diff options
| author | mrjive <mrjive@mrjive.it> | 2018-01-16 11:45:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-16 11:45:01 +0100 |
| commit | e81949bb095448881ce83605a50454d0c3c40782 (patch) | |
| tree | bd15059a020152b5dc59c265e22a27251efe0de4 /Zotlabs/Module/Connedit.php | |
| parent | b4f8f4df7bc5cc8a74240506cd536224cb31e114 (diff) | |
| parent | 9aadcb0bd40a8f773dc164f7dadc8c238fff9954 (diff) | |
| download | volse-hubzilla-e81949bb095448881ce83605a50454d0c3c40782.tar.gz volse-hubzilla-e81949bb095448881ce83605a50454d0c3c40782.tar.bz2 volse-hubzilla-e81949bb095448881ce83605a50454d0c3c40782.zip | |
Merge pull request #7 from redmatrix/dev
Dev
Diffstat (limited to 'Zotlabs/Module/Connedit.php')
| -rw-r--r-- | Zotlabs/Module/Connedit.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php index 23c5282e3..8288886cd 100644 --- a/Zotlabs/Module/Connedit.php +++ b/Zotlabs/Module/Connedit.php @@ -567,7 +567,7 @@ 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 order by xchan_name", + $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 and xchan_deleted = 0 order by xchan_name", intval(local_channel()) ); @@ -866,7 +866,7 @@ class Connedit extends \Zotlabs\Web\Controller { $o .= replace_macros($tpl, [ '$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), - '$permcat' => [ 'permcat', t('Permission role'), '', '',$permcats ], + '$permcat' => [ 'permcat', t('Permission role'), '', '<span class="loading invisible">' . t('Loading') . '<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span></span>',$permcats ], '$permcat_new' => t('Add permission role'), '$permcat_enable' => feature_enabled(local_channel(),'permcats'), '$addr' => $contact['xchan_addr'], |