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

Timestamp:

2013/05/02 18:11:36 (11 years ago)

Author:

h_yoshimoto

Message:

#2236 2.12.3リリース以降の2.12-devへのコミット差し戻し

File:

• branches/version-2_12-dev/data/class/api/SC_Api_Operation.php (modified) (12 diffs)

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

@@ -33 +33 @@
 
 
-class SC_Api_Operation 
-{
+class SC_Api_Operation {
 
     /** API_DEBUG_MODE */
@@ -59 +58 @@
      * @return boolean ログイン情報が有効な場合 true
      */
-    protected function checkMemberAccount($member_id, $member_password)
-    {
+    protected function checkMemberAccount($member_id, $member_password) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         //パスワード、saltの取得
@@ -84 +82 @@
      * @return boolean ログインに成功した場合 true; 失敗した場合 false
      */
-    protected function checkCustomerAccount($login_email, $login_password)
-    {
+    protected function checkCustomerAccount($login_email, $login_password) {
         $objCustomer = new SC_Customer_Ex();
         if ($objCustomer->getCustomerDataFromEmailPass($login_password, $login_email)) {
@@ -99 +96 @@
      * @return boolean チェックに成功した場合 true; 失敗した場合 false
      */
-    protected function checkReferer()
-    {
+    protected function checkReferer() {
         $ret = false;
         if (!SC_Utils_Ex::isBlank($_SERVER['HTTP_REFERER'])) {
@@ -121 +117 @@
      * @return boolean 署名認証に成功した場合 true; 失敗した場合 false
      */
-    protected function checkApiSignature($operation_name, $arrParam, $arrApiConfig)
-    {
+    protected function checkApiSignature($operation_name, $arrParam, $arrApiConfig) {
         if (SC_Utils_Ex::isBlank($arrParam['Signature'])) {
             return false;
@@ -176 +171 @@
      * @return boolean チェックに成功した場合 true; 失敗した場合 false
      */
-    protected function checkIp($operation_name)
-    {
+    protected function checkIp($operation_name) {
         $ret = false;
         $allow_hosts = SC_Api_Utils_Ex::getOperationSubConfig($operation_name, 'allow_hosts');
@@ -195 +189 @@
      * @return string 秘密鍵文字列
      */
-    protected function getApiSecretKey($access_key)
-    {
+    protected function getApiSecretKey($access_key) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $secret_key = $objQuery->get('api_secret_key', 'dtb_api_account', 'api_access_key = ? and enable = 1 and del_flg = 0', array($access_key));
@@ -209 +202 @@
      * @return boolean 権限がある場合 true; 無い場合 false
      */
-    protected function checkOperationAuth($operation_name, &$arrParam, &$arrApiConfig)
-    {
+    protected function checkOperationAuth($operation_name, &$arrParam, &$arrApiConfig) {
         if (SC_Utils_Ex::isBlank($operation_name)) {
             return false;
@@ -273 +265 @@
      * @return void
      */
-    protected function setApiBaseParam(&$objFormParam)
-    {
+    protected function setApiBaseParam(&$objFormParam) {
         $objFormParam->addParam('Operation', 'Operation', STEXT_LEN, 'an', array('EXIST_CHECK', 'GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('Service', 'Service', STEXT_LEN, 'an', array('EXIST_CHECK', 'GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
@@ -288 +279 @@
      * @return array(string レスポンス名, array レスポンス配列)
      */
-    public function doApiAction($arrPost)
-    {
+    public function doApiAction($arrPost) {
         // 実行時間計測用
         $start_time = microtime(true);
@@ -384 +374 @@
      * @return array エコー情報配列 (XML用の _attributes 指定入り）
      */
-    protected function getOperationRequestEcho($arrParam, $start_time)
-    {
+    protected function getOperationRequestEcho($arrParam, $start_time) {
         $arrRet = array(
                 'HTTPHeaders' => array('Header' => array('_attributes' => array('Name' => 'UserAgent',
@@ -400 +389 @@
 
     // TODO: ここらへんは SC_Displayに持って行きたい所だが・・
-    public function sendApiResponse($type, $response_outer_name, &$arrResponse)
-    {
+    public function sendApiResponse($type, $response_outer_name, &$arrResponse) {
         switch ($type) {
             case 'xml':