Changeset 28839

Timestamp:

Jun 29, 2014, 4:21:03 PM (10 years ago)

Author:

mistic100

Message:

use new maintain class

Location:

extensions/ContactForm

Files:

• admin/config.php (modified) (1 diff)
• include/functions.inc.php (modified) (1 diff)
• main.inc.php (modified) (3 diffs)
• maintain.class.php (added)
• maintain.inc.php (deleted)

extensions/ContactForm/admin/config.php

@@ -33 +33 @@
     'cf_redirect_url' =>      $_POST['cf_redirect_url'],
     );
-  $conf['ContactForm_before'] = $_POST['cf_before'];
-  $conf['ContactForm_after'] = $_POST['cf_after'];
 
-  conf_update_param('ContactForm', pwg_db_real_escape_string(serialize($conf['ContactForm'])));
-  conf_update_param('ContactForm_before', $conf['ContactForm_before']);
-  conf_update_param('ContactForm_after', $conf['ContactForm_after']);
+  conf_update_param('ContactForm', $conf['ContactForm']);
+  conf_update_param('ContactForm_before', trim($_POST['cf_before']), true);
+  conf_update_param('ContactForm_after', trim($_POST['cf_after']), true);
 
   $page['infos'][] = l10n('Information data registered in database');

extensions/ContactForm/include/functions.inc.php

@@ -141 +141 @@
 
   $conf['ContactForm']['cf_must_initialize'] = false;
-  conf_update_param('ContactForm', serialize($conf['ContactForm']));
+  conf_update_param('ContactForm', $conf['ContactForm']);
 }
 

extensions/ContactForm/main.inc.php

@@ -13 +13 @@
  */
 
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+defined('PHPWG_ROOT_PATH') or die('Hacking attempt!');
 
 global $prefixeTable;
 
-defined('CONTACT_FORM_ID') or define('CONTACT_FORM_ID', basename(dirname(__FILE__)));
-define('CONTACT_FORM_PATH',    PHPWG_PLUGINS_PATH . CONTACT_FORM_ID . '/');
-define('CONTACT_FORM_ADMIN',   get_root_url() . 'admin.php?page=plugin-' . CONTACT_FORM_ID);
-define('CONTACT_FORM_PUBLIC',  get_absolute_root_url() . make_index_url(array('section' => 'contact')) . '/');
-define('CONTACT_FORM_TABLE',   $prefixeTable .'contact_form');
-define('CONTACT_FORM_VERSION', 'auto');
+define('CONTACT_FORM_ID',     basename(dirname(__FILE__)));
+define('CONTACT_FORM_PATH',   PHPWG_PLUGINS_PATH . CONTACT_FORM_ID . '/');
+define('CONTACT_FORM_ADMIN',  get_root_url() . 'admin.php?page=plugin-' . CONTACT_FORM_ID);
+define('CONTACT_FORM_PUBLIC', get_absolute_root_url() . make_index_url(array('section' => 'contact')) . '/');
+define('CONTACT_FORM_TABLE',  $prefixeTable .'contact_form');
+
+include(CONTACT_FORM_PATH . 'include/functions.inc.php');
 
 
@@ -40 +41 @@
 add_event_handler('before_parse_mail_template', 'contact_form_mail_template', EVENT_HANDLER_PRIORITY_NEUTRAL, 2);
 
-include(CONTACT_FORM_PATH . 'include/functions.inc.php');
-
 
 /**
@@ -48 +47 @@
 function contact_form_init()
 {
-  global $conf, $template, $pwg_loaded_plugins;
+  global $conf, $template;
 
-  include_once(CONTACT_FORM_PATH . 'maintain.inc.php');
-  $maintain = new ContactForm_maintain(CONTACT_FORM_ID);
-  $maintain->autoUpdate(CONTACT_FORM_VERSION, 'install');
-
-  $conf['ContactForm'] = unserialize($conf['ContactForm']);
+  $conf['ContactForm'] = safe_unserialize($conf['ContactForm']);
+  
   load_language('plugin.lang', CONTACT_FORM_PATH);
   load_language('lang', PHPWG_ROOT_PATH.PWG_LOCAL_DIR, array('no_fallback'=>true, 'local'=>true));