X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fextensions.php;h=5f3a704895bc1a7588896fdbecb018a6e5c2158b;hp=0d542d6d38f9af262fbe026b7e4d02c884177a7f;hb=98077af43126dd7c274fe57f6ea0494e906e8943;hpb=f97a999e0737c0007ae9c3c26dfef49f75a175ac diff --git a/inc/extensions.php b/inc/extensions.php index 0d542d6d38..5f3a704895 100644 --- a/inc/extensions.php +++ b/inc/extensions.php @@ -43,7 +43,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) { +function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = '', $EXT_VER = '', $dry_run = false) { // Set current extension name EXT_SET_CURR_NAME($ext_name); @@ -61,6 +61,8 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run if ((isset($GLOBALS['ext_loaded']['ext'][$ext_name])) && (empty($EXT_LOAD_MODE))) { // Debug message DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Extension %s already loaded.", $ext_name)); + + // Abort here return false; } // END - if @@ -69,44 +71,54 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run $FQFN = constant('PATH') . $INC; // Is the extension file NOT there? - if (!INCLUDE_READABLE($INC)) { + if (!isIncludeReadable($INC)) { // Debug message - DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Extension %s not found.", $ext_name)); + DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Extension %s not found or not readable.", $ext_name)); // Abort here return false; } // END - if // Construct FQFN for language file - $langInclude = sprintf("inc/language/%s_%s.php", $ext_name, GET_LANGUAGE()); + $langInclude = sprintf("inc/language/%s_%s.php", $ext_name, getLanguage()); // Is this include there? - if ((FILE_READABLE($langInclude)) && (!isset($GLOBALS['ext_loaded']['lang'][$ext_name]))) { + 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; - LOAD_INC_ONCE($langInclude); - } // END - if + 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() + )); + } // Construct FQFN for functions file $funcsInclude = sprintf("inc/libs/%s_functions.php", $ext_name); // Is this include there? - if ((FILE_READABLE($funcsInclude)) && (!isset($GLOBALS['ext_loaded']['funcs'][$ext_name]))) { + if ((isFileReadable($funcsInclude)) && (!isset($GLOBALS['ext_loaded']['funcs'][$ext_name]))) { // Then load it //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "--- Functions loaded."); $GLOBALS['ext_loaded']['funcs'][$ext_name] = true; - LOAD_INC_ONCE($funcsInclude); + 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.", + $ext_name + )); } // END - if // Extensions are not deprecated by default - EXT_SET_DEPRECATED("N"); + EXT_SET_DEPRECATED('N'); // Extensions are not always active by default - EXT_SET_ALWAYS_ACTIVE("N"); + EXT_SET_ALWAYS_ACTIVE('N'); // Extension update notes - EXT_SET_UPDATE_NOTES(""); + EXT_SET_UPDATE_NOTES(''); // Include the extension file //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "Extension loaded."); @@ -164,8 +176,8 @@ function REGISTER_EXTENSION ($ext_name, $task_id, $dry_run = false, $logout = tr if (($task_id == 0) && (!$dry_run)) { // Then request a bug report debug_report_bug(sprintf("%s: task_id is still zero after DETERMINE_EXTENSION_TASK_ID(%s)", - __FUNCTION__, - EXT_GET_CURR_NAME() + __FUNCTION__, + EXT_GET_CURR_NAME() )); } // END - if } // END - if @@ -226,7 +238,10 @@ function REGISTER_EXTENSION ($ext_name, $task_id, $dry_run = false, $logout = tr // Try to register the extension //* DEBUG: */ print __FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME().":ext_update=".$ext_update.",taskId=".$task."
\n"; $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: */ print __FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME().':'; var_dump($test); } // END - if } elseif ($ext_ver != EXT_GET_VERSION()) { // Ok, update this extension now @@ -258,9 +273,9 @@ 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: */ print __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: */ print __FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME().':'; var_dump($test); // Does everthing before wents ok? if ($test === true) { @@ -275,7 +290,7 @@ 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: */ print __FUNCTION__."[".__LINE__."]:insert=".EXT_GET_CURR_NAME().'/'.EXT_GET_VERSION()." - INSERT!
\n"; 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__); @@ -312,23 +327,23 @@ function REGISTER_EXTENSION ($ext_name, $task_id, $dry_run = false, $logout = tr //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "".EXT_GET_CURR_NAME()); $ret = false; } - } elseif (($task_id > 0) && (EXT_GET_CURR_NAME() != "")) { + } elseif (($task_id > 0) && (EXT_GET_CURR_NAME() != '')) { //* DEBUG: */ print __FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME()."
\n"; // 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)), __FUNCTION__, __LINE__); } // Is this the sql_patches? - //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ":".EXT_GET_CURR_NAME()."/{$EXT_LOAD_MODE}"); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ':'.EXT_GET_CURR_NAME()."/{$EXT_LOAD_MODE}"); if ((EXT_GET_CURR_NAME() == 'sql_patches') && (($EXT_LOAD_MODE == 'register') || ($EXT_LOAD_MODE == 'remove')) && (!$dry_run) && ($test)) { //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ": LOAD!"); if ($logout === true) { // Then redirect to logout - LOAD_URL("modules.php?module=admin&logout=1&".$EXT_LOAD_MODE."=sql_patches"); + redirectToUrl('modules.php?module=admin&logout=1&' . $EXT_LOAD_MODE . '=sql_patches'); } else { // Add temporary filter - REGISTER_FILTER('shutdown', 'REDIRECT_TO_LOGOUT_SQL_PATCHES', true, true); + registerFilter('shutdown', 'REDIRECT_TO_LOGOUT_SQL_PATCHES', true, true); $GLOBALS['ext_load_mode'] = $EXT_LOAD_MODE; } } // END - if @@ -349,7 +364,10 @@ function EXTENSION_RUN_SQLS ($ext_id, $load_mode) { $ext_name = GET_EXT_NAME($ext_id); // If it is not set then maybe there is no extension for that ID number - if ($ext_name == "") return false; + if (empty($ext_name)) { + // We should fix these all! + debug_report_bug(__FUNCTION__ . ': ext_name is empty. ext_id=' . $ext_id); + } // END - if // Set current SQL name EXT_SET_CURR_NAME($ext_name); @@ -373,19 +391,22 @@ function EXTENSION_RUN_SQLS ($ext_id, $load_mode) { //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ":SQLs::count=".COUNT_SQLS().""); if ((IS_SQLS_VALID() && (COUNT_SQLS() > 0))) { + // Run any filters depending on the action here + runFilterChain('extension_' . $load_mode, $ext_name); + // Run SQL commands... runFilterChain('run_sqls'); // 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_GET_CURR_NAME()), __FUNCTION__, __LINE__); } // END - if } // END - if // Remove cache file(s) if extension is active - if (((EXT_IS_ACTIVE('cache')) || (GET_EXT_VERSION('cache') != "")) && (((SQL_AFFECTEDROWS() == 1)) || ($sqlRan === true) || ($load_mode == 'activate') || ($load_mode == 'deactivate'))) { + if (((EXT_IS_ACTIVE('cache')) || (GET_EXT_VERSION('cache') != '')) && (((SQL_AFFECTEDROWS() == 1)) || ($sqlRan === true) || ($load_mode == 'activate') || ($load_mode == 'deactivate'))) { // Run filters runFilterChain('post_extension_run_sql', EXT_GET_CURR_NAME()); } // END - if @@ -395,7 +416,7 @@ function EXTENSION_RUN_SQLS ($ext_id, $load_mode) { if ((EXT_GET_CURR_NAME() == 'sql_patches') && (($load_mode == 'register') || ($load_mode == 'remove'))) { // Then redirect to logout //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ": LOAD!"); - LOAD_URL("modules.php?module=admin&logout=1&".$load_mode."=sql_patches"); + redirectToUrl('modules.php?module=admin&logout=1&' . $load_mode . '=sql_patches'); } // END - if } @@ -405,7 +426,7 @@ function EXT_IS_ACTIVE ($ext_name) { if ((!isInstalled()) || (isInstalling()) || (empty($ext_name))) return false; // Not active is the default - $active = "N"; + $active = 'N'; // Check cache if (isset($GLOBALS['cache_array']['extensions']['ext_active'][$ext_name])) { @@ -418,10 +439,10 @@ function EXT_IS_ACTIVE ($ext_name) { } elseif (isset($GLOBALS['ext_loaded'][$ext_name])) { // @TODO Extension is loaded, what next? app_die(__FUNCTION__, __LINE__, "LOADED:$ext_name"); - } elseif (($ext_name == 'cache') || (GET_EXT_VERSION('cache') == "")) { + } 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? @@ -439,7 +460,7 @@ function EXT_IS_ACTIVE ($ext_name) { } else { // Extension not active! //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "ext_name=".$ext_name.": Not active!"); - $GLOBALS['cache_array']['extensions']['ext_active'][$ext_name] = "N"; + $GLOBALS['cache_array']['extensions']['ext_active'][$ext_name] = 'N'; } // Debug message @@ -456,7 +477,7 @@ function GET_EXT_VERSION ($ext_name) { // Empty extension name should be fixed! if (empty($ext_name)) { // Please report this bug! - debug_report_bug(__FUNCTION__.": ext_name is empty which is not allowed here."); + debug_report_bug(__FUNCTION__ . ': ext_name is empty which is not allowed here.'); } // END - if // Extensions are all inactive during installation @@ -473,7 +494,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).""); @@ -481,7 +502,10 @@ function GET_EXT_VERSION ($ext_name) { if (SQL_NUMROWS($result) == 1) { // Load entry list($ext_ver) = SQL_FETCHROW($result); - } // END - if + } elseif (isDebugModeEnabled()) { + // Not found! + DEBUG_LOG(__FUNCTION__, __LINE__, sprintf(": Cannot find extension %s in database!", $ext_name)); + } // Free result SQL_FREERESULT($result); @@ -524,21 +548,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: */ print __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 @@ -562,11 +603,11 @@ function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) { if (!$dry_run) { // Create task - CREATE_EXTENSION_UPDATE_TASK(GET_CURRENT_ADMIN_ID(), EXT_GET_CURR_NAME(), $GLOBALS['cache_array']['update_ver'][EXT_GET_CURR_NAME()], SQL_ESCAPE(EXT_GET_NOTES(EXT_GET_NOTES()))); + CREATE_EXTENSION_UPDATE_TASK(getCurrentAdminId(), EXT_GET_CURR_NAME(), $GLOBALS['cache_array']['update_ver'][EXT_GET_CURR_NAME()], SQL_ESCAPE(EXT_GET_NOTES(EXT_GET_NOTES()))); // Update extension's version - SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_version='%s' WHERE ext_name='%s' LIMIT 1", - array($GLOBALS['cache_array']['update_ver'][EXT_GET_CURR_NAME()], EXT_GET_CURR_NAME()), __FUNCTION__, __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_GET_CURR_NAME()], EXT_GET_CURR_NAME()), __FUNCTION__, __LINE__); // Remove arrays UNSET_SQLS(); @@ -579,7 +620,7 @@ function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) { } // Output verbose SQL table for extension -function EXTENSION_VERBOSE_TABLE ($queries = array(), $title = "", $dashed = "", $switch = false, $width = "100%") { +function EXTENSION_VERBOSE_TABLE ($queries = array(), $title = '', $dashed = '', $switch = false, $width = '100%') { // Empty title? if (empty($title)) { // Then fix it to default @@ -653,11 +694,13 @@ function GET_EXT_NAME ($ext_id) { 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)), __FUNCTION__, __LINE__); list($ret) = SQL_FETCHROW($result); SQL_FREERESULT($result); } + + // Return the extension name return $ret; } @@ -673,7 +716,7 @@ function GET_EXT_ID ($ext_name) { 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), __FUNCTION__, __LINE__); list($ret) = SQL_FETCHROW($result); SQL_FREERESULT($result); @@ -686,8 +729,8 @@ 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", - array($ext_name), __FUNCTION__, __LINE__); + SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET `ext_active`='Y' WHERE `ext_name`='%s' LIMIT 1", + array($ext_name), __FUNCTION__, __LINE__); // Extension has been activated? if (SQL_AFFECTEDROWS() == 1) { @@ -699,8 +742,8 @@ 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", - array($ext_name), __FUNCTION__, __LINE__); + SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET `ext_active`='N' WHERE `ext_name`='%s' LIMIT 1", + array($ext_name), __FUNCTION__, __LINE__); // Extension has been activated? if (SQL_AFFECTEDROWS() == 1) { @@ -711,10 +754,10 @@ function DEACTIVATE_EXTENSION($ext_name) { CREATE_EXTENSION_DEACTIVATION_TASK($ext_name); // Notify the admin - SEND_ADMIN_NOTIFICATION( - getMessage('ADMIN_SUBJECT_EXTENSION_DEACTIVATED'), - "admin_ext_deactivated", - array('ext_name' => $ext_name) + sendAdminNotification( + getMessage('ADMIN_SUBJECT_EXTENSION_DEACTIVATED'), + 'admin_ext_deactivated', + array('ext_name' => $ext_name) ); } // END - if } @@ -725,8 +768,8 @@ function EXT_VERSION_IS_OLDER ($ext_name, $ext_ver) { $currVersion = GET_EXT_VERSION($ext_name); // Remove all dots from both versions - $currVersion = str_replace(".", '', $currVersion); - $ext_ver = str_replace(".", '', $ext_ver); + $currVersion = str_replace('.', '', $currVersion); + $ext_ver = str_replace('.', '', $ext_ver); // Now compare both and return the result return ($currVersion < $ext_ver); @@ -735,15 +778,15 @@ 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) != "") { + 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())", - array($admin_id, $subject, $notes), __FUNCTION__, __LINE__); + array($admin_id, $subject, $notes), __FUNCTION__, __LINE__); } // END - if } // END - if } @@ -751,21 +794,21 @@ function CREATE_EXTENSION_UPDATE_TASK ($admin_id, $ext_name, $ext_ver, $notes) { // Creates a new task for newly installed extension 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) == "")) { + if ((DETERMINE_TASK_ID_BY_SUBJECT($subject) == 0) && (GET_EXT_VERSION($ext) == '')) { // Template file $tpl = sprintf("%stemplates/%s/html/ext/ext_%s.tpl", - constant('PATH'), - GET_LANGUAGE(), - $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 (FILE_READABLE($tpl)) { + if (isFileReadable($tpl)) { // Load extension's own text template (HTML!) - $msg = LOAD_TEMPLATE("ext_" . $ext, true); + $msg = LOAD_TEMPLATE('ext_' . $ext, true); } else { // Write this in debug.log as well DEBUG_LOG(__FUNCTION__, __LINE__, $msg); @@ -774,11 +817,11 @@ 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) VALUES (%s, 0, 'NEW', 'EXTENSION', '%s', '%s', UNIX_TIMESTAMP())", - array( - $admin_id, - $subject, - smartAddSlashes($msg), - ), __FUNCTION__, __LINE__, true, false, false + array( + $admin_id, + $subject, + smartAddSlashes($msg), + ), __FUNCTION__, __LINE__, true, false, false ); } // END - if } @@ -789,14 +832,14 @@ function CREATE_EXTENSION_DEACTIVATION_TASK ($ext) { $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) != "")) { + 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 + array( + $subject, + SQL_ESCAPE(LOAD_TEMPLATE('task_ext_deactivated', true, $ext)), + ), __FUNCTION__, __LINE__, true, false ); } // END - if } @@ -824,7 +867,7 @@ 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__); + array($mod), __FUNCTION__, __LINE__); // Entry found? if (SQL_NUMROWS($result) == 1) { @@ -840,13 +883,13 @@ function MODULE_HAS_MENU ($mod, $forceDb = false) { // Free memory SQL_FREERESULT($result); - } elseif (GET_EXT_VERSION('sql_patches') == "") { + } elseif (GET_EXT_VERSION('sql_patches') == '') { // No sql_patches installed, so maybe in admin area or no admin registered? $ret = (((IS_ADMIN()) || (!isAdminRegistered())) && ($mod == 'admin')); // Then there is a menu! } // Return status - //* DEBUG: */ print __FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME().":"; var_dump($ret); + //* DEBUG: */ print __FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME().':'; var_dump($ret); return $ret; } @@ -856,8 +899,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) { @@ -878,8 +921,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) { @@ -901,7 +944,6 @@ function ADD_EXTENSION_NOTES ($ver) { // Is do we have verbose output enabled? if ((getConfig('verbose_sql') == 'Y') || (!EXT_IS_ACTIVE('sql_patches'))) { - // Update notes found? if (EXT_GET_UPDATE_NOTES() != '') { // Update notes found @@ -911,7 +953,7 @@ function ADD_EXTENSION_NOTES ($ver) { ); // Reset them - EXT_SET_UPDATE_NOTES(""); + EXT_SET_UPDATE_NOTES(''); } elseif (($ver == '0.0') || ($ver == '0.0.0')) { // Initial release $content = array( @@ -1007,7 +1049,7 @@ function EXT_ADD_UPDATE_DEPENDS ($updateDepends) { // Is it not yet added? if (!in_array($updateDepends, $GLOBALS['ext_running_updates'])) { - //* DEBUG */ DEBUG_LOG(__FUNCTION__, __LINE__, "currName=".EXT_GET_CURR_NAME()."/".$updateDepends); + //* DEBUG */ DEBUG_LOG(__FUNCTION__, __LINE__, "currName=".EXT_GET_CURR_NAME().'/'.$updateDepends); // Add it to the list of extension update depencies map $GLOBALS['ext_update_depends'][EXT_GET_CURR_NAME()][] = (string) $updateDepends; @@ -1104,7 +1146,7 @@ function EXT_GET_UPDATE_ITERATOR () { if (!isset($GLOBALS['ext_depend_iterator'][EXT_GET_CURR_NAME()])) EXT_INIT_UPDATE_ITERATOR(); // Return it - //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "currName=".EXT_GET_CURR_NAME()."/".$GLOBALS['ext_depend_iterator'][EXT_GET_CURR_NAME()]); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "currName=".EXT_GET_CURR_NAME().'/'.$GLOBALS['ext_depend_iterator'][EXT_GET_CURR_NAME()]); return $GLOBALS['ext_depend_iterator'][EXT_GET_CURR_NAME()]; } @@ -1193,7 +1235,7 @@ function GET_EXT_SQLS () { if (!isset($GLOBALS['ext_sqls'][EXT_GET_CURR_NAME()])) { // Not found, should not happen debug_report_bug(sprintf("ext_sqls is empty, current extension: %s", - EXT_GET_CURR_NAME() + EXT_GET_CURR_NAME() )); } // END - if @@ -1236,5 +1278,26 @@ function EXT_GET_REMOVAL_LIST () { return $GLOBALS['ext_update_remove']; } +// Redirects if the provided extension is not installed +function redirectOnUninstalledExtension ($ext_name) { + // So is the extension there? + if ((!isExtensionInstalled($ext_name)) || (!EXT_IS_ACTIVE($ext_name))) { + // Redirect to index + redirectToUrl('modules.php?module=index&msg=' . getCode('EXTENSION_PROBLEM') . '&ext=' . $ext_name); + } // END - if +} + +// Determines wether the given extension is installed +function isExtensionInstalled ($ext_name) { + // Default is not installed + $isInstalled = false; + + // Check cache ext_version + $isInstalled = isset($GLOBALS['cache_array']['extensions']['ext_version'][$ext_name]); + + // Return status + return $isInstalled; +} + // ?>