Changeset 22108

Timestamp:

2012/11/26 18:53:27 (11 years ago)

Author:

h_yoshimoto

Message:

#1955 r22104 ～ r22106 間のコミットをmerge

Location:

branches/version-2_12-multilang/data/class/pages

Files:

• admin/system/LC_Page_Admin_System_AdminArea.php (modified) (5 diffs)
• products/LC_Page_Products_Review.php (modified) (2 diffs)

branches/version-2_12-multilang/data/class/pages/admin/system/LC_Page_Admin_System_AdminArea.php

@@ -148 +148 @@
      */
     function lfCheckAdminArea(&$arrForm, &$arrErr) {
-        $admin_dir = trim($arrForm['admin_dir']).'/';
+        $admin_dir = trim($arrForm['admin_dir']) . '/';
 
         $installData = file(CONFIG_REALFILE, FILE_IGNORE_NEW_LINES);
@@ -155 +155 @@
                 //既存ディレクトリのチェック
                 if (file_exists(HTML_REALDIR.$admin_dir) and $admin_dir != 'admin/') {
-                    $arrErr['admin_dir'] .= t('LC_Page_Admin_System_AdminArea_003', array('T_FIELD' => OOT_URLPATH.$admin_dir));
+                    $arrErr['admin_dir'] .= t('LC_Page_Admin_System_AdminArea_003', array('T_FIELD' => ROOT_URLPATH . $admin_dir));
                     
                 }
                 //権限チェック
                 if (!is_writable(HTML_REALDIR . ADMIN_DIR)) {
-                    $arrErr['admin_dir'] .= t('LC_Page_Admin_System_AdminArea_004', array('T_FIELD' => ROOT_URLPATH.ADMIN_DIR));
+                    $arrErr['admin_dir'] .= t('LC_Page_Admin_System_AdminArea_004', array('T_FIELD' => ROOT_URLPATH . ADMIN_DIR));
                     
                 }
@@ -169 +169 @@
     //管理機能ディレクトリのリネームと CONFIG_REALFILE の変更
     function lfUpdateAdminData(&$arrForm) {
-        $admin_dir = trim($arrForm['admin_dir']).'/';
-        $admin_force_ssl = 'FALSE';
+        $admin_dir = trim($arrForm['admin_dir']) . '/';
+        $admin_force_ssl = 'false';
         if ($arrForm['admin_force_ssl'] == 1) {
-            $admin_force_ssl = 'TRUE';
-        }
-        $admin_allow_hosts = explode("\n",$arrForm['admin_allow_hosts']);
+            $admin_force_ssl = 'true';
+        }
+        $admin_allow_hosts = explode("\n", $arrForm['admin_allow_hosts']);
         foreach ($admin_allow_hosts as $key=>$host) {
             $host = trim($host);
@@ -190 +190 @@
         foreach ($installData as $key=>$line) {
             if (strpos($line,'ADMIN_DIR') !== false and ADMIN_DIR != $admin_dir) {
-                $installData[$key] = 'define("ADMIN_DIR","'.$admin_dir.'");';
+                $installData[$key] = 'define("ADMIN_DIR", "' . $admin_dir . '");';
                 //管理機能ディレクトリのリネーム
                 if (!rename(HTML_REALDIR.ADMIN_DIR,HTML_REALDIR.$admin_dir)) {
-                    $this->arrErr['admin_dir'] .= t('LC_Page_Admin_System_AdminArea_005', array('T_FIELD' => ROOT_URLPATH.ADMIN_DIR));
+                    $this->arrErr['admin_dir'] .= t('LC_Page_Admin_System_AdminArea_005', array('T_FIELD' => ROOT_URLPATH . ADMIN_DIR));
                     
                     return false;
@@ -201 +201 @@
 
             if (strpos($line,'ADMIN_FORCE_SSL') !== false) {
-                $installData[$key] = 'define("ADMIN_FORCE_SSL",'.$admin_force_ssl.');';
+                $installData[$key] = 'define("ADMIN_FORCE_SSL", ' . $admin_force_ssl.');';
                 $diff ++;
             }
             if (strpos($line,'ADMIN_ALLOW_HOSTS') !== false and ADMIN_ALLOW_HOSTS != $admin_allow_hosts) {
-                $installData[$key] = "define('ADMIN_ALLOW_HOSTS','".$admin_allow_hosts."');";
+                $installData[$key] = "define('ADMIN_ALLOW_HOSTS', '" . $admin_allow_hosts."');";
                 $diff ++;
             }

branches/version-2_12-multilang/data/class/pages/products/LC_Page_Products_Review.php

@@ -124 +124 @@
         $this->arrForm['name'] = $this->lfGetProductName($this->arrForm['product_id']);
         if (empty($this->arrForm['name'])) {
-            SC_Utils_Ex::sfDispSiteError(PAGE_ERROR);
+            SC_Utils_Ex::sfDispSiteError(PRODUCT_NOT_FOUND);
         }
 
@@ -195 +195 @@
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
-        return $objQuery->get('name', 'dtb_products', 'product_id = ? ', array($product_id));
+        return $objQuery->get('name', 'dtb_products', 'product_id = ? AND del_flg = 0 AND status = 1', array($product_id));
     }