From 2442496087ec3ccf0be0d0a3f7aca7ffda70350e Mon Sep 17 00:00:00 2001
From: pecesama <pecesama@gmail.com>
Date: Fri, 20 Jul 2007 23:36:39 +0000
Subject: [PATCH] Fixed bug on options

---
 admin/options.php        |  19 +++++++++++++------
 classes/gelato.class.php |   6 ++----
 languages/en/lang.mo     | Bin 305 -> 0 bytes
 languages/en/lang.po     |  13 -------------
 4 files changed, 15 insertions(+), 23 deletions(-)
 delete mode 100644 languages/en/lang.mo
 delete mode 100644 languages/en/lang.po

diff --git a/admin/options.php b/admin/options.php
index 963f284..91aebb2 100644
--- a/admin/options.php
+++ b/admin/options.php
@@ -23,10 +23,17 @@ $conf = new configuration();
 
 if ($user->isAdmin()) {
 	
-	if(isset($_POST["btnsubmit"]))	{		
-		unset($_POST["btnsubmit"]);		
-		$tumble->saveOption($_POST["rich_text"], "rich_text");
-		$tumble->saveOption($_POST["urlFriendly"], "rich_text");
+	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();
+		}
+		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">
@@ -92,12 +99,12 @@ if ($user->isAdmin()) {
 							<fieldset>								
 								<ul>																	
 									<li><label for="rich_text"><?=__("Rich text editor:")?></label>
-										<select name="rich_text" id="rich_text">										
+										<select name="rich_text" id="rich_text">
 											<option value="1" <?php if($conf->richText) echo "selected"; ?>><?=__("Active")?></option>
 											<option value="0" <?php if(!$conf->richText) echo "selected"; ?>><?=__("Deactive")?></option>
 										</select>
 									</li>
-									<li><label for="rich_text">URL friendly:</label>
+									<li><label for="url_friendly">URL friendly:</label>
 										<select name="url_friendly" id="url_friendly">
 											<option value="1" <?php if($conf->urlFriendly) echo "selected"; ?>><?=__("Active")?></option>
 											<option value="0" <?php if(!$conf->urlFriendly) echo "selected"; ?>><?=__("Deactive")?></option>
diff --git a/classes/gelato.class.php b/classes/gelato.class.php
index a96dc08..2ea15a4 100644
--- a/classes/gelato.class.php
+++ b/classes/gelato.class.php
@@ -35,11 +35,9 @@ class gelato extends Conexion_Mysql {
 	function saveOption($value, $name) {
 		$sqlStr = "UPDATE ".$this->conf->tablePrefix."options SET val='".$value."' WHERE name='".$name."' LIMIT 1";		
 		if ($this->ejecutarConsulta($sqlStr)) {
-			header("Location: ".$this->conf->urlGelato."/admin/options.php?modified=true");
-			die();
+			return true;
 		} else {
-			header("Location: ".$this->conf->urlGelato."/admin/options.php?error=1&des=".$this->merror);
-			die();
+			return true;
 		}
 	}
 	
diff --git a/languages/en/lang.mo b/languages/en/lang.mo
deleted file mode 100644
index ea9e0180c0ea6e67b7adb7237f68be82c6d4b719..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 305
zcmYL@&rSkC48}2f+M{O=bMR<!c7w94e_{e0NF)%l;a-Nij_%HonM&kAd_7--t6gH?
zOMjWP`P%t@FE4&NqBG%2xE9WZ8=+M$?1h2QdXAb0|3QXfvW6vvXuT^`GM|+&41_E#
zjF9Otg9UAE>-ZmKTK7RJ(@N_i?Sa16I(fy&PzH3dM)sjlOKap+BT_Z0g*Wf09=E&C
zEQFV;L0fl?Z=Pk%RbN;Ul!T3ZH=Rt!r$lL2CqwU;oZQ}RBoEU!-)?HO?m@}P5Q(2`
c^pNLw14vKiHpm+V7(3(F)>VbdSC*5`A5qOylK=n!

diff --git a/languages/en/lang.po b/languages/en/lang.po
deleted file mode 100644
index 0060bca..0000000
--- a/languages/en/lang.po
+++ /dev/null
@@ -1,13 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: 2007-07-20 00:14-0600\n"
-"Last-Translator: Victor De la Rocha <vyk2rr@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-msgid "this is a test."
-msgstr ""
\ No newline at end of file