1 files changed, 137 insertions, 128 deletions
diff --git a/phpBB/style.php b/phpBB/style.php
index 9be0d6a0dc..cf9911c9ee 100644
--- a/phpBB/style.php
+++ b/phpBB/style.php
@@ -70,175 +70,184 @@ if ($id && $sid)
 	unset($dbpasswd);
 
 	$config = $cache->obtain_config();
+	$user = false;
 
-	$sql = 'SELECT u.user_id, u.user_lang
-		FROM ' . SESSIONS_TABLE . ' s, ' . USERS_TABLE . " u
-		WHERE s.session_id = '" . $db->sql_escape($sid) . "'
-			AND s.session_user_id = u.user_id";
-	$result = $db->sql_query($sql);
-	$user = $db->sql_fetchrow($result);
+	if ($sid)
+	{
+		$sql = 'SELECT u.user_id, u.user_lang
+			FROM ' . SESSIONS_TABLE . ' s, ' . USERS_TABLE . " u
+			WHERE s.session_id = '" . $db->sql_escape($sid) . "'
+				AND s.session_user_id = u.user_id";
+		$result = $db->sql_query($sql);
+		$user = $db->sql_fetchrow($result);
+		$db->sql_freeresult($result);
+	}
+
+	$recompile = $config['load_tplcompile'];
+	if (!$user)
+	{
+		$id			= $config['default_style'];
+		$recompile	= false;
+		$user		= array('user_id' => ANONYMOUS);
+	}
+
+	$sql = 'SELECT s.style_id, c.theme_data, c.theme_path, c.theme_name, c.theme_mtime, i.*, t.template_path
+		FROM ' . STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . ' c, ' . STYLES_IMAGESET_TABLE . ' i
+		WHERE s.style_id = ' . $id . '
+			AND t.template_id = s.template_id
+			AND c.theme_id = s.theme_id
+			AND i.imageset_id = s.imageset_id';
+	$result = $db->sql_query($sql, 300);
+	$theme = $db->sql_fetchrow($result);
 	$db->sql_freeresult($result);
 
-	if ($user)
+	if ($user['user_id'] == ANONYMOUS)
 	{
-		$sql = 'SELECT s.style_id, c.theme_data, c.theme_path, c.theme_name, c.theme_mtime, i.*, t.template_path
-			FROM ' . STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . ' c, ' . STYLES_IMAGESET_TABLE . ' i
-			WHERE s.style_id = ' . $id . '
-				AND t.template_id = s.template_id
-				AND c.theme_id = s.theme_id
-				AND i.imageset_id = s.imageset_id';
-		$result = $db->sql_query($sql, 300);
-		$theme = $db->sql_fetchrow($result);
-		$db->sql_freeresult($result);
+		$user['user_lang'] = $config['default_lang'];
+	}
 
-		if ($user['user_id'] == ANONYMOUS)
-		{
-			$user['user_lang'] = $config['default_lang'];
-		}
+	$user_image_lang = (file_exists($phpbb_root_path . 'styles/' . $theme['imageset_path'] . '/imageset/' . $user['user_lang'])) ? $user['user_lang'] : $config['default_lang'];
 
-		$user_image_lang = (file_exists($phpbb_root_path . 'styles/' . $theme['imageset_path'] . '/imageset/' . $user['user_lang'])) ? $user['user_lang'] : $config['default_lang'];
+	$sql = 'SELECT *
+		FROM ' . STYLES_IMAGESET_DATA_TABLE . '
+		WHERE imageset_id = ' . $theme['imageset_id'] . "
+		AND image_lang IN('" . $db->sql_escape($user_image_lang) . "', '')";
+	$result = $db->sql_query($sql, 3600);
 
-		$sql = 'SELECT *
-			FROM ' . STYLES_IMAGESET_DATA_TABLE . '
-			WHERE imageset_id = ' . $theme['imageset_id'] . "
-			AND image_lang IN('" . $db->sql_escape($user_image_lang) . "', '')";
-		$result = $db->sql_query($sql, 3600);
+	$img_array = array();
 
-		$img_array = array();
+	while ($row = $db->sql_fetchrow($result))
+	{
+		$img_array[$row['image_name']] = $row;
+	}
 
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$img_array[$row['image_name']] = $row;
-		}
+	if (!$theme)
+	{
+		exit;
+	}
 
-		if (!$theme)
+	// Re-cache stylesheet data if necessary
+	if ($recompile || empty($theme['theme_data']))
+	{
+		$recache = (empty($theme['theme_data'])) ? true : false;
+		$update_time = time();
+
+		// We test for stylesheet.css because it is faster and most likely the only file changed on common themes
+		if (!$recache && $theme['theme_mtime'] < @filemtime("{$phpbb_root_path}styles/" . $theme['theme_path'] . '/theme/stylesheet.css'))
 		{
-			exit;
+			$recache = true;
+			$update_time = @filemtime("{$phpbb_root_path}styles/" . $theme['theme_path'] . '/theme/stylesheet.css');
 		}
-
-		// Re-cache stylesheet data if necessary
-		if ($config['load_tplcompile'] || empty($theme['theme_data']))
+		else if (!$recache)
 		{
-			$recache = (empty($theme['theme_data'])) ? true : false;
-			$update_time = time();
+			$last_change = $theme['theme_mtime'];
 
-			// We test for stylesheet.css because it is faster and most likely the only file changed on common themes
-			if (!$recache && $theme['theme_mtime'] < @filemtime("{$phpbb_root_path}styles/" . $theme['theme_path'] . '/theme/stylesheet.css'))
-			{
-				$recache = true;
-				$update_time = @filemtime("{$phpbb_root_path}styles/" . $theme['theme_path'] . '/theme/stylesheet.css');
-			}
-			else if (!$recache)
+			foreach (glob("{$phpbb_root_path}styles/{$theme['theme_path']}/theme/*.css", GLOB_NOSORT) as $file)
 			{
-				$last_change = $theme['theme_mtime'];
-
-				foreach (glob("{$phpbb_root_path}styles/{$theme['theme_path']}/theme/*.css", GLOB_NOSORT) as $file)
+				if ($last_change < @filemtime($file))
 				{
-					if ($last_change < @filemtime($file))
-					{
-						$recache = true;
-						break;
-					}
+					$recache = true;
+					break;
 				}
 			}
+		}
 
-			if ($recache)
-			{
-				include_once($phpbb_root_path . 'includes/acp/acp_styles.' . $phpEx);
+		if ($recache)
+		{
+			include_once($phpbb_root_path . 'includes/acp/acp_styles.' . $phpEx);
 
-				$theme['theme_data'] = acp_styles::db_theme_data($theme);
-				$theme['theme_mtime'] = $update_time;
+			$theme['theme_data'] = acp_styles::db_theme_data($theme);
+			$theme['theme_mtime'] = $update_time;
 
-				// Save CSS contents
-				$sql_ary = array(
-					'theme_mtime'	=> $theme['theme_mtime'],
-					'theme_data'	=> $theme['theme_data']
-				);
+			// Save CSS contents
+			$sql_ary = array(
+				'theme_mtime'	=> $theme['theme_mtime'],
+				'theme_data'	=> $theme['theme_data']
+			);
 
-				$sql = 'UPDATE ' . STYLES_THEME_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . "
-					WHERE theme_id = $id";
-				$db->sql_query($sql);
+			$sql = 'UPDATE ' . STYLES_THEME_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . "
+				WHERE theme_id = $id";
+			$db->sql_query($sql);
 
-				$cache->destroy('sql', STYLES_THEME_TABLE);
+			$cache->destroy('sql', STYLES_THEME_TABLE);
 
-				header('Expires: 0');
-			}
-		}
-		else
-		{
-			header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time() + 3600));
+			header('Expires: 0');
 		}
+	}
+	else
+	{
+		header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time() + 3600));
+	}
 
-		header('Content-type: text/css');
+	header('Content-type: text/css');
 
-		// Parse Theme Data
-		$replace = array(
-			'{T_THEME_PATH}'			=> "{$phpbb_root_path}styles/" . $theme['theme_path'] . '/theme',
-			'{T_TEMPLATE_PATH}'			=> "{$phpbb_root_path}styles/" . $theme['template_path'] . '/template',
-			'{T_IMAGESET_PATH}'			=> "{$phpbb_root_path}styles/" . $theme['imageset_path'] . '/imageset',
-			'{T_IMAGESET_LANG_PATH}'	=> "{$phpbb_root_path}styles/" . $theme['imageset_path'] . '/imageset/' . $user_image_lang,
-			'{T_STYLESHEET_NAME}'		=> $theme['theme_name'],
-			'{S_USER_LANG}'				=> $user['user_lang']
-		);
+	// Parse Theme Data
+	$replace = array(
+		'{T_THEME_PATH}'			=> "{$phpbb_root_path}styles/" . $theme['theme_path'] . '/theme',
+		'{T_TEMPLATE_PATH}'			=> "{$phpbb_root_path}styles/" . $theme['template_path'] . '/template',
+		'{T_IMAGESET_PATH}'			=> "{$phpbb_root_path}styles/" . $theme['imageset_path'] . '/imageset',
+		'{T_IMAGESET_LANG_PATH}'	=> "{$phpbb_root_path}styles/" . $theme['imageset_path'] . '/imageset/' . $user_image_lang,
+		'{T_STYLESHEET_NAME}'		=> $theme['theme_name'],
+		'{S_USER_LANG}'				=> $user['user_lang']
+	);
 
-		$theme['theme_data'] = str_replace(array_keys($replace), array_values($replace), $theme['theme_data']);
+	$theme['theme_data'] = str_replace(array_keys($replace), array_values($replace), $theme['theme_data']);
 
-		$matches = array();
-		preg_match_all('#\{IMG_([A-Za-z0-9_]*?)_(WIDTH|HEIGHT|SRC)\}#', $theme['theme_data'], $matches);
+	$matches = array();
+	preg_match_all('#\{IMG_([A-Za-z0-9_]*?)_(WIDTH|HEIGHT|SRC)\}#', $theme['theme_data'], $matches);
 
-		$imgs = $find = $replace = array();
-		if (isset($matches[0]) && sizeof($matches[0]))
+	$imgs = $find = $replace = array();
+	if (isset($matches[0]) && sizeof($matches[0]))
+	{
+		foreach ($matches[1] as $i => $img)
 		{
-			foreach ($matches[1] as $i => $img)
-			{
-				$img = strtolower($img);
-				$find[] = $matches[0][$i];
-
-				if (!isset($img_array[$img]))
-				{
-					$replace[] = '';
-					continue;
-				}
-
-				if (!isset($imgs[$img]))
-				{
-					$img_data = &$img_array[$img];
-					$imgsrc = ($img_data['image_lang'] ? $img_data['image_lang'] . '/' : '') . $img_data['image_filename'];
-					$imgs[$img] = array(
-						'src'		=> $phpbb_root_path . 'styles/' . $theme['imageset_path'] . '/imageset/' . $imgsrc,
-						'width'		=> $img_data['image_width'],
-						'height'	=> $img_data['image_height'],
-					);
-				}
+			$img = strtolower($img);
+			$find[] = $matches[0][$i];
 
-				switch ($matches[2][$i])
-				{
-					case 'SRC':
-						$replace[] = $imgs[$img]['src'];
-					break;
-					
-					case 'WIDTH':
-						$replace[] = $imgs[$img]['width'];
-					break;
-		
-					case 'HEIGHT':
-						$replace[] = $imgs[$img]['height'];
-					break;
+			if (!isset($img_array[$img]))
+			{
+				$replace[] = '';
+				continue;
+			}
 
-					default:
-						continue;
-				}
+			if (!isset($imgs[$img]))
+			{
+				$img_data = &$img_array[$img];
+				$imgsrc = ($img_data['image_lang'] ? $img_data['image_lang'] . '/' : '') . $img_data['image_filename'];
+				$imgs[$img] = array(
+					'src'		=> $phpbb_root_path . 'styles/' . $theme['imageset_path'] . '/imageset/' . $imgsrc,
+					'width'		=> $img_data['image_width'],
+					'height'	=> $img_data['image_height'],
+				);
 			}
 
-			if (sizeof($find))
+			switch ($matches[2][$i])
 			{
-				$theme['theme_data'] = str_replace($find, $replace, $theme['theme_data']);
+				case 'SRC':
+					$replace[] = $imgs[$img]['src'];
+				break;
+				
+				case 'WIDTH':
+					$replace[] = $imgs[$img]['width'];
+				break;
+	
+				case 'HEIGHT':
+					$replace[] = $imgs[$img]['height'];
+				break;
+
+				default:
+					continue;
 			}
 		}
 
-		echo $theme['theme_data'];
+		if (sizeof($find))
+		{
+			$theme['theme_data'] = str_replace($find, $replace, $theme['theme_data']);
+		}
 	}
 
+	echo $theme['theme_data'];
+
 	if (!empty($cache))
 	{
 		$cache->unload();