Changeset 17518

Timestamp:

Aug 9, 2012, 10:46:10 PM (12 years ago)

Author:

mistic100

Message:

clean definition of CONTACT_FORM_PUBLIC

Location:

extensions/ContactForm

Files:

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

extensions/ContactForm/include/functions.inc.php

@@ -9 +9 @@
   global $tokens, $page, $conf;
   
-  if (!defined('CONTACT_FORM_PUBLIC')) define('CONTACT_FORM_PUBLIC', make_index_url(array('section' => 'contact')) . '/');
-
   if ($tokens[0] == 'contact')
   {
@@ -41 +39 @@
   if ( !is_classic_user() and !$conf['ContactForm']['cf_allow_guest'] ) return;
   if ( !count(get_contact_emails()) ) return;
-  
-  if (!defined('CONTACT_FORM_PUBLIC')) define('CONTACT_FORM_PUBLIC', make_index_url(array('section' => 'contact')) . '/');
 
   $menu = &$menu_ref_arr[0];

extensions/ContactForm/main.inc.php

@@ -11 +11 @@
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
-define('CONTACT_FORM_PATH',  PHPWG_PLUGINS_PATH . basename(dirname(__FILE__)) . '/');
-define('CONTACT_FORM_ADMIN', get_root_url() . 'admin.php?page=plugin-' . basename(dirname(__FILE__)));
+define('CONTACT_FORM_PATH',   PHPWG_PLUGINS_PATH . basename(dirname(__FILE__)) . '/');
+define('CONTACT_FORM_ADMIN',  get_root_url() . 'admin.php?page=plugin-' . basename(dirname(__FILE__)));
+define('CONTACT_FORM_PUBLIC', get_absolute_root_url() . make_index_url(array('section' => 'contact')) . '/');
 
 
@@ -22 +23 @@
 {
   add_event_handler('get_admin_plugin_menu_links', 'contact_form_admin_menu');
-  define('CONTACT_FORM_PUBLIC', make_index_url(array('section' => 'contact')) . '/');
 }