Changeset 23141 for branches/version-2_13-dev/data/class/pages

Timestamp:

2013/08/28 13:26:44 (11 years ago)

Author:

m_uehara

Message:

#2275
影響が大きいため、2.13.0では対応を行わない r23125 r23128 r23133 を差し戻します。

Location:

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

Files:

• admin/basis/LC_Page_Admin_Basis_ZipInstall.php (modified) (2 diffs)
• frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php (modified) (1 diff)
• upgrade/LC_Page_Upgrade_Base.php (modified) (2 diffs)
• upgrade/LC_Page_Upgrade_Download.php (modified) (4 diffs)
• upgrade/LC_Page_Upgrade_ProductsList.php (modified) (3 diffs)

branches/version-2_13-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php

@@ -354 +354 @@
         // Proxy経由を可能とする。
         // TODO Proxyの設定は「data/module/HTTP/Request.php」内の「function HTTP_Request」へ記述する。いずれは、外部設定としたい。
-        $req = new HTTP_Request2();
+        $req = new HTTP_Request();
 
         $req->setURL(ZIP_DOWNLOAD_URL);
 
         // 郵便番号CSVをdownloadする。
-        $res = $req->send();
+        $res = $req->sendRequest();
         if (!$res || strlen($res) > 1) {
             trigger_error(ZIP_DOWNLOAD_URL . ' の取得に失敗しました。', E_USER_ERROR);
@@ -369 +369 @@
             trigger_error($this->zip_csv_temp_realfile . ' を開けません。', E_USER_ERROR);
         }
-        $res = fwrite($fp, $res->getBody());
+        $res = fwrite($fp, $req->getResponseBody());
         if (!$res) {
             trigger_error($this->zip_csv_temp_realfile . ' への書き込みに失敗しました。', E_USER_ERROR);

branches/version-2_13-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php

@@ -22 +22 @@
  */
 
+define('CALENDAR_ROOT', DATA_REALDIR.'module/Calendar'.DIRECTORY_SEPARATOR);
 require_once CLASS_EX_REALDIR . 'page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Ex.php';
 

branches/version-2_13-dev/data/class/pages/upgrade/LC_Page_Upgrade_Base.php

@@ -71 +71 @@
     public function request($mode, $arrParams = array(), $arrCookies = array())
     {
-        $objReq = new HTTP_Request2();
+        $objReq = new HTTP_Request();
         $objReq->setUrl(OSTORE_URL . 'upgrade/index.php');
         $objReq->setMethod('POST');
-        $objReq->addPostParameter('mode', $mode);
+        $objReq->addPostData('mode', $mode);
         foreach ($arrParams as $key => $val) {
-            $objReq->addPostParameter($key, $val);
+            $objReq->addPostData($key, $val);
         }
 
@@ -83 +83 @@
         }
 
-        $e = $objReq->send();
+        $e = $objReq->sendRequest();
         if (PEAR::isError($e)) {
             return $e;

branches/version-2_13-dev/data/class/pages/upgrade/LC_Page_Upgrade_Download.php

@@ -130 +130 @@
 
         $objReq = $this->request($mode, $arrPostData);
-        $response = $objReq->send();
 
         // リクエストチェック
@@ -144 +143 @@
         // レスポンスチェック
         $objLog->log('* http response check start');
-        if ($response->getStatus() !== 200) {
+        if ($objReq->getResponseCode() !== 200) {
             $objJson->setError(OSTORE_E_C_HTTP_RESP);
             $objJson->display();
@@ -152 +151 @@
         }
 
-        $body = $response->getBody();
+        $body = $objReq->getResponseBody();
         $objRet = $objJson->decode($body);
 
@@ -231 +230 @@
             // 配信サーバーへ通知
             $objLog->log('* notify to lockon server start');
-            $objReq = $this->notifyDownload($mode, $response->getCookies());
+            $objReq = $this->notifyDownload($mode, $objReq->getResponseCookies());
 
             $objLog->log('* dl commit result:' . serialize($objReq));

branches/version-2_13-dev/data/class/pages/upgrade/LC_Page_Upgrade_ProductsList.php

@@ -87 +87 @@
         );
         $objReq = $this->request('products_list', $arrPostData);
-        $response = $objReq->send();
 
         // リクエストチェック
@@ -101 +100 @@
         // レスポンスチェック
         $objLog->log('* http response check start');
-
-        if ( $response->getStatus() !== 200) {
+        if ($objReq->getResponseCode() !== 200) {
             $objJson->setError(OSTORE_E_C_HTTP_RESP);
             $objJson->display();
@@ -110 +108 @@
         }
 
-        $body = $response->getBody();
+        $body = $objReq->getResponseBody();
         $objRet = $objJson->decode($body);