From df1724629a2633e762a45b11d66f4a64f15e3b3f Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Wed, 18 Sep 2002 12:49:54 +0000
Subject: [PATCH] bug 610315

---
 ChangeLog                      | 4 ++++
 libraries/display_tbl.lib.php3 | 6 +++---
 sql.php3                       | 6 ++++++
 tbl_change.php3                | 6 +++---
 tbl_replace.php3               | 5 +++++
 5 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7f46acfdf..adc8acf30 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-09-18 Loïc Chapeaux  <lolo@phpheaven.net>
+    * tbl_change.php3, tbl_replace.php3, sql.php3, 
+      libraries/display_tbl.lib.php3: bug 610315 full text toggle
+
 2002-09-18 Michal Cihar  <nijel@users.sourceforge.net>
     * lang/*.php3, tbl_properties_export.php3: removed duplicate message
       with typo in name strCvsData (replaced by strStrucCSV)
diff --git a/libraries/display_tbl.lib.php3 b/libraries/display_tbl.lib.php3
index 5c8476d18..e761ba454 100644
--- a/libraries/display_tbl.lib.php3
+++ b/libraries/display_tbl.lib.php3
@@ -474,7 +474,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
                   . '&amp;disp_direction=' . $disp_direction
                   . '&amp;repeat_cells=' . $repeat_cells
                   . '&amp;goto=' . $goto
-                  . '&amp;dontlimitchars=' . (empty($dontlimitchars) ? 0 : 1);
+                  . '&amp;dontlimitchars=' . (($dontlimitchars) ? 0 : 1);
 
         //     ... before the result table
         if (($is_display['edit_lnk'] == 'nn' && $is_display['del_lnk'] == 'nn')
@@ -618,7 +618,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
                            . '&amp;session_max_rows=' . $session_max_rows
                            . '&amp;disp_direction=' . $disp_direction
                            . '&amp;repeat_cells=' . $repeat_cells
-                           . '&amp;dontlimitchars=' . (empty($dontlimitchars) ? 0 : 1)
+                           . '&amp;dontlimitchars=' . $dontlimitchars
                            . '&amp;sql_query=' . urlencode($sorted_sql_query);
 
                 // 2.1.5 Displays the sorting url
@@ -924,7 +924,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
                             . '&amp;session_max_rows=' . $session_max_rows
                             . '&amp;disp_direction=' . $disp_direction
                             . '&amp;repeat_cells=' . $repeat_cells
-                            . '&amp;dontlimitchars=' . (empty($dontlimitchars) ? 0 : 1);
+                            . '&amp;dontlimitchars=' . $dontlimitchars;
 
                 // 1.2.1 Modify link(s)
                 if ($is_display['edit_lnk'] == 'ur') { // update row case
diff --git a/sql.php3 b/sql.php3
index 23e92d417..17c8a96fb 100755
--- a/sql.php3
+++ b/sql.php3
@@ -510,6 +510,9 @@ else {
             // libraries/display_tbl.lib.php3
             $disp_mode = 'urdr111101';
         }
+        if (!isset($dontlimitchars)) {
+            $dontlimitchars = 0;
+        }
         PMA_displayTable($result, $disp_mode);
         mysql_free_result($result);
 
@@ -529,6 +532,7 @@ else {
                            . '&amp;session_max_rows=' . $session_max_rows
                            . '&amp;disp_direction=' . $disp_direction
                            . '&amp;repeat_cells=' . $repeat_cells
+                           . '&amp;dontlimitchars=' . $dontlimitchars
                            . '&amp;sql_query=' . urlencode($sql_query);
                 $url_query = '?lang=' . $lang
                            . '&amp;convcharset=' . $convcharset
@@ -539,6 +543,7 @@ else {
                            . '&amp;session_max_rows=' . $session_max_rows
                            . '&amp;disp_direction=' . $disp_direction
                            . '&amp;repeat_cells=' . $repeat_cells
+                           . '&amp;dontlimitchars=' . $dontlimitchars
                            . '&amp;sql_query=' . urlencode($sql_query)
                            . '&amp;goto=' . urlencode($lnk_goto);
 
@@ -587,6 +592,7 @@ else {
                   . '&amp;session_max_rows=' . $session_max_rows
                   . '&amp;disp_direction=' . $disp_direction
                   . '&amp;repeat_cells=' . $repeat_cells
+                  . '&amp;dontlimitchars=' . $dontlimitchars
                   . '&amp;sql_query=' . urlencode($sql_query)
                   . '&amp;id_bookmark=1';
             ?>
diff --git a/tbl_change.php3 b/tbl_change.php3
index b2b10cf82..b6f6eb0b8 100755
--- a/tbl_change.php3
+++ b/tbl_change.php3
@@ -166,6 +166,7 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5)
     <input type="hidden" name="session_max_rows" value="<?php echo isset($session_max_rows) ? $session_max_rows : ''; ?>" />
     <input type="hidden" name="disp_direction" value="<?php echo isset($disp_direction) ? $disp_direction : ''; ?>" />
     <input type="hidden" name="repeat_cells" value="<?php echo isset($repeat_cells) ? $repeat_cells : ''; ?>" />
+    <input type="hidden" name="dontlimitchars" value="<?php echo (isset($dontlimitchars) ? $dontlimitchars : 0); ?>" />
     <input type="hidden" name="err_url" value="<?php echo urlencode($err_url); ?>" />
     <input type="hidden" name="sql_query" value="<?php echo isset($sql_query) ? urlencode($sql_query) : ''; ?>" />
 <?php
@@ -219,10 +220,9 @@ for ($i = 0; $i < $fields_cnt; $i++) {
     $field           = $row_table_def['Field'];
     // loic1: current date should not be set as default if the field is NULL
     //        for the current row
-    // lem9:  but do not put here the current datetime if there is a default 
-    //        value (the real default value will be set in the 
+    // lem9:  but do not put here the current datetime if there is a default
+    //        value (the real default value will be set in the
     //        Default value logic below)
-
     if (($row_table_def['Type'] == 'datetime')
         && (!isset($row_table_def['Default']))) {
         // INSERT case
diff --git a/tbl_replace.php3 b/tbl_replace.php3
index 3af4fdb99..5055f5334 100755
--- a/tbl_replace.php3
+++ b/tbl_replace.php3
@@ -16,6 +16,9 @@ require('./libraries/common.lib.php3');
 if (isset($sql_query)) {
     $sql_query = urldecode($sql_query);
 }
+if (!isset($dontlimitchars)) {
+    $dontlimitchars = 0;
+}
 $is_gotofile = FALSE;
 if (isset($after_insert) && $after_insert == 'new_insert') {
     $goto = 'tbl_change.php3'
@@ -29,6 +32,7 @@ if (isset($after_insert) && $after_insert == 'new_insert') {
           . '&session_max_rows=' . $session_max_rows
           . '&disp_direction=' . $disp_direction
           . '&repeat_cells=' . $repeat_cells
+          . '&dontlimitchars=' . $dontlimitchars
           . (empty($sql_query) ? '' : '&sql_query=' . urlencode($sql_query));
 } else if ($goto == 'sql.php3') {
     $goto = 'sql.php3?'
@@ -41,6 +45,7 @@ if (isset($after_insert) && $after_insert == 'new_insert') {
           . '&session_max_rows=' . $session_max_rows
           . '&disp_direction=' . $disp_direction
           . '&repeat_cells=' . $repeat_cells
+          . '&dontlimitchars=' . $dontlimitchars
           . '&sql_query=' . urlencode($sql_query);
 } else if (!empty($goto)) {
     // Security checkings