Changeset 18824

Timestamp:

Oct 31, 2012, 3:27:46 PM (11 years ago)

Author:

mistic100

Message:

update for ContactForm 2.5

Location:

extensions/Contact1menu

Files:

• initadmin.php (modified) (1 diff)
• main.inc.php (modified) (1 diff)

extensions/Contact1menu/initadmin.php

@@ -1 +1 @@
 <?php
-        add_event_handler('loc_begin_admin_page', 'C1M_admin_menu' );
+add_event_handler('loc_begin_admin_page', 'C1M_admin_menu' );
         
-        function C1M_admin_menu()
+function C1M_admin_menu()
 {
         global $page,$conf;
 
         load_language('plugin.lang', C1M_PATH);
-        $page['errors'][] = l10n('Plugin Contact form must be installe and activate for use Contact 1 menu');
+        $page['errors'][] = l10n('The plugin ContactForm must be installed and activated in order to use Contact1menu');
 
 }

extensions/Contact1menu/main.inc.php

@@ -17 +17 @@
 
 if($desacc['state'] != 'active') 
-        {
-if (script_basename() == 'admin')   
 {
-  include_once(dirname(__FILE__).'/initadmin.php');
+  if (script_basename() == 'admin')   
+  {
+    include_once(dirname(__FILE__).'/initadmin.php');
+  }
 }
-        }
 else
-        {
+{
+  add_event_handler('blockmanager_register_blocks', 'register_c1m_menubar_blocks');
+  add_event_handler('blockmanager_apply', 'c1m_apply');
 
-add_event_handler('blockmanager_register_blocks', 'register_c1m_menubar_blocks');
-add_event_handler('blockmanager_apply', 'c1m_apply');
+  function register_c1m_menubar_blocks( $menu_ref_arr )
+  {
+    $menu = & $menu_ref_arr[0];
+    if ($menu->get_id() != 'menubar')
+      return;
+    $menu->register_block( new RegisteredBlock( 'mbContact', 'Contact', 'C1M'));
+  }
 
-function register_c1m_menubar_blocks( $menu_ref_arr )
-{
-  $menu = & $menu_ref_arr[0];
-  if ($menu->get_id() != 'menubar')
-    return;
-  $menu->register_block( new RegisteredBlock( 'mbContact', 'Contact', 'C1M'));
+  function c1m_apply($menu_ref_arr)
+  {
+    global $template;
+
+    $menu = & $menu_ref_arr[0];
+   
+    load_language('plugin.lang', CONTACT_FORM_PATH);
+    load_language('lang', PHPWG_ROOT_PATH.PWG_LOCAL_DIR, array('no_fallback'=>true, 'local'=>true) );
+    // Envoi des données au template
+    $template->assign(array(
+      'C1MTITLE'     => l10n('Contact'),
+      'C1MNAME'      => l10n('Contact'),
+      'C1MURL'       => CONTACT_FORM_PUBLIC,
+      ));
+
+     
+    if (($block = $menu->get_block( 'mbContact' )) != null)
+    {
+      $template->set_template_dir(C1M_PATH.'template/');
+      $block->template = 'menubar_contact.tpl';
+    }
+  }
 }
 
-function c1m_apply($menu_ref_arr)
-{
-  global $template;
-
- $menu = & $menu_ref_arr[0];
- 
- load_language('plugin.lang', CF_PATH);
- load_language('lang', PHPWG_ROOT_PATH.PWG_LOCAL_DIR, array('no_fallback'=>true, 'local'=>true) );
-     // Envoi des données au template
-            $template->assign   (
-                array   (
-        'C1MTITLE'     => l10n('contact_form_title'),
-        'C1MNAME'      => l10n('contact_form'),
-        'C1MURL' => get_root_url().'index.php?/contact',
-                                )                       );
-
-   
-    if (($block = $menu->get_block( 'mbContact' )) != null) {
-        $template->set_template_dir(C1M_PATH.'template/');
-        $block->template = 'menubar_contact.tpl';
-    }
-}
-        }
-
 ?>