nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style upgrade

Browse Source
This commit is contained in:
Sebastian Mendel
2006-04-25 12:14:34 +00:00
parent 9e725e08c6
commit 4a62967b0c
2 changed files with 250 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -5,7 +5,11 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2006-03-24 Michal Čihař <michal@cihar.com> 2006-04-25 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* db_details_qbe.php:
style upgrade
2006-04-24 Michal Čihař <michal@cihar.com>
* main.php: Fix logout link (bug #1474694). * main.php: Fix logout link (bug #1474694).
2006-04-21 Michal Čihař <michal@cihar.com> 2006-04-21 Michal Čihař <michal@cihar.com>

493
db_details_qbe.php
View File

@@ -9,9 +9,9 @@
/** /**
* requirements * requirements
*/ */
require_once('./libraries/common.lib.php'); require_once './libraries/common.lib.php';
require_once './libraries/Table.class.php'; require_once './libraries/Table.class.php';
require_once('./libraries/relation.lib.php'); require_once './libraries/relation.lib.php';
/** /**
@@ -23,23 +23,23 @@ $cfgRelation = PMA_getRelationsParam();
/** /**
* A query has been submitted -> execute it, else display the headers * A query has been submitted -> execute it, else display the headers
*/ */
if ( isset( $_REQUEST['submit_sql'] ) if (isset($_REQUEST['submit_sql'])
&& preg_match('@^SELECT@i', $_REQUEST['encoded_sql_query']) ) { && preg_match('@^SELECT@i', $_REQUEST['encoded_sql_query'])) {
$goto = 'db_details.php'; $goto = 'db_details.php';
$zero_rows = htmlspecialchars($GLOBALS['strSuccess']); $zero_rows = htmlspecialchars($GLOBALS['strSuccess']);
$sql_query = urldecode($_REQUEST['encoded_sql_query']); $sql_query = urldecode($_REQUEST['encoded_sql_query']);
require('./sql.php'); require './sql.php';
exit(); exit;
} else { } else {
$sub_part = '_qbe'; $sub_part = '_qbe';
require('./libraries/db_details_common.inc.php'); require './libraries/db_details_common.inc.php';
$url_query .= '&amp;goto=db_details_qbe.php'; $url_query .= '&amp;goto=db_details_qbe.php';
$url_params['goto'] = 'db_details_qbe.php'; $url_params['goto'] = 'db_details_qbe.php';
require('./libraries/db_details_db_info.inc.php'); require './libraries/db_details_db_info.inc.php';
} }
if ( isset($_REQUEST['submit_sql'] ) if (isset($_REQUEST['submit_sql'])
&& ! preg_match('@^SELECT@i', $_REQUEST['encoded_sql_query']) ) { && ! preg_match('@^SELECT@i', $_REQUEST['encoded_sql_query'])) {
echo '<div class="warning">' . $GLOBALS['strHaveToShow'] . '</div>'; echo '<div class="warning">' . $GLOBALS['strHaveToShow'] . '</div>';
} }
@@ -47,31 +47,31 @@ if ( isset($_REQUEST['submit_sql'] )
/** /**
* Initialize some variables * Initialize some variables
*/ */
$col_cnt = isset( $_REQUEST['col_cnt'] ) ? (int) $_REQUEST['col_cnt'] : 3; $col_cnt = isset($_REQUEST['col_cnt']) ? (int) $_REQUEST['col_cnt'] : 3;
$add_col = isset( $_REQUEST['add_col'] ) ? (int) $_REQUEST['add_col'] : 0; $add_col = isset($_REQUEST['add_col']) ? (int) $_REQUEST['add_col'] : 0;
$add_row = isset( $_REQUEST['add_row'] ) ? (int) $_REQUEST['add_row'] : 0; $add_row = isset($_REQUEST['add_row']) ? (int) $_REQUEST['add_row'] : 0;
$rows = isset( $_REQUEST['rows'] ) ? (int) $_REQUEST['rows'] : 0; $rows = isset($_REQUEST['rows']) ? (int) $_REQUEST['rows'] : 0;
$ins_col = isset( $_REQUEST['ins_col'] ) ? $_REQUEST['ins_col'] : array(); $ins_col = isset($_REQUEST['ins_col']) ? $_REQUEST['ins_col'] : array();
$del_col = isset( $_REQUEST['del_col'] ) ? $_REQUEST['del_col'] : array(); $del_col = isset($_REQUEST['del_col']) ? $_REQUEST['del_col'] : array();
$prev_criteria = isset( $_REQUEST['prev_criteria'] ) $prev_criteria = isset($_REQUEST['prev_criteria'])
? $_REQUEST['prev_criteria'] ? $_REQUEST['prev_criteria']
: array(); : array();
$criteria = isset( $_REQUEST['criteria'] ) $criteria = isset($_REQUEST['criteria'])
? $_REQUEST['criteria'] ? $_REQUEST['criteria']
: array_fill(0, $col_cnt, ''); : array_fill(0, $col_cnt, '');
$ins_row = isset( $_REQUEST['ins_row'] ) $ins_row = isset($_REQUEST['ins_row'])
? $_REQUEST['ins_row'] ? $_REQUEST['ins_row']
: array_fill(0, $col_cnt, ''); : array_fill(0, $col_cnt, '');
$del_row = isset( $_REQUEST['del_row'] ) $del_row = isset($_REQUEST['del_row'])
? $_REQUEST['del_row'] ? $_REQUEST['del_row']
: array_fill(0, $col_cnt, ''); : array_fill(0, $col_cnt, '');
$and_or_row = isset( $_REQUEST['and_or_row'] ) $and_or_row = isset($_REQUEST['and_or_row'])
? $_REQUEST['and_or_row'] ? $_REQUEST['and_or_row']
: array_fill(0, $col_cnt, ''); : array_fill(0, $col_cnt, '');
$and_or_col = isset( $_REQUEST['and_or_col'] ) $and_or_col = isset($_REQUEST['and_or_col'])
? $_REQUEST['and_or_col'] ? $_REQUEST['and_or_col']
: array_fill(0, $col_cnt, ''); : array_fill(0, $col_cnt, '');
@@ -90,8 +90,8 @@ if (!empty($TableList)) {
} // end if } // end if
$columns = PMA_DBI_get_columns_full( $GLOBALS['db'] ); $columns = PMA_DBI_get_columns_full($GLOBALS['db']);
$tables = PMA_DBI_get_columns_full( $GLOBALS['db'] ); $tables = PMA_DBI_get_columns_full($GLOBALS['db']);
/** /**
@@ -144,15 +144,15 @@ $realwidth = $form_column_width . 'ex';
* Displays the Query by example form * Displays the Query by example form
*/ */
function showColumnSelectCell( $columns, $column_number, $selected = '' ) function showColumnSelectCell($columns, $column_number, $selected = '')
{ {
?> ?>
<td align="center"> <td align="center">
<select name="Field[<?php echo $column_number; ?>]" size="1"> <select name="Field[<?php echo $column_number; ?>]" size="1">
<option value=""></option> <option value=""></option>
<?php <?php
foreach ( $columns as $column ) { foreach ($columns as $column) {
if ( $column === $selected ) { if ($column === $selected) {
$sel = ' selected="selected"'; $sel = ' selected="selected"';
} else { } else {
$sel = ''; $sel = '';
@@ -170,51 +170,47 @@ function showColumnSelectCell( $columns, $column_number, $selected = '' )
?> ?>
<form action="db_details_qbe.php" method="post"> <form action="db_details_qbe.php" method="post">
<table> <table class="data" style="width: 100%;">
<tr class="odd"> <tr class="odd noclick">
<th align="<?php echo $cell_align_right; ?>"> <th><?php echo $strField; ?>:</th>
<?php echo $strField; ?>:
</th>
<?php <?php
$z = 0; $z = 0;
for ($x = 0; $x < $col; $x++) { for ($x = 0; $x < $col; $x++) {
if ( isset($ins_col[$x]) && $ins_col[$x] == 'on') { if (isset($ins_col[$x]) && $ins_col[$x] == 'on') {
showColumnSelectCell( $fld, $z ); showColumnSelectCell( $fld, $z );
$z++; $z++;
} }
if (!empty($del_col) && isset($del_col[$x]) && $del_col[$x] == 'on') { if (! empty($del_col) && isset($del_col[$x]) && $del_col[$x] == 'on') {
continue; continue;
} }
$selected = ''; $selected = '';
if ( isset( $Field[$x] ) ) { if (isset($Field[$x])) {
$selected = urldecode($Field[$x]); $selected = urldecode($Field[$x]);
$curField[$z] = urldecode($Field[$x]); $curField[$z] = urldecode($Field[$x]);
} }
showColumnSelectCell( $fld, $z, $selected ); showColumnSelectCell($fld, $z, $selected);
$z++; $z++;
} // end for } // end for
?> ?>
</tr> </tr>
<!-- Sort row --> <!-- Sort row -->
<tr class="even"> <tr class="even noclick">
<th align="<?php echo $cell_align_right; ?>"> <th><?php echo $strSort; ?>:</th>
<?php echo $strSort; ?>:
</th>
<?php <?php
$z = 0; $z = 0;
for ($x = 0; $x < $col; $x++) { for ($x = 0; $x < $col; $x++) {
if (!empty($ins_col) && isset($ins_col[$x]) && $ins_col[$x] == 'on') { if (!empty($ins_col) && isset($ins_col[$x]) && $ins_col[$x] == 'on') {
?> ?>
<td align="center" bgcolor="<?php echo $cfg['BgcolorTwo']; ?>"> <td align="center">
<select style="width: <?php echo $realwidth; ?>" name="Sort[<?php echo $z; ?>]" size="1"> <select style="width: <?php echo $realwidth; ?>" 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>
<option value="DESC"><?php echo $strDescending; ?></option> <option value="DESC"><?php echo $strDescending; ?></option>
</select> </select>
</td> </td>
<?php <?php
$z++; $z++;
} // end if } // end if
@@ -224,16 +220,17 @@ for ($x = 0; $x < $col; $x++) {
continue; continue;
} }
?> ?>
<td align="center" bgcolor="<?php echo $cfg['BgcolorTwo']; ?>"> <td align="center">
<select style="width: <?php echo $realwidth; ?>" name="Sort[<?php echo $z; ?>]" size="1"> <select style="width: <?php echo $realwidth; ?>" name="Sort[<?php echo $z; ?>]" size="1">
<option value=""></option> <option value=""></option>
<?php <?php
echo "\n"; echo "\n";
// If they have chosen all fields using the * selector, // If they have chosen all fields using the * selector,
// then sorting is not available // then sorting is not available
// Robbat2 - Fix for Bug #570698 // Robbat2 - Fix for Bug #570698
if (isset($Sort[$x]) && isset($Field[$x]) && (substr(urldecode($Field[$x]),-2) == '.*')) { if (isset($Sort[$x]) && isset($Field[$x])
&& substr(urldecode($Field[$x]), -2) == '.*') {
$Sort[$x] = ''; $Sort[$x] = '';
} //end if } //end if
@@ -254,28 +251,26 @@ for ($x = 0; $x < $col; $x++) {
echo ' '; echo ' ';
echo '<option value="DESC"' . $sel . '>' . $strDescending . '</option>' . "\n"; echo '<option value="DESC"' . $sel . '>' . $strDescending . '</option>' . "\n";
?> ?>
</select> </select>
</td> </td>
<?php <?php
$z++; $z++;
echo "\n"; echo "\n";
} // end for } // end for
?> ?>
</tr> </tr>
<!-- Show row --> <!-- Show row -->
<tr> <tr class="odd noclick">
<td class="tblHeaders" align="<?php echo $cell_align_right; ?>"> <th><?php echo $strShow; ?>:</th>
<b><?php echo $strShow; ?>:&nbsp;</b>
</td>
<?php <?php
$z = 0; $z = 0;
for ($x = 0; $x < $col; $x++) { for ($x = 0; $x < $col; $x++) {
if (!empty($ins_col) && isset($ins_col[$x]) && $ins_col[$x] == 'on') { if (!empty($ins_col) && isset($ins_col[$x]) && $ins_col[$x] == 'on') {
?> ?>
<td class="tblHeaders" align="center" bgcolor="<?php echo $cfg['BgcolorOne']; ?>"> <td align="center">
<input type="checkbox" name="Show[<?php echo $z; ?>]" /> <input type="checkbox" name="Show[<?php echo $z; ?>]" />
</td> </td>
<?php <?php
$z++; $z++;
} // end if } // end if
@@ -291,29 +286,27 @@ for ($x = 0; $x < $col; $x++) {
$checked = ''; $checked = '';
} }
?> ?>
<td class="tblHeaders" align="center" bgcolor="<?php echo $cfg['BgcolorOne']; ?>"> <td align="center">
<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
$z++; $z++;
echo "\n"; echo "\n";
} // end for } // end for
?> ?>
</tr> </tr>
<!-- Criteria row --> <!-- Criteria row -->
<tr> <tr class="even noclick">
<td class="tblHeaders" align="<?php echo $cell_align_right; ?>"> <th><?php echo $strCriteria; ?>:</th>
<b><?php echo $strCriteria; ?>:&nbsp;</b>
</td>
<?php <?php
$z = 0; $z = 0;
for ($x = 0; $x < $col; $x++) { for ($x = 0; $x < $col; $x++) {
if (!empty($ins_col) && isset($ins_col[$x]) && $ins_col[$x] == 'on') { if (!empty($ins_col) && isset($ins_col[$x]) && $ins_col[$x] == 'on') {
?> ?>
<td align="center" bgcolor="<?php echo $cfg['BgcolorTwo']; ?>"> <td align="center">
<input type="text" name="criteria[<?php echo $z; ?>]" value="" class="textfield" style="width: <?php echo $realwidth; ?>" size="20" /> <input type="text" name="criteria[<?php echo $z; ?>]" value="" class="textfield" style="width: <?php echo $realwidth; ?>" size="20" />
</td> </td>
<?php <?php
$z++; $z++;
} // end if } // end if
@@ -334,58 +327,58 @@ for ($x = 0; $x < $col; $x++) {
$encoded_Criteria = $prev_criteria[$x]; $encoded_Criteria = $prev_criteria[$x];
} }
?> ?>
<td align="center" bgcolor="<?php echo $cfg['BgcolorTwo']; ?>"> <td align="center">
<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 $realwidth; ?>" size="20" /> <input type="text" name="criteria[<?php echo $z; ?>]" value="<?php echo htmlspecialchars($stripped_Criteria); ?>" class="textfield" style="width: <?php echo $realwidth; ?>" size="20" />
</td> </td>
<?php <?php
$z++; $z++;
echo "\n"; echo "\n";
} // end for } // end for
?> ?>
</tr> </tr>
<!-- And/Or columns and rows --> <!-- And/Or columns and rows -->
<?php <?php
$w = 0; $w = 0;
$odd_row = true;
for ($y = 0; $y <= $row; $y++) { for ($y = 0; $y <= $row; $y++) {
$bgcolor = ($y % 2) ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo'];
if (isset($ins_row[$y]) && $ins_row[$y] == 'on') { if (isset($ins_row[$y]) && $ins_row[$y] == 'on') {
$chk['or'] = ' checked="checked"'; $chk['or'] = ' checked="checked"';
$chk['and'] = ''; $chk['and'] = '';
?> ?>
<tr> <tr class="<?php echo $odd_row ? 'odd' : 'even'; ?> noclick">
<td align="<?php echo $cell_align_right; ?>" bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap"> <td align="<?php echo $cell_align_right; ?>" nowrap="nowrap">
<!-- Row controls --> <!-- Row controls -->
<table bgcolor="<?php echo $bgcolor; ?>" cellpadding="0" cellspacing="0" border="0"> <table cellpadding="0" cellspacing="0" border="0">
<tr> <tr>
<td align="<?php echo $cell_align_right; ?>" nowrap="nowrap"> <td align="<?php echo $cell_align_right; ?>" nowrap="nowrap">
<small><?php echo $strQBEIns; ?>:</small> <small><?php echo $strQBEIns; ?>:</small>
<input type="checkbox" name="ins_row[<?php echo $w; ?>]" /> <input type="checkbox" name="ins_row[<?php echo $w; ?>]" />
</td> </td>
<td align="<?php echo $cell_align_right; ?>"> <td align="<?php echo $cell_align_right; ?>">
<b><?php echo $strAnd; ?>:</b> <b><?php echo $strAnd; ?>:</b>
</td> </td>
<td> <td>
<input type="radio" name="and_or_row[<?php echo $w; ?>]" value="and"<?php echo $chk['and']; ?> /> <input type="radio" name="and_or_row[<?php echo $w; ?>]" value="and"<?php echo $chk['and']; ?> />
&nbsp; &nbsp;
</td> </td>
</tr> </tr>
<tr> <tr>
<td align="<?php echo $cell_align_right; ?>" nowrap="nowrap"> <td align="<?php echo $cell_align_right; ?>" nowrap="nowrap">
<small><?php echo $strQBEDel; ?>:</small> <small><?php echo $strQBEDel; ?>:</small>
<input type="checkbox" name="del_row[<?php echo $w; ?>]" /> <input type="checkbox" name="del_row[<?php echo $w; ?>]" />
</td> </td>
<td align="<?php echo $cell_align_right; ?>"> <td align="<?php echo $cell_align_right; ?>">
<b><?php echo $strOr; ?>:</b> <b><?php echo $strOr; ?>:</b>
</td> </td>
<td> <td>
<input type="radio" name="and_or_row[<?php echo $w; ?>]" value="or"<?php echo $chk['or']; ?> /> <input type="radio" name="and_or_row[<?php echo $w; ?>]" value="or"<?php echo $chk['or']; ?> />
&nbsp; &nbsp;
</td> </td>
</tr> </tr>
</table> </table>
</td> </td>
<?php <?php
$z = 0; $z = 0;
for ($x = 0; $x < $col; $x++) { for ($x = 0; $x < $col; $x++) {
@@ -393,9 +386,9 @@ for ($y = 0; $y <= $row; $y++) {
echo "\n"; echo "\n";
$or = 'Or' . $w . '[' . $z . ']'; $or = 'Or' . $w . '[' . $z . ']';
?> ?>
<td align="center" bgcolor="<?php echo $bgcolor; ?>"> <td align="center">
<textarea cols="20" rows="2" style="width: <?php echo $realwidth; ?>" name="<?php echo $or; ?>" dir="<?php echo $text_dir; ?>"></textarea> <textarea cols="20" rows="2" style="width: <?php echo $realwidth; ?>" name="<?php echo $or; ?>" dir="<?php echo $text_dir; ?>"></textarea>
</td> </td>
<?php <?php
$z++; $z++;
} // end if } // end if
@@ -406,17 +399,18 @@ for ($y = 0; $y <= $row; $y++) {
echo "\n"; echo "\n";
$or = 'Or' . $w . '[' . $z . ']'; $or = 'Or' . $w . '[' . $z . ']';
?> ?>
<td align="center" bgcolor="<?php echo $bgcolor; ?>"> <td align="center">
<textarea cols="20" rows="2" style="width: <?php echo $realwidth; ?>" name="<?php echo $or; ?>" dir="<?php echo $text_dir; ?>"></textarea> <textarea cols="20" rows="2" style="width: <?php echo $realwidth; ?>" name="<?php echo $or; ?>" dir="<?php echo $text_dir; ?>"></textarea>
</td> </td>
<?php <?php
$z++; $z++;
} // end for } // end for
$w++; $w++;
echo "\n"; echo "\n";
?> ?>
</tr> </tr>
<?php <?php
$odd_row =! $odd_row;
} // end if } // end if
if (isset($del_row[$y]) && $del_row[$y] == 'on') { if (isset($del_row[$y]) && $del_row[$y] == 'on') {
@@ -435,36 +429,36 @@ for ($y = 0; $y <= $row; $y++) {
} }
echo "\n"; echo "\n";
?> ?>
<tr> <tr class="<?php echo $odd_row ? 'odd' : 'even'; ?> noclick">
<td align="<?php echo $cell_align_right; ?>" bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap"> <td align="<?php echo $cell_align_right; ?>" nowrap="nowrap">
<!-- Row controls --> <!-- Row controls -->
<table bgcolor="<?php echo $bgcolor; ?>" border="0" cellpadding="0" cellspacing="0"> <table border="0" cellpadding="0" cellspacing="0">
<tr> <tr>
<td align="<?php echo $cell_align_right; ?>" nowrap="nowrap"> <td align="<?php echo $cell_align_right; ?>" nowrap="nowrap">
<small><?php echo $strQBEIns; ?>:</small> <small><?php echo $strQBEIns; ?>:</small>
<input type="checkbox" name="ins_row[<?php echo $w; ?>]" /> <input type="checkbox" name="ins_row[<?php echo $w; ?>]" />
</td> </td>
<td align="<?php echo $cell_align_right; ?>"> <td align="<?php echo $cell_align_right; ?>">
<b><?php echo $strAnd; ?>:</b> <b><?php echo $strAnd; ?>:</b>
</td> </td>
<td> <td>
<input type="radio" name="and_or_row[<?php echo $w; ?>]" value="and"<?php echo $chk['and']; ?> /> <input type="radio" name="and_or_row[<?php echo $w; ?>]" value="and"<?php echo $chk['and']; ?> />
</td> </td>
</tr> </tr>
<tr> <tr>
<td align="<?php echo $cell_align_right; ?>" nowrap="nowrap"> <td align="<?php echo $cell_align_right; ?>" nowrap="nowrap">
<small><?php echo $strQBEDel; ?>:</small> <small><?php echo $strQBEDel; ?>:</small>
<input type="checkbox" name="del_row[<?php echo $w; ?>]" /> <input type="checkbox" name="del_row[<?php echo $w; ?>]" />
</td> </td>
<td align="<?php echo $cell_align_right; ?>"> <td align="<?php echo $cell_align_right; ?>">
<b><?php echo $strOr; ?>:</b> <b><?php echo $strOr; ?>:</b>
</td> </td>
<td> <td>
<input type="radio" name="and_or_row[<?php echo $w; ?>]" value="or"<?php echo $chk['or']; ?> /> <input type="radio" name="and_or_row[<?php echo $w; ?>]" value="or"<?php echo $chk['or']; ?> />
</td> </td>
</tr> </tr>
</table> </table>
</td> </td>
<?php <?php
$z = 0; $z = 0;
for ($x = 0; $x < $col; $x++) { for ($x = 0; $x < $col; $x++) {
@@ -472,9 +466,9 @@ for ($y = 0; $y <= $row; $y++) {
echo "\n"; echo "\n";
$or = 'Or' . $w . '[' . $z . ']'; $or = 'Or' . $w . '[' . $z . ']';
?> ?>
<td align="center" bgcolor="<?php echo $bgcolor; ?>"> <td align="center">
<textarea cols="20" rows="2" style="width: <?php echo $realwidth; ?>" name="<?php echo $or; ?>" dir="<?php echo $text_dir; ?>"></textarea> <textarea cols="20" rows="2" style="width: <?php echo $realwidth; ?>" name="<?php echo $or; ?>" dir="<?php echo $text_dir; ?>"></textarea>
</td> </td>
<?php <?php
$z++; $z++;
} // end if } // end if
@@ -493,9 +487,9 @@ for ($y = 0; $y <= $row; $y++) {
$stripped_or = ''; $stripped_or = '';
} }
?> ?>
<td align="center" bgcolor="<?php echo $bgcolor; ?>"> <td align="center">
<textarea cols="20" rows="2" style="width: <?php echo $realwidth; ?>" name="Or<?php echo $w . '[' . $z . ']'; ?>" dir="<?php echo $text_dir; ?>"><?php echo htmlspecialchars($stripped_or); ?></textarea> <textarea cols="20" rows="2" style="width: <?php echo $realwidth; ?>" name="Or<?php echo $w . '[' . $z . ']'; ?>" dir="<?php echo $text_dir; ?>"><?php echo htmlspecialchars($stripped_or); ?></textarea>
</td> </td>
<?php <?php
if (!empty(${$or}) && isset(${$or}[$x])) { if (!empty(${$or}) && isset(${$or}[$x])) {
${'cur' . $or}[$z] = ${$or}[$x]; ${'cur' . $or}[$z] = ${$or}[$x];
@@ -505,17 +499,15 @@ for ($y = 0; $y <= $row; $y++) {
$w++; $w++;
echo "\n"; echo "\n";
?> ?>
</tr> </tr>
<?php <?php
echo "\n"; echo "\n";
$odd_row =! $odd_row;
} // end for } // end for
?> ?>
<!-- Modify columns -->
<!-- Modify columns --> <tr class="even noclick">
<tr> <th><?php echo $strModify; ?>:</th>
<td class="tblHeaders" align="<?php echo $cell_align_right; ?>">
<b><?php echo $strModify; ?>:&nbsp;</b>
</td>
<?php <?php
$z = 0; $z = 0;
for ($x = 0; $x < $col; $x++) { for ($x = 0; $x < $col; $x++) {
@@ -529,17 +521,17 @@ for ($x = 0; $x < $col; $x++) {
$chk['or'] = ''; $chk['or'] = '';
} }
?> ?>
<td align="center" bgcolor="<?php echo $cfg['BgcolorTwo']; ?>"> <td align="center">
<b><?php echo $strOr; ?>:</b> <b><?php echo $strOr; ?>:</b>
<input type="radio" name="and_or_col[<?php echo $z; ?>]" value="or"<?php echo $chk['or']; ?> /> <input type="radio" name="and_or_col[<?php echo $z; ?>]" value="or"<?php echo $chk['or']; ?> />
&nbsp;&nbsp;<b><?php echo $strAnd; ?>:</b> &nbsp;&nbsp;<b><?php echo $strAnd; ?>:</b>
<input type="radio" name="and_or_col[<?php echo $z; ?>]" value="and"<?php echo $chk['and']; ?> /> <input type="radio" name="and_or_col[<?php echo $z; ?>]" value="and"<?php echo $chk['and']; ?> />
<br /> <br />
<?php echo $strQBEIns . "\n"; ?> <?php echo $strQBEIns . "\n"; ?>
<input type="checkbox" name="ins_col[<?php echo $z; ?>]" /> <input type="checkbox" name="ins_col[<?php echo $z; ?>]" />
&nbsp;&nbsp;<?php echo $strQBEDel . "\n"; ?> &nbsp;&nbsp;<?php echo $strQBEDel . "\n"; ?>
<input type="checkbox" name="del_col[<?php echo $z; ?>]" /> <input type="checkbox" name="del_col[<?php echo $z; ?>]" />
</td> </td>
<?php <?php
$z++; $z++;
} // end if } // end if
@@ -560,17 +552,17 @@ for ($x = 0; $x < $col; $x++) {
$chk['or'] = ''; $chk['or'] = '';
} }
?> ?>
<td align="center" bgcolor="<?php echo $cfg['BgcolorTwo']; ?>"> <td align="center">
<b><?php echo $strOr; ?>:</b> <b><?php echo $strOr; ?>:</b>
<input type="radio" name="and_or_col[<?php echo $z; ?>]" value="or"<?php echo $chk['or']; ?> /> <input type="radio" name="and_or_col[<?php echo $z; ?>]" value="or"<?php echo $chk['or']; ?> />
&nbsp;&nbsp;<b><?php echo $strAnd; ?>:</b> &nbsp;&nbsp;<b><?php echo $strAnd; ?>:</b>
<input type="radio" name="and_or_col[<?php echo $z; ?>]" value="and"<?php echo $chk['and']; ?> /> <input type="radio" name="and_or_col[<?php echo $z; ?>]" value="and"<?php echo $chk['and']; ?> />
<br /> <br />
<?php echo $strQBEIns . "\n"; ?> <?php echo $strQBEIns . "\n"; ?>
<input type="checkbox" name="ins_col[<?php echo $z; ?>]" /> <input type="checkbox" name="ins_col[<?php echo $z; ?>]" />
&nbsp;&nbsp;<?php echo $strQBEDel . "\n"; ?> &nbsp;&nbsp;<?php echo $strQBEDel . "\n"; ?>
<input type="checkbox" name="del_col[<?php echo $z; ?>]" /> <input type="checkbox" name="del_col[<?php echo $z; ?>]" />
</td> </td>
<?php <?php
$z++; $z++;
echo "\n"; echo "\n";
@@ -580,52 +572,51 @@ for ($x = 0; $x < $col; $x++) {
</table> </table>
<!-- Other controls --> <!-- Other controls -->
<?php echo PMA_generate_common_hidden_inputs(); ?> <?php
$w--;
$url_params['db'] = $db;
$url_params['col_cnt'] = $z;
$url_params['rows'] = $w;
echo PMA_generate_common_hidden_inputs($url_params);
?>
<fieldset class="tblFooters">
<table border="0" cellpadding="2" cellspacing="1"> <table border="0" cellpadding="2" cellspacing="1">
<tr> <tr>
<td nowrap="nowrap"><input type="hidden" value="<?php echo htmlspecialchars($db); ?>" name="db" /> <td nowrap="nowrap">
<input type="hidden" value="<?php echo $z; ?>" name="col_cnt" /> <?php echo $strAddDeleteRow; ?>:
<?php <select size="1" name="add_row" style="vertical-align: middle">
$w--; <option value="-3">-3</option>
?> <option value="-2">-2</option>
<input type="hidden" value="<?php echo $w; ?>" name="rows" /> <option value="-1">-1</option>
<?php echo $strAddDeleteRow; ?>: <option value="0" selected="selected">0</option>
<select size="1" name="add_row" style="vertical-align: middle"> <option value="1">1</option>
<option value="-3">-3</option> <option value="2">2</option>
<option value="-2">-2</option> <option value="3">3</option>
<option value="-1">-1</option> </select>
<option value="0" selected="selected">0</option> </td>
<option value="1">1</option> <td width="10">&nbsp;</td>
<option value="2">2</option> <td nowrap="nowrap"><?php echo $strAddDeleteColumn; ?>:
<option value="3">3</option> <select size="1" name="add_col" style="vertical-align: middle">
</select> <option value="-3">-3</option>
</td> <option value="-2">-2</option>
<td width="10">&nbsp;</td> <option value="-1">-1</option>
<td nowrap="nowrap"><?php echo $strAddDeleteColumn; ?>: <option value="0" selected="selected">0</option>
<select size="1" name="add_col" style="vertical-align: middle"> <option value="1">1</option>
<option value="-3">-3</option> <option value="2">2</option>
<option value="-2">-2</option> <option value="3">3</option>
<option value="-1">-1</option> </select>
<option value="0" selected="selected">0</option> </td>
<option value="1">1</option> <td width="10">&nbsp;</td>
<option value="2">2</option> <!-- Generates a query -->
<option value="3">3</option> <td><input type="submit" name="modify" value="<?php echo $strUpdateQuery; ?>" /></td>
</select> </tr>
</td> </table>
<td width="10">&nbsp;</td> </fieldset>
<!-- Generates a query -->
<td><input type="submit" name="modify" value="<?php echo $strUpdateQuery; ?>" /></td>
</tr>
</table><br />
<table border="0" cellpadding="2" cellspacing="1"> <table>
<tr> <tr><td>
<td class="tblHeaders">&nbsp;<?php echo $strUseTables; ?>:&nbsp;</td> <fieldset>
<td width="20">&nbsp;</td> <legend><?php echo $strUseTables; ?></legend>
<td class="tblHeaders">&nbsp;<?php echo sprintf($strQueryOnDb, htmlspecialchars($db)); ?>&nbsp;</td>
</tr>
<tr>
<td bgcolor="<?php echo $cfg['BgcolorOne']; ?>">
<?php <?php
$strTableListOptions = ''; $strTableListOptions = '';
$numTableListOptions = 0; $numTableListOptions = 0;
@@ -635,14 +626,23 @@ foreach ($tbl_names AS $key => $val) {
$numTableListOptions++; $numTableListOptions++;
} }
?> ?>
<select name="TableList[]" size="<?php echo ($numTableListOptions > 30) ? '15' : '7'; ?>" multiple="multiple" id="listTable"> <select name="TableList[]" multiple="multiple" id="listTable"
<?php echo $strTableListOptions; ?> size="<?php echo ($numTableListOptions > 30) ? '15' : '7'; ?>">
<?php echo $strTableListOptions; ?>
</select> </select>
</td> </fieldset>
<td>&nbsp;&nbsp;</td> <fieldset class="tblFooters">
<!-- Displays the current query --> <input type="submit" name="modify" value="<?php echo $strUpdateQuery; ?>" />
<td bgcolor="<?php echo $cfg['BgcolorOne']; ?>"> </fieldset>
<textarea cols="30" rows="<?php echo ($numTableListOptions > 30) ? '15' : '7'; ?>" name="sql_query" dir="<?php echo $text_dir; ?>" id="textSqlquery"> </td>
<td width="20">&nbsp;</td>
<td>
<fieldset>
<legend><?php echo sprintf($strQueryOnDb, PMA_getDbLink($db)); ?>
</legend>
<textarea cols="30" name="sql_query" id="textSqlquery"
rows="<?php echo ($numTableListOptions > 30) ? '15' : '7'; ?>"
dir="<?php echo $text_dir; ?>">
<?php <?php
// 1. SELECT // 1. SELECT
$last_select = 0; $last_select = 0;
@@ -1012,22 +1012,19 @@ if (!empty($qry_orderby)) {
echo 'ORDER BY ' . htmlspecialchars($qry_orderby) . "\n"; echo 'ORDER BY ' . htmlspecialchars($qry_orderby) . "\n";
} }
?> ?>
</textarea> </textarea>
<input type="hidden" name="encoded_sql_query" value="<?php echo $encoded_qry; ?>" /> <input type="hidden" name="encoded_sql_query" value="<?php echo $encoded_qry; ?>" />
</td> </fieldset>
</tr> <fieldset class="tblFooters">
<tr> <input type="submit" name="submit_sql" value="<?php echo $strRunQuery; ?>" />
<!-- Generates a query --> </fieldset>
<td align="right" class="tblHeaders"><input type="submit" name="modify" value="<?php echo $strUpdateQuery; ?>" /></td> </td>
<td>&nbsp;</td> </tr>
<!-- Execute a query -->
<td align="right" class="tblHeaders"><input type="submit" name="submit_sql" value="<?php echo $strRunQuery; ?>" /></td>
</tr>
</table> </table>
</form> </form>
<?php <?php
/** /**
* Displays the footer * Displays the footer
*/ */
require_once('./libraries/footer.inc.php'); require_once './libraries/footer.inc.php';
?> ?>