diff options
| author | Andrew Manning <andrew@reticu.li> | 2016-11-29 22:13:24 -0500 |
|---|---|---|
| committer | Andrew Manning <andrew@reticu.li> | 2016-11-29 22:13:24 -0500 |
| commit | 50a8ba8c18b081ce60ba7ab1a74ba30d8ff43794 (patch) | |
| tree | 4f38196c3f0b45d6aa87149ca27119481f470c60 /Zotlabs/Module/Connedit.php | |
| parent | b32bce9be22ca9c0c2b47e4a43282e9289c236ff (diff) | |
| parent | 8c87f32b381ec0be066cdd0e6ca4fe50079bbd16 (diff) | |
| download | volse-hubzilla-50a8ba8c18b081ce60ba7ab1a74ba30d8ff43794.tar.gz volse-hubzilla-50a8ba8c18b081ce60ba7ab1a74ba30d8ff43794.tar.bz2 volse-hubzilla-50a8ba8c18b081ce60ba7ab1a74ba30d8ff43794.zip | |
Merge remote-tracking branch 'upstream/dev' into doco
Diffstat (limited to 'Zotlabs/Module/Connedit.php')
| -rw-r--r-- | Zotlabs/Module/Connedit.php | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php index 9dfa871f7..5968ccde6 100644 --- a/Zotlabs/Module/Connedit.php +++ b/Zotlabs/Module/Connedit.php @@ -48,9 +48,6 @@ class Connedit extends \Zotlabs\Web\Controller { } - static public function xchan_name_sort($a,$b) { - return strcasecmp($a['xchan_name'],$b['xchan_name']); - } /* @brief Evaluate posted values and set changes * @@ -401,6 +398,7 @@ class Connedit extends \Zotlabs\Web\Controller { return login(); } + $section = ((array_key_exists('section',$_REQUEST)) ? $_REQUEST['section'] : ''); $channel = \App::get_channel(); $my_perms = get_channel_default_perms(local_channel()); $role = get_pconfig(local_channel(),'system','permissions_role'); @@ -557,12 +555,11 @@ class Connedit extends \Zotlabs\Web\Controller { $contact_id = \App::$poi['abook_id']; $contact = \App::$poi; - $cn = q("SELECT abook_id, xchan_name from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_self = 0", + $cn = q("SELECT abook_id, xchan_name from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_self = 0 order by xchan_name", intval(local_channel()) ); - if($cn) { - usort($cn, '\\Zotlabs\\Module\\Connedit::xchan_name_sort'); + if($cn) { $pntotal = count($cn); for($x = 0; $x < $pntotal; $x ++) { @@ -783,6 +780,7 @@ class Connedit extends \Zotlabs\Web\Controller { '$header' => (($self) ? t('Connection Default Permissions') : sprintf( t('Connection: %s'),$contact['xchan_name'])), '$autoperms' => array('autoperms',t('Apply these permissions automatically'), ((get_pconfig(local_channel(),'system','autoperms')) ? 1 : 0), t('Connection requests will be approved without your interaction'), $yes_no), '$addr' => $contact['xchan_addr'], + '$section' => $section, '$addr_text' => t('This connection\'s primary address is'), '$loc_text' => t('Available locations:'), '$locstr' => $locstr, |