Merge pull request #2886 from rabuzarus/0311_fix_photo_albums

cache: serialize the cache content directly in the cache class

include/Probe.php

@@ -217,7 +217,6 @@ class Probe {
 		if ($cache) {
 			$result = Cache::get("probe_url:".$network.":".$uri);
 			if (!is_null($result)) {
-				$result = unserialize($result);
 				return $result;
 			}
 		}
@@ -257,7 +256,7 @@ class Probe {
 
 		// Only store into the cache if the value seems to be valid
 		if (!in_array($data['network'], array(NETWORK_PHANTOM, NETWORK_MAIL))) {
-			Cache::set("probe_url:".$network.":".$uri,serialize($data), CACHE_DAY);
+			Cache::set("probe_url:".$network.":".$uri, $data, CACHE_DAY);
 
 			/// @todo temporary fix - we need a real contact update function that updates only changing fields
 			/// The biggest problem is the avatar picture that could have a reduced image size.

include/cache.php

@@ -99,8 +99,8 @@ class Cache {
 			dbesc($key)
 		);
 
-		if (count($r)) {
-			return $r[0]['v'];
+		if (dbm::is_result($r)) {
+			return unserialize($r[0]['v']);
 		}
 
 		return null;
@@ -108,7 +108,9 @@ class Cache {
 
 	/**
 	 * @brief Put data in the cache according to the key
-	 *
+	 * 
+	 * The input $value can have multiple formats.
+	 * 
 	 * @param string $key The key to the cached data
 	 * @param mixed $valie The value that is about to be stored
 	 * @param integer $duration The cache lifespan
@@ -126,7 +128,7 @@ class Cache {
 		/// @todo store the cache data in the same way like the config data
 		q("REPLACE INTO `cache` (`k`,`v`,`expire_mode`,`updated`) VALUES ('%s','%s',%d,'%s')",
 				dbesc($key),
-				dbesc($value),
+				dbesc(serialize($value)),
 				intval($duration),
 				dbesc(datetime_convert()));
 	}

include/cron.php

@@ -11,6 +11,7 @@ if (!file_exists("boot.php") AND (sizeof($_SERVER["argv"]) != 0)) {
 }
 
 require_once("boot.php");
+require_once("include/photos.php");
 
 
 function cron_run(&$argv, &$argc){
@@ -162,8 +163,9 @@ function cron_run(&$argv, &$argc){
  */
 function cron_update_photo_albums() {
 	$r = q("SELECT `uid` FROM `user` WHERE NOT `account_expired` AND NOT `account_removed`");
-	if (!dbm::is_result($r))
+	if (!dbm::is_result($r)) {
 		return;
+	}
 
 	foreach ($r AS $user) {
 		photo_albums($user['uid'], true);

include/gprobe.php

@@ -12,11 +12,11 @@ function gprobe_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');
@@ -39,14 +39,13 @@ function gprobe_run(&$argv, &$argc){
 
 	logger("gprobe start for ".normalise_link($url), LOGGER_DEBUG);
 
-	if (!count($r)) {
+	if (!dbm::is_result($r)) {
 
 		// Is it a DDoS attempt?
 		$urlparts = parse_url($url);
 
 		$result = Cache::get("gprobe:".$urlparts["host"]);
 		if (!is_null($result)) {
-			$result = unserialize($result);
 			if (in_array($result["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) {
 				logger("DDoS attempt detected for ".$urlparts["host"]." by ".$_SERVER["REMOTE_ADDR"].". server data: ".print_r($_SERVER, true), LOGGER_DEBUG);
 				return;
@@ -56,7 +55,7 @@ function gprobe_run(&$argv, &$argc){
 		$arr = probe_url($url);
 
 		if (is_null($result))
-			Cache::set("gprobe:".$urlparts["host"],serialize($arr));
+			Cache::set("gprobe:".$urlparts["host"], $arr);
 
 		if (!in_array($arr["network"], array(NETWORK_FEED, NETWORK_PHANTOM)))
 			update_gcontact($arr);
@@ -65,7 +64,7 @@ function gprobe_run(&$argv, &$argc){
 			dbesc(normalise_link($url))
 		);
 	}
-	if(count($r)) {
+	if(dbm::is_result($r)) {
 		// Check for accessibility and do a poco discovery
 		if (poco_last_updated($r[0]['url'], true) AND ($r[0]["network"] == NETWORK_DFRN))
 			poco_load(0,0,$r[0]['id'], str_replace('/profile/','/poco/',$r[0]['url']));
@@ -76,6 +75,6 @@ function gprobe_run(&$argv, &$argc){
 }
 
 if (array_search(__file__,get_included_files())===0){
-  gprobe_run($_SERVER["argv"],$_SERVER["argc"]);
-  killme();
+	gprobe_run($_SERVER["argv"],$_SERVER["argc"]);
+	killme();
 }

include/oembed.php

@@ -6,7 +6,15 @@ function oembed_replacecb($matches){
 	return $s;
 }
 
-
+/**
+ * @brief Get data from an URL to embed its content.
+ * 
+ * @param string $embedurl The URL from which the data should be fetched.
+ * @param bool $no_rich_type If set to true rich type content won't be fetched.
+ * 
+ * @return bool|object Returns object with embed content or false if no embedable
+ *	 content exists
+ */
 function oembed_fetch_url($embedurl, $no_rich_type = false){
 	$embedurl = trim($embedurl, "'");
 	$embedurl = trim($embedurl, '"');
@@ -16,11 +24,11 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
 	$r = q("SELECT * FROM `oembed` WHERE `url` = '%s'",
 		dbesc(normalise_link($embedurl)));
 
-	if ($r)
+	if (dbm::is_result($r)) {
 		$txt = $r[0]["content"];
-	else
+	} else {
 		$txt = Cache::get($a->videowidth . $embedurl);
-
+	}
 	// These media files should now be caught in bbcode.php
 	// left here as a fallback in case this is called from another source
 
@@ -28,27 +36,27 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
 	$ext = pathinfo(strtolower($embedurl),PATHINFO_EXTENSION);
 
 
-	if(is_null($txt)){
+	if (is_null($txt)) {
 		$txt = "";
 
 		if (!in_array($ext, $noexts)){
 			// try oembed autodiscovery
 			$redirects = 0;
-			$html_text = fetch_url($embedurl, false, $redirects, 15, "text/*"); /**/
-			if($html_text){
+			$html_text = fetch_url($embedurl, false, $redirects, 15, "text/*");
+			if ($html_text) {
 				$dom = @DOMDocument::loadHTML($html_text);
-				if ($dom){
+				if ($dom) {
 					$xpath = new DOMXPath($dom);
 					$attr = "oembed";
 					$xattr = oe_build_xpath("class","oembed");
 					$entries = $xpath->query("//link[@type='application/json+oembed']");
-					foreach($entries as $e){
+					foreach ($entries as $e) {
 						$href = $e->getAttributeNode("href")->nodeValue;
 						$txt = fetch_url($href . '&maxwidth=' . $a->videowidth);
 						break;
 					}
 					$entries = $xpath->query("//link[@type='text/json+oembed']");
-					foreach($entries as $e){
+					foreach ($entries as $e) {
 						$href = $e->getAttributeNode("href")->nodeValue;
 						$txt = fetch_url($href . '&maxwidth=' . $a->videowidth);
 						break;
@@ -57,7 +65,7 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
 			}
 		}
 
-		if ($txt==false || $txt==""){
+		if ($txt==false || $txt=="") {
 			$embedly = get_config("system", "embedly");
 			if ($embedly != "") {
 				// try embedly service
@@ -70,30 +78,33 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
 
 		$txt=trim($txt);
 
-		if ($txt[0]!="{")
+		if ($txt[0]!="{") {
 			$txt='{"type":"error"}';
-		else {	//save in cache
+		} else {	//save in cache
 			$j = json_decode($txt);
-			if ($j->type != "error")
+			if ($j->type != "error") {
 				q("INSERT INTO `oembed` (`url`, `content`, `created`) VALUES ('%s', '%s', '%s')
 					ON DUPLICATE KEY UPDATE `content` = '%s', `created` = '%s'",
 					dbesc(normalise_link($embedurl)),
 					dbesc($txt), dbesc(datetime_convert()),
 					dbesc($txt), dbesc(datetime_convert()));
+			}
 
-			Cache::set($a->videowidth.$embedurl,$txt, CACHE_DAY);
+			Cache::set($a->videowidth.$embedurl, $txt, CACHE_DAY);
 		}
 	}
 
 	$j = json_decode($txt);
 
-	if (!is_object($j))
+	if (!is_object($j)) {
 		return false;
+	}
 
 	// Always embed the SSL version
-	if (isset($j->html))
+	if (isset($j->html)) {
 		$j->html = str_replace(array("http://www.youtube.com/", "http://player.vimeo.com/"),
 			array("https://www.youtube.com/", "https://player.vimeo.com/"), $j->html);
+	}
 
 	$j->embedurl = $embedurl;
 
@@ -109,16 +120,18 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
 			//$j->height = $data["images"][0]["height"];
 		}
 
-		if (isset($data["title"]))
-		        $j->title = $data["title"];
+		if (isset($data["title"])) {
+			$j->title = $data["title"];
+		}
 
-		if (isset($data["text"]))
-	        	$j->description = $data["text"];
+		if (isset($data["text"])) {
+			$j->description = $data["text"];
+		}
 
 		if (is_array($data["images"])) {
-		        $j->thumbnail_url = $data["images"][0]["src"];
-		        $j->thumbnail_width = $data["images"][0]["width"];
-	        	$j->thumbnail_height = $data["images"][0]["height"];
+			$j->thumbnail_url = $data["images"][0]["src"];
+			$j->thumbnail_width = $data["images"][0]["width"];
+			$j->thumbnail_height = $data["images"][0]["height"];
 		}
 	}
 

include/photos.php

@@ -25,3 +25,34 @@ function gps2Num($coordPart) {
 
 	return floatval($parts[0]) / floatval($parts[1]);
 }
+
+/**
+ * @brief Fetch the photo albums that are available for a viewer
+ *
+ * The query in this function is cost intensive, so it is cached.
+ *
+ * @param int $uid User id of the photos
+ * @param bool $update Update the cache
+ *
+ * @return array Returns array of the photo albums
+ */
+function photo_albums($uid, $update = false) {
+	$sql_extra = permissions_sql($uid);
+
+	$key = "photo_albums:".$uid.":".local_user().":".remote_user();
+	$albums = Cache::get($key);
+	if (is_null($albums) OR $update) {
+		/// @todo This query needs to be renewed. It is really slow
+		// At this time we just store the data in the cache
+		$albums = qu("SELECT COUNT(DISTINCT `resource-id`) AS `total`, `album`
+			FROM `photo` USE INDEX (`uid_album_created`)
+			WHERE `uid` = %d  AND `album` != '%s' AND `album` != '%s' $sql_extra
+			GROUP BY `album` ORDER BY `created` DESC",
+			intval($uid),
+			dbesc('Contact Photos'),
+			dbesc(t('Contact Photos'))
+		);
+		Cache::set($key, $albums, CACHE_DAY);
+	}
+	return $albums;
+}

mod/photos.php

@@ -21,8 +21,6 @@ function photos_init(&$a) {
 
 	nav_set_selected('home');
 
-	$o = '';
-
 	if ($a->argc > 1) {
 		$nick = $a->argv[1];
 		$user = qu("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",