From 92f3afbb8e2fd3248bd2775cdf9a1939f715bb00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 30 Nov 2012 11:12:06 +0100 Subject: [PATCH 1/3] Fix reference to auth_type config option --- doc/setup.rst | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/setup.rst b/doc/setup.rst index 32eec9ae8d..7659c1afa6 100644 --- a/doc/setup.rst +++ b/doc/setup.rst @@ -344,9 +344,12 @@ Signon authentication mode application to authenticate to phpMyAdmin. * The other application has to store login information into session data. -* More details in the section. -.. seealso:: :config:option:`$cfg['Servers'][$i]['SignonSession']` :config:option:`$cfg['Servers'][$i]['SignonScript']` :config:option:`$cfg['Servers'][$i]['SignonURL']` +.. seealso:: + :config:option:`$cfg['Servers'][$i]['auth_type']`, + :config:option:`$cfg['Servers'][$i]['SignonSession']`, + :config:option:`$cfg['Servers'][$i]['SignonScript']`, + :config:option:`$cfg['Servers'][$i]['SignonURL']` .. index:: pair: Config; Authentication mode From 222f484bb0bf1848f16000aae77eec5b32dfd2e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 30 Nov 2012 11:14:06 +0100 Subject: [PATCH 2/3] Add missing reference --- doc/setup.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/setup.rst b/doc/setup.rst index 7659c1afa6..850d67a2c9 100644 --- a/doc/setup.rst +++ b/doc/setup.rst @@ -253,7 +253,7 @@ For ':term:`HTTP`' and 'cookie' modes, phpMyAdmin needs a controluser that has **only** the ``SELECT`` privilege on the *`mysql`.`user` (all columns except `Password`)*, *`mysql`.`db` (all columns)*, *`mysql`.`host` (all columns)* and *`mysql`.`tables\_priv` (all columns except `Grantor` and `Timestamp`)* tables. -You must specify the details for the controluser in the :file:`config.inc.php` +You must specify the details for the controluser in the :file:`config.inc.php` file under the :config:option:`$cfg['Servers'][$i]['controluser']` and :config:option:`$cfg['Servers'][$i]['controlpass']` settings. The following example assumes you want to use ``pma`` as the controluser and ``pmapass`` as @@ -332,7 +332,7 @@ Cookie authentication mode * With this mode, the user can truly log out of phpMyAdmin and log in back with the same username. * If you want to log in to arbitrary server see :config:option:`$cfg['AllowArbitraryServer']` directive. -* As mentioned in the section, having the ``mcrypt`` extension will +* As mentioned in the :ref:`require` section, having the ``mcrypt`` extension will speed up access considerably, but is not required. .. index:: pair: Signon; Authentication mode From 5491e69d581357cbc17d24c764c7424c93e3b5ef Mon Sep 17 00:00:00 2001 From: Rouslan Placella Date: Fri, 30 Nov 2012 11:56:35 +0000 Subject: [PATCH 3/3] Fixed broken storage engine selection on tbl_operation.php --- libraries/operations.lib.php | 8 ++++---- tbl_operations.php | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php index 7d947a0547..15693f0d4f 100644 --- a/libraries/operations.lib.php +++ b/libraries/operations.lib.php @@ -1444,7 +1444,7 @@ function PMA_getQueryAndResultForReorderingTable() */ function PMA_getTableAltersArray($is_myisam_or_aria, $is_isam, $pack_keys, $checksum, $is_aria, $page_checksum, $delay_key_write, $is_innodb, - $is_pbxt, $row_format, $tbl_storage_engine, $transactional, $tbl_collation + $is_pbxt, $row_format, $new_tbl_storage_engine, $transactional, $tbl_collation ) { $table_alters = array(); @@ -1454,10 +1454,10 @@ function PMA_getTableAltersArray($is_myisam_or_aria, $is_isam, $pack_keys, $table_alters[] = 'COMMENT = \'' . PMA_Util::sqlAddSlashes($_REQUEST['comment']) . '\''; } - if (! empty($_REQUEST['new_tbl_storage_engine']) - && strtolower($_REQUEST['new_tbl_storage_engine']) !== strtolower($tbl_storage_engine) + if (! empty($new_tbl_storage_engine) + && strtolower($new_tbl_storage_engine) !== strtolower($GLOBALS['tbl_storage_engine']) ) { - $table_alters[] = 'ENGINE = ' . $_REQUEST['new_tbl_storage_engine']; + $table_alters[] = 'ENGINE = ' . $new_tbl_storage_engine; } if (! empty($_REQUEST['tbl_collation']) && $_REQUEST['tbl_collation'] !== $tbl_collation diff --git a/tbl_operations.php b/tbl_operations.php index b0b81e54d3..44eb517c0c 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -110,11 +110,11 @@ if (isset($_REQUEST['submitoptions'])) { && strtolower($_REQUEST['new_tbl_storage_engine']) !== strtolower($tbl_storage_engine) ) { - $tbl_storage_engine = $_REQUEST['new_tbl_storage_engine']; + $new_tbl_storage_engine = $_REQUEST['new_tbl_storage_engine']; // reset the globals for the new engine list($is_myisam_or_aria, $is_innodb, $is_isam, $is_berkeleydb, $is_aria, $is_pbxt - ) = PMA_setGlobalVariablesForEngine($tbl_storage_engine); + ) = PMA_setGlobalVariablesForEngine($new_tbl_storage_engine); if ($is_aria) { $transactional = (isset($transactional) && $transactional == '0') @@ -131,7 +131,7 @@ if (isset($_REQUEST['submitoptions'])) { ((isset($page_checksum)) ? $page_checksum : ''), (empty($delay_key_write) ? '0' : '1'), $is_innodb, $is_pbxt, $row_format, - $tbl_storage_engine, + $new_tbl_storage_engine, ((isset($transactional) && $transactional == '0') ? '0' : '1'), $tbl_collation );