Changeset 2300742
- Timestamp:
- 05/08/2020 11:04:17 AM (6 years ago)
- Location:
- wp-phone-message/trunk
- Files:
-
- 3 edited
-
includes/WpPhoneMessageAdmin.php (modified) (2 diffs)
-
js/shortcode.js (modified) (4 diffs)
-
js/shortcode.min.js (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
wp-phone-message/trunk/includes/WpPhoneMessageAdmin.php
r2299592 r2300742 29 29 // save data 30 30 if( ( $_POST['wp-phone-message-phone-number'] ) && ( $_POST['wp-phone-message-phone-prefix'] ) ) { 31 32 $phone = sanitize_text_field( $_POST['wp-phone-message-phone-number'] ); 33 $prefix = (int) str_replace(' ', '', sanitize_text_field( $_POST['wp-phone-message-phone-prefix'] )); 34 $title = sanitize_text_field( $_POST['wp-phone-message-title'] ); 35 $text = sanitize_text_field( $_POST['wp-phone-message-text'] ); 36 $button = sanitize_text_field( $_POST['wp-phone-message-button'] ); 37 $textarea = sanitize_text_field( $_POST['wp-phone-message-textarea'] ); 38 $name_place = sanitize_text_field( $_POST['wp-phone-message-name'] ); 39 $name_active = sanitize_text_field( $_POST['wp-phone-message-name-active'] ); 40 $name_mandatory = sanitize_text_field( $_POST['wp-phone-message-name-mandatory'] ); 41 $address_place = sanitize_text_field( $_POST['wp-phone-message-address'] ); 42 $address_active = sanitize_text_field( $_POST['wp-phone-message-address-active'] ); 43 $address_mandatory = sanitize_text_field( $_POST['wp-phone-message-address-mandatory'] ); 44 $phone_place = sanitize_text_field( $_POST['wp-phone-message-phone'] ); 45 $phone_active = sanitize_text_field( $_POST['wp-phone-message-phone-active'] ); 46 $phone_mandatory = sanitize_text_field( $_POST['wp-phone-message-phone-mandatory'] ); 47 $email_place = sanitize_text_field( $_POST['wp-phone-message-email'] ); 48 $email_active = sanitize_text_field( $_POST['wp-phone-message-email-active'] ); 49 $email_mandatory = sanitize_text_field( $_POST['wp-phone-message-email-mandatory'] ); 50 51 $fullPhoneNumber = (int) str_replace(' ', '', $prefix) . ltrim(str_replace(' ', '', $phone), '0') ; 52 53 update_option( 'wp-phone-message-phone-number', $phone ); 54 update_option( 'wp-phone-message-phone-prefix', $prefix ); 55 update_option( 'wp-phone-message-full-phone-number', $fullPhoneNumber ); 56 update_option( 'wp-phone-message-title', $title ); 57 update_option( 'wp-phone-message-text', $text ); 58 update_option( 'wp-phone-message-button', $button ); 59 update_option( 'wp-phone-message-textarea', $textarea ); 60 update_option( 'wp-phone-message-name', $name_place ); 61 update_option( 'wp-phone-message-name-active', $name_active ); 62 update_option( 'wp-phone-message-name-mandatory', $name_mandatory ); 63 update_option( 'wp-phone-message-address', $address_place ); 64 update_option( 'wp-phone-message-address-active', $address_active ); 65 update_option( 'wp-phone-message-address-mandatory', $address_mandatory ); 66 update_option( 'wp-phone-message-phone', $phone_place ); 67 update_option( 'wp-phone-message-phone-active', $phone_active ); 68 update_option( 'wp-phone-message-phone-mandatory', $phone_mandatory ); 69 update_option( 'wp-phone-message-email', $email_place ); 70 update_option( 'wp-phone-message-email-active', $email_active ); 71 update_option( 'wp-phone-message-email-mandatory', $email_mandatory ); 31 $this->saveData(); 72 32 update_option( 'wp-phone-message-form-message', 'Settings saved.'); 73 74 33 } 75 34 else{ 35 $this->saveData(); 76 36 update_option( 'wp-phone-message-form-message', 'International prefix and Whatsapp phone number are required.'); 77 37 } … … 80 40 } 81 41 82 public function adminRedirect() { 42 private function saveData(){ 43 44 $phone = sanitize_text_field( $_POST['wp-phone-message-phone-number'] ); 45 $prefix = (int) str_replace(' ', '', sanitize_text_field( $_POST['wp-phone-message-phone-prefix'] )); 46 $title = sanitize_text_field( $_POST['wp-phone-message-title'] ); 47 $text = sanitize_text_field( $_POST['wp-phone-message-text'] ); 48 $button = sanitize_text_field( $_POST['wp-phone-message-button'] ); 49 $textarea = sanitize_text_field( $_POST['wp-phone-message-textarea'] ); 50 $name_place = sanitize_text_field( $_POST['wp-phone-message-name'] ); 51 $name_active = sanitize_text_field( $_POST['wp-phone-message-name-active'] ); 52 $name_mandatory = sanitize_text_field( $_POST['wp-phone-message-name-mandatory'] ); 53 $address_place = sanitize_text_field( $_POST['wp-phone-message-address'] ); 54 $address_active = sanitize_text_field( $_POST['wp-phone-message-address-active'] ); 55 $address_mandatory = sanitize_text_field( $_POST['wp-phone-message-address-mandatory'] ); 56 $phone_place = sanitize_text_field( $_POST['wp-phone-message-phone'] ); 57 $phone_active = sanitize_text_field( $_POST['wp-phone-message-phone-active'] ); 58 $phone_mandatory = sanitize_text_field( $_POST['wp-phone-message-phone-mandatory'] ); 59 $email_place = sanitize_text_field( $_POST['wp-phone-message-email'] ); 60 $email_active = sanitize_text_field( $_POST['wp-phone-message-email-active'] ); 61 $email_mandatory = sanitize_text_field( $_POST['wp-phone-message-email-mandatory'] ); 62 63 $fullPhoneNumber = (int) str_replace(' ', '', $prefix) . ltrim(str_replace(' ', '', $phone), '0') ; 64 65 update_option( 'wp-phone-message-phone-number', $phone ); 66 update_option( 'wp-phone-message-phone-prefix', $prefix ); 67 update_option( 'wp-phone-message-full-phone-number', $fullPhoneNumber ); 68 update_option( 'wp-phone-message-title', $title ); 69 update_option( 'wp-phone-message-text', $text ); 70 update_option( 'wp-phone-message-button', $button ); 71 update_option( 'wp-phone-message-textarea', $textarea ); 72 update_option( 'wp-phone-message-name', $name_place ); 73 update_option( 'wp-phone-message-name-active', $name_active ); 74 update_option( 'wp-phone-message-name-mandatory', $name_mandatory ); 75 update_option( 'wp-phone-message-address', $address_place ); 76 update_option( 'wp-phone-message-address-active', $address_active ); 77 update_option( 'wp-phone-message-address-mandatory', $address_mandatory ); 78 update_option( 'wp-phone-message-phone', $phone_place ); 79 update_option( 'wp-phone-message-phone-active', $phone_active ); 80 update_option( 'wp-phone-message-phone-mandatory', $phone_mandatory ); 81 update_option( 'wp-phone-message-email', $email_place ); 82 update_option( 'wp-phone-message-email-active', $email_active ); 83 update_option( 'wp-phone-message-email-mandatory', $email_mandatory ); 84 85 } 86 87 private function adminRedirect() { 83 88 // redirect at the end of the process 84 89 if(isset( $_POST['_wp_http_referer'] )){ -
wp-phone-message/trunk/js/shortcode.js
r2299595 r2300742 1 1 jQuery(document).ready(function ($) { 2 2 3 $("#whatapp-form").submit(function () { 3 $("#whatapp-form").submit(function (e) { 4 e.preventDefault(); 4 5 var fullTelephone = $('#wp-phone-message-full-phone-number').val(); 5 6 var message = $('#wp-phone-message-message').val(); … … 16 17 popupwindow(whatappUrl, title, 1000, 700); 17 18 } 19 return false; 18 20 }); 19 21 20 $("#whatapp-widget-form").submit(function () { 22 $("#whatapp-widget-form").submit(function (e) { 23 e.preventDefault(); 21 24 var fullTelephone = $('#wp-phone-message-widget-full-phone-number').val(); 22 25 var message = $('#wp-phone-message-widget-message').val(); … … 32 35 popupwindow(whatappUrl, 'Whatsapp Me', 1000, 700); 33 36 } 37 return false; 34 38 }); 35 39 … … 41 45 42 46 function whatappValidation(fullTelephone, errorTarget) { 43 if (fullTelephone ) {47 if (fullTelephone && fullTelephone != '0') { 44 48 whatappErrorMessage(" ", errorTarget); 45 49 return true; 46 50 } 47 51 else { 48 whatappErrorMessage("Telephone number is not set .", errorTarget);52 whatappErrorMessage("Telephone number is not set or not valid.", errorTarget); 49 53 return false; 50 54 } -
wp-phone-message/trunk/js/shortcode.min.js
r2299595 r2300742 1 jQuery(document).ready((function($){function popupwindow(url,title,w,h){var left=screen.width/2-w/2,top=screen.height/2-h/2;return window.open(url,title,"toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=no, resizable=no, copyhistory=no, width="+w+", height="+h+", top="+top+", left="+left)}function whatappValidation(fullTelephone,errorTarget){return fullTelephone ?(whatappErrorMessage(" ",errorTarget),!0):(whatappErrorMessage("Telephone number is not set.",errorTarget),!1)}function whatappErrorMessage(errorMessage,errorTarget){$("#"+errorTarget).text(errorMessage)}function whatappCreateFinalMessage(name,address,phone,email,message){return final_message="",void 0!==name&&(final_message+=name+" %0a"),void 0!==address&&(final_message+=address+" %0a"),void 0!==phone&&(final_message+=phone+" %0a"),void 0!==email&&(final_message+=email+" %0a"),final_message+=message.replace(/[\r\n]/g," %0a"),final_message}$("#whatapp-form").submit((function(){var fullTelephone=$("#wp-phone-message-full-phone-number").val(),message=$("#wp-phone-message-message").val(),name=$("#wp-phone-message-name").val(),address=$("#wp-phone-message-address").val(),phone=$("#wp-phone-message-phone").val(),email=$("#wp-phone-message-email").val(),title=$("#wp-phone-message-title").val(),whatappUrl;whatappValidation(fullTelephone,"whatapp-error")&&(final_message=whatappCreateFinalMessage(name,address,phone,email,message),popupwindow("https://wa.me/"+fullTelephone+"?text="+final_message,title,1e3,700))})),$("#whatapp-widget-form").submit((function(){var fullTelephone=$("#wp-phone-message-widget-full-phone-number").val(),message=$("#wp-phone-message-widget-message").val(),name=$("#wp-phone-message-widget-name").val(),address=$("#wp-phone-message-widget-address").val(),phone=$("#wp-phone-message-widget-phone").val(),email=$("#wp-phone-message-widget-email").val(),whatappUrl;whatappValidation(fullTelephone,"whatapp-widget-error")&&(final_message=whatappCreateFinalMessage(name,address,phone,email,message),popupwindow("https://wa.me/"+fullTelephone+"?text="+final_message,"Whatsapp Me",1e3,700))}))}));1 jQuery(document).ready((function($){function popupwindow(url,title,w,h){var left=screen.width/2-w/2,top=screen.height/2-h/2;return window.open(url,title,"toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=no, resizable=no, copyhistory=no, width="+w+", height="+h+", top="+top+", left="+left)}function whatappValidation(fullTelephone,errorTarget){return fullTelephone&&"0"!=fullTelephone?(whatappErrorMessage(" ",errorTarget),!0):(whatappErrorMessage("Telephone number is not set or not valid.",errorTarget),!1)}function whatappErrorMessage(errorMessage,errorTarget){$("#"+errorTarget).text(errorMessage)}function whatappCreateFinalMessage(name,address,phone,email,message){return final_message="",void 0!==name&&(final_message+=name+" %0a"),void 0!==address&&(final_message+=address+" %0a"),void 0!==phone&&(final_message+=phone+" %0a"),void 0!==email&&(final_message+=email+" %0a"),final_message+=message.replace(/[\r\n]/g," %0a"),final_message}$("#whatapp-form").submit((function(e){e.preventDefault();var fullTelephone=$("#wp-phone-message-full-phone-number").val(),message=$("#wp-phone-message-message").val(),name=$("#wp-phone-message-name").val(),address=$("#wp-phone-message-address").val(),phone=$("#wp-phone-message-phone").val(),email=$("#wp-phone-message-email").val(),title=$("#wp-phone-message-title").val(),whatappUrl;whatappValidation(fullTelephone,"whatapp-error")&&(final_message=whatappCreateFinalMessage(name,address,phone,email,message),popupwindow("https://wa.me/"+fullTelephone+"?text="+final_message,title,1e3,700));return!1})),$("#whatapp-widget-form").submit((function(e){e.preventDefault();var fullTelephone=$("#wp-phone-message-widget-full-phone-number").val(),message=$("#wp-phone-message-widget-message").val(),name=$("#wp-phone-message-widget-name").val(),address=$("#wp-phone-message-widget-address").val(),phone=$("#wp-phone-message-widget-phone").val(),email=$("#wp-phone-message-widget-email").val(),whatappUrl;whatappValidation(fullTelephone,"whatapp-widget-error")&&(final_message=whatappCreateFinalMessage(name,address,phone,email,message),popupwindow("https://wa.me/"+fullTelephone+"?text="+final_message,"Whatsapp Me",1e3,700));return!1}))}));
Note: See TracChangeset
for help on using the changeset viewer.