bug fix

api.php

@@ -17,8 +17,8 @@ if(!defined('entry')) define('entry',true);
 	require('entry.php');
 	global $user, $conf, $tumble;
 	$f = new feeds();
-	
-	$theme = new themes;
+	
+	$theme = new themes;
 
 	if (isset($_GET["action"]) && $_GET["action"] == "read") {
 		if (isset($_GET["start"])) { $start = $_GET["start"]; } else { $start = 0; }
@@ -27,82 +27,83 @@ if(!defined('entry')) define('entry',true);
 		if ($total > 50) { $total = 50; }
 		$user = new user();
 		$userData = $user->getUserByID(1);
-		$username = ($userData["name"] == "") ? "gelato" : $userData["name"];
-
-		$theme->set("username",$username);
-		$theme->set("conf",array(
-			"offsetCity"=>$conf->offsetCity,
-			"title"=>$conf->title,
-			"description"=>$conf->description
+		$username = ($userData["name"] == "") ? "gelato" : $userData["name"];
+
+		$theme->set("username",$username);
+		$theme->set("conf",array(
+			"offsetCity"=>$conf->offsetCity,
+			"title"=>$conf->title,
+			"description"=>$conf->description
 		));
-
-		$feeds = array();
		$actual_feeds = $f->getFeedList();
+
+		$feeds = array();
+		$actual_feeds = $f->getFeedList();
 		foreach($actual_feeds as $feed){
-			$error_text = ($feed["error"]>0) ? "false" : "true";
-			$feed['url'] = htmlspecialchars($feed['url']);
-			$feed['type'] = util::type2Text($feed['type']);
-			$feed['getNextUpdate'] = $f->getNextUpdate($feed['id_feed']);
-			$feed['title'] = htmlspecialchars($feed['title']);
-			$feed['error_text'] = $error_text;
-			$feeds[] = $feed;
-		}
-		
+			$error_text = ($feed["error"]>0) ? "false" : "true";
+			$feed['url'] = htmlspecialchars($feed['url']);
+			$feed['type'] = util::type2Text($feed['type']);
+			$feed['getNextUpdate'] = $f->getNextUpdate($feed['id_feed']);
+			$feed['title'] = htmlspecialchars($feed['title']);
+			$feed['error_text'] = $error_text;
+			$feeds[] = $feed;
+		}
+		
 		$theme->set("feeds",$feeds);
 
 		if ($hasType) {
 			$postType = type2Number($_GET["type"]);
 		}
-		$rs = $tumble->getPosts($total, $start);
-
-		$totalRegistros = $db->contarRegistros();
-		$theme->set("totalRegistros",$totalRegistros);
+		$rs = $tumble->getPosts($total, $start);
+
+		$totalRegistros = $db->contarRegistros();
+		$theme->set("totalRegistros",$totalRegistros);
 
-		if ($db->contarRegistros()>0) {
-			$theme->set("start",$start);
-			$theme->set("total",$total);
-
-			while($post = mysql_fetch_assoc($rs)){
+		if ($db->contarRegistros()>0) {
+			$theme->set("start",$start);
+			$theme->set("total",$total);
+
+			while($post = mysql_fetch_assoc($rs)){
 				$post['desc'] = util::trimString($post["description"]);				
 				$strEnd = ($conf->urlFriendly) ? "/" : "";
 				$post['url'] = $conf->urlGelato.($conf->urlFriendly ? "/post/" : "/index.php?post=").$post["id_post"].$strEnd;
 				$post['formatedDate'] = gmdate("D, d M Y H:i:s", strtotime($post["date"]) + util::transform_offset($conf->offsetTime));
-				
-				$post['type'] = util::type2Text($post["type"]);
-
-				switch ($post["type"]) {
-					case "post":
-						$post['tit'] = (empty($post["title"])) ? $desc : strip_tags($post["title"]);
+				
+				$post["type"] = util::type2Text($post["type"]);
+				
+				switch ($post["type"]) {				
+					case "post":
+						$post['tit'] = (empty($post["title"])) ? $post['desc'] : strip_tags($post["title"]);
 						break;
 					case "photo":
-						$post['photoPath'] = str_replace("../", $conf->urlGelato."/", $post["url"]);
-						$post['tit'] = stripslashes(((empty($post["description"])) ? "Photo" : $post['desc']));
+						$post['photoPath'] = str_replace("../", $conf->urlGelato."/", $post["url"]);
+						$post['tit'] = stripslashes(((empty($post["description"])) ? "Photo" : $post['desc']));
 						break;
 					case "quote":
-						$post['title'] = strip_tags($post["title"]);
+						$post['title'] = strip_tags($post["title"]);
 						break;
 					case "url":
 						$post['tit'] = (empty($post["title"])) ? $post["url"] : strip_tags($post["title"]);
 						break;
 					case "conversation":
-						$lines = explode("\n", $desc);
+						$lines = explode("\n", $post['desc']);
 						$line = $lines[0];
 						$post['tit'] = (empty($post["title"])) ? trimString($line) : $post["title"];
-						$post['desc'] = $tumble->formatConversation($desc);
-						$post['descAPIFormat'] = $tumble->formatConversation($desc);
+						$post['desc'] = $tumble->formatConversation($post['desc']);
+						$post['descAPIFormat'] = $tumble->formatConversation($post['desc']);
 						break;
 					case "video":
-						$post['tit'] = (empty($post["description"])) ? "Video" : $desc;
+						$post['tit'] = (empty($post["description"])) ? "Video" : $post['desc'];
 						$post['desc'] = htmlspecialchars($tumble->getVideoPlayer($post["url"]));
 						break;
 					case "mp3":
-						$post['tit'] = (empty($post["description"])) ? "Audio" : $desc;
-						$desc = htmlspecialchars($tumble->getMp3Player($post["url"]));
+						$post['tit'] = (empty($post["description"])) ? "Audio" : $post['desc'];
+						$post['desc'] = htmlspecialchars($tumble->getMp3Player($post["url"]));
 						break;
-				}				
-				$posts[] = $post;
-			}
-			$theme->set("posts",$posts);
-		}
+				}				
+				$posts[] = $post;
+			}
+			$theme->set("posts",$posts);
+		}
 		$theme->display(Absolute_Path.'admin/themes/admin/api.xml');
 	}
-?>
+?>