Changeset 28882 for extensions/ContactForm/include/functions.inc.php

Timestamp:

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

Author:

mistic100

Message:

block menu link sooner, add identifier for menu link

File:

• extensions/ContactForm/include/functions.inc.php (modified) (3 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);
 }