Changeset 2943206

Timestamp:

07/25/2023 04:50:22 PM (3 years ago)

Author:

aspiesoft

Message:

: bug fixes for php updates

Location:

aspiesoft-auto-embed/trunk

Files:

• aspiesoft-auto-embed.php (modified) (4 diffs)
• functions.php (modified) (6 diffs)
• readme.txt (modified) (1 diff)
• src/admin.php (modified) (1 diff)
• src/assets/0settings.php (modified) (1 diff)
• src/main.php (modified) (2 diffs)
• src/settings.php (modified) (1 diff)
• templates/admin.php (modified) (2 diffs)

aspiesoft-auto-embed/trunk/aspiesoft-auto-embed.php

@@ -7 +7 @@
 Plugin URI: https://github.com/AspieSoft/aspiesoft-auto-embed
 Description: Easily Embed Dynamic Lazy Loading Youtube Videos And More Simply By Pasting The Url.
-Version: 1.5.7
+Version: 1.5.8
 Author: AspieSoft
 Author URI: https://www.aspiesoft.com
@@ -123 +123 @@
       // version added so updates to functions can still occur without breaking other plugins
       require_once(plugin_dir_path(__FILE__).'functions.php');
-      global $aspieSoft_Functions_v1_3;
-      self::$func = $aspieSoft_Functions_v1_3;
+      global $AspieSoft_Functions_v1_4;
+      self::$func = $AspieSoft_Functions_v1_4;
 
       self::$options = self::$func::options($this->plugin);
@@ -164 +164 @@
         $this->enableOptionsAutoload();
       }
-      //flush_rewrite_rules();
+      flush_rewrite_rules();
     }
 
@@ -171 +171 @@
         $this->disableOptionsAutoload();
       }
-      //flush_rewrite_rules();
+      flush_rewrite_rules();
     }
 

aspiesoft-auto-embed/trunk/functions.php

@@ -6 +6 @@
 }
 
-if(!class_exists('AspieSoft_Functions_v1_3')){
-
-  class AspieSoft_Functions_v1_3{
+if(!class_exists('AspieSoft_Functions_v1_4')){
+
+  class AspieSoft_Functions_v1_4{
 
     public static function startsWith($haystack, $needle){
@@ -54 +54 @@
       }
       foreach($attr as $v){
-        if($v !== null){
+        if(isset($v)){
           return $v;
         }
@@ -103 +103 @@
       if(is_multisite()){
         $option = sanitize_text_field(get_option($name));
-        if(!isset($option) || !$option || $option === null || $option === ''){
+        if(!isset($option) || $option === ''){
           $option = sanitize_text_field(get_site_option($name));
         }
@@ -109 +109 @@
         $option = sanitize_text_field(get_option($name));
       }
-      if(!isset($option) || !$option || $option === null || $option === ''){
+      if(!isset($option) || $option === ''){
         $option = $default;
       }
@@ -186 +186 @@
         if($onActivation){
           $value = self::options_get($plugin, $name, null, false);
-          if($value && $value !== null){
+          if(isset($value)){
             // twice with name change to force update
             self::options_set($plugin, $name, 'autoload:'.$value, $global, $autoload);
@@ -205 +205 @@
   }
 
-  global $aspieSoft_Functions_v1_3;
-  $aspieSoft_Functions_v1_3 = new AspieSoft_Functions_v1_3();
+  global $AspieSoft_Functions_v1_4;
+  $AspieSoft_Functions_v1_4 = new AspieSoft_Functions_v1_4();
 
 }

aspiesoft-auto-embed/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 3.0.1
 Tested up to: 6.0.2
-Stable tag: 1.5.7
+Stable tag: 1.5.8
 Requires PHP: 5.2.4
 License: GPLv2 or later

aspiesoft-auto-embed/trunk/src/admin.php

@@ -22 +22 @@
       $this->plugin = $pluginData;
       require_once(plugin_dir_path(__FILE__).'../functions.php');
-      global $aspieSoft_Functions_v1_3;
-      self::$func = $aspieSoft_Functions_v1_3;
+      global $AspieSoft_Functions_v1_4;
+      self::$func = $AspieSoft_Functions_v1_4;
       self::$options = self::$func::options($this->plugin);
       self::$optionsGlobal = self::$func::options(array('setting' => 'global'));

aspiesoft-auto-embed/trunk/src/assets/0settings.php

@@ -25 +25 @@
       $this->plugin = $pluginData;
       require_once(plugin_dir_path(__FILE__) . '../../functions.php');
-      global $aspieSoft_Functions_v1_3;
-      self::$func = $aspieSoft_Functions_v1_3;
+      global $AspieSoft_Functions_v1_4;
+      self::$func = $AspieSoft_Functions_v1_4;
     }
 

aspiesoft-auto-embed/trunk/src/main.php

@@ -21 +21 @@
       $this->plugin = $pluginData;
       require_once(plugin_dir_path(__FILE__).'../functions.php');
-      global $aspieSoft_Functions_v1_3;
-      self::$func = $aspieSoft_Functions_v1_3;
+      global $AspieSoft_Functions_v1_4;
+      self::$func = $AspieSoft_Functions_v1_4;
       self::$options = self::$func::options($this->plugin);
     }
@@ -37 +37 @@
 
       $altShortcode_default = self::$options['get']('altShortcode_default');
-      if($altShortcode_default && $altShortcode_default !== null){
+      if(isset($altShortcode_default)){
         add_shortcode($altShortcode_default, array($this, 'shortcode_Embed'));
       }
 
       $altShortcode = self::$options['get']('altShortcode');
-      if($altShortcode && $altShortcode !== null){ // add custom shortcode from settings, if it exists
+      if(isset($altShortcode)){ // add custom shortcode from settings, if it exists
         add_shortcode($altShortcode, array($this, 'shortcode_YoutubeEmbed'));
       }

aspiesoft-auto-embed/trunk/src/settings.php

@@ -25 +25 @@
       );
       if (is_array($default)) {
-        if ($default['width'] !== null) {
+        if (isset($default['width'])) {
           $sizes['width'] = $default['width'];
         }
-        if ($default['min-width'] !== null) {
+        if (isset($default['min-width'])) {
           $sizes['min-width'] = $default['min-width'];
         }
-        if ($default['max-width'] !== null) {
+        if (isset($default['max-width'])) {
           $sizes['max-width'] = $default['max-width'];
         }
-        if ($default['ratio'] !== null) {
+        if (isset($default['ratio'])) {
           $sizes['ratio'] = $default['ratio'];
         }

aspiesoft-auto-embed/trunk/templates/admin.php

@@ -33 +33 @@
 
         // unique identifier to allow multiple sessions
-        $computerId = hash('sha256', sanitize_text_field($_SERVER['HTTP_USER_AGENT']).sanitize_text_field($_SERVER['LOCAL_ADDR']).sanitize_text_field($_SERVER['LOCAL_PORT']).sanitize_text_field($_SERVER['REMOTE_ADDR']));
+        $computerId = '';
+        if(isset($_SERVER['HTTP_USER_AGENT'])){
+          $computerId .= sanitize_text_field($_SERVER['HTTP_USER_AGENT']);
+        }
+        if(isset($_SERVER['LOCAL_ADDR'])){
+          $computerId .= sanitize_text_field($_SERVER['LOCAL_ADDR']);
+        }
+        if(isset($_SERVER['LOCAL_PORT'])){
+          $computerId .= sanitize_text_field($_SERVER['LOCAL_PORT']);
+        }
+        if(isset($_SERVER['REMOTE_ADDR'])){
+          $computerId .= sanitize_text_field($_SERVER['REMOTE_ADDR']);
+        }
+        $computerId = hash('sha256', $computerId);
 
         // verify session token
@@ -172 +185 @@
       // load common functions
       require_once(plugin_dir_path(__FILE__).'../functions.php');
-      global $aspieSoft_Functions_v1_3;
-      self::$func = $aspieSoft_Functions_v1_3;
+      global $AspieSoft_Functions_v1_4;
+      self::$func = $AspieSoft_Functions_v1_4;
     }