keith
/
friendica
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spelling: phppath 

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
This commit is contained in:
Josh Soref 2023-03-26 18:38:03 -04:00
parent 68a5a99d8b
commit 04cbbcd2ff
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Core/Installer.php
View File

@ -98,17 +98,17 @@ class Installer
* Checks the current installation environment. There are optional and mandatory checks. * Checks the current installation environment. There are optional and mandatory checks.
* *
* @param string $baseurl The baseurl of Friendica * @param string $baseurl The baseurl of Friendica
* @param string $phpath Optional path to the PHP binary * @param string $phppath Optional path to the PHP binary
* *
* @return bool if the check succeed * @return bool if the check succeed
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
public function checkEnvironment($baseurl, $phpath = null) public function checkEnvironment($baseurl, $phppath = null)
{ {
$returnVal = true; $returnVal = true;
if (isset($phpath)) { if (isset($phppath)) {
if (!$this->checkPHP($phpath)) { if (!$this->checkPHP($phppath)) {
$returnVal = false; $returnVal = false;
} }
} }
@ -165,7 +165,7 @@ class Installer
'$dbpass' => $configCache->get('database', 'password'), '$dbpass' => $configCache->get('database', 'password'),
'$dbdata' => $configCache->get('database', 'database'), '$dbdata' => $configCache->get('database', 'database'),
'$phpath' => $configCache->get('config', 'php_path'), '$phppath' => $configCache->get('config', 'php_path'),
'$adminmail' => $configCache->get('config', 'admin_email'), '$adminmail' => $configCache->get('config', 'admin_email'),
'$system_url' => $configCache->get('system', 'url'), '$system_url' => $configCache->get('system', 'url'),

2
view/templates/install/01_checks.tpl
View File

@ -27,7 +27,7 @@
{{/foreach}} {{/foreach}}
</table> </table>
{{if $phpath}} {{if $phppath}}
<input type="hidden" name="config-php_path" value="{{$php_path}}"> <input type="hidden" name="config-php_path" value="{{$php_path}}">
{{/if}} {{/if}}

2
view/templates/install/local.config.tpl
View File

@ -21,7 +21,7 @@ return [
// **************************************************************** // ****************************************************************
'config' => [ 'config' => [
'php_path' => '{{$phpath|escape:'quotes' nofilter}}', 'php_path' => '{{$phppath|escape:'quotes' nofilter}}',
'admin_email' => '{{$adminmail|escape:'quotes' nofilter}}', 'admin_email' => '{{$adminmail|escape:'quotes' nofilter}}',
'sitename' => 'Friendica Social Network', 'sitename' => 'Friendica Social Network',
'register_policy' => \Friendica\Module\Register::OPEN, 'register_policy' => \Friendica\Module\Register::OPEN,