Changeset 28882

Timestamp:

Jul 1, 2014, 11:09:38 AM (10 years ago)

Author:

mistic100

Message:

block menu link sooner, add identifier for menu link

Location:

extensions/ContactForm

Files:

• include/functions.inc.php (modified) (3 diffs)
• main.inc.php (modified) (4 diffs)

extensions/ContactForm/include/functions.inc.php

@@ -31 +31 @@
   global $page;
 
-  if (isset($page['section']) and $page['section'] == 'contact')
+  if (isset($page['section']) && $page['section'] == 'contact')
   {
     include(CONTACT_FORM_PATH . 'include/contact_form.inc.php');
@@ -44 +44 @@
   global $conf;
 
-  if (!$conf['ContactForm']['cf_menu_link']) return;
-  if (!is_classic_user() and !$conf['ContactForm']['cf_allow_guest']) return;
-  if (!$conf['ContactForm_ready']) return;
+  if (!$conf['ContactForm_ready'] || (
+    !is_classic_user() && !$conf['ContactForm']['cf_allow_guest']
+  ))
+  {
+    return;
+  }
 
   $menu = &$menu_ref_arr[0];
   if (($block = $menu->get_block('mbMenu')) != null)
   {
-    $block->data[] = array(
+    $block->data['contact'] = array(
       'URL' => CONTACT_FORM_PUBLIC,
       'NAME' => l10n('Contact'),
@@ -63 +66 @@
 function contact_form_footer_link($content, &$smarty)
 {
-  $search = '<a href="mailto:{$CONTACT_MAIL}?subject={\'A comment on your site\'|@translate|@escape:url}">';
+  $search = '#<a href="mailto:{\\$CONTACT_MAIL}\\?subject={\'A comment on your site\'\\|@?translate\\|@?escape:url}">#';
   $replace = '<a href="{$CONTACT_FORM_PUBLIC}">';
-  return str_replace($search, $replace, $content);
+  return preg_replace($search, $replace, $content);
 }
 

extensions/ContactForm/main.inc.php

@@ -15 +15 @@
 defined('PHPWG_ROOT_PATH') or die('Hacking attempt!');
 
-global $prefixeTable;
+global $conf, $prefixeTable;
 
 define('CONTACT_FORM_ID',     basename(dirname(__FILE__)));
@@ -22 +22 @@
 define('CONTACT_FORM_PUBLIC', get_absolute_root_url() . make_index_url(array('section' => 'contact')) . '/');
 define('CONTACT_FORM_TABLE',  $prefixeTable .'contact_form');
+
+$conf['ContactForm'] = safe_unserialize($conf['ContactForm']);
 
 include(CONTACT_FORM_PATH . 'include/functions.inc.php');
@@ -38 +40 @@
 }
 
-add_event_handler('blockmanager_apply', 'contact_form_applymenu', EVENT_HANDLER_PRIORITY_NEUTRAL+10);
-add_event_handler('before_parse_mail_template', 'contact_form_mail_template', EVENT_HANDLER_PRIORITY_NEUTRAL, 2);
+if ($conf['ContactForm']['cf_menu_link'])
+{
+  add_event_handler('blockmanager_apply', 'contact_form_applymenu', EVENT_HANDLER_PRIORITY_NEUTRAL+10);
+}
+
+add_event_handler('before_parse_mail_template', 'contact_form_mail_template');
 
 
@@ -49 +55 @@
   global $conf, $template;
 
-  $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));