mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 03:04:09 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x'

Browse Source
This commit is contained in:
Marc Alexander
2015-10-11 10:48:53 +02:00
parent f6f796770a f6c8338358
commit 8c3fdfe4e1
6 changed files with 77 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
phpBB/phpbb/db/migration/data/v31x/m_pm_report.php Normal file
View File

@@ -0,0 +1,64 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
namespace phpbb\db\migration\data\v31x;
class m_pm_report extends \phpbb\db\migration\migration
{
static public function depends_on()
{
return array('\phpbb\db\migration\data\v31x\v316rc1');
}
public function update_data()
{
return array(
array('permission.add', array('m_pm_report', true, 'm_report')),
array('custom', array(
array($this, 'update_module_auth'),
),
),
);
}
public function revert_data()
{
return array(
array('permission.remove', array('m_pm_report')),
array('custom', array(
array($this, 'revert_module_auth'),
),
),
);
}
public function update_module_auth()
{
$sql = 'UPDATE ' . MODULES_TABLE . "
SET module_auth = 'acl_m_pm_report'
WHERE module_class = 'mcp'
AND module_basename = 'mcp_pm_reports'
AND module_auth = 'aclf_m_report'";
$this->db->sql_query($sql);
}
public function revert_module_auth()
{
$sql = 'UPDATE ' . MODULES_TABLE . "
SET module_auth = 'aclf_m_report'
WHERE module_class = 'mcp'
AND module_basename = 'mcp_pm_reports'
AND module_auth = 'acl_m_pm_report'";
$this->db->sql_query($sql);
}
}

5
phpBB/phpbb/permissions.php
View File

@@ -308,8 +308,9 @@ class permissions
'm_split' => array('lang' => 'ACL_M_SPLIT', 'cat' => 'topic_actions'),
'm_merge' => array('lang' => 'ACL_M_MERGE', 'cat' => 'topic_actions'),
'm_warn' => array('lang' => 'ACL_M_WARN', 'cat' => 'misc'),
'm_ban' => array('lang' => 'ACL_M_BAN', 'cat' => 'misc'),
'm_warn' => array('lang' => 'ACL_M_WARN', 'cat' => 'misc'),
'm_pm_report' => array('lang' => 'ACL_M_PM_REPORT', 'cat' => 'misc'),
'm_ban' => array('lang' => 'ACL_M_BAN', 'cat' => 'misc'),
// Admin Permissions
'a_board' => array('lang' => 'ACL_A_BOARD', 'cat' => 'settings'),