X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fextensions.php;h=5c15cdf857b98c597056170afe23759c6a26ac56;hp=fa5e463b8f089aef5cefb1bc9beb4074473875bb;hb=c45b1827a16928c65ecc1aea6a9d7a504c4874d4;hpb=6445dffaac3477625d6632ec764624039bd25da6;ds=sidebyside

diff --git a/inc/extensions.php b/inc/extensions.php
index fa5e463b8f..5c15cdf857 100644
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -471,7 +471,7 @@ function EXTENSION_UPDATE($file, $ext, $EXT_VER, $dry_run=false)
 			{
 				// Task not created so it's a brand-new extension which we need to register and create a task for!
 				$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (assigned_admin, userid, status, task_type, subject, text, task_created) VALUES ('%s', '0', 'NEW', 'EXTENSION_UPDATE', '%s', '%s', UNIX_TIMESTAMP())",
-				 array(GET_ADMIN_ID(SQL_ESCAPE(get_session('admin_login'))), $ext_subj, addslashes($NOTES)), __FILE__, __LINE__);
+				 array(GET_ADMIN_ID(get_session('admin_login')), $ext_subj, addslashes($NOTES)), __FILE__, __LINE__);
 			}
 
 			// Free memory
@@ -547,21 +547,17 @@ function EXTENSION_VERBOSE_TABLE($SQLs, $title = ADMIN_SQLS_EXECUTED_ON_REMOVAL,
 	// Return output
 	return $OUT;
 }
-//
-function GET_EXT_NAME($id)
-{
+// Get extension name from id
+function GET_EXT_NAME ($id) {
 	$ret = "";
 	global $cacheArray, $_CONFIG;
-	if (!empty($cacheArray['extensions']['ext_id'][$id]))
-	{
+	if (!empty($cacheArray['extensions']['ext_name'][$id])) {
 		// Load from cache
-		$ret = $cacheArray['extensions']['ext_id'][$id];
+		$ret = $cacheArray['extensions']['ext_name'][$id];
 
 		// Count cache hits
 		$_CONFIG['cache_hits']++;
-	}
-	 else
-	{
+	} elseif (!EXT_IS_ACTIVE("cache")) {
 		// Load from database
 		$result = SQL_QUERY_ESC("SELECT ext_name FROM "._MYSQL_PREFIX."_extensions WHERE id=%s LIMIT 1",
 		 array(bigintval($id)), __FILE__, __LINE__);
@@ -570,27 +566,25 @@ function GET_EXT_NAME($id)
 	}
 	return $ret;
 }
-//
-function GET_EXT_ID($name)
-{
-	$ret = "0";
+// Get extension id from name
+function GET_EXT_ID($name) {
+	$ret = 0;
 	global $cacheArray, $_CONFIG;
-	if ((isset($cacheArray['extensions']['ext_id'])) && (is_array($cacheArray['extensions']['ext_id'])))
-	{
+	if (isset($cacheArray['extensions']['ext_id'][$name])) {
 		// Load from cache
-		$ret = array_search($name, $cacheArray['extensions']['ext_id']);
+		$ret = $cacheArray['extensions']['ext_id'][$name];
 
 		// Count cache hits
 		$_CONFIG['cache_hits']++;
-	}
-	 else
-	{
+	} elseif (!EXT_IS_ACTIVE("cache")) {
 		// Load from database
 		$result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_extensions WHERE ext_name='%s' LIMIT 1",
 		 array($name), __FILE__, __LINE__);
 		list($ret) = SQL_FETCHROW($result);
 		SQL_FREERESULT($result);
 	}
+
+	// Return value
 	return $ret;
 }
 //