removed tabs and/or trailing spaces
This commit is contained in:
@@ -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.
|
||||||
|
|
||||||
|
@@ -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';
|
||||||
|
@@ -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';
|
||||||
|
@@ -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 ';
|
||||||
|
@@ -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>';
|
||||||
|
@@ -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 : '';
|
||||||
|
@@ -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) {
|
|
||||||
$field_unique[]=$i;
|
|
||||||
}
|
}
|
||||||
|
if (${'field_key_' . $i} == '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()) {
|
||||||
|
@@ -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) {
|
|
||||||
$field_unique[]=$i;
|
|
||||||
}
|
}
|
||||||
|
if (${'field_key_' . $i} == '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])) {
|
||||||
|
@@ -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,7 +210,7 @@ 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"';
|
||||||
@@ -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
|
||||||
|
Reference in New Issue
Block a user