]> git.mxchange.org Git - friendica.git/blobdiff - mod/contacts.php
Merge remote branch 'mike/master'
[friendica.git] / mod / contacts.php
index bd5bf8ea80b9c56d3acbf4d55aa342a1224b6673..c2d28dc1f25e5d7363e041170724c66fb2fb5474 100644 (file)
@@ -4,10 +4,20 @@ require_once('include/Contact.php');
 
 function contacts_init(&$a) {
        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'] .= '<div class="side-invite-link-wrapper" id="side-invite-link-wrapper" ><a href="invite" class="side-invite-link" id="side-invite-link">' . t("Invite Friends") . '</a></div>';
+
+       $tpl = load_view_file('view/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')
+       ));
+
 }
 
 function contacts_post(&$a) {
@@ -30,6 +40,8 @@ function contacts_post(&$a) {
                return; // NOTREACHED
        }
 
+       call_hooks('contact_edit_post', $_POST);
+
        $profile_id = intval($_POST['profile-assign']);
        if($profile_id) {
                $r = q("SELECT `id` FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
@@ -41,9 +53,9 @@ function contacts_post(&$a) {
                        return;
                }
        }
+logger('contact_edit ' . print_r($_POST,true));
 
-
-       $priority = intval($_POST['priority']);
+       $priority = intval($_POST['poll']);
        if($priority == (-1))
                
        if($priority > 5 || $priority < 0)
@@ -55,12 +67,15 @@ function contacts_post(&$a) {
 
        $reason = notags(trim($_POST['reason']));
 
-       $r = q("UPDATE `contact` SET `profile-id` = %d, `priority` = %d , `rating` = %d, `reason` = '%s'
+       $info = escape_tags(trim($_POST['info']));
+
+       $r = q("UPDATE `contact` SET `profile-id` = %d, `priority` = %d , `rating` = %d, `reason` = '%s', `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())
        );
@@ -76,7 +91,12 @@ function contacts_post(&$a) {
 
 function contacts_content(&$a) {
 
+       $sort_type = 0;
+       $o = '';
        $o .= '<script> $(document).ready(function() { $(\'#nav-contacts-link\').addClass(\'nav-selected\'); });</script>';
+
+       $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
+
        if(! local_user()) {
                notice( t('Permission denied.') . EOL);
                return;
@@ -101,6 +121,13 @@ function contacts_content(&$a) {
                        return; // NOTREACHED
                }
 
+               if($cmd === 'update') {
+
+                       // pull feed and consume it, which should subscribe to the hub.
+                       proc_run('php',"include/poller.php","$contact_id");
+                       goaway($a->get_baseurl() . '/contacts/' . $contact_id);
+                       // NOTREACHED
+               }
 
                if($cmd === 'block') {
                        $blocked = (($orig_record[0]['blocked']) ? 0 : 1);
@@ -131,6 +158,38 @@ function contacts_content(&$a) {
                }
 
                if($cmd === 'drop') {
+
+                       // create an unfollow slap
+
+                       if($orig_record[0]['network'] === 'stat') {
+                               $tpl = load_view_file('view/follow_slap.tpl');
+                               $slap = replace_macros($tpl, array(
+                                       '$name' => $a->user['username'],
+                                       '$profile_page' => $a->get_baseurl() . '/profile/' . $a->user['nickname'],
+                                       '$photo' => $a->contact['photo'],
+                                       '$thumb' => $a->contact['thumb'],
+                                       '$published' => datetime_convert('UTC','UTC', 'now', ATOM_TIME),
+                                       '$item_id' => 'urn:X-dfrn:' . $a->get_hostname() . ':unfollow:' . random_string(),
+                                       '$title' => '',
+                                       '$type' => 'text',
+                                       '$content' => t('stopped following'),
+                                       '$nick' => $a->user['nickname'],
+                                       '$verb' => ACTIVITY_UNFOLLOW,
+                                       '$ostat_follow' => '<as:verb>http://ostatus.org/schema/1.0/unfollow</as:verb>' . "\r\n"
+                               ));
+
+                               if((x($orig_record[0],'notify')) && (strlen($orig_record[0]['notify']))) {
+                                       require_once('include/salmon.php');
+                                       slapper($a->user,$orig_record[0]['notify'],$slap);
+                               }
+                       }
+
+                       if($orig_record[0]['network'] === 'dfrn') {
+                               require_once('include/items.php');
+                               dfrn_deliver($a->user,$orig_record[0],'placeholder', 1);
+                       }
+
+
                        contact_remove($contact_id);
                        notice( t('Contact has been removed.') . EOL );
                        goaway($a->get_baseurl() . '/contacts');
@@ -150,7 +209,10 @@ function contacts_content(&$a) {
                        return;
                }
 
-               require_once('view/contact_selectors.php');
+               $tpl = load_view_file('view/contact_head.tpl');
+               $a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
+
+               require_once('include/contact_selectors.php');
 
                $tpl = load_view_file("view/contact_edit.tpl");
 
@@ -181,15 +243,30 @@ function contacts_content(&$a) {
                        $sparkle = '';
                }
 
+               $last_update = (($r[0]['last-update'] == '0000-00-00 00:00:00') 
+                               ? t('Never') 
+                               : datetime_convert('UTC',date_default_timezone_get(),$r[0]['last-update'],'D, j M Y, g:i 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"));
+
                $o .= replace_macros($tpl,array(
+                       '$header' => t('Contact Editor'),
+                       '$visit' => t('Visit $name\'s profile'),
+                       '$blockunblock' => t('Block/Unblock contact'),
+                       '$ignorecont' => t('Ignore contact'),
+                       '$delete' => t('Delete contact'),
                        '$poll_interval' => contact_poll_interval($r[0]['priority']),
-                       '$last_update' => (($r[0]['last-update'] == '0000-00-00 00:00:00') 
-                               ? t('Never') 
-                               : datetime_convert('UTC',date_default_timezone_get(),$r[0]['last-update'],'D, j M Y, g:i A')),
-                       '$profile_select' => contact_profile_assign($r[0]['profile-id']),
+                       '$lastupdtext' => t('Last updated: '),
+                       '$updpub' => t('Update public posts: '),
+                       '$last_update' => $last_update,
+                       '$udnow' => t('Update now'),
+                       '$profile_select' => contact_profile_assign($r[0]['profile-id'],(($r[0]['network'] !== 'dfrn') ? true : false)),
                        '$contact_id' => $r[0]['id'],
                        '$block_text' => (($r[0]['blocked']) ? t('Unblock this contact') : t('Block this contact') ),
                        '$ignore_text' => (($r[0]['readonly']) ? t('Unignore this contact') : t('Ignore this contact') ),
+                       '$insecure' => (($r[0]['network'] === 'stat') ? load_view_file('view/insecure_net.tpl') : ''),
+                       '$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']),
@@ -204,7 +281,11 @@ function contacts_content(&$a) {
 
                ));
 
-               return $o;
+               $arr = array('contact' => $r[0],'output' => $o);
+
+               call_hooks('contact_edit', $arr);
+
+               return $arr['output'];
 
        }
 
@@ -218,6 +299,7 @@ function contacts_content(&$a) {
 
        $tpl = load_view_file("view/contacts-top.tpl");
        $o .= replace_macros($tpl,array(
+               '$header' => t('Contacts'),
                '$hide_url' => ((strlen($sql_extra)) ? 'contacts/all' : 'contacts' ),
                '$hide_text' => ((strlen($sql_extra)) ? t('Show Blocked Connections') : t('Hide Blocked Connections')),
                '$search' => $search,
@@ -288,11 +370,12 @@ function contacts_content(&$a) {
                                '$alt_text' => $alt_text,
                                '$dir_icon' => $dir_icon,
                                '$thumb' => $rr['thumb'], 
-                               '$name' => $rr['name'],
+                               '$name' => substr($rr['name'],0,20),
                                '$sparkle' => $sparkle,
                                '$url' => $url
                        ));
                }
+
                $o .= '<div id="contact-edit-end"></div>';
 
        }