Merge branch 'release_yh' into 'master'

test

See merge request !18

new_admincp/applications/zsb/config/constants.php

@@ -140,8 +140,8 @@ if(GB_CITY == 'nj')
 }
 else
 {
-    $base_url = isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off' ? 'https' : 'http';
-    $base_url .= '://'. $_SERVER['HTTP_HOST'];
+    $base_url = $http = ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') || (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https')) ? 'https://' :'http://';
+    $base_url .= $_SERVER['HTTP_HOST'];
     $base_url .= str_replace(basename($_SERVER['SCRIPT_NAME']), '', $_SERVER['SCRIPT_NAME']);
     //define('STATIC_SOURCE_URL', 'http://esf.fz.house365.com');
     if(isset($_GET['test'])){
@@ -150,7 +150,7 @@ else
         print_r($_SERVER);
         exit;
     }
-    define('STATIC_SOURCE_URL', 'http://'.$_SERVER['HTTP_HOST'].'/source');
+    define('STATIC_SOURCE_URL', $http.$_SERVER['HTTP_HOST'].'/source');
     define('GB_WO_HELP', "http://zsb.house365.com/help/");
 }