Changeset 24234 for extensions/EasyCaptcha/main.inc.php

Timestamp:

Aug 25, 2013, 12:36:50 PM (11 years ago)

Author:

mistic100

Message:

error with question_mark_in_urls=false, restore full language keys
+ de_DE for icons.lang.php

File:

• extensions/EasyCaptcha/main.inc.php (modified) (3 diffs)

extensions/EasyCaptcha/main.inc.php

@@ -31 +31 @@
 else
 {
-  add_event_handler('init', 'easycaptcha_document_init');
-  add_event_handler('loc_end_section_init', 'easycaptcha_section_init', EVENT_HANDLER_PRIORITY_NEUTRAL+30);
+  add_event_handler('loc_end_section_init', 'easycaptcha_document_init', EVENT_HANDLER_PRIORITY_NEUTRAL+30);
 }
 
@@ -67 +66 @@
 
 
-// modules : picture comment & register
+// modules
 function easycaptcha_document_init()
 {
-  global $conf, $user;
+  global $conf, $pwg_loaded_plugins, $page;
 
   if (!is_a_guest()) return;
@@ -84 +83 @@
     include(EASYCAPTCHA_PATH . 'include/picture.inc.php');
   }
-
-}
-
-// modules : album comment & contact & guestbook
-function easycaptcha_section_init()
-{
-  global $conf, $pwg_loaded_plugins, $page;
-
-  if (!is_a_guest() || !isset($page['section'])) return;
-
-  if (
-    script_basename() == 'index' &&
-    $page['section'] == 'categories' && isset($page['category']) &&
-    isset($pwg_loaded_plugins['Comments_on_Albums']) &&
-    $conf['EasyCaptcha']['activate_on']['category']
-    )
+  else if (isset($page['section']))
   {
-    $conf['EasyCaptcha']['template'] = 'comment';
-    include(EASYCAPTCHA_PATH . 'include/category.inc.php');
-  }
-  else if ( $page['section'] == 'contact' && $conf['EasyCaptcha']['activate_on']['contactform'] )
-  {
-    $conf['EasyCaptcha']['template'] = 'contactform';
-    include(EASYCAPTCHA_PATH . 'include/contactform.inc.php');
-  }
-  else if ( $page['section'] == 'guestbook' && $conf['EasyCaptcha']['activate_on']['guestbook'] )
-  {
-    $conf['EasyCaptcha']['template'] = 'guestbook';
-    include(EASYCAPTCHA_PATH . 'include/guestbook.inc.php');
+    if (
+      script_basename() == 'index' &&
+      $page['section'] == 'categories' && isset($page['category']) &&
+      isset($pwg_loaded_plugins['Comments_on_Albums']) &&
+      $conf['EasyCaptcha']['activate_on']['category']
+      )
+    {
+      $conf['EasyCaptcha']['template'] = 'comment';
+      include(EASYCAPTCHA_PATH . 'include/category.inc.php');
+    }
+    else if ( $page['section'] == 'contact' && $conf['EasyCaptcha']['activate_on']['contactform'] )
+    {
+      $conf['EasyCaptcha']['template'] = 'contactform';
+      include(EASYCAPTCHA_PATH . 'include/contactform.inc.php');
+    }
+    else if ( $page['section'] == 'guestbook' && $conf['EasyCaptcha']['activate_on']['guestbook'] )
+    {
+      $conf['EasyCaptcha']['template'] = 'guestbook';
+      include(EASYCAPTCHA_PATH . 'include/guestbook.inc.php');
+    }
   }
 }