X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=a18dd7f49fd303d62e333915e71fa9cd4fae2377;hp=33c542893c305d77b6dd990bd0bba841591b2f18;hb=61621983cc6d7195fcc7eab29b5f6080ff283b34;hpb=e5848e7e22dffe36ea207111a3a4ed1f7d5a8639

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 33c542893c..a18dd7f49f 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2016 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -53,7 +53,7 @@ function addAdminAccount ($adminLogin, $passHash, $adminEmail, $accessLevel = 'd
 		array($adminLogin), __FUNCTION__, __LINE__);
 
 	// Is the entry there?
-	if (ifSqlHasZeroNums($result)) {
+	if (ifSqlHasZeroNumRows($result)) {
 		// Is ext-admins installed and version at least 0.3.0?
 		if (isExtensionInstalledAndNewer('admins', '0.3.0')) {
 			// Ok, let's create the admin login
@@ -135,6 +135,8 @@ function ifAdminLoginDataIsValid ($adminLogin, $adminPassword) {
 
 // Only be executed on cookie checking
 function ifAdminCookiesAreValid ($adminLogin, $passHash) {
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'adminLogin=' . $adminLogin . ',passHash=' . $passHash . ' - CALLED!');
+
 	// First of all, no admin login is found
 	$ret = '404';
 
@@ -161,7 +163,7 @@ function ifAdminCookiesAreValid ($adminLogin, $passHash) {
 	} // END - if
 
 	// Return status
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ret='.$ret);
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ret=' . $ret . ' - EXIT!');
 	return $ret;
 }
 
@@ -280,7 +282,7 @@ ORDER BY
 	`id` DESC", __FUNCTION__, __LINE__);
 
 	// Are there entries?
-	if (!ifSqlHasZeroNums($result_main)) {
+	if (!ifSqlHasZeroNumRows($result_main)) {
 		$OUT .= '<ul class="admin_menu_main">';
 
 		// Load all 'action' menus
@@ -363,7 +365,7 @@ ORDER BY
 		array($mainContent['main_action']), __FUNCTION__, __LINE__);
 
 	// Remember the count for later checks
-	setAdminMenuHasEntries($mainContent['main_action'], ((!ifSqlHasZeroNums($result_what)) && (($action == $mainContent['main_action']) || (isAdminMenuJavascriptEnabled()))));
+	setAdminMenuHasEntries($mainContent['main_action'], ((!ifSqlHasZeroNumRows($result_what)) && (($action == $mainContent['main_action']) || (isAdminMenuJavascriptEnabled()))));
 
 	// Start li-tag for sub menu content
 	$OUT .= '<li class="admin_menu_sub" id="action_menu_' . $mainContent['main_action'] . '"' . addStyleMenuContent('admin', $mainContent['main_action'], $action) . '>';
@@ -374,7 +376,7 @@ ORDER BY
 		$SUB = TRUE;
 
 		// Are there entries?
-		if (!ifSqlHasZeroNums($result_what)) {
+		if (!ifSqlHasZeroNumRows($result_what)) {
 			// Start HTML code
 			$OUT .= '<ul class="admin_menu_sub">';
 
@@ -541,7 +543,7 @@ function adminMenuSelectionBox_DEPRECATED ($mode, $default = '', $defid = '') {
 
 	$result = sqlQueryEscaped("SELECT `%s` AS `menu`, `title` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$what." ORDER BY `sort` ASC",
 		array($mode), __FUNCTION__, __LINE__);
-	if (!ifSqlHasZeroNums($result)) {
+	if (!ifSqlHasZeroNumRows($result)) {
 		// Load menu as selection
 		$OUT = '<select name="' . $mode . '_menu';
 		if (!isValidId($defid)) $OUT .= '[' . intval($defid) . ']';
@@ -614,10 +616,10 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
 			// Shall we add numbers or strings?
 			if ('' . $val . '' == '' . $test . '') {
 				// Add numbers
-				array_push($tableData, sprintf("`%s`=%s", $id, $test));
+				array_push($tableData, sprintf('`%s`=%s', $id, $test));
 			} elseif (is_null($val)) {
 				// Add NULL
-				array_push($tableData, sprintf("`%s`=NULL", $id));
+				array_push($tableData, sprintf('`%s`=NULL', $id));
 			} else {
 				// Add strings
 				array_push($tableData, sprintf("`%s`='%s'", $id, trim($val)));
@@ -1150,7 +1152,7 @@ function sendAdminPasswordResetLink ($email) {
 		array($email), __FUNCTION__, __LINE__);
 
 	// Is there an account?
-	if (ifSqlHasZeroNums($result)) {
+	if (ifSqlHasZeroNumRows($result)) {
 		// No account found
 		return '{--ADMIN_NO_LOGIN_WITH_EMAIL--}';
 	} // END - if
@@ -1247,7 +1249,7 @@ function adminUpdateTaskData ($id, $row, $data) {
 		reportBug(__FUNCTION__, __LINE__, 'id=' . $id . ',row=' . $row . ',data=' . $data . ' - isAdmin()=false');
 	} elseif ($id <= 0) {
 		// Initiate backtrace
-		reportBug(__FUNCTION__, __LINE__, sprintf("id is invalid: %s. row=%s, data=%s",
+		reportBug(__FUNCTION__, __LINE__, sprintf('id is invalid: %s. row=%s, data=%s',
 			$id,
 			$row,
 			$data
@@ -1531,7 +1533,7 @@ function adminProcessMenuEditForm ($type, $subMenu) {
 				break;
 
 			default: // Unexpected action
-				logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unsupported action %s detected.", postRequestElement('ok')));
+				logDebugMessage(__FUNCTION__, __LINE__, sprintf('Unsupported action %s detected.', postRequestElement('ok')));
 				displayMessage('{%message,ADMIN_UNKNOWN_OKAY=' . postRequestElement('ok') . '%}');
 				break;
 		} // END - switch
@@ -1663,7 +1665,7 @@ function registerFirstAdmin () {
 
 			default:
 				// Any other kind will be logged
-				$errorMessage = sprintf("Unknown return code %s from ifAdminLoginDataIsValid().", $ret);
+				$errorMessage = sprintf('Unknown return code %s from ifAdminLoginDataIsValid().', $ret);
 				logDebugMessage(__FUNCTION__, __LINE__, $errorMessage);
 
 				// Set this to have our error message displayed