X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Finstall.php;h=2339124469ef220c8373de7d48c7ada6a3b88524;hb=778935eb48e9700ca2e879b1fe377541817705a0;hp=db8f730714fbf04dc7c615f023e7222927e8a6ac;hpb=16123f5ad5ec08257ba97e1def23db90ce9062f7;p=friendica.git

diff --git a/mod/install.php b/mod/install.php
index db8f730714..2339124469 100755
--- a/mod/install.php
+++ b/mod/install.php
@@ -11,6 +11,14 @@ function install_init(&$a){
 		echo "ok";
 		killme();
 	}
+	
+	// We overwrite current theme css, because during install we could not have a working mod_rewrite
+	// so we could not have a css at all. Here we set a static css file for the install procedure pages
+	$a->config['system']['theme'] = "../install";
+	$a->theme['stylesheet'] = $a->get_baseurl()."/view/install/style.css";
+	
+	
+	
 	global $install_wizard_pass;
 	if (x($_POST,'pass'))
 		$install_wizard_pass = intval($_POST['pass']);
@@ -69,7 +77,16 @@ function install_post(&$a) {
 			$dbdata = notags(trim($_POST['dbdata']));
 			$phpath = notags(trim($_POST['phpath']));
 			$timezone = notags(trim($_POST['timezone']));
+			$language = notags(trim($_POST['language']));
 			$adminmail = notags(trim($_POST['adminmail']));
+			// In step 4 of the installer, we passed the  check for mcrypt
+			// already, so we can activate RINO, make RINO2 the default
+			// and only fall back if the mcrypt_create_iv function is
+			// not available on the system.
+			$rino = 2;
+			if (! function_exists('mcrypt_create_iv')) {
+				$rino = 1;
+			]
 
 			// connect to db
 			$db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
@@ -81,9 +98,11 @@ function install_post(&$a) {
 				'$dbpass' => $dbpass,
 				'$dbdata' => $dbdata,
 				'$timezone' => $timezone,
+				'$language' => $language,
 				'$urlpath' => $urlpath,
 				'$phpath' => $phpath,
-				'$adminmail' => $adminmail
+				'$adminmail' => $adminmail,
+				'$rino' => $rino
 			));
 
 
@@ -265,6 +284,8 @@ function install_content(&$a) {
 
 			$adminmail = notags(trim($_POST['adminmail']));
 			$timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles');
+			/* Installed langs */
+			$lang_choices = get_avaiable_languages();
 
 			$tpl = get_markup_template('install_settings.tpl');
 			$o .= replace_macros($tpl, array(
@@ -283,7 +304,7 @@ function install_content(&$a) {
 
 
 				'$timezone' => field_timezone('timezone', t('Please select a default timezone for your website'), $timezone, ''),
-
+				'$language' => array('language', t('System Language:'), 'en', t('Set the default language for your Friendica installation interface and to send emails.'), $lang_choices),
 				'$baseurl' => $a->get_baseurl(),
 
 
@@ -324,7 +345,7 @@ function check_php(&$phpath, &$checks) {
 	$help = "";
 	if(!$passed) {
 		$help .= t('Could not find a command line version of PHP in the web server PATH.'). EOL;
-		$help .= t("If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron. See <a href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>") . EOL ;
+		$help .= t("If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron. See <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'Setup the poller'</a>") . EOL ;
 		$help .= EOL . EOL ;
 		$tpl = get_markup_template('field_input.tpl');
 		$help .= replace_macros($tpl, array(
@@ -431,9 +452,20 @@ function check_funcs(&$checks) {
 		$ck_funcs[5]['help']= t('Error: mcrypt PHP module required but not installed.');
 	}
 
+	$checks = array_merge($checks, $ck_funcs);
 
+	// check for 'mcrypt_create_iv()', needed for RINO2
+	if ($ck_funcs[5]['status']) {
+		if (function_exists('mcrypt_create_iv')) {
+			$__status = true;
+			$__help = t("If you are using php_cli, please make sure that mcrypt module is enabled in its config file");
+		} else {
+			$__status = false;
+			$__help = t('Function mcrypt_create_iv() is not defined. This is needed to enable RINO2 encryption layer.');
+		}
+		check_add($checks, t('mcrypt_create_iv() function'), $__status, false, $__help);
+	}
 
-	$checks = array_merge($checks, $ck_funcs);
 
 	/*if((x($_SESSION,'sysmsg')) && is_array($_SESSION['sysmsg']) && count($_SESSION['sysmsg']))
 		notice( t('Please see the file "INSTALL.txt".') . EOL);*/
@@ -511,6 +543,7 @@ function check_imagik(&$checks) {
 }
 
 
+
 function manual_config(&$a) {
 	$data = htmlentities($a->data['txt'],ENT_COMPAT,'UTF-8');
 	$o = t('The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.');