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

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
}
}
}