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

Timestamp:

2011/01/20 04:03:25 (16 years ago)

Author:

Seasoft

Message:

#640(URL の index.php ハードコーディングを解消し省略・変更を考慮)

• IIS動作未確認

#834(パスに関わるパラメータ名が不適切)

• DIR_INDEX_URL -> DIR_INDEX_PATH

Location:

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

Files:

• LC_Page_Sitemap.php (modified) (2 diffs)
• admin/LC_Page_Admin_Logout.php (modified) (1 diff)
• admin/design/LC_Page_Admin_Design.php (modified) (1 diff)
• admin/design/LC_Page_Admin_Design_MainEdit.php (modified) (1 diff)
• forgot/LC_Page_Forgot.php (modified) (1 diff)
• mypage/LC_Page_Mypage.php (modified) (2 diffs)
• mypage/LC_Page_Mypage_Login.php (modified) (1 diff)
• mypage/LC_Page_Mypage_LoginCheck.php (modified) (1 diff)

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

@@ -77 +77 @@
         $this->staticURL = array();
         
-        $this->staticURL[] = HTTP_URL . 'rss/' . DIR_INDEX_URL;
+        $this->staticURL[] = HTTP_URL . 'rss/' . DIR_INDEX_PATH;
         if (USE_MOBILE !== false) {
             $this->staticURL[] = MOBILE_HTTP_URL;
@@ -311 +311 @@
                 $page['url'] = HTTP_URL . $page['url'];
             }
-            $page['url'] = preg_replace('|/' . preg_quote(DIR_INDEX_FILE) . '$|', '/' . DIR_INDEX_URL, $page['url']);
+            $page['url'] = preg_replace('|/' . preg_quote(DIR_INDEX_FILE) . '$|', '/' . DIR_INDEX_PATH, $page['url']);
         }
         unset($page);

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

@@ -55 +55 @@
         $objSess->logout();
 
-        SC_Response_Ex::sendRedirectFromUrlPath(ADMIN_DIR . DIR_INDEX_URL);
+        SC_Response_Ex::sendRedirectFromUrlPath(ADMIN_DIR . DIR_INDEX_PATH);
     }
 

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

@@ -210 +210 @@
                 $_SESSION['preview'] = "ON";
 
-                SC_Response_Ex::sendRedirectFromUrlPath('preview/' . DIR_INDEX_URL, array("filename" => $arrPageData[0]["filename"]));
+                SC_Response_Ex::sendRedirectFromUrlPath('preview/' . DIR_INDEX_PATH, 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::sendRedirectFromUrlPath('preview/' . DIR_INDEX_URL, array("filename" => $arrPageData[0]["filename"]));
+        SC_Response_Ex::sendRedirectFromUrlPath('preview/' . DIR_INDEX_PATH, array("filename" => $arrPageData[0]["filename"]));
     }
 

branches/version-2_5-dev/data/class/pages/forgot/LC_Page_Forgot.php

@@ -302 +302 @@
         // 空メール用のトークンを作成。
         if (MOBILE_USE_KARA_MAIL) {
-            $token = $objMobile->gfPrepareKaraMail('forgot/' . DIR_INDEX_URL);
+            $token = $objMobile->gfPrepareKaraMail('forgot/' . DIR_INDEX_PATH);
             if ($token !== false) {
                 $objPage->tpl_kara_mail_to = MOBILE_KARA_MAIL_ADDRESS_USER . MOBILE_KARA_MAIL_ADDRESS_DELIMITER . 'forgot_' . $token . '@' . MOBILE_KARA_MAIL_ADDRESS_DOMAIN;

branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage.php

@@ -116 +116 @@
             // next
             if ($pageNo + HISTORY_NUM < $linemax) {
-                $next = "<a href='index.php?pageno=" . ($pageNo + HISTORY_NUM) . "'>次へ→</a>";
+                $next = "<a href='?pageno=" . ($pageNo + HISTORY_NUM) . "'>次へ→</a>";
             } else {
                 $next = "";
@@ -123 +123 @@
             // previous
             if ($pageNo - HISTORY_NUM > 0) {
-                $previous = "<a href='index.php?pageno=" . ($pageNo - HISTORY_NUM) . "'>←前へ</a>";
+                $previous = "<a href='?pageno=" . ($pageNo - HISTORY_NUM) . "'>←前へ</a>";
             } elseif ($pageNo == 0) {
                 $previous = "";
             } else {
-                $previous = "<a href='index.php?pageno=0'>←前へ</a>";
+                $previous = "<a href='?pageno=0'>←前へ</a>";
             }
 

branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Login.php

@@ -72 +72 @@
         // ログイン判定
         if($objCustomer->isLoginSuccess(true)) {
-            SC_Response_Ex::sendRedirect(DIR_INDEX_URL);
+            SC_Response_Ex::sendRedirect(DIR_INDEX_PATH);
             exit;
         } else {

branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_LoginCheck.php

@@ -143 +143 @@
                 }
                 
-                SC_Response_Ex::sendRedirect(DIR_INDEX_URL);
+                SC_Response_Ex::sendRedirect(DIR_INDEX_PATH);
                 exit;
             }