From 7d5c43d1f4597d0da1bc9e1e9b4962dd87de6f04 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Thu, 19 Jul 2001 18:54:19 +0000
Subject: [PATCH] dynamic length

---
 ChangeLog               |  7 +++++++
 Documentation.html      | 10 ++++++++--
 config.inc.php3         |  4 ++--
 db_details.php3         |  6 ++++--
 grab_globals.inc.php3   |  2 +-
 lib.inc.php3            |  4 ++++
 tbl_change.php3         | 13 +++++++++----
 tbl_properties.inc.php3 |  2 +-
 tbl_properties.php3     |  5 ++++-
 tbl_select.php3         |  5 ++++-
 10 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a979e133a..bad140fc0 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,13 @@ phpMyAdmin - Changelog
 $Id$ 
 $Source$
 
+2001-07-19  Marc Delisle  <lem9@users.sourceforge.net>
+	* config.inc.php3, tbl_change.php3, db_details.php3, lib.inc.php3,
+	  tbl_properties.php3, tbl_properties_inc.php3, tbl_select.php3,
+	  Documentation.html:
+	  Feature #429771: dynamic lenght for input fields, and new config
+	  for textareas
+
 2001-07-18  Steve Alberty  <alberty@neptunlabs.de>
 	* left.php3: add 'or mysql_die()' for mysql_list_dbs to suppress
 	  'unable to save result' warnings
diff --git a/Documentation.html b/Documentation.html
index 16c73ccb0..e8b33dc29 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -464,9 +464,15 @@
         <br /><br />
     </dd>
 
-    <dt><b>$cfgMaxInputsize </b>integer</dt>
+    <dt><b>$cfgTextareaCols </b>integer</dt>
     <dd>
-        Size of the edit-field when adding a new record to a table.
+        Number of columns for the textareas. 
+        <br /><br />
+    </dd>
+
+    <dt><b>$cfgTextareaRows </b>integer</dt>
+    <dd>
+        Number of rows for the textareas. 
         <br /><br />
     </dd>
 
diff --git a/config.inc.php3 b/config.inc.php3
index d5f7cbdc4..73e618866 100755
--- a/config.inc.php3
+++ b/config.inc.php3
@@ -77,11 +77,11 @@ $cfgThBgcolor    = "#D3DCE3";
 $cfgBgcolorOne   = "#CCCCCC";
 $cfgBgcolorTwo   = "#DDDDDD";
 $cfgMaxRows      = 30;
-$cfgMaxInputsize = "300px";
 $cfgOrder        = "ASC";
 $cfgShowBlob     = true;
 $cfgShowSQL      = true;
-
+$cfgTextareaCols = "40";
+$cfgTextareaRows = "7";
 $cfgModifyDeleteAtLeft  = true;
 $cfgModifyDeleteAtRight = false;
 
diff --git a/db_details.php3 b/db_details.php3
index 6823b8870..4346df50d 100755
--- a/db_details.php3
+++ b/db_details.php3
@@ -11,7 +11,6 @@ if (!isset($message)) {
     show_message($message);
 }
 
-
 /**
  * Displays an html table with all the tables contained into the current
  * database
@@ -261,7 +260,10 @@ if ($num_tables > 0) {
             <input type="hidden" name="zero_rows" value="<?php echo $strSuccess; ?>" />
             <?php echo $strRunSQLQuery . $db . ' ' . show_docu('manual_Reference.html#SELECT'); ?>&nbsp;:<br />
             <div style="margin-bottom: 5px">
-<textarea name="sql_query" cols="40" rows="3" wrap="virtual" style="width: <?php echo $cfgMaxInputsize; ?>">
+<textarea name="sql_query" wrap="virtual" 
+ rows="<?php echo $cfgTextareaRows; ?>"
+ cols="<?php echo $cfgTextareaCols; ?>"
+>
 <?php if (isset($show_query)) {
          echo $show_query=="y" ? $sql_query : '';
       }
diff --git a/grab_globals.inc.php3 b/grab_globals.inc.php3
index ddc50e821..dc438056d 100644
--- a/grab_globals.inc.php3
+++ b/grab_globals.inc.php3
@@ -23,4 +23,4 @@ if (!empty($HTTP_POST_FILES)) {
 		$$name = $value['tmp_name'];
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib.inc.php3 b/lib.inc.php3
index ff8af5be8..a011f7f83 100755
--- a/lib.inc.php3
+++ b/lib.inc.php3
@@ -3,6 +3,10 @@
 
 require("./config.inc.php3");
 
+// if they are using an old config.inc.php3
+if (!isset($cfgTextareaCols)) $cfgTextareaCols="40";
+if (!isset($cfgTextareaRows)) $cfgTextareaRows="7";
+
 if(!defined("__LIB_INC__")){
 	define("__LIB_INC__", 1);
 
diff --git a/tbl_change.php3 b/tbl_change.php3
index c4cdd31d8..3da69c5f5 100755
--- a/tbl_change.php3
+++ b/tbl_change.php3
@@ -81,7 +81,6 @@ for($i=0;$i<mysql_num_rows($table_def);$i++)
     }
     echo "<td>$type</td>\n";
 
-   // THE VALUE COLUMN
     if(isset($row) && isset($row[$field]))
     {
         $special_chars = htmlspecialchars($row[$field]);
@@ -119,9 +118,12 @@ for($i=0;$i<mysql_num_rows($table_def);$i++)
     	echo "</select></td>\n";
     }
 
+   // THE VALUE COLUMN
+
     if(strstr($row_table_def["Type"], "text"))
     {
-        echo "<td><textarea name=fields[$field] style=\"width:$cfgMaxInputsize;\" rows=5>$special_chars</textarea></td>\n";
+        echo "<td><textarea name=fields[$field] rows=\"$cfgTextareaRows\" 
+	      cols=\"$cfgTextareaCols\" >$special_chars</textarea></td>\n";
         if (strlen($special_chars) > 32000)
             echo "<td>$strTextAreaLength</td>";
     }
@@ -210,11 +212,14 @@ for($i=0;$i<mysql_num_rows($table_def);$i++)
     elseif((strstr($row_table_def["Type"], "blob") || strstr($row_table_def["Type"], "binary")) && !empty($data))
     {
         echo "<td>" . $strBinaryDoNotEdit;
-        echo "<input type=\"hidden\" name=fields[$field] value=\"".$special_chars."\" style=\"width:$cfgMaxInputsize;\" maxlength=$len></td>";
+        echo "<input type=\"hidden\" name=fields[$field] value=\"".$special_chars."\"></td>";
     }
     else
     {
-        echo "<td><input type=text name=fields[$field] value=\"".$special_chars."\" style=\"width:$cfgMaxInputsize;\" maxlength=$len></td>";
+        $fieldsize=($len>40? 40: $len);
+
+        echo "<td><input type=text name=fields[$field] 
+	 value=\"".$special_chars."\" maxlength=\"$len\" size=\"$fieldsize\"></td>";
     }
     echo "</tr>\n";
 }
diff --git a/tbl_properties.inc.php3 b/tbl_properties.inc.php3
index 9c4fd1059..b6e76cb5b 100755
--- a/tbl_properties.inc.php3
+++ b/tbl_properties.inc.php3
@@ -201,7 +201,7 @@ if($action == "tbl_create.php3" && MYSQL_MAJOR_VERSION >= "3.23")
 {
     echo "$strTableComments:<br>";
     ?>
-    <input type="text" name="comment" style="width: <?php echo $cfgMaxInputsize;?>" maxlength="80">
+    <input type="text" name="comment" size="40" maxlength="80">
     <?php
 //BEGIN - Table Type - 2 May 2001 - Robbat2 - change by staybyte - 11 June 2001
 if($action == "tbl_create.php3")
diff --git a/tbl_properties.php3 b/tbl_properties.php3
index 188ba896c..4da0b47eb 100755
--- a/tbl_properties.php3
+++ b/tbl_properties.php3
@@ -467,7 +467,10 @@ echo "\n";
             <input type="hidden" name="zero_rows" value="<?php echo $strSuccess; ?>" />
             <?php echo $strRunSQLQuery . $db . ' ' . show_docu('manual_Reference.html#SELECT'); ?>&nbsp;:<br />
             <div style="margin-bottom: 5px">
-<textarea name="sql_query" cols="40" rows="3" wrap="virtual" style="width: <?php echo $cfgMaxInputsize; ?>">
+<textarea name="sql_query" wrap="virtual" 
+ rows="<?php echo $cfgTextareaRows; ?>"
+ cols="<?php echo $cfgTextareaCols; ?>"
+>
 SELECT * FROM <?php echo $table; ?> WHERE 1
 </textarea><br />
             </div>
diff --git a/tbl_select.php3 b/tbl_select.php3
index 777fcf545..5491f127b 100755
--- a/tbl_select.php3
+++ b/tbl_select.php3
@@ -58,7 +58,10 @@ if(!isset($param) || $param[0] == "") {
      echo "<tr bgcolor=".$bgcolor.">";
      echo "<td>$field</td>";
      echo "<td>$type</td>";
-     echo "<td><input type=text name=fields[] style=\"width: ".$cfgMaxInputsize."\" maxlength=".$len."></td>\n";
+
+     $fieldsize=($len>40? 40: $len);
+     echo "<td><input type=text name=fields[] 
+	size=\"$fieldsize\" maxlength=".$len."></td>\n";
      echo "<input type=hidden name=names[] value=\"$field\">\n";
      echo "<input type=hidden name=types[] value=\"$type\">\n";
      echo "</tr>";