diff --git a/ChangeLog b/ChangeLog index 80164b1b2..f8a9ea37a 100755 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ $Source$ 2003-07-24 Garvin Hicking * libraries/sqlparser.lib.php3 - Confirmation is also needed on TRUNCATE statements! + * libraries/common.lib.php3 - RFE #758051 (simpler PHPcode generation) 2003-07-24 Marc Delisle * libraries/sqlparser.lib.php3 /relation.lib.php3 /get_foreign.lib.php3: diff --git a/config.inc.php3 b/config.inc.php3 index 8545e80d3..cd475be34 100755 --- a/config.inc.php3 +++ b/config.inc.php3 @@ -36,7 +36,7 @@ if (!isset($old_error_reporting)) { * If the auto-detection code does work properly, you can set to TRUE the * $cfg['PmaAbsoluteUri_DisableWarning'] variable below. */ -$cfg['PmaAbsoluteUri'] = ''; +$cfg['PmaAbsoluteUri'] = 'http://www.garvinhicking.de/cvs/phpMyAdmin/'; /** @@ -76,9 +76,12 @@ $cfg['Servers'][$i]['controluser'] = ''; // MySQL control user settin // (this user must have read-only $cfg['Servers'][$i]['controlpass'] = ''; // access to the "mysql/user" // and "mysql/db" tables) -$cfg['Servers'][$i]['auth_type'] = 'config'; // Authentication method (config, http or cookie based)? -$cfg['Servers'][$i]['user'] = 'root'; // MySQL user -$cfg['Servers'][$i]['password'] = ''; // MySQL password (only needed +$cfg['Servers'][$i]['auth_type'] = 'http'; // Authentication method (config, http or cookie based)? +$cfg['Servers'][$i]['blowfish_secret'] = 'hammer'; // Secret key used by + // blowfish encryption + // (if auth_type='cookie') +$cfg['Servers'][$i]['user'] = 'superdbl'; // MySQL user +$cfg['Servers'][$i]['password'] = 'geheim00'; // MySQL password (only needed // with 'config' auth_type) $cfg['Servers'][$i]['only_db'] = ''; // If set to a db-name, only // this db is displayed @@ -228,7 +231,7 @@ $cfg['SuggestDBName'] = TRUE; // suggest a new DB name if possible (fa // In browse mode... $cfg['ShowBlob'] = FALSE; // display blob field contents $cfg['NavigationBarIconic'] = TRUE; // do not display text inside navigation bar buttons -$cfg['ShowAll'] = FALSE; // allows to display all the rows +$cfg['ShowAll'] = TRUE; // allows to display all the rows $cfg['MaxRows'] = 30; // maximum number of rows to display $cfg['Order'] = 'ASC'; // default for 'ORDER BY' clause (valid // values are 'ASC', 'DESC' or 'SMART' -ie diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3 index 4192e4685..c985bd7bc 100644 --- a/libraries/common.lib.php3 +++ b/libraries/common.lib.php3 @@ -1333,7 +1333,7 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold} /* SQL-Parser-Analyzer */ $sqlnr = 1; if (!empty($GLOBALS['show_as_php'])) { - $new_line = '\';
' . "\n" . ' $sql .= \''; + $new_line = '\'
' . "\n" . '        . \''; } if (isset($new_line)) { /* SQL-Parser-Analyzer */