多重更新：后台金币支持具体文章查询，微信验证码功能优化，修复按钮js的报错，优化短代码嵌套使用的问题

assets/assets_load.php

@@ -15,7 +15,7 @@ add_action('admin_enqueue_scripts', 'gdk_admin_enqueue_script');
 function gdk_enqueue_script_frontend()
 {
     if (!is_admin()) {
-        wp_enqueue_style('pure_css', 'https://cdn.jsdelivr.net/npm/css-mint@2.0.7/build/css-mint.min.css', false, GDK_PLUGIN_VER, 'all');
+        wp_enqueue_style('pure_css', GDK_BASE_URL . 'assets/css/css-mint.min.css', false, GDK_PLUGIN_VER, 'all');
         wp_enqueue_style('font-awesome', GDK_BASE_URL . 'assets/css/font-awesome.min.css', false, GDK_PLUGIN_VER, 'all');
         //wp_enqueue_style( 'milligram_css', GDK_BASE_URL.'assets/css/milligram.min.css', false, GDK_PLUGIN_VER, 'all' );
         wp_enqueue_style('gdk_css', GDK_BASE_URL . 'assets/css/gdk.css', false, GDK_PLUGIN_VER, 'all');
@@ -53,6 +53,7 @@ jQuery(function($) {
     /* bengin */
     if ($("#ed_toolbar").length > 0) {
     /***文章编辑器 */
+	QTags.addButton('h2', 'H2标题', '<h2>', '</h2>');
     QTags.addButton('ipre', '代码高亮', '<pre class="prettyprint linenums" >\n\n</pre>', "");
     $("#content").pasteUploadImage(ajaxurl); //ajax img upload
     $(".insert-shortcodes").click(function() { //shortcode botton

assets/css/gdk.css

@@ -14,6 +14,7 @@ body.compensate-for-scrollbar{overflow:hidden}.fancybox-active{height:auto}.fanc
 .cm-badge{padding:8px;font-size:.8em;background-color:#dadada;border-radius:3px;text-align:center;margin-bottom:15px}
 .cm-coin{padding:4px 18px;border:1px solid #f0ad4e;border-radius:20px;background-color:#fff;color:#f0ad4e}
 .cm-round{width:30px;height:30px;border-radius:50%;}
+.cm-btn{display: inline-block;}
 .alert-warning,.warning{background-color:#fdd867;border-color:#f6b73c;}
 .alert-info,.info{background-color:#7db1f1;border-color:#3d7e9a;color:#fff;}
 .alert-success,.success{background-color:#68d58c;border-color:#4d9f0c;color:#fff;}

class/class_load.php

@@ -1,6 +1,6 @@
 <?php
 
-include 'clean-up.php'; //数据库清理
+
 include 'local_avatars.php'; //本地头像
 
 include 'updates.php'; //在线更新
@@ -11,3 +11,5 @@ include 'points/points.php'; //积分功能
 
 include 'aq_resizer.php'; //缩略图功能
 include 'wechat.php'; //微信功能
+
+

class/points/class-points-admin.php

@@ -201,27 +201,35 @@ class GDK_Points_Admin
         $alert = "";
         if (isset($_POST['psearch'])) {
             $sdata = trim($_POST['psearch']);
-            if (preg_match('/E20/', $sdata)) {
+            if (preg_match('/E20/', $sdata) ) {
                 //order id
                 global $wpdb;
                 $point_id = $wpdb->get_row("SELECT point_id FROM " . GDK_Points_Database::points_get_table("users") . " WHERE description = '{$sdata}'", ARRAY_A)['point_id'];
                 $points   = GDK_Points::get_point($point_id);
+            }elseif (preg_match('/(D|d)/', $sdata)){// description
+				$data = substr($sdata,1);
+				global $wpdb;
+                $points = $wpdb->get_results("SELECT * FROM " . GDK_Points_Database::points_get_table("users") . " WHERE description = '{$data}'");
+				//var_dump($points);
+				$k[]    = '<div style="margin-bottom:10px;">文章ID：' . $data . '  &nbsp;&nbsp;&nbsp;||&nbsp;&nbsp;&nbsp;文章名为：' . get_post($data)->post_title . '</div><hr />';
 			} elseif (filter_var($sdata, FILTER_VALIDATE_EMAIL)) {
                 //email
                 $user   = get_user_by('email', $sdata);
                 $points = GDK_Points::get_points_by_user($user->ID);
-                $k[]    = '<div style="margin-bottom:10px;">用户ID：' . $user->ID . '  &nbsp;&nbsp;总金币为：' . GDK_Points::get_user_total_points($user->ID) . '</div>';
+                $k[]    = '<div style="margin-bottom:10px;">用户ID：' . $user->ID . '  &nbsp;&nbsp;&nbsp;||&nbsp;&nbsp;&nbsp;总金币为：' . GDK_Points::get_user_total_points($user->ID) . '</div>';
             } else {
                 //userid
                 $points = GDK_Points::get_points_by_user($sdata);
-                $k[]    = '<div style="margin-bottom:10px;">用户ID：' . $sdata . '  &nbsp;&nbsp;总金币为：' . GDK_Points::get_user_total_points($sdata) . '</div>';
+                $k[]    = '<div style="margin-bottom:10px;">用户ID：' . $sdata . '  &nbsp;&nbsp;&nbsp;||&nbsp;&nbsp;&nbsp;总金币为：' . GDK_Points::get_user_total_points($sdata) . '</div>';
             }
             if (is_array($points)) {
                 foreach ($points as $point) {
-                    $k[] = '<div style="margin-bottom:5px;">金币：' . $point->points . ' &nbsp;&nbsp;描述：' . $point->description . ' &nbsp;&nbsp;日期：' . $point->datetime . '</div>';
+					$userid = $point->user_id;
+					$user_name = get_user_by('id', $userid)->display_name;
+                    $k[] = '<div style="margin-bottom:5px;">用户ID：' . $userid . '&nbsp;&nbsp;&nbsp;||&nbsp;&nbsp;&nbsp;金币：' . $point->points . ' &nbsp;&nbsp;&nbsp;||&nbsp;&nbsp;&nbsp;描述：' . $point->description . ' &nbsp;&nbsp;&nbsp;||&nbsp;&nbsp;&nbsp;日期：' . $point->datetime . '&nbsp;&nbsp;&nbsp;||&nbsp;&nbsp;&nbsp;用户名：' . $user_name . '</div>';
                 }
             } else {
-                $k[] = '<div style="margin-bottom:5px;">金币：' . $points->points . ' &nbsp;&nbsp;描述：' . $points->description . ' &nbsp;&nbsp;日期：' . $points->datetime . '</div>';
+                $k[] = '<div style="margin-bottom:5px;">用户ID：' . $point->user_id . '&nbsp;&nbsp;金币：' . $points->points . ' &nbsp;&nbsp;描述：' . $points->description . ' &nbsp;&nbsp;日期：' . $points->datetime . '</div>';
             }
             $alert = implode(" ", $k);
         }
@@ -327,7 +335,7 @@ class GDK_Points_Admin
 				<a class="add button" href="<?php echo esc_url(add_query_arg('action', 'edit', $current_url)); ?>" title="点击手动添加金币">添加金币</a>
 			</span>
 			<form method="POST" style="float:right;">
-				<input size="40" placeholder="搜索用户ID/用户邮箱/订单号" type="search" name="psearch" value="" />
+				<input size="40" placeholder="搜索用户ID/用户邮箱/订单号/D文章ID" type="search" name="psearch" value="" />
 				</form>
 			<?php echo '<style type="text/css">tbody#the-list tr:hover{background:rgba(132,219,162,.61)}</style>';
         $exampleListTable->display(); ?>

class/points/class-points-shortcodes.php

@@ -66,6 +66,7 @@ class GDK_Points_Shortcodes
 
     public static function pay($atts, $content = null)
     {
+		$content = do_shortcode($content);
         global $wpdb;
         $user_id = get_current_user_id();
         $pid     = get_the_ID();

class/wechat.php

@@ -80,12 +80,15 @@ class Wechat_Captcha
     }
 }
 
-function wx_process()
+function wx_process() {
-{
+	if(isset($_GET["signature"])) {
-    global $object;
+		global $wx_captchas;
+		if(!isset($wx_captchas)) {
 			$wx_token = trim(gdk_option('gdk_wxmp_token'));
-    $object   = new Wechat_Captcha($wx_token, wx_captcha());
+			$wx_captchas   = new Wechat_Captcha($wx_token, wx_captcha());
-    $object->responseMsg();
+			$wx_captchas->responseMsg();
-    return;
+			exit;
+		}
+	}
 }
-add_action('pre_get_posts', 'wx_process', 4);
+add_action('parse_request', 'wx_process', 4);

framework/plugin-options.php

@@ -71,7 +71,6 @@ $activePanelIdx = empty($_GET['panel']) ? 0 : $_GET['panel'];
         echo '<li><a href="#panel_' . $i . '" data-panel="' . $i . '" ' . ($i == $activePanelIdx ? 'class="current"' : '') . '>' . $name . '</a></li>';
     }
     ?>
-			<li><a href="#panel_data" data-panel="data" class="data">数据清理</a></li>
 			<li><a href="#panel_about" data-panel="about" class="about">关于插件</a></li>
 		</ul>
 <div class="search-form"><label class="screen-reader-text" for="wp-filter-search-input">筛选插件选项…</label><input placeholder="筛选插件选项…" type="search" id="wp-filter-search-input" class="wp-filter-search"></div>
@@ -181,11 +180,6 @@ break;
         $index++;
     }
     ?>
-	<div class="panel" id="panel_data">
-	<table class="form-table">
-	<?php echo gdk_clean_up_page(); ?>
-	</table>
-	</div>
 	<div class="panel" id="panel_about">
 		<table class="form-table">
 			<tr>

functions/Ajax.php

@@ -379,7 +379,9 @@ function msg_form()
     $msg = array(
         'post_title'   => '【来自' . $_POST['mail'] . '留言】',
         'post_author'  => 1,
-        'post_content' => $_POST['msg_content'],
+        'post_content' => $_POST['msg_content'].'
+	
+	回复邮件：' . $_POST['mail'],
     );
 
 	wp_mail(get_bloginfo('admin_email'), $msg['post_title'], $msg['post_content']);

functions/advanced.php

@@ -19,17 +19,23 @@ if (gdk_option('gdk_cdn_water')) {
 //CDN水印
 
 //文章首尾添加自定义内容
-function gdk_add_content($content)
+function gdk_add_content($content) {
-{
+	if(is_single()) {
-    
 		$before = gdk_option('gdk_artical_top');
 		$after  = gdk_option('gdk_artical_bottom');
-    if (empty($before) && empty($after) && !is_single()) {
+		if(!empty($before) && !empty($after)) {
-        return $content;
-    } else {
 			return $before . '<br>' . $content . '<br>' . $after;
+		}elseif(!empty($before)) {
+			return $before . '<br>' . $content;
+		}elseif(!empty($after)) {
+			return $content . '<br>' . $after;
+		}else{
+			return $content;
 		}
 
+	}else{
+		return $content;
+	}
 }
 add_filter('the_content', 'gdk_add_content');
 
@@ -157,7 +163,7 @@ function gdk_link_go($content)
     preg_match_all('/<a(.*?)href="(.*?)"(.*?)>/', $content, $matches);
     if ($matches) {
         foreach ($matches[2] as $val) {
-            if (in_string($val, '://') && !in_string($val, home_url()) && !preg_match('/\.(jpg|jepg|png|ico|bmp|gif|tiff)/i', $val) && !preg_match('/(ed2k|thunder|Flashget|flashget|qqdl):\/\//i', $val)) {
+            if (in_string($val, '://') && !in_string($val, home_url()) && !preg_match('/\.(jpg|jepg|png|ico|bmp|gif|zip|rar|tiff)/i', $val) && !preg_match('/(ed2k|thunder|Flashget|flashget|qqdl):\/\//i', $val)) {
                 $content = str_replace("href=\"$val\"", "href=\"" . home_url() . "?go=$val\" ", $content);
             }
         }

functions/optimization.php

@@ -28,6 +28,8 @@ function gdk_disable_srcset_img()
 }
 add_filter('max_srcset_image_width', 'gdk_disable_srcset_img');
 
+add_filter( 'big_image_size_threshold', '__return_false' );
+
 //移除默认的图片宽度以及高度
 function gdk_remove_img_width($html)
 {

functions/shortcode.php

@@ -50,6 +50,7 @@ add_shortcode('dm', 'gdk_DemoUrl');
 //使用短代码添加回复后可见内容开始
 function gdk_reply_to_read($atts, $content = null)
 {
+    $content = do_shortcode($content);
     extract(shortcode_atts(array(
         'notice' => '<div class="alert info pull-center"><p class="reply-to-read">注意：本段内容须成功“<a href="' . get_permalink() . '#respond" title="回复本文">回复本文</a>”后“<a href="javascript:window.location.reload();" title="刷新本页">刷新本页</a>”方可查看！</p></div>',
     ), $atts));
@@ -203,6 +204,7 @@ add_shortcode('netmusic', 'gdk_music163');
 //登录可见
 function gdk_login_to_read($atts, $content = null)
 {
+    $content = do_shortcode($content);
     $logina = '<a target="_blank" href="' . esc_url(wp_login_url(get_permalink())) . '">登录</a>';
     extract(shortcode_atts(array(
         'notice' => '<div class="alert info pull-center"><p class="reply-to-read" style="color: blue;">注意：本段内容须“' . $logina . '”后方可查看！</p></div>',
@@ -217,6 +219,7 @@ add_shortcode('vip', 'gdk_login_to_read');
 // 部分内容输入密码可见
 function gdk_secret_view($atts, $content = null)
 {
+    $content = do_shortcode($content);
     $pid = get_the_ID();
     add_post_meta($pid, '_pass_content', $content, true) or update_post_meta($pid, '_pass_content', $content);
     if (current_user_can('administrator')) {
@@ -407,6 +410,7 @@ add_shortcode('sohutv', function ($atts, $content = '') {
 //付费可见短代码
 function gdk_pay_nologin($atts, $content = '')
 {
+	$content = do_shortcode($content);
     extract(shortcode_atts(array('money' => '1'), $atts));
     $pid = get_the_ID(); //文章ID
     add_post_meta($pid, '_pay_content', $content, true) or update_post_meta($pid, '_pay_content', $content); //没有新建,有就更新
@@ -430,7 +434,6 @@ function gdk_shortcode_list()
 {
     $wpshortcodes = [
         '横线'      => '<hr />',
-        'H2标题'    => '<h2> </h2>',
         'H3标题'    => '<h3> </h3>',
         '记号笔'     => '<mark> </mark>',
         '链接按钮'    => '[dm href=] [/dm]',
@@ -471,7 +474,7 @@ function gdk_shortcode_list()
 [/pax]',
         '弹窗下载'    => '[fanctdl filename=\'这里填写文件名\' filepass=\'这里填写文件密码什么的\' href=\'这里填写的主下载链接\' filedown=\'这里填写的是文件的主下载名称\']这里填写的文件的辅助下载链接，可写多个,空格间隔[/fanctdl]',
         '面板下载'    => '[dltable file=\'在此处写下文件名称\' pass=\'在这里写下文件密码\']这里填写的文件的辅助下载链接，可写多个,空格间隔[/dltable]',
-        '单页下载'    => '[pdownload title=]',
+        '单页下载'    => '[pdownload title=点击下载]',
         '文章内链'    => '[neilian ids=]',
         '无序列表'    => '[list]
 
@@ -487,9 +490,9 @@ function gdk_shortcode_list()
     return $output;
 }
 
-function gdk_shortcode_button($context)
+function gdk_shortcode_button()
 {
     $context = '<a class="button insert-shortcodes" title="添加简码" data-editor="content" href="javascript:;"><span class="dashicons dashicons-twitter shortcodes-icon"></span>短代码</a><div class="shortcodes-wrap">' . gdk_shortcode_list() . '</div>';
-    return $context;
+    echo $context;
 }
-add_action('media_buttons_context', 'gdk_shortcode_button');
+add_action('media_buttons', 'gdk_shortcode_button');