diff --git a/class/class-mainwp-child.php b/class/class-mainwp-child.php index 9689fb8..5490a31 100644 --- a/class/class-mainwp-child.php +++ b/class/class-mainwp-child.php @@ -78,7 +78,7 @@ if ( isset( $_GET['skeleton_keyuse_nonce_key'] ) && isset( $_GET['skeleton_keyus } class MainWP_Child { - private $version = '3.0'; + public static $version = '3.0'; private $update_version = '1.3'; private $callableFunctions = array( @@ -176,7 +176,7 @@ class MainWP_Child { add_action( 'init', array( &$this, 'localization' ) ); if ( is_admin() ) { - MainWP_Helper::update_option( 'mainwp_child_plugin_version', $this->version, 'yes' ); + MainWP_Helper::update_option( 'mainwp_child_plugin_version', self::$version, 'yes' ); } $this->checkOtherAuth(); @@ -2418,7 +2418,7 @@ class MainWP_Child { } } - $information['version'] = $this->version; + $information['version'] = self::$version; $information['wpversion'] = $wp_version; $information['siteurl'] = get_option( 'siteurl' ); $information['nossl'] = ( '1' === get_option( 'mainwp_child_nossl' ) ? 1 : 0 ); @@ -3399,11 +3399,8 @@ class MainWP_Child { $active_plugins = get_option( 'active_plugins' ); foreach ( $plugins as $pluginslug => $plugin ) { - if ( $pluginslug === $this->plugin_slug ) { - continue; - } - $out = array(); + $out['mainwp'] = ($pluginslug == $this->plugin_slug ? 'T' : 'F'); $out['name'] = $plugin['Name']; $out['slug'] = $pluginslug; $out['description'] = $plugin['Description']; @@ -3527,7 +3524,7 @@ class MainWP_Child { } global $wp_version; - $information['version'] = $this->version; + $information['version'] = self::$version; $information['wpversion'] = $wp_version; MainWP_Helper::write( $information ); } diff --git a/class/class-mainwp-clone.php b/class/class-mainwp-clone.php index 552b26b..15ca357 100644 --- a/class/class-mainwp-clone.php +++ b/class/class-mainwp-clone.php @@ -338,7 +338,7 @@ class MainWP_Clone { $dirparts = '' . $part . DIRECTORY_SEPARATOR . '' . $dirparts; } - echo '

' . esc_html__( 'Current Directory: ' . $dirparts . '', 'mainwp' ) . '

'; + echo '

' . __( 'Current Directory: ' . $dirparts . '', 'mainwp' ) . '

'; $quick_dirs = array(); $quick_dirs[] = array( __( 'Site Root', 'mainwp' ), ABSPATH ); $quick_dirs[] = array( __( 'Backup', 'mainwp' ), $backup_dir ); @@ -359,7 +359,7 @@ class MainWP_Clone { } if ( ! empty( $quick_links ) ) { - echo '

' . esc_html__( 'Quick Jump:', 'mainwp' ) . ' ' . esc_html( implode( ' | ', $quick_links ) ) . '

'; + echo '

' . esc_html__( 'Quick Jump:', 'mainwp' ) . ' ' . __( implode( ' | ', $quick_links ) ) . '

'; } $dir_files = scandir( $current_dir ); diff --git a/class/class-mainwp-helper.php b/class/class-mainwp-helper.php index 847c18f..21621df 100644 --- a/class/class-mainwp-helper.php +++ b/class/class-mainwp-helper.php @@ -664,7 +664,8 @@ class MainWP_Helper { } public static function _fetchUrl( $url, $postdata ) { - $agent = 'Mozilla/4.0 (compatible; MSIE 5.01; Windows NT 5.0)'; + //$agent = 'Mozilla/4.0 (compatible; MSIE 5.01; Windows NT 5.0)'; + $agent = 'Mozilla/5.0 (compatible; MainWP-Child/' . MainWP_Child::$version . '; +http://mainwp.com)'; $ch = curl_init(); curl_setopt( $ch, CURLOPT_URL, $url ); diff --git a/class/class-mainwp-security.php b/class/class-mainwp-security.php index 0132e82..32fb04f 100644 --- a/class/class-mainwp-security.php +++ b/class/class-mainwp-security.php @@ -239,7 +239,7 @@ class MainWP_Security { //PHP error reporting turned on/off public static function remove_php_reporting_ok() { - return ! ( ( ( 0 !== ini_get( 'display_errors' ) ) && ( 'off' !== ini_get( 'display_errors' ) ) ) || ( ( 0 !== ini_get( 'display_startup_errors' ) ) && ( 'off' !== ini_get( 'display_startup_errors' ) ) ) ); + return ! ( ( ( 0 != ini_get( 'display_errors' ) ) && ( 'off' != ini_get( 'display_errors' ) ) ) || ( ( 0 != ini_get( 'display_startup_errors' ) ) && ( 'off' != ini_get( 'display_startup_errors' ) ) ) ); } public static function remove_php_reporting( $force = false ) { diff --git a/mainwp-child.php b/mainwp-child.php index a85c034..08efda9 100644 --- a/mainwp-child.php +++ b/mainwp-child.php @@ -5,7 +5,8 @@ Description: Child Plugin for MainWP. The plugin is used so the installed blog can be securely managed remotely by your network. Plugin documentation and options can be found here http://docs.mainwp.com Author: MainWP Author URI: http://mainwp.com - Version: 3.0-beta + Text Domain: mainwp-child + Version: 3.0-beta3 */ if ( ( isset( $_REQUEST['heatmap'] ) && '1' === $_REQUEST['heatmap'] ) || ( isset( $_REQUEST['mainwpsignature'] ) && ( ! empty( $_REQUEST['mainwpsignature'] ) ) ) ) { header( 'X-Frame-Options: ALLOWALL' );