Changeset 2274 for branches

Timestamp:

12/01/10 22:22:18 (18 months ago)

Author:

petsagouris

Message:

[Branch 1.5] Fixed the default theme apostrophe bug. close #164

Files:

• branches/1.5/content/themes/default/settings.php (modified) (1 diff)

branches/1.5/content/themes/default/settings.php

@@ -2 +2 @@
 // settings.php
 
-// currently active theme, not necessarily the one we're viewing.
-$cTheme = rtrim(THEME, '/');
-
 // theme we're viewing the settings for.
-$vTheme = $h->cage->get->testAlnumLines('theme');
+$theme_name = $h->cage->get->testAlnumLines('theme');
 
 // If the form has been submitted, save the data...
 if ($h->cage->post->getAlpha('submitted') == 'true') {
-        $error = '';
-
-        if ($h->cage->post->keyExists('tagline')) {
+        if (!$h->cage->post->keyExists('tagline')) {
+                $h->showMessage('Invalid tagline', 'red');
+                
+        } else {
                 $theme_settings['tagline'] = $h->cage->post->getHtmLawed('tagline');
-        } else {
-                $error = 'Invalid tagline';
-        }
-
-        if ($error) {
-                $h->showMessage($error, 'red');
-        } else {
-                $h->updateThemeSettings($theme_settings, $vTheme);
+                $h->updateThemeSettings($theme_settings, $theme_name);
                 $h->showMessage('Settings updated', 'green');
         }
-}
-
-// If the user wants to revert to the defaults...
-if ($h->cage->get->getAlpha('reset') == 'true') {
-        $theme_settings = $h->getThemeSettings($vTheme, 'default');
-        $h->updateThemeSettings($theme_settings, $vTheme, 'value');
+} elseif ($h->cage->get->getAlpha('reset') == 'true') {
+        // The user wants to revert to the defaults
+        $theme_settings = $h->getThemeSettings($theme_name, 'default');
+        $h->updateThemeSettings($theme_settings, $theme_name, 'value');
         $h->showMessage('Reverted to default settings', 'green');
 }
 
-// Default settings:
-$defaults['tagline'] = "Possibly the greatest site on the Internet.";
-
 // Get settings from database if they exist...
-$theme_settings = $h->getThemeSettings($vTheme);
+$theme_settings = $h->getThemeSettings($theme_name);
 if (!$theme_settings) {
+        // Default settings:
+        $theme_settings = array('tagline'=>'Possibly the greatest site on the Internet');
         // inserts settings for the first time
-        $h->updateThemeSettings($defaults, $vTheme, 'both');
+        $h->updateThemeSettings($theme_settings, $theme_name, 'both');
         // use the defaults
-        $theme_settings = $defaults;
 }
 ?>
-
-<form name='theme_settings_form' action='<?php echo BASEURL; ?>admin_index.php?page=theme_settings&amp;theme=<?php echo $vTheme; ?>' method='post'>
-        <p>Tagline: <input type='text' size="70" name='tagline' value='<?php echo $theme_settings['tagline']; ?>'></p>
-        <br />
-        <input type='hidden' name='submitted' value='true' />
-        <input type='submit' value='<?php echo $h->lang["main_form_save"]; ?>' />
-        <input type='hidden' name='csrf' value='<?php echo $h->csrfToken; ?>' />
+<form name="theme_settings_form" action="<?php echo BASEURL; ?>admin_index.php?page=theme_settings&amp;theme=<?php echo $theme_name; ?>" method="post">
+        <label>Tagline: <input type="text" size="70" name="tagline" value="<?php echo htmlentities($theme_settings['tagline'], ENT_QUOTES, 'UTF-8'); ?>"></label>
+        <input type="submit" value="<?php echo $h->lang['main_form_save']; ?>" />
+        <input type="hidden" name="submitted" value="true" /><input type="hidden" name="csrf" value="<?php echo $h->csrfToken; ?>" />
 </form>
 <br />
-<a href="<?php echo BASEURL; ?>admin_index.php?page=theme_settings&amp;theme=<?php echo $vTheme; ?>&amp;reset=true"><?php echo $h->lang["admin_theme_theme_revert_settings"]; ?></a>
+<a href="<?php echo BASEURL; ?>admin_index.php?page=theme_settings&amp;theme=<?php echo $theme_name; ?>&amp;reset=true"><?php echo $h->lang["admin_theme_theme_revert_settings"]; ?></a>