X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Finstall.php;h=3adcb75aa45b007ab234fd6418bbccb8769cb3f8;hb=bc848526829c9808868bb8520f8e3510b1a0000e;hp=cbad3b2548d6cad36ebdd0a9eae7adfe3c79d3e5;hpb=9ab55181ed9a08c4887eabe5a85e58bc3b34d9fb;p=friendica.git

diff --git a/mod/install.php b/mod/install.php
index cbad3b2548..3adcb75aa4 100644
--- a/mod/install.php
+++ b/mod/install.php
@@ -2,12 +2,15 @@
 /**
  * @file mod/install.php
  */
+
 use Friendica\App;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Database\DBStructure;
 use Friendica\Object\Image;
+use Friendica\Util\Network;
+use Friendica\Util\Temporal;
 
 $install_wizard_pass = 1;
 
@@ -219,6 +222,7 @@ function install_content(App $a) {
 			$dbdata = notags(trim($_POST['dbdata']));
 			$phpath = notags(trim($_POST['phpath']));
 
+			$adminmail = notags(trim($_POST['adminmail']));
 
 			$tpl = get_markup_template('install_db.tpl');
 			$o .= replace_macros($tpl, [
@@ -250,7 +254,6 @@ function install_content(App $a) {
 			return $o;
 		}; break;
 		case 3: { // Site settings
-			require_once('include/datetime.php');
 			$dbhost = ((x($_POST, 'dbhost')) ? notags(trim($_POST['dbhost'])) : 'localhost');
 			$dbuser = notags(trim($_POST['dbuser']));
 			$dbpass = notags(trim($_POST['dbpass']));
@@ -278,7 +281,7 @@ function install_content(App $a) {
 				'$adminmail' => ['adminmail', L10n::t('Site administrator email address'), $adminmail, L10n::t('Your account email address must match this in order to use the web admin panel.'), 'required', 'autofocus', 'email'],
 
 
-				'$timezone' => field_timezone('timezone', L10n::t('Please select a default timezone for your website'), $timezone, ''),
+				'$timezone' => Temporal::getTimezoneField('timezone', L10n::t('Please select a default timezone for your website'), $timezone, ''),
 				'$language' => ['language', L10n::t('System Language:'), 'en', L10n::t('Set the default language for your Friendica installation interface and to send emails.'), $lang_choices],
 				'$baseurl' => System::baseUrl(),
 
@@ -482,10 +485,10 @@ function check_htaccess(&$checks) {
 	$status = true;
 	$help = "";
 	if (function_exists('curl_init')) {
-		$test = fetch_url(System::baseUrl()."/install/testrewrite");
+		$test = Network::fetchUrl(System::baseUrl()."/install/testrewrite");
 
 		if ($test != "ok") {
-			$test = fetch_url(normalise_link(System::baseUrl()."/install/testrewrite"));
+			$test = Network::fetchUrl(normalise_link(System::baseUrl()."/install/testrewrite"));
 		}
 
 		if ($test != "ok") {