Refactoring

This commit is contained in:
thanghv 2020-05-14 19:43:10 +07:00
parent f2bf358b3a
commit d130ab7e5f
21 changed files with 62 additions and 56 deletions

View file

@ -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;

View file

@ -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 {

View file

@ -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;

View file

@ -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 );

View file

@ -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'] ) {

View file

@ -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;

View file

@ -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 {

View file

@ -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 {

View file

@ -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() {

View file

@ -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;

View file

@ -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 );

View file

@ -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;

View file

@ -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'],

View file

@ -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;

View file

@ -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;

View file

@ -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;

View file

@ -1,6 +1,6 @@
<?php
// 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_WPvivid_BackupRestore {

View file

@ -26,7 +26,7 @@ class MainWP_Child {
public $plugin_slug;
private $plugin_dir;
private $maxHistory = 5;
public static $brandingTitle = null;
@ -756,10 +756,6 @@ class MainWP_Child {
<?php
}
public function get_max_history() {
return $this->maxHistory;
}
public function parse_init() {
if ( isset( $_REQUEST['cloneFunc'] ) ) {

View file

@ -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;
}
}

View file

@ -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;
}
}

View file

@ -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;