patch #515268 - Feature Request #511816 (enable/disable functions fields) thanks to Alexander M. Turek

This commit is contained in:
Loïc Chapeaux
2002-02-09 18:57:44 +00:00
parent f7cb75b4c1
commit 9c9e5e8a2e
5 changed files with 87 additions and 64 deletions

View File

@@ -24,6 +24,10 @@ $Source$
with <base href=""> thanks to Alexander M. Turek. with <base href=""> thanks to Alexander M. Turek.
* main.php3, lines 11-14; libraries/grab_globals.lib.php3, lines 27-32; * main.php3, lines 11-14; libraries/grab_globals.lib.php3, lines 27-32;
libraries/auth/cookie.auth.lib.php3: improved patch #495360. libraries/auth/cookie.auth.lib.php3: improved patch #495360.
* config.inc.php3, lines 142 & 238-265; Documentation.html, lines 746-752;
tbl_change.php3; libraries/common.lib.php3, lines 105-107:
patch #515268 - Feature Request #511816 (enable/disable functions fields)
thanks to Alexander M. Turek <rabus at users.sourceforge.net>.
2002-02-08 Marc Delisle <lem9@users.sourceforge.net> 2002-02-08 Marc Delisle <lem9@users.sourceforge.net>
* ukrainian updates thanks to Markijan Baran. * ukrainian updates thanks to Markijan Baran.

View File

@@ -732,7 +732,7 @@
<br /><br /> <br /><br />
</dd> </dd>
<dt><b>$cfgProtectBinary </b>boolean</dt> <dt><b>$cfgProtectBinary </b>boolean or string</dt>
<dd> <dd>
Defines whether <tt>BLOB</tt> or <tt>BINARY</tt> fields are protected Defines whether <tt>BLOB</tt> or <tt>BINARY</tt> fields are protected
from edition when browsing a table's content or not. from edition when browsing a table's content or not.
@@ -743,6 +743,13 @@
<br /><br /> <br /><br />
</dd> </dd>
<dt><b>$cfgShowFunctionFields </b>boolean</dt>
<dd>
Defines whether MySQL functions fields should be displayed or not in edit/insert
mode.
<br /><br />
</dd>
<dt> <dt>
<b>$cfgZipDump </b>boolean<br /> <b>$cfgZipDump </b>boolean<br />
<b>$cfgGZipDump </b>boolean<br /> <b>$cfgGZipDump </b>boolean<br />

View File

@@ -139,6 +139,7 @@ $cfgProtectBinary = 'blob'; // disallow editing of binary fields
// FALSE allow editing // FALSE allow editing
// 'blob' allow editing except for BLOB fields // 'blob' allow editing except for BLOB fields
// 'all' disallow editing // 'all' disallow editing
$cfgShowFunctionFields = TRUE; // Display the function fields in edit/insert mode
$cfgZipDump = TRUE; // Allow the use of zip/gzip/bzip $cfgZipDump = TRUE; // Allow the use of zip/gzip/bzip
$cfgGZipDump = TRUE; // compression for $cfgGZipDump = TRUE; // compression for
@@ -234,6 +235,7 @@ $cfgAttributeTypes = array(
); );
// Available functions // Available functions
if ($cfgShowFunctionFields) {
$cfgFunctions = array( $cfgFunctions = array(
'ASCII', 'ASCII',
'CHAR', 'CHAR',
@@ -260,6 +262,7 @@ $cfgFunctions = array(
'USER', 'USER',
'WEEKDAY' 'WEEKDAY'
); );
} // end if
/** /**

View File

@@ -102,6 +102,9 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
$cfgProtectBinary = 'blob'; $cfgProtectBinary = 'blob';
} }
} }
if (!isset($cfgShowFunctionFields)) {
$cfgShowFunctionFields = TRUE;
}
if (!isset($cfgZipDump)) { if (!isset($cfgZipDump)) {
$cfgZipDump = (isset($cfgGZipDump) ? $cfgGZipDump : TRUE); $cfgZipDump = (isset($cfgGZipDump) ? $cfgGZipDump : TRUE);
} }

View File

@@ -142,7 +142,11 @@ echo "\n";
<tr> <tr>
<th><?php echo $strField; ?></th> <th><?php echo $strField; ?></th>
<th><?php echo $strType; ?></th> <th><?php echo $strType; ?></th>
<th><?php echo $strFunction; ?></th> <?php
if ($cfgShowFunctionFields) {
echo ' <th>' . $strFunction . '</th>' . "\n";
}
?>
<th><?php echo $strNull; ?></th> <th><?php echo $strNull; ?></th>
<th><?php echo $strValue; ?></th> <th><?php echo $strValue; ?></th>
</tr> </tr>
@@ -242,6 +246,7 @@ for ($i = 0; $i < $fields_cnt; $i++) {
// Note: from the MySQL manual: "BINARY doesn't affect how the column is // Note: from the MySQL manual: "BINARY doesn't affect how the column is
// stored or retrieved" so it does not mean that the contents is // stored or retrieved" so it does not mean that the contents is
// binary // binary
if ($cfgShowFunctionFields) {
if ((($cfgProtectBinary && $is_blob) if ((($cfgProtectBinary && $is_blob)
|| ($cfgProtectBinary == 'all' && $is_binary)) || ($cfgProtectBinary == 'all' && $is_binary))
&& !empty($data)) { && !empty($data)) {
@@ -277,6 +282,7 @@ for ($i = 0; $i < $fields_cnt; $i++) {
</td> </td>
<?php <?php
} }
}
echo "\n"; echo "\n";
// The null column // The null column