X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fitems.php;h=24eb1b30fb7b97c823238d2a2989b9d9413b589e;hb=9521f39ebea7603098e4f96f5edb6c85a40fc646;hp=8d95c3552973498e575b428819f72bebf67af1ae;hpb=d2280d4120ca09ff5f3013e961a1f43bb5244cc6;p=friendica.git

diff --git a/include/items.php b/include/items.php
index 8d95c35529..24eb1b30fb 100644
--- a/include/items.php
+++ b/include/items.php
@@ -820,7 +820,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
 	// Store the unescaped version
 	$unescaped = $arr;
 
-	dbesc_array($arr);
+	dbm::esc_array($arr, true);
 
 	logger('item_store: ' . print_r($arr,true), LOGGER_DATA);
 
@@ -829,9 +829,9 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
 
 	$r = dbq("INSERT INTO `item` (`"
 			. implode("`, `", array_keys($arr))
-			. "`) VALUES ('"
-			. implode("', '", array_values($arr))
-			. "')");
+			. "`) VALUES ("
+			. implode(", ", array_values($arr))
+			. ")");
 
 	// And restore it
 	$arr = $unescaped;
@@ -857,10 +857,15 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
 		}
 
 		// Now we store the data in the spool directory
-		$file = 'item-'.round(microtime(true) * 10000).".msg";
-		$spool = get_spoolpath().'/'.$file;
-		file_put_contents($spool, json_encode($arr));
-		logger("Item wasn't stored - Item was spooled into file ".$file, LOGGER_DEBUG);
+		// We use "microtime" to keep the arrival order and "mt_rand" to avoid duplicates
+		$file = 'item-'.round(microtime(true) * 10000).'-'.mt_rand().'.msg';
+
+		$spoolpath = get_spoolpath();
+		if ($spoolpath != "") {
+			$spool = $spoolpath.'/'.$file;
+			file_put_contents($spool, json_encode($arr));
+			logger("Item wasn't stored - Item was spooled into file ".$file, LOGGER_DEBUG);
+		}
 		return 0;
 	}
 
@@ -955,12 +960,14 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
 
 		$r = q('SELECT * FROM `item` WHERE `id` = %d', intval($current_post));
 		if ((dbm::is_result($r)) && (count($r) == 1)) {
-			if ($notify)
+			if ($notify) {
 				call_hooks('post_local_end', $r[0]);
-			else
+			} else {
 				call_hooks('post_remote_end', $r[0]);
-		} else
+			}
+		} else {
 			logger('item_store: new item not found in DB, id ' . $current_post);
+		}
 	}
 
 	if ($arr['parent-uri'] === $arr['uri']) {
@@ -994,8 +1001,9 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
 
 	check_item_notification($current_post, $uid);
 
-	if ($notify)
+	if ($notify) {
 		proc_run(PRIORITY_HIGH, "include/notifier.php", $notify_type, $current_post);
+	}
 
 	return $current_post;
 }