Changeset 1906488

Timestamp:

07/09/2018 02:08:01 PM (8 years ago)

Author:

devavi

Message:

Fix issues

Location:

purge-varnish

Files:

• tags/1.0.8 (added)
• tags/1.0.8/class_purge_varnish.php (added)
• tags/1.0.8/css (added)
• tags/1.0.8/css/purge_varnish.css (added)
• tags/1.0.8/images (added)
• tags/1.0.8/images/error.png (added)
• tags/1.0.8/images/ok.png (added)
• tags/1.0.8/images/purge16x16.png (added)
• tags/1.0.8/includes (added)
• tags/1.0.8/includes/expire.php (added)
• tags/1.0.8/includes/purge_all.php (added)
• tags/1.0.8/includes/purge_urls.php (added)
• tags/1.0.8/includes/terminal.php (added)
• tags/1.0.8/js (added)
• tags/1.0.8/js/purge_varnish.js (added)
• tags/1.0.8/readme.txt (added)
• tags/1.0.8/vcl (added)
• tags/1.0.8/vcl/3.x (added)
• tags/1.0.8/vcl/3.x/default.vcl (added)
• tags/1.0.8/vcl/3.x/varnish (added)
• tags/1.0.8/vcl/4.x (added)
• tags/1.0.8/vcl/4.x/default.vcl (added)
• tags/1.0.8/vcl/4.x/varnish (added)
• tags/1.0.8/vcl/5.x (added)
• tags/1.0.8/vcl/5.x/default.vcl (added)
• tags/1.0.8/vcl/5.x/varnish (added)
• trunk/class_purge_varnish.php (modified) (15 diffs)
• trunk/css/purge_varnish.css (modified) (3 diffs)
• trunk/includes/expire.php (modified) (5 diffs)
• trunk/js/purge_varnish.js (modified) (1 diff)
• trunk/readme.txt (modified) (2 diffs)

purge-varnish/trunk/class_purge_varnish.php

@@ -44 +44 @@
         if (current_user_can('manage_options')) {
             add_submenu_page('purge-varnish-settings', 'Terminal', 'Terminal', 'manage_options', 'purge-varnish-settings', array(
-             $this, 'purge_varnish_page_file_path'));
+                $this, 'purge_varnish_page_file_path'));
             add_submenu_page('purge-varnish-settings', 'Purge all', 'Purge all', 'manage_options', 'purge-varnish-all', array(
-              $this, 'purge_varnish_page_file_path'));
+                $this, 'purge_varnish_page_file_path'));
 
             add_submenu_page('purge-varnish-settings', 'Expire', 'Expire', 'manage_options', 'purge-varnish-expire', array(
-              $this, 'purge_varnish_page_file_path'));
+                $this, 'purge_varnish_page_file_path'));
         }
 
         if (current_user_can('edit_posts')) {
             add_submenu_page('purge-varnish-settings', 'Purge URLs', 'Purge URLs', 'edit_posts', 'purge-varnish-urls', array(
-              $this, 'purge_varnish_page_file_path'));
+                $this, 'purge_varnish_page_file_path'));
         }
     }
@@ -165 +165 @@
                 $result = socket_write($client, "$command\n");
                 if ($status = $this->purge_varnish_execute_command($client, $command)) {
-                    $logdata .= $status;
                     $ret[$terminal][$command] = $status;
                 }
@@ -216 +215 @@
                 error_log('Socket error: ' . socket_strerror($error), 0);
                 return array(
-                  'code' => $error,
-                  'msg' => socket_strerror($error),
+                    'code' => $error,
+                    'msg' => socket_strerror($error),
                 );
             }
@@ -224 +223 @@
 
         $status = array(
-          'code' => substr($header, 0, 3),
-          'msg' => socket_read($client, $msg_len, PHP_BINARY_READ),
+            'code' => substr($header, 0, 3),
+            'msg' => socket_read($client, $msg_len, PHP_BINARY_READ),
         );
 
@@ -273 +272 @@
             $message['error']['varnish_socket_timeout'] = esc_html('Varnish connection timeout must be a positive number.');
         }
-       
+
         $msg = '';
         if (isset($message['error']) && count($message['error'])) {
@@ -483 +482 @@
                 if (count($custom_urls)) {
                     foreach ($custom_urls as $url) {
-                        $command = $this->purge_varnish_get_command($url);
-                        $this->purge_varnish_terminal_run(array($command));
+                        $url = trim($url);
+                        if (!empty($url)) {
+                            $command = $this->purge_varnish_get_command($url);
+                            $this->purge_varnish_terminal_run(array($command));
+                        }
                     }
                 }
@@ -556 +558 @@
             $expire = unserialize($purge_varnish_expire);
             if (is_array($expire)) {
+                $uploads_path = wp_upload_dir();
                 foreach ($expire as $page) {
                     switch ($page) {
@@ -609 +612 @@
         }
 
-        if (($new_status <> $old_status) && ($new_status == 'approved' || $old_status == 'approved')) {
+        if (($new_status <> $old_status) && ($new_status == 'approved')) {
             $comment_post_id = $comment->comment_post_ID;
             $post = get_post($comment_post_id);
@@ -697 +700 @@
 
     /*
-     * Callback to purge various type of varnish objects on comment edited.
-     */
-
-    function purge_varnish_comment_post_trigger($ID) {
-        $comment = get_comment($ID);
-
-        if (!is_object($comment)) {
+     * Callback to purge publish post object whenever comment is posted
+     */
+
+    function purge_varnish_comment_insert_trigger($comment_id, $comment_object) {
+        // Cause with wp_update_nav_menu
+        if (is_object($comment_object)) {
+            $post_id = $comment_object->comment_post_ID;
+            $post = get_post($post_id);
+
+            // Halt exection if not have post object
+            $this->purge_varnish_is_post_object($post);
+            if ($post->post_status == 'publish') {
+                $this->purge_varnish_trigger_post_expire($post);
+            }
+        } else {
             return;
         }
-
-        $post_id = $comment->comment_post_ID;
-        $post = get_post($ID);
-
-        if (is_object($comment) && ($comment->comment_approved <> 1 || $post->post_status <> 'publish')) {
+    }
+
+    /*
+     * Callback to purge publish post object whenever comment is posted
+     */
+
+    function purge_varnish_comment_edit_trigger($comment_id, $comment_object) {
+        // Cause with wp_update_nav_menu
+        if (is_object($comment_object)) {
+            $post_id = $comment_object->comment_post_ID;
+            $post = get_post($post_id);
+
+            // Halt exection if not have post object
+            $this->purge_varnish_is_post_object($post);
+            if ($post->post_status == 'publish') {
+                $this->purge_varnish_trigger_post_expire($post);
+            }
+        } else {
             return;
         }
-        // Call to purge
-        $this->purge_varnish_trigger_comment_expire($post);
     }
 
@@ -800 +822 @@
     function purge_varnish_default_actions() {
         return array(
-          'post_insert_update' => 'post_updated',
-          'post_status' => 'transition_post_status',
-          'post_trash' => 'wp_trash_post',
-          'comment_insert_update' => 'comment_post',
-          'navmenu_insert_update' => 'wp_update_nav_menu',
-          'theme_switch' => 'after_switch_theme',
+            'post_insert_update' => 'post_updated',
+            'post_status' => 'transition_post_status',
+            'post_trash' => 'wp_trash_post',
+            'comment_insert' => 'wp_insert_comment',
+            'comment_update' => 'edit_comment',
+            'navmenu_insert_update' => 'wp_update_nav_menu',
+            'theme_switch' => 'after_switch_theme',
         );
     }
@@ -816 +839 @@
         $default_actions = $this->purge_varnish_default_actions();
         $additional_actions = array(
-          'comment_status_changed' => 'transition_comment_status',
+            'comment_status_changed' => 'transition_comment_status',
         );
         $actions = $default_actions + $additional_actions;
@@ -834 +857 @@
     function purge_varnish_default_tiggers() {
         return array(
-          'post_front_page' => 'front_page',
-          'post_custom_url' => 'custom_url',
-          'post_post_item' => 'post_item',
-          'post_category_page' => 'category_page',
-          'comment_front_page' => 'front_page',
-          'comment_custom_url' => 'custom_url',
-          'navmenu_front_page' => 'front_page',
-          'navmenu_custom_url' => 'custom_url',
-          'wp_theme_front_page' => 'front_page',
-          'wp_theme_custom_url' => 'custom_url',
+            'post_front_page' => 'front_page',
+            'post_custom_url' => 'custom_url',
+            'post_post_item' => 'post_item',
+            'post_category_page' => 'category_page',
+            'comment_front_page' => 'front_page',
+            'comment_custom_url' => 'custom_url',
+            'navmenu_front_page' => 'front_page',
+            'navmenu_custom_url' => 'custom_url',
+            'wp_theme_front_page' => 'front_page',
+            'wp_theme_custom_url' => 'custom_url',
         );
     }
@@ -854 +877 @@
         $default_tiggers = $this->purge_varnish_default_tiggers();
         $additional_tiggers = array(
-          'comment_post_item' => 'post_item',
-          'navmenu_menu_link' => 'post_item',
-          'wp_theme_purge_all' => 'purge_all',
-          'post_custom_urls' => '?',
-          'comment_custom_urls' => '?',
-          'navmenu_custom_urls' => '?',
-          'wp_theme_custom_urls' => '?',
+            'comment_post_item' => 'post_item',
+            'navmenu_menu_link' => 'menu_item',
+            'wp_theme_purge_all' => 'purge_all',
+            'post_custom_urls' => '?',
+            'comment_custom_urls' => '?',
+            'navmenu_custom_urls' => '?',
+            'wp_theme_custom_urls' => '?',
         );
         $tiggers = $default_tiggers + $additional_tiggers;
@@ -939 +962 @@
 if (!empty($purge_varnish_action)) {
     $actions = unserialize($purge_varnish_action);
-    if (is_array($actions)) {
+    if (is_array($actions)) {       
         foreach ($actions as $action) {
             switch ($action) {
@@ -957 +980 @@
                     break;
 
-                case 'comment_post':
-                    add_action($action, array($purge_varnish, 'purge_varnish_comment_post_trigger'));
+                case 'wp_insert_comment':
+                    add_action($action, array($purge_varnish, 'purge_varnish_comment_insert_trigger'), 10, 3);
+                    break;
+
+                case 'edit_comment':
+                    add_action($action, array($purge_varnish, 'purge_varnish_comment_edit_trigger'), 10, 3);
                     break;
 

purge-varnish/trunk/css/purge_varnish.css

@@ -1 +1 @@
 .purge_varnish
 {
-  width: 90%;
-  padding-left: 2px;
+    width: 98%;
+    padding-left: 2px;
 }
 .purge_varnish table
 {
-  width: 80%;
+    width: 98%;
 }
 .purge_varnish .screen
 {
-  background-color: #fff;
-  padding-bottom: 30px;
+    background-color: #fff;
+    padding-bottom: 30px;
 }
 .purge_varnish h2
 {
-  background-image: url("../images/purge16x16.png");
-  background-position: left 8px center;
-  background-repeat: no-repeat;
-  margin: 15px 0 0;
-  padding: 9px 0 9px 30px;
+    background-image: url("../images/purge16x16.png");
+    background-position: left 8px center;
+    background-repeat: no-repeat;
+    margin: 15px 0 0;
+    padding: 9px 0 9px 30px;
 }
 .purge_varnish .screen .desc
 {
-  padding-left: 23px; 
-  color: #777;
+    padding-left: 23px; 
+    color: #777;
 }
 
 .terminal_desc
 {
-  padding-top: 3px; 
-  color: #777;
+    padding-top: 3px; 
+    color: #777;
 }
 
 .purge_varnish table th{
-  text-align: right;
-  padding-right: 20px;
+    text-align: right;
+    vertical-align: text-top;
 }
 .purge_varnish table td{
-  text-align: left;
-  padding-right: 20px;
+    text-align: left;
+    vertical-align: text-top;
 }
 
 .purge_varnish input[type=text], .purge_varnish select {
-  width: 350px;
-  border: 1px solid #0073AA;
-  border-left: 4px solid #1d8ccc;
+    width: 350px;
+    border: 1px solid #0073AA;
+    border-left: 4px solid #1d8ccc;
 }
 
 .purge_varnish input[type=checkbox]{
-  border: 1px solid #0073AA;
-  border-left: 4px solid #1d8ccc;
+    border: 2px solid #0073AA;
+/*    border-left: 4px solid #1d8ccc;*/
 }
 
 .purge_varnish code
 {
-  border-left: 4px solid #1d8ccc;
-  padding: 4px;
-  font-size: 14px;
+    border-left: 4px solid #1d8ccc;
+    padding: 4px;
+    font-size: 14px;
 }
 .purge_varnish input[type=submit] {
@@ -73 +73 @@
     transition-timing-function: ease-in;
 }
-ul.tab {
-  border-left: 5px solid #fff;
-  border-right: 5px solid #fff; 
-  list-style-type: none;
-  margin: 0;
-  padding: 0;
-  overflow: hidden;
-  border-top: none;
-  background-color: #f1f1f1;
+ul.tab {    
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+    overflow: hidden;
+    border-top: none;
+    background-color: #f1f1f1;
 }
 
 /* Float the list items side by side */
 ul.tab li {
-  float: left;
-  border-right: #eee;
+    float: left;
+    border-right: #eee;
 }
 
 /* Style the links inside the list items */
 ul.tab li a {
-  display: inline-block;
-  color: black;
-  text-align: center;
-  padding: 14px 16px;
-  text-decoration: none;
-  transition: 0.3s;
-  font-size: 17px;
+    display: inline-block;
+    color: black;
+    text-align: center;
+    padding: 10px 30px;
+    text-decoration: none;
+    transition: 0.3s;
+    font-size: 17px;
 }
 
 /* Change background color of links on hover */
 ul.tab li a:hover {
-  background-color: #ddd;
+    background-color: #ddd;
 }
 
 /* Create an active/current tablink class */
 ul.tab li a:focus, .active {
-  background-color: #ccc;
+    background-color: #ccc;
 }
 
 /* Style the tab content */
 .tabcontent {
-  border-style:none!important;;
-  display: none;
-  padding: 6px 12px;
-  border: 1px solid #ccc;
-  border-top: none;
+    border-style:none!important;;
+    display: none;
+    padding: 6px 12px;
+    border: 1px solid #ccc;
+    border-top: none;
 }
 
 .tablinks{
-  font-weight: bold; 
-  font-size: 20px;
+    font-weight: bold; 
+    font-size: 20px;
 }
 #wpbody-content dd, li {
@@ -129 +127 @@
 .hide_custom_url {display: none;}
 .show_custom_url {display: block;}
+
+/*input[type="checkbox"][readonly] {
+    pointer-events: none;
+}*/
+
+
+table.expiration tr td{
+    border-bottom: 1px  solid #ccc;
+    padding-bottom: 20px;
+}
+table.expiration tr td:first-child{
+    background-color: #fbfbfb;
+}
+tr.expiration td{
+    padding-top: 20px;
+    background-color: #fbfbfb;
+}

purge-varnish/trunk/includes/expire.php

@@ -13 +13 @@
     if ($purge_varnish->purge_varnish_nonce('pvEsetting') == true) {
         $post_actions = (array) $_POST['purge_varnish_action'];
+
         $sanitize_actions = $purge_varnish->purge_varnish_sanitize_actions($post_actions);
         update_option('purge_varnish_action', serialize($sanitize_actions));
@@ -27 +28 @@
 $post_status = '';
 $post_trash = '';
-$comment_insert_update = '';
+$comment_insert = '';
+$comment_update = '';
 $comment_status_changed = '';
 $navmenu_insert_update = '';
@@ -36 +38 @@
     $post_status = isset($action['post_status']) ? $action['post_status'] : '';
     $post_trash = isset($action['post_trash']) ? $action['post_trash'] : '';
-    $comment_insert_update = isset($action['comment_insert_update']) ? $action['comment_insert_update'] : '';
+    $comment_insert = isset($action['comment_insert']) ? $action['comment_insert'] : '';
+    $comment_update = isset($action['comment_update']) ? $action['comment_update'] : '';
     $comment_status_changed = isset($action['comment_status_changed']) ? $action['comment_status_changed'] : '';
     $navmenu_insert_update = isset($action['navmenu_insert_update']) ? $action['navmenu_insert_update'] : '';
@@ -149 +152 @@
                                     <input type="checkbox" name="purge_varnish_expire[post_custom_url]" value="custom_url" <?php print $expire_post_checked; ?> class="ck_custom_url" /> <label><?php esc_html_e('Custom URLs'); ?></label> <br />
                                     <span class="desc"><?php esc_html_e('Expire user-defined custom urls.'); ?></span>
-                                <div class="custom_url <?php print $expire_post_custom_url_class; ?>"><b>Enter custom URLs </b>
+                                <div class="custom_url <?php print $expire_post_custom_url_class; ?>">
                                     <textarea rows="3" cols="70" name="purge_varnish_expire[post_custom_urls]" class="input_custom_urls"><?php print $expire_post_custom_urls; ?></textarea>
                                     <div>
@@ -157 +160 @@
                                         </tbody>
                                         </table>
-                                    </div>
-
-                                    <div id="comment_expiration" class="tabcontent">
-                                        <h3><?php esc_html_e('Comment expiration'); ?></h3>
-                                        <table cellpadding="5">
-                                            <tbody>
-                                                <tr>
-                                                    <th width="20%"></th>
-                                                    <td width="80%">
-                                                        <b><?php esc_html_e('Comment actions') ?></b>
-                                                        <p>
-                                                            <input type="checkbox" name="purge_varnish_action[comment_insert_update]" value="comment_post" <?php
-                                                            if ($comment_insert_update == 'comment_post') {
-                                                                print 'checked="checked"';
-                                                            }
-                                                            ?> /> <label><?php esc_html_e('Comment insert/update'); ?></label> <br /> <span class="desc"><?php esc_html_e('Trigger when approved comment is posted on approved post.'); ?></span><br />
-
-                                                            <input type="checkbox" name="purge_varnish_action[comment_status_changed]" value="transition_comment_status" <?php
-                                                            if ($comment_status_changed == 'transition_comment_status') {
-                                                                print 'checked="checked"';
-                                                            }
-                                                            ?> /> <label><?php esc_html_e('Comment status changed'); ?></label> <br /><span class="desc"><?php esc_html_e('Trigger when comment is approved/unapproved.'); ?></span><br />
-
-                                                        </p>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <th> </th>
-                                                    <td>
-                                                        <b><?php esc_html_e('What URLs should be expired when comment action is triggered?'); ?></b>
-                                                        <p>
-                                                            <input type="checkbox" name="purge_varnish_expire[comment_front_page]" value="front_page" <?php
-                                                            if ($expire_comment_front_page == 'front_page') {
-                                                                print 'checked="checked"';
-                                                            }
-                                                            ?> /> <label><?php esc_html_e('Front page'); ?></label> <br /><span class="desc"><?php esc_html_e('Expire url of the site front page'); ?></span><br />
-                                                            <input type="checkbox" name="purge_varnish_expire[comment_post_item]" value="post_item" <?php
-                                                            if ($expire_comment_post_item == 'post_item') {
-                                                                print 'checked="checked"';
-                                                            }
-                                                            ?> /> <label><?php esc_html_e('Post page'); ?></label> <br /> <span class="desc"><?php esc_html_e('Expire url of the expiring post/page'); ?></span><br />
-
-                                                            <?php
-                                                            $expire_comment_custom_url_class = 'hide_custom_url';
-                                                            $expire_comment_checked = '';
-                                                            if ($expire_comment_custom_url == 'custom_url') {
-                                                                $expire_comment_checked = 'checked="checked"';
-                                                                $expire_comment_custom_url_class = 'show_custom_url';
-                                                            }
-                                                            ?>
-                                                            <input type="checkbox" name="purge_varnish_expire[comment_custom_url]" value="custom_url" <?php print $expire_comment_checked; ?> class="ck_custom_url" /> <label><?php esc_html_e('Custom URLs'); ?></label> <br />
-                                                            <span class="desc"><?php esc_html_e('Expire user-defined custom urls.'); ?></span><br />
-                                                        <div class="custom_url <?php print $expire_comment_custom_url_class; ?>"><b>Enter custom URLs </b>
-                                                            <textarea rows="3" cols="70" name="purge_varnish_expire[comment_custom_urls]" class="input_custom_urls"><?php print $expire_comment_custom_urls; ?></textarea>
-                                                        </div>
-                                                        </p>
-                                                    </td>
-                                                </tr>
-                                            </tbody>
-                                        </table>
-                                    </div>
-
-                                    <div id="menu_expiration" class="tabcontent">
-                                        <h3><?php esc_html_e('Menu links expiration'); ?></h3>
-                                        <table cellpadding="5">
-                                            <tbody>
-                                                <tr>
-                                                    <th width="20%"></th>
-                                                    <td width="80%">
-                                                        <b><?php esc_html_e('Menu link actions') ?></b>
-                                                        <p>
-                                                            <input type="checkbox" name="purge_varnish_action[navmenu_insert_update]" value="wp_update_nav_menu" <?php
-                                                            if ($navmenu_insert_update == 'wp_update_nav_menu') {
-                                                                print 'checked="checked"';
-                                                            }
-                                                            ?> /> <label><?php esc_html_e('Menu link insert/update/delete'); ?></label> <br /> <span class="desc"><?php esc_html_e('Trigger on menu save action.'); ?></span><br />
-                                                        </p>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <th> </th>
-                                                    <td>
-                                                        <b><?php esc_html_e('What URLs should be expired when menu save action is triggered?') ?></b>
-                                                        <p>
-                                                            <input type="checkbox" name="purge_varnish_expire[navmenu_front_page]" value="front_page" <?php
-                                                            if ($expire_navmenu_front_page == 'front_page') {
-                                                                print 'checked="checked"';
-                                                            }
-                                                            ?> /> <label><?php esc_html_e('Front page'); ?></label> <br /><span class="desc"><?php esc_html_e('Expire url of the site front page'); ?></span><br />
-                                                            <input type="checkbox" name="purge_varnish_expire[navmenu_menu_link]" value="post_item" <?php
-                                                            if ($expire_navmenu_link == 'post_item') {
-                                                                print 'checked="checked"';
-                                                            }
-                                                            ?> /> <label><?php esc_html_e('Menu links'); ?></label> <br /> <span class="desc"><?php esc_html_e('Expire url of menu links'); ?></span><br />
-
-                                                            <?php
-                                                            $expire_navmenu_custom_url_class = 'hide_custom_url';
-                                                            $expire_navmenu_checked = '';
-                                                            if ($expire_navmenu_custom_url == 'custom_url') {
-                                                                $expire_navmenu_checked = 'checked="checked"';
-                                                                $expire_navmenu_custom_url_class = 'show_custom_url';
-                                                            }
-                                                            ?>
-                                                            <input type="checkbox" name="purge_varnish_expire[navmenu_custom_url]" value="custom_url" <?php print $expire_navmenu_checked; ?> class="ck_custom_url" /> <label><?php esc_html_e('Custom URLs'); ?></label> <br />
-                                                            <span class="desc"><?php esc_html_e('Expire user-defined custom urls.'); ?></span><br />
-                                                        <div class="custom_url <?php print $expire_navmenu_custom_url_class; ?>"><b>Enter custom URLs </b>
-                                                            <textarea rows="3" cols="70" name="purge_varnish_expire[navmenu_custom_urls]" class="input_custom_urls"><?php print $expire_navmenu_custom_urls; ?></textarea>
-                                                        </div>
-                                                        </p>
-                                                    </td>
-                                                </tr>
-                                            </tbody>
-                                        </table>
-                                    </div>
-
-                                    <div id="switch_theme" class="tabcontent">
-                                        <h3><?php esc_html_e('Switch theme expiration'); ?></h3>
-                                        <table cellpadding="5">
-                                            <tbody>
-                                                <tr>
-                                                    <th width="20%"></th>
-                                                    <td width="80%">
-                                                        <b><?php esc_html_e('Theme actions') ?></b>
-                                                        <p>
-                                                            <input type="checkbox" name="purge_varnish_action[theme_switch]" value="after_switch_theme" <?php
-                                                            if ($switch_theme == 'after_switch_theme') {
-                                                                print 'checked="checked"';
-                                                            }
-                                                            ?> /> <label><?php esc_html_e('switch theme'); ?></label> <br /><span class="desc"><?php esc_html_e('Trigger when theme is switched.'); ?></span><br />
-                                                        </p>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <th> </th>
-                                                    <td>
-                                                        <b><?php esc_html_e('What URLs should be expired when theme switch action is triggered?') ?></b>
-                                                        <p>
-                                                            <input type="checkbox" name="purge_varnish_expire[wp_theme_front_page]" value="front_page" <?php
-                                                            if ($expire_wp_theme_front_page == 'front_page') {
-                                                                print 'checked="checked"';
-                                                            }
-                                                            ?> /> <label><?php esc_html_e('Front page') ?></label> <br /><span class="desc"><?php esc_html_e('Expire url of the site front page'); ?></span><br />
-                                                            <input type="checkbox" name="purge_varnish_expire[wp_theme_purge_all]" value="purge_all" <?php
-                                                            if ($expire_wp_theme_purge_all == 'purge_all') {
-                                                                print 'checked="checked"';
-                                                            }
-                                                            ?> class="ck_custom_url" /> <label>All varnish cache</label> <br /> <span class="desc"><?php esc_html_e('Expire/Purge all varnish cache'); ?></span><br />                              
-
-                                                            <?php
-                                                            $expire_wp_theme_custom_url_class = 'hide_custom_url';
-                                                            $expire_wp_theme_checked = '';
-                                                            if ($expire_wp_theme_custom_url == 'custom_url') {
-                                                                $expire_wp_theme_checked = 'checked="checked"';
-                                                                $expire_wp_theme_custom_url_class = 'show_custom_url';
-                                                            }
-                                                            ?>
-                                                            <input type="checkbox" name="purge_varnish_expire[wp_theme_custom_url]" value="custom_url" <?php print $expire_wp_theme_checked; ?> class="ck_custom_url" /> <label><?php esc_html_e('Custom URLs'); ?></label> <br />
-                                                            <span class="desc"><?php esc_html_e('Expire user-defined custom urls.'); ?></span><br />
-                                                        <div class="custom_url <?php print $expire_wp_theme_custom_url_class; ?>"><b>Enter custom URLs </b>
-                                                            <textarea rows="3" cols="70" name="purge_varnish_expire[wp_theme_custom_urls]" class="input_custom_urls"><?php print $expire_wp_theme_custom_urls; ?></textarea>
-                                                        </div>
-                                                        </p>
-                                                    </td>
-                                                </tr>
-                                            </tbody>
-                                        </table>
-                                    </div>
-                                    <table cellpadding="5">
-                                        <tr>
-                                            <th width="20%"></th>
-                                            <td>
-                                                <?php wp_nonce_field('pvEsetting'); ?>
-                                                <input type="submit" value="Save Configurations" name="save_configurations" />
-                                            </td>
-                                        </tr>
-                                    </table>
-                                    </form>
-                                </div>
-                                </div>
+            </div>
+
+            <div id="comment_expiration" class="tabcontent">
+            <h3><?php esc_html_e('Comment expiration'); ?></h3>
+            <table cellpadding="5">
+                <tbody>
+                    <tr>
+                        <th width="20%"></th>
+                        <td width="80%">
+                            <b><?php esc_html_e('Comment actions') ?></b>
+                            <p>
+                                <input type="checkbox" name="purge_varnish_action[comment_insert]" value="wp_insert_comment" <?php
+                                if ($comment_insert == 'wp_insert_comment') {
+                                    print 'checked="checked"';
+                                }
+                                ?> /> <label><?php esc_html_e('Comment inserted'); ?></label> <br /> <span class="desc"><?php esc_html_e('Trigger when comment is posted on approved post.'); ?></span><br />
+
+
+                                <input type="checkbox" name="purge_varnish_action[comment_update]" value="edit_comment" <?php
+                                if ($comment_update == 'edit_comment') {
+                                    print 'checked="checked"';
+                                }
+                                ?> /> <label><?php esc_html_e('Comment updated'); ?></label> <br /> <span class="desc"><?php esc_html_e('Trigger on approved post whenever comment is updated.'); ?></span><br />
+
+
+
+
+                                <input type="checkbox" name="purge_varnish_action[comment_status_changed]" value="transition_comment_status" <?php
+                                if ($comment_status_changed == 'transition_comment_status') {
+                                    print 'checked="checked"';
+                                }
+                                ?> /> <label><?php esc_html_e('Comment status changed'); ?></label> <br /><span class="desc"><?php esc_html_e('Trigger when comment is approved/unapproved.'); ?></span><br />
+
+                            </p>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th> </th>
+                        <td>
+                            <b><?php esc_html_e('What URLs should be expired when comment action is triggered?'); ?></b>
+                            <p>
+                                <input type="checkbox" name="purge_varnish_expire[comment_front_page]" value="front_page" <?php
+                                if ($expire_comment_front_page == 'front_page') {
+                                    print 'checked="checked"';
+                                }
+                                ?> /> <label><?php esc_html_e('Front page'); ?></label> <br /><span class="desc"><?php esc_html_e('Expire url of the site front page'); ?></span><br />
+                                <input type="checkbox" name="purge_varnish_expire[comment_post_item]" value="post_item" <?php
+                                if ($expire_comment_post_item == 'post_item') {
+                                    print 'checked="checked"';
+                                }
+                                ?> /> <label><?php esc_html_e('Post page'); ?></label> <br /> <span class="desc"><?php esc_html_e('Expire url of the expiring post/page'); ?></span><br />
+
+                                <?php
+                                $expire_comment_custom_url_class = 'hide_custom_url';
+                                $expire_comment_checked = '';
+                                if ($expire_comment_custom_url == 'custom_url') {
+                                    $expire_comment_checked = 'checked="checked"';
+                                    $expire_comment_custom_url_class = 'show_custom_url';
+                                }
+                                ?>
+                                <input type="checkbox" name="purge_varnish_expire[comment_custom_url]" value="custom_url" <?php print $expire_comment_checked; ?> class="ck_custom_url" /> <label><?php esc_html_e('Custom URLs'); ?></label> <br />
+                                <span class="desc"><?php esc_html_e('Expire user-defined custom urls.'); ?></span><br />
+                            <div class="custom_url <?php print $expire_comment_custom_url_class; ?>">
+                                <textarea rows="3" cols="70" name="purge_varnish_expire[comment_custom_urls]" class="input_custom_urls"><?php print $expire_comment_custom_urls; ?></textarea>
+                            </div>
+                            </p>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+
+        <div id="menu_expiration" class="tabcontent">
+            <h3><?php esc_html_e('Menu links expiration'); ?></h3>
+            <table cellpadding="5">
+                <tbody>
+                    <tr>
+                        <th width="20%"></th>
+                        <td width="80%">
+                            <b><?php esc_html_e('Menu link actions') ?></b>
+                            <p>
+                                <input type="checkbox" name="purge_varnish_action[navmenu_insert_update]" value="wp_update_nav_menu" <?php
+                                if ($navmenu_insert_update == 'wp_update_nav_menu') {
+                                    print 'checked="checked"';
+                                }
+                                ?> /> <label><?php esc_html_e('Menu link insert/update/delete'); ?></label> <br /> <span class="desc"><?php esc_html_e('Trigger on menu save action.'); ?></span><br />
+                            </p>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th> </th>
+                        <td>
+                            <b><?php esc_html_e('What URLs should be expired when menu save action is triggered?') ?></b>
+                            <p>
+                                <input type="checkbox" name="purge_varnish_expire[navmenu_front_page]" value="front_page" <?php
+                                if ($expire_navmenu_front_page == 'front_page') {
+                                    print 'checked="checked"';
+                                }
+                                ?> /> <label><?php esc_html_e('Front page'); ?></label> <br /><span class="desc"><?php esc_html_e('Expire url of the site front page'); ?></span><br />
+                                <input type="checkbox" name="purge_varnish_expire[navmenu_menu_link]" value="menu_item" <?php
+                                if ($expire_navmenu_link == 'menu_item') {
+                                    print 'checked="checked"';
+                                }
+                                ?> /> <label><?php esc_html_e('Menu links'); ?></label> <br /> <span class="desc"><?php esc_html_e('Expire url of menu links'); ?></span><br />
+
+                                <?php
+                                $expire_navmenu_custom_url_class = 'hide_custom_url';
+                                $expire_navmenu_checked = '';
+                                if ($expire_navmenu_custom_url == 'custom_url') {
+                                    $expire_navmenu_checked = 'checked="checked"';
+                                    $expire_navmenu_custom_url_class = 'show_custom_url';
+                                }
+                                ?>
+                                <input type="checkbox" name="purge_varnish_expire[navmenu_custom_url]" value="custom_url" <?php print $expire_navmenu_checked; ?> class="ck_custom_url" /> <label><?php esc_html_e('Custom URLs'); ?></label> <br />
+                                <span class="desc"><?php esc_html_e('Expire user-defined custom urls.'); ?></span><br />
+                            <div class="custom_url <?php print $expire_navmenu_custom_url_class; ?>">
+                                <textarea rows="3" cols="70" name="purge_varnish_expire[navmenu_custom_urls]" class="input_custom_urls"><?php print $expire_navmenu_custom_urls; ?></textarea>
+                            </div>
+                            </p>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+
+        <div id="switch_theme" class="tabcontent">
+            <h3><?php esc_html_e('Switch theme expiration'); ?></h3>
+            <table cellpadding="5">
+                <tbody>
+                    <tr>
+                        <th width="20%"></th>
+                        <td width="80%">
+                            <b><?php esc_html_e('Theme actions') ?></b>
+                            <p>
+                                <input type="checkbox" name="purge_varnish_action[theme_switch]" value="after_switch_theme" <?php
+                                if ($switch_theme == 'after_switch_theme') {
+                                    print 'checked="checked"';
+                                }
+                                ?> /> <label><?php esc_html_e('switch theme'); ?></label> <br /><span class="desc"><?php esc_html_e('Trigger when theme is switched.'); ?></span><br />
+                            </p>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th> </th>
+                        <td>
+                            <b><?php esc_html_e('What URLs should be expired when theme switch action is triggered?') ?></b>
+                            <p>
+                                <input type="checkbox" name="purge_varnish_expire[wp_theme_front_page]" value="front_page" <?php
+                                if ($expire_wp_theme_front_page == 'front_page') {
+                                    print 'checked="checked"';
+                                }
+                                ?> /> <label><?php esc_html_e('Front page') ?></label> <br /><span class="desc"><?php esc_html_e('Expire url of the site front page'); ?></span><br />
+                                <input type="checkbox" name="purge_varnish_expire[wp_theme_purge_all]" value="purge_all" <?php
+                                if ($expire_wp_theme_purge_all == 'purge_all') {
+                                    print 'checked="checked"';
+                                }
+                                ?> class="ck_custom_url" /> <label>All varnish cache</label> <br /> <span class="desc"><?php esc_html_e('Expire/Purge all varnish cache'); ?></span><br />                              
+
+                                <?php
+                                $expire_wp_theme_custom_url_class = 'hide_custom_url';
+                                $expire_wp_theme_checked = '';
+                                if ($expire_wp_theme_custom_url == 'custom_url') {
+                                    $expire_wp_theme_checked = 'checked="checked"';
+                                    $expire_wp_theme_custom_url_class = 'show_custom_url';
+                                }
+                                ?>
+                                <input type="checkbox" name="purge_varnish_expire[wp_theme_custom_url]" value="custom_url" <?php print $expire_wp_theme_checked; ?> class="ck_custom_url" /> <label><?php esc_html_e('Custom URLs'); ?></label> <br />
+                                <span class="desc"><?php esc_html_e('Expire user-defined custom urls.'); ?></span><br />
+                            <div class="custom_url <?php print $expire_wp_theme_custom_url_class; ?>">
+                                <textarea rows="3" cols="70" name="purge_varnish_expire[wp_theme_custom_urls]" class="input_custom_urls"><?php print $expire_wp_theme_custom_urls; ?></textarea>
+                            </div>
+                            </p>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+        <table cellpadding="5">
+            <tr>
+                <th width="20%"></th>
+                <td>
+                    <?php wp_nonce_field('pvEsetting'); ?>
+                    <input type="submit" value="Save Configurations" name="save_configurations" />
+                </td>
+            </tr>
+        </table>
+        </form>
+    </div>
+</div>

purge-varnish/trunk/js/purge_varnish.js

@@ -14 +14 @@
     }
 });
-
   
 });

purge-varnish/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 4.0
 Tested up to: 4.8.1
-Stable tag: 1.0.7
+Stable tag: 1.0.8
 License: GPLv2 or later
 
@@ -108 +108 @@
 == ChangeLog ==
 
+= 1.0.8 =
+
+Fix: 
+1.  Wrong number of arguments’ errors filling up logs.
+2.  Purge Varnish cache on comment post/update on published post.
 
 = 1.0.7 =