Merge branch 'master' of github.com:hainatravel/information-system into master

application/config/config.php

@@ -35,6 +35,9 @@ switch ($_SERVER['SERVER_NAME']) {
     case 'origin-int.mycht.cn':
         $base_url = 'https://int.mycht.cn';
         break;
+    case 'gh-int.mycht.cn':
+        $base_url = 'https://gh-int.mycht.cn';
+        break;
     case 'origin-gh.mycht.cn':
         $base_url = 'https://gh.mycht.cn';
         break;

application/controllers/login.php

@@ -3,14 +3,17 @@
 if (!defined('BASEPATH'))
     exit('No direct script access allowed');
 
-class Login extends CI_Controller {
+class Login extends CI_Controller
+{
 
-    function __construct() {
+    function __construct()
+    {
         parent::__construct();
         $this->load->model('Operator_model');
     }
 
-    public function index() {
+    public function index()
+    {
         //添加找回用户密码功能
         $usercode = $this->input->get('....ht-user');
         if (!empty($usercode)) {
@@ -26,7 +29,8 @@ class Login extends CI_Controller {
     }
 
     //退出登录，清空session
-    public function out() {
+    public function out()
+    {
         $this->session->unset_userdata('session_admin');
         $this->session->unset_userdata('session_site');
         $this->session->unset_userdata('session_color');
@@ -41,14 +45,16 @@ class Login extends CI_Controller {
     }
 
     //当用户无权限时提醒页面
-    public function refuse() {
+    public function refuse()
+    {
         $this->load->view('bootstrap/header');
         $this->load->view('bootstrap/accessmanage/refuse');
         $this->load->view('bootstrap/footer');
     }
 
     //站点切换
-    public function change_site($site_code) {
+    public function change_site($site_code)
+    {
         //来源页面，成功切换站点之后转到原始页面去 ,如果在各编辑界面切换则会导致站点错误，比如ch的文章id=100，切换到gm下就没有id=100，只能切换的某个板块
         // $referer = empty($_SERVER['HTTP_REFERER']) ? false : $_SERVER['HTTP_REFERER'];
 
@@ -73,7 +79,8 @@ class Login extends CI_Controller {
     }
 
     //主题切换
-    public function change_color($color = false) {
+    public function change_color($color = false)
+    {
         if ($color) {
             $this->session->set_userdata('session_color', $color . '-');
         } else {
@@ -84,7 +91,8 @@ class Login extends CI_Controller {
     }
 
     //登录检测
-    public function check() {
+    public function check()
+    {
         //如果已经登陆则跳到管理首页
         if ($this->session->userdata('session_admin')) {
             $data[] = array('name' => 'go', 'value' => site_url());
@@ -122,7 +130,7 @@ class Login extends CI_Controller {
                     $site_item = $site_array[trim($user_site_array[0])];
                     $this->session->set_userdata('session_admin', $userdata);
                     $this->session->set_userdata('session_site', $site_item);
-                    $this->session->set_userdata('session_color', '');
+                    // $this->session->set_userdata('session_color', '');
                     $data[] = array('name' => 'go', 'value' => site_url());
 
                     echo json_encode($data);
@@ -150,5 +158,4 @@ class Login extends CI_Controller {
             }
         }
     }
-
 }