X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions.php;h=c2dd63532587979c36cb430edb314d9e68df397a;hb=3f96fb4deadc0f967980e855d3541224057606b2;hp=11cf83c782903240b5a51600d3ed4573f125c7c1;hpb=b23a36f5987978648ec67f7125c23c7ac1ccd760;p=mailer.git

diff --git a/inc/extensions.php b/inc/extensions.php
index 11cf83c782..c2dd635325 100644
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -261,7 +261,7 @@ function REGISTER_EXTENSION ($ext_name, $task_id, $dry_run = false, $logout = tr
 
 				// Register extension
 				SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_extensions` (ext_name, ext_active, ext_version) VALUES ('%s','%s','%s')",
-					array(EXT_GET_CURR_NAME(), EXT_GET_ALWAYS_ACTIVE(), EXT_GET_VERSION()), __FILE__, __LINE__);
+					array(EXT_GET_CURR_NAME(), EXT_GET_ALWAYS_ACTIVE(), EXT_GET_VERSION()), __FUNCTION__, __LINE__);
 
 				// Remove cache file(s) if extension is active
 				runFilterChain('post_extension_installed', array('ext_name' => EXT_GET_CURR_NAME(), 'task_id' => $task_id));
@@ -299,7 +299,7 @@ function REGISTER_EXTENSION ($ext_name, $task_id, $dry_run = false, $logout = tr
 	} elseif (($task_id > 0) && (EXT_GET_CURR_NAME() != "")) {
 		// Remove task from system when id and extension's name is valid
 		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_task_system` WHERE id=%s AND `status`='NEW' LIMIT 1",
-			array(bigintval($task_id)), __FILE__, __LINE__);
+			array(bigintval($task_id)), __FUNCTION__, __LINE__);
 	}
 
 	// Is this the sql_patches?
@@ -361,7 +361,7 @@ function EXTENSION_RUN_SQLS ($ext_id, $load_mode) {
 		if ($load_mode == "remove") {
 			// Delete this extension (remember to remove it from your server *before* you click on welcome!
 			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_extensions` WHERE ext_name='%s' LIMIT 1",
-				array(EXT_GET_CURR_NAME()), __FILE__, __LINE__);
+				array(EXT_GET_CURR_NAME()), __FUNCTION__, __LINE__);
 		} // END - if
 	} // END - if
 
@@ -398,12 +398,12 @@ function EXT_IS_ACTIVE ($ext_name) {
 		incrementConfigEntry('cache_hits');
 	} elseif (isset($GLOBALS['ext_loaded'][$ext_name])) {
 		// @TODO Extension is loaded, what next?
-		mxchange_die("LOADED:$ext_name");
+		app_die(__FUNCTION__, __LINE__, "LOADED:$ext_name");
 	} elseif (($ext_name == "cache") || (GET_EXT_VERSION("cache") == "")) {
 		//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "DB! ext_name={$ext_name}");
 		// Load from database
 		$result = SQL_QUERY_ESC("SELECT ext_active FROM `{!_MYSQL_PREFIX!}_extensions` WHERE ext_name='%s' LIMIT 1",
-			array($ext_name), __FILE__, __LINE__);
+			array($ext_name), __FUNCTION__, __LINE__);
 
 		// Entry found?
 		if (SQL_NUMROWS($result) == 1) {
@@ -455,7 +455,7 @@ function GET_EXT_VERSION ($ext_name) {
 	} elseif (!isCacheInstanceValid()) {
 		// Load from database
 		$result = SQL_QUERY_ESC("SELECT ext_version FROM `{!_MYSQL_PREFIX!}_extensions` WHERE ext_name='%s' LIMIT 1",
-			array($ext_name), __FILE__, __LINE__);
+			array($ext_name), __FUNCTION__, __LINE__);
 		//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ": DB - ".SQL_NUMROWS($result)."");
 
 		// Is the extension there?
@@ -547,7 +547,7 @@ function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
 
 			// Update extension's version
 			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_version='%s' WHERE ext_name='%s' LIMIT 1",
-				array($GLOBALS['cache_array']['update_ver'][EXT_GET_CURR_NAME()], EXT_GET_CURR_NAME()), __FILE__, __LINE__);
+				array($GLOBALS['cache_array']['update_ver'][EXT_GET_CURR_NAME()], EXT_GET_CURR_NAME()), __FUNCTION__, __LINE__);
 
 			// Remove arrays
 			UNSET_SQLS();
@@ -635,7 +635,7 @@ function GET_EXT_NAME ($ext_id) {
 	} 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($ext_id)), __FILE__, __LINE__);
+			array(bigintval($ext_id)), __FUNCTION__, __LINE__);
 		list($ret) = SQL_FETCHROW($result);
 		SQL_FREERESULT($result);
 	}
@@ -655,7 +655,7 @@ function GET_EXT_ID ($ext_name) {
 	} 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($ext_name), __FILE__, __LINE__);
+			array($ext_name), __FUNCTION__, __LINE__);
 		list($ret) = SQL_FETCHROW($result);
 		SQL_FREERESULT($result);
 	}
@@ -668,7 +668,7 @@ function GET_EXT_ID ($ext_name) {
 function ACTIVATE_EXTENSION ($ext_name) {
 	// Activate the extension
 	SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_active='Y' WHERE ext_name='%s' LIMIT 1",
-		array($ext_name), __FILE__, __LINE__);
+		array($ext_name), __FUNCTION__, __LINE__);
 
 	// Extension has been activated?
 	if (SQL_AFFECTEDROWS() == 1) {
@@ -681,7 +681,7 @@ function ACTIVATE_EXTENSION ($ext_name) {
 function DEACTIVATE_EXTENSION($ext_name) {
 	// Activate the extension
 	SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_active='N' WHERE ext_name='%s' LIMIT 1",
-		array($ext_name), __FILE__, __LINE__);
+		array($ext_name), __FUNCTION__, __LINE__);
 
 	// Extension has been activated?
 	if (SQL_AFFECTEDROWS() == 1) {
@@ -724,7 +724,7 @@ function CREATE_EXTENSION_UPDATE_TASK ($admin_id, $ext_name, $ext_ver, $notes) {
 		if (DETERMINE_TASK_ID_BY_SUBJECT($subject) == 0) {
 			// Task not created so it's a brand-new extension which we need to register and create a task for!
 			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($admin_id, $subject, $notes), __FILE__, __LINE__);
+				array($admin_id, $subject, $notes), __FUNCTION__, __LINE__);
 		} // END - if
 	} // END - if
 }
@@ -740,13 +740,16 @@ function CREATE_NEW_EXTENSION_TASK ($admin_id, $subject, $ext) {
 			$ext
 		);
 
-		// Load text for task
+		// Set default message if ext-foo is missing
+		$msg = sprintf(getMessage('ADMIN_EXT_TEXT_FILE_MISSING'), $ext);
+
+		// Load text for task if found
 		if (FILE_READABLE($tpl)) {
 			// Load extension's own text template (HTML!)
 			$msg = LOAD_TEMPLATE("ext_".$ext, true);
 		} else {
-			// Load default message
-			$msg = LOAD_TEMPLATE("admin_new_ext", "", 0);
+			// Write this in debug.log as well
+			DEBUG_LOG(__FUNCTION__, __LINE__, $msg);
 		}
 
 		// Task not created so it's a brand-new extension which we need to register and create a task for!
@@ -756,7 +759,7 @@ VALUES (%s,0,'NEW','EXTENSION','%s','%s',UNIX_TIMESTAMP())",
 				$admin_id,
 				$subject,
 				SQL_ESCAPE($msg),
-			),  __FILE__, __LINE__, true, false
+			),  __FUNCTION__, __LINE__, true, false
 		);
 	} // END - if
 }
@@ -774,7 +777,7 @@ VALUES (0,0,'NEW','EXTENSION_DEACTIVATION','%s','%s',UNIX_TIMESTAMP())",
 			array(
 				$subject,
 				SQL_ESCAPE(LOAD_TEMPLATE("task_ext_deactivated", true, $ext)),
-			),  __FILE__, __LINE__, true, false
+			),  __FUNCTION__, __LINE__, true, false
 		);
 	} // END - if
 }
@@ -801,8 +804,8 @@ function MODULE_HAS_MENU ($mod, $forceDb = false) {
 		}
 	} elseif ((GET_EXT_VERSION("sql_patches") >= "0.3.6") && ((!EXT_IS_ACTIVE("cache")) || ($forceDb === true))) {
 		// Check database for entry
-		$result = SQL_QUERY_ESC("SELECT has_menu FROM `{!_MYSQL_PREFIX!}_mod_reg` WHERE module='%s' LIMIT 1",
-			array($mod), __FILE__, __LINE__);
+		$result = SQL_QUERY_ESC("SELECT has_menu FROM `{!_MYSQL_PREFIX!}_mod_reg` WHERE `module`='%s' LIMIT 1",
+			array($mod), __FUNCTION__, __LINE__);
 
 		// Entry found?
 		if (SQL_NUMROWS($result) == 1) {
@@ -835,7 +838,7 @@ function DETERMINE_EXTENSION_TASK_ID ($ext_name) {
 
 	// Search for extension task's id
 	$result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_task_system` WHERE task_type='EXTENSION' AND subject='[%s:]' LIMIT 1",
-		array($ext_name), __FILE__, __LINE__);
+		array($ext_name), __FUNCTION__, __LINE__);
 
 	// Entry found?
 	if (SQL_NUMROWS($result) == 1) {
@@ -857,7 +860,7 @@ function DETERMINE_TASK_ID_BY_SUBJECT ($subject) {
 
 	// Search for task id
 	$result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_task_system` WHERE subject LIKE '%s%%' LIMIT 1",
-		array($subject), __FILE__, __LINE__);
+		array($subject), __FUNCTION__, __LINE__);
 
 	// Entry found?
 	if (SQL_NUMROWS($result) == 1) {