Merge remote-tracking branch 'mike/master' into dev

Zotlabs/Module/Dirsearch.php

@@ -313,7 +313,7 @@ class Dirsearch extends \Zotlabs\Web\Controller {
 	
 			$ret['results'] = $entries;
 			if($kw) {
-				$k = dir_tagadelic($kw);
+				$k = dir_tagadelic($kw, $hub);
 				if($k) {
 					$ret['keywords'] = array();
 					foreach($k as $kv) {

app/articles.apd

@@ -3,4 +3,4 @@ url: $baseurl/articles/$nick
 name: Articles
 requires: local_channel, articles
 photo: icon:file-text-o
-categories: Productivity
+categories: nav_featured_app, Productivity

app/cards.apd

@@ -3,4 +3,4 @@ url: $baseurl/cards/$nick
 name: Cards
 requires: local_channel, cards
 photo: icon:list
-categories: Productivity
+categories: nav_featured_app, Productivity

app/webpages.apd

@@ -3,4 +3,4 @@ url: $baseurl/webpages/$nick
 requires: local_channel, webpages
 name: Webpages
 photo: icon:newspaper-o
-categories: Productivity
+categories: nav_featured_app, Productivity

app/wiki.apd

@@ -3,4 +3,4 @@ url: $baseurl/wiki/$nick
 requires: local_channel, wiki
 name: Wiki
 photo: icon:pencil-square-o
-categories: Productivity
+categories: nav_featured_app, Productivity

include/socgraph.php

@@ -178,11 +178,12 @@ function poco_load($xchan = '', $url = null) {
 		);
 
 		if(! $r) {
-			q("insert into xlink ( xlink_xchan, xlink_link, xlink_rating, xlink_rating_text, xlink_updated, xlink_static ) values ( '%s', '%s', %d, '%s', '%s', 0 ) ",
+			q("insert into xlink ( xlink_xchan, xlink_link, xlink_rating, xlink_rating_text, xlink_sig, xlink_updated, xlink_static ) values ( '%s', '%s', %d, '%s', '%s', '%s', 0 ) ",
 				dbesc($xchan),
 				dbesc($hash),
 				intval(0),
 				dbesc(''),
+				dbesc(''),
 				dbesc(datetime_convert())
 			);
 		}

include/taxonomy.php

@@ -309,19 +309,27 @@ function article_tagadelic($uid, $count = 0, $authors = '', $owner = '', $flags
 
 
 
-function dir_tagadelic($count = 0) {
+function dir_tagadelic($count = 0, $hub = '') {
 
 	$count = intval($count);
 
 	$dirmode = get_config('system','directory_mode');
 
-	if($dirmode == DIRECTORY_MODE_STANDALONE) {
+	if(($dirmode == DIRECTORY_MODE_STANDALONE) && (! $hub)) {
+		$hub = \App::get_hostname();
+	}
+
+	if($hub)
+		$hub_query = " and xtag_hash in (select hubloc_hash from hubloc where hubloc_host =  '" . protect_sprintf(dbesc($hub)) . "') ";
+	else
+		$hub_query = '';
+
+	if($hub_query) {
 		// Fetch tags
 		$r = q("select xtag_term as term, count(xtag_term) as total from xtag 
 			left join hubloc on xtag_hash = hubloc_hash 
-			where xtag_flags = 0 and hubloc_url = '%s'
+			where xtag_flags = 0 $hub_query
 			group by xtag_term order by total desc %s",
-			dbesc(z_root()),
 			((intval($count)) ? "limit $count" : '')
 		);
 	}
@@ -485,9 +493,6 @@ function dir_tagblock($link,$r) {
 	$o = '';
 
 	$observer = get_observer_hash();
-	if(! get_directory_setting($observer, 'globaldir'))
-		return $o;
-
 
 	if(! $r)
 		$r = App::$data['directory_keywords'];

view/de

@@ -0,0 +1 @@
+de-de