Changeset 17658

Timestamp:

Aug 29, 2012, 5:33:08 PM (12 years ago)

Author:

mistic100

Message:

consolidate upgrade process

Location:

extensions/ContactForm

Files:

• include/functions.inc.php (modified) (1 diff)
• include/install.inc.php (added)
• main.inc.php (modified) (3 diffs)
• maintain.inc.php (modified) (1 diff)

extensions/ContactForm/include/functions.inc.php

@@ -48 +48 @@
     ));
   }
-}
-
-/**
- * admin plugins menu link 
- */
-function contact_form_admin_menu($menu) 
-{
-  array_push($menu, array(
-    'URL' => CONTACT_FORM_ADMIN,
-    'NAME' => 'Contact Form',
-  ));
-  return $menu;
 }
 

extensions/ContactForm/main.inc.php

@@ -11 +11 @@
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
-define('CONTACT_FORM_PATH',   PHPWG_PLUGINS_PATH . basename(dirname(__FILE__)) . '/');
-define('CONTACT_FORM_ADMIN',  get_root_url() . 'admin.php?page=plugin-' . basename(dirname(__FILE__)));
+define('CONTACT_FORM_PATH',   PHPWG_PLUGINS_PATH . 'ContactForm/');
+define('CONTACT_FORM_ADMIN',  get_root_url() . 'admin.php?page=plugin-ContactForm');
 define('CONTACT_FORM_PUBLIC', get_absolute_root_url() . make_index_url(array('section' => 'contact')) . '/');
+define('CONTACT_FORM_VERSION', '2.4.d');
 
 
 add_event_handler('init', 'contact_form_init');
+
 add_event_handler('loc_end_section_init', 'contact_form_section_init');
 add_event_handler('loc_end_index', 'contact_form_page');
 add_event_handler('blockmanager_apply', 'contact_form_applymenu', EVENT_HANDLER_PRIORITY_NEUTRAL+10);
+
 if (defined('IN_ADMIN'))
 {
@@ -28 +31 @@
 
 
+/**
+ * update & unserialize conf & load language & init emails
+ */
 function contact_form_init()
 {
-  global $conf, $template;
+  global $conf, $template,  $pwg_loaded_plugins;
+  
+  if (
+    $pwg_loaded_plugins['ContactForm']['version'] == 'auto' or
+    version_compare($pwg_loaded_plugins['ContactForm']['version'], CONTACT_FORM_VERSION, '<')
+  )
+  {
+    include_once(CONTACT_FORM_PATH . 'include/install.inc.php');
+    contact_form_install();
+    
+    if ($pwg_loaded_plugins['ContactForm']['version'] != 'auto')
+    {
+      $query = '
+UPDATE '. PLUGINS_TABLE .'
+SET version = "'. CONTACT_FORM_VERSION .'"
+WHERE id = "ContactForm"';
+      pwg_query($query);
+      
+      $pwg_loaded_plugins['ContactForm']['version'] = CONTACT_FORM_VERSION;
+      
+      if (defined('IN_ADMIN'))
+      {
+        $_SESSION['page_infos'][] = 'ContactForm updated to version '. CONTACT_FORM_VERSION;
+      }
+    }
+  }
+  
   $conf['ContactForm'] = unserialize($conf['ContactForm']);
-  
   load_language('plugin.lang', CONTACT_FORM_PATH);
   
@@ -43 +74 @@
 }
 
+/**
+ * admin plugins menu link 
+ */
+function contact_form_admin_menu($menu) 
+{
+  array_push($menu, array(
+    'URL' => CONTACT_FORM_ADMIN,
+    'NAME' => 'Contact Form',
+  ));
+  return $menu;
+}
+
 ?>

extensions/ContactForm/maintain.inc.php

@@ -2 +2 @@
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
-define('contact_form_default_config', 
-  serialize(array(
-    'cf_must_initialize' => true,
-    'cf_menu_link' => true,
-    'cf_subject_prefix' => '%gallery_title%',
-    'cf_default_subject' => 'A comment on your site',
-    'cf_allow_guest' => true,
-    'cf_mandatory_mail' => true,
-    'cf_mandatory_name' => true,
-    'cf_redirect_delay' => 5,
-    'cf_mail_type' => 'text/html',
-    'cf_admin_mails' => array(),
-    ))
-  );
-
+include_once(PHPWG_PLUGINS_PATH . 'ContactForm/include/install.inc.php');
 
 function plugin_install() 
 {
-  conf_update_param('ContactForm', contact_form_default_config);
-  conf_update_param('ContactForm_before', null);
-  conf_update_param('ContactForm_after', null);
+  contact_form_install();
+  define('contact_form_installed', true);
 }
 
 function plugin_activate()
 {
-  global $conf;
-
-  if (!isset($conf['ContactForm']))
+  if (!defined('contact_form_installed'))
   {
-    plugin_install();
-  }
-  else
-  {
-    $new_conf = unserialize($conf['ContactForm']);
-    
-    // migration 2.4 -> 2.5
-    if (!isset($new_conf['cf_must_initialize']))
-    {
-      $new_conf['cf_must_initialize'] = false;
-      $new_conf['cf_default_subject'] = 'A comment on your site';
-      $new_conf['cf_mail_type'] = 'text/html';
-      unset($new_conf['comment'], $new_conf['cf_redirect_delay']);
-      unset($new_conf['cf_separator'], $new_conf['cf_separator_length']);
-      
-      foreach ($new_conf['cf_admin_mails'] as $email => $data)
-      {
-        $new_conf['cf_admin_mails'][] = array(
-          'email' => $email,
-          'name' => $data['NAME'],
-          'active' => $data['ACTIVE'],
-          );
-        unset($new_conf['cf_admin_mails'][ $email ]);
-      }
-      
-      conf_update_param('ContactForm', serialize($new_conf));
-      conf_update_param('ContactForm_before', stripslashes($conf['persoformtop']));
-      conf_update_param('ContactForm_after', stripslashes($conf['persoformbottom']));
-      
-      pwg_query('DELETE FROM `'. CONFIG_TABLE .'` WHERE param IN("persoformtop", "persoformbottom") LIMIT 2;');
-    }
+    contact_form_install();
   }
 }