X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-extensions.php;h=54c37e4dd3205436d3a00a0c2a94fb75bb0f56e1;hp=b8a940ff951ca4dc155ca4274fdb5ee4d89d1b2b;hb=ba973321465edf4c1239d3b499b6de1e4be1f10c;hpb=8fcf84db9fb67ecc531962b23811330d5cd07a91

diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php
index b8a940ff95..54c37e4dd3 100644
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -49,23 +49,23 @@ if (!empty($_POST['sel'])) $SEL = SELECTION_COUNT($_POST['sel']);
 
 if (!empty($_GET['reg_ext'])) {
 	// We are about to register a new extension
-	$do = "register"; $id = $_GET['reg_ext'];
+	$do = "register"; $ext_id = bigintval($_GET['reg_ext']);
 	// The ID comes from task management and it is - of course - *not* the extension's name!
 } elseif ((isset($_POST['change'])) && ($SEL > 0) && (!IS_DEMO())) {
 	// De-/activate extensions
-	foreach ($_POST['sel'] as $id => $active) {
+	foreach ($_POST['sel'] as $ext_id => $active) {
 		// Shall we keep the extension always active?
-		if ((isset($cacheArray['active_extensions'][GET_EXT_NAME($id)])) && ($cacheArray['active_extensions'][GET_EXT_NAME($id)] == "Y") && ($active == "N")) {
+		if ((isset($cacheArray['active_extensions'][GET_EXT_NAME($ext_id)])) && ($cacheArray['active_extensions'][GET_EXT_NAME($ext_id)] == "Y") && ($active == "N")) {
 			// Keep this extension active!
 		} else {
 			// De/activate extension
 			$ACT = "N"; $EXT_LOAD_MODE = "deactivate";
 			if ($active == "N") { $ACT = "Y"; $EXT_LOAD_MODE = "activate"; }
-			$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_extensions SET ext_active='".$ACT."' WHERE id=%s AND ext_active='%s' LIMIT 1",
-			 array(bigintval($id), $active), __FILE__, __LINE__);
+			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_active='".$ACT."' WHERE id=%s AND ext_active='%s' LIMIT 1",
+				array(bigintval($ext_id), $active), __FILE__, __LINE__);
 
 			// Run embeded SQL commands
-			EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE);
+			EXTENSION_RUN_SQLS($ext_id, $EXT_LOAD_MODE);
 		}
 	}
 } elseif (((isset($_POST['edit'])) || (isset($_POST['modify']))) && ($SEL > 0) && (!IS_DEMO())) {
@@ -73,54 +73,52 @@ if (!empty($_GET['reg_ext'])) {
 	if (isset($_POST['modify'])) {
 		// Change entries
 		$cache_update = 0;
-		foreach ($_POST['sel'] as $id => $sel) {
+		foreach ($_POST['sel'] as $ext_id => $sel) {
 			// Secure ID
-			$id = bigintval($id);
+			$ext_id = bigintval($ext_id);
 
 			// Change this extension?
 			if ($sel == 1) {
 				// Update extension's record
-				$active = $_POST['active'][$id];
+				$active = $_POST['active'][$ext_id];
 				if (GET_EXT_VERSION("sql_patches") >= "0.0.6") 	{
 					// Update also CSS column when extensions sql_patches is newer or exact v0.0.6
-					$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_extensions SET ext_has_css='%s', ext_active='%s' WHERE id=%s LIMIT 1",
-					 array($_POST['css'][$id], $active, $id), __FILE__, __LINE__);
+					SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_has_css='%s', ext_active='%s' WHERE id=%s LIMIT 1",
+						array($_POST['css'][$ext_id], $active, $ext_id), __FILE__, __LINE__);
 				} else {
 					// When extension is older than v0.0.6 there is no column for the CSS information
-					$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_extensions SET ext_active='%s' WHERE id=%s LIMIT 1",
-					 array($active, $id), __FILE__, __LINE__);
+					SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_active='%s' WHERE id=%s LIMIT 1",
+						array($active, $ext_id), __FILE__, __LINE__);
 				}
 
 				// Run SQLs on activation / deactivation
 				switch ($active) {
-					case 'Y': $EXT_LOAD_MODE = "activate";   break;
-					case 'N': $EXT_LOAD_MODE = "deactivate"; break;
+					case "Y": $EXT_LOAD_MODE = "activate";   break;
+					case "N": $EXT_LOAD_MODE = "deactivate"; break;
 				}
 
 				// Run embeded SQL commands
-				EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE);
+				EXTENSION_RUN_SQLS($ext_id, $EXT_LOAD_MODE);
 			}
 		}
 
 		// Extensions changed
-		OUTPUT_HTML("<P align=\"center\">");
-		LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_EXT_CHANGED);
-		OUTPUT_HTML("</P>");
+		LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_EXT_CHANGED'));
 	} else {
 		// Edit selected entries
 		$SW = "2"; $OUT = "";
-		foreach ($_POST['sel'] as $id => $sel) {
+		foreach ($_POST['sel'] as $ext_id => $sel) {
 			// Edit this extension?
 			if (($sel == "Y") || ($sel == "N")) {
 				// Load required data
 				if (GET_EXT_VERSION("sql_patches") >= "0.0.6") {
-					$result = SQL_QUERY_ESC("SELECT ext_name, ext_has_css, ext_active FROM "._MYSQL_PREFIX."_extensions WHERE id=%s LIMIT 1",
-					 array(bigintval($id)), __FILE__, __LINE__);
+					$result = SQL_QUERY_ESC("SELECT ext_name, ext_has_css, ext_active FROM `{!_MYSQL_PREFIX!}_extensions` WHERE id=%s LIMIT 1",
+					 array(bigintval($ext_id)), __FILE__, __LINE__);
 					list($name, $css, $active) = SQL_FETCHROW($result);
 					SQL_FREERESULT($result);
 				} else {
-					$result = SQL_QUERY_ESC("SELECT ext_name, ext_active FROM "._MYSQL_PREFIX."_extensions WHERE id=%s LIMIT 1",
-					 array(bigintval($id)), __FILE__, __LINE__);
+					$result = SQL_QUERY_ESC("SELECT ext_name, ext_active FROM `{!_MYSQL_PREFIX!}_extensions` WHERE id=%s LIMIT 1",
+					 array(bigintval($ext_id)), __FILE__, __LINE__);
 					list($name, $active) = SQL_FETCHROW($result);
 					SQL_FREERESULT($result);
 					$css = "X";
@@ -128,14 +126,14 @@ if (!empty($_GET['reg_ext'])) {
 
 				// Output row
 				$CSS = "---";
-				if (GET_EXT_VERSION("sql_patches") >= "0.0.6") $CSS = ADD_SELECTION("yn", $css, "css", $id);
+				if (GET_EXT_VERSION("sql_patches") >= "0.0.6") $CSS = ADD_SELECTION("yn", $css, "css", $ext_id);
 
 				// Prepare data for the row template
 				$content = array(
 					'sw'     => $SW,
-					'id'     => $id,
+					'id'     => $ext_id,
 					'name'   => $name,
-					'active' => ADD_SELECTION("yn", $active, "active", $id),
+					'active' => ADD_SELECTION("yn", $active, "active", $ext_id),
 					'css'    => $CSS,
 				);
 
@@ -153,37 +151,30 @@ if (!empty($_GET['reg_ext'])) {
 } elseif ((isset($_POST['delete'])) && ($SEL > 0) && (!IS_DEMO())) {
 	// List extensions and when verbose is enabled SQL statements which will be executed
 	$SW = 2; $OUT = "";
-	foreach ($_POST['sel'] as $id => $sel) {
+	foreach ($_POST['sel'] as $ext_id => $sel) {
 		// Init variables
 		$VERBOSE_OUT = ""; $SQLs = array();
 
 		// Secure id number
-		$id = bigintval($id);
+		$ext_id = bigintval($ext_id);
 
 		// Get extension name
-		$ext_name = GET_EXT_NAME($id);
-		$ext_ver = GET_EXT_VERSION($ext_name);
+		$ext_name = GET_EXT_NAME($ext_id);
 
-		if ($_CONFIG['verbose_sql']) {
+		if (getConfig('verbose_sql') == "Y") {
 			// Load SQL commands in remove mode
-			$EXT_LOAD_MODE = "remove";
-			$EXT_ALWAYS_ACTIVE = "N";
-			$file = sprintf("%sinc/extensions/ext-%s.php", PATH, $ext_name);
-			if (FILE_READABLE($file)) {
-				// Load file
-				include($file);
-
+			if (LOAD_EXTENSION($ext_name, "remove", "", true, $SQLs)) {
 				// Generate extra table with loaded SQL commands
 				$VERBOSE_OUT = EXTENSION_VERBOSE_TABLE($SQLs);
-			}
+			} // END - if
 		} // END - if
 
 		// Prepare data for the row template
 		$content = array(
 			'sw'       => $SW,
-			'id'       => $id,
+			'id'       => $ext_id,
 			'ext_name' => $ext_name,
-			'ext_ver'  => $ext_ver,
+			'ext_ver'  => GET_EXT_VERSION($ext_name),
 			'verbose'  => $VERBOSE_OUT
 		);
 
@@ -199,14 +190,17 @@ if (!empty($_GET['reg_ext'])) {
 } elseif ((isset($_POST['remove'])) && ($SEL > 0) && (!IS_DEMO())) {
 	// Remove extensions from DB (you have to delete all files manually!)
 	$cache_update = 0;
-	foreach ($_POST['sel'] as $id => $active) {
+	foreach ($_POST['sel'] as $ext_id => $active) {
 		// Secure ID number
-		$id = bigintval($id);
+		$ext_id = bigintval($ext_id);
 
 		// Is this extension selected?
 		if ($active == 1) {
+			// Run any assigned removal filters
+			RUN_FILTER('extension_remove', GET_EXT_NAME($ext_id));
+
 			// Run embeded SQL commands
-			EXTENSION_RUN_SQLS($id, "remove");
+			EXTENSION_RUN_SQLS($ext_id, "remove");
 		} // END - if
 	} // END - foreach
 } elseif (!empty($_GET['do']) && (!IS_DEMO())) {
@@ -228,14 +222,14 @@ switch ($do) {
 case "overview": // List all registered extensions
 	if (GET_EXT_VERSION("sql_patches") >= "0.0.6") {
 		// Load extension data with CSS informations
-		$result = SQL_QUERY("SELECT id, ext_name, ext_active, ext_has_css, ext_version
-FROM "._MYSQL_PREFIX."_extensions
+		$result = SQL_QUERY("SELECT id AS ext_id, ext_name, ext_active, ext_has_css AS ext_css, ext_version
+FROM `{!_MYSQL_PREFIX!}_extensions`
 ".$where."
 ORDER BY ext_name", __FILE__, __LINE__);
 	} else {
 		// Load extension data without CSS informations
-		$result = SQL_QUERY("SELECT id, ext_name, ext_active, id, ext_version
-FROM "._MYSQL_PREFIX."_extensions
+		$result = SQL_QUERY("SELECT id AS ext_id, ext_name, ext_active, id, ext_version
+FROM `{!_MYSQL_PREFIX!}_extensions`
 ".$where."
 ORDER BY ext_name", __FILE__, __LINE__);
 	}
@@ -244,20 +238,19 @@ ORDER BY ext_name", __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) > 0) {
 		// Extensions are registered
 		$SW = 2; $OUT = "";
-		while (list($id, $name, $lang, $active, $css, $ver) = SQL_FETCHROW($result)) {
+		while ($content = SQL_FETCHARRAY($result)) {
 			$CSS = "---";
-			if (GET_EXT_VERSION("sql_patches") >= "0.0.6") $CSS = TRANSLATE_YESNO($css);
+			if (GET_EXT_VERSION("sql_patches") >= "0.0.6") $CSS = TRANSLATE_YESNO($content['ext_css']);
 
 			// Prepare data for the row template
 			$content = array(
 				'sw'      => $SW,
-				'id'      => $id,
-				'name'    => $name,
-				'active'  => TRANSLATE_YESNO($active),
-				'act_val' => $active,
-				'lang'    => $lang,
+				'id'      => $content['ext_id'],
+				'name'    => $content['ext_name'],
+				'active'  => TRANSLATE_YESNO($content['ext_active']),
+				'act_val' => $content['ext_active'],
 				'css'     => $CSS,
-				'ver'     => $ver,
+				'ver'     => $content['ext_version'],
 			);
 
 			// Load row template and switch color
@@ -275,23 +268,23 @@ ORDER BY ext_name", __FILE__, __LINE__);
 		LOAD_TEMPLATE("admin_extensions");
 	} else {
 		// No extensions are registered
-		LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_EXTENSION_REGISTERED."</FONT>");
+		LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NO_EXTENSION_REGISTERED'));
 	}
 	break;
 
 case "register": // Register new extension
-	$result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_task_system WHERE assigned_admin='%s' AND task_type='EXTENSION' LIMIT 1",
-	 array(bigintval(GET_ADMIN_ID(get_session('admin_login')))), __FILE__, __LINE__);
+	$result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_task_system` WHERE assigned_admin=%s AND task_type='EXTENSION' LIMIT 1",
+		array(GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
 	$task_found = SQL_NUMROWS($result);
 
 	// Free result
 	SQL_FREERESULT($result);
 
 	// Is the ID number valid and the task was found?
-	if (($id > 0) && ($task_found == 1)) {
+	if (($ext_id > 0) && ($task_found == 1)) {
 		// ID is valid so begin with registration, we first want to it's real name from task management (subject column)
-		$result = SQL_QUERY_ESC("SELECT subject FROM "._MYSQL_PREFIX."_task_system WHERE id=%s LIMIT 1",
-		 array(bigintval($id)), __FILE__, __LINE__);
+		$result = SQL_QUERY_ESC("SELECT subject FROM `{!_MYSQL_PREFIX!}_task_system` WHERE id=%s LIMIT 1",
+			array(bigintval($ext_id)), __FILE__, __LINE__);
 		list($subj) = SQL_FETCHROW($result);
 		SQL_FREERESULT($result);
 
@@ -301,41 +294,64 @@ case "register": // Register new extension
 			// Extract extension's name from subject...
 			$ext_name = trim(substr($subj, 1, strpos($subj, ":") - 1));
 
-			// ... so we can finally register and load it in registration mode
-			$status = EXTENSION_REGISTER($ext_name, $id);
-			if ($status == true) {
-				// Extension was found and successfully registered
-				LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_EXTENSION_REGISTERED);
-
-				// Do we need to update cache file?
-				if ((EXT_IS_ACTIVE("cache")) && ($cacheMode != "no")) {
-					// Remove cache file (will be auto-created again!)
-					if ($cacheInstance->loadCacheFile("config")) $cacheInstance->destroyCacheFile();
-					if ($cacheInstance->loadCacheFile("extensions", true)) $cacheInstance->destroyCacheFile();
-					if ($cacheInstance->loadCacheFile("mod_reg")) $cacheInstance->destroyCacheFile();
-				} // END - if
-			} elseif (GET_EXT_VERSION($ext_name) != "") {
-				// Motify the admin that we have a problem here...
-				LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_REG_FAILED_ALREADY);
+			// Test the extension for deprecation
+			global $EXT_DEPRECATED;
+			LOAD_EXTENSION($ext_name, "test");
+
+			// Is the extension deprecated?
+			if ($EXT_DEPRECATED == "N") {
+				// ... so we can finally register and load it in registration mode
+				$status = EXTENSION_REGISTER($ext_name, $ext_id);
+				if ($status == true) {
+					// Extension was found and successfully registered
+					LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_EXTENSION_REGISTERED'));
+
+					// Show next link
+					if (EXT_IS_ACTIVE("task")) {
+						LOAD_TEMPLATE("admin_next_link", false, array(
+							'url'   => "modules.php?module=admin&amp;what=list_task",
+							'title' => getMessage('ADMIN_EXT_REGISTER_NEXT_LINK')
+						));
+					} else {
+						LOAD_TEMPLATE("admin_next_link", false, array(
+							'url'   => "modules.php?module=admin",
+							'title' => getMessage('ADMIN_EXT_REGISTER_NEXT_LINK')
+						));
+					}
+
+					// Do we need to update cache file?
+					if ((EXT_IS_ACTIVE("cache")) && ($cacheMode != "no")) {
+						// Remove cache file (will be auto-created again!)
+						if ($cacheInstance->loadCacheFile("config")) $cacheInstance->destroyCacheFile();
+						if ($cacheInstance->loadCacheFile("extensions", true)) $cacheInstance->destroyCacheFile();
+						if ($cacheInstance->loadCacheFile("mod_reg")) $cacheInstance->destroyCacheFile();
+					} // END - if
+				} elseif (GET_EXT_VERSION($ext_name) != "") {
+					// Notify the admin that we have a problem here...
+					LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_REG_FAILED_ALREADY'));
+				} else {
+					// Notify the admin that we have a problem here...
+					LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_REG_FAILED_404'));
+				}
 			} else {
 				// Motify the admin that we have a problem here...
-				LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_REG_FAILED_404);
+				LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_REG_FAILED_DEPRECATED'));
 			}
 		} else {
 			// Extension was not found in task management
-			LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_REG_FAILED_ID_404);
+			LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_REG_FAILED_ID_404'));
 		}
 	} elseif ($task_found == "0") {
 		// No longer assigned or old task
-		LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_REG_FAILED_ASSIGED);
+		LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_REG_FAILED_ASSIGED'));
 	} else {
 		// ID is invalid
-		LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_REG_FAILED_INVALID);
+		LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_REG_FAILED_INVALID'));
 	}
 	break;
 
 case "demo":
-	LOAD_TEMPLATE("admin_settings_saved", false, SETTINGS_NOT_SAVED);
+	LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_NOT_SAVED'));
 	break;
 }
 //