Changeset 21734 for branches/version-2_12-dev/data/class/api

Timestamp:

2012/04/11 02:58:27 (14 years ago)

Author:

Seasoft

Message:

#1613 (typo修正・ソース整形・ソースコメントの改善)

Location:

branches/version-2_12-dev/data/class/api

Files:

• SC_Api_Abstract.php (modified) (1 diff)
• SC_Api_Operation.php (modified) (12 diffs)
• SC_Api_Utils.php (modified) (4 diffs)

branches/version-2_12-dev/data/class/api/SC_Api_Abstract.php

@@ -106 +106 @@
         $this->objFormParam->convParam();
         $this->arrErr = $this->objFormParam->checkError(false);
-        $this->arrErr = array_merge( (array)$this->arrErr, (array)$this->checkErrorExtended($arrParam) );
+        $this->arrErr = array_merge((array)$this->arrErr, (array)$this->checkErrorExtended($arrParam));
         return $this->objFormParam->getHashArray();
     }

branches/version-2_12-dev/data/class/api/SC_Api_Operation.php

@@ -98 +98 @@
     protected function checkReferer() {
         $ret = false;
-        if(!SC_Utils_Ex::isBlank($_SERVER['HTTP_REFERER'])) {
+        if (!SC_Utils_Ex::isBlank($_SERVER['HTTP_REFERER'])) {
             $domain  = SC_Utils_Ex::sfIsHTTPS() ? HTTPS_URL : HTTP_URL;
             $pattern = sprintf('|^%s.*|', $domain);
@@ -144 +144 @@
         // Refer: https://images-na.ssl-images-amazon.com/images/G/09/associates/paapi/dg/index.html?Query_QueryAuth.html
         $check_str = '';
-        foreach($arrParam as $key => $val) {
+        foreach ($arrParam as $key => $val) {
             switch ($key) {
                 case 'Signature':
@@ -159 +159 @@
                      . $check_str;
         $signature = base64_encode(hash_hmac('sha256', $check_str, $secret_key, true));
-        if($signature === $arrParam['Signature']) {
+        if ($signature === $arrParam['Signature']) {
             return true;
         }
@@ -206 +206 @@
             return false;
         }
-        $arrAuthTypes = explode("|", $arrApiConfig['auth_types']);
+        $arrAuthTypes = explode('|', $arrApiConfig['auth_types']);
         $result = false;
         foreach ($arrAuthTypes as $auth_type) {
@@ -249 +249 @@
                     break;
             }
-            if($ret === true) {
+            if ($ret === true) {
                 $result = true;
-            }else{
+            } else {
                 $result = false;
                 break;  // 1つでもfalseがあれば，その時点で終了
@@ -277 +277 @@
      *
      * @param array $arrPost リクエストパラメーター
-     * @return array( string レスポンス名, array レスポンス配列 )
+     * @return array(string レスポンス名, array レスポンス配列)
      */
     public function doApiAction($arrPost) {
@@ -313 +313 @@
 
                     // オペレーション結果処理
-                    if($operation_result) {
+                    if ($operation_result) {
                         $arrOperationRequestValid = $objApiOperation->getRequestValidate();
                         $arrResponseBody =  $objApiOperation->getResponseArray();
                         $response_group_name = $objApiOperation->getResponseGroupName();
-                    }else{
+                    } else {
                         $arrErr = $objApiOperation->getErrorArray();
                     }
-                }else{
+                } else {
                     $arrErr['ECCUBE.Operation.NoLoad'] = 'オペレーションをロード出来ませんでした。';
                 }
-            }else{
+            } else {
                 $arrErr['ECCUBE.Authority.NoAuthority'] = 'オペレーションの実行権限がありません。';
             }
@@ -330 +330 @@
         if (count($arrErr) == 0) {
             // 実行成功
-            $arrResponseValidSection = array( 'Request' => array(
+            $arrResponseValidSection = array('Request' => array(
                                                             'IsValid' => 'True',
                                                             $operation_name . 'Request' => $arrOperationRequestValid
@@ -343 +343 @@
                 $arrResponseErrorSection[] = array('Code' => $error_code, 'Message' => $error_msg);
             }
-            $arrResponseValidSection = array( 'Request' => array(
+            $arrResponseValidSection = array('Request' => array(
                                                             'IsValid' => 'False',
                                                             'Errors' => array('Error' => $arrResponseErrorSection)
@@ -350 +350 @@
             if (is_object($objApiOperation)) {
                 $response_outer = $operation_name . 'Response';
-            }else{
+            } else {
                 $response_outer = 'ECCUBEApiCommonResponse';
             }
@@ -381 +381 @@
                 'Arguments' => array(),
                 );
-        foreach($arrParam as $key => $val) {
+        foreach ($arrParam as $key => $val) {
             $arrRet['Arguments'][] = array('_attributes' => array('Name' => htmlentities($key, ENT_NOQUOTES, 'UTF-8'), 'Value' => htmlentities($val, ENT_NOQUOTES, 'UTF-8')));
         }
@@ -390 +390 @@
     // TODO: ここらへんは SC_Displayに持って行きたい所だが・・
     public function sendApiResponse($type, $response_outer_name, &$arrResponse) {
-        switch($type) {
+        switch ($type) {
             case 'xml':
                 SC_Api_Utils_Ex::sendResponseXml($response_outer_name, $arrResponse);

branches/version-2_12-dev/data/class/api/SC_Api_Utils.php

@@ -29 +29 @@
  * @version $Id$
  */
-define('API_UPLOAD_REALDIR', DATA_REALDIR . "downloads/api/");
-define('API_CLASS_EX_REALDIR', CLASS_EX_REALDIR . "api_extends/operations/");
-define('API_CLASS_REALDIR', CLASS_REALDIR . "api/operations/");
+define('API_UPLOAD_REALDIR', DATA_REALDIR . 'downloads/api/');
+define('API_CLASS_EX_REALDIR', CLASS_EX_REALDIR . 'api_extends/operations/');
+define('API_CLASS_REALDIR', CLASS_REALDIR . 'api/operations/');
 
 class SC_Api_Utils {
@@ -159 +159 @@
         // Core API ディレクトリ
         if (is_dir(API_CLASS_EX_REALDIR)) {
-            if($dh = opendir(API_CLASS_EX_REALDIR)) {
+            if ($dh = opendir(API_CLASS_EX_REALDIR)) {
                 while (($file_name = readdir($dh)) !== false) {
                     if ($file_name != '.' && $file_name != '..' && substr($file_name, -4) == '.php') {
@@ -171 +171 @@
         // downaloads APIディレクトリ (for Plugin)
         if (is_dir(API_UPLOAD_REALDIR)) {
-            if($dh = opendir(API_UPLOAD_REALDIR)) {
+            if ($dh = opendir(API_UPLOAD_REALDIR)) {
                 while (($file_name = readdir($dh)) !== false) {
                     if ($file_name != '.' && $file_name != '..' && substr($file_name, -4) == '.php') {
@@ -206 +206 @@
             'encoding' => 'UTF-8',
             'rootName' => $response_outer_name,
-            'rootAttributes' => array( 'xmlns' => self::API_XMLNS . ECCUBE_VERSION,
+            'rootAttributes' => array('xmlns' => self::API_XMLNS . ECCUBE_VERSION,
                                         'xml:lang' => self::API_XML_LANG),
             'defaultTagName' => 'Response',