From: Robert Treat <robert@robert-treats-macbook.local>
Date: Fri, 3 Jul 2009 23:14:28 +0000 (-0400)
Subject: add option for specifying the template database during database creation. prompted... 
X-Git-Tag: REL_5-0-BETA-1~102
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=3914822d2957382eb1debb164f03d80db7d7ae2c;p=phppgadmin.git

add option for specifying the template database during database creation. prompted by changes in 8.4 wrt encoding rules changes, but this should work on all versions. Verified against 8.3 and 8.4
---

diff --git a/all_db.php b/all_db.php
index bb79cf95..a5f511f4 100644
--- a/all_db.php
+++ b/all_db.php
@@ -163,9 +163,13 @@
 			else
 				$_POST['formEncoding'] = '';
 		}
+		if (!isset($_POST['formTemplate'])) $_POST['formTemplate'] = 'template1';
 		if (!isset($_POST['formSpc'])) $_POST['formSpc'] = '';
 		if (!isset($_POST['formComment'])) $_POST['formComment'] = '';
 
+		// Fetch a list of databases in the cluster
+		$templatedbs = $data->getDatabases(false);
+
 		// Fetch all tablespaces from the database
 		if ($data->hasTablespaces()) $tablespaces = $data->getTablespaces();
 
@@ -174,6 +178,27 @@
 		echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strname']}</th>\n";
 		echo "\t\t<td class=\"data1\"><input name=\"formName\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"",
 			htmlspecialchars($_POST['formName']), "\" /></td>\n\t</tr>\n";
+
+		echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strtemplatedb']}</th>\n";
+		echo "\t\t<td class=\"data1\">\n";
+		echo "\t\t\t<select name=\"formTemplate\">\n";
+			// Always offer template0 and template1 
+			echo "\t\t\t\t<option value=\"template0\"",
+				($_POST['formTemplate'] == 'template0') ? ' selected="selected"' : '', ">template0</option>\n";
+			echo "\t\t\t\t<option value=\"template1\"",
+				($_POST['formTemplate'] == 'template1') ? ' selected="selected"' : '', ">template1</option>\n";
+			while (!$templatedbs->EOF) {
+				$dbname = htmlspecialchars($templatedbs->fields['datname']);
+				if ($dbname != 'template1') { 
+					// filter out for $conf[show_system] users so we dont get duplicates 
+					echo "\t\t\t\t<option value=\"{$dbname}\"",
+						($dbname == $_POST['formTemplate']) ? ' selected="selected"' : '', ">{$dbname}</option>\n";
+				}
+				$templatedbs->moveNext();
+			}
+		echo "\t\t\t</select>\n";
+		echo "\t\t</td>\n\t</tr>\n";
+
 		echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strencoding']}</th>\n";
 		echo "\t\t<td class=\"data1\">\n";
 		echo "\t\t\t<select name=\"formEncoding\">\n";
@@ -233,7 +258,7 @@
 		// Check that they've given a name and a definition
 		if ($_POST['formName'] == '') doCreate($lang['strdatabaseneedsname']);
 		else {
-			$status = $data->createDatabase($_POST['formName'], $_POST['formEncoding'], $_POST['formSpc'], $_POST['formComment']);
+			$status = $data->createDatabase($_POST['formName'], $_POST['formEncoding'], $_POST['formSpc'], $_POST['formComment'], $_POST['formTemplate']);
 			if ($status == 0) {
 				$_reload_browser = true;
 				doDefault($lang['strdatabasecreated']);
diff --git a/classes/database/Postgres.php b/classes/database/Postgres.php
index f17d9de2..80c0e078 100755
--- a/classes/database/Postgres.php
+++ b/classes/database/Postgres.php
@@ -545,17 +545,16 @@ class Postgres extends ADODB_base {
 	 * @return -1 tablespace error
 	 * @return -2 comment error
 	 */
-	function createDatabase($database, $encoding, $tablespace = '', $comment = '') {
+	function createDatabase($database, $encoding, $tablespace = '', $comment = '', $template = 'template1') {
 		$this->fieldClean($database);
 		$this->clean($encoding);
 		$this->fieldClean($tablespace);
 		$this->fieldClean($comment);
+		$this->fieldClean($template);
 
-		if ($encoding == '') {
-			$sql = "CREATE DATABASE \"{$database}\"";
-		} else {
-			$sql = "CREATE DATABASE \"{$database}\" WITH ENCODING='{$encoding}'";
-		}
+		$sql = "CREATE DATABASE \"{$database}\" WITH TEMPLATE=\"{$template}\"";
+
+		if ($encoding != '') $sql .= " ENCODING='{$encoding}'";
 
 		if ($tablespace != '' && $this->hasTablespaces()) $sql .= " TABLESPACE \"{$tablespace}\"";
 
diff --git a/lang/english.php b/lang/english.php
index 3c558b37..01578710 100644
--- a/lang/english.php
+++ b/lang/english.php
@@ -369,6 +369,7 @@
 	$lang['strdatabasealtered'] = 'Database altered.';
 	$lang['strdatabasealteredbad'] = 'Database alter failed.';
 	$lang['strspecifydatabasetodrop'] = 'You must specify at least one database to drop.';
+	$lang['strtemplatedb'] = 'Template';
 
 	// Views
 	$lang['strview'] = 'View';
diff --git a/lang/recoded/english.php b/lang/recoded/english.php
index 77e8f30d..d3c90201 100644
--- a/lang/recoded/english.php
+++ b/lang/recoded/english.php
@@ -369,6 +369,7 @@
 	$lang['strdatabasealtered'] = 'Database altered.';
 	$lang['strdatabasealteredbad'] = 'Database alter failed.';
 	$lang['strspecifydatabasetodrop'] = 'You must specify at least one database to drop.';
+	$lang['strtemplatedb'] = 'Template';
 
 	// Views
 	$lang['strview'] = 'View';