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

removed tabs and/or trailing spaces

Browse Source
This commit is contained in:
Loïc Chapeaux
2002-02-10 09:31:41 +00:00
parent 579387e7c4
commit 7f919e6a86
54 changed files with 450 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -5,11 +5,14 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2002-02-09 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* most of the scripts: removed tabs and/or trailing spaces.
2002-02-09 Marc Delisle <lem9@users.sourceforge.net> 2002-02-09 Marc Delisle <lem9@users.sourceforge.net>
* main.php3, libraries/auth/cookie.auth.lib.php3, Patch * main.php3, libraries/auth/cookie.auth.lib.php3, Patch
495360 (cookie with domain), experimental, thanks to 495360 (cookie with domain), experimental, thanks to
Piotr Roszatycki (d3xter) and Christoph (certelt). Piotr Roszatycki (d3xter) and Christoph (certelt).
* tbl_properties.inc.php3: clarifications * tbl_properties.inc.php3: clarifications.
* tbl_create.php3, tbl_addfield.php3, tbl_properties.inc.php3: * tbl_create.php3, tbl_addfield.php3, tbl_properties.inc.php3:
radio buttons for indexes. radio buttons for indexes.

6
lang/czech-iso.inc.php3
View File

@@ -258,9 +258,9 @@ $strRowLength = 'D
$strRows = '<27><>dk<64>'; $strRows = '<27><>dk<64>';
$strRowsFrom = '<27><>dk<64> za<7A><61>naj<61>c<EFBFBD> od'; $strRowsFrom = '<27><>dk<64> za<7A><61>naj<61>c<EFBFBD> od';
$strRowSize = ' Velikost <20><>dku '; $strRowSize = ' Velikost <20><>dku ';
$strRowsModeVertical='svisl<73>m'; $strRowsModeVertical = 'svisl<73>m';
$strRowsModeHorizontal='vodorovn<76>m'; $strRowsModeHorizontal = 'vodorovn<76>m';
$strRowsModeOptions='ve %s re<72>imu a opakovat hlavi<76>ky po %s <20><>dc<64>ch.'; $strRowsModeOptions = 've %s re<72>imu a opakovat hlavi<76>ky po %s <20><>dc<64>ch.';
$strRowsStatistic = 'Statistika <20><>dk<64>'; $strRowsStatistic = 'Statistika <20><>dk<64>';
$strRunning = 'b<><62><EFBFBD>c<EFBFBD> na %s'; $strRunning = 'b<><62><EFBFBD>c<EFBFBD> na %s';
$strRunQuery = 'Prov<6F>st dotaz'; $strRunQuery = 'Prov<6F>st dotaz';

6
lang/czech-win1250.inc.php3
View File

@@ -258,9 +258,9 @@ $strRowLength = 'D
$strRows = '<27><>dk<64>'; $strRows = '<27><>dk<64>';
$strRowsFrom = '<27><>dk<64> za<7A><61>naj<61>c<EFBFBD> od'; $strRowsFrom = '<27><>dk<64> za<7A><61>naj<61>c<EFBFBD> od';
$strRowSize = ' Velikost <20><>dku '; $strRowSize = ' Velikost <20><>dku ';
$strRowsModeVertical='svisl<73>m'; $strRowsModeVertical = 'svisl<73>m';
$strRowsModeHorizontal='vodorovn<76>m'; $strRowsModeHorizontal = 'vodorovn<76>m';
$strRowsModeOptions='ve %s re<72>imu a opakovat hlavi<76>ky po %s <20><>dc<64>ch.'; $strRowsModeOptions = 've %s re<72>imu a opakovat hlavi<76>ky po %s <20><>dc<64>ch.';
$strRowsStatistic = 'Statistika <20><>dk<64>'; $strRowsStatistic = 'Statistika <20><>dk<64>';
$strRunning = 'b<><62><EFBFBD>c<EFBFBD> na %s'; $strRunning = 'b<><62><EFBFBD>c<EFBFBD> na %s';
$strRunQuery = 'Prov<6F>st dotaz'; $strRunQuery = 'Prov<6F>st dotaz';

2
lang/english.inc.php3
View File

@@ -280,7 +280,7 @@ $strSetEnumVal = 'If field type is "enum" or "set", please enter the values usin
$strShow = 'Show'; $strShow = 'Show';
$strShowAll = 'Show all'; $strShowAll = 'Show all';
$strShowCols = 'Show columns'; $strShowCols = 'Show columns';
$strShowingRecords = 'Showing rows '; $strShowingRecords = 'Showing rows';
$strShowPHPInfo = 'Show PHP information'; $strShowPHPInfo = 'Show PHP information';
$strShowTables = 'Show tables'; $strShowTables = 'Show tables';
$strShowThisQuery = ' Show this query here again '; $strShowThisQuery = ' Show this query here again ';

6
lang/ukrainian-win1251.inc.php3
View File

@@ -258,9 +258,9 @@ $strRowLength = '
$strRows = '<27><><EFBFBD><EFBFBD><EFBFBD>'; $strRows = '<27><><EFBFBD><EFBFBD><EFBFBD>';
$strRowsFrom = '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>'; $strRowsFrom = '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>';
$strRowSize = ' <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> '; $strRowSize = ' <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> ';
$strRowsModeVertical=" <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> "; $strRowsModeVertical = ' <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ';
$strRowsModeHorizontal=" <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> "; $strRowsModeHorizontal = ' <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ';
$strRowsModeOptions="-<2D><> %s <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> %s <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> "; $strRowsModeOptions = '-<2D><> %s <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> %s <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ';
$strRowsStatistic = '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>'; $strRowsStatistic = '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>';
$strRunning = '<27><> %s'; $strRunning = '<27><> %s';
$strRunQuery = '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>'; $strRunQuery = '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>';

2
libraries/build_dump.lib.php3
View File

@@ -211,7 +211,7 @@ if (!defined('PMA_BUILD_DUMP_LIB_INCLUDED')){
@set_time_limit($GLOBALS['cfgExecTimeLimit']); @set_time_limit($GLOBALS['cfgExecTimeLimit']);
while ($row = mysql_fetch_row($result)) { while ($row = mysql_fetch_row($result)) {
$current_row++; $current_row++;
for ($j = 0; $j < $fields_cnt; $j++) { for ($j = 0; $j < $fields_cnt; $j++) {
if (!isset($row[$j])) { if (!isset($row[$j])) {
$values[] = 'NULL'; $values[] = 'NULL';

2
read_dump.php3
View File

@@ -188,7 +188,7 @@ $err_url = $goto
/** /**
* Set up default values for some variables and * Set up default values for some variables
*/ */
$view_bookmark = 0; $view_bookmark = 0;
$sql_bookmark = isset($sql_bookmark) ? $sql_bookmark : ''; $sql_bookmark = isset($sql_bookmark) ? $sql_bookmark : '';

16
tbl_addfield.php3
View File

@@ -28,19 +28,19 @@ $err_url = 'tbl_properties.php3'
if (isset($submit)) { if (isset($submit)) {
$query = ''; $query = '';
// transform the radio button field_key into 3 arrays // Transforms the radio button field_key into 3 arrays
$field_cnt = count($field_name); $field_cnt = count($field_name);
for ($i = 0; $i < $field_cnt; ++$i) { for ($i = 0; $i < $field_cnt; ++$i) {
if (${'field_key_'.$i} == 'primary_'.$i) { if (${'field_key_' . $i} == 'primary_' . $i) {
$field_primary[]=$i; $field_primary[] = $i;
} }
if (${'field_key_'.$i} == 'index_'.$i) { if (${'field_key_' . $i} == 'index_' . $i) {
$field_index[]=$i; $field_index[] = $i;
} }
if (${'field_key_'.$i} == 'unique_'.$i) { if (${'field_key_' . $i} == 'unique_' . $i) {
$field_unique[]=$i; $field_unique[] = $i;
} }
} } // end for
// Builds the field creation statement and alters the table // Builds the field creation statement and alters the table
for ($i = 0; $i < $field_cnt; ++$i) { for ($i = 0; $i < $field_cnt; ++$i) {
if (get_magic_quotes_gpc()) { if (get_magic_quotes_gpc()) {

56
tbl_change.php3
View File

@@ -247,41 +247,41 @@ for ($i = 0; $i < $fields_cnt; $i++) {
// 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 ($cfgShowFunctionFields) {
if ((($cfgProtectBinary && $is_blob) if ((($cfgProtectBinary && $is_blob)
|| ($cfgProtectBinary == 'all' && $is_binary)) || ($cfgProtectBinary == 'all' && $is_binary))
&& !empty($data)) { && !empty($data)) {
echo ' <td align="center" bgcolor="'. $bgcolor . '">' . $strBinary . '</td>' . "\n"; echo ' <td align="center" bgcolor="'. $bgcolor . '">' . $strBinary . '</td>' . "\n";
} else if (strstr($row_table_def['True_Type'], 'enum') || strstr($row_table_def['True_Type'], 'set')) { } else if (strstr($row_table_def['True_Type'], 'enum') || strstr($row_table_def['True_Type'], 'set')) {
echo ' <td align="center" bgcolor="'. $bgcolor . '">--</td>' . "\n"; echo ' <td align="center" bgcolor="'. $bgcolor . '">--</td>' . "\n";
} else { } else {
?> ?>
<td bgcolor="<?php echo $bgcolor; ?>"> <td bgcolor="<?php echo $bgcolor; ?>">
<select name="funcs[<?php echo urlencode($field); ?>]"> <select name="funcs[<?php echo urlencode($field); ?>]">
<option></option> <option></option>
<?php <?php
echo "\n"; echo "\n";
if (!$first_timestamp) { if (!$first_timestamp) {
for ($j = 0; $j < count($cfgFunctions); $j++) { for ($j = 0; $j < count($cfgFunctions); $j++) {
echo ' '; echo ' ';
echo '<option>' . $cfgFunctions[$j] . '</option>' . "\n"; echo '<option>' . $cfgFunctions[$j] . '</option>' . "\n";
} }
} else { } else {
// for default function = NOW() on first timestamp field // for default function = NOW() on first timestamp field
// -- swix/18jul01 // -- swix/18jul01
for ($j = 0; $j < count($cfgFunctions); $j++) { for ($j = 0; $j < count($cfgFunctions); $j++) {
echo ' '; echo ' ';
if ($cfgFunctions[$j] == 'NOW') { if ($cfgFunctions[$j] == 'NOW') {
echo '<option selected="selected">' . $cfgFunctions[$j] . '</option>' . "\n"; echo '<option selected="selected">' . $cfgFunctions[$j] . '</option>' . "\n";
} else { } else {
echo '<option>' . $cfgFunctions[$j] . '</option>' . "\n"; echo '<option>' . $cfgFunctions[$j] . '</option>' . "\n";
} }
} // end for } // end for
} }
?> ?>
</select> </select>
</td> </td>
<?php <?php
} }
} }
echo "\n"; echo "\n";
@@ -302,7 +302,7 @@ for ($i = 0; $i < $fields_cnt; $i++) {
} }
} else if (strstr($row_table_def['True_Type'], 'set')) { } else if (strstr($row_table_def['True_Type'], 'set')) {
echo ' onclick="if (this.checked) {document.forms[\'insertForm\'].elements[\'field_' . md5($field) . '[]\'].selectedIndex = -1}; return true" />' . "\n"; echo ' onclick="if (this.checked) {document.forms[\'insertForm\'].elements[\'field_' . md5($field) . '[]\'].selectedIndex = -1}; return true" />' . "\n";
} else { } else {
echo ' onclick="if (this.checked) {document.forms[\'insertForm\'].elements[\'fields[' . urlencode($field) . ']\'].value = \'\'}; return true" />' . "\n"; echo ' onclick="if (this.checked) {document.forms[\'insertForm\'].elements[\'fields[' . urlencode($field) . ']\'].value = \'\'}; return true" />' . "\n";
} }
} else { } else {

16
tbl_create.php3
View File

@@ -34,19 +34,19 @@ mysql_select_db($db);
if (isset($submit)) { if (isset($submit)) {
$sql_query = $query_cpy = ''; $sql_query = $query_cpy = '';
// transform the radio button field_key into 3 arrays // Transforms the radio button field_key into 3 arrays
$field_cnt = count($field_name); $field_cnt = count($field_name);
for ($i = 0; $i < $field_cnt; ++$i) { for ($i = 0; $i < $field_cnt; ++$i) {
if (${'field_key_'.$i} == 'primary_'.$i) { if (${'field_key_' . $i} == 'primary_' . $i) {
$field_primary[]=$i; $field_primary[] = $i;
} }
if (${'field_key_'.$i} == 'index_'.$i) { if (${'field_key_' . $i} == 'index_' . $i) {
$field_index[]=$i; $field_index[] = $i;
} }
if (${'field_key_'.$i} == 'unique_'.$i) { if (${'field_key_' . $i} == 'unique_' . $i) {
$field_unique[]=$i; $field_unique[] = $i;
} }
} } // end for
// Builds the fields creation statements // Builds the fields creation statements
for ($i = 0; $i < $field_cnt; $i++) { for ($i = 0; $i < $field_cnt; $i++) {
if (empty($field_name[$i])) { if (empty($field_name[$i])) {

2
tbl_printview.php3
View File

@@ -232,7 +232,7 @@ while (list($key, $table) = each($the_tables)) {
? count($indexes) ? count($indexes)
: 0; : 0;
if ($index_count > 0) { if ($index_count > 0) {
echo "\n"; echo "\n";
?> ?>
<br /><br /> <br /><br />

76
tbl_properties.inc.php3
View File

@@ -34,9 +34,9 @@ $is_backup = ($action != 'tbl_create.php3' && $action != 'tbl_addfield.php3');
<th><?php echo $strDefault; ?></th> <th><?php echo $strDefault; ?></th>
<th><?php echo $strExtra; ?></th> <th><?php echo $strExtra; ?></th>
<?php <?php
// We could remove this 'if' and let the key information be shown and // lem9: We could remove this 'if' and let the key information be shown and
// editable. However, for this to work, tbl_alter must be modified // editable. However, for this to work, tbl_alter must be modified to use the
// to use the key fields, as tbl_addfield does. // key fields, as tbl_addfield does.
if (!$is_backup) { if (!$is_backup) {
echo " <th>$strPrimary</th>\n"; echo " <th>$strPrimary</th>\n";
@@ -210,31 +210,31 @@ for ($i = 0 ; $i < $num_fields; $i++) {
</select> </select>
</td> </td>
<?php <?php
// See my other comment about removing this 'if'. // lem9: See my other comment about removing this 'if'.
if (!$is_backup) { if (!$is_backup) {
if (isset($row) && isset($row['Key']) && $row['Key'] == 'PRI') { if (isset($row) && isset($row['Key']) && $row['Key'] == 'PRI') {
$checked_primary = ' checked="checked"'; $checked_primary = ' checked="checked"';
} else { } else {
$checked_primary = ''; $checked_primary = '';
} }
if (isset($row) && isset($row['Key']) && $row['Key'] == 'MUL') { if (isset($row) && isset($row['Key']) && $row['Key'] == 'MUL') {
$checked_index = ' checked="checked"'; $checked_index = ' checked="checked"';
} else { } else {
$checked_index = ''; $checked_index = '';
} }
if (isset($row) && isset($row['Key']) && $row['Key'] == 'UNI') { if (isset($row) && isset($row['Key']) && $row['Key'] == 'UNI') {
$checked_unique = ' checked="checked"'; $checked_unique = ' checked="checked"';
} else { } else {
$checked_unique = ''; $checked_unique = '';
} }
if (PMA_MYSQL_INT_VERSION >= 32323 if (PMA_MYSQL_INT_VERSION >= 32323
&&(isset($row) && isset($row['Comment']) && $row['Comment'] == 'FULLTEXT')) { &&(isset($row) && isset($row['Comment']) && $row['Comment'] == 'FULLTEXT')) {
$checked_fulltext = ' checked="checked"'; $checked_fulltext = ' checked="checked"';
} else { } else {
$checked_fulltext = ''; $checked_fulltext = '';
} }
echo "\n"; echo "\n";
?> ?>
<td align="center" bgcolor="<?php echo $bgcolor; ?>"> <td align="center" bgcolor="<?php echo $bgcolor; ?>">
<input type="radio" name="field_key_<?php echo $i; ?>" value="primary_<?php echo $i; ?>"<?php echo $checked_primary; ?> /> <input type="radio" name="field_key_<?php echo $i; ?>" value="primary_<?php echo $i; ?>"<?php echo $checked_primary; ?> />
</td> </td>
@@ -247,16 +247,16 @@ for ($i = 0 ; $i < $num_fields; $i++) {
<td align="center" bgcolor="<?php echo $bgcolor; ?>"> <td align="center" bgcolor="<?php echo $bgcolor; ?>">
<input type="radio" name="field_key_<?php echo $i; ?>" value="none_<?php echo $i; ?>" /> <input type="radio" name="field_key_<?php echo $i; ?>" value="none_<?php echo $i; ?>" />
</td> </td>
<?php <?php
if (PMA_MYSQL_INT_VERSION >= 32323) { if (PMA_MYSQL_INT_VERSION >= 32323) {
echo "\n"; echo "\n";
?> ?>
<td bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap"> <td bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap">
<input type="checkbox" name="field_fulltext[]" value="<?php echo $i; ?>"<?php echo $checked_fulltext; ?> /> <input type="checkbox" name="field_fulltext[]" value="<?php echo $i; ?>"<?php echo $checked_fulltext; ?> />
</td> </td>
<?php <?php
} // end if (PMA_MYSQL_INT_VERSION >= 32323) } // end if (PMA_MYSQL_INT_VERSION >= 32323)
echo "\n"; echo "\n";
} // end if ($action ==...) } // end if ($action ==...)
echo "\n"; echo "\n";
?> ?>
@@ -336,10 +336,10 @@ if ($action == 'tbl_create.php3' && PMA_MYSQL_INT_VERSION >= 32300) {
<option value="MYISAM">MyISAM</option> <option value="MYISAM">MyISAM</option>
<option value="HEAP">Heap</option> <option value="HEAP">Heap</option>
<option value="MERGE">Merge</option> <option value="MERGE">Merge</option>
<?php if (isset($tbl_bdb)) { ?><option value="BDB">Berkeley DB</option><?php }?> <?php if (isset($tbl_bdb)) { ?><option value="BDB">Berkeley DB</option><?php } ?>
<?php if (isset($tbl_gemini)) { ?><option value="GEMINI">Gemini</option><?php }?> <?php if (isset($tbl_gemini)) { ?><option value="GEMINI">Gemini</option><?php } ?>
<?php if (isset($tbl_innodb)) { ?><option value="InnoDB">INNO DB</option><?php }?> <?php if (isset($tbl_innodb)) { ?><option value="InnoDB">INNO DB</option><?php } ?>
<?php if (isset($tbl_isam)) { ?><option value="ISAM">ISAM</option><?php }?> <?php if (isset($tbl_isam)) { ?><option value="ISAM">ISAM</option><?php } ?>
</select> </select>
</td> </td>
<?php <?php