Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 26 insertions, 25 deletions

diff --git a/mod/match.php b/mod/match.php
index 5a01ba645..fd739ba2c 100644
--- a/mod/match.php
+++ b/mod/match.php
@@ -1,14 +1,20 @@
 <?php
 
-// FIXME - this has never been properly ported from Friendica
-// It takes keywords from your profile and queries the directory server for 
-// matching keywords from other profiles.
-
-
+/**
+ * @brief Controller for /match.
+ *
+ * It takes keywords from your profile and queries the directory server for
+ * matching keywords from other profiles.
+ *
+ * @FIXME this has never been properly ported from Friendica.
+ *
+ * @param App &$a
+ * @return void|string
+ */
 function match_content(&$a) {
 
 	$o = '';
-	if(! local_channel())
+	if (! local_channel())
 		return;
 
 	$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
@@ -18,22 +24,22 @@ function match_content(&$a) {
 	$r = q("SELECT `keywords` FROM `profile` WHERE `is_default` = 1 AND `uid` = %d LIMIT 1",
 		intval(local_channel())
 	);
-	if(! count($r))
-		return; 
-	if(! $r[0]['keywords']) {
-		notice( t('No keywords to match. Please add keywords to your default profile.') . EOL);
+	if (! count($r))
 		return;
 
+	if (! $r[0]['keywords']) {
+		notice( t('No keywords to match. Please add keywords to your default profile.') . EOL);
+		return;
 	}
 
 	$params = array();
 	$tags = trim($r[0]['keywords']);
-	
-	if($tags) {
+
+	if ($tags) {
 		$params['s'] = $tags;
-		if($a->pager['page'] != 1)
+		if ($a->pager['page'] != 1)
 			$params['p'] = $a->pager['page'];
-			
+
 //		if(strlen(get_config('system','directory_submit_url')))
 //			$x = post_url('http://dir.friendica.com/msearch', $params);
 //		else
@@ -41,18 +47,14 @@ function match_content(&$a) {
 
 		$j = json_decode($x);
 
-		if($j->total) {
+		if ($j->total) {
 			$a->set_pager_total($j->total);
 			$a->set_pager_itemspage($j->items_page);
 		}
 
-		if(count($j->results)) {
-
-
-			
+		if (count($j->results)) {
 			$tpl = get_markup_template('match.tpl');
-			foreach($j->results as $jj) {
-				
+			foreach ($j->results as $jj) {
 				$connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url;
 				$o .= replace_macros($tpl,array(
 					'$url' => zid($jj->url),
@@ -64,14 +66,13 @@ function match_content(&$a) {
 					'$tags' => $jj->tags
 				));
 			}
-		}
-		else {
+		} else {
 			info( t('No matches') . EOL);
-		}		
-
+		}
 	}
 
 	$o .= cleardiv();
 	$o .= paginate($a);
+
 	return $o;
 }