friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #1413 from annando/1502-more-contact-options 

Show the profile visibility only for Friendica contacts
This commit is contained in:
fabrixxm 2015-02-23 08:49:34 +01:00
parent c8a1057300 f3cc065e66
commit d610445563
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mod/contacts.php
View File

@ -482,6 +482,9 @@ function contacts_content(&$a) {
if (in_array($contact['network'], array(NETWORK_FEED, NETWORK_MAIL, NETWORK_MAIL2))) if (in_array($contact['network'], array(NETWORK_FEED, NETWORK_MAIL, NETWORK_MAIL2)))
$poll_interval = contact_poll_interval($contact['priority'],(! $poll_enabled)); $poll_interval = contact_poll_interval($contact['priority'],(! $poll_enabled));
if ($contact['network'] == NETWORK_DFRN)
$profile_select = contact_profile_assign($contact['profile-id'],(($contact['network'] !== NETWORK_DFRN) ? true : false));
$o .= replace_macros($tpl, array( $o .= replace_macros($tpl, array(
'$header' => t('Contact Editor'), '$header' => t('Contact Editor'),
'$tab_str' => $tab_str, '$tab_str' => $tab_str,
@ -509,7 +512,7 @@ function contacts_content(&$a) {
'$updpub' => t('Update public posts'), '$updpub' => t('Update public posts'),
'$last_update' => $last_update, '$last_update' => $last_update,
'$udnow' => t('Update now'), '$udnow' => t('Update now'),
'$profile_select' => contact_profile_assign($contact['profile-id'],(($contact['network'] !== NETWORK_DFRN) ? true : false)), '$profile_select' => $profile_select,
'$contact_id' => $contact['id'], '$contact_id' => $contact['id'],
'$block_text' => (($contact['blocked']) ? t('Unblock') : t('Block') ), '$block_text' => (($contact['blocked']) ? t('Unblock') : t('Block') ),
'$ignore_text' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ), '$ignore_text' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ),

19
view/templates/contact_edit.tpl
View File

@ -84,15 +84,14 @@
</div> </div>
<div id="contact-edit-info-end"></div> <div id="contact-edit-info-end"></div>
{{if $profile_select}}
<div id="contact-edit-profile-select-text"> <div id="contact-edit-profile-select-text">
<h4>{{$lbl_vis1}}</h4> <h4>{{$lbl_vis1}}</h4>
<p>{{$lbl_vis2}}</p> <p>{{$lbl_vis2}}</p>
</div> </div>
{{$profile_select}} {{$profile_select}}
<div id="contact-edit-profile-select-end"></div> <div id="contact-edit-profile-select-end"></div>
<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" /> {{/if}}
</form> </form>
</div> </div>