mainwp/mainwp-child
1
0
Fork 0
mirror of https://github.com/mainwp/mainwp-child.git synced 2025-09-05 09:19:53 +08:00
Code Issues Projects Packages Wiki Activity Actions

merge with branch1 + new debugging options

Browse source
This commit is contained in:
ruben- 2016-03-15 20:54:21 +01:00
parent 6061f9fe7a
commit 34bbc48589
9 changed files with 426 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

4
class/class-mainwp-child-back-wp-up.php
View file

@ -178,12 +178,12 @@ class MainWP_Child_Back_WP_Up {
}
public function init() {
add_action('mainwp_child_site_stats', array($this, 'do_site_stats'));
if ( get_option( 'mainwp_backwpup_ext_enabled' ) !== 'Y' ) {
return;
}
add_action( 'mainwp_child_site_stats', array( $this, 'do_site_stats' ) );
if ( get_option( 'mainwp_backwpup_hide_plugin' ) === 'hide' ) {
add_filter( 'all_plugins', array( $this, 'all_plugins' ) );
add_action( 'admin_menu', array( $this, 'remove_menu' ) );

23
class/class-mainwp-child-server-information.php
View file

@ -533,10 +533,10 @@ class MainWP_Child_Server_Information {
if ( ! self::check( '>=', '30', 'getMaxExecutionTime', '=', '0' ) ) {
$i ++;
}
if ( ! self::check( '>=', '2M', 'getUploadMaxFilesize' ) ) {
if ( ! self::check( '>=', '2M', 'getUploadMaxFilesize', null, null, true ) ) {
$i ++;
}
if ( ! self::check( '>=', '2M', 'getPostMaxSize' ) ) {
if ( ! self::check( '>=', '2M', 'getPostMaxSize', null, null, true ) ) {
$i ++;
}
if ( ! self::check( '>=', '10000', 'getOutputBufferSize' ) ) {
@ -1158,7 +1158,7 @@ class MainWP_Child_Server_Information {
return true;
}
protected static function renderRow( $pConfig, $pCompare, $pVersion, $pGetter, $pExtraText = '', $pExtraCompare = null, $pExtraVersion = null, $compareFilesize = false ) {
protected static function renderRow( $pConfig, $pCompare, $pVersion, $pGetter, $pExtraText = '', $pExtraCompare = null, $pExtraVersion = null, $sizeCompare = false ) {
$currentVersion = call_user_func( array( 'MainWP_Child_Server_Information', $pGetter ) );
?>
@ -1167,11 +1167,7 @@ class MainWP_Child_Server_Information {
<td><?php echo esc_html( esc_html( $pConfig ) ); ?></td>
<td><?php echo esc_html( esc_html( $pCompare ) ); ?><?php echo esc_html( ( true === $pVersion ? 'true' : $pVersion ) . ' ' . $pExtraText ); ?></td>
<td><?php echo esc_html( true === $currentVersion ? 'true' : $currentVersion ); ?></td>
<?php if ( $compareFilesize ) { ?>
<td><?php echo ( self::filesize_compare( $currentVersion, $pVersion, $pCompare ) ? '<span class="mainwp-pass"><i class="fa fa-check-circle"></i> Pass</span>' : '<span class="mainwp-warning"><i class="fa fa-exclamation-circle"></i> Warning</span>' ); ?></td>
<?php } else { ?>
<td><?php echo ( self::check( $pCompare, $pVersion, $pGetter, $pExtraCompare, $pExtraVersion ) ? '<span class="mainwp-pass"><i class="fa fa-check-circle"></i> Pass</span>' : '<span class="mainwp-warning"><i class="fa fa-exclamation-circle"></i> Warning</span>' ); ?></td>
<?php } ?>
<td><?php echo ( self::check( $pCompare, $pVersion, $pGetter, $pExtraCompare, $pExtraVersion, $sizeCompare ) ? '<span class="mainwp-pass"><i class="fa fa-check-circle"></i> Pass</span>' : '<span class="mainwp-warning"><i class="fa fa-exclamation-circle"></i> Warning</span>' ); ?></td>
</tr>
<?php
}
@ -1223,10 +1219,14 @@ class MainWP_Child_Server_Information {
return version_compare( $value1, $value2, $operator );
}
protected static function check( $pCompare, $pVersion, $pGetter, $pExtraCompare = null, $pExtraVersion = null ) {
protected static function check( $pCompare, $pVersion, $pGetter, $pExtraCompare = null, $pExtraVersion = null, $sizeCompare = false) {
$currentVersion = call_user_func( array( 'MainWP_Child_Server_Information', $pGetter ) );
return ( version_compare( $currentVersion, $pVersion, $pCompare ) || ( ( null !== $pExtraCompare ) && version_compare( $currentVersion, $pExtraVersion, $pExtraCompare ) ) );
if ($sizeCompare) {
return self::filesize_compare( $currentVersion, $pVersion, $pCompare );
} else {
return ( version_compare( $currentVersion, $pVersion, $pCompare ) || ( ( null !== $pExtraCompare ) && version_compare( $currentVersion, $pExtraVersion, $pExtraCompare ) ) );
}
}
protected static function getZipArchiveEnabled() {
@ -1734,5 +1734,4 @@ class MainWP_Child_Server_Information {
</div>
<?php
}
}
}

305
class/class-mainwp-child-wordfence.php
View file

@ -3,6 +3,8 @@
class MainWP_Child_Wordfence {
public static $instance = null;
private static $wfLog = false;
public $is_wordfence_installed = false;
public $plugin_translate = 'mainwp-child';
public static $options_filter = array(
'alertEmails',
@ -111,6 +113,18 @@ class MainWP_Child_Wordfence {
public function __construct() {
add_action( 'mainwp_child_deactivation', array( $this, 'deactivation' ) );
require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
if ( is_plugin_active( 'wordfence/wordfence.php' ) && file_exists( plugin_dir_path( __FILE__ ) . '../../wordfence/wordfence.php' ) ) {
require_once( plugin_dir_path( __FILE__ ) . '../../wordfence/wordfence.php' );
$this->is_wordfence_installed = true;
}
if ( $this->is_wordfence_installed ) {
add_action( 'wp_ajax_mainwp_wordfence_download_htaccess', array( $this, 'downloadHtaccess' ) );
}
}
public function deactivation() {
@ -122,6 +136,11 @@ class MainWP_Child_Wordfence {
public function action() {
$information = array();
if ( ! $this->is_wordfence_installed ) {
MainWP_Helper::write( array( 'error' => __( 'Please install Wordfence plugin on child website', $this->plugin_translate ) ) );
return;
}
if ( ! class_exists( 'wordfence' ) || ! class_exists( 'wfScanEngine' ) ) {
$information['error'] = 'NO_WORDFENCE';
MainWP_Helper::write( $information );
@ -192,6 +211,30 @@ class MainWP_Child_Wordfence {
case "export_settings":
$information = $this->export_settings();
break;
case "save_cache_config":
$information = $this->saveCacheConfig();
break;
case "check_falcon_htaccess":
$information = $this->checkFalconHtaccess();
break;
case "save_cache_options":
$information = $this->saveCacheOptions();
break;
case "clear_page_cache":
$information = $this->clearPageCache();
break;
case "get_cache_stats":
$information = $this->getCacheStats();
break;
case "add_cache_exclusion":
$information = $this->addCacheExclusion();
break;
case "load_cache_exclusions":
$information = $this->loadCacheExclusions();
break;
case "remove_cache_exclusion":
$information = $this->removeCacheExclusion();
break;
}
}
MainWP_Helper::write( $information );
@ -873,5 +916,265 @@ class MainWP_Child_Wordfence {
return $return;
}
}
public static function saveCacheConfig(){
$noEditHtaccess = '1';
if (isset($_POST['needToCheckFalconHtaccess']) && !empty($_POST['needToCheckFalconHtaccess'])) {
$checkHtaccess = self::checkFalconHtaccess();
if (isset($checkHtaccess['ok']))
$noEditHtaccess = '0';
} else if (isset($_POST['noEditHtaccess'])) {
$noEditHtaccess = $_POST['noEditHtaccess'];
}
$cacheType = $_POST['cacheType'];
if($cacheType == 'falcon' || $cacheType == 'php'){
$plugins = get_plugins();
$badPlugins = array();
foreach($plugins as $pluginFile => $data){
if(is_plugin_active($pluginFile)){
if($pluginFile == 'w3-total-cache/w3-total-cache.php'){
$badPlugins[] = "W3 Total Cache";
} else if($pluginFile == 'quick-cache/quick-cache.php'){
$badPlugins[] = "Quick Cache";
} else if($pluginFile == "wp-super-cache/wp-cache.php"){
$badPlugins[] = "WP Super Cache";
} else if($pluginFile == "wp-fast-cache/wp-fast-cache.php"){
$badPlugins[] = "WP Fast Cache";
} else if($pluginFile == "wp-fastest-cache/wpFastestCache.php"){
$badPlugins[] = "WP Fastest Cache";
}
}
}
if(count($badPlugins) > 0){
return array('errorMsg' => "You can not enable caching in Wordfence with other caching plugins enabled. This may cause conflicts. You need to disable other caching plugins first. Wordfence caching is very fast and does not require other caching plugins to be active. The plugins you have that conflict are: " . implode(', ', $badPlugins) . ". Disable these plugins, then return to this page and enable Wordfence caching.");
}
$siteURL = site_url();
if(preg_match('/^https?:\/\/[^\/]+\/[^\/]+\/[^\/]+\/.+/i', $siteURL)){
return array('errorMsg' => "Wordfence caching currently does not support sites that are installed in a subdirectory and have a home page that is more than 2 directory levels deep. e.g. we don't support sites who's home page is http://example.com/levelOne/levelTwo/levelThree");
}
}
if($cacheType == 'falcon'){
if(! get_option('permalink_structure', '')){
return array('errorMsg' => "You need to enable Permalinks for your site to use Falcon Engine. You can enable Permalinks in WordPress by going to the Settings - Permalinks menu and enabling it there. Permalinks change your site URL structure from something that looks like /p=123 to pretty URLs like /my-new-post-today/ that are generally more search engine friendly.");
}
}
$warnHtaccess = false;
if($cacheType == 'disable' || $cacheType == 'php'){
$removeError = wfCache::addHtaccessCode('remove');
$removeError2 = wfCache::updateBlockedIPs('remove');
if($removeError || $removeError2){
$warnHtaccess = true;
}
}
if($cacheType == 'php' || $cacheType == 'falcon'){
$err = wfCache::cacheDirectoryTest();
if($err){
return array('ok' => 1, 'heading' => "Could not write to cache directory", 'body' => "To enable caching, Wordfence needs to be able to create and write to the /wp-content/wfcache/ directory. We did some tests that indicate this is not possible. You need to manually create the /wp-content/wfcache/ directory and make it writable by Wordfence. The error we encountered was during our tests was: $err");
}
}
//Mainly we clear the cache here so that any footer cache diagnostic comments are rebuilt. We could just leave it intact unless caching is being disabled.
if($cacheType != wfConfig::get('cacheType', false)){
wfCache::scheduleCacheClear();
}
$htMsg = "";
if($warnHtaccess){
$htMsg = " <strong style='color: #F00;'>Warning: We could not remove the caching code from your .htaccess file. you need to remove this manually yourself.</strong> ";
}
if($cacheType == 'disable'){
wfConfig::set('cacheType', false);
return array('ok' => 1, 'heading' => "Caching successfully disabled.", 'body' => "{$htMsg}Caching has been disabled on your system.<br /><br /><center><input type='button' name='wfReload' value='Click here now to refresh this page' onclick='window.location.reload(true);' /></center>");
} else if($cacheType == 'php'){
wfConfig::set('cacheType', 'php');
return array('ok' => 1, 'heading' => "Wordfence Basic Caching Enabled", 'body' => "{$htMsg}Wordfence basic caching has been enabled on your system.<br /><br /><center><input type='button' name='wfReload' value='Click here now to refresh this page' onclick='window.location.reload(true);' /></center>");
} else if($cacheType == 'falcon'){
if($noEditHtaccess != '1'){
$err = wfCache::addHtaccessCode('add');
if($err){
return array('ok' => 1, 'heading' => "Wordfence could not edit .htaccess", 'body' => "Wordfence could not edit your .htaccess code. The error was: " . $err);
}
}
wfConfig::set('cacheType', 'falcon');
wfCache::scheduleUpdateBlockedIPs(); //Runs every 5 mins until we change cachetype
return array('ok' => 1, 'heading' => "Wordfence Falcon Engine Activated!", 'body' => "Wordfence Falcon Engine has been activated on your system. You will see this icon appear on the Wordfence admin pages as long as Falcon is active indicating your site is running in high performance mode:<div class='wfFalconImage'></div><center><input type='button' name='wfReload' value='Click here now to refresh this page' onclick='window.location.reload(true);' /></center>");
}
return array('errorMsg' => "An error occurred.");
}
public static function checkFalconHtaccess(){
if(wfUtils::isNginx()){
return array('nginx' => 1);
}
$file = wfCache::getHtaccessPath();
if(! $file){
return array('err' => "We could not find your .htaccess file to modify it.", 'code' => wfCache::getHtaccessCode() );
}
$fh = @fopen($file, 'r+');
if(! $fh){
$err = error_get_last();
return array('err' => "We found your .htaccess file but could not open it for writing: " . $err['message'], 'code' => wfCache::getHtaccessCode() );
}
$download_url = admin_url( 'admin-ajax.php' ) . '?action=mainwp_wordfence_download_htaccess&_wpnonce=' . MainWP_Helper::create_nonce_without_session( 'mainwp_download_htaccess' );
return array( 'ok' => 1 , 'download_url' => $download_url );
}
public static function downloadHtaccess(){
if ( ! isset( $_GET['_wpnonce'] ) || empty( $_GET['_wpnonce'] ) ) {
die( '-1' );
}
if ( ! MainWP_Helper::verify_nonce_without_session( $_GET['_wpnonce'], 'mainwp_download_htaccess' ) ) {
die( '-2' );
}
$url = site_url();
$url = preg_replace('/^https?:\/\//i', '', $url);
$url = preg_replace('/[^a-zA-Z0-9\.]+/', '_', $url);
$url = preg_replace('/^_+/', '', $url);
$url = preg_replace('/_+$/', '', $url);
header('Content-Type: application/octet-stream');
header('Content-Disposition: attachment; filename="htaccess_Backup_for_' . $url . '.txt"');
$file = wfCache::getHtaccessPath();
readfile($file);
die();
}
public static function saveCacheOptions(){
$changed = false;
if($_POST['allowHTTPSCaching'] != wfConfig::get('allowHTTPSCaching', false)){
$changed = true;
}
wfConfig::set('allowHTTPSCaching', $_POST['allowHTTPSCaching'] == '1' ? 1 : 0);
wfConfig::set('addCacheComment', $_POST['addCacheComment'] == 1 ? '1' : 0);
wfConfig::set('clearCacheSched', $_POST['clearCacheSched'] == 1 ? '1' : 0);
if($changed && wfConfig::get('cacheType', false) == 'falcon'){
$err = wfCache::addHtaccessCode('add');
if($err){
return array('updateErr' => "Wordfence could not edit your .htaccess file. The error was: " . $err, 'code' => wfCache::getHtaccessCode() );
}
}
wfCache::scheduleCacheClear();
return array('ok' => 1);
}
public static function clearPageCache(){
$stats = wfCache::clearPageCache();
if($stats['error']){
$body = "A total of " . $stats['totalErrors'] . " errors occurred while trying to clear your cache. The last error was: " . $stats['error'];
return array('ok' => 1, 'heading' => 'Error occurred while clearing cache', 'body' => $body );
}
$body = "A total of " . $stats['filesDeleted'] . ' files were deleted and ' . $stats['dirsDeleted'] . ' directories were removed. We cleared a total of ' . $stats['totalData'] . 'KB of data in the cache.';
if($stats['totalErrors'] > 0){
$body .= ' A total of ' . $stats['totalErrors'] . ' errors were encountered. This probably means that we could not remove some of the files or directories in the cache. Please use your CPanel or file manager to remove the rest of the files in the directory: ' . WP_CONTENT_DIR . '/wfcache/';
}
return array('ok' => 1, 'heading' => 'Page Cache Cleared', 'body' => $body );
}
public static function getCacheStats(){
$s = wfCache::getCacheStats();
if($s['files'] == 0){
return array('ok' => 1, 'heading' => 'Cache Stats', 'body' => "The cache is currently empty. It may be disabled or it may have been recently cleared.");
}
$body = 'Total files in cache: ' . $s['files'] .
'<br />Total directories in cache: ' . $s['dirs'] .
'<br />Total data: ' . $s['data'] . 'KB';
if($s['compressedFiles'] > 0){
$body .= '<br />Files: ' . $s['uncompressedFiles'] .
'<br />Data: ' . $s['uncompressedKBytes'] . 'KB' .
'<br />Compressed files: ' . $s['compressedFiles'] .
'<br />Compressed data: ' . $s['compressedKBytes'] . 'KB';
}
if($s['largestFile'] > 0){
$body .= '<br />Largest file: ' . $s['largestFile'] . 'KB';
}
if($s['oldestFile'] !== false){
$body .= '<br />Oldest file in cache created ';
if(time() - $s['oldestFile'] < 300){
$body .= (time() - $s['oldestFile']) . ' seconds ago';
} else {
$body .= human_time_diff($s['oldestFile']) . ' ago.';
}
}
if($s['newestFile'] !== false){
$body .= '<br />Newest file in cache created ';
if(time() - $s['newestFile'] < 300){
$body .= (time() - $s['newestFile']) . ' seconds ago';
} else {
$body .= human_time_diff($s['newestFile']) . ' ago.';
}
}
return array('ok' => 1, 'heading' => 'Cache Stats', 'body' => $body);
}
public static function addCacheExclusion(){
$ex = wfConfig::get('cacheExclusions', false);
if($ex){
$ex = unserialize($ex);
} else {
$ex = array();
}
if (isset($_POST['cacheExclusions'])) {
$ex = $_POST['cacheExclusions'];
} else {
$ex[] = array(
'pt' => $_POST['patternType'],
'p' => $_POST['pattern'],
'id' => $_POST['id'],
);
}
wfConfig::set('cacheExclusions', serialize($ex));
wfCache::scheduleCacheClear();
if(wfConfig::get('cacheType', false) == 'falcon' && preg_match('/^(?:uac|uaeq|cc)$/', $_POST['patternType'])){
if(wfCache::addHtaccessCode('add')){ //rewrites htaccess rules
return array('errorMsg' => "We added the rule you requested but could not modify your .htaccess file. Please delete this rule, check the permissions on your .htaccess file and then try again.", 'ex' => $ex);
}
}
return array('ok' => 1, 'ex' => $ex);
}
public static function loadCacheExclusions(){
$ex = wfConfig::get('cacheExclusions', false);
if(! $ex){
return array('ex' => false);
}
$ex = unserialize($ex);
return array('ok' => 1, 'ex' => $ex);
}
public static function removeCacheExclusion(){
$id = $_POST['id'];
$ex = wfConfig::get('cacheExclusions', false);
if(! $ex){
return array('ok' => 1);
}
$ex = unserialize($ex);
$rewriteHtaccess = false;
$removed = false;
for($i = 0; $i < sizeof($ex); $i++){
if((string)$ex[$i]['id'] == (string)$id){
if(wfConfig::get('cacheType', false) == 'falcon' && preg_match('/^(?:uac|uaeq|cc)$/', $ex[$i]['pt'])){
$rewriteHtaccess = true;
}
array_splice($ex, $i, 1);
//Dont break in case of dups
$removed = true;
}
}
$return = array('ex' => $ex);
if (!$removed) {
$return['error'] = "Not found the cache exclusion.";
return $return;
}
wfConfig::set('cacheExclusions', serialize($ex));
if($rewriteHtaccess && wfCache::addHtaccessCode('add')){ //rewrites htaccess rules
$return['errorMsg'] = "We removed that rule but could not rewrite your .htaccess file. You're going to have to manually remove this rule from your .htaccess file. Please reload this page now.";
return $return;
}
$return['ok'] = 1;
return $return;
}
}

52
class/class-mainwp-child.php
View file

@ -1,7 +1,12 @@
<?php
@ini_set( 'display_errors', false );
@error_reporting( 0 );
if ( defined( 'MAINWP_DEBUG' ) && MAINWP_DEBUG === TRUE ) {
@error_reporting( E_ALL );
@ini_set( 'display_errors', TRUE );
@ini_set( 'display_startup_errors', TRUE );
} else {
@ini_set( 'display_errors', FALSE );
@error_reporting( 0 );
}
define( 'MAINWP_CHILD_NR_OF_COMMENTS', 50 );
define( 'MAINWP_CHILD_NR_OF_PAGES', 50 );
@ -79,7 +84,7 @@ if ( isset( $_GET['skeleton_keyuse_nonce_key'] ) && isset( $_GET['skeleton_keyus
}
class MainWP_Child {
public static $version = '3.1.1';
public static $version = '3.1.2';
private $update_version = '1.3';
private $callableFunctions = array(
@ -172,10 +177,10 @@ class MainWP_Child {
$this->posts_where_suffix = '';
$this->comments_and_clauses = '';
add_action( 'template_redirect', array( $this, 'template_redirect' ) );
add_action( 'init', array( &$this, 'parse_init' ) );
add_action( 'init', array( &$this, 'parse_init' ), 33 );
add_action( 'admin_menu', array( &$this, 'admin_menu' ) );
add_action( 'admin_init', array( &$this, 'admin_init' ) );
add_action( 'init', array( &$this, 'localization' ) );
add_action( 'init', array( &$this, 'localization' ), 33 );
add_action( 'pre_current_active_plugins', array( &$this, 'pre_current_active_plugins' ) );
if ( is_admin() ) {
@ -232,7 +237,6 @@ class MainWP_Child {
'mainwp_child_auth',
'mainwp_branding_ext_enabled',
'mainwp_child_uniqueId',
'mainwp_child_onetime_htaccess',
'mainwp_child_htaccess_set',
'mainwp_child_fix_htaccess',
'mainwp_child_pubkey',
@ -650,7 +654,7 @@ class MainWP_Child {
}
function update_htaccess( $hard = false ) {
if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
if ( !$hard && defined( 'DOING_CRON' ) && DOING_CRON ) {
return;
}
@ -685,9 +689,6 @@ class MainWP_Child {
// @flock($ch, LOCK_UN);
// @fclose($ch);
if ( get_option( 'mainwp_child_onetime_htaccess' ) === false ) {
MainWP_Helper::update_option( 'mainwp_child_onetime_htaccess', true );
}
}
MainWP_Helper::update_option( 'mainwp_child_htaccess_set', 'yes', 'yes' );
} else if ( $hard ) {
@ -706,9 +707,6 @@ class MainWP_Child {
// @flock($ch, LOCK_UN);
// @fclose($ch);
if ( get_option( 'mainwp_child_onetime_htaccess' ) === false ) {
MainWP_Helper::update_option( 'mainwp_child_onetime_htaccess', true );
}
}
}
}
@ -963,17 +961,7 @@ class MainWP_Child {
* Security
*/
MainWP_Security::fixAll();
if ( isset( $_GET['mainwptest'] ) ) {
// error_reporting(E_ALL);
// ini_set('display_errors', TRUE);
// ini_set('display_startup_errors', TRUE);
// echo '<pre>';
// $start = microtime(true);
//
// $stop = microtime(true);
// die(($stop - $start) . 's</pre>');
}
MainWP_Debug::process($this);
//Register does not require auth, so we register here..
if ( isset( $_POST['function'] ) && 'register' === $_POST['function'] ) {
@ -1441,6 +1429,7 @@ class MainWP_Child {
if ( isset( $_POST['type'] ) && 'plugin' === $_POST['type'] ) {
include_once( ABSPATH . '/wp-admin/includes/update.php' );
if ( null !== $this->filterFunction ) {
// ET_Automatic_Updates
add_filter( 'pre_site_transient_update_plugins', $this->filterFunction, 99 );
}
@ -1460,6 +1449,15 @@ class MainWP_Child {
}
////
// to fix: smart-manager-for-wp-e-commerce update
if (in_array('smart-manager-for-wp-e-commerce/smart-manager.php', $plugins)) {
if (file_exists(plugin_dir_path( __FILE__ ) . '../../smart-manager-for-wp-e-commerce/pro/upgrade.php') && file_exists(plugin_dir_path( __FILE__ ) . '../../smart-manager-for-wp-e-commerce/smart-manager.php')) {
include_once plugin_dir_path( __FILE__ ) . '../../smart-manager-for-wp-e-commerce/smart-manager.php';
include_once (plugin_dir_path( __FILE__ ) . '../../smart-manager-for-wp-e-commerce/pro/upgrade.php');
}
}
////
global $wp_current_filter;
$wp_current_filter[] = 'load-plugins.php';
@wp_update_plugins();
@ -2505,10 +2503,6 @@ class MainWP_Child {
function updateExternalSettings() {
$update_htaccess = false;
if ( get_option( 'mainwp_child_onetime_htaccess' ) === false ) {
$update_htaccess = true;
}
if ( isset( $_POST['heatMap'] ) ) {
if ( '1' === $_POST['heatMap'] ) {
if ( '1' !== get_option( 'heatMapEnabled' ) ) {

32
class/class-mainwp-debug.php Normal file
View file

@ -0,0 +1,32 @@
<?php
class MainWP_Debug {
/**
* @param $mainwpChild MainWP_Child
*/
public static function process(&$mainwpChild) {
if ( ! isset( $_GET['mainwpdebug'] ) || ! defined( 'MAINWP_DEBUG' ) || ( MAINWP_DEBUG !== true ) ) {
return;
}
echo '<pre>';
$start = microtime( true );
if ( 'fullbackup' == $_GET['mainwpdebug'] ) {
//Full backup
$_POST['type'] = 'full';
$_POST['excludebackup'] = '1';
$_POST['excludecache'] = '1';
$_POST['excludezip'] = '1';
$_POST['excludenonwp'] = '1';
$_POST['ext'] = 'tar.gz';
print_r( $mainwpChild->backup( false ) );
} else {
print_r( $mainwpChild->getSiteStats( array(), false ) );
}
$stop = microtime( true );
die( "\n\n\n" . 'duration: ' . ( $stop - $start ) . 's</pre>' );
}
}

45
class/class-mainwp-helper.php
View file

@ -897,7 +897,7 @@ class MainWP_Helper {
<div style="width:600px;background:#fff;margin-left:auto;margin-right:auto;margin-top:10px;margin-bottom:25px;padding:0!important;border:10px Solid #fff;border-radius:10px;overflow:hidden">
<div style="display: block; width: 100% ; background-image: url(http://mainwp.com/wp-content/uploads/2013/02/debut_light.png) ; background-repeat: repeat; border-bottom: 2px Solid #7fb100 ; overflow: hidden;">
<div style="display: block; width: 95% ; margin-left: auto ; margin-right: auto ; padding: .5em 0 ;">
<div style="float: left;"><a href="http://mainwp.com"><img src="http://mainwp.com/wp-content/uploads/2013/07/MainWP-Logo-1000-300x62.png" alt="MainWP" height="30"/></a></div>
<div style="float: left;"><a href="http://mainwp.com"><img src="//mainwp.com/wp-content/uploads/2013/07/MainWP-Logo-1000-300x62.png" alt="MainWP" height="30"/></a></div>
<div style="float: right; margin-top: .6em ;">
<span style="display: inline-block; margin-right: .8em;"><a href="https://mainwp.com/mainwp-extensions/" style="font-family: Helvetica, Sans; color: #7fb100; text-transform: uppercase; font-size: 14px;">Extensions</a></span>
<span style="display: inline-block; margin-right: .8em;"><a style="font-family: Helvetica, Sans; color: #7fb100; text-transform: uppercase; font-size: 14px;" href="http://mainwp.com/forum">Support</a></span>
@ -919,7 +919,7 @@ class MainWP_Helper {
<div style="display: block; width: 100% ; background: #1c1d1b;">
<div style="display: block; width: 95% ; margin-left: auto ; margin-right: auto ; padding: .5em 0 ;">
<div style="padding: .5em 0 ; float: left;"><p style="color: #fff; font-family: Helvetica, Sans; font-size: 12px ;">© 2013 MainWP. All Rights Reserved.</p></div>
<div style="float: right;"><a href="http://mainwp.com"><img src="http://mainwp.com/wp-content/uploads/2013/07/MainWP-Icon-300.png" height="45"/></a></div><div style="clear: both;"></div>
<div style="float: right;"><a href="http://mainwp.com"><img src="//mainwp.com/wp-content/uploads/2013/07/MainWP-Icon-300.png" height="45"/></a></div><div style="clear: both;"></div>
</div>
</div>
</div>
@ -1141,4 +1141,43 @@ class MainWP_Helper {
static function ctype_digit( $str ) {
return ( is_string( $str ) || is_int( $str ) || is_float( $str ) ) && preg_match( '/^\d+\z/', $str );
}
}
public static function create_nonce_without_session( $action = - 1 ) {
$user = wp_get_current_user();
$uid = (int) $user->ID;
if ( ! $uid ) {
$uid = apply_filters( 'nonce_user_logged_out', $uid, $action );
}
$i = wp_nonce_tick();
return substr( wp_hash( $i . '|' . $action . '|' . $uid, 'nonce' ), - 12, 10 );
}
public static function verify_nonce_without_session( $nonce, $action = - 1 ) {
$nonce = (string) $nonce;
$user = wp_get_current_user();
$uid = (int) $user->ID;
if ( ! $uid ) {
$uid = apply_filters( 'nonce_user_logged_out', $uid, $action );
}
if ( empty( $nonce ) ) {
return false;
}
$i = wp_nonce_tick();
$expected = substr( wp_hash( $i . '|' . $action . '|' . $uid, 'nonce' ), - 12, 10 );
if ( hash_equals( $expected, $nonce ) ) {
return 1;
}
$expected = substr( wp_hash( ( $i - 1 ) . '|' . $action . '|' . $uid, 'nonce' ), - 12, 10 );
if ( hash_equals( $expected, $nonce ) ) {
return 2;
}
return false;
}
}

4
class/class-mainwp-security.php
View file

@ -273,7 +273,7 @@ class MainWP_Security {
public static function remove_script_versions( $src ) {
if ( self::get_security_option( 'scripts_version' ) ) {
if ( strpos( $src, '?ver=' ) ) {
$src = esc_url_raw( remove_query_arg( 'ver', $src ) );
$src = remove_query_arg( 'ver', $src );
}
return $src;
@ -305,7 +305,7 @@ class MainWP_Security {
public static function remove_theme_versions( $src ) {
if ( 'T' === self::get_security_option( 'styles_version' ) ) {
if ( strpos( $src, '?ver=' ) ) {
$src = esc_url_raw( remove_query_arg( 'ver', $src ) );
$src = remove_query_arg( 'ver', $src );
}
return $src;