X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fonepoll.php;h=eb1045de142957dcab4e08d8b66ff8aa3ecb4750;hb=0adff6f6b893bd7562547bb00021f358383f51ba;hp=5ebafb353e95323b33a40d34a2a25e10a01078e4;hpb=4007876b847e711d25f08b6e6e8cc624ee21c794;p=friendica.git

diff --git a/include/onepoll.php b/include/onepoll.php
index 5ebafb353e..eb1045de14 100644
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -27,12 +27,10 @@ function onepoll_run(&$argv, &$argc){
 
 	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');
 	require_once('include/socgraph.php');
-	require_once('include/pidfile.php');
 	require_once('include/queue_fn.php');
 
 	load_config('config');
@@ -61,18 +59,10 @@ function onepoll_run(&$argv, &$argc){
 		return;
 	}
 
-	$lockpath = get_lockpath();
-	if ($lockpath != '') {
-		$pidfile = new pidfile($lockpath, 'onepoll'.$contact_id);
-		if ($pidfile->is_already_running()) {
-			logger("onepoll: Already running for contact ".$contact_id);
-			if ($pidfile->running_time() > 9*60) {
-				$pidfile->kill();
-				logger("killed stale process");
-			}
-			exit;
-		}
-	}
+	// Don't check this stuff if the function is called by the poller
+	if (App::callstack() != "poller_run")
+		if (App::is_already_running('onepoll'.$contact_id, '', 540))
+			return;
 
 	$d = datetime_convert();
 
@@ -335,7 +325,7 @@ function onepoll_run(&$argv, &$argc){
 		if($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['blocked'] || $contact['readonly'])
 			return;
 
-		$cookiejar = tempnam('/tmp', 'cookiejar-onepoll-');
+		$cookiejar = tempnam(get_temppath(), 'cookiejar-onepoll-');
 		$xml = fetch_url($contact['poll'], false, $redirects, 0, Null, $cookiejar);
 		unlink($cookiejar);
 	}