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

This may take a few iterations to discover the best way to present the information, but we need a way for members to know what alternate locations are available for a channel during times of server issues - and as recently discovered if there aren't any hublocs at all; without digging around the database and probing channels and other messy stuff.

Browse Source
This commit is contained in:
redmatrix 2015-10-29 01:23:56 -07:00
parent 4fec7aa991
commit 96402a2354
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mod/connedit.php
View File

@ -652,12 +652,28 @@ function connedit_content(&$a) {
$perms[] = array('perms_' . $k, $v[3], (($contact['abook_their_perms'] & $v[1]) ? "1" : ""),$thisperm, $v[1], (($channel[$v[0]] == PERMS_SPECIFIC) ? '' : '1'), $v[4], $checkinherited); $perms[] = array('perms_' . $k, $v[3], (($contact['abook_their_perms'] & $v[1]) ? "1" : ""),$thisperm, $v[1], (($channel[$v[0]] == PERMS_SPECIFIC) ? '' : '1'), $v[4], $checkinherited);
} }
$locstr = '';
$locs = q("select hubloc_addr as location from hubloc where hubloc_hash = '%s'",
dbesc($contact['xchan_hash'])
);
if($locs) {
foreach($locs as $l) {
if(strlen($locstr))
$locstr .= ', ';
$locstr .= $l['location'];
}
}
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(
'$header' => (($self) ? t('Connection Default Permissions') : sprintf( t('Connection: %s'),$contact['xchan_name'])), '$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), 'Connection requests will be approved without your interaction', array(t('No'),('Yes'))), '$autoperms' => array('autoperms',t('Apply these permissions automatically'), ((get_pconfig(local_channel(),'system','autoperms')) ? 1 : 0), 'Connection requests will be approved without your interaction', array(t('No'),('Yes'))),
'$addr' => $contact['xchan_addr'], '$addr' => $contact['xchan_addr'],
'$addr_text' => t('This connection\'s address is'), '$addr_text' => t('This connection\'s primary address is'),
'$loc_text' => t('Available locations:'),
'$locstr' => $locstr,
'$notself' => (($self) ? '' : '1'), '$notself' => (($self) ? '' : '1'),
'$self' => (($self) ? '1' : ''), '$self' => (($self) ? '1' : ''),
'$autolbl' => t('The permissions indicated on this page will be applied to all new connections.'), '$autolbl' => t('The permissions indicated on this page will be applied to all new connections.'),

2
version.inc
View File

@ -1 +1 @@
2015-10-28.1199 2015-10-29.1200

7
view/tpl/abook_edit.tpl
View File

@ -33,8 +33,13 @@
{{/foreach}} {{/foreach}}
<div class="section-content-info-wrapper"> <div class="section-content-info-wrapper">
<div> <div>
{{$addr_text}} <strong>'{{$addr}}'</strong> {{$addr_text}} <strong>'{{$addr}}'</strong>
</div> </div>
{{if $locstr}}
<div>
{{$loc_text}} {{$locstr}}
</div>
{{/if}}
{{if $last_update}} {{if $last_update}}
<div> <div>
{{$lastupdtext}} {{$last_update}} {{$lastupdtext}} {{$last_update}}