diff options
| -rw-r--r-- | Zotlabs/Module/Dirsearch.php | 2 | ||||
| -rw-r--r-- | app/articles.apd | 2 | ||||
| -rw-r--r-- | app/cards.apd | 2 | ||||
| -rw-r--r-- | app/webpages.apd | 2 | ||||
| -rw-r--r-- | app/wiki.apd | 2 | ||||
| -rw-r--r-- | include/socgraph.php | 3 | ||||
| -rw-r--r-- | include/taxonomy.php | 19 | ||||
| l--------- | view/de | 1 | ||||
| -rw-r--r-- | view/de-de/hmessages.po (renamed from view/de/hmessages.po) | 0 | ||||
| -rw-r--r-- | view/de-de/hstrings.php (renamed from view/de/hstrings.php) | 0 | ||||
| -rw-r--r-- | view/de-de/htconfig.tpl (renamed from view/de/htconfig.tpl) | 0 | ||||
| -rw-r--r-- | view/de-de/lostpass_eml.tpl (renamed from view/de/lostpass_eml.tpl) | 0 | ||||
| -rw-r--r-- | view/de-de/messages.po (renamed from view/de/messages.po) | 0 | ||||
| -rw-r--r-- | view/de-de/passchanged_eml.tpl (renamed from view/de/passchanged_eml.tpl) | 0 | ||||
| -rw-r--r-- | view/de-de/register_open_eml.tpl (renamed from view/de/register_open_eml.tpl) | 0 | ||||
| -rw-r--r-- | view/de-de/register_verify_eml.tpl (renamed from view/de/register_verify_eml.tpl) | 0 | ||||
| -rw-r--r-- | view/de-de/strings.php (renamed from view/de/strings.php) | 0 | ||||
| -rw-r--r-- | view/de-de/update_fail_eml.tpl (renamed from view/de/update_fail_eml.tpl) | 0 |
18 files changed, 20 insertions, 13 deletions
diff --git a/Zotlabs/Module/Dirsearch.php b/Zotlabs/Module/Dirsearch.php index e6cf5449a..53ec1a850 100644 --- a/Zotlabs/Module/Dirsearch.php +++ b/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) { diff --git a/app/articles.apd b/app/articles.apd index eec9cda0a..74e86415b 100644 --- a/app/articles.apd +++ b/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 diff --git a/app/cards.apd b/app/cards.apd index 047aaeac9..8e2762ff8 100644 --- a/app/cards.apd +++ b/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 diff --git a/app/webpages.apd b/app/webpages.apd index b00e55cc4..46c6cdb5d 100644 --- a/app/webpages.apd +++ b/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 diff --git a/app/wiki.apd b/app/wiki.apd index 1110f0cc4..48fcbe0c1 100644 --- a/app/wiki.apd +++ b/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 diff --git a/include/socgraph.php b/include/socgraph.php index 26446d9c7..87a880202 100644 --- a/include/socgraph.php +++ b/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()) ); } diff --git a/include/taxonomy.php b/include/taxonomy.php index a646df28c..278925391 100644 --- a/include/taxonomy.php +++ b/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']; diff --git a/view/de b/view/de new file mode 120000 index 000000000..47f12ca72 --- /dev/null +++ b/view/de @@ -0,0 +1 @@ +de-de
\ No newline at end of file diff --git a/view/de/hmessages.po b/view/de-de/hmessages.po index e7c962bbd..e7c962bbd 100644 --- a/view/de/hmessages.po +++ b/view/de-de/hmessages.po diff --git a/view/de/hstrings.php b/view/de-de/hstrings.php index 61db3fb5d..61db3fb5d 100644 --- a/view/de/hstrings.php +++ b/view/de-de/hstrings.php diff --git a/view/de/htconfig.tpl b/view/de-de/htconfig.tpl index 46bf0de14..46bf0de14 100644 --- a/view/de/htconfig.tpl +++ b/view/de-de/htconfig.tpl diff --git a/view/de/lostpass_eml.tpl b/view/de-de/lostpass_eml.tpl index 02a71b77a..02a71b77a 100644 --- a/view/de/lostpass_eml.tpl +++ b/view/de-de/lostpass_eml.tpl diff --git a/view/de/messages.po b/view/de-de/messages.po index 460fd764b..460fd764b 100644 --- a/view/de/messages.po +++ b/view/de-de/messages.po diff --git a/view/de/passchanged_eml.tpl b/view/de-de/passchanged_eml.tpl index 95805f677..95805f677 100644 --- a/view/de/passchanged_eml.tpl +++ b/view/de-de/passchanged_eml.tpl diff --git a/view/de/register_open_eml.tpl b/view/de-de/register_open_eml.tpl index ce96d2ec6..ce96d2ec6 100644 --- a/view/de/register_open_eml.tpl +++ b/view/de-de/register_open_eml.tpl diff --git a/view/de/register_verify_eml.tpl b/view/de-de/register_verify_eml.tpl index 4da21265d..4da21265d 100644 --- a/view/de/register_verify_eml.tpl +++ b/view/de-de/register_verify_eml.tpl diff --git a/view/de/strings.php b/view/de-de/strings.php index 85bff2451..85bff2451 100644 --- a/view/de/strings.php +++ b/view/de-de/strings.php diff --git a/view/de/update_fail_eml.tpl b/view/de-de/update_fail_eml.tpl index d28bed717..d28bed717 100644 --- a/view/de/update_fail_eml.tpl +++ b/view/de-de/update_fail_eml.tpl |