Replaced the code with the newest version in the "dev" branch

LICENSE

@@ -1,339 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.

admin/admin.php

@@ -1,32 +1,34 @@
-<?php
-if(!defined('entry')) define('entry',true);  
-/* ===========================
-
-  gelato CMS - A PHP based tumblelog CMS
-  development version
-  http://www.gelatocms.com/
-
-  gelato CMS is a free software licensed under the GPL 2.0
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
-
-  =========================== */
-
-require_once('../entry.php');
-global $user, $conf, $tumble;
-
-if ($user->isAdmin()) {
-	
-?>
+<?php
+if (!defined('entry')) {
+    define('entry', true);
+}
+/* ===========================
+
+  gelato CMS - A PHP based tumblelog CMS
+  development version
+  http://www.gelatocms.com/
+
+  gelato CMS is a free software licensed under the GPL 2.0
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
+
+  =========================== */
+
+require_once('../entry.php');
+global $user, $conf, $tumble;
+
+if ($user->isAdmin()) {
+    ?>
 	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 	<html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<title>gelato :: <?php echo __("admin users")?></title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<meta name="generator" content="gelato cms <?php echo util::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/jquery.js"></script>
-		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/tools.js"></script>
-		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/jquery.tablesorter.min.js"></script>
+		<?php $util_class = new util(); ?>
+		<meta name="generator" content="gelato cms <?php echo $util_class->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/jquery.js"></script>
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato; ?>/admin/scripts/tools.js"></script>
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato; ?>/admin/scripts/jquery.tablesorter.min.js"></script>
 		<script type="text/javascript">
 		$(document).ready(function(){
 			$("#admin-table").tablesorter({        
@@ -41,7 +43,7 @@ if ($user->isAdmin()) {
 		});
 		</script>
 		<style type="text/css" media="screen">	
-			@import "<?php echo $conf->urlGelato;?>/admin/css/style.css";
+			@import "<?php echo $conf->urlGelato; ?>/admin/css/style.css";
 		</style>
 	</head>
 	
@@ -49,10 +51,10 @@ if ($user->isAdmin()) {
 		<div id="div-process" style="display:none;"><?php echo __("Processing request&hellip;")?></div>
 		<div id="cont">
 			<div id="head">
-				<h1><a href="<?php echo $conf->urlGelato;?>/admin/index.php" title="gelato :: <?php echo __("home")?>">gelato cms</a></h1>
+				<h1><a href="<?php echo $conf->urlGelato; ?>/admin/index.php" title="gelato :: <?php echo __("home")?>">gelato cms</a></h1>
 				<ul id="nav">
-					<li><a href="<?php echo $conf->urlGelato;?>/" title="Take me to the tumblelog"><?php echo __("View Tumblelog")?></a></li>
-					<li><a href="close.php" title="Log off" onclick="return exit('div-process','<?php echo $conf->urlGelato;?>/admin/ajax.php?action=close');"><?php echo __("Log out")?></a></li>
+					<li><a href="<?php echo $conf->urlGelato; ?>/" title="Take me to the tumblelog"><?php echo __("View Tumblelog")?></a></li>
+					<li><a href="close.php" title="Log off" onclick="return exit('div-process','<?php echo $conf->urlGelato; ?>/admin/ajax.php?action=close');"><?php echo __("Log out")?></a></li>
 			  	</ul>
 			</div>
 			<div id="main">				
@@ -60,40 +62,39 @@ if ($user->isAdmin()) {
 				<div class="box">
 					<ul class="menu manage">
 					<h3>Manage</h3>
-					<li><a href="<?php echo $conf->urlGelato;?>/admin/plugins.php"><?php echo __("Plugins")?></a></li>
-					<li><a href="<?php echo $conf->urlGelato;?>/admin/settings.php"><?php echo __("Settings")?></a></li>
-					<li><a href="<?php echo $conf->urlGelato;?>/admin/index.php"><?php echo __("Posts")?></a></li>
-					<li><a href="<?php echo $conf->urlGelato;?>/admin/user.php"><?php echo __("Add user")?></a></li>
+					<li><a href="<?php echo $conf->urlGelato; ?>/admin/plugins.php"><?php echo __("Plugins")?></a></li>
+					<li><a href="<?php echo $conf->urlGelato; ?>/admin/settings.php"><?php echo __("Settings")?></a></li>
+					<li><a href="<?php echo $conf->urlGelato; ?>/admin/index.php"><?php echo __("Posts")?></a></li>
+					<li><a href="<?php echo $conf->urlGelato; ?>/admin/user.php"><?php echo __("Add user")?></a></li>
 					<li class="selected"><a><?php echo __("Users")?></a></li>
 					</ul>
 					<p>&nbsp;</p>
-<?php				
-						if (isset($_GET["added"])) {
-							if ($_GET["added"]=="true") {
-								echo "<div class=\"exito\" id=\"divMessages\">".__("The user has been added successfully.")."</div>";
-							}
-						}
-						
-						if (isset($_GET["delete"])) {
-							if ($_GET["delete"]=="true") {
-								echo "<div class=\"exito\" id=\"divMessages\">".__("The user has been eliminated successfully.")."</div>";
-							}
-						}
-						
-						if (isset($_GET["modified"])) {
-							if ($_GET["modified"]=="true") {
-								echo "<div class=\"exito\" id=\"divMessages\">".__("The user has been modified successfully.")."</div>";
-							}
-						}
-						
-						if (isset($_GET["error"])) {
-							if ($_GET["error"]==1) {
-								echo "<div class=\"error\" id=\"divMessages\">".__("The username is not available.")."</div>";
-							} elseif ($_GET["error"]==2) {
-								echo "<div class=\"error\" id=\"divMessages\"><strong>".__("Error on the database server:.")." </strong>".$_GET["des"]."</div>";
-							}
-						}
-?>						
+<?php	
+                        if (isset($_GET["added"])) {
+                            if ($_GET["added"]=="true") {
+                                echo "<div class=\"exito\" id=\"divMessages\">".__("The user has been added successfully.")."</div>";
+                            }
+                        }
+                        
+    if (isset($_GET["delete"])) {
+        if ($_GET["delete"]=="true") {
+            echo "<div class=\"exito\" id=\"divMessages\">".__("The user has been eliminated successfully.")."</div>";
+        }
+    }
+                        
+    if (isset($_GET["modified"])) {
+        if ($_GET["modified"]=="true") {
+            echo "<div class=\"exito\" id=\"divMessages\">".__("The user has been modified successfully.")."</div>";
+        }
+    }
+                        
+    if (isset($_GET["error"])) {
+        if ($_GET["error"]==1) {
+            echo "<div class=\"error\" id=\"divMessages\">".__("The username is not available.")."</div>";
+        } elseif ($_GET["error"]==2) {
+            echo "<div class=\"error\" id=\"divMessages\"><strong>".__("Error on the database server:.")." </strong>".$_GET["des"]."</div>";
+        }
+    } ?>						
 						<div class="tabla">
 						<table border="0" cellpadding="0" cellspacing="0" id="admin-table">
 							<thead>
@@ -105,30 +106,35 @@ if ($user->isAdmin()) {
 								</tr>
 							</thead>
 							<tbody>
-<?php
-					$odd=false;
-					$rs = $user->getUsers();
-					if ($db->contarRegistros()>0) {
-						while($register = mysql_fetch_array($rs)) {
-?>
-							<tr <?php if ($odd) { echo 'class="odd"'; } $odd=!$odd; ?>>
+<?php
+                    $odd=false;
+    $rs = $user->getUsers();
+    if ($db->contarRegistros()>0) {
+        while ($register = mysql_fetch_array($rs)) {
+            ?>
+							<tr <?php if ($odd) {
+                echo 'class="odd"';
+            }
+            $odd=!$odd; ?>>
 								<td><?php echo $register["login"]."\n"; ?></td>
 								<td><?php echo $register["name"]."\n"; ?></td>
 								<td><a href="user.php?edit=<?php echo $register["id_user"]; ?>"><?php echo __("Edit")?></a></td>								
-								<td><?php if ($_SESSION["user_id"] != $register["id_user"]) { ?><a href="user.php?delete=<?php echo $register["id_user"]; ?>"><?php echo __("Delete")?></a><?php } ?>&nbsp;</td>
+								<td><?php if ($_SESSION["user_id"] != $register["id_user"]) {
+                ?><a href="user.php?delete=<?php echo $register["id_user"]; ?>"><?php echo __("Delete")?></a><?php 
+            } ?>&nbsp;</td>
 								
 							</tr>
-<?php
-						}
-					}
-					else {
-?>
+<?php
+
+        }
+    } else {
+        ?>
 						<tr> 
 							<td colspan="4"><div class="exito"><?php echo __("No users available.")?></div></td>
 						</tr>
-<?php
-					}
-?>
+<?php
+
+    } ?>
 							</tbody>
 						</table>
 					</div>
@@ -142,8 +148,9 @@ if ($user->isAdmin()) {
 		</div>
 	</body>
 	</html>
-<?php
-} else {
-	header("Location: ".$conf->urlGelato."/login.php");
-}
-?>
+<?php
+
+} else {
+    header("Location: ".$conf->urlGelato."/login.php");
+}
+?>

admin/ajax.php

@@ -1,42 +1,43 @@
-<?php
-if(!defined('entry'))define('entry', true);
-/* ===========================
-
-  gelato CMS - A PHP based tumblelog CMS
-  development version
-  http://www.gelatocms.com/
-
-  gelato CMS is a free software licensed under the GPL 2.0
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
-
-  =========================== */
+<?php
+if (!defined('entry')) {
+    define('entry', true);
+}
+/* ===========================
+
+  gelato CMS - A PHP based tumblelog CMS
+  development version
+  http://www.gelatocms.com/
+
+  gelato CMS is a free software licensed under the GPL 2.0
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
+
+  =========================== */
 ?>
-<?php
-	require_once('../entry.php');
-	global $user;
-	
-	if ($user->isAdmin()) {
-		if ($_GET["action"]) {
-			
-			if ($_GET["action"] == "close") {
-				if ($user->closeSession()) {
-					echo __("&nbsp;ending session&hellip;");
-				} else {
-					echo __("&nbsp;failure ending session&hellip;");
-				}
-			}	// $_GET["action"] == "close"
-			
-			if ($_GET["action"] == "verify") {
-				if ($_GET["login"]=="") {
-					echo "<div class=\"error\">".__("Required field cannot be left blank.")."</div>";
-				} else {
-					if (!$user->userExist($_GET["login"])) {
-						echo "<div class=\"exito\">".__("Username available.")."</div>";
-					} else {
-						echo "<div class=\"error\">".__("The username is not available.")."</div>";
-					}
-				}
-			}	// $_GET["action"] == "verify"			
-		}	// $_GET["action"]
-	}	// $user->isAdmin()
+<?php
+    require_once('../entry.php');
+    global $user;
+    
+    if ($user->isAdmin()) {
+        if ($_GET["action"]) {
+            if ($_GET["action"] == "close") {
+                if ($user->closeSession()) {
+                    echo __("&nbsp;ending session&hellip;");
+                } else {
+                    echo __("&nbsp;failure ending session&hellip;");
+                }
+            }    // $_GET["action"] == "close"
+            
+            if ($_GET["action"] == "verify") {
+                if ($_GET["login"]=="") {
+                    echo "<div class=\"error\">".__("Required field cannot be left blank.")."</div>";
+                } else {
+                    if (!$user->userExist($_GET["login"])) {
+                        echo "<div class=\"exito\">".__("Username available.")."</div>";
+                    } else {
+                        echo "<div class=\"error\">".__("The username is not available.")."</div>";
+                    }
+                }
+            }    // $_GET["action"] == "verify"
+        }    // $_GET["action"]
+    }    // $user->isAdmin()
 ?>

admin/bm.php

@@ -1,121 +1,118 @@
-<?php
-if(!defined('entry'))define('entry', true);
-/* ===========================
-
-  gelato CMS - A PHP based tumblelog CMS
-  development version
-  http://www.gelatocms.com/
-
-  gelato CMS is a free software licensed under the GPL 2.0
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
-
-  =========================== */
-?>
-<?php
-
-require('../entry.php');
-global $user, $conf, $tumble;
-$template = new plantillas("admin");
-
-if ($user->isAdmin()) {
-
-	if(isset($_POST["btnAdd"]))	{
-		unset($_POST["btnAdd"]);
-
-		if ($_POST["type"]=="2") { // is Photo type
-			if (isset($_POST["url"]) && $_POST["url"]!="")  {
-				$photoName = util::getFileName($_POST["url"]);
-				if (!$tumble->savePhoto($_POST["url"])) {
-					header("Location: ".$conf->urlGelato."/admin/index.php?photo=false");
-					die();
-				}
-				$_POST["url"] = "../uploads/".util::sanitizeName($photoName);
-			} 
-
-			unset($_POST["photo"]);
-			unset($_POST["MAX_FILE_SIZE"]);
-		}
-
-		if ($_POST["type"]=="7") { // is MP3 type
-			set_time_limit(300);
-			$mp3Name = util::getFileName($_POST["url"]);
-			if (!$tumble->saveMP3($_POST["url"])) {
-				header("Location: ".$conf->urlGelato."/admin/index.php?mp3=false");
-				die();
-			}
-			if (isMP3($remoteFileName)) {
-				$_POST["url"] = $conf->urlGelato."/uploads/".$mp3Name;
-			}
-		}
-
-		if (!get_magic_quotes_gpc()) {
-			$_POST["title"] = addslashes($_POST["title"]);
-			$_POST["description"] = addslashes($_POST["description"]);
-		}		
-		
-		$_POST["title"] = util::removeBadTags($_POST["title"],true);
-		$_POST["description"] = util::removeBadTags($_POST["description"]);
-
-		if ($tumble->addPost($_POST)) {
-			$input = array("{type}");
-			$output = array("1");
-
-			$template->cargarPlantilla($input, $output, "template_bm");
-			$template->mostrarPlantilla();
-			die();
-		} else {
-			header("Location: ".$conf->urlGelato."/admin/index.php?error=2&des=".$this->merror);
-			die();
-		}
-	} else {
-
-		if (isset($_GET["url"])) {
-			$url = $_GET["url"];
-		} else {
-			$url = null;
-		}
-		if (isset($url)) {
-
-			if (util::isMP3($url)) {
-				$postType = "mp3";
-			} elseif (util::isGoEar($url)) {
-				$postType = "mp3";
-			} elseif (util::isImageFile($url)) {
-				$postType = "photo";
-			} elseif (util::isVideo($url)) {
-				$postType = "video";
-			} else {
-				if (isset($_GET["sel"]) && !$_GET["sel"]=="" ) {
-					$postType = "post";
-				} else {
-					$postType = "url";
-				}
-			}
-
-		} else {
-			die(__("Must be a valid URL"));
-		}
+<?php
+if (!defined('entry')) {
+    define('entry', true);
+}
+/* ===========================
+
+  gelato CMS - A PHP based tumblelog CMS
+  development version
+  http://www.gelatocms.com/
+
+  gelato CMS is a free software licensed under the GPL 2.0
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
+
+  =========================== */
 ?>
+<?php
+
+require('../entry.php');
+global $user, $conf, $tumble;
+$template = new plantillas("admin");
+$util_class = new util();
+if ($user->isAdmin()) {
+    if (isset($_POST["btnAdd"])) {
+        unset($_POST["btnAdd"]);
+
+        if ($_POST["type"]=="2") { // is Photo type
+            if (isset($_POST["url"]) && $_POST["url"]!="") {
+                $photoName = $util_class->getFileName($_POST["url"]);
+                if (!$tumble->savePhoto($_POST["url"])) {
+                    header("Location: ".$conf->urlGelato."/admin/index.php?photo=false");
+                    die();
+                }
+                $_POST["url"] = "../uploads/".$util_class->sanitizeName($photoName);
+            }
+
+            unset($_POST["photo"]);
+            unset($_POST["MAX_FILE_SIZE"]);
+        }
+
+        if ($_POST["type"]=="7") { // is MP3 type
+            set_time_limit(300);
+            $mp3Name = $util_class->getFileName($_POST["url"]);
+            if (!$tumble->saveMP3($_POST["url"])) {
+                header("Location: ".$conf->urlGelato."/admin/index.php?mp3=false");
+                die();
+            }
+            if (isMP3($remoteFileName)) {
+                $_POST["url"] = $conf->urlGelato."/uploads/".$mp3Name;
+            }
+        }
+
+        if (!get_magic_quotes_gpc()) {
+            $_POST["title"] = addslashes($_POST["title"]);
+            $_POST["description"] = addslashes($_POST["description"]);
+        }
+        
+        $_POST["title"] = $util_class->removeBadTags($_POST["title"], true);
+        $_POST["description"] = $util_class->removeBadTags($_POST["description"]);
+
+        if ($tumble->addPost($_POST)) {
+            $input = array("{type}");
+            $output = array("1");
+
+            $template->cargarPlantilla($input, $output, "template_bm");
+            $template->mostrarPlantilla();
+            die();
+        } else {
+            header("Location: ".$conf->urlGelato."/admin/index.php?error=2&des=".$this->merror);
+            die();
+        }
+    } else {
+        if (isset($_GET["url"])) {
+            $url = $_GET["url"];
+        } else {
+            $url = null;
+        }
+        if (isset($url)) {
+            if ($util_class->isMP3($url)) {
+                $postType = "mp3";
+            } elseif ($util_class->isGoEar($url)) {
+                $postType = "mp3";
+            } elseif ($util_class->isImageFile($url)) {
+                $postType = "photo";
+            } elseif ($util_class->isVideo($url)) {
+                $postType = "video";
+            } else {
+                if (isset($_GET["sel"]) && !$_GET["sel"]=="") {
+                    $postType = "post";
+                } else {
+                    $postType = "url";
+                }
+            }
+        } else {
+            die(__("Must be a valid URL"));
+        } ?>
 	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 	<html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<meta name="generator" content="gelato cms <?php echo util::version();?>" />
+		<meta name="generator" content="gelato cms <?php echo $util_class->version(); ?>" />
 		<title>gelato :: <?php echo __("bookmarklet")?></title>
-		<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/jquery.js"></script>
-		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/tools.js"></script>
-        <script type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/markitup/jquery.markitup.pack.js"></script>
-		<script type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/markitup/sets/html/set.js"></script>			
-        <link rel="stylesheet" type="text/css" href="<?php echo $conf->urlGelato;?>/admin/scripts/markitup/skins/simple/style.css" />
-        <link rel="stylesheet" type="text/css" href="<?php echo $conf->urlGelato;?>/admin/scripts/markitup/sets/html/style.css" />			
+		<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/jquery.js"></script>
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato; ?>/admin/scripts/tools.js"></script>
+        <script type="text/javascript" src="<?php echo $conf->urlGelato; ?>/admin/scripts/markitup/jquery.markitup.pack.js"></script>
+		<script type="text/javascript" src="<?php echo $conf->urlGelato; ?>/admin/scripts/markitup/sets/html/set.js"></script>			
+        <link rel="stylesheet" type="text/css" href="<?php echo $conf->urlGelato; ?>/admin/scripts/markitup/skins/simple/style.css" />
+        <link rel="stylesheet" type="text/css" href="<?php echo $conf->urlGelato; ?>/admin/scripts/markitup/sets/html/style.css" />			
         <script type="text/javascript" >
            $(document).ready(function() {
               $("#description").markItUp(my_html);
            });
         </script>
 		<style type="text/css" media="screen">
-			@import "<?php echo $conf->urlGelato;?>/admin/css/style.css";
+			@import "<?php echo $conf->urlGelato; ?>/admin/css/style.css";
 		</style>
 	</head>
 
@@ -125,84 +122,82 @@ if ($user->isAdmin()) {
 				<div class="box">
 					<h3><?php echo __("New Post")?></h3>
 					<ul class="menu">
-<?php
-						switch ($postType) {
-								case "post":
+<?php
+                        switch ($postType) {
+                                case "post":
 ?>
 									<li class="selected"><a href="#"><img src="css/images/page.png" alt="New post" /> <?php echo __("Regular")?></a></li>
-<?php
-									break;
-								case "photo":
+<?php
+                                    break;
+                                case "photo":
 ?>
 									<li class="selected"><a href="#"><img src="css/images/image.png" alt="New picture" /> <?php echo __("Picture")?></a></li>
-<?php
-									break;
-								case "url":
+<?php
+                                    break;
+                                case "url":
 ?>
 									<li class="selected"><a href="#"><img src="css/images/world.png" alt="New link" /> <?php echo __("Link")?></a></li>
-<?php
-									break;
-								case "video":
+<?php
+                                    break;
+                                case "video":
 ?>
 									<li class="selected"><a href="#"><img src="css/images/film.png" alt="New video" /> <?php echo __("Video")?></a></li>
-<?php
-									break;
-								case "mp3":
+<?php
+                                    break;
+                                case "mp3":
 ?>
 									<li class="selected"><a href="#"><img src="css/images/music.png" alt="New audio" /> <?php echo __("Audio")?></a></li>
-<?php
-									break;
-							}
-?>
+<?php
+                                    break;
+                            } ?>
 					</ul>
 					<p>&nbsp;</p>
 					<form action="bm.php" method="post" <?php echo (isset($_GET["new"]) && $_GET["new"]=="photo") ? "enctype=\"multipart/form-data\"" : ""?> name="frmAdd" class="newpost">
 						<fieldset>
-<?php
-							$date = gmmktime();
-							$title = "";
-							$body = (isset($_GET["sel"])) ? $_GET["sel"] : "";
-							$url = (isset($url)) ? $url : "";
-
-							switch ($postType) {
-								case "post":
-									$input = array("{type}", "{date}", "{id_user}", "{editTitle}", "{editBody}");
-									$output = array("1", $date, $_SESSION['user_id'], $title, $body);
-
-									$template->cargarPlantilla($input, $output, "template_add_post");
-									$template->mostrarPlantilla();
-									break;
-								case "photo":
-									$input = array("{type}", "{date}", "{id_user}", "{editUrl}", "{editBody}");
-									$output = array("2", $date, $_SESSION['user_id'], $url, $body);
-
-									$template->cargarPlantilla($input, $output, "template_add_photo_bm");
-									$template->mostrarPlantilla();
-									break;
-								case "url":
-
-									$input = array("{type}", "{date}", "{id_user}", "{editTitle}", "{editUrl}", "{editBody}");
-									$output = array("4", $date, $_SESSION['user_id'], $title, $url, $body);
-
-									$template->cargarPlantilla($input, $output, "template_add_link");
-									$template->mostrarPlantilla();
-									break;
-								case "video":
-									$input = array("{type}", "{date}", "{id_user}", "{editUrl}", "{editBody}");
-									$output = array("6", $date, $_SESSION['user_id'], $url, $body);
-
-									$template->cargarPlantilla($input, $output, "template_add_video");
-									$template->mostrarPlantilla();
-									break;
-								case "mp3":
-									$input = array("{type}", "{date}", "{id_user}", "{editUrl}", "{editBody}");
-									$output = array("7", $date, $_SESSION['user_id'], $url, $body);
-
-									$template->cargarPlantilla($input, $output, "template_add_mp3");
-									$template->mostrarPlantilla();
-									break;
-							}
-?>
+<?php
+                            $date = time();
+        $title = "";
+        $body = (isset($_GET["sel"])) ? $_GET["sel"] : "";
+        $url = (isset($url)) ? $url : "";
+
+        switch ($postType) {
+                                case "post":
+                                    $input = array("{type}", "{date}", "{id_user}", "{editTitle}", "{editBody}");
+                                    $output = array("1", $date, $_SESSION['user_id'], $title, $body);
+
+                                    $template->cargarPlantilla($input, $output, "template_add_post");
+                                    $template->mostrarPlantilla();
+                                    break;
+                                case "photo":
+                                    $input = array("{type}", "{date}", "{id_user}", "{editUrl}", "{editBody}");
+                                    $output = array("2", $date, $_SESSION['user_id'], $url, $body);
+
+                                    $template->cargarPlantilla($input, $output, "template_add_photo_bm");
+                                    $template->mostrarPlantilla();
+                                    break;
+                                case "url":
+
+                                    $input = array("{type}", "{date}", "{id_user}", "{editTitle}", "{editUrl}", "{editBody}");
+                                    $output = array("4", $date, $_SESSION['user_id'], $title, $url, $body);
+
+                                    $template->cargarPlantilla($input, $output, "template_add_link");
+                                    $template->mostrarPlantilla();
+                                    break;
+                                case "video":
+                                    $input = array("{type}", "{date}", "{id_user}", "{editUrl}", "{editBody}");
+                                    $output = array("6", $date, $_SESSION['user_id'], $url, $body);
+
+                                    $template->cargarPlantilla($input, $output, "template_add_video");
+                                    $template->mostrarPlantilla();
+                                    break;
+                                case "mp3":
+                                    $input = array("{type}", "{date}", "{id_user}", "{editUrl}", "{editBody}");
+                                    $output = array("7", $date, $_SESSION['user_id'], $url, $body);
+
+                                    $template->cargarPlantilla($input, $output, "template_add_mp3");
+                                    $template->mostrarPlantilla();
+                                    break;
+                            } ?>
 								<p>
 									<span style="color: rgb(136, 136, 136); margin-bottom: 10px; font-size: 10px;">
                                     	<?php echo __("Some HTML allowed")?>:<br />
@@ -225,18 +220,19 @@ if ($user->isAdmin()) {
 				</div>
 
 			</div>
-<?php
-			}
-?>
+<?php
+
+    } ?>
 			<div id="foot">
 				<a href="http://www.gelatocms.com/" title="gelato CMS">gelato CMS</a> :: PHP/MySQL Tumblelog Content Management System.
 			</div>
 		</div>
 	</body>
 	</html>
-<?php
-} else {
-	$target = (isset($_GET["url"]))? "/login.php?redirect_url=".$_GET["url"]."&sel=".$_GET["sel"] : "/login.php";
-	header("Location: ".$conf->urlGelato.$target);
-}
-?>
+<?php
+
+} else {
+    $target = (isset($_GET["url"]))? "/login.php?redirect_url=".$_GET["url"]."&sel=".$_GET["sel"] : "/login.php";
+    header("Location: ".$conf->urlGelato.$target);
+}
+?>

admin/close.php

@@ -1,21 +1,23 @@
-<?php
-if(!defined('entry'))define('entry', true);
-/* ===========================
-
-  gelato CMS - A PHP based tumblelog CMS
-  development version
-  http://www.gelatocms.com/
-
-  gelato CMS is a free software licensed under the GPL 2.0
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
-
-  =========================== */
+<?php
+if (!defined('entry')) {
+    define('entry', true);
+}
+/* ===========================
+
+  gelato CMS - A PHP based tumblelog CMS
+  development version
+  http://www.gelatocms.com/
+
+  gelato CMS is a free software licensed under the GPL 2.0
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
+
+  =========================== */
 ?>
-<?php
-require('../entry.php');
-global $user;
-$closed = $user->closeSession();
-
+<?php
+require('../entry.php');
+global $user;
+$closed = $user->closeSession();
+
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 	<html xmlns="http://www.w3.org/1999/xhtml">
@@ -47,16 +49,18 @@ $closed = $user->closeSession();
 				
 					<div class="tabla">
 						<p>
-<?php
-						if ($closed) {
-?>		
+<?php
+                        if ($closed) {
+                            ?>		
 							<h2><?php echo __("Ending session&hellip;")?></h2>
-<?php
-						} else {	
-?>
+<?php
+
+                        } else {
+                            ?>
 							<h2><?php echo __("Has happened an error when closing the session.")?></h2>
-<?php
-						}	
+<?php
+
+                        }
 ?> 
 						</p>
 					</div>

admin/comments.php

@@ -1,82 +1,81 @@
-<?php
-if(!defined('entry')) define('entry',true);
-/* ===========================
-
-  gelato CMS - A PHP based tumblelog CMS
-  development version
-  http://www.gelatocms.com/
-
-  gelato CMS is a free software licensed under the GPL 2.0
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
-
-  =========================== */
-?>
-<?php
-require_once('../entry.php');
-global $user, $conf, $tumble;
-
-$comment = new comments();
-$template = new plantillas("admin");
-$isAdmin = $user->isAdmin();
-$isEdition = isset($_GET["edit"]);
-$commentId = ($isEdition) ? $_GET["edit"] : NULL;
-	
-if(isset($_POST["btnAdd"]))	{		
-	unset($_POST["btnAdd"]);	
-	
-	$_POST["username"] = strip_tags($_POST["username"]);
-	$_POST["email"] =  strip_tags($_POST["email"]);
-	$_POST["web"] = strip_tags($_POST["web"]);
-	$_POST["content"] = util::removeBadTags($_POST["content"], true);
-		
-	if (isset($_POST["id_comment"])) {
-		if ($isAdmin) {
-			if ($comment->modifyComment($_POST, $_POST["id_comment"])) {
-				header("Location: comments.php?modified=true");
-				die();
-			} else {
-				header("Location: comments.php?modified=false");
-				die();
-			}
-		}
-	} else {
-		$comment->generateCookie($_POST);
-		$_POST["spam"] = ($comment->isSpam($_POST)) ? "1" : "0";		
-		$_POST["ip_user"] = $_SERVER["REMOTE_ADDR"];
-		
-		$strEnd=($conf->urlFriendly) ? "/" : "";
-		if ($comment->addComment($_POST)) {
-			header("Location: ".$conf->urlGelato.($conf->urlFriendly?"/post/":"/index.php?post=").$_POST["id_post"].$strEnd);
-			die();
-		} else {
-			header("Location: ".$conf->urlGelato.($conf->urlFriendly?"/post/":"/index.php?post=").$_POST["id_post"].$strEnd);
-			die();
-		}
-	}		
-} 
-
-if ($isAdmin) {
-
-	if (isset($_GET["delete"])) {
-		if ($comment->deleteComment($_GET['delete'])) {
-			header("Location: comments.php?deleted=true");
-			die();
-		} else {
-			header("Location: comments.php?deleted=false");
-			die();
-		}		
-	}
-	
+<?php
+if (!defined('entry')) {
+    define('entry', true);
+}
+/* ===========================
+
+  gelato CMS - A PHP based tumblelog CMS
+  development version
+  http://www.gelatocms.com/
+
+  gelato CMS is a free software licensed under the GPL 2.0
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
+
+  =========================== */
 ?>
+<?php
+require_once('../entry.php');
+global $user, $conf, $tumble;
+
+$comment = new comments();
+$template = new plantillas("admin");
+$isAdmin = $user->isAdmin();
+$isEdition = isset($_GET["edit"]);
+$commentId = ($isEdition) ? $_GET["edit"] : null;
+    
+if (isset($_POST["btnAdd"])) {
+    unset($_POST["btnAdd"]);
+    
+    $_POST["username"] = strip_tags($_POST["username"]);
+    $_POST["email"] =  strip_tags($_POST["email"]);
+    $_POST["web"] = strip_tags($_POST["web"]);
+    $_POST["content"] = util::removeBadTags($_POST["content"], true);
+        
+    if (isset($_POST["id_comment"])) {
+        if ($isAdmin) {
+            if ($comment->modifyComment($_POST, $_POST["id_comment"])) {
+                header("Location: comments.php?modified=true");
+                die();
+            } else {
+                header("Location: comments.php?modified=false");
+                die();
+            }
+        }
+    } else {
+        $comment->generateCookie($_POST);
+        $_POST["spam"] = ($comment->isSpam($_POST)) ? "1" : "0";
+        $_POST["ip_user"] = $_SERVER["REMOTE_ADDR"];
+        
+        $strEnd=($conf->urlFriendly) ? "/" : "";
+        if ($comment->addComment($_POST)) {
+            header("Location: ".$conf->urlGelato.($conf->urlFriendly?"/post/":"/index.php?post=").$_POST["id_post"].$strEnd);
+            die();
+        } else {
+            header("Location: ".$conf->urlGelato.($conf->urlFriendly?"/post/":"/index.php?post=").$_POST["id_post"].$strEnd);
+            die();
+        }
+    }
+}
+
+if ($isAdmin) {
+    if (isset($_GET["delete"])) {
+        if ($comment->deleteComment($_GET['delete'])) {
+            header("Location: comments.php?deleted=true");
+            die();
+        } else {
+            header("Location: comments.php?deleted=false");
+            die();
+        }
+    } ?>
 	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 	<html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<title>gelato :: <?php echo __("comments")?></title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<meta name="generator" content="gelato cms <?php echo util::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/jquery.js"></script>
-		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/tools.js"></script>
+		<meta name="generator" content="gelato cms <?php echo util::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/jquery.js"></script>
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato; ?>/admin/scripts/tools.js"></script>
 		<script language="javascript" type="text/javascript">
 		$(document).ready(function(){
 			$("#divMessages").fadeOut(5000,function(){
@@ -85,17 +84,17 @@ if ($isAdmin) {
 		});
 		</script>
 		<style type="text/css" media="screen">	
-			@import "<?php echo $conf->urlGelato;?>/admin/css/style.css";
+			@import "<?php echo $conf->urlGelato; ?>/admin/css/style.css";
 		</style>
 	</head>
 	
 	<body>
-		<div id="div-process" style="display:none;"><?=__("Processing request&hellip;");?></div>
+		<div id="div-process" style="display:none;"><?=__("Processing request&hellip;"); ?></div>
 		<div id="cont">
 			<div id="head">
-				<h1><a href="<?php echo $conf->urlGelato;?>/admin/index.php" title="gelato :: <?=__("home")?>">gelato cms</a></h1>
+				<h1><a href="<?php echo $conf->urlGelato; ?>/admin/index.php" title="gelato :: <?=__("home")?>">gelato cms</a></h1>
 				<ul id="nav">
-					<li><a href="<?php echo $conf->urlGelato;?>/" title="<?=__("Take me to the tumblelog")?>"><?=__("Back to the Tumblelog")?></a></li>
+					<li><a href="<?php echo $conf->urlGelato; ?>/" title="<?=__("Take me to the tumblelog")?>"><?=__("Back to the Tumblelog")?></a></li>
 			  	</ul>
 			</div>
 			<div id="main">				
@@ -104,82 +103,84 @@ if ($isAdmin) {
 					<ul class="menu manage">
 						<h3><?=__("Manage comments")?></h3>
 						<li><a href="index.php"><?=__("Posts")?></a></li>
-						<li <?php if (isset($_GET["spam"])) { ?> class="selected" <?php } ?>><a href="comments.php?spam=true"><?=__("Spam")?></a></li>
-						<li <?php if (!isset($_GET["spam"])) { ?> class="selected" <?php } ?> ><a href="comments.php"><?php echo ($isEdition) ? __("Edit") : __("List"); ?></a></li>
+						<li <?php if (isset($_GET["spam"])) {
+        ?> class="selected" <?php 
+    } ?>><a href="comments.php?spam=true"><?=__("Spam")?></a></li>
+						<li <?php if (!isset($_GET["spam"])) {
+        ?> class="selected" <?php 
+    } ?> ><a href="comments.php"><?php echo ($isEdition) ? __("Edit") : __("List"); ?></a></li>
 					</ul>
 					<p>&nbsp;</p>					
-<?php	
-					if (isset($_GET["deleted"])) {
-						if ($_GET["deleted"]=="true") {
-							echo "<div class=\"exito\" id=\"divMessages\">".__("The comment has been eliminated successfully.")."</div>";
-						}
-						if ($_GET["deleted"]=="false") {
-							echo "<div class=\"error\" id=\"divMessages\">".__("The post has NOT been eliminated.")."</div>";
-						}
-					}
-					
-					if (isset($_GET["modified"])) {
-						if ($_GET["modified"]=="true") {
-							echo "<div class=\"exito\" id=\"divMessages\">".__("The comment has been modified successfully.")."</div>";
-						}
-						if ($_GET["modified"]=="false") {
-							echo "<div class=\"error\" id=\"divMessages\">".__("The post has NOT been modified.")."</div>";
-						}
-					}
-?>
+<?php	
+                    if (isset($_GET["deleted"])) {
+                        if ($_GET["deleted"]=="true") {
+                            echo "<div class=\"exito\" id=\"divMessages\">".__("The comment has been eliminated successfully.")."</div>";
+                        }
+                        if ($_GET["deleted"]=="false") {
+                            echo "<div class=\"error\" id=\"divMessages\">".__("The post has NOT been eliminated.")."</div>";
+                        }
+                    }
+                    
+    if (isset($_GET["modified"])) {
+        if ($_GET["modified"]=="true") {
+            echo "<div class=\"exito\" id=\"divMessages\">".__("The comment has been modified successfully.")."</div>";
+        }
+        if ($_GET["modified"]=="false") {
+            echo "<div class=\"error\" id=\"divMessages\">".__("The post has NOT been modified.")."</div>";
+        }
+    } ?>
 					<div class="tabla">						
-<?php
-						if ($isEdition) {						
-							
-							$row = $comment->getComment($_GET["edit"]);
-							$date = strtotime($row["comment_date"]);
-							
-							$input = array("{User}", "{Email}", "{Web}", "{Comment}", "{Id_Post}", "{Date_Added}", "{Id_Comment}", "{Form_Action}");
-							$output = array($row["username"], $row["email"], $row["web"], $row["content"], $row["id_post"], $date, $row["id_comment"], $conf->urlGelato."/admin/comments.php");
-							
-							$template->cargarPlantilla($input, $output, "template_comment_post");
-							$template->mostrarPlantilla(); 
-
-						} else {
-							
-							if (isset($_GET["page"]) && is_numeric($_GET["page"]) ) {
-								$page_num = $_GET["page"];
-							} else {
-								$page_num = NULL;
-							}
-							
-							$limit=$conf->postLimit;
-							
-							if(isset($page_num) && is_numeric($page_num) && $page_num>0) {
-								$from = (($page_num-1) * $limit);
-							} else {
-								$from = 0;
-							}
-							
-							if (isset($_GET["spam"]) && $_GET["spam"]=="true") { $sp = "1"; } else { $sp = null; }
-							
-							$rs = $comment->getComments(null, $limit, $from, $sp);
-					
-							if ($db->contarRegistros()>0) {				
-								while($rowComment = mysql_fetch_array($rs)) {	
-							
-									$commentAuthor = ($rowComment["web"]=="") ? $rowComment["username"]." | ".$rowComment["email"]  : "<a href=\"".$rowComment["web"]."\" rel=\"external\">".$rowComment["username"]."</a> | ".$rowComment["email"];
-									
-									$input = array("{Permalink}", "{URL_Tumble}", "{Id_Comment}", "{Comment_Author}", "{Comment}");				
-									$output = array($conf->urlGelato."/index.php/post/".$rowComment["id_post"]."#comment-".$rowComment["id_comment"], $conf->urlGelato, $rowComment["id_comment"], $commentAuthor, $rowComment["content"]);
-									
-									$template->cargarPlantilla($input, $output, "template_comment");
-									$template->mostrarPlantilla();
-								}
-								
-								$p = new pagination;
-								$p->items($comment->countComments());
-								$p->limit($limit);
-								$p->currentPage(isset($page_num) ? $page_num : 1);
-								$p->show();
-							}						
-						}
-?>							
+<?php
+                        if ($isEdition) {
+                            $row = $comment->getComment($_GET["edit"]);
+                            $date = strtotime($row["comment_date"]);
+                            
+                            $input = array("{User}", "{Email}", "{Web}", "{Comment}", "{Id_Post}", "{Date_Added}", "{Id_Comment}", "{Form_Action}");
+                            $output = array($row["username"], $row["email"], $row["web"], $row["content"], $row["id_post"], $date, $row["id_comment"], $conf->urlGelato."/admin/comments.php");
+                            
+                            $template->cargarPlantilla($input, $output, "template_comment_post");
+                            $template->mostrarPlantilla();
+                        } else {
+                            if (isset($_GET["page"]) && is_numeric($_GET["page"])) {
+                                $page_num = $_GET["page"];
+                            } else {
+                                $page_num = null;
+                            }
+                            
+                            $limit=$conf->postLimit;
+                            
+                            if (isset($page_num) && is_numeric($page_num) && $page_num>0) {
+                                $from = (($page_num-1) * $limit);
+                            } else {
+                                $from = 0;
+                            }
+                            
+                            if (isset($_GET["spam"]) && $_GET["spam"]=="true") {
+                                $sp = "1";
+                            } else {
+                                $sp = null;
+                            }
+                            
+                            $rs = $comment->getComments(null, $limit, $from, $sp);
+                    
+                            if ($db->contarRegistros()>0) {
+                                while ($rowComment = mysql_fetch_array($rs)) {
+                                    $commentAuthor = ($rowComment["web"]=="") ? $rowComment["username"]." | ".$rowComment["email"]  : "<a href=\"".$rowComment["web"]."\" rel=\"external\">".$rowComment["username"]."</a> | ".$rowComment["email"];
+                                    
+                                    $input = array("{Permalink}", "{URL_Tumble}", "{Id_Comment}", "{Comment_Author}", "{Comment}");
+                                    $output = array($conf->urlGelato."/index.php/post/".$rowComment["id_post"]."#comment-".$rowComment["id_comment"], $conf->urlGelato, $rowComment["id_comment"], $commentAuthor, $rowComment["content"]);
+                                    
+                                    $template->cargarPlantilla($input, $output, "template_comment");
+                                    $template->mostrarPlantilla();
+                                }
+                                
+                                $p = new pagination;
+                                $p->items($comment->countComments());
+                                $p->limit($limit);
+                                $p->currentPage(isset($page_num) ? $page_num : 1);
+                                $p->show();
+                            }
+                        } ?>							
 					</div>
 
 					<div class="footer-box">&nbsp;</div>
@@ -191,8 +192,9 @@ if ($isAdmin) {
 		</div>
 	</body>
 	</html>
-<?php
-} else {
-	header("Location: ".$conf->urlGelato."/login.php");
-}
+<?php
+
+} else {
+    header("Location: ".$conf->urlGelato."/login.php");
+}
 ?>

admin/feeds.php

@@ -1,49 +1,49 @@
-<?php
-if(!defined('entry')) define('entry', true);
- /* ===========================
-
-  gelato CMS - A PHP based tumblelog CMS
-  development version
-  http://www.gelatocms.com/
-
-  gelato CMS is a free software licensed under the GPL 2.0
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
-
-  =========================== */
-?>
-<?php
-require('../entry.php');
-global $user, $conf, $tumble;
-
-if ($user->isAdmin()) {
-	$message = '';
-	$f = new feeds();
-	if(isset($_POST['add'], $_POST['url'])){
-		 $credits =(isset($_POST['credits']))? 1 : 0;
-		if($f->addFeed($_POST['url'],$_POST['type'],$_POST['source'], $credits)){
-			$message = __('Feed added');
-			$messageStatus = 'exito';
-		}
-	}
-	
-	if(isset($_GET['delete']) && is_numeric($_GET['delete'])){
-		if($f->removeFeed((int)$_GET['delete'])){
-			$message = __('Feed deleted');
-			$messageStatus = 'error';
-		}
-	}
-	
+<?php
+if (!defined('entry')) {
+    define('entry', true);
+}
+ /* ===========================
+
+  gelato CMS - A PHP based tumblelog CMS
+  development version
+  http://www.gelatocms.com/
+
+  gelato CMS is a free software licensed under the GPL 2.0
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
+
+  =========================== */
 ?>
+<?php
+require('../entry.php');
+global $user, $conf, $tumble;
+
+if ($user->isAdmin()) {
+    $message = '';
+    $f = new feeds();
+    if (isset($_POST['add'], $_POST['url'])) {
+        $credits =(isset($_POST['credits']))? 1 : 0;
+        if ($f->addFeed($_POST['url'], $_POST['type'], $_POST['source'], $credits)) {
+            $message = __('Feed added');
+            $messageStatus = 'exito';
+        }
+    }
+    
+    if (isset($_GET['delete']) && is_numeric($_GET['delete'])) {
+        if ($f->removeFeed((int)$_GET['delete'])) {
+            $message = __('Feed deleted');
+            $messageStatus = 'error';
+        }
+    } ?>
 	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 	<html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<title>gelato :: <?php echo __("Feeds")?></title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<meta name="generator" content="gelato cms <?php echo util::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/jquery.js"></script>
-		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/tools.js"></script>
-		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/jquery.validate.min.js"></script>
+		<meta name="generator" content="gelato cms <?php echo util::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/jquery.js"></script>
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato; ?>/admin/scripts/tools.js"></script>
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato; ?>/admin/scripts/jquery.validate.min.js"></script>
 		<script type="text/javascript">
 		$(document).ready(function(){
 			$("#divMessages").fadeOut(5000,function(){
@@ -67,16 +67,16 @@ if ($user->isAdmin()) {
 		});
 		</script>
 		<style type="text/css" media="screen">	
-			@import "<?php echo $conf->urlGelato;?>/admin/css/style.css";
+			@import "<?php echo $conf->urlGelato; ?>/admin/css/style.css";
 		</style>
 	</head>
 	
 	<body>
 		<div id="cont">
 			<div id="head">
-				<h1><a href="<?php echo $conf->urlGelato;?>/admin/index.php" title="gelato :: <?php echo __("home")?>">gelato cms</a></h1>
+				<h1><a href="<?php echo $conf->urlGelato; ?>/admin/index.php" title="gelato :: <?php echo __("home")?>">gelato cms</a></h1>
 				<ul id="nav">
-					<li><a href="<?php echo $conf->urlGelato;?>/" title="<?php echo __("Take me to the tumblelog")?>"><?php echo __("Back to the Tumblelog")?></a></li>
+					<li><a href="<?php echo $conf->urlGelato; ?>/" title="<?php echo __("Take me to the tumblelog")?>"><?php echo __("Back to the Tumblelog")?></a></li>
 			  	</ul>
 			</div>
 			<div id="main">				
@@ -88,7 +88,7 @@ if ($user->isAdmin()) {
                     <li><a href="options.php"><?php echo __("Options")?></a></li>
 					</ul>
 					
-					<?php echo (!(empty($message))? '<div class="'.$messageStatus.'" id="divMessages"> '.$message.'</div>' : ''); ?>
+					<?php echo(!(empty($message))? '<div class="'.$messageStatus.'" id="divMessages"> '.$message.'</div>' : ''); ?>
 
 					<div class="tabla">
 
@@ -128,16 +128,15 @@ if ($user->isAdmin()) {
 						</form>
 						<div id="feedlist">						  
 						  <ul>
-						    <?php
-							$actual_feeds = $f->getFeedList();
-							foreach($actual_feeds as $feed){
-								if($feed['error']>0){
-									echo '<li class="feederror"><a href="feeds.php?delete='.$feed['id_feed'].'" title="'.__('Delete this Feed').'" class="action"><img title="" alt="" src="css/images/delete.png"/></a><span class="status">'.__('Error updating').'</span> '.((!empty($feed['title']))? $feed['title'] : $feed['url']).'</li>';
-								}else{
-									echo '<li><a href="feeds.php?delete='.$feed['id_feed'].'" title="'.__('Delete this Feed').'" class="action"><img title="" alt="" src="css/images/delete.png"/></a><span class="status" title="'.__('Last update').': '.$feed['updated_at'].'">'.__('Importing').'</span> '.((!empty($feed['title']))? $feed['title'] : $feed['url']).'</li>';
-								}
-							}
-						?>
+						    <?php
+                            $actual_feeds = $f->getFeedList();
+    foreach ($actual_feeds as $feed) {
+        if ($feed['error']>0) {
+            echo '<li class="feederror"><a href="feeds.php?delete='.$feed['id_feed'].'" title="'.__('Delete this Feed').'" class="action"><img title="" alt="" src="css/images/delete.png"/></a><span class="status">'.__('Error updating').'</span> '.((!empty($feed['title']))? $feed['title'] : $feed['url']).'</li>';
+        } else {
+            echo '<li><a href="feeds.php?delete='.$feed['id_feed'].'" title="'.__('Delete this Feed').'" class="action"><img title="" alt="" src="css/images/delete.png"/></a><span class="status" title="'.__('Last update').': '.$feed['updated_at'].'">'.__('Importing').'</span> '.((!empty($feed['title']))? $feed['title'] : $feed['url']).'</li>';
+        }
+    } ?>
 					      </ul>
 					    </div>
 				  </div>
@@ -151,8 +150,9 @@ if ($user->isAdmin()) {
 		</div>
 	</body>
 	</html>
-<?php
-} else {
-	header("Location: ".$conf->urlGelato."/login.php");
-}
+<?php
+
+} else {
+    header("Location: ".$conf->urlGelato."/login.php");
+}
 ?>

admin/index.php

@@ -1,313 +1,326 @@
-<?php
-if(!defined('entry'))define('entry', true);
-/* ===========================
-
-  gelato CMS - A PHP based tumblelog CMS
-  development version
-  http://www.gelatocms.com/
-
-  gelato CMS is a free software licensed under the GPL 2.0
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
-
-  =========================== */
+<?php
+if (!defined('entry')) {
+    define('entry', true);
+}
+/* ===========================
+
+  gelato CMS - A PHP based tumblelog CMS
+  development version
+  http://www.gelatocms.com/
+
+  gelato CMS is a free software licensed under the GPL 2.0
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
+
+  =========================== */
 ?>
-<?php
-require('../entry.php');
-
-global $user, $conf, $tumble;
-#$template = new plantillas("admin");
-$theme = new themes;
-
-$isEdition = (isset($_GET["edit"])) ? true : false;
-$postId = ($isEdition) ? $_GET["edit"] : NULL;
-
-$theme->set('isEdition',$isEdition);
-$theme->set('postId',$postId);
-$theme->set('pagination','');
-
-if (get_magic_quotes_gpc()) {
-        foreach($_GET as $k=>$get){
-                $_GET[$k]=stripslashes($get);
-        }
-}
-
-if ($user->isAuthenticated()) {
-        if (isset($_GET["delete"])) {
-                $tumble->deletePost($_GET['delete']);
-                header("Location: index.php?deleted=true");
-                die();
-        }
-
-        if(isset($_POST["btnAdd"])){
-                unset($_POST["btnAdd"]);
-                $_POST['type'] = util::type2Number($_POST['type']);
-
-                if ($_POST["type"]=="2") { // is Photo type
-                        if (isset($_POST["url"]) && $_POST["url"]!="")  {
-                                $photoName = util::getFileName($_POST["url"]);
-                                if (!$tumble->savePhoto($_POST["url"])) {
-                                        header("Location: ".$conf->urlGelato."/admin/index.php?photo=false");
-                                        die();
-                                }
-                                $_POST["url"] = "../uploads/".util::sanitizeName($photoName);
-                        }
-
-                        if ( move_uploaded_file( $_FILES['photo']['tmp_name'], "../uploads/".util::sanitizeName($_FILES['photo']['name']) ) ) {
-                                $_POST["url"] = "../uploads/".util::sanitizeName($_FILES['photo']['name']);
-                        }
-
-                        unset($_POST["photo"]);
-                        unset($_POST["MAX_FILE_SIZE"]);
-                }
-
-                if ($_POST["type"]=="7") { // is MP3 type
-                        set_time_limit(300);
-                        $mp3Name = util::getFileName($_POST["url"]);
-                        if (!$tumble->saveMP3($_POST["url"])) {
-                                header("Location: ".$conf->urlGelato."/admin/index.php?mp3=false");
-                                die();
-                        }
-                        if (util::isMP3($remoteFileName)) {
-                                $_POST["url"] = $conf->urlGelato."/uploads/".$mp3Name;
-                        }
-                }
-
-                if (!get_magic_quotes_gpc()) {
-                        $_POST["title"] = addslashes($_POST["title"]);
-                        $_POST["description"] = addslashes($_POST["description"]);
-                }
-
-                /*
-                $textile = new Textile();
-
-                $_POST["title"] = $textile->TextileThis(removeBadTags($_POST["title"],true));
-                $_POST["description"] = $textile->TextileThis(removeBadTags($_POST["description"]));
-                */
-
-                $_POST["title"] = util::removeBadTags($_POST["title"],true);
-                $_POST["description"] = util::removeBadTags($_POST["description"]);
-
-                if (isset($_POST["id_post"]) and  is_numeric($_POST["id_post"]) and $_POST["id_post"]>0) {
-                        $tumble->modifyPost($_POST, $_POST["id_post"]);
-                } else {
-                        if ($tumble->addPost($_POST)) {
-                                header("Location: ".$conf->urlGelato."/admin/index.php?added=true");
-                                die();
-                        } else {
-                                header("Location: ".$conf->urlGelato."/admin/index.php?error=2&des=".$tumble->merror);
-                                die();
-                        }
-                }
-        } else {
-                if ($isEdition) {
-                        $post = $tumble->getPost($postId);
-                }
-				$admin_includes = "";
-				$trigger->call('admin_includes');
-                $theme->set('admin_includes',$admin_includes);
-                $theme->set('version',util::version());
-                $theme->set('conf', array(
-                        'urlGelato'=>$conf->urlGelato,
-                        'richText'=>$conf->richText
-                ));
-                $theme->set('new',isset($_GET['new'])?$_GET['new']:'');
-                $theme->set('information',false);
-                $theme->set('error',false);
-
-                if($conf->check_version){
-                        $present = util::version();
-                        $lastest = util::_file_get_contents("http://www.gelatocms.com/vgel.txt");
-                        if ($present < $lastest)
-                                $theme->set('information',__("A new gelato version has been released and is ready <a href=\"http://www.gelatocms.com/\">for download</a>."));
-                }
-
-                $actions = array(
-                        'deleted'=>false,
-                        'modified'=>false,
-                        'added'=>false
-                );
-
-                if(isset($_GET['deleted']) and $_GET['deleted']=='true'){
-                        $theme->set('exito',__("The post has been eliminated successfully."));
-                        $actions['deleted'] = true;
-                }
-
-                if(isset($_GET["modified"]) and $_GET["modified"]==true){
-                        $theme->set('exito',__("The post has been modified successfully."));
-                        $actions['modified']=true;
-                }
-
-                if(isset($_GET["added"]) and $_GET["added"]==true) {
-                        $theme->set('exito',__("The post has been added successfully."));
-                        $actions['added']=true;
-                }
-
-                $theme->set('action',$actions);
-
-                if (isset($_GET["error"]) and $_GET["error"]==2)
-                        $theme->set('error',__("Error on the database server:")." </strong>".$_GET["des"]);
-
-                if (isset($_GET["mp3"]) and $_GET["mp3"]=='false')
-                        $theme->set('error',__("Not an MP3 file or an upload problem."));
-
-                if (isset($_GET["photo"]) and $_GET["photo"]=='false')
-                        $theme->set('error',__("Not a photo file or an upload problem."));
-
-                if ($isEdition) {
-                        switch ($post["type"]) {
-                                case "1": $_GET["new"] = "post"; break;
-                                case "2": $_GET["new"] = "photo"; break;
-                                case "3": $_GET["new"] = "quote"; break;
-                                case "4": $_GET["new"] = "url"; break;
-                                case "5": $_GET["new"] = "conversation"; break;
-                                case "6": $_GET["new"] = "video"; break;
-                                case "7": $_GET["new"] = "mp3"; break;
-                        }
-                }
-
-                $date = ($isEdition) ? strtotime($post["date"]) : gmmktime();
-                $title = ($isEdition) ? htmlspecialchars(stripslashes($post["title"])) : "";
-                $body = ($isEdition) ? stripslashes($post["description"]) : "";
-                $url = ($isEdition) ? $post["url"] : "";
-
-                if (!isset($_GET['new'])) $_GET['new'] = 'post';
-
-				$form = new themes;
-                $form->set('date',$date);
-                $form->set('id_user',$_SESSION['user_id']);
-                $form->set('type',$_GET["new"]);
-				$form->set('editBody',$body);
-                switch ($_GET["new"]) {
-                        case "post":
-                                $form->set('editTitle',$title);
-                                $theme->set('form',$form->fetch(Absolute_Path.'admin/themes/admin/parts/template_add_post.htm'));
-                                break;
-                        case "photo":
-                                $url = str_replace("../", $conf->urlGelato."/", $url);
-                                $form->set('editUrl',$url);
-                                $theme->set('form',$form->fetch(Absolute_Path.'admin/themes/admin/parts/template_add_photo.htm'));
-                                break;
-                        case "quote":
-                                $form->set('editTitle',$title);
-                                $theme->set('form',$form->fetch(Absolute_Path.'admin/themes/admin/parts/template_add_quote.htm'));
-                                break;
-                        case "url":
-                                $form->set('editTitle',$title);
-                                $form->set('editUrl',$url);
-                                $theme->set('form',$form->fetch(Absolute_Path.'admin/themes/admin/parts/template_add_link.htm'));
-                                break;
-                        case "conversation":
-                                $form->set('editTitle',$title);
-                                $theme->set('form',$form->fetch(Absolute_Path.'admin/themes/admin/parts/template_add_conversation.htm'));
-                                break;
-                        case "video":
-                                $form->set('editUrl',$url);
-                                $theme->set('form',$form->fetch(Absolute_Path.'admin/themes/admin/parts/template_add_video.htm'));
-                                break;
-                        case "mp3":
-                                $form->set('editUrl',$url);
-                                $theme->set('form',$form->fetch(Absolute_Path.'admin/themes/admin/parts/template_add_mp3.htm'));
-                                break;
-                        }
-
-
-                if (!$isEdition){
-                        if (isset($_GET["page"]))
-                                $page_num = $_GET["page"];
-                        else
-                                $page_num = NULL;
-
-                        $limit=$conf->postLimit;
-
-                        if(isset($page_num) && is_numeric($page_num) && $page_num>0)// Is defined the page and is numeric?
-                                $from = (($page_num-1) * $limit);
-                        else
-                                $from = 0;
-
-                        $rs = $tumble->getPosts($limit, $from);
-                        $theme->set('Posts_Number',$db->contarRegistros());
-
-                        $rows = array();
-                        if ($db->contarRegistros()>0) {
-                                while($register = mysql_fetch_array($rs)) {
-                                        $row['postType'] = util::type2Text($tumble->getType($register["id_post"]));
-
-                                        $formatedDate = gmdate("M d", strtotime($register["date"]) + util::transform_offset($conf->offsetTime));
-                                        $strEnd=($conf->urlFriendly) ? "/" : "";
-										$permalink = $conf->urlGelato.($conf->urlFriendly?"/post/":"/index.php?post=").$register["id_post"].$strEnd;
-
-                                        $register["title"] = stripslashes($register["title"]);
-                                        $register["description"] = stripslashes($register["description"]);
-
-                                        $row['Id_Post'] = $register["id_post"];
-                                        $row['Date_Added'] = $formatedDate;
-                                        $row['Permalink'] = $permalink;
-
-                                        switch ($tumble->getType($register["id_post"])) {
-                                                case "1":
-                                                        $row['Title'] = $register["title"];
-                                                        $row['Body'] = $register["description"];
-                                                        break;
-                                                case "2":
-                                                        $fileName = "../uploads/".util::getFileName($register["url"]);
-
-                                                        $x = @getimagesize($fileName);
-                                                        if ($x[0] > 100)
-                                                                $photoPath = $conf->urlGelato."/classes/imgsize.php?w=100&img=".$register["url"];
-                                                        else
-                                                                $photoPath = $register["url"];
-
-                                                        $effect = " href=\"".str_replace("../", $conf->urlGelato."/", $register["url"])."\" rel=\"lightbox\"";
-
-                                                        $row['PhotoURL'] = $photoPath;
-                                                        $row['PhotoAlt'] = strip_tags($register["description"]);
-                                                        $row['Caption'] = $register["description"];
-                                                        $row['Effect'] = $effect;
-                                                        break;
-                                                case "3":
-                                                        $row['Quote'] = $register["description"];
-                                                        $row['Source'] = $register["title"];
-                                                        break;
-                                                case "4":
-                                                        if($conf->shorten_links)
-                                                                $register["url"] = util::_file_get_contents("http://api.abbrr.com/api.php?out=link&url=".$register["url"]);
-                                                        $register["title"] = ($register["title"]=="")? $register["url"] : $register["title"];
-
-                                                        $row['URL'] = $register["url"];
-                                                        $row['Name'] = $register["title"];
-                                                        $row['Description'] = $register["description"];
-                                                        break;
-                                                case "5":
-                                                        $row['Title'] = $register["title"];
-                                                        $row['Conversation'] = $tumble->formatConversation($register["description"]);
-                                                break;
-                                                        case "6":
-                                                        $row['Video'] = $tumble->getVideoPlayer($register["url"]);
-                                                        $row['Caption'] = $register["description"];
-                                                        break;
-                                                case "7":
-                                                        $row['Mp3'] = $tumble->getMp3Player($register["url"]);
-                                                        $row['Caption'] = $register["description"];
-                                                        break;
-                                        }
-
-                                        $rows[] = $row;
-                                }
-
-                                $p = new pagination;
-                                $p->items($tumble->getPostsNumber());
-                                $p->limit($limit);
-                                $p->currentPage(isset($page_num) ? $page_num : 1);
-
-                                $theme->set('pagination',$p->getPagination());
-                                $theme->set('rows',$rows);
-                        }else{
-                                $theme->set('error',__("No posts in this tumblelog."));
-                        }
-                }
-                $theme->display(Absolute_Path.'admin/themes/admin/index.htm');
-        }
-} else {
-        header("Location: ".$conf->urlGelato."/login.php");
-}
+<?php
+require('../entry.php');
+
+global $user, $conf, $tumble;
+#$template = new plantillas("admin");
+$theme = new themes;
+
+$isEdition = (isset($_GET["edit"])) ? true : false;
+$postId = ($isEdition) ? $_GET["edit"] : null;
+
+$theme->set('isEdition', $isEdition);
+$theme->set('postId', $postId);
+$theme->set('pagination', '');
+
+if (get_magic_quotes_gpc()) {
+    foreach ($_GET as $k=>$get) {
+        $_GET[$k]=stripslashes($get);
+    }
+}
+$util_class = new util();
+if ($user->isAuthenticated()) {
+    if (isset($_GET["delete"])) {
+        $tumble->deletePost($_GET['delete']);
+        header("Location: index.php?deleted=true");
+        die();
+    }
+
+    if (isset($_POST["btnAdd"])) {
+        unset($_POST["btnAdd"]);
+        $_POST['type'] = $util_class->type2Number($_POST['type']);
+
+        if ($_POST["type"]=="2") { // is Photo type
+                        if (isset($_POST["url"]) && $_POST["url"]!="") {
+                            $photoName = $util_class->getFileName($_POST["url"]);
+                            if (!$tumble->savePhoto($_POST["url"])) {
+                                header("Location: ".$conf->urlGelato."/admin/index.php?photo=false");
+                                die();
+                            }
+                            $_POST["url"] = "../uploads/".$util_class->sanitizeName($photoName);
+                        }
+
+            if (move_uploaded_file($_FILES['photo']['tmp_name'], "../uploads/".$util_class->sanitizeName($_FILES['photo']['name']))) {
+                $_POST["url"] = "../uploads/".$util_class->sanitizeName($_FILES['photo']['name']);
+            }
+
+            unset($_POST["photo"]);
+            unset($_POST["MAX_FILE_SIZE"]);
+        }
+
+        if ($_POST["type"]=="7") { // is MP3 type
+                        set_time_limit(300);
+            $mp3Name = $util_class->getFileName($_POST["url"]);
+            if (!$tumble->saveMP3($_POST["url"])) {
+                header("Location: ".$conf->urlGelato."/admin/index.php?mp3=false");
+                die();
+            }
+            if ($util_class->isMP3($remoteFileName)) {
+                $_POST["url"] = $conf->urlGelato."/uploads/".$mp3Name;
+            }
+        }
+
+        if (!get_magic_quotes_gpc()) {
+            $_POST["title"] = addslashes($_POST["title"]);
+            $_POST["description"] = addslashes($_POST["description"]);
+        }
+
+                /*
+                $textile = new Textile();
+
+                $_POST["title"] = $textile->TextileThis(removeBadTags($_POST["title"],true));
+                $_POST["description"] = $textile->TextileThis(removeBadTags($_POST["description"]));
+                */
+
+                $_POST["title"] = $util_class->removeBadTags($_POST["title"], true);
+        $_POST["description"] = $util_class->removeBadTags($_POST["description"]);
+
+        if (isset($_POST["id_post"]) and  is_numeric($_POST["id_post"]) and $_POST["id_post"]>0) {
+            $tumble->modifyPost($_POST, $_POST["id_post"]);
+        } else {
+            if ($tumble->addPost($_POST)) {
+                header("Location: ".$conf->urlGelato."/admin/index.php?added=true");
+                die();
+            } else {
+                header("Location: ".$conf->urlGelato."/admin/index.php?error=2&des=".$tumble->merror);
+                die();
+            }
+        }
+    } else {
+        if ($isEdition) {
+            $post = $tumble->getPost($postId);
+        }
+        $admin_includes = "";
+        $trigger->call('admin_includes');
+        $theme->set('admin_includes', $admin_includes);
+        
+        $theme->set('version', $util_class->version());
+        $theme->set('conf', array(
+                        'urlGelato'=>$conf->urlGelato,
+                        'richText'=>$conf->richText
+                ));
+        $theme->set('new', isset($_GET['new'])?$_GET['new']:'');
+        $theme->set('information', false);
+        $theme->set('error', false);
+
+        if ($conf->check_version) {
+            $present = $util_class->version();
+            $lastest = $util_class->_file_get_contents("http://www.gelatocms.com/vgel.txt");
+            if ($present < $lastest) {
+                $theme->set('information', __("A new gelato version has been released and is ready <a href=\"http://www.gelatocms.com/\">for download</a>."));
+            }
+        }
+
+        $actions = array(
+                        'deleted'=>false,
+                        'modified'=>false,
+                        'added'=>false
+                );
+
+        if (isset($_GET['deleted']) and $_GET['deleted']=='true') {
+            $theme->set('exito', __("The post has been eliminated successfully."));
+            $actions['deleted'] = true;
+        }
+
+        if (isset($_GET["modified"]) and $_GET["modified"]==true) {
+            $theme->set('exito', __("The post has been modified successfully."));
+            $actions['modified']=true;
+        }
+
+        if (isset($_GET["added"]) and $_GET["added"]==true) {
+            $theme->set('exito', __("The post has been added successfully."));
+            $actions['added']=true;
+        }
+
+        $theme->set('action', $actions);
+
+        if (isset($_GET["error"]) and $_GET["error"]==2) {
+            $theme->set('error', __("Error on the database server:")." </strong>".$_GET["des"]);
+        }
+
+        if (isset($_GET["mp3"]) and $_GET["mp3"]=='false') {
+            $theme->set('error', __("Not an MP3 file or an upload problem."));
+        }
+
+        if (isset($_GET["photo"]) and $_GET["photo"]=='false') {
+            $theme->set('error', __("Not a photo file or an upload problem."));
+        }
+
+        if ($isEdition) {
+            switch ($post["type"]) {
+                                case "1": $_GET["new"] = "post"; break;
+                                case "2": $_GET["new"] = "photo"; break;
+                                case "3": $_GET["new"] = "quote"; break;
+                                case "4": $_GET["new"] = "url"; break;
+                                case "5": $_GET["new"] = "conversation"; break;
+                                case "6": $_GET["new"] = "video"; break;
+                                case "7": $_GET["new"] = "mp3"; break;
+                        }
+        }
+
+        $date = ($isEdition) ? strtotime($post["date"]) : time();
+        $title = ($isEdition) ? htmlspecialchars(stripslashes($post["title"])) : "";
+        $body = ($isEdition) ? stripslashes($post["description"]) : "";
+        $url = ($isEdition) ? $post["url"] : "";
+
+        if (!isset($_GET['new'])) {
+            $_GET['new'] = 'post';
+        }
+
+        $form = new themes;
+        $form->set('date', $date);
+        $form->set('id_user', $_SESSION['user_id']);
+        $form->set('type', $_GET["new"]);
+        $form->set('editBody', $body);
+        switch ($_GET["new"]) {
+                        case "post":
+                                $form->set('editTitle', $title);
+                                $theme->set('form', $form->fetch(Absolute_Path.'admin/themes/admin/template_add_post.htm'));
+                                break;
+                        case "photo":
+                                $url = str_replace("../", $conf->urlGelato."/", $url);
+                                $form->set('editUrl', $url);
+                                $theme->set('form', $form->fetch(Absolute_Path.'admin/themes/admin/template_add_photo.htm'));
+                                break;
+                        case "quote":
+                                $form->set('editTitle', $title);
+                                $theme->set('form', $form->fetch(Absolute_Path.'admin/themes/admin/template_add_quote.htm'));
+                                break;
+                        case "url":
+                                $form->set('editTitle', $title);
+                                $form->set('editUrl', $url);
+                                $theme->set('form', $form->fetch(Absolute_Path.'admin/themes/admin/template_add_link.htm'));
+                                break;
+                        case "conversation":
+                                $form->set('editTitle', $title);
+                                $theme->set('form', $form->fetch(Absolute_Path.'admin/themes/admin/template_add_conversation.htm'));
+                                break;
+                        case "video":
+                                $form->set('editUrl', $url);
+                                $theme->set('form', $form->fetch(Absolute_Path.'admin/themes/admin/template_add_video.htm'));
+                                break;
+                        case "mp3":
+                                $form->set('editUrl', $url);
+                                $theme->set('form', $form->fetch(Absolute_Path.'admin/themes/admin/template_add_mp3.htm'));
+                                break;
+                        }
+
+
+        if (!$isEdition) {
+            if (isset($_GET["page"])) {
+                $page_num = $_GET["page"];
+            } else {
+                $page_num = null;
+            }
+
+            $limit=$conf->postLimit;
+
+            if (isset($page_num) && is_numeric($page_num) && $page_num>0) {// Is defined the page and is numeric?
+                                $from = (($page_num-1) * $limit);
+            } else {
+                $from = 0;
+            }
+
+            $rs = $tumble->getPosts($limit, $from);
+            $theme->set('Posts_Number', $db->contarRegistros());
+
+            $rows = array();
+            if ($db->contarRegistros()>0) {
+                while ($register = mysql_fetch_array($rs)) {
+                    $row['postType'] = $util_class->type2Text($tumble->getType($register["id_post"]));
+
+                    $formatedDate = gmdate("M d", strtotime($register["date"]) + $util_class->transform_offset($conf->offsetTime));
+                    $strEnd=($conf->urlFriendly) ? "/" : "";
+                    $permalink = $conf->urlGelato.($conf->urlFriendly?"/post/":"/index.php?post=").$register["id_post"].$strEnd;
+
+                    $register["title"] = stripslashes($register["title"]);
+                    $register["description"] = stripslashes($register["description"]);
+
+                    $row['Id_Post'] = $register["id_post"];
+                    $row['Date_Added'] = $formatedDate;
+                    $row['Permalink'] = $permalink;
+
+                    switch ($tumble->getType($register["id_post"])) {
+                                                case "1":
+                                                        $row['Title'] = $register["title"];
+                                                        $row['Body'] = $register["description"];
+                                                        break;
+                                                case "2":
+                                                        $fileName = "../uploads/".$util_class->getFileName($register["url"]);
+
+                                                        $x = @getimagesize($fileName);
+                                                        if ($x[0] > 100) {
+                                                            $photoPath = $conf->urlGelato."/classes/imgsize.php?w=100&img=".$register["url"];
+                                                        } else {
+                                                            $photoPath = $register["url"];
+                                                        }
+
+                                                        $effect = " href=\"".str_replace("../", $conf->urlGelato."/", $register["url"])."\" rel=\"lightbox\"";
+
+                                                        $row['PhotoURL'] = $photoPath;
+                                                        $row['PhotoAlt'] = strip_tags($register["description"]);
+                                                        $row['Caption'] = $register["description"];
+                                                        $row['Effect'] = $effect;
+                                                        break;
+                                                case "3":
+                                                        $row['Quote'] = $register["description"];
+                                                        $row['Source'] = $register["title"];
+                                                        break;
+                                                case "4":
+                                                        if ($conf->shorten_links) {
+                                                            $register["url"] = $util_class->_file_get_contents("http://api.abbrr.com/api.php?out=link&url=".$register["url"]);
+                                                        }
+                                                        $register["title"] = ($register["title"]=="")? $register["url"] : $register["title"];
+
+                                                        $row['URL'] = $register["url"];
+                                                        $row['Name'] = $register["title"];
+                                                        $row['Description'] = $register["description"];
+                                                        break;
+                                                case "5":
+                                                        $row['Title'] = $register["title"];
+                                                        $row['Conversation'] = $tumble->formatConversation($register["description"]);
+                                                break;
+                                                        case "6":
+                                                        $row['Video'] = $tumble->getVideoPlayer($register["url"]);
+                                                        $row['Caption'] = $register["description"];
+                                                        break;
+                                                case "7":
+                                                        $row['Mp3'] = $tumble->getMp3Player($register["url"]);
+                                                        $row['Caption'] = $register["description"];
+                                                        break;
+                                        }
+
+                    $rows[] = $row;
+                }
+
+                $p = new pagination;
+                $p->items($tumble->getPostsNumber());
+                $p->limit($limit);
+                $p->currentPage(isset($page_num) ? $page_num : 1);
+
+                $theme->set('pagination', $p->getPagination());
+                $theme->set('rows', $rows);
+            } else {
+                $theme->set('error', __("No posts in this tumblelog."));
+            }
+        }
+        $theme->display(Absolute_Path.'admin/themes/admin/index.htm');
+    }
+} else {
+    header("Location: ".$conf->urlGelato."/login.php");
+}
 ?>

admin/options.php

@@ -1,77 +1,78 @@
-<?php
-if(!defined('entry')) define('entry',true);  
-/* ===========================
-
-  gelato CMS - A PHP based tumblelog CMS
-  development version
-  http://www.gelatocms.com/
-
-  gelato CMS is a free software licensed under the GPL 2.0
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
-
-  =========================== */
-?>
-<?php
-require_once('../entry.php');
-global $user, $conf, $tumble;
-
-if ($user->isAdmin()) {
-	
-	if(isset($_POST["btnsubmit"]))	{
-		if (!$tumble->saveOption($_POST["rich_text"], "rich_text")) {
-			header("Location: ".$conf->urlGelato."/admin/options.php?error=1&des=".$conf->merror);
-			die();
-		}
-		if (!$tumble->saveOption($_POST["url_friendly"], "url_friendly")) {
-			header("Location: ".$conf->urlGelato."/admin/options.php?error=1&des=".$conf->merror);
-			die();
-		}
-		
-		$off_r= split("," , $_POST['time_offsets']);
-		$_POST['offset_time'] = $off_r[0];
-		$_POST['offset_city'] = $off_r[1];
-		unset($_POST['time_offsets']);
-		if (!$tumble->saveOption($_POST["offset_city"], "offset_city")) {
-			header("Location: ".$conf->urlGelato."/admin/options.php?error=1&des=".$conf->merror);
-			die();
-		}
-		if (!$tumble->saveOption($_POST["offset_time"], "offset_time")) {
-			header("Location: ".$conf->urlGelato."/admin/options.php?error=1&des=".$conf->merror);
-			die();
-		}
-		
-		if (!$tumble->saveOption($_POST["allow_comments"], "allow_comments")) {
-			header("Location: ".$conf->urlGelato."/admin/options.php?error=1&des=".$conf->merror);
-			die();
-		}
-		
-		if (!$tumble->saveOption($_POST["shorten_links"], "shorten_links")) {
-			header("Location: ".$conf->urlGelato."/admin/options.php?error=1&des=".$conf->merror);
-			die();
-		}
-		
-		if (!$tumble->saveOption($_POST["rss_import_frec"], "rss_import_frec")) {
-			header("Location: ".$conf->urlGelato."/admin/options.php?error=1&des=".$conf->merror);
-			die();
-		}
-		
-		if (!$tumble->saveOption($_POST["check_version"], "check_version")) {
-			header("Location: ".$conf->urlGelato."/admin/options.php?error=1&des=".$conf->merror);
-			die();
-		}
-
-		header("Location: ".$conf->urlGelato."/admin/options.php?modified=true");
-		die();
-	} else {
+<?php
+if (!defined('entry')) {
+    define('entry', true);
+}
+/* ===========================
+
+  gelato CMS - A PHP based tumblelog CMS
+  development version
+  http://www.gelatocms.com/
+
+  gelato CMS is a free software licensed under the GPL 2.0
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
+
+  =========================== */
 ?>
+<?php
+require_once('../entry.php');
+global $user, $conf, $tumble;
+
+if ($user->isAdmin()) {
+    if (isset($_POST["btnsubmit"])) {
+        if (!$tumble->saveOption($_POST["rich_text"], "rich_text")) {
+            header("Location: ".$conf->urlGelato."/admin/options.php?error=1&des=".$conf->merror);
+            die();
+        }
+        if (!$tumble->saveOption($_POST["url_friendly"], "url_friendly")) {
+            header("Location: ".$conf->urlGelato."/admin/options.php?error=1&des=".$conf->merror);
+            die();
+        }
+        
+        $off_r= split(",", $_POST['time_offsets']);
+        $_POST['offset_time'] = $off_r[0];
+        $_POST['offset_city'] = $off_r[1];
+        unset($_POST['time_offsets']);
+        if (!$tumble->saveOption($_POST["offset_city"], "offset_city")) {
+            header("Location: ".$conf->urlGelato."/admin/options.php?error=1&des=".$conf->merror);
+            die();
+        }
+        if (!$tumble->saveOption($_POST["offset_time"], "offset_time")) {
+            header("Location: ".$conf->urlGelato."/admin/options.php?error=1&des=".$conf->merror);
+            die();
+        }
+        
+        if (!$tumble->saveOption($_POST["allow_comments"], "allow_comments")) {
+            header("Location: ".$conf->urlGelato."/admin/options.php?error=1&des=".$conf->merror);
+            die();
+        }
+        
+        if (!$tumble->saveOption($_POST["shorten_links"], "shorten_links")) {
+            header("Location: ".$conf->urlGelato."/admin/options.php?error=1&des=".$conf->merror);
+            die();
+        }
+        
+        if (!$tumble->saveOption($_POST["rss_import_frec"], "rss_import_frec")) {
+            header("Location: ".$conf->urlGelato."/admin/options.php?error=1&des=".$conf->merror);
+            die();
+        }
+        
+        if (!$tumble->saveOption($_POST["check_version"], "check_version")) {
+            header("Location: ".$conf->urlGelato."/admin/options.php?error=1&des=".$conf->merror);
+            die();
+        }
+
+        header("Location: ".$conf->urlGelato."/admin/options.php?modified=true");
+        die();
+    } else {
+        ?>
 	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 	<html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<title>gelato :: <?php echo __("options")?></title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<meta name="generator" content="gelato cms <?php echo util::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/jquery.js"></script>
+		<meta name="generator" content="gelato cms <?php echo util::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/jquery.js"></script>
 		<script type="text/javascript">
 		$(document).ready(function(){
 			$("#divMessages").fadeOut(5000,function(){
@@ -80,7 +81,7 @@ if ($user->isAdmin()) {
 		});
 		</script>		
 		<style type="text/css" media="screen">	
-			@import "<?php echo $conf->urlGelato;?>/admin/css/style.css";
+			@import "<?php echo $conf->urlGelato; ?>/admin/css/style.css";
 		</style>
 	</head>
 	
@@ -88,9 +89,9 @@ if ($user->isAdmin()) {
 		<div id="div-process" style="display:none;"><?php echo __("Processing request&hellip;")?></div>
 		<div id="cont">
 			<div id="head">
-				<h1><a href="<?php echo $conf->urlGelato;?>/admin/index.php" title="gelato :: <?php echo __("home")?>">gelato cms</a></h1>
+				<h1><a href="<?php echo $conf->urlGelato; ?>/admin/index.php" title="gelato :: <?php echo __("home")?>">gelato cms</a></h1>
 				<ul id="nav">
-					<li><a href="<?php echo $conf->urlGelato;?>/" title="<?php echo __("Take me to the tumblelog")?>"><?php echo __("Back to the Tumblelog")?></a></li>
+					<li><a href="<?php echo $conf->urlGelato; ?>/" title="<?php echo __("Take me to the tumblelog")?>"><?php echo __("Back to the Tumblelog")?></a></li>
 			  	</ul>
 			</div>
 			<div id="main">				
@@ -98,24 +99,23 @@ if ($user->isAdmin()) {
 				<div class="box">
 					<ul class="menu manage">
 					<h3><?php echo __("Tumblelog options")?></h3>
-					<li><a href="<?php echo $conf->urlGelato;?>/admin/index.php"><?php echo __("Post")?></a></li>
-					<li><a href="<?php echo $conf->urlGelato;?>/admin/admin.php"><?php echo __("Users")?></a></li>
-					<li><a href="<?php echo $conf->urlGelato;?>/admin/plugins.php"><?php echo __("Plugins")?></a></li>
-					<li><a href="<?php echo $conf->urlGelato;?>/admin/settings.php"><?php echo __("Settings")?></a></li>
+					<li><a href="<?php echo $conf->urlGelato; ?>/admin/index.php"><?php echo __("Post")?></a></li>
+					<li><a href="<?php echo $conf->urlGelato; ?>/admin/admin.php"><?php echo __("Users")?></a></li>
+					<li><a href="<?php echo $conf->urlGelato; ?>/admin/plugins.php"><?php echo __("Plugins")?></a></li>
+					<li><a href="<?php echo $conf->urlGelato; ?>/admin/settings.php"><?php echo __("Settings")?></a></li>
 					<li class="selected"><a><?php echo __("Options")?></a></li>
 					</ul>
-<?php
-					if (isset($_GET["modified"])) {
-						if ($_GET["modified"]=="true") {
-							echo "<div class=\"exito\" id=\"divMessages\">".__("The configuration has been modified successfully.")."</div>";
-						}
-					}					
-					if (isset($_GET["error"])) {
-						if ($_GET["error"]==1) {
-							echo "<div class=\"error\" id=\"divMessages\"><strong>".__("Error on the database server: ")."</strong>".$_GET["des"]."</div>";
-						}
-					}
-?>
+<?php
+                    if (isset($_GET["modified"])) {
+                        if ($_GET["modified"]=="true") {
+                            echo "<div class=\"exito\" id=\"divMessages\">".__("The configuration has been modified successfully.")."</div>";
+                        }
+                    }
+        if (isset($_GET["error"])) {
+            if ($_GET["error"]==1) {
+                echo "<div class=\"error\" id=\"divMessages\"><strong>".__("Error on the database server: ")."</strong>".$_GET["des"]."</div>";
+            }
+        } ?>
 					<div class="tabla">
 
 						<form action="options.php" method="post" id="options_form" autocomplete="off" class="newpost">							
@@ -123,20 +123,32 @@ if ($user->isAdmin()) {
 								<ul>																	
 									<li class="select"><label for="rich_text"><?php echo __("Rich text editor:")?></label>
 										<select name="rich_text" id="rich_text">
-											<option value="1" <?php if($conf->richText) echo "selected"; ?>><?php echo __("Active")?></option>
-											<option value="0" <?php if(!$conf->richText) echo "selected"; ?>><?php echo __("Deactive")?></option>
+											<option value="1" <?php if ($conf->richText) {
+            echo "selected";
+        } ?>><?php echo __("Active")?></option>
+											<option value="0" <?php if (!$conf->richText) {
+            echo "selected";
+        } ?>><?php echo __("Deactive")?></option>
 										</select>
 									</li>
 									<li class="select"><label for="url_friendly"><?php echo __("URL friendly:")?></label>
 										<select name="url_friendly" id="url_friendly">
-											<option value="1" <?php if($conf->urlFriendly) echo "selected"; ?>><?php echo __("Active")?></option>
-											<option value="0" <?php if(!$conf->urlFriendly) echo "selected"; ?>><?php echo __("Deactive")?></option>
+											<option value="1" <?php if ($conf->urlFriendly) {
+            echo "selected";
+        } ?>><?php echo __("Active")?></option>
+											<option value="0" <?php if (!$conf->urlFriendly) {
+            echo "selected";
+        } ?>><?php echo __("Deactive")?></option>
 										</select>
 									</li>
 									<li class="select"><label for="allow_comments"><?php echo __("Allow readers comments:")?></label>
 										<select name="allow_comments" id="allow_comments">
-											<option value="1" <?php if($conf->allowComments) echo "selected"; ?>><?php echo __("Active")?></option>
-											<option value="0" <?php if(!$conf->allowComments) echo "selected"; ?>><?php echo __("Deactive")?></option>
+											<option value="1" <?php if ($conf->allowComments) {
+            echo "selected";
+        } ?>><?php echo __("Active")?></option>
+											<option value="0" <?php if (!$conf->allowComments) {
+            echo "selected";
+        } ?>><?php echo __("Deactive")?></option>
 										</select>
 									</li>
 									<li class="select"><label for="time_offsets"><?php echo __("Time Offset:")?></label>
@@ -207,35 +219,66 @@ if ($user->isAdmin()) {
 									</li>
 									<li class="select"><label for="shorten_links"><?php echo __("Shorten long URLs:")?></label>
 										<select name="shorten_links" id="shorten_links">
-											<option value="1" <?php if($conf->shorten_links) echo "selected=\"selected\""; ?>><?php echo __("Active")?></option>
-											<option value="0" <?php if(!$conf->shorten_links) echo "selected=\"selected\""; ?>><?php echo __("Deactive")?></option>
+											<option value="1" <?php if ($conf->shorten_links) {
+            echo "selected=\"selected\"";
+        } ?>><?php echo __("Active")?></option>
+											<option value="0" <?php if (!$conf->shorten_links) {
+            echo "selected=\"selected\"";
+        } ?>><?php echo __("Deactive")?></option>
 										</select>
 									</li>
  									<li class="select"><label for="rss_import_frec"><?php echo __("Import feeds every:")?></label>
 										<select name="rss_import_frec" id="rss_import_frec">
-											<option value="5 minutes" <?php if($conf->rssImportFrec == '5 minutes') echo "selected=\"selected\""; ?>>5 <?php echo __("minutes");?></option>
-											<option value="10 minutes" <?php if($conf->rssImportFrec == '10 minutes') echo "selected=\"selected\""; ?>>10 <?php echo __("minutes");?></option>
-											<option value="15 minutes" <?php if($conf->rssImportFrec == '15 minutes') echo "selected=\"selected\""; ?>>15 <?php echo __("minutes");?></option>
-											<option value="30 minutes" <?php if($conf->rssImportFrec == '30 minutes') echo "selected=\"selected\""; ?>>30 <?php echo __("minutes");?></option>
-											<option value="45 minutes" <?php if($conf->rssImportFrec == '45 minutes') echo "selected=\"selected\""; ?>>45 <?php echo __("minutes");?></option>
-											<option value="1 hour" <?php if($conf->rssImportFrec == '1 hour') echo "selected=\"selected\""; ?>>1 <?php echo __("hour");?></option>
- 											<option value="2 hours" <?php if($conf->rssImportFrec == '2 hours') echo "selected=\"selected\""; ?>>2 <?php echo __("hours");?></option>
-											<option value="3 hours" <?php if($conf->rssImportFrec == '3 hours') echo "selected=\"selected\""; ?>>3 <?php echo __("hours");?></option>
-											<option value="4 hours" <?php if($conf->rssImportFrec == '4 hours') echo "selected=\"selected\""; ?>>4 <?php echo __("hours");?></option>
- 											<option value="6 hours" <?php if($conf->rssImportFrec == '6 hours') echo "selected=\"selected\""; ?>>6 <?php echo __("hours");?></option>
-											<option value="12 hours" <?php if($conf->rssImportFrec == '12 hours') echo "selected=\"selected\""; ?>>12 <?php echo __("hours");?></option>
-											<option value="1 day" <?php if($conf->rssImportFrec == '1 day') echo "selected=\"selected\""; ?>>24 <?php echo __("hours");?></option>
+											<option value="5 minutes" <?php if ($conf->rssImportFrec == '5 minutes') {
+            echo "selected=\"selected\"";
+        } ?>>5 <?php echo __("minutes"); ?></option>
+											<option value="10 minutes" <?php if ($conf->rssImportFrec == '10 minutes') {
+            echo "selected=\"selected\"";
+        } ?>>10 <?php echo __("minutes"); ?></option>
+											<option value="15 minutes" <?php if ($conf->rssImportFrec == '15 minutes') {
+            echo "selected=\"selected\"";
+        } ?>>15 <?php echo __("minutes"); ?></option>
+											<option value="30 minutes" <?php if ($conf->rssImportFrec == '30 minutes') {
+            echo "selected=\"selected\"";
+        } ?>>30 <?php echo __("minutes"); ?></option>
+											<option value="45 minutes" <?php if ($conf->rssImportFrec == '45 minutes') {
+            echo "selected=\"selected\"";
+        } ?>>45 <?php echo __("minutes"); ?></option>
+											<option value="1 hour" <?php if ($conf->rssImportFrec == '1 hour') {
+            echo "selected=\"selected\"";
+        } ?>>1 <?php echo __("hour"); ?></option>
+ 											<option value="2 hours" <?php if ($conf->rssImportFrec == '2 hours') {
+            echo "selected=\"selected\"";
+        } ?>>2 <?php echo __("hours"); ?></option>
+											<option value="3 hours" <?php if ($conf->rssImportFrec == '3 hours') {
+            echo "selected=\"selected\"";
+        } ?>>3 <?php echo __("hours"); ?></option>
+											<option value="4 hours" <?php if ($conf->rssImportFrec == '4 hours') {
+            echo "selected=\"selected\"";
+        } ?>>4 <?php echo __("hours"); ?></option>
+ 											<option value="6 hours" <?php if ($conf->rssImportFrec == '6 hours') {
+            echo "selected=\"selected\"";
+        } ?>>6 <?php echo __("hours"); ?></option>
+											<option value="12 hours" <?php if ($conf->rssImportFrec == '12 hours') {
+            echo "selected=\"selected\"";
+        } ?>>12 <?php echo __("hours"); ?></option>
+											<option value="1 day" <?php if ($conf->rssImportFrec == '1 day') {
+            echo "selected=\"selected\"";
+        } ?>>24 <?php echo __("hours"); ?></option>
 										</select>
 									</li>
 									<li class="select"><label for="check_version"><?php echo __("Check for updates:")?></label>
 										<select name="check_version" id="check_version">
-											<option value="1" <?php if($conf->check_version) echo "selected=\"selected\""; ?>><?php echo __("Active")?></option>
-											<option value="0" <?php if(!$conf->check_version) echo "selected=\"selected\""; ?>><?php echo __("Deactive")?></option>
+											<option value="1" <?php if ($conf->check_version) {
+            echo "selected=\"selected\"";
+        } ?>><?php echo __("Active")?></option>
+											<option value="0" <?php if (!$conf->check_version) {
+            echo "selected=\"selected\"";
+        } ?>><?php echo __("Deactive")?></option>
 										</select>
 									</li>
-<?php
-									$trigger->call('add_options_panel');									
-?>									
+<?php
+                                    $trigger->call('add_options_panel'); ?>									
 								</ul>
 							</fieldset>
 							<p>
@@ -254,9 +297,10 @@ if ($user->isAdmin()) {
 		</div>
 	</body>
 	</html>
-<?php
-	}
-} else {
-	header("Location: ".$conf->urlGelato."/login.php");
-}
+<?php
+
+    }
+} else {
+    header("Location: ".$conf->urlGelato."/login.php");
+}
 ?>

admin/plugins.php

@@ -1,64 +1,64 @@
-<?php
-if(!defined('entry')) define('entry',true);  
-/* ===========================
-
-  gelato CMS - A PHP based tumblelog CMS
-  development version
-  http://www.gelatocms.com/
-
-  gelato CMS is a free software licensed under the GPL 2.0
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
-
-  =========================== */
-?>
-<?php
-require_once('../entry.php');
-global $user, $conf, $tumble;
-
-
-if ($user->isAdmin()) {
-	
-	
-	$plugins = array();
-	if ($handle = opendir(Absolute_Path."plugins")) {
-		while (false !== ($file = readdir($handle))) { 
-			if (substr($file, strlen($file)-4, 4) == ".php") {
-				$plugins[] = substr($file, 0, strlen($file)-4);
-			} 
-		} 
-		closedir($handle); 
-	}
-	
-	$actives = json_decode($conf->active_plugins,1);	
-	
-	$actives = $actives[1];
-	
-	if(isset($_POST["btnsubmit"]))	{
-		$actives = array();
-		foreach($_POST['plugins'] as $plugin => $val){
-			if($val != 'off'){
-				$file = $plugin.'.php';
-				$actives[$plugin] = $file;
-			}
-		}
-		
-		if(!$tumble->saveOption(json_encode(array(array('total'=>count($actives)),$actives)), "active_plugins")){
-			header("Location: ".$conf->urlGelato."/admin/plugins.php?error=1&desc=".$conf->merror);
-			die();
-		}
-		header("Location: ".$conf->urlGelato."/admin/plugins.php?modified=true");
-		die();
-	} else {
+<?php
+if (!defined('entry')) {
+    define('entry', true);
+}
+/* ===========================
+
+  gelato CMS - A PHP based tumblelog CMS
+  development version
+  http://www.gelatocms.com/
+
+  gelato CMS is a free software licensed under the GPL 2.0
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
+
+  =========================== */
 ?>
+<?php
+require_once('../entry.php');
+global $user, $conf, $tumble;
+
+
+if ($user->isAdmin()) {
+    $plugins = array();
+    if ($handle = opendir(Absolute_Path."plugins")) {
+        while (false !== ($file = readdir($handle))) {
+            if (substr($file, strlen($file)-4, 4) == ".php") {
+                $plugins[] = substr($file, 0, strlen($file)-4);
+            }
+        }
+        closedir($handle);
+    }
+    
+    $actives = json_decode($conf->active_plugins, 1);
+    
+    $actives = $actives[1];
+    
+    if (isset($_POST["btnsubmit"])) {
+        $actives = array();
+        foreach ($_POST['plugins'] as $plugin => $val) {
+            if ($val != 'off') {
+                $file = $plugin.'.php';
+                $actives[$plugin] = $file;
+            }
+        }
+        
+        if (!$tumble->saveOption(json_encode(array(array('total'=>count($actives)),$actives)), "active_plugins")) {
+            header("Location: ".$conf->urlGelato."/admin/plugins.php?error=1&desc=".$conf->merror);
+            die();
+        }
+        header("Location: ".$conf->urlGelato."/admin/plugins.php?modified=true");
+        die();
+    } else {
+        ?>
 	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 	<html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<title>gelato :: <?php echo __("Plugins")?></title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<meta name="generator" content="gelato cms <?php echo util::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/jquery.js"></script>
-		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/tools.js"></script>
+		<meta name="generator" content="gelato cms <?php echo util::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/jquery.js"></script>
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato; ?>/admin/scripts/tools.js"></script>
 		<script type="text/javascript">
 		$(document).ready(function(){
 			$("#divMessages").fadeOut(5000,function(){
@@ -67,7 +67,7 @@ if ($user->isAdmin()) {
 		});
 		</script>		
 		<style type="text/css" media="screen">	
-			@import "<?php echo $conf->urlGelato;?>/admin/css/style.css";
+			@import "<?php echo $conf->urlGelato; ?>/admin/css/style.css";
 		</style>
 	</head>
 	
@@ -75,9 +75,9 @@ if ($user->isAdmin()) {
 		<div id="div-process" style="display:none;"><?php echo __("Processing request&hellip;")?></div>
 		<div id="cont">
 			<div id="head">
-				<h1><a href="<?php echo $conf->urlGelato;?>/admin/index.php" title="gelato :: <?php echo __("home")?>">gelato cms</a></h1>
+				<h1><a href="<?php echo $conf->urlGelato; ?>/admin/index.php" title="gelato :: <?php echo __("home")?>">gelato cms</a></h1>
 				<ul id="nav">
-					<li><a href="<?php echo $conf->urlGelato;?>/" title="<?php echo __("Take me to the tumblelog")?>"><?php echo __("Back to the Tumblelog")?></a></li>
+					<li><a href="<?php echo $conf->urlGelato; ?>/" title="<?php echo __("Take me to the tumblelog")?>"><?php echo __("Back to the Tumblelog")?></a></li>
 			  	</ul>
 			</div>
 			<div id="main">				
@@ -91,62 +91,64 @@ if ($user->isAdmin()) {
 					<li><a href="options.php"><?php echo __("Options")?></a></li>
 					<li class="selected"><a href="plugins.php"><?php echo __("Plugins")?></a></li>
 					</ul>
-<?php
-					if (isset($_GET["modified"])) {
-						if ($_GET["modified"]=="true") {
-							echo "<div class=\"exito\" id=\"divMessages\">".__("The configuration has been modified successfully.")."</div>";
-						}
-					}					
-					if (isset($_GET["error"])) {
-						if ($_GET["error"]==1) {
-							echo "<div class=\"error\" id=\"divMessages\"><strong>".__("Error on the database server: ")."</strong>".$_GET["des"]."</div>";
-						}
-					}
-?>
+<?php
+                    if (isset($_GET["modified"])) {
+                        if ($_GET["modified"]=="true") {
+                            echo "<div class=\"exito\" id=\"divMessages\">".__("The configuration has been modified successfully.")."</div>";
+                        }
+                    }
+        if (isset($_GET["error"])) {
+            if ($_GET["error"]==1) {
+                echo "<div class=\"error\" id=\"divMessages\"><strong>".__("Error on the database server: ")."</strong>".$_GET["des"]."</div>";
+            }
+        } ?>
 					<div class="tabla">
 
 						<form action="plugins.php" method="post" id="options_form" autocomplete="off" class="newpost">							
 							<fieldset>
-								<?php
-									if(count($plugins) == 0){
-										echo __('You dont have any plugin installed, get some <a href="http://www.gelatocms.com/">here</a>');
-									}else{
-										foreach ($plugins as $key => $plugin) {
-											
-											//FIXME terminar esto asi se lee la info desde el archivo 'a la' WP
-											/*
-											$plugin_data = implode( '', file( Absolute_Path."plugins/".$plugin.'.php' ));
-											preg_match( '|Plugin Name:(.*)$|mi', $plugin_data, $plugin_name );
-											preg_match( '|Plugin URI:(.*)$|mi', $plugin_data, $plugin_uri );
-											preg_match( '|Description:(.*)$|mi', $plugin_data, $description );
-											preg_match( '|Author:(.*)$|mi', $plugin_data, $author_name );
-											preg_match( '|Author URI:(.*)$|mi', $plugin_data, $author_uri );
-
-											if ( preg_match( "|Version:(.*)|i", $plugin_data, $version ))
-											$version = trim( $version[1] );
-											else
-											$version = '';
-
-											$plugin_data = array('Name' => trim($plugin_name[1]), 'URI' => trim($plugin_uri[1]), 'Description' => trim($description[1]), 'Author' => trim($author_name[1]), 'Author_uri' => trim($author_uri[1]), 'Version' => $version);
-*/
-											$desc = __("There is no info for this plugin jet");
-											$activated = array_key_exists($plugin, $actives);
-								?>								
+								<?php
+                                    if (count($plugins) == 0) {
+                                        echo __('You dont have any plugin installed, get some <a href="http://www.gelatocms.com/">here</a>');
+                                    } else {
+                                        foreach ($plugins as $key => $plugin) {
+                                            
+                                            //FIXME terminar esto asi se lee la info desde el archivo 'a la' WP
+                                            /*
+                                            $plugin_data = implode( '', file( Absolute_Path."plugins/".$plugin.'.php' ));
+                                            preg_match( '|Plugin Name:(.*)$|mi', $plugin_data, $plugin_name );
+                                            preg_match( '|Plugin URI:(.*)$|mi', $plugin_data, $plugin_uri );
+                                            preg_match( '|Description:(.*)$|mi', $plugin_data, $description );
+                                            preg_match( '|Author:(.*)$|mi', $plugin_data, $author_name );
+                                            preg_match( '|Author URI:(.*)$|mi', $plugin_data, $author_uri );
+
+                                            if ( preg_match( "|Version:(.*)|i", $plugin_data, $version ))
+                                            $version = trim( $version[1] );
+                                            else
+                                            $version = '';
+
+                                            $plugin_data = array('Name' => trim($plugin_name[1]), 'URI' => trim($plugin_uri[1]), 'Description' => trim($description[1]), 'Author' => trim($author_name[1]), 'Author_uri' => trim($author_uri[1]), 'Version' => $version);
+*/
+                                            $desc = __("There is no info for this plugin jet");
+                                            $activated = array_key_exists($plugin, $actives); ?>								
 								<ul>	
 									<li class="select">
-										<label for="<?php echo $key;?>" title="<?php echo $desc; ?>" class="help"><?php echo $plugin;	?></label>
-										<select name="plugins[<?php echo $plugin;	?>]" id="<?php echo $key;?>">
-											<option value="on" <?php if($activated) echo 'selected="selected"'; ?>><?php echo __("On")?></option>
-											<option value="off" <?php if(!$activated) echo 'selected="selected"'; ?>><?php echo __("Off")?></option>
+										<label for="<?php echo $key; ?>" title="<?php echo $desc; ?>" class="help"><?php echo $plugin; ?></label>
+										<select name="plugins[<?php echo $plugin; ?>]" id="<?php echo $key; ?>">
+											<option value="on" <?php if ($activated) {
+                                                echo 'selected="selected"';
+                                            } ?>><?php echo __("On")?></option>
+											<option value="off" <?php if (!$activated) {
+                                                echo 'selected="selected"';
+                                            } ?>><?php echo __("Off")?></option>
 										</select>
 									</li>
-									<?php
-										}
-									?>
+									<?php
+
+                                        } ?>
 								</ul>
-								<?php
-									}
-								?>
+								<?php
+
+                                    } ?>
 							</fieldset>
 							<p>
 								<input type="submit" name="btnsubmit" id="btnsubmit" value="<?php echo __("Modify")?>" class="submit"/>
@@ -164,9 +166,10 @@ if ($user->isAdmin()) {
 		</div>
 	</body>
 	</html>
-<?php
-	}
-} else {
-	header("Location: ".$conf->urlGelato."/login.php");
-}
+<?php
+
+    }
+} else {
+    header("Location: ".$conf->urlGelato."/login.php");
+}
 ?>

admin/settings.php

@@ -1,35 +1,36 @@
-<?php
-if(!defined('entry')) define('entry',true);  
-/* ===========================
-
-  gelato CMS - A PHP based tumblelog CMS
-  development version
-  http://www.gelatocms.com/
-
-  gelato CMS is a free software licensed under the GPL 2.0
-  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
-
-  =========================== */
-
-require_once('../entry.php');
-global $user, $conf, $tumble;
-
-if ($user->isAdmin()) {
-	
-	if(isset($_POST["btnsubmit"]))	{		
-		unset($_POST["btnsubmit"]);
-		$_POST["url_installation"] = (util::endsWith($_POST["url_installation"], "/")) ? substr($_POST["url_installation"], 0, strlen($_POST["url_installation"])-1) : $_POST["url_installation"] ;
-		$tumble->saveSettings($_POST);
-	} else {
-?>
+<?php
+if (!defined('entry')) {
+    define('entry', true);
+}
+/* ===========================
+
+  gelato CMS - A PHP based tumblelog CMS
+  development version
+  http://www.gelatocms.com/
+
+  gelato CMS is a free software licensed under the GPL 2.0
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
+
+  =========================== */
+
+require_once('../entry.php');
+global $user, $conf, $tumble;
+
+if ($user->isAdmin()) {
+    if (isset($_POST["btnsubmit"])) {
+        unset($_POST["btnsubmit"]);
+        $_POST["url_installation"] = (util::endsWith($_POST["url_installation"], "/")) ? substr($_POST["url_installation"], 0, strlen($_POST["url_installation"])-1) : $_POST["url_installation"] ;
+        $tumble->saveSettings($_POST);
+    } else {
+        ?>
 	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 	<html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<title>gelato :: <?php echo __("settings")?></title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<meta name="generator" content="gelato cms <?php echo util::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/jquery.js"></script>
+		<meta name="generator" content="gelato cms <?php echo util::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/jquery.js"></script>
 		<script type="text/javascript">
 		$(document).ready(function(){
 			$("#divMessages").fadeOut(5000,function(){
@@ -38,7 +39,7 @@ if ($user->isAdmin()) {
 		});
 		</script>	
 		<style type="text/css" media="screen">	
-			@import "<?php echo $conf->urlGelato;?>/admin/css/style.css";
+			@import "<?php echo $conf->urlGelato; ?>/admin/css/style.css";
 		</style>
 	</head>
 	
@@ -46,9 +47,9 @@ if ($user->isAdmin()) {
 		<div id="div-process" style="display:none;"><?php echo __("Processing request&hellip;")?></div>
 		<div id="cont">
 			<div id="head">
-				<h1><a href="<?php echo $conf->urlGelato;?>/admin/index.php" title="gelato :: <?php echo __("home")?>">gelato cms</a></h1>
+				<h1><a href="<?php echo $conf->urlGelato; ?>/admin/index.php" title="gelato :: <?php echo __("home")?>">gelato cms</a></h1>
 				<ul id="nav">
-					<li><a href="<?php echo $conf->urlGelato;?>/" title="<?php echo __("Take me to the tumblelog")?>"><?php echo __("Back to the Tumblelog")?></a></li>
+					<li><a href="<?php echo $conf->urlGelato; ?>/" title="<?php echo __("Take me to the tumblelog")?>"><?php echo __("Back to the Tumblelog")?></a></li>
 			  	</ul>
 			</div>
 			<div id="main">				
@@ -56,64 +57,58 @@ if ($user->isAdmin()) {
 				<div class="box">
 					<ul class="menu manage">
 					<h3><?php echo __("Tumblelog configuration")?></h3>
-					<li><a href="<?php echo $conf->urlGelato;?>/admin/index.php"><?php echo __("Post")?></a></li>
-					<li><a href="<?php echo $conf->urlGelato;?>/admin/admin.php"><?php echo __("Users")?></a></li>
-					<li><a href="<?php echo $conf->urlGelato;?>/admin/plugins.php"><?php echo __("Plugins")?></a></li>
-					<li><a href="<?php echo $conf->urlGelato;?>/admin/options.php"><?php echo __("Options")?></a></li>
+					<li><a href="<?php echo $conf->urlGelato; ?>/admin/index.php"><?php echo __("Post")?></a></li>
+					<li><a href="<?php echo $conf->urlGelato; ?>/admin/admin.php"><?php echo __("Users")?></a></li>
+					<li><a href="<?php echo $conf->urlGelato; ?>/admin/plugins.php"><?php echo __("Plugins")?></a></li>
+					<li><a href="<?php echo $conf->urlGelato; ?>/admin/options.php"><?php echo __("Options")?></a></li>
 					<li class="selected"><a><?php echo __("Settings")?></a></li>
 					</ul>
-<?php
-					if (isset($_GET["modified"])) {
-						if ($_GET["modified"]=="true") {
-							echo "<div class=\"exito\" id=\"divMessages\">".__("The configuration has been modified successfully.")."</div>";
-						}
-					}					
-					if (isset($_GET["error"])) {
-						if ($_GET["error"]==1) {
-							echo "<div class=\"error\" id=\"divMessages\"><strong>".__("Error on the database server: ")."</strong>".$_GET["des"]."</div>";
-						}
-					}
-?>
+<?php
+                    if (isset($_GET["modified"])) {
+                        if ($_GET["modified"]=="true") {
+                            echo "<div class=\"exito\" id=\"divMessages\">".__("The configuration has been modified successfully.")."</div>";
+                        }
+                    }
+        if (isset($_GET["error"])) {
+            if ($_GET["error"]==1) {
+                echo "<div class=\"error\" id=\"divMessages\"><strong>".__("Error on the database server: ")."</strong>".$_GET["des"]."</div>";
+            }
+        } ?>
 					<div class="tabla">
 
 						<form action="settings.php" method="post" id="settings_form" autocomplete="off" class="newpost">							
 							<fieldset>								
 								<ul>							
 									<li><label for="title"><?php echo __("Title:")?></label>
-										<input type="text" name="title" id="title" value="<?php echo $conf->title;?>" class="txt"/></li>
+										<input type="text" name="title" id="title" value="<?php echo $conf->title; ?>" class="txt"/></li>
 									<li><label for="description"><?php echo __("Description:")?></label>
-										<input type="text" name="description" id="description" value="<?php echo $conf->description;?>" class="txt"/></li>
+										<input type="text" name="description" id="description" value="<?php echo $conf->description; ?>" class="txt"/></li>
 									<li><label for="url_installation"><?php echo __("Installation URL")?></label>
-										<input type="text" name="url_installation" id="url_installation" value="<?php echo $conf->urlGelato;?>" class="txt"/></li>
+										<input type="text" name="url_installation" id="url_installation" value="<?php echo $conf->urlGelato; ?>" class="txt"/></li>
 									<li><label for="posts_limit"><?php echo __("Post limit:")?></label>
-										<input type="text" name="posts_limit" id="posts_limit" value="<?php echo $conf->postLimit;?>" class="txt"/></li>
+										<input type="text" name="posts_limit" id="posts_limit" value="<?php echo $conf->postLimit; ?>" class="txt"/></li>
 									<li><label for="lang"><?php echo __("Language:")?></label>
 										<select id="lang" name="lang">
-<?php									
-										$langs = util::getLangs();
-										foreach ($langs as $key=>$lang) {
-											$active = ($conf->lang==$key) ? "selected" : "";
-											echo "<option value=\"".$key."\" ".$active.">".$lang."</option>\n";
-											
-										}
-?>
+<?php	
+                                        $langs = util::getLangs();
+        foreach ($langs as $key=>$lang) {
+            $active = ($conf->lang==$key) ? "selected" : "";
+            echo "<option value=\"".$key."\" ".$active.">".$lang."</option>\n";
+        } ?>
 										</select>
 									</li>
 									<li><label for="template"><?php echo __("Template:")?></label>
 										<select id="template" name="template">
-<?php
-										$themes = util::getThemes();
-										foreach ($themes as $theme) {
-											$active = ($conf->template==$theme) ? "selected" : "";
-											echo "<option value=\"".$theme."\" ".$active.">".$theme."</option>\n";
-											
-										}
-?>
+<?php
+                                        $themes = util::getThemes();
+        foreach ($themes as $theme) {
+            $active = ($conf->template==$theme) ? "selected" : "";
+            echo "<option value=\"".$theme."\" ".$active.">".$theme."</option>\n";
+        } ?>
 										</select>
 									</li>
-<?php	
-									$trigger->call('add_settings_panel');	
-?>
+<?php	
+                                    $trigger->call('add_settings_panel'); ?>
 								</ul>
 							</fieldset>
 							<p>
@@ -132,9 +127,10 @@ if ($user->isAdmin()) {
 		</div>
 	</body>
 	</html>
-<?php
-	}
-} else {
-	header("Location: ".$conf->urlGelato."/login.php");
-}
+<?php
+
+    }
+} else {
+    header("Location: ".$conf->urlGelato."/login.php");
+}
 ?>

admin/themes/admin/install.htm

@@ -29,8 +29,16 @@
 					<fieldset class="install">
 						<legend class="install">Database Settings</legend>
 						<ul>
-							<li><label for="login">Are you the admin? Write the same data that "DB_User" in config.php</label>
-								<input type="text" name="db_login" id="db_login" value="{db_login}" class="txt"/>{error.9}</li>
+							<li><label for="login">User:</label>
+								<input type="text" name="db_login" id="db_login" value="{db_login}" class="txt"/>{error.10}</li>
+							<li><label for="password">Password:</label>
+								<input type="password" name="db_password" id="db_password" value="" class="txt"/></li>
+							<li><label for="password2">Re-type password:</label>
+								<input type="password" name="db_password2" id="db_password2" value="" class="txt"/>{error.9}</li>
+							<li><label for="email">Database Host:</label>
+								<input type="text" name="db_host" id="db_host" value="{db_host}" class="txt"/>{error.7}</li>
+							<li><label for="email">Database Name:</label>
+								<input type="text" name="db_name" id="db_name" value="{db_name}" class="txt"/>{error.8}</li>
 						</ul>
 					</fieldset><br  />
 					<fieldset class="install">
@@ -59,9 +67,7 @@
 								<input type="text" name="posts_limit" id="posts_limit" value="10" class="txt"/></li>
 							<li><label for="lang">Language:</label>
 								<select id="lang" name="lang">
-									{block $langs as $k=>$v}
-										<option value="{$k}" {if $k=='en'}selected="selected"{/if}>{$v}</option>
-									{/block}
+									<option value="en" selected="selected">english</option>
 								</select>
 							</li>
 							<li><label for="template">Template:</label>

admin/themes/admin/parts/template_add_photo.htm → admin/themes/admin/template_add_photo.htm

@@ -1,3 +1,5 @@
+
+
 	<div id="photo_upload">
 		<label for="description">Photo</label>												
 		<br /><input type="file" name="photo" id="photo" accept="image/gif,image/jpeg,image/jpg,image/png"/>
@@ -28,13 +30,15 @@
 	<input type="hidden" name="date" id="date" value="{date}" />
 	<input type="hidden" name="id_user" id="id_user" value="{id_user}" />
 
+
+
+
 	<script>
 		$('#photo_url').css('display','none');
-
 		$("#autosave").validate({
 			rules: {				
 				photo: { 
-					required:  function() {
+					required:  function() {
  						return ($('#photo_upload').css('display')!= 'none') ? true : false;
   					},
 					accept: "(jpe?g|gif|png)" 
@@ -60,7 +64,7 @@
 				return false;
 			} 
 		);
-
+		
 		$("#photo_url a.linkFrm").click( function() {
 				$('#photo_url').css('display','none');				
 				$('#photo_upload').css('display','block'); 
@@ -68,4 +72,5 @@
 				return false;
 			} 
 		);
-	</script>
+
+	</script>

admin/themes/admin/parts/template_photo.htm → admin/themes/admin/template_photo.htm

@@ -6,5 +6,4 @@
 					<span class="option">{Caption}</span>
 					<p><a {Effect}><img src="{PhotoURL}" alt="{PhotoAlt}" /></a></a></p>
 				</div>
-			</div>
-
+			</div>