v0.9.1 版本更新

Signed-off-by: wixy <wixy@wixy.cn>
2022-03-07 16:55:32 +08:00 · 2022-03-07 16:55:32 +08:00 · 134da411c7
parent 7396f290b6
commit 134da411c7
6 changed files with 69 additions and 219 deletions
--- a/QuickAuthLogin/Action.php
+++ b/QuickAuthLogin/Action.php
@ -17,9 +17,7 @@ class QuickAuthLogin_Action extends Typecho_Widget
        if ($user->haslogin()) {
            // 获取当前用户名
            $name = $user->__get('name');
-
            $options = QuickAuthLogin_Plugin::getoptions();
-          
            $db   = Typecho_Db::get();
            $db->query($db->update('table.users')->rows(['qa_openid' => null, 'qa_nickname' => null, 'qa_avatar' => null])->where('name = ?', $name));
          
@ -33,13 +31,6 @@ class QuickAuthLogin_Action extends Typecho_Widget
        $res->throwJson($ret);
    }

-    /* 二维码授权绑定 */
-    public function authbind()
-    {
-        $path = QuickAuthLogin_Plugin::PLUGIN_PATH . 'views/authbind.php';
-        require_once $path;
-    }
-
    /* 微信Callback跳转登录逻辑 */
    public function wechatlogin()
    {
@ -72,12 +63,12 @@ class QuickAuthLogin_Action extends Typecho_Widget
                $user = $db->fetchRow($db->select()->from('table.users')->where( 'qa_openid' . ' = ?', $openId[1])->limit(1));
                if($user){
                    $this->widget('Widget_Notice')->set('此微信账号已被绑定！', 'error');
-                    $res->redirect(QuickAuthLogin_Plugin::tourl('QuickAuthLogin/auth-bind'));
+                    $res->redirect("/admin/extending.php?panel=QuickAuthLogin/views/authbind.php");
                }
                //更新基础信息
                $db->query($db->update('table.users')->rows(['qa_openid' => $openId[1], 'qa_nickname' => $nickName[1], 'qa_avatar' => $avatarUrl[1]])->where('name = ?', $name));
                $this->widget('Widget_Notice')->set(_t('用户 <strong>%s</strong> 成功绑定微信账号 <strong>%s</strong>', $name, $nickName[1]), 'success');
-                $res->redirect(QuickAuthLogin_Plugin::tourl('QuickAuthLogin/auth-bind'));
+                $res->redirect("/admin/extending.php?panel=QuickAuthLogin/views/authbind.php");
            }
            else{
                $ret['login']['msg']  = 'Fail';
--- a/QuickAuthLogin/Plugin.php
+++ b/QuickAuthLogin/Plugin.php
@ -4,7 +4,7 @@
 * 
 * @package QuickAuthLogin 
 * @author wixy
- * @version 0.9.0
+ * @version 0.9.1
 * @link https://blog.wixy.cn/archives/quickauthlogin.html
 */

@ -13,7 +13,6 @@ class QuickAuthLogin_Plugin implements Typecho_Plugin_Interface {
 	const PLUGIN_NAME  = 'QuickAuthLogin';
 	const PLUGIN_PATH  = __TYPECHO_ROOT_DIR__.__TYPECHO_PLUGIN_DIR__.'/QuickAuthLogin/';
 	
-	
 	/**
 	 * 启用插件方法,如果启用失败,直接抛出异常
 	 *
@ -24,20 +23,10 @@ class QuickAuthLogin_Plugin implements Typecho_Plugin_Interface {
 	 */
 	public static function activate(){
 		$info = self::updateDb();
-	
-		Typecho_Plugin::factory('admin/menu.php')-> navBar = array(__class__, 'render');
-		Typecho_Plugin::factory('Widget_User')-> loginSucceed = array(__class__,'afterlogin');
        Typecho_Plugin::factory('admin/footer.php')->end = array(__class__, 'render_footer');
-        
-        
        Helper::addPanel(1, 'QuickAuthLogin/views/authbind.php', '微信账号绑定', '微信账号绑定', 'subscriber');
-		
-		Helper::addRoute('bind',__TYPECHO_ADMIN_DIR__.'QuickAuthLogin/bind','QuickAuthLogin_Action','bind');
-		Helper::addRoute('login',__TYPECHO_ADMIN_DIR__.'QuickAuthLogin/login','QuickAuthLogin_Action','login');
 		Helper::addRoute('wechatlogin',__TYPECHO_ADMIN_DIR__.'QuickAuthLogin/wechatlogin','QuickAuthLogin_Action','wechatlogin');
 		Helper::addRoute('reset',__TYPECHO_ADMIN_DIR__.'QuickAuthLogin/reset','QuickAuthLogin_Action','reset');
-		Helper::addRoute('auth-bind',__TYPECHO_ADMIN_DIR__.'QuickAuthLogin/auth-bind','QuickAuthLogin_Action','authbind');
-	
 	}
 	
 	public static function updateDb()
@ -47,8 +36,7 @@ class QuickAuthLogin_Plugin implements Typecho_Plugin_Interface {
        if ("Pdo_Mysql" === $db->getAdapterName() || "Mysql" === $db->getAdapterName()) {
            $sql = "ALTER TABLE `{$prefix}users` ADD COLUMN `qa_openid` varchar(64);
            ALTER TABLE `{$prefix}users` ADD COLUMN `qa_nickname` varchar(64);
-            ALTER TABLE `{$prefix}users` ADD COLUMN `qa_avatar` varchar(255);
-            ";
+            ALTER TABLE `{$prefix}users` ADD COLUMN `qa_avatar` varchar(255);";
            $db->query($sql);
        } else {
            throw new Typecho_Plugin_Exception(_t('对不起, 本插件仅支持MySQL数据库。'));
@ -67,7 +55,6 @@ class QuickAuthLogin_Plugin implements Typecho_Plugin_Interface {
 	 */
 	public static function deactivate(){
 		$info = self::uninstallDb();
-	
 	}
 	
 	
@ -77,15 +64,11 @@ class QuickAuthLogin_Plugin implements Typecho_Plugin_Interface {
        $prefix = $db->getPrefix();
        $sql = "ALTER TABLE `{$prefix}users` DROP COLUMN `qa_openid`;
        ALTER TABLE `{$prefix}users` DROP COLUMN `qa_nickname`;
-        ALTER TABLE `{$prefix}users` DROP COLUMN `qa_avatar`;
-        ";
+        ALTER TABLE `{$prefix}users` DROP COLUMN `qa_avatar`;";
        $db->query($sql);
        
-        
        Helper::removePanel(1, 'QuickAuthLogin/views/authbind.php');
-    
-    
-        return "数据表删除字段成功！";
+        return "插件卸载成功！";
    }
 	
 	/**
@ -98,7 +81,6 @@ class QuickAuthLogin_Plugin implements Typecho_Plugin_Interface {
 	 */
 	public static function config(Typecho_Widget_Helper_Form $form){
 	    
-		
 		$user = Typecho_Widget::widget('Widget_User');
 		
 		//var_dump($user);
@ -108,18 +90,13 @@ class QuickAuthLogin_Plugin implements Typecho_Plugin_Interface {
 		$appkey = new Typecho_Widget_Helper_Form_Element_Text('qauth_app_key',null,'',_t('AppKey：'),_t('<b>QuickAuth后台创建应用时的AppKey <a target="_blank" href="https://qauth.cn/app">获取AppKey</a></b>'));
 		//var_dump($appkey);
 		$form->addInput($appkey);
+		
 		$encryptscrypt = new Typecho_Widget_Helper_Form_Element_Text('qauth_user_secret',null,'',_t('UserSecret：'),_t('<b>QuickAuth用户的数据加密密钥 <a target="_blank" href="https://qauth.cn/config/secret">获取UserSecret</a></b>'));
 		$form->addInput($encryptscrypt);
 		
-		$off = new Typecho_Widget_Helper_Form_Element_Radio('off',array('0'=>'开启','1'=>'关闭'),0,_t('账户密码登录：',''),'<b><font color=red>默认开启，如需关闭，请确保账号已经绑定微信，否则将无法正常登录后台；如果出现这种情况，请重装插件解决！</font></b>');
-		$form->addInput($off);
-		
 		$allowRegister = new Typecho_Widget_Helper_Form_Element_Radio('allow_register',array('0'=>'否','1'=>'是'),0,_t('允许未绑定微信账号扫码登录：',''),'<b><font color=red>开启后使用没有绑定账号的微信扫码后自动注册新账号登录！</font></b>');
 		$form->addInput($allowRegister);
 		
-		$users = new Typecho_Widget_Helper_Form_Element_Radio('users',array('0'=>'否','1'=>'是'),0,_t('非管理员启用：',''),'<b>启用后在导航栏增加微信账号绑定入口</b>');
-		$form->addInput($users);
-		
 		$username = $user->__get('name');
 		$openid = $user->__get('qa_openid');
 		$nickname = $user->__get('qa_nickname');
@ -132,7 +109,7 @@ class QuickAuthLogin_Plugin implements Typecho_Plugin_Interface {
 		<li><p class="description">在此页面中配置 AppKey和UserSecret</p></li>
 		</ol>
 		</li>
-		</ul><ul class="typecho-option"><li><label class="typecho-label">绑定情况：</label>当前登录用户：'.$username.'&nbsp;&nbsp; 微信账号：<u>'.(empty($openid)?'暂未绑定':$nickname).'</u></li><li><a href="'.QuickAuthLogin_Plugin::tourl('QuickAuthLogin/auth-bind').'"><button type="submit" class="btn primary">账号绑定</button></a></li></ul>';
+		</ul><ul class="typecho-option"><li><label class="typecho-label">绑定情况：</label>当前登录用户：'.$username.'&nbsp;&nbsp; 微信账号：<u>'.(empty($openid)?'暂未绑定':$nickname).'</u></li><li><a href="/admin/extending.php?panel=QuickAuthLogin/views/authbind.php"><button type="submit" class="btn primary">账号绑定</button></a></li></ul>';
 		
 	}
 	
@ -146,37 +123,6 @@ class QuickAuthLogin_Plugin implements Typecho_Plugin_Interface {
 	public static function personalConfig(Typecho_Widget_Helper_Form $form){
 	}
 	
-	public static function afterlogin($this_, $name, $password, $temporarily, $expire){
-		
-		$options = self::getoptions();
-		if($options->off === '1'){
-			echo 'what are you doing?';
-			// 登录之前没有合适的插入点，这里强制退出
-			$this_ -> logout();
-		}
-	}
-	
-	
-	public static function login($header){
-		
-		/** 获取链接信息 */
-		$baseurl = Typecho_Request::getInstance()->getBaseUrl();
-		
-		/** 判断是否登录 */
-		if($baseurl == __TYPECHO_ADMIN_DIR__.'login.php'){
-			
-			/** 清空输出缓存区 */
-			ob_clean();
-			
-			require_once self::PLUGIN_PATH.'views/login.php';
-			
-			ob_end_flush();
-			exit();
-		}else{
-			return $header;
-		}
-	}
-	
 	public static function render_footer(){
 		$options = self::getoptions();
        if (!Typecho_Widget::widget('Widget_User')->hasLogin()){
@ -203,13 +149,6 @@ class QuickAuthLogin_Plugin implements Typecho_Plugin_Interface {
        }
 	}
 	
-	public static function render(){
-		$options = self::getoptions();
-        if($options->users){
-            echo '<a href="'.QuickAuthLogin_Plugin::tourl('QuickAuthLogin/auth-bind').'" target="_blank">' . _t('微信账号绑定') . '</a>';
-        }
-	}
-	
 	/** 生成URL，解决部分博客未开启伪静态，仅对本插件有效 */
 	public static function tourl($action){
 		return Typecho_Common::url(__TYPECHO_ADMIN_DIR__.$action, Helper::options()->index);
--- a/QuickAuthLogin/README.md
+++ b/QuickAuthLogin/README.md
@ -2,13 +2,24 @@

 基于[QuickAuth](https://qauth.cn)扫码登录平台开发的Typecho微信扫码登录插件

+#### 更新记录
+
+##### 2022/03/07 v0.9.1
+
+1. 取消替换登录界面功能，改为在源登录界面注入微信登录按钮
+2. 删除多余配置功能，简化配置
+
 ## 起始

 本插件是基于 QuickAuth 开发的 插件，使用前需要进入[QuickAuth平台](https://qauth.cn)注册配置自己的应用

 如需修改插件或开发自己的接入项目，请参考 [QuickAuth接入文档](https://qauth.cn/doc/index.html)

-插件地址：[https://github.com/mr-wixy/QuickAuthLogin](https://github.com/mr-wixy/QuickAuthLogin)
+插件地址：
+
+Gitee: [https://gitee.com/wixy/QuickAuthLogin](https://gitee.com/wixy/QuickAuthLogin)
+
+Github: [https://github.com/mr-wixy/QuickAuthLogin](https://github.com/mr-wixy/QuickAuthLogin)

 (请勿与其它同类插件同时启用，以免互相影响)

@ -40,21 +51,21 @@

 第 8 步：进入博客插件后台配置AppKey和UserSecret；

-![](https://cdn.wixy.cn/blog-picture/20220127161859.png)
+![](https://cdn.wixy.cn/blog-picture/20220307165220.png)

 <br/>

 ## 重要说明

 1. QuickAuthApi 默认配置，正常情况下无需修改（除非QuickAuth网站接口地址改了）
-2. 账户密码登录默认开启，如需关闭，请确保账号已经绑定微信，否则将无法正常登录后台；如果出现这种情况，请重装插件解决！
-3. 允许未绑定微信账号扫码登录开启后，未绑定的微信扫码则会自动注册账号
-4. 非管理员启用选项开启后会在导航栏增加微信账号绑定入口
+2. 允许未绑定微信账号扫码登录开启后，未绑定的微信扫码则会自动注册账号

 ## 与我联系

 作者：wixy

-如果有任何意见或发现任何BUG请联系我
+如果有任何意见或发现任何BUG请提issue或直接联系我
+
+邮箱：[wixy@qq.com](mailto:wixy@qq.com)

 博客：[https://blog.wixy.cn/](https://blog.wixy.cn/)
--- a/QuickAuthLogin/views/authbind.php
+++ b/QuickAuthLogin/views/authbind.php
@ -1,9 +1,9 @@
 <?php
+include 'header.php';
+include 'menu.php';

 require_once __TYPECHO_ROOT_DIR__.__TYPECHO_ADMIN_DIR__.'common.php';

-
-
 // 获取当前用户名
 $name = $user->__get('name');
 $openid = $user->__get('qa_openid');
@ -12,35 +12,15 @@ $avatarUrl = $user->__get('qa_avatar');
 $option = QuickAuthLogin_Plugin::getoptions();
 $group = $user->__get('group');

-
-if($group != 'administrator' && !$option->users){ //非管理员且[非管理员启用]处于否
-	throw new Typecho_Widget_Exception(_t('禁止访问'), 403);
-}
 ?>
-<!DOCTYPE HTML>
-<html class="no-js">
-    <head>
-        <meta charset="UTF-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <meta name="renderer" content="webkit">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <title>QuickAuthLogin - 扫码登录授权绑定</title>
-        <meta name="robots" content="noindex, nofollow">
-        <link rel="stylesheet" href="<?=__TYPECHO_ADMIN_DIR__?>css/normalize.css?v=17.10.30">
-		<link rel="stylesheet" href="<?=__TYPECHO_ADMIN_DIR__?>css/grid.css?v=17.10.30">
-		<link rel="stylesheet" href="<?=__TYPECHO_ADMIN_DIR__?>css/style.css?v=17.10.30">
-		<!--[if lt IE 9]>
-		<script src="/admin/js/html5shiv.js?v=17.10.30"></script>
-		<script src="/admin/js/respond.js?v=17.10.30"></script>
-		<![endif]-->    
-</head>
-    <body class="body-100">
-    <!--[if lt IE 9]>
-        <div class="message error browsehappy" role="dialog">当前网页 <strong>不支持</strong> 你正在使用的浏览器. 为了正常的访问, 请 <a href="http://browsehappy.com/">升级你的浏览器</a>.</div>
-    <![endif]-->
-	<div class="typecho-login-wrap">
-    <div class="typecho-login">
-        <h1><a href="#" class="i-logo">Typecho</a></h1>
+
+<div class="main">
+    <div class="body container">
+        <div class="typecho-page-title">
+            <h2>微信账号绑定</h2>
+        </div>
+        
+        <div class="row typecho-page-main" role="main" style="text-align:center">
        	<div class="qrlogin">
    			<h3>当前账号：<?=$name?></h3>
    			<?php if($openid):?>
@ -52,14 +32,9 @@ if($group != 'administrator' && !$option->users){ //非管理员且[非管理员
    			<button type="submit" class="btn primary" onclick="binding()">绑定微信</button>
    			<?php endif; ?>
    		</div>	
-        <p class="more-link"> <a href="<? echo Helper::options()->adminUrl; ?>">返回后台</a> <a href="/">返回首页</a></p>
+        </div>
    </div>
 </div>
-<script src="<?=__TYPECHO_ADMIN_DIR__?>js/jquery.js?v=17.10.30"></script>
-<script src="<?=__TYPECHO_ADMIN_DIR__?>js/jquery-ui.js?v=17.10.30"></script>
-<script src="<?=__TYPECHO_ADMIN_DIR__?>js/typecho.js?v=17.10.30"></script>
-
-<?php include __TYPECHO_ROOT_DIR__.__TYPECHO_ADMIN_DIR__.'common-js.php'; ?>

 <script>
 	var data = {};
@ -85,5 +60,9 @@ if($group != 'administrator' && !$option->users){ //非管理员且[非管理员
 	}

 </script>
-    </body>
-</html>
+
+<?php
+include 'copyright.php';
+include 'common-js.php';
+include 'footer.php';
+?>
--- a/QuickAuthLogin/views/login.php
+++ b/QuickAuthLogin/views/login.php
@ -1,79 +0,0 @@
-<?php
-include 'common.php';
-$option = QuickAuthLogin_Plugin::getoptions();;
-if ($user->hasLogin()) {
-    $response->redirect($options->adminUrl);
-}
-if($option->off == '1'){
-    $response->redirect($option->qauth_api."/qrconnect?appkey=".$option->qauth_app_key.'&state=login');
-}
-
-$rememberName = htmlspecialchars(Typecho_Cookie::get('__typecho_remember_name'));
-Typecho_Cookie::delete('__typecho_remember_name');
-$header = '<link rel="stylesheet" href="' . Typecho_Common::url('normalize.css?v=' . $suffixVersion, $options->adminStaticUrl('css')) . '">
-<link rel="stylesheet" href="' . Typecho_Common::url('grid.css?v=' . $suffixVersion, $options->adminStaticUrl('css')) . '">
-<link rel="stylesheet" href="' . Typecho_Common::url('style.css?v=' . $suffixVersion, $options->adminStaticUrl('css')) . '">
-<!--[if lt IE 9]>
-<script src="' . Typecho_Common::url('html5shiv.js?v=' . $suffixVersion, $options->adminStaticUrl('js')) . '"></script>
-<script src="' . Typecho_Common::url('respond.js?v=' . $suffixVersion, $options->adminStaticUrl('js')) . '"></script>
-<![endif]-->';
-?>
-<!DOCTYPE HTML>
-<html class="no-js">
-    <head>
-        <meta charset="UTF-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <meta name="renderer" content="webkit">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <title><?php _e('%s - %s - Powered by Typecho', $menu->title, $options->title);?></title>
-        <meta name="robots" content="noindex, nofollow">
-      <?= $header;?>
-	</head>
-    <body class="body-100">
-    <!--[if lt IE 9]>
-        <div class="message error browsehappy" role="dialog">当前网页 <strong>不支持</strong> 你正在使用的浏览器. 为了正常的访问, 请 <a href="http://browsehappy.com/">升级你的浏览器</a>.</div>
-    <![endif]-->
-	<div class="typecho-login-wrap">
-    <div class="typecho-login">
-        <h1><a href="#" class="i-logo">Typecho</a></h1>
-		<div id="login">
-			<form action="<?php $options->loginAction(); ?>" method="post" name="login" role="form" id="login">
-				<p>
-					<label for="name" class="sr-only">用户名</label>
-					<input type="text" id="name" name="name" value="" placeholder="用户名" class="text-l w-100" autofocus />
-				</p>
-				<p>
-					<label for="password" class="sr-only">密码</label>
-					<input type="password" id="password" name="password" class="text-l w-100" placeholder="密码" />
-				</p>
-				<p class="submit">
-				<input type="hidden" name="referer" value="<?php echo htmlspecialchars($request->get('referer')); ?>" />
-    				<button type="submit" class="btn primary">立即登录</button>
-    				<button type="button" class="btn primary" style="background: #2a0;" onclick="openLogin()">微信登录</button>
-				</p>
-			</form>
-		</div>
-        <p class="more-link"> <a href="<?php $options->siteUrl(); ?>">返回首页</a> 
-        <?php if($options->allowRegister): ?>
-        &bull;
-        <a href="<?php $options->registerUrl(); ?>"><?php _e('用户注册'); ?></a>
-        <?php endif; ?>
-        </p>
-    </div>
-</div>
-<?php include 'common-js.php';include 'footer.php';?>
-
-<script>
-	function openLogin(){
-	    <?php if(empty($option->qauth_app_key)): ?>
-            <?php 
-            Typecho_Cookie::set('__typecho_notice', Json::encode(array('使用微信登陆需要先配置QuickAuth插件的AppKey和UserSecret')));
-            Typecho_Cookie::set('__typecho_notice_type', "error");
-            ?>
-        <?php else : ?>
-    	    var iTop = (window.screen.availHeight - 30 - 600) / 2; 
-            var iLeft = (window.screen.availWidth - 10 - 500) / 2; 
-    	    window.open ('<?php echo $option->qauth_api; ?>/qrconnect?appkey=<?php echo $option->qauth_app_key; ?>&state=login&popup=true','QuickAuth登录','width=500,height=600,top='+iTop+',left='+iLeft); 
-        <?php endif; ?>
-    }
-</script>
--- a/README.md
+++ b/README.md
@ -2,13 +2,24 @@

 基于[QuickAuth](https://qauth.cn)扫码登录平台开发的Typecho微信扫码登录插件

+#### 更新记录
+
+##### 2022/03/07 v0.9.1
+
+1. 取消替换登录界面功能，改为在源登录界面注入微信登录按钮
+2. 删除多余配置功能，简化配置
+
 ## 起始

 本插件是基于 QuickAuth 开发的 插件，使用前需要进入[QuickAuth平台](https://qauth.cn)注册配置自己的应用

 如需修改插件或开发自己的接入项目，请参考 [QuickAuth接入文档](https://qauth.cn/doc/index.html)

-插件地址：[https://github.com/mr-wixy/QuickAuthLogin](https://github.com/mr-wixy/QuickAuthLogin)
+插件地址：
+
+Gitee: [https://gitee.com/wixy/QuickAuthLogin](https://gitee.com/wixy/QuickAuthLogin)
+
+Github: [https://github.com/mr-wixy/QuickAuthLogin](https://github.com/mr-wixy/QuickAuthLogin)

 (请勿与其它同类插件同时启用，以免互相影响)

@ -40,22 +51,20 @@

 第 8 步：进入博客插件后台配置AppKey和UserSecret；

-![](https://cdn.wixy.cn/blog-picture/20220127161859.png)
+![](https://cdn.wixy.cn/blog-picture/20220307165220.png)

 <br/>

 ## 重要说明

 1. QuickAuthApi 默认配置，正常情况下无需修改（除非QuickAuth网站接口地址改了）
-2. 账户密码登录默认开启，如需关闭，请确保账号已经绑定微信，否则将无法正常登录后台；如果出现这种情况，请重装插件解决！
-3. 允许未绑定微信账号扫码登录开启后，未绑定的微信扫码则会自动注册账号
-4. 非管理员启用选项开启后会在导航栏增加微信账号绑定入口
+2. 允许未绑定微信账号扫码登录开启后，未绑定的微信扫码则会自动注册账号

 ## 与我联系

 作者：wixy

-如果有任何意见或发现任何BUG请联系我
+如果有任何意见或发现任何BUG请提issue或直接联系我

 邮箱：[wixy@qq.com](mailto:wixy@qq.com)