aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-09-20 13:22:41 +0200
committerMario Vavti <mario@mariovavti.com>2018-09-20 13:22:41 +0200
commit1ca558f011b21b0a493d294501f530e57bdd574e (patch)
treecd4611553771f0b9ab75cb1a54340bdb5398ceaf /Zotlabs
parenta6db822a696afe808d9c8cb34af1075a42fffada (diff)
downloadvolse-hubzilla-1ca558f011b21b0a493d294501f530e57bdd574e.tar.gz
volse-hubzilla-1ca558f011b21b0a493d294501f530e57bdd574e.tar.bz2
volse-hubzilla-1ca558f011b21b0a493d294501f530e57bdd574e.zip
move connection filtering setting from network to connections, provide a link to settings in the navbar if present for a module and some code optimisation
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Connections.php21
-rw-r--r--Zotlabs/Module/Settings/Connections.php51
-rw-r--r--Zotlabs/Module/Settings/Network.php14
3 files changed, 65 insertions, 21 deletions
diff --git a/Zotlabs/Module/Connections.php b/Zotlabs/Module/Connections.php
index cecada769..0e5f1dfe2 100644
--- a/Zotlabs/Module/Connections.php
+++ b/Zotlabs/Module/Connections.php
@@ -1,6 +1,7 @@
<?php
namespace Zotlabs\Module;
+use App;
require_once('include/socgraph.php');
require_once('include/selectors.php');
@@ -12,8 +13,10 @@ class Connections extends \Zotlabs\Web\Controller {
if(! local_channel())
return;
+
+ App::$profile_uid = local_channel();
- $channel = \App::get_channel();
+ $channel = App::get_channel();
if($channel)
head_set_icon($channel['xchan_photo_s']);
@@ -43,7 +46,7 @@ class Connections extends \Zotlabs\Web\Controller {
$all = false;
if(! $_REQUEST['aj'])
- $_SESSION['return_url'] = \App::$query_string;
+ $_SESSION['return_url'] = App::$query_string;
$search_flags = "";
$head = '';
@@ -88,14 +91,14 @@ class Connections extends \Zotlabs\Web\Controller {
$search_flags = " and abook_pending = 1 ";
$head = t('New');
$pending = true;
- \App::$argv[1] = 'pending';
+ App::$argv[1] = 'pending';
}
else {
$head = t('All');
$search_flags = '';
$all = true;
- \App::$argc = 1;
- unset(\App::$argv[1]);
+ App::$argc = 1;
+ unset(App::$argv[1]);
}
break;
// case 'unconnected':
@@ -225,15 +228,15 @@ class Connections extends \Zotlabs\Web\Controller {
intval(local_channel())
);
if($r) {
- \App::set_pager_total($r[0]['total']);
+ App::set_pager_total($r[0]['total']);
$total = $r[0]['total'];
}
$r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash
WHERE abook_channel = %d and abook_self = 0 and xchan_deleted = 0 and xchan_orphan = 0 $sql_extra $sql_extra2 ORDER BY xchan_name LIMIT %d OFFSET %d ",
intval(local_channel()),
- intval(\App::$pager['itemspage']),
- intval(\App::$pager['start'])
+ intval(App::$pager['itemspage']),
+ intval(App::$pager['start'])
);
$contacts = array();
@@ -337,7 +340,7 @@ class Connections extends \Zotlabs\Web\Controller {
'$finding' => (($searching) ? t('Connections search') . ": '" . $search . "'" : ""),
'$submit' => t('Find'),
'$edit' => t('Edit'),
- '$cmd' => \App::$cmd,
+ '$cmd' => App::$cmd,
'$contacts' => $contacts,
'$paginate' => paginate($a),
diff --git a/Zotlabs/Module/Settings/Connections.php b/Zotlabs/Module/Settings/Connections.php
new file mode 100644
index 000000000..361d86ccb
--- /dev/null
+++ b/Zotlabs/Module/Settings/Connections.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Zotlabs\Module\Settings;
+
+
+class Connections {
+
+ function post() {
+ check_form_security_token_redirectOnErr('/settings/connections', 'settings_connections');
+
+ $features = self::get_features();
+
+ process_features_post(local_channel(), $features, $_POST);
+
+ build_sync_packet();
+ return;
+ }
+
+ function get() {
+
+ $features = self::get_features();
+
+ $tpl = get_markup_template("settings_module.tpl");
+
+ $o .= replace_macros($tpl, array(
+ '$action_url' => 'settings/connections',
+ '$form_security_token' => get_form_security_token("settings_connections"),
+ '$title' => t('Connections Settings'),
+ '$features' => process_features_get(local_channel(), $features),
+ '$submit' => t('Submit')
+ ));
+
+ return $o;
+ }
+
+ function get_features() {
+ $arr = [
+ [
+ 'connfilter',
+ t('Connection Filtering'),
+ t('Filter incoming posts from connections based on keywords/content'),
+ false,
+ get_config('feature_lock','connfilter')
+ ]
+ ];
+
+ return $arr;
+
+ }
+
+}
diff --git a/Zotlabs/Module/Settings/Network.php b/Zotlabs/Module/Settings/Network.php
index 4e2e3915e..eaf11f3da 100644
--- a/Zotlabs/Module/Settings/Network.php
+++ b/Zotlabs/Module/Settings/Network.php
@@ -10,13 +10,7 @@ class Network {
$features = self::get_features();
- foreach($features as $f) {
- $k = $f[0];
- if(array_key_exists("feature_$k",$_POST))
- set_pconfig(local_channel(),'feature',$k, (string) $_POST["feature_$k"]);
- else
- set_pconfig(local_channel(),'feature', $k, '');
- }
+ process_features_post(local_channel(), $features, $_POST);
build_sync_packet();
return;
@@ -26,17 +20,13 @@ class Network {
$features = self::get_features();
- foreach($features as $f) {
- $arr[] = array('feature_' . $f[0],$f[1],((intval(feature_enabled(local_channel(),$f[0]))) ? "1" : ''),$f[2],array(t('Off'),t('On')));
- }
-
$tpl = get_markup_template("settings_module.tpl");
$o .= replace_macros($tpl, array(
'$action_url' => 'settings/network',
'$form_security_token' => get_form_security_token("settings_network"),
'$title' => t('Activity Settings'),
- '$features' => $arr,
+ '$features' => process_features_get(local_channel(), $features),
'$submit' => t('Submit')
));