Minor bug fixes

admin/css/style.css

@@ -18,7 +18,7 @@ h1, h2, h3, h4, h5, h6, h7{ font-weight:normal;}
 a, a:link, a:visited, a:active{ color:#000000; text-decoration:none; outline:none;}
 a:hover{ text-decoration:underline; color:#000000;  outline:none;}
 
-.inslnl { text-decoration:underline; }
+.inslnl a{ text-decoration:underline; }
 
 acronym{ border-bottom: 1px dotted #666; cursor:help;}
 fieldset{ border:none; margin:0; padding:0;}
@@ -118,11 +118,12 @@ a.linkFrm:hover{ text-decoration:underline; color:#297aab;  outline:none;}
 .exito { width:80%; background: #F4FBF5 url('../../images/information.png') 15px center no-repeat; border-top: 2px solid #006600; border-bottom: 2px solid #006600; margin: 0 auto; padding: 5px 20px 5px 45px; }
 .information { width:80%; background: #FFF6BF url('../../images/icon_info.gif') 15px center no-repeat; border-top: 2px solid #FFD324; border-bottom: 2px solid #FFD324; margin: 0 auto;padding: 5px 20px 5px 45px; }
 
+
 #update { text-align:center; font-size: 10px; color: #000; }
-	#update a { color: #000; text-decoration:none; }
-	#update a:visited { color: #000; text-decoration:none; }
-	#update a:active { color: #000; text-decoration:none; }
-	#update a:hover { color: #000; text-decoration:underline; }
+	#update a { color: #000; text-decoration:underline; }
+	#update a:visited { color: #000; text-decoration:underline; }
+	#update a:active { color: #000; text-decoration:underline; }
+	#update a:hover { color: #F00; text-decoration:underline; }
 
 /* Pagination */
 

admin/index.php

@@ -68,11 +68,11 @@ if ($user->isAdmin()) {
 				$_POST["url"] = $conf->urlGelato."/uploads/".$mp3Name;
 			}
 		}		
-		
-		if (get_magic_quotes_gpc()) {
-			$_POST["title"] = stripslashes($_POST["title"]);
-			$_POST["description"] = stripslashes($_POST["description"]);
-		}
+				
+		if (!get_magic_quotes_gpc()) {	
+			$_POST["title"] = addslashes($_POST["title"]);
+			$_POST["description"] = addslashes($_POST["description"]);
+		}	
 		
 		$_POST["title"] = strip_tags($_POST["title"]);
 		$_POST["description"] = strip_tags($_POST["description"]);
@@ -163,7 +163,7 @@ if ($user->isAdmin()) {
 					$present = version();
 					$lastest = _file_get_contents("http://www.gelatocms.com/vgel.txt");
 					if ($present < $lastest) {
-						echo "<div class=\"information\" id=\"update\">A new gelato version has been released and is ready <a href=\"http://www.gelatocms.com/\">for download</a>.</div>";
+						echo "<div class=\"information\" id=\"update\">A new gelato version has been released and is ready <a href=\"http://www.gelatocms.com/\">for download</a>.</div><br />";
 					}
 					
 					if (isset($_GET["deleted"])) {

admin/scripts/tools.js

@@ -1,3 +1,36 @@
-//<!--
+//<!-- 
+
+function validateFrmAddUser() {
+	if ($('login').value == "") {
+	   alert("The username field cannot be left blank.");
+	   document.frm_add.login.select();	
+	   return false;
+	}
+	if ($('password').value == "") {
+	   alert("The password field cannot be left blank.");
+	   document.frm_add.password.select();	
+	   return false;
+	}	
+	if ($('password').value != $('repass').value) {
+	   alert("The password must match,\nplease verify them.");
+	   document.frm_add.password.focus();	
+	   return false;
+	}		
+	return true;
+}
+
+function verifyExistingUser() {
+	$('div-process').style.display="block";
+	el = $('target');
+	el.style.display="block";										
+	var path = 'ajax.php?action=verify&login='+$('login').value;
+	new Ajax(path, {
+		onComplete:function(e) {						
+			el.setHTML(e);
+			$('div-process').style.display="none";
+		}
+	}).request();
+	return false;
+}
 
 //-->

admin/settings.php

@@ -108,7 +108,7 @@ if ($user->isAdmin()) {
 <?php
 										$themes = getThemes();
 										foreach ($themes as $theme) {
-											$active = ($conf->template) ? "selected" : "";
+											$active = ($conf->template==$theme) ? "selected" : "";
 											echo "<option value=\"".$theme."\" ".$active.">".$theme."</option>\n";
 											
 										}

admin/user.php

@@ -57,40 +57,7 @@ if ($user->isAdmin()) {
 		<meta name="generator" content="gelato cms <?php echo version();?>" />
 		<link rel="shortcut icon" href="<?php echo $conf->urlGelato;?>/images/favicon.ico" />
 		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/mootools.js"></script>
-		<script language="javascript" type="text/javascript">								
-			function validateFrmAddUser() {
-				if ($('login').value == "") {
-				   alert("The username field cannot be left blank.");
-				   document.frm_add.login.select();	
-				   return false;
-				}
-				if ($('password').value == "") {
-				   alert("The password field cannot be left blank.");
-				   document.frm_add.password.select();	
-				   return false;
-				}	
-				if ($('password').value != $('repass').value) {
-				   alert("The password must match,\nplease verify them.");
-				   document.frm_add.password.focus();	
-				   return false;
-				}		
-				return true;
-			}
-			
-			function verifyExistingUser() {
-				$('div-process').style.display="block";
-				el = $('target');
-				el.style.display="block";										
-				var path = 'ajax.php?action=verify&login='+$('login').value;
-				new Ajax(path, {
-					onComplete:function(e) {						
-						el.setHTML(e);
-						$('div-process').style.display="none";
-					}
-				}).request();
-				return false;
-			}
-		</script>
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/tools.js"></script>
 		<style type="text/css" media="screen">	
 			@import "<?php echo $conf->urlGelato;?>/admin/css/style.css";
 		</style>

classes/functions.php

@@ -49,6 +49,13 @@
 		}
 	}
 	
+	function getGoEarCode($songUrl) {
+		$pos = strpos($songUrl, "?v=");
+		$lon = strlen($songUrl);
+		$str = substr($songUrl, $pos + 3, $lon);
+		return $str;
+	}
+	
 	function isGoEar($songUrl) {
 		if (beginsWith($songUrl, "http://www.goear.com/listen.php?v="))
 			return true;

classes/gelato.class.php

@@ -158,7 +158,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=c0a2c85\" /></object>\n";
+			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";
 		} else {
 			return "This URL is not an MP3 file.";
 		}		

themes/tumblr/template_header.htm

@@ -2,7 +2,7 @@
 	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>	
-	{Gelato_includes}	
+	{Gelato_includes}
     <title>{Title}</title>
     <!--[if IE]>
         <style type="text/css">

themes/tumblr/template_regular_post.htm

@@ -2,15 +2,12 @@
                 <div class="date">
                     {Date_Added}
                 </div>
-
         
             <div class="post">
                 <a href="{Permalink}"><img src="{URL_Tumble}/themes/tumblr/img/link.gif" class="permalink" alt="Permalink"/></a>
-
                 
-                    <div class="regular">
-                        <h2><a href="{Permalink}">{Title}</a></h2>
-                        {Body}
-                    </div>                
-				
+				<div class="regular">
+					<h2><a href="{Permalink}">{Title}</a></h2>
+					{Body}
+				</div>				
 			</div>