X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=4ee9340b32aba67d244665a28f9d4423c5d8d428;hb=eb301334eb0960dd060cc0d59e6021260a41f835;hp=ffdab4e9b2be7d23068c1312fe87fe32158bc6c4;hpb=19f04fbab2663d9a0fcb3578ca81aefff7d58a08;p=mailer.git

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index ffdab4e9b2..4ee9340b32 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -1211,7 +1211,7 @@ function doResetAdminPassword ($login, $password) {
 	$passHash = '';
 
 	// Now check if we have sql_patches installed
-	if (getExtensionVersion('sql_patches') >= '0.3.6') {
+	if (isExtensionInstalledAndNewer('sql_patches', '0.3.6')) {
 		// Use new way of hashing
 		$passHash = generateHash($password);
 	} else {
@@ -1295,31 +1295,5 @@ function adminCreateUserLink ($userid) {
 	return '{?URL?}/modules.php?module=admin&what=list_user';
 }
 
-// -----------------------------------------------------------------------------
-// ---                           Filter functions                            ---
-// -----------------------------------------------------------------------------
-
-// Filter for checking admin ACL
-function FILTER_CHECK_ADMIN_ACL () {
-	// Extension not installed so it's always allowed to access everywhere!
-	$ret = true;
-
-	// Ok, Cookie-Update done
-	if ((isExtensionInstalledAndNewer('admins', '0.3.0')) && (isExtensionActive('admins'))) {
-		// Check if action GET variable was set
-		$action = getAction();
-		if (isWhatSet()) {
-			// Get action value by what-value
-			$action = getModeAction('admin', getWhat());
-		} // END - if
-
-		// Check for access control line of current menu entry
-		$ret = adminsCheckAdminAcl($action, getWhat());
-	} // END - if
-
-	// Set it here
-	$GLOBALS['acl_allow'] = $ret;
-}
-
 // [EOF]
 ?>