Authored by hf

do modify login call redirect

@@ -284,7 +284,7 @@ class AbstractAction extends Controller_Abstract @@ -284,7 +284,7 @@ class AbstractAction extends Controller_Abstract
284 protected function getUid($useSession = false) 284 protected function getUid($useSession = false)
285 { 285 {
286 // @todo 286 // @todo
287 - $useSession = false; 287 + // $useSession = false;
288 288
289 if (!$this->_uid) { 289 if (!$this->_uid) {
290 $cookie = $this->getCookie('_UID'); 290 $cookie = $this->getCookie('_UID');
@@ -607,7 +607,7 @@ class Helpers @@ -607,7 +607,7 @@ class Helpers
607 public static function syncUserSession($uid, $refer = '', $callback = 'call') 607 public static function syncUserSession($uid, $refer = '', $callback = 'call')
608 { 608 {
609 return 'http://mapi.yohobuy.com/Passport/session/index?callback=' . $callback 609 return 'http://mapi.yohobuy.com/Passport/session/index?callback=' . $callback
610 - . '&sign=' . md5($uid . 'Js8Yn0!EwPM45-ws') . '&uid=' . $uid . '&go=' . $refer; 610 + . '&sign=' . md5(md5($uid . 'Js8Yn0!EwPM45-ws')) . '&uid=' . $uid . '&go=' . $refer;
611 } 611 }
612 612
613 /** 613 /**
@@ -623,7 +623,7 @@ class Helpers @@ -623,7 +623,7 @@ class Helpers
623 public static function logoutSession($token, $refer = '', $callback = 'call') 623 public static function logoutSession($token, $refer = '', $callback = 'call')
624 { 624 {
625 return 'http://mapi.yohobuy.com/Passport/session/logout?callback=' . $callback 625 return 'http://mapi.yohobuy.com/Passport/session/logout?callback=' . $callback
626 - . '&sign=' . md5('Js8Yn0!EwPM45-ws') . '&token=' . $token . '&go=' . $refer; 626 + . '&sign=' . md5(md5('Js8Yn0!EwPM45-ws')) . '&token=' . $token . '&go=' . $refer;
627 } 627 }
628 628
629 } 629 }
@@ -213,7 +213,7 @@ class ListModel @@ -213,7 +213,7 @@ class ListModel
213 } 213 }
214 214
215 // 调用接口查询数据 215 // 调用接口查询数据
216 - $brandLogo = BrandData::getBrandLogoByDomain($domain); 216 + $brandLogo = BrandData::getBrandLogoByDomain($domain);
217 // 处理返回的数据 217 // 处理返回的数据
218 if (isset($brandLogo['data'])) { 218 if (isset($brandLogo['data'])) {
219 $result = array( 219 $result = array(
@@ -217,7 +217,7 @@ class IndexController extends AbstractAction @@ -217,7 +217,7 @@ class IndexController extends AbstractAction
217 217
218 // 右下角的购物车链接 218 // 右下角的购物车链接
219 $data['goodList']['cartUrl'] = Helpers::url('/cart/index/index', null); 219 $data['goodList']['cartUrl'] = Helpers::url('/cart/index/index', null);
220 - //$data['goodList'] += $condition; 220 + $data['goodList'] += $condition;
221 $data['pageFooter'] = true; 221 $data['pageFooter'] = true;
222 222
223 if ($title === '') { 223 if ($title === '') {