X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcontacts.php;h=f64709ab6c73d4b3c7131cc64aac47761c4fa2a6;hb=48ffa880f099b19052f18e399bf6af50780a24b0;hp=0ad0d217f0eb30449d4746efa24b09c2984e2931;hpb=4cff911939b263993eb41682ca558c975e2db01f;p=friendica.git diff --git a/mod/contacts.php b/mod/contacts.php index 0ad0d217f0..f64709ab6c 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -3,16 +3,42 @@ require_once('include/Contact.php'); function contacts_init(&$a) { + if(! local_user()) + return; + + $contact_id = 0; + if(($a->argc == 2) && intval($a->argv[1])) { + $contact_id = intval($a->argv[1]); + $r = q("SELECT * FROM `contact` WHERE `uid` = %d and `id` = %d LIMIT 1", + intval(local_user()), + intval($contact_id) + ); + if(! count($r)) { + $contact_id = 0; + } + } + require_once('include/group.php'); if(! x($a->page,'aside')) $a->page['aside'] = ''; - $a->page['aside'] .= group_side(); + $a->page['aside'] .= group_side('contacts','group',false,0,$contact_id); + + $inv = ''; + + if(get_config('system','invitation_only')) { + $x = get_pconfig(local_user(),'system','invites_remaining'); + if($x || is_site_admin()) { + $a->page['aside'] .= '' . $inv; + } + } + elseif($a->config['register_policy'] != REGISTER_CLOSED) + $a->page['aside'] .= $inv; - if($a->config['register_policy'] != REGISTER_CLOSED) - $a->page['aside'] .= ''; - 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 +84,7 @@ function contacts_post(&$a) { return; } } -logger('contact_edit ' . print_r($_POST,true)); + $priority = intval($_POST['poll']); if($priority == (-1)) @@ -85,7 +111,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 +169,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 +183,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 +223,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 } @@ -223,16 +249,16 @@ function contacts_content(&$a) { $tpl = get_markup_template("contact_edit.tpl"); switch($r[0]['rel']) { - case REL_BUD: + case CONTACT_IS_FRIEND: $dir_icon = 'images/lrarrow.gif'; $alt_text = t('Mutual Friendship'); break; - case REL_VIP; + case CONTACT_IS_FOLLOWER; $dir_icon = 'images/larrow.gif'; $alt_text = t('is a fan of yours'); break; - case REL_FAN; + case CONTACT_IS_SHARING; $dir_icon = 'images/rarrow.gif'; $alt_text = t('you are a fan of'); break; @@ -249,6 +275,8 @@ function contacts_content(&$a) { $sparkle = ''; } + $grps = ''; + $insecure = '

' . t('Privacy Unavailable') . ' ' . t('Private communications are not available for this contact.') . '

'; @@ -259,6 +287,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) + ? '
' . t('Suggest friends') . '
' : ''); + + $o .= replace_macros($tpl,array( '$header' => t('Contact Editor'), '$submit' => t('Submit'), @@ -269,12 +301,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: '), @@ -334,7 +368,7 @@ function contacts_content(&$a) { $search = dbesc($search.'*'); $sql_extra .= ((strlen($search)) ? " AND MATCH `name` AGAINST ('$search' IN BOOLEAN MODE) " : ""); - $sql_extra2 = ((($sort_type > 0) && ($sort_type <= REL_BUD)) ? sprintf(" AND `rel` = %d ",intval($sort_type)) : ''); + $sql_extra2 = ((($sort_type > 0) && ($sort_type <= CONTACT_IS_FRIEND)) ? sprintf(" AND `rel` = %d ",intval($sort_type)) : ''); $r = q("SELECT COUNT(*) AS `total` FROM `contact` @@ -358,15 +392,15 @@ function contacts_content(&$a) { continue; switch($rr['rel']) { - case REL_BUD: + case CONTACT_IS_FRIEND: $dir_icon = 'images/lrarrow.gif'; $alt_text = t('Mutual Friendship'); break; - case REL_VIP; + case CONTACT_IS_FOLLOWER; $dir_icon = 'images/larrow.gif'; $alt_text = t('is a fan of yours'); break; - case REL_FAN; + case CONTACT_IS_SHARING; $dir_icon = 'images/rarrow.gif'; $alt_text = t('you are a fan of'); break; @@ -384,7 +418,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 +436,4 @@ function contacts_content(&$a) { } $o .= paginate($a); return $o; -} \ No newline at end of file +}