mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-30 21:40:43 +02:00
Merge remote-tracking branch 'phpbb/develop' into ticket/9657
* phpbb/develop: (216 commits) [ticket/11626] Remove last reference to template in ldap [ticket/11626] Remove LDAP dependency on template [develop-olympus] Increment version number to 3.0.13-dev. [develop-olympus] Add changelog for 3.0.12 release. [develop-olympus] Bump version numbers for 3.0.12-RC1 release. [develop-olympus] Bumping version numbers to final for 3.0.12 releases. [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./) [ticket/11668] Run lint test at the end of the test suite [ticket/11548] Fix test errors in groups test on develop [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0 [ticket/11548] Fix incorrect usage of array_map on acp groups page [ticket/11665] Fix test class name [ticket/11664] Stop creating php.html file in root path in tests [ticket/11665] Can't change file names already sent to set_filenames [ticket/11662] Typos: occured -> occurred [ticket/11662] Typos: occured -> occurred [ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect) [feature/auth-refactor] Add parent::setUp() in setUp() [feature/auth-refactor] Changes [feature/auth-refactor] DataProvider for acp_board test ...
This commit is contained in:
@@ -357,6 +357,109 @@ class phpbb_functional_test_case extends phpbb_test_case
|
||||
$db_conn_mgr->recreate_db();
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a new style
|
||||
*
|
||||
* @param string $style_id Style ID
|
||||
* @param string $style_path Style directory
|
||||
* @param string $parent_style_id Parent style id. Default = 1
|
||||
* @param string $parent_style_path Parent style directory. Default = 'prosilver'
|
||||
*/
|
||||
protected function add_style($style_id, $style_path, $parent_style_id = 1, $parent_style_path = 'prosilver')
|
||||
{
|
||||
global $phpbb_root_path;
|
||||
|
||||
$db = $this->get_db();
|
||||
if (version_compare(PHPBB_VERSION, '3.1.0-dev', '<'))
|
||||
{
|
||||
$sql = 'INSERT INTO ' . STYLES_TABLE . ' ' . $db->sql_build_array('INSERT', array(
|
||||
'style_id' => $style_id,
|
||||
'style_name' => $style_path,
|
||||
'style_copyright' => '',
|
||||
'style_active' => 1,
|
||||
'template_id' => $style_id,
|
||||
'theme_id' => $style_id,
|
||||
'imageset_id' => $style_id,
|
||||
));
|
||||
$db->sql_query($sql);
|
||||
|
||||
$sql = 'INSERT INTO ' . STYLES_IMAGESET_TABLE . ' ' . $db->sql_build_array('INSERT', array(
|
||||
'imageset_id' => $style_id,
|
||||
'imageset_name' => $style_path,
|
||||
'imageset_copyright' => '',
|
||||
'imageset_path' => $style_path,
|
||||
));
|
||||
$db->sql_query($sql);
|
||||
|
||||
$sql = 'INSERT INTO ' . STYLES_TEMPLATE_TABLE . ' ' . $db->sql_build_array('INSERT', array(
|
||||
'template_id' => $style_id,
|
||||
'template_name' => $style_path,
|
||||
'template_copyright' => '',
|
||||
'template_path' => $style_path,
|
||||
'bbcode_bitfield' => 'kNg=',
|
||||
'template_inherits_id' => $parent_style_id,
|
||||
'template_inherit_path' => $parent_style_path,
|
||||
));
|
||||
$db->sql_query($sql);
|
||||
|
||||
$sql = 'INSERT INTO ' . STYLES_THEME_TABLE . ' ' . $db->sql_build_array('INSERT', array(
|
||||
'theme_id' => $style_id,
|
||||
'theme_name' => $style_path,
|
||||
'theme_copyright' => '',
|
||||
'theme_path' => $style_path,
|
||||
'theme_storedb' => 0,
|
||||
'theme_mtime' => 0,
|
||||
'theme_data' => '',
|
||||
));
|
||||
$db->sql_query($sql);
|
||||
|
||||
if ($style_path != 'prosilver' && $style_path != 'subsilver2')
|
||||
{
|
||||
@mkdir($phpbb_root_path . 'styles/' . $style_path, 0777);
|
||||
@mkdir($phpbb_root_path . 'styles/' . $style_path . '/template', 0777);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$db->sql_multi_insert(STYLES_TABLE, array(
|
||||
'style_id' => $style_id,
|
||||
'style_name' => $style_path,
|
||||
'style_copyright' => '',
|
||||
'style_active' => 1,
|
||||
'style_path' => $style_path,
|
||||
'bbcode_bitfield' => 'kNg=',
|
||||
'style_parent_id' => $parent_style_id,
|
||||
'style_parent_tree' => $parent_style_path,
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove temporary style created by add_style()
|
||||
*
|
||||
* @param string $style_id Style ID
|
||||
* @param string $style_path Style directory
|
||||
*/
|
||||
protected function delete_style($style_id, $style_path)
|
||||
{
|
||||
global $phpbb_root_path;
|
||||
|
||||
$db = $this->get_db();
|
||||
$db->sql_query('DELETE FROM ' . STYLES_TABLE . ' WHERE style_id = ' . $style_id);
|
||||
if (version_compare(PHPBB_VERSION, '3.1.0-dev', '<'))
|
||||
{
|
||||
$db->sql_query('DELETE FROM ' . STYLES_IMAGESET_TABLE . ' WHERE imageset_id = ' . $style_id);
|
||||
$db->sql_query('DELETE FROM ' . STYLES_TEMPLATE_TABLE . ' WHERE template_id = ' . $style_id);
|
||||
$db->sql_query('DELETE FROM ' . STYLES_THEME_TABLE . ' WHERE theme_id = ' . $style_id);
|
||||
|
||||
if ($style_path != 'prosilver' && $style_path != 'subsilver2')
|
||||
{
|
||||
@rmdir($phpbb_root_path . 'styles/' . $style_path . '/template');
|
||||
@rmdir($phpbb_root_path . 'styles/' . $style_path);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a new user with limited permissions
|
||||
*
|
||||
|
Reference in New Issue
Block a user