Changeset 18649 for extensions/ContactForm

Timestamp:

Oct 16, 2012, 10:35:07 AM (12 years ago)

Author:

mistic100

Message:

correct upgrade procedure

Location:

extensions/ContactForm

Files:

• admin/emails.php (modified) (1 diff)
• include/install.inc.php (modified) (3 diffs)
• main.inc.php (modified) (2 diffs)
• maintain.inc.php (modified) (1 diff)

extensions/ContactForm/admin/emails.php

@@ -27 +27 @@
   }
   
-  pwg_query('TRUNCATE TABLE `'. CONTACT_FORM_TABLE. '`');
+  pwg_query('TRUNCATE TABLE `'. CONTACT_FORM_TABLE. '`;');
   
   mass_inserts(

extensions/ContactForm/include/install.inc.php

@@ -30 +30 @@
       'cf_mandatory_mail' => true,
       'cf_mandatory_name' => true,
-      'cf_redirect_delay' => 5,
       'cf_mail_type' => 'text/html',
       'cf_redirect_url' => null,
@@ -57 +56 @@
       
       // move emails to database
-      $email = array();
+      $emails = array();
       foreach ($new_conf['cf_admin_mails'] as $email => $data)
       {
@@ -82 +81 @@
       // save config
       $conf['ContactForm'] = serialize($new_conf);
-      $conf['ContactForm_before'] = stripslashes($conf['persoformtop']);
-      $conf['ContactForm_after'] = stripslashes($conf['persoformbottom']);
+      $conf['ContactForm_before'] = stripslashes(@$conf['persoformtop']);
+      $conf['ContactForm_after'] = stripslashes(@$conf['persoformbottom']);
       
       conf_update_param('ContactForm', $conf['ContactForm']);

extensions/ContactForm/main.inc.php

@@ -45 +45 @@
   
   if (
+    CONTACT_FORM_VERSION == 'auto' or
     $pwg_loaded_plugins[CONTACT_FORM_ID]['version'] == 'auto' or
     version_compare($pwg_loaded_plugins[CONTACT_FORM_ID]['version'], CONTACT_FORM_VERSION, '<')
@@ -52 +53 @@
     contact_form_install();
     
-    if ($pwg_loaded_plugins[CONTACT_FORM_ID]['version'] != 'auto')
+    if ( $pwg_loaded_plugins[CONTACT_FORM_ID]['version'] != 'auto' and CONTACT_FORM_VERSION != 'auto' )
     {
       $query = '

extensions/ContactForm/maintain.inc.php

@@ -21 +21 @@
 function plugin_uninstall() 
 {
+  global $prefixeTable;
+  
   pwg_query('DELETE FROM `'. CONFIG_TABLE .'` WHERE param LIKE "ContactForm%" LIMIT 3;');
+  pwg_query('DROP TABLE IF EXISTS `'. $prefixeTable .'contact_form`;');
 }