Changeset 19834

Timestamp:

2011/01/06 07:00:09 (13 years ago)

Author:

Seasoft

Message:

#714(パス指定によるリダイレクトの記述を簡潔にする)

Location:

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

Files:

• SC_Response.php (modified) (6 diffs)
• pages/admin/LC_Page_Admin_Logout.php (modified) (1 diff)
• pages/admin/design/LC_Page_Admin_Design.php (modified) (1 diff)
• pages/admin/design/LC_Page_Admin_Design_MainEdit.php (modified) (1 diff)
• pages/admin/mail/LC_Page_Admin_Mail.php (modified) (1 diff)
• pages/admin/mail/LC_Page_Admin_Mail_Sendmail.php (modified) (1 diff)
• pages/frontparts/LC_Page_FrontParts_LoginCheck.php (modified) (2 diffs)

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

@@ -132 +132 @@
 
     /**
-     * @param string $location 「アプリケーションルートからの相対パス」「現在のURLからの相対パス」「URL」のいずれか
+     * @param string $location 「url-path」「現在のURLからのパス」「URL」のいずれか
      * @return void
      * @static
@@ -138 +138 @@
     function sendRedirect($location, $arrQueryString = array(), $inheritQueryString = false, $useSsl = null) {
 
-        // アプリケーションルートからの相対パス
+        // url-path → URL 変換
         if ($location[0] === '/') {
-            if (!is_bool($useSsl)) {
-                $useSsl = SC_Utils_Ex::sfIsHTTPS();
-            }
-            $url = ($useSsl ? HTTPS_URL : HTTP_URL) . substr($location, 1);
-        }
+            $netUrl = new Net_URL();
+            $netUrl->path = $location;
+            $location = $netUrl->getUrl();
+        }
+
         // URL の場合
-        elseif (preg_match('/^https?:/', $location)) {
+        if (preg_match('/^https?:/', $location)) {
             $url = $location;
             if (is_bool($useSsl)) {
@@ -161 +161 @@
             }
         }
-        // 現在のURLからの相対パス
+        // 現在のURLからのパス
         else {
             if (!is_bool($useSsl)) {
@@ -171 +171 @@
         }
 
-        $netUrl = new Net_URL($url);
-        $arrQueryString = array_merge($netUrl->querystring, $arrQueryString);
-
-        if ($inheritQueryString) {
-            if (!empty($_SERVER['QUERY_STRING'])) {
-                $netUrl->addRawQueryString($_SERVER['QUERY_STRING']);
-            }
-        }
-
-        foreach ($arrQueryString as $key => $val) {
-            $netUrl->addQueryString($key, $val);
-        }
-
-        $url = $netUrl->getURL();
-
+        // アプリケーション内での遷移時の処理
         $pattern = '/^(' . preg_quote(HTTP_URL, '/') . '|' . preg_quote(HTTPS_URL, '/') . ')/';
         if (preg_match($pattern, $url)) {
+            $netUrl = new Net_URL($url);
+            $arrQueryString = array_merge($netUrl->querystring, $arrQueryString);
+            $netUrl->querystring = array();
+
+            if ($inheritQueryString) {
+                if (!empty($_SERVER['QUERY_STRING'])) {
+                    $netUrl->addRawQueryString($_SERVER['QUERY_STRING']);
+                }
+            }
+
+            foreach ($arrQueryString as $key => $val) {
+                $netUrl->addQueryString($key, $val);
+            }
+
+            $url = $netUrl->getURL();
+
             $session = SC_SessionFactory::getInstance();
             if (SC_MobileUserAgent::isMobile() || $session->useCookie() == false) {
@@ -202 +204 @@
 
     /**
+     * HTML_PATH からのパスを指定してリダイレクトする
+     *
+     * @param string $location /html/ からの相対パス
+     * @return void
+     * @static
+     */
+    function sendRedirectFromUrlPath($location, $arrQueryString = array(), $inheritQueryString = false, $useSsl = null) {
+        $location = URL_PATH . $location;
+        SC_Response_Ex::sendRedirect($location, $arrQueryString, $inheritQueryString, $useSsl);
+    }
+
+    /**
      * @static
      */
@@ -213 +227 @@
         $netUrl->querystring = array();
 
-        $this->sendRedirect($netUrl->getURL(), $arrQueryString);
+        SC_Response_Ex::sendRedirect($netUrl->getURL(), $arrQueryString);
     }
 

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

@@ -55 +55 @@
         $objSess->logout();
 
-        $this->objDisplay->redirect('/' . ADMIN_DIR . DIR_INDEX_URL);
+        SC_Response_Ex::sendRedirectFromUrlPath('/' . ADMIN_DIR . DIR_INDEX_URL);
     }
 

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

@@ -214 +214 @@
                 $_SESSION['preview'] = "ON";
 
-                SC_Response_Ex::sendRedirect('/preview/' . DIR_INDEX_URL, array("filename" => $arrPageData[0]["filename"]));
+                SC_Response_Ex::sendRedirectFromUrlPath('preview/' . DIR_INDEX_URL, array("filename" => $arrPageData[0]["filename"]));
                 exit;
 

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

@@ -215 +215 @@
         }
         $_SESSION['preview'] = "ON";
-        SC_Response_Ex::sendRedirect('/preview/' . DIR_INDEX_URL, array("filename" => $arrPageData[0]["filename"]));
+        SC_Response_Ex::sendRedirectFromUrlPath('preview/' . DIR_INDEX_URL, array("filename" => $arrPageData[0]["filename"]));
     }
 

branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php

@@ -364 +364 @@
                     if (MELMAGA_SEND) {
                         if (MELMAGA_BATCH_MODE) {
-                            $this->objDisplay->redirect('/' . ADMIN_DIR . 'mail/history.php');
+                            SC_Response_Ex::sendRedirectFromUrlPath(ADMIN_DIR . 'mail/history.php');
                         } else {
-                            $this->objDisplay->redirect('/' . ADMIN_DIR . 'mail/sendmail.php', array('mode' => 'now', 'send_id' => $sendId));
+                            SC_Response_Ex::sendRedirectFromUrlPath(ADMIN_DIR . 'mail/sendmail.php', array('mode' => 'now', 'send_id' => $sendId));
                         }
                         exit;

branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Sendmail.php

@@ -178 +178 @@
         }
         if ($_GET['mode'] == 'now') {
-            $this->objDisplay->redirect('/' . ADMIN_DIR . 'mail/history.php');
+            SC_Response_Ex::sendRedirectFromUrlPath(ADMIN_DIR . 'mail/history.php');
         }
         echo "complete\n";

branches/version-2_5-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php

@@ -106 +106 @@
             if(count($arrErr) == 0) {
                 if($objCustomer->getCustomerDataFromEmailPass($arrForm['login_pass'], $arrForm['login_email'], true)) {
-                    $this->objDisplay->redirect('/', array(), false, true);
+                    SC_Response_Ex::sendRedirectFromUrlPath('', array(), false, false);
                     exit;
                 } else {
@@ -132 +132 @@
             //マイページログイン中はログイン画面へ移行
             if ($mypage_url_search == 2){
-                $this->objDisplay->redirect('/mypage/login.php');
+                SC_Response_Ex::sendRedirectFromUrlPath('mypage/login.php');
             }else{
-                $this->objDisplay->redirect('/', array(), false, true);
+                SC_Response_Ex::sendRedirectFromUrlPath('', array(), false, false);
             }
             exit;