From: Jehan-Guillaume (ioguix) de Rorthais <ioguix@digix.(none)>
Date: Thu, 11 Mar 2010 23:27:10 +0000 (+0100)
Subject: Fix #2967918, display bug when creating a FTS conf with multi errors. Reported by... 
X-Git-Tag: REL_5-0-BETA-1~63
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=4e8b7048a33a12e6f007aadd80ee52554332c80f;p=phppgadmin.git

Fix #2967918, display bug when creating a FTS conf with multi errors. Reported by Alexey Baturin.
---

diff --git a/fulltext.php b/fulltext.php
index 9098b827..40c3034f 100644
--- a/fulltext.php
+++ b/fulltext.php
@@ -229,23 +229,25 @@
 	function doSaveCreateConfig() {
 		global $data, $lang, $_reload_browser;
 
+		$err = '';
 		// Check that they've given a name
-		if ($_POST['formName'] == '') doCreateConfig($lang['strftsconfigneedsname']);
-		if (($_POST['formParser'] != '') && ($_POST['formTemplate'] != '')) doCreateConfig($lang['strftscantparsercopy']);
-		else {
-			if ($_POST['formParser'] != '') $formParser = unserialize($_POST['formParser']);
-			else $formParser = '';
-			if ($_POST['formTemplate'] != '') $formTemplate = unserialize($_POST['formTemplate']);
-			else $formTemplate = '';
+		if ($_POST['formName'] == '') $err .= "{$lang['strftsconfigneedsname']}<br />";		
+		if (($_POST['formParser'] != '') && ($_POST['formTemplate'] != ''))  $err .= "{$lang['strftscantparsercopy']}<br />";
 
-			$status = $data->createFtsConfiguration($_POST['formName'], $formParser, $formTemplate, $_POST['formComment']);
-			if ($status == 0) {
-				$_reload_browser = true;
-				doDefault($lang['strftsconfigcreated']);
-			}
-			else
-				doCreateConfig($lang['strftsconfigcreatedbad']);
+		if ($err != '') return doCreateConfig($err);
+
+		if ($_POST['formParser'] != '') $formParser = unserialize($_POST['formParser']);
+		else $formParser = '';
+		if ($_POST['formTemplate'] != '') $formTemplate = unserialize($_POST['formTemplate']);
+		else $formTemplate = '';
+
+		$status = $data->createFtsConfiguration($_POST['formName'], $formParser, $formTemplate, $_POST['formComment']);
+		if ($status == 0) {
+			$_reload_browser = true;
+			doDefault($lang['strftsconfigcreated']);
 		}
+		else
+			doCreateConfig($lang['strftsconfigcreatedbad']);
 	}
 
 	/**