Changeset 30900 for extensions/greydragon/include

Timestamp:

Jan 23, 2015, 7:53:13 PM (9 years ago)

Author:

SergeD

Message:

version 1.1.20 - please refer to change log for more details

File:

• extensions/greydragon/include/greydragon.class.php (modified) (12 diffs)

extensions/greydragon/include/greydragon.class.php

@@ -3 +3 @@
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
-define('GDTHEME_VERSION', '1.1.19');
+define('GDTHEME_VERSION', '1.1.20');
 
 define("QUOTES_NONE",   FALSE);
@@ -36 +36 @@
 
     return array(
+      "p_version"          => array("value" => "",       "quotes" => QUOTES_NONE),
+
       // General Settings
       "p_logo_path"        => array("value" => null,     "quotes" => QUOTES_NONE),
-      "p_favicon_path"     => array("value" => null,     "quotes" => QUOTES_NONE),
-      "p_apple_path"       => array("value" => null,     "quotes" => QUOTES_NONE),
       "p_header"           => array("value" => null,     "quotes" => QUOTES_LAZY),
       "p_footer"           => array("value" => null,     "quotes" => QUOTES_LAZY),
       "p_colorpack"        => array("value" => null,     "quotes" => QUOTES_NONE),
+
+      "p_favicon_ico"      => array("value" => null,     "quotes" => QUOTES_NONE),
+      "p_favicon_png"      => array("value" => null,     "quotes" => QUOTES_NONE),
+      "p_favicon_gif"      => array("value" => null,     "quotes" => QUOTES_NONE),
+      "p_favicon_apple"    => array("value" => null,     "quotes" => QUOTES_NONE),
+      "p_favicon_noshine"  => array("value" => "off",    "quotes" => QUOTES_NONE),
     
       // Advanced Options - General
@@ -80 +86 @@
   private function loadConfig($ver = '') {
     global $conf, $pwg_loaded_plugins;
+
     $this->themeConfigMin = unserialize($conf['greydragon']);
     $this->themeConfigMin["version"] = $ver;
@@ -88 +95 @@
 
   private function validateDefault($config) {
+
+    // Check version, perform update if necessary
+    if (!isset($config["p_version"]) || ($this->themeConfigMin["version"] !== $config["p_version"])):
+
+      if (isset($config["p_favicon_path"])):
+        $config["p_favicon_ico"] = $config["p_favicon_path"];
+        unset($config["p_favicon_path"]);
+      endif;
+    endif;
+
     $theme_default_settings = $this->getDefaults();
 
     foreach ($theme_default_settings as $key => $value):
-      if ($value["value"]):
+      if (isset($value["value"])):
         if (array_key_exists($key, $config)):
         else:
@@ -100 +117 @@
 
     // Populate some system settings
-
     $url_root = get_root_url();
     $config['U_SITE_ADMIN'] = $url_root . 'admin.php?page=';
@@ -120 +136 @@
       return $this->themeConfig;
     else:
-      return $this->themeConfigMin;
+      $config = $this->themeConfigMin;
+      $config['p_version'] = GDTHEME_VERSION;
+      return $config;
     endif;
   }
@@ -187 +205 @@
     if ((isset($_POST["p_reset"])) && ($_POST["p_reset"] == "on")):
       // Reset theme settings
-      conf_update_param('greydragon', pwg_db_real_escape_string(serialize(array())));
+      $config = array();
+      conf_update_param('greydragon', pwg_db_real_escape_string(serialize($config)));
       load_conf_from_db();
       $this->loadConfig();
@@ -216 +235 @@
     else:
       return (array_key_exists($name, $this->themeConfig));
+    endif;
+  }
+
+  public function deleteOption($name, $isGlobal = FALSE) {
+    global $conf;
+
+    if ($isGlobal):
+      if (array_key_exists($name, $conf) && isset($conf[$name])):
+        unset($conf[$name]);
+      endif;
+    else:
+      if (array_key_exists($name, $this->themeConfig)):
+        unset($this->themeConfig[$name]);
+      endif;
     endif;
   }
@@ -235 +268 @@
       endif;
     endif;
+  }
+
+  public function hasCustomFavicon() {
+    return ($this->hasOption("p_logo_path"));
+  }
+
+  public function update($old_version, $new_version) {
+    $this->prepareCustomCSS();
+  }
+
+  public function uninstall() {
+    // delete configuration
+    $this->deleteCustomCSS();
+
+    conf_delete_param('greydragon');
   }
 
@@ -290 +338 @@
   }
 
-  public function getHeader() {
-    $content = "";
+  public function getURLRoot() {
     $root_base = get_root_url();
     if ($root_base):
@@ -297 +344 @@
       $root_base = '/';
     endif;
+    return $root_base;
+  }
+
+  public function getHeader() {
+    global $conf;
+
+    $content = "";
+    $root_base = $this->getURLRoot();
 
     if ($this->hasOption('p_logo_path')):
@@ -302 +357 @@
     endif;
     if ($this->hasOption('p_header')):
-      $content .= '<a title="Home" id="g-header-text" href="' . $root_base . '">' . $this->getOption('p_header') . '</a>';
+      $p_header = $this->getOption('p_header');
     elseif ($this->hasOption('page_banner', TRUE)):
-      $content .= '<a title="Home" id="g-header-text" href="' . $root_base . '">' . $this->getOption('page_banner', TRUE) . '</a>';
-    endif;                                                                                                              
+      $p_header = $this->getOption('page_banner', TRUE);
+    else:
+      $p_header = "";
+    endif;
+    $p_header = trim(str_replace('%gallery_title%', $conf['gallery_title'], $p_header));
+    if (strlen($p_header) > 0):
+      $content .= '<a title="Home" id="g-header-text" href="{$U_HOME}">' . $p_header . '</a>';
+    endif;
 
     return $content;