Changeset 3125304

Timestamp:

07/25/2024 01:12:56 PM (8 months ago)

Author:

simpleform

Message:

refactor: code rewritten following the coding standards
fix: general errors
feat: entry status column

Location:

simpleform-contact-form-submissions

Files:

• tags/2.1.0 (added)
• tags/2.1.0/admin (added)
• tags/2.1.0/admin/class-simpleform-submissions-admin.php (added)
• tags/2.1.0/admin/css (added)
• tags/2.1.0/admin/css/admin.css (added)
• tags/2.1.0/admin/includes (added)
• tags/2.1.0/admin/includes/class-simpleform-data-management.php (added)
• tags/2.1.0/admin/includes/class-simpleform-entries-list-actions.php (added)
• tags/2.1.0/admin/includes/class-simpleform-entries-list-extender.php (added)
• tags/2.1.0/admin/includes/class-simpleform-entries-list-utils.php (added)
• tags/2.1.0/admin/includes/class-simpleform-entries-list.php (added)
• tags/2.1.0/admin/includes/class-simpleform-submissions-admin-validation.php (added)
• tags/2.1.0/admin/includes/class-simpleform-submissions-management.php (added)
• tags/2.1.0/admin/includes/class-simpleform-submissions-util.php (added)
• tags/2.1.0/admin/includes/index.php (added)
• tags/2.1.0/admin/index.php (added)
• tags/2.1.0/admin/js (added)
• tags/2.1.0/admin/js/admin.js (added)
• tags/2.1.0/admin/partials (added)
• tags/2.1.0/admin/partials/entry.php (added)
• tags/2.1.0/admin/partials/index.php (added)
• tags/2.1.0/changelog.txt (added)
• tags/2.1.0/includes (added)
• tags/2.1.0/includes/class-simpleform-submissions-activator.php (added)
• tags/2.1.0/includes/class-simpleform-submissions-deactivator.php (added)
• tags/2.1.0/includes/class-simpleform-submissions-loader.php (added)
• tags/2.1.0/includes/class-simpleform-submissions.php (added)
• tags/2.1.0/includes/index.php (added)
• tags/2.1.0/index.php (added)
• tags/2.1.0/languages (added)
• tags/2.1.0/languages/readme.txt (added)
• tags/2.1.0/license.txt (added)
• tags/2.1.0/public (added)
• tags/2.1.0/public/class-simpleform-submissions-public.php (added)
• tags/2.1.0/public/index.php (added)
• tags/2.1.0/readme.txt (added)
• tags/2.1.0/simpleform-submissions.php (added)
• tags/2.1.0/uninstall.php (added)
• trunk/README.txt (modified) (4 diffs)
• trunk/admin/class-simpleform-submissions-admin.php (added)
• trunk/admin/css/admin.css (modified) (11 diffs)
• trunk/admin/includes (added)
• trunk/admin/includes/class-simpleform-data-management.php (added)
• trunk/admin/includes/class-simpleform-entries-list-actions.php (added)
• trunk/admin/includes/class-simpleform-entries-list-extender.php (added)
• trunk/admin/includes/class-simpleform-entries-list-utils.php (added)
• trunk/admin/includes/class-simpleform-entries-list.php (added)
• trunk/admin/includes/class-simpleform-submissions-admin-validation.php (added)
• trunk/admin/includes/class-simpleform-submissions-management.php (added)
• trunk/admin/includes/class-simpleform-submissions-util.php (added)
• trunk/admin/includes/index.php (added)
• trunk/admin/index.php (modified) (1 diff)
• trunk/admin/js/admin.js (modified) (1 diff)
• trunk/admin/partials/entry.php (modified) (1 diff)
• trunk/admin/partials/index.php (modified) (1 diff)
• trunk/changelog.txt (modified) (1 diff)
• trunk/includes/class-simpleform-submissions-activator.php (added)
• trunk/includes/class-simpleform-submissions-deactivator.php (added)
• trunk/includes/class-simpleform-submissions-loader.php (added)
• trunk/includes/class-simpleform-submissions.php (added)
• trunk/includes/index.php (modified) (1 diff)
• trunk/index.php (modified) (1 diff)
• trunk/public/class-simpleform-submissions-public.php (added)
• trunk/public/index.php (modified) (1 diff)
• trunk/simpleform-submissions.php (modified) (2 diffs)
• trunk/uninstall.php (modified) (1 diff)

simpleform-contact-form-submissions/trunk/README.txt

@@ -1 +1 @@
 === SimpleForm Contact Form Submissions ===
-Contributors: simpleform
-Donate link: https://wpsform.com/
-Tags: contact form, email manager, crm, database, simpleform addon, emails, comments, feedback, wordpress form plugin, simple, form builder, form maker
-Requires at least: 5.6
-Tested up to: 5.9
-Requires PHP: 5.6
-Stable tag: 2.0.1
+Contributors: simpleform, gianpic
+Donate link: paypal.me/simpleformdonation
+Tags: contact form, emails manager, comments, database, simpleform addon
+Requires at least: 5.9
+Tested up to: 6.6
+Requires PHP: 7.4
+Stable tag: 2.1.0
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -86 +86 @@
 
 == Changelog ==
+
+= 2.1.0 (25 July 2024) =
+* Changed: code refactoring
+* Fixed: general errors
+* Added: entry status column
+
+= 2.0.2 (30 March 2022) =
+* Fixed: PHP error while deactivating the plugin
 
 = 2.0.1 (29 March 2022) =
@@ -214 +222 @@
 == Upgrade Notice ==
 
-This version requires SimpleForm version 1.10.6 or greater installed. If you have not yet done so, please update SimpleForm to make it work properly!
+This version requires SimpleForm version 2.2.0 or greater installed. If you have not yet done so, please update SimpleForm to make it work properly!
 
 == Demo ==
  
-You don’t know SimpleForm yet? Check out our [Demo](https://wpsform.com/demo/) and find out how it works.
+You don’t know SimpleForm yet? Check out our [Demo]() and find out how it works.
 
 == Credits ==
@@ -224 +232 @@
 We wish to thank everyone who has contributed to SimpleForm Contact Form Submissions translations. We really appreciate your time, your help and your suggestions.
 
-[See all contributors](https://wpsform.com/contributors/).
+[See all contributors]().

simpleform-contact-form-submissions/trunk/admin/css/admin.css

@@ -55 +55 @@
 .tablenav .one-page .displaying-num { margin: 7px 0; }
 #screen-options-wrap.hidden { display: none; }
-
-/* Message page */
+.tablenav select, .search-box input[name="s"] { margin-right: 6px; }
+
+/* Entry page */
 #navigation-buttons { position: relative; margin-bottom: 10px; padding: 0 4px; }
 #messages-nav { text-align: center; padding-top: 10px; height: 20px; position: relative; }
@@ -82 +83 @@
 #navigation-buttons.foggy #messages-nav a:hover { color: #8993ab; }
 #navigation-buttons.polar #messages-nav a:hover { color: #53a0de; }
-
-
-
-
-
-
 .paginated span { font-weight: 600; transition: none !important; }
 #prev { position: absolute; left: 0; }
@@ -110 +105 @@
 .plaintext.toggle { position: relative; }
 .dashicons.contact-info { float: right; }
-
-    
-    
-    
 #toggle-info, #toggle-message { cursor: pointer; }
 #toggle-info:after, #toggle-message:after { display: block; opacity: 0; pointer-events: none; position: absolute; line-height: 21px; content: attr(data-title); font-weight: 300; font-size: 13px; transform: scale3d(.2,.2,1); transition: all .2s ease-in-out; }
@@ -142 +133 @@
 .switch-box { display: inline-table; width: 100%; position: relative; height: 20px; line-height: 20px; }
 .switch-input { position: relative; display: inline-block; float: left; margin-right: 10px; width: 40px; height: 20px; }
-.switch-input input { top: 2px; left: 4px; margin: 0; position: absolute; opacity: 0 !important; width: 20px; height: 20px; } 
+.switch-input input { top: 2px; left: 4px; margin: 0; position: absolute; opacity: 0 !important; width: 20px; height: 20px; }
 .switch-input input:active + span { outline: 0; box-shadow: none; }
-.switch-label{ display: inline-block; vertical-align: middle; width: calc(100% - 50px); } 
+.switch-label{ display: inline-block; vertical-align: middle; width: calc(100% - 50px); }
 .switch-input input + span{ position: absolute; z-index: 1; cursor: pointer; top: 0; left: 0; right: 0; bottom: 0; background: #dcdfe6; -webkit-transition: .4s; transition: .4s; -moz-transition: .4s; -o-transition: .4s; border-radius:20px; border: 2px solid #dcdfe6; }
 .switch-input input + span:before { position: absolute; content: ""; height: 16px; width: 16px; background-color: #FFF; -webkit-transition: .4s; transition: .4s; -moz-transition: .4s; -o-transition: .4s; border-radius: 50%; }
 .switch-input input:checked + span:before { -webkit-transform: translateX(20px); -ms-transform: translateX(20px); transform: translateX(20px); }
 .checkmark { position: absolute; cursor: pointer; top: 0; left: 0; height: 20px; width: 20px; border-radius: 4px; background-color: #dcdfe6; border: 2px solid #dcdfe6; }
+label.disabled { cursor: default; }
+label.disabled > .checkmark { cursor: default !important; }
 .checkmark:after { left: 7px; top: 2px; width: 4px; height: 10px; border: solid white; border-width: 0 3px 3px 0; -webkit-transform: rotate(45deg); -ms-transform: rotate(45deg); transform: rotate(45deg); content: ""; position: absolute; display: none; }
 input[type="checkbox"]:checked + .checkmark { background-color: #0d6efd; border: 2px solid #0d6efd; }
@@ -237 +230 @@
 th.request { vertical-align: top; }
 td.request p { margin-top: 0 !important; }
+.dashicons-arrow-up-alt2, .dashicons-arrow-down-alt2 { color: #dcdfe6; }
+.dashicons-arrow-up-alt2:hover { color: #f6866f; }
+.dashicons-arrow-down-alt2:hover { color: #9bcc79; }
+#h2-editing.closed { padding-bottom: 60px; }
+
+.options-heading, .options-heading span span { line-height: 60px; }
+.options-heading span { cursor: pointer; }
+.options-heading span span { padding-left: 10px; }
+.section.editing { max-height: 1500px; transition: max-height 1.25s linear,opacity 1.5s,font-size 1.5s,margin 1.5s,padding 1.5s; }
+.section.editing.collapsed { font-size: 0; margin: 0; opacity: 0; padding: 0; max-height: 0; overflow: hidden; transition: max-height 0.15s linear, opacity 0.10s, font-size 0.10s, margin .10s, padding .10s; -webkit-transition: max-height 0.15s linear, opacity 0.10s, font-size .10s, margin .10s, padding .10s; -moz-transition: max-height 0.15s linear, opacity 0.10s, font-size .10s, margin .10s, padding .10s; -o-transition: max-height 0.15s linear, opacity 0.10s, font-size .10s, margin .10s, padding .10s; }
+.section.editing { max-height: 800px; transition: max-height 0.5s linear, opacity 1.0s, font-size 1.0s, margin 1.0s, padding 1.0s; -webkit-transition: max-height 0.5s linear, opacity 1.0s, font-size 1.0s, margin 1.0s, padding 1.0s; -moz-transition: max-height 0.5s linear, opacity 1.0s, font-size 1.0s, margin 1.0s, padding 1.0s; -o-transition: max-height 0.5s linear, opacity 1.0s, font-size 1.0s, margin 1.0s, padding 1.0s;   }
+
+#storing-notice.dashicons-warning { margin-left: 5px; cursor: pointer; width: 30px; padding-right: 5px; }
+#storing-notice:before, .dashicons-warning:before { content: "\f534"; opacity: 0.25; }
+
+div.notice { margin-top: 13px !important; margin-left: 0; margin-right: 0; }
 
 @media screen and (max-width: 782px) {
-/* Message page */
+
+/* Entry page */
 #sform-wrap { padding-right: 10px; }
+#sform-wrap.spaced { padding-top: 9px; }
+div.notice-warning.incompatible { margin-right: 20px; margin-left: 10px; }
 h1.title { padding: 10px; }
 .responsive { display: none !important; }
@@ -254 +266 @@
 .entrie-table th { display: block; margin-bottom: 0; }
 .entrie-table td { display: block; margin-bottom: 0; }
-td.last.select { padding: 10px 20px 40px; } 
+td.last.select { padding: 10px 20px 40px; }
 td.checkbox-switch.last { padding: 10px 20px 40px; }
 td.plaintext { padding: 12px 20px; }
 td.plaintext.last { padding: 12px 20px 45px; }
-td.checkbox-switch.notes, td.checkbox-switch, td.select.notes, td.select { padding: 10px 20px; } 
+td.checkbox-switch.notes, td.checkbox-switch, td.select.notes, td.select { padding: 10px 20px; }
 a#reply { text-decoration: none; }
 .dashicons-external { float: none !important; padding-left: 10px; }
@@ -272 +284 @@
 .dashicons-external.foggy:hover { color: #72aee6; }
 .dashicons-external.polar:hover { color: #53a0de; }
-/*.reply-message.button { display: none; } */
-
-.reply-message.button {
-    margin-left: 2px;
-    margin-top: 12px !important;
-}
-.icon-button {
-    display: none;
-}
-
+
+.reply-message.button { margin-left: 2px; margin-top: 12px !important; }
+.icon-button { display: none; }
 
 #submit-wrap { padding: 0 20px 100px; }
@@ -297 +302 @@
 #submissions-table { padding: 20px 0 10px 0; }
 tbody td.check-column, .widefat tbody th.check-column, .widefat tfoot td.check-column, .widefat thead td.check-column { padding: 8px 0 0 10px; }
+
 .widefat td, .widefat th { padding: 14px 10px; }
-input[type=checkbox] { margin: 2px 0 8px 10px !important; }
 .widefat tfoot td input[type=checkbox], .widefat thead td input[type=checkbox] { margin: 0 0 8px 10px !important; }
 .wp-list-table .toggle-row { top: 16px; }
@@ -307 +312 @@
 .tablenav-pages .pagination-links .current-page { margin: 0 2px 0 0; font-size: 13px; text-align: center; min-width: 30px; min-height: 30px; margin: 0; padding: 0 4px; }
 input[type=text] { padding: 0 8px; line-height: 2; min-height: 30px; }
+
+.reply-message.button { margin-left: 2px; margin-top: 12px !important; }
+#h2-editing { padding-left: 20px; }
+
+.tablenav-pages, p.search-box input { margin-top: 20px !important; }
+.entry-status { display: none; }
+.entry-status + span { visibility: visible; }
+
 }
 
 @media screen and (min-width: 783px) {
-#sform-wrap { padding-right: 20px; }
+
+#sform-wrap { padding-right: 20px; padding-bottom: 30px; }
+#sform-wrap.spaced { padding-top: 7px; }
+div.notice-warning.incompatible { margin-right: 20px; }
 h1.title { padding: 10px 0; }
 .icon-button { display: none; }
@@ -332 +348 @@
 th.topaligned { padding-top: 15px; padding-bottom: 15px; }
 td.topaligned { padding-bottom: 15px; }
+
+th.column-progress, td.column-progress { width: 90px; text-align: center; }
+.entry-status.red, .entry-status.red + span { color: #D63638; }
+.entry-status.green, .entry-status.green + span { color: #85C641; }
+.entry-status + span { display: block; visibility: hidden; }
+.entry-status:hover + span { visibility: visible; }
+
+#h2-editing { padding-left: 30px; }
+
 }
 
@@ -340 +365 @@
 .columns-wrap.right { width: 100%; }
 .columns-wrap.right.fullwidth { width: 100%; }
-} 
+}
 
 @media screen and (max-width: 1024px) {
 .columns-wrap.left, .columns-wrap.right { width: 100%; }
-} 
-
-/*
-.nodecoration { text-decoration: none; }
-.message { margin-left: 10px; font-weight: 500; }
-span.message.success { color: #9bcc79; }
-span.message.error { color: #f6866f }
-div.notice { margin-top: 13px !important; }
-#deletion-wrap { display: inline-block; width: 100%; margin-bottom: 15px; }
-#deletion-toggle.nostoring, deletion-notice.nostoring { margin-top: 30px; }
-#deletion-toggle.storing, deletion-notice.storing { margin-top: 10px; }
-.row { box-sizing: border-box; display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; display: flex; -webkit-box-flex: 0; -webkit-flex: 0 1 auto; -ms-flex: 0 1 auto; flex: 0 1 auto; -webkit-box-orient: horizontal; -webkit-box-direction: normal; -webkit-flex-direction: row; -ms-flex-direction: row; flex-direction: row; -webkit-flex-wrap: wrap; -ms-flex-wrap: wrap; flex-wrap: wrap; margin-right: ; margin-left: ;
 }
-#admin-notice > a { text-decoration: none; }
-*/
-
-@media screen and (max-width: 782px) {
-.reply-message.button { margin-left: 2px; margin-top: 12px !important; }
-#h2-editing { padding-left: 20px; }
-}
-
-@media screen and (min-width: 783px) {
-#h2-editing { padding-left: 30px; }
-}
-
-#h2-editing.closed {
-    padding-bottom: 60px;
-}
-
-
-@media screen and (min-width: 783px)
-.options-heading {
-    padding: 0 30px;
-}
-@media screen and (min-width: 783px)
-.options-heading, .options-heading span span {
-    line-height: 60px;
-}
-
-.options-heading span {
-    cursor: pointer;
-}
-
-@media screen and (min-width: 783px)
-.options-heading, .options-heading span span {
-    line-height: 60px;
-}
-
-.toggle.dashicons {
-    color: #dcdfe6;
-}
-@media screen and (min-width: 783px)
-.options-heading, .options-heading span span {
-    line-height: 60px;
-}
-.options-heading span span {
-    padding-left: 10px;
-}
-.options-heading span {
-    cursor: pointer;
-}
-
-.section.editing {
-    max-height: 1500px;
-    transition: max-height 1.25s linear,opacity 1.5s,font-size 1.5s,margin 1.5s,padding 1.5s;
-}
-
-.dashicons-arrow-up-alt2:hover {
-    color: #f6866f;
-}
-
-.dashicons-arrow-down-alt2:hover {
-    color: #9bcc79;
-}
-
-
-.section.editing.collapsed { font-size: 0; margin: 0; opacity: 0; padding: 0; max-height: 0; overflow: hidden; transition: max-height 0.3s linear, opacity 0.15s, font-size 0.15s, margin .15s, padding .15s; -webkit-transition: max-height 0.3s linear, opacity 0.15s, font-size .15s, margin .15s, padding .15s; -moz-transition: max-height 0.3s linear, opacity 0.15s, font-size .15s, margin .15s, padding .15s; -o-transition: max-height 0.3s linear, opacity 0.15s, font-size .15s, margin .15s, padding .15s; }
-.section.editing { max-height: 800px; transition: max-height 0.5s linear, opacity 1.0s, font-size 1.0s, margin 1.0s, padding 1.0s; -webkit-transition: max-height 0.5s linear, opacity 1.0s, font-size 1.0s, margin 1.0s, padding 1.0s; -moz-transition: max-height 0.5s linear, opacity 1.0s, font-size 1.0s, margin 1.0s, padding 1.0s; -o-transition: max-height 0.5s linear, opacity 1.0s, font-size 1.0s, margin 1.0s, padding 1.0s;   }

simpleform-contact-form-submissions/trunk/admin/index.php

@@ -1 @@
-<?php // Silence is golden
+<?php
+/**
+ * Silence is golden.
+ *
+ * @package SimpleForm Contact Form Submissions/admin
+ */

simpleform-contact-form-submissions/trunk/admin/js/admin.js

@@ +1 @@
+/**
+ * JavaScript code delegated to the backend functionality of the plugin.
+ *
+ * @package SimpleForm Contact Form Submissions
+ * @subpackage SimpleForm Contact Form Submissions/admin
+ */
+
 (function( $ ) {
     'use strict';
-    
-     $( window ).on('load', function() {
-
-       var toggle = document.getElementsByClassName("contact-info");
-       for (var i = 0; i < toggle.length; i++) {
-         toggle[i].addEventListener("click", function() {
-           document.getElementById("message-wrap").classList.remove("seen");
-           var info = document.getElementById("submitter-data");
-           info.classList.toggle("unseen");
-           document.getElementById("toggle-message").classList.toggle("unseen");
-           document.getElementById("message-data-column").classList.toggle("fullwidth");
-           var prev_link = document.getElementById("prev-link");
-           var next_link = document.getElementById("next-link");
-           if ( info.classList.contains("unseen") ) {
-             if ( prev_link ) {
-               var href_prev = prev_link.getAttribute("href"); 
-               let prevParams = new URLSearchParams(href_prev);
-               if ( prevParams.has('info') === false ) {
-                 var new_href_prev = href_prev + '&info=hidden';
-                 prev_link.setAttribute('href', new_href_prev);
-               }   
-             }   
-             if ( next_link ) {
-               var href_next = next_link.getAttribute("href");
-               let nextParams = new URLSearchParams(href_next);
-               if ( nextParams.has('info') === false ) {
-                 var new_href_next = href_next + '&info=hidden';
-                 next_link.setAttribute('href', new_href_next);
-               }
-             }
-           } 
-           else {
-             if ( prev_link ) {
-               var href_prev = prev_link.getAttribute("href"); 
-               let prevParams = new URLSearchParams(href_prev);
-               if ( prevParams.has('info') === true ) {
-                 var new_href_prev = href_prev.replace('&info=hidden', '');
-                 prev_link.setAttribute('href', new_href_prev);
-               }
-             }   
-             if ( next_link ) {
-               var href_next = next_link.getAttribute("href");
-               let nextParams = new URLSearchParams(href_next);
-               if ( nextParams.has('info') === true ) {
-                 var new_href_next = href_next.replace('&info=hidden', '');
-                 next_link.setAttribute('href', new_href_next);
-               }    
-             }
-           }
-         });
-       }
-               
-       $('#message-status').on("change", function(e) {
-         var option = $(this).val();
-         if ( option != 'spam' && option != 'trash' ) {
-           $('#reply').addClass('unseen');
-           $('.trmovable').removeClass('unseen');
-           $('#thstatus, #tdstatus').removeClass('last'); 
-           if ( $("#moving").prop('checked') == true ) { 
-             $('.trmoving').removeClass('unseen');
-             $('#thmoveto, #tdmoveto').addClass('last'); 
-           }
-           else { 
-             $('#thmoving, #tdmoving').addClass('last'); 
-           }
-           if ( option == 'read' || option == 'new' ) {
-             $('#reply').removeClass('unseen');
-             $('.reply-message.button').removeClass('unseen'); 
-           }
-           else {
-             $('#reply').addClass('unseen');
-             $('.reply-message.button').addClass('unseen'); 
-           }
-         }  
-         else {
-           $('.trmovable, .trmoving, .reply-message.button').addClass('unseen');
-           $('#thstatus, #tdstatus').addClass('last'); 
-           $('#thmoving, #tdmoving, #thmoveto, #tdmoveto').removeClass('last'); 
-         }  
-       });
-       
-       $("#moving").on("click", function() { 
-         if($(this).prop('checked') == true) { 
-           $('.trmoving').removeClass('unseen'); 
-           $('#thmoving, #tdmoving').removeClass('last'); 
-           $('#thmoveto, #tdmoveto').addClass('last'); 
-         } 
-         else { 
-           $('.trmoving').addClass('unseen');
-           $('#moveto').val(''); 
-           $('#thmoving, #tdmoving').addClass('last'); 
-           $('#thmoveto, #tdmoveto').removeClass('last'); 
-         } 
-       });
-       
-       $('#edit-entry').on( 'click', function(e) {
-          $('.message').removeClass('error success unchanged');
-          $('#message-wrap').addClass('seen');
-          $('.message').text(sform_submissions_object.saving);
-          var formData = $('form#submission-tab').serialize();
-          $.ajax({
-            type: 'POST',
-            dataType: 'json',
-            url: sform_submissions_object.ajaxurl,
-            data: formData + '&action=edit_entry', 
-            success: function(data){
-              var error = data['error'];
-              var message = data['message'];
-              var update = data['update'];
-              var bubble = data['bubble'];
-              var updatestatus = data['status'];
-              var entries = data['entries'];
-              var newstatus = data['newstatus'];
-              var prevstatus = data['prevstatus'];
-              var formname = data['formname'];
-              var view = data['view'];
-              var moving = data['moving'];
-              var options = data['options'];
-              if( error === true ){
-                $('.message').addClass('error');
-                $('.message').html(data.message);
-              }
-              if( error === false ){
-                if( update === false ){
-                  $('.message').addClass('unchanged');
-                }
-                else {
-                  $('#view-counter').text(entries);
-                  if ( newstatus !== prevstatus ) {
-                    if ( newstatus == 'new' ) {
-                      var unread = parseInt($('#unread-messages').text(), 10);
-                      if ( isNaN(unread) ) {
-                        $('#unread-messages').html('<span class="sform awaiting-mod">1</span>');
-                      }
-                      else {
-                        var number = ++unread;
-                        $('.sform.awaiting-mod').text(number);
-                      }
-                    }
-                    else {
-                      var unread = parseInt($('#unread-messages').text(), 10);
-                      if ( ! isNaN(unread) && prevstatus == 'new' ) {
-                        if ( unread > '1' ) {
-                          var number = --unread;
-                          $('.sform.awaiting-mod').text(number);
-                        }
-                        else {
-                          $('#unread-messages').html('');
-                        } 
-                      }
-                    }
-                  }               
-                  else {
-                    if ( view === true /* && moving === true */ ) {
-                      $('#view-counter').text(entries);
-                    }
-                  }
-                  
-                  $('.message').addClass('success');
-                  $('.form-name').html(data.formname);
-                  $('#moveto').html(data.options);
-                }
-                $('.message').html(data.message);
-                $('#current-status').val(status);
-              }
-            },
-            error: function(data){
-              $('.message').html('AJAX call failed');
-            }   
-          });
-          e.preventDefault();
-          return false;
-       });
-       
-       $(document).on('input', function() {
-         $('#message-wrap').removeClass('seen');
-       });
-              
-       $("#data-storing").on("click", function() {
-         if($(this).prop('checked') == true) {         
-            $('.trstoring').removeClass('unseen'); 
-            $('#storing-description').html(sform_submissions_object.disable);
-            if ( $("#counter").prop('checked') == true ) {
-            $('.sform.awaiting-mod').removeClass('unseen');
-            }
-         } 
-         else { $('.trstoring').addClass('unseen'); 
-            $('#storing-description').html(sform_submissions_object.enable); 
-            $('.sform.awaiting-mod').addClass('unseen');
-         }
-       });
-       
-       $("#counter").on("click", function() {
-         if($(this).prop('checked') == true) {         
-            $('.sform.awaiting-mod').removeClass('unseen');
-         } else {
-            $('.sform.awaiting-mod').addClass('unseen');
-         }
-       });
-
-       // Prevent duplicate queries by appending the selector to move entries in the bottom bulk actions
-       if ( document.getElementById("moveto") != null && document.getElementById("bulk-action-selector-bottom") != null ) {
-         const node = document.getElementById("moveto");
-         const clone = node.cloneNode(true);
-         var bottomSelector = document.getElementById("bulk-action-selector-bottom"); 
-         bottomSelector.parentNode.insertBefore( clone, bottomSelector.nextSibling );                  
-       }
-           
-       $('#bulk-action-selector-top, #bulk-action-selector-bottom').on("change", function() {
-         var selectbulk = $(this).val();
-         if ( selectbulk === 'bulk-move' ) { 
-             $('.moveto').removeClass('unseen');
-         }
-         else {
-             $('.moveto').addClass('unseen');
-             $('.moveto').val('');
-             $('#move2').val('');
-         }
-       });             
-       
-       $('.moveto').on("change", function() {
-         var form = $(this).val();
-          $('#move2').val(form);
-          $('.moveto').val(form);
-       });  
-       
-       $("span.heading").on("click", function() {
-         var section = $(this).attr('section');
-         var prev_link = document.getElementById("prev-link");
-         var next_link = document.getElementById("next-link");
-         $('.section.' + section).toggleClass('collapsed');
-          if ( ! $('.section.' + section).hasClass('collapsed') ) {  
-            $('span.toggle.' + section).removeClass('dashicons-arrow-down-alt2');
-            $('span.toggle.' + section).addClass('dashicons-arrow-up-alt2');
-            $('#h2-' + section).removeClass('closed');
-             if ( prev_link ) {
-               var href_prev = prev_link.getAttribute("href"); 
-               let prevParams = new URLSearchParams(href_prev);
-               if ( prevParams.has('editing') === true ) {
-                 var new_href_prev = href_prev.replace('&editing=hidden', '');
-                 prev_link.setAttribute('href', new_href_prev);
-               }
-             }   
-             if ( next_link ) {
-               var href_next = next_link.getAttribute("href");
-               let nextParams = new URLSearchParams(href_next);
-               if ( nextParams.has('editing') === true ) {
-                 var new_href_next = href_next.replace('&editing=hidden', '');
-                 next_link.setAttribute('href', new_href_next);
-               }    
-             }
-          } 
-          else{
-            $('span.toggle.' + section).removeClass('dashicons-arrow-up-alt2');
-            $('span.toggle.' + section).addClass('dashicons-arrow-down-alt2');
-            $('#h2-' + section).addClass('closed');
-             if ( prev_link ) {
-               var href_prev = prev_link.getAttribute("href"); 
-               let prevParams = new URLSearchParams(href_prev);
-               if ( prevParams.has('editing') === false ) {
-                 var new_href_prev = href_prev + '&editing=hidden';
-                 prev_link.setAttribute('href', new_href_prev);
-               }   
-             }   
-             if ( next_link ) {
-               var href_next = next_link.getAttribute("href");
-               let nextParams = new URLSearchParams(href_next);
-               if ( nextParams.has('editing') === false ) {
-                 var new_href_next = href_next + '&editing=hidden';
-                 next_link.setAttribute('href', new_href_next);
-               }
-             }
-          }
-       });
-   
-     });
+
+    $( window ).on(
+        'load',
+        function() {
+
+            var toggle       = document.getElementsByClassName( 'contact-info' );
+            var toggleLength = toggle.length;
+
+            for ( var i = 0; i < toggleLength; i++ ) {
+                toggle[i].addEventListener(
+                    'click',
+                    function() {
+                        document.getElementById( 'message-wrap' ).classList.remove( 'seen' );
+                        var info = document.getElementById( 'submitter-data' );
+                        info.classList.toggle( 'unseen' );
+                        document.getElementById( 'toggle-message' ).classList.toggle( 'unseen' );
+                        document.getElementById( 'message-data-column' ).classList.toggle( 'fullwidth' );
+                        var prev_link = document.getElementById( 'prev-link' );
+                        var next_link = document.getElementById( 'next-link' );
+                        if ( info.classList.contains( 'unseen' ) ) {
+                            if ( prev_link ) {
+                                var href_prev  = prev_link.getAttribute( 'href' );
+                                let prevParams = new URLSearchParams( href_prev );
+                                if ( prevParams.has( 'info' ) === false ) {
+                                    var new_href_prev = href_prev + '&info=hidden';
+                                    prev_link.setAttribute( 'href', new_href_prev );
+                                }
+                            }
+                            if ( next_link ) {
+                                var href_next  = next_link.getAttribute( 'href' );
+                                let nextParams = new URLSearchParams( href_next );
+                                if ( nextParams.has( 'info' ) === false ) {
+                                    var new_href_next = href_next + '&info=hidden';
+                                    next_link.setAttribute( 'href', new_href_next );
+                                }
+                            }
+                        } else {
+                            if ( prev_link ) {
+                                var href_prev  = prev_link.getAttribute( 'href' );
+                                let prevParams = new URLSearchParams( href_prev );
+                                if ( prevParams.has( 'info' ) === true ) {
+                                    var new_href_prev = href_prev.replace( '&info=hidden', '' );
+                                    prev_link.setAttribute( 'href', new_href_prev );
+                                }
+                            }
+                            if ( next_link ) {
+                                var href_next  = next_link.getAttribute( 'href' );
+                                let nextParams = new URLSearchParams( href_next );
+                                if ( nextParams.has( 'info' ) === true ) {
+                                    var new_href_next = href_next.replace( '&info=hidden', '' );
+                                    next_link.setAttribute( 'href', new_href_next );
+                                }
+                            }
+                        }
+                    }
+                );
+            }
+
+            $( '#message-status' ).on(
+                'change',
+                function(e) {
+                    var option = $( this ).val();
+                    if ( option != 'spam' && option != 'trash' ) {
+                        $( '#reply' ).addClass( 'unseen' );
+                        $( '.trmovable' ).removeClass( 'unseen' );
+                        $( '#thstatus, #tdstatus' ).removeClass( 'last' );
+                        if ( $( '#moving' ).prop( 'checked' ) == true ) {
+                            $( '.trmoving' ).removeClass( 'unseen' );
+                            $( '#thmoveto, #tdmoveto' ).addClass( 'last' );
+                        } else {
+                            $( '#thmoving, #tdmoving' ).addClass( 'last' );
+                        }
+                        if ( option == 'read' || option == 'new' ) {
+                            $( '#reply' ).removeClass( 'unseen' );
+                            $( '.reply-message.button' ).removeClass( 'unseen' );
+                        } else {
+                            $( '#reply' ).addClass( 'unseen' );
+                            $( '.reply-message.button' ).addClass( 'unseen' );
+                        }
+                    } else {
+                        $( '.trmovable, .trmoving, .reply-message.button' ).addClass( 'unseen' );
+                        $( '#thstatus, #tdstatus' ).addClass( 'last' );
+                        $( '#thmoving, #tdmoving, #thmoveto, #tdmoveto' ).removeClass( 'last' );
+                    }
+                }
+            );
+
+            $( '#moving' ).on(
+                'click',
+                function() {
+                    if ( $( this ).prop( 'checked' ) == true ) {
+                        $( this ).val( 'true' );
+                        $( '.trmoving' ).removeClass( 'unseen' );
+                        $( '#thmoving, #tdmoving' ).removeClass( 'last' );
+                        $( '#thmoveto, #tdmoveto' ).addClass( 'last' );
+                    } else {
+                        $( this ).val( 'false' );
+                        $( '.trmoving' ).addClass( 'unseen' );
+                        $( '#moveto' ).val( '' );
+                        $( '#thmoving, #tdmoving' ).addClass( 'last' );
+                        $( '#thmoveto, #tdmoveto' ).removeClass( 'last' );
+                    }
+                }
+            );
+
+            // Switch the column with row actions.
+            $( '.hide-column-tog' ).on(
+                'click',
+                function(e) {
+                    var column = $( this ).val();
+                    if ( column === 'id' ) {
+                        if ( $( this ).prop( 'checked' ) == true ) {
+                            $( '#id-actions' ).removeClass( 'hidden' );
+                            $( '#subject-actions' ).addClass( 'hidden' );
+                            $( '.column-id' ).addClass( 'column-primary' );
+                            $( '.column-subject' ).removeClass( 'column-primary' );
+                        } else {
+                            if ( $( '#subject-hide' ).length > 0 && $( '#subject-hide' ).prop( 'checked' ) == true ) {
+                                $( '#subject-actions' ).removeClass( 'hidden' );
+                                $( '#id-actions' ).addClass( 'hidden' );
+                                $( '.column-id' ).removeClass( 'column-primary' );
+                                $( '.column-subject' ).addClass( 'column-primary' );
+                            }
+                        }
+                    }
+                    if ( column === 'subject' ) {
+                        if ( $( this ).prop( 'checked' ) == true ) {
+                            if ( ( $( '#id-hide' ).length > 0 && $( '#id-hide' ).prop( 'checked' ) == false ) || $( '#id-hide' ).length == 0 ) {
+                                $( '#subject-actions' ).removeClass( 'hidden' );
+                                $( '.column-id' ).removeClass( 'column-primary' );
+                                $( '.column-subject' ).addClass( 'column-primary' );
+                            }
+                        } else {
+                            $( '#subject-actions' ).addClass( 'hidden' );
+                            $( '.column-id' ).addClass( 'column-primary' );
+                            $( '.column-subject' ).removeClass( 'column-primary' );
+                        }
+                    }
+                    // Display error if no column has row actions.
+                    if ( $( '#id-hide' ).length > 0 && $( '#id-hide' ).prop( 'checked' ) == false && $( '#subject-hide' ).length == 0 ) {
+                        $( '.submission-notice' ).html( sform_submissions_object.id_notice );
+                    } else if ( $( '#subject-hide' ).length > 0 && $( '#subject-hide' ).prop( 'checked' ) == false && $( '#id-hide' ).length == 0 ) {
+                        $( '.submission-notice' ).html( sform_submissions_object.subject_notice );
+                    } else if ( $( '#id-hide' ).length > 0 && $( '#id-hide' ).prop( 'checked' ) == false && $( '#subject-hide' ).length > 0 && $( '#subject-hide' ).prop( 'checked' ) == false ) {
+                        $( '.submission-notice' ).html( sform_submissions_object.combo_notice );
+                    } else {
+                        $( '.submission-notice' ).html( '' );
+                    }
+                }
+            );
+
+            $( '#edit-entry' ).on(
+                'click',
+                function(e) {
+                    $( '.message' ).removeClass( 'error success unchanged' );
+                    $( '#message-wrap' ).addClass( 'seen' );
+                    $( '.message' ).text( sform_submissions_object.saving );
+                    var formData = $( 'form#submission-tab' ).serialize();
+                    var formname = $( '#form_name' ).text()
+                    var formname = $( '#moveto option:selected' ).text();
+                    var status   = $( '#message-status' ).val();
+                    var newform  = $( '#moveto' ).val();
+                    $.ajax(
+                        {
+                            type: 'POST',
+                            dataType: 'json',
+                            url: sform_submissions_object.ajaxurl,
+                            data: formData + '&action=edit_entry',
+                            success: function( data ){
+                                var error          = data['error'];
+                                var update         = data['update'];
+                                var current_form   = data['current_form'];
+                                var current_status = data['current_status'];
+                                var entries        = data['entries'];
+                                var options        = data['options'];
+                                var message        = data['message'];
+                                if ( error === true ) {
+                                    $( '.message' ).addClass( 'error' );
+                                    $( '.message' ).html( data.message );
+                                }
+                                if ( error === false ) {
+                                    if ( update === false ) {
+                                        $( '.message' ).addClass( 'unchanged' );
+                                    } else {
+                                        $( '#view-counter' ).text( entries );
+                                        if ( status !== current_status ) {
+                                            if ( status == 'new' ) {
+                                                var unread = parseInt( $( '#unread-messages' ).text(), 10 );
+                                                if ( isNaN( unread ) ) {
+                                                    $( '#unread-messages' ).html( '<span class="sform awaiting-mod">1</span>' );
+                                                } else {
+                                                    var number = ++unread;
+                                                    $( '.sform.awaiting-mod' ).text( number );
+                                                }
+                                            } else {
+                                                var unread = parseInt( $( '#unread-messages' ).text(), 10 );
+                                                if ( ! isNaN( unread ) && current_status == 'new' ) {
+                                                    if ( unread > '1' ) {
+                                                        var number = --unread;
+                                                        $( '.sform.awaiting-mod' ).text( number );
+                                                    } else {
+                                                        $( '#unread-messages' ).html( '' );
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        $( '.message' ).addClass( 'success' );
+                                        $( '.form-name' ).html( data.current_form );
+                                        $( '#moveto' ).html( data.options );
+                                        $( '#moving' ).prop( 'checked', false );
+                                        $( '.trmoving' ).addClass( 'unseen' );
+                                        $( '#thmoving, #tdmoving' ).addClass( 'last' );
+                                    }
+                                    $( '.message' ).html( data.message );
+                                }
+                            },
+                            error: function( data ) {
+                                $( '.message' ).html( 'AJAX call failed' );
+                            }
+                        }
+                    );
+                    e.preventDefault();
+                    return false;
+                }
+            );
+
+            $( document ).on(
+                'input',
+                function() {
+                    $( '#message-wrap' ).removeClass( 'seen' );
+                }
+            );
+
+            $( '#storing' ).on(
+                'click',
+                function() {
+                    if ( $( this ).prop( 'checked' ) == true) {
+                        $( '.trstoring' ).removeClass( 'unseen' );
+                        $( '#storing-description' ).html( sform_submissions_object.disable );
+                        if ( $( '#counter' ).prop( 'checked' ) == true ) {
+                            $( '.sform.awaiting-mod' ).removeClass( 'unseen' );
+                        }
+                    } else {
+                        $( '.trstoring' ).addClass( 'unseen' );
+                        $( '#storing-description' ).html( sform_submissions_object.enable );
+                        $( '.sform.awaiting-mod' ).addClass( 'unseen' );
+                    }
+                }
+            );
+
+            $( '#counter' ).on(
+                'click',
+                function() {
+                    if ( $( this ).prop( 'checked' ) == true) {
+                        $( '.sform.awaiting-mod' ).removeClass( 'unseen' );
+                    } else {
+                        $( '.sform.awaiting-mod' ).addClass( 'unseen' );
+                    }
+                }
+            );
+
+            // Prevent duplicate queries by appending the selector to move entries in the bottom bulk actions.
+            if ( document.getElementById( 'moveto' ) != null && document.getElementById( 'bulk-action-selector-bottom' ) != null ) {
+                const node         = document.getElementById( 'moveto' );
+                const clone        = node.cloneNode( true );
+                var bottomSelector = document.getElementById( 'bulk-action-selector-bottom' );
+                bottomSelector.parentNode.insertBefore( clone, bottomSelector.nextSibling );
+            }
+
+            $( '#bulk-action-selector-top, #bulk-action-selector-bottom' ).on(
+                'change',
+                function() {
+                    var selectbulk = $( this ).val();
+                    if ( selectbulk === 'bulk-move' ) {
+                        $( '.moveto' ).removeClass( 'unseen' );
+                    } else {
+                        $( '.moveto' ).addClass( 'unseen' );
+                        $( '.moveto' ).val( '' );
+                        $( '#move2' ).val( '' );
+                    }
+                }
+            );
+
+            $( '.moveto' ).on(
+                'change',
+                function() {
+                    var form = $( this ).val();
+                    $( '#move2' ).val( form );
+                    $( '.moveto' ).val( form );
+                }
+            );
+
+            $( 'span.editing' ).on(
+                'click',
+                function() {
+                    var section   = $( this ).attr( 'data-section' );
+                    var prev_link = document.getElementById( 'prev-link' );
+                    var next_link = document.getElementById( 'next-link' );
+                    $( '.section.' + section ).toggleClass( 'collapsed' );
+                    if ( ! $( '.section.' + section ).hasClass( 'collapsed' ) ) {
+                        $( 'span.toggle.' + section ).removeClass( 'dashicons-arrow-down-alt2' );
+                        $( 'span.toggle.' + section ).addClass( 'dashicons-arrow-up-alt2' );
+                        $( '#h2-' + section ).removeClass( 'closed' );
+                        if ( prev_link ) {
+                            var href_prev  = prev_link.getAttribute( 'href' );
+                            let prevParams = new URLSearchParams( href_prev );
+                            if ( prevParams.has( 'editing' ) === true ) {
+                                var new_href_prev = href_prev.replace( '&editing=hidden', '' );
+                                prev_link.setAttribute( 'href', new_href_prev );
+                            }
+                        }
+                        if ( next_link ) {
+                            var href_next  = next_link.getAttribute( 'href' );
+                            let nextParams = new URLSearchParams( href_next );
+                            if ( nextParams.has( 'editing' ) === true ) {
+                                var new_href_next = href_next.replace( '&editing=hidden', '' );
+                                next_link.setAttribute( 'href', new_href_next );
+                            }
+                        }
+                    } else {
+                        $( 'span.toggle.' + section ).removeClass( 'dashicons-arrow-up-alt2' );
+                        $( 'span.toggle.' + section ).addClass( 'dashicons-arrow-down-alt2' );
+                        $( '#h2-' + section ).addClass( 'closed' );
+                        if ( prev_link ) {
+                            var href_prev  = prev_link.getAttribute( 'href' );
+                            let prevParams = new URLSearchParams( href_prev );
+                            if ( prevParams.has( 'editing' ) === false ) {
+                                var new_href_prev = href_prev + '&editing=hidden';
+                                prev_link.setAttribute( 'href', new_href_prev );
+                            }
+                        }
+                        if ( next_link ) {
+                            var href_next  = next_link.getAttribute( 'href' );
+                            let nextParams = new URLSearchParams( href_next );
+                            if ( nextParams.has( 'editing' ) === false ) {
+                                var new_href_next = href_next + '&editing=hidden';
+                                next_link.setAttribute( 'href', new_href_next );
+                            }
+                        }
+                    }
+                }
+            );
+
+        }
+    );
 
 })( jQuery );

simpleform-contact-form-submissions/trunk/admin/partials/entry.php

@@ -1 +1 @@
 <?php
-    
-if ( ! defined( 'WPINC' ) ) die;
-
-$form_id = isset( $_REQUEST['form'] ) ? absint($_REQUEST['form']) : '';
-$settings = get_option("sform_{$form_id}_settings") != false ? get_option("sform_{$form_id}_settings") : get_option("sform_settings");
-$admin_notices = ! empty( $settings['admin_notices'] ) ? esc_attr($settings['admin_notices']) : 'false';
-$notice = '';
-$color = ! empty( $settings['admin_color'] ) ? esc_attr($settings['admin_color']) : 'default';
-$form = isset( $_REQUEST['form'] ) && !empty( $_REQUEST['form'] ) ? '&form=' . absint($_REQUEST['form']) : '';
-$view = isset( $_REQUEST['view'] ) && !empty( $_REQUEST['view'] ) ? '&view=' . sanitize_text_field($_REQUEST['view']) : '';
-$date = isset ( $_REQUEST['date'] ) && !empty( $_REQUEST['date'] ) ? '&date=' . sanitize_text_field($_REQUEST['date']) : '';
-$search_key = isset( $_REQUEST['s'] ) && !empty( $_REQUEST['s'] ) ? '&s=' . sanitize_text_field($_REQUEST['s']) : '';
-$pagenum = isset( $_REQUEST['paged'] ) && !empty( $_REQUEST['paged'] ) ? '&paged=' . absint($_REQUEST['paged']) : '';
-$order = (isset($_REQUEST['order']) && in_array($_REQUEST['order'], array('asc', 'desc'))) ? '&order=' . $_REQUEST['order'] : '';
-$orderby = (isset($_REQUEST['orderby']) && in_array($_REQUEST['orderby'], array('subject', 'email', 'date'))) ? '&orderby=' . $_REQUEST['orderby'] : '';
-$back_link = get_admin_url(get_current_blog_id(), 'admin.php?page=sform-entries') .$form.$view.$date.$search_key.$pagenum.$order.$orderby;
-$id = isset( $_REQUEST['id'] ) ? absint($_REQUEST['id']) : '';
+/**
+ * File delegated to show the entry data page.
+ *
+ * @package    SimpleForm Contact Form Submissions
+ * @subpackage SimpleForm Contact Form Submissions/admin/partials
+ */
+
+defined( 'ABSPATH' ) || exit;
+
+$entries_class = new SimpleForm_Entries_List();
+$validation    = new SimpleForm_Submissions_Admin_Validation();
+$util          = new SimpleForm_Submissions_Util();
+$admin_notices = $util->get_sform_option( 1, 'settings', 'admin_notices', false );
+$notice_class  = $admin_notices ? 'invisible' : '';
+$version_alert = get_transient( 'sform_version_alert' );
+$notice_class .= false !== $version_alert ? ' unseen' : '';
+$wrap_class    = false !== $version_alert ? 'spaced' : '';
+$notice        = '';
+$color         = strval( $util->get_sform_option( 1, 'settings', 'admin_color', 'default' ) );
+$referer_url   = wp_get_referer() ? wp_get_referer() : admin_url( 'admin.php?page=sform-entries' );
+// Return an array of query variables.
+if ( isset( wp_parse_url( $referer_url )['query'] ) ) {
+    parse_str( wp_parse_url( $referer_url )['query'], $params );
+}
+$query_page    = isset( $params['page'] ) && ! empty( $params['page'] ) ? $params['page'] : 'sform-entries';
+$form          = isset( $params['form'] ) && ! empty( $params['form'] ) ? $params['form'] : '';
+$view          = isset( $params['view'] ) && ! empty( $params['view'] ) ? $params['view'] : '';
+$date          = isset( $params['date'] ) && ! empty( $params['date'] ) ? $params['date'] : '';
+$keyword       = isset( $params['s'] ) && ! empty( $params['s'] ) ? $params['s'] : '';
+$query_orderby = isset( $params['orderby'] ) && ! empty( $params['orderby'] ) ? $params['orderby'] : '';
+$query_order   = isset( $params['order'] ) && ! empty( $params['order'] ) ? $params['order'] : '';
+$pagenum       = isset( $params['paged'] ) && ! empty( $params['paged'] ) ? $params['paged'] : '';
+// Save query args if you are come from entries page.
+if ( 'sform-entries' === $query_page ) {
+    unset( $params['id'] );
+    update_option( 'sform_entries_params', $params );
+}
+$entries_params = (array) get_option( 'sform_entries_params', array( 'page' => 'sform-entries' ) );
+$back_url       = add_query_arg( $entries_params, $referer_url );
+$back_url       = remove_query_arg( array( 'id', 'info', 'editing' ), $back_url );
+$back_button    = '<a href="' . esc_url( $back_url ) . '"><span class="dashicons dashicons-list-view icon-button admin ' . esc_attr( $color ) . '"></span><span class="wp-core-ui button admin back-list ' . esc_attr( $color ) . '">' . __( 'Back to entries', 'simpleform-contact-form-submissions' ) . '</span></a>';
+$entry_id       = absint( $validation->sanitized_key( 'id' ) );
+$entry_form     = absint( $util->entry_value( $entry_id, 'form' ) );
+$requester_type = strval( $util->entry_value( $entry_id, 'requester_type' ) );
+$requester_id   = absint( $util->entry_value( $entry_id, 'requester_id' ) );
+$entry_name     = strval( $util->entry_value( $entry_id, 'name' ) );
+$entry_lastname = strval( $util->entry_value( $entry_id, 'lastname' ) );
+$entry_email    = strval( $util->entry_value( $entry_id, 'email' ) );
+$entry_phone    = strval( $util->entry_value( $entry_id, 'phone' ) );
+$entry_subject  = strval( $util->entry_value( $entry_id, 'subject' ) );
+$entry_message  = strval( $util->entry_value( $entry_id, 'object' ) );
+$entry_ip       = strval( $util->entry_value( $entry_id, 'ip' ) );
+$entry_date     = strval( $util->entry_value( $entry_id, 'date' ) );
+$entry_status   = strval( $util->entry_value( $entry_id, 'status' ) );
+$description    = __( 'All submitted data, and more, at a glance. ', 'simpleform-contact-form-submissions' );
+$unspam_desc    = __( 'For restoring the entry from spam change its status. ', 'simpleform-contact-form-submissions' );
+$restoring_desc = __( 'For restoring the entry from trash change its status. ', 'simpleform-contact-form-submissions' );
+$description   .= 'spam' === $entry_status ? '&nbsp;' . $unspam_desc . '&nbsp;' . __( 'For permanently deleting the entry, back to entries list and use the specific action. ', 'simpleform-contact-form-submissions' ) : '';
+$description   .= 'trash' === $entry_status ? '&nbsp;' . $restoring_desc . '&nbsp;' . __( 'For permanently deleting the entry, back to entries list and use the specific action. ', 'simpleform-contact-form-submissions' ) : '';
 global $wpdb;
-$item = !empty($id) ? $wpdb->get_row($wpdb->prepare("SELECT * FROM {$wpdb->prefix}sform_submissions WHERE id = %d", $id), ARRAY_A) : array();
-$entry_form = esc_attr($item['form']);
-$entry_form_name = $wpdb->get_var("SELECT name FROM {$wpdb->prefix}sform_shortcodes WHERE id = '$entry_form'");
-$description = __( 'All submitted data, and more, at a glance.','simpleform-contact-form-submissions');
-$unspam_desc = __( 'For restoring the entry from spam change its status.','simpleform-contact-form-submissions'); 
-$restoring_desc = __( 'For restoring the entry from trash change its status.','simpleform-contact-form-submissions'); 
-if ( $item['status'] == 'spam' ) { $description .= '&nbsp;' . $unspam_desc . '&nbsp;' . __( 'For permanently deleting the entry, back to entries list and use the specific action.','simpleform-contact-form-submissions'); }
-if ( $item['status'] == 'trash' ) { $description .= '&nbsp;' . $restoring_desc . '&nbsp;' . __( 'For permanently deleting the entry, back to entries list and use the specific action.','simpleform-contact-form-submissions'); }
-$where_form = !empty($form_id) ? "AND form = '$form_id'" : " AND form != '0' AND listable = '1'";
-$view_arg = isset( $_REQUEST['view'] ) && !empty( $_REQUEST['view'] ) ? sanitize_text_field($_REQUEST['view']) : '';
-if ($view_arg == '') { $where_status = " AND status != 'trash' AND status != 'spam'"; $message_type = 'inbox'; }
-if ($view_arg == 'new') { $where_status = " AND status = 'new'"; $message_type = 'unread'; }
-if ($view_arg == 'answered') { $where_status = " AND status = 'answered'"; $message_type = 'answered'; }
-if ($view_arg == 'spam') { $where_status = " AND status = 'spam'"; $message_type = 'junk'; }
-if ($view_arg == 'trash') { $where_status = " AND status = 'trash'"; $message_type = 'trashed'; }
-$ip_storing = ! empty( $settings['ip_storing'] ) ? esc_attr($settings['ip_storing']) : 'true';
-$keyword = ( isset( $_REQUEST['s'] ) ) ? sanitize_text_field($_REQUEST['s']) : '';
-$search = !empty($keyword) ? '%'.$wpdb->esc_like($keyword).'%' : '';                        
-if( $keyword != '') {    
-  if ( $ip_storing == 'true'  ) { $where_keyword = "AND object != '' AND object != 'not stored' AND (name LIKE '$search' OR lastname LIKE '$search' OR subject LIKE '$search' OR object LIKE '$search' OR ip LIKE '$search' OR email LIKE '$search' OR phone LIKE '$search')"; }
-  else { $where_keyword = "AND object != '' AND object != 'not stored' AND (name LIKE '$search' OR lastname LIKE '$search' OR subject LIKE '$search' OR object LIKE '$search' OR email LIKE '$search' OR phone LIKE '$search')"; }
-}
-else { $where_keyword = "AND object != '' AND object != 'not stored'"; }
-$date_arg = isset( $_REQUEST['date'] ) ? sanitize_text_field($_REQUEST['date']) : '';
-if( $date_arg != ''){    
-  if ( $date_arg == 'last_day' ) { $where_date = " AND ( date >= UTC_TIMESTAMP() - INTERVAL 24 HOUR )"; }
-  if ( $date_arg == 'last_week' ) { $where_date = " AND ( date >= UTC_TIMESTAMP() - INTERVAL 7 DAY )"; }
-  if ( $date_arg == 'last_month' ) { $where_date = " AND ( date >= UTC_TIMESTAMP() - INTERVAL 30 DAY )"; }
-  if ( $date_arg == 'current_year' ) { $where_date = " AND ( YEAR(date) = YEAR(CURDATE()) )"; }
-  if ( $date_arg == 'last_year' ) { $where_date = " AND ( date >= UTC_TIMESTAMP() - INTERVAL 1 YEAR )"; }
-  if ( $date_arg != 'last_day' && $date_arg != 'last_week' && $date_arg != 'last_month' && $date_arg != 'current_year' && $date_arg != 'last_year' ) { $where_date = " AND ( YEAR(date) = '$date_arg' )"; }
-}
-else { $where_date = ""; }
-$submission_date = $wpdb->get_var("SELECT date FROM {$wpdb->prefix}sform_submissions WHERE id = '$id'");
-$prev_id = $wpdb->get_var("SELECT id FROM {$wpdb->prefix}sform_submissions WHERE date < '$submission_date' $where_form $where_status $where_keyword $where_date ORDER BY date DESC LIMIT 1");
-$next_id = $wpdb->get_var("SELECT id FROM {$wpdb->prefix}sform_submissions WHERE date > '$submission_date' $where_form $where_status $where_keyword $where_date ORDER BY date ASC LIMIT 1");
-$id_arg = '&id='.$id;
-$url_split = explode($id_arg,$_SERVER['REQUEST_URI']);
-$url_root = $url_split[0];
-$url_args = !empty($url_split[1]) ? $url_split[1] : '';   
-$prev_id_url = $url_root . '&id='.$prev_id . $url_args;
-$next_id_url = $url_root . '&id='.$next_id . $url_args;
-$prev_button = $prev_id ? '<a id="prev-link" href="'. esc_url($prev_id_url) .'"><span id="prev" class="paginated"><span class="dashicons dashicons-arrow-left-alt2"></span><span>'. __('Prev', 'simpleform-contact-form-submissions' ) .'</span></span></a>' : '';
-$next_button = $next_id ? '<a id="next-link" href="'. esc_url($next_id_url) .'"><span id="next" class="paginated"><span class="dashicons dashicons-arrow-right-alt2" style="float: right"></span><span>'. __('Next', 'simpleform-contact-form-submissions' ) .'</span></span></a>' : '';
-if ( !empty($form_id) ) { $counter = $wpdb->get_var("SELECT COUNT(*) FROM {$wpdb->prefix}sform_submissions WHERE form = {$form_id} $where_status $where_keyword $where_date"); }
-else { $counter = $wpdb->get_var("SELECT COUNT(*) FROM {$wpdb->prefix}sform_submissions WHERE form != '0' AND listable = '1' $where_status $where_keyword $where_date"); }
-if ( !empty($form_id) ) { /* $form_name = $wpdb->get_var("SELECT name FROM {$wpdb->prefix}sform_shortcodes WHERE id = '$form_id'"); */ $form_name = $entry_form_name; }
-else { $form_name = 'all forms';  }
-if ( esc_attr($item['status']) == 'new' ) { $counter = $counter - 1; }
-else { $counter = $counter; }
-$counter_span = '<span id="view-counter">' . $counter . '</span>';
-$count_messages = sprintf( _n( '%1$s %2$s entry in %3$s', '%1$s %2$s entries in %3$s', $counter ), $counter_span, $message_type, $form_name ) . '&nbsp;';
-$messages_nav_class = $counter > 1 ? $color : 'invisible';
-$messages_nav = '<div id="navigation-buttons" class="' . $messages_nav_class . '"><div id="messages-nav">' . $prev_button . $next_button . '</div><div id="messages-info">' . $count_messages . '</div></div>';
-$contact_info = isset( $_REQUEST['info'] ) && $_REQUEST['info'] == 'hidden' ? ' unseen' : '';
-$editing = isset( $_REQUEST['editing'] ) && $_REQUEST['editing'] == 'hidden' ? ' collapsed' : '';
-$editing_class = $editing ? 'closed' : '';
-$toggle_message_class = isset( $_REQUEST['info'] ) && $_REQUEST['info'] == 'hidden' ? '' : ' unseen';
+$form_param    = isset( $entries_params['form'] ) ? $entries_params['form'] : '';
+$view_param    = isset( $entries_params['view'] ) ? $entries_params['view'] : '';
+$date_param    = isset( $entries_params['date'] ) ? $entries_params['date'] : '';
+$keyword_param = isset( $entries_params['s'] ) ? $entries_params['s'] : '';
+if ( in_array( $date_param, array( '', 'last_day', 'last_week', 'last_month', 'current_year', 'last_year' ), true ) ) {
+    $date_value       = array(
+        ''             => '',
+        'last_day'     => ' AND ( date >= UTC_TIMESTAMP() - INTERVAL 24 HOUR )',
+        'last_week'    => ' AND ( date >= UTC_TIMESTAMP() - INTERVAL 7 DAY )',
+        'last_month'   => ' AND ( date >= UTC_TIMESTAMP() - INTERVAL 30 DAY )',
+        'current_year' => ' AND ( YEAR(date ) = YEAR(CURDATE() ) )',
+        'last_year'    => ' AND ( date >= UTC_TIMESTAMP() - INTERVAL 1 YEAR )',
+    );
+    $where_date       = $date_value[ $date_param ];
+    $date_placeholder = array();
+} else {
+    $where_date       = ' AND YEAR(date ) = %d';
+    $date_placeholder = array( $date_param );
+}
+$ip_storing          = $util->get_sform_option( 1, 'settings', 'ip_storing', true );
+$ip_clause           = $ip_storing ? 'name LIKE %s OR lastname LIKE %s OR subject LIKE %s OR object LIKE %s OR ip LIKE %s OR email LIKE %s OR phone LIKE %s' : 'name LIKE %s OR lastname LIKE %s OR subject LIKE %s OR object LIKE %s OR email LIKE %s OR phone LIKE %s';
+$where_keyword       = ! empty( $keyword_param ) ? 'WHERE object != %s AND object != %s AND ( ' . $ip_clause . ')' : 'WHERE object != %s AND object != %s';
+$search_val          = empty( $keyword_param ) ? '' : '%' . $wpdb->esc_like( $keyword_param ) . '%';
+$arguments_list      = $ip_storing ? array( '', 'not stored', $search_val, $search_val, $search_val, $search_val, $search_val, $search_val, $search_val ) : array( '', 'not stored', $search_val, $search_val, $search_val, $search_val, $search_val, $search_val );
+$keyword_placeholder = empty( $keyword_param ) ? array( '', 'not stored' ) : $arguments_list;
+$where_form          = ! empty( $form_param ) ? " AND form = %d AND listable = '1' AND hidden = '0'" : " AND form != '0' AND listable = '1' AND hidden = '0'";
+$form_placeholder    = empty( $form_param ) ? array() : array( $form_param );
+$condition           = array(
+    ''         => " AND status != 'trash' AND status != 'spam'",
+    'inbox'    => " AND status != 'trash' AND status != 'spam'",
+    'new'      => " AND status = 'new'",
+    'answered' => " AND status = 'answered'",
+    'spam'     => " AND status = 'spam'",
+    'trash'    => " AND status = 'trash'",
+);
+$where_status        = $condition[ $view_param ];
+$where_clause        = $where_keyword . $where_date . $where_form . $where_status;
+$placeholders        = array_merge( $keyword_placeholder, $date_placeholder, $form_placeholder );
+$counter_query       = "SELECT COUNT( id ) FROM {$wpdb->prefix}sform_submissions {$where_clause}";
+$counter_result      = $wpdb->get_var( $wpdb->prepare( $counter_query, $placeholders ) ); // phpcs:ignore
+$counter             = 'new' === $entry_status ? $counter_result - 1 : $counter_result;
+$placeholders[]      = $entry_date;
+$prev_query          = "SELECT id FROM {$wpdb->prefix}sform_submissions {$where_clause} AND date < %s ORDER BY date DESC LIMIT 1";
+$prev_id             = $wpdb->get_var( $wpdb->prepare( $prev_query, $placeholders ) ); // phpcs:ignore
+$next_query          = "SELECT id FROM {$wpdb->prefix}sform_submissions {$where_clause} AND date > %s ORDER BY date ASC LIMIT 1";
+$next_id             = $wpdb->get_var( $wpdb->prepare( $next_query, $placeholders ) ); // phpcs:ignore
+$referer             = 'sform-entries' === $query_page ? remove_query_arg( array( 'page', 'form', 'view', 'date', 's', 'orderby', 'order', 'paged', 'id' ) ) : $referer_url;
+$prev_url            = esc_url( add_query_arg( 'id', $prev_id ) );
+$next_url            = esc_url( add_query_arg( 'id', $next_id ) );
+$nav_class           = $counter > 1 ? $color : 'invisible';
+$prev_button         = $prev_id ? '<a id="prev-link" href="' . $prev_url . '"><span id="prev" class="paginated"><span class="dashicons dashicons-arrow-left-alt2"></span><span>' . __( 'Prev', 'simpleform-contact-form-submissions' ) . '</span></span></a>' : '';
+$next_button         = $next_id ? '<a id="next-link" href="' . $next_url . '"><span id="next" class="paginated"><span class="dashicons dashicons-arrow-right-alt2" style="float: right"></span><span>' . __( 'Next', 'simpleform-contact-form-submissions' ) . '</span></span></a>' : '';
+$counter_span        = '<span id="view-counter">' . $counter . '</span>';
+$form_name           = $wpdb->get_var( $wpdb->prepare( "SELECT name FROM {$wpdb->prefix}sform_shortcodes WHERE id = %d", $entry_form ) ); // phpcs:ignore
+$referer_form        = $form ? $form_name : 'all forms';
+$referer_view        = array(
+    ''         => __( 'Inbox', 'simpleform-contact-form-submissions' ) . ':',
+    'inbox'    => __( 'Inbox', 'simpleform-contact-form-submissions' ) . ':',
+    'new'      => __( 'Unread', 'simpleform-contact-form-submissions' ) . ':',
+    'answered' => __( 'Answered', 'simpleform-contact-form-submissions' ) . ':',
+    'spam'     => __( 'Junk', 'simpleform-contact-form-submissions' ) . ':',
+    'trash'    => __( 'Trash', 'simpleform-contact-form-submissions' ) . ':',
+);
+$entries_view        = $referer_view[ $view_param ];
+/* translators: $1$s: View of the table; $2$s: Number of entries found in the view; $3$s: The form where entries were found; */
+$navigation_note = sprintf( _n( '%1$s: %2$s entry found in %3$s', '%1$s %2$s entries found in %3$s', $counter ), $entries_view, $counter_span, $referer_form );
+$contact_info    = isset( $_GET['info'] ) && 'hidden' === $_GET['info'] ? ' unseen' : ''; // phpcs:ignore
+$count_forms     = $wpdb->get_var( "SELECT COUNT(*) FROM {$wpdb->prefix}sform_shortcodes WHERE status != 'trash'" ); // phpcs:ignore
+$form_data_class = $count_forms < 2 ? 'unseen' : '';
+$user_type       = 'registered' === $requester_type && 0 !== $requester_id ? __( 'Registered', 'simpleform-contact-form-submissions' ) : __( 'Unregistered', 'simpleform-contact-form-submissions' );
+$phone           = ! empty( $entry_phone ) && 'not stored' !== $entry_phone ? $entry_phone : '';
+$ip              = ! empty( $entry_ip ) && 'not stored' !== $entry_ip ? $entry_ip : '';
+$email           = ! empty( $entry_email ) && 'not stored' !== $entry_email ? $entry_email : '';
+$page_user       = '';
+$login_data      = '';
+$role_class      = '';
+$role_name       = '';
+$avatar          = false;
+if ( 'registered' === $requester_type && 0 !== $requester_id ) {
+    $user_info  = get_userdata( $requester_id );
+    $page_user  = get_edit_user_link( $requester_id );
+    $login_data = false !== $user_info ? $user_info->user_login : '';
+    global $wp_roles;
+    $user_role  = false !== $user_info ? implode( ', ', $user_info->roles ) : '';
+    $role_class = empty( $phone ) && empty( $ip ) && empty( $email ) ? 'last' : '';
+    $role_name  = translate_user_role( $wp_roles->roles[ $user_role ]['name'] );
+}
+if ( is_email( $entry_email ) ) {
+    $gravemail = md5( strtolower( trim( $entry_email ) ) );
+    $gravsrc   = 'http://www.gravatar.com/avatar/' . $gravemail;
+    $gravcheck = 'http://www.gravatar.com/avatar/' . $gravemail . '?d=404';
+    $response  = get_headers( $gravcheck );
+    $avatar    = false !== $response && strpos( $response[0], '404 Not Found' ) === false ? true : false;
+}
+$name               = ! empty( $entry_name ) && 'not stored' !== $entry_name && 'anonymous' !== $requester_type ? $entry_name : '';
+$lastname           = ! empty( $entry_lastname ) && 'not stored' !== $entry_lastname ? $entry_lastname : '';
+$name_line          = empty( $name ) || empty( $lastname ) ? '' : 'topaligned';
+$name_class         = empty( $phone ) && empty( $ip ) && empty( $email ) ? 'last ' . $name_line : $name_line;
+$lastname_separator = ! empty( $name ) ? '<br>' : '';
+$fullname           = ! empty( $name ) || ! empty( $lastname ) ? $name . $lastname_separator . $lastname : __( 'Anonymous', 'simpleform' );
+$phone_class        = empty( $ip ) && empty( $email ) ? 'last' : '';
+$email_class        = empty( $ip ) ? 'last' : '';
+$data_column_class  = isset( $_GET['info'] ) && 'hidden' === $_GET['info'] ? 'fullwidth' : 'first'; // phpcs:ignore
+/* translators: at: used to indicate the time */
+$at = __( 'at', 'simpleform-contact-form-submissions' );
+// Get the site's timezone offset in seconds from UTC.
+$timezone_offset = date_offset_get( current_datetime() );
+$local_date      = strtotime( $entry_date ) + $timezone_offset;
+$date            = date_i18n( strval( get_option( 'date_format' ) ), $local_date );
+$time            = date_i18n( strval( get_option( 'time_format' ) ), $local_date );
+$data_entry_date = $date . ' ' . $at . ' ' . $time;
+$toggle_class    = isset( $_GET['info'] ) && 'hidden' === $_GET['info'] ? '' : ' unseen'; // phpcs:ignore
+$subject         = ! empty( $entry_subject ) && 'not stored' !== $entry_subject ? $entry_subject : '';
+$editing         = isset( $_GET['editing'] ) && 'hidden' === $_GET['editing'] ? ' collapsed' : ''; // phpcs:ignore
+$editing_class   = $editing ? 'closed' : '';
 $dashicons_arrow = $editing ? 'dashicons-arrow-down-alt2' : 'dashicons-arrow-up-alt2';
-$user_type =  esc_attr($item['requester_type']) == 'registered' && esc_attr($item['requester_id']) != '0' ? __('Registered', 'simpleform-contact-form-submissions') : __('Unregistered', 'simpleform-contact-form-submissions');
-$name = $item['name'] != '' && $item['name'] != 'not stored' && $item['name'] != 'Anonymous' ? trim(esc_attr($item['name'])) : '';
-$lastname = $item['lastname'] != '' && $item['lastname'] != 'not stored' ? esc_attr($item['lastname']) : '';
-$lastname_separator = ! empty($name) ? '<br>' : '';
-$fullname = ! empty($name) || ! empty($lastname) ? $name . $lastname_separator . $lastname : __( 'Anonymous', 'simpleform' );
-$phone = $item['phone'] != '' && $item['phone'] != 'not stored' ? esc_attr($item['phone']) : '';
-$ip = $item['ip'] != '' && $item['ip'] != 'not stored' ? esc_attr($item['ip']) : '';
-$email = $item['email'] != '' && $item['email'] != 'not stored' ? esc_attr($item['email']) : '';
-// $user_class = esc_attr($item['requester_type']) != 'registered' && empty($name) && empty($lastname) && empty($phone) && empty($ip) && empty($email) ? 'last' : '';
-$user_data = false;
-if ( esc_attr($item['requester_type']) == 'registered' && esc_attr($item['requester_id']) != '0' ) {      
-  $user_data = true;
-  $user_info = get_userdata(esc_attr($item['requester_id']));
-  $page_user = get_edit_user_link( esc_attr($item['requester_id']) );
-  $user_login = $user_info->user_login;
-  global $wp_roles;
-  $role = implode(', ', $user_info->roles);
-  $role_name = translate_user_role($wp_roles->roles[$role]['name']);
-} 
-$role_class = empty($phone) && empty($ip) && empty($email) ? 'last' : '';
-$name_line = empty($name) || empty($lastname) ? '' : 'topaligned';
-$name_class = empty($phone) && empty($ip) && empty($email) ? 'last ' . $name_line : $name_line;
-$phone_class = empty($ip) && empty($email) ? 'last' : '';
-$email_class = empty($ip) ? 'last' : '';
-$data_column_class = isset( $_REQUEST['info'] ) && $_REQUEST['info'] == 'hidden' ? 'fullwidth' : 'first';
-$submission_id_class = isset( $_REQUEST['info'] ) && $_REQUEST['info'] == 'hidden' ? '' : 'unseen';
-$date_class = isset( $_REQUEST['info'] ) && $_REQUEST['info'] == 'hidden' ? '' : 'first';
-$tzcity = get_option('timezone_string'); $tzoffset = get_option('gmt_offset');
-if ( ! empty($tzcity))  { 
-$current_time_timezone = date_create('now', timezone_open($tzcity));
-$timezone_offset =  date_offset_get($current_time_timezone);
-$submission_timestamp = strtotime(esc_attr($item['date'])) + $timezone_offset; 
-}
-else { 
-$timezone_offset =  $tzoffset * 3600;
-$submission_timestamp = strtotime(esc_attr($item['date'])) + $timezone_offset;  
-}
-/* translators: It is used to indicate the time */
-$at = __('at', 'simpleform-contact-form-submissions');
-$entry_date = date_i18n(get_option('date_format'),$submission_timestamp).' '.$at.' '.date_i18n(get_option('time_format'),$submission_timestamp );
-$subject = $item['subject'] != '' && $item['subject'] != 'not stored' ? esc_attr($item['subject']) : '';
-if ( $item['status'] == 'new') { $wpdb->query( $wpdb->prepare("UPDATE {$wpdb->prefix}sform_submissions SET status = 'read' WHERE id = %d", $id) ); }
-$count_forms = $wpdb->get_var("SELECT COUNT(*) FROM {$wpdb->prefix}sform_shortcodes WHERE status != 'trash'");
-$status_class = $count_forms > 1 && $item['status'] != 'trash' && $item['status'] != 'spam' ? '' : 'last';
-$separator = ! empty($subject) ? '?' : '';
-/* translators: added in front of the subject of a reply email */
-$re = __('Re: ', 'simpleform-contact-form-submissions' );
-$mailsubject = ! empty($subject) ? 'subject=' . $re . str_replace(' ', '%20', $subject) : '';
-$mailto = ! empty( $settings['mailto'] ) ? esc_attr($settings['mailto']) : 'false';
-$mailtolink_class = $item['status'] == 'read' || $item['status'] == 'new' ? '' : 'class="unseen"';
-$mailtolink = $mailto == 'true' && ! empty($email) ? '<a id="reply" ' . $mailtolink_class . ' href="mailto:'. $email . $separator . $mailsubject .'"><span class="sform reply-message button '. $color .'">'. __('Reply', 'simpleform-contact-form-submissions' ) .'</span><span class="dashicons dashicons-external icon-button '. $color .'"></span></a>' : '';
-$movable =  esc_attr($item['movable']) ? true : false ;
-// $current_form = !empty($form_id) ? $form_id : $wpdb->get_var("SELECT form FROM {$wpdb->prefix}sform_submissions WHERE id = {$id}");
-$forms = $wpdb->get_results( "SELECT id, name FROM {$wpdb->prefix}sform_shortcodes WHERE id != {$entry_form} AND status != 'trash' ORDER BY name ASC", 'ARRAY_A' );
-$options = '';
-foreach ( $forms as $form_data ) { $formID = $form_data['id']; $formName = $form_data['name']; $options .= '<option value="'.$formID.'">'.$formName.'</option>'; }
-?>
-
-<div id="sform-wrap" class="sform">
-
-<div id="new-release" class="<?php if ( $admin_notices == 'true' ) { echo 'invisible'; } ?>"><?php echo apply_filters( 'sform_update', $notice ); ?>&nbsp;</div>
-
-<div class="full-width-bar <?php echo $color ?>"><h1 class="title <?php echo $color ?>"><span class="dashicons dashicons-buddicons-pm responsive"></span><?php _e( 'Entry Data', 'simpleform-contact-form-submissions' ); ?><a href="<?php echo esc_url($back_link)?>"><span class="dashicons dashicons-list-view icon-button admin <?php echo $color ?>"></span><span class="settings-page wp-core-ui button admin back-list <?php echo $color ?>"><?php _e( 'Back to entries', 'simpleform-contact-form-submissions' ) ?></span></a></h1></div>
-
-<div id="page-description"><p><?php echo $description ?></p></div>
-
-<?php echo $messages_nav ?>
-
-<form id="submission-tab" method="post" class="<?php echo $color ?>">
-
-<input type="hidden" id="selected-form" name="selected-form" value="<?php echo $form_id ?>">
-<input type="hidden" id="entry" name="entry" value="<?php echo $item['id'] ?>">
-<input type="hidden" id="entries-counter" name="entries-counter" value="<?php echo $counter ?>">
-<input type="hidden" id="entries-form" name="entries-form" value="<?php echo $form_id ?>">
-<input type="hidden" id="entries-view" name="entries-view" value="<?php echo $view_arg ?>">
-<?php
-$email= esc_attr($item['email']);
-$gravemail = md5( strtolower( trim( $email ) ) );
-$gravsrc = "http://www.gravatar.com/avatar/".$gravemail;
-$gravcheck = "http://www.gravatar.com/avatar/".$gravemail."?d=404";
-$response = get_headers($gravcheck);
-$avatar = strpos( $response[0], '404 Not Found' ) === false ? true : '';
-?>
-
-<div class="submission-data"> 
-
-<div id="submitter-data" class="columns-wrap left <?php echo $color . $contact_info ?>">
-
-<table class="entrie-table"><tbody>
-
-<tr><th class="option first"><span><?php _e('ID','simpleform-contact-form-submissions') ?></span></th><td class="plaintext first toggle"># <?php echo $id; ?><span id="toggle-info" data-title="<?php esc_attr_e('Hide','simpleform-contact-form-submissions') ?>" class="dashicons dashicons-arrow-left-alt2 contact-info left"></span></td></tr>
-
-<tr class="<?php if ( $count_forms < 2 ) { echo 'unseen'; } ?>"><th class="option"><span><?php _e('Form','simpleform') ?></span></th><td class="plaintext"><span class="form-name"><?php echo $entry_form_name ?></span></td></tr>
-
-<tr><th class="option <?php // echo $user_class ?>"><span><?php _e('User','simpleform-contact-form-submissions') ?></span></th><td class="plaintext <?php // echo $user_class ?>"><?php echo $user_type ?></td></tr>
-
-<?php if ( $user_data == true ) { ?>
-
-<tr><th class="option"><span><?php _e('Username','simpleform-contact-form-submissions') ?></span></th><td class="plaintext"><?php echo '<a href="'.$page_user.'" target="_blank" class="nodecoration">' . $user_login .'</a>' ?></td></tr>
-
-<tr><th class="option <?php echo $role_class ?>"><span><?php _e('Role','simpleform-contact-form-submissions') ?></span></th><td class="plaintext <?php echo $role_class ?>"><?php echo $role_name ?></td></tr>
-
-<?php } ?>
-
-<?php if ( get_option( 'show_avatars' ) && is_email($item['email']) && $avatar ) { ?>
-
-<tr><th class="option"><span><?php _e('Profile Picture','simpleform-contact-form-submissions') ?></span></th><td class="plaintext profile"><?php echo get_avatar( esc_attr($item['email']), 'mystery' ); ?></td></tr>
-
-<?php } ?>
-
-<tr><th class="option <?php echo $name_class ?>"><span><?php _e('Name','simpleform-contact-form-submissions') ?></span></th><td class="plaintext <?php echo $name_class ?>"><?php echo $fullname ?></td></tr>
-         
-<?php if ( ! empty($phone ) ) { ?>
-     
-<tr><th class="option <?php echo $phone_class ?>"><span><?php _e('Phone','simpleform-contact-form-submissions') ?></span></th><td class="plaintext <?php echo $phone_class ?>"><?php echo $phone ?></td></tr>
-             
-<?php } ?>
-         
-<?php if ( ! empty($email) ) { ?>
-     
-<tr><th class="option <?php echo $email_class ?>"><span><?php _e('Email','simpleform-contact-form-submissions') ?></span></th><td class="plaintext email <?php echo $email_class ?>"><?php echo $email ?></td></tr>
-         
-<?php } ?>
-
-<?php if ( ! empty($ip) ) { ?>
-     
- <tr><th class="option last"><span><?php _e('IP','simpleform-contact-form-submissions') ?></span></th><td class="plaintext last"><?php echo $ip ?></td></tr>
-         
-<?php } ?>
-
-</tbody></table>
-
-</div>
-
-<div id="message-data-column" class="columns-wrap right <?php echo $data_column_class ?>">
-
-<table class="entrie-table"><tbody>
-    
-<tr id="submission-id" class="first"><th id="thdate" class="option first"><span><?php _e('Date','simpleform-contact-form-submissions') ?></span></th><td id="tddate" class="plaintext first toggle"><?php echo $entry_date ?><span id="toggle-message" data-title="<?php esc_attr_e('Show contact info','simpleform-contact-form-submissions') ?>" class="dashicons dashicons-arrow-right-alt2 contact-info right <?php echo $toggle_message_class ?>"></span></td></tr>
-
-<?php if ( ! empty($subject) ) { ?>
-
-<tr><th class="option"><span><?php _e('Subject','simpleform-contact-form-submissions') ?></span></th><td class="plaintext"><?php echo $subject ?></td></tr>
-
-<?php } ?>
-
-<tr><th class="option request"><span><?php _e('Message','simpleform-contact-form-submissions') ?></span></th><td class="plaintext request"><?php echo stripslashes(wpautop(esc_attr($item['object']))) ?></td></tr>
-
-</tbody></table>
-<h2 id="h2-editing" class="options-heading <?php echo $editing_class ?>"><span class="heading" section="editing"><?php _e( 'Editing', 'simpleform' ); ?><span class="toggle dashicons <?php echo $dashicons_arrow ?> editing"></span></span></h2>
-
-<div class="section editing <?php echo $editing ?>">
-<table class="form-table editing"><tbody>
-
-<tr><th id="thstatus" class="option <?php echo $status_class ?>"><span><?php _e('Status','simpleform') ?></span></th><td id="tdstatus"  class="select <?php echo $status_class ?>"><select name="message-status" id="message-status" class="sform <?php echo $color ?>"><option value="" disabled><?php _e('Mark as', 'simpleform-contact-form-submissions' ) ?></option><option value="new"><?php _e('unread', 'simpleform-contact-form-submissions' ) ?></option><option value="read" <?php if ( $item['status'] == 'read' || $item['status'] == 'new' ) echo 'selected="selected"'; ?>><?php _e('read', 'simpleform-contact-form-submissions' ) ?></option><option value="answered" <?php selected( $item['status'], 'answered'); ?>><?php _e('answered', 'simpleform-contact-form-submissions' ) ?></option><option value="spam" <?php selected( $item['status'], 'spam'); ?>><?php _e('junk', 'simpleform-contact-form-submissions' ) ?></option><option value="trash" <?php selected( $item['status'], 'trash'); ?>><?php _e('trashed', 'simpleform-contact-form-submissions' ) ?></option></select><?php echo $mailtolink ?></td></tr>
-    
-<tr class="trmovable <?php if ( $count_forms < 2 || $item['status'] == 'trash' || $item['status'] == 'spam' ) { echo 'unseen'; } ?>"><th id="thmoving" class="option <?php if ( $movable != true ) { echo 'last'; } ?>"><span><?php _e('Moving','simpleform-contact-form-submissions') ?></span></th><td id="tdmoving" class="checkbox-switch <?php if ( $movable != true ) { echo 'last'; } ?>"><div class="switch-box"><label class="switch-input"><input type="checkbox" name="moving" id="moving" class="sform-switch" value="false" <?php checked( $movable, true ) ?>><span></span></label><label for="moving" class="switch-label"><?php _e( 'Allow the entry to be moved to another form','simpleform-contact-form-submissions') ?></label></div></td></tr>
-     
-<tr class="trmoving <?php if ( $count_forms < 2 || $item['status'] == 'trash' || $item['status'] == 'spam' || $movable != true ) { echo 'unseen'; } ?>"><th id="thmoveto" class="option last"><span><?php _e('Move To','simpleform') ?></span></th><td id="tdmoveto" class="select last"><select name="moveto" id="moveto" class="sform <?php echo $color ?>"><option value=""><?php _e('Select a form to move entry to', 'simpleform-contact-form-submissions' ) ?></option><?php echo $options ?></select></td></tr>
-
-</tbody></table>
-
-<div id="submit-wrap">
-<div id="alert-wrap">
-<noscript><div id="noscript"><?php _e('You need JavaScript enabled to edit form. Please activate it. Thanks!', 'simpleform' ) ?></div></noscript>
-<div id="message-wrap" class="message"></div>
-</div>
-<input type="submit" name="edit-entry" id="edit-entry" class="submit-button" value="<?php esc_attr_e( 'Save Changes', 'simpleform-contact-form-submissions' ) ?>"><?php  wp_nonce_field( 'ajax-verification-nonce', 'verification_nonce'); ?>
-</div>
-</div>
-</div>
-</div>
-
-</form>
-
-</div> 
-
-<div class="sform-clear"></div>
+// Update the status of unread entry as soon as the page finishes loading.
+if ( 'new' === $entry_status ) {
+    $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->prefix}sform_submissions SET status = 'read' WHERE id = %d", $entry_id ) ); // phpcs:ignore
+}
+$status_class      = $count_forms > 1 && 'trash' !== $entry_status && 'spam' !== $entry_status ? '' : 'last';
+$read_selected     = 'read' === $entry_status || 'new' === $entry_status ? 'selected="selected"' : '';
+$answered_selected = 'answered' === $entry_status ? 'selected="selected"' : '';
+$spam_selected     = 'spam' === $entry_status ? 'selected="selected"' : '';
+$trash_selected    = 'trash' === $entry_status ? 'selected="selected"' : '';
+/* translators: Prefix for the reply subject */
+$re             = __( 'Re: ', 'simpleform-contact-form-submissions' );
+$separator      = ! empty( $subject ) ? '?' : '';
+$mailto_subject = ! empty( $subject ) ? 'subject=' . $re . str_replace( ' ', '%20', $subject ) : '';
+$mailto         = $util->get_sform_option( $entry_form, 'settings', 'mailto', false );
+$mailto_class   = 'read' === $entry_status || 'new' === $entry_status ? '' : 'unseen';
+$mailto_button  = $mailto && ! empty( $email ) ? '<a id="reply" class="' . esc_attr( $mailto_class ) . '" href="mailto:' . esc_attr( $email ) . esc_attr( $separator ) . esc_attr( $mailto_subject ) . '"><span class="sform reply-message button ' . esc_attr( $color ) . '">' . __( 'Reply', 'simpleform-contact-form-submissions' ) . '</span><span class="dashicons dashicons-external icon-button ' . esc_attr( $color ) . '"></span></a>' : '';
+$moving_class   = $count_forms < 2 || 'trash' === $entry_status || 'spam' === $entry_status ? 'unseen' : '';
+$forms_data     = $wpdb->get_results( $wpdb->prepare( "SELECT id, name FROM {$wpdb->prefix}sform_shortcodes WHERE id != %d AND status != 'trash' ORDER BY name ASC", $entry_form ), ARRAY_A ); // phpcs:ignore
+$options        = '<option value="">' . __( 'Select a form to move entry to', 'simpleform-contact-form-submissions' ) . '</option>';
+foreach ( $forms_data as $form_data ) {
+    $id_data   = $form_data['id'];
+    $name_data = $form_data['name'];
+    $options  .= '<option value="' . $id_data . '">' . $name_data . '</option>';
+}
+$allowed_tags = $util->sform_allowed_tags();
+
+// Page wrap: opening tag.
+$entry_page = '<div id="sform-wrap" class="sform ' . esc_attr( $wrap_class ) . '">';
+
+// Admin notice.
+$entry_page .= '<div id="new-release" class="' . esc_attr( $notice_class ) . '">' . wp_kses_post( apply_filters( 'sform_update', $notice ) ) . '&nbsp;</div>';
+
+// Page heading.
+$entry_page .= '<div class="full-width-bar ' . esc_attr( $color ) . '"><h1 class="title ' . esc_attr( $color ) . '"><span class="dashicons dashicons-tag responsive"></span>' . __( 'Entry data', 'simpleform-contact-form-submissions' ) . $back_button . '</h1></div>';
+
+// Description page.
+$entry_page .= '<div id="page-description"><p>' . esc_html( $description ) . '</p></div>';
+
+// Previous/Next entries navigation.
+$entry_page .= '<div id="navigation-buttons" class="' . esc_attr( $nav_class ) . '"><div id="messages-nav">' . $prev_button . $next_button . '</div><div id="messages-info">' . $navigation_note . '&nbsp;</div></div>';
+
+// Form opening tag.
+$entry_page .= '<form id="submission-tab" method="post" class="' . esc_attr( $color ) . '">';
+
+// Hidden input.
+$entry_page .= '<input type="hidden" id="entry" name="entry" value="' . $entry_id . '">';
+$entry_page .= '<input type="hidden" id="entries-counter" name="entries-counter" value="' . $counter . '">';
+$entry_page .= '<input type="hidden" id="entry-form" name="entry-form" value="' . $entry_form . '">';
+$entry_page .= '<input type="hidden" id="entries-view" name="entries-view" value="' . $view . '">';
+
+// Entry data wrap: opening tag.
+$entry_page .= '<div class="submission-data">';
+
+// Contact info data wrap: opening tag.
+$entry_page .= '<div id="submitter-data" class="columns-wrap left ' . esc_attr( $color ) . esc_attr( $contact_info ) . '">';
+
+$entry_page .= '<table class="entrie-table"><tbody>';
+
+$entry_page .= '<tr><th class="option first"><span>' . __( 'ID', 'simpleform-contact-form-submissions' ) . '</span></th><td class="plaintext first toggle"># ' . $entry_id . '<span id="toggle-info" data-title="' . esc_attr__( 'Hide', 'simpleform-contact-form-submissions' ) . '" class="dashicons dashicons-arrow-left-alt2 contact-info left"></span></td></tr>';
+
+$entry_page .= '<tr class="' . esc_attr( $form_data_class ) . '"><th class="option"><span>' . __( 'Form', 'simpleform' ) . '</span></th><td class="plaintext"><span id="form_name" class="form-name">' . esc_html( $form_name ) . '</span></td></tr>';
+
+$entry_page .= '<tr><th class="option"><span>' . __( 'User', 'simpleform-contact-form-submissions' ) . '</span></th><td class="plaintext">' . esc_html( $user_type ) . '</td></tr>';
+
+if ( 'registered' === $requester_type && 0 !== $requester_id ) {
+
+    $entry_page .= '<tr><th class="option"><span>' . __( 'Username', 'simpleform-contact-form-submissions' ) . '</span></th><td class="plaintext"><a href="' . esc_attr( $page_user ) . '" target="_blank" class="nodecoration">' . esc_html( $login_data ) . '</a></td></tr>';
+
+    $entry_page .= '<tr><th class="option ' . esc_attr( $role_class ) . '"><span>' . __( 'Role', 'simpleform-contact-form-submissions' ) . '</span></th><td class="plaintext ' . esc_attr( $role_class ) . '">' . esc_html( $role_name ) . '</td></tr>';
+
+}
+
+if ( get_option( 'show_avatars' ) && is_email( $entry_email ) && $avatar ) {
+
+    $entry_page .= '<tr><th class="option"><span>' . __( 'Profile Picture', 'simpleform-contact-form-submissions' ) . '</span></th><td class="plaintext profile">' . get_avatar( esc_attr( $entry_email ), 96, 'mystery' ) . '</td></tr>';
+
+}
+
+$entry_page .= '<tr><th class="option ' . esc_attr( $name_class ) . '"><span>' . __( 'Name', 'simpleform-contact-form-submissions' ) . '</span></th><td class="plaintext ' . esc_attr( $name_class ) . '">' . wp_kses_post( $fullname ) . '</td></tr>';
+
+if ( ! empty( $phone ) ) {
+
+    $entry_page .= '<tr><th class="option ' . esc_attr( $phone_class ) . '"><span>' . __( 'Phone', 'simpleform-contact-form-submissions' ) . '</span></th><td class="plaintext ' . esc_attr( $phone_class ) . '">' . esc_html( $phone ) . '</td></tr>';
+
+}
+
+if ( ! empty( $email ) ) {
+
+    $entry_page .= '<tr><th class="option ' . esc_attr( $email_class ) . '"><span>' . __( 'Email', 'simpleform-contact-form-submissions' ) . '</span></th><td class="plaintext email ' . esc_attr( $email_class ) . '">' . esc_html( $email ) . '</td></tr>';
+
+}
+
+if ( ! empty( $ip ) ) {
+
+    $entry_page .= '<tr><th class="option last"><span>' . __( 'IP', 'simpleform-contact-form-submissions' ) . '</span></th><td class="plaintext last">' . esc_html( $ip ) . '</td></tr>';
+
+}
+
+// Contact info data wrap: closing tab.
+$entry_page .= '</tbody></table></div>';
+
+// Message data wrap: opening tag.
+$entry_page .= '<div id="message-data-column" class="columns-wrap right ' . esc_attr( $data_column_class ) . '">';
+
+$entry_page .= '<table class="entrie-table"><tbody>';
+
+$entry_page .= '<tr id="submission-id" class="first"><th id="thdate" class="option first"><span>' . __( 'Date', 'simpleform-contact-form-submissions' ) . '</span></th><td id="tddate" class="plaintext first toggle">' . esc_html( $data_entry_date ) . '<span id="toggle-message" data-title="' . esc_attr__( 'Show contact info', 'simpleform-contact-form-submissions' ) . '" class="dashicons dashicons-arrow-right-alt2 contact-info right ' . esc_attr( $toggle_class ) . '"></span></td></tr>';
+
+if ( ! empty( $subject ) ) {
+
+    $entry_page .= '<tr><th class="option"><span>' . __( 'Subject', 'simpleform-contact-form-submissions' ) . '</span></th><td class="plaintext">' . esc_html( stripslashes( $subject ) ) . '</td></tr>';
+
+}
+
+$entry_page .= '<tr><th class="option request"><span>' . __( 'Message', 'simpleform-contact-form-submissions' ) . '</span></th><td class="plaintext request">' . wpautop( stripslashes( $entry_message ) ) . '</td></tr>';
+
+// Message data wrap: closing tag.
+$entry_page .= '</tbody></table>';
+
+// Editing options: opening tag.
+$entry_page .= '<h2 id="h2-editing" class="options-heading ' . esc_attr( $editing_class ) . '"><span class="editing" data-section="editing">' . __( 'Editing', 'simpleform' ) . '<span class="toggle dashicons editing ' . esc_attr( $dashicons_arrow ) . '"></span></span></h2><div class="section editing ' . esc_attr( $editing ) . '">';
+
+// Editing options wrap: opening tag.
+$entry_page .= '<table class="form-table editing"><tbody>';
+
+$entry_page .= '<tr><th id="thstatus" class="option ' . esc_attr( $status_class ) . '"><span>' . __( 'Status', 'simpleform' ) . '</span></th><td id="tdstatus" class="select ' . esc_attr( $status_class ) . '"><select name="message-status" id="message-status" class="sform ' . esc_attr( $color ) . '"><option value="" disabled>' . __( 'Mark as', 'simpleform-contact-form-submissions' ) . '</option><option value="new">' . __( 'unread', 'simpleform-contact-form-submissions' ) . '</option><option value="read" ' . esc_html( $read_selected ) . '>' . __( 'read', 'simpleform-contact-form-submissions' ) . '</option><option value="answered" ' . esc_html( $answered_selected ) . '>' . __( 'answered', 'simpleform-contact-form-submissions' ) . '</option><option value="spam" ' . esc_html( $spam_selected ) . '>' . __( 'junk', 'simpleform-contact-form-submissions' ) . '</option><option value="trash" ' . esc_html( $trash_selected ) . '>' . __( 'trashed', 'simpleform-contact-form-submissions' ) . '</option></select>' . $mailto_button . '</td></tr>';
+
+$entry_page .= '<tr class="trmovable ' . esc_attr( $moving_class ) . '"><th id="thmoving" class="option last"><span>' . __( 'Moving', 'simpleform-contact-form-submissions' ) . '</span></th><td id="tdmoving" class="checkbox-switch last"><div class="switch-box"><label class="switch-input"><input type="checkbox" name="moving" id="moving" class="sform-switch" value="false"><span></span></label><label for="moving" class="switch-label">' . __( 'Allow the entry to be moved to another form', 'simpleform-contact-form-submissions' ) . '</label></div></td></tr>';
+
+$entry_page .= '<tr class="trmoving unseen"><th id="thmoveto" class="option last"><span>' . __( 'Move To', 'simpleform' ) . '</span></th><td id="tdmoveto" class="select last"><select name="moveto" id="moveto" class="sform ' . esc_attr( $color ) . '">' . $options . '</select></td></tr>';
+
+// Editing options wrap: closing tag.
+$entry_page .= '</tbody></table>';
+
+// Save changes button.
+$entry_page .= '<div id="submit-wrap"><div id="alert-wrap"><noscript><div id="noscript">' . __( 'You need JavaScript enabled to edit entry data. Please activate it. Thanks!', 'simpleform-contact-form-submissions' ) . '</div></noscript><div id="message-wrap" class="message"></div></div><input type="submit" id="edit-entry" name="edit-entry" class="submit-button" value="' . esc_attr__( 'Save Changes', 'simpleform-contact-form-submissions' ) . '">' . wp_nonce_field( 'simpleform_backend_update', 'simpleform_nonce', false, false ) . '</div>';
+
+// Editing options: closing tag.
+$entry_page .= '</div>';
+
+// Message data wrap: closing tag.
+$entry_page .= '</div>';
+
+// Entry data wrap: closing tag.
+$entry_page .= '</div>';
+
+// Form closing tag.
+$entry_page .= '</form>';
+
+// Page wrap: closing tag.
+$entry_page .= '</div>';
+
+echo wp_kses( $entry_page, $allowed_tags );

simpleform-contact-form-submissions/trunk/admin/partials/index.php

@@ -1 @@
-<?php // Silence is golden
+<?php
+/**
+ * Silence is golden.
+ *
+ * @package SimpleForm Contact Form Submissions/admin/partials
+ */

simpleform-contact-form-submissions/trunk/changelog.txt

@@ -1 +1 @@
 == Changelog ==
+
+= 2.1.0 (24 July 2024) =
+* Changed: code refactoring
+* Fixed: general errors
+* Added: entry status column
+
+= 2.0.2 (30 March 2022) =
+* Fixed: PHP error while deactivating the plugin
 
 = 2.0.1 (29 March 2022) =

simpleform-contact-form-submissions/trunk/includes/index.php

@@ -1 @@
-<?php // Silence is golden
+<?php
+/**
+ * Silence is golden.
+ *
+ * @package SimpleForm Contact Form Submissions/includes
+ */

simpleform-contact-form-submissions/trunk/index.php

@@ -1 @@
-<?php // Silence is golden
+<?php
+/**
+ * Silence is golden.
+ *
+ * @package SimpleForm Contact Form Submissions
+ */

simpleform-contact-form-submissions/trunk/public/index.php

@@ -1 @@
-<?php // Silence is golden
+<?php
+/**
+ * Silence is golden.
+ *
+ * @package SimpleForm Contact Form Submissions/public
+ */

simpleform-contact-form-submissions/trunk/simpleform-submissions.php

@@ -1 +1 @@
 <?php
-
 /**
  *
- * Plugin Name: SimpleForm Contact Form Submissions
- * Description: You are afraid of losing important messages? This addon for SimpleForm saves data into the WordPress database, and allows you to easily manage the messages from the dashboard.
- * Version: 2.0.1
- * Requires at least: 5.2
- * Requires PHP: 5.6
- * Author: WPSForm Team
- * Author URI: https://wpsform.com
- * License: GPL-2.0+
- * License URI: http://www.gnu.org/licenses/gpl-2.0.txt
- * Text Domain: simpleform-contact-form-submissions
- * Domain Path: /languages
+ * Plugin Name:       SimpleForm Contact Form Submissions
+ * Description:       You are afraid of losing important messages? This addon for SimpleForm saves data into the WordPress database, and allows you to easily manage the messages from the dashboard.
+ * Version:           2.1.0
+ * Requires at least: 5.9
+ * Requires PHP:      7.4
+ * Author:            SimpleForm Team
+ * License:           GPL-2.0+
+ * License URI:       http://www.gnu.org/licenses/gpl-2.0.txt
+ * Text Domain:       simpleform-contact-form-submissions
+ * Requires Plugins:  simpleform
  *
+ * @package           SimpleForm Contact Form Submissions
  */
 
-if ( ! defined( 'WPINC' ) ) { die; }
+defined( 'WPINC' ) || exit;
 
 /**
  * Plugin constants.
  *
- * @since    1.0
+ * @since 1.0.0
  */
- 
-define( 'SIMPLEFORM_SUBMISSIONS_NAME', 'SimpleForm Contact Form Submissions' ); 
-define( 'SIMPLEFORM_SUBMISSIONS_VERSION', '2.0.1' ); 
-define( 'SIMPLEFORM_SUBMISSIONS_DB_VERSION', '2.0.1' );
+
+define( 'SIMPLEFORM_SUBMISSIONS_NAME', 'SimpleForm Contact Form Submissions' );
+define( 'SIMPLEFORM_SUBMISSIONS_VERSION', '2.1.0' );
+define( 'SIMPLEFORM_SUBMISSIONS_DB_VERSION', '2.1.0' );
 define( 'SIMPLEFORM_SUBMISSIONS_BASENAME', plugin_basename( __FILE__ ) );
-define( 'SIMPLEFORM_SUBMISSIONS_PATH', plugin_dir_path( __FILE__ ) );
-define( 'SIMPLEFORM_VERSION_REQUIRED', '2.1.5' );
+if ( ! defined( 'SIMPLEFORM_VERSION_REQUIRED' ) ) {
+    define( 'SIMPLEFORM_VERSION_REQUIRED', '2.2.0' );
+}
 
 /**
  * The code that runs during plugin activation.
  *
- * @since    1.0
+ * @since 1.0.0
+ *
+ * @param bool $network_wide Whether to enable the plugin for all sites in the network
+ *                           or just the current site. Multisite only. Default false.
+ *
+ * @return void
  */
- 
-function activate_simpleform_submissions($network_wide) {
-    require_once plugin_dir_path( __FILE__ ) . 'includes/class-activator.php';
-    SimpleForm_Submissions_Activator::activate($network_wide);
+function activate_simpleform_submissions( $network_wide ) {
+    require_once plugin_dir_path( __FILE__ ) . 'includes/class-simpleform-submissions-activator.php';
+    SimpleForm_Submissions_Activator::activate( $network_wide );
 }
 
-/** 
+/**
  * Change table when a new site into a network is created.
  *
- * @since    1.0
- */ 
-
-function simpleform_submissions_db_on_create_blog($params) {
-    require_once plugin_dir_path( __FILE__ ) . 'includes/class-activator.php';
-    SimpleForm_Submissions_Activator::on_create_blog($params);
+ * @since 1.0.0
+ *
+ * @param WP_Site $new_site New site object.
+ *
+ * @return void
+ */
+function simpleform_submissions_network( $new_site ) {
+    require_once plugin_dir_path( __FILE__ ) . 'includes/class-simpleform-submissions-activator.php';
+    SimpleForm_Submissions_Activator::on_create_blog( $new_site );
 }
 
-add_action( 'wp_insert_site', 'simpleform_submissions_db_on_create_blog'); 
+add_action( 'wp_insert_site', 'simpleform_submissions_network' );
 
 /**
  * The code that runs during plugin deactivation.
  *
- * @since    1.0
+ * @since 1.0.0
+ *
+ * @return void
  */
- 
 function deactivate_simpleform_submissions() {
-    require_once plugin_dir_path( __FILE__ ) . 'includes/class-deactivator.php';
+    require_once plugin_dir_path( __FILE__ ) . 'includes/class-simpleform-submissions-deactivator.php';
     SimpleForm_Submissions_Deactivator::deactivate();
 }
@@ -73 +81 @@
  * The core plugin class.
  *
- * @since    1.0
+ * @since 1.0.0
  */
- 
-require plugin_dir_path( __FILE__ ) . '/includes/class-core.php';
+
+require plugin_dir_path( __FILE__ ) . '/includes/class-simpleform-submissions.php';
 
 /**
  * Begins execution of the plugin.
  *
- * @since    1.0
+ * @since 1.0.0
+ *
+ * @return void
  */
- 
-function run_SimpleForm_Submissions() {
+function run_simpleform_submissions() {
 
     $plugin = new SimpleForm_Submissions();
     $plugin->run();
-
 }
 
-run_SimpleForm_Submissions();
+run_simpleform_submissions();

simpleform-contact-form-submissions/trunk/uninstall.php

@@ -1 +1 @@
 <?php
-
 /**
- * Fired when the plugin is uninstalled.
+ * File delegated to the uninstalling the plugin.
  *
- * @since      1.0
+ * @package SimpleForm Contact Form Submissions
  */
 
-// Prevent direct access. Exit if file is not called by WordPress.
-if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
-    exit;
+defined( 'WP_UNINSTALL_PLUGIN' ) || exit;
+
+// Detect the simpleform plugin installation.
+$plugin_file = defined( 'WP_PLUGIN_DIR' ) ? WP_PLUGIN_DIR . '/simpleform/simpleform.php' : '';
+
+if ( file_exists( $plugin_file ) ) {
+
+    global $wpdb;
+
+    if ( ! is_multisite() ) {
+
+        $settings = (array) get_option( 'sform_settings', array() );
+
+        // Detect the parent plugin activation.
+        if ( $settings ) {
+
+            if ( isset( $settings['deleting_messages'] ) && $settings['deleting_messages'] ) {
+
+                $submissions_table = $wpdb->prefix . 'sform_submissions';
+                $wpdb->query( "ALTER TABLE {$submissions_table} DROP COLUMN name, DROP COLUMN lastname, DROP COLUMN email, DROP COLUMN phone, DROP COLUMN subject, DROP COLUMN object, DROP COLUMN ip, DROP COLUMN listable, DROP COLUMN movable" ); // phpcs:ignore
+
+            }
+
+            $addon_settings = array(
+                'data_storing'      => $settings['data_storing'],
+                'ip_storing'        => $settings['ip_storing'],
+                'data_columns'      => $settings['data_columns'],
+                'counter'           => $settings['counter'],
+                'deleting_messages' => $settings['deleting_messages'],
+            );
+
+            $new_settings = array_diff_key( $settings, $addon_settings );
+            update_option( 'sform_settings', $new_settings );
+
+            $shortcodes_table = $wpdb->prefix . 'sform_shortcodes';
+
+            if ( $wpdb->get_var( $wpdb->prepare( "SHOW TABLES LIKE %s", $shortcodes_table ) ) === $shortcodes_table ) { // phpcs:ignore         
+
+                $forms = $wpdb->get_col( "SELECT id FROM {$wpdb->prefix}sform_shortcodes WHERE id != '1'" ); // phpcs:ignore
+
+                foreach ( $forms as $form ) {
+
+                    $form_settings = (array) get_option( 'sform_' . $form . '_settings', array() );
+
+                    if ( $form_settings ) {
+
+                        $addon_settings = array(
+                            'data_storing'      => $form_settings['data_storing'],
+                            'ip_storing'        => $form_settings['ip_storing'],
+                            'data_columns'      => $form_settings['data_columns'],
+                            'counter'           => $form_settings['counter'],
+                            'deleting_messages' => $form_settings['deleting_messages'],
+                        );
+
+                        $new_form_settings = array_diff_key( $form_settings, $addon_settings );
+                        update_option( 'sform_' . $form . '_settings', $new_form_settings );
+
+                    }
+                }
+
+                $wpdb->query( "UPDATE {$wpdb->prefix}sform_shortcodes SET storing = '1'" ); // phpcs:ignore
+
+            }
+        }
+
+        delete_option( 'sform_sub_db_version' );
+        delete_option( 'sform_screen_options' );
+        delete_option( 'sform_entries_view' );
+        delete_transient( 'sform_action_notice' );
+
+    } else {
+
+        $blog_ids         = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" ); // phpcs:ignore
+        $original_blog_id = get_current_blog_id();
+
+        foreach ( $blog_ids as $blogid ) {
+
+            switch_to_blog( $blogid );
+            $settings = (array) get_option( 'sform_settings', array() );
+
+            // Detect the parent plugin activation.
+            if ( $settings ) {
+
+                if ( isset( $settings['deleting_messages'] ) && $settings['deleting_messages'] ) {
+
+                    $submissions_table = $wpdb->prefix . 'sform_submissions';
+                    $wpdb->query( "ALTER TABLE {$submissions_table} DROP COLUMN name, DROP COLUMN lastname, DROP COLUMN email, DROP COLUMN phone, DROP COLUMN subject, DROP COLUMN object, DROP COLUMN ip, DROP COLUMN listable, DROP COLUMN movable" ); // phpcs:ignore
+
+                }
+
+                $addon_settings = array(
+                    'data_storing'      => $settings['data_storing'],
+                    'ip_storing'        => $settings['ip_storing'],
+                    'data_columns'      => $settings['data_columns'],
+                    'counter'           => $settings['counter'],
+                    'deleting_messages' => $settings['deleting_messages'],
+                );
+
+                $new_settings = array_diff_key( $settings, $addon_settings );
+                update_option( 'sform_settings', $new_settings );
+
+                $shortcodes_table = $wpdb->prefix . 'sform_shortcodes';
+
+                if ( $wpdb->get_var( $wpdb->prepare( "SHOW TABLES LIKE %s", $shortcodes_table ) ) === $shortcodes_table ) { // phpcs:ignore         
+
+                    $forms = $wpdb->get_col( "SELECT id FROM {$wpdb->prefix}sform_shortcodes WHERE id != '1'" ); // phpcs:ignore
+
+                    foreach ( $forms as $form ) {
+
+                        $form_settings = (array) get_option( 'sform_' . $form . '_settings', array() );
+
+                        if ( $form_settings ) {
+
+                            $addon_settings = array(
+                                'data_storing'      => $form_settings['data_storing'],
+                                'ip_storing'        => $form_settings['ip_storing'],
+                                'data_columns'      => $form_settings['data_columns'],
+                                'counter'           => $form_settings['counter'],
+                                'deleting_messages' => $form_settings['deleting_messages'],
+                            );
+
+                            $new_form_settings = array_diff_key( $form_settings, $addon_settings );
+                            update_option( 'sform_' . $form . '_settings', $new_form_settings );
+
+                        }
+                    }
+
+                    $wpdb->query( "UPDATE {$wpdb->prefix}sform_shortcodes SET storing = '1'" ); // phpcs:ignore
+
+                }
+            }
+
+            delete_option( 'sform_sub_db_version' );
+            delete_option( 'sform_screen_options' );
+            delete_option( 'sform_entries_view' );
+            delete_transient( 'sform_action_notice' );
+
+        }
+
+        switch_to_blog( $original_blog_id );
+
+    }
+} else {
+
+    global $wpdb;
+    $wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . 'sform_submissions' ); // phpcs:ignore
+    $wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . 'sform_shortcodes' ); // phpcs:ignore
+    $wpdb->query( "DELETE FROM {$wpdb->options} WHERE option_name LIKE 'sform\_%'" ); // phpcs:ignore
+    $wpdb->query( "DELETE FROM {$wpdb->options} WHERE option_name LIKE 'sform\-%'" ); // phpcs:ignore
+    $wpdb->query( "DELETE FROM {$wpdb->options} WHERE option_name LIKE '%\_sform\_%'" ); // phpcs:ignore
+
 }
-
-// Detect core plugin
-$plugin_file = 'simpleform/simpleform.php';
-if ( file_exists( WP_PLUGIN_DIR . '/' . $plugin_file ) ) {
-
- if ( !is_multisite() )  {
-  $settings = get_option('sform_settings');
-  if ( $settings ) {
-   if ( isset( $settings['deleting_messages'] ) && esc_attr($settings['deleting_messages']) == 'true' ) {
-    global $wpdb;
-    $prefix = $wpdb->prefix;
-    $submissions_table = $prefix . 'sform_submissions';
-    $wpdb->query("ALTER TABLE $submissions_table DROP COLUMN name, DROP COLUMN lastname, DROP COLUMN email, DROP COLUMN phone, DROP COLUMN subject, DROP COLUMN object, DROP COLUMN ip, DROP COLUMN listable, DROP COLUMN movable");
-   }
-   $addon_settings = array( 'data_storing' => $settings['data_storing'], 'ip_storing' => $settings['ip_storing'], 'data_columns' => $settings['data_columns'], 'counter' => $settings['counter'], 'deleting_messages' => $settings['deleting_messages'] );
-   $new_settings = array_diff_key($settings,$addon_settings);
-   update_option('sform_settings', $new_settings);
-   global $wpdb;
-   $shortcodes_table = $wpdb->prefix . 'sform_shortcodes';
-   if ( $result = $wpdb->get_results("SHOW TABLES LIKE '".$shortcodes_table."'") ) {
-   $ids = $wpdb->get_col("SELECT id FROM `$shortcodes_table` WHERE id != '1'");  
-   if ( $ids ) {
-    foreach ( $ids as $id ) {
-    $form_settings = get_option('sform_'.$id.'_settings');
-    if ( $form_settings != false ) {
-       $addon_settings = array( 'data_storing' => $form_settings['data_storing'], 'ip_storing' => $form_settings['ip_storing'], 'data_columns' => $form_settings['data_columns'], 'counter' => $form_settings['counter'], 'deleting_messages' => $form_settings['deleting_messages'] );
-       $new_form_settings = array_diff_key($form_settings,$addon_settings);
-       update_option('sform_'.$id.'_settings', $new_form_settings); 
-    }
-    }
-   }
-  }
-  }
-  delete_option( 'sform_sub_db_version' );
-  delete_option( 'sform_screen_options' );
-  delete_option( 'sform_entries_view' );
-  delete_transient( 'sform_action_notice' );
-  
-  $shortcodes_table = "{$wpdb->prefix}sform_shortcodes"; 
-  $forms = $wpdb->get_col( "SELECT id FROM $shortcodes_table" );
-  foreach($forms as $form) {
-    $update = $wpdb->update($shortcodes_table, array( 'storing' => '1' ), array('id' => $form ) );
-  }
-
-  } 
-
- else {
-    global $wpdb;
-    $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
-    $original_blog_id = get_current_blog_id();
-    foreach ( $blog_ids as $blog_id ) {
-      switch_to_blog( $blog_id );
-      $settings = get_option('sform_settings');
-      if ( $settings ) {
-        if ( isset( $settings['deleting_messages'] ) && esc_attr($settings['deleting_messages']) == 'true' ) {
-        $prefix = $wpdb->prefix;
-        $submissions_table = $prefix . 'sform_submissions';
-        $wpdb->query("ALTER TABLE $submissions_table DROP COLUMN name, DROP COLUMN lastname, DROP COLUMN email, DROP COLUMN phone, DROP COLUMN subject, DROP COLUMN object, DROP COLUMN ip, DROP COLUMN listable, DROP COLUMN movable");
-        }
-        $addon_settings = array( 'data_storing' => $settings['data_storing'], 'ip_storing' => $settings['ip_storing'], 'data_columns' => $settings['data_columns'], 'counter' => $settings['counter'], 'deleting_messages' => $settings['deleting_messages'] );
-        $new_settings = array_diff_key($settings,$addon_settings);
-        update_option('sform_settings', $new_settings);
-        $shortcodes_table = $wpdb->prefix . 'sform_shortcodes';
-        if ( $result = $wpdb->get_results("SHOW TABLES LIKE '".$shortcodes_table."'") ) {
-         $ids = $wpdb->get_col("SELECT id FROM `$shortcodes_table` WHERE id != '1'");    
-         if ( $ids ) {
-          foreach ( $ids as $id ) {
-          $form_settings = get_option('sform_'.$id.'_settings');
-          if ( $form_settings != false ) {
-           $addon_settings = array( 'data_storing' => $form_settings['data_storing'], 'ip_storing' => $form_settings['ip_storing'], 'data_columns' => $form_settings['data_columns'], 'counter' => $form_settings['counter'], 'deleting_messages' => $form_settings['deleting_messages'] );
-           $new_form_settings = array_diff_key($form_settings,$addon_settings);
-           update_option('sform_'.$id.'_settings', $new_form_settings); 
-          }
-          }
-         }
-        }
-      }
-      delete_option( 'sform_sub_db_version' );
-      delete_option( 'sform_screen_options' );
-      delete_option( 'sform_entries_view' );
-      delete_transient( 'sform_action_notice' );
-      
-      $shortcodes_table = "{$wpdb->prefix}sform_shortcodes"; 
-      $forms = $wpdb->get_col( "SELECT id FROM $shortcodes_table" );
-      foreach($forms as $form) {
-        $update = $wpdb->update($shortcodes_table, array( 'storing' => '1' ), array('id' => $form ) );
-      }
-
-    } 
-    switch_to_blog( $original_blog_id );
- }
- 
-}
-
-else {
-  global $wpdb;
-  $wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . 'sform_submissions' );
-  $wpdb->query( "DELETE FROM {$wpdb->options} WHERE option_name LIKE 'sform\_%'" );
-  $wpdb->query( "DELETE FROM {$wpdb->options} WHERE option_name LIKE 'sform\-%'" );
-  $wpdb->query( "DELETE FROM {$wpdb->options} WHERE option_name LIKE '%\_sform\_%'" );
-}