Changeset 1862731

Timestamp:

04/23/2018 06:23:45 AM (8 years ago)

Author:

osexcel

Message:

Centrora Joomla 7.4.0

Location:

ose-firewall/trunk

Files:

• assets/views/cronjobs.php (modified) (2 diffs)
• classes/App/Controller/GitbackupController.php (added)
• classes/App/Controller/GitbackupsuiteController.php (added)
• classes/App/Model/CronjobsModel.php (modified) (4 diffs)
• classes/App/Model/GitbackupModel.php (added)
• classes/App/Model/GitbackupsuiteModel.php (added)
• classes/Library/gitBackup (added)
• classes/Library/gitBackup/GitSetup.php (added)
• classes/Library/gitBackup/GitSetupL.php (added)
• classes/Library/gitBackup/GitSetupsuite.php (added)
• classes/Library/gitBackup/Process.php (added)
• classes/Library/gitBackup/gitActivationPanel.php (added)
• classes/Library/gitBackup/index.html (added)
• classes/Library/oseFirewallJoomla.php (modified) (5 diffs)
• classes/Library/oseFirewallWordpress.php (modified) (4 diffs)
• classes/Library/panel/panel.php (modified) (1 diff)
• ose_firewall_badge.php (modified) (1 diff)
• ose_wordpress_firewall.php (modified) (1 diff)
• public/messages/da_DK.php (modified) (1 diff)
• public/messages/en_US.php (modified) (1 diff)
• public/messages/fr_FR.php (modified) (1 diff)

ose-firewall/trunk/assets/views/cronjobs.php

@@ -50 +50 @@
                              </div>
                          </div>
-                        <!--
+
                           <div class="col-sm-4">
                              <div class="vs-line-1">
@@ -61 +61 @@
                              </div>
                          </div>
-                            -->
+
                           </div>
                      </div>

ose-firewall/trunk/classes/App/Model/CronjobsModel.php

@@ -206 +206 @@
         }
         $menu = false;
+
+        //disabled the cloud backup for not allow domain
+        $isAllowDomain = true;
+        oseFirewall::callLibClass('panel', 'panel');
+        $panel = new panel();
+        $premium = $panel->isAllowPremiumDomain();
+        if(empty($premium['status'])){
+            $isAllowDomain = false;
+        }
         if(!empty($cloudbt))
         {
@@ -229 +238 @@
                     $repoBare = $gitbackup->checkisRepoBare();
                 }
-                if($isremotereposet==true && $repoBare == false)
+                if($isremotereposet==true && $repoBare == false && $isAllowDomain)
                 {
                     $menu .= '<option value="2">Cloud Backup </option>';
 
                 }else{
-                    $menu .= '<option value="2" disabled>Cloud Backup </option>';
+                    $menu .= '<option value="2" disabled>Cloud Backup (Premium User Only)</option>';
                 }
             }elseif($cloudbt == 2){
@@ -256 +265 @@
                     $repoBare = $gitbackup->checkisRepoBare();
                 }
-                if($isremotereposet && $repoBare == false)
+                if($isremotereposet && $repoBare == false && $isAllowDomain)
                 {
                     $menu .= '<option value="2" selected>Cloud Backup </option>';
 
                 }else{
-                    $menu .= '<option value="2" selected disabled>Cloud Backup </option>';
+                    $menu .= '<option value="2" selected disabled>Cloud Backup (Premium User Only)</option>';
                 }
             }
@@ -284 +293 @@
                 $repoBare = $gitbackup->checkisRepoBare();
             }
-            if($isremotereposet && $repoBare == false)
+            if($isremotereposet && $repoBare == false && $isAllowDomain)
             {
                 $menu .= '<option value="2">Cloud Backup </option>';
 
             }else{
-                $menu .= '<option value="2" disabled>Cloud Backup </option>';
+                $menu .= '<option value="2" disabled>Cloud Backup (Premium User Only)</option>';
             }
         }

ose-firewall/trunk/classes/Library/oseFirewallJoomla.php

@@ -114 +114 @@
         $menu .= '><a href="index.php?option=' . $extension . '&view=mfscan">' . oLang::_get('MF_SCAN') . '</a></li>';
 
+        $menu .= '<li ';
+        $menu .= ($view == 'fpscan') ? 'class="active"' : '';
+        $menu .= '><a href="index.php?option=' . $extension . '&view=fpscan">' . oLang::_get('FILE_PERM_SCAN') . '</a></li>';
+
+
         if (JOOMLA15 == false) {
             $menu .= '<li ';
@@ -139 +144 @@
         // SubMenu Anti-Hacking Ends;
         $menu .= '</li>';
-
+        /*
         //Modified File Scanner
         $menu .= '<li ';
@@ -146 +151 @@
         $menu .= '<img src=' . OSE_FWPUBLICURL . '/images/topbar/icon_t.png>';
         $menu .= oLang::_get('FILE_PERM_SCAN') . '</a>';
+        */
         // SubMenu Anti-Hacking Starts;
         $menu .= '<ul class="dropdown-menu">';
@@ -155 +161 @@
 
         //Backup menu starts
-        /*
+
         $menu .= '<li ';
         $menu .= (in_array($view, array('backup', 'advancedbackup', 'authentication', 'gitbackup'))) ? 'class="dropdown"' : 'class="dropdown"';
@@ -178 +184 @@
         // SubMenu Anti-Hacking Ends;
         $menu .= '</li>';
-*/
+
         if(oseFirewallBase::isSuite()) {
             if (oseFirewallBase::isFirewallV7Active()) {

ose-firewall/trunk/classes/Library/oseFirewallWordpress.php

@@ -102 +102 @@
 
         $menu .= '<li ';
+        $menu .= ($view == 'ose_fw_fpscan') ? 'class="active"' : '';
+        $menu .= '><a href="admin.php?page=ose_fpscan">' . oLang::_get('FILE_PERM_SCAN') . '</a></li>';
+
+
+        $menu .= '<li ';
         $menu .= ($view == 'ose_fw_vlscan') ? 'class="active"' : '';
         $menu .= '><a href="admin.php?page=ose_fw_vlscan">' . oLang::_get('Vl_SCAN') . '</a></li>';
@@ -132 +137 @@
         // SubMenu Anti-Hacking Ends;
         $menu .= '</li>';
-
+/*
         //Modified File Scanner
         $menu .= '<li ';
@@ -146 +151 @@
         $menu .= '</ul>';
         $menu .= '</li>';
-
+*/
         //Backup menu starts
-        /*
+
         $menu .= '<li ';
         $menu .= (in_array($view, array('ose_fw_backup', 'ose_fw_advancedbackup', 'ose_fw_authentication', 'ose_fw_gitbackup'))) ? 'class="dropdown"' : 'class="dropdown"';
@@ -166 +171 @@
         // SubMenu Anti-Hacking Ends;
         $menu .= '</li>';
-*/
+
         // Firewall Settings Menu
         $menu .= '<li id="dropdownMenu1"';

ose-firewall/trunk/classes/Library/panel/panel.php

@@ -957 +957 @@
         return $updatefile;
     }
+    public function isAllowPremiumDomain(){
+        $domain = $_SERVER['HTTP_HOST'];
+        $url = BACKUP_API."Gitbackupv6/isAllowPremiumDomain?domain=".$domain;
+        $curl = curl_init($url);
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($curl, CURLOPT_USERAGENT, 'Centrora Security Downloader Agent');
+        $response = curl_exec($curl);
+        curl_close($curl);
+        $response = json_decode($response,true);
+        return $response;
+    }
 }

ose-firewall/trunk/ose_firewall_badge.php

@@ -4 +4 @@
    Description: Plugin For Showing Centrora Security Badge 
    Author: Centrora Security
-   Version: 7.3.4
+   Version: 7.4.0
 */
 include(dirname(__FILE__).'/includes/oseBadgeWidget.php');

ose-firewall/trunk/ose_wordpress_firewall.php

@@ -5 +5 @@
 Description: Centrora Security (previously OSE Firewall) - A WordPress Security Firewall plugin created by Centrora. Protect your WordPress site by identify any malicious codes, spam, virus, SQL injection, and security vulnerabilities.
 Author: Centrora (Previously ProWeb)
-Version: 7.3.4
+Version: 7.4.0
 Author URI: http://www.centrora.com/
 */

ose-firewall/trunk/public/messages/da_DK.php

@@ -920 +920 @@
 
 //6.2.0
-define('GITBACKUP', 'Git Backup<sup><span>(New)</span></sup>');
+define('GITBACKUP', 'Smart Backup<sup><span>(New)</span></sup>');
 define('CRONJOBS_GITBACKUP','Select how often git backup to run.');
 define('CRONJOBS_FREQUENCY','Frequency');

ose-firewall/trunk/public/messages/en_US.php

@@ -786 +786 @@
 
 //6.2.0
-define('GITBACKUP', 'Git Backup<sup><span>(New)</span></sup>');
+define('GITBACKUP', 'Smart Backup<sup><span>(New)</span></sup>');
 define('CRONJOBS_GITBACKUP','Select how often git backup to run.');
 define('CRONJOBS_FREQUENCY','Frequency');

ose-firewall/trunk/public/messages/fr_FR.php

@@ -935 +935 @@
 
 //6.2.0
-define('GITBACKUP', 'Git Backup<sup><span>(New)</span></sup>');
+define('GITBACKUP', 'Smart Backup<sup><span>(New)</span></sup>');
 define('CRONJOBS_GITBACKUP', 'Select how often git backup to run.');
 define('CRONJOBS_FREQUENCY', 'Frequency');