The poller now always respects the priority setting for feeds.

[friendica.git] / mod / contacts.php

diff --git a/mod/contacts.php b/mod/contacts.php
index 51ff4ed4bc1fc481dcc646ceb5ae34c76873e06d..300331a9dcdf19be1f09e992691ca3b3aa98f7f9 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -3,6 +3,7 @@
 require_once('include/Contact.php');
 require_once('include/socgraph.php');
 require_once('include/contact_selectors.php');
+require_once('mod/proxy.php');
 
 function contacts_init(&$a) {
        if(! local_user())
@@ -73,12 +74,12 @@ function contacts_init(&$a) {
 function contacts_batch_actions(&$a){
        $contacts_id = $_POST['contact_batch'];
        if (!is_array($contacts_id)) return;
-       
+
        $orig_records = q("SELECT * FROM `contact` WHERE `id` IN (%s) AND `uid` = %d AND `self` = 0",
                implode(",", $contacts_id),
                intval(local_user())
        );
-       
+
        $count_actions=0;
        foreach($orig_records as $orig_record) {
                $contact_id = $orig_record['id'];
@@ -106,7 +107,7 @@ function contacts_batch_actions(&$a){
        if ($count_actions>0) {
                info ( sprintf( tt("%d contact edited.", "%d contacts edited", $count_actions), $count_actions) );
        }
-       
+
        if(x($_SESSION,'return_url'))
                goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
        else
@@ -160,6 +161,8 @@ function contacts_post(&$a) {
 
        $fetch_further_information = intval($_POST['fetch_further_information']);
 
+       $ffi_keyword_blacklist = fix_mce_lf(escape_tags(trim($_POST['ffi_keyword_blacklist'])));
+
        $priority = intval($_POST['poll']);
        if($priority > 5 || $priority < 0)
                $priority = 0;
@@ -167,13 +170,15 @@ function contacts_post(&$a) {
        $info = fix_mce_lf(escape_tags(trim($_POST['info'])));
 
        $r = q("UPDATE `contact` SET `profile-id` = %d, `priority` = %d , `info` = '%s',
-               `hidden` = %d, `notify_new_posts` = %d, `fetch_further_information` = %d WHERE `id` = %d AND `uid` = %d",
+               `hidden` = %d, `notify_new_posts` = %d, `fetch_further_information` = %d,
+               `ffi_keyword_blacklist` = '%s' WHERE `id` = %d AND `uid` = %d",
                intval($profile_id),
                intval($priority),
                dbesc($info),
                intval($hidden),
                intval($notify),
                intval($fetch_further_information),
+               dbesc($ffi_keyword_blacklist),
                intval($contact_id),
                intval(local_user())
        );
@@ -388,7 +393,7 @@ function contacts_content(&$a) {
                                $dir_icon = 'images/larrow.gif';
                                $relation_text = t('You are sharing with %s');
                                break;
-       
+
                        case CONTACT_IS_SHARING;
                                $dir_icon = 'images/rarrow.gif';
                                $relation_text = t('%s is sharing with you');
@@ -403,19 +408,19 @@ function contacts_content(&$a) {
                        $url = "redir/{$contact['id']}";
                        $sparkle = ' class="sparkle" ';
                }
-               else { 
+               else {
                        $url = $contact['url'];
                        $sparkle = '';
                }
 
                $insecure = t('Private communications are not available for this contact.');
 
-               $last_update = (($contact['last-update'] == '0000-00-00 00:00:00') 
-                               ? t('Never') 
+               $last_update = (($contact['last-update'] == '0000-00-00 00:00:00')
+                               ? t('Never')
                                : datetime_convert('UTC',date_default_timezone_get(),$contact['last-update'],'D, j M Y, g:i A'));
 
                if($contact['last-update'] !== '0000-00-00 00:00:00')
-                       $last_update .= ' ' . (($contact['last-update'] == $contact['success_update']) ? t("\x28Update was successful\x29") : t("\x28Update was not successful\x29"));
+                       $last_update .= ' ' . (($contact['last-update'] <= $contact['success_update']) ? t("\x28Update was successful\x29") : t("\x28Update was not successful\x29"));
 
                $lblsuggest = (($contact['network'] === NETWORK_DFRN) ? t('Suggest friends') : '');
 
@@ -426,7 +431,7 @@ function contacts_content(&$a) {
                $common = count_common_friends(local_user(),$contact['id']);
                $common_text = (($common) ? sprintf( tt('%d contact in common','%d contacts in common', $common),$common) : '');
 
-               $polling = (($contact['network'] === NETWORK_MAIL | $contact['network'] === NETWORK_FEED) ? 'polling' : ''); 
+               $polling = (($contact['network'] === NETWORK_MAIL | $contact['network'] === NETWORK_FEED) ? 'polling' : '');
 
                $x = count_all_friends(local_user(), $contact['id']);
                $all_friends = (($x) ? t('View all contacts') : '');
@@ -504,6 +509,8 @@ function contacts_content(&$a) {
                        '$notify' => array('notify', t('Notification for new posts'), ($contact['notify_new_posts'] == 1), t('Send a notification of every new post of this contact')),
                        '$fetch_further_information' => array('fetch_further_information', t('Fetch further information for feeds'), $contact['fetch_further_information'], t('Fetch further information for feeds'),
                                                                array('0'=>t('Disabled'), '1'=>t('Fetch information'), '2'=>t('Fetch information and keywords'))),
+                       '$ffi_keyword_blacklist' => $contact['ffi_keyword_blacklist'],
+                       '$ffi_keyword_blacklist' => array('ffi_keyword_blacklist', t('Blacklisted keywords'), $contact['ffi_keyword_blacklist'], t('Comma separated list of keywords that should not be converted to hashtags, when "Fetch information and keywords" is selected')),
                        '$photo' => $contact['photo'],
                        '$name' => $contact['name'],
                        '$dir_icon' => $dir_icon,
@@ -617,11 +624,11 @@ function contacts_content(&$a) {
 
        if($nets)
                $sql_extra .= sprintf(" AND network = '%s' ", dbesc($nets));
- 
-       $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` 
+       $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`
                WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ",
                intval($_SESSION['uid']));
        if(count($r)) {
@@ -662,7 +669,7 @@ function contacts_content(&$a) {
                                $url = "redir/{$rr['id']}";
                                $sparkle = ' class="sparkle" ';
                        }
-                       else { 
+                       else {
                                $url = $rr['url'];
                                $sparkle = '';
                        }
@@ -675,7 +682,7 @@ function contacts_content(&$a) {
                                'id' => $rr['id'],
                                'alt_text' => $alt_text,
                                'dir_icon' => $dir_icon,
-                               'thumb' => $rr['thumb'], 
+                               'thumb' => proxy_url($rr['thumb']),
                                'name' => $rr['name'],
                                'username' => $rr['name'],
                                'sparkle' => $sparkle,