From 00281f4fc907e26c0c46f89b3bee3e26cf9ec7fe Mon Sep 17 00:00:00 2001
From: soranzo <soranzo>
Date: Thu, 15 Jul 2004 10:06:24 +0000
Subject: [PATCH] Separate internal function creation andediting. Small fixes.

---
 classes/database/BaseDB.php |  3 +-
 functions.php               | 80 +++++++++++++++++++++++--------------
 lang/english.php            | 10 ++---
 lang/recoded/english.php    | 10 ++---
 sqledit.php                 |  4 +-
 5 files changed, 62 insertions(+), 45 deletions(-)

diff --git a/classes/database/BaseDB.php b/classes/database/BaseDB.php
index 05bc8fc6..10f7bce0 100644
--- a/classes/database/BaseDB.php
+++ b/classes/database/BaseDB.php
@@ -4,7 +4,7 @@
  * A class that implements the DB interface for Postgres
  * Note: This class uses ADODB and returns RecordSets.
  *
- * $Id: BaseDB.php,v 1.53 2004/07/14 19:09:38 soranzo Exp $
+ * $Id: BaseDB.php,v 1.54 2004/07/15 10:06:25 soranzo Exp $
  */
 
 include_once('./classes/database/ADODB_base.php');
@@ -272,7 +272,6 @@ class BaseDB extends ADODB_base {
 	function hasFullExplain() { return false; }
 	function hasStatsCollector() { return false; }
 	function hasSchemaDump() { return false; }
-	function hasFunctionRename() { return false; }
 	function hasAlterColumnType() { return false; }
 	function hasUserSessionDefaults() { return false; }
 	function hasUserRename() { return false; }
diff --git a/functions.php b/functions.php
index 60d529ed..3c816a91 100644
--- a/functions.php
+++ b/functions.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage functions in a database
 	 *
-	 * $Id: functions.php,v 1.38 2004/07/14 19:09:38 soranzo Exp $
+	 * $Id: functions.php,v 1.39 2004/07/15 10:06:24 soranzo Exp $
 	 */
 
 	// Include application functions
@@ -19,11 +19,12 @@
 	function doSaveEdit() {
 		global $data, $lang;
 		
-		// If the backend does not support renaming functions...
-		if (!$data->hasFunctionRename()) $_POST['formFunction'] = $_POST['original_function'];
-
-		if (strtolower($_POST['original_lang']) == 'c') {
+		$fnlang = strtolower($_POST['original_lang']);
+		
+		if ($fnlang == 'c') {
 			$def = array($_POST['formObjectFile'], $_POST['formLinkSymbol']);
+		} else if ($fnlang == 'internal'){
+			$def = $_POST['formLinkSymbol'];
 		} else {
 			$def = $_POST['formDefinition'];
 		}
@@ -92,12 +93,7 @@
 			echo "<tr>\n";
 			echo "<td class=\"data1\">";
 			echo "<input type=\"hidden\" name=\"original_function\" value=\"", htmlspecialchars($fndata->f['proname']),"\" />\n"; 
-			// If we're 7.4 or above, we can rename functions
-			if ($data->hasFunctionRename()) {
-				echo "<input name=\"formFunction\" style=\"width: 100%\" maxlength=\"{$data->_maxNameLen}\" value=\"", htmlspecialchars($_POST['formFunction']), "\" />";
-			}
-			else
-				echo $misc->printVal($fndata->f['proname']);
+			echo "<input name=\"formFunction\" style=\"width: 100%\" maxlength=\"{$data->_maxNameLen}\" value=\"", htmlspecialchars($_POST['formFunction']), "\" />";
 			echo "</td>\n";
 
 			echo "<td class=\"data1\">", $misc->printVal($args), "\n";
@@ -117,13 +113,17 @@
 			echo "</td>\n";
 			
 			$fnlang = strtolower($fndata->f['prolanguage']);
-			if ($fnlang == 'c' || $fnlang == 'internal') {
+			if ($fnlang == 'c') {
 				echo "<tr><th class=\"data required\" colspan=\"2\">{$lang['strobjectfile']}</th>\n";
 				echo "<th class=\"data\" colspan=\"2\">{$lang['strlinksymbol']}</th></tr>\n";
 				echo "<tr><td class=\"data1\" colspan=\"2\"><input type=\"text\" name=\"formObjectFile\" style=\"width:100%\" value=\"",
 					htmlspecialchars($_POST['formObjectFile']), "\" /></td>\n";
 				echo "<td class=\"data1\" colspan=\"2\"><input type=\"text\" name=\"formLinkSymbol\" style=\"width:100%\" value=\"",
 					htmlspecialchars($_POST['formLinkSymbol']), "\" /></td></tr>\n";
+			} else if ($fnlang == 'internal') {
+				echo "<tr><th class=\"data\" colspan=\"4\">{$lang['strlinksymbol']}</th></tr>\n";
+				echo "<tr><td class=\"data1\" colspan=\"4\"><input type=\"text\" name=\"formLinkSymbol\" style=\"width:100%\" value=\"",
+					htmlspecialchars($_POST['formLinkSymbol']), "\" /></td></tr>\n";
 			} else {
 				echo "<tr><th class=\"data required\" colspan=\"4\">{$lang['strdefinition']}</th></tr>\n";
 				echo "<tr><td class=\"data1\" colspan=\"4\"><textarea style=\"width:100%;\" rows=\"20\" cols=\"50\" name=\"formDefinition\" wrap=\"virtual\">", 
@@ -212,11 +212,14 @@
 			echo "<td class=\"data1\">", $misc->printVal($funcdata->f['prolanguage']), "</td></tr>\n";
 			
 			$fnlang = strtolower($funcdata->f['prolanguage']);
-			if ($fnlang == 'c' || $fnlang == 'internal') {
+			if ($fnlang == 'c') {
 				echo "<tr><th class=\"data\" colspan=\"2\">{$lang['strobjectfile']}</th>\n";
 				echo "<th class=\"data\" colspan=\"2\">{$lang['strlinksymbol']}</th></tr>\n";
 				echo "<tr><td class=\"data1\" colspan=\"2\">", $misc->printVal($funcdata->f['probin']), "</td>\n";
 				echo "<td class=\"data1\" colspan=\"2\">", $misc->printVal($funcdata->f['prosrc']), "</td></tr>\n";
+			} else if ($fnlang == 'internal') {
+				echo "<tr><th class=\"data\" colspan=\"4\">{$lang['strlinksymbol']}</th></tr>\n";
+				echo "<tr><td class=\"data1\" colspan=\"4\">", $misc->printVal($funcdata->f['prosrc']), "</td></tr>\n";
 			} else {
 				echo "<tr><th class=\"data\" colspan=\"4\">{$lang['strdefinition']}</th></tr>\n";
 				echo "<tr><td class=\"data1\" colspan=\"4\">", $misc->printVal($funcdata->f['prosrc'], 'pre'), "</td></tr>\n";
@@ -299,8 +302,13 @@
 
 		$types = &$data->getTypes(true, true, true);
 		$langs = &$data->getLanguages(true);
+		$fnlang = strtolower($_POST['formLanguage']);
 
-		echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strfunctions']}: {$lang['strcreatefunction']}</h2>\n";
+		echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strfunctions']}: ";
+		if ($fnlang == 'c') echo $lang['strcreatecfunction'];
+		else if ($fnlang == 'internal') echo $lang['strcreateinternalfunction'];
+		else echo $lang['strcreateplfunction'];
+		echo "</h2>\n";
 		$misc->printMsg($msg);
 
 		echo "<form action=\"$PHP_SELF\" method=post>\n";
@@ -339,25 +347,33 @@
 		echo "<option value=\"[]\"", ($_POST['formArray'] == '[]') ? ' selected="selected"' : '', ">[ ]</option>\n";
 		echo "</select></td>\n";
 
-		echo "<td class=\"data1\"><select name=\"formLanguage\">\n";
-		while (!$langs->EOF) {
-			echo "<option value=\"", htmlspecialchars($langs->f['lanname']), "\"",
-				($langs->f['lanname'] == $_POST['formLanguage']) ? ' selected="selected"' : '', ">",
-				$misc->printVal($langs->f['lanname']), "</option>\n";
-			$langs->moveNext();
+		// Output language
+		echo "<td class=\"data1\">";
+		if ($fnlang == 'c' || $fnlang == 'internal') echo $_POST['formLanguage'], "<input type=\"hidden\" name=\"formLanguage\" value=\"{$_POST['formLanguage']}\" />";
+		else {
+			echo "<select name=\"formLanguage\">\n";
+			while (!$langs->EOF) {
+				if (strtolower($langs->f['lanname']) != 'c' && strtolower($langs->f['lanname']) != 'internal')
+					echo "<option value=\"", htmlspecialchars($langs->f['lanname']), "\"",
+						($langs->f['lanname'] == $_POST['formLanguage']) ? ' selected="selected"' : '', ">",
+						$misc->printVal($langs->f['lanname']), "</option>\n";
+				$langs->moveNext();
+			}
+			echo "</select>\n";
 		}
-		echo "</select>\n";
-
 		echo "</td></tr>\n";
 		
-		$fnlang = strtolower($_POST['formLanguage']);
-		if ($fnlang == 'c' || $fnlang == 'internal') {
+		if ($fnlang == 'c') {
 			echo "<tr><th class=\"data required\" colspan=\"2\">{$lang['strobjectfile']}</th>\n";
 			echo "<th class=\"data\" colspan=\"2\">{$lang['strlinksymbol']}</th></tr>\n";
 			echo "<tr><td class=\"data1\" colspan=\"2\"><input type=\"text\" name=\"formObjectFile\" style=\"width:100%\" value=\"",
 				htmlspecialchars($_POST['formObjectFile']), "\" /></td>\n";
 			echo "<td class=\"data1\" colspan=\"2\"><input type=\"text\" name=\"formLinkSymbol\" style=\"width:100%\" value=\"",
 				htmlspecialchars($_POST['formLinkSymbol']), "\" /></td></tr>\n";
+		} else if ($fnlang == 'internal') {
+			echo "<tr><th class=\"data\" colspan=\"4\">{$lang['strlinksymbol']}</th></tr>\n";
+			echo "<td class=\"data1\" colspan=\"4\"><input type=\"text\" name=\"formLinkSymbol\" style=\"width:100%\" value=\"",
+				htmlspecialchars($_POST['formLinkSymbol']), "\" /></td></tr>\n";
 		} else {
 			echo "<tr><th class=\"data required\" colspan=\"4\">{$lang['strdefinition']}</th></tr>\n";
 			echo "<tr><td class=\"data1\" colspan=\"4\"><textarea style=\"width:100%;\" rows=\"20\" cols=\"50\" name=\"formDefinition\" wrap=\"virtual\">", 
@@ -395,18 +411,19 @@
 	function doSaveCreate() {
 		global $data, $lang;
 		
-		// Set properties to an empty array if it doesn't exist (for db's without properties)
-		if (!is_array($_POST['formProperties'])) $_POST['formProperties'] = array();
+		$fnlang = strtolower($_POST['formLanguage']);
 		
-		if (strtolower($_POST['formLanguage']) == 'c') {
+		if ($fnlang == 'c') {
 			$def = array($_POST['formObjectFile'], $_POST['formLinkSymbol']);
+		} else if ($fnlang == 'internal'){
+			$def = $_POST['formLinkSymbol'];
 		} else {
 			$def = $_POST['formDefinition'];
 		}
 
 		// Check that they've given a name and a definition
 		if ($_POST['formFunction'] == '') doCreate($lang['strfunctionneedsname']);
-		elseif (!$def) doCreate($lang['strfunctionneedsdef']);
+		elseif ($fnlang != 'internal' && !$def) doCreate($lang['strfunctionneedsdef']);
 		else {
 			// Append array symbol to type if chosen
 			$status = $data->createFunction($_POST['formFunction'], $_POST['formArguments'] , 
@@ -482,8 +499,9 @@
 		
 		$misc->printTable($funcs, $columns, $actions, $lang['strnofunctions'], 'fnPre');
 
-		echo "<p><a class=\"navlink\" href=\"$PHP_SELF?action=create&amp;{$misc->href}\">{$lang['strcreateplfunction']}</a> | ";
-		echo "<a class=\"navlink\" href=\"$PHP_SELF?action=create&amp;language=c&amp;{$misc->href}\">{$lang['strcreatecfunction']}</a></p>\n";
+		echo "<p><a class=\"navlink\" href=\"{$PHP_SELF}?action=create&amp;{$misc->href}\">{$lang['strcreateplfunction']}</a> | ";
+		echo "<a class=\"navlink\" href=\"{$PHP_SELF}?action=create&amp;language=internal&amp;{$misc->href}\">{$lang['strcreateinternalfunction']}</a> | ";
+		echo "<a class=\"navlink\" href=\"{$PHP_SELF}?action=create&amp;language=C&amp;{$misc->href}\">{$lang['strcreatecfunction']}</a></p>\n";
 	}
 	
 	$misc->printHeader($lang['strfunctions']);
@@ -506,7 +524,7 @@
 			doDrop(true);
 			break;			
 		case 'save_edit':
-			if (isset($_POST['cancel'])) doProperties();
+			if (isset($_POST['cancel'])) doDefault();
 			else doSaveEdit();
 			break;
 		case 'edit':
diff --git a/lang/english.php b/lang/english.php
index ea67a769..4f0a60c1 100755
--- a/lang/english.php
+++ b/lang/english.php
@@ -4,7 +4,7 @@
 	 * English language file for phpPgAdmin.  Use this as a basis
 	 * for new translations.
 	 *
-	 * $Id: english.php,v 1.154 2004/07/12 04:18:41 chriskl Exp $
+	 * $Id: english.php,v 1.155 2004/07/15 10:06:25 soranzo Exp $
 	 */
 
 	// Language and character set
@@ -289,7 +289,7 @@
 	$lang['strfreeze'] = 'Freeze';
 	$lang['strforce'] = 'Force';
 	$lang['strsignalsent'] = 'Signal sent.';
-	$lang['strsignalsentbad'] = 'Failed sending signal.';
+	$lang['strsignalsentbad'] = 'Sending signal failed.';
 	$lang['strallobjects'] = 'All objects';
 
 	// Views
@@ -419,8 +419,8 @@
 	$lang['strshowallfunctions'] = 'Show all functions';
 	$lang['strnofunction'] = 'No function found.';
 	$lang['strnofunctions'] = 'No functions found.';
-	$lang['strcreatefunction'] = 'Create function';
 	$lang['strcreateplfunction'] = 'Create SQL/PL function';
+	$lang['strcreateinternalfunction'] = 'Create internal function';
 	$lang['strcreatecfunction'] = 'Create C function';
 	$lang['strfunctionname'] = 'Function name';
 	$lang['strreturns'] = 'Returns';
@@ -605,8 +605,9 @@
 	$lang['strrows2'] = 'Rows';
 
 	// Tablespaces
-	$lang['strtablespaces'] = 'Tablespaces';
 	$lang['strtablespace'] = 'Tablespace';
+	$lang['strtablespaces'] = 'Tablespaces';
+	$lang['strshowalltablespaces'] = 'Show all tablespaces';
 	$lang['strnotablespaces'] = 'No tablespaces found.';
 	$lang['strcreatetablespace'] = 'Create tablespace';
 	$lang['strlocation'] = 'Location';
@@ -619,7 +620,6 @@
 	$lang['strtablespacedroppedbad'] = 'Tablespace drop failed.';
 	$lang['strtablespacealtered'] = 'Tablespace altered.';
 	$lang['strtablespacealteredbad'] = 'Tablespace alteration failed.';
-	$lang['strshowalltablespaces'] = 'Show all tablespaces';
 
 	// Miscellaneous
 	$lang['strtopbar'] = '%s running on %s:%s -- You are logged in as user "%s", %s';
diff --git a/lang/recoded/english.php b/lang/recoded/english.php
index c5b40342..e2b16c1d 100644
--- a/lang/recoded/english.php
+++ b/lang/recoded/english.php
@@ -4,7 +4,7 @@
 	 * English language file for phpPgAdmin.  Use this as a basis
 	 * for new translations.
 	 *
-	 * $Id: english.php,v 1.107 2004/07/12 04:18:42 chriskl Exp $
+	 * $Id: english.php,v 1.108 2004/07/15 10:06:25 soranzo Exp $
 	 */
 
 	// Language and character set
@@ -289,7 +289,7 @@
 	$lang['strfreeze'] = 'Freeze';
 	$lang['strforce'] = 'Force';
 	$lang['strsignalsent'] = 'Signal sent.';
-	$lang['strsignalsentbad'] = 'Failed sending signal.';
+	$lang['strsignalsentbad'] = 'Sending signal failed.';
 	$lang['strallobjects'] = 'All objects';
 
 	// Views
@@ -419,8 +419,8 @@
 	$lang['strshowallfunctions'] = 'Show all functions';
 	$lang['strnofunction'] = 'No function found.';
 	$lang['strnofunctions'] = 'No functions found.';
-	$lang['strcreatefunction'] = 'Create function';
 	$lang['strcreateplfunction'] = 'Create SQL/PL function';
+	$lang['strcreateinternalfunction'] = 'Create internal function';
 	$lang['strcreatecfunction'] = 'Create C function';
 	$lang['strfunctionname'] = 'Function name';
 	$lang['strreturns'] = 'Returns';
@@ -605,8 +605,9 @@
 	$lang['strrows2'] = 'Rows';
 
 	// Tablespaces
-	$lang['strtablespaces'] = 'Tablespaces';
 	$lang['strtablespace'] = 'Tablespace';
+	$lang['strtablespaces'] = 'Tablespaces';
+	$lang['strshowalltablespaces'] = 'Show all tablespaces';
 	$lang['strnotablespaces'] = 'No tablespaces found.';
 	$lang['strcreatetablespace'] = 'Create tablespace';
 	$lang['strlocation'] = 'Location';
@@ -619,7 +620,6 @@
 	$lang['strtablespacedroppedbad'] = 'Tablespace drop failed.';
 	$lang['strtablespacealtered'] = 'Tablespace altered.';
 	$lang['strtablespacealteredbad'] = 'Tablespace alteration failed.';
-	$lang['strshowalltablespaces'] = 'Show all tablespaces';
 
 	// Miscellaneous
 	$lang['strtopbar'] = '%s running on %s:%s -- You are logged in as user &quot;%s&quot;, %s';
diff --git a/sqledit.php b/sqledit.php
index 90190faa..e40ea066 100644
--- a/sqledit.php
+++ b/sqledit.php
@@ -3,7 +3,7 @@
 	/**
 	 * Alternative SQL editing window
 	 *
-	 * $Id: sqledit.php,v 1.19 2004/07/14 10:24:26 jollytoad Exp $
+	 * $Id: sqledit.php,v 1.20 2004/07/15 10:06:24 soranzo Exp $
 	 */
 
 	// Include application functions
@@ -137,7 +137,7 @@
 			if (!isset($_REQUEST['search_path']))
 				$_REQUEST['search_path'] = $data->getSearchPath();
 		
-			echo "\n<label>{$lang['strsearchpath']}:&nbsp;<input type=\"text\" name=\"search_path\" size=\"30\" value=\"",
+			echo "\n<label>{$lang['strsearchpath']}: <input type=\"text\" name=\"search_path\" size=\"30\" value=\"",
 				htmlspecialchars($_REQUEST['search_path']), "\" /></label>";
 		}
 		
-- 
2.39.5