X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fextensions.php;h=22f218150d7cfc16d48aa0c5c416eb67d3827d7a;hp=93f6fa192a254236a2f76f7a17f82019090b95b8;hb=509ae618cc32ba2b811cf66567d62abc597dc405;hpb=e1d636846bafc8ae71855595a2a2843463025e26
diff --git a/inc/extensions.php b/inc/extensions.php
index 93f6fa192a..22f218150d 100644
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -281,7 +281,7 @@ function REGISTER_EXTENSION ($ext_name, $task_id, $dry_run = false, $logout = tr
if ($test === true) {
// "Dry-run-mode" activated?
if ((!$dry_run) && (!EXT_IS_ON_REMOVAL_LIST())) {
- //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, " ext_name=".EXT_GET_CURR_NAME());
+ //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "ext_name=".EXT_GET_CURR_NAME());
// Init SQLs and transfer ext->generic
INIT_SQLS();
SET_SQLS(GET_EXT_SQLS());
@@ -549,7 +549,7 @@ function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
// And load SQL queries in order of version history
for ($idx = ($start + 1); $idx < count($history); $idx++) {
// Set current extension name
- //* DEBUG: */ print __FUNCTION__.'['.__LINE__.':] ext_name='.$ext_name.'
';
+ //* DEBUG: */ print __FUNCTION__.'['.__LINE__.':] ext_name='.$ext_name."
\n";
EXT_SET_CURR_NAME($ext_name);
// Set extension version
@@ -785,8 +785,7 @@ function CREATE_EXTENSION_UPDATE_TASK ($admin_id, $ext_name, $ext_ver, $notes) {
// Check if task is not there
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), __FUNCTION__, __LINE__);
+ createNewTask($subject, $notes, 'EXTENSION_UPDATE', 0, $admin_id);
} // END - if
} // END - if
}
@@ -795,34 +794,27 @@ function CREATE_EXTENSION_UPDATE_TASK ($admin_id, $ext_name, $ext_ver, $notes) {
function CREATE_NEW_EXTENSION_TASK ($admin_id, $subject, $ext) {
// Not installed and do we have created a task for the admin?
if ((DETERMINE_TASK_ID_BY_SUBJECT($subject) == 0) && (GET_EXT_VERSION($ext) == '')) {
+ // Set default message if ext-foo is missing
+ $message = sprintf(getMessage('ADMIN_EXT_TEXT_FILE_MISSING'), $ext);
+
// Template file
$tpl = sprintf("%stemplates/%s/html/ext/ext_%s.tpl",
- constant('PATH'),
- getLanguage(),
- $ext
+ constant('PATH'),
+ getLanguage(),
+ $ext
);
- // Set default message if ext-foo is missing
- $msg = sprintf(getMessage('ADMIN_EXT_TEXT_FILE_MISSING'), $ext);
-
// Load text for task if found
if (isFileReadable($tpl)) {
// Load extension's own text template (HTML!)
- $msg = LOAD_TEMPLATE('ext_' . $ext, true);
+ $message = LOAD_TEMPLATE('ext_' . $ext, true);
} else {
// Write this in debug.log as well
- DEBUG_LOG(__FUNCTION__, __LINE__, $msg);
+ DEBUG_LOG(__FUNCTION__, __LINE__, $message);
}
// 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', '%s', '%s', UNIX_TIMESTAMP())",
- array(
- $admin_id,
- $subject,
- smartAddSlashes($msg),
- ), __FUNCTION__, __LINE__, true, false, false
- );
+ createNewTask($subject, $message, 'EXTENSION_UPDATE', 0, $admin_id, false);
} // END - if
}
@@ -834,13 +826,7 @@ function CREATE_EXTENSION_DEACTIVATION_TASK ($ext) {
// Not installed and do we have created a task for the admin?
if ((DETERMINE_TASK_ID_BY_SUBJECT($subject) == 0) && (GET_EXT_VERSION($ext) != '')) {
// Task not created so add it
- SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_task_system` (assigned_admin, userid, status, task_type, subject, text, task_created)
-VALUES (0, 0, 'NEW', 'EXTENSION_DEACTIVATION', '%s', '%s', UNIX_TIMESTAMP())",
- array(
- $subject,
- SQL_ESCAPE(LOAD_TEMPLATE('task_ext_deactivated', true, $ext)),
- ), __FUNCTION__, __LINE__, true, false
- );
+ createNewTask($subject, SQL_ESCAPE(LOAD_TEMPLATE('task_ext_deactivated', true, $ext)), 'EXTENSION_DEACTIVATION');
} // END - if
}
@@ -866,8 +852,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), __FUNCTION__, __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) {
@@ -899,8 +885,8 @@ function DETERMINE_EXTENSION_TASK_ID ($ext_name) {
$task_id = 0;
// 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), __FUNCTION__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_task_system` WHERE `task_type`='EXTENSION' AND `subject`='[%s:]' LIMIT 1",
+ array($ext_name), __FUNCTION__, __LINE__);
// Entry found?
if (SQL_NUMROWS($result) == 1) {
@@ -921,8 +907,8 @@ function DETERMINE_TASK_ID_BY_SUBJECT ($subject) {
$task_id = 0;
// Search for task id
- $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_task_system` WHERE subject LIKE '%s%%' LIMIT 1",
- array($subject), __FUNCTION__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_task_system` WHERE `subject` LIKE '%s%%' LIMIT 1",
+ array($subject), __FUNCTION__, __LINE__);
// Entry found?
if (SQL_NUMROWS($result) == 1) {