Merge remote-tracking branch 'friendica/master' into mobile

8 files changed, 69 insertions, 18 deletions

diff --git a/mod/community.php b/mod/community.php
index d578b469f..a98999942 100755
--- a/mod/community.php
+++ b/mod/community.php
@@ -80,12 +80,10 @@ function community_content(&$a, $update = 0) {
 
 	// we behave the same in message lists as the search module
 
-	$o .= conversation($a,$r,'community',false);
+	$o .= conversation($a,$r,'community',$update);
 
 	$o .= paginate($a);
 
-//	$o .= '<div class="cc-license">' . t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.') . '</div>';
-
 	return $o;
 }
 
diff --git a/mod/contacts.php b/mod/contacts.php
index 51c6920d3..ef77366da 100755
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -42,6 +42,7 @@ function contacts_init(&$a) {
 
 	$a->page['aside'] .= findpeople_widget();
 
+	$a->page['aside'] .= networks_widget('contacts',$_GET['nets']);
 }
 
 function contacts_post(&$a) {
@@ -99,6 +100,14 @@ function contacts_post(&$a) {
 		info( t('Contact updated.') . EOL);
 	else
 		notice( t('Failed to update contact record.') . EOL);
+
+	$r = q("select * from contact where id = %d and uid = %d limit 1",
+		intval($contact_id),
+		intval(local_user())
+	);
+	if($r && count($r))
+		$a->data['contact'] = $r[0];
+
 	return;
 
 }
@@ -111,7 +120,6 @@ function contacts_content(&$a) {
 	$o = '';
 	nav_set_selected('contacts');
 
-	$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);
@@ -211,7 +219,10 @@ function contacts_content(&$a) {
 
 			contact_remove($orig_record[0]['id']);
 			info( t('Contact has been removed.') . EOL );
-			goaway($a->get_baseurl() . '/contacts');
+			if(x($_SESSION,'return_url'))
+				goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
+			else
+				goaway($a->get_baseurl() . '/contacts');
 			return; // NOTREACHED
 		}
 	}
@@ -354,19 +365,30 @@ function contacts_content(&$a) {
 
 	}
 
+	$blocked = false;
+
+	$_SESSION['return_url'] = $a->query_string;
 
 	if(($a->argc == 2) && ($a->argv[1] === 'all'))
 		$sql_extra = '';
-	else
-		$sql_extra = " AND `blocked` = 0 ";
-
+	else {
+		if(($a->argc == 2) && ($a->argv[1] === 'blocked')) {
+			$sql_extra = " AND `blocked` = 1 ";
+			$blocked = true;
+		}
+		else
+			$sql_extra = " AND `blocked` = 0 ";
+	}
 	$search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : '');
+	$nets = ((x($_GET,'nets')) ? notags(trim($_GET['nets'])) : '');
 
 	$tpl = get_markup_template("contacts-top.tpl");
 	$o .= replace_macros($tpl,array(
-		'$header' => t('Contacts'),
-		'$hide_url' => ((strlen($sql_extra)) ? 'contacts/all' : 'contacts' ),
-		'$hide_text' => ((strlen($sql_extra)) ? t('Show Blocked Connections') : t('Hide Blocked Connections')),
+		'$header' => t('Contacts') . (($nets) ? ' - ' . network_to_name($nets) : ''),
+		'$hide_url' => (($blocked) ? 'contacts' : 'contacts/blocked'),
+		'$hide_text' => (($blocked) ? t('Show Unblocked Contacts') : t('Show Blocked Contacts')),
+		'$all_url' => 'contacts/all',
+		'$all_text' => t('Show All Contacts'),
 		'$search' => $search,
 		'$desc' => t('Search your contacts'),
 		'$finding' => (strlen($search) ? '<h4>' . t('Finding: ') . "'" . $search . "'" . '</h4>' : ""),
@@ -380,6 +402,9 @@ function contacts_content(&$a) {
 		$search = dbesc($search.'*');
 	$sql_extra .= ((strlen($search)) ? " AND MATCH `name` AGAINST ('$search' IN BOOLEAN MODE) " : "");
 
+	if($nets)
+		$sql_extra .= sprintf(" AND network = '%s' ", dbesc($nets));
+ 
 	$sql_extra2 = ((($sort_type > 0) && ($sort_type <= CONTACT_IS_FRIEND)) ? sprintf(" AND `rel` = %d ",intval($sort_type)) : ''); 
 
 	
diff --git a/mod/editpost.php b/mod/editpost.php
index bceb9250a..f23b305f0 100755
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -35,6 +35,7 @@ function editpost_content(&$a) {
 	
 	$a->page['htmlhead'] .= replace_macros($tpl, array(
 		'$baseurl' => $a->get_baseurl(),
+		'$editselect' =>  (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
 		'$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
 		'$geotag' => $geotag,
 		'$nickname' => $a->user['nickname']
@@ -108,11 +109,14 @@ function editpost_content(&$a) {
 		'$emailcc' => t('CC: email addresses'),
 		'$public' => t('Public post'),
 		'$jotnets' => $jotnets,
+		'$title' => $itm[0]['title'],
+		'$placeholdertitle' => t('Set title'),
 		'$emtitle' => t('Example: bob@example.com, mary@example.com'),
 		'$lockstate' => $lockstate,
 		'$acl' => '', // populate_acl((($group) ? $group_acl : $a->user), $celeb),
 		'$bang' => (($group) ? '!' : ''),
 		'$profile_uid' => $_SESSION['uid'],
+		'$preview' => t('Preview'),
 		'$jotplugins' => $jotplugins,
 	));
 
diff --git a/mod/install.php b/mod/install.php
index f7820fc80..003d81c6a 100755
--- a/mod/install.php
+++ b/mod/install.php
@@ -186,8 +186,8 @@ function install_content(&$a) {
 
 			check_keys($checks);
 			
-			if(x($_POST,'phppath'))
-				$phpath = notags(trim($_POST['phppath']));
+			if(x($_POST,'phpath'))
+				$phpath = notags(trim($_POST['phpath']));
 
 			check_php($phpath, $checks);
 
@@ -210,6 +210,7 @@ function install_content(&$a) {
 				'$next' => t('Next'),
 				'$reload' => t('Check again'),
 				'$phpath' => $phpath,
+				'$baseurl' => $a->get_baseurl(),
 			));
 			return $o;
 		}; break;
@@ -220,7 +221,7 @@ function install_content(&$a) {
 			$dbuser = notags(trim($_POST['dbuser']));
 			$dbpass = notags(trim($_POST['dbpass']));
 			$dbdata = notags(trim($_POST['dbdata']));
-			$phpath = notags(trim($_POST['phppath']));
+			$phpath = notags(trim($_POST['phpath']));
 			
 
 			$tpl = get_markup_template('install_db.tpl');
@@ -258,7 +259,7 @@ function install_content(&$a) {
 			$dbuser = notags(trim($_POST['dbuser']));
 			$dbpass = notags(trim($_POST['dbpass']));
 			$dbdata = notags(trim($_POST['dbdata']));
-			$phpath = notags(trim($_POST['phppath']));
+			$phpath = notags(trim($_POST['phpath']));
 			
 			$adminmail = notags(trim($_POST['adminmail']));
 			$timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles');
@@ -322,7 +323,7 @@ function check_php(&$phpath, &$checks) {
 		$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')),
+			'$field' => array('phpath', t('PHP executable path'), $phpath, t('Enter full path to php executable')),
 		));
 		$phpath="";
 	}
diff --git a/mod/item.php b/mod/item.php
index 217f13c49..d5dcfccbd 100755
--- a/mod/item.php
+++ b/mod/item.php
@@ -649,7 +649,8 @@ function item_post(&$a) {
 
 
 	if($orig_post) {
-		$r = q("UPDATE `item` SET `body` = '%s', `edited` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
+		$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `edited` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
+			dbesc($title),
 			dbesc($body),
 			dbesc(datetime_convert()),
 			intval($post_id),
diff --git a/mod/network.php b/mod/network.php
index 497e8a115..8f10ace77 100755
--- a/mod/network.php
+++ b/mod/network.php
@@ -56,7 +56,9 @@ function saved_searches($search) {
 		. ((x($_GET,'star')) ? '?star=' . $_GET['star'] : '')
 		. ((x($_GET,'bmark')) ? '?bmark=' . $_GET['bmark'] : '')
 		. ((x($_GET,'conv')) ? '?conv=' . $_GET['conv'] : '')
-		. ((x($_GET,'nets')) ? '?nets=' . $_GET['nets'] : '');
+		. ((x($_GET,'nets')) ? '?nets=' . $_GET['nets'] : '')
+		. ((x($_GET,'cmin')) ? '?cmin=' . $_GET['cmin'] : '')
+		. ((x($_GET,'cmax')) ? '?cmax=' . $_GET['cmax'] : '');
 	
 	$o = '';
 
@@ -222,6 +224,8 @@ function network_content(&$a, $update = 0) {
 	$conv = ((x($_GET,'conv')) ? intval($_GET['conv']) : 0);
 	$spam = ((x($_GET,'spam')) ? intval($_GET['spam']) : 0);
 	$nets = ((x($_GET,'nets')) ? $_GET['nets'] : '');
+	$cmin = ((x($_GET,'cmin')) ? intval($_GET['cmin']) : 0);
+	$cmax = ((x($_GET,'cmax')) ? intval($_GET['cmax']) : 99);
 
 	if(($a->argc > 2) && $a->argv[2] === 'new')
 		$nouveau = true;
@@ -358,6 +362,8 @@ function network_content(&$a, $update = 0) {
 			. ((x($_GET,'conv'))   ? '&conv='   . $_GET['conv']   : '') 
 			. ((x($_GET,'spam'))   ? '&spam='   . $_GET['spam']   : '') 
 			. ((x($_GET,'nets'))   ? '&nets='   . $_GET['nets']   : '') 
+			. ((x($_GET,'cmin'))   ? '&cmin='   . $_GET['cmin']   : '') 
+			. ((x($_GET,'cmax'))   ? '&cmax='   . $_GET['cmax']   : '') 
 
 			. "'; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
 	}
diff --git a/mod/oembed.php b/mod/oembed.php
index 25995813a..236625f68 100755
--- a/mod/oembed.php
+++ b/mod/oembed.php
@@ -2,11 +2,26 @@
 require_once("include/oembed.php");
 
 function oembed_content(&$a){
+	// logger('mod_oembed ' . $a->query_string, LOGGER_ALL);
+
+	if ($a->argv[1]=='b2h'){
+		$url = array( "", trim(hex2bin($_REQUEST['url'])));
+		echo oembed_replacecb($url);
+		killme();
+	}
+	
+	if ($a->argv[1]=='h2b'){
+		$text = trim(hex2bin($_REQUEST['text']));
+		echo oembed_html2bbcode($text);
+		killme();
+	}
+	
 	if ($a->argc == 2){
 		echo "<html><body>";
 		$url = base64url_decode($a->argv[1]);
 		$j = oembed_fetch_url($url);
 		echo $j->html;
+//		logger('mod-oembed ' . $j->html, LOGGER_ALL);
 		echo "</body></html>";
 	}
 	killme();
diff --git a/mod/settings.php b/mod/settings.php
index e75272539..b4cd2e608 100755
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -818,6 +818,7 @@ function settings_content(&$a) {
 		'$notify4'	=> array('notify4', t('Someone writes a followup comment'), ($notify & NOTIFY_COMMENT), NOTIFY_COMMENT, ''),
 		'$notify5'	=> array('notify5', t('You receive a private message'), ($notify & NOTIFY_MAIL), NOTIFY_MAIL, ''),
 		'$notify6'  => array('notify6', t('You receive a friend suggestion'), ($notify & NOTIFY_SUGGEST), NOTIFY_SUGGEST, ''),		
+		'$notify7'  => array('notify7', t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, ''),		
 		
 		
 		'$h_advn' => t('Advanced Page Settings'),