X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Finstall.php;h=99ebfc6bab3a792ace3514b68c8dcb3785eeb0b1;hb=f7597d42ad9ffeed1774e9957237e1366270fc36;hp=c6fe7083626a6f177ed676a21b07a27825cdd37e;hpb=36724eb8ea53cc2272b6c86b153e16f9a09062dd;p=friendica.git

diff --git a/mod/install.php b/mod/install.php
index c6fe708362..99ebfc6bab 100755
--- a/mod/install.php
+++ b/mod/install.php
@@ -73,7 +73,7 @@ function install_post(&$a) {
 			// connect to db
 			$db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
 
-			$tpl = get_intltext_template('htconfig.tpl');
+			$tpl = get_markup_template('htconfig.tpl');
 			$txt = replace_macros($tpl,array(
 				'$dbhost' => $dbhost,
 				'$dbuser' => $dbuser,
@@ -84,13 +84,15 @@ function install_post(&$a) {
 				'$phpath' => $phpath,
 				'$adminmail' => $adminmail
 			));
+			
 
 			$result = file_put_contents('.htconfig.php', $txt);
 			if(! $result) {
 				$a->data['txt'] = $txt;
 			}
-
+			
 			$errors = load_database($db);
+			
 
 			if($errors)
 				$a->data['db_failed'] = $errors;
@@ -148,7 +150,7 @@ function install_content(&$a) {
 			return replace_macros($tpl, array(
 				'$title' => $install_title,
 				'$pass' => '',
-				'$status' => t('Permission denied.'),
+				'$status' => t('Database already in use.'),
 				'$text' => '',
 			));
 		}
@@ -466,16 +468,19 @@ function check_htaccess(&$checks) {
 	$status = true;
 	$help = "";
 	if (function_exists('curl_init')){
-        $test = fetch_url($a->get_baseurl()."/install/testrewrite");
-        if ($test!="ok") {
-            $status = false;
-            $help = t('Url rewrite in .htaccess is not working. Check your server configuration.');
-        }
-        check_add($checks, t('Url rewrite is working'), $status, true, $help);
-    } else {
-        // cannot check modrewrite if libcurl is not installed
-    }
+		$test = fetch_url($a->get_baseurl()."/install/testrewrite");
+
+		if ($test!="ok")
+			$test = fetch_url(normalise_link($a->get_baseurl()."/install/testrewrite"));
 
+		if ($test!="ok") {
+			$status = false;
+			$help = t('Url rewrite in .htaccess is not working. Check your server configuration.');
+		}
+		check_add($checks, t('Url rewrite is working'), $status, true, $help);
+	} else {
+		// cannot check modrewrite if libcurl is not installed
+	}
 }