Changeset 2186034

Timestamp:

11/05/2019 09:55:01 AM (6 years ago)

Author:

wpemaker

Message:

Update to version 1.3.0

Location:

download-sender/trunk

Files:

• assets/css/admin.css (modified) (1 diff)
• assets/css/form.css (modified) (4 diffs)
• assets/css/premium.css (modified) (5 diffs)
• assets/images/logs-email_verify-icons-sprites.png (added)
• assets/images/spinner.gif (added)
• assets/js/front-end.js (modified) (7 diffs)
• assets/js/settings.js (modified) (7 diffs)
• assets/js/shortcode.js (modified) (1 diff)
• assets/lib/modaal-master (added)
• assets/lib/modaal-master/modaal.min.css (added)
• assets/lib/modaal-master/modaal.min.js (added)
• download-sender.php (modified) (1 diff)
• includes/admin/class-admin-assets.php (modified) (2 diffs)
• includes/admin/class-ajax-request.php (modified) (11 diffs)
• includes/admin/class-html-elements.php (modified) (6 diffs)
• includes/admin/class-logs-page.php (modified) (17 diffs)
• includes/admin/class-options.php (modified) (1 diff)
• includes/admin/class-settings-page.php (modified) (21 diffs)
• includes/admin/class-tinymce.php (modified) (8 diffs)
• includes/class-download-sender.php (modified) (3 diffs)
• includes/class-frontend-scripts.php (modified) (1 diff)
• includes/class-shortcodes.php (modified) (4 diffs)
• includes/core-functions.php (modified) (1 diff)
• readme.txt (modified) (3 diffs)

download-sender/trunk/assets/css/admin.css

@@ -150 +150 @@
     margin: 10px 0;
 }
+
+/* Logs page */
+.email_verify-sprite {
+    display: inline-block;
+    position: relative;
+    top: 4px;
+    margin-right: 7px;
+    width: 20px;
+    height: 20px;
+    background: url('../images/logs-email_verify-icons-sprites.png') no-repeat;
+}
+.email_verify-sprite.blank {
+    background: none;
+}
+.email_verify-sprite.a-verified {
+    background-position: 0px 0px;
+}
+.email_verify-sprite.m-verified {
+    background-position: -20px 0px;
+}
+.email_verify-sprite.n-verified {
+    background-position: -40px 0px;
+}
+.email_verify-sprite.n-valid {
+    background-position: -60px 0px;
+}
+.email_verify-sprite.ds-spinner {
+    background: url('../images/spinner.gif') no-repeat;
+    background-position: 0px 0px;
+}
+#downloadsender_logs_filter .email_verify-title {
+    color: #333;
+    font-weight: bolder;
+}
+.wp-core-ui .button-primary.checkme[data-status="1"] {
+    background: #e35b32;
+    border-color: #ec633a #d75129 #d75129;
+    box-shadow: 0 1px 0 #c64b26;
+    text-shadow: 0 -1px 1px #c64b26,1px 0 1px #c64b26,0 1px 1px #c64b26,-1px 0 1px #c64b26;
+}
+.wp-core-ui .button-primary.checkme[data-status="1"]:focus, .wp-core-ui .button-primary.checkme[data-status="1"]:hover {
+    background: #ee653c;
+    border-color: #c64b26;
+}
+.button.checkme, .button.resend-download {
+    display: inline-block;
+    margin-top: 5px;
+    margin-left: 15px;
+    height: auto;
+    width: auto;
+    padding: 0 4px 1px!important;
+    font-size: 11px;
+    line-height: normal;
+    opacity: 0;
+}
+ol.logsfiles-list li {
+    position: relative;
+}
+.button.resend-download {
+    position: absolute;
+    right: 0;
+    margin: 0;
+    opacity: 0;
+}
+
+tr:hover > .column-email_verify > .button.checkme {
+    opacity: 1;
+}
+ol.logsfiles-list li:hover .button.resend-download {
+    opacity: 1;
+}
+tr:hover > .column-email_verify > .button.checkme.premium_require {
+    opacity: .5;
+}
+.logs-email_verify-tooltip {
+    visibility: hidden;
+    opacity: 0;
+    margin-top: 7px;
+    background: #f0f0f0;
+    color: #333;
+    border: 1px solid #d9d9d9;
+    border-radius: 3px;
+    padding: 0 8px;
+    font-size: 12px;
+    text-align: center;
+}
+.button.checkme:hover + .logs-email_verify-tooltip {
+    visibility: visible;
+    opacity: 1;
+}
+#downloadsender_logs_filter .mail-verif-ribb {
+    display: inline-block;
+    margin-left: 8px;
+    padding: 0 5px;
+    background: #60aa35;
+    color: #fff;
+    font-size: 10px;
+    border-radius: 5px 5px 5px 0;
+    line-height: normal;
+}
+#downloadsender_logs_filter ol.logsfiles-list {
+    margin-left: 0;
+    font-size: 11px;
+    color: #666;
+}
+.downloadsender_options-tab.flex-block {
+    display: flex;
+}
+.modaal-wrapper {
+    z-index: 100009!important;
+}
+p#confirme_resend_dld {
+    display: inline-block;
+    color: #111;
+    font-size: 14px;
+    margin-top: 0;
+}
+p#confirme_resend_dld strong {
+    color: #000;
+    min-width: 32px;
+    display: inline-block;
+}

download-sender/trunk/assets/css/form.css

@@ -97 +97 @@
 .downloadsender .button-primary, .downloadsender .button-secondary {
     min-width: 120px;
+    text-align: center;
 }
 .downloadsender_options-tab.singlebutton > div {
@@ -281 +282 @@
 }
 
+/* Paragraph */
+
+
+
 /* Labels */
 .downloadsender_options-tab label {
@@ -371 +376 @@
     margin: 1px 0;
 }
-
+/* Dropdown*/
+.downloadsender_options-tab optgroup {
+    font-style: normal;
+}
+
+/* Accordion */
+.ds-accordion {
+    background-color: #eee;
+    color: #444;
+    cursor: pointer;
+    padding: 12px 18px;
+    width: 100%;
+    border: none;
+    text-align: left;
+    outline: none;
+    font-size: 15px;
+    transition: 0.4s;
+}
+
+.ds-accordion.active, .ds-accordion:hover {
+    background-color: #ccc; 
+}
+
+.ds-panel {
+    padding: 0 18px;
+    display: none;
+    background-color: #eee;
+    border: 1px solid #ccc;
+    overflow: hidden;
+}
+/* Modaal */
+.modaal-container {
+    border-radius: 3px !important;
+}
+.modaal-close:focus, .modaal-close:hover {
+    background: transparent!important;
+}
+.modaal-close::after, .modaal-close::before {
+    background: #23282d!important;
+}
+.modaal-close:hover:after, .modaal-close:hover:before {
+    background: #0085ba!important;
+}
+
+.downloadsender.modaal .footer-group-button {
+    text-align: right;
+    margin-top: 20px;
+    padding-top: 20px;
+    border-top: 1px solid #eaeaea;
+}
+.downloadsender.modaal .button-primary {
+    min-width: 0;
+}
+/*
+.downloadsender.modaal .button-primary.ok-modaal {
+    background: #32373c;
+    border-color: #2c3136 #292e33;
+    box-shadow: 0 1px 0 #22272c;
+    text-shadow: none;
+}
+.downloadsender.modaal .button-primary.ok-modaal:hover {
+    background: #008ec2;
+    border-color: #0180af #017daa;
+    box-shadow: 0 1px 0 #00749f;
+}
+*/
 /*-------------------------------------------------------------------------*/
 /*  tinyMCE
 /*-------------------------------------------------------------------------*/
 
+[aria-describedby="downloadsender-mce-dialog"] .ui-dialog-title {
+    color: #444;
+}
 form#downloadsender-mce-dialog {
     margin-bottom: 60px;
@@ -487 +560 @@
     background: #fff;
 }
+
+.downloadsender_options-tab.premium_require .set-default {
+    display: none;
+}
+
 .downloadsender_options-tab.file_url .set-default, .downloadsender_options-tab.file .set-default {
     top: -16px;

download-sender/trunk/assets/css/premium.css

@@ -18 +18 @@
 .downloadsender .premium_require:not(#file_tab):not(#download_btn_tab):not(#send_btn_tab):not(.mce-dialog-tabs):not(.downloadsender-icon-picker) {
     position: relative;
-    pointer-events: none;
+    cursor: default;
 }
+
 .downloadsender .premium_require:not(#file_tab):not(#download_btn_tab):not(#send_btn_tab):not(.mce-dialog-tabs):not(.downloadsender-icon-picker) form,
 .downloadsender .premium_require:not(#file_tab):not(#download_btn_tab):not(#send_btn_tab):not(.mce-dialog-tabs):not(.downloadsender-icon-picker) > div,
@@ -25 +26 @@
 .downloadsender .downloads_allowed.premium_require p {
     opacity: .5;
+    pointer-events: none;
 }
 .downloadsender .premium_require.is_hidded, .downloadsender .premium.is_hidded {
@@ -30 +32 @@
 }
 
-.downloadsender .premium_require:not(#file_tab):not(#download_btn_tab):not(#send_btn_tab):not(.mce-dialog-tabs):not(.downloadsender-icon-picker)::after {
+.downloadsender .premium_require:not(#file_tab):not(#download_btn_tab):not(#send_btn_tab):not(.mce-dialog-tabs):not(.downloadsender-icon-picker):hover:after {
     font-family: Arial,sans-serif;
-    content: 'Premium';
+    content: 'Premium version required';
     position: absolute;
     right: 0;
@@ -47 +49 @@
     display: inline-block;
     width: auto;
+    pointer-events: none;
 }
 .downloadsender .premium_require.inline-tag {
@@ -71 +74 @@
     right: unset!important;
 }
+
+.button.premium_require {
+    pointer-events: none;
+    opacity: 0.5;
+}
+.downloadsender option:disabled {
+    color: #777 !important;
+}

download-sender/trunk/assets/js/front-end.js

@@ -5 +5 @@
             access_count = parseInt($(this).attr('data-access-count')),
             limit_downloads = parseInt($(this).attr('data-limit-downloads')),
+            email = $(this).attr('data-email'),
             limit_date = $(this).attr('data-limit-date'),
             file = $(this).attr('data-file'),
@@ -20 +21 @@
             data : {
                 action : action,
-                file : file,
+                email  : email,
+                file   : file,
                 access_count : access_count,
                 url : url,
@@ -187 +189 @@
             warning_icon  = '<i class="'+data.attr('data-warning-icon')+'"></i>',
             success_icon  = '<i class="'+data.attr('data-success-icon')+'"></i>';
-                
+        
         response.removeClass('downloadsender-warning downloadsender-success empty-file');
         var cookie_val = email+file_name;           
         
-        var empty_email  = downloadSender.empty_email,
-                wrong_email  = downloadSender.wrong_email,
-                already_sent = downloadSender.already_sent;     
+        var empty_email             = downloadSender.empty_email,
+                wrong_email         = downloadSender.wrong_email,
+                already_sent        = downloadSender.already_sent,
+                resend_timer        = downloadSender.resend_timer,
+                much_attempts       = downloadSender.much_attempts,
+                much_attempts_timer = downloadSender.much_attempts_timer,
+                is_admin            = downloadSender.is_admin;      
         
         var alert_text; 
@@ -215 +221 @@
                         
             response.html(alert_text.replace('{email}', '<strong>'+email+'</strong>').replace('{timer}', timer).replace('{help}', tooltip));
-            response.addClass('downloadsender-warning has-tooltip');        
+            response.addClass('downloadsender-warning has-tooltip');
+            return false;
+        //} else if ( Number(getCookie('downloadsender_anti_spamming')) > 2 && !is_admin ) {
+        } else if ( Number(getCookie('downloadsender_anti_spamming')) > 2 ) {
+            var current  = Date.now();
+            if(!getCookie('downloadsender_anti_spamming_time')){
+                setCookie({cname: 'downloadsender_anti_spamming_time', value: current, time: much_attempts_timer, units: 'M'});
+            }
+            
+            var previous = Number(getCookie('downloadsender_anti_spamming_time')),
+                timer    = timeDifference(much_attempts_timer, current, previous);
+            
+            much_attempts = much_attempts.replace('{timer}', timer);
+            alert_text = content_align === 'right' ? much_attempts+warning_icon : warning_icon+much_attempts;
+                        
+            response.html(alert_text);
+            response.addClass('downloadsender-warning');
             return false;
         }
@@ -247 +269 @@
                 
                 if(data.indexOf('FAILED') > -1 ) {
+                    var spam_counter = getCookie('downloadsender_anti_spamming') ? getCookie('downloadsender_anti_spamming') : 0;
+                    setCookie({cname: 'downloadsender_anti_spamming', value: Number(spam_counter)+1, time: resend_timer, units: 'M'});
+                    
                     alert_text = content_align === 'right' ? data.replace('FAILED', '')+warning_icon : warning_icon+data.replace('FAILED', '');
                     response.html(alert_text);
@@ -257 +282 @@
                     setCookie({cname: 'downloadsender_check_send', value: cookie_val, time: resend_timer, units: 'M'});
                     setCookie({cname: 'downloadsender_check_send_time', value: Date.now(), time: resend_timer, units: 'M'});
+                    
+                    setCookie({cname: 'downloadsender_anti_spamming', value: 0, time: resend_timer, units: 'M'});
+                }
+                try{
+                    grecaptcha.reset(window.widgetId);
+                }catch(e){
+                    //alert(e);
                 }
             } 
@@ -322 +354 @@
             }
         }
-        return "";
+        return null;
     }
 

download-sender/trunk/assets/js/settings.js

@@ -1 +1 @@
 jQuery( function( $ ) {
     
+    $( document.body ).delegate( ".premium_require", "click", function() {
+        return false;
+    });
+    
     downloadSenderPremiumRequire();
-        
+    
+    /*-------------------------------------------------------------------------*/
+    /*  Export logs to CSV
+    /*-------------------------------------------------------------------------*/
+
+    insertParamHref();
+    
+    $( document.body ).delegate( ".ds-export-logs-to-csv-filter input[type=checkbox]", "click, change", function() {
+        insertParamHref();
+    });
+    
+    function insertParamHref(){
+        var a = $('a.ds-export-logs-to-csv');
+        if(a.length === 0){
+            return false;
+        }
+        var url = a.attr('href').split('?')[0]+'?action=print.csv';
+        
+        if ( $('input[name=checkbox_verified_logs_one]').attr('checked') ) {
+            url = url + '&verified1=true';
+        }
+        
+        if ( $('input[name=checkbox_verified_logs_two]').attr('checked') ) {
+            url = url + '&verified2=true';
+        }
+        
+        if ( $('input[name=checkbox_not_verified_logs]').attr('checked') ) {
+            url = url + '&not_verified=true';
+        }
+        
+        if ( $('input[name=checkbox_not_valid_logs]').attr('checked') ) {
+            url = url + '&not_valid=true';
+        }
+        a.attr('href', url);
+    }
+    
     /*-------------------------------------------------------------------------*/
     /*  Update tinyMCE textarea content
@@ -118 +157 @@
         downloadSenderDependencyTriggers(elements);
     }); 
-        
+    
+    /*-------------------------------------------------------------------------*/
+    /*  Verify Log
+    /*-------------------------------------------------------------------------*/
+
+    $( document.body ).delegate( "#make_log_verified", "click", function() {
+        if (!downloadSender.is_premium_v){
+            //alert(downloadSender.premium_required_msg);
+            //return false;
+        }
+    });
+    
+    $('#make_log_verified').modaal({
+        type: 'inline',
+        content_source: '#email_verify_modaal',
+        overlay_close: false,
+        hide_close: true,
+        background_scroll: true,
+        width: 500,
+    });
+    
+    $( document.body ).delegate( "#modaal-close", "click", function() {
+        $('#make_log_verified').modaal('close');
+    });
+    
+    
+    /*-------------------------------------------------------------------------*/
+    /*  Resend download
+    /*-------------------------------------------------------------------------*/
+    
+    $('.resend-download').modaal({
+        content_source: '#resend_download_modaal',
+        //overlay_opacity: 0,
+        hide_close: true,
+        background_scroll: true,
+        width: 900,
+        before_open: function(e) {
+            var dl_url   = e.currentTarget.getAttribute('data-href'),
+                to_email = e.currentTarget.getAttribute('data-email');
+            $('form#logs_resend_download [name="file_url"]').val(dl_url);
+            $('form#logs_resend_download [name="to_email"]').val(to_email);
+            $('form#logs_resend_download [name="to_email_field"]').val(to_email);
+            
+            var baseName = dl_url.substring(dl_url.lastIndexOf('/') + 1); 
+            
+            $('#confirme_resend_dld').html(
+                downloadSender.confirm_resend_msg.replace('{file}', baseName).replace('{email}', to_email)
+            );  
+        }
+    });
+    
+    $( document.body ).delegate( 'form#logs_resend_download [name="to_email_field"]', "keyup", function() {
+        var dl_url   = $('form#logs_resend_download [name="file_url"]').val(),
+            to_email = $(this).val(),
+            baseName = dl_url.substring(dl_url.lastIndexOf('/') + 1); 
+        
+        $('#confirme_resend_dld').html(
+                downloadSender.confirm_resend_msg.replace('{file}', baseName).replace('{email}', to_email)
+            );
+        
+    });
+    
+    $( document.body ).delegate( "#resend_download_link", "click", function() {
+        var filter   = $('#logs_resend_download'),
+            btn      = filter.find('div#resend_download_link'),
+            response = filter.find('.ajax__response'),
+            email    = filter.find('[name="to_email_field"]').val();
+        var result = confirm(downloadSender.confirm_resend);
+        if (result) {
+            $.ajax({
+                type : "POST",
+                url  : downloadSender.ajax,
+                data : filter.serialize(),
+                beforeSend:function(xhr) {
+                    btn.next().css('visibility', 'visible');
+                },
+                success:function(data){
+                    $('.spinner').css('visibility', 'hidden');
+                    if(data.indexOf('FAILED') > -1 ) {
+
+                    } else {
+                        response.html(downloadSender.download_sent.replace('%s', email));
+                    }
+
+                }
+            });
+        }
+        return false;
+    });
+    
+    var acc = document.getElementsByClassName("ds-accordion");
+    var i;
+
+    for (i = 0; i < acc.length; i++) {
+        acc[i].addEventListener("click", function() {
+            this.classList.toggle("active");
+            var panel = this.nextElementSibling;
+            if (panel.style.display === "block") {
+                panel.style.display = "none";
+            } else {
+                panel.style.display = "block";
+            }
+        });
+    }
+    
     /*-------------------------------------------------------------------------*/
     /*  Admin functions
@@ -332 +475 @@
 function downloadSenderPremiumRequire() {
         if ( jQuery('.mce-dialog-tabs.premium_require').length !== 0 ) {
-
+            var is_hidded_Class = 'is_hidded';
+            is_hidded_Class = 'noon';
+            
             var i, op = jQuery(".premium_require #file_type")[0].getElementsByTagName("option");
             for ( i = 0; i < op.length; i++) {
                 if ( op[i].value.toLowerCase() !== "file_picker" ) {
                     op[i].disabled = true;
-                    op[i].classList.add('premium', 'is_hidded');
+                    op[i].classList.add('premium', is_hidded_Class);
                 } else {
                     op[i].disabled = false;
-                    op[i].classList.remove('premium', 'is_hidded');
+                    op[i].classList.remove('premium', is_hidded_Class);
                 }
             }
@@ -348 +493 @@
                 if ( op[i].value.toLowerCase() !== "never" && op[i].value.toLowerCase() !== "24"  ) {
                     op[i].disabled = true;
-                    op[i].classList.add('premium', 'is_hidded');
+                    op[i].classList.add('premium', is_hidded_Class);
                 } else {
                     op[i].disabled = false;
-                    op[i].classList.remove('premium', 'is_hidded');
+                    op[i].classList.remove('premium', is_hidded_Class);
                 }
             }
@@ -359 +504 @@
                 if ( op[i].value.toLowerCase() !== "fill-hover" && op[i].value.toLowerCase() !== "outline-hover"  ) {
                     op[i].disabled = true;
-                    op[i].classList.add('premium', 'is_hidded');
+                    op[i].classList.add('premium', is_hidded_Class);
                 } else {
                     op[i].disabled = false;
-                    op[i].classList.remove('premium', 'is_hidded');
+                    op[i].classList.remove('premium', is_hidded_Class);
                 }
             }
@@ -370 +515 @@
                 if ( op[i].value.toLowerCase() !== "fill-hover" && op[i].value.toLowerCase() !== "outline-hover"  ) {
                     op[i].disabled = true;
-                    op[i].classList.add('premium', 'is_hidded');
+                    op[i].classList.add('premium', is_hidded_Class);
                 } else {
                     op[i].disabled = false;
-                    op[i].classList.remove('premium', 'is_hidded');
+                    op[i].classList.remove('premium', is_hidded_Class);
                 }
             }   
@@ -393 +538 @@
     if ( target !== undefined ) {
         downloadSenderToggleTabs(null, target); 
+    }
+}
+
+// Confirm logs filter action
+function validate_logs_filter_action(Form){
+    var dataArray = $(Form).serializeArray(),
+        dataObj = {};
+
+    $(dataArray).each(function(i, field){
+      dataObj[field.name] = field.value;
+    });
+    
+    var action = dataObj['action'];
+    
+    if ( action !== '-1' &&  action !== undefined ){
+        return confirm('This is irreversible. Are you sure you want to continue?');
     }
 }

download-sender/trunk/assets/js/shortcode.js

@@ -6 +6 @@
     
     $( document.body ).delegate( ".downloadsender-chosen", "change", function() {
-        console.log('sss');
+        
         var i, x, y, newclass='', classes = $(this)[0].className.split(' ');
         for ( x = 0; x < classes.length; x++) {

download-sender/trunk/download-sender.php

@@ -4 +4 @@
  * Plugin URI: https://www.mustaphafersaoui.fr/wp-plugins/download-sender/
  * Description: This plugin allows you to add a download button, which when clicked displays a file sending form requiring users to enter their email address to receive a download link.
- * Version: 1.2.8
+ * Version: 1.3.0
  * Author: Mustapha FERSAOUI
- * Author URI: https://www.mustaphafersaoui.fr/wp-plugins/
+ * Author URI: https://www.mustaphafersaoui.fr
  * Text Domain: download-sender
  * Domain Path: /languages/

download-sender/trunk/includes/admin/class-admin-assets.php

@@ -153 +153 @@
                     'downloadSender',
                     array( 
-                        'ajax'                => admin_url( 'admin-ajax.php' ),
-                        'settings_saved'      => __( 'Settings saved.' ),
-                        'download_sent'       => __( 'Download link were sent to %s', 'download-sender' ),
-                        'confirm_reset'       => __( 'Are you sure you want to reset all options?', 'download-sender' ),
-                        'fill_all_fields'     => __( 'Please, fill in correctly all the fields and click SEND.', 'download-sender' ),
-                        'confirm_del_older'   => __( 'Are you sure you want to delete all links older then %s?', 'download-sender' ),
-                        'confirm_del_expired' => __( 'Are you sure you want to delete all expired links?', 'download-sender' ),
-                        'greater_value'       => __( 'Please enter a value greater than or equal to 1.', 'download-sender' ),
-                        'set_default'         => __( 'Set Default' ),
-                         ) 
+                        'ajax'                  => admin_url( 'admin-ajax.php' ),
+                        'settings_saved'        => __( 'Settings saved.' ),
+                        'download_sent'         => __( 'Download link were sent to %s', 'download-sender' ),
+                        'confirm_reset'         => __( 'Are you sure you want to reset all options?', 'download-sender' ),
+                        'fill_all_fields'       => __( 'Please, fill in correctly all the fields and click SEND.', 'download-sender' ),
+                        'confirm_del_older'     => __( 'Are you sure you want to delete all links older then %s?', 'download-sender' ),
+                        'confirm_del_expired'   => __( 'Are you sure you want to delete all expired links?', 'download-sender' ),
+                        'greater_value'         => __( 'Please enter a value greater than or equal to 1.', 'download-sender' ),
+                        'set_default'           => __( 'Set Default' ),
+                        'is_premium_v'          => is_downloadsender_premium_activated(),
+                        //'premium_required_msg'    => __( 'The premium version is required to use this feature.', 'download-sender' ), 
+                        'confirm_resend_msg'    => __( '<strong>File :</strong> {file}<br><strong>To Email :</strong> {email}', 'download-sender' ),
+                        'confirm_resend'            => __( 'Are you sure you want to resend file?', 'download-sender' ),
+                    ) 
             );
             wp_enqueue_script( 'downloadsender-settings' );
@@ -187 +191 @@
             wp_enqueue_script( 'chosen' );
             wp_register_style( 'chosen', DOWNLOAD_SENDER_ABSURL . '/assets/lib/chosen/chosen.min.css' );
-            wp_enqueue_style( 'chosen' );
+            wp_enqueue_style( 'chosen' );           
+            
+            wp_register_style( 'downloadsender-premium-modaal-master', DOWNLOAD_SENDER_ABSURL . '/assets/lib/modaal-master/modaal.min.css');
+            wp_enqueue_style( 'downloadsender-premium-modaal-master' );
+            wp_register_script( 'downloadsender-premium-modaal-master', DOWNLOAD_SENDER_ABSURL . '/assets/lib/modaal-master/modaal.min.js', array('jquery'));
+            wp_enqueue_script( 'downloadsender-premium-modaal-master' );
         }
     }

download-sender/trunk/includes/admin/class-ajax-request.php

@@ -10 +10 @@
 use \DownloadSender\Post_Meta;
 use \DownloadSender\g_recaptcha;
+use \DownloadSender\VerifyEmail;
 
 defined( 'ABSPATH' ) || exit;
@@ -37 +38 @@
             'downloadsender_action_process'    => 'download_action_process',
             'downloadsender_update_table'      => 'update_table',
+            'downloadsender_resend_dld_request'=> 'resend_download',
         );
         
@@ -45 +47 @@
     }
     
+    
+    /**
+     * Re-Send download file from logs page
+     */
+    function resend_download() {
+        
+        $options = new Options;
+        
+        if ( is_downloadsender_premium_activated() ) {
+            $to_email               = sanitize_email($_POST['to_email_field']);
+            $expiration_time        = sanitize_text_field($_POST['expiration_time']);
+            $expiration_timeunits   = sanitize_text_field($_POST['expiration_timeunits']);
+            $downloads_allowed      = sanitize_text_field($_POST['downloads_allowed']);
+        } else {
+            $to_email               = sanitize_email($_POST['to_email']);
+            $expiration_time        = 2;
+            $expiration_timeunits   = 1440;
+            $downloads_allowed      = 5;
+        }
+        
+        $data = array(
+            'file_url'              => esc_url($_POST['file_url']),
+            'to_email'              => $to_email,
+            'expiration_time'       => $expiration_time,
+            'expiration_timeunits'  => $expiration_timeunits,
+            'downloads_allowed'     => $downloads_allowed,
+            'from_name'             => $options->get_option('from_name'),
+            'from_address'          => $options->get_option('from_address'),
+            'email_subject'         => $options->get_option('email_subject'),
+            'email_body'            => $options->get_option('email_body'),
+        );
+        
+        $this->send_request($data);     
+        die();
+    }
+    
     /**
      * Run download process
@@ -66 +104 @@
         $table   = $wpdb->prefix . DOWNLOAD_SENDER_ENCRYPTED_LINKS_TABLE;
         $file    = sanitize_text_field($_POST['file']);
-
+        $email   = isset($_POST['email']) ? sanitize_email($_POST['email']) : '';
+            
         $results = $wpdb->get_results("SELECT * FROM $table WHERE download_key = '". $file ."' ");
         foreach( $results as $key => $row) {
@@ -86 +125 @@
 
         if ( $time_reached && $downloads_reached && count($results) != 0 ) {
-            $wpdb->update($table, array('access_count'=>$access_count+1),array('download_key'=> $file));
+            $wpdb->update($table, array('access_count'=>$access_count+1),array('download_key'=> $file));            
             echo downloadsender_str_crypt( $download_link, 'd');
         } else {
@@ -242 +281 @@
     function send_request($data=array()) {
         global $wpdb, $post;
+        
         $options = new Options;
         $enable_recaptcha = $options->get_option('enable_recaptcha');
+        
+        // mail
+        $blogname     = get_option('blogname');
+        $blog_url     = home_url();
+        $blog_domain  = downloadsender_domain_name();
+        $from_name    = isset($data['from_name']) ? $data['from_name'] : $options->get_option('from_name');
+        $from_address = isset($data['from_address']) ? $data['from_address'] : $options->get_option('from_address');
+        $subject      = isset($data['email_subject']) ? $data['email_subject'] : $options->get_option('email_subject');
         
         // To email address
@@ -254 +302 @@
         
         // Check if user was not verified by recaptcha.
-        if ( is_downloadsender_premium_activated() && $enable_recaptcha == true ) {
+        if ( is_downloadsender_premium_activated() && $enable_recaptcha == true && !isset($data['to_email']) ) {
             $secret          = $options->get_option('secret_key');
             $response        = $_POST["captcha"];
@@ -267 +315 @@
         // return FAILED Error if record insert fails
         if( !checkdnsrr(array_pop(explode("@",$to)),"MX")) {
-            echo $options->get_option('success_msg');
+            echo 'FAILED'.$options->get_option('wrong_email');
             die();
+        }
+        
+        if( is_downloadsender_premium_activated() && !isset($data['to_email']) ) {          
+            $ve = new VerifyEmail($to, $from_address);
+            //$ve->verify();
+            //$ve->get_debug()
+            
+            if ( !$ve->verify() ) {
+                echo 'FAILED'.$options->get_option('wrong_email');
+                die();
+            }
         }
         
@@ -290 +349 @@
             }
             
-            $file       = downloadsender_str_crypt( $data['file_url'], 'e' );
+            $file = downloadsender_str_crypt( $data['file_url'], 'e' );
         } else {
             $decrypted_link  = downloadsender_str_crypt( sanitize_text_field($_POST['file_url']), 'd' );
@@ -344 +403 @@
         // final html link
         $file_url = '<a href="'.$encrypted_link.'">'.$encrypted_link.'</a>';        
+        
+        // Record Log
+        if ( !isset($data['to_email'])) { // disable record log when sent from admin (back-end)
+            $recorde_date = current_time('mysql');
+            $ip           = downloadsender_get_ip();
+            $country      = downloadsender_geolocate($ip);
+
+            $check_email  = $wpdb->get_results('SELECT * FROM ' . $wpdb->prefix . DOWNLOAD_SENDER_LOGS_TABLE.' WHERE email="' . $to . '"');
+
+            //Check if Email is already logged. No need to log it again.
+            if ($check_email) {         
+                $logs_add = false;
+            }
+
+            $file_name = downloadsender_str_crypt( strtok( sanitize_file_name($_POST['file_name']), '?'), 'd');
+            $file_name = $file_name != '' ? $file_name : $strtok;
+
+            // Log email adress.
+            $logs_table = $wpdb->prefix . DOWNLOAD_SENDER_LOGS_TABLE;
+            
+            if ( count($check_email) == 0 && !$options->get_option('disable_logs') ) {
+                $row = array(
+                    'email'         => $to,
+                    'email_verify'  => 1,
+                    'ip'            => $ip,
+                    'country'       => $country,
+                    'files'         => serialize(array($file)),
+                    'recorde_date'  => $recorde_date,
+                );
+
+                $row = array_filter($row); //Remove any null values.
+                $insert_table = $wpdb->insert($logs_table, $row);
+            } else {
+                $file_name = $file;
+                $get  = $wpdb->get_row('SELECT * FROM ' . $logs_table . ' WHERE email="'.$to.'"');
                 
+                $files = unserialize($get->files);              
+                $s_files = !is_array($files) ? array($get->files) : $files;
+                
+                if ( !in_array($file_name, $s_files)){
+                    array_push($s_files, $file_name);
+                    $wpdb->update( $logs_table, array('files' => serialize($s_files)), array('email' => $to) );
+                }
+            }
+        }
+        
         // Send email
-        $blogname     = get_option('blogname');
-        $blog_url     = home_url();
-        $blog_domain  = downloadsender_domain_name();
-        $from_name    = isset($data['from_name']) ? $data['from_name'] : $options->get_option('from_name');
-        $from_address = isset($data['from_address']) ? $data['from_address'] : $options->get_option('from_address');
-        $subject      = isset($data['email_subject']) ? $data['email_subject'] : $options->get_option('email_subject');
-
         $shortcode    = array("{file_url}", "{blog_name}", "{blog_domain}", "{from_email}", "{blog_url}", "{expire_time}");
         $shortcode_replace = array($file_url, $blogname, $blog_domain, $from_address, $blog_url, $full_expire_time );
@@ -362 +459 @@
         $headers   .= "Content-type: text/html; charset=".get_bloginfo('charset')."" . "\r\n";
         $headers   .= "From: " . $from_name . " <".$from_address.">" . "\r\n";
-        
+        $headers   .= "Reply-To: " . $from_name . " <".$from_address.">" . "\r\n";
+        //$headers   .= "Cc: " . $from_name . " <".$from_address.">" . "\r\n";
+        
+        if( current_user_can('editor') || current_user_can('administrator') ) {
+            //die();
+        }
         // send message
         $sent_message = wp_mail( $to, $subject, nl2br($message), $headers );

download-sender/trunk/includes/admin/class-html-elements.php

@@ -230 +230 @@
         $class         = isset($data['class']) ? ' '.$data['class'] : '';
         $dashicons     = isset($data['dashicons']) ? '<span class="dashicons dashicons-'.$data['dashicons'].'"></span>' : '';
+        $position      = isset($data['position']) ? $data['position'] : 'left';     
+        $tag           = isset($data['tag']) ? $data['tag'] : 'button';
+        
+        if ($position == 'right'){
+            $data['raw_style'] = 'text-align: right;';
+        }
+        $spinner_style = $position == 'right' ? ' style="float:left"' : '';
         
         echo self::Surround($data);
         ?>
             <div>
+            <?php
+            if ($tag == 'div'){ ?>
+                <div id="<?php echo $id; ?>" class="button-<?php echo $button_style.$class; ?>" data-single="1"><?php echo $dashicons . $label; ?></div>
+            <?php } else { ?>
                 <button id="<?php echo $id; ?>" class="button-<?php echo $button_style.$class; ?>" data-single="1"><?php echo $dashicons . $label; ?></button>
-                <span class="spinner"></span>
+            <?php } ?>
+                <span class="spinner"<?php echo $spinner_style; ?>></span>
             </div>
             <?php
@@ -486 +498 @@
         ?>  
         <select id="<?php echo $data['id'];?>" class="<?php echo $chosen.$icon_picker.$class.$current;?>" name="<?php echo $name;?>"<?php echo $data_fa_icon;?> <?php echo $target.$hide_target;?> data-placeholder="Your Favorite Type of Bear">
-    <?php foreach($data['value'] as $value => $label ) { 
+    <?php foreach($data['value'] as $value => $label ) {
+            // Close optgroup
+            if ($value == 'optgroup_in') {
+            ?>          
+            <optgroup label="<?php echo $label;?>">
+            <?php }
+            
+            // option
             if(isset($data['label_to_value'])){
                 $value = 'fa '.$label;
@@ -495 +514 @@
             <option class="<?php echo $value;?>" value="<?php echo $value;?>" 
             <?php if ( $value == self::Current($data, self::$opt_name) ) echo 'selected="selected"'; ?>                 
-            ><?php echo $label;?></option>      
-    <?php } ?>
+            ><?php echo $label;?></option>  
+            
+            <?php // Close optgroup
+            if ($value == 'optgroup_out') {
+            ?>          
+            </optgroup>
+            <?php }
+        } ?>
         </select>
         <p class="description"<?php echo $desc_style;?>><?php echo $description;?></p>
@@ -521 +546 @@
         </div>
         <?php
-    }
-    
+    }   
+            
+    /**
+     * Output : close div block container.
+     */
+    public static function paragraph($data) {
+        $id         = isset($data['id']) ? $data['id'] : '';
+        $content    = isset($data['content']) ? $data['content'] : '';
+        $raw_style  = isset($data['raw_style']) ? ' style="'.$data['raw_style'].'"' : '';
+        
+        ?>
+        <p id="<?php echo $id ?>"<?php echo $raw_style;?>><?php echo $content;?></p>
+        <?php
+    }
+    
+        
     /**
      * Output : open form
@@ -551 +590 @@
         ?>
         <input type="hidden" name="action" value="<?php echo $action ?>">
+        <?php
+    }
+    
+    /**
+     * Output : Hidden input field
+     */
+    public static function hidden($data) {
+        $name = isset($data['name']) ? $data['name'] : '';
+        ?>
+        <input type="hidden" name="<?php echo $name ?>" value="">
         <?php
     }
@@ -573 +622 @@
         <p class="description"><?php echo $description;?></p>   
         </div> <!-- Close Surround -->  
+        <?php
+    }
+    
+    /**
+     * accordion open
+     */
+    public static function openAccordion($data) {
+        $heading = isset($data['heading']) ? $data['heading'] : 'Section 1';
+        ?>
+        <div class="ds-accordion"><?php echo $heading;?></div>
+        <div class="ds-panel">                  
+        <?php
+    }
+    
+    /**
+     * accordion close
+     */
+    public static function closeAccordion($data) {
+        ?>
+        </div>                  
         <?php
     }

download-sender/trunk/includes/admin/class-logs-page.php

@@ -41 +41 @@
     public function column_default( $item, $column_name ) {
         switch ( $column_name ) {
-        case 'file_name':
-            return $item[$column_name];
-        case 'email':
-            return $item[$column_name];
-        case 'ip';
-        case 'country':
-            return $item[$column_name];
-        case 'date':
-            return $item[$column_name];
-        default:
-            return print_r( $item, true ); //Show the whole array for troubleshooting purposes
+            case 'email':
+                return $item[$column_name];
+            case 'email_verify':
+                return $item[$column_name];
+            case 'ip';
+            case 'country':
+                return $item[$column_name];
+            case 'files':
+                return $item[$column_name];
+            case 'date':
+                return $item[$column_name];
+            default:
+                return print_r( $item, true ); //Show the whole array for troubleshooting purposes
         }
     }   
@@ -67 +69 @@
         
         $actions = [
+            'edit' => sprintf('<a href="?page=%s&action=%s&id=%s">Edit</a>', $_REQUEST['page'], 'edit', $item['id']),
             'delete' => sprintf('<a href="?page=%s&action=%s&id=%s&_wpnonce=%s" onclick="return confirm(\''.__('Are you sure you want to delete this entry?', 'download-sender').'\')">' . __('Delete', 'download-sender') . '</a>', esc_attr( $_REQUEST['page'] ), 'deletethismail', $item['id'], $delete_nonce),
         ];
@@ -98 +101 @@
     function get_columns() {
         $columns = array(
-            'cb'        => '<input type="checkbox" />',
-            'email'     => __( 'Email', 'download-sender' ),
-            'ip'        => __( 'IP Address', 'download-sender' ),
-            'country'   => __( 'Country', 'download-sender' ),
-            'file_name' => __( 'File Name', 'download-sender' ),
-            'date'      => __( 'Date', 'download-sender' )          
+            'cb'            => '<input type="checkbox" />',
+            'email'         => __( 'Email', 'download-sender' ),
+            'email_verify'  => __( 'Email Verify', 'download-sender' ),
+            'ip'            => __( 'IP Address', 'download-sender' ),
+            'country'       => __( 'Country', 'download-sender' ),
+            'files'         => __( 'Files', 'download-sender' ),
+            'date'          => __( 'Date', 'download-sender' )          
         );
         return $columns;
@@ -115 +119 @@
     public function get_sortable_columns() {
         $sortable_columns = array(
-            'email'     => array( 'email', false ),
-            'ip'        => array( 'ip', false ),
-            'country'   => array( 'country', false ),
-            'file_name' => array( 'file_name', false ),
-            'date'      => array( 'recorde_date', false )
+            'email'         => array( 'email', false ),
+            'email_verify'  => array( 'email_verify', false ),
+            'ip'            => array( 'ip', false ),
+            'country'       => array( 'country', false ),
+            'files'         => array( 'files', false ),
+            'date'          => array( 'recorde_date', false )
         );
 
@@ -201 +206 @@
      * Handles data query and filter, sorting, and pagination.
      */
-    public function prepare_items() {       
+    public function prepare_items($search ='') {        
         global $wpdb;
+        
         
         $per_page     = $this->get_items_per_page( 'logs_per_page' );
@@ -233 +239 @@
         $orderby_column = $this->order_recorde_by_array(
             $orderby_column, array(
-                                'ip'           =>'1',
-                                'recorde_date' =>'1',
-                                'file_name'    =>'1',
-                                'country'      =>'1',
-                                'email'        =>'1'
-                                )
-            );
+                                'ip'            =>'1',
+                                'recorde_date'  =>'1',
+                                'files'         =>'1',
+                                'country'       =>'1',
+                                'email'         =>'1',
+                                'email_verify'  =>'1'
+                            )
+            ); 
         $sort_order = $this->order_recorde_by_array(
             $sort_order, array(
@@ -247 +254 @@
             ); 
         
-        $query  = "SELECT * FROM $table ORDER BY $orderby_column $sort_order";
+        // Search box
+        $search = ( isset( $_REQUEST['s'] ) ) ? $_REQUEST['s'] : false;
+        $do_search = $search ? $wpdb->prepare(" WHERE email LIKE '%%%s%%' OR ip LIKE '%%%s%%' OR country LIKE '%%%s%%'", $search, $search, $search) : '';
+
+        // Query
+        $query  = "SELECT * FROM $table $do_search ORDER BY $orderby_column $sort_order";
+        
         $offset = ($current_page - 1) * $per_page;
         $query .=' LIMIT ' . (int) $offset . ',' . (int) $per_page;//Limit to query to only load a limited number of records
@@ -254 +267 @@
         //Prepare the array with the correct index names that the table is expecting.
         $data = array();
+        
+        //$premium_require = !is_downloadsender_premium_activated() ? ' premium_require' : '';
+        $premium_require = '';
         
         foreach ($data_results as $data_result) {           
@@ -262 +278 @@
                 $country_flag = '<span class="country-flag"><span src="blank.gif" class="flag flag-'.$country_id.'" alt="" /></span><span class="country-name">'.$data_result->country.'</span></span>';
             }
-
+            
+            // Email Verify Column
+            $t1     = __( 'Verified', 'download-sender' );
+            $t2 = __( 'Not Verified', 'download-sender' );
+            $t3 = __( 'Not Valid', 'download-sender' );
+            $v1 = '✔';
+            $v2 = '✖';
+            
+            $bt1 = __( 'Cancel Verification', 'download-sender' );
+            $bt2 = __( 'Verify Email', 'download-sender' );
+            
+            $res_email_verify = '';
+            
+            if ( $data_result->email_verify == 1 || $data_result->email_verify == 0 ) {
+                $res_email_verify = '<span class="email_verify-sprite n-verified"></span><span class="email_verify-title">' . $t2 . '</span><input type="button" id="make_log_verified" data-status="3" data-id="'.$data_result->id.'" data-email="'.$data_result->email.'" class="button button-primary checkme" value="'.$v1.'"><div class="logs-email_verify-tooltip">' . $bt2 . '</div>';
+            } else if ($data_result->email_verify == 2) {
+                $confirm    = __( '(100% Valid)', 'download-sender' );
+                $res_email_verify = '<span class="email_verify-sprite a-verified"></span><span class="email_verify-title">' . $t1 . '<span class="mail-verif-ribb">' . __( '100% Valid', 'download-sender' ) . '</span></span>';            
+            } else if ($data_result->email_verify == 3) {               
+                $res_email_verify = '<span class="email_verify-sprite m-verified"></span><span class="email_verify-title">' . $t1 . '</span><input type="button" id="make_log_verified" data-status="1" data-id="'.$data_result->id.'" data-email="'.$data_result->email.'" class="button button-primary checkme" value="'.$v2.'"><div class="logs-email_verify-tooltip">' . $bt1 . '</div>';               
+            } else if ($data_result->email_verify == 4) {               
+                $res_email_verify = '<span class="email_verify-sprite n-valid"></span><span class="email_verify-title">' . $t3 . '</span><input type="button" id="make_log_verified" data-status="1" data-id="'.$data_result->id.'" class="button button-primary checkme" value="'.$v2.'"><div class="logs-email_verify-tooltip">' . $bt1 . '</div>';               
+            }
+            
+            // Files names
+            if (strpos($data_result->files, ':{') === false) {
+                $file_name = $data_result->files;
+            } else{
+                $file_name = unserialize($data_result->files);
+            }
+            
+            $files = '<ol class="logsfiles-list">';
+            if (is_array($file_name)) {
+                foreach($file_name as $value){
+                    $d_url = downloadsender_str_crypt( $value, 'd');
+                    if ($d_url){
+                        $files .= '<li><a href="'.$d_url.'">' . basename($d_url) . '</a><span data-href="'.$d_url.'" data-email="'.$data_result->email.'" class="button button-primary resend-download">'. __( 'Resend File', 'download-sender' ) .'</span></li>';
+                    } else {
+                        $files .= '<li>' . $value . '</li>'; 
+                    }
+                    //$file_name = downloadsender_str_crypt( $value, 'd') ? downloadsender_str_crypt( $value, 'd'): $value;
+                }
+                
+            } else {
+                $files .= '<li>'.$data_result->files.'</li>';
+            }
+            $files .= '</ol>';
+
+            if($data_result->files==''){
+                $files = '';
+                
+            }
             $data[] = array(
-                'id'        => $data_result->id,
-                'email'     => $data_result->email,
-                'ip'        => $data_result->ip,
-                'country'   => $country_flag,
-                'file_name' => $data_result->file_name,
-                'date'      => $data_result->recorde_date
+                'id'            => $data_result->id,
+                'email'         => $data_result->email,
+                'email_verify'  => $res_email_verify,
+                'ip'            => $data_result->ip,
+                'country'       => $country_flag,
+                'files'         => $files,
+                'date'          => $data_result->recorde_date
             );
         }
@@ -281 +349 @@
         ));
     }
+    
+    public function search_box( $text, $input_id ) {
+        if ( empty( $_REQUEST['s'] ) && ! $this->has_items() ) {
+            return;
+        }
+ 
+        $input_id = $input_id . '-search-input';
+ 
+        if ( ! empty( $_REQUEST['orderby'] ) ) {
+            echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
+        }
+        if ( ! empty( $_REQUEST['order'] ) ) {
+            echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
+        }
+        if ( ! empty( $_REQUEST['post_mime_type'] ) ) {
+            echo '<input type="hidden" name="post_mime_type" value="' . esc_attr( $_REQUEST['post_mime_type'] ) . '" />';
+        }
+        if ( ! empty( $_REQUEST['detached'] ) ) {
+            echo '<input type="hidden" name="detached" value="' . esc_attr( $_REQUEST['detached'] ) . '" />';
+        }
+        ?>
+        <p class="search-box">
+            <label class="screen-reader-text" for="<?php echo esc_attr( $input_id ); ?>"><?php echo $text; ?>:</label>
+            <input type="search" id="<?php echo esc_attr( $input_id ); ?>" name="s" value="<?php _admin_search_query(); ?>" />
+        <?php submit_button( $text, '', '', false, array( 'id' => 'search-submit' ) ); ?>
+        </p>
+        <?php
+    }
     
     /**
@@ -351 +447 @@
                     'ck'=>'cook islands',
                     'cr'=>'costa rica',
-                    'ci'=>'cote d ivoire',
+                    'ci'=>'ivory coast',
                     'hr'=>'croatia',
                     'cu'=>'cuba',
                     'cy'=>'cyprus',
-                    'cz'=>'czech republic',
+                    'cz'=>'czechia',
                     'dk'=>'denmark',
                     'dj'=>'djibouti',
@@ -400 +496 @@
                     'in'=>'india',
                     'id'=>'indonesia',
-                    'ir'=>'iran, islamic republic of',
+                    'ir'=>'iran',
                     'iq'=>'iraq',
                     'ie'=>'ireland',
@@ -407 +503 @@
                     'jm'=>'jamaica',
                     'jp'=>'japan',
-                    'jo'=>'jordan',
-                    'kz'=>'kazakstan',
+                    'jo'=>'hashemite kingdom of jordan',
+                    'kz'=>'kazakhstan',
                     'ke'=>'kenya',
                     'ki'=>'kiribati',
                     'kp'=>'korea, democratic peoples republic of',
-                    'kr'=>'korea, republic of',
+                    'kr'=>'republic of korea',
                     'kw'=>'kuwait',
                     'kg'=>'kyrgyzstan',
-                    'la'=>'lao peoples democratic republic',
+                    'la'=>'laos',
                     'lv'=>'latvia',
                     'lb'=>'lebanon',
                     'ls'=>'lesotho',
                     'lr'=>'liberia',
-                    'ly'=>'libyan arab jamahiriya',
+                    'ly'=>'libya',
                     'li'=>'liechtenstein',
                     'lt'=>'lithuania',
                     'lu'=>'luxembourg',
-                    'mo'=>'macau',
+                    'mo'=>'macao',
                     'mk'=>'macedonia, the former yugoslav republic of',
                     'mg'=>'madagascar',
@@ -439 +535 @@
                     'mx'=>'mexico',
                     'fm'=>'micronesia, federated states of',
-                    'md'=>'moldova, republic of',
+                    'md'=>'republic of moldova',
                     'mc'=>'monaco',
                     'mn'=>'mongolia',
@@ -463 +559 @@
                     'pk'=>'pakistan',
                     'pw'=>'palau',
-                    'ps'=>'palestinian territory, occupied',
+                    'ps'=>'palestine',
                     'pa'=>'panama',
                     'pg'=>'papua new guinea',
@@ -476 +572 @@
                     're'=>'reunion',
                     'ro'=>'romania',
-                    'ru'=>'russian federation',
+                    'ru'=>'russia',
                     'rw'=>'rwanda',
                     'sh'=>'saint helena',
@@ -509 +605 @@
                     'tw'=>'taiwan',
                     'tj'=>'tajikistan',
-                    'tz'=>'tanzania, united republic of',
+                    'tz'=>'tanzania',
                     'th'=>'thailand',
                     'tg'=>'togo',

download-sender/trunk/includes/admin/class-options.php

@@ -46 +46 @@
             'sending_failed'     => __("Failed to send the download link.", 'download-sender'),
             'wrong_email'        => __('Please enter a valid email address!', 'download-sender'),
+            //'much_attempts'        => __('Too many subscribe attempts for this email address. Please try again in about 5 minutes.'),
+            'much_attempts'      => __('Too many attempts, please try again in about {timer} minutes.'),
             'empty_email'        => __('Please fill out the email field', 'download-sender'),
             'already_sent'       => __('This file has already been sent to {email}, wait up to {timer} and retry. {help}', 'download-sender'),

download-sender/trunk/includes/admin/class-settings-page.php

@@ -22 +22 @@
         add_action( 'admin_init', array( $this, 'add_settings_fields') );
         add_action( 'admin_post_print.csv', array( $this, 'print_csv') );
-        add_filter( 'set-screen-option', array( $this, 'set_screen_option' ), 10, 3 );      
+        add_filter( 'set-screen-option', array( $this, 'set_screen_option' ), 10, 3 );
+        
+        add_action( 'admin_head', array( $this, 'logs_page_modals' ) );
+        
     }
+    
+    /**
+     * Edit Element UI-Panel.
+     *
+     * @return string
+     */
+    public function logs_page_modals() {
+        if ( !isset($_GET['page']) || sanitize_html_class( $_GET['page'] ) != 'downloadsender-logs' ) {
+            return false;
+        }
+        $options = new Options;
+        $premium_require = ! defined( 'DOWNLOAD_SENDER_PREMIUM' ) ? ' premium_require' : '';
+        
+        $track_attr = [
+            'meta_name'      => null,
+            
+            //  +--------------------+
+            //  | Email Template tab |
+            //  *--------------------+
+            
+            // Open form
+            array( 
+                'type'       => 'openForm',
+                'id'         => 'logs_resend_download',
+                ),
+
+            array( 
+                'type'          => 'paragraph',
+                'id'            => 'confirme_resend_dld',
+                'content'       => '',
+                //'raw_style'       => 'font-size: 14px; color: #e1401b;',
+                ),
+            
+            // Open Accordion
+            array( 
+                'type'       => 'openAccordion',
+                'heading'    => 'Options :',
+                ),
+            
+            array('type' => 'openBlock', 'active' => true, 'unflex' => true, 'class' => $premium_require), // start Premium block
+            
+            array( 
+                'type'       => 'ExtraLabel',
+                'title'      => __( 'Expiration time', 'download-sender' ),
+                'for'        => 'expiration_time',
+                ),
+            
+            array('type' => 'openBlock'),
+            
+            array( 
+                'type'        => 'textfield',
+                'id'          => 'expiration_time',
+                'description' => __( 'Set for how long, the download link will be active. Leave blank for unlimited time.', 'download-sender' ),
+                'display'     => 'inline-block',
+                'default'     => '2',
+                ),
+            
+            // Time Units
+            array( 
+                'type'      => 'dropdown',
+                'id'        => 'expiration_timeunits',
+                'class'     => 'auto_width',
+                'value'     => array(
+                                '1440' => __( 'Day(s)', 'download-sender' ),
+                                '60'   => __( 'Hour(s)', 'download-sender' ),
+                            ),
+                'default'   => '1440',
+                'display'   => 'inline',
+                ),
+            
+            array('type' => 'closeBlock'),
+            
+            array( 
+                'type'       => 'textfield',
+                'id'         => 'downloads_allowed',
+                'heading'    => __( 'Downloads allowed', 'download-sender' ),
+                'default'   => '5',
+                'display'    => 'inline-block',
+                'max_width'  => '100%',
+                'raw_style'  => 'min-width: 200px;',
+                'description'=> __( 'Sets the maximum number of downloads. Leave blank for unlimited.', 'download-sender' ),
+                ),
+            
+            array( 
+                'type'       => 'textfield',
+                'id'         => 'to_email_field',
+                'heading'    => __( 'To Email', 'download-sender' ),
+                'display'    => 'inline-block',
+                'raw_style'  => 'min-width: 200px;',            
+                'required'   => true,
+                'class'      => 'right-block',
+                ),
+
+            array('type' => 'closeBlock'), // end block require premium
+            
+            // Close Accordion
+            array( 
+                'type'       => 'closeAccordion',
+                ),
+            
+            array( 'type'   => 'Separator', 'height' => 'thin', 'style' => 'no_line' ),
+            
+            array( 
+                'type'          => 'SingleButton',
+                'tag'           => 'div',
+                'id'            => 'resend_download_link',
+                'heading'       => __( 'Re-Send', 'download-sender' ),              
+                //'position'        => 'right', 
+                'ajax_response' => true,
+                ),
+            
+            // Form filter
+            array( 
+                'type'       => 'ajaxAction',
+                'action'     => 'downloadsender_resend_dld_request',
+                ),
+            
+            // Hidden input
+            array( 
+                'type'      => 'hidden',
+                'name'      => 'file_url',
+                ),
+
+            // Close form
+            array( 
+                'type'       => 'closeForm',
+                ),
+        ];
+        ?>
+        <div id="email_verify_modaal" style="display:none;">
+            <div class="downloadsender modaal">
+                <div class="modaal-content">
+                    <p>You have free version. <strong>Buy Premium Version</strong> to access this feature.</p>
+                    <h2>About:</h2>
+                    <p>
+                        The Email Verify option is a very useful way to take a raw email list and check it for bad and invalid emails. This feature verifies the email address at sending file time to minimize the sending of emails to non-working email addresses and receiving too many bounced and returned emails.
+                        <br>
+                        <br>
+                        
+                        The Verify Emails feature uses a multi-stage checking process which checks numerous attributes such as the validity of the domain, DNS and MX records to determine which addresses are working and which are able to receive an email.
+                        <br>
+                        <br>
+                        
+                        <strong>Note:</strong> The email verifier works with a high accuracy to clean email lists. However it’s impossible to verify emails with 100% accuracy without sending a physical email with tracking, and waiting for a real person to read the email.
+                    </p>
+                </div>
+                <div class="footer-group-button">
+                    <div class="button-primary ok-modaal" id="modaal-close">OK</div>
+                    <?php echo  getPremiumButton() ?>
+                </div>
+            </div>
+        </div>
+        <div id="resend_download_modaal" style="display:none;">
+            <button type="button" class="modaal-close" id="modaal-close" style="position: absolute;top: -5px;right: -5px;">
+                <span>Close</span>
+            </button>
+            <div class="downloadsender modaal">
+                <?php
+                $form = new Form($track_attr);
+                $form->render();
+                ?>
+            </div>
+        </div>
+        <?php
+    }
+    
     /**
      * Validate screen options on update.
@@ -45 +214 @@
          
          $logs_obj = new DownloadSender_Logs();
-
+         
          add_screen_option(
              'per_page', array(
@@ -116 +285 @@
         ?>
         <div class="wrap downloadsender"> 
-            <h2 style="margin-left: 10px;">Download Sender Settings</h2>            
+            <h2 style="margin-left: 10px;">Download Sender Settings</h2>
+            <?php echo ! defined( 'DOWNLOAD_SENDER_PREMIUM' ) ? self::get_premium() : ''; ?>        
             <?php echo self::settings_errors(); ?>
             <form method="post" id="downloadsender_settings" action='options.php'>
@@ -354 +524 @@
                 'type'       => 'Textarea',
                 'id'         => 'already_sent',
-                'heading'    => __( 'File already sent message', 'download-sender' ),
+                'heading'    => __( 'File already sent', 'download-sender' ),
                 'sub_desc' => __( 'Prevent users from spamming your file sending forms.', 'download-sender' ),
                 'default'    => $options->get_default('already_sent'),
@@ -361 +531 @@
                 ),
             
+            array( 
+                'type'       => 'Textarea',
+                'id'         => 'much_attempts',
+                'heading'    => __( 'Max wrong send attempts reached', 'download-sender' ),
+                'sub_desc' => __( 'Prevent the maximum number of wrong sending attempts exceeded.', 'download-sender' ),
+                'default'    => $options->get_default('much_attempts'),
+                'display'    => 'inline-block',
+                'class'      => 'right-block',
+                'description'=> 'Shortcodes: {timer}',
+                ),  
+            
             // Custom resend timer          
             array('type' => 'openBlock', 'active' => true, 'class' => $premium_require), // start Premium block
@@ -367 +548 @@
                 'type'      => 'textfield',
                 'id'        => 'resend_timer',
-                'heading'    => __( '{timer} - Shortcode', 'download-sender' ),
+                'heading'    => __( '{timer}', 'download-sender' ),
                 'default'   => '5',
-                'display'   => 'inline',
-                'description'=> 'Increase / Decrease the timer value (in munutes).',
+                'display'   => 'inline-block',
+                'description'=> 'Timer value (in munutes) of the "File already sent" option.',
+                ),
+            
+            array( 
+                'type'      => 'textfield',
+                'id'        => 'much_attempts_timer',
+                'heading'    => __( '{timer}', 'download-sender' ),
+                'default'   => '5',
+                'display'    => 'inline-block',
+                'class'      => 'right-block',
+                'description'=> 'Timer value (in munutes) of the "Max wrong send attempts reached" option.',
                 ),
             
@@ -560 +751 @@
                 'display'    => 'inline-block',
                 'class'      => 'right-block',
+                "dependency"  => array('element' => "enable_recaptcha", 'value' => array('true')),
                 ),
             
@@ -572 +764 @@
                 'display'    => 'inline-block',
                 'class'      => 'right-block',
+                "dependency"  => array('element' => "enable_recaptcha", 'value' => array('true')),
                 ),
 
@@ -582 +775 @@
                 'html-content'  => $g_recaptcha,
                 'raw_style'     => 'line-height: 0;min-height: 0;',
+                "dependency"  => array('element' => "enable_recaptcha", 'value' => array('true')),
                 ),
 
@@ -593 +787 @@
                 'class'         => 'description',
                 'raw_style'     => 'font-style: normal;',
+                "dependency"  => array('element' => "enable_recaptcha", 'value' => array('true')),
                 ),
 
@@ -601 +796 @@
                 'type'       => 'heading',
                 'heading'    => 'Options',
+                "dependency"  => array('element' => "enable_recaptcha", 'value' => array('true')),
                 ),
 
@@ -611 +807 @@
                 'display'    => 'block',
                 'raw_style'  => 'margin-bottom: 12px;',
+                "dependency"  => array('element' => "enable_recaptcha", 'value' => array('true')),
                 ),
             
@@ -626 +823 @@
                 'default'   => 'light',
                 'display'   => 'middle-inline',
+                "dependency"  => array('element' => "enable_recaptcha", 'value' => array('true')),
                 ),
 
@@ -659 +857 @@
             
             array( 
-                'type'       => 'textfield',
-                'id'         => 'from_address',
-                'heading'    => __( 'From Address', 'download-sender' ),
-                'default'    => 'wordpress@'.downloadsender_domain_name(),
-                'display'    => 'inline-block',
-                'raw_style'  => 'min-width: 200px;',
+                'type'        => 'textfield',
+                'id'          => 'from_address',
+                'heading'     => __( 'From Address', 'download-sender' ),
+                'description' => sprintf( 
+                                    __( 'This email needs to be valid and from your domain name (e.g. %s). To make sure your server is not treated as a spam or gets blacklisted.', 'download-sender' ),
+                                    'downloads@'.downloadsender_domain_name()
+                                ),
+                'default'     => 'wordpress@'.downloadsender_domain_name(),
+                'display'     => 'inline-block',
+                'raw_style'   => 'min-width: 200px;',
                 ),
 
@@ -829 +1031 @@
                                 '60'   => __( 'Hour(s)', 'download-sender' ),
                             ),
-                'default'   => 'minutes',
+                'default'   => '60',
                 'display'   => 'middle-inline',
                 ),
@@ -987 +1189 @@
                                 '1'    => __( 'Minute(s)', 'download-sender' ),
                             ),
-                'default'    => 'minutes',
+                'default'    => '1',
                 'display'    => 'middle-inline',
                 ),
@@ -1035 +1237 @@
         <div class="wrap">
             <h2>Download Sender Logs</h2>
+            <?php //echo ! defined( 'DOWNLOAD_SENDER_PREMIUM' ) ? self::get_premium() : ''; ?>
             <?php settings_errors(); ?>
-            <form id="downloadsender_logs_filter" method="post" onsubmit="return confirm('This is irreversible. Are you sure you want to continue?');">
-            <input type="hidden" name="page" value="<?php echo esc_attr($_REQUEST['page']) ?>" />
+            <form id="downloadsender_logs_filter" method="post" onsubmit="return validate_logs_filter_action(this)">
+            <input type="hidden" name="page" value="<?php echo esc_attr($_REQUEST['page']); ?>" />
             <?php
-            $logs_obj->prepare_items();
+        
+             //Fetch, prepare, sort, and filter our data...
+            if( isset($_POST['s']) ){
+                    $logs_obj->prepare_items($_POST['s']);
+            } else {
+                    $logs_obj->prepare_items();
+            }
+        
+            //$logs_obj->prepare_items();
+            $logs_obj->search_box('Search', 'search');
             $logs_obj->display();
             ?> 
@@ -1047 +1259 @@
             <!-- Logs export button -->
             <form method="post" class="logs-utilities" action="<?php echo $_SERVER["REQUEST_URI"]; ?>" onSubmit="return confirm('<?php  echo __( 'Are you sure you want to export all the log entries?', 'download-sender' )?>');" >
-                <a href="<?php echo admin_url( 'admin-post.php?action=print.csv' ) ?>"><input type="button" class="button-primary" value="<?php _e('Export Logs to CSV File', 'download-sender'); ?>" /></a>
-               <span style="margin-left: 10px; cursor:default;"> <?php  echo __( 'Use this to export all the log entries to a CSV file (comma separated).', 'download-sender' )?></span>
+                
+                <div class="downloadsender_options-tab heading" style="margin: 0;">Export Logs Filter</div>
+                <div style="padding-left: 25px;" class="ds-export-logs-to-csv-filter">
+                    <div class="downloadsender_options-tab checkbox">   
+                        <input type="checkbox" id="checkbox_verified_logs_one" name="checkbox_verified_logs_one" value="checkbox_verified_logs_one" checked="checked">
+                        <label for="checkbox_verified_logs_one">100% valid logs</label>
+                    </div>
+                    <div class="downloadsender_options-tab checkbox">   
+                        <input type="checkbox" id="checkbox_verified_logs_two" name="checkbox_verified_logs_two" value="checkbox_verified_logs_two" checked="checked">
+                        <label for="checkbox_verified_logs_two">Verified logs</label>
+                    </div>
+                    <div class="downloadsender_options-tab checkbox">   
+                        <input type="checkbox" id="checkbox_not_verified_logs" name="checkbox_not_verified_logs" value="checkbox_not_verified_logs" checked="checked">
+                        <label for="checkbox_not_verified_logs">Not verified logs</label>
+                    </div>
+                    <div class="downloadsender_options-tab checkbox">   
+                        <input type="checkbox" id="checkbox_not_valid_logs" name="checkbox_not_valid_logs" value="checkbox_not_valid_logs" checked="checked">
+                        <label for="checkbox_not_valid_logs">Not valid logs</label>
+                    </div>
+                </div>
+                <div class="downloadsender_options-tab separator thinnest no_line">     
+                    <div class="downloadsender_separator no_line" data-width="" data-height="thinnest"></div>       
+                </div>
+                <a href="<?php echo admin_url( 'admin-post.php?action=print.csv' ) ?>" class="ds-export-logs-to-csv"><input type="button" class="button-primary" value="<?php _e('Export Logs to CSV File', 'download-sender'); ?>" /></a>
+               <span style="margin-left: 10px; cursor:default;"> <?php  echo __( 'Use this to export log entries to a CSV file (comma separated).', 'download-sender' )?></span>
             </form> 
 
@@ -1075 +1310 @@
         
         $fopen = fopen($file_path, 'w');
-        $header_names = array("ID", "Email", "IP Address", "Country", "Date");
-        fputcsv($fopen, $header_names);  
+        $header_names = array("ID", "Email", "Email Verify", "IP Address", "Country", "Date");
+        fputcsv($fopen, $header_names);
+
         foreach ($resultset as $result) {
-            $fields = array($result->id, $result->email, $result->ip, $result->country, $result->recorde_date);
+            
+            if ( !isset($_GET['not_verified']) && ( $result->email_verify == 0 || $result->email_verify == 1 ) ){
+                continue;
+            }
+            
+            if ( !isset($_GET['verified1']) && $result->email_verify == 2 ){
+                continue;
+            }
+            
+            if ( !isset($_GET['verified2']) && $result->email_verify == 3 ){
+                continue;
+            }
+            
+            if ( !isset($_GET['not_valid']) && $result->email_verify == 4 ){
+                continue;
+            }
+            
+            switch ($result->email_verify) {
+                case 0:
+                case 1:
+                    $email_verify = 'Not Verified';
+                    break;
+                case 2:
+                    $email_verify = 'Verified - 100% Valid';
+                    break;
+                case 3:
+                    $email_verify = 'Verified';
+                    break;
+                case 4:
+                    $email_verify = 'Not Valid';
+                    break;
+                default:
+                    $email_verify = '';
+            }
+            
+            $fields = array($result->id, $result->email, $email_verify, $result->ip, $result->country, $result->recorde_date);
             fputcsv($fopen, $fields);
         }
+        
+        if(!isset($fields)){
+            fputcsv($fopen, array('No logs found for this request.'));
+        }
+        
         fclose($fopen);    
+        
         return DOWNLOAD_SENDER_ABSURL . '/logs.csv';
     }
@@ -1091 +1368 @@
         if ( ! current_user_can( 'manage_options' ) )
             return;
+
         $file_url = $this->generate_csv();
         
@@ -1134 +1412 @@
             <li>Admin functions, 9 Buttons Hover Animation Effects, Limit the number of downloads per user option, and more...</li>
         </ul>
-        <p><a href="https://www.mustaphafersaoui.fr/wp-plugins/download-sender/download-sender-premium/" class="button button-primary get-premium-btn" target="_blank"><?php echo  __( 'Get Premium', 'download-sender' ) ?></a></p>
+        <p><?php echo  getPremiumButton() ?></p>
         </div>
     <?php

download-sender/trunk/includes/admin/class-tinymce.php

@@ -42 +42 @@
      */
     function dialog_contents() {
-        /*
-        if ( function_exists( 'get_current_screen' ) ) {
-            $pt = get_current_screen()->post_type;
-            if ( $pt != 'post' && $pt != 'page' )
-                return;
-        }
-        */
         // Print directly html      
         ?>
         <div style="display: none">         
-            <form id="downloadsender-mce-dialog" tabindex="-1">             
+            <form id="downloadsender-mce-dialog" tabindex="-1">
+                
+            <?php if ( !defined( 'DOWNLOAD_SENDER_PREMIUM' ) ) {
+                ?>
+                <div style="display: block; text-align: right;padding-top: 10px;">
+                    <?php echo  getPremiumButton() ?>
+                </div>
+            <?php }?>
+                
                 <?php echo $this->dialog_contents_tabs();?>
                 <div class="downloadsender-submitbox">
@@ -62 +63 @@
                 </div>
             </form>
+            
         </div>
         <?php
@@ -77 +79 @@
         $premium_require   = ! defined( 'DOWNLOAD_SENDER_PREMIUM' ) ? ' premium_require' : '';
         $is_hidded_require = ! defined( 'DOWNLOAD_SENDER_PREMIUM' ) ? ' is_hidded' : '';
-         
+        $is_hidded_require = '';
+        
         $pages = get_pages();
         $page_list = array();
@@ -88 +91 @@
         $color_scheme_desc = __( 'Choose a color from your', 'download-sender') . ' <a target="_blank" href="'. esc_url(admin_url()) .'/admin.php?page=downloadsender-settings&tab_id=theme_tab"> ' . esc_html__('globally defined color scheme', 'download-sender') . '</a>';
 
+        $premium_tag  = ! defined( 'DOWNLOAD_SENDER_PREMIUM' ) ? ' - [premium]' : '';
         $hover_transitions = array(
              'fill-hover'           => 'Fill on hover ',
              'outline-hover'        => 'Outline on hover' ,
+             'optgroup_in'          => 'Premium Hover Effects',
              'fill-right-left'      => 'Fill from right to left',
              'fill-left-right'      => 'Fill from left to right',
@@ -100 +105 @@
              'fill-diagonal-right'  => 'Fill diagonal to right',
              'fill-center'          => 'Fill from center',
+             'optgroup_out'         => '',
             );
         
@@ -291 +297 @@
                 'value'       => array(
                         'file_picker' => 'File picker',
-                        'file_url'    => 'URL',
+                        'file_url'    => 'Custom URL'.$premium_tag,
                         ),
                 'default'     => 'file_picker',
@@ -315 +321 @@
             ),  
 
+            array('type' => 'openBlock', 'active' => true, 'unflex' => true, 'class' => $premium_require), // start Premium block
+            
             array(
                 "type"        => 'checkbox',
                 "heading"     => __("Direct download link button",  'download-sender'),
                 "id"          => "direct_link",
-                'class'       => $premium_require . $is_hidded_require,
+                //'class'         => $premium_require . $is_hidded_require,
                 "value"       => 'yes',
                 'description' => __( 'This will disable the sending file form and allows the user to start downloading just by clicking the Download button.',  'download-sender' ),
                 "default"     => false,
             ),
+            
+            array('type' => 'closeBlock'), // end block require premium
 
             // Set expiration
@@ -337 +347 @@
                 'class'       => 'dependency-triggers',
                 'value'       => array(
-                        'never'  => 'Never',
-                        '24'     => '1 Day',
-                        '48'     => '48 Hours',
-                        '720'    => '30 Days',
-                        'custom' => 'Custom',
+                        'never'       => 'Never',
+                        '24'          => '1 Day',
+                        'optgroup_in' => 'Premium Options',
+                        '48'          => '48 Hours',
+                        '720'         => '30 Days',
+                        'custom'      => 'Custom',
                         ),
                 'default'     => 'never',

download-sender/trunk/includes/class-download-sender.php

@@ -40 +40 @@
         do_action( 'download_sender_loaded' );
     }   
-    
     
     /**
@@ -186 +185 @@
                     recorde_date DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL,
                     email MEDIUMTEXT NOT NULL,
+                    status MEDIUMTEXT NOT NULL,
                     file_name MEDIUMTEXT NOT NULL,
                     PRIMARY KEY  (id)
@@ -191 +191 @@
             dbDelta($sql);
         }   
+        
+        // Alter email_verify column if not exist
+        $email_verify_column = $wpdb->get_results( $wpdb->prepare(
+            "SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = %s AND TABLE_NAME = %s AND COLUMN_NAME = %s ",
+            DB_NAME, $logs_table, 'email_verify'
+        ) );
+        
+        if ( empty( $email_verify_column ) ) {
+            $wpdb->query("ALTER TABLE $logs_table ADD email_verify MEDIUMTEXT NOT NULL AFTER email");
+        }
+        
+        // Change file_name column name
+        $file_name_column = $wpdb->get_results( $wpdb->prepare(
+            "SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = %s AND TABLE_NAME = %s AND COLUMN_NAME = %s ",
+            DB_NAME, $logs_table, 'file_name'
+        ) );
+        
+        if ( !empty( $file_name_column ) ) {
+            $wpdb->query("ALTER TABLE $logs_table CHANGE file_name files MEDIUMTEXT");
+        }
         
         // Install the Download Links DB

download-sender/trunk/includes/class-frontend-scripts.php

@@ -286 +286 @@
                 'downloadSender',
                 array( 
-                        'ajax'            => admin_url( 'admin-ajax.php' ),
-                        'dl_date_msg'     => __( 'This link will expire after %s clicks or after %s.', 'download-sender' ),
-                        'date_msg'        => __( 'This link will expire in %s.', 'download-sender' ),
-                        'dl_msg'          => __( 'This link will expire after %s clicks.', 'download-sender' ),
-                        'limit_reached'   => __( 'This file has expired.', 'download-sender' ),
-                        'wrong_file'      => $options->get_option('wrong_file'),
-                        'empty_email'     => $options->get_option('empty_email'),
-                        'wrong_email'     => $options->get_option('wrong_email'),
-                        'already_sent'    => $options->get_option('already_sent'),
-                        'troubleshooting' => $options->get_option('troubleshooting')
+                        'ajax'              => admin_url( 'admin-ajax.php' ),
+                        'dl_date_msg'       => __( 'This link will expire after %s clicks or after %s.', 'download-sender' ),
+                        'date_msg'          => __( 'This link will expire in %s.', 'download-sender' ),
+                        'dl_msg'            => __( 'This link will expire after %s clicks.', 'download-sender' ),
+                        'limit_reached'     => __( 'This file has expired.', 'download-sender' ),
+                        'wrong_file'        => $options->get_option('wrong_file'),
+                        'empty_email'       => $options->get_option('empty_email'),
+                        'wrong_email'       => $options->get_option('wrong_email'),
+                        'already_sent'      => $options->get_option('already_sent'),
+                        'resend_timer'      => $options->get_option('resend_timer'),
+                        'much_attempts'     => $options->get_option('much_attempts'),
+                        'much_attempts_timer' => $options->get_option('much_attempts_timer'),
+                        'troubleshooting'   => $options->get_option('troubleshooting'),
+                        'is_admin'          => current_user_can('editor') || current_user_can('administrator')
                      ) 
         );

download-sender/trunk/includes/class-shortcodes.php

@@ -207 +207 @@
             $simply_button .= '<input type="hidden"
                                data-post-id="' . get_the_ID() .'"
-                               data-resend-timer="' . $options->get_option('resend_timer').'"
                                data-form-desc="' . htmlentities($form_desc) .'"
                                data-alert-class="'. $alert_pos.' alert-'.$alerts_style.$alert_shadow.'"
@@ -440 +439 @@
             $file       = sanitize_text_field($_REQUEST['file']);
             $to         = isset($_REQUEST['to']) ? downloadsender_str_crypt( $_REQUEST['to'], 'd') : null;
-            $user_email = sanitize_email($to) ? $to : null;
+            $user_email = $to ? sanitize_email($to) : null;
             
             if( !$user_email || !checkdnsrr(explode("@", $user_email)[1],"MX")) {
@@ -469 +468 @@
                 
                 // Record Log
-                $ip           = downloadsender_get_ip();
-                $country      = downloadsender_geolocate($ip);
-
-                $check_email  = $wpdb->get_results('SELECT * FROM ' . $wpdb->prefix . DOWNLOAD_SENDER_LOGS_TABLE.' WHERE email="' . $to . '"');
-
-                // Log email adress.
-                if ( count($check_email) == 0 && !$options->get_option('disable_logs') ) {
-                    $logs_table = $wpdb->prefix . DOWNLOAD_SENDER_LOGS_TABLE;
-
-                    $row = array(
-                        'ip'           => $ip,
-                        'country'      => $country,
-                        'recorde_date' => $cur_time,
-                        'email'        => $to,
-                        'file_name'    => $filename 
-                    );
-
-                    $row = array_filter($row); //Remove any null values.
-                    $insert_table = $wpdb->insert($logs_table, $row);
+                $logs_table = $wpdb->prefix . DOWNLOAD_SENDER_LOGS_TABLE;
+                
+                $check_email  = $wpdb->get_results('SELECT * FROM ' . $logs_table . ' WHERE email="' . $to . '"');
+
+                // Set email status to Verified
+                if ( count($check_email) != 0 ) {                   
+                    $wpdb->update( $logs_table, array('email_verify' => 2), array('email' => $to) );                
                 }   
                 
@@ -520 +507 @@
                 exit;
             }
-            $file_url = '<a class="downloadsender-href" data-action="downloadsender_action_process" data-href="'.$download_link.'" data-file="'.$file.'" data-access-count="'.$access_count.'" data-message="'.$message.'" data-limit-date="'.$ajax->to_hours_days($expire_time/60).'" data-limit-downloads="'.$limit_downloads.'">'.$filename.'</a>';
+            $file_url = '<a class="downloadsender-href" data-action="downloadsender_action_process" data-email="'.$to.'" data-href="'.$download_link.'" data-file="'.$file.'" data-access-count="'.$access_count.'" data-message="'.$message.'" data-limit-date="'.$ajax->to_hours_days($expire_time/60).'" data-limit-downloads="'.$limit_downloads.'">'.$filename.'</a>';
         }
         

download-sender/trunk/includes/core-functions.php

@@ -114 +114 @@
     if ( class_exists( 'Download_Sender_Premium' ) ) { return true; } else { return false; }
 }
+
+/**
+ * Check if Download Sender Premium is activated
+*/
+function getPremiumButton() {
+    return '<a href="https://www.mustaphafersaoui.fr/wp-plugins/download-sender/download-sender-premium/" class="button button-primary get-premium-btn" target="_blank">'. __( 'Get Premium', 'download-sender' ).'</a>';   
+}

download-sender/trunk/readme.txt

@@ -25 +25 @@
 * Disable file sending form for logged in users.
 * Ability to enable/disable downloading logs.
+* Abbilty to resending download link from in the admin logs page with a simple click.
 * Export logs to CSV file.
 * Configure URL of "Expired Link" page.
@@ -41 +42 @@
 * Integrates well with **WPBakery Page Builder**.
 * Add Google Captcha (reCAPTCHA) to the file sending form.
+* Feature to verifies the email address at sending file time to minimize the sending of emails to non-working email addresses and receiving too many bounced and returned emails.
+* Ability to verify emails manually from the logs page.
 * Manually enter a valid URL with ability to use URLs of files hosted on external web sites.
 * Set custom expiration times for your download links (Manually enter the number of hours or days).
@@ -99 +102 @@
 == Changelog ==
 
+= 1.3.0 =
+* New premium feature to verifies the email address at sending file time to minimize the sending of emails to non-working email addresses and receiving too many bounced and returned emails.
+* Ability to verify emails manually from the admin logs page.
+* Added feature to re-sending download link from in the logs page with a simple click.
+* Added Notifications option : Max wrong send attempts reached - To prevent the maximum number of wrong sending attempts exceeded.
+* Added logs search box.
+* Added export logs filter.
+* Fixed flag display on the logs page.
+
 = 1.2.8 =
 * Fix: reCAPTCHA is now working on pages with multiple captchas