update

shonenada · Sep 9, 2014 · 2b10cac · 2b10cac
1 parent dc84863
commit 2b10cac
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/szuias/Controller/Admin/SignIn.php b/szuias/Controller/Admin/SignIn.php
@@ -11,6 +11,12 @@ class SignIn extends \Controller\Base {
 
     static public function get () {
         $is_captcha = SettingModel::get('admin_signin', 'captcha');
+        $userid = self::$app->getEncryptedCookie('user_id');
+        $token = self::$app->getEncryptedCookie('token');
+        $user = User::find($userid);
+        if (isset($user) && $user->getToken() == $token) {
+            return self::redirect('/admin/content');
+        }
         return self::render("admin/signin.html", get_defined_vars());
     }
 

diff --git a/szuias/Model/User.php b/szuias/Model/User.php
@@ -149,6 +149,10 @@ public function setToken ($token) {
         $this->token = $token;
     }
 
+    public function getToken() {
+        return $this->token;
+    }
+
     public function isActivity() {
         return ($this->is_deleted == 0);
     }

diff --git a/szuias/templates/base.html b/szuias/templates/base.html
@@ -82,9 +82,7 @@
       <ul>
         <li><a href="{{ siteUrl('article/494') }}">{{ trans('About us') }}</a></li>
         <li><a href="{{ siteUrl('article/501') }}">{{ trans('Contact us') }}</a></li>
-        {% if loggedUser.hasPermission('/admin', 'GET') %}
         <li><a href="{{ siteUrl('admin') }}">{{ trans('Admin Login') }}</a></li>
-        {% endif %}
       </ul>
     </div>
 

diff --git a/szuias/translations/zh/message.php b/szuias/translations/zh/message.php
@@ -23,6 +23,7 @@
     'Counts' => '浏览数',
     'Edit' => '编辑',
     'More' => '更多',
+    'Admin Login' => '管理员登陆',
     'SZU Career Development Center' => '深圳大学就业指导中心',
     'Institute for Advanced Study, Shenzhen University, Nanshan District Shenzhen, Guangdong, China 518060' => '深圳市南山区南海大道 3688 号办公楼 313 深圳大学高等研究院院长办公室 518060',
 );