调整test分之代码冲突

webmain/model/loginModel.php

@@ -308,35 +308,23 @@ class loginClassModel extends Model
         $redis->close();
 
         $this->rock->clearcookie('mo_adminid,PHPSESSID,ukey');
-<<<<<<< HEAD
-        $this->rock->clearsession('adminid,adminname,adminuser,user,ukey');
-        $this->rock->clearcookie('user','/',ini_get('session.cookie_domain'));
-        $this->rock->clearallcookie();
-        $this->rock->clearallsession();
-
-=======
 
         $this->rock->clearsession('adminid,adminname,adminuser,user,ukey');
         $this->rock->clearcookie('user','/',ini_get('session.cookie_domain'));
-
         $this->rock->clearallcookie();
         $this->rock->clearallsession();
 
-
->>>>>>> master
         $this->update("`online`=0", "`token`='$token'");
 	}
 	
 	public function setsession($uid, $name,$token, $user='')
 	{
         $encryptKey = $this->getRandomStr();
-<<<<<<< HEAD
+
 
         $isadmin = (int)$this->rock->session('isadmin');
+
 	    $session = array(
-=======
-	    $session = array(
->>>>>>> master
             'adminid'	=> $uid,
             'adminname'	=> $name,
             'adminuser'	=> $user,
@@ -344,15 +332,9 @@ class loginClassModel extends Model
             'logintime'	=> time(),
             'ukey' => $encryptKey
         );
-<<<<<<< HEAD
         if($user == 'admin' || $isadmin) $session['is_admin'] = true;
-=======
-        if($user == 'admin') $session['is_admin'] = true;
->>>>>>> master
         else $session['is_admin'] = false;
-
         $this->rock->savesession($session);
-
         $this->rock->adminid	= $uid;
 		$this->rock->adminname	= $name;
 		$this->admintoken		= $token;