fix unlogin state cart fcode

centra_srv.php

@@ -6,13 +6,13 @@ require_once (BASE_ROOT_PATH . '/fooder.php');
 require_once (BASE_ROOT_PATH . '/helper/search/server.php');
 require_once (BASE_ROOT_PATH . '/helper/search/processor.php');
 require_once (BASE_ROOT_PATH . '/helper/search/event_handler.php');
-require_once(BASE_ROOT_PATH . '/helper/search/util.php');
-require_once(BASE_ROOT_PATH . '/helper/category_helper.php');
-require_once(BASE_ROOT_PATH . '/helper/brand_helper.php');
-require_once(BASE_ROOT_PATH . '/helper/search/searcher.php');
-require_once(BASE_ROOT_PATH . '/helper/search/area_library.php');
-require_once(BASE_ROOT_PATH . '/helper/brand_helper.php');
-require_once(BASE_ROOT_PATH . '/helper/algorithm.php');
+require_once (BASE_ROOT_PATH . '/helper/search/util.php');
+require_once (BASE_ROOT_PATH . '/helper/category_helper.php');
+require_once (BASE_ROOT_PATH . '/helper/brand_helper.php');
+require_once (BASE_ROOT_PATH . '/helper/search/searcher.php');
+require_once (BASE_ROOT_PATH . '/helper/search/area_library.php');
+require_once (BASE_ROOT_PATH . '/helper/brand_helper.php');
+require_once (BASE_ROOT_PATH . '/helper/algorithm.php');
 require_once (BASE_ROOT_PATH . '/helper/message/msgutil.php');
 require_once (BASE_ROOT_PATH . '/helper/message/subscriber.php');
 

data/resource/sensitive_word/composer.json

@@ -1,12 +0,0 @@
-{
-  "name": "vendor_name/package_name",
-  "description": "description_text",
-  "minimum-stability": "stable",
-  "license": "proprietary",
-  "authors": [
-    {
-      "name": "author's name",
-      "email": "email@example.com"
-    }
-  ]
-}

helper/fcode/send_manager.php

@@ -46,7 +46,7 @@ class send_manager
         $this->mGoodsBlock  = [];
 
         global $config;
-        $fcodes_id = $config['autosend_fcodes']['fcodes_specialid'];
+        $fcodes_id = $config['autosend_fcodes']['fcodes_spid'];
         $blocks = special_manager::instance()->special($fcodes_id,$goods_ids);
 
         foreach ($blocks as $block)
@@ -73,7 +73,7 @@ class send_manager
     private function add($amount,$item,$block)
     {
         global $config;
-        $add_gids = $config['autosend_fcodes']['additional_goodsids'];
+        $add_gids = $config['autosend_fcodes']['additional_gids'];
 
         $goods_id = intval($item['data']);
         if($goods_id <= 0) return;

mobile/control/cart.php

@@ -62,7 +62,7 @@ class cartControl extends mobileControl
         $this->mUserFcode = null;
 
         global $config;
-        $this->mFcodeBannerID = $config['autosend_fcodes']['cart_page_specialid'];
+        $this->mFcodeBannerID = $config['autosend_fcodes']['cart_spid'];
     }
 
     public function rate_moneyOp()
@@ -177,6 +177,18 @@ class cartControl extends mobileControl
     public function exgoodsOp()
     {
         $mod_fcode = Model('goods_fcode');
+        $mobile = session_helper::cur_mobile();
+        if(empty($mobile))
+        {
+            return self::outsuccess(array('special_list' => null,
+                'fcodes' => null,
+                'summary'  => null,
+                'groupbuy' => null,
+                'limitime' => null,
+                'bundling' => null,
+                'mobile_page' => mobile_page(0)));
+        }
+
         $items = $mod_fcode->getFcodeList(array('mobile' => session_helper::cur_mobile(),
             'usable_time' => array('gt',time()),
             'fc_state' => 0),

mobile/control/member_buy.php

@@ -27,7 +27,7 @@ class member_buyControl extends mbMemberControl
         parent::__construct();
 
         global $config;
-        $this->mFcodeBannerID = $config['autosend_fcodes']['pay_page_specialid'];
+        $this->mFcodeBannerID = $config['autosend_fcodes']['payconfirm_spid'];
     }
 
     public function step_firstOp()

mobile/control/member_fcode.php

@@ -15,9 +15,13 @@ require_once (BASE_ROOT_PATH . '/helper/special_helper.php');
 
 class member_fcodeControl extends mbMemberControl
 {
+    private $mFcodeBannerID;
+
     public function __construct()
     {
         parent::__construct();
+        global $config;
+        $this->mFcodeBannerID = $config['autosend_fcodes']['myfcode_sid'];
     }
 
     public function listOp()
@@ -55,9 +59,9 @@ class member_fcodeControl extends mbMemberControl
         }
         else
         {
-            if($this->page_no() == 1 && is_publish())
+            if($this->page_no() == 1 && $this->mFcodeBannerID > 0)
             {
-                $blocks = special_manager::instance()->special(343,$unused_gids);
+                $blocks = special_manager::instance()->special($this->mFcodeBannerID,$unused_gids);
                 $items = $this->format($fcodes);
                 $blocks = array_merge($blocks,$items);
             }