X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodule-functions.php;h=a0841a6a6015408d5697f5575c8d7807b13e6c95;hb=0fada672e2066043b76ed5d57f852f451a49a3a3;hp=d0f00c8fa60c1f2602cd434fd4c4741d4f6ae60b;hpb=c9b17a86f4d62b50b8b1fbe6f9d88e6092430526;p=mailer.git

diff --git a/inc/module-functions.php b/inc/module-functions.php
index d0f00c8fa6..a0841a6a60 100644
--- a/inc/module-functions.php
+++ b/inc/module-functions.php
@@ -6,9 +6,9 @@
  * -------------------------------------------------------------------- *
  * File              : module-functions.php                             *
  * -------------------------------------------------------------------- *
- * Short description : All MySQL-related functions                      *
+ * Short description : Module functions                                 *
  * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Alle MySQL-Relevanten Funktionen                 *
+ * Kurzbeschreibung  : Modulfunktionen                                  *
  * -------------------------------------------------------------------- *
  * $Revision::                                                        $ *
  * $Date::                                                            $ *
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -61,7 +61,7 @@ function getModuleTitle ($module) {
 				array($module), __FUNCTION__, __LINE__);
 
 			// Is the entry there?
-			if (SQL_NUMROWS($result)) {
+			if (SQL_NUMROWS($result) == 1) {
 				// Get the title from database
 				$data = SQL_FETCHARRAY($result);
 			} // END - if
@@ -79,10 +79,10 @@ function getModuleTitle ($module) {
 		// Is it 'error'?
 		if ($module == 'error') {
 			// Error (real module was not found)
-			$data['title'] = getMessage('MODULE_ERROR_404');
+			$data['title'] = '{--MODULE_ERROR_404--}';
 		}  else {
 			// No name found
-			$data['title'] = getMaskedMessage('UNKNOWN_MODULE_DETECTED', $module);
+			$data['title'] = '{%message,UNKNOWN_MODULE_DETECTED_TITLE=' . $module . '%}';
 			if ((is_resource($result)) && (SQL_HASZERONUMS($result))) {
 				// Add module to database
 				$dummy = checkModulePermissions($module);
@@ -154,7 +154,7 @@ function isModuleRegistered ($module) {
 			$found = true;
 		} elseif (isDebugModeEnabled()) {
 			// Debug message only in debug-mode...
-			logDebugMessage(__FUNCTION__, __LINE__, 'Module ' . $module . ' not found!');
+			logDebugMessage(__FUNCTION__, __LINE__, 'Module ' . $module . ' not found.');
 		}
 
 		// Free result
@@ -322,7 +322,7 @@ VALUES
 		rebuildCache('modules', 'modules');
 	} elseif ($found === false) {
 		// Problem with module detected
-		logDebugMessage(__FUNCTION__, __LINE__, sprintf("Problem in module %s detected. ret=%s,locked=%d,hidden=%d,mem=%d,admin=%d,output_mode=%s",
+		logDebugMessage(__FUNCTION__, __LINE__, sprintf("Problem in module %s detected. getModuleStatus()=%s,locked=%d,hidden=%d,mem=%d,admin=%d,output_mode=%s",
 			$module_chk,
 			getModuleStatus($module_chk),
 			intval(isModuleLocked($module_chk)),
@@ -396,7 +396,7 @@ function addModuleSql ($module, $locked, $hidden, $adminOnly, $memOnly) {
 	// Is the module already registered?
 	if (!isModuleRegistered($module)) {
 		// Add it
-		addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg` (`module`,`locked`,`hidden`,`admin_only`,`mem_only`) VALUES('" . $module . "','" . $locked . "','" . $hidden . "','" . $adminOnly . "','" . $memOnly . "')");
+		addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg` (`module`, `locked`, `hidden`, `admin_only`, `mem_only`) VALUES ('" . $module . "','" . $locked . "','" . $hidden . "','" . $adminOnly . "','" . $memOnly . "')");
 	} else {
 		// Already registered
 		logDebugMessage(__FUNCTION__, __LINE__, sprintf("Already registered: module=%s,locked=%s,hidden=%s,admin=%s,mem=%s",