X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Finstall.php;h=1e0d7a5fa527f5d6daef42c3b6792bc0f2c73780;hb=789e1f4275bb216183f93cc392bd6faebfe87fb9;hp=8434b38e387f21e7953bc68b9c2163750284cd34;hpb=c5f2157eb2914de06ae098907b1dfb68fc4d03e3;p=friendica.git

diff --git a/mod/install.php b/mod/install.php
index 8434b38e38..1e0d7a5fa5 100755
--- a/mod/install.php
+++ b/mod/install.php
@@ -77,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);
@@ -89,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
 			));
 
 
@@ -273,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(
@@ -291,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(),
 
 
@@ -404,7 +417,8 @@ function check_funcs(&$checks) {
 	check_add($ck_funcs, t('mysqli PHP module'), true, true, "");
 	check_add($ck_funcs, t('mb_string PHP module'), true, true, "");
 	check_add($ck_funcs, t('mcrypt PHP module'), true, true, "");
-
+	check_add($ck_funcs, t('XML PHP module'), true, true, "");
+	check_add($ck_funcs, t('iconv module'), true, true, "");
 
 	if(function_exists('apache_get_modules')){
 		if (! in_array('mod_rewrite',apache_get_modules())) {
@@ -438,6 +452,10 @@ function check_funcs(&$checks) {
 		$ck_funcs[5]['status']= false;
 		$ck_funcs[5]['help']= t('Error: mcrypt PHP module required but not installed.');
 	}
+	if(! function_exists('iconv_strlen')){
+		$ck_funcs[7]['status']= false;
+		$ck_funcs[7]['help']= t('Error: iconv PHP module required but not installed.');
+	}
 
 	$checks = array_merge($checks, $ck_funcs);
 
@@ -445,7 +463,7 @@ function check_funcs(&$checks) {
 	if ($ck_funcs[5]['status']) {
 		if (function_exists('mcrypt_create_iv')) {
 			$__status = true;
-			$__help = "If you are using php_cli, please make sure that mcrypt module is enabled in its config file";
+			$__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.');
@@ -453,6 +471,13 @@ function check_funcs(&$checks) {
 		check_add($checks, t('mcrypt_create_iv() function'), $__status, false, $__help);
 	}
 
+	// check for XML DOM Documents being able to be generated
+	try {
+		$xml = new DOMDocument();
+	} catch (Exception $e) {
+		$ck_funcs[6]['status'] = false;
+		$ck_funcs[6]['help'] = t('Error, XML PHP module required but not installed.');
+	}
 
 	/*if((x($_SESSION,'sysmsg')) && is_array($_SESSION['sysmsg']) && count($_SESSION['sysmsg']))
 		notice( t('Please see the file "INSTALL.txt".') . EOL);*/