Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 15:14:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

PHP Cli version

Browse Source
This commit is contained in:
David Bomba 2020-09-23 14:11:34 +10:00
parent c59e6a2141
commit 2627ec8894
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Middleware/ContactKeyLogin.php
View File

@ -29,8 +29,6 @@ class ContactKeyLogin
public function handle($request, Closure $next) public function handle($request, Closure $next)
{ {
info("key login = " . $request->segment(3));
if ($request->segment(3) && config('ninja.db.multi_db_enabled')) { if ($request->segment(3) && config('ninja.db.multi_db_enabled')) {
if (MultiDB::findAndSetDbByContactKey($request->segment(3))) { if (MultiDB::findAndSetDbByContactKey($request->segment(3))) {

16
app/Utils/SystemHealth.php
View File

@ -66,6 +66,7 @@ class SystemHealth
'php_version' => [ 'php_version' => [
'minimum_php_version' => (string) self::$php_version, 'minimum_php_version' => (string) self::$php_version,
'current_php_version' => phpversion(), 'current_php_version' => phpversion(),
'current_php_cli_version' => (string) self::checkPhpCli(),
'is_okay' => version_compare(phpversion(), self::$php_version, '>='), 'is_okay' => version_compare(phpversion(), self::$php_version, '>='),
], ],
'env_writable' => self::checkEnvWritable(), 'env_writable' => self::checkEnvWritable(),
@ -116,6 +117,21 @@ class SystemHealth
return $result; return $result;
} }
private static function checkPhpCli()
{
try {
exec('php -v', $foo, $exitCode);
if ($exitCode === 0) {
return empty($foo[0]) ? 'Found php cli, but no version information' : $foo[0];
}
} catch (\Exception $e) {
return false;
}
}
private static function extensions() :array private static function extensions() :array
{ {
$loaded_extensions = []; $loaded_extensions = [];