MainWP Child - Version 3.5.2

Version Description

  • 11-27-18 =
  • Fixed: an issue with detecting updates when a custom branding is applied
  • Fixed: an issue with passing WebDav remote storage info for the UpdraftPlus Extension
  • Fixed: an issue with grabbing fresh child site favicons
  • Updated: process to skip WooCommerce order notes in the comments section for Client Reports
Download this release

Release Info

Developer mainwp
Plugin Icon 128x128 MainWP Child
Version 3.5.2
Comparing to
See all releases

Code changes from version 3.5.1 to 3.5.2

Files changed (7) hide show
  1. class/class-mainwp-child-branding.php +12 -12
  2. class/class-mainwp-child-server-information.php +11 -11
  3. class/class-mainwp-child-updraft-plus-backups.php +12 -1
  4. class/class-mainwp-child.php +13 -4
  5. class/class-mainwp-client-report.php +13 -1
  6. mainwp-child.php +1 -1
  7. readme.txt +7 -1
class/class-mainwp-child-branding.php CHANGED
@@ -277,9 +277,9 @@ class MainWP_Child_Branding {
277
  // enable branding in case child plugin is deactive
278
  add_filter( 'all_plugins', array( $this, 'branding_child_plugin' ) );
279
 
280
- if ( self::is_branding() ) {
281
- add_filter( 'site_transient_update_plugins', array( &$this, 'remove_update_nag' ) );
282
- }
283
 
284
  if ( get_option( 'mainwp_branding_ext_enabled' ) !== 'Y' ) {
285
  return;
@@ -894,15 +894,15 @@ class MainWP_Child_Branding {
894
  }
895
  }
896
 
897
- function remove_update_nag( $value ) {
898
- if ( isset( $_POST['mainwpsignature'] ) ) {
899
- return $value;
900
- }
901
- if ( isset( $value->response['mainwp-child/mainwp-child.php'] ) ) {
902
- unset( $value->response['mainwp-child/mainwp-child.php'] );
903
- }
904
- return $value;
905
- }
906
 
907
  public function update_child_header( $plugins, $header ) {
908
  $plugin_key = '';
277
  // enable branding in case child plugin is deactive
278
  add_filter( 'all_plugins', array( $this, 'branding_child_plugin' ) );
279
 
280
+ // if ( self::is_branding() ) {
281
+ // add_filter( 'site_transient_update_plugins', array( &$this, 'remove_update_nag' ) );
282
+ // }
283
 
284
  if ( get_option( 'mainwp_branding_ext_enabled' ) !== 'Y' ) {
285
  return;
894
  }
895
  }
896
 
897
+ // function remove_update_nag( $value ) {
898
+ // if ( isset( $_POST['mainwpsignature'] ) ) {
899
+ // return $value;
900
+ // }
901
+ // if ( isset( $value->response['mainwp-child/mainwp-child.php'] ) ) {
902
+ // unset( $value->response['mainwp-child/mainwp-child.php'] );
903
+ // }
904
+ // return $value;
905
+ // }
906
 
907
  public function update_child_header( $plugins, $header ) {
908
  $plugin_key = '';
class/class-mainwp-child-server-information.php CHANGED
@@ -22,9 +22,9 @@ class MainWP_Child_Server_Information {
22
  if (isset($_POST['warnings']))
23
  $warnings = intval($_POST['warnings']);
24
  else
25
- $warnings = self::getWarnings();
26
  $dismissWarnings['warnings'] = $warnings;
27
- }
28
  MainWP_Helper::update_option( 'mainwp_child_dismiss_warnings', $dismissWarnings );
29
  }
30
  }
@@ -1123,7 +1123,7 @@ class MainWP_Child_Server_Information {
1123
  }
1124
 
1125
  protected static function getSSLWarning() {
1126
- $conf = array( 'private_key_bits' => 384 );
1127
  $str = '';
1128
  if ( function_exists( 'openssl_pkey_new' ) ) {
1129
  $res = @openssl_pkey_new( $conf );
@@ -1618,20 +1618,20 @@ class MainWP_Child_Server_Information {
1618
  </div>
1619
  <?php
1620
  }
1621
-
1622
  public static function renderConnectionDetails() {
1623
  $branding_title = 'MainWP';
1624
  if ( MainWP_Child_Branding::is_branding() ) {
1625
  $branding_title = MainWP_Child_Branding::get_branding();
1626
  }
1627
-
1628
  global $current_user;
1629
  $uniqueId = get_option('mainwp_child_uniqueId');
1630
  $details = array(
1631
  'siteurl' => array(
1632
  'title' => __('Site URL', 'mainwp-child'),
1633
  'value' => get_bloginfo( 'url' ),
1634
- 'desc' => get_bloginfo( 'url' )
1635
  ),
1636
  'adminuser' => array(
1637
  'title' => __('Administrator name', 'mainwp-child'),
@@ -1656,7 +1656,7 @@ class MainWP_Child_Server_Information {
1656
  'ssl_version' => array(
1657
  'title' => __('SSL version', 'mainwp-child'),
1658
  'value' => __('Auto Detect', 'mainwp-child'),
1659
- 'desc' => __('Auto Detect', 'mainwp-child'),
1660
  ),
1661
 
1662
  );
@@ -1671,7 +1671,7 @@ class MainWP_Child_Server_Information {
1671
  </div>
1672
  <table id="mainwp-table" class="wp-list-table widefat" cellspacing="0" style="border: 0">
1673
  <tbody>
1674
- <?php
1675
  foreach ($details as $row) {
1676
  ?>
1677
  <tr>
@@ -1680,13 +1680,13 @@ class MainWP_Child_Server_Information {
1680
  <td><?php echo $row['desc']; ?></td>
1681
  </tr>
1682
  <?php
1683
- }
1684
- ?>
1685
  </tbody>
1686
  </table>
1687
  </div>
1688
  </div>
1689
  <?php
1690
  }
1691
-
1692
  }
22
  if (isset($_POST['warnings']))
23
  $warnings = intval($_POST['warnings']);
24
  else
25
+ $warnings = self::getWarnings();
26
  $dismissWarnings['warnings'] = $warnings;
27
+ }
28
  MainWP_Helper::update_option( 'mainwp_child_dismiss_warnings', $dismissWarnings );
29
  }
30
  }
1123
  }
1124
 
1125
  protected static function getSSLWarning() {
1126
+ $conf = array( 'private_key_bits' => 2048 );
1127
  $str = '';
1128
  if ( function_exists( 'openssl_pkey_new' ) ) {
1129
  $res = @openssl_pkey_new( $conf );
1618
  </div>
1619
  <?php
1620
  }
1621
+
1622
  public static function renderConnectionDetails() {
1623
  $branding_title = 'MainWP';
1624
  if ( MainWP_Child_Branding::is_branding() ) {
1625
  $branding_title = MainWP_Child_Branding::get_branding();
1626
  }
1627
+
1628
  global $current_user;
1629
  $uniqueId = get_option('mainwp_child_uniqueId');
1630
  $details = array(
1631
  'siteurl' => array(
1632
  'title' => __('Site URL', 'mainwp-child'),
1633
  'value' => get_bloginfo( 'url' ),
1634
+ 'desc' => get_bloginfo( 'url' )
1635
  ),
1636
  'adminuser' => array(
1637
  'title' => __('Administrator name', 'mainwp-child'),
1656
  'ssl_version' => array(
1657
  'title' => __('SSL version', 'mainwp-child'),
1658
  'value' => __('Auto Detect', 'mainwp-child'),
1659
+ 'desc' => __('Auto Detect', 'mainwp-child'),
1660
  ),
1661
 
1662
  );
1671
  </div>
1672
  <table id="mainwp-table" class="wp-list-table widefat" cellspacing="0" style="border: 0">
1673
  <tbody>
1674
+ <?php
1675
  foreach ($details as $row) {
1676
  ?>
1677
  <tr>
1680
  <td><?php echo $row['desc']; ?></td>
1681
  </tr>
1682
  <?php
1683
+ }
1684
+ ?>
1685
  </tbody>
1686
  </table>
1687
  </div>
1688
  </div>
1689
  <?php
1690
  }
1691
+
1692
  }
class/class-mainwp-child-updraft-plus-backups.php CHANGED
@@ -593,7 +593,18 @@ class MainWP_Child_Updraft_Plus_Backups {
593
  }
594
  }
595
  UpdraftPlus_Options::update_updraft_option( 'updraft_sftp', $opts );
596
- } else if ( 'updraft_backblaze' === $key ) {
 
 
 
 
 
 
 
 
 
 
 
597
  $opts = UpdraftPlus_Options::get_updraft_option( 'updraft_backblaze' );
598
  if (!is_array($opts))
599
  $opts = array();
593
  }
594
  }
595
  UpdraftPlus_Options::update_updraft_option( 'updraft_sftp', $opts );
596
+ } else if ('updraft_webdav_settings' == $key) {
597
+ $opts = UpdraftPlus_Options::get_updraft_option( 'updraft_webdav' );
598
+ if (!is_array($opts))
599
+ $opts = array();
600
+
601
+ if(is_array($opts) && isset($opts['settings'])) {
602
+ $settings_key = key($opts['settings']);
603
+ $opts['settings'][$settings_key]['url'] = $settings[ $key ]['url'];
604
+ UpdraftPlus_Options::update_updraft_option( 'updraft_webdav', $opts );
605
+ }
606
+
607
+ } else if ( 'updraft_backblaze' === $key ) {
608
  $opts = UpdraftPlus_Options::get_updraft_option( 'updraft_backblaze' );
609
  if (!is_array($opts))
610
  $opts = array();
class/class-mainwp-child.php CHANGED
@@ -107,7 +107,7 @@ if ( isset( $_GET['skeleton_keyuse_nonce_key'] ) && isset( $_GET['skeleton_keyus
107
  }
108
 
109
  class MainWP_Child {
110
- public static $version = '3.5';
111
  private $update_version = '1.3';
112
 
113
  private $callableFunctions = array(
@@ -176,7 +176,8 @@ class MainWP_Child {
176
  'wp_staging' => 'wp_staging',
177
  'disconnect' => 'disconnect',
178
  'time_capsule' => 'time_capsule',
179
- 'extra_excution' => 'extra_execution',
 
180
  );
181
 
182
  private $FTP_ERROR = 'Failed! Please, add FTP details for automatic updates.';
@@ -3843,8 +3844,16 @@ class MainWP_Child {
3843
  }
3844
 
3845
  if ( !empty( $favi ) ){
3846
- if ( false === strpos( $favi, 'http' ) ) {
3847
- $favi_url = $site_url . $favi;
 
 
 
 
 
 
 
 
3848
  } else {
3849
  $favi_url = $favi;
3850
  }
107
  }
108
 
109
  class MainWP_Child {
110
+ public static $version = '3.5.2';
111
  private $update_version = '1.3';
112
 
113
  private $callableFunctions = array(
176
  'wp_staging' => 'wp_staging',
177
  'disconnect' => 'disconnect',
178
  'time_capsule' => 'time_capsule',
179
+ 'extra_excution' => 'extra_execution', // deprecated
180
+ 'extra_execution' => 'extra_execution',
181
  );
182
 
183
  private $FTP_ERROR = 'Failed! Please, add FTP details for automatic updates.';
3844
  }
3845
 
3846
  if ( !empty( $favi ) ){
3847
+ if ( false === strpos( $favi, 'http' )) {
3848
+ if (0 === strpos( $favi, '//' )) {
3849
+ if (0 === strpos( $site_url, 'https' )) {
3850
+ $favi_url = 'https:' . $favi;
3851
+ } else {
3852
+ $favi_url = 'http:' . $favi;
3853
+ }
3854
+ } else {
3855
+ $favi_url = $site_url . $favi;
3856
+ }
3857
  } else {
3858
  $favi_url = $favi;
3859
  }
class/class-mainwp-client-report.php CHANGED
@@ -576,6 +576,18 @@ class MainWP_Client_Report {
576
  }
577
  }
578
 
 
 
 
 
 
 
 
 
 
 
 
 
579
  $token_values = array();
580
 
581
  foreach ( $tokens as $token ) {
@@ -757,7 +769,7 @@ class MainWP_Client_Report {
757
  $value = $value['agent'];
758
  }
759
  }
760
-
761
  if (!is_string($value)) {
762
  $value = '';
763
  }
576
  }
577
  }
578
 
579
+ // to avoid WC order_note, action_log
580
+ if ( 'comments' === $context ) {
581
+ if ( isset( $record->meta ) ) {
582
+ if ( isset( $record->meta[ 'comment_type' ] ) && is_array($record->meta[ 'comment_type' ])) {
583
+ $cmtype = current($record->meta[ 'comment_type' ]);
584
+ if ( $cmtype == 'order_note' || $cmtype == 'action_log') {
585
+ continue;
586
+ }
587
+ }
588
+ }
589
+ }
590
+
591
  $token_values = array();
592
 
593
  foreach ( $tokens as $token ) {
769
  $value = $value['agent'];
770
  }
771
  }
772
+
773
  if (!is_string($value)) {
774
  $value = '';
775
  }
mainwp-child.php CHANGED
@@ -6,7 +6,7 @@
6
  Author: MainWP
7
  Author URI: https://mainwp.com
8
  Text Domain: mainwp-child
9
- Version: 3.5.1
10
  */
11
  if ( ( isset( $_REQUEST['heatmap'] ) && '1' === $_REQUEST['heatmap'] ) || ( isset( $_REQUEST['mainwpsignature'] ) && ( ! empty( $_REQUEST['mainwpsignature'] ) ) ) ) {
12
  header( 'X-Frame-Options: ALLOWALL' );
6
  Author: MainWP
7
  Author URI: https://mainwp.com
8
  Text Domain: mainwp-child
9
+ Version: 3.5.2
10
  */
11
  if ( ( isset( $_REQUEST['heatmap'] ) && '1' === $_REQUEST['heatmap'] ) || ( isset( $_REQUEST['mainwpsignature'] ) && ( ! empty( $_REQUEST['mainwpsignature'] ) ) ) ) {
12
  header( 'X-Frame-Options: ALLOWALL' );
readme.txt CHANGED
@@ -7,7 +7,7 @@ Author URI: https://mainwp.com
7
  Plugin URI: https://mainwp.com
8
  Requires at least: 3.6
9
  Tested up to: 5.0
10
- Stable tag: 3.5.1
11
  License: GPLv2 or later
12
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
13
 
@@ -71,6 +71,12 @@ To see full documentation and FAQs please visit [MainWP Documentation](https://m
71
 
72
  == Changelog ==
73
 
 
 
 
 
 
 
74
  = 3.5.1 - 11-14-18 =
75
  * Fixed: an issue with detecting the Wordfence status info
76
  * Fixed: an issue with loading UpdraftPlus existing backups
7
  Plugin URI: https://mainwp.com
8
  Requires at least: 3.6
9
  Tested up to: 5.0
10
+ Stable tag: 3.5.2
11
  License: GPLv2 or later
12
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
13
 
71
 
72
  == Changelog ==
73
 
74
+ = 3.5.2 - 11-27-18 =
75
+ * Fixed: an issue with detecting updates when a custom branding is applied
76
+ * Fixed: an issue with passing WebDav remote storage info for the UpdraftPlus Extension
77
+ * Fixed: an issue with grabbing fresh child site favicons
78
+ * Updated: process to skip WooCommerce order notes in the comments section for Client Reports
79
+
80
  = 3.5.1 - 11-14-18 =
81
  * Fixed: an issue with detecting the Wordfence status info
82
  * Fixed: an issue with loading UpdraftPlus existing backups