X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fextensions.php;h=d50ff70309cc548f33af484e9ec440e376a2e3bd;hb=d1637dad0b2ca0e5fb411ee0843f01bfb4cc94e0;hp=5eb14f67ad7f43e8aaa1163807ee7a20897780ce;hpb=06a24901c58897845bafc1e5b428fee99024bc64;p=mailer.git
diff --git a/inc/extensions.php b/inc/extensions.php
index 5eb14f67ad..d50ff70309 100644
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -79,21 +79,8 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = '', $EXT_VER = '', $dry_run
return false;
} // END - if
- // Construct FQFN for language file
- $langInclude = sprintf("inc/language/%s_%s.php", $ext_name, getLanguage());
-
- // Is this include there?
- if ((isFileReadable($langInclude)) && (!isset($GLOBALS['ext_loaded']['lang'][$ext_name]))) {
- // Then load it
- //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "--- Language loaded.");
- $GLOBALS['ext_loaded']['lang'][$ext_name] = true;
- loadIncludeOnce($langInclude);
- } elseif ((isDebugModeEnabled()) && ($ext_name != 'sql_patches') && (substr($ext_name, 0, 10) != 'admintheme')) {
- // No language file is not so good...
- DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("WARNING: Extension %s has no language file or we cannot read from it. lang=%s",
- $ext_name, getLanguage()
- ));
- }
+ // Load extension's own language file
+ loadLanguageFile($ext_name);
// Construct FQFN for functions file
$funcsInclude = sprintf("inc/libs/%s_functions.php", $ext_name);
@@ -106,7 +93,7 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = '', $EXT_VER = '', $dry_run
loadIncludeOnce($funcsInclude);
} elseif ((isDebugModeEnabled()) && ($ext_name != 'sql_patches') && (substr($ext_name, 0, 10) != 'admintheme')) {
// No functions file is not so good...
- DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("WARNING: Extension %s has no own functions file or we cannot read from it.",
+ DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("NOTICE: Extension %s has no own functions file or we cannot read from it.",
$ext_name
));
} // END - if
@@ -148,7 +135,7 @@ function REGISTER_EXTENSION ($ext_name, $task_id, $dry_run = false, $logout = tr
// Set current extension name
EXT_SET_CURR_NAME($ext_name);
- //* DEBUG: */ print __FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME()." - ENTERED!
\n";
+ //* DEBUG: */ OUTPUT_HTML(__FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME()." - ENTERED!
");
// This shall never do a non-admin user or if the extension is active (already installed)
if ((!IS_ADMIN()) || (EXT_IS_ACTIVE($ext_name))) {
return false;
@@ -157,7 +144,7 @@ function REGISTER_EXTENSION ($ext_name, $task_id, $dry_run = false, $logout = tr
// When this extension is already in install/update phase, all is fine
if (EXT_IS_REGISTER_RUNNING($ext_name)) {
// Then abort here which is fine
- //* DEBUG: */ print __FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME()." - ALREADY!
\n";
+ //* DEBUG: */ OUTPUT_HTML(__FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME()." - ALREADY!
");
return true;
} // END - if
@@ -236,9 +223,12 @@ function REGISTER_EXTENSION ($ext_name, $task_id, $dry_run = false, $logout = tr
// Entry found?
if ($task > 0) {
// Try to register the extension
- //* DEBUG: */ print __FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME().":ext_update=".$ext_update.",taskId=".$task."
\n";
+ //* DEBUG: */ OUTPUT_HTML(__FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME().":ext_update=".$ext_update.",taskId=".$task."
");
$test = REGISTER_EXTENSION($ext_update, $task, $dry_run, false);
- //* DEBUG: */ print __FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME().':'; var_dump($test);
+
+ // Reset extension name
+ EXT_SET_CURR_NAME($ext_name);
+ //* DEBUG: */ OUTPUT_HTML(__FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME().':'); var_dump($test);
} // END - if
} elseif ($ext_ver != EXT_GET_VERSION()) {
// Ok, update this extension now
@@ -270,15 +260,15 @@ function REGISTER_EXTENSION ($ext_name, $task_id, $dry_run = false, $logout = tr
$EXT_LOAD_MODE = 'register';
// Remains true if extension registration reports no failures
- //* DEBUG: */ print __FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME().':'; var_dump($test);
+ //* DEBUG: */ OUTPUT_HTML(__FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME().':'); var_dump($test);
$test = (($test === true) && (EXT_GET_REPORTS_FAILURE() === false));
- //* DEBUG: */ print __FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME().':'; var_dump($test);
+ //* DEBUG: */ OUTPUT_HTML(__FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME().':'); var_dump($test);
// Does everthing before wents ok?
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());
@@ -287,9 +277,9 @@ function REGISTER_EXTENSION ($ext_name, $task_id, $dry_run = false, $logout = tr
runFilterChain('pre_extension_installed', array('dry_run' => $dry_run));
// Register extension
- //* DEBUG: */ print __FUNCTION__."[".__LINE__."]:insert=".EXT_GET_CURR_NAME().'/'.EXT_GET_VERSION()." - INSERT!
\n";
+ //* DEBUG: */ OUTPUT_HTML(__FUNCTION__."[".__LINE__."]:insert=".EXT_GET_CURR_NAME().'/'.EXT_GET_VERSION()." - INSERT!
");
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()), __FUNCTION__, __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));
@@ -325,7 +315,7 @@ function REGISTER_EXTENSION ($ext_name, $task_id, $dry_run = false, $logout = tr
$ret = false;
}
} elseif (($task_id > 0) && (EXT_GET_CURR_NAME() != '')) {
- //* DEBUG: */ print __FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME()."
\n";
+ //* DEBUG: */ OUTPUT_HTML(__FUNCTION__."[".__LINE__."]:currName=".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)), __FUNCTION__, __LINE__);
@@ -346,7 +336,7 @@ function REGISTER_EXTENSION ($ext_name, $task_id, $dry_run = false, $logout = tr
} // END - if
// Return status code
- //* DEBUG: */ print __FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME()." - LEFT!
\n";
+ //* DEBUG: */ OUTPUT_HTML(__FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME()." - LEFT!
");
//* DEBUG: */ var_dump($ret);
return $ret;
}
@@ -439,7 +429,7 @@ function EXT_IS_ACTIVE ($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",
+ $result = SQL_QUERY_ESC("SELECT `ext_active` FROM `{!_MYSQL_PREFIX!}_extensions` WHERE `ext_name`='%s' LIMIT 1",
array($ext_name), __FUNCTION__, __LINE__);
// Entry found?
@@ -461,7 +451,7 @@ function EXT_IS_ACTIVE ($ext_name) {
}
// Debug message
- //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, " ext_name={$ext_name},active={$active}");
+ //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "ext_name={$ext_name},active={$active}");
// Is this extension activated? (For admins we always have active extensions...)
return ($active == 'Y');
@@ -491,7 +481,7 @@ function GET_EXT_VERSION ($ext_name) {
incrementConfigEntry('cache_hits');
} elseif (!isCacheInstanceValid()) {
// Load from database
- $result = SQL_QUERY_ESC("SELECT ext_version FROM `{!_MYSQL_PREFIX!}_extensions` WHERE `ext_name`='%s' LIMIT 1",
+ $result = SQL_QUERY_ESC("SELECT `ext_version` FROM `{!_MYSQL_PREFIX!}_extensions` WHERE `ext_name`='%s' LIMIT 1",
array($ext_name), __FUNCTION__, __LINE__);
//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ": DB - ".SQL_NUMROWS($result)."");
@@ -545,21 +535,38 @@ 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: */ OUTPUT_HTML(__FUNCTION__.'['.__LINE__.':] ext_name='.$ext_name."
");
+ EXT_SET_CURR_NAME($ext_name);
+
// Set extension version
$GLOBALS['cache_array']['update_ver'][EXT_GET_CURR_NAME()] = $history[$idx];
// Load again...
LOAD_EXTENSION(EXT_GET_CURR_NAME(), 'update', $GLOBALS['cache_array']['update_ver'][EXT_GET_CURR_NAME()], $dry_run);
- if (EXT_GET_UPDATE_DEPENDS() != '') {
- // Is the extension there?
- if (GET_EXT_VERSION(EXT_GET_UPDATE_DEPENDS()) != '') {
- // Update another extension first!
- $test = EXTENSION_UPDATE(EXT_GET_UPDATE_DEPENDS(), GET_EXT_VERSION(EXT_GET_UPDATE_DEPENDS()), $dry_run);
- } else {
- // Register new extension
- $test = REGISTER_EXTENSION(EXT_GET_UPDATE_DEPENDS(), 0, $dry_run, false);
- }
+ // Get all depencies
+ $depencies = EXT_GET_UPDATE_DEPENDS();
+
+ // Nothing to apply?
+ if (count($depencies) > 0) {
+ // Apply all extension depencies
+ foreach ($depencies as $ext_depend) {
+ // Set it as current
+ EXT_SET_CURR_NAME($ext_depend);
+
+ // Is the extension there?
+ if (GET_EXT_VERSION($ext_depend) != '') {
+ // Update another extension first!
+ $test = EXTENSION_UPDATE($ext_depend, GET_EXT_VERSION($ext_depend), $dry_run);
+ } else {
+ // Register new extension
+ $test = REGISTER_EXTENSION($ext_depend, 0, $dry_run, false);
+ }
+ } // END - foreach
+
+ // Set name back
+ EXT_SET_CURR_NAME($ext_name);
} // END - if
// Add notes
@@ -765,8 +772,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
}
@@ -775,34 +781,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
}
@@ -814,13 +813,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
}
@@ -846,8 +839,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) {
@@ -869,7 +862,7 @@ function MODULE_HAS_MENU ($mod, $forceDb = false) {
}
// Return status
- //* DEBUG: */ print __FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME().':'; var_dump($ret);
+ //* DEBUG: */ OUTPUT_HTML(__FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME().':'; var_dump($ret));
return $ret;
}
@@ -879,8 +872,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) {
@@ -901,8 +894,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) {