This commit is contained in:
Marc Delisle
2002-04-25 01:10:50 +00:00
parent 6a90e4e3c8
commit 1fba05320d
5 changed files with 59 additions and 56 deletions

View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2002-04-24 Marc Delisle <lem9@users.sourceforge.net>
* tbl_*.php3: $cfg system changes
2002-04-24 Alexander M. Turek <rabus@bugfixes.info> 2002-04-24 Alexander M. Turek <rabus@bugfixes.info>
* libraries/*, lang/*: $cfg system changes. * libraries/*, lang/*: $cfg system changes.
* libraries/common.lib.php3, libraries/select_lang.php3, * libraries/common.lib.php3, libraries/select_lang.php3,

View File

@@ -34,7 +34,7 @@ if (!isset($is_db) || !$is_db) {
$is_db = @mysql_select_db($db); $is_db = @mysql_select_db($db);
} }
if (empty($db) || !$is_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(); exit();
} }
} // end if (ensures db exists) } // 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) . '\''); $is_table = @mysql_query('SHOW TABLES LIKE \'' . PMA_sqlAddslashes($table, TRUE) . '\'');
} }
if (empty($table) || !@mysql_numrows($is_table)) { 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(); exit();
} else if (isset($is_table)) { } else if (isset($is_table)) {
mysql_free_result($is_table); mysql_free_result($is_table);
@@ -249,7 +249,7 @@ $fields_cnt = mysql_num_rows($fields_rs);
<input type="hidden" name="db" value="<?php echo $db; ?>" /> <input type="hidden" name="db" value="<?php echo $db; ?>" />
<input type="hidden" name="table" value="<?php echo $table; ?>" /> <input type="hidden" name="table" value="<?php echo $table; ?>" />
<table border="<?php echo $cfgBorder; ?>"> <table border="<?php echo $cfg['Border']; ?>">
<tr> <tr>
<td></td> <td></td>
<th>&nbsp;<?php echo ucfirst($strField); ?>&nbsp;</th> <th>&nbsp;<?php echo ucfirst($strField); ?>&nbsp;</th>
@@ -267,7 +267,7 @@ $aryFields = array();
while ($row = mysql_fetch_array($fields_rs)) { while ($row = mysql_fetch_array($fields_rs)) {
$i++; $i++;
$bgcolor = ($i % 2) ? $cfgBgcolorOne : $cfgBgcolorTwo; $bgcolor = ($i % 2) ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo'];
$aryFields[] = $row['Field']; $aryFields[] = $row['Field'];
$type = $row['Type']; $type = $row['Type'];
@@ -504,7 +504,7 @@ require ('./tbl_indexes.php3');
// loic1, 22 feb. 2002: updated with patch from // loic1, 22 feb. 2002: updated with patch from
// Joshua Nye <josh at boxcarmedia.com> to get valid // Joshua Nye <josh at boxcarmedia.com> to get valid
// statistics whatever is the table type // statistics whatever is the table type
if ($cfgShowStats) { if ($cfg['ShowStats']) {
$nonisam = FALSE; $nonisam = FALSE;
$is_innodb = ($showtable['Type'] == 'InnoDB'); $is_innodb = ($showtable['Type'] == 'InnoDB');
if (isset($showtable['Type']) && !eregi('ISAM|HEAP', $showtable['Type'])) { if (isset($showtable['Type']) && !eregi('ISAM|HEAP', $showtable['Type'])) {
@@ -539,24 +539,24 @@ if ($cfgShowStats) {
<td valign="top"> <td valign="top">
<?php echo $strSpaceUsage . '&nbsp;:' . "\n"; ?> <?php echo $strSpaceUsage . '&nbsp;:' . "\n"; ?>
<a name="showusage"></a> <a name="showusage"></a>
<table border="<?php echo $cfgBorder; ?>"> <table border="<?php echo $cfg['Border']; ?>">
<tr> <tr>
<th><?php echo $strType; ?></th> <th><?php echo $strType; ?></th>
<th colspan="2" align="center"><?php echo $strUsage; ?></th> <th colspan="2" align="center"><?php echo $strUsage; ?></th>
</tr> </tr>
<tr> <tr>
<td bgcolor="<?php echo $cfgBgcolorTwo; ?>" style="padding-right: 10px"><?php echo ucfirst($strData); ?></td> <td bgcolor="<?php echo $cfg['BgcolorTwo']; ?>" style="padding-right: 10px"><?php echo ucfirst($strData); ?></td>
<td bgcolor="<?php echo $cfgBgcolorTwo; ?>" align="right" nowrap="nowrap"><?php echo $data_size; ?></td> <td bgcolor="<?php echo $cfg['BgcolorTwo']; ?>" align="right" nowrap="nowrap"><?php echo $data_size; ?></td>
<td bgcolor="<?php echo $cfgBgcolorTwo; ?>"><?php echo $data_unit; ?></td> <td bgcolor="<?php echo $cfg['BgcolorTwo']; ?>"><?php echo $data_unit; ?></td>
</tr> </tr>
<?php <?php
if (isset($index_size)) { if (isset($index_size)) {
echo "\n"; echo "\n";
?> ?>
<tr> <tr>
<td bgcolor="<?php echo $cfgBgcolorTwo; ?>" style="padding-right: 10px"><?php echo ucfirst($strIndex); ?></td> <td bgcolor="<?php echo $cfg['BgcolorTwo']; ?>" style="padding-right: 10px"><?php echo ucfirst($strIndex); ?></td>
<td bgcolor="<?php echo $cfgBgcolorTwo; ?>" align="right" nowrap="nowrap"><?php echo $index_size; ?></td> <td bgcolor="<?php echo $cfg['BgcolorTwo']; ?>" align="right" nowrap="nowrap"><?php echo $index_size; ?></td>
<td bgcolor="<?php echo $cfgBgcolorTwo; ?>"><?php echo $index_unit; ?></td> <td bgcolor="<?php echo $cfg['BgcolorTwo']; ?>"><?php echo $index_unit; ?></td>
</tr> </tr>
<?php <?php
} }
@@ -564,14 +564,14 @@ if ($cfgShowStats) {
echo "\n"; echo "\n";
?> ?>
<tr style="color: #bb0000"> <tr style="color: #bb0000">
<td bgcolor="<?php echo $cfgBgcolorTwo; ?>" style="padding-right: 10px"><?php echo ucfirst($strOverhead); ?></td> <td bgcolor="<?php echo $cfg['BgcolorTwo']; ?>" style="padding-right: 10px"><?php echo ucfirst($strOverhead); ?></td>
<td bgcolor="<?php echo $cfgBgcolorTwo; ?>" align="right" nowrap="nowrap"><?php echo $free_size; ?></td> <td bgcolor="<?php echo $cfg['BgcolorTwo']; ?>" align="right" nowrap="nowrap"><?php echo $free_size; ?></td>
<td bgcolor="<?php echo $cfgBgcolorTwo; ?>"><?php echo $free_unit; ?></td> <td bgcolor="<?php echo $cfg['BgcolorTwo']; ?>"><?php echo $free_unit; ?></td>
</tr> </tr>
<tr> <tr>
<td bgcolor="<?php echo $cfgBgcolorOne; ?>" style="padding-right: 10px"><?php echo ucfirst($strEffective); ?></td> <td bgcolor="<?php echo $cfg['BgcolorOne']; ?>" style="padding-right: 10px"><?php echo ucfirst($strEffective); ?></td>
<td bgcolor="<?php echo $cfgBgcolorOne; ?>" align="right" nowrap="nowrap"><?php echo $effect_size; ?></td> <td bgcolor="<?php echo $cfg['BgcolorOne']; ?>" align="right" nowrap="nowrap"><?php echo $effect_size; ?></td>
<td bgcolor="<?php echo $cfgBgcolorOne; ?>"><?php echo $effect_unit; ?></td> <td bgcolor="<?php echo $cfg['BgcolorOne']; ?>"><?php echo $effect_unit; ?></td>
</tr> </tr>
<?php <?php
} }
@@ -579,9 +579,9 @@ if ($cfgShowStats) {
echo "\n"; echo "\n";
?> ?>
<tr> <tr>
<td bgcolor="<?php echo $cfgBgcolorOne; ?>" style="padding-right: 10px"><?php echo ucfirst($strTotal); ?></td> <td bgcolor="<?php echo $cfg['BgcolorOne']; ?>" style="padding-right: 10px"><?php echo ucfirst($strTotal); ?></td>
<td bgcolor="<?php echo $cfgBgcolorOne; ?>" align="right" nowrap="nowrap"><?php echo $tot_size; ?></td> <td bgcolor="<?php echo $cfg['BgcolorOne']; ?>" align="right" nowrap="nowrap"><?php echo $tot_size; ?></td>
<td bgcolor="<?php echo $cfgBgcolorOne; ?>"><?php echo $tot_unit; ?></td> <td bgcolor="<?php echo $cfg['BgcolorOne']; ?>"><?php echo $tot_unit; ?></td>
</tr> </tr>
<?php <?php
} }
@@ -605,7 +605,7 @@ if ($cfgShowStats) {
<td width="20">&nbsp;</td> <td width="20">&nbsp;</td>
<td valign="top"> <td valign="top">
<?php echo $strRowsStatistic . '&nbsp;:' . "\n"; ?> <?php echo $strRowsStatistic . '&nbsp;:' . "\n"; ?>
<table border="<?php echo $cfgBorder; ?>"> <table border="<?php echo $cfg['Border']; ?>">
<tr> <tr>
<th><?php echo $strStatement; ?></th> <th><?php echo $strStatement; ?></th>
<th align="center"><?php echo $strValue; ?></th> <th align="center"><?php echo $strValue; ?></th>
@@ -613,7 +613,7 @@ if ($cfgShowStats) {
<?php <?php
$i = 0; $i = 0;
if (isset($showtable['Row_format'])) { if (isset($showtable['Row_format'])) {
$bgcolor = ((++$i%2) ? $cfgBgcolorTwo : $cfgBgcolorOne); $bgcolor = ((++$i%2) ? $cfg['BgcolorTwo'] : $cfg['BgcolorOne']);
echo "\n"; echo "\n";
?> ?>
<tr> <tr>
@@ -637,7 +637,7 @@ if ($cfgShowStats) {
<?php <?php
} }
if (!$is_innodb && isset($showtable['Rows'])) { if (!$is_innodb && isset($showtable['Rows'])) {
$bgcolor = ((++$i%2) ? $cfgBgcolorTwo : $cfgBgcolorOne); $bgcolor = ((++$i%2) ? $cfg['BgcolorTwo'] : $cfg['BgcolorOne']);
echo "\n"; echo "\n";
?> ?>
<tr> <tr>
@@ -649,7 +649,7 @@ if ($cfgShowStats) {
<?php <?php
} }
if (!$is_innodb && isset($showtable['Avg_row_length']) && $showtable['Avg_row_length'] > 0) { if (!$is_innodb && isset($showtable['Avg_row_length']) && $showtable['Avg_row_length'] > 0) {
$bgcolor = ((++$i%2) ? $cfgBgcolorTwo : $cfgBgcolorOne); $bgcolor = ((++$i%2) ? $cfg['BgcolorTwo'] : $cfg['BgcolorOne']);
echo "\n"; echo "\n";
?> ?>
<tr> <tr>
@@ -661,7 +661,7 @@ if ($cfgShowStats) {
<?php <?php
} }
if (!$is_innodb && isset($showtable['Data_length']) && $showtable['Rows'] > 0 && $mergetable == FALSE) { if (!$is_innodb && isset($showtable['Data_length']) && $showtable['Rows'] > 0 && $mergetable == FALSE) {
$bgcolor = ((++$i%2) ? $cfgBgcolorTwo : $cfgBgcolorOne); $bgcolor = ((++$i%2) ? $cfg['BgcolorTwo'] : $cfg['BgcolorOne']);
echo "\n"; echo "\n";
?> ?>
<tr> <tr>
@@ -673,7 +673,7 @@ if ($cfgShowStats) {
<?php <?php
} }
if (isset($showtable['Auto_increment'])) { if (isset($showtable['Auto_increment'])) {
$bgcolor = ((++$i%2) ? $cfgBgcolorTwo : $cfgBgcolorOne); $bgcolor = ((++$i%2) ? $cfg['BgcolorTwo'] : $cfg['BgcolorOne']);
echo "\n"; echo "\n";
?> ?>
<tr> <tr>
@@ -734,7 +734,7 @@ $is_upload = (PMA_PHP_INT_VERSION >= 40000 && function_exists('ini_get'))
<input type="hidden" name="prev_sql_query" value="<?php echo ((!empty($query_to_display)) ? urlencode($query_to_display) : ''); ?>" /> <input type="hidden" name="prev_sql_query" value="<?php echo ((!empty($query_to_display)) ? urlencode($query_to_display) : ''); ?>" />
<?php echo sprintf($strRunSQLQuery, htmlspecialchars($db)) . ' ' . PMA_showDocuShort('S/E/SELECT.html'); ?>&nbsp;:<br /> <?php echo sprintf($strRunSQLQuery, htmlspecialchars($db)) . ' ' . PMA_showDocuShort('S/E/SELECT.html'); ?>&nbsp;:<br />
<div style="margin-bottom: 5px"> <div style="margin-bottom: 5px">
<textarea name="sql_query" rows="<?php echo $cfgTextareaRows; ?>" cols="<?php echo $cfgTextareaCols; ?>" wrap="virtual" <textarea name="sql_query" rows="<?php echo $cfg['TextareaRows']; ?>" cols="<?php echo $cfg['TextareaCols']; ?>" wrap="virtual"
onfocus="if (typeof(document.layers) == 'undefined' || typeof(textarea_selected) == 'undefined') {textarea_selected = 1; this.form.elements['sql_query'].select();}"> onfocus="if (typeof(document.layers) == 'undefined' || typeof(textarea_selected) == 'undefined') {textarea_selected = 1; this.form.elements['sql_query'].select();}">
<?php echo ((!empty($query_to_display)) ? htmlspecialchars($query_to_display) : 'SELECT * FROM ' . PMA_backquote($table) . ' WHERE 1'); ?> <?php echo ((!empty($query_to_display)) ? htmlspecialchars($query_to_display) : 'SELECT * FROM ' . PMA_backquote($table) . ' WHERE 1'); ?>
</textarea><br /> </textarea><br />
@@ -759,8 +759,8 @@ if (function_exists('PMA_set_enc_form')) {
} }
// Bookmark Support // Bookmark Support
if ($cfgBookmark['db'] && $cfgBookmark['table']) { if ($cfg['Bookmark']['db'] && $cfg['Bookmark']['table']) {
if (($bookmark_list = PMA_listBookmarks($db, $cfgBookmark)) && count($bookmark_list) > 0) { if (($bookmark_list = PMA_listBookmarks($db, $cfg['Bookmark'])) && count($bookmark_list) > 0) {
echo " <i>$strOr</i> $strBookmarkQuery&nbsp;:<br />\n"; echo " <i>$strOr</i> $strBookmarkQuery&nbsp;:<br />\n";
echo ' <div style="margin-bottom: 5px">' . "\n"; echo ' <div style="margin-bottom: 5px">' . "\n";
echo ' <select name="id_bookmark" style="vertical-align: middle">' . "\n"; echo ' <select name="id_bookmark" style="vertical-align: middle">' . "\n";
@@ -898,9 +898,9 @@ echo "\n";
<?php <?php
// zip, gzip and bzip2 encode features // zip, gzip and bzip2 encode features
if (PMA_PHP_INT_VERSION >= 40004) { if (PMA_PHP_INT_VERSION >= 40004) {
$is_zip = (isset($cfgZipDump) && $cfgZipDump && @function_exists('gzcompress')); $is_zip = (isset($cfg['ZipDump']) && $cfg['ZipDump'] && @function_exists('gzcompress'));
$is_gzip = (isset($cfgGZipDump) && $cfgGZipDump && @function_exists('gzencode')); $is_gzip = (isset($cfg['GZipDump']) && $cfg['GZipDump'] && @function_exists('gzencode'));
$is_bzip = (isset($cfgBZipDump) && $cfgBZipDump && @function_exists('bzcompress')); $is_bzip = (isset($cfg['BZipDump']) && $cfg['BZipDump'] && @function_exists('bzcompress'));
if ($is_zip || $is_gzip || $is_bzip) { if ($is_zip || $is_gzip || $is_bzip) {
echo "\n" . ' (' . "\n"; echo "\n" . ' (' . "\n";
if ($is_zip) { if ($is_zip) {
@@ -1279,7 +1279,7 @@ if (!empty($cfgServer['relation'])) {
<!-- Flushes the table --> <!-- Flushes the table -->
<li> <li>
<a href="sql.php3?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('FLUSH TABLE ' . PMA_backquote($table)); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strTableHasBeenFlushed, htmlspecialchars($table))); if ($cfgShowTooltip) echo '&amp;reload=1'; ?>"> <a href="sql.php3?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('FLUSH TABLE ' . PMA_backquote($table)); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strTableHasBeenFlushed, htmlspecialchars($table))); if ($cfg['ShowTooltip']) echo '&amp;reload=1'; ?>">
<?php echo $strFlushTable; ?></a> <?php echo $strFlushTable; ?></a>
<br /><br /> <br /><br />
</li> </li>

View File

@@ -151,11 +151,11 @@ mysql_free_result($tbl_result);
<!-- Query by example form --> <!-- Query by example form -->
<form action="tbl_qbe.php3" method="post"> <form action="tbl_qbe.php3" method="post">
<table border="<?php echo $cfgBorder; ?>"> <table border="<?php echo $cfg['Border']; ?>">
<!-- Fields row --> <!-- Fields row -->
<tr> <tr>
<td align="<?php echo $cell_align_right; ?>" bgcolor="<?php echo $cfgThBgcolor; ?>"> <td align="<?php echo $cell_align_right; ?>" bgcolor="<?php echo $cfg['ThBgcolor']; ?>">
<b><?php echo $strField; ?>&nbsp;:&nbsp;</b> <b><?php echo $strField; ?>&nbsp;:&nbsp;</b>
</td> </td>
<?php <?php
@@ -163,7 +163,7 @@ $z = 0;
for ($x = 0; $x < $col; $x++) { for ($x = 0; $x < $col; $x++) {
if (!empty($InsCol) && isset($InsCol[$x]) && $InsCol[$x] == 'on') { if (!empty($InsCol) && isset($InsCol[$x]) && $InsCol[$x] == 'on') {
?> ?>
<td align="center" bgcolor="<?php echo $cfgBgcolorOne; ?>"> <td align="center" bgcolor="<?php echo $cfg['BgcolorOne']; ?>">
<select style="width: <?php echo $widem; ?>" name="Field[<?php echo $z; ?>]" size="1"> <select style="width: <?php echo $widem; ?>" name="Field[<?php echo $z; ?>]" size="1">
<option value=""></option> <option value=""></option>
<?php <?php
@@ -189,7 +189,7 @@ for ($x = 0; $x < $col; $x++) {
continue; continue;
} }
?> ?>
<td align="center" bgcolor="<?php echo $cfgBgcolorOne; ?>"> <td align="center" bgcolor="<?php echo $cfg['BgcolorOne']; ?>">
<select style="width: <?php echo $widem; ?>" name="Field[<?php echo $z; ?>]" size="1"> <select style="width: <?php echo $widem; ?>" name="Field[<?php echo $z; ?>]" size="1">
<option value=""></option> <option value=""></option>
<?php <?php
@@ -216,7 +216,7 @@ for ($x = 0; $x < $col; $x++) {
<!-- Sort row --> <!-- Sort row -->
<tr> <tr>
<td align="<?php echo $cell_align_right; ?>" bgcolor="<?php echo $cfgThBgcolor; ?>"> <td align="<?php echo $cell_align_right; ?>" bgcolor="<?php echo $cfg['ThBgcolor']; ?>">
<b><?php echo $strSort; ?>&nbsp;:&nbsp;</b> <b><?php echo $strSort; ?>&nbsp;:&nbsp;</b>
</td> </td>
<?php <?php
@@ -224,7 +224,7 @@ $z = 0;
for ($x = 0; $x < $col; $x++) { for ($x = 0; $x < $col; $x++) {
if (!empty($InsCol) && isset($InsCol[$x]) && $InsCol[$x] == 'on') { if (!empty($InsCol) && isset($InsCol[$x]) && $InsCol[$x] == 'on') {
?> ?>
<td align="center" bgcolor="<?php echo $cfgBgcolorTwo; ?>"> <td align="center" bgcolor="<?php echo $cfg['BgcolorTwo']; ?>">
<select style="width: <?php echo $widem; ?>" name="Sort[<?php echo $z; ?>]" size="1"> <select style="width: <?php echo $widem; ?>" name="Sort[<?php echo $z; ?>]" size="1">
<option value=""></option> <option value=""></option>
<option value="ASC"><?php echo $strAscending; ?></option> <option value="ASC"><?php echo $strAscending; ?></option>
@@ -240,7 +240,7 @@ for ($x = 0; $x < $col; $x++) {
continue; continue;
} }
?> ?>
<td align="center" bgcolor="<?php echo $cfgBgcolorTwo; ?>"> <td align="center" bgcolor="<?php echo $cfg['BgcolorTwo']; ?>">
<select style="width: <?php echo $widem; ?>" name="Sort[<?php echo $z; ?>]" size="1"> <select style="width: <?php echo $widem; ?>" name="Sort[<?php echo $z; ?>]" size="1">
<option value=""></option> <option value=""></option>
<?php <?php
@@ -273,7 +273,7 @@ for ($x = 0; $x < $col; $x++) {
<!-- Show row --> <!-- Show row -->
<tr> <tr>
<td align="<?php echo $cell_align_right; ?>" bgcolor="<?php echo $cfgThBgcolor; ?>"> <td align="<?php echo $cell_align_right; ?>" bgcolor="<?php echo $cfg['ThBgcolor']; ?>">
<b><?php echo $strShow; ?>&nbsp;:&nbsp;</b> <b><?php echo $strShow; ?>&nbsp;:&nbsp;</b>
</td> </td>
<?php <?php
@@ -281,7 +281,7 @@ $z = 0;
for ($x = 0; $x < $col; $x++) { for ($x = 0; $x < $col; $x++) {
if (!empty($InsCol) && isset($InsCol[$x]) && $InsCol[$x] == 'on') { if (!empty($InsCol) && isset($InsCol[$x]) && $InsCol[$x] == 'on') {
?> ?>
<td align="center" bgcolor="<?php echo $cfgBgcolorOne; ?>"> <td align="center" bgcolor="<?php echo $cfg['BgcolorOne']; ?>">
<input type="checkbox" name="Show[<?php echo $z; ?>]" /> <input type="checkbox" name="Show[<?php echo $z; ?>]" />
</td> </td>
<?php <?php
@@ -299,7 +299,7 @@ for ($x = 0; $x < $col; $x++) {
$checked = ''; $checked = '';
} }
?> ?>
<td align="center" bgcolor="<?php echo $cfgBgcolorOne; ?>"> <td align="center" bgcolor="<?php echo $cfg['BgcolorOne']; ?>">
<input type="checkbox" name="Show[<?php echo $z; ?>]"<?php echo $checked; ?> /> <input type="checkbox" name="Show[<?php echo $z; ?>]"<?php echo $checked; ?> />
</td> </td>
<?php <?php
@@ -311,7 +311,7 @@ for ($x = 0; $x < $col; $x++) {
<!-- Criteria row --> <!-- Criteria row -->
<tr> <tr>
<td align="<?php echo $cell_align_right; ?>" bgcolor="<?php echo $cfgThBgcolor; ?>"> <td align="<?php echo $cell_align_right; ?>" bgcolor="<?php echo $cfg['ThBgcolor']; ?>">
<b><?php echo $strCriteria; ?>&nbsp;:&nbsp;</b> <b><?php echo $strCriteria; ?>&nbsp;:&nbsp;</b>
</td> </td>
<?php <?php
@@ -319,7 +319,7 @@ $z = 0;
for ($x = 0; $x < $col; $x++) { for ($x = 0; $x < $col; $x++) {
if (!empty($InsCol) && isset($InsCol[$x]) && $InsCol[$x] == 'on') { if (!empty($InsCol) && isset($InsCol[$x]) && $InsCol[$x] == 'on') {
?> ?>
<td align="center" bgcolor="<?php echo $cfgBgcolorTwo; ?>"> <td align="center" bgcolor="<?php echo $cfg['BgcolorTwo']; ?>">
<input type="text" name="Criteria[<?php echo $z; ?>]" value="" class="textfield" style="width: <?php echo $widem; ?>" size="20" /> <input type="text" name="Criteria[<?php echo $z; ?>]" value="" class="textfield" style="width: <?php echo $widem; ?>" size="20" />
</td> </td>
<?php <?php
@@ -346,7 +346,7 @@ for ($x = 0; $x < $col; $x++) {
$encoded_Criteria = $prev_Criteria[$x]; $encoded_Criteria = $prev_Criteria[$x];
} }
?> ?>
<td align="center" bgcolor="<?php echo $cfgBgcolorTwo; ?>"> <td align="center" bgcolor="<?php echo $cfg['BgcolorTwo']; ?>">
<input type="hidden" name="prev_Criteria[<?php echo $z; ?>]" value="<?php echo $encoded_Criteria; ?>" /> <input type="hidden" name="prev_Criteria[<?php echo $z; ?>]" value="<?php echo $encoded_Criteria; ?>" />
<input type="text" name="Criteria[<?php echo $z; ?>]" value="<?php echo htmlspecialchars($stripped_Criteria); ?>" class="textfield" style="width: <?php echo $widem; ?>" size="20" /> <input type="text" name="Criteria[<?php echo $z; ?>]" value="<?php echo htmlspecialchars($stripped_Criteria); ?>" class="textfield" style="width: <?php echo $widem; ?>" size="20" />
</td> </td>
@@ -361,7 +361,7 @@ for ($x = 0; $x < $col; $x++) {
<?php <?php
$w = 0; $w = 0;
for ($y = 0; $y <= $row; $y++) { for ($y = 0; $y <= $row; $y++) {
$bgcolor = ($y % 2) ? $cfgBgcolorOne : $cfgBgcolorTwo; $bgcolor = ($y % 2) ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo'];
if (isset($InsRow[$y]) && $InsRow[$y] == 'on') { if (isset($InsRow[$y]) && $InsRow[$y] == 'on') {
$chk['or'] = ' checked="checked"'; $chk['or'] = ' checked="checked"';
$chk['and'] = ''; $chk['and'] = '';
@@ -529,7 +529,7 @@ for ($y = 0; $y <= $row; $y++) {
<!-- Modify columns --> <!-- Modify columns -->
<tr> <tr>
<td align="<?php echo $cell_align_right; ?>" bgcolor="<?php echo $cfgThBgcolor; ?>"> <td align="<?php echo $cell_align_right; ?>" bgcolor="<?php echo $cfg['ThBgcolor']; ?>">
<b><?php echo $strModify; ?>&nbsp;:&nbsp;</b> <b><?php echo $strModify; ?>&nbsp;:&nbsp;</b>
</td> </td>
<?php <?php
@@ -545,7 +545,7 @@ for ($x = 0; $x < $col; $x++) {
$chk['or'] = ''; $chk['or'] = '';
} }
?> ?>
<td align="center" bgcolor="<?php echo $cfgBgcolorTwo; ?>"> <td align="center" bgcolor="<?php echo $cfg['BgcolorTwo']; ?>">
<b><?php echo $strOr; ?>&nbsp;:</b> <b><?php echo $strOr; ?>&nbsp;:</b>
<input type="radio" name="AndOrCol[<?php echo $z; ?>]" value="or"<?php echo $chk['or']; ?> /> <input type="radio" name="AndOrCol[<?php echo $z; ?>]" value="or"<?php echo $chk['or']; ?> />
&nbsp;&nbsp;<b><?php echo $strAnd; ?>&nbsp;:</b> &nbsp;&nbsp;<b><?php echo $strAnd; ?>&nbsp;:</b>
@@ -576,7 +576,7 @@ for ($x = 0; $x < $col; $x++) {
$chk['or'] = ''; $chk['or'] = '';
} }
?> ?>
<td align="center" bgcolor="<?php echo $cfgBgcolorTwo; ?>"> <td align="center" bgcolor="<?php echo $cfg['BgcolorTwo']; ?>">
<b><?php echo $strOr; ?>&nbsp;:</b> <b><?php echo $strOr; ?>&nbsp;:</b>
<input type="radio" name="AndOrCol[<?php echo $z; ?>]" value="or"<?php echo $chk['or']; ?> /> <input type="radio" name="AndOrCol[<?php echo $z; ?>]" value="or"<?php echo $chk['or']; ?> />
&nbsp;&nbsp;<b><?php echo $strAnd; ?>&nbsp;:</b> &nbsp;&nbsp;<b><?php echo $strAnd; ?>&nbsp;:</b>

View File

@@ -145,7 +145,7 @@ if (isset($primary_key) && ($submit_type != $strInsertAsNewRow)) {
include('./header.inc.php3'); include('./header.inc.php3');
include('./' . ereg_replace('\.\.*', '.', $goto)); include('./' . ereg_replace('\.\.*', '.', $goto));
} else { } else {
header('Location: ' . $cfgPmaAbsoluteUri . $goto . '&message=' . urlencode($message)); header('Location: ' . $cfg['PmaAbsoluteUri'] . $goto . '&message=' . urlencode($message));
} }
exit(); exit();
} }
@@ -249,7 +249,7 @@ if (!$result) {
include('./' . ereg_replace('\.\.*', '.', $goto)); include('./' . ereg_replace('\.\.*', '.', $goto));
} else { } else {
$add_query = (strpos(' ' . $goto, 'tbl_change') ? '&disp_query=' . urlencode($sql_query) : ''); $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(); exit();
} // end if } // end if

View File

@@ -75,7 +75,7 @@ if (!isset($param) || $param[0] == '') {
<li> <li>
<div style="margin-bottom: 10px"> <div style="margin-bottom: 10px">
<?php echo $strLimitNumRows . "\n"; ?> <?php echo $strLimitNumRows . "\n"; ?>
<input type="text" size="4" name="session_max_rows" value="<?php echo $cfgMaxRows; ?>" class="textfield" /> <input type="text" size="4" name="session_max_rows" value="<?php echo $cfg['MaxRows']; ?>" class="textfield" />
</div> </div>
</li> </li>
<li> <li>
@@ -84,7 +84,7 @@ if (!isset($param) || $param[0] == '') {
<?php echo PMA_showDocuShort('F/u/Functions.html') . "\n"; ?> <?php echo PMA_showDocuShort('F/u/Functions.html') . "\n"; ?>
<br /><br /> <br /><br />
<?php echo '<i>' . $strOr . '</i> ' . $strDoAQuery; ?><br /> <?php echo '<i>' . $strOr . '</i> ' . $strDoAQuery; ?><br />
<table border="<?php echo $cfgBorder; ?>"> <table border="<?php echo $cfg['Border']; ?>">
<tr> <tr>
<th><?php echo $strField; ?></th> <th><?php echo $strField; ?></th>
<th><?php echo $strType; ?></th> <th><?php echo $strType; ?></th>
@@ -93,7 +93,7 @@ if (!isset($param) || $param[0] == '') {
<?php <?php
for ($i = 0; $i < $fields_cnt; $i++) { for ($i = 0; $i < $fields_cnt; $i++) {
echo "\n"; echo "\n";
$bgcolor = ($i % 2) ? $cfgBgcolorOne : $cfgBgcolorTwo; $bgcolor = ($i % 2) ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo'];
?> ?>
<tr> <tr>
<td bgcolor="<?php echo $bgcolor; ?>"><?php echo htmlspecialchars($fields_list[$i]); ?></td> <td bgcolor="<?php echo $bgcolor; ?>"><?php echo htmlspecialchars($fields_list[$i]); ?></td>