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

clean up the warnings about connections on unclonable networks

Browse Source
This commit is contained in:
zotlabs 2017-06-09 16:26:30 -07:00
parent 42c9f853a7
commit 2a4032d71a
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Zotlabs/Module/Connedit.php
View File

@ -842,6 +842,22 @@ class Connedit extends \Zotlabs\Web\Controller {
} }
else else
$locstr = t('none'); $locstr = t('none');
$clone_warn = '';
$clonable = (in_array($contact['xchan_network'],['zot','rss']) ? true : false);
if(! $clonable) {
$clone_warn = '<strong>';
$clone_warn .= ((intval($contact['abook_not_here']))
? t('This connection is unreachable from this location.')
: t('This connection may be unreachable from other channel locations.')
);
$clone_warn .= '</strong><br>' . t('Location independence is not supported by their network.');
}
if(intval($contact['abook_not_here']) && $unclonable)
$not_here = t('This connection is unreachable from this location. Location independence is not supported by their network.');
$o .= replace_macros($tpl, [ $o .= replace_macros($tpl, [
'$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'])),
@ -856,7 +872,7 @@ class Connedit extends \Zotlabs\Web\Controller {
'$addr_text' => t('This connection\'s primary address is'), '$addr_text' => t('This connection\'s primary address is'),
'$loc_text' => t('Available locations:'), '$loc_text' => t('Available locations:'),
'$locstr' => $locstr, '$locstr' => $locstr,
'$not_here' => ((intval($contact['abook_not_here'])) ? t('Not connected at this location') : ''), '$unclonable' => $clone_warn,
'$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.'),

5
view/tpl/abook_edit.tpl
View File

@ -59,10 +59,11 @@
{{$loc_text}} {{$locstr}} {{$loc_text}} {{$locstr}}
</div> </div>
{{/if}} {{/if}}
{{if $not_here}} {{if $unclonable}}
<div> <div>
<strong>{{$not_here}}</strong> <br>{{$unclonable}}
</div> </div>
<br>
{{/if}} {{/if}}
{{if $last_update}} {{if $last_update}}
<div> <div>