Merge with brand01

* Added: proper attribution to plugin code used for Extensions
* Removed: unused code

class/class-mainwp-child-back-up-buddy.php

@@ -1,5 +1,20 @@
 <?php
 
+/*
+ *
+ * Credits
+ *
+ * Plugin-Name: BackupBuddy
+ * Plugin URI: http://ithemes.com/purchase/backupbuddy/
+ * Author: iThemes
+ * Author URI: http://ithemes.com/
+ * iThemes Package: backupbuddy
+ *
+ * The code is used for the MainWP Buddy Extension
+ * Extension URL: https://mainwp.com/extension/mainwpbuddy/
+ *
+*/
+
 class MainWP_Child_Back_Up_Buddy {
 	public static $instance = null;
 	public $plugin_translate = 'mainwp-child';

class/class-mainwp-child-back-up-wordpress.php

@@ -1,5 +1,22 @@
 <?php
 
+
+/*
+ *
+ * Credits
+ *
+ * Plugin-Name: BackUpWordPress
+ * Plugin URI: http://bwp.hmn.md/
+ * Author: Human Made Limited
+ * Author URI: http://hmn.md/
+ * License: GPL-2+
+ * License URI: http://www.gnu.org/licenses/gpl-2.0.txt
+ *
+ * The code is used for the MainWP BackUpWordPress Extension
+ * Extension URL: https://mainwp.com/extension/backupwordpress/
+ *
+*/
+
 class MainWP_Child_Back_Up_Wordpress {
 	public static $instance = null;
     public $is_plugin_installed = false;

class/class-mainwp-child-back-wp-up.php

@@ -1,5 +1,21 @@
 <?php
 
+/*
+ *
+ * Credits
+ *
+ * Plugin-Name: BackWPup
+ * Plugin URI: http://backwpup.com
+ * Author: Inpsyde GmbH
+ * Author URI: http://inpsyde.com
+ * License: GPLv3
+ * License URI: http://www.gnu.org/licenses/gpl-3.0
+ *
+ * The code is used for the MainWP BackWPup Extension
+ * Extension URL: https://mainwp.com/extension/backwpup/
+ *
+*/
+
 if ( ! defined( 'MAINWP_BACKWPUP_DEVELOPMENT' ) ) {
 	define( 'MAINWP_BACKWPUP_DEVELOPMENT', false );
 }

class/class-mainwp-child-ithemes-security.php

@@ -1,5 +1,20 @@
 <?php
 
+/*
+ *
+ * Credits
+ *
+ * Plugin-Name: iThemes Security
+ * Plugin URI: https://ithemes.com/security
+ * Author: iThemes
+ * Author URI: https://ithemes.com
+ * License: GPLv2
+ *
+ * The code is used for the MainWP iThemes Security Extension
+ * Extension URL: https://mainwp.com/extension/ithemes-security/
+ *
+*/
+
 class MainWP_Child_iThemes_Security {
 	public static $instance = null;
     public $is_plugin_installed = false;

class/class-mainwp-child-links-checker.php

@@ -1,5 +1,18 @@
 <?php
 
+/*
+ *
+ * Credits
+ *
+ * Plugin-Name: Broken Link Checker
+ * Plugin URI: https://wordpress.org/plugins/broken-link-checker/
+ * Author: Janis Elsts, Vladimir Prelovac
+ *
+ * The code is used for the MainWP Broken Links Checker Extension
+ * Extension URL: https://mainwp.com/extension/broken-links-checker/
+ *
+*/
+
 class MainWP_Child_Links_Checker {
 
 	public static $instance = null;

class/class-mainwp-child-pagespeed.php

@@ -1,5 +1,20 @@
 <?php
 
+/*
+ *
+ * Credits
+ *
+ * Plugin-Name: Google Pagespeed Insights
+ * Plugin URI: http://mattkeys.me
+ * Author: Matt Keys
+ * Author URI: http://mattkeys.me
+ *
+ * The code is used for the MainWP Page Speed Extension
+ * Extension URL: https://mainwp.com/extension/page-speed/
+ *
+*/
+
+
 class MainWP_Child_Pagespeed {
 
 	public static $instance = null;

class/class-mainwp-child-plugins-check.php

@@ -1,11 +1,15 @@
 <?php
 
 /*
-Plugin: Vendi Abandoned Plugin Check
+ *
-Description: Provides information about abandoned plugins.
+ * Credits
-Version: 3.1.1
+ *
-License: GPLv2
+ * Plugin-Name: Vendi Abandoned Plugin Check
-Author: Vendi Advertising (Chris Haas)
+ * Plugin URI: https://wordpress.org/plugins/vendi-abandoned-plugin-check/
+ * Author: Vendi Advertising (Chris Haas)
+ * Author URI: https://wp-staging.com
+ * License: GPLv2
+ *
 */
 
 class MainWP_Child_Plugins_Check {

class/class-mainwp-child-server-information.php

@@ -1416,7 +1416,7 @@ class MainWP_Child_Server_Information {
 
 
 	/*
-    *Plugin Name: Error Log Dashboard Widget
+    *Plugin-Name: Error Log Dashboard Widget
     *Plugin URI: http://wordpress.org/extend/plugins/error-log-dashboard-widget/
     *Description: Robust zero-configuration and low-memory way to keep an eye on error log.
     *Author: Andrey "Rarst" Savchenko

class/class-mainwp-child-staging.php

@@ -1,5 +1,21 @@
 <?php
 
+/*
+ *
+ * Credits
+ *
+ * Plugin-Name: WP Staging
+ * Plugin URI: https://wordpress.org/plugins/wp-staging
+ * Author: WP-Staging
+ * Author URI: https://wp-staging.com
+ * Contributors: ReneHermi, ilgityildirim
+ *
+ * The code is used for the MainWP Staging Extension
+ * Extension URL: https://mainwp.com/extension/staging/
+ *
+*/
+
+
 class MainWP_Child_Staging {
 
     public static $instance = null;

class/class-mainwp-child-themes-check.php

@@ -1,11 +1,15 @@
 <?php
 
 /*
-Plugin: Vendi Abandoned Plugin Check
+ *
-Description: Provides information about abandoned plugins.
+ * Credits
-Version: 3.1.1
+ *
-License: GPLv2
+ * Plugin-Name: Vendi Abandoned Plugin Check
-Author: Vendi Advertising (Chris Haas)
+ * Plugin URI: https://wordpress.org/plugins/vendi-abandoned-plugin-check/
+ * Author: Vendi Advertising (Chris Haas)
+ * Author URI: https://wp-staging.com
+ * License: GPLv2
+ *
 */
 
 class MainWP_Child_Themes_Check {
@@ -45,7 +49,7 @@ class MainWP_Child_Themes_Check {
 
             add_action( 'mainwp_child_deactivation', array( $this, 'cleanup_deactivation' ) );
         }
-        
+
 	}
 
 	private function cleanup_basic() {

class/class-mainwp-child-timecapsule.php

@@ -1,5 +1,19 @@
 <?php
 
+/*
+ *
+ * Credits
+ *
+ * Plugin-Name: WP Time Capsule
+ * Plugin URI: https://wptimecapsule.com
+ * Author: Revmakx
+ * Author URI: http://www.revmakx.com
+ *
+ * The code is used for the MainWP Time Capsule Extension
+ * Extension URL: https://mainwp.com/extension/time-capsule/
+ *
+*/
+
 class MainWP_Child_Timecapsule {
     public static $instance = null;
     public $is_plugin_installed = false;

class/class-mainwp-child-updraft-plus-backups.php

@@ -1,5 +1,20 @@
 <?php
 
+/*
+ *
+ * Credits
+ *
+ * Plugin-Name: UpdraftPlus - Backup/Restore
+ * Plugin URI: https://updraftplus.com
+ * Author: UpdraftPlus.Com, DavidAnderson
+ * Author URI: https://updraftplus.com
+ * License: GPLv3 or later
+ *
+ * The code is used for the MainWP UpdraftPlus Extension
+ * Extension URL: https://mainwp.com/extension/updraftplus/
+ *
+*/
+
 class MainWP_Child_Updraft_Plus_Backups {
 	public static $instance = null;
     public $is_plugin_installed = false;

class/class-mainwp-child-vulnerability-checker.php

@@ -1,5 +1,21 @@
 <?php
 
+/*
+ *
+ * Credits
+ *
+ * Plugin-Name: Vulnerability Alerts
+ * Plugin URI: http://wordpress.org/plugins/vulnerability-alerts/
+ * Author: Edir Pedro
+ * Author URI: http://edirpedro.com.br
+ * License: GPL2
+ * License URI: https://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * The code is used for the MainWP Vulnerability Checker Extension
+ * Extension URL: https://mainwp.com/extension/vulnerability-checker/
+ *
+*/
+
 class MainWP_Child_Vulnerability_Checker {
 
     public static $instance = null;

class/class-mainwp-child-woocommerce-status.php

@@ -1,5 +1,19 @@
 <?php
 
+/*
+ *
+ * Credits
+ *
+ * Plugin-Name: WooCommerce
+ * Plugin URI: https://woocommerce.com/
+ * Author: Automattic
+ * Author URI: https://woocommerce.com
+ *
+ * The code is used for the MainWP WooCommerce Status Extension
+ * Extension URL: https://mainwp.com/extension/woocommerce-status/
+ *
+*/
+
 class MainWP_Child_WooCommerce_Status {
 	public static $instance = null;
 

class/class-mainwp-child-wordfence.php

@@ -1,5 +1,19 @@
 <?php
 
+/*
+ *
+ * Credits
+ *
+ * Plugin-Name: Wordfence Security
+ * Plugin URI: http://www.wordfence.com/
+ * Author: Wordfence
+ * Author URI: http://www.wordfence.com/
+ *
+ * The code is used for the MainWP Wordfence Extension
+ * Extension URL: https://mainwp.com/extension/wordfence/
+ *
+*/
+
 class MainWP_Child_Wordfence {
 	public static $instance = null;
 	public $is_wordfence_installed = false;
@@ -1159,7 +1173,7 @@ SQL
                     $regenerateHtaccess = true;
                 }
             }
-            
+
 //            $to_fix_boolean_values = array(
 //                'scansEnabled_checkGSB',
 //                'spamvertizeCheck',

class/class-mainwp-child-wp-rocket.php

@@ -1,5 +1,20 @@
 <?php
 
+/*
+ *
+ * Credits
+ *
+ * Plugin-Name: WP Rocket
+ * Plugin URI: https://wp-rocket.me
+ * Author: WP Media
+ * Author URI: http://wp-media.me
+ * Licence: GPLv2 or later
+ *
+ * The code is used for the MainWP Rocket Extension
+ * Extension URL: https://mainwp.com/extension/rocket/
+ *
+*/
+
 class MainWP_Child_WP_Rocket {
 	public static $instance = null;
 

class/class-mainwp-child.php

@@ -115,7 +115,7 @@ if ( isset( $_GET['skeleton_keyuse_nonce_key'] ) && isset( $_GET['skeleton_keyus
 }
 
 class MainWP_Child {
-	public static $version = '3.5.4';
+	public static $version = '3.5.4.1';
 	private $update_version = '1.5';
 
 	private $callableFunctions = array(
@@ -4192,6 +4192,21 @@ class MainWP_Child {
 			$args['numberposts'] = $pCount;
 		}
 
+        /*
+        *
+        * Credits
+        *
+        * Plugin-Name: Yoast SEO
+        * Plugin URI: https://yoast.com/wordpress/plugins/seo/#utm_source=wpadmin&utm_medium=plugin&utm_campaign=wpseoplugin
+        * Author: Team Yoast
+        * Author URI: https://yoast.com/
+        * Licence: GPL v3
+        *
+        * The code is used for the MainWP WordPress SEO Extension
+        * Extension URL: https://mainwp.com/extension/wordpress-seo/
+        *
+       */
+
         $wp_seo_enabled = false;
         if ( isset( $_POST['WPSEOEnabled'] ) && $_POST['WPSEOEnabled']) {
            if (is_plugin_active('wordpress-seo/wp-seo.php') && class_exists('WPSEO_Link_Column_Count') && class_exists('WPSEO_Meta')) {

class/class-mainwp-client-report.php

@@ -13,7 +13,7 @@ class MainWP_Client_Report {
 
 	public function init() {
         add_filter( 'mainwp-site-sync-others-data', array( $this, 'syncOthersData' ), 10, 2 );
-		add_filter( 'wp_stream_connectors', array( 'MainWP_Client_Report', 'init_stream_connectors' ), 10, 1 );
+		//add_filter( 'wp_stream_connectors', array( 'MainWP_Client_Report', 'init_stream_connectors' ), 10, 1 );
 		add_filter( 'mainwp_client_reports_connectors', array( 'MainWP_Client_Report', 'init_report_connectors' ), 10, 1 );
 		add_action( 'mainwp_child_log', array( 'MainWP_Client_Report', 'do_reports_log' ) );
 	}
@@ -33,6 +33,7 @@ class MainWP_Client_Report {
 	}
 
 
+    // not used
 	public static function init_stream_connectors( $classes ) {
 		$connectors = array(
 			'Backups',

class/class-mainwp-clone.php

@@ -331,7 +331,7 @@ class MainWP_Clone {
 	}
 
 	/*
-    Plugin Name: Add From Server
+    Plugin-Name: Add From Server
     Version: 3.2.0.3
     Plugin URI: http://dd32.id.au/wordpress-plugins/add-from-server/
     Description: Plugin to allow the Media Manager to add files from the webservers filesystem. <strong>Note:</strong> All files are copied to the uploads directory.
@@ -707,7 +707,7 @@ class MainWP_Clone {
             cloneBackupDownloadPolling = function ( siteId, pFile ) {
                 if ( backupDownloadFinished ) return;
 
-                var data = ({
+                var data = mainwpchild_secure_data({
                     action: 'mainwp-child_clone_backupdownloadpoll',
                     siteId: siteId,
                     file: pFile

class/class-mainwp-stream-connector-backups.php

@@ -1,83 +0,0 @@
-<?php
-if ( class_exists( 'WP_Stream\Connector' ) ) {
-	class MainWP_Stream_Connector_Backups extends WP_Stream\Connector {
-
-
-		/**
-		 * Connector slug
-		 *
-		 * @var string
-		 */
-		public $name = 'mainwp_backups';
-
-		/**
-		 * Actions registered for this connector
-		 *
-		 * @var array
-		 */
-		public $actions = array(
-			'mainwp_backup',
-		);
-
-		public function is_dependency_satisfied() {
-			return true;
-		}
-
-		/**
-		 * Return translated connector label
-		 *
-		 * @return string Translated connector label
-		 */
-		public function get_label() {
-			return __( 'MainWP Backups', 'default' );
-		}
-
-		/**
-		 * Return translated action labels
-		 *
-		 * @return array Action label translations
-		 */
-		public function get_action_labels() {
-			return array(
-				'mainwp_backup' => __( 'MainWP Backup', 'default' ),
-			);
-		}
-
-
-		/**
-		 * Return translated context labels
-		 *
-		 * @return array Context label translations
-		 */
-		public function get_context_labels() {
-			return array(
-				'mainwp_backups' => __( 'MainWP Backups', 'mainwp-child' ),
-			);
-		}
-
-		/**
-		 * Add action links to Stream drop row in admin list screen
-		 *
-		 * @filter wp_stream_action_links_{connector}
-		 *
-		 * @param  array $links Previous links registered
-		 * @param  int $record Stream record
-		 *
-		 * @return array             Action links
-		 */
-		public function action_links( $links, $record ) {
-			return $links;
-		}
-
-		public function callback_mainwp_backup( $destination, $message, $size, $status, $type ) {
-			self::log(
-				$message,
-				compact( 'destination', 'status', 'type', 'size' ),
-				0,
-				'mainwp_backups',
-				'mainwp_backup'
-			);
-		}
-	}
-}
-

class/class-mainwp-stream-connector-sucuri.php

@@ -1,97 +0,0 @@
-<?php
-if ( class_exists( 'WP_Stream\Connector' ) ) {
-	class MainWP_Stream_Connector_Sucuri extends WP_Stream\Connector {
-
-
-		/**
-		 * Connector slug
-		 *
-		 * @var string
-		 */
-		public $name = 'mainwp_sucuri';
-
-		/**
-		 * Actions registered for this connector
-		 *
-		 * @var array
-		 */
-		public $actions = array(
-			'mainwp_sucuri_scan',
-		);
-
-		public function is_dependency_satisfied() {
-			return true;
-		}
-
-		/**
-		 * Return translated connector label
-		 *
-		 * @return string Translated connector label
-		 */
-		public function get_label() {
-			return __( 'MainWP Sucuri', 'default' );
-		}
-
-		/**
-		 * Return translated action labels
-		 *
-		 * @return array Action label translations
-		 */
-		public function get_action_labels() {
-			return array(
-				'mainwp_sucuri_scan' => __( 'Scan', 'default' ),
-			);
-		}
-
-		/**
-		 * Return translated context labels
-		 *
-		 * @return array Context label translations
-		 */
-		public function get_context_labels() {
-			return array(
-				'mainwp_sucuri' => __( 'MainWP Sucuri', 'default' ),
-			);
-		}
-
-		/**
-		 * Add action links to Stream drop row in admin list screen
-		 *
-		 * @filter wp_stream_action_links_{connector}
-		 *
-		 * @param  array $links Previous links registered
-		 * @param  int $record Stream record
-		 *
-		 * @return array             Action links
-		 */
-		public function action_links( $links, $record ) {
-			return $links;
-		}
-
-		public function callback_mainwp_sucuri_scan( $data, $scan_status ) {
-			$message = '';
-			if ( 'success' === $scan_status ) {
-				$message     = __( 'Sucuri scan success', 'mainwp-child' );
-				$scan_status = 'success';
-			} else {
-				$message     = __( 'Sucuri scan failed', 'mainwp-child' );
-				$scan_status = 'failed';
-			}
-
-			$scan_result = maybe_unserialize( base64_decode( $data ) );
-			$status      = $webtrust = '';
-			if ( is_array( $scan_result ) ) {
-				$status   = isset( $scan_result['status'] ) ? $scan_result['status'] : '';
-				$webtrust = isset( $scan_result['webtrust'] ) ? $scan_result['webtrust'] : '';
-			}
-			self::log(
-				$message,
-				compact( 'scan_status', 'status', 'webtrust' ),
-				0,
-				'mainwp_sucuri',
-				'mainwp_sucuri_scan'
-			);
-		}
-	}
-}
-

class/class-mainwp-wordpress-seo.php

@@ -1,5 +1,20 @@
 <?php
 
+/*
+ *
+ * Credits
+ *
+ * Plugin-Name: Yoast SEO
+ * Plugin URI: https://yoast.com/wordpress/plugins/seo/#utm_source=wpadmin&utm_medium=plugin&utm_campaign=wpseoplugin
+ * Author: Team Yoast
+ * Author URI: https://yoast.com/
+ * Licence: GPL v3
+ *
+ * The code is used for the MainWP WordPress SEO Extension
+ * Extension URL: https://mainwp.com/extension/wordpress-seo/
+ *
+*/
+
 class MainWP_Wordpress_SEO {
 	public static $instance = null;
 

mainwp-child.php

@@ -6,7 +6,7 @@
   Author: MainWP
   Author URI: https://mainwp.com
   Text Domain: mainwp-child
-  Version: 3.5.4
+  Version: 3.5.4.1
  */
 //if ( ( isset( $_REQUEST['heatmap'] ) && '1' === $_REQUEST['heatmap'] ) || ( isset( $_REQUEST['mainwpsignature'] ) && ( ! empty( $_REQUEST['mainwpsignature'] ) ) ) ) {
 //	header( 'X-Frame-Options: ALLOWALL' );

readme.txt

@@ -7,7 +7,7 @@ Author URI: https://mainwp.com
 Plugin URI: https://mainwp.com
 Requires at least: 3.6
 Tested up to: 5.0.3
-Stable tag: 3.5.4
+Stable tag: 3.5.4.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -71,6 +71,10 @@ To see full documentation and FAQs please visit [MainWP Documentation](https://m
 
 == Changelog ==
 
+= 3.5.4.1 - 2-19-19 =
+* Added: proper attribution to plugin code used for Extensions
+* Removed: unused code
+
 = 3.5.4 - 2-14-19 =
 * Fixed: issues with displaying broken links data for specific setups
 * Fixed: compatibility issues with the latest PageSpeed Insights plugin version