X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Finstall.php;h=5c508e4f2c79f0c3d8990df3a7369636e1980eac;hb=7defb1768bff1c3da7ea63957cf8c7c928d379ab;hp=cbe3b2fc9b190995c2cbf0c611362bd49edbe551;hpb=de6c777d3f6753b8fb5f33bc0ee8acafc6772551;p=friendica.git

diff --git a/mod/install.php b/mod/install.php
index cbe3b2fc9b..5c508e4f2c 100644
--- a/mod/install.php
+++ b/mod/install.php
@@ -5,6 +5,7 @@ function install_post(&$a) {
 
 	global $db;
 
+	$urlpath = $a->get_path();
 	$dbhost = notags(trim($_POST['dbhost']));
 	$dbuser = notags(trim($_POST['dbuser']));
 	$dbpass = notags(trim($_POST['dbpass']));
@@ -13,17 +14,20 @@ function install_post(&$a) {
 	$phpath = notags(trim($_POST['phpath']));
 
 	require_once("dba.php");
-
-	$db = new dba($dbhost, $dbuser, $dbpass, $dbdata, $true);
+	unset($db);
+	$db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
 
 	if(mysqli_connect_errno()) {
+		unset($db);
 		$db = new dba($dbhost, $dbuser, $dbpass, '', true);
-		if(! mysql_connect_errno()) {
+		if(! mysqli_connect_errno()) {
 			$r = q("CREATE DATABASE '%s'",
 					dbesc($dbdata)
 			);
-			if($r) 
-				$db = new dba($dbhost, $dbuser, $dbpass, $dbdata, $true);
+			if($r) {
+				unset($db);
+				$db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
+			}
 		}
 		if(mysqli_connect_errno()) {
 			notice( t('Could not create/connect to database.') . EOL);
@@ -40,6 +44,7 @@ function install_post(&$a) {
 		'$dbpass' => $dbpass,
 		'$dbdata' => $dbdata,
 		'$timezone' => $timezone,
+		'$urlpath' => $urlpath,
 		'$phpath' => $phpath
 	));
 	$result = file_put_contents('.htconfig.php', $txt);
@@ -48,36 +53,47 @@ function install_post(&$a) {
 	}
 
 	$errors = load_database($db);
-	if(! $errors) {
-		// Our sessions normally are stored in the database. But as we have only managed 
-		// to get it bootstrapped milliseconds ago, we have to apply a bit of trickery so 
-		// that you'll see the following important notice (which is stored in the session). 
-
-		session_write_close();
 
-		require_once('session.php');
-		session_start();
-		session_regenerate_id();
+	if($errors)
+		$a->data['db_failed'] = true;
+	else
+		$a->data['db_installed'] = true;
 
-		$_SESSION['sysmsg'] = '';
-
-		notice( t('Database import succeeded.') . EOL 
-			. t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.') . EOL 
-			. t('Please see the file INSTALL.') . EOL );
-		goaway($a->get_baseurl() . '/register' );
-	}
-	else {
-		$db = null; // start fresh
-		notice( t('Database import failed.') . EOL
-			. t('You may need to import the file "database.sql" manually using phpmyadmin or mysql.') . EOL
-			. t('Please see the file INSTALL.') . EOL );
-	}
+	return;
 }
 
 
 function install_content(&$a) {
 
+	global $db;
 	$o = '';
+	
+	if(x($a->data,'db_installed')) {
+		$o .= '<h2>' . t('Proceed with Installation') . '</h2>';
+		$o .= '<p style="font-size: 130%;">';
+		$o .= t('Your Friendika site database has been installed.') . EOL;
+		$o .= t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.') . EOL ;
+		$o .= t('Please see the file "INSTALL.txt".') . EOL ;
+		$o .= '<br />';
+		$o .= '<a href="' . $a->get_baseurl() . '/register' . '">' . t('Proceed to registration') . '</a>' ;
+		$o .= '</p>';
+		return $o;
+	}
+
+	if(x($a->data,'db_failed')) {
+		$o .= t('Database import failed.') . EOL;
+		$o .= t('You may need to import the file "database.sql" manually using phpmyadmin or mysql.') . EOL;
+		$o .= t('Please see the file "INSTALL.txt".') . EOL ;
+		return $o;
+	}
+
+	if($db && $db->connected) {
+		$r = q("SELECT COUNT(*) as `total` FROM `user`");
+		if($r && count($r) && $r[0]['total']) {
+			notice( t('Permission denied.') . EOL);
+			return '';
+		}
+	}
 
 	notice( t('Welcome to Friendika.') . EOL);
 
@@ -95,10 +111,14 @@ function install_content(&$a) {
 
 	$o .= check_php($phpath);
 
+	$o .= check_keys();
+
+
 	require_once('datetime.php');
 
 	$tpl = load_view_file('view/install_db.tpl');
 	$o .= replace_macros($tpl, array(
+		'$baseurl' => $a->get_baseurl(),
 		'$tzselect' => ((x($_POST,'timezone')) ? select_timezone($_POST['timezone']) : select_timezone()),
 		'$submit' => t('Submit'),
 		'$dbhost' => ((x($_POST,'dbhost')) ? notags(trim($_POST['dbhost'])) : 'localhost'),
@@ -115,12 +135,45 @@ function check_php(&$phpath) {
 	$o = '';
 	$phpath = trim(shell_exec('which php'));
 	if(! strlen($phpath)) {
-		$o .= t('Could not find a command line version of PHP in the web server PATH.');
-		$o .= t('This is required. Please adjust the configuration file .htconfig.php accordingly.');
+		$o .= t('Could not find a command line version of PHP in the web server PATH.') . EOL;
+		$o .= t('This is required. Please adjust the configuration file .htconfig.php accordingly.') . EOL;
+	}
+	if(strlen($phpath)) {
+		$str = autoname(8);
+		$cmd = "$phpath testargs.php $str";
+		$result = trim(shell_exec($cmd));
+		if($result != $str) {
+			$o .= t('The command line version of PHP on your system does not have "register_argc_argv" enabled.') . EOL;
+			$o .= t('This is required for message delivery to work.') . EOL;
+		}
+	}
+	return $o;
+
+}
+
+function check_keys() {
+
+	$o = '';
+
+	$res = false;
+
+	if(function_exists('openssl_pkey_new')) 
+		$res=openssl_pkey_new(array(
+		'digest_alg' => 'sha1',
+		'private_key_bits' => 4096,
+		'encrypt_key' => false ));
+
+	// Get private key
+
+	if(! $res) {
+		$o .= t('Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys') . EOL;
+		$o .= t('If running under Windows, please see "http://www.php.net/manual/en/openssl.installation.php".') . EOL;
 	}
 	return $o;
+
 }
 
+
 function check_funcs() {
 	if((function_exists('apache_get_modules')) && (! in_array('mod_rewrite',apache_get_modules())))
 		notice( t('Error: Apache webserver mod-rewrite module is required but not installed.') . EOL);
@@ -133,7 +186,7 @@ function check_funcs() {
 	if(! function_exists('mysqli_connect')) 
 		notice( t('Error: mysqli PHP module required but not installed.') . EOL);	
 	if((x($_SESSION,'sysmsg')) && strlen($_SESSION['sysmsg']))
-		notice( t('Please see the file "INSTALL".') . EOL);
+		notice( t('Please see the file "INSTALL.txt".') . EOL);
 }
 
 
@@ -145,7 +198,7 @@ function check_htconfig() {
 		$o = t('The web installer needs to be able to create a file called ".htconfig.php" in the top folder of your web server and it is unable to do so.');
 		$o .= t('This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.');
 		$o .= t('Please check with your site documentation or support people to see if this situation can be corrected.');
-		$o .= t('If not, you may be required to perform a manual installation. Please see the file "INSTALL" for instructions.'); 
+		$o .= t('If not, you may be required to perform a manual installation. Please see the file "INSTALL.txt" for instructions.'); 
 	}
 
 	return $o;