fixed coding inconcistencies

This commit is contained in:
Loïc Chapeaux
2001-08-29 22:28:25 +00:00
parent 4b9fdbd471
commit 2e6a11c47b
2 changed files with 13 additions and 8 deletions

View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2001-08-30 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* lib.inc.php3: fits to coding standards.
2001-08-29 Olivier M<>ller <om@omnis.ch> 2001-08-29 Olivier M<>ller <om@omnis.ch>
* left.php3: on login with std_auth, only the databases on which * left.php3: on login with std_auth, only the databases on which
the user has rights will be shown (tested with @mysql_select_db($dbname)). the user has rights will be shown (tested with @mysql_select_db($dbname)).

View File

@@ -722,6 +722,8 @@ window.parent.frames['nav'].location.replace('<?php echo $reload_url; ?>');
* @global string the current sql query * @global string the current sql query
* @global integer the current position in results * @global integer the current position in results
* @global string the url to go back in case of errors * @global string the url to go back in case of errors
* @global boolean whether to limit the number of displayed charcaters of
* text type fields or not
* @global integer the maximum number of rows per page * @global integer the maximum number of rows per page
* @global integer the total number of rows returned by the sql query * @global integer the total number of rows returned by the sql query
*/ */
@@ -729,7 +731,7 @@ window.parent.frames['nav'].location.replace('<?php echo $reload_url; ?>');
{ {
global $lang, $server, $db, $table; global $lang, $server, $db, $table;
global $sql_query, $pos, $goto, $dontlimitchars; global $sql_query, $pos, $goto, $dontlimitchars;
global $sessionMaxRows, $SelectNumRows, $cfgLimitChars; global $sessionMaxRows, $SelectNumRows;
// $sql_query will be stripslashed in 'sql.php3' if the // $sql_query will be stripslashed in 'sql.php3' if the
// 'magic_quotes_gpc' directive is set to 'on' // 'magic_quotes_gpc' directive is set to 'on'
@@ -836,13 +838,10 @@ window.parent.frames['nav'].location.replace('<?php echo $reload_url; ?>');
</td> </td>
<?php <?php
} // end move toward } // end move toward
echo "\n";
// cfgLimitChars stuff // cfgLimitChars stuff
if (!$dontlimitchars) { if (!$dontlimitchars) {
echo "\n";
?> ?>
<td> <td>
&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
@@ -863,6 +862,7 @@ window.parent.frames['nav'].location.replace('<?php echo $reload_url; ?>');
</td> </td>
<?php <?php
} else { } else {
echo "\n";
?> ?>
<td> <td>
&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
@@ -878,12 +878,12 @@ window.parent.frames['nav'].location.replace('<?php echo $reload_url; ?>');
<input type="hidden" name="sessionMaxRows" value="<?php echo $sessionMaxRows; ?>" /> <input type="hidden" name="sessionMaxRows" value="<?php echo $sessionMaxRows; ?>" />
<input type="hidden" name="goto" value="<?php echo $goto; ?>" /> <input type="hidden" name="goto" value="<?php echo $goto; ?>" />
<input type="hidden" name="dontlimitchars" value="0" /> <input type="hidden" name="dontlimitchars" value="0" />
<input type="submit" name="navig" value="<?php echo $GLOBALS['str2'] . " " . $cfgLimitChars; ?> chars" /> <input type="submit" name="navig" value="<?php echo $GLOBALS['str2'] . ' ' . $GLOBALS['cfgLimitChars']; ?> chars" />
</form> </form>
</td> </td>
<?php <?php
} } // end cfgLimitChars toward
echo "\n";
?> ?>
</tr> </tr>
</table> </table>
@@ -908,6 +908,8 @@ window.parent.frames['nav'].location.replace('<?php echo $reload_url; ?>');
* @global string the current sql query * @global string the current sql query
* @global string the url to go back in case of errors * @global string the url to go back in case of errors
* @global integer the total number of rows returned by the sql query * @global integer the total number of rows returned by the sql query
* @global boolean whether to limit the number of displayed charcaters of
* text type fields or not
*/ */
function display_table($dt_result, $is_simple = FALSE) function display_table($dt_result, $is_simple = FALSE)
{ {