diff --git a/Documentation.html b/Documentation.html index 7e94df4af..dc7091755 100755 --- a/Documentation.html +++ b/Documentation.html @@ -211,15 +211,15 @@

Documentation warning: when you see in this - document a .php3 file extension, please transpose to .php + document a .php3 file extension, please transpose to .php if you are using a kit with files having this extension.

Quick Install:

  1. Use a distribution kit with the files having the extension - (.php3 or .php) depending on the way your web/PHP server interprets - those extensions.
    2. + (.php3 or .php) depending on the way your web/PHP server + interprets those extensions.
  2. Untar or unzip the distribution (be sure to unzip the subdirectories): tar xzvf phpMyAdmin_x.x.x.tar.gz in your webserver's document root.
    3. @@ -439,12 +439,13 @@ Please see the install section on "Using http authentication" for more information.

    - Note that if you try login to phpMyAdmin with this "controluser", - you could get some errors, depending the exact privileges you gave to - the "controluser". phpMyAdmin does not support a direct login - with the "controluser". + Note that if you try login to phpMyAdmin with this + "controluser", you could get some errors, depending the exact + privileges you gave to the "controluser". phpMyAdmin does not + support a direct login with the "controluser".

    - In versions before 2.2.5, those were called stduser/stdpass. + In versions before 2.2.5, those were called + "stduser/stdpass".

    @@ -548,8 +549,8 @@
    - Note that controluser must have SELECT, INSERT - and DELETE privileges on the bookmark table. + Note that controluser must have SELECT, + INSERT and DELETE privileges on the bookmark table. Here is a query to set up those privileges (using "pma" as the controluser:
    GRANT SELECT,INSERT,DELETE ON <bookmarkdb>.<bookmarktable> to 'pma'@localhost; @@ -1122,14 +1123,14 @@

    For RedHat users, Harald Legner suggests this on the mailing list:

    - On my RedHat-Box the socket of mysql is /var/lib/mysql/mysql.sock. In your - php.ini you will find a line + On my RedHat-Box the socket of mysql is /var/lib/mysql/mysql.sock. + In your php.ini you will find a line
    - mysql.default_socket = /tmp/mysql.sock +     mysql.default_socket = /tmp/mysql.sock
    change it to
    - mysql.default_socket = /var/lib/mysql/mysql.sock +     mysql.default_socket = /var/lib/mysql/mysql.sock
    Then restart apache and it will work.

    @@ -1280,8 +1281,8 @@
    Starting with 2.2.5, in the user management page, you can enter a wildcard database name for a user, and put the privileges you want. For example, - adding SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER would - let a user create/manage his/her database(s). + adding SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER + would let a user create/manage his/her database(s).

    [Browsers or client OS]

    @@ -1637,7 +1638,7 @@ P Kristof Hamann, Thomas Kläger, Lubos Klokner, Martin Marconcini, Girish Nair, David Nordenberg, Bernard M. Piller, Laurent Haas, "Sakamoto", Yuval Sarna, www.securereality.com.au, -Peter Svec, Michael Tacelosky, Daniel Villanueva, Vinay, +Peter Svec, Michael Tacelosky, Luís V., Daniel Villanueva, Vinay, Ignacio Vazquez-Abrams, Chee Wai, Jakub Wilk, Thomas Michael Winningham. diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3 index a6dea1196..689b7aede 100644 --- a/libraries/common.lib.php3 +++ b/libraries/common.lib.php3 @@ -71,7 +71,6 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){ include('./config.inc.php3'); // For compatibility with old config.inc.php3 - if (!isset($cfgExecTimeLimit)) { $cfgExecTimeLimit = 300; // 5 minutes } @@ -177,7 +176,7 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){ $suffix = '.dll'; } else { $suffix = '.so'; - } + } if (!@extension_loaded($extension)) { @dl($extension.$suffix); } @@ -428,7 +427,7 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){ if (isset($cfgServer['stduser'])) { $cfgServer['controluser'] = $cfgServer['stduser']; $cfgServer['controlpass'] = $cfgServer['stdpass']; - } + } // Gets the authentication library that fits the cfgServer settings // and run authentication @@ -492,8 +491,8 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){ @ini_set('track_errors', $bkp_track_err); } - // If controluser isn't defined, use the current user settings to get his - // rights + // If controluser isn't defined, use the current user settings to get + // his rights if ($cfgServer['controluser'] == '') { $dbh = $userlink; } @@ -556,7 +555,7 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){ . 'FROM mysql.user ' . 'WHERE User = \'' . PMA_sqlAddslashes($cfgServer['user']) . '\''; $rs = mysql_query($auth_query, $dbh); // Debug: or PMA_mysqlDie('', $auth_query, FALSE); - } // end + } // end } // end if (!$dblist_cnt) // Access to "mysql" db allowed and dblist still empty -> gets the