X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fextensions.php;h=a59e17b086ff61ef806d85a365349eb99dd11427;hp=19405263086cddc90ae61dcb3998a40df76b19f6;hb=c5502e4040f7946d4d6e42434efc3dc03c7b73d1;hpb=e9f2f6afad84a15a018f70a07784b6c6583f2e13
diff --git a/inc/extensions.php b/inc/extensions.php
index 1940526308..a59e17b086 100644
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -127,7 +127,7 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run
function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run = false, $logout = true) {
global $UPDATE_NOTES, $INC_POOL, $cacheInstance;
global $EXT_VER_HISTORY, $NOTES, $EXT_ALWAYS_ACTIVE, $EXT_VERSION;
- global $EXT_UPDATE_DEPENDS, $SQLs;
+ global $EXT_UPDATE_DEPENDS;
// This shall never do a non-admin user!
if (!IS_ADMIN()) return false;
@@ -152,20 +152,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?
@@ -225,10 +213,10 @@ 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
@@ -255,7 +243,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__);
}
@@ -280,7 +268,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, $SQLs;
+ global $cacheInstance;
// This shall never do a non-admin user!
if (!IS_ADMIN()) return false;
@@ -302,12 +290,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
@@ -329,7 +317,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;
@@ -344,7 +332,7 @@ 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
@@ -377,7 +365,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
@@ -391,7 +379,7 @@ 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",
@@ -419,11 +407,14 @@ function GET_EXT_VERSION ($ext_name) {
function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
// This shall never do a non-admin user!
global $cacheInstance, $UPDATE_NOTES, $NOTES, $EXT_VER_HISTORY;
- global $EXT_UPDATE_DEPENDS, $EXT_VERSION, $INC_POOL, $cacheArray;
+ 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;
@@ -440,7 +431,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++) {
@@ -469,18 +459,7 @@ 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
@@ -492,14 +471,14 @@ function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
} // 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
@@ -512,7 +491,7 @@ 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
@@ -526,48 +505,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 .= "
-