X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fonepoll.php;h=6fb191f73da534dff3230ac9692848a9dd897d68;hb=ec57b61f012562e3a2464869d62ade97fdc2e8d9;hp=1fc861afa2a4f2fa0648110cf197fc2cd2967ded;hpb=c67fbc89c426255ffebe940e47435cc149254db8;p=friendica.git

diff --git a/include/onepoll.php b/include/onepoll.php
index 1fc861afa2..6fb191f73d 100644
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -18,16 +18,15 @@ function onepoll_run(&$argv, &$argc){
 	}
 
 	if(is_null($db)) {
-	    @include(".htconfig.php");
-	require_once("include/dba.php");
-	    $db = new dba($db_host, $db_user, $db_pass, $db_data);
-	unset($db_host, $db_user, $db_pass, $db_data);
+		@include(".htconfig.php");
+		require_once("include/dba.php");
+		$db = new dba($db_host, $db_user, $db_pass, $db_data);
+		unset($db_host, $db_user, $db_pass, $db_data);
 	};
 
 
 	require_once('include/session.php');
 	require_once('include/datetime.php');
-	require_once('library/simplepie/simplepie.inc');
 	require_once('include/items.php');
 	require_once('include/Contact.php');
 	require_once('include/email.php');
@@ -109,9 +108,8 @@ function onepoll_run(&$argv, &$argc){
 				poco_load($contact['id'],$importer_uid,0,$contact['poco']);
 	}
 
-	// To-Do:
-	// - Check why we don't poll the Diaspora feed at the moment (some guid problem in the items?)
-	// - Check whether this is possible with Redmatrix
+	/// @TODO Check why we don't poll the Diaspora feed at the moment (some guid problem in the items?)
+	/// @TODO Check whether this is possible with Redmatrix
 	if ($contact["network"] == NETWORK_DIASPORA) {
 		if (poco_do_update($contact["created"], $contact["last-item"], $contact["failure_update"], $contact["success_update"])) {
 			$last_updated = poco_last_updated($contact["url"]);
@@ -168,8 +166,18 @@ function onepoll_run(&$argv, &$argc){
 	);
 
 	// Update the contact entry
-	if(($contact['network'] === NETWORK_OSTATUS) || ($contact['network'] === NETWORK_DIASPORA) || ($contact['network'] === NETWORK_DFRN))
-		update_contact($contact["id"]);
+	if(($contact['network'] === NETWORK_OSTATUS) || ($contact['network'] === NETWORK_DIASPORA) || ($contact['network'] === NETWORK_DFRN)) {
+		if (!poco_reachable($contact['url'])) {
+			logger("Skipping probably dead contact ".$contact['url']);
+			return;
+		}
+
+		if (!update_contact($contact["id"])) {
+			mark_for_death($contact);
+			return;
+		} else
+			unmark_for_death($contact);
+	}
 
 	if($contact['network'] === NETWORK_DFRN) {
 
@@ -326,7 +334,9 @@ function onepoll_run(&$argv, &$argc){
 		if($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['blocked'] || $contact['readonly'])
 			return;
 
-		$xml = fetch_url($contact['poll']);
+		$cookiejar = tempnam(get_temppath(), 'cookiejar-onepoll-');
+		$xml = fetch_url($contact['poll'], false, $redirects, 0, Null, $cookiejar);
+		unlink($cookiejar);
 	}
 	elseif($contact['network'] === NETWORK_MAIL || $contact['network'] === NETWORK_MAIL2) {
 
@@ -360,7 +370,7 @@ function onepoll_run(&$argv, &$argc){
 				);
 				logger("Mail: Connected to " . $mailconf[0]['user']);
 			} else
-				logger("Mail: Connection error ".$mailconf[0]['user']." ".print_r(imap_errors()));
+				logger("Mail: Connection error ".$mailconf[0]['user']." ".print_r(imap_errors(), true));
 		}
 		if($mbox) {
 
@@ -497,7 +507,7 @@ function onepoll_run(&$argv, &$argc){
 						logger("Mail: Importing ".$msg_uid." for ".$mailconf[0]['user']);
 
 						// some mailing lists have the original author as 'from' - add this sender info to msg body.
-						// todo: adding a gravatar for the original author would be cool
+						/// @TODO Adding a gravatar for the original author would be cool
 
 						if(! stristr($meta->from,$contact['addr'])) {
 							$from = imap_mime_header_decode($meta->from);
@@ -669,6 +679,6 @@ function onepoll_run(&$argv, &$argc){
 }
 
 if (array_search(__file__,get_included_files())===0){
-  onepoll_run($_SERVER["argv"],$_SERVER["argc"]);
-  killme();
+	onepoll_run($_SERVER["argv"],$_SERVER["argc"]);
+	killme();
 }