X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fadmins_functions.php;h=67a2a21a5df1a4dc6f5b657f54679f87838fe010;hb=218aaa7c38e0c92a511cfd837a4554acd1f40ca3;hp=71e179e00e7c052c8896e2309ac183ae252b80fc;hpb=d8148e3f1f3a6762b2e786dbe99ada269dcf2ea0;p=mailer.git

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index 71e179e00e..67a2a21a5d 100644
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Funktionen fuer die admins-Erweiterung           *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -106,11 +111,11 @@ function ADMINS_CHECK_ACL($act, $wht) {
 		{
 			// Main menu
 			$result = SQL_QUERY_ESC("SELECT access_mode FROM `{!_MYSQL_PREFIX!}_admins_acls` WHERE admin_id=%s AND action_menu='%s' LIMIT 1",
-			 array(bigintval($aid), $act), __FILE__, __LINE__);
+			 array(bigintval($aid), $act), __FUNCTION__, __LINE__);
 		} elseif (!empty($wht)) {
 			// Sub menu
 			$result = SQL_QUERY_ESC("SELECT access_mode FROM `{!_MYSQL_PREFIX!}_admins_acls` WHERE admin_id=%s AND what_menu='%s' LIMIT 1",
-			 array(bigintval($aid), $wht), __FILE__, __LINE__);
+			 array(bigintval($aid), $wht), __FUNCTION__, __LINE__);
 		}
 
 		// Get number of lines
@@ -130,16 +135,14 @@ function ADMINS_CHECK_ACL($act, $wht) {
 
 // Create email link to admins's account
 function ADMINS_CREATE_EMAIL_LINK ($email, $mod="admin") {
-	$locked = " AND `status`='CONFIRMED'";
-	if (IS_ADMIN()) $locked = "";
 	if (strpos("@", $email) > 0) {
 		// Create email link
 		$result = SQL_QUERY_ESC("SELECT id
 FROM `{!_MYSQL_PREFIX!}_admins`
-WHERE email='%s'".$locked." LIMIT 1",
- array($email), __FILE__, __LINE__);
+WHERE email='%s' LIMIT 1",
+			array($email), __FUNCTION__, __LINE__);
 
- 		// Is there an entry?
+		// Is there an entry?
 		if (SQL_NUMROWS($result) == 1) {
 			// Load userid
 			list($uid) = SQL_FETCHROW($result);
@@ -150,7 +153,7 @@ WHERE email='%s'".$locked." LIMIT 1",
 
 		// Free memory
 		SQL_FREERESULT($result);
-	} elseif (bigintval($email) > 0) {
+	} elseif ((is_int($email)) && ($email > 0)) {
 		// Direct ID given
 		$email = "{!URL!}/modules.php?module=".$mod."&what=admins_contct&admin=".bigintval($email);
 	}
@@ -217,7 +220,7 @@ WHERE id=%s LIMIT 1",
 						$POST['mode'][$id],
 						$POST['la_mode'][$id],
 						$id
-					), __FILE__, __LINE__);
+					), __FUNCTION__, __LINE__);
 			} else {
 				// Do not allow it here
 				SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET
@@ -230,7 +233,7 @@ WHERE id=%s LIMIT 1",
 						$POST['email'][$id],
 						$POST['la_mode'][$id],
 						$id
-					), __FILE__, __LINE__);
+					), __FUNCTION__, __LINE__);
 			}
 
 			// Purge cache
@@ -250,7 +253,7 @@ WHERE id=%s LIMIT 1",
 	}
 
 	// Remove cache file
-	RUN_FILTER('post_admin_edited', REQUEST_POST_ARRAY());
+	runFilterChain('post_admin_edited', REQUEST_POST_ARRAY());
 }
 
 // Make admin accounts editable
@@ -259,15 +262,15 @@ function ADMINS_EDIT_ADMIN_ACCOUNTS ($POST) {
 	$currMode = GET_ADMIN_DEFAULT_ACL(GET_CURRENT_ADMIN_ID());
 
 	// Begin the edit loop
-	$SW = 2; $OUT = "";
-	foreach ($POST['sel'] as $id => $sel) {
+	$OUT = ""; $SW = 2;
+	foreach ($POST['sel'] as $id => $selected) {
 		// Secure ID number
 		$id = bigintval($id);
 
 		// Get the admin's data
 		$result = SQL_QUERY_ESC("SELECT login, email, default_acl AS mode, la_mode FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
-			array($id), __FILE__, __LINE__);
-		if ((SQL_NUMROWS($result) == 1) && ($sel == 1)) {
+			array($id), __FUNCTION__, __LINE__);
+		if ((SQL_NUMROWS($result) == 1) && ($selected == 1)) {
 			// Entry found
 			$content = SQL_FETCHARRAY($result);
 			SQL_FREERESULT($result);
@@ -300,19 +303,19 @@ function ADMINS_EDIT_ADMIN_ACCOUNTS ($POST) {
 // Delete given admin accounts
 function ADMINS_DELETE_ADMIN_ACCOUNTS ($POST) {
 	// Check if this account is the last one which cannot be deleted...
-	$result_main = SQL_QUERY("SELECT id FROM `{!_MYSQL_PREFIX!}_admins`", __FILE__, __LINE__);
+	$result_main = SQL_QUERY("SELECT id FROM `{!_MYSQL_PREFIX!}_admins`", __FUNCTION__, __LINE__);
 	$accounts = SQL_NUMROWS($result_main);
 	SQL_FREERESULT($result_main);
 	if ($accounts > 1) {
 		// Delete accounts
-		$SW = 2; $OUT = "";
-		foreach ($POST['sel'] as $id => $sel) {
+		$OUT = ""; $SW = 2;
+		foreach ($POST['sel'] as $id => $selected) {
 			// Secure ID number
 			$id = bigintval($id);
 
 			// Get the admin's data
 			$result = SQL_QUERY_ESC("SELECT login, email, default_acl AS mode, la_mode FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
-			 array($id), __FILE__, __LINE__);
+				array($id), __FUNCTION__, __LINE__);
 			if (SQL_NUMROWS($result) == 1) {
 				// Entry found
 				$content = SQL_FETCHARRAY($result);
@@ -351,11 +354,11 @@ function ADMINS_REMOVE_ADMIN_ACCOUNTS ($POST) {
 		if (($del == 1) && (GET_CURRENT_ADMIN_ID() != $id)) {
 			// Rewrite his tasks to all admins
 			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_task_system` SET assigned_admin=0 WHERE assigned_admin=%s",
-			 array($id), __FILE__, __LINE__);
+			 array($id), __FUNCTION__, __LINE__);
 
 			// Remove account
 			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
-				array($id), __FILE__, __LINE__);
+				array($id), __FUNCTION__, __LINE__);
 
 			// Purge cache
 			CACHE_PURGE_ADMIN_MENU($id);
@@ -364,14 +367,14 @@ function ADMINS_REMOVE_ADMIN_ACCOUNTS ($POST) {
 	}
 
 	// Remove cache if cache system is activated
-	RUN_FILTER('post_admin_deleted', REQUEST_POST_ARRAY());
+	runFilterChain('post_admin_deleted', REQUEST_POST_ARRAY());
 }
 
 // List all admin accounts
 function ADMINS_LIST_ADMIN_ACCOUNTS() {
 	// Select all admin accounts
-	$result = SQL_QUERY("SELECT id, login, email, default_acl AS mode, la_mode FROM `{!_MYSQL_PREFIX!}_admins` ORDER BY login ASC", __FILE__, __LINE__);
-	$SW = 2; $OUT = "";
+	$result = SQL_QUERY("SELECT id, login, email, default_acl AS mode, la_mode FROM `{!_MYSQL_PREFIX!}_admins` ORDER BY login ASC", __FUNCTION__, __LINE__);
+	$OUT = ""; $SW = 2;
 	while ($content = SQL_FETCHARRAY($result)) {
 		// Compile some variables
 		$content['mode'] = constant('ADMINS_'.strtoupper($content['mode']).'_MODE');