cleanup untracked files

[friendica.git] / mod / contacts.php

diff --git a/mod/contacts.php b/mod/contacts.php
index 4c627c88f91ceba6f906eb82ccdb6c74b793eea9..aee6548fe6a225e9fccb67b28911e9d4aabdf687 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -9,15 +9,20 @@ function contacts_init(&$a) {
        $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>';
+               $a->page['aside'] .= '<div class="side-link" id="side-invite-link" ><a href="invite" >' . t("Invite Friends") . '</a></div>';
+
+       if(strlen(get_config('system','directory_submit_url')))
+               $a->page['aside'] .= '<div class="side-link" id="side-match-link"><a href="match" >' . t('Find People With Shared Interests') . '</a></div>';
 
        $tpl = load_view_file('view/follow.tpl');
        $a->page['aside'] .= replace_macros($tpl,array(
-               '$label' => t('Connect/Follow [profile address]'),
+               '$label' => t('Connect/Follow'),
                '$hint' => t('Example: bob@example.com, http://example.com/barbara'),
                '$follow' => t('Follow')
        ));
 
+
+
 }
 
 function contacts_post(&$a) {
@@ -124,9 +129,7 @@ function contacts_content(&$a) {
                if($cmd === 'update') {
 
                        // pull feed and consume it, which should subscribe to the hub.
-
-                       $php_path = ((x($a->config,'php_path') && strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-                       proc_run($php_path,"include/poller.php","$contact_id");
+                       proc_run('php',"include/poller.php","$contact_id");
                        goaway($a->get_baseurl() . '/contacts/' . $contact_id);
                        // NOTREACHED
                }
@@ -139,7 +142,8 @@ function contacts_content(&$a) {
                                        intval(local_user())
                        );
                        if($r) {
-                               notice( t('Contact has been ') . (($blocked) ? t('blocked') : t('unblocked')) . EOL );
+                               //notice( t('Contact has been ') . (($blocked) ? t('blocked') : t('unblocked')) . EOL );
+                               notice( (($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')) . EOL );
                        }
                        goaway($a->get_baseurl() . '/contacts/' . $contact_id);
                        return; // NOTREACHED
@@ -153,7 +157,7 @@ function contacts_content(&$a) {
                                        intval(local_user())
                        );
                        if($r) {
-                               notice( t('Contact has been ') . (($readonly) ? t('ignored') : t('unignored')) . EOL );
+                               notice( (($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')) . EOL );
                        }
                        goaway($a->get_baseurl() . '/contacts/' . $contact_id);
                        return; // NOTREACHED
@@ -245,6 +249,16 @@ function contacts_content(&$a) {
                        $sparkle = '';
                }
 
+               $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>';
+
+               $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'),
@@ -254,15 +268,13 @@ function contacts_content(&$a) {
                        '$poll_interval' => contact_poll_interval($r[0]['priority']),
                        '$lastupdtext' => t('Last updated: '),
                        '$updpub' => t('Update public posts: '),
-                       '$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')),
+                       '$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') : ''),
+                       '$insecure' => (($r[0]['network'] !== 'dfrn') ? $insecure : ''),
                        '$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>' : ''),
@@ -361,13 +373,14 @@ function contacts_content(&$a) {
 
 
                        $o .= replace_macros($tpl, array(
-                               '$img_hover' => t('Visit ') . $rr['name'] . t('\'s profile'),
+                               '$img_hover' => t('Visit $username\'s profile'),
                                '$edit_hover' => t('Edit contact'),
                                '$id' => $rr['id'],
                                '$alt_text' => $alt_text,
                                '$dir_icon' => $dir_icon,
                                '$thumb' => $rr['thumb'], 
-                               '$name' => $rr['name'],
+                               '$name' => substr($rr['name'],0,20),
+                               '$username' => $rr['name'],
                                '$sparkle' => $sparkle,
                                '$url' => $url
                        ));