Changeset 1515533

Timestamp:

10/15/2016 05:22:32 PM (9 years ago)

Author:

liwanglin12

Message:

1.72

[Optimize] Update iedie
[Optimize] Update notie
[Optimize] Optimizes the directory structure
[Remove] Plugin report logic

Location:

wp-plus/trunk

Files:

• README.md (added)
• alert (deleted)
• css (added)
• css/index.php (added)
• css/nprogress.css (added)
• css/plus_prism.css (added)
• jdt (deleted)
• jquery.min.js (deleted)
• js (added)
• js/global.js (added)
• js/iedie.min.js (added)
• js/index.php (added)
• js/jquery-1.8.2.min.js (added)
• js/notie.min.js (added)
• js/nprogress.js (added)
• js/plus_prism.js (added)
• option.php (modified) (3 diffs)
• plus_prism.css (deleted)
• plus_prism.js (deleted)
• readme.txt (modified) (3 diffs)
• wp-plus.php (modified) (10 diffs)

wp-plus/trunk/option.php

@@ -1 +1 @@
 <?php
 defined('ABSPATH') or exit;
-if ($_POST['plus_empty_cron'] == 'true') {
-    echo '<div id="message" class="updated"><h4>操作已完成！';
-    var_dump(wp_clear_scheduled_hook('plus_hook_update'));
-    echo '</h4></div>';
-}
-if ($_POST['plus_update_info'] == 'true') {
-    echo '<div id="message" class="updated"><h4>操作已完成！';
-    var_dump(plus_updateinfo());
-    echo '</h4></div>';
-}
-if ($_POST['plus_post_open'] == 'true') {
-    echo '<div id="message" class="updated"><h4>操作已完成！';
-    var_dump(plus_post("activate"));
-    echo '</h4></div>';
-}
 if ($_POST['update_pluginoptions'] == 'true') {
     plus_pluginoptions_update();
@@ -26 +11 @@
 echo plus_version;
 ?>版本更新日志：<br />
-[新增]我也忘了我到底改了些什么，先凑合用，有啥问题再修好了。。。<br />
+[优化]更新 iedie<br />
+[优化]更新 notie<br />
+[优化]优化目录结构<br />
+[移除]插件回报逻辑
 </div>
 <form method="POST" action="">
@@ -99 +87 @@
     <input type="submit" class="button-primary" value="保存设置" style="margin: 20px 0;" /> &nbsp; WP-Plus 版本 <?php
     echo plus_version;
-    ?> &nbsp; 插件作者 <a href="http://lwl12.com">liwanglin12</a> &nbsp; <a href="http://blog.lwl12.com/read/wp-plus.html">点击获取最新版本 & 说明</a>
+    ?> &nbsp; 插件作者 <a href="https://lwl12.com">liwanglin12</a> &nbsp; <a href="http://blog.lwl12.com/read/wp-plus.html">点击获取最新版本 & 说明</a>
 </form>
 
-<hr>
-
-<p>DEBUG中心</p>此处信息供出现问题时作者分析使用！请勿随意触动此处按钮！<br />
-<?php
-echo ("下次报告时间");
-var_dump(wp_next_scheduled('plus_hook_update'));
-echo ("<br />");
-echo ("UUID");
-var_dump(get_option('wp_plus_uuid'));
-echo ("<br />");
-?>
-<form method="POST" action="">
-    <input type="hidden" name="plus_empty_cron" value="true" />
-    <input type="submit" class="button" value="清空计划任务设置"  style="margin: 10px 0;" />
-</form>
-<form method="POST" action="">
-    <input type="hidden" name="plus_update_info" value="true" />
-    <input type="submit" class="button" value="发送信息刷新事件"  style="margin: 10px 0;" />
-</form>
-<form method="POST" action="">
-    <input type="hidden" name="plus_post_open" value="true" />
-    <input type="submit" class="button" value="发送插件启用事件"  style="margin: 10px 0;" />
-</form>
-</div>
 <?php
 /* 插件设置验证*/

wp-plus/trunk/readme.txt

@@ -1 +1 @@
 === WP-Plus ===
 Contributors: liwanglin12
-Donate link: http://lwl12.com/
+Donate link: https://lwl12.com/
 Tags: wordpressplus, wpplus, 增强, 优化, Enhancement, optimization
 Requires at least: 3.0
-Tested up to: 4.5
+Tested up to: 4.6
 Stable tag: 1.3
 License: GPLv2 or later
@@ -29 +29 @@
 
 == Changelog ==
+= 1.72 =
+[优化]更新 iedie
+[优化]更新 notie
+[优化]优化目录结构
+[移除]插件回报逻辑
 = 1.71 =
 [新增]我也忘了我到底改了些什么，先凑合用，有啥问题再修好了。。。
@@ -84 +89 @@
 
 == Upgrade Notice ==
+= 1.72 =
+[优化]更新 iedie
+[优化]更新 notie
+[优化]优化目录结构
+[移除]插件回报逻辑
 = 1.69 =
 [优化]欢迎信息、版权提示采用全新提示框组件（感谢Github@egoist）

wp-plus/trunk/wp-plus.php

@@ -5 +5 @@
 Description: 优化和增强您的博客
 Author: liwanglin12
-Author URI: http://lwl12.com
-Version: 1.71
+Author URI: https://lwl12.com
+Version: 1.72
 */
 /*Exit if accessed directly:安全第一,如果是直接载入,就退出.*/
 defined('ABSPATH') or exit;
-define("plus_version", "1.71");
+define("plus_version", "1.72");
 /* 插件初始化*/
 define('WP_PLUS_URL', plugin_dir_url(__FILE__));
 register_activation_hook(__FILE__, 'plus_plugin_activate');
 register_deactivation_hook(__FILE__, 'plus_plugin_deactivate');
-add_action('plus_hook_update', 'plus_updateinfo');
 add_action('admin_init', 'plus_plugin_redirect');
-function plus_plugin_activate()
-{
-    add_option('do_activation_redirect', true);
-    for ($i = 0; $i <= 10; $i++) {
-        if (plus_post("activate") == "success") {
-            break;
-        }
-    }
-}
+
 
 function plus_plugin_redirect()
 {
-    if (!wp_next_scheduled('plus_hook_update'))
-        wp_schedule_event(time() + 60, 'hourly', 'plus_hook_update');
     if (get_option('do_activation_redirect', false)) {
         delete_option('do_activation_redirect');
@@ -84 +73 @@
     function plus_wpn_enqueue()
     {
-        wp_enqueue_style('nprogresss', WP_PLUS_URL . 'jdt/nprogress.css');
+        wp_enqueue_style('nprogresss', WP_PLUS_URL . 'css/nprogress.css?ver=' . plus_version);
         
-        wp_enqueue_script('nprogress', WP_PLUS_URL . 'jdt/nprogress.js', array(
+        wp_enqueue_script('nprogress', WP_PLUS_URL . 'js/nprogress.js?ver=' . plus_version, array(
             'jquery'
         ), '0.1.2', true);
-        wp_enqueue_script('wp-nprogress', WP_PLUS_URL . 'jdt/global.js', array(
+        wp_enqueue_script('wp-nprogress', WP_PLUS_URL . 'js/global.js?ver=' . plus_version, array(
             'jquery',
             'nprogress'
@@ -304 +293 @@
         $msg = welcome_msg();
         if ($msg !== false) {
-            echo "<script>notie('info', '$msg', true)</script>";
+            echo "<script>notie('$msg', {type:'info', autoHide:true, timeout: 5000,width:200})</script>";
         }
     }
@@ -318 +307 @@
     function plus_ietip()
     {
-        echo '<!--[if lt IE 10]><script src="//wuyongzhiyong.b0.upaiyun.com/iedie/v1.1/script.min.js"></script><![endif]-->';
+        echo '<!--[if lt IE 10]><script src="' . WP_PLUS_URL . 'js/iedie.min.js"></script><![endif]-->';
     }
     add_action('wp_head', 'plus_ietip');
@@ -366 +355 @@
     function plus_add_prismjs()
     {
-        wp_register_script('prismJS', WP_PLUS_URL . 'plus_prism.js');
+        wp_register_script('prismJS', WP_PLUS_URL . 'js/plus_prism.js?ver=' . plus_version);
         wp_enqueue_script('prismJS');
     }
     function plus_add_prismcss()
     {
-        wp_register_style('prismCSS', WP_PLUS_URL . 'plus_prism.css');
+        wp_register_style('prismCSS', WP_PLUS_URL . 'css/plus_prism.css?ver=' . plus_version);
         wp_enqueue_style('prismCSS');
     }
@@ -391 +380 @@
         if (!is_admin()) {
             wp_deregister_script('jquery');
-            wp_register_script('jquery', (WP_PLUS_URL . 'jquery.min.js'), false, null, true);
+            wp_register_script('jquery', (WP_PLUS_URL . 'js/jquery-1.8.2.min.js?ver=' . plus_version), false, null, true);
             wp_enqueue_script('jquery');
         }
@@ -408 +397 @@
     function plus_copyright()
     {
-        echo '<script>function plus_copyright(){document.body.addEventListener("copy", function (e) { if (window.getSelection().toString().length > '. get_option("wp_plus_copyright_num") .') { setClipboardText(e); notie("error", "商业转载请联系作者获得授权，非商业转载请注明出处", true); } }); function setClipboardText(event) { event.preventDefault(); var htmlData = "" + "著作权归作者所有。<br>" + "商业转载请联系作者获得授权，非商业转载请注明出处。<br>" + "作者：' . get_the_author() . '<br>" + "链接：" + window.location.href + "<br>" + "来源：' . get_bloginfo('name') . '<br><br>" + window.getSelection().toString(); var textData = "" + "著作权归作者所有。\n" + "商业转载请联系作者获得授权，非商业转载请注明出处。\n" + "作者：' . get_the_author() . '\n" + "链接：" + window.location.href + "\n" + "来源：' . get_bloginfo('name') . '\n\n" + window.getSelection().toString(); if (event.clipboardData) { event.clipboardData.setData("text/html", htmlData); event.clipboardData.setData("text/plain",textData); } else if (window.clipboardData) { return window.clipboardData.setData("text", textData); } }}</script>';
+        echo '<script>function plus_copyright(){document.body.addEventListener("copy", function (e) { if (window.getSelection().toString().length > '. get_option("wp_plus_copyright_num") .') { setClipboardText(e); notie("商业转载请联系作者获得授权，非商业转载请注明出处", {type:"error", autoHide:true, timeout: 5000,width:200}); } }); function setClipboardText(event) { event.preventDefault(); var htmlData = "" + "著作权归作者所有。<br>" + "商业转载请联系作者获得授权，非商业转载请注明出处。<br>" + "作者：' . get_the_author() . '<br>" + "链接：" + window.location.href + "<br>" + "来源：' . get_bloginfo('name') . '<br><br>" + window.getSelection().toString(); var textData = "" + "著作权归作者所有。\n" + "商业转载请联系作者获得授权，非商业转载请注明出处。\n" + "作者：' . get_the_author() . '\n" + "链接：" + window.location.href + "\n" + "来源：' . get_bloginfo('name') . '\n\n" + window.getSelection().toString(); if (event.clipboardData) { event.clipboardData.setData("text/html", htmlData); event.clipboardData.setData("text/plain",textData); } else if (window.clipboardData) { return window.clipboardData.setData("text", textData); } }}</script>';
         if (is_single()) {
             echo '<script>plus_copyright();</script>';
@@ -429 +418 @@
             $time = time() - get_the_modified_date('U');
             if ($time > get_option("wp_plus_oldpost_num") * 86400) {
-                return $content . "<script>window.plus_oldpost = function(){notie('warning', '此文章最后修订于 ". floor($time / 86400) ." 天前，其中的信息可能已经有所发展或是发生改变', true);};plus_oldpost();</script>";
+                return $content . "<script>window.plus_oldpost = function(){notie('此文章最后修订于 ". floor($time / 86400) ." 天前，其中的信息可能已经有所发展或是发生改变', {type:'warning', autoHide:true, timeout: 5000,width:200});};plus_oldpost();</script>";
             }
         }
@@ -471 +460 @@
 ?>
 <?php
-/**
- * [plus_post 用于向LWL插件统计API发送数据]
- * @param  [text] $action [动作]
- * @return [type]         [成功返回返回内容，失败返回false]
- * 请勿修改或删除此段代码，这非常重要！
- */
-function plus_post($action)
-{
-    if (get_option('wp_plus_uuid', "") == "") {
-        $chars = md5(uniqid(mt_rand(), true));
-        $uuid  = substr($chars, 0, 8) . '-';
-        $uuid .= substr($chars, 8, 4) . '-';
-        $uuid .= substr($chars, 12, 4) . '-';
-        $uuid .= substr($chars, 16, 4) . '-';
-        $uuid .= substr($chars, 20, 12);
-        add_option('wp_plus_uuid', "wp_plus_" . $uuid);
-    }
-    $args = array(
-        'uuid' => get_option('wp_plus_uuid'),
-        'url' => get_bloginfo('url'),
-        'name' => get_bloginfo('name'),
-        'version' => plus_version,
-        'action' => $action
-    );
-    
-    $response = wp_remote_post('https://api.lwl12.com/wordpress/plugin/wpplus/post.php', array(
-        'body' => $args
-    ));
-    
-    if (is_wp_error($response) || wp_remote_retrieve_response_code($response) !== 200)
-        return (false);
-    else
-        return (wp_remote_retrieve_body($response));
-}
 function plus_updateinfo()
 {
@@ -510 +465 @@
 }
 function plus_loadalert(){
-    wp_register_script('notieJS', WP_PLUS_URL . 'alert/notie.js');
+    wp_register_script('notieJS', WP_PLUS_URL . 'js/notie.min.js');
     wp_enqueue_script('notieJS');
 }