Browse Source

bug fixes

pecesama 16 years ago
parent
commit
b2b0791489
3 changed files with 4 additions and 4 deletions
  1. 1 1
      admin/index.php
  2. 1 1
      api.php
  3. 2 2
      classes/gelato.class.php

+ 1 - 1
admin/index.php View File

67
                                 header("Location: ".$conf->urlGelato."/admin/index.php?mp3=false");
67
                                 header("Location: ".$conf->urlGelato."/admin/index.php?mp3=false");
68
                                 die();
68
                                 die();
69
                         }
69
                         }
70
-                        if (isMP3($remoteFileName)) {
70
+                        if (util::isMP3($remoteFileName)) {
71
                                 $_POST["url"] = $conf->urlGelato."/uploads/".$mp3Name;
71
                                 $_POST["url"] = $conf->urlGelato."/uploads/".$mp3Name;
72
                         }
72
                         }
73
                 }
73
                 }

+ 1 - 1
api.php View File

87
 					case "conversation":
87
 					case "conversation":
88
 						$lines = explode("\n", $post['desc']);
88
 						$lines = explode("\n", $post['desc']);
89
 						$line = $lines[0];
89
 						$line = $lines[0];
90
-						$post['tit'] = (empty($post["title"])) ? trimString($line) : $post["title"];
90
+						$post['tit'] = (empty($post["title"])) ? util::trimString($line) : $post["title"];
91
 						$post['desc'] = $tumble->formatConversation($post['desc']);
91
 						$post['desc'] = $tumble->formatConversation($post['desc']);
92
 						$post['descAPIFormat'] = $tumble->formatConversation($post['desc']);
92
 						$post['descAPIFormat'] = $tumble->formatConversation($post['desc']);
93
 						break;
93
 						break;

+ 2 - 2
classes/gelato.class.php View File

188
 			$playerUrl = $conf->urlGelato."/admin/scripts/player.swf?soundFile=".$url;
188
 			$playerUrl = $conf->urlGelato."/admin/scripts/player.swf?soundFile=".$url;
189
 			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";
189
 			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";
190
 		} elseif (util::isGoEar($url)) {
190
 		} elseif (util::isGoEar($url)) {
191
-			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";
191
+			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";
192
 		} elseif (util::isOdeo($url)) {
192
 		} elseif (util::isOdeo($url)) {
193
-			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";
193
+			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";
194
 		} else {
194
 		} else {
195
 			return "This URL is not an MP3 file.";
195
 			return "This URL is not an MP3 file.";
196
 		}
196
 		}