Changeset 22796 for branches/version-2_12-dev/data/class/SC_Display.php

Timestamp:

2013/05/02 18:11:36 (13 years ago)

Author:

h_yoshimoto

Message:

#2236 2.12.3リリース以降の2.12-devへのコミット差し戻し

File:

• branches/version-2_12-dev/data/class/SC_Display.php (modified) (10 diffs)

branches/version-2_12-dev/data/class/SC_Display.php

@@ -28 +28 @@
  * @version $Id$
  */
-class SC_Display
-{
+class SC_Display{
 
     var $response;
@@ -50 +49 @@
      */
 
-    function __construct($hasPrevURL = true)
-    {
+    function __construct($hasPrevURL = true) {
         $this->response = new SC_Response_Ex();
         if ($hasPrevURL) {
@@ -58 +56 @@
     }
 
-    function setPrevURL()
-    {
+    function setPrevURL() {
         // TODO SC_SiteSession で実装した方が良さげ
         $objCartSess = new SC_CartSession_Ex();
@@ -71 +68 @@
      * @param $is_admin boolean 管理画面を扱う場合 true
      */
-    function prepare($page, $is_admin = false)
-    {
+    function prepare($page, $is_admin = false) {
         if (!$this->deviceSeted || !is_null($this->view)) {
             $device = ($is_admin) ? DEVICE_TYPE_ADMIN : $this->detectDevice();
@@ -87 +83 @@
      * SC_Response::reload() のラッパーです.
      */
-    function reload($queryString = array(), $removeQueryString = false)
-    {
+    function reload($queryString = array(), $removeQueryString = false) {
         $this->response->reload($queryString, $removeQueryString);
     }
 
-    function noAction()
-    {
+    function noAction() {
         return;
     }
@@ -100 +94 @@
      * ヘッダを追加する.
      */
-    function addHeader($name, $value)
-    {
+    function addHeader($name, $value) {
         $this->response->addHeader($name, $value);
     }
@@ -109 +102 @@
      * Enter description here ...
      */
-    function setDevice($device = DEVICE_TYPE_PC)
-    {
+    function setDevice($device = DEVICE_TYPE_PC) {
 
         switch ($device) {
@@ -135 +127 @@
      * SC_View インスタンスを設定する.
      */
-    function setView($view)
-    {
+    function setView($view) {
         $this->view = $view;
     }
@@ -151 +142 @@
      * @return integer 端末種別ID
      */
-    public static function detectDevice($reset = FALSE)
-    {
+    public static function detectDevice($reset = FALSE) {
         if (is_null(SC_Display_Ex::$device) || $reset) {
             $nu = new Net_UserAgent_Mobile();
@@ -167 +157 @@
     }
 
-    function assign($val1,$val2)
-    {
+    function assign($val1,$val2) {
         $this->view->assign($val1, $val2);
     }
 
-    function assignobj($obj)
-    {
+    function assignobj($obj) {
         $this->view->assignobj($obj);
     }
 
-    function assignarray($array)
-    {
+    function assignarray($array) {
         $this->view->assignarray($array);
     }