From 1fba05320d56198976fbe798f03348b922b5ff3e Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 25 Apr 2002 01:10:50 +0000 Subject: [PATCH] new cfg --- ChangeLog | 3 ++ tbl_properties.php3 | 68 ++++++++++++++++++++++----------------------- tbl_qbe.php3 | 34 +++++++++++------------ tbl_replace.php3 | 4 +-- tbl_select.php3 | 6 ++-- 5 files changed, 59 insertions(+), 56 deletions(-) diff --git a/ChangeLog b/ChangeLog index f6bbce234..baff7616d 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ phpMyAdmin - Changelog $Id$ $Source$ +2002-04-24 Marc Delisle + * tbl_*.php3: $cfg system changes + 2002-04-24 Alexander M. Turek * libraries/*, lang/*: $cfg system changes. * libraries/common.lib.php3, libraries/select_lang.php3, diff --git a/tbl_properties.php3 b/tbl_properties.php3 index 4e103ce81..0fc7c5d63 100755 --- a/tbl_properties.php3 +++ b/tbl_properties.php3 @@ -34,7 +34,7 @@ if (!isset($is_db) || !$is_db) { $is_db = @mysql_select_db($db); } if (empty($db) || !$is_db) { - header('Location: ' . $cfgPmaAbsoluteUri . 'main.php3?lang=' . $lang . '&server=' . $server . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1'); + header('Location: ' . $cfg['PmaAbsoluteUri'] . 'main.php3?lang=' . $lang . '&server=' . $server . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1'); exit(); } } // end if (ensures db exists) @@ -44,7 +44,7 @@ if (!isset($is_table) || !$is_table) { $is_table = @mysql_query('SHOW TABLES LIKE \'' . PMA_sqlAddslashes($table, TRUE) . '\''); } if (empty($table) || !@mysql_numrows($is_table)) { - header('Location: ' . $cfgPmaAbsoluteUri . 'db_details.php3?lang=' . $lang . '&server=' . $server . '&db=' . urlencode($db) . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1'); + header('Location: ' . $cfg['PmaAbsoluteUri'] . 'db_details.php3?lang=' . $lang . '&server=' . $server . '&db=' . urlencode($db) . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1'); exit(); } else if (isset($is_table)) { mysql_free_result($is_table); @@ -249,7 +249,7 @@ $fields_cnt = mysql_num_rows($fields_rs); - +
@@ -267,7 +267,7 @@ $aryFields = array(); while ($row = mysql_fetch_array($fields_rs)) { $i++; - $bgcolor = ($i % 2) ? $cfgBgcolorOne : $cfgBgcolorTwo; + $bgcolor = ($i % 2) ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']; $aryFields[] = $row['Field']; $type = $row['Type']; @@ -504,7 +504,7 @@ require ('./tbl_indexes.php3'); // loic1, 22 feb. 2002: updated with patch from // Joshua Nye to get valid // statistics whatever is the table type -if ($cfgShowStats) { +if ($cfg['ShowStats']) { $nonisam = FALSE; $is_innodb = ($showtable['Type'] == 'InnoDB'); if (isset($showtable['Type']) && !eregi('ISAM|HEAP', $showtable['Type'])) { @@ -539,24 +539,24 @@ if ($cfgShowStats) {
   - +
- - - + + + - - - + + + - - - + + + - - - + + + - - - + + +  
- +
@@ -613,7 +613,7 @@ if ($cfgShowStats) { @@ -637,7 +637,7 @@ if ($cfgShowStats) { @@ -649,7 +649,7 @@ if ($cfgShowStats) { 0) { - $bgcolor = ((++$i%2) ? $cfgBgcolorTwo : $cfgBgcolorOne); + $bgcolor = ((++$i%2) ? $cfg['BgcolorTwo'] : $cfg['BgcolorOne']); echo "\n"; ?> @@ -661,7 +661,7 @@ if ($cfgShowStats) { 0 && $mergetable == FALSE) { - $bgcolor = ((++$i%2) ? $cfgBgcolorTwo : $cfgBgcolorOne); + $bgcolor = ((++$i%2) ? $cfg['BgcolorTwo'] : $cfg['BgcolorOne']); echo "\n"; ?> @@ -673,7 +673,7 @@ if ($cfgShowStats) { @@ -734,7 +734,7 @@ $is_upload = (PMA_PHP_INT_VERSION >= 40000 && function_exists('ini_get'))  :
-
@@ -759,8 +759,8 @@ if (function_exists('PMA_set_enc_form')) { } // Bookmark Support -if ($cfgBookmark['db'] && $cfgBookmark['table']) { - if (($bookmark_list = PMA_listBookmarks($db, $cfgBookmark)) && count($bookmark_list) > 0) { +if ($cfg['Bookmark']['db'] && $cfg['Bookmark']['table']) { + if (($bookmark_list = PMA_listBookmarks($db, $cfg['Bookmark'])) && count($bookmark_list) > 0) { echo " $strOr $strBookmarkQuery :
\n"; echo '
' . "\n"; echo '
+
- - - - - - - - - - @@ -361,7 +361,7 @@ for ($x = 0; $x < $col; $x++) { - -
+  :  + +
+  :  + +
+  :  + + />
+  :  + +
+  :  +  : />    : @@ -576,7 +576,7 @@ for ($x = 0; $x < $col; $x++) { $chk['or'] = ''; } ?> - +  : />    : diff --git a/tbl_replace.php3 b/tbl_replace.php3 index 2d9db6316..0eb5db401 100755 --- a/tbl_replace.php3 +++ b/tbl_replace.php3 @@ -145,7 +145,7 @@ if (isset($primary_key) && ($submit_type != $strInsertAsNewRow)) { include('./header.inc.php3'); include('./' . ereg_replace('\.\.*', '.', $goto)); } else { - header('Location: ' . $cfgPmaAbsoluteUri . $goto . '&message=' . urlencode($message)); + header('Location: ' . $cfg['PmaAbsoluteUri'] . $goto . '&message=' . urlencode($message)); } exit(); } @@ -249,7 +249,7 @@ if (!$result) { include('./' . ereg_replace('\.\.*', '.', $goto)); } else { $add_query = (strpos(' ' . $goto, 'tbl_change') ? '&disp_query=' . urlencode($sql_query) : ''); - header('Location: ' . $cfgPmaAbsoluteUri . $goto . '&message=' . urlencode($message) . $add_query); + header('Location: ' . $cfg['PmaAbsoluteUri'] . $goto . '&message=' . urlencode($message) . $add_query); } exit(); } // end if diff --git a/tbl_select.php3 b/tbl_select.php3 index 0f5347868..47b5ca722 100755 --- a/tbl_select.php3 +++ b/tbl_select.php3 @@ -75,7 +75,7 @@ if (!isset($param) || $param[0] == '') {
  • - +
  • @@ -84,7 +84,7 @@ if (!isset($param) || $param[0] == '') {

    ' . $strOr . ' ' . $strDoAQuery; ?>
    - +
    @@ -93,7 +93,7 @@ if (!isset($param) || $param[0] == '') {