Changeset 8528 for extensions/gally/gally-default/admin

Timestamp:

Jan 8, 2011, 5:34:17 PM (13 years ago)

Author:

grum

Message:

Release 1.4.0
Rewrite some JS
fix bug bug:1983

Location:

extensions/gally/gally-default/admin

Files:

• Conf.class.inc.php (modified) (2 diffs)
• GallyDefault.class.inc.php (modified) (3 diffs)

extensions/gally/gally-default/admin/Conf.class.inc.php

@@ -117 +117 @@
   }
 
+  public function confExists($key)
+  {
+    return(array_key_exists($key, $this->values));
+  }
+
   public function getConfValue($key)
   {
@@ -144 +149 @@
 
 
+  /**
+   * function used to initialize config file
+   *
+   */
+  static public function init($theme)
+  {
+    $forcedToDefault=array(
+      "imageCenterMode" => '',
+      "imageCenterOffset" => '',
+      "imageCenterTopMin" => '',
+      "imageCenterTopBorder" => '',
+      "interfaceAnimated" => '',
+      "commentAnimated" => '',
+      "animateDelay" => '',
+      "marginContainer" => '',
+      "paddingContainer" => '',
+      "tabsAnimated" => '',
+      "tabsHidden" => '',
+      "tabsVisible" => '',
+      "tabsPosition" => '',
+      "commentRows" => '',
+      "menuAnimated" => '',
+      "menuWidth" => '',
+      "menuMaxWidth" => '',
+      "menuMSIEMaxWidth" => '',
+      "imageSimulateHighRes" => '',
+      "imageScrollMinDeadArea" => ''
+      //"expandMenu" => '',
+    );
+    $gallyDefault = new Conf();
+    $gallyDefault->setFileName(PHPWG_ROOT_PATH."themes/gally-default/conf/default.conf");
+    $gallyDefault->read();
+
+    $configDefault = new Conf();
+    $configDefault->setFileName(PHPWG_ROOT_PATH."themes/$theme/conf/default.conf");
+    $configDefault->read();
+
+    $configLocal = new Conf();
+    $configLocal->setFileName(PHPWG_ROOT_PATH."local/themes/$theme/conf/local.conf");
+    $configLocal->read();
+
+    foreach($forcedToDefault as $key => $param)
+    {
+      if($gallyDefault->confExists($key)) $forcedToDefault[$key]=$gallyDefault->getConfValue($key);
+      if($configDefault->confExists($key)) $forcedToDefault[$key]=$configDefault->getConfValue($key);
+    }
+    $configLocal->setConf($forcedToDefault, false);
+    $configLocal->write();
+  }
+
 }
 

extensions/gally/gally-default/admin/GallyDefault.class.inc.php

@@ -20 +20 @@
 class GallyDefault
 {
+  const THEME_VERSION = '1.4.0';
+
   private $directories=Array(
     'templates.parent' => '',
@@ -32 +34 @@
   protected $themeProperties = Array(
       'name' => 'Gally/Default',
-      'version' => '1.3.1'
+      'version' => self::THEME_VERSION
     );
+
+
+  /**
+   * function used to activate a theme
+   *
+   * @param String $themeId : theme's id (for example 'gally-lapis-lazulis')
+   * @param String $themeVersion : theme's release (not gally-default release)
+   * @param String $gallyDefaultNeeded : gally-default release needed
+   * @param &Array $errors : array of error messages
+   */
+  static public function activate($themeId, $themeVersion, $gallyDefaultNeeded, $errors)
+  {
+    if(strnatcmp(self::THEME_VERSION, $gallyDefaultNeeded)<0)
+    {
+      if(!is_array($errors))
+      {
+        if($errors!='')
+        {
+          $errors=array($errors);
+        }
+        else
+        {
+          $errors=array();
+        }
+      }
+
+      $errors[]=sprintf(l10n('This theme needs Gally-default theme v%s; actually, Gally-default version is %s.'), $gallyDefaultNeeded, self::THEME_VERSION);
+    }
+    else
+    {
+      Conf::init($themeId);
+    }
+    return($errors);
+  }
+
+  /**
+   * function used to deactivate a theme
+   *
+   */
+  static public function deactivate()
+  {
+  }
 
   /**
@@ -92 +136 @@
     $this->config->read();
     $this->config->setFileName($this->directories['conf.local']."/default.conf");
-    $this->config->read();
+    $this->config->read(false);
     $this->config->setFileName(PHPWG_ROOT_PATH."local/themes/".basename(dirname($this->directories['conf.local']))."/conf/local.conf");
     $this->config->read(false);