X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcontacts.php;h=2fc01a0d8bee9d73fa58960e64e9b68b3c02e022;hb=020deefba613327a1d8875ba7f2cf9a750be42dd;hp=0ad0d217f0eb30449d4746efa24b09c2984e2931;hpb=b2e92e0af32f86212d15748c6d432d658905d4b6;p=friendica.git
diff --git a/mod/contacts.php b/mod/contacts.php
index 0ad0d217f0..2fc01a0d8b 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -3,16 +3,30 @@
require_once('include/Contact.php');
function contacts_init(&$a) {
+ if(! local_user())
+ return;
+
require_once('include/group.php');
if(! x($a->page,'aside'))
$a->page['aside'] = '';
$a->page['aside'] .= group_side();
- if($a->config['register_policy'] != REGISTER_CLOSED)
- $a->page['aside'] .= '
';
+ $inv = '';
+
+ if(get_config('system','invitation_only')) {
+ $x = get_pconfig(local_user(),'system','invites_remaining');
+ if($x || is_site_admin()) {
+ $a->page['aside'] .= ''
+ . sprintf( tt('%d invitation available','%d invitations available',$x), $x)
+ . '
' . $inv;
+ }
+ }
+ elseif($a->config['register_policy'] != REGISTER_CLOSED)
+ $a->page['aside'] .= $inv;
+
- if(strlen(get_config('system','directory_submit_url')))
- $a->page['aside'] .= '';
+ $a->page['aside'] .= '';
$tpl = get_markup_template('follow.tpl');
$a->page['aside'] .= replace_macros($tpl,array(
@@ -58,7 +72,7 @@ function contacts_post(&$a) {
return;
}
}
-logger('contact_edit ' . print_r($_POST,true));
+
$priority = intval($_POST['poll']);
if($priority == (-1))
@@ -85,7 +99,7 @@ logger('contact_edit ' . print_r($_POST,true));
intval(local_user())
);
if($r)
- notice( t('Contact updated.') . EOL);
+ info( t('Contact updated.') . EOL);
else
notice( t('Failed to update contact record.') . EOL);
return;
@@ -143,7 +157,7 @@ function contacts_content(&$a) {
);
if($r) {
//notice( t('Contact has been ') . (($blocked) ? t('blocked') : t('unblocked')) . EOL );
- notice( (($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')) . EOL );
+ info( (($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')) . EOL );
}
goaway($a->get_baseurl() . '/contacts/' . $contact_id);
return; // NOTREACHED
@@ -157,7 +171,7 @@ function contacts_content(&$a) {
intval(local_user())
);
if($r) {
- notice( (($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')) . EOL );
+ info( (($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')) . EOL );
}
goaway($a->get_baseurl() . '/contacts/' . $contact_id);
return; // NOTREACHED
@@ -197,7 +211,7 @@ function contacts_content(&$a) {
contact_remove($contact_id);
- notice( t('Contact has been removed.') . EOL );
+ info( t('Contact has been removed.') . EOL );
goaway($a->get_baseurl() . '/contacts');
return; // NOTREACHED
}
@@ -249,6 +263,15 @@ function contacts_content(&$a) {
$sparkle = '';
}
+ $grps = '';
+ $member_of = member_of($r[0]['id']);
+ if(is_array($member_of) && count($member_of)) {
+ $grps = t('Member of: ') . EOL . '';
+ }
+
$insecure = '
'
. t('Private communications are not available for this contact.') . '
';
@@ -259,6 +282,10 @@ function contacts_content(&$a) {
if($r[0]['last-update'] !== '0000-00-00 00:00:00')
$last_update .= ' ' . (($r[0]['last-update'] == $r[0]['success_update']) ? t("\x28Update was successful\x29") : t("\x28Update was not successful\x29"));
+ $lblsuggest = (($r[0]['network'] === NETWORK_DFRN)
+ ? '' : '');
+
+
$o .= replace_macros($tpl,array(
'$header' => t('Contact Editor'),
'$submit' => t('Submit'),
@@ -269,12 +296,14 @@ function contacts_content(&$a) {
'$lbl_rep2' => t('Occasionally your friends may wish to inquire about this person\'s online legitimacy.'),
'$lbl_rep3' => t('You may help them choose whether or not to interact with this person by providing a reputation to guide them.'),
'$lbl_rep4' => t('Please take a moment to elaborate on this selection if you feel it could be helpful to others.'),
- '$visit' => t('Visit $name\'s profile'),
+ '$visit' => sprintf( t('Visit %s\'s profile [%s]'),$r[0]['name'],$r[0]['url']),
'$blockunblock' => t('Block/Unblock contact'),
'$ignorecont' => t('Ignore contact'),
'$altcrepair' => t('Repair contact URL settings'),
'$lblcrepair' => t("Repair contact URL settings \x28WARNING: Advanced\x29"),
'$lblrecent' => t('View conversations'),
+ '$lblsuggest' => $lblsuggest,
+ '$grps' => $grps,
'$delete' => t('Delete contact'),
'$poll_interval' => contact_poll_interval($r[0]['priority']),
'$lastupdtext' => t('Last updated: '),
@@ -384,7 +413,7 @@ function contacts_content(&$a) {
$o .= replace_macros($tpl, array(
- '$img_hover' => t('Visit $username\'s profile'),
+ '$img_hover' => sprintf( t('Visit %s\'s profile [%s]'),$rr['name'],$rr['url']),
'$edit_hover' => t('Edit contact'),
'$id' => $rr['id'],
'$alt_text' => $alt_text,
@@ -402,4 +431,4 @@ function contacts_content(&$a) {
}
$o .= paginate($a);
return $o;
-}
\ No newline at end of file
+}