X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions.php;h=7ed3d4943421a8f3f4068b01758fdb77650e5b57;hb=af59daf6541b279989547829c95adc5bee8ca11d;hp=0e49343d0ac81b16312485f88395ff9b563964d6;hpb=89c00e43d2ce1dd1afe11c2c8485307342805f97;p=mailer.git diff --git a/inc/extensions.php b/inc/extensions.php index 0e49343d0a..7ed3d49434 100644 --- a/inc/extensions.php +++ b/inc/extensions.php @@ -39,7 +39,7 @@ if (!defined('__SECURITY')) { // Load the extension and maybe found language and function files. function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run = false, &$SQLs = array()) { - global $EXT_LOADED, $_CONFIG, $CSS, $cacheMode, $EXT_VER_HISTORY; + global $EXT_LOADED, $_CONFIG, $EXT_VER_HISTORY; global $INC_POOL, $EXT_UPDATE_DEPENDS, $EXT_DEPRECATED, $UPDATE_NOTES; global $EXT_VERSION, $EXT_ALWAYS_ACTIVE; @@ -55,10 +55,13 @@ 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)) { + if (!FILE_READABLE($FQFN)) { // Debug message DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Extension %s not found.", $ext_name)); @@ -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 @@ -102,7 +105,7 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run // Include the extension file //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "Extension loaded."); - require($extInclude); + require($FQFN); // Is this extension deprecated? if ($EXT_DEPRECATED == "Y") { @@ -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, $INC_POOL, $cacheInstance; + global $UPDATE_NOTES, $INC_POOL; global $EXT_VER_HISTORY, $NOTES, $EXT_ALWAYS_ACTIVE, $EXT_VERSION; global $EXT_UPDATE_DEPENDS; @@ -140,7 +143,7 @@ function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run = false, $logout = tr $NOTES = ""; $INC_POOL = array(); - // By default we have no failtures + // By default we have no failures $EXT_REPORTS_FAILURE = false; // Does this extension exists? @@ -152,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? @@ -217,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? @@ -228,7 +219,7 @@ function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run = false, $logout = tr RUN_FILTER('pre_extension_installed', array('dry_run' => $dry_run, 'sqls' => $SQLs)); // Register extension - 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 +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 - 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,8 +271,6 @@ 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; - // This shall never do a non-admin user! if (!IS_ADMIN()) return false; @@ -293,6 +282,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 @@ -307,7 +297,7 @@ function EXTENSION_RUN_SQLS ($ext_id, $load_mode) { // Removal 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", + 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,8 +319,6 @@ function EXTENSION_RUN_SQLS ($ext_id, $load_mode) { // Check if given extension is active function EXT_IS_ACTIVE ($ext_name) { - global $cacheArray, $_CONFIG; - // Extensions are all inactive during installation if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isBooleanConstantAndTrue('mxchange_installing')) || (empty($ext_name))) return false; @@ -338,17 +326,17 @@ function EXT_IS_ACTIVE ($ext_name) { $active = "N"; // Check cache - if (isset($cacheArray['extensions']['ext_active'][$ext_name])) { + if (isset($GLOBALS['cache_array']['extensions']['ext_active'][$ext_name])) { // Load from cache //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "CACHE! ext_name={$ext_name}"); - $active = $cacheArray['extensions']['ext_active'][$ext_name]; + $active = $GLOBALS['cache_array']['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? @@ -362,11 +350,11 @@ function EXT_IS_ACTIVE ($ext_name) { // Write cache array //* DEBUG: */ echo $ext_name."[DB]: {$active}"); - $cacheArray['extensions']['ext_active'][$ext_name] = $active; + $GLOBALS['cache_array']['extensions']['ext_active'][$ext_name] = $active; } else { // Extension not active! //* DEBUG: */ echo $ext_name.": Not active!"); - $cacheArray['extensions']['ext_active'][$ext_name] = "N"; + $GLOBALS['cache_array']['extensions']['ext_active'][$ext_name] = "N"; } // Debug message @@ -377,7 +365,7 @@ function EXT_IS_ACTIVE ($ext_name) { } // Get version from extensions function GET_EXT_VERSION ($ext_name) { - global $cacheArray, $_CONFIG, $cacheInstance; + // By default no extension is found $ext_ver = false; // Extensions are all inactive during installation @@ -385,16 +373,16 @@ function GET_EXT_VERSION ($ext_name) { //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ": ext_name={$ext_name}"); // Is the cache written? - if (isset($cacheArray['extensions']['ext_version'][$ext_name])) { + if (isset($GLOBALS['cache_array']['extensions']['ext_version'][$ext_name])) { // Load data from cache //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ": CACHE!"); - $ext_ver = $cacheArray['extensions']['ext_version'][$ext_name]; + $ext_ver = $GLOBALS['cache_array']['extensions']['ext_version'][$ext_name]; // Count cache hits - if (getConfig('cache_hits') > 0) $_CONFIG['cache_hits']++; else $_CONFIG['cache_hits'] = 1; - } elseif (!is_object($cacheInstance)) { + incrementConfigEntry('cache_hits'); + } elseif ((!isset($GLOBALS['cache_instance'])) || (!is_object($GLOBALS['cache_instance']))) { // 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? @@ -407,7 +395,7 @@ function GET_EXT_VERSION ($ext_name) { SQL_FREERESULT($result); // Set cache - $cacheArray['extensions']['ext_version'][$ext_name] = $ext_ver; + $GLOBALS['cache_array']['extensions']['ext_version'][$ext_name] = $ext_ver; } // Return result @@ -418,12 +406,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, $UPDATE_NOTES, $NOTES, $EXT_VER_HISTORY; - global $EXT_UPDATE_DEPENDS, $EXT_VERSION, $INC_POOL, $cacheArray, $SQLs; + global $UPDATE_NOTES, $NOTES, $EXT_VER_HISTORY; + global $EXT_UPDATE_DEPENDS, $EXT_VERSION, $INC_POOL, $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,19 +431,18 @@ 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++) { // Set extension version - $cacheArray['update_ver'][$ext_name] = $history[$idx]; + $GLOBALS['cache_array']['update_ver'][$ext_name] = $history[$idx]; // Load again... - LOAD_EXTENSION($ext_name, "update", $cacheArray['update_ver'][$ext_name], $dry_run, $SQLs); + LOAD_EXTENSION($ext_name, "update", $GLOBALS['cache_array']['update_ver'][$ext_name], $dry_run, $SQLs); if (!empty($EXT_UPDATE_DEPENDS)) { // Backup current SQL queries - $cacheArray['update_sqls'][$ext_name] = $SQLs; + $GLOBALS['cache_array']['update_sqls'][$ext_name] = $SQLs; // Is the extension there? if (GET_EXT_VERSION($EXT_UPDATE_DEPENDS) != "") { @@ -464,31 +454,20 @@ function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) { } // Restore previous SQL queries - $SQLs = $cacheArray['update_sqls'][$ext_name]; - unset($cacheArray['update_sqls'][$ext_name]); + $SQLs = $GLOBALS['cache_array']['update_sqls'][$ext_name]; + unset($GLOBALS['cache_array']['update_sqls'][$ext_name]); } // 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($GLOBALS['cache_array']['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; + $GLOBALS['cache_array']['inc_pool'][$ext_name] = $INC_POOL; RUN_FILTER('load_includes', $INC_POOL); - $INC_POOL = $cacheArray['inc_pool'][$ext_name]; - unset($cacheArray['inc_pool'][$ext_name]); + $INC_POOL = $GLOBALS['cache_array']['inc_pool'][$ext_name]; + unset($GLOBALS['cache_array']['inc_pool'][$ext_name]); } // END - if // Run SQLs @@ -496,15 +475,15 @@ function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) { if (!$dry_run) { // Create task - CREATE_EXTENSION_UPDATE_TASK(GET_CURRENT_ADMIN_ID(), $ext_name, $cacheArray['update_ver'][$ext_name], addslashes($NOTES)); + CREATE_EXTENSION_UPDATE_TASK(GET_CURRENT_ADMIN_ID(), $ext_name, $GLOBALS['cache_array']['update_ver'][$ext_name], SQL_ESCAPE($NOTES)); // Update extension's version - 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__); + SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_version='%s' WHERE ext_name='%s' LIMIT 1", + array($GLOBALS['cache_array']['update_ver'][$ext_name], $ext_name), __FILE__, __LINE__); // Remove arrays unset($SQLs); - unset($cacheArray['update_ver'][$ext_name]); + unset($GLOBALS['cache_array']['update_ver'][$ext_name]); // Run filters on success extension update RUN_FILTER('extension_update', $ext_name); @@ -516,9 +495,15 @@ function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) { } // Output verbose SQL table for extension -function EXTENSION_VERBOSE_TABLE ($queries = array(), $title = ADMIN_SQLS_EXECUTED_ON_REMOVAL, $dashed = "", $switch = false, $width = "100%") { +function EXTENSION_VERBOSE_TABLE ($queries = array(), $title = "", $dashed = "", $switch = false, $width = "100%") { global $SQLs; + // Empty title? + if (empty($title)) { + // Then fix it to default + $title = getMessage('ADMIN_SQLS_EXECUTED_ON_REMOVAL'); + } // END - if + // Are there some queries in $queries? if (count($queries) > 0) { // Then use them instead! @@ -526,48 +511,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 = "
- - - -\n"; foreach ($SQLs as $idx => $sql) { + // Trim out spaces $sql = trim($sql); + + // Output command if set if (!empty($sql)) { - $S = true; - $OUT .= " - - -\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 .= " - -\n"; - } + // Prepare content for template + $content = array( + 'width' => $width, + 'dashed' => $dashed, + 'title' => $title, + 'out' => $OUT + ); - if (!empty($OUT)) { - // Add missing close-table tag - $OUT .= "
- ".$title.": -
".$i.". - ".$sql." -
- ".ADMIN_NO_ADDIONAL_SQLS." -
-
\n"; - } + // Load main template + $OUT = LOAD_TEMPLATE("admin_ext_sql_table", true, $content); + } elseif ((GET_EXT_VERSION("sql_patches") >= "0.0.7") && (getConfig('verbose_sql') == "Y")) { + // No addional SQL commands to run + $OUT = LOAD_TEMPLATE("admin_settings_saved", true, getMessage('ADMIN_NO_ADDITIONAL_SQLS')); + } // END - if // Return output return $OUT; @@ -575,21 +559,19 @@ function EXTENSION_VERBOSE_TABLE ($queries = array(), $title = ADMIN_SQLS_EXECUT // Get extension name from id function GET_EXT_NAME ($ext_id) { - global $cacheArray, $_CONFIG; - // Init extension name $ret = ""; // Is cache there? - if (isset($cacheArray['extensions']['ext_name'][$ext_id])) { + if (isset($GLOBALS['cache_array']['extensions']['ext_name'][$ext_id])) { // Load from cache - $ret = $cacheArray['extensions']['ext_name'][$ext_id]; + $ret = $GLOBALS['cache_array']['extensions']['ext_name'][$ext_id]; // Count cache hits - if (getConfig('cache_hits') > 0) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; } + incrementConfigEntry('cache_hits'); } elseif (!EXT_IS_ACTIVE("cache")) { // Load from database - $result = SQL_QUERY_ESC("SELECT ext_name FROM "._MYSQL_PREFIX."_extensions WHERE id=%s LIMIT 1", + $result = SQL_QUERY_ESC("SELECT ext_name FROM `{!_MYSQL_PREFIX!}_extensions` WHERE id=%s LIMIT 1", array(bigintval($ext_id)), __FILE__, __LINE__); list($ret) = SQL_FETCHROW($result); SQL_FREERESULT($result); @@ -599,19 +581,17 @@ function GET_EXT_NAME ($ext_id) { // Get extension id from name function GET_EXT_ID ($ext_name) { - global $cacheArray, $_CONFIG; - // Init ID number $ret = 0; - if (isset($cacheArray['extensions']['ext_id'][$ext_name])) { + if (isset($GLOBALS['cache_array']['extensions']['ext_id'][$ext_name])) { // Load from cache - $ret = $cacheArray['extensions']['ext_id'][$ext_name]; + $ret = $GLOBALS['cache_array']['extensions']['ext_id'][$ext_name]; // Count cache hits - if (getConfig('cache_hits') > 0) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; } + incrementConfigEntry('cache_hits'); } elseif (!EXT_IS_ACTIVE("cache")) { // Load from database - $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_extensions WHERE ext_name='%s' LIMIT 1", + $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_extensions` WHERE ext_name='%s' LIMIT 1", array($ext_name), __FILE__, __LINE__); list($ret) = SQL_FETCHROW($result); SQL_FREERESULT($result); @@ -624,7 +604,7 @@ function GET_EXT_ID ($ext_name) { // Activate given extension 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", + SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_active='Y' WHERE ext_name='%s' LIMIT 1", array($ext_name), __FILE__, __LINE__); // Extension has been activated? @@ -637,7 +617,7 @@ function ACTIVATE_EXTENSION ($ext_name) { // Deactivate given extension 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", + SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_active='N' WHERE ext_name='%s' LIMIT 1", array($ext_name), __FILE__, __LINE__); // Extension has been activated? @@ -649,7 +629,11 @@ function DEACTIVATE_EXTENSION($ext_name) { CREATE_EXTENSION_DEACTIVATION_TASK($ext_name); // Notify the admin - SEND_ADMIN_NOTIFICATION(ADMIN_SUBJECT_EXTENSION_DEACTIVATED, "admin_ext_deactivated", array('ext_name' => $ext_name)); + SEND_ADMIN_NOTIFICATION( + getMessage('ADMIN_SUBJECT_EXTENSION_DEACTIVATED'), + "admin_ext_deactivated", + array('ext_name' => $ext_name) + ); } // END - if } @@ -669,14 +653,14 @@ function EXT_VERSION_IS_OLDER ($ext_name, $ext_ver) { // Creates a new task for updated extension function CREATE_EXTENSION_UPDATE_TASK ($admin_id, $ext_name, $ext_ver, $notes) { // Create subject line - $subject = "[UPDATE-".$ext_name."-".$ext_ver.":] ".ADMIN_UPDATE_EXT_SUBJ; + $subject = "[UPDATE-".$ext_name."-".$ext_ver.":] {--ADMIN_UPDATE_EXT_SUBJ--}"; // Is the extension there? if (GET_EXT_VERSION($ext_name) != "") { // 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())", + 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__); } // END - if } // END - if @@ -688,7 +672,7 @@ function CREATE_NEW_EXTENSION_TASK ($admin_id, $subject, $ext) { if ((DETERMINE_TASK_ID_BY_SUBJECT($subject) == 0) && (GET_EXT_VERSION($ext) == "")) { // Template file $tpl = sprintf("%stemplates/%s/html/ext/ext_%s.tpl", - PATH, + constant('PATH'), GET_LANGUAGE(), $ext ); @@ -703,12 +687,12 @@ function CREATE_NEW_EXTENSION_TASK ($admin_id, $subject, $ext) { } // 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) + 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, - addslashes($msg), + SQL_ESCAPE($msg), ), __FILE__, __LINE__, true, false ); } // END - if @@ -717,16 +701,16 @@ VALUES (%s,0,'NEW','EXTENSION','%s','%s',UNIX_TIMESTAMP())", // Creates a task for automatically deactivated (deprecated) extension function CREATE_EXTENSION_DEACTIVATION_TASK ($ext) { // Create subject line - $subject = sprintf("[%s:] %s", $ext, TASK_SUBJ_EXTENSION_DEACTIVATED); + $subject = sprintf("[%s:] %s", $ext, getMessage('TASK_SUBJ_EXTENSION_DEACTIVATED')); // 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) + 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, - addslashes(LOAD_TEMPLATE("task_ext_deactivated", true, $ext)), + SQL_ESCAPE(LOAD_TEMPLATE("task_ext_deactivated", true, $ext)), ), __FILE__, __LINE__, true, false ); } // END - if @@ -734,28 +718,27 @@ VALUES (0,0,'NEW','EXTENSION_DEACTIVATION','%s','%s',UNIX_TIMESTAMP())", // Checks if the module has a menu function MODULE_HAS_MENU ($mod, $forceDb = false) { - global $cacheArray, $_CONFIG; - // All is false by default $ret = false; + //* DEBUG: */ print __FUNCTION__."(".__LINE__."):mod={$mod},cache=".GET_EXT_VERSION("cache")."
\n"; if (GET_EXT_VERSION("cache") >= "0.1.2") { // Cache version is okay, so let's check the cache! - if (isset($cacheArray['modules']['has_menu'][$mod])) { + if (isset($GLOBALS['cache_array']['modules']['has_menu'][$mod])) { // Check module cache and count hit - $ret = ($cacheArray['modules']['has_menu'][$mod] == "Y"); - if (getConfig('cache_hits') > 0) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; } - } elseif (isset($cacheArray['extensions']['ext_menu'][$mod])) { + $ret = ($GLOBALS['cache_array']['modules']['has_menu'][$mod] == "Y"); + incrementConfigEntry('cache_hits'); + } elseif (isset($GLOBALS['cache_array']['extensions']['ext_menu'][$mod])) { // Check cache and count hit - $ret = ($cacheArray['extensions']['ext_menu'][$mod] == "Y"); - if (getConfig('cache_hits') > 0) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; } + $ret = ($GLOBALS['cache_array']['extensions']['ext_menu'][$mod] == "Y"); + incrementConfigEntry('cache_hits'); } elseif ((IS_ADMIN()) && ($mod == "admin")) { // Admin module has always a menu! $ret = true; } } 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", + $result = SQL_QUERY_ESC("SELECT has_menu FROM `{!_MYSQL_PREFIX!}_mod_reg` WHERE module='%s' LIMIT 1", array($mod), __FILE__, __LINE__); // Entry found? @@ -764,7 +747,7 @@ function MODULE_HAS_MENU ($mod, $forceDb = false) { list($has_menu) = SQL_FETCHROW($result); // Fake cache... ;-) - $cacheArray['extensions']['ext_menu'][$mod] = $has_menu; + $GLOBALS['cache_array']['extensions']['ext_menu'][$mod] = $has_menu; // Does it have a menu? $ret = ($has_menu == "Y"); @@ -788,7 +771,7 @@ 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", + $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__); // Entry found? @@ -810,7 +793,7 @@ 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", + $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_task_system` WHERE subject LIKE '%s%%' LIMIT 1", array($subject), __FILE__, __LINE__); // Entry found? @@ -826,5 +809,76 @@ function DETERMINE_TASK_ID_BY_SUBJECT ($subject) { return $task_id; } +// Add updates notes for given version +function ADD_EXTENSION_NOTES ($ver, &$UPDATE_NOTES) { + // Init notes/content + $out = ""; $content = array(); + + // Is do we have verbose output enabled? + if ((getConfig('verbose_sql') == "Y") || (!EXT_IS_ACTIVE("sql_patches"))) { + + // Update notes found? + if (!empty($UPDATE_NOTES)) { + // Update notes found + $content = array( + 'ver' => $ver, + 'notes' => $UPDATE_NOTES + ); + $UPDATE_NOTES = ""; + } elseif (($ver == "0.0") || ($ver == "0.0.0")) { + // Initial release + $content = array( + 'ver' => $ver, + 'notes' => getMessage('INITIAL_RELEASE') + ); + } else { + // No update notes found! + $content = array( + 'ver' => $ver, + 'notes' => getMessage('NO_UPDATE_NOTES') + ); + } + + // Load template + $out = LOAD_TEMPLATE("admin_ext_notes", true, $content); + } // END - if + + // Return the output + return $out; +} + +// Getter for CSS files array +function EXT_GET_CSS_FILES () { + // By default no additional CSS files are found + $cssFiles = array(); + + // Is the array there? + if (isset($GLOBALS['css_files'])) { + // Then use it + $cssFiles = $GLOBALS['css_files']; + } // END - if + + // Return array + return $cssFiles; +} + +// Init CSS files array +function EXT_INIT_CSS_FILES () { + // Simply init it + $GLOBALS['css_files'] = array(); +} + +// Add new entry +function EXT_ADD_CSS_FILE ($file) { + // Is the array there? + if (!isset($GLOBALS['css_files'])) { + // Then auto-init them + EXT_INIT_CSS_FILES(); + } // END - if + + // Add the entry + $GLOBALS['css_files'][] = $file; +} + // ?>