Changeset 3480 for extensions/CommentEditor

Timestamp:

Jun 30, 2009, 11:38:31 PM (15 years ago)

Author:

Criss

Message:

Fix bug on plugin update

Location:

extensions/CommentEditor

Files:

• classes/ce_config.class.php (modified) (7 diffs)
• classes/ce_plugin.class.php (modified) (3 diffs)
• include/ce_common.inc.php (modified) (2 diffs)
• maintain.inc.php (modified) (2 diffs)

extensions/CommentEditor/classes/ce_config.class.php

@@ -9 +9 @@
   var $config_values;
   var $default_config;
-  var $db_key;
-  var $db_comment;
+  var $db_key = null;
+  var $db_comment = null;
 
   /* ************************ */
@@ -18 +18 @@
   function CE_Config($default_config = array()) {
     $this->default_config = $default_config;
-    $this->db_key = CE_CFG_DB_KEY;
-    $this->db_comment = CE_CFG_DB_COMMENT;
   }
 
@@ -33 +31 @@
   }
 
+  function setValue($key, $value) {
+      $this->config_values[$key] = $value;
+  }
+
+  function getVersion() {
+    if (isset($this->config_values[CE_CFG_VERSION])) {
+      return $this->config_values[CE_CFG_VERSION];
+    }
+    return CE_VERSION;
+  }
+
   function setDBKey($key) {
     $this->db_key = $key;
-  }
-
-  function setDBComment($comment) {
-    $this->db_comment = $comment;
-  }
-
-  function setValue($key, $value) {
-      $this->config_values[$key] = $value;
   }
 
@@ -50 +51 @@
 
   function loadConfig() {
-    $query = '
-        SELECT value
-        FROM '.CONFIG_TABLE.'
-        WHERE param = \''.CE_CFG_DB_KEY.'\'
-        ;';
-    $result = pwg_query($query);
-    if($result) {
-      $row = mysql_fetch_row($result);
-      if(is_string($row[0])) {
-        $this->config_values = unserialize($row[0]);
+    if (null != $this->db_key) {
+      $query = '
+          SELECT value
+          FROM '.CONFIG_TABLE.'
+          WHERE param = \''. $this->db_key .'\'
+          ;';
+      $result = pwg_query($query);
+      if($result) {
+        $row = mysql_fetch_row($result);
+        if(is_string($row[0])) {
+          $this->config_values = unserialize($row[0]);
+        }
       }
     }
@@ -78 +81 @@
 
   function saveConfig() {
+    if (null == $this->db_key) {
+      return false;
+    }
+    $db_comment = sprintf($this->config_values[CE_CFG_COMMENT],
+                          $this->db_key,
+                          $this->getVersion());
     $query = '
         REPLACE INTO '.CONFIG_TABLE.'
@@ -83 +92 @@
           \''. $this->db_key .'\',
           \''.serialize($this->config_values).'\',
-          \''. $this->db_comment . '\')
+          \''. $db_comment . '\')
         ;';
     $result = pwg_query($query);
@@ -99 +108 @@
   static function install($plugin_id, $default_config = array()) {
     $config = new CE_Config($default_config);
-    $config->setDBComment('Factory settings for '. $plugin_id);
     $config->setDBKey($plugin_id);
     $config->loadConfig();
+    if (isset($default_config[CE_CFG_VERSION])) {
+      // Override version
+      $config->config_values[CE_CFG_VERSION] = $default_config[CE_CFG_VERSION];
+    }
+    if (isset($default_config[CE_CFG_COMMENT])) {
+      // Override comment
+      $config->config_values[CE_CFG_COMMENT] = $default_config[CE_CFG_COMMENT];
+    }
     $result = $config->saveConfig();
     return $result;

extensions/CommentEditor/classes/ce_plugin.class.php

@@ -1 +1 @@
 <?php
-/* $Id: ce_plugin.class.php,v 1.13 2009/06/30 19:01:50 Criss Exp $ */
+/* $Id: ce_plugin.class.php,v 1.14 2009/06/30 21:36:20 Criss Exp $ */
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
@@ -20 +20 @@
     $this->config = $config;
     if (null != $this->config) {
+      $this->config->setDBKey(CE_CFG_DB_KEY);
       $this->config->loadConfig();
+      $this->config->setValue(CE_CFG_COMMENT, CE_CFG_DB_COMMENT);
     }
   }
@@ -118 +120 @@
 
   function getVersion() {
-    if (isset($this->config->config_values[CE_CFG_VERSION])) {
-      return $this->config->config_values[CE_CFG_VERSION];
-    }
-    return CE_VERSION;
+    return $this->config->getVersion();
   }
 

extensions/CommentEditor/include/ce_common.inc.php

@@ -1 +1 @@
 <?php
-/* $Id: ce_common.inc.php,v 1.14 2009/06/30 19:22:06 Criss Exp $ */
+/* $Id: ce_common.inc.php,v 1.15 2009/06/30 21:36:20 Criss Exp $ */
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
@@ -42 +42 @@
 if (isset($plugin)) {
   define('CE_CFG_DB_KEY',       $plugin['id']);
-  define('CE_CFG_DB_COMMENT',   'Configuration of plugin ' . $plugin['id']);
 }
+define('CE_CFG_DB_FACTORY',     'Factory settings for plugin %s [%s]');
+define('CE_CFG_DB_COMMENT',     'Configuration of plugin %s [%s]');
 define('CE_CFG_DISPLAY_ERROR',  'display_error');
 define('CE_CFG_DISPLAY_INFO',   'display_info');
+define('CE_CFG_COMMENT',        'comment');
 define('CE_CFG_VERSION',        'version');
 

extensions/CommentEditor/maintain.inc.php

@@ -11 +11 @@
 
 function plugin_install($plugin_id, $version, &$errors) {
+  include_once(CE_PATH . 'include/ce_common.inc.php');
+  // Include language advices
+  load_language('plugin.lang', CE_PATH);
+  if ($version != CE_VERSION) {
+    array_push($errors, sprintf(l10n('ce_inconsistent_version'), $plugin_id));
+    return;
+  }
+  $ce_config_default[CE_CFG_COMMENT] = CE_CFG_DB_FACTORY;
   update_config($plugin_id, $version, $errors);
 }
@@ -29 +37 @@
 function update_config($plugin_id, $version, &$errors) {
   include_once(CE_PATH . 'include/ce_common.inc.php');
-  // Include language advices
-  load_language('plugin.lang', CE_PATH);
-  if ($version != CE_VERSION) {
-    array_push($errors, sprintf(l10n('ce_inconsistent_version'), $plugin_id));
-    return;
-  }
   $clean = ce_clean_obsolete_files(CE_OBSOLETE);
-  $ce_config_default[CE_CFG_VERSION] = $version;
+  $ce_config_default[CE_CFG_VERSION] = CE_VERSION;
   $install = CE_Config::install($plugin_id, $ce_config_default);
 }