Changeset 1760432

Timestamp:

11/07/2017 10:57:55 PM (8 years ago)

Author:

technoyer

Message:

update htaccess class

Location:

bravo-security

Files:

• tags/1.1/hooks/tebravo.firewall.php (modified) (1 diff)
• tags/1.1/includes/tebravo.htaccess.php (modified) (7 diffs)
• trunk/includes/tebravo.htaccess.php (modified) (7 diffs)

bravo-security/tags/1.1/hooks/tebravo.firewall.php

@@ -1861 +1861 @@
             $output[] = "<td colspan=2>";
             $output[] = "<textarea name='' style='width:35%; height:45px;' disabled></textarea>";
-            $output[] = "<br /><font class='smallfont'>".__("seprate it by comma ','", TEBRAVO_TRANS)."<br />".__("google.com,bing.com,yahoo.com ...etc", TEBRAVO_TRANS)."</font></td>";
+            $output[] = "<br /><font class='smallfont'>".__("separate it by comma ','", TEBRAVO_TRANS)."<br />".__("google.com,bing.com,yahoo.com ...etc", TEBRAVO_TRANS)."</font></td>";
             
             

bravo-security/tags/1.1/includes/tebravo.htaccess.php

@@ -75 +75 @@
         if(empty($action))
         {
+            $newData = $this->delete_rule($this->prevent_images_start, $this->prevent_images_end, '');
             $this->prevent_images();
         } else {
@@ -161 +162 @@
         $web_server = tebravo_phpsettings::web_server();
         
-        $output[] = $this->prevent_images_start;
+        $output[] = '';
+        $output[] = $this->prevent_images_start;
        
         if( $web_server == 'nginx' )
@@ -257 +259 @@
        
         $output[] = $this->prevent_images_end;
+        $output[] = ' ';
         
         return implode("\n", $output);
@@ -301 +304 @@
     {
         if( tebravo_phpsettings::web_server() != 'nginx'){
+            $rules[] = '';
             $rules[] = $this->wplogin_start;
             $rules[] = '<IfModule mod_rewrite.c>';
@@ -314 +318 @@
             $rules[] = '</IfModule>';
             $rules[] = $this->wplogin_end;
-        } else {
+            $rules[] = '';
+        } else {
+            $rules[] = '';
             $rules[] = $this->wplogin_start;
             $MU_rules = '';
@@ -326 +332 @@
             $rules[] = $MU_rules;
             $rules[] = $this->wplogin_end;
+            $rules[] = '';
         }
         
@@ -335 +342 @@
     {
         if( tebravo_phpsettings::web_server() != 'nginx'){
+            $rules[] = '';
             $rules[] = $this->wpadmin_start;
             $rules[] = "RewriteRule ^({$this->home_root})?{$this->wpadmin_slug}/?$ {$this->home_root}wp-admin [QSA,L]";
             $rules[] = $this->wpadmin_end;
-        } else {
+            $rules[] = '';
+        } else {
+            $rules[] = '';
             $rules[] = $this->wpadmin_start;
             $rules[] = "rewrite ^({$this->home_root})?{$this->wpadmin_slug}/?$ {$this->home_root}wp-admin\$query_string break;";
             $rules[] = $this->wpadmin_end;
+            $rules[] = '';
         }
         

bravo-security/trunk/includes/tebravo.htaccess.php

@@ -75 +75 @@
         if(empty($action))
         {
+            $newData = $this->delete_rule($this->prevent_images_start, $this->prevent_images_end, '');
             $this->prevent_images();
         } else {
@@ -161 +162 @@
         $web_server = tebravo_phpsettings::web_server();
         
-        $output[] = $this->prevent_images_start;
+        $output[] = '';
+        $output[] = $this->prevent_images_start;
        
         if( $web_server == 'nginx' )
@@ -257 +259 @@
        
         $output[] = $this->prevent_images_end;
+        $output[] = ' ';
         
         return implode("\n", $output);
@@ -301 +304 @@
     {
         if( tebravo_phpsettings::web_server() != 'nginx'){
+            $rules[] = '';
             $rules[] = $this->wplogin_start;
             $rules[] = '<IfModule mod_rewrite.c>';
@@ -314 +318 @@
             $rules[] = '</IfModule>';
             $rules[] = $this->wplogin_end;
-        } else {
+            $rules[] = '';
+        } else {
+            $rules[] = '';
             $rules[] = $this->wplogin_start;
             $MU_rules = '';
@@ -326 +332 @@
             $rules[] = $MU_rules;
             $rules[] = $this->wplogin_end;
+            $rules[] = '';
         }
         
@@ -335 +342 @@
     {
         if( tebravo_phpsettings::web_server() != 'nginx'){
+            $rules[] = '';
             $rules[] = $this->wpadmin_start;
             $rules[] = "RewriteRule ^({$this->home_root})?{$this->wpadmin_slug}/?$ {$this->home_root}wp-admin [QSA,L]";
             $rules[] = $this->wpadmin_end;
-        } else {
+            $rules[] = '';
+        } else {
+            $rules[] = '';
             $rules[] = $this->wpadmin_start;
             $rules[] = "rewrite ^({$this->home_root})?{$this->wpadmin_slug}/?$ {$this->home_root}wp-admin\$query_string break;";
             $rules[] = $this->wpadmin_end;
+            $rules[] = '';
         }