Changeset 20741 for branches/version-2_5-dev/data/class/pages/admin

Timestamp:

2011/03/20 14:45:13 (16 years ago)

Author:

kotani

Message:

#862 (テンプレート上のエスケープを簡単に)実装漏れ箇所

Location:

branches/version-2_5-dev/data/class/pages/admin

Files:

• design/LC_Page_Admin_Design_Bloc.php (modified) (1 diff)
• design/LC_Page_Admin_Design_CSS.php (modified) (5 diffs)
• total/LC_Page_Admin_Total.php (modified) (1 diff)

branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php

@@ -82 +82 @@
         // 端末種別IDを取得
         $device_type_id = $objFormParam->getValue('device_type_id');
-//        if (isset($_REQUEST['device_type_id'])
-//            && is_numeric($_REQUEST['device_type_id'])) {
-//            $device_type_id = $_REQUEST['device_type_id'];
-//        } else {
-//            $device_type_id = DEVICE_TYPE_PC;
-//        }
 
         $this->objLayout = new SC_Helper_PageLayout_Ex();

branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php

@@ -76 +76 @@
         $this->objLayout = new SC_Helper_PageLayout_Ex();
 
+        $objFormParam = new SC_FormParam_Ex();
+        $this->lfInitParam($objFormParam, $_REQUEST);
+
         // CSSファイル名を取得
-        if (isset($_POST['css_name'])) {
-            $css_name = $_POST['css_name'];
-        }else if (isset($_GET['css_name'])){
-            $css_name = $_GET['css_name'];
-        }else{
-            $css_name = '';
-        }
+        $css_name = $objFormParam->getValue('css_name');
         $this->css_name = $css_name;
-
-        if (isset($_POST['old_css_name'])) {
-            $old_css_name = $_POST['old_css_name'];
-        }else if (isset($_GET['css_name'])) {
-            $old_css_name = $_GET['css_name'];
-        }else{
-            $old_css_name = '';
-        }
+        $old_css_name = $objFormParam->getValue('old_css_name');
         $this->old_css_name = $old_css_name;
 
         // 端末種別IDを取得
-        if (isset($_REQUEST['device_type_id'])
-            && is_numeric($_REQUEST['device_type_id'])) {
-            $device_type_id = $_REQUEST['device_type_id'];
-        } else {
-            $device_type_id = DEVICE_TYPE_PC;
-        }
+        $device_type_id = $objFormParam->getValue('device_type_id');
 
         //サブタイトルの追加
@@ -122 +107 @@
                 break;
             case 'delete':
-                $this->lfExecuteDelete($css_path);
+                $this->lfExecuteDelete($css_path, $device_type_id);
                 break;
             default:
-                GC_Utils_Ex::gfPrintLog("MODEエラー：".$this->getMode());
                 break;
         }
@@ -141 +125 @@
     function destroy() {
         parent::destroy();
+    }
+
+
+    /**
+     * パラメータ情報の初期化
+     *
+     * @param object $objFormParam SC_FormParamインスタンス
+     * @param array $arrPost $_POSTデータ
+     * @return void
+     */
+    function lfInitParam(&$objFormParam, $arrPost) {
+        $objFormParam->addParam("端末種別ID", "device_type_id", INT_LEN, 'n', array("NUM_CHECK", "MAX_LENGTH_CHECK"), DEVICE_TYPE_PC);
+        $objFormParam->addParam("CSSファイル名", "css_name", MTEXT_LEN, 'a', array("MAX_LENGTH_CHECK"));
+        $objFormParam->addParam("旧CSSファイル名", "old_css_name", MTEXT_LEN, 'a', array("MAX_LENGTH_CHECK"));
+        $objFormParam->setParam($arrPost);
+        $objFormParam->convParam();
     }
 
@@ -164 +164 @@
     }
 
-    function lfExecuteDelete($css_path) {
+    function lfExecuteDelete($css_path, $device_type_id) {
         $objFileManager = new SC_Helper_FileManager_Ex();
 
@@ -171 +171 @@
             $objFileManager->sfDeleteDir($css_path);
         }
-        $this->objDisplay->reload(array(), true);
+        $this->objDisplay->reload(array('device_type_id' => $device_type_id), true);
     }
 

branches/version-2_5-dev/data/class/pages/admin/total/LC_Page_Admin_Total.php

@@ -171 +171 @@
     }
 
+    /* デフォルト値の取得 */
+    function lfGetDateDefault() {
+        $year = date("Y");
+        $month = date("m");
+        $day = date("d");
+
+        $list = isset($_SESSION['total']) ? $_SESSION['total'] : "";
+
+        // セッション情報に開始月度が保存されていない。
+        if(empty($_SESSION['total']['startyear_m'])) {
+            $list['startyear_m'] = $year;
+            $list['startmonth_m'] = $month;
+        }
+
+        // セッション情報に開始日付、終了日付が保存されていない。
+        if(empty($_SESSION['total']['startyear']) && empty($_SESSION['total']['endyear'])) {
+            $list['startyear'] = $year;
+            $list['startmonth'] = $month;
+            $list['startday'] = $day;
+            $list['endyear'] = $year;
+            $list['endmonth'] = $month;
+            $list['endday'] = $day;
+        }
+
+        return $list;
+    }
+
     /* パラメータ情報の初期化 */
     function lfInitParam(&$objFormParam) {
+        // デフォルト値の取得
+        $arrList = $this->lfGetDateDefault();
+
         // 月度集計
-        $objFormParam->addParam("月度", "search_startyear_m", INT_LEN, 'n', array("MAX_LENGTH_CHECK", "NUM_CHECK"));
-        $objFormParam->addParam("月度", "search_startmonth_m", INT_LEN, 'n', array("MAX_LENGTH_CHECK", "NUM_CHECK"));
+        $objFormParam->addParam("月度", "search_startyear_m", INT_LEN, 'n', array("MAX_LENGTH_CHECK", "NUM_CHECK"), $arrList['startyear_m']);
+        $objFormParam->addParam("月度", "search_startmonth_m", INT_LEN, 'n', array("MAX_LENGTH_CHECK", "NUM_CHECK"), $arrList['startmonth_m']);
         // 期間集計
-        $objFormParam->addParam("開始日", "search_startyear", INT_LEN, 'n', array("MAX_LENGTH_CHECK", "NUM_CHECK"));
-        $objFormParam->addParam("開始日", "search_startmonth", INT_LEN, 'n', array("MAX_LENGTH_CHECK", "NUM_CHECK"));
-        $objFormParam->addParam("開始日", "search_startday", INT_LEN, 'n', array("MAX_LENGTH_CHECK", "NUM_CHECK"));
-        $objFormParam->addParam("終了日", "search_endyear", INT_LEN, 'n', array("MAX_LENGTH_CHECK", "NUM_CHECK"));
-        $objFormParam->addParam("終了日", "search_endmonth", INT_LEN, 'n', array("MAX_LENGTH_CHECK", "NUM_CHECK"));
-        $objFormParam->addParam("終了日", "search_endday", INT_LEN, 'n', array("MAX_LENGTH_CHECK", "NUM_CHECK"));
+        $objFormParam->addParam("開始日", "search_startyear", INT_LEN, 'n', array("MAX_LENGTH_CHECK", "NUM_CHECK"), $arrList['startyear']);
+        $objFormParam->addParam("開始日", "search_startmonth", INT_LEN, 'n', array("MAX_LENGTH_CHECK", "NUM_CHECK"), $arrList['startmonth']);
+        $objFormParam->addParam("開始日", "search_startday", INT_LEN, 'n', array("MAX_LENGTH_CHECK", "NUM_CHECK"), $arrList['startday']);
+        $objFormParam->addParam("終了日", "search_endyear", INT_LEN, 'n', array("MAX_LENGTH_CHECK", "NUM_CHECK"), $arrList['endyear']);
+        $objFormParam->addParam("終了日", "search_endmonth", INT_LEN, 'n', array("MAX_LENGTH_CHECK", "NUM_CHECK"), $arrList['endmonth']);
+        $objFormParam->addParam("終了日", "search_endday", INT_LEN, 'n', array("MAX_LENGTH_CHECK", "NUM_CHECK"), $arrList['endday']);
 
         // hiddenデータの取得用