From d57a7d87f951b99967111ed44de2a51fe71fd792 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=91=E8=90=BD?= <sp91@qq.com>
Date: Fri, 20 Mar 2020 20:35:13 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=8F=90=E9=86=92,=E6=97=A5=E5=BF=97=E5=8A=9F=E8=83=BD=202.=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=9F=AD=E4=BB=A3=E7=A0=81=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?,=E5=85=8D=E7=99=BB=E9=99=86=E5=8F=AF=E8=A7=81=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=91=98=E7=9B=B4=E6=8E=A5=E6=9F=A5=E7=9C=8B=203.=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8E=B7=E5=8F=96=E8=AE=BF=E5=AE=A2IP?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=204.=20=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E9=9A=8F=E6=9C=BA=E6=95=B0=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/css/gdk.css           |  2 +-
 class/updates.php            |  1 +
 framework/plugin-options.php | 27 ++++++++++++------
 functions/Ajax.php           | 20 +++++++++++++
 functions/Common.php         | 54 +++++++++++++++---------------------
 functions/shortcode.php      | 45 +++++++++++++++++-------------
 gdk_route.php                |  2 +-
 7 files changed, 88 insertions(+), 63 deletions(-)

diff --git a/assets/css/gdk.css b/assets/css/gdk.css
index 0accd37..32e83ac 100644
--- a/assets/css/gdk.css
+++ b/assets/css/gdk.css
@@ -20,7 +20,7 @@ body.compensate-for-scrollbar{overflow:hidden}.fancybox-active{height:auto}.fanc
 .alert-error,.error{background-color:#f17783;border-color:#e66465;color:#fff;}
 
 .red{color:#f6003c}.purple{color:#6b48ff}.black{color:#060608}.pink{color:#FF5F5F}
-.pull-center,.fieldset p{text-align:center;}
+.pull-center{text-align:center;}
 /**millgram mod end*/
 
 /*文字tooltips*/
diff --git a/class/updates.php b/class/updates.php
index 94c9f59..9d0c50d 100644
--- a/class/updates.php
+++ b/class/updates.php
@@ -11,6 +11,7 @@ json数据格式:
 "download_url" : "http://a.xxoo.net/Git-alpha.zip"
 }
  */
+
 if (!class_exists('ThemeUpdateChecker')):
 
     class ThemeUpdateChecker
diff --git a/framework/plugin-options.php b/framework/plugin-options.php
index bb517be..0698643 100644
--- a/framework/plugin-options.php
+++ b/framework/plugin-options.php
@@ -50,7 +50,7 @@ function gdk_options_page()
     ?>
 
 <div class="wrap">
-	<h2>GDK选项</h2>
+	<h2>GDK选项  <input type="button" class="feedback add-new-h2 get_new_version" value="检测更新"></h2>
 	<hr/>
 <?php
 if (isset($_GET['update'])) {
@@ -188,12 +188,6 @@ break;
 	</div>
 	<div class="panel" id="panel_about">
 		<table class="form-table">
-			<tr>
-				<th><h4>云落小贴士</h4></th>
-				<td>
-					<p>哈哈</p>
-				</td>
-			</tr>
 			<tr>
 				<th><h4>联系方式</h4></th>
 				<td>
@@ -316,7 +310,11 @@ body.show-filters .wrap form {
 .filter-drawer ul {
 	list-style: disc inside;
 }
-
+.get_update_res,.get_new_version{
+    margin-left: 20px;
+    padding: 5px;
+    font-size: medium;
+}
 </style>
 <style id="theme-options-filter"></style>
 <script>
@@ -372,7 +370,18 @@ jQuery(function ($) {
         });
 	});
 
-
+	$(".get_new_version").click(function () {
+		var ajax_data = { action: 'get_new_version' };
+    $.post(ajaxurl, ajax_data,
+        function(a) {
+			a = $.trim(a);
+            if (a !== '400') {
+				$(".get_new_version").after("" + a + "");
+            }else{
+				$(".get_new_version").after("检测失败,网络错误");
+			}
+        });
+	});
 
 
 
diff --git a/functions/Ajax.php b/functions/Ajax.php
index 6b69ee9..6ef29e5 100644
--- a/functions/Ajax.php
+++ b/functions/Ajax.php
@@ -21,6 +21,26 @@ function gdk_test_email()
 add_action('wp_ajax_nopriv_gdk_test_email', 'gdk_test_email');
 add_action('wp_ajax_gdk_test_email', 'gdk_test_email');
 
+//检测插件更新
+function gdk_ajax_get_update()
+{
+    $response = wp_remote_get('https://u.gitcafe.net/api/gdk.json');
+
+    if (!is_array($response) || is_wp_error($response)) {
+        exit('400');
+    }
+    $plugin_info = json_decode($response['body'], true);
+    $version     = $plugin_info['version'];
+
+    if (version_compare($version, GDK_PLUGIN_VER, '>')) {
+        exit('<span class="get_update_res">插件有更新，<a href="' . $plugin_info['details_url'] . '" target="_blank">请及时查看！</a></span>');
+    } else {
+        exit('<span class="get_update_res">你的插件目前已经是最新版了！</span>');
+    }
+}
+add_action('wp_ajax_nopriv_get_new_version', 'gdk_ajax_get_update');
+add_action('wp_ajax_get_new_version', 'gdk_ajax_get_update');
+
 //粘贴上传图片
 function gdk_pasteup_imag()
 {
diff --git a/functions/Common.php b/functions/Common.php
index 7cd3e94..d532a22 100644
--- a/functions/Common.php
+++ b/functions/Common.php
@@ -308,42 +308,22 @@ function getBrowser()
 //获取IP地址
 function gdk_get_ip()
 {
-    // check for shared internet/ISP IP
-    if (!empty($_SERVER['HTTP_CLIENT_IP']) && gdk_validate_ip($_SERVER['HTTP_CLIENT_IP'])) {
-        return $_SERVER['HTTP_CLIENT_IP'];
-    }
-    // check for IPs passing through proxies
-    if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
-        // check if multiple ips exist in var
-        if (in_string($_SERVER['HTTP_X_FORWARDED_FOR'], ',')) {
-            $iplist = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
-            foreach ($iplist as $ip) {
-                if (gdk_validate_ip($ip)) {
-                    return $ip;
-                }
-
+    $proxy_headers = ["CLIENT_IP", "FORWARDED", "FORWARDED_FOR", "FORWARDED_FOR_IP", "HTTP_CLIENT_IP", "HTTP_FORWARDED", "HTTP_FORWARDED_FOR", "HTTP_FORWARDED_FOR_IP", "HTTP_PC_REMOTE_ADDR", "HTTP_PROXY_CONNECTION", "HTTP_VIA", "HTTP_X_FORWARDED", "HTTP_X_FORWARDED_FOR", "HTTP_X_FORWARDED_FOR_IP", "HTTP_X_IMFORWARDS", "HTTP_XROXY_CONNECTION", "VIA", "X_FORWARDED", "X_FORWARDED_FOR"];
+    foreach ($proxy_headers as $proxy_header) {
+        if (isset($_SERVER[$proxy_header])) {
+            if (gdk_validate_ip($_SERVER[$proxy_header])) {
+                return $_SERVER[$proxy_header];
+            } elseif (stristr(",", $_SERVER[$proxy_header]) !== false) {
+                $proxy_header_temp = trim(array_shift(explode(",", $_SERVER[$proxy_header])));
+                if (($pos_temp = in_string($proxy_header_temp, ":"))) {$proxy_header_temp = substr($proxy_header_temp, 0, $pos_temp);}
+                if (gdk_validate_ip($proxy_header_temp)) {return $proxy_header_temp;}
             }
-        } else {
-            if (gdk_validate_ip($_SERVER['HTTP_X_FORWARDED_FOR'])) {
-                return $_SERVER['HTTP_X_FORWARDED_FOR'];
-            }
-
         }
     }
-    if (!empty($_SERVER['HTTP_X_FORWARDED']) && gdk_validate_ip($_SERVER['HTTP_X_FORWARDED'])) {
-        return $_SERVER['HTTP_X_FORWARDED'];
+    if (gdk_validate_ip($_SERVER["REMOTE_ADDR"])) {
+        return $_SERVER["REMOTE_ADDR"];
     }
-    if (!empty($_SERVER['HTTP_X_CLUSTER_CLIENT_IP']) && gdk_validate_ip($_SERVER['HTTP_X_CLUSTER_CLIENT_IP'])) {
-        return $_SERVER['HTTP_X_CLUSTER_CLIENT_IP'];
-    }
-    if (!empty($_SERVER['HTTP_FORWARDED_FOR']) && gdk_validate_ip($_SERVER['HTTP_FORWARDED_FOR'])) {
-        return $_SERVER['HTTP_FORWARDED_FOR'];
-    }
-    if (!empty($_SERVER['HTTP_FORWARDED']) && gdk_validate_ip($_SERVER['HTTP_FORWARDED'])) {
-        return $_SERVER['HTTP_FORWARDED'];
-    }
-    // return unreliable ip since all else failed
-    return $_SERVER['REMOTE_ADDR'];
+
 }
 
 /**
@@ -904,6 +884,12 @@ function gdk_order_id()
     return $order_id;
 }
 
+//生成随机数
+function randomString($length = 11)
+{
+    return substr(str_shuffle(str_repeat($x = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ', ceil($length / strlen($x)))), 1, $length);
+}
+
 //获取云落的远程通知，加入缓存，1天一次
 function gdk_get_Yunluo_Notice()
 {
@@ -970,6 +956,10 @@ function gdk_get_link_items()
     return $result;
 }
 
+function gdk_get_Version()
+{
+    echo '<input type="button" class="button button-secondary get_new_version" value="点击检测更新">';
+}
 /*
  * Payjs支付操作函数
  * 订单标题
diff --git a/functions/shortcode.php b/functions/shortcode.php
index 629ccc2..c42e156 100644
--- a/functions/shortcode.php
+++ b/functions/shortcode.php
@@ -24,16 +24,16 @@ add_shortcode('gdk_login_btn', 'gdk_login_fancybox');
 function gdk_DownloadUrl($atts, $content = null)
 {
     extract(shortcode_atts(array(
-        "href" => 'http://',
+        'href' => 'http://',
     ), $atts));
     return '<a class="dl" href="' . $href . '" target="_blank" rel="nofollow"><i class="fa fa-cloud-download"></i>' . $content . '</a>';
 }
-add_shortcode("dl", "gdk_DownloadUrl");
+add_shortcode('dl', 'gdk_DownloadUrl');
 //添加钮git
 function gdk_GithubUrl($atts, $content = null)
 {
     extract(shortcode_atts(array(
-        "href" => 'http://',
+        'href' => 'http://',
     ), $atts));
     return '<a class="dl" href="' . $href . '" target="_blank" rel="nofollow"><i class="fa fa-github-alt"></i>' . $content . '</a>';
 }
@@ -42,7 +42,7 @@ add_shortcode('gt', 'gdk_GithubUrl');
 function gdk_DemoUrl($atts, $content = null)
 {
     extract(shortcode_atts(array(
-        "href" => 'http://',
+        'href' => 'http://',
     ), $atts));
     return '<a class="dl" href="' . $href . '" target="_blank" rel="nofollow"><i class="fa fa-external-link"></i>' . $content . '</a>';
 }
@@ -51,7 +51,7 @@ add_shortcode('dm', 'gdk_DemoUrl');
 function gdk_reply_to_read($atts, $content = null)
 {
     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>',
+        '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));
     $email   = null;
     $user_ID = get_current_user_id();
@@ -117,7 +117,7 @@ add_shortcode('v_tips', 'gdk_toe');
 function gdk_tom($atts, $content = null)
 {
     extract(shortcode_atts(array(
-        "href" => 'http://',
+        'href' => 'http://',
     ), $atts));
     return '<a class="cm-btn success" href="' . $href . '" target="_blank" rel="nofollow">' . $content . '</a>';
 }
@@ -126,7 +126,7 @@ add_shortcode('lhb', 'gdk_tom');
 function gdk_too($atts, $content = null)
 {
     extract(shortcode_atts(array(
-        "play" => '0',
+        'play' => '0',
     ), $atts));
     if ($play == 0) {
         return '<video style="width:100%;" src="' . $content . '" controls preload >您的浏览器不支持HTML5的 video 标签，无法为您播放！</video>';
@@ -140,7 +140,7 @@ add_shortcode('video', 'gdk_too');
 function gdk_tkk($atts, $content = null)
 {
     extract(shortcode_atts(array(
-        "play" => '0',
+        'play' => '0',
     ), $atts));
     if ($play == 0) {
         return '<audio style="width:100%;" src="' . $content . '" controls loop>您的浏览器不支持 audio 标签。</audio>';
@@ -154,10 +154,10 @@ add_shortcode('audio', 'gdk_tkk');
 function gdk_ton($atts, $content = null)
 {
     extract(shortcode_atts(array(
-        "href"     => 'http://',
-        "filename" => '',
-        "filesize" => '',
-        "filedown" => '',
+        'href'     => 'http://',
+        'filename' => '',
+        'filesize' => '',
+        'filedown' => '',
     ), $atts));
     return '<a class="lhb" id="showdiv" href="#fancydlbox" >文件下载</a><div id="fancydlbox" style="cursor:default;display:none;width:800px;"><div class="part" style="padding:20px 0;"><h2>下载声明:</h2> <div class="fancydlads" align="left"><p>' . gdk_option('gdk_fancydlcp') . '</p></div></div><div class="part" style="padding:20px 0;"><h2>文件信息：</h2> <div class="dlnotice" align="left"><p>文件名称：' . $filename . '<br />文件大小：' . $filesize . '<br />发布日期：' . get_the_modified_time('Y年n月j日') . '</p></div></div><div class="part" id="download_button_part"><a id="download_button" target="_blank" href="' . $href . '"><span></span>' . $filedown . '</a> </div><div class="part" style="padding:20px 0;"><div class="moredl" style="text-align:center;">[更多地址] : ' . $content . '</div></div><div class="dlfooter">' . gdk_option('gdk_fancydlad') . '</div></div>';
 }
@@ -179,7 +179,7 @@ add_shortcode('download', 'gdk_download');
 function gdk_xcollapse($atts, $content = null)
 {
     extract(shortcode_atts(array(
-        "title" => "",
+        'title' => '',
     ), $atts));
     return '<div style="margin: 0.5em 0;"><div class="xControl"><a href="javascript:void(0)" class="collapseButton xButton"><i class="fa fa-plus-square" ></i> ' . $title . '</a><div style="clear: both;"></div></div><div class="xContent" style="display: none;">' . $content . '</div></div>';
 }
@@ -188,8 +188,8 @@ add_shortcode('collapse', 'gdk_xcollapse');
 function gdk_xdltable($atts, $content = null)
 {
     extract(shortcode_atts(array(
-        "file" => "",
-        "size" => "",
+        'file' => '',
+        'size' => '',
     ), $atts));
     return '<table class="dltable"><tbody><tr><td style="background-color:#F9F9F9;" rowspan="3"><p>文件下载</p></td><td><i class="fa fa-list-alt"></i>&nbsp;&nbsp;文件名称：' . $file . '</td><td><i class="fa fa-th-large"></i>&nbsp;&nbsp;文件大小：' . $size . '</td></tr><tr><td colspan="2"><i class="fa fa-volume-up"></i>&nbsp;&nbsp;下载声明：' . gdk_option('gdk_dltable_b') . '</td></tr><tr><td colspan="2"><i class="fa fa-download"></i>&nbsp;&nbsp;下载地址：' . $content . '</td></tr></tbody></table>';
 }
@@ -198,7 +198,7 @@ add_shortcode('dltable', 'gdk_xdltable');
 function gdk_music163($atts, $content = null)
 {
     extract(shortcode_atts(array(
-        "play" => "1",
+        'play' => '1',
     ), $atts));
     return '<iframe style="width:100%;max-height:86px;" frameborder="no" border="0" marginwidth="0" marginheight="0" src="http://music.163.com/outchain/player?type=2&id=' . $content . '&auto=' . $play . '&height=66"></iframe>';
 }
@@ -208,7 +208,7 @@ function gdk_login_to_read($atts, $content = null)
 {
     $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>',
+        'notice' => '<div class="alert info pull-center"><p class="reply-to-read" style="color: blue;">注意：本段内容须“' . $logina . '”后方可查看！</p></div>',
     ), $atts));
     if (is_user_logged_in() && !is_null($content) && !is_feed()) {
         return '<fieldset class="fieldset"><legend class="legend">隐藏内容</legend><p>' . $content . '</p></fieldset>';
@@ -413,13 +413,16 @@ function gdk_pay_nologin($atts, $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); //没有新建,有就更新
+    if (current_user_can('administrator')) {
+        return '<fieldset class="fieldset"><legend class="legend">隐藏内容</legend><p>' . $content . '</p></fieldset>';
+    } //admin show
     $pay_log   = get_post_meta($pid, 'pay_log', true); //购买记录数据
     $pay_arr   = explode(",", $pay_log);
     $pay_count = count($pay_arr); //已购买人数
-    $notice    = '<fieldset id="hide_notice" class="fieldset"><legend class="legend">付费内容</legend>';
+    $notice    = '<fieldset id="hide_notice" class="fieldset pull-center"><legend class="legend">付费内容</legend>';
     $notice .= '<p>当前隐藏内容需要支付</p><span class="cm-coin">' . $money . '元</span>';
     $notice .= '<p>已有<span class="red">' . $pay_count . '</span>人支付</p>';
-    $notice .= '<p><button id="pay_view" type="button" data-action="pay_view" data-money="' . $money . '" data-id="' . $pid . '" class="button">立即查看</button></p>';
+    $notice .= '<p><button id="pay_view" type="button" data-action="pay_view" data-money="' . $money . '" data-id="' . $pid . '">立即查看</button></p>';
     $notice .= '</fieldset>';
     return $notice;
 }
@@ -466,7 +469,9 @@ function gdk_shortcode_list()
 
 [/wxcaptcha]',
         '积分购买可见'  => '[pay point=\'10\']这里是需要付费的内容[/pay]',
-        '游客付费可见'  => '[pax money=1]',
+        '游客付费可见'  => '[pax money=1]
+
+[/pax]',
         '弹窗下载'    => '[fanctdl filename=\'这里填写文件名\' filepass=\'这里填写文件密码什么的\' href=\'这里填写的主下载链接\' filedown=\'这里填写的是文件的主下载名称\']这里填写的文件的辅助下载链接，可写多个,空格间隔[/fanctdl]',
         '面板下载'    => '[dltable file=\'在此处写下文件名称\' pass=\'在这里写下文件密码\']这里填写的文件的辅助下载链接，可写多个,空格间隔[/dltable]',
         '单页下载'    => '[pdownload title=]',
diff --git a/gdk_route.php b/gdk_route.php
index b0e05b6..26e4989 100644
--- a/gdk_route.php
+++ b/gdk_route.php
@@ -28,7 +28,7 @@ if (!version_compare(PHP_VERSION, '7.2', '>=')) {
 }
 
 //定义各种常量
-define('GDK_PLUGIN_VER', '0.0.1');
+define('GDK_PLUGIN_VER', '0.0.2');
 define('GDK_PLUGIN_FILE', __FILE__); //插件入口文件
 define('GDK_BASE_URL', plugin_dir_url(__FILE__)); //插件目录url
 define('GDK_ROOT_PATH', plugin_dir_path(__FILE__)); //插件目录路径