if (isAdmin()) $add = '';
// Select all themes we want
- $result = SQL_QUERY("SELECT
+ $result = SQL_QUERY('SELECT
`theme_path`, `theme_name`
FROM
`{?_MYSQL_PREFIX?}_themes`
-".$add."
+' . $add . '
ORDER BY
- `theme_name` ASC", __FILE__, __LINE__);
+ `theme_name` ASC', __FUNCTION__, __LINE__);
// Load all themes
while ($content = SQL_FETCHARRAY($result)) {
SQL_FREERESULT($result);
// Construct selection form for the box template
+ // @TODO Can't this be rewritten to an API function?
$OUT = '';
foreach ($themesArray['theme_unix'] as $key => $theme) {
- $OUT .= " <option value=\"".$theme."\"";
+ $OUT .= ' <option value="' . $theme . '"';
if ($theme == getCurrentTheme()) $OUT .= ' selected="selected"';
- $OUT .= ">".$themesArray['theme_name'][$key]."</option>\n";
+ $OUT .= '>' . $themesArray['theme_name'][$key] . '</option>';
} // END - foreach
// Remember content
$cver = '?.?';
// Is the cache entry there?
- if (isset($GLOBALS['cache_array']['themes']['theme_ver'][$name])) {
+ if (isset($GLOBALS['cache_array']['themes']['theme_version'][$name])) {
// Get the version from cache
- $cver = $GLOBALS['cache_array']['themes']['theme_ver'][$name];
+ $cver = $GLOBALS['cache_array']['themes']['theme_version'][$name];
// Count up
incrementStatsEntry('cache_hits');
// Fix it to default
$ret = 'default';
} // END - if
- } elseif ((!isInstalled()) && ((isInstalling()) || (getOutputMode() == true)) && ((isGetRequestParameterSet('theme')) || (isPostRequestParameterSet('theme')))) {
+ } elseif ((!isInstalled()) && ((isInstalling()) || (isHtmlOutputMode())) && ((isGetRequestParameterSet('theme')) || (isPostRequestParameterSet('theme')))) {
// Prepare filename for checking
$themeFile = sprintf("theme/%s/theme.php", getRequestParameter('theme'));
return $id;
}
-///////////////////////////////////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
// Only filter functions
-///////////////////////////////////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
// Filter for generic handling of theme change
function FILTER_HANDLE_THEME_CHANGE () {
// Is the user data valid?
if (!isMember()) {
// Do only run for logged in members
- debug_report_bug('Please only run this filter for logged in users.');
+ debug_report_bug(__FUNCTION__, __LINE__, 'Please only run this filter for logged in users.');
} // END - if
// Change to new theme