harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
zotlabs
2018-09-20 18:36:14 -07:00
parent 3cc66b6816 369f34b2d1
commit a4d987b45a
18 changed files with 258 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Zotlabs/Module/Connections.php
View File

@@ -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),

51
Zotlabs/Module/Settings/Connections.php Normal file
View File

@@ -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;
}
}

25
Zotlabs/Module/Settings/Network.php
View File

@@ -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,19 +20,14 @@ 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,
'$baseurl' => z_root(),
'$submit' => t('Submit'),
'$features' => process_features_get(local_channel(), $features),
'$submit' => t('Submit')
));
return $o;
@@ -109,14 +98,6 @@ class Network {
t('Show friend and connection suggestions'),
false,
get_config('feature_lock','suggest')
],
[
'connfilter',
t('Connection Filtering'),
t('Filter incoming posts from connections based on keywords/content'),
false,
get_config('feature_lock','connfilter')
]
];