mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-13 20:28:44 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'Elsensee/ticket/11169' into develop

Browse Source 
* Elsensee/ticket/11169:
  [ticket/11169] Skip migration if "Users" category has been deleted
  [ticket/11169] Move module 'prune users' to users category
This commit is contained in:
Joas Schilling 2014-03-19 21:35:08 +01:00
commit 997ad65062
2 changed files with 78 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/acp/info/acp_prune.php
View File

@ -20,7 +20,7 @@ class acp_prune_info
'version' => '1.0.0',
'modes' => array(
'forums' => array('title' => 'ACP_PRUNE_FORUMS', 'auth' => 'acl_a_prune', 'cat' => array('ACP_MANAGE_FORUMS')),
'users' => array('title' => 'ACP_PRUNE_USERS', 'auth' => 'acl_a_userdel', 'cat' => array('ACP_USER_SECURITY')),
'users' => array('title' => 'ACP_PRUNE_USERS', 'auth' => 'acl_a_userdel', 'cat' => array('ACP_CAT_USERS')),
),
);
}

77
phpBB/phpbb/db/migration/data/v310/acp_prune_users_module.php Normal file
View File

@ -0,0 +1,77 @@
<?php
/**
*
* @package migration
* @copyright (c) 2014 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
*
*/
namespace phpbb\db\migration\data\v310;
class acp_prune_users_module extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
$sql = 'SELECT module_id
FROM ' . MODULES_TABLE . "
WHERE module_class = 'acp'
AND module_langname = 'ACP_CAT_USERS'";
$result = $this->db->sql_query($sql);
$acp_cat_users_id = (int) $this->db->sql_fetchfield('module_id');
$this->db->sql_freeresult($result);
$sql = 'SELECT parent_id
FROM ' . MODULES_TABLE . "
WHERE module_class = 'acp'
AND module_basename = 'acp_prune'
AND module_mode = 'users'";
$result = $this->db->sql_query($sql);
$acp_prune_users_parent = (int) $this->db->sql_fetchfield('parent_id');
$this->db->sql_freeresult($result);
// Skip migration if "Users" category has been deleted
// or the module has already been moved to that category
return !$acp_cat_users_id || $acp_cat_users_id === $acp_prune_users_parent;
}
static public function depends_on()
{
return array('\phpbb\db\migration\data\v310\beta1');
}
public function update_data()
{
return array(
array('custom', array(array($this, 'move_prune_users_module'))),
);
}
public function move_prune_users_module()
{
$sql = 'SELECT module_id
FROM ' . MODULES_TABLE . "
WHERE module_class = 'acp'
AND module_basename = 'acp_prune'
AND module_mode = 'users'";
$result = $this->db->sql_query($sql);
$acp_prune_users_id = (int) $this->db->sql_fetchfield('module_id');
$this->db->sql_freeresult($result);
$sql = 'SELECT module_id
FROM ' . MODULES_TABLE . "
WHERE module_class = 'acp'
AND module_langname = 'ACP_CAT_USERS'";
$result = $this->db->sql_query($sql);
$acp_cat_users_id = (int) $this->db->sql_fetchfield('module_id');
$this->db->sql_freeresult($result);
if (!class_exists('\acp_modules'))
{
include($this->phpbb_root_path . 'includes/acp/acp_modules.' . $this->php_ext);
}
$module_manager = new \acp_modules();
$module_manager->module_class = 'acp';
$module_manager->move_module($acp_prune_users_id, $acp_cat_users_id);
}
}