From b2b079148902ea0edd6c05ebf352c04adf27e3d2 Mon Sep 17 00:00:00 2001
From: pecesama <pecesama@gmail.com>
Date: Thu, 8 Jan 2009 08:52:54 +0000
Subject: [PATCH] bug fixes

---
 admin/index.php          | 2 +-
 api.php                  | 2 +-
 classes/gelato.class.php | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin/index.php b/admin/index.php
index 5110132..0b0a173 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -67,7 +67,7 @@ if ($user->isAuthenticated()) {
                                 header("Location: ".$conf->urlGelato."/admin/index.php?mp3=false");
                                 die();
                         }
-                        if (isMP3($remoteFileName)) {
+                        if (util::isMP3($remoteFileName)) {
                                 $_POST["url"] = $conf->urlGelato."/uploads/".$mp3Name;
                         }
                 }
diff --git a/api.php b/api.php
index 9e93c3e..ba97fc1 100644
--- a/api.php
+++ b/api.php
@@ -87,7 +87,7 @@ if(!defined('entry')) define('entry',true);
 					case "conversation":
 						$lines = explode("\n", $post['desc']);
 						$line = $lines[0];
-						$post['tit'] = (empty($post["title"])) ? trimString($line) : $post["title"];
+						$post['tit'] = (empty($post["title"])) ? util::trimString($line) : $post["title"];
 						$post['desc'] = $tumble->formatConversation($post['desc']);
 						$post['descAPIFormat'] = $tumble->formatConversation($post['desc']);
 						break;
diff --git a/classes/gelato.class.php b/classes/gelato.class.php
index 119f81f..bceab54 100644
--- a/classes/gelato.class.php
+++ b/classes/gelato.class.php
@@ -188,9 +188,9 @@ class gelato {
 			$playerUrl = $conf->urlGelato."/admin/scripts/player.swf?soundFile=".$url;
 			return "\t\t\t<object type=\"application/x-shockwave-flash\" data=\"" . $playerUrl . "\" width=\"290\" height=\"24\"><param name=\"movie\" value=\"" . $playerUrl . "\" /><param name=\"quality\" value=\"high\" /><param name=\"menu\" value=\"false\" /><param name=\"wmode\" value=\"transparent\" /></object>\n";
 		} elseif (util::isGoEar($url)) {
-			return "\t\t\t<object type=\"application/x-shockwave-flash\" data=\"http://www.goear.com/files/external.swf\" width=\"366\" height=\"130\"><param name=\"movie\" value=\"http://www.goear.com/files/external.swf\" /><param name=\"quality\" value=\"high\" /><param name=\"FlashVars\" value=\"file=".getGoEarCode($url)."\" /><param name=\"wmode\" value=\"transparent\" /></object>\n";
+			return "\t\t\t<object type=\"application/x-shockwave-flash\" data=\"http://www.goear.com/files/external.swf\" width=\"366\" height=\"130\"><param name=\"movie\" value=\"http://www.goear.com/files/external.swf\" /><param name=\"quality\" value=\"high\" /><param name=\"FlashVars\" value=\"file=".util::getGoEarCode($url)."\" /><param name=\"wmode\" value=\"transparent\" /></object>\n";
 		} elseif (util::isOdeo($url)) {
-			return "\t\t\t<object type=\"application/x-shockwave-flash\" data=\"http://media.odeo.com/flash/odeo_player.swf?v=3\" width=\"366\" height=\"75\"><param name=\"quality\" value=\"high\" /><param name=\"FlashVars\" value=\"type=audio&amp;id=".getOdeoCode($url)."\" /><param name=\"wmode\" value=\"transparent\" /></object>\n";
+			return "\t\t\t<object type=\"application/x-shockwave-flash\" data=\"http://media.odeo.com/flash/odeo_player.swf?v=3\" width=\"366\" height=\"75\"><param name=\"quality\" value=\"high\" /><param name=\"FlashVars\" value=\"type=audio&amp;id=".util::getOdeoCode($url)."\" /><param name=\"wmode\" value=\"transparent\" /></object>\n";
 		} else {
 			return "This URL is not an MP3 file.";
 		}