diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-04-24 11:33:00 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-04-24 11:33:00 +0200 |
| commit | 6e85b2acc76ef44c10c331d4a9d6f20ccb663dce (patch) | |
| tree | 73a188a26e723bd88d5805b80e0269916c0e6fe6 | |
| parent | 5b6a6753992ae03e7bd36e7530a1a4e0e14fb57b (diff) | |
| parent | 3d9b5aed46ac1c3aec4b3a068b837169748a429c (diff) | |
| download | forums-6e85b2acc76ef44c10c331d4a9d6f20ccb663dce.tar forums-6e85b2acc76ef44c10c331d4a9d6f20ccb663dce.tar.gz forums-6e85b2acc76ef44c10c331d4a9d6f20ccb663dce.tar.bz2 forums-6e85b2acc76ef44c10c331d4a9d6f20ccb663dce.tar.xz forums-6e85b2acc76ef44c10c331d4a9d6f20ccb663dce.zip | |
Merge remote-tracking branch 'github-nickvergessen/ticket/11917' into develop-ascraeus
* github-nickvergessen/ticket/11917:
[ticket/11917] Move OAuth Module to the bottom while installing
[ticket/11917] Hide OAuth UCP Module when OAuth is not the selected backend
Conflicts:
phpBB/install/install_install.php
| -rw-r--r-- | phpBB/includes/functions_module.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/ucp/info/ucp_auth_link.php | 2 | ||||
| -rw-r--r-- | phpBB/install/install_install.php | 14 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v310/auth_provider_oauth2.php | 40 |
4 files changed, 55 insertions, 2 deletions
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php index be066de0f0..98b2848c19 100644 --- a/phpBB/includes/functions_module.php +++ b/phpBB/includes/functions_module.php @@ -398,6 +398,7 @@ class p_master 'cfg_([a-z0-9_]+)' => '(int) $config[\'\\1\']', 'request_([a-zA-Z0-9_]+)' => '$request->variable(\'\\1\', false)', 'ext_([a-zA-Z0-9_/]+)' => 'array_key_exists(\'\\1\', $phpbb_extension_manager->all_enabled())', + 'authmethod_([a-z0-9_\\\\]+)' => '($config[\'auth_method\'] === \'\\1\')', ); /** diff --git a/phpBB/includes/ucp/info/ucp_auth_link.php b/phpBB/includes/ucp/info/ucp_auth_link.php index ee88b15ea8..3a34232d28 100644 --- a/phpBB/includes/ucp/info/ucp_auth_link.php +++ b/phpBB/includes/ucp/info/ucp_auth_link.php @@ -19,7 +19,7 @@ class ucp_auth_link_info 'title' => 'UCP_AUTH_LINK', 'version' => '1.0.0', 'modes' => array( - 'auth_link' => array('title' => 'UCP_AUTH_LINK_MANAGE', 'auth' => '', 'cat' => array('UCP_PROFILE')), + 'auth_link' => array('title' => 'UCP_AUTH_LINK_MANAGE', 'auth' => 'authmethod_oauth', 'cat' => array('UCP_PROFILE')), ), ); } diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index db8156a831..a0c9cf9c5c 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1669,11 +1669,23 @@ class install_install extends module WHERE module_basename = 'ucp_notifications' AND module_class = 'ucp' AND module_mode = 'notification_options'"; - $result = $db->sql_query($sql); + $result = $db->sql_query($sql); $row = $db->sql_fetchrow($result); $db->sql_freeresult($result); $_module->move_module_by($row, 'move_down', 4); + + // Move OAuth module 5 down... + $sql = 'SELECT * + FROM ' . MODULES_TABLE . " + WHERE module_basename = 'ucp_auth_link' + AND module_class = 'ucp' + AND module_mode = 'auth_link'"; + $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + $_module->move_module_by($row, 'move_down', 5); } // And now for the special ones diff --git a/phpBB/phpbb/db/migration/data/v310/auth_provider_oauth2.php b/phpBB/phpbb/db/migration/data/v310/auth_provider_oauth2.php new file mode 100644 index 0000000000..692647dcde --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v310/auth_provider_oauth2.php @@ -0,0 +1,40 @@ +<?php +/** +* +* @package migration +* @copyright (c) 2014 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +namespace phpbb\db\migration\data\v310; + +class auth_provider_oauth2 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v310\auth_provider_oauth', + ); + } + + public function update_data() + { + return array( + array('custom', array( + array($this, 'update_auth_link_module_auth'), + )), + ); + } + + public function update_auth_link_module_auth() + { + $sql = 'UPDATE ' . MODULES_TABLE . " + SET module_auth = 'authmethod_oauth' + WHERE module_class = 'ucp' + AND module_basename = 'ucp_auth_link' + AND module_mode = 'auth_link' + AND module_auth = ''"; + $this->db->sql_query($sql); + } +} |