From e5fd37da9ba8ca26550570406091200aea2db564 Mon Sep 17 00:00:00 2001 From: thanghv Date: Thu, 21 May 2020 01:22:51 +0700 Subject: [PATCH] Refactoring --- class/class-mainwp-backup.php | 2 +- class/class-mainwp-child-back-up-buddy.php | 8 +- .../class-mainwp-child-back-up-wordpress.php | 5 +- class/class-mainwp-child-back-wp-up.php | 9 +- class/class-mainwp-child-branding.php | 98 +- class/class-mainwp-child-callable.php | 2 +- class/class-mainwp-child-install.php | 10 +- class/class-mainwp-child-links-checker.php | 2 +- class/class-mainwp-child-pagespeed.php | 2 +- ...mainwp-child-server-information-render.php | 1118 ++++++++++++++ .../class-mainwp-child-server-information.php | 1365 ++--------------- class/class-mainwp-child-staging.php | 24 +- class/class-mainwp-child-stats.php | 4 +- class/class-mainwp-child-timecapsule.php | 7 +- ...lass-mainwp-child-updraft-plus-backups.php | 5 +- .../class-mainwp-child-woocommerce-status.php | 2 +- class/class-mainwp-child-wordfence.php | 7 +- class/class-mainwp-child-wp-rocket.php | 2 +- ...ass-mainwp-child-wpvivid-backuprestore.php | 2 +- class/class-mainwp-client-report.php | 13 +- class/class-mainwp-helper.php | 247 --- class/class-mainwp-pages.php | 9 +- class/class-mainwp-utility.php | 152 ++ class/class-mainwp-wordpress-seo.php | 2 +- 24 files changed, 1546 insertions(+), 1551 deletions(-) create mode 100644 class/class-mainwp-child-server-information-render.php diff --git a/class/class-mainwp-backup.php b/class/class-mainwp-backup.php index e9ba9d5..c392368 100644 --- a/class/class-mainwp-backup.php +++ b/class/class-mainwp-backup.php @@ -247,7 +247,7 @@ class MainWP_Backup { } private function include_core_files( &$nodes ) { - return array( + $coreFiles = array( 'favicon.ico', 'index.php', 'license.txt', diff --git a/class/class-mainwp-child-back-up-buddy.php b/class/class-mainwp-child-back-up-buddy.php index 1b58ecc..e3bc300 100644 --- a/class/class-mainwp-child-back-up-buddy.php +++ b/class/class-mainwp-child-back-up-buddy.php @@ -13,6 +13,8 @@ */ use MainWP\Child\MainWP_Helper; +use MainWP\Child\MainWP_Utility; + // phpcs:disable -- third party credit. class MainWP_Child_Back_Up_Buddy { @@ -792,7 +794,7 @@ class MainWP_Child_Back_Up_Buddy { $time = $this->localize_time( $finish_time ); $data['lastBackupStats'] = date( 'M j - g:i A', $time ); // phpcs:ignore -- local time. $data['lasttime_backup'] = $finish_time; - MainWP_Helper::instance()->update_lasttime_backup( 'backupbuddy', $finish_time ); // support Require Backup Before Update feature. + MainWP_Utility::update_lasttime_backup( 'backupbuddy', $finish_time ); // support Require Backup Before Update feature. } else { $data['lastBackupStats'] = 'Unknown'; } @@ -1265,7 +1267,7 @@ class MainWP_Child_Back_Up_Buddy { // Calculate main row string. if ( 'default' == $type ) { // Default backup listing. - $download_url = '/wp-admin/admin-ajax.php?action=mainwp_backupbuddy_download_archive&backupbuddy_backup=' . basename( $file ) . '&_wpnonce=' . MainWP_Helper::instance()->create_nonce_without_session( 'mainwp_download_backup' ); + $download_url = '/wp-admin/admin-ajax.php?action=mainwp_backupbuddy_download_archive&backupbuddy_backup=' . basename( $file ) . '&_wpnonce=' . MainWP_Utility::create_nonce_without_session( 'mainwp_download_backup' ); $main_string = '' . $modified . ' (' . $time_ago . ')'; } elseif ( 'migrate' == $type ) { // Migration backup listing. $main_string = '' . $modified . ' (' . $time_ago . ')'; @@ -1761,7 +1763,7 @@ class MainWP_Child_Back_Up_Buddy { die( '-1' ); } - if ( ! MainWP_Helper::instance()->verify_nonce_without_session( $_GET['_wpnonce'], 'mainwp_download_backup' ) ) { + if ( ! MainWP_Utility::verify_nonce_without_session( $_GET['_wpnonce'], 'mainwp_download_backup' ) ) { die( '-2' ); } diff --git a/class/class-mainwp-child-back-up-wordpress.php b/class/class-mainwp-child-back-up-wordpress.php index 07ae51c..5776842 100644 --- a/class/class-mainwp-child-back-up-wordpress.php +++ b/class/class-mainwp-child-back-up-wordpress.php @@ -14,8 +14,9 @@ */ use MainWP\Child\MainWP_Helper; +use MainWP\Child\MainWP_Utility; -// phpcs:disable PSR1.Classes.ClassDeclaration, WordPress.WP.AlternativeFunctions -- root namespace to use external code. +// phpcs:disable PSR1.Classes.ClassDeclaration, WordPress.WP.AlternativeFunctions -- to use external code. class MainWP_Child_Back_Up_WordPress { public static $instance = null; @@ -227,7 +228,7 @@ class MainWP_Child_Back_Up_WordPress { $date = filemtime( $file ); if ( ! empty( $date ) ) { do_action( 'mainwp_reports_backupwordpress_backup', $destination, $message, 'finished', $backup_type, $date ); - MainWP_Helper::instance()->update_lasttime_backup( 'backupwordpress', $date ); // to support backup before update feature. + MainWP_Utility::update_lasttime_backup( 'backupwordpress', $date ); // to support backup before update feature. } } } diff --git a/class/class-mainwp-child-back-wp-up.php b/class/class-mainwp-child-back-wp-up.php index 9edd1aa..117f17f 100644 --- a/class/class-mainwp-child-back-wp-up.php +++ b/class/class-mainwp-child-back-wp-up.php @@ -16,6 +16,7 @@ // phpcs:disable -- third party credit. use MainWP\Child\MainWP_Helper; +use MainWP\Child\MainWP_Utility; if ( ! defined( 'MAINWP_BACKWPUP_DEVELOPMENT' ) ) { define( 'MAINWP_BACKWPUP_DEVELOPMENT', false ); @@ -247,9 +248,7 @@ class MainWP_Child_Back_WP_Up { MainWP_Helper::instance()->check_classes_exists( array( '\BackWPup_File', '\BackWPup_Job' ) ); MainWP_Helper::instance()->check_methods( '\BackWPup_File', array( 'get_absolute_path' ) ); MainWP_Helper::instance()->check_methods( '\BackWPup_Job', array( 'read_logheader' ) ); - - $lasttime_logged = MainWP_Helper::instance()->get_lasttime_backup( 'backwpup' ); - + $lasttime_logged = MainWP_Utility::get_lasttime_backup( 'backwpup' ); $log_folder = get_site_option( 'backwpup_cfg_logfolder' ); $log_folder = \BackWPup_File::get_absolute_path( $log_folder ); $log_folder = untrailingslashit( $log_folder ); @@ -319,7 +318,7 @@ class MainWP_Child_Back_WP_Up { } if ( $new_lasttime_logged > $lasttime_logged ) { - MainWP_Helper::instance()->update_lasttime_backup( 'backwpup', $new_lasttime_logged ); // to support backup before update feature. + MainWP_Utility::update_lasttime_backup( 'backwpup', $new_lasttime_logged ); // to support backup before update feature. } } } catch ( \Exception $ex ) { @@ -330,7 +329,7 @@ class MainWP_Child_Back_WP_Up { public function sync_others_data( $information, $data = array() ) { if ( isset( $data['syncBackwpupData'] ) && $data['syncBackwpupData'] ) { try { - $lastbackup = MainWP_Helper::instance()->get_lasttime_backup( 'backwpup' ); + $lastbackup = MainWP_Utility::get_lasttime_backup( 'backwpup' ); $information['syncBackwpupData'] = array( 'lastbackup' => $lastbackup, ); diff --git a/class/class-mainwp-child-branding.php b/class/class-mainwp-child-branding.php index b08e9dc..bf769c8 100644 --- a/class/class-mainwp-child-branding.php +++ b/class/class-mainwp-child-branding.php @@ -656,17 +656,111 @@ class MainWP_Child_Branding { } if ( ! empty( $header_css ) ) { - echo ''; + echo ''; } } public function custom_login_css() { $extra_setting = $this->get_extra_options(); if ( isset( $extra_setting['login_css'] ) && ! empty( $extra_setting['login_css'] ) ) { - echo ''; + echo ''; } } + + /** + * PARSE + * Parses some CSS into an array + * CSSPARSER + * Copyright (C) 2009 Peter Kröner + */ + public static function parse_css( $css ) { + // Remove CSS-Comments. + $css = preg_replace( '/\/\*.*?\*\//ms', '', $css ); + // Remove HTML-Comments. + $css = preg_replace( '/([^\'"]+?)(\