Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-19 06:30:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bugfixings

Browse source 
- moved testargs.php to util directory
- Switch Environment check before config at automatic install
- checkPHP() is now finding the PHP binary too
- Bugfixing checkPHP() & required returned wrong status
- removing not used $_POST['phpath'] in web installer
This commit is contained in:
Philipp Holzer 2018-10-30 11:30:19 +01:00
parent f0382ab919
commit cf39c9df81
No known key found for this signature in database
GPG key ID: 517BE60E2CE5C8A5
5 changed files with 77 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/Core/Installer.php
View file

@ -26,6 +26,11 @@ class Installer
*/
private $checks;
/**
* @var string The path to the PHP binary
*/
private $phppath = null;
/**
* Returns all checks made
*
@ -36,6 +41,22 @@ class Installer
return $this->checks;
}
/**
* Returns the PHP path
*
* @return string the PHP Path
*/
public function getPHPPath()
{
// if not set, determine the PHP path
if (!isset($this->phppath)) {
$this->checkPHP();
$this->resetChecks();
}
return $this->phppath;
}
/**
* Resets all checks
*/
@ -197,11 +218,17 @@ class Installer
*/
public function checkPHP($phppath = null, $required = false)
{
$passed = $passed2 = $passed3 = false;
if (isset($phppath)) {
$passed = file_exists($phppath);
} else {
$phppath = trim(shell_exec('which php'));
$passed = false;
$passed2 = false;
$passed3 = false;
if (!isset($phppath)) {
$phppath = 'php';
}
$passed = file_exists($phppath);
if (!$passed) {
$phppath = trim(shell_exec('which ' . $phppath));
$passed = strlen($phppath);
}
@ -232,12 +259,12 @@ class Installer
$this->addCheck(L10n::t('PHP cli binary'), $passed2, true, $help);
} else {
// return if it was required
return $required;
return !$required;
}
if ($passed2) {
$str = autoname(8);
$cmd = "$phppath testargs.php $str";
$cmd = "$phppath util/testargs.php $str";
$result = trim(shell_exec($cmd));
$passed3 = $result == $str;
$help = "";
@ -557,7 +584,7 @@ class Installer
}
if (DBA::connected()) {
if (DBA::count('user') > 0) {
if (DBStructure::existsTable('user')) {
$this->addCheck(L10n::t('Database already in use.'), false, true, '');
return false;