makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-13 14:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/13263] Only install/set prosilver if no style available

Browse source 
Users that have a nonexistent style selectd will revert back to the default
style.

PHPBB3-13263
This commit is contained in:
Marc Alexander 2014-11-01 23:22:44 +01:00
parent be8b5a41c8
commit d1f85f0de3
1 changed files with 24 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
phpBB/phpbb/db/migration/data/v31x/style_update.php
View file

@ -29,16 +29,25 @@ class style_update extends \phpbb\db\migration\migration
public function update_installed_styles() public function update_installed_styles()
{ {
// First check if prosilver is properly installed // Get all currently available styles
$sql = 'SELECT style_id, style_active $styles = $this->find_style_dirs();
FROM ' . $this->table_prefix . "styles $style_paths = $style_ids = array();
WHERE style_name = 'prosilver'";
$sql = 'SELECT style_path, style_id
FROM ' . $this->table_prefix . 'styles';
$result = $this->db->sql_query($sql); $result = $this->db->sql_query($sql);
$row = $this->db->sql_fetchrow($result); while ($styles_row = $this->db->sql_fetchrow())
{
if (in_array($styles_row['style_path'], $styles))
{
$style_paths[] = $styles_row['style_path'];
$style_ids[] = $styles_row['style_id'];
}
}
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
// Make sure prosilver is installed // Install prosilver if no style is available and prosilver can be installed
if (empty($row) || !isset($row['style_id'])) if (empty($style_paths) && in_array('prosilver', $styles))
{ {
// Try to parse config file // Try to parse config file
$cfg = parse_cfg_file($this->phpbb_root_path . 'styles/prosilver/style.cfg'); $cfg = parse_cfg_file($this->phpbb_root_path . 'styles/prosilver/style.cfg');
@ -46,7 +55,7 @@ class style_update extends \phpbb\db\migration\migration
// Stop running this if prosilver doesn't exist // Stop running this if prosilver doesn't exist
if (empty($cfg)) if (empty($cfg))
{ {
return; throw new \RuntimeException('No styles available and could not fall back to prosilver.');
} }
// Check data // Check data
@ -75,31 +84,18 @@ class style_update extends \phpbb\db\migration\migration
$row = array('style_id' => $this->db->sql_nextid()); $row = array('style_id' => $this->db->sql_nextid());
$this->db->sql_transaction('commit'); $this->db->sql_transaction('commit');
// Set prosilver to default style
$this->config->set('default_style', $row['style_id']);
} }
// Make sure prosilver is activated else if (empty($styles) && empty($available_styles))
else if (!isset($row['style_active']) || !$row['style_active'])
{ {
$sql = 'UPDATE ' . STYLES_TABLE . ' SET style_active = 1 WHERE style_id = ' . $row['style_id']; throw new \RuntimeException('No valid styles available');
$this->db->sql_query($sql);
} }
// Get all currently available styles // Reset users to default style if their user_style is nonexistent
$styles = $this->find_style_dirs();
// Get IDs of the available styles
$style_ids = array();
$sql = 'SELECT DISTINCT(style_id) AS style_id
FROM ' . $this->table_prefix . 'styles
WHERE ' . $this->db->sql_in_set('style_name', $styles);
$result = $this->db->sql_query($sql);
while ($styles_row = $this->db->sql_fetchrow())
{
$style_ids[] = $styles_row['style_id'];
}
$this->db->sql_freeresult($result);
$sql = 'UPDATE ' . $this->table_prefix . "users $sql = 'UPDATE ' . $this->table_prefix . "users
SET user_style = {$row['style_id']} SET user_style = {$this->config['default_style']}
WHERE " . $this->db->sql_in_set('user_style', $style_ids, true); WHERE " . $this->db->sql_in_set('user_style', $style_ids, true);
$this->db->sql_query($sql); $this->db->sql_query($sql);
} }