Changeset 1479829

Timestamp:

08/21/2016 06:02:50 AM (10 years ago)

Author:

safly

Message:

Bug Fix: Some bugfixes

Location:

safly-cloud-protection/trunk

Files:

• core/safly-interact.php (modified) (2 diffs)
• options.php (modified) (2 diffs)
• wrapper.php (modified) (4 diffs)

safly-cloud-protection/trunk/core/safly-interact.php

@@ -13 +13 @@
     //Excluded Spiders UA
     //Pass
+    $SaFly_If_Footer = '0';
 }elseif (SaFly_Exclude_Keyword(base64_decode(SaFly_Current_URL()), $safly_options['exclude_url_keyword'])) {
     //Excluded keywords
@@ -56 +57 @@
 
 /* Pages Adding */
-add_action('wp_footer', 'SaFly_add_Footer_Frames');
+if (isset($SaFly_If_Footer) && $SaFly_If_Footer == '0') {
+    //No Footer Added
+}else {
+    add_action('wp_footer', 'SaFly_add_Footer_Frames');
+}
 
 ?>

safly-cloud-protection/trunk/options.php

@@ -192 +192 @@
         //Update the API Server
         $safly_api_server_url = $_POST['saflyapiserverurl'];
-        SaFly_Options_If_API_Domain($safly_api_server_url);
+        SaFly_Options_If_API_Server($safly_api_server_url);
         update_option('safly_api_server_url', $safly_api_server_url);
         //Update the trigger
@@ -237 +237 @@
         $safly_options_saflywafserver = $_POST['saflywafserver'];
         SaFly_Level_VALIDATE($safly_options_level);
-        SaFly_Options_If_API_Domain($safly_options_saflywafserver, 'Invalid WAF Server.');      
+        SaFly_Options_If_API_Server($safly_options_saflywafserver, 'Invalid WAF Server.');      
         $safly_options['level']          = $safly_options_level;
         $safly_options['saflywafserver'] = $safly_options_saflywafserver;

safly-cloud-protection/trunk/wrapper.php

@@ -211 +211 @@
 }
 
-function SaFly_Get_API_Code($tolerance=on)
+function SaFly_Get_API_Code($tolerance = 'on')
 {
     global $safly_api_domain, $saflysalt, $saflysign;
@@ -256 +256 @@
 }
 
-function SaFly_Options_If_API_Domain($str, $notice = 'Wrong API Server.')
+function SaFly_Options_If_API_Server($str, $notice = 'Invalid API Server.')
 {
     if (!empty($str)) {
@@ -273 +273 @@
 }
 
+function SaFly_Options_If_API_Domain($str, $notice = 'Invalid API Domain.')
+{
+    if (!empty($str)) {
+        if (function_exists(esc_url)) {
+            $str   = esc_url($str);
+            $tempu = parse_url($str);
+            $str   = $tempu['host'];
+        }
+        if (!preg_match('/(\w){1,63}(\.(\w){1,63}){1,5}$/', $str)) {
+            wp_die($notice, 'SaFly Cloud Protection');
+        }elseif (strlen($str) > 50) {
+            wp_die($notice, 'SaFly Cloud Protection');
+        }
+    }
+    return $str;
+}
+
 function SaFly_Trigger_VALIDATE($trigger)
 {
@@ -289 +306 @@
 function SaFly_Number_VALIDATE($number)
 {
-    if (!preg_match('/^(\w)+$/', $number)) {
-        wp_die('Invalid Numbers.', 'SaFly Cloud Protection');
+    if (!empty($number)) {
+        if (!preg_match('/^(\w)+$/', $number)) {
+            wp_die('Invalid Numbers.', 'SaFly Cloud Protection');
+        }
     }
 }