add to local

admin/control/store.php

@@ -979,7 +979,7 @@ class storeControl extends SystemControl{
 		Tpl::showpage('store_import');    
     }
 
-    public function store_import_csvOp()
+    public function store_import_csv_xOp()
     {
         if (isset($_POST['import']))
         {
@@ -1041,7 +1041,8 @@ class storeControl extends SystemControl{
                 //批量导入数据的所在省份／城市校验
                 $province_id = 0;
                 $split_area_info = explode(" ", $store_area);
-                if(isset($split_area_info[0])) {
+                if(isset($split_area_info[0]))
+                {
                     $province_name = $split_area_info[0];
                     if(isset($split_area_info[1])) {
                         $city_name = $split_area_info[1];
@@ -1141,7 +1142,7 @@ class storeControl extends SystemControl{
         }
     }
     
-    public function store_import_csvOp_old()
+    public function store_import_csvOp()
     {
     	if (isset($_POST['import'])) {
     		$file = $_FILES['csv_stores'];

core/framework/function/http.php

@@ -39,18 +39,18 @@ function http_request($url, $params = array(), $method = 'GET', $multi = false,
                     curl_setopt($ci, CURLOPT_POSTFIELDS, $params);
                     $headers[] = 'Expect: ';
                 } 
-                else 
-                {
+                else {
                     curl_setopt($ci, CURLOPT_POSTFIELDS, http_build_query($params));
                 }
             }
             break;
         case 'DELETE':
         case 'GET':
-            $method == 'DELETE' && curl_setopt($ci, CURLOPT_CUSTOMREQUEST, 'DELETE');
+            if($method == 'DELETE') {
+                curl_setopt($ci, CURLOPT_CUSTOMREQUEST, 'DELETE');
+            }
             if (!empty($params)) {
-                $url = $url . (strpos($url, '?') ? '&' : '?')
-                        . (is_array($params) ? http_build_query($params) : $params);
+                $url = $url . (strpos($url, '?') ? '&' : '?') . (is_array($params) ? http_build_query($params) : $params);
             }
             break;
     }
@@ -62,6 +62,7 @@ function http_request($url, $params = array(), $method = 'GET', $multi = false,
 
     $response = curl_exec($ci);
     curl_close($ci);
+
     return $response;
 }