From c09bab466a989a606fd1940a667eb95b90fabe09 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 10 Jan 2018 15:32:04 -0800 Subject: [PATCH 1/4] hubzilla issue #945 continued: We previously blocked directory keywords when searching the local directory as it produced errant results and included results from the entire directory space (an issue that was resolved satisfactorily by that fix sometime in the past). As a result of issue #945 this was reworked so that we should return correct results for keywords when searching either the local directory or a standalone directory. --- Zotlabs/Module/Dirsearch.php | 2 +- include/taxonomy.php | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 8 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/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']; From b05c1c391cf9b73e58b60fb0ef8d5b4ca702eac3 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 10 Jan 2018 15:42:02 -0800 Subject: [PATCH 2/4] db issue reported in hubzilla #953 - this does not do anything about the auth issue --- include/socgraph.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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()) ); } From e59237e680977e4a609d3c76479ed41e56de9feb Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 10 Jan 2018 23:06:54 -0800 Subject: [PATCH 3/4] provide de-de language since some browsers do not offer de on its own --- view/de | 1 + view/{de => de-de}/hmessages.po | 0 view/{de => de-de}/hstrings.php | 0 view/{de => de-de}/htconfig.tpl | 0 view/{de => de-de}/lostpass_eml.tpl | 0 view/{de => de-de}/messages.po | 0 view/{de => de-de}/passchanged_eml.tpl | 0 view/{de => de-de}/register_open_eml.tpl | 0 view/{de => de-de}/register_verify_eml.tpl | 0 view/{de => de-de}/strings.php | 0 view/{de => de-de}/update_fail_eml.tpl | 0 11 files changed, 1 insertion(+) create mode 120000 view/de rename view/{de => de-de}/hmessages.po (100%) rename view/{de => de-de}/hstrings.php (100%) rename view/{de => de-de}/htconfig.tpl (100%) rename view/{de => de-de}/lostpass_eml.tpl (100%) rename view/{de => de-de}/messages.po (100%) rename view/{de => de-de}/passchanged_eml.tpl (100%) rename view/{de => de-de}/register_open_eml.tpl (100%) rename view/{de => de-de}/register_verify_eml.tpl (100%) rename view/{de => de-de}/strings.php (100%) rename view/{de => de-de}/update_fail_eml.tpl (100%) 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 similarity index 100% rename from view/de/hmessages.po rename to view/de-de/hmessages.po diff --git a/view/de/hstrings.php b/view/de-de/hstrings.php similarity index 100% rename from view/de/hstrings.php rename to view/de-de/hstrings.php diff --git a/view/de/htconfig.tpl b/view/de-de/htconfig.tpl similarity index 100% rename from view/de/htconfig.tpl rename to view/de-de/htconfig.tpl diff --git a/view/de/lostpass_eml.tpl b/view/de-de/lostpass_eml.tpl similarity index 100% rename from view/de/lostpass_eml.tpl rename to view/de-de/lostpass_eml.tpl diff --git a/view/de/messages.po b/view/de-de/messages.po similarity index 100% rename from view/de/messages.po rename to view/de-de/messages.po diff --git a/view/de/passchanged_eml.tpl b/view/de-de/passchanged_eml.tpl similarity index 100% rename from view/de/passchanged_eml.tpl rename to view/de-de/passchanged_eml.tpl diff --git a/view/de/register_open_eml.tpl b/view/de-de/register_open_eml.tpl similarity index 100% rename from view/de/register_open_eml.tpl rename to view/de-de/register_open_eml.tpl diff --git a/view/de/register_verify_eml.tpl b/view/de-de/register_verify_eml.tpl similarity index 100% rename from view/de/register_verify_eml.tpl rename to view/de-de/register_verify_eml.tpl diff --git a/view/de/strings.php b/view/de-de/strings.php similarity index 100% rename from view/de/strings.php rename to view/de-de/strings.php diff --git a/view/de/update_fail_eml.tpl b/view/de-de/update_fail_eml.tpl similarity index 100% rename from view/de/update_fail_eml.tpl rename to view/de-de/update_fail_eml.tpl From 894b3706e7e10fbcd158f4022f68ed23c1c7defa Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 10 Jan 2018 23:32:56 -0800 Subject: [PATCH 4/4] tag nav_featured_app to apps that the corresponding features may not be enabled by default, so that they will become visible in the app menu when enabled --- app/articles.apd | 2 +- app/cards.apd | 2 +- app/webpages.apd | 2 +- app/wiki.apd | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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