From 0448ca38973fed14840d33079989fd71af93708b Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 25 Jun 2018 21:00:58 -0400 Subject: [PATCH] Update install procedure - Fix Notice messages in Core\Install and Database\DBStructure - Move local config file template from htconfig.tpl to local.ini.tpl - Remove htconfig.php --- htconfig.php | 114 --------------------------------- mod/install.php | 7 +-- src/Core/Install.php | 7 +-- view/templates/htconfig.tpl | 118 ----------------------------------- view/templates/local.ini.tpl | 12 ---- 5 files changed, 5 insertions(+), 253 deletions(-) delete mode 100644 htconfig.php delete mode 100644 view/templates/htconfig.tpl diff --git a/htconfig.php b/htconfig.php deleted file mode 100644 index 87c1301abd..0000000000 --- a/htconfig.php +++ /dev/null @@ -1,114 +0,0 @@ -config['system']['db_charset'] = "utf8mb4"; - -// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles". -// It can be changed later and only applies to timestamps for anonymous viewers. - -$default_timezone = 'America/Los_Angeles'; - -// Default system language - -$a->config['system']['language'] = 'en'; - -// What is your site name? - -$a->config['sitename'] = "Friendica Social Network"; - -// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. -// Be certain to create your own personal account before setting -// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on -// the registration page. REGISTER_APPROVE requires you set 'admin_email' -// to the email address of an already registered person who can authorise -// and/or approve/deny the request. - -// In order to perform system administration via the admin panel, admin_email -// must precisely match the email address of the person logged in. - -$a->config['register_policy'] = REGISTER_OPEN; -$a->config['register_text'] = ''; -$a->config['admin_email'] = ''; - -// Maximum size of an imported message, 0 is unlimited - -$a->config['max_import_size'] = 200000; - -// maximum size of uploaded photos - -$a->config['system']['maximagesize'] = 800000; - -// Location of PHP command line processor - -$a->config['php_path'] = 'php'; - -// Server-to-server private message encryption (RINO) is allowed by default. -// set to 0 to disable, 1 to enable - -$a->config['system']['rino_encrypt'] = 1; - -// allowed themes (change this from admin panel after installation) - -$a->config['system']['allowed_themes'] = 'quattro,vier,duepuntozero,smoothly'; - -// default system theme - -$a->config['system']['theme'] = 'vier'; - - -// By default allow pseudonyms - -$a->config['system']['no_regfullname'] = true; - -//Deny public access to the local directory -//$a->config['system']['block_local_dir'] = false; - -// Location of the global directory -$a->config['system']['directory'] = 'https://dir.friendica.social'; - -// Allowed protocols in link URLs; HTTP protocols always are accepted -$a->config['system']['allowed_link_protocols'] = ['ftp', 'ftps', 'mailto', 'cid', 'gopher']; - -// Authentication cookie lifetime, in days -$a->config['system']['auth_cookie_lifetime'] = 7; diff --git a/mod/install.php b/mod/install.php index 79a5c40a3f..6962ff2dda 100644 --- a/mod/install.php +++ b/mod/install.php @@ -67,12 +67,11 @@ function install_post(App $a) { $timezone = notags(trim($_POST['timezone'])); $language = notags(trim($_POST['language'])); $adminmail = notags(trim($_POST['adminmail'])); - $rino = 1; // connect to db dba::connect($dbhost, $dbuser, $dbpass, $dbdata); - Install::install($urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $phpath, $timezone, $language, $adminmail, $rino); + Install::install($urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $phpath, $timezone, $language, $adminmail); return; break; @@ -140,9 +139,7 @@ function install_content(App $a) { switch ($install_wizard_pass) { case 1: { // System check - if (x($_POST, 'phpath')) { - $phpath = notags(trim($_POST['phpath'])); - } + $phpath = defaults($_POST, 'phpath', 'php'); list($checks, $checkspassed) = Install::check($phpath); diff --git a/src/Core/Install.php b/src/Core/Install.php index 663195e104..d6ef52df93 100644 --- a/src/Core/Install.php +++ b/src/Core/Install.php @@ -54,7 +54,7 @@ class Install extends BaseObject $checkspassed = array_reduce($checks, function ($v, $c) { - if ($c['require']) { + if (!empty($c['require'])) { $v = $v && $c['status']; } return $v; @@ -80,7 +80,7 @@ class Install extends BaseObject * @param string $adminmail Mail-Adress of the administrator * @param int $rino Rino-enabled (1 = true, 0 = false) */ - public static function install($urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $phpath, $timezone, $language, $adminmail, $rino = 1) + public static function install($urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $phpath, $timezone, $language, $adminmail) { $tpl = get_markup_template('local.ini.tpl'); $txt = replace_macros($tpl,[ @@ -93,7 +93,6 @@ class Install extends BaseObject '$urlpath' => $urlpath, '$phpath' => $phpath, '$adminmail' => $adminmail, - '$rino' => $rino ]); $result = file_put_contents('config/local.ini.php', $txt); @@ -376,7 +375,7 @@ class Install extends BaseObject $error_msg = []; $error_msg['head'] = L10n::t('Error message from Curl when fetching'); $error_msg['url'] = $test['redirect_url']; - $error_msg['msg'] = $test['error']; + $error_msg['msg'] = defaults($test, 'error', ''); } self::addCheck($checks, L10n::t('Url rewrite is working'), $status, true, $help, $error_msg); } else { diff --git a/view/templates/htconfig.tpl b/view/templates/htconfig.tpl deleted file mode 100644 index dc2d4bcdab..0000000000 --- a/view/templates/htconfig.tpl +++ /dev/null @@ -1,118 +0,0 @@ -config['system']['db_charset'] = "utf8mb4"; - -// email adress for the system admin - -$a->config['admin_email'] = '{{$adminmail}}'; - -// Location of PHP command line processor - -$a->config['php_path'] = '{{$phpath}}'; - -// If you are using a subdirectory of your domain you will need to put the -// relative path (from the root of your domain) here. -// For instance if your URL is 'http://example.com/directory/subdirectory', -// set path to 'directory/subdirectory'. - -$a->path = '{{$urlpath}}'; - -// Allowed protocols in link URLs; HTTP protocols always are accepted -$a->config['system']['allowed_link_protocols'] = array('ftp', 'ftps', 'mailto', 'cid', 'gopher'); - -/* ********************************************************************* - * The configuration below will be overruled by the admin panel. - * Changes made below will only have an effect if the database does - * not contain any configuration for the friendica system. - * *********************************************************************/ - -// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles". -// It can be changed later and only applies to timestamps for anonymous viewers. - -$default_timezone = '{{$timezone}}'; - -// Default system language - -$a->config['system']['language'] = '{{$language}}'; - -// What is your site name? - -$a->config['sitename'] = "My Friend Network"; - -// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. -// Be certain to create your own personal account before setting -// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on -// the registration page. REGISTER_APPROVE requires you set 'admin_email' -// to the email address of an already registered person who can authorise -// and/or approve/deny the request. - -$a->config['register_policy'] = REGISTER_OPEN; -$a->config['register_text'] = ''; - -// Maximum size of an imported message, 0 is unlimited - -$a->config['max_import_size'] = 200000; - -// maximum size of uploaded photos - -$a->config['system']['maximagesize'] = 800000; - -// Server-to-server private message encryption (RINO) is allowed by default. -// set to 0 to disable, 1 to enable - -$a->config['system']['rino_encrypt'] = {{$rino}}; - -// default system theme - -$a->config['system']['theme'] = 'vier'; -$a->config['system']['allowed_themes'] = 'vier,quattro,duepuntozero,smoothly,frio'; - -// By default allow pseudonyms - -$a->config['system']['no_regfullname'] = true; - -//Deny public access to the local directory -//$a->config['system']['block_local_dir'] = false; - -// Location of the global directory -$a->config['system']['directory'] = 'https://dir.friendica.social'; - -// Authentication cookie lifetime, in days -$a->config['system']['auth_cookie_lifetime'] = 7; diff --git a/view/templates/local.ini.tpl b/view/templates/local.ini.tpl index 1b91fec88f..632b34e5a7 100644 --- a/view/templates/local.ini.tpl +++ b/view/templates/local.ini.tpl @@ -1,15 +1,5 @@