瀏覽代碼

GoEar is working. Youtube is working. GTM-2 is set.

vbracco 15 年之前
父節點
當前提交
dcc69bcd1f
共有 3 個文件被更改,包括 4 次插入2 次删除
  1. 1 0
      admin/options.php
  2. 2 1
      classes/functions.php
  3. 1 1
      classes/gelato.class.php

+ 1 - 0
admin/options.php 查看文件

@@ -156,6 +156,7 @@ if ($user->isAdmin()) {
156 156
 											<option value="-3.50,Canada/Newfoundland" <?php echo ($conf->offsetCity=="Canada/Newfoundland")? "selected=\"selected\"":"" ?>>(GMT -3:30) Newfoundland</option>
157 157
 											<option value="-3,Canada/Atlantic" <?php echo ($conf->offsetCity=="Canada/Atlantic")? "selected=\"selected\"":"" ?>>(GMT -3:00) Brasilia, Greenland</option>
158 158
 											<option value="-3,America/Buenos_Aires" <?php echo ($conf->offsetCity=="America/Buenos_Aires")? "selected=\"selected\"":"" ?>>(GMT -3:00) Buenos Aires, Georgetown</option>
159
+											<option value="-2,Atlantic/Central" <?php echo ($conf->offsetCity=="Atlantic/Central")? "selected=\"selected\"":"" ?>>(GMT -2:00) Atlantic Central</option>
159 160
 											<option value="-1,Atlantic/Cape_Verde" <?php echo ($conf->offsetCity=="Atlantic/Cape_Verde")? "selected=\"selected\"":"" ?>>(GMT -1:00) Cape Verde Is.</option>
160 161
 											<option value="-1,Atlantic/Azores" <?php echo ($conf->offsetCity=="Atlantic/Azores")? "selected=\"selected\"":"" ?>>(GMT -1:00) Azores</option>
161 162
 											<option value="0,Africa/Casablanca" <?php echo ($conf->offsetCity=="Africa/Casablanca")? "selected=\"selected\"":"" ?>>(GMT) Casablanca, Monrovia</option>

+ 2 - 1
classes/functions.php 查看文件

@@ -134,7 +134,8 @@ if(!defined('entry') || !entry) die('Not a valid page');
134 134
 	}
135 135
 	
136 136
 	function isYoutubeVideo($videoUrl) {
137
-		if (beginsWith($videoUrl, "http://youtube.com/watch?v=") || beginsWith($videoUrl, "http://www.youtube.com/watch?v="))
137
+		$url = explode("?", $videoUrl);
138
+		if (beginsWith($url[0], "http://") && endsWith($url[0], ".youtube.com/watch"))
138 139
 			return true;
139 140
 		else
140 141
 			return false;

+ 1 - 1
classes/gelato.class.php 查看文件

@@ -182,7 +182,7 @@ class gelato extends Conexion_Mysql {
182 182
 			$playerUrl = $this->conf->urlGelato."/admin/scripts/player.swf?soundFile=".$url;
183 183
 			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";
184 184
 		} elseif (isGoEar($url)) {
185
-			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";
185
+			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";
186 186
 		} elseif (isOdeo($url)) {
187 187
 			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";
188 188
 		} else {