fix avatar no support https

helper/model/member_info.php

@@ -93,6 +93,7 @@ class member_info
     public function is_man() {
         return (intval($this->member_info['member_sex']) == 1);
     }
+
     public function avatar()
     {
         if(is_null($this->member_info['member_avatar']) || empty($this->member_info['member_avatar']))
@@ -107,7 +108,7 @@ class member_info
         else
         {
             $path = $this->member_info['member_avatar'];
-            if(strncasecmp($path,"http://",strlen("http://")) == 0) {
+            if($this->ishttp($path)) {
                 $url = $path;
             } else {
                 $url = UPLOAD_SITE_URL . "/shop/avatar{$path}";

helper/room/room_info.php

@@ -8,6 +8,8 @@
 
 namespace room;
 
+use util;
+
 class room_info
 {
     private $mParams;
@@ -24,13 +26,15 @@ class room_info
     public function avatar()
     {
         $avatar = $this->mParams['avatar'];
-        if(!empty($avatar)) {
-            if(strpos($avatar,'http') === false){
-                return BASE_SITE_URL . $avatar;
-            } else {
+        if(!empty($avatar))
+        {
+            if(util::ishttp($avatar)) {
                 return $avatar;
+            } else {
+                return BASE_SITE_URL . $avatar;
             }
-        } else {
+        }
+        else {
             return $this->tmp_avatar();
         }
     }

helper/room_helper.php

@@ -7,6 +7,7 @@
  */
 
 require_once(BASE_ROOT_PATH . '/helper/search/tcp_client.php');
+require_once(BASE_ROOT_PATH . '/helper/util_helper.php');
 require_once(BASE_ROOT_PATH . '/helper/room/access_client.php');
 require_once(BASE_ROOT_PATH . '/helper/room/proto_type.php');
 require_once(BASE_ROOT_PATH . '/helper/room/room_info.php');

helper/session_helper.php

@@ -12,6 +12,7 @@ require_once (BASE_ROOT_PATH . '/helper/account_helper.php');
 require_once (BASE_ROOT_PATH . '/helper/push_helper.php');
 require_once (BASE_ROOT_PATH . '/helper/login_helper.php');
 require_once (BASE_ROOT_PATH . '/helper/bonus_helper.php');
+require_once (BASE_ROOT_PATH . '/helper/util_helper.php');
 require_once (BASE_ROOT_PATH . '/helper/url_helper.php');
 
 class session_helper
@@ -138,7 +139,7 @@ class session_helper
             return RESOURCE_SITE_URL . '/mobile/defimg/' . $img;
         } else {
             $path = $_SESSION['member_avatar'];
-            if (strncasecmp($path, "http://", strlen("http://")) == 0) {
+            if (util::ishttp($path)) {
                 $url = $path;
             } else {
                 $url = UPLOAD_SITE_URL . "/shop/avatar{$path}";

helper/util_helper.php

@@ -19,8 +19,9 @@ class util
         if (is_null($path) || empty($path)) {
             $img = 'female.png';
             return RESOURCE_SITE_URL . '/mobile/defimg/' . $img;
-        } else {
-            if (strncasecmp($path, "http://", strlen("http://")) == 0) {
+        }
+        else {
+            if (self::ishttp($path)) {
                 $url = $path;
             } else {
                 $url = UPLOAD_SITE_URL . "/shop/avatar{$path}";
@@ -29,6 +30,15 @@ class util
         }
     }
 
+    public static function ishttp($path)
+    {
+        if(strncasecmp($path,"http://",strlen("http://")) == 0 || strncasecmp($path,"https://",strlen("https://")) == 0) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
     public static function goods_thumb_image($path, $store_id)
     {
         return cthumb($path, 480, $store_id);

mobile/control/festval.php

@@ -8,6 +8,7 @@
 defined( 'InShopNC' ) or exit( 'Access Invalid!' );
 
 require_once(BASE_ROOT_PATH . '/helper/session_helper.php');
+require_once(BASE_ROOT_PATH . '/helper/util_helper.php');
 require_once(BASE_ROOT_PATH . '/helper/fcode/operator.php');
 
 use bonus\account;
@@ -240,7 +241,7 @@ class festvalControl extends mobileControl
 
     private function img_url($path)
     {
-        if(strncasecmp($path,"http://",strlen("http://")) == 0) {
+        if(util::ishttp($path)) {
             $url = $path;
         } else {
             $url = UPLOAD_SITE_URL . $path;

mobile/control/member_info.php

@@ -47,7 +47,7 @@ class member_infoControl extends mbMemberControl
                     }
                     else
                     {
-                        if(strncasecmp($path,"http://",strlen("http://")) == 0) {
+                        if(util::ishttp($path)) {
                             $ret['member_avatar'] = $path;
                         } else {
                             $url = UPLOAD_SITE_URL . "/shop/avatar{$path}";

room_factory.php

@@ -9,19 +9,11 @@
 define('BASE_ROOT_PATH',str_replace('\\','/',dirname(__FILE__)));
 
 require_once(BASE_ROOT_PATH . '/fooder.php');
-require_once (BASE_ROOT_PATH . '/helper/event_looper.php');
+require_once(BASE_ROOT_PATH . '/helper/event_looper.php');
 
-require_once(BASE_ROOT_PATH . '/helper/room/factory_processor.php');
-require_once(BASE_ROOT_PATH . '/helper/room/proto_type.php');
-require_once(BASE_ROOT_PATH . '/helper/room/room_info.php');
-require_once(BASE_ROOT_PATH . '/helper/room/msg_builder.php');
-require_once(BASE_ROOT_PATH . '/helper/room/base_room.php');
-require_once(BASE_ROOT_PATH . '/helper/room/chatwo.php');
-require_once(BASE_ROOT_PATH . '/helper/room/chat_room.php');
-require_once(BASE_ROOT_PATH . '/helper/room/bargain_room.php');
-require_once(BASE_ROOT_PATH . '/helper/room/shake_room.php');
+require_once(BASE_ROOT_PATH . '/helper/room_helper.php');
 require_once(BASE_ROOT_PATH . '/helper/room/factory.php');
-require_once(BASE_ROOT_PATH . '/helper/room/room_client.php');
+require_once(BASE_ROOT_PATH . '/helper/room/factory_processor.php');
 
 function factwork($sockfd)
 {