Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

check mysql using PDO now #487

Merged
merged 6 commits into from
Aug 23, 2019
Merged

check mysql using PDO now #487

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bf240be
check mysql using PDO now
fiammybe Aug 14, 2019
35808bd
success images now reflect the correct status in system check
fiammybe Aug 15, 2019
2b3db7b
transform requirements check to array
fiammybe Aug 17, 2019
7783081
use language constants for yes and no
fiammybe Aug 19, 2019
a02e6d0
use translation constants in more places
fiammybe Aug 19, 2019
22910b5
remove copy-paste error resulting in double ?
fiammybe Aug 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 41 additions & 26 deletions htdocs/install/page_modcheck.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
*/
require_once 'common.inc.php';
if (!defined( 'XOOPS_INSTALL' ) ) exit();
$requirements_array = array();

$wizard->setPage( 'modcheck' );
$pageHasForm = false;
Expand Down Expand Up @@ -63,37 +64,51 @@ function xoDiagIfWritable( $path) {
return xoDiag( $error ? -1 : 1, $error ? 'Not writable' : 'Writable' );
}

function imCheckRequirements()
fiammybe marked this conversation as resolved.
Show resolved Hide resolved
{
$requirement['server_api']['description']=PHP_SAPI;
$requirement['server_api']['result']=php_sapi_name();
$requirement['server_api']['status']=true;

$requirement['php_version']['description']=_PHP_VERSION;
if (version_compare( phpversion(), '5.6', '>=')) {
$requirement['php_version']['status']=1;
} else {
$requirement['php_version']['status']=0;
}
$requirement['php_version']['result']=phpversion();

$requirement['mysql']['description']="MySQL Handler";
$requirement['mysql']['result']=in_array("mysql",PDO::getAvailableDrivers(),TRUE) ? "using PDO" : "missing";
$requirement['mysql']['status']=in_array("mysql",PDO::getAvailableDrivers(),TRUE) ? true : false;
fiammybe marked this conversation as resolved.
Show resolved Hide resolved

$requirement['session']['description']="Session Extension";
$requirement['session']['result']=extension_loaded( 'session' ) ? "available" : "missing";
$requirement['session']['status']=extension_loaded( 'session' ) ? true : false;

$requirement['pcre']['description']="PCRE Extension";
$requirement['pcre']['result']=extension_loaded( 'PCRE' ) ? "available" : "missing";
$requirement['pcre']['status']=extension_loaded( 'PCRE' ) ? true : false;

$requirement['file_upload']['description']="File uploads";
$requirement['file_upload']['result']=xoDiagBoolSetting( 'file_uploads', true ) ? "yes" : "no";
fiammybe marked this conversation as resolved.
Show resolved Hide resolved
$requirement['file_upload']['status']=xoDiagBoolSetting( 'file_uploads', true ) ? true : false;

return $requirement;
}

ob_start();
$requirements_array = imCheckRequirements();
?>
<fieldset>
<h3><?php echo REQUIREMENTS; ?></h3>
<h4><?php echo SERVER_API; ?>:&nbsp; <?php echo php_sapi_name(); ?> <img
src="img/yes.png" alt="Success" class="rootimg" /></h4>
<div class="clear">&nbsp;</div>
<h4><?php echo _PHP_VERSION; ?>:&nbsp; <?php
if (version_compare( phpversion(), '5.2', '>=')) {
echo xoDiag( 1, phpversion() );
} elseif (version_compare( phpversion(), '5.1', '>=')) {
echo xoDiag( 0, phpversion() );
} else {
echo xoDiag( -1, phpversion() );
}
?> <img
src="img/<?php echo (isset($php_version_error) ? "no" : "yes") ?>.png"
alt="Success" class="rootimg" /></h4>
<div class="clear">&nbsp;</div>
<h4><?php printf( PHP_EXTENSION, 'MySQL' ); ?>:&nbsp; <?php echo xoDiag( function_exists( 'mysql_connect' ) ? 1 : -1 ); ?>
<img src="img/yes.png" alt="Success" class="rootimg" /></h4>
<div class="clear">&nbsp;</div>
<h4><?php printf( PHP_EXTENSION, 'Session' ); ?>:&nbsp; <?php echo xoDiag( extension_loaded( 'session' ) ? 1 : -1 ); ?>
<img src="img/yes.png" alt="Success" class="rootimg" /></h4>
<div class="clear">&nbsp;</div>
<h4><?php printf( PHP_EXTENSION, 'PCRE' ); ?>:&nbsp; <?php echo xoDiag( extension_loaded( 'pcre' ) ? 1 : -1 ); ?>
<img src="img/yes.png" alt="Success" class="rootimg" /></h4>
<div class="clear">&nbsp;</div>
<h4>file_uploads:&nbsp; <?php echo xoDiagBoolSetting( 'file_uploads', true ); ?>
<img src="img/yes.png" alt="Success" class="rootimg" /></h4>
<?php foreach($requirements_array as &$requirement)
{
?>
<h4><?php echo $requirement['description']; ?>:&nbsp; <?php echo xoDiag($requirement['status'], $requirement['result']); ?> <img
src="img/<?php echo $requirement['status'] ? "yes" : "no"; ?>.png" alt="<?php echo $requirement['status'] ? "Succes" : "Failure"; ?>" class="rootimg" /></h4>
MekDrop marked this conversation as resolved.
Show resolved Hide resolved
fiammybe marked this conversation as resolved.
Show resolved Hide resolved
fiammybe marked this conversation as resolved.
Show resolved Hide resolved
<div class="clear">&nbsp;</div>
<?php } ?>
</fieldset>

<fieldset>
Expand Down