Changeset 2861993

Timestamp:

02/08/2023 10:32:14 AM (3 years ago)

Author:

mndpsingh287

Message:

v7.1.8

Location:

wp-file-manager/trunk

Files:

• file_folder_manager.php (modified) (7 diffs)
• readme.txt (modified) (3 diffs)

wp-file-manager/trunk/file_folder_manager.php

@@ -5 +5 @@
   Description: Manage your WP files.
   Author: mndpsingh287
-  Version: 7.1.7
+  Version: 7.1.8
   Author URI: https://profiles.wordpress.org/mndpsingh287
   License: GPLv2
@@ -17 +17 @@
     {
         protected $SERVER = 'https://www.tru.agency/api/plugindata/api.php';
-        var $ver = '7.1.7';
+        var $ver = '7.1.8';
         /* Auto Load Hooks */
         public function __construct()
         {
+            add_action('activated_plugin', array(&$this, 'deactivate_file_manager_pro'));
             add_action('admin_menu', array(&$this, 'ffm_menu_page'));
             add_action('network_admin_menu', array(&$this, 'ffm_menu_page'));
@@ -31 +32 @@
             add_action('plugins_loaded', array(&$this, 'filemanager_load_text_domain'));
             /*
-            Lokhal Verify Email
+            File Manager Verify Email
             */
             add_action('wp_ajax_mk_filemanager_verify_email', array(&$this, 'mk_filemanager_verify_email_callback'));
@@ -47 +48 @@
             add_action('wp_ajax_mk_file_manager_single_backup_logs', array(&$this, 'mk_file_manager_single_backup_logs_callback'));
             add_action('wp_ajax_mk_file_manager_single_backup_restore', array(&$this, 'mk_file_manager_single_backup_restore_callback'));
-            add_action('admin_init', array('mk_file_folder_manager', 'mk_file_manager_create_tables'));
             add_action( 'rest_api_init', function () {
                 if(is_user_logged_in() && current_user_can('manage_options')){
@@ -64 +64 @@
             });
         }
+
+        /**
+         * Checks if another version of Filemanager/Filemanager PRO is active and deactivates it.
+         * Hooked on `activated_plugin` so other plugin is deactivated when current plugin is activated.
+         *
+         * @return void
+         */
+        public function deactivate_file_manager_pro($plugin) {
+
+            if ( ! in_array( $plugin, array(
+                'wp-file-manager/file_folder_manager.php',
+                'wp-file-manager-pro/file_folder_manager_pro.php'
+            ), true ) ) {
+                return;
+            }
+
+            $plugin_to_deactivate  = 'wp-file-manager/file_folder_manager.php';
+
+            // If we just activated the free version, deactivate the pro version.
+            if ( $plugin === $plugin_to_deactivate ) {
+                $plugin_to_deactivate  = 'wp-file-manager-pro/file_folder_manager_pro.php';
+            }
+
+            if ( is_multisite() && is_network_admin() ) {
+                $active_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
+                $active_plugins = array_keys( $active_plugins );
+            } else {
+                $active_plugins = (array) get_option( 'active_plugins', array() );
+            }
+
+            foreach ( $active_plugins as $plugin_basename ) {
+                if ( $plugin_to_deactivate === $plugin_basename ) {
+                    deactivate_plugins( $plugin_basename );
+                    return;
+                }
+            }
+        }
+
         /* Auto Directory */
         public function create_auto_directory() {
@@ -96 +134 @@
             }
         }
-         /* 
-         function called on activation create table
-        */
-        public static function mk_file_manager_create_tables() {
-            if ( is_multisite() ) {
-                global $wpdb;
-                // Get all blogs in the network and activate plugin on each one
-                $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
-                foreach ( $blog_ids as $blog_id ) {
-                    switch_to_blog( $blog_id );
-                    self::wp_fm_create_tables();
-                    restore_current_blog();
-                }
-            } else {
-                self::wp_fm_create_tables();
-            }
-        }
-
-        /* 
-         create Backup table
-        */
-
-        public static function wp_fm_create_tables(){
-            global $wpdb;
-            $table_name = $wpdb->prefix . 'wpfm_backup';
-            require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
-            if($wpdb->get_var("SHOW TABLES LIKE '$table_name'") != $table_name) {
-                $charset_collate = $wpdb->get_charset_collate();        
-                $sql = "CREATE TABLE ".$table_name." (
-                    id int(11) NOT NULL AUTO_INCREMENT,
-                    backup_name text NULL,
-                    backup_date text NULL,
-                    PRIMARY KEY  (id)
-                ) $charset_collate;";                   
-                dbDelta( $sql );
-            }
-        }
+
         /*
         Backup - Restore
@@ -1513 +1515 @@
 endif;
 
-register_activation_hook( __FILE__, array( 'mk_file_folder_manager', 'mk_file_manager_create_tables' ) );
+if(!function_exists('mk_file_folder_manager_wp_fm_create_tables')) {
+    function mk_file_folder_manager_wp_fm_create_tables(){
+        global $wpdb;
+        $table_name = $wpdb->prefix . 'wpfm_backup';
+        require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+        if($wpdb->get_var("SHOW TABLES LIKE '$table_name'") != $table_name) {
+            $charset_collate = $wpdb->get_charset_collate();
+            $sql = "CREATE TABLE ".$table_name." (
+                    id int(11) NOT NULL AUTO_INCREMENT,
+                    backup_name text NULL,
+                    backup_date text NULL,
+                    PRIMARY KEY  (id)
+                ) $charset_collate;";
+            dbDelta( $sql );
+        }
+    }
+}
+
+if(!function_exists('mk_file_folder_manager_create_tables')){
+    function mk_file_folder_manager_create_tables(){
+        if ( is_multisite() ) {
+            global $wpdb;
+            // Get all blogs in the network and activate plugin on each one
+            $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
+            foreach ( $blog_ids as $blog_id ) {
+                switch_to_blog( $blog_id );
+                mk_file_folder_manager_wp_fm_create_tables();
+                restore_current_blog();
+            }
+        } else {
+            mk_file_folder_manager_wp_fm_create_tables();
+        }
+    }
+}
+
+register_activation_hook( __FILE__, 'mk_file_folder_manager_create_tables' );

wp-file-manager/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 6.1.1
 Requires PHP: 5.2.4
-Stable tag: 7.1.7
+Stable tag: 7.1.8
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -90 +90 @@
 = Premium Addons =
 
+<strong>[File Manager Digital Ocean](https://filemanagerpro.io/product/digital-ocean-add-on/?utm_source=Wordpress.org&utm_medium=Website&utm_campaign=File%20Manager%20Pro)</strong> provides you ability to edit, delete, upload, download, copy and paste files and folders in Digital Ocean.
 <strong>[File Manager Google Drive](https://filemanagerpro.io/product/file-manager-google-drive/?utm_source=Wordpress.org&utm_medium=Website&utm_campaign=File%20Manager%20Pro)</strong> provides you ability to edit, delete, upload, download, copy and paste files and folders in Google Drive.
 <strong>[File Manager OneDrive](https://filemanagerpro.io/product/file-manager-one-drive/?utm_source=Wordpress.org&utm_medium=Website&utm_campaign=File%20Manager%20Pro)</strong> provides you ability to edit, delete, upload, download, copy and paste files and folders in OneDrive from File Manager.
@@ -138 +139 @@
 
 == Changelog ==
+= 7.1.8 (8th Feb, 2023) =
+
+* Fixed confliction with pro version
+* Minor updations
+
 = 7.1.7 (5th December, 2022) =