Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/Installation/SystemCheck.php')
-rw-r--r--plugins/Installation/SystemCheck.php31
1 files changed, 27 insertions, 4 deletions
diff --git a/plugins/Installation/SystemCheck.php b/plugins/Installation/SystemCheck.php
index 60585cf80a..c017a19d41 100644
--- a/plugins/Installation/SystemCheck.php
+++ b/plugins/Installation/SystemCheck.php
@@ -8,6 +8,7 @@
*/
namespace Piwik\Plugins\Installation;
+use Piwik\CliMulti;
use Piwik\CliMulti\Process;
use Piwik\Common;
use Piwik\Config;
@@ -59,7 +60,7 @@ class SystemCheck
$infos['phpVersion_minimum'] = $piwik_minimumPHPVersion;
$infos['phpVersion'] = PHP_VERSION;
- $infos['phpVersion_ok'] = version_compare($piwik_minimumPHPVersion, $infos['phpVersion']) === -1;
+ $infos['phpVersion_ok'] = self::isPhpVersionValid($infos['phpVersion']);
// critical errors
$extensions = @get_loaded_extensions();
@@ -131,7 +132,6 @@ class SystemCheck
'parse_ini_file',
'glob',
);
- $infos['desired_functions'] = $desired_functions;
$infos['missing_desired_functions'] = array();
foreach ($desired_functions as $desired_function) {
if (!self::functionExists($desired_function)) {
@@ -139,11 +139,20 @@ class SystemCheck
}
}
+ $sessionAutoStarted = (int)ini_get('session.auto_start');
+ if($sessionAutoStarted) {
+ $infos['missing_desired_functions'][] = 'session.auto_start';
+ }
+
+ $desired_settings = array(
+ 'session.auto_start',
+ );
+ $infos['desired_functions'] = array_merge($desired_functions, $desired_settings);
+
$infos['openurl'] = Http::getTransportMethod();
$infos['gd_ok'] = SettingsServer::isGdExtensionEnabled();
-
$serverSoftware = isset($_SERVER['SERVER_SOFTWARE']) ? $_SERVER['SERVER_SOFTWARE'] : '';
$infos['serverVersion'] = addslashes($serverSoftware);
$infos['serverOs'] = @php_uname();
@@ -174,7 +183,9 @@ class SystemCheck
}
$infos['timezone'] = SettingsServer::isTimezoneSupportEnabled();
- $infos['cli_process_ok'] = Process::isSupported();
+
+ $process = new CliMulti();
+ $infos['cli_process_ok'] = $process->supportsAsync();
$infos['tracker_status'] = Common::getRequestVar('trackerStatus', 0, 'int');
@@ -182,6 +193,7 @@ class SystemCheck
$infos['is_nfs'] = Filesystem::checkIfFileSystemIsNFS();
$infos = self::enrichSystemChecks($infos);
+
return $infos;
}
@@ -315,4 +327,15 @@ class SystemCheck
ServerFilesGenerator::createWebRootFiles();
}
+ /**
+ * @param $piwik_minimumPHPVersion
+ * @param $infos
+ * @return bool
+ */
+ public static function isPhpVersionValid($phpVersion)
+ {
+ global $piwik_minimumPHPVersion;
+ return version_compare($piwik_minimumPHPVersion, $phpVersion) === -1;
+ }
+
} \ No newline at end of file