Changeset 23279 for branches/version-2_13-dev/data/class/pages/admin

Timestamp:

2013/11/18 15:20:47 (13 years ago)

Author:

m_uehara

Message:

#2465 r23269 - r23272, r23274 - r23275, r23277 - r23278 をマージ

Location:

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

Files:

• contents/LC_Page_Admin_Contents_FileManager.php (modified) (2 diffs)
• contents/LC_Page_Admin_Contents_FileView.php (modified) (1 diff)
• products/LC_Page_Admin_Products_Product.php (modified) (3 diffs)

branches/version-2_13-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php

@@ -127 +127 @@
                         $this->setDispError('select_file', $disp_error);
                     } else {
-                        // ファイルダウンロード
-                        $objFileManager->sfDownloadFile($objFormParam->getValue('select_file'));
-                        SC_Response_Ex::actionExit();
-                    }
+                       $path_exists = SC_Utils::checkFileExistsWithInBasePath($objFormParam->getValue('select_file'),USER_REALDIR);
+                       if ($path_exists) {
+                         // ファイルダウンロード
+                         $objFileManager->sfDownloadFile($objFormParam->getValue('select_file'));
+                         SC_Response_Ex::actionExit();
+                      }
+                  }
                 }
                 break;
@@ -139 +142 @@
                 $objFormParam->setParam($this->createSetParam($_POST));
                 $objFormParam->convParam();
-
                 $this->arrErr = $objFormParam->checkError();
-                if (SC_Utils_Ex::isBlank($this->arrErr)) {
+                $path_exists = SC_Utils::checkFileExistsWithInBasePath($objFormParam->getValue('select_file'),USER_REALDIR);
+                if (SC_Utils_Ex::isBlank($this->arrErr) && ($path_exists)) {
                     $objFileManager->deleteFile($objFormParam->getValue('select_file'));
                 }

branches/version-2_13-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileView.php

@@ -102 +102 @@
     {
         $file_check_flg = false;
-
         // FIXME パスのチェック関数が必要
         $file = $objFormParam->getValue('file');
-
-        if (!preg_match('|\./|', $file)) {
+        $path_exists = SC_Utils::checkFileExistsWithInBasePath($file,USER_REALDIR);
+        if ($path_exists){
             $file_check_flg = true;
         }
-
         return $file_check_flg;
     }

branches/version-2_13-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php

@@ -565 +565 @@
     {
         $arrForm = $objFormParam->getHashArray();
-        $arrForm['category_id'] = unserialize($arrForm['category_id']);
+        $arrForm['category_id'] = SC_Utils_Ex::jsonDecode($arrForm['category_id']);
         $objFormParam->setValue('category_id', $arrForm['category_id']);
 
@@ -587 +587 @@
 
         if (isset($arrForm['category_id']) && !is_array($arrForm['category_id'])) {
-            $arrForm['category_id'] = unserialize($arrForm['category_id']);
+            $arrForm['category_id'] = SC_Utils_Ex::jsonDecode($arrForm['category_id']);
         }
         $this->tpl_json_category_id = !empty($arrForm['category_id']) ? SC_Utils_Ex::jsonEncode($arrForm['category_id']) : SC_Utils_Ex::jsonEncode(array());
@@ -638 +638 @@
         $arrForm['arrCategoryId'] = $arrForm['category_id'];
         // hidden に渡す値は serialize する
-        $arrForm['category_id'] = serialize($arrForm['category_id']);
+        $arrForm['category_id'] = SC_Utils_Ex::jsonEncode($arrForm['category_id']);
         // 画像ファイル用データ取得
         $arrForm['arrFile'] = $objUpFile->getFormFileList(IMAGE_TEMP_URLPATH, IMAGE_SAVE_URLPATH);