Changeset 19996 for branches/version-2_5-dev/data/class

Timestamp:

2011/01/20 03:52:23 (16 years ago)

Author:

tao

Message:

#841 管理画面内の設定画面変更。インストール時のディレクトリのパーミッションチェックに/htmlの書き込み権限のチェックを追加。adminでも設定出来る様に修正。

Location:

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

Files:

• SC_View.php (modified) (1 diff)
• pages/admin/basis/LC_Page_Admin_Basis.php (modified) (7 diffs)
• pages/admin/system/LC_Page_Admin_System_AdminArea.php (added)

branches/version-2_5-dev/data/class/SC_View.php

@@ -201 +201 @@
         $this->_smarty->compile_dir = COMPILE_ADMIN_REALDIR;
         $this->assign('TPL_URLPATH_DEFAULT', ROOT_URLPATH . USER_DIR . USER_PACKAGE_DIR . DEFAULT_TEMPLATE_NAME . '/');
-        $this->assign('TPL_URLPATH', ROOT_URLPATH . USER_DIR . USER_PACKAGE_DIR . ADMIN_DIR);
+        $this->assign('TPL_URLPATH', ROOT_URLPATH . USER_DIR . USER_PACKAGE_DIR . "admin/");
         $this->initpath();
     }

branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php

@@ -52 +52 @@
         $this->arrTAXRULE = $masterData->getMasterData("mtb_taxrule");
         $this->tpl_subtitle = 'SHOPマスタ';
-        $this->tpl_enable_ssl = FALSE;
-        if(strpos(HTTPS_URL,"https://") !== FALSE){
-            $this->tpl_enable_ssl = TRUE;
-        }
 
         //定休日用配列
@@ -118 +114 @@
                     break;
                 }
-                $this->tpl_onload = "fnCheckLimit('downloadable_days', 'downloadable_days_unlimited', '" . DISABLED_RGB . "'); window.alert('SHOPマスタの登録が完了しました。管理機能のURLを変更した場合は、新しいURLにアクセスしてください。');";
+                $this->tpl_onload = "fnCheckLimit('downloadable_days', 'downloadable_days_unlimited', '" . DISABLED_RGB . "'); window.alert('SHOPマスタの登録が完了しました。');";
             }
             if( empty($this->arrForm['regular_holiday_ids']) ) {
@@ -133 +129 @@
             $regular_holiday_ids = explode('|', $this->arrForm['regular_holiday_ids']);
             $this->arrForm['regular_holiday_ids'] = $regular_holiday_ids;
-            $admin_dir = str_replace("/","",ADMIN_DIR);
-            $this->arrForm += array("admin_dir"=>$admin_dir);
-            $this->arrForm += array("admin_force_ssl"=>ADMIN_FORCE_SSL);
-            if(defined("ADMIN_ALLOW_HOSTS")){
-                $allow_hosts = unserialize(ADMIN_ALLOW_HOSTS);
-                $this->arrForm += array("admin_allow_hosts"=>implode("\n",$allow_hosts));
-            }else{
-                $this->arrForm += array("admin_allow_hosts"=>"");
-            }
             $this->tpl_onload = "fnCheckLimit('downloadable_days', 'downloadable_days_unlimited', '" . DISABLED_RGB . "');";
         }
@@ -205 +192 @@
         }
         $sqlval['update_date'] = 'Now()';
-        $this->lfUpdateAdminData($array);
         // UPDATEの実行
         $ret = $objQuery->update("dtb_baseinfo", $sqlval);
@@ -217 +203 @@
         }
         $sqlval['update_date'] = 'Now()';
-        $this->lfUpdateAdminData($array);
         // INSERTの実行
         $ret = $objQuery->insert("dtb_baseinfo", $sqlval);
     }
     
-    //管理機能ディレクトリのリネームと CONFIG_REALFILE の変更
-    function lfUpdateAdminData($array){
-        $admin_dir = trim($array['admin_dir'])."/";
-        $admin_force_ssl = "FALSE";
-        if($array['admin_force_ssl'] == 1){
-            $admin_force_ssl = "TRUE";
-        }
-        $admin_allow_hosts = explode("\n",$array['admin_allow_hosts']);
-        foreach($admin_allow_hosts as $key=>$host){
-            $host = trim($host);
-            if(strlen($host) >= 8){
-                $admin_allow_hosts[$key] = $host;
-            }else{
-                unset($admin_allow_hosts[$key]);
-            }
-        }
-        $admin_allow_hosts = serialize($admin_allow_hosts);
-
-        // 権限チェック 
-        if(!is_writable(CONFIG_REALFILE)){
-            $this->arrErr["admin_force_ssl"] = CONFIG_REALFILE . ' を変更する権限がありません。';
-            return false;
-        }
-
-        // CONFIG_REALFILE の書き換え
-        $installData = file(CONFIG_REALFILE, FILE_IGNORE_NEW_LINES);
-        $diff = 0;
-        foreach($installData as $key=>$line){
-            if(strpos($line,"ADMIN_DIR") !== false and ADMIN_DIR != $admin_dir){
-                //既存ディレクトリのチェック
-                if(file_exists(HTML_REALDIR.$admin_dir)){
-                    $this->arrErr["admin_dir"] .= HTML_REALDIR.$admin_dir."は既に存在しています。別のディレクトリ名を指定してください。";
-                }
-                if(file_exists(USER_TEMPLATE_REALDIR.$admin_dir)){
-                    $this->arrErr["admin_dir"] .= USER_TEMPLATE_REALDIR.$admin_dir."は既に存在しています。別のディレクトリ名を指定してください。";
-                }
-                //権限チェック
-                if(!is_writable(HTML_REALDIR . ADMIN_DIR)){
-                    $this->arrErr["admin_dir"] .= ROOT_URLPATH.ADMIN_DIR."のディレクトリ名を変更する権限がありません。";
-                }
-                if(!is_writable(USER_TEMPLATE_REALDIR . ADMIN_DIR)){
-                    $this->arrErr["admin_dir"] .= USER_TEMPLATE_REALDIR . ADMIN_DIR."のディレクトリ名を変更する権限がありません。";        
-                }
-                if(count($this->arrErr) == 0 ){
-                    $installData[$key] = 'define("ADMIN_DIR","'.$admin_dir.'");';
-                    //管理機能ディレクトリのリネーム
-                    rename(HTML_REALDIR.ADMIN_DIR,HTML_REALDIR.$admin_dir);
-                    rename(USER_TEMPLATE_REALDIR.ADMIN_DIR,USER_TEMPLATE_REALDIR.$admin_dir);
-                    $diff ++;
-                }
-            }
-            
-            if(strpos($line,"ADMIN_FORCE_SSL") !== false and ADMIN_FORCE_SSL !== (boolean)$array['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."');";
-                $diff ++;
-            }
-        }
-        
-        if($diff > 0) {
-            $fp = fopen(DATA_REALDIR . "install.php","wb");
-            $installData = implode("\n",$installData);
-            echo $installData;
-            fwrite($fp, $installData);
-            fclose($fp);
-        }
-        return true;
-    }
 
     /* 取得文字列の変換 */
@@ -326 +240 @@
         $arrConvList['email03'] = "a";
         $arrConvList['email04'] = "a";
-        $arrConvList['admin_dir'] = "a";
-        $arrConvList['admin_force_ssl'] = "n";
-        $arrConvList['admin_allow_hosts'] = "a";
         $arrConvList['tax'] = "n";
         $arrConvList['free_rule'] = "n";
@@ -362 +273 @@
         $objErr->doFunc(array('メール送信元メールアドレス', "email03", STEXT_LEN) ,array("EXIST_CHECK", "EMAIL_CHECK", "EMAIL_CHAR_CHECK", "MAX_LENGTH_CHECK"));
         $objErr->doFunc(array('送信エラー受付メールアドレス', "email04", STEXT_LEN) ,array("EXIST_CHECK", "EMAIL_CHECK", "EMAIL_CHAR_CHECK","MAX_LENGTH_CHECK"));
-        //管理機能設定チェック
-        $objErr->doFunc(array('ディレクトリ名', "admin_dir", ID_MAX_LEN) ,array("EXIST_CHECK","SPTAB_CHECK", "ALNUM_CHECK"));
-        $objErr->doFunc(array('SSL制限', "admin_force_ssl", 1) ,array("NUM_CHECK", "MAX_LENGTH_CHECK"));
-        $objErr->doFunc(array('IP制限', "admin_allow_hosts", LTEXT_LEN) ,array("IP_CHECK", "MAX_LENGTH_CHECK"));
-        
 
         // 電話番号チェック