From dcc69bcd1fb1008058c02078853a597d534707de Mon Sep 17 00:00:00 2001
From: vbracco <vbracco@gmail.com>
Date: Thu, 23 Oct 2008 19:59:04 +0000
Subject: [PATCH] GoEar is working. Youtube is working. GTM-2 is set.

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

diff --git a/admin/options.php b/admin/options.php
index 16a56ca..e1d09d1 100644
--- a/admin/options.php
+++ b/admin/options.php
@@ -156,6 +156,7 @@ if ($user->isAdmin()) {
 											<option value="-3.50,Canada/Newfoundland" <?php echo ($conf->offsetCity=="Canada/Newfoundland")? "selected=\"selected\"":"" ?>>(GMT -3:30) Newfoundland</option>
 											<option value="-3,Canada/Atlantic" <?php echo ($conf->offsetCity=="Canada/Atlantic")? "selected=\"selected\"":"" ?>>(GMT -3:00) Brasilia, Greenland</option>
 											<option value="-3,America/Buenos_Aires" <?php echo ($conf->offsetCity=="America/Buenos_Aires")? "selected=\"selected\"":"" ?>>(GMT -3:00) Buenos Aires, Georgetown</option>
+											<option value="-2,Atlantic/Central" <?php echo ($conf->offsetCity=="Atlantic/Central")? "selected=\"selected\"":"" ?>>(GMT -2:00) Atlantic Central</option>
 											<option value="-1,Atlantic/Cape_Verde" <?php echo ($conf->offsetCity=="Atlantic/Cape_Verde")? "selected=\"selected\"":"" ?>>(GMT -1:00) Cape Verde Is.</option>
 											<option value="-1,Atlantic/Azores" <?php echo ($conf->offsetCity=="Atlantic/Azores")? "selected=\"selected\"":"" ?>>(GMT -1:00) Azores</option>
 											<option value="0,Africa/Casablanca" <?php echo ($conf->offsetCity=="Africa/Casablanca")? "selected=\"selected\"":"" ?>>(GMT) Casablanca, Monrovia</option>
diff --git a/classes/functions.php b/classes/functions.php
index d9b0d7a..2b40f25 100644
--- a/classes/functions.php
+++ b/classes/functions.php
@@ -134,7 +134,8 @@ if(!defined('entry') || !entry) die('Not a valid page');
 	}
 	
 	function isYoutubeVideo($videoUrl) {
-		if (beginsWith($videoUrl, "http://youtube.com/watch?v=") || beginsWith($videoUrl, "http://www.youtube.com/watch?v="))
+		$url = explode("?", $videoUrl);
+		if (beginsWith($url[0], "http://") && endsWith($url[0], ".youtube.com/watch"))
 			return true;
 		else
 			return false;
diff --git a/classes/gelato.class.php b/classes/gelato.class.php
index 4055e0c..3380b5e 100644
--- a/classes/gelato.class.php
+++ b/classes/gelato.class.php
@@ -182,7 +182,7 @@ class gelato extends Conexion_Mysql {
 			$playerUrl = $this->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 (isGoEar($url)) {
-			return "\t\t\t<object type=\"application/x-shockwave-flash\" data=\"http://www.goear.com/files/localplayer.swf\" width=\"366\" height=\"75\"><param name=\"movie\" value=\"http://www.goear.com/files/localautoplayer.swf\" /><param name=\"quality\" value=\"high\" /><param name=\"FlashVars\" value=\"file=".getGoEarCode($url)."\" /></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=".getGoEarCode($url)."\" /></object>\n";
 		} elseif (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";
 		} else {