Fix PHP warning

1.10.x
Julio Montoya 10 years ago
parent 1aaf5e4e46
commit f21e7e13c9
  1. 59
      main/inc/lib/diagnoser.lib.php

@ -189,7 +189,7 @@ class Diagnoser
$setting = ini_get('upload_max_filesize'); $setting = ini_get('upload_max_filesize');
$req_setting = '>= '.REQUIRED_MIN_UPLOAD_MAX_FILESIZE.'M'; $req_setting = '>= '.REQUIRED_MIN_UPLOAD_MAX_FILESIZE.'M';
$status = self :: STATUS_ERROR; $status = self :: STATUS_ERROR;
if ((float)$setting >= REQUIRED_UPLOAD_MAX_FILESIZE) if ((float)$setting >= REQUIRED_MIN_UPLOAD_MAX_FILESIZE)
$status = self :: STATUS_OK; $status = self :: STATUS_OK;
$array[] = $this->build_setting($status, '[INI]', 'upload_max_filesize', 'http://www.php.net/manual/en/ini.core.php#ini.upload_max_filesize', $setting, $req_setting, null, get_lang('UploadMaxFilesizeInfo')); $array[] = $this->build_setting($status, '[INI]', 'upload_max_filesize', 'http://www.php.net/manual/en/ini.core.php#ini.upload_max_filesize', $setting, $req_setting, null, get_lang('UploadMaxFilesizeInfo'));
@ -208,21 +208,54 @@ class Diagnoser
$status = $setting == $req_setting ? self :: STATUS_OK : self :: STATUS_WARNING; $status = $setting == $req_setting ? self :: STATUS_OK : self :: STATUS_WARNING;
$array[] = $this->build_setting($status, '[INI]', 'browscap', 'http://www.php.net/manual/en/misc.configuration.php#ini.browscap', $setting, $req_setting, 'on_off', get_lang('BrowscapInfo')); $array[] = $this->build_setting($status, '[INI]', 'browscap', 'http://www.php.net/manual/en/misc.configuration.php#ini.browscap', $setting, $req_setting, 'on_off', get_lang('BrowscapInfo'));
//Extensions // Extensions
$extensions = array('gd' => array('link'=>'http://www.php.net/gd', 'expected' => 1, 'comment' => get_lang('ExtensionMustBeLoaded')), $extensions = array(
'mysql' => array('link'=>'http://www.php.net/mysql', 'expected' => 1, 'comment' => get_lang('ExtensionMustBeLoaded')), 'gd' => array(
'pcre' => array('link'=>'http://www.php.net/pcre', 'expected' => 1, 'comment' => get_lang('ExtensionMustBeLoaded')), 'link' => 'http://www.php.net/gd',
'session' => array('link'=>'http://www.php.net/session', 'expected' => 1, 'comment' => get_lang('ExtensionMustBeLoaded')), 'expected' => 1,
'standard' => array('link'=>'http://www.php.net/spl', 'expected' => 1, 'comment' => get_lang('ExtensionMustBeLoaded')), 'comment' => get_lang('ExtensionMustBeLoaded'),
'zlib' => array('link'=>'http://www.php.net/zlib', 'expected' => 1, 'comment' => get_lang('ExtensionMustBeLoaded')), ),
'xsl' => array('link'=>'http://be2.php.net/xsl', 'expected' => 2, 'comment' => get_lang('ExtensionShouldBeLoaded')), 'mysql' => array(
'curl' => array('link'=>'http://www.php.net/curl', 'expected' => 2, 'comment' => get_lang('ExtensionShouldBeLoaded')), 'link' => 'http://www.php.net/mysql',
'expected' => 1,
'comment' => get_lang('ExtensionMustBeLoaded'),
),
'pcre' => array(
'link' => 'http://www.php.net/pcre',
'expected' => 1,
'comment' => get_lang('ExtensionMustBeLoaded'),
),
'session' => array(
'link' => 'http://www.php.net/session',
'expected' => 1,
'comment' => get_lang('ExtensionMustBeLoaded'),
),
'standard' => array(
'link' => 'http://www.php.net/spl',
'expected' => 1,
'comment' => get_lang('ExtensionMustBeLoaded'),
),
'zlib' => array(
'link' => 'http://www.php.net/zlib',
'expected' => 1,
'comment' => get_lang('ExtensionMustBeLoaded'),
),
'xsl' => array(
'link' => 'http://be2.php.net/xsl',
'expected' => 2,
'comment' => get_lang('ExtensionShouldBeLoaded'),
),
'curl' => array(
'link' => 'http://www.php.net/curl',
'expected' => 2,
'comment' => get_lang('ExtensionShouldBeLoaded'),
),
); );
foreach ($extensions as $extension => $data) { foreach ($extensions as $extension => $data) {
$url = $data['link']; $url = $data['link'];
$expected_value = $data['expected']; $expected_value = $data['expected'];
$comment = $data['comment']; $comment = $data['comment'];
$loaded = extension_loaded($extension); $loaded = extension_loaded($extension);
$status = $loaded ? self :: STATUS_OK : self :: STATUS_ERROR; $status = $loaded ? self :: STATUS_OK : self :: STATUS_ERROR;

Loading…
Cancel
Save