Merge pull request #37 from fabrixxm/master

[friendica.git] / mod / contacts.php

diff --git a/mod/contacts.php b/mod/contacts.php
index 5d72cff88ad1ad1c63c3d46cca46287fdf173b06..9bbcea07d3a98ab25fe62d1f63a91676de1329ff 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -19,35 +19,16 @@ function contacts_init(&$a) {
        }
 
        require_once('include/group.php');
+       require_once('include/contact_widgets.php');
+
        if(! x($a->page,'aside'))
                $a->page['aside'] = '';
-       $a->page['aside'] .= group_side('contacts','group',false,0,$contact_id);
-
-       $inv = '<div class="side-link" id="side-invite-link" ><a href="invite" >' . t("Invite Friends") . '</a></div>';
-
-       if(get_config('system','invitation_only')) {
-               $x = get_pconfig(local_user(),'system','invites_remaining');
-               if($x || is_site_admin()) {
-                       $a->page['aside'] .= '<div class="side-link" id="side-invite-remain">' 
-                       . sprintf( tt('%d invitation available','%d invitations available',$x), $x) 
-                       . '</div>' . $inv;
-               }
-       }
-       elseif($a->config['register_policy'] != REGISTER_CLOSED)
-               $a->page['aside'] .= $inv;
 
+       $a->page['aside'] .= follow_widget();
 
-       $a->page['aside'] .= '<div class="side-link" id="side-match-link"><a href="match" >' 
-               . t('Find People With Shared Interests') . '</a></div>';
-
-       $tpl = get_markup_template('follow.tpl');
-       $a->page['aside'] .= replace_macros($tpl,array(
-               '$label' => t('Connect/Follow'),
-               '$hint' => t('Example: bob@example.com, http://example.com/barbara'),
-               '$follow' => t('Follow')
-       ));
-
+       $a->page['aside'] .= group_side('contacts','group',false,0,$contact_id);
 
+       $a->page['aside'] .= findpeople_widget();
 
 }
 
@@ -87,25 +68,15 @@ function contacts_post(&$a) {
 
 
        $priority = intval($_POST['poll']);
-       if($priority == (-1))
-               
        if($priority > 5 || $priority < 0)
                $priority = 0;
 
-       $rating = intval($_POST['reputation']);
-       if($rating > 5 || $rating < 0)
-               $rating = 0;
-
-       $reason = notags(trim($_POST['reason']));
-
        $info = escape_tags(trim($_POST['info']));
 
-       $r = q("UPDATE `contact` SET `profile-id` = %d, `priority` = %d , `rating` = %d, `reason` = '%s', `info` = '%s'
+       $r = q("UPDATE `contact` SET `profile-id` = %d, `priority` = %d , `info` = '%s'
                WHERE `id` = %d AND `uid` = %d LIMIT 1",
                intval($profile_id),
                intval($priority),
-               intval($rating),
-               dbesc($reason),
                dbesc($info),
                intval($contact_id),
                intval(local_user())
@@ -124,7 +95,7 @@ function contacts_content(&$a) {
 
        $sort_type = 0;
        $o = '';
-       $o .= '<script> $(document).ready(function() { $(\'#nav-contacts-link\').addClass(\'nav-selected\'); });</script>';
+       nav_set_selected('contacts');
 
        $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
 
@@ -277,8 +248,6 @@ function contacts_content(&$a) {
                        $sparkle = '';
                }
 
-               $grps = '';
-
                $insecure = '<div id="profile-edit-insecure"><p><img src="images/unlock_icon.gif" alt="' . t('Privacy Unavailable') . '" />&nbsp;'
                        . t('Private communications are not available for this contact.') . '</p></div>';
 
@@ -313,7 +282,6 @@ function contacts_content(&$a) {
                        '$lblcrepair' => t("Repair contact URL settings \x28WARNING: Advanced\x29"),
                        '$lblrecent' => t('View conversations'),
                        '$lblsuggest' => $lblsuggest,
-                       '$grps' => $grps,
                        '$delete' => t('Delete contact'),
                        '$nettype' => $nettype,
                        '$poll_interval' => contact_poll_interval($r[0]['priority'],(! $poll_enabled)),
@@ -330,9 +298,6 @@ function contacts_content(&$a) {
                        '$info' => $r[0]['info'],
                        '$blocked' => (($r[0]['blocked']) ? '<div id="block-message">' . t('Currently blocked') . '</div>' : ''),
                        '$ignored' => (($r[0]['readonly']) ? '<div id="ignore-message">' . t('Currently ignored') . '</div>' : ''),
-                       '$rating' => contact_reputation($r[0]['rating']),
-                       '$reason' => $r[0]['reason'],
-                       '$groups' => '', // group_selector(),
                        '$photo' => $r[0]['photo'],
                        '$name' => $r[0]['name'],
                        '$dir_icon' => $dir_icon,
@@ -364,6 +329,7 @@ function contacts_content(&$a) {
                '$hide_url' => ((strlen($sql_extra)) ? 'contacts/all' : 'contacts' ),
                '$hide_text' => ((strlen($sql_extra)) ? t('Show Blocked Connections') : t('Hide Blocked Connections')),
                '$search' => $search,
+               '$desc' => t('Search your contacts'),
                '$finding' => (strlen($search) ? '<h4>' . t('Finding: ') . "'" . $search . "'" . '</h4>' : ""),
                '$submit' => t('Find'),
                '$cmd' => $a->cmd