X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fextensions.php;h=b54e75612325d30c2ddd5b390bcab96da320f642;hp=5686e7c0edd0e11a50de5e688da0f7e98d6543d8;hb=d5ee31ebfc85f22fc691b8c2753c42e188c1c4ef;hpb=0f9689b7d070311251abdc1dc3c5f970a4227021
diff --git a/inc/extensions.php b/inc/extensions.php
index 5686e7c0ed..b54e756123 100644
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -55,7 +55,10 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run
} // END - if
// Construct FQFN for extension file
- $extInclude = sprintf("%sinc/extensions/ext-%s.php", PATH, $ext_name);
+ $FQFN = sprintf("%sinc/extensions/ext-%s.php",
+ constant('PATH'),
+ $ext_name
+ );
// Is the extension file NOT there?
if (!FILE_READABLE($extInclude)) {
@@ -67,25 +70,25 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run
} // END - if
// Construct FQFN for language file
- $langInclude = sprintf("%sinc/language/%s_%s.php", PATH, $ext_name, GET_LANGUAGE());
+ $langInclude = sprintf("inc/language/%s_%s.php", $ext_name, GET_LANGUAGE());
// Is this include there?
if ((FILE_READABLE($langInclude)) && (!isset($EXT_LOADED['lang'][$ext_name]))) {
// Then load it
//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "--- Language loaded.");
$EXT_LOADED['lang'][$ext_name] = true;
- require($langInclude);
+ LOAD_INC_ONCE($langInclude);
} // END - if
// Construct FQFN for functions file
- $funcsInclude = sprintf("%sinc/libs/%s_functions.php", PATH, $ext_name);
+ $funcsInclude = sprintf("inc/libs/%s_functions.php", $ext_name);
// Is this include there?
if ((FILE_READABLE($funcsInclude)) && (!isset($EXT_LOADED['funcs'][$ext_name]))) {
// Then load it
//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "--- Functions loaded.");
$EXT_LOADED['funcs'][$ext_name] = true;
- require($funcsInclude);
+ LOAD_INC_ONCE($funcsInclude);
} // END - if
// Extensions are not deprecated by default
@@ -125,7 +128,7 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run
// Registeres an extension and possible update depencies
function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run = false, $logout = true) {
- global $UPDATE_NOTES, $_CONFIG, $INC_POOL, $cacheInstance;
+ global $UPDATE_NOTES, $INC_POOL, $cacheInstance;
global $EXT_VER_HISTORY, $NOTES, $EXT_ALWAYS_ACTIVE, $EXT_VERSION;
global $EXT_UPDATE_DEPENDS;
@@ -140,9 +143,7 @@ function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run = false, $logout = tr
$NOTES = "";
$INC_POOL = array();
- // By default the language prefix is the extension's name
- // @TODO: Do we really need this one anymore? Can't we just take $ext_name and done?
- // By default we have no failtures
+ // By default we have no failures
$EXT_REPORTS_FAILURE = false;
// Does this extension exists?
@@ -154,20 +155,8 @@ function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run = false, $logout = tr
// Load extension in update mode
LOAD_EXTENSION($ext_name, "update", $ver, $dry_run, $SQLs);
- // Do we have an update?
- if (((GET_EXT_VERSION("sql_patches") != "") && (getConfig('verbose_sql') == "Y")) || (!EXT_IS_ACTIVE("sql_patches"))) {
- if (!empty($UPDATE_NOTES)) {
- // Update notes found
- $NOTES .= ("v".$ver.":
".$UPDATE_NOTES."
");
- $UPDATE_NOTES = "";
- } elseif (($ver == "0.0") || ($ver == "0.0.0")) {
- // Initial release
- $NOTES .= ("v".$ver.":
".INITIAL_RELEASE."
");
- } else {
- // No update notes found!
- $NOTES .= ("v".$ver.":
".NO_UPDATE_NOTES."
");
- }
- } // END - if
+ // Add update notes to our output
+ $NOTES .= ADD_EXTENSION_NOTES($ver, $UPDATE_NOTES);
} // END - foreach
// Does this extension depends on an outstanding update of another update?
@@ -219,7 +208,7 @@ function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run = false, $logout = tr
// Switch back to register mode
$EXT_LOAD_MODE = "register";
- // Remains true if extension registration reports no failtures
+ // Remains true if extension registration reports no failures
$test = ($test && !$EXT_REPORTS_FAILURE);
// Does everthing before wents ok?
@@ -227,14 +216,14 @@ function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run = false, $logout = tr
// "Dry-run-mode" activated?
if (!$dry_run) {
// Run installation pre-installation filters
- RUN_FILTER('pre_extension_installed', false);
+ RUN_FILTER('pre_extension_installed', array('dry_run' => $dry_run, 'sqls' => $SQLs));
// Register extension
- $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_extensions (ext_name, ext_active, ext_version) VALUES ('%s','%s','%s')",
+ SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_extensions` (ext_name, ext_active, ext_version) VALUES ('%s','%s','%s')",
array($ext_name, $EXT_ALWAYS_ACTIVE, $EXT_VERSION), __FILE__, __LINE__);
// Remove cache file(s) if extension is active
- RUN_FILTER('post_extension_installed', array('ext_name' => $ext_name, 'task_id' => $task_id));
+ RUN_FILTER('post_extension_installed', array('ext_name' => $ext_name, 'task_id' => $task_id, 'inc_pool' => $INC_POOL));
// In normal mode return a true on success
$ret = true;
@@ -257,7 +246,7 @@ function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run = false, $logout = tr
}
} elseif (($task_id > 0) && (!empty($ext_name))) {
// Remove task from system when id and extension's name is valid
- $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_task_system WHERE id=%s AND status='NEW' LIMIT 1",
+ 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__);
}
@@ -282,7 +271,7 @@ function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run = false, $logout = tr
// Run SQL queries for given extension id
// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
function EXTENSION_RUN_SQLS ($ext_id, $load_mode) {
- global $cacheInstance, $_CONFIG;
+ global $cacheInstance;
// This shall never do a non-admin user!
if (!IS_ADMIN()) return false;
@@ -295,6 +284,7 @@ function EXTENSION_RUN_SQLS ($ext_id, $load_mode) {
// Get extension's name
$ext_name = GET_EXT_NAME($ext_id);
+ // If it is not set then maybe there is no extension for that ID number
if (empty($ext_name)) return false;
// Load extension in detected mode
@@ -304,12 +294,12 @@ function EXTENSION_RUN_SQLS ($ext_id, $load_mode) {
//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ":SQLs::count=".count($SQLs)."");
if ((is_array($SQLs) && (sizeof($SQLs) > 0))) {
// Run SQL commands...
- RUN_FILTER('run_sqls');
+ RUN_FILTER('run_sqls', array('dry_run' => false, 'sqls' => $SQLs));
// Removal mode?
if ($load_mode == "remove") {
// Delete this extension (remember to remove it from your server *before* you click on welcome!
- $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_extensions WHERE ext_name='%s' LIMIT 1",
+ SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_extensions` WHERE ext_name='%s' LIMIT 1",
array($ext_name), __FILE__, __LINE__);
} // END - if
} // END - if
@@ -331,7 +321,7 @@ function EXTENSION_RUN_SQLS ($ext_id, $load_mode) {
// Check if given extension is active
function EXT_IS_ACTIVE ($ext_name) {
- global $cacheArray, $_CONFIG;
+ global $cacheArray;
// Extensions are all inactive during installation
if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isBooleanConstantAndTrue('mxchange_installing')) || (empty($ext_name))) return false;
@@ -346,11 +336,11 @@ function EXT_IS_ACTIVE ($ext_name) {
$active = $cacheArray['extensions']['ext_active'][$ext_name];
// Count cache hits
- if (getConfig('cache_hits') > 0) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
+ incrementConfigEntry('cache_hits');
} 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), __FILE__, __LINE__);
// Entry found?
@@ -379,7 +369,7 @@ function EXT_IS_ACTIVE ($ext_name) {
}
// Get version from extensions
function GET_EXT_VERSION ($ext_name) {
- global $cacheArray, $_CONFIG, $cacheInstance;
+ global $cacheArray, $cacheInstance;
$ext_ver = false;
// Extensions are all inactive during installation
@@ -393,10 +383,10 @@ function GET_EXT_VERSION ($ext_name) {
$ext_ver = $cacheArray['extensions']['ext_version'][$ext_name];
// Count cache hits
- if (getConfig('cache_hits') > 0) $_CONFIG['cache_hits']++; else $_CONFIG['cache_hits'] = 1;
+ incrementConfigEntry('cache_hits');
} elseif (!is_object($cacheInstance)) {
// 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), __FILE__, __LINE__);
// Is the extension there?
@@ -420,12 +410,15 @@ function GET_EXT_VERSION ($ext_name) {
// Updates a given extension with current extension version to latest version
function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
// This shall never do a non-admin user!
- global $cacheInstance, $_CONFIG, $UPDATE_NOTES, $NOTES, $EXT_VER_HISTORY;
- global $EXT_UPDATE_DEPENDS, $EXT_VERSION, $INC_POOL, $cacheArray;
+ global $cacheInstance, $UPDATE_NOTES, $NOTES, $EXT_VER_HISTORY;
+ global $EXT_UPDATE_DEPENDS, $EXT_VERSION, $INC_POOL, $cacheArray, $SQLs;
// Init arrays
$SQLs = array(); $INC_POOL = array();
+ // Init notes
+ $NOTES = "";
+
// Only admins are allowed to update extensions
if ((!IS_ADMIN()) || (empty($ext_name))) return false;
@@ -442,7 +435,6 @@ function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
if ((($EXT_VERSION != $ext_ver) || ($dry_run)) && (is_array($history))) {
// Search for starting point
$start = array_search($ext_ver, $history);
- $NOTES = "";
// And load SQL queries in order of version history
for ($idx = ($start + 1); $idx < sizeof($history); $idx++) {
@@ -471,37 +463,26 @@ function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
} // END - if
// Add notes
- if (getConfig('verbose_sql') == "Y") {
- if (!empty($UPDATE_NOTES)) {
- // Update notes found
- $NOTES .= ("v".$cacheArray['update_ver'][$ext_name].":
".$UPDATE_NOTES."
");
- $UPDATE_NOTES = "";
- } elseif ($cacheArray['update_ver'][$ext_name] == "0.0") {
- // Initial release
- $NOTES .= ("v".$cacheArray['update_ver'][$ext_name].":
".INITIAL_RELEASE."
");
- } else {
- $NOTES .= ("v".$cacheArray['update_ver'][$ext_name].":
".NO_UPDATE_NOTES."
");
- }
- } // END - if
+ $NOTES .= ADD_EXTENSION_NOTES($cacheArray['update_ver'][$ext_name], $UPDATE_NOTES);
} // END - for
// In real-mode execute any existing includes
if (!$dry_run) {
$cacheArray['inc_pool'][$ext_name] = $INC_POOL;
- RUN_FILTER('load_includes');
+ RUN_FILTER('load_includes', $INC_POOL);
$INC_POOL = $cacheArray['inc_pool'][$ext_name];
unset($cacheArray['inc_pool'][$ext_name]);
} // END - if
// Run SQLs
- RUN_FILTER('run_sqls', $dry_run);
+ RUN_FILTER('run_sqls', array('dry_run' => $dry_run, 'sqls' => $SQLs));
if (!$dry_run) {
// Create task
CREATE_EXTENSION_UPDATE_TASK(GET_CURRENT_ADMIN_ID(), $ext_name, $cacheArray['update_ver'][$ext_name], addslashes($NOTES));
// Update extension's version
- $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_extensions SET ext_version='%s' WHERE ext_name='%s' LIMIT 1",
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_version='%s' WHERE ext_name='%s' LIMIT 1",
array($cacheArray['update_ver'][$ext_name], $ext_name), __FILE__, __LINE__);
// Remove arrays
@@ -514,12 +495,12 @@ function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
// In "dry-run" mode return array with SQL commands
return $SQLs;
}
- }
+ } // END - if
}
// Output verbose SQL table for extension
function EXTENSION_VERBOSE_TABLE ($queries = array(), $title = ADMIN_SQLS_EXECUTED_ON_REMOVAL, $dashed = "", $switch = false, $width = "100%") {
- global $_CONFIG, $SQLs;
+ global $SQLs;
// Are there some queries in $queries?
if (count($queries) > 0) {
@@ -528,48 +509,47 @@ function EXTENSION_VERBOSE_TABLE ($queries = array(), $title = ADMIN_SQLS_EXECUT
} // END - if
// Init variables
- $S = false; $SW = 2; $i = 1;
+ $SW = 2; $i = 1;
$OUT = "";
// Do we have queries?
if ((is_array($SQLs)) && (GET_EXT_VERSION("sql_patches") >= "0.0.7") && (getConfig('verbose_sql') == "Y")) {
- $OUT = "
-
-
- |
- ".$title.":
- |
-
\n";
foreach ($SQLs as $idx => $sql) {
+ // Trim out spaces
$sql = trim($sql);
+
+ // Output command if set
if (!empty($sql)) {
- $S = true;
- $OUT .= "
- | ".$i.". |
-
- ".$sql."
- |
-
\n";
- if ($switch) $SW = 3 - $SW;
+ // Prepare output for template
+ $content = array(
+ 'sw' => $SW,
+ 'i' => $i,
+ 'sql' => $sql
+ );
+
+ // Load row template
+ $OUT .= LOAD_TEMPLATE("admin_ext_sql_row", true, $content);
+
+ // Switch color and count up
+ $SW = 3 - $SW;
$i++;
- }
- }
- }
+ } // END - if
+ } // END - foreach
- if ((!$S) && (GET_EXT_VERSION("sql_patches") >= "0.0.7") && (getConfig('verbose_sql') == "Y")) {
- // No addional SQL commands to run
- $OUT .= "
- |
- ".ADMIN_NO_ADDIONAL_SQLS."
- |
-
\n";
- }
+ // Prepare content for template
+ $content = array(
+ 'width' => $width,
+ 'dashed' => $dashed,
+ 'title' => $title,
+ 'out' => $OUT
+ );
- if (!empty($OUT)) {
- // Add missing close-table tag
- $OUT .= "
-