X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fspool_post.php;h=b7b8de396ad6b0ba47772c15dc76124fd49e2bd8;hb=0cd9db9cb7f4c96f597e37590a536eaae123238d;hp=d55b100edae94bf7a72347a42a3df4dca3b660a6;hpb=288ad37c3c93bcc3f5f3409be095dba57deab7f4;p=friendica.git

diff --git a/include/spool_post.php b/include/spool_post.php
index d55b100eda..b7b8de396a 100644
--- a/include/spool_post.php
+++ b/include/spool_post.php
@@ -4,38 +4,50 @@
  * @brief Posts items that wer spooled because they couldn't be posted.
  */
 
-use \Friendica\Core\Config;
+use Friendica\Core\Config;
 
-require_once("boot.php");
 require_once("include/items.php");
 
 function spool_post_run($argv, $argc) {
-	global $a, $db;
-
-	if (is_null($a)) {
-		$a = new App;
-	}
-
-	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);
-	}
-
-	Config::load();
+	global $a;
 
 	$path = get_spoolpath();
 
-	if (is_writable($path)){
+	if (($path != '') && is_writable($path)){
 		if ($dh = opendir($path)) {
 			while (($file = readdir($dh)) !== false) {
+
+				// It is not named like a spool file, so we don't care.
+				if (substr($file, 0, 5) != "item-") {
+					continue;
+				}
+
 				$fullfile = $path."/".$file;
+
+				// We don't care about directories either
 				if (filetype($fullfile) != "file") {
 					continue;
 				}
+
+				// We can't read or write the file? So we don't care about it.
+				if (!is_writable($fullfile) || !is_readable($fullfile)) {
+					continue;
+				}
+
 				$arr = json_decode(file_get_contents($fullfile), true);
+
+				// If it isn't an array then it is no spool file
+				if (!is_array($arr)) {
+					continue;
+				}
+
+				// Skip if it doesn't seem to be an item array
+				if (!isset($arr['uid']) && !isset($arr['uri']) && !isset($arr['network'])) {
+					continue;
+				}
+
 				$result = item_store($arr);
+
 				logger("Spool file ".$file." stored: ".$result, LOGGER_DEBUG);
 				unlink($fullfile);
 			}
@@ -43,9 +55,3 @@ function spool_post_run($argv, $argc) {
 		}
 	}
 }
-
-if (array_search(__file__, get_included_files()) === 0) {
-	spool_post_run($_SERVER["argv"], $_SERVER["argc"]);
-	killme();
-}
-?>