Changeset 2170

Timestamp:

04/09/10 09:34:08 (13 years ago)

Author:

bruno

Message:

Added dotclear 2.2 compatibility.

Location:

themes/freshy2

Files:

• _config.php (modified) (3 diffs)
• _public.php (modified) (6 diffs)

themes/freshy2/_config.php

@@ -18 +18 @@
 require dirname(__FILE__).'/lib/class.freshy2.config.php';
 
+if (!version_compare(DC_VERSION,'2.1.6','<=')) {
+     $core->blog->settings->addNamespace('freshy2');
+     $freshy2_settings =& $core->blog->settings->freshy2;
+} else {
+     $core->blog->settings->setNamespace('freshy2');
+     $freshy2_settings =& $core->blog->settings;
+}
+
 $config = new freshy2Config($core);
 
@@ -23 +31 @@
 $custom_themes_combo = $config->getCustomThemes();
 $images = $config->getHeaderImages();
-$current_custom_theme = $core->blog->settings->freshy2_custom;
-$current_top_image = $core->blog->settings->freshy2_top_image;
-$left_sidebar = $core->blog->settings->freshy2_sidebar_left;
-$right_sidebar = $core->blog->settings->freshy2_sidebar_right;
+$current_custom_theme = $freshy2_settings->freshy2_custom;
+$current_top_image = $freshy2_settings->freshy2_top_image;
+$left_sidebar = $freshy2_settings->freshy2_sidebar_left;
+$right_sidebar = $freshy2_settings->freshy2_sidebar_right;
 if ($current_custom_theme == null) {
      $current_custom_theme = 'default';
@@ -42 +50 @@
      $left_sidebar = $_POST['left_sidebar'];
      $right_sidebar = $_POST['right_sidebar'];
-     $core->blog->settings->setNamespace('themes');
-     $core->blog->settings->put('freshy2_custom',$current_custom_theme,'string');
-     $core->blog->settings->put('freshy2_top_image',$current_top_image,'string');
-     $core->blog->settings->put('freshy2_sidebar_left',$left_sidebar,'string');
-     $core->blog->settings->put('freshy2_sidebar_right',$right_sidebar,'string');
+     $freshy2_settings->put('freshy2_custom',$current_custom_theme,'string');
+     $freshy2_settings->put('freshy2_top_image',$current_top_image,'string');
+     $freshy2_settings->put('freshy2_sidebar_left',$left_sidebar,'string');
+     $freshy2_settings->put('freshy2_sidebar_right',$right_sidebar,'string');
      $core->blog->triggerBlog();
 }

themes/freshy2/_public.php

@@ -22 +22 @@
 class tplFreshy2Theme
 {
+     public static $settings;
+     
+     public static function initSettings() {
+          global $core;
+          if (!version_compare(DC_VERSION,'2.1.6','<='))
+               self::$settings =& $core->blog->settings->freshy2;
+          else
+               self::$settings =& $core->blog->settings;
+     }
+
      public static function FreshyStyleSheet($attr) {
           return "style.css";
@@ -28 +38 @@
      public static function FreshyLayoutClass($attr) {
           $p = '<?php '."\n";
-          $p .= 'if ($core->blog->settings->freshy2_sidebar_right != "none")'."\n";
+          $p .= 'if (tplFreshy2Theme::$settings->freshy2_sidebar_right != "none")'."\n";
           $p .= '  echo "sidebar_right ";'."\n";
-          $p .= 'if ($core->blog->settings->freshy2_sidebar_left != "none")'."\n";
+          $p .= 'if (tplFreshy2Theme::$settings->freshy2_sidebar_left != "none")'."\n";
           $p .= '  echo "sidebar_left";'."\n";
           $p .= '?>'."\n";
@@ -42 +52 @@
                $pos="right";
           if ($pos == 'both') {
-               return '<?php if (($core->blog->settings->freshy2_sidebar_left != "none") '.
-                    '&& ($core->blog->settings->freshy2_sidebar_right != "none")): ?>'."\n".
+               return '<?php if ((tplFreshy2Theme::$settings->freshy2_sidebar_left != "none") '.
+                    '&& (tplFreshy2Theme::$settings->freshy2_sidebar_right != "none")): ?>'."\n".
                     $content."\n".
                     '<?php endif; ?>'."\n";
           } else {
                $setting = "freshy2_sidebar_".$pos;
-               return '<?php if ($core->blog->settings->'.$setting.' != "none"): ?>'."\n".
+               return '<?php if (tplFreshy2Theme::$settings->'.$setting.' != "none"): ?>'."\n".
                     $content."\n".
                     '<?php endif; ?>'."\n";
@@ -63 +73 @@
           else
                $value="nav";
-          return '<?php if ($core->blog->settings->'.$setting.' == "'.$value.'"): ?>'."\n".
+          return '<?php if (tplFreshy2Theme::$settings->'.$setting.' == "'.$value.'"): ?>'."\n".
                $content."\n".
                '<?php endif; ?>'."\n";
@@ -70 +80 @@
      public static function publicHeadContent($core)
      {
-          $cust = $core->blog->settings->freshy2_custom;
-          $topimg = $core->blog->settings->freshy2_top_image;
-          $theme_url=$core->blog->settings->themes_url."/".$core->blog->settings->theme;
+          $cust = self::$settings->freshy2_custom;
+          $topimg = self::$settings->freshy2_top_image;
+          $theme_url= self::$settings->themes_url."/".self::$settings->theme;
 
           $css_content='';
@@ -163 +173 @@
 
 }
+
+tplFreshy2Theme::initSettings();
 ?>