+++ /dev/null
-<?php
-
-// If automatic system installation fails:
-
-
-die('The configuration you did manually contains some mistakes. Please have a look at your .htconfig.php file.');
-// If you are doing the configuration manually, please remove the line above
-
-
-// Copy or rename this file to .htconfig.php
-
-// Why .htconfig.php? Because it contains sensitive information which could
-// give somebody complete control of your database. Apache's default
-// configuration denies access to and refuses to serve any file beginning
-// with .ht
-
-// Then set the following for your MySQL installation
-
-$db_host = 'your.mysqlhost.com';
-$db_user = 'mysqlusername';
-$db_pass = 'mysqlpassword';
-$db_data = 'mysqldatabasename';
-
-// Use environment variables for mysql if they are set beforehand
-if (!empty(getenv('MYSQL_HOST'))
- && (!empty(getenv('MYSQL_USERNAME')) || !empty(getenv('MYSQL_USER')))
- && !getenv('MYSQL_PASSWORD') === false
- && !empty(getenv('MYSQL_DATABASE'))) {
- $db_host = getenv('MYSQL_HOST');
- if (!empty(getenv('MYSQL_PORT'))) {
- $db_host .= ':' . getenv('MYSQL_PORT');
- }
- if (!empty(getenv('MYSQL_USERNAME'))) {
- $db_user = getenv('MYSQL_USERNAME');
- } else {
- $db_user = getenv('MYSQL_USER');
- }
- $db_pass = (string) getenv('MYSQL_PASSWORD');
- $db_data = getenv('MYSQL_DATABASE');
-}
-
-// Set the database connection charset to full Unicode (utf8mb4).
-// Changing this value will likely corrupt the special characters.
-// You have been warned.
-$a->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;
$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;
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);
\r
$checkspassed = array_reduce($checks,\r
function ($v, $c) {\r
- if ($c['require']) {\r
+ if (!empty($c['require'])) {\r
$v = $v && $c['status'];\r
}\r
return $v;\r
* @param string $adminmail Mail-Adress of the administrator\r
* @param int $rino Rino-enabled (1 = true, 0 = false)\r
*/\r
- public static function install($urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $phpath, $timezone, $language, $adminmail, $rino = 1)\r
+ public static function install($urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $phpath, $timezone, $language, $adminmail)\r
{\r
$tpl = get_markup_template('local.ini.tpl');\r
$txt = replace_macros($tpl,[\r
'$urlpath' => $urlpath,\r
'$phpath' => $phpath,\r
'$adminmail' => $adminmail,\r
- '$rino' => $rino\r
]);\r
\r
$result = file_put_contents('config/local.ini.php', $txt);\r
$error_msg = [];\r
$error_msg['head'] = L10n::t('Error message from Curl when fetching');\r
$error_msg['url'] = $test['redirect_url'];\r
- $error_msg['msg'] = $test['error'];\r
+ $error_msg['msg'] = defaults($test, 'error', '');\r
}\r
self::addCheck($checks, L10n::t('Url rewrite is working'), $status, true, $help, $error_msg);\r
} else {\r
+++ /dev/null
-<?php
-
-/* ********************************************************************
- * The following configuration has to be within the .htconfig.php
- * file and will not be overruled by decisions made in the admin panel.
- *
- * See below for variables that may be overruled by the admin panel.
- * ********************************************************************/
-
-// Set the following for your MySQL installation
-//
-// If you need to specify a port for reacing the database, you can do so by
-// adding ":portnumber" after "your.mysqlhost.com" in the $db_host config.
-
-$db_host = '{{$dbhost}}';
-$db_user = '{{$dbuser}}';
-$db_pass = '{{$dbpass}}';
-$db_data = '{{$dbdata}}';
-
-// Use environment variables for mysql if they are set beforehand
-if (!empty(getenv('MYSQL_HOST'))
- && !empty(getenv('MYSQL_PORT'))
- && (!empty(getenv('MYSQL_USERNAME')) || !empty(getenv('MYSQL_USER')))
- && !empty(getenv('MYSQL_PASSWORD'))
- && !empty(getenv('MYSQL_DATABASE'))) {
- $db_host = getenv('MYSQL_HOST') . ':' . getenv('MYSQL_PORT');
- if (!empty(getenv('MYSQL_USERNAME'))) {
- $db_user = getenv('MYSQL_USERNAME');
- } elseif (!empty(getenv('MYSQL_USER'))) {
- $db_user = getenv('MYSQL_USER');
- }
- $db_pass = getenv('MYSQL_PASSWORD');
- $db_data = getenv('MYSQL_DATABASE');
-}
-
-
-// Set the database connection charset to full Unicode (utf8mb4).
-// Changing this value will likely corrupt the special characters.
-// You have been warned.
-$a->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;
<?php return <<<INI
-; If automatic system installation fails:
-
-; Copy this file to local.ini.php
-
-; Why local.ini.php? Because it contains sensitive information which could
-; give somebody complete control of your database. Apache's default
-; configuration will interpret any .php file as a script and won't show the values
-
-; Then set the following for your MySQL installation
-
[database]
hostname = {{$dbhost}}
username = {{$dbuser}}
language = {{$language}}
-rino_encrypt = {{$rino}}
-
allowed_themes = vier,quattro,duepuntozero,smoothly,frio
theme = vier
projects / friendica.git / commitdiff