Rewritten to use isExtensionInstalledAndNewer() to save some calls/bugfix

[mailer.git] / inc / modules / guest / action-

diff --git a/inc/modules/guest/action- b/inc/modules/guest/action-
index c865842667308ebd66a5bf45bd379286a6b8d0e6..ad7c0a33a6e12b42702800cddd84fc99e97a9760 100644 (file)
--- a/inc/modules/guest/action-
+++ b/inc/modules/guest/action-
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 01/27/2004 *
- * ================                             Last change: 01/27/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 01/27/2004 *
+ * ===================                          Last change: 01/27/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : action-                                          *
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -39,7 +40,10 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} // END - if
+} elseif (isBlockModeEnabled()) {
+       // Block mode detected
+       return;
+}
 
 // Add description as navigation point
 addMenuDescription('guest', __FILE__);
@@ -47,9 +51,6 @@ addMenuDescription('guest', __FILE__);
 if ((!isExtensionActive('')) && (!isAdmin())) {
        loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage(''));
        return;
-} elseif (isBlockModeEnabled()) {
-       // Block mode detected
-       return;
 }
 
 // Load the include file
@@ -58,7 +59,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the guest action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('GUEST_LOCKED_ACTION'), getWhat()));
+       addFatalMessage(__FILE__, __LINE__, getMaskedMessage('GUEST_LOCKED_ACTION', getWhat()));
 }
 
 // [EOF]