Changeset 7197 for extensions/ContactForm/include

Timestamp:

Oct 15, 2010, 4:20:39 PM (14 years ago)

Author:

plg

Message:

feature 1897 added: the core "Contact Webmaster" link in footer is replaced by
a link to the ContactForm page. It works with a smarty prefilter, so it should
work with all themes.

The configurable template variable name was removed. It is hard coded as
$ContactFormLink. I've seen no example using another variable name. It was
hard to understand for users in the administration panel and not very useful.
The corresponding language keys were removed from all languages.

bug 1916 fixed: apply the same rule for link display in footer as in menu. If
the administrator has allowed the ContactForm page for guests, let's display
it in the menu + footer.

Location:

extensions/ContactForm/include

Files:

• cf_common.inc.php (modified) (3 diffs)
• cf_functions.inc.php (modified) (1 diff)

extensions/ContactForm/include/cf_common.inc.php

@@ -37 +37 @@
 define('CF_DEFAULT_PREFIX',     'Piwigo ContactForm');
 define('CF_REDIRECT_DELAY',     5);
-define('CF_DEFAULT_LINKNAME',   'ContactFormLink');
 define('CF_LANG_DEFAULT',       'default');
 // Config keys
@@ -56 +55 @@
 define('CF_CFG_NAME_MANDATORY', 'cf_mandatory_name');
 define('CF_CFG_REDIRECT_DELAY', 'cf_redirect_delay');
-define('CF_CFG_DEFINE_LINK',    'cf_define_link');
-define('CF_CFG_CONTACT_LINK',   'cf_link');
 define('CF_CFG_ADMIN_MAILS',    'cf_admin_mails');
 
@@ -86 +83 @@
 $cf_config_default[CF_CFG_NAME_MANDATORY] = true;
 $cf_config_default[CF_CFG_REDIRECT_DELAY] = CF_REDIRECT_DELAY;
-$cf_config_default[CF_CFG_DEFINE_LINK] = true;
-$cf_config_default[CF_CFG_CONTACT_LINK] = CF_DEFAULT_LINKNAME;
 $cf_config_default[CF_CFG_ADMIN_MAILS] = cf_get_admins_contacts();
 $cf_config_default[CF_CFG_ADMIN_MAILS] = array();

extensions/ContactForm/include/cf_functions.inc.php

@@ -140 +140 @@
   }
 }
+
+function contactForm_prefilter($content, &$smarty) {
+  $search = '#{if\s+isset\s*\(\s*\$CONTACT_MAIL\s*\)\s*}.*?{/if}#s';
+  $replacement = '{if isset($ContactFormLink)}{$ContactFormLink}{/if}';
+
+  return preg_replace($search, $replacement, $content);
+}
   
 function cf_clean_obsolete_files($obsolete_file_list) {