Merge remote-tracking branch 'friendica/master'

boot.php

@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1213' );
+define ( 'FRIENDICA_VERSION',      '2.3.1214' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1114      );
 

include/bbcode.php

@@ -27,7 +27,7 @@ function tryoembed($match){
 
 
 	// BBcode 2 HTML was written by WAY2WEB.net
-	// extended to work with Mistpark/Friendika - Mike Macgirvin
+	// extended to work with Mistpark/Friendica - Mike Macgirvin
 
 function bbcode($Text,$preserve_nl = false) {
 

include/conversation.php

@@ -892,3 +892,63 @@ function status_editor($a,$x, $notes_cid = 0) {
 
 	return $o;
 }
+
+
+function conv_sort($arr,$order) {
+
+	if((!(is_array($arr) && count($arr))))
+		return array();
+
+	$parents = array();
+
+	foreach($arr as $x)
+		if($x['id'] == $x['parent'])
+				$parents[] = $x;
+
+	if(stristr($order,'created'))
+		usort($parents,'sort_thr_created');
+	elseif(stristr($order,'commented'))
+		usort($parents,'sort_thr_commented');
+
+	foreach($parents as $x) 
+		$x['children'] = array();
+
+	foreach($arr as $x) {
+		if($x['id'] != $x['parent']) {
+			$p = find_thread_parent_index($parents,$x);
+			$parents[$p]['children'][] = $x;
+		}
+	}
+	foreach($parents as $x)
+		if(count($x['children']))
+			usort($x['children'],'sort_thr_created_rev');
+
+	$ret = array();
+	foreach($parents as $x) {
+		$ret[] = $x;
+		if(count($x['children']))
+			foreach($x['children'] as $y)
+				$ret[] = $y;
+	}
+
+	return $ret;
+}
+
+
+function sort_thr_created($a,$b) {
+	return strcmp($b['created'],$a['created']);
+}
+
+function sort_thr_created_rev($a,$b) {
+	return strcmp($a['created'],$b['created']);
+}
+
+function sort_thr_commented($a,$b) {
+	return strcmp($b['commented'],$a['commented']);
+}
+
+function find_thread_parent_index($arr,$x) {
+	foreach($arr as $k => $v)
+		if($v['id'] == $x['parent'])
+			return $k;
+}

include/datetime.php

@@ -15,7 +15,6 @@ function timezone_cmp($a, $b) {
 }}
 
 // emit a timezone selector grouped (primarily) by continent
-
 if(! function_exists('select_timezone')) {
 function select_timezone($current = 'America/Los_Angeles') {
 
@@ -55,6 +54,23 @@ function select_timezone($current = 'America/Los_Angeles') {
 	return $o;
 }}
 
+// return a select using 'field_select_raw' template, with timezones 
+// groupped (primarily) by continent
+// arguments follow convetion as other field_* template array:
+// 'name', 'label', $value, 'help'
+if (!function_exists('field_timezone')){
+function field_timezone($name='timezone', $label='', $current = 'America/Los_Angeles', $help){
+	$options = select_timezone($current);
+	$options = str_replace('<select id="timezone_select" name="timezone">','', $options);
+	$options = str_replace('</select>','', $options);
+	
+	$tpl = get_markup_template('field_select_raw.tpl');
+	return replace_macros($tpl, array(
+		'$field' => array($name, $label, $current, $help, $options),
+	));
+	
+}}
+
 // General purpose date parse/convert function.
 // $from = source timezone
 // $to   = dest timezone

include/dba.php

@@ -18,7 +18,7 @@ class dba {
 	private $db;
 	public  $mysqli = true;
 	public  $connected = false;
-
+	public  $error = false;
 
 	function __construct($server,$user,$pass,$db,$install = false) {
 
@@ -27,10 +27,16 @@ class dba {
 		$pass = trim($pass);
 		$db = trim($db);
 
+		if (!(strlen($server) && strlen($user))){
+			$this->connected = false;
+			$this->db = null;
+			return;			
+		}
+		
 		if($install) {
 			if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) {
 				if(! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) {
-					notice( sprintf( t('Cannot locate DNS info for database server \'%s\''), $server));
+					$this->error = sprintf( t('Cannot locate DNS info for database server \'%s\''), $server);
 					$this->connected = false;
 					$this->db = null;
 					return;
@@ -152,10 +158,11 @@ class dba {
 	}
 
 	function __destruct() {
-		if($this->mysqli)
+		if ($this->db) 
-			@$this->db->close();
+			if($this->mysqli)
-		else
+				$this->db->close();
-			@mysql_close($this->db);
+			else
+				mysql_close($this->db);
 	}
 }}
 
@@ -186,6 +193,7 @@ function dbesc($str) {
 }}
 
 
+
 // Function: q($sql,$args);
 // Description: execute SQL query with printf style args.
 // Example: $r = q("SELECT * FROM `%s` WHERE `uid` = %d",
@@ -209,7 +217,6 @@ function q($sql) {
 	 * session data after abnormal program termination 
 	 *
 	 */
-
 	logger('dba: no database: ' . print_r($args,true));
 	return false; 
 

include/text.php

@@ -426,6 +426,10 @@ function attribute_contains($attr,$s) {
 
 if(! function_exists('logger')) {
 function logger($msg,$level = 0) {
+	// turn off logger in install mode
+	global $a;
+	if ($a->module == 'install') return;
+	
 	$debugging = get_config('system','debugging');
 	$loglevel  = intval(get_config('system','loglevel'));
 	$logfile   = get_config('system','logfile');

mod/install.php

@@ -1,68 +1,99 @@
 <?php
 
+$install_wizard_pass=1;
+
+
+function install_init(&$a){
+	global $install_wizard_pass;
+	if (x($_POST,'pass'))
+		$install_wizard_pass = intval($_POST['pass']);
+
+}
 
 function install_post(&$a) {
+	global $install_wizard_pass, $db;
 
-	global $db;
+	switch($install_wizard_pass) {
-
+		case 1:
-	$urlpath = $a->get_path();
+		case 2:
-	$dbhost = notags(trim($_POST['dbhost']));
-	$dbuser = notags(trim($_POST['dbuser']));
-	$dbpass = notags(trim($_POST['dbpass']));
-	$dbdata = notags(trim($_POST['dbdata']));
-	$timezone = notags(trim($_POST['timezone']));
-	$phpath = notags(trim($_POST['phpath']));
-	$adminmail = notags(trim($_POST['adminmail']));
-
-	require_once("dba.php");
-	unset($db);
-	$db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
-
-	if(get_db_errno()) {
-		unset($db);
-		$db = new dba($dbhost, $dbuser, $dbpass, '', true);
-		if(! get_db_errno()) {
-			$r = q("CREATE DATABASE '%s'",
-					dbesc($dbdata)
-			);
-			if($r) {
-				unset($db);
-				$db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
-			}
-		}
-		if(get_db_errno()) {
-			notice( t('Could not create/connect to database.') . EOL);
 			return;
-		}
+			break; // just in case return don't return :)
+		case 3:
+			$urlpath = $a->get_path();
+			$dbhost = notags(trim($_POST['dbhost']));
+			$dbuser = notags(trim($_POST['dbuser']));
+			$dbpass = notags(trim($_POST['dbpass']));
+			$dbdata = notags(trim($_POST['dbdata']));
+			$phpath = notags(trim($_POST['phpath']));
+
+			require_once("dba.php");
+			unset($db);
+			$db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
+			/*if(get_db_errno()) {
+				unset($db);
+				$db = new dba($dbhost, $dbuser, $dbpass, '', true);
+
+				if(! get_db_errno()) {
+					$r = q("CREATE DATABASE '%s'",
+							dbesc($dbdata)
+					);
+					if($r) {
+						unset($db);
+						$db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
+					} else {
+						$a->data['db_create_failed']=true;
+					}
+				} else {
+					$a->data['db_conn_failed']=true;
+					return;
+				}
+			}*/
+			if(get_db_errno()) {
+				$a->data['db_conn_failed']=true;
+			}
+
+			return; 
+			break;
+		case 4;
+			$urlpath = $a->get_path();
+			$dbhost = notags(trim($_POST['dbhost']));
+			$dbuser = notags(trim($_POST['dbuser']));
+			$dbpass = notags(trim($_POST['dbpass']));
+			$dbdata = notags(trim($_POST['dbdata']));
+			$phpath = notags(trim($_POST['phpath']));
+			$timezone = notags(trim($_POST['timezone']));
+			$adminmail = notags(trim($_POST['adminmail']));
+
+			// connect to db
+			$db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
+
+			$tpl = get_intltext_template('htconfig.tpl');
+			$txt = replace_macros($tpl,array(
+				'$dbhost' => $dbhost,
+				'$dbuser' => $dbuser,
+				'$dbpass' => $dbpass,
+				'$dbdata' => $dbdata,
+				'$timezone' => $timezone,
+				'$urlpath' => $urlpath,
+				'$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;
+			else
+				$a->data['db_installed'] = true;
+
+			return;
+		break;
 	}
-
-	info( t('Connected to database.') . EOL);
-
-	$tpl = get_intltext_template('htconfig.tpl');
-	$txt = replace_macros($tpl,array(
-		'$dbhost' => $dbhost,
-		'$dbuser' => $dbuser,
-		'$dbpass' => $dbpass,
-		'$dbdata' => $dbdata,
-		'$timezone' => $timezone,
-		'$urlpath' => $urlpath,
-		'$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'] = true;
-	else
-		$a->data['db_installed'] = true;
-
-	return;
 }
 
 function get_db_errno() {
@@ -74,107 +105,249 @@ function get_db_errno() {
 
 function install_content(&$a) {
 
-	global $db;
+	global $install_wizard_pass, $db;
 	$o = '';
+	$wizard_status = "";
+	$install_title = t('Friendica Social Communications Server - Setup');
+	
+	if(x($a->data,'txt') && strlen($a->data['txt'])) {
+		$tpl = get_markup_template('install.tpl');
+		return replace_macros($tpl, array(
+			'$title' => $install_title,
+			'$pass' => t('Database connection'),
+			'$text' => manual_config($a),
+		));
+	}
+	
+	if(x($a->data,'db_conn_failed')) {
+		$install_wizard_pass = 2;
+		$wizard_status =  t('Could not connect to database.');
+	}
+	if(x($a->data,'db_create_failed')) {
+		$install_wizard_pass = 2;
+		$wizard_status =  t('Could not create table.');
+	}
 	
 	if(x($a->data,'db_installed')) {
-		$o .= '<h2>' . t('Proceed with Installation') . '</h2>';
+		$txt = '<p style="font-size: 130%;">';
-		$o .= '<p style="font-size: 130%;">';
+		$txt .= t('Your Friendica site database has been installed.') . EOL;
-		$o .= t('Your Friendica site database has been installed.') . EOL;
+		$txt .= t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.') . EOL ;
-		$o .= t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.') . EOL ;
+		$txt .= t('Please see the file "INSTALL.txt".') . EOL ;
-		$o .= t('Please see the file "INSTALL.txt".') . EOL ;
+		$txt .= '<br />';
-		$o .= '<br />';
+		$txt .= '<a href="' . $a->get_baseurl() . '/register' . '">' . t('Proceed to registration') . '</a>' ;
-		$o .= '<a href="' . $a->get_baseurl() . '/register' . '">' . t('Proceed to registration') . '</a>' ;
+		$txt .= '</p>';
-		$o .= '</p>';
+		
-		return $o;
+		$tpl = get_markup_template('install.tpl');
+		return replace_macros($tpl, array(
+			'$title' => $install_title,
+			'$pass' => t('Proceed with Installation'),
+			'$text' => $txt,
+		));
+
 	}
 
 	if(x($a->data,'db_failed')) {
-		$o .= t('Database import failed.') . EOL;
+		$txt = t('You may need to import the file "database.sql" manually using phpmyadmin or mysql.') . EOL;
-		$o .= t('You may need to import the file "database.sql" manually using phpmyadmin or mysql.') . EOL;
+		$txt .= t('Please see the file "INSTALL.txt".') . EOL ."<hr>" ;
-		$o .= t('Please see the file "INSTALL.txt".') . EOL ;
+		$txt .= "<pre>".$a->data['db_failed'] . "</pre>". EOL ;
-		return $o;
+
+		$tpl = get_markup_template('install.tpl');
+		return replace_macros($tpl, array(
+			'$title' => $install_title,
+			'$pass' => t('Database connection'),
+			'$status' => t('Database import failed.'),
+			'$text' => $txt,
+		));
+		
 	}
 
 	if($db && $db->connected) {
 		$r = q("SELECT COUNT(*) as `total` FROM `user`");
 		if($r && count($r) && $r[0]['total']) {
-			notice( t('Permission denied.') . EOL);
+			$tpl = get_markup_template('install.tpl');
-			return '';
+			return replace_macros($tpl, array(
+				'$title' => $install_title,
+				'$pass' => '',
+				'$status' => t('Permission denied.'),
+				'$text' => '',
+			));
 		}
 	}
 
-	info( t('Welcome to Friendica.') . EOL);
+	switch ($install_wizard_pass){
+		case 1: { // System check
 
 
-	check_funcs();
+			$checks = array();
 
-	$o .= check_htconfig();
+			check_funcs($checks);
-	if(strlen($o))
+
-		return $o;
+			check_htconfig($checks);
+
+			check_keys($checks);
+			
+			if(x($_POST,'phppath'))
+				$phpath = notags(trim($_POST['phppath']));
+
+			check_php($phpath, $checks);
+
+
+			function check_passed($v, $c){
+				if ($c['required'])
+					$v = $v && $c['status'];
+				return $v;
+			}
+			$checkspassed = array_reduce($checks, "check_passed", true);
+			
+
+			$tpl = get_markup_template('install_checks.tpl');
+			$o .= replace_macros($tpl, array(
+				'$title' => $install_title,
+				'$pass' => t('System check'),
+				'$checks' => $checks,
+				'$passed' => $checkspassed,
+				'$see_install' => t('Please see the file "INSTALL.txt".'),
+				'$next' => t('Next'),
+				'$reload' => t('Check again'),
+				'$phpath' => $phpath,
+			));
+			return $o;
+		}; break;
+		
+		case 2: { // Database config
+
+			$dbhost = ((x($_POST,'dbhost')) ? notags(trim($_POST['dbhost'])) : 'localhost');
+			$dbuser = notags(trim($_POST['dbuser']));
+			$dbpass = notags(trim($_POST['dbpass']));
+			$dbdata = notags(trim($_POST['dbdata']));
+			$phpath = notags(trim($_POST['phppath']));
+			
+
+			$tpl = get_markup_template('install_db.tpl');
+			$o .= replace_macros($tpl, array(
+				'$title' => $install_title,
+				'$pass' => t('Database connection'),
+				'$info_01' => t('In order to install Friendica we need to know how to connect to your database.'),
+				'$info_02' => t('Please contact your hosting provider or site administrator if you have questions about these settings.'),
+				'$info_03' => t('The database you specify below should already exist. If it does not, please create it before continuing.'),
+
+				'$status' => $wizard_status,
+				
+				'$dbhost' => array('dbhost', t('Database Server Name'), $dbhost, ''),
+				'$dbuser' => array('dbuser', t('Database Login Name'), $dbuser, ''),
+				'$dbpass' => array('dbpass', t('Database Login Password'), $dbpass, ''),
+				'$dbdata' => array('dbdata', t('Database Name'), $dbdata, ''),
+				'$adminmail' => array('adminmail', t('Site administrator email address'), $adminmail, t('Your account email address must match this in order to use the web admin panel.')),
+
+				
+
+				'$lbl_10' => t('Please select a default timezone for your website'),
+				
+				'$baseurl' => $a->get_baseurl(),
+				
+				'$phpath' => $phpath,
+				
+				'$submit' => t('Submit'),
+				
+			));
+			return $o;
+		}; break;
+		case 3: { // Site settings
+			require_once('datetime.php');
+			$dbhost = ((x($_POST,'dbhost')) ? notags(trim($_POST['dbhost'])) : 'localhost');
+			$dbuser = notags(trim($_POST['dbuser']));
+			$dbpass = notags(trim($_POST['dbpass']));
+			$dbdata = notags(trim($_POST['dbdata']));
+			$phpath = notags(trim($_POST['phppath']));
+			
+			$adminmail = notags(trim($_POST['adminmail']));
+			$timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles');
+			
+			$tpl = get_markup_template('install_settings.tpl');
+			$o .= replace_macros($tpl, array(
+				'$title' => $install_title,
+				'$pass' => t('Site settings'),
+
+				'$status' => $wizard_status,
+				
+				'$dbhost' => $dbhost, 
+				'$dbuser' => $dbuser,
+				'$dbpass' => $dbpass,
+				'$dbdata' => $dbdata,
+				'$phpath' => $phpath,
+				
+				'$adminmail' => array('adminmail', t('Site administrator email address'), $adminmail, t('Your account email address must match this in order to use the web admin panel.')),
+
+				
+				'$timezone' => field_timezone('timezone', t('Please select a default timezone for your website'), $timezone, ''),
+				
+				'$baseurl' => $a->get_baseurl(),
+				
+				
+				
+				'$submit' => t('Submit'),
+				
+			));
+			return $o;
+		}; break;
 			
-	if(strlen($a->data['txt'])) {
-		$o .= manual_config($a);
-		return;
 	}
-
-	$o .= check_php($phpath);
-
-	$o .= check_keys();
-
-
-	require_once('datetime.php');
-
-	$tpl = get_markup_template('install_db.tpl');
-	$o .= replace_macros($tpl, array(
-		'$lbl_01' => t('Friendica Social Communications Server'),
-		'$lbl_02' => t('Installation'),
-		'$lbl_03' => t('In order to install Friendica we need to know how to connect to your database.'),
-		'$lbl_04' => t('Please contact your hosting provider or site administrator if you have questions about these settings.'),
-		'$lbl_05' => t('The database you specify below should already exist. If it does not, please create it before continuing.'),
-		'$lbl_06' => t('Database Server Name'),
-		'$lbl_07' => t('Database Login Name'),
-		'$lbl_08' => t('Database Login Password'),
-		'$lbl_09' => t('Database Name'),
-		'$lbl_10' => t('Please select a default timezone for your website'),
-		'$lbl_11' => t('Site administrator email address. Your account email address must match this in order to use the web admin panel.'), 
-		'$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'),
-		'$dbuser' => notags(trim($_POST['dbuser'])),
-		'$dbpass' => notags(trim($_POST['dbpass'])),
-		'$dbdata' => notags(trim($_POST['dbdata'])),
-		'$phpath' => $phpath,
-		'$adminmail' => notags(trim($_POST['adminmail']))
-	));
-
-	return $o;
 }
 
-function check_php(&$phpath) {
+/**
-	$o = '';
+ * checks   : array passed to template
-	$phpath = trim(shell_exec('which php'));
+ * title    : string
-	if(! strlen($phpath)) {
+ * status   : boolean
-		$o .= t('Could not find a command line version of PHP in the web server PATH.') . EOL;
+ * required : boolean
-		$o .= t('This is required. Please adjust the configuration file .htconfig.php accordingly.') . EOL;
+ * help		: string optional
+ */
+function check_add(&$checks, $title, $status, $required, $help){
+	$checks[] = array(
+		'title' => $title,
+		'status' => $status,
+		'required' => $required,
+		'help'	=> $help,
+	);
+}
+
+function check_php(&$phpath, &$checks) {
+	if (strlen($phpath)){
+		$passed = file_exists($phpath);
+	} else {
+		$phpath = trim(shell_exec('which php'));
+		$passed = strlen($phpath);
 	}
-	if(strlen($phpath)) {
+	$help = "";
+	if(!$passed) {
+		$help .= t('Could not find a command line version of PHP in the web server PATH.'). EOL;
+		$tpl = get_markup_template('field_input.tpl');
+		$help .= replace_macros($tpl, array(
+			'$field' => array('phppath', t('PHP executable path'), $phpath, t('Enter full path to php executable')),
+		));
+		$phpath="";
+	}
+	
+	check_add($checks, t('Command line PHP'), $passed, true, $help);
+	
+	if($passed) {
 		$str = autoname(8);
 		$cmd = "$phpath testargs.php $str";
 		$result = trim(shell_exec($cmd));
-		if($result != $str) {
+		$passed2 = $result == $str;
-			$o .= t('The command line version of PHP on your system does not have "register_argc_argv" enabled.') . EOL;
+		$help = "";
-			$o .= t('This is required for message delivery to work.') . EOL;
+		if(!$passed2) {
+			$help .= t('The command line version of PHP on your system does not have "register_argc_argv" enabled.'). EOL;
+			$help .= t('This is required for message delivery to work.');
 		}
+		check_add($checks, t('PHP "register_argc_argv"'), $passed, true, $help);
 	}
-	return $o;
+	
 
 }
 
-function check_keys() {
+function check_keys(&$checks) {
 
-	$o = '';
+	$help = '';
 
 	$res = false;
 
@@ -187,45 +360,73 @@ function check_keys() {
 	// Get private key
 
 	if(! $res) {
-		$o .= t('Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys') . EOL;
+		$help .= 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;
+		$help .= t('If running under Windows, please see "http://www.php.net/manual/en/openssl.installation.php".');
 	}
-	return $o;
+	check_add($checks, t('Generate encryption keys'), $res, true, $help);
 
 }
 
 
-function check_funcs() {
+function check_funcs(&$checks) {
-	if((function_exists('apache_get_modules')) && (! in_array('mod_rewrite',apache_get_modules())))
+	$ck_funcs = array();
-		notice( t('Error: Apache webserver mod-rewrite module is required but not installed.') . EOL);
+	check_add($ck_funcs, t('libCurl PHP module'), true, true, "");
-	if(! function_exists('curl_init')) 
+	check_add($ck_funcs, t('GD graphics PHP module'), true, true, "");
-		notice( t('Error: libCURL PHP module required but not installed.') . EOL);
+	check_add($ck_funcs, t('OpenSSL PHP module'), true, true, "");
-	if(! function_exists('imagecreatefromjpeg')) 
+	check_add($ck_funcs, t('mysqli PHP module'), true, true, "");
-		notice( t('Error: GD graphics PHP module with JPEG support required but not installed.') . EOL);
+	check_add($ck_funcs, t('mb_string PHP module'), true, true, "");
-	if(! function_exists('openssl_public_encrypt')) 
-		notice( t('Error: openssl PHP module required but not installed.') . EOL);	
-	if(! function_exists('mysqli_connect')) 
-		notice( t('Error: mysqli PHP module required but not installed.') . EOL);
-	if(! function_exists('mb_strlen'))
-		notice( t('Error: mb_string PHP module required but not installed.') . EOL);
 		
-	if((x($_SESSION,'sysmsg')) && is_array($_SESSION['sysmsg']) && count($_SESSION['sysmsg']))
+	
-		notice( t('Please see the file "INSTALL.txt".') . EOL);
+	if(function_exists('apache_get_modules')){
+		if (! in_array('mod_rewrite',apache_get_modules())) {
+			check_add($ck_funcs, t('Apace mod_rewrite module'), false, true, t('Error: Apache webserver mod-rewrite module is required but not installed.'));
+		} else {
+			check_add($ck_funcs, t('Apace mod_rewrite module'), true, true, "");
+		}
+	}
+	if(! function_exists('curl_init')){
+		$ck_funcs[0]['status']= false;
+		$ck_funcs[0]['help']= t('Error: libCURL PHP module required but not installed.');
+	}
+	if(! function_exists('imagecreatefromjpeg')){
+		$ck_funcs[1]['status']= false;
+		$ck_funcs[1]['help']= t('Error: GD graphics PHP module with JPEG support required but not installed.');
+	}
+	if(! function_exists('openssl_public_encrypt')) {
+		$ck_funcs[2]['status']= false;
+		$ck_funcs[2]['help']= t('Error: openssl PHP module required but not installed.');
+	}
+	if(! function_exists('mysqli_connect')){
+		$ck_funcs[3]['status']= false;
+		$ck_funcs[3]['help']= t('Error: mysqli PHP module required but not installed.');
+	}
+	if(! function_exists('mb_strlen')){
+		$ck_funcs[4]['status']= false;
+		$ck_funcs[4]['help']= t('Error: mb_string PHP module required but not installed.');
+	}
+	
+	$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);*/
 }
 
 
-function check_htconfig() {
+function check_htconfig(&$checks) {
+	$status = true;
+	$help = "";
+	if(	(file_exists('.htconfig.php') && !is_writable('.htconfig.php')) ||
+		(!file_exists('.htconfig.php') && !is_writable('.')) ) {
 	
-	if(((file_exists('.htconfig.php')) && (! is_writable('.htconfig.php')))
+		$status=false;
-		|| (! is_writable('.'))) {
+		$help = 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.') .EOL;
-
+		$help .= 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.').EOL;
-		$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.');
+		$help .= t('Please check with your site documentation or support people to see if this situation can be corrected.').EOL;
-		$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.');
+		$help .= t('If not, you may be required to perform a manual installation. Please see the file "INSTALL.txt" for instructions.').EOL; 
-		$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.txt" for instructions.'); 
 	}
 
-	return $o;
+	check_add($checks, t('.htconfig.php is writable'), $status, true, $help);
+	
 }
 
 	
@@ -236,18 +437,27 @@ function manual_config(&$a) {
 	return $o;
 }
 
+function load_database_rem($v, $i){
+	$l = trim($i);
+	if (strlen($l)>1 && ($l[0]=="-" || ($l[0]=="/" && $l[1]=="*"))){
+		return $v;
+	} else  {
+		return $v."\n".$i;
+	}
+}
+
 
 function load_database($db) {
 
 	$str = file_get_contents('database.sql');
+	$str = array_reduce(explode("\n", $str),"load_database_rem","");
 	$arr = explode(';',$str);
-	$errors = 0;
+	$errors = false;
 	foreach($arr as $a) {
 		if(strlen(trim($a))) {	
 			$r = @$db->q(trim($a));
 			if(! $r) {
-				notice( t('Errors encountered creating database tables.') . $a . EOL);
+				$errors .=  t('Errors encountered creating database tables.') . $a . EOL;
-				$errors ++;
 			}
 		}
 	}

mod/network.php

@@ -15,14 +15,6 @@ function network_init(&$a) {
 
 	$search = ((x($_GET,'search')) ? escape_tags($_GET['search']) : '');
 
-	// We need a better way of managing a growing argument list
-
-	// moved into savedsearches()
-	// $srchurl = '/network' 
-	// 		. ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') 
-	// 		. ((x($_GET,'star')) ? '?star=' . $_GET['star'] : '')
-	// 		. ((x($_GET,'bmark')) ? '?bmark=' . $_GET['bmark'] : '');
-	
 	if(x($_GET,'save')) {
 		$r = q("select * from `search` where `uid` = %d and `term` = '%s' limit 1",
 			intval(local_user()),
@@ -46,14 +38,10 @@ function network_init(&$a) {
 	
 	// search terms header
 	if(x($_GET,'search')) {
-		$a->page['content'] .= '<h2>Search Results For: '  . $search . '</h2>';
+		$a->page['content'] .= '<h2>' . t('Search Results For:') . ' '  . $search . '</h2>';
 	}
 	
 	$a->page['aside'] .= group_side('network','network',true,$group_id);
-	
-	// moved to saved searches to have it in the same div
-	//$a->page['aside'] .= search($search,'netsearch-box',$srchurl,true);
-
 	$a->page['aside'] .= saved_searches($search);
 
 }
@@ -275,13 +263,11 @@ function network_content(&$a, $update = 0) {
 	$sql_options  = (($star) ? " and starred = 1 " : '');
 	$sql_options .= (($bmark) ? " and bookmark = 1 " : '');
 
+	// We'll need the following line if starred/bookmarks are allowed in comments in the future
+	//	$sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` $sql_options ) ";
 
-	$sql_new = '';
+	// Otherwise, this is a bit faster:
-	$sql_items = '';
+	$sql_extra = $sql_options;
-	$sql_update = '';
-
-
-	$sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` $sql_options ) ";
 
 	if($group) {
 		$r = q("SELECT `name`, `id` FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
@@ -432,7 +418,7 @@ function network_content(&$a, $update = 0) {
 		// Fetch a page full of parent items for this page
 
 		if($update) {
-			$r = q("SELECT distinct(`parent`) AS `item_id`, `contact`.`uid` AS `contact_uid`
+			$r = q("SELECT `parent` AS `item_id`, `contact`.`uid` AS `contact_uid`
 				FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 				WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
 				and `item`.`unseen` = 1
@@ -460,23 +446,26 @@ function network_content(&$a, $update = 0) {
 
 		if(count($r)) {
 			foreach($r as $rr)
-				$parents_arr[] = $rr['item_id'];
+				if(! array_key_exists($rr['item_id'],$parents_arr))
+					$parents_arr[] = $rr['item_id'];
 			$parents_str = implode(', ', $parents_arr);
 
 			$items = q("SELECT `item`.*, `item`.`id` AS `item_id`,
 				`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`writable`,
 				`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
 				`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
-				FROM `item`, (SELECT `p`.`id`,`p`.`created`,`p`.`commented` FROM `item` AS `p` WHERE `p`.`parent`=`p`.`id`) as `parentitem`, `contact`
+				FROM `item`, `contact`
 				WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
 				AND `contact`.`id` = `item`.`contact-id`
 				AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-				AND `item`.`parent` = `parentitem`.`id` AND `item`.`parent` IN ( %s )
+				AND `item`.`parent` IN ( %s )
-				$sql_extra
+				$sql_extra ",
-				ORDER BY `parentitem`.$ordering DESC, `parentitem`.`id` ASC, `item`.`gravity` ASC, `item`.`created` ASC ",
 				intval(local_user()),
 				dbesc($parents_str)
 			);
+
+			$items = conv_sort($items,$ordering);
+
 		}	
 	}
 

mod/profile.php

@@ -167,7 +167,7 @@ function profile_content(&$a, $update = 0) {
 		$r = q("SELECT distinct(parent) AS `item_id`, `contact`.`uid` AS `contact-uid`
 			FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 			WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
-			and `item`.`parent` in (select parent from item where unseen = 1 )
+			and `item`.`unseen` = 1
 			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
 			AND `item`.`wall` = 1
 			$sql_extra
@@ -218,18 +218,19 @@ function profile_content(&$a, $update = 0) {
 			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`network`, `contact`.`rel`, 
 			`contact`.`thumb`, `contact`.`self`, `contact`.`writable`, 
 			`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
-			FROM `item`, (SELECT `p`.`id`,`p`.`created` FROM `item` AS `p` WHERE `p`.`parent` = `p`.`id`) AS `parentitem`, `contact`
+			FROM `item`, `contact`
 			WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
 			AND `contact`.`id` = `item`.`contact-id`
 			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-			AND `item`.`parent` = `parentitem`.`id` AND `item`.`parent` IN ( %s )
+			AND `item`.`parent` IN ( %s )
-			$sql_extra
+			$sql_extra ",
-			ORDER BY `parentitem`.`created` DESC, `gravity` ASC, `item`.`created` ASC ",
 			intval($a->profile['profile_uid']),
 			dbesc($parents_str)
 		);
 	}
 
+	$items = conv_sort($items,'created');
+
 	if($is_owner && ! $update) {
 		$o .= get_birthdays();
 		$o .= get_events();

view/field_select_raw.tpl

@@ -0,0 +1,8 @@
+	
+	<div class='field select'>
+		<label for='id_$field.0'>$field.1</label>
+		<select name='$field.0' id='id_$field.0'>
+			$field.4
+		</select>
+		<span class='field_help'>$field.3</span>
+	</div>

view/install.tpl

@@ -0,0 +1,10 @@
+
+<h1>$title</h1>
+<h2>$pass</h2>
+
+
+{{ if $status }}
+<h3 class="error-message">$status</h3>
+{{ endif }}
+
+$text

view/install_checks.tpl

@@ -0,0 +1,24 @@
+<h1>$title</h1>
+<h2>$pass</h2>
+<form  action="$baseurl/install" method="POST">
+<table>
+{{ for $checks as $check }}
+	<tr><td>$check.title </td><td><span class="icon s22 {{if $check.status}}on{{else}}off{{endif}}"></td><td>{{if $check.required}}(required){{endif}}</td></tr>
+	{{if $check.help }}
+	<tr><td colspan="3">$check.help</td></tr>
+	{{endif}}
+{{ endfor }}
+</table>
+
+{{ if $phpath }}
+	<input type="hidden" name="phpath" value="$phpath">
+{{ endif }}
+
+{{ if $passed }}
+	<input type="hidden" name="pass" value="2">
+	<input type="submit" value="$next">
+{{ else }}
+	<input type="hidden" name="pass" value="1">
+	<input type="submit" value="$reload">
+{{ endif }}
+</form>

view/install_db.tpl

@@ -1,44 +1,30 @@
 
-<h3>$lbl_01</h3>
+<h1>$title</h1>
-<h3>$lbl_02</h3>
+<h2>$pass</h2>
+
 
 <p>
-$lbl_03 $lbl_04 $lbl_05
+$info_01<br>
+$info_02<br>
+$info_03
 </p>
 
+{{ if $status }}
+<h3 class="error-message">$status</h3>
+{{ endif }}
+
 <form id="install-form" action="$baseurl/install" method="post">
 
 <input type="hidden" name="phpath" value="$phpath" />
+<input type="hidden" name="pass" value="3" />
 
-<label for="install-dbhost" id="install-dbhost-label">$lbl_06</label>
+{{ inc field_input.tpl with $field=$dbhost }}{{endinc}}
-<input type="text" name="dbhost" id="install-dbhost" value="$dbhost" />
+{{ inc field_input.tpl with $field=$dbuser }}{{endinc}}
-<div id="install-dbhost-end"></div>
+{{ inc field_input.tpl with $field=$dbpass }}{{endinc}}
+{{ inc field_input.tpl with $field=$dbdata }}{{endinc}}
 
-<label for="install-dbuser" id="install-dbuser-label">$lbl_07</label>
-<input type="text" name="dbuser" id="install-dbuser" value="$dbuser" />
-<div id="install-dbuser-end"></div>
 
-<label for="install-dbpass" id="install-dbpass-label">$lbl_08</label>
-<input type="password" name="dbpass" id="install-dbpass" value="$dbpass" />
-<div id="install-dbpass-end"></div>
-
-<label for="install-dbdata" id="install-dbdata-label">$lbl_09</label>
-<input type="text" name="dbdata" id="install-dbdata"  value="$dbdata" />
-<div id="install-dbdata-end"></div>
-
-<label for="install-admin" id="install-admin-label">$lbl_11</label>
-<input type="text" name="adminmail" id="install-admin"  value="$adminmail" />
-<div id="install-admin-end"></div>
-
-<div id="install-tz-desc">
-$lbl_10
-</div>
-
-$tzselect
-
-<div id="install-tz-end" ></div>
 <input id="install-submit" type="submit" name="submit" value="$submit" /> 
 
 </form>
-<div id="install-end" ></div>
 

view/install_settings.tpl

@@ -0,0 +1,25 @@
+
+<h1>$title</h1>
+<h2>$pass</h2>
+
+
+{{ if $status }}
+<h3 class="error-message">$status</h3>
+{{ endif }}
+
+<form id="install-form" action="$baseurl/install" method="post">
+
+<input type="hidden" name="phpath" value="$phpath" />
+<input type="hidden" name="dbhost" value="$dbhost" />
+<input type="hidden" name="dbuser" value="$dbuser" />
+<input type="hidden" name="dbpass" value="$dbpass" />
+<input type="hidden" name="dbdata" value="$dbdata" />
+<input type="hidden" name="pass" value="4" />
+
+{{ inc field_input.tpl with $field=$adminmail }}{{endinc}}
+$timezone
+
+<input id="install-submit" type="submit" name="submit" value="$submit" /> 
+
+</form>
+