diff --git a/class/class-mainwp-backup.php b/class/class-mainwp-backup.php index 90f93e2..e5d77af 100644 --- a/class/class-mainwp-backup.php +++ b/class/class-mainwp-backup.php @@ -2,6 +2,8 @@ namespace MainWP\Child; +// phpcs:disable WordPress.WP.AlternativeFunctions -- to custom functions. + class MainWP_Backup { protected static $instance = null; protected $excludeZip; @@ -138,11 +140,11 @@ class MainWP_Backup { } public function m_zip_file( $files, $archive ) { - $this->zip = new ZipArchive(); + $this->zip = new \ZipArchive(); $this->zipArchiveFileCount = 0; $this->zipArchiveSizeCount = 0; - $zipRes = $this->zip->open( $archive, ZipArchive::CREATE ); + $zipRes = $this->zip->open( $archive, \ZipArchive::CREATE ); if ( $zipRes ) { foreach ( $files as $file ) { $this->add_fileToZip( $file, basename( $file ) ); @@ -161,7 +163,7 @@ class MainWP_Backup { public function m_zip_file_pcl( $files, $archive ) { // Zip this backup folder. require_once ABSPATH . 'wp-admin/includes/class-pclzip.php'; - $this->zip = new PclZip( $archive ); + $this->zip = new \PclZip( $archive ); $error = false; foreach ( $files as $file ) { @@ -180,7 +182,7 @@ class MainWP_Backup { * @return bool */ public function check_zip_support() { - return class_exists( 'ZipArchive' ); + return class_exists( '\ZipArchive' ); } /** @@ -201,11 +203,11 @@ class MainWP_Backup { */ public function create_zip_full_backup( $filepath, $excludes, $addConfig, $includeCoreFiles, $excludezip, $excludenonwp ) { $this->excludeZip = $excludezip; - $this->zip = new ZipArchive(); + $this->zip = new \ZipArchive(); $this->zipArchiveFileCount = 0; $this->zipArchiveSizeCount = 0; $this->zipArchiveFileName = $filepath; - $zipRes = $this->zip->open( $filepath, ZipArchive::CREATE ); + $zipRes = $this->zip->open( $filepath, \ZipArchive::CREATE ); if ( $zipRes ) { $nodes = glob( ABSPATH . '*' ); if ( ! $includeCoreFiles ) { @@ -442,7 +444,7 @@ class MainWP_Backup { // Zip this backup folder. require_once ABSPATH . 'wp-admin/includes/class-pclzip.php'; - $this->zip = new PclZip( $filepath ); + $this->zip = new \PclZip( $filepath ); $this->zip->create( $backupFolder, PCLZIP_OPT_REMOVE_PATH, $backupFolder ); if ( $addConfig ) { global $wpdb; @@ -614,7 +616,7 @@ class MainWP_Backup { if ( function_exists( 'gc_collect_cycles' ) ) { gc_collect_cycles(); } - $this->zip = new ZipArchive(); + $this->zip = new \ZipArchive(); $this->zip->open( $this->zipArchiveFileName ); $this->zipArchiveFileCount = 0; $this->zipArchiveSizeCount = 0; diff --git a/class/class-mainwp-child-back-up-buddy.php b/class/class-mainwp-child-back-up-buddy.php index 1cd52af..a246317 100644 --- a/class/class-mainwp-child-back-up-buddy.php +++ b/class/class-mainwp-child-back-up-buddy.php @@ -12,7 +12,7 @@ * Extension URL: https://mainwp.com/extension/mainwpbuddy/ */ -// phpcs:disable PSR1.Classes.ClassDeclaration, WordPress.WP.AlternativeFunctions -- use external code. +// phpcs:disable PSR1.Classes.ClassDeclaration, WordPress.WP.AlternativeFunctions -- root namespace to use external code. class MainWP_Child_Back_Up_Buddy { diff --git a/class/class-mainwp-child-back-up-wordpress.php b/class/class-mainwp-child-back-up-wordpress.php index 1397622..d45f0ee 100644 --- a/class/class-mainwp-child-back-up-wordpress.php +++ b/class/class-mainwp-child-back-up-wordpress.php @@ -13,7 +13,7 @@ * Extension URL: https://mainwp.com/extension/backupwordpress/ */ -// phpcs:disable PSR1.Classes.ClassDeclaration, WordPress.WP.AlternativeFunctions -- use external code. +// phpcs:disable PSR1.Classes.ClassDeclaration, WordPress.WP.AlternativeFunctions -- root namespace to use external code. class MainWP_Child_Back_Up_WordPress { public static $instance = null; diff --git a/class/class-mainwp-child-back-wp-up.php b/class/class-mainwp-child-back-wp-up.php index 9bf9f08..1429952 100644 --- a/class/class-mainwp-child-back-wp-up.php +++ b/class/class-mainwp-child-back-wp-up.php @@ -13,7 +13,7 @@ * Extension URL: https://mainwp.com/extension/backwpup/ */ -// phpcs:disable PSR1.Classes.ClassDeclaration, WordPress.WP.AlternativeFunctions -- use external code. +// phpcs:disable PSR1.Classes.ClassDeclaration, WordPress.WP.AlternativeFunctions -- root namespace to use external code. if ( ! defined( 'MAINWP_BACKWPUP_DEVELOPMENT' ) ) { define( 'MAINWP_BACKWPUP_DEVELOPMENT', false ); diff --git a/class/class-mainwp-child-install.php b/class/class-mainwp-child-install.php index 93f466a..df0c8f5 100644 --- a/class/class-mainwp-child-install.php +++ b/class/class-mainwp-child-install.php @@ -206,7 +206,7 @@ class MainWP_Child_Install { $result = array(); foreach ( $urls as $url ) { - $installer = new WP_Upgrader(); + $installer = new \WP_Upgrader(); $ssl_verify = true; // @see wp-admin/includes/class-wp-upgrader.php if ( isset( $_POST['sslVerify'] ) && '0' === $_POST['sslVerify'] ) { diff --git a/class/class-mainwp-child-ithemes-security.php b/class/class-mainwp-child-ithemes-security.php index 127575d..12426a3 100644 --- a/class/class-mainwp-child-ithemes-security.php +++ b/class/class-mainwp-child-ithemes-security.php @@ -13,7 +13,7 @@ * Extension URL: https://mainwp.com/extension/ithemes-security/ */ -// phpcs:disable PSR1.Classes.ClassDeclaration, WordPress.WP.AlternativeFunctions -- use external code. +// phpcs:disable PSR1.Classes.ClassDeclaration, WordPress.WP.AlternativeFunctions -- root namespace to use external code. class MainWP_Child_IThemes_Security { public static $instance = null; diff --git a/class/class-mainwp-child-links-checker.php b/class/class-mainwp-child-links-checker.php index 20b12a3..07e5f4f 100644 --- a/class/class-mainwp-child-links-checker.php +++ b/class/class-mainwp-child-links-checker.php @@ -9,7 +9,7 @@ * The code is used for the MainWP Broken Links Checker Extension (Retired Extension) */ -// phpcs:disable PSR1.Classes.ClassDeclaration, WordPress.WP.AlternativeFunctions -- use external code. +// phpcs:disable PSR1.Classes.ClassDeclaration, WordPress.WP.AlternativeFunctions -- root namespace to use external code. class MainWP_Child_Links_Checker { diff --git a/class/class-mainwp-child-pagespeed.php b/class/class-mainwp-child-pagespeed.php index caa046d..0887c25 100644 --- a/class/class-mainwp-child-pagespeed.php +++ b/class/class-mainwp-child-pagespeed.php @@ -12,7 +12,7 @@ * Extension URL: https://mainwp.com/extension/page-speed/ */ -// phpcs:disable PSR1.Classes.ClassDeclaration, WordPress.WP.AlternativeFunctions -- use external code. +// phpcs:disable PSR1.Classes.ClassDeclaration, WordPress.WP.AlternativeFunctions -- root namespace to use external code. class MainWP_Child_Pagespeed { diff --git a/class/class-mainwp-child-server-information.php b/class/class-mainwp-child-server-information.php index d362431..d01c246 100644 --- a/class/class-mainwp-child-server-information.php +++ b/class/class-mainwp-child-server-information.php @@ -1074,7 +1074,7 @@ class MainWP_Child_Server_Information { } protected static function get_zip_archive_enabled() { - return class_exists( 'ZipArchive' ); + return class_exists( '\ZipArchive' ); } protected static function get_gzip_enabled() { diff --git a/class/class-mainwp-child-staging.php b/class/class-mainwp-child-staging.php index f4ab1bd..e550ad4 100644 --- a/class/class-mainwp-child-staging.php +++ b/class/class-mainwp-child-staging.php @@ -12,6 +12,8 @@ * Extension URL: https://mainwp.com/extension/staging/ */ +// phpcs:disable PSR1.Classes.ClassDeclaration, WordPress.WP.AlternativeFunctions -- root namespace to use external code. + class MainWP_Child_Staging { public static $instance = null; diff --git a/class/class-mainwp-child-stats.php b/class/class-mainwp-child-stats.php index 91398c9..c346c6b 100644 --- a/class/class-mainwp-child-stats.php +++ b/class/class-mainwp-child-stats.php @@ -166,9 +166,7 @@ class MainWP_Child_Stats { $information['dbsize'] = MainWP_Child_DB::get_size(); - global $mainWPChild; - $max_his = $mainWPChild->get_max_history(); - + $max_his = MainWP_Connect::instance()->get_max_history(); $auths = get_option( 'mainwp_child_auth' ); $information['extauth'] = ( $auths && isset( $auths[ $max_his ] ) ? $auths[ $max_his ] : null ); diff --git a/class/class-mainwp-child-timecapsule.php b/class/class-mainwp-child-timecapsule.php index fca3487..39f8a10 100644 --- a/class/class-mainwp-child-timecapsule.php +++ b/class/class-mainwp-child-timecapsule.php @@ -11,7 +11,7 @@ * Extension URL: https://mainwp.com/extension/time-capsule/ */ -// phpcs:disable PSR1.Classes.ClassDeclaration, WordPress.WP.AlternativeFunctions -- use external code. +// phpcs:disable PSR1.Classes.ClassDeclaration, WordPress.WP.AlternativeFunctions -- root namespace to use external code. class MainWP_Child_Timecapsule { public static $instance = null; diff --git a/class/class-mainwp-child-updates.php b/class/class-mainwp-child-updates.php index 4cc75e8..f006011 100644 --- a/class/class-mainwp-child-updates.php +++ b/class/class-mainwp-child-updates.php @@ -96,7 +96,7 @@ class MainWP_Child_Updates { $slug = ( isset( $update['slug'] ) ? $update['slug'] : $update['Name'] ); if ( isset( $update['url'] ) ) { - $installer = new WP_Upgrader(); + $installer = new \WP_Upgrader(); $result = $installer->run( array( 'package' => $update['url'], diff --git a/class/class-mainwp-child-woocommerce-status.php b/class/class-mainwp-child-woocommerce-status.php index 965347f..0e7278d 100644 --- a/class/class-mainwp-child-woocommerce-status.php +++ b/class/class-mainwp-child-woocommerce-status.php @@ -11,7 +11,7 @@ * Extension URL: https://mainwp.com/extension/woocommerce-status/ */ -// phpcs:disable PSR1.Classes.ClassDeclaration, WordPress.WP.AlternativeFunctions -- use external code. +// phpcs:disable PSR1.Classes.ClassDeclaration, WordPress.WP.AlternativeFunctions -- root namespace to use external code. class MainWP_Child_WooCommerce_Status { public static $instance = null; diff --git a/class/class-mainwp-child-wordfence.php b/class/class-mainwp-child-wordfence.php index 0e4ae91..dd51da3 100644 --- a/class/class-mainwp-child-wordfence.php +++ b/class/class-mainwp-child-wordfence.php @@ -11,7 +11,7 @@ * Extension URL: https://mainwp.com/extension/wordfence/ */ -// phpcs:disable PSR1.Classes.ClassDeclaration, WordPress.WP.AlternativeFunctions -- use external code. +// phpcs:disable PSR1.Classes.ClassDeclaration, WordPress.WP.AlternativeFunctions -- root namespace to use external code. class MainWP_Child_Wordfence { public static $instance = null; diff --git a/class/class-mainwp-child-wp-rocket.php b/class/class-mainwp-child-wp-rocket.php index 3bd4099..2a144e5 100644 --- a/class/class-mainwp-child-wp-rocket.php +++ b/class/class-mainwp-child-wp-rocket.php @@ -12,7 +12,7 @@ * Extension URL: https://mainwp.com/extension/rocket/ */ -// phpcs:disable PSR1.Classes.ClassDeclaration, WordPress.WP.AlternativeFunctions -- use external code. +// phpcs:disable PSR1.Classes.ClassDeclaration, WordPress.WP.AlternativeFunctions -- root namespace to use external code. class MainWP_Child_WP_Rocket { public static $instance = null; diff --git a/class/class-mainwp-child-wpvivid-backuprestore.php b/class/class-mainwp-child-wpvivid-backuprestore.php index 93b31f8..76fc3a7 100644 --- a/class/class-mainwp-child-wpvivid-backuprestore.php +++ b/class/class-mainwp-child-wpvivid-backuprestore.php @@ -1,6 +1,6 @@ maxHistory; - } - public function parse_init() { if ( isset( $_REQUEST['cloneFunc'] ) ) { diff --git a/class/class-mainwp-clone-install.php b/class/class-mainwp-clone-install.php index b749677..578bfbc 100644 --- a/class/class-mainwp-clone-install.php +++ b/class/class-mainwp-clone-install.php @@ -2,6 +2,8 @@ namespace MainWP\Child; +// phpcs:disable WordPress.WP.AlternativeFunctions -- to custom functions. + class MainWP_Clone_Install { protected $file; public $config; @@ -34,7 +36,7 @@ class MainWP_Clone_Install { * @return bool */ public function check_zip_support() { - return class_exists( 'ZipArchive' ); + return class_exists( '\ZipArchive' ); } /** @@ -60,7 +62,7 @@ class MainWP_Clone_Install { } elseif ( $this->check_zip_console() ) { return false; } elseif ( $this->check_zip_support() ) { - $zip = new ZipArchive(); + $zip = new \ZipArchive(); $zipRes = $zip->open( $this->file ); if ( $zipRes ) { $zip->deleteName( 'wp-config.php' ); @@ -72,7 +74,7 @@ class MainWP_Clone_Install { return false; } else { - $zip = new PclZip( $this->file ); + $zip = new \PclZip( $this->file ); $list = $zip->delete( PCLZIP_OPT_BY_NAME, 'wp-config.php' ); $list2 = $zip->delete( PCLZIP_OPT_BY_NAME, 'clone' ); if ( 0 === $list ) { @@ -115,7 +117,7 @@ class MainWP_Clone_Install { } elseif ( $this->check_zip_console() ) { return false; } elseif ( $this->check_zip_support() ) { - $zip = new ZipArchive(); + $zip = new \ZipArchive(); $zipRes = $zip->open( $this->file ); if ( $zipRes ) { $content = $zip->locateName( $file ); @@ -292,7 +294,7 @@ class MainWP_Clone_Install { if ( $this->check_zip_console() ) { return false; } elseif ( $this->check_zip_support() ) { - $zip = new ZipArchive(); + $zip = new \ZipArchive(); $zipRes = $zip->open( $this->file ); if ( $zipRes ) { $content = $zip->get_from_name( 'clone/config.txt' ); @@ -303,7 +305,7 @@ class MainWP_Clone_Install { return false; } else { - $zip = new PclZip( $this->file ); + $zip = new \PclZip( $this->file ); $content = $zip->extract( PCLZIP_OPT_BY_NAME, 'clone/config.txt', PCLZIP_OPT_EXTRACT_AS_STRING ); if ( ! is_array( $content ) || ! isset( $content[0]['content'] ) ) { return false; @@ -350,7 +352,7 @@ class MainWP_Clone_Install { * @return bool */ public function extract_zip_backup() { - $zip = new ZipArchive(); + $zip = new \ZipArchive(); $zipRes = $zip->open( $this->file ); if ( $zipRes ) { $zip->extract_to( ABSPATH ); @@ -379,7 +381,7 @@ class MainWP_Clone_Install { } public function extract_zip_pcl_backup() { - $zip = new PclZip( $this->file ); + $zip = new \PclZip( $this->file ); if ( 0 === $zip->extract( PCLZIP_OPT_PATH, ABSPATH, PCLZIP_OPT_REPLACE_NEWER ) ) { return false; } @@ -611,7 +613,7 @@ class MainWP_Clone_Install { if ( ! isset( $_REQUEST['f'] ) || ( '' === $_REQUEST['f'] ) ) { return; } - if ( ! $this->is_valid_auth( $_REQUEST['key'] ) ) { + if ( ! MainWP_Connect::instance()->is_valid_auth( $_REQUEST['key'] ) ) { return; } @@ -725,19 +727,4 @@ class MainWP_Clone_Install { return true; } - - public function is_valid_auth( $key ) { - $auths = get_option( 'mainwp_child_auth' ); - if ( ! $auths ) { - return false; - } - for ( $i = 0; $i <= $this->maxHistory; $i ++ ) { - if ( isset( $auths[ $i ] ) && ( $auths[ $i ] === $key ) ) { - return true; - } - } - - return false; - } - } diff --git a/class/class-mainwp-connect.php b/class/class-mainwp-connect.php index 90e26df..a82752a 100644 --- a/class/class-mainwp-connect.php +++ b/class/class-mainwp-connect.php @@ -4,7 +4,8 @@ namespace MainWP\Child; class MainWP_Connect { - public static $instance = null; + public static $instance = null; + private $maxHistory = 5; /** * Method get_class_name() @@ -459,4 +460,24 @@ class MainWP_Connect { MainWP_Helper::update_option( 'mainwp_child_auth', $auths, 'yes' ); } } + + public function is_valid_auth( $key ) { + $auths = get_option( 'mainwp_child_auth' ); + if ( ! $auths ) { + return false; + } + for ( $i = 0; $i <= $this->maxHistory; $i ++ ) { + if ( isset( $auths[ $i ] ) && ( $auths[ $i ] === $key ) ) { + return true; + } + } + + return false; + } + + + public function get_max_history() { + return $this->maxHistory; + } + } diff --git a/class/class-mainwp-wordpress-seo.php b/class/class-mainwp-wordpress-seo.php index 5629366..7778851 100644 --- a/class/class-mainwp-wordpress-seo.php +++ b/class/class-mainwp-wordpress-seo.php @@ -12,7 +12,7 @@ * Extension URL: https://mainwp.com/extension/wordpress-seo/ */ -// phpcs:disable PSR1.Classes.ClassDeclaration, WordPress.WP.AlternativeFunctions -- use external code. +// phpcs:disable PSR1.Classes.ClassDeclaration, WordPress.WP.AlternativeFunctions -- root namespace to use external code. class MainWP_WordPress_SEO { public static $instance = null;