Changeset 19908
- Timestamp:
- 2011/01/13 16:23:02 (13 years ago)
- Location:
- branches/version-2_5-dev/data/class
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_5-dev/data/class/SC_Display.php
r19832 r19908 73 73 $this->assignobj($page); 74 74 $this->response->setResposeBody($this->view->getResponse($page->getTemplate())); 75 }76 77 /**78 * リダイレクトを行う.79 *80 * SC_Response::sendRedirect() のラッパーです.81 */82 function redirect($location){83 $this->response->sendRedirect($location, array(), true);84 75 } 85 76 -
branches/version-2_5-dev/data/class/SC_Response.php
r19834 r19908 132 132 133 133 /** 134 * @param string $location 「url-path」「現在のURLからのパス」「URL」のいずれか 134 * アプリケーション内でリダイレクトする 135 * 136 * @param string $location 「url-path」「現在のURLからのパス」「URL」のいずれか。「../」の解釈は行なわない。 135 137 * @return void 136 138 * @static … … 171 173 } 172 174 173 // アプリケーション内での遷移時の処理174 175 $pattern = '/^(' . preg_quote(HTTP_URL, '/') . '|' . preg_quote(HTTPS_URL, '/') . ')/'; 175 if (preg_match($pattern, $url)) { 176 $netUrl = new Net_URL($url); 177 $arrQueryString = array_merge($netUrl->querystring, $arrQueryString); 178 $netUrl->querystring = array(); 179 180 if ($inheritQueryString) { 181 if (!empty($_SERVER['QUERY_STRING'])) { 182 $netUrl->addRawQueryString($_SERVER['QUERY_STRING']); 183 } 176 177 // アプリケーション外へのリダイレクトは扱わない 178 if (preg_match($pattern, $url) === 0) { 179 SC_Utils_Ex::sfDispException(); 180 } 181 182 $netUrl = new Net_URL($url); 183 $arrQueryString = array_merge($netUrl->querystring, $arrQueryString); 184 $netUrl->querystring = array(); 185 186 if ($inheritQueryString) { 187 if (!empty($_SERVER['QUERY_STRING'])) { 188 $netUrl->addRawQueryString($_SERVER['QUERY_STRING']); 184 189 } 185 186 foreach ($arrQueryString as $key => $val) { 187 $netUrl->addQueryString($key, $val);188 }189 190 $url = $netUrl->getURL(); 191 192 $session = SC_SessionFactory::getInstance(); 193 if (SC_MobileUserAgent::isMobile() || $session->useCookie() == false) {194 $netUrl->addQueryString(session_name(), session_id());195 }196 197 $netUrl->addQueryString(TRANSACTION_ID_NAME, SC_Helper_Session_Ex::getToken()); 198 $url = $netUrl->getURL();199 }190 } 191 192 foreach ($arrQueryString as $key => $val) { 193 $netUrl->addQueryString($key, $val); 194 } 195 196 $url = $netUrl->getURL(); 197 198 $session = SC_SessionFactory::getInstance(); 199 if (SC_MobileUserAgent::isMobile() || $session->useCookie() == false) { 200 $netUrl->addQueryString(session_name(), session_id()); 201 } 202 203 $netUrl->addQueryString(TRANSACTION_ID_NAME, SC_Helper_Session_Ex::getToken()); 204 $url = $netUrl->getURL(); 200 205 201 206 header("Location: $url"); … … 206 211 * HTML_PATH からのパスを指定してリダイレクトする 207 212 * 208 * @param string $location /html/ からの相対パス 213 * @param string $location /html/ からの相対パス。先頭に / を含むかは任意。「../」の解釈は行なわない。 209 214 * @return void 210 215 * @static 211 216 */ 212 217 function sendRedirectFromUrlPath($location, $arrQueryString = array(), $inheritQueryString = false, $useSsl = null) { 213 $location = URL_PATH . $location;218 $location = URL_PATH . ltrim($location, '/'); 214 219 SC_Response_Ex::sendRedirect($location, $arrQueryString, $inheritQueryString, $useSsl); 215 220 } -
branches/version-2_5-dev/data/class/pages/LC_Page.php
r19817 r19908 196 196 */ 197 197 function sendRedirect($url, $isMobile = false) { 198 echo "SC_Response.php::sendRedirect()に移行してね。";198 echo 'SC_Response_Ex::sendRedirect()に移行してね。'; 199 199 exit; 200 200 … … 383 383 */ 384 384 function reload($queryString = array(), $removeQueryString = false) { 385 echo "SC_Display.php::reload()に移行してね。";385 echo 'SC_Response_Ex::reload()に移行してね。'; 386 386 exit; 387 387 -
branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Logout.php
r19834 r19908 55 55 $objSess->logout(); 56 56 57 SC_Response_Ex::sendRedirectFromUrlPath( '/' .ADMIN_DIR . DIR_INDEX_URL);57 SC_Response_Ex::sendRedirectFromUrlPath(ADMIN_DIR . DIR_INDEX_URL); 58 58 } 59 59 -
branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileView.php
r19805 r19908 91 91 print($objFileManager->sfReadFile(USER_REALDIR . $_GET['file'])); 92 92 } else { 93 $this->objDisplay->redirect(USER_URL . $_GET['file']);93 SC_Response_Ex::sendRedirect(USER_URL . $_GET['file']); 94 94 exit; 95 95 } -
branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Delete.php
r19833 r19908 90 90 $url = $this->getLocation(ADMIN_SYSTEM_URL_PATH) 91 91 . '?pageno=' . $this->objForm->getValue('pageno'); 92 $this->objDisplay->redirect($url);92 SC_Response_Ex::sendRedirect($url); 93 93 } 94 94 -
branches/version-2_5-dev/data/class/pages/cart/LC_Page_Cart.php
r19845 r19908 121 121 $objCartSess->saveCurrentCart($uniqid, $cartKey); 122 122 // 購入ページへ 123 $this->objDisplay->redirect(SHOPPING_URL);123 SC_Response_Ex::sendRedirect(SHOPPING_URL); 124 124 exit; 125 125 } -
branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage.php
r19881 r19908 176 176 if (!$objMobile->gfIsMobileMailAddress($objCustomer->getValue('email'))) { 177 177 if (!$objCustomer->hasValue('email_mobile')) { 178 $this->objDisplay->redirect($this->getLocation("../entry/email_mobile.php"));178 SC_Response_Ex::sendRedirectFromUrlPath('entry/email_mobile.php'); 179 179 exit; 180 180 } -
branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php
r19807 r19908 214 214 if (!$objMobile->gfIsMobileMailAddress($objCustomer->getValue('email'))) { 215 215 if (!$objCustomer->hasValue('email_mobile')) { 216 $this->objDisplay->redirect($this->getLocation("../entry/email_mobile.php"));216 SC_Response_Ex::sendRedirectFromUrlPath('entry/email_mobile.php'); 217 217 } 218 218 } -
branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php
r19907 r19908 153 153 SC_Response_Ex::sendRedirect(CART_URL_PATH); 154 154 } else { 155 $this->objDisplay->redirect(SHOPPING_URL);155 SC_Response_Ex::sendRedirect(SHOPPING_URL); 156 156 } 157 157 exit;
Note: See TracChangeset
for help on using the changeset viewer.