From 15916a2cb717828367fc7e0bb74137942836a772 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sat, 10 Mar 2012 09:52:20 +0100
Subject: Mail: Removing signatures, gpg, unnecessary line breaks

---
 include/poller.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'include/poller.php')

diff --git a/include/poller.php b/include/poller.php
index cfbc46b87..3be6caebd 100755
--- a/include/poller.php
+++ b/include/poller.php
@@ -1,7 +1,6 @@
 <?php
 
 require_once("boot.php");
-require_once("include/quoteconvert.php");
 
 
 function poller_run($argv, $argc){
@@ -494,7 +493,7 @@ function poller_run($argv, $argc){
 								logger("Mail: can't fetch msg ".$msg_uid);
 								continue;
 							}
-							$datarray['body'] = escape_tags(convertquote($r['body'], false));
+							$datarray['body'] = escape_tags($r['body']);
 
 							logger("Mail: Importing ".$msg_uid);
 
-- 
cgit v1.2.3


From e098147c24bd45bc15c14fc597bd101b66011458 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sat, 10 Mar 2012 11:29:40 +0100
Subject: New config options if ostatus polling should use the priority in the
 contacts

---
 include/poller.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'include/poller.php')

diff --git a/include/poller.php b/include/poller.php
index 3be6caebd..f165ad590 100755
--- a/include/poller.php
+++ b/include/poller.php
@@ -140,7 +140,10 @@ function poller_run($argv, $argc){
 			if($manual_id)
 				$contact['last-update'] = '0000-00-00 00:00:00';
 
-			if($contact['network'] === NETWORK_DFRN || $contact['network'] === NETWORK_OSTATUS)
+			if($contact['network'] === NETWORK_DFRN)
+				$contact['priority'] = 2;
+
+			if(!get_config('system','ostatus_use_priority') and ($contact['network'] === NETWORK_OSTATUS))
 				$contact['priority'] = 2;
 
 			if($contact['priority'] || $contact['subhub']) {
-- 
cgit v1.2.3


From 9f76d96d46356b18325ca49c383f94a1958fefd3 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sun, 11 Mar 2012 19:11:25 +0100
Subject: Cache: item cache now has an autodelete of old files. The pages
 plugin now sets a link via redirection. So posting works.

---
 include/poller.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'include/poller.php')

diff --git a/include/poller.php b/include/poller.php
index f165ad590..65fafda4c 100755
--- a/include/poller.php
+++ b/include/poller.php
@@ -69,6 +69,19 @@ function poller_run($argv, $argc){
 	// clear old cache
 	Cache::clear();
 
+	// clear item cache files if they are older than one day
+	$cache = get_config('system','itemcache');
+	if (($cache != '') and is_dir($cache)) {
+		if ($dh = opendir($cache)) {
+			while (($file = readdir($dh)) !== false) {
+				$fullpath = $cache."/".$file;
+				if ((filetype($fullpath) == "file") and filectime($fullpath) < (time() - 1800))
+					unlink($fullpath);
+			}
+			closedir($dh);
+		}
+	}
+
 	$manual_id  = 0;
 	$generation = 0;
 	$hub_update = false;
-- 
cgit v1.2.3


From 9ca5de8c281fa0a7b2323f33765bca25b64bc29d Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sun, 11 Mar 2012 19:45:28 +0100
Subject: Item cache now is one day.

---
 include/poller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/poller.php')

diff --git a/include/poller.php b/include/poller.php
index 65fafda4c..3bc98e36f 100755
--- a/include/poller.php
+++ b/include/poller.php
@@ -75,7 +75,7 @@ function poller_run($argv, $argc){
 		if ($dh = opendir($cache)) {
 			while (($file = readdir($dh)) !== false) {
 				$fullpath = $cache."/".$file;
-				if ((filetype($fullpath) == "file") and filectime($fullpath) < (time() - 1800))
+				if ((filetype($fullpath) == "file") and filectime($fullpath) < (time() - 86400))
 					unlink($fullpath);
 			}
 			closedir($dh);
-- 
cgit v1.2.3


From cca524495cdc8c1167421393f4d8e8da4a94a855 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 18 Mar 2012 22:12:36 -0700
Subject: community discovery cont., cleanup of DB debugging

---
 include/poller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/poller.php')

diff --git a/include/poller.php b/include/poller.php
index 3bc98e36f..8262c1d60 100755
--- a/include/poller.php
+++ b/include/poller.php
@@ -232,7 +232,7 @@ function poller_run($argv, $argc){
 
 			$importer_uid = $contact['uid'];
 		
-			$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
+			$r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` LEFT JOIN `user` on `contact`.`uid` = `user`.`uid` WHERE `user`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
 				intval($importer_uid)
 			);
 			if(! count($r))
-- 
cgit v1.2.3