aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Zotlabs/Module/Directory.php6
-rw-r--r--app/directory.apd4
-rw-r--r--include/features.php23
3 files changed, 21 insertions, 12 deletions
diff --git a/Zotlabs/Module/Directory.php b/Zotlabs/Module/Directory.php
index 8a7c6baf6..c29fa8326 100644
--- a/Zotlabs/Module/Directory.php
+++ b/Zotlabs/Module/Directory.php
@@ -12,13 +12,16 @@ class Directory extends \Zotlabs\Web\Controller {
function init() {
\App::set_pager_itemspage(60);
- if(x($_GET,'ignore')) {
+ if(local_channel() && x($_GET,'ignore')) {
q("insert into xign ( uid, xchan ) values ( %d, '%s' ) ",
intval(local_channel()),
dbesc($_GET['ignore'])
);
goaway(z_root() . '/directory?f=&suggest=1');
}
+
+ if(local_channel())
+ \App::$profile_uid = local_channel();
$observer = get_observer_hash();
$global_changed = false;
@@ -55,6 +58,7 @@ class Directory extends \Zotlabs\Web\Controller {
if($observer)
set_xconfig($observer,'directory','pubforums',$pubforums);
}
+
}
function get() {
diff --git a/app/directory.apd b/app/directory.apd
index 03a93f042..0c723c16b 100644
--- a/app/directory.apd
+++ b/app/directory.apd
@@ -1,5 +1,5 @@
-version: 1
-url: $baseurl/directory
+version: 1.1
+url: $baseurl/directory, $baseurl/settings/directory
name: Directory
photo: icon:sitemap
categories: nav_featured_app, Networking
diff --git a/include/features.php b/include/features.php
index 37445c643..c1d2510de 100644
--- a/include/features.php
+++ b/include/features.php
@@ -114,15 +114,6 @@ function get_features($filtered = true, $level = (-1)) {
],
[
- 'advanced_dirsearch',
- t('Advanced Directory Search'),
- t('Allows creation of complex directory search queries'),
- false,
- get_config('feature_lock','advanced_dirsearch'),
- feature_level('advanced_dirsearch',4),
- ],
-
- [
'advanced_theming',
t('Advanced Theme and Layout Settings'),
t('Allows fine tuning of themes and page layouts'),
@@ -283,6 +274,20 @@ function get_features($filtered = true, $level = (-1)) {
]
],
+ 'directory' => [
+
+ t('Directory'),
+
+ [
+ 'advanced_dirsearch',
+ t('Advanced Directory Search'),
+ t('Allows creation of complex directory search queries'),
+ false,
+ get_config('feature_lock','advanced_dirsearch'),
+ ]
+
+ ],
+
'editor' => [
t('Editor'),