X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-extensions.php;h=965bc1f8bd0596947ee5bcf40f27a72a16661948;hp=c9421a7cf65a586e51c38c21e217692037eea521;hb=0715fa7aa8e5e70bcf1d957fb09ae655c3896c4e;hpb=671f0fea4b23b0fc2e571dd2b1b949db223dade8 diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php index c9421a7cf6..965bc1f8bd 100644 --- a/inc/modules/admin/what-extensions.php +++ b/inc/modules/admin/what-extensions.php @@ -1,7 +1,7 @@ 0) && (!isDemoModeActive())) { + $do = 'register'; $ext_id = bigintval(getRequestParameter('reg_ext')); + // The id comes from task management and it is - of course - *not* the extension's name! +} elseif ((isFormSent('change')) && (countPostSelection() > 0) && (!isDemoModeActive())) { // De-/activate extensions - foreach (postRequestElement('sel') as $ext_id => $active) { + foreach (postRequestParameter('sel') as $ext_id => $active) { // Shall we keep the extension always active? - if ((isset($GLOBALS['cache_array']['active_extensions'][getExtensionName($ext_id)])) && ($GLOBALS['cache_array']['active_extensions'][getExtensionName($ext_id)] == 'Y') && ($active != 'Y')) { + if ((isset($GLOBALS['cache_array']['always_active'][getExtensionName($ext_id)])) && ($GLOBALS['cache_array']['always_active'][getExtensionName($ext_id)] == 'Y') && ($active == 'Y')) { // Keep this extension active! + loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_ALWAYS_ACTIVE', getExtensionName($ext_id))); } else { // De/activate extension $ACT = 'N'; setExtensionMode('deactivate'); if ($active != 'Y') { $ACT = 'Y'; setExtensionMode('activate'); } - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET `ext_active`='".$ACT."' WHERE `id`=%s AND `ext_active`='%s' LIMIT 1", - array(bigintval($ext_id), $active), __FILE__, __LINE__); + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET `ext_active`='%s' WHERE `id`=%s AND `ext_active`='%s' LIMIT 1", + array($ACT, bigintval($ext_id), $active), __FILE__, __LINE__); // Run embeded SQL commands doExtensionSqls($ext_id, getExtensionMode()); } - } -} elseif (((isPostRequestElementSet('edit')) || (isPostRequestElementSet(('modify')))) && ($SEL > 0) && (!isDemoModeActive())) { + } // END - foreach + + // Redirect to prevent missing cache in js.php + redirectToUrl('modules.php?module=admin&what=extensions&changed=' . countPostSelection()); +} elseif (((isFormSent('edit')) || (isPostRequestParameterSet('modify'))) && (countPostSelection() > 0) && (!isDemoModeActive())) { // Change settings like CSS file load - if (isPostRequestElementSet(('modify'))) { + if (isPostRequestParameterSet('modify')) { // Change entries - $cache_update = 0; - foreach (postRequestElement('sel') as $ext_id => $sel) { - // Secure ID + $cache_update = '0'; + foreach (postRequestParameter('sel') as $ext_id => $sel) { + // Secure id $ext_id = bigintval($ext_id); // Change this extension? @@ -90,13 +88,13 @@ if (isGetRequestElementSet('reg_ext')) { setExtensionMode('modify'); // Get entry for 'active' - $active = postRequestElement('active', $ext_id); + $active = postRequestParameter('active', $ext_id); // Update extension's record - if (getExtensionVersion('sql_patches') >= '0.0.6') { + if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) { // Update also CSS column when extensions sql_patches is newer or exact v0.0.6 SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET `ext_has_css`='%s', `ext_active`='%s' WHERE `id`=%s LIMIT 1", - array(postRequestElement('css', $ext_id), $active, $ext_id), __FILE__, __LINE__); + array(postRequestParameter('css', $ext_id), $active, $ext_id), __FILE__, __LINE__); } else { // When extension is older than v0.0.6 there is no column for the CSS information SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET `ext_active`='%s' WHERE `id`=%s LIMIT 1", @@ -114,19 +112,19 @@ if (isGetRequestElementSet('reg_ext')) { } } - // Extensions changed - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_EXT_CHANGED')); + // Redirect to prevent missing cache in js.php + redirectToUrl('modules.php?module=admin&what=extensions&edited=' . countPostSelection()); } else { // Edit selected entries $SW = 2; $OUT = ''; - foreach (postRequestElement('sel') as $ext_id => $sel) { + foreach (postRequestParameter('sel') as $ext_id => $sel) { // Edit this extension? if (($sel == 'Y') || ($sel != 'Y')) { // Default is no CSS for non-updated mailers $css = 'N'; // Load required data - if (getExtensionVersion('sql_patches') >= '0.0.6') { + if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) { $result = SQL_QUERY_ESC("SELECT ext_has_css, ext_active FROM `{?_MYSQL_PREFIX?}_extensions` WHERE `id`=%s LIMIT 1", array(bigintval($ext_id)), __FILE__, __LINE__); list($css, $active) = SQL_FETCHROW($result); @@ -139,9 +137,11 @@ if (isGetRequestElementSet('reg_ext')) { $css = 'X'; } - // Output row + // Prepare CSS column $cssSelection = '---'; - if (getExtensionVersion('sql_patches') >= '0.0.6') $cssSelection = addSelectionBox('yn', $css, 'css', $ext_id); + if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) { + $cssSelection = addSelectionBox('yn', $css, 'css', $ext_id); + } // END - if // Prepare data for the row template $content = array( @@ -162,10 +162,10 @@ if (isGetRequestElementSet('reg_ext')) { loadTemplate('admin_extensions_edit', false, $OUT); $do = 'edit'; } -} elseif ((isPostRequestElementSet('delete')) && ($SEL > 0) && (!isDemoModeActive())) { +} elseif ((isPostRequestParameterSet('delete')) && (countPostSelection() > 0) && (!isDemoModeActive())) { // List extensions and when verbose is enabled SQL statements which will be executed $OUT = ''; $SW = 2; - foreach (postRequestElement('sel') as $ext_id => $sel) { + foreach (postRequestParameter('sel') as $ext_id => $sel) { // Init variables $VERBOSE_OUT = ''; initSqls(); @@ -213,11 +213,11 @@ if (isGetRequestElementSet('reg_ext')) { // Load template loadTemplate('admin_extensions_delete', false, $OUT); $do = 'delete'; -} elseif ((isPostRequestElementSet('remove')) && ($SEL > 0) && (!isDemoModeActive())) { +} elseif ((isFormSent('remove')) && (countPostSelection() > 0) && (!isDemoModeActive())) { // Remove extensions from DB (you have to delete all files manually!) - $cache_update = 0; - foreach (postRequestElement('sel') as $ext_id => $active) { - // Secure ID number + $cache_update = '0'; + foreach (postRequestParameter('sel') as $ext_id => $active) { + // Secure id number $ext_id = bigintval($ext_id); // Is this extension selected and id valid? @@ -227,20 +227,29 @@ if (isGetRequestElementSet('reg_ext')) { } // END - if } // END - foreach - // Extensions removed - loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_EXTENSIONS_REMOVED'), $SEL)); -} elseif ((isGetRequestElementSet('do')) && (!isDemoModeActive())) { + // Redirect to prevent missing cache in js.php + redirectToUrl('modules.php?module=admin&what=extensions&removed=' . countPostSelection()); +} elseif ((isGetRequestParameterSet('do')) && (!isDemoModeActive())) { // Other things to do - $do = SQL_ESCAPE(secureString(getRequestElement('do'))); -} elseif (isGetRequestElementSet('do')) { + $do = SQL_ESCAPE(secureString(getRequestParameter('do'))); +} elseif (isGetRequestParameterSet('do')) { // Demo mode active! $do = 'demo'; +} elseif (isGetRequestParameterSet('changed')) { + // Extensions changed + loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_CHANGED', bigintval(getRequestParameter('changed')))); +} elseif (isGetRequestParameterSet('edited')) { + // Extensions changed + loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_EDITED', bigintval(getRequestParameter('edited')))); +} elseif (isGetRequestParameterSet('removed')) { + // Extensions changed + loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSIONS_REMOVED', bigintval(getRequestParameter('removed')))); } // Shall we display active/inactive extensions? $where = ''; -if (isGetRequestElementSet(('active'))) { - $where = sprintf("WHERE `ext_active`='%s'", SQL_ESCAPE(secureString(getRequestElement('active')))); +if (isGetRequestParameterSet(('active'))) { + $where = sprintf("WHERE `ext_active`='%s'", SQL_ESCAPE(secureString(getRequestParameter('active')))); } // END - if // Case selection @@ -267,7 +276,7 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__); while ($content = SQL_FETCHARRAY($result)) { // Prepare CSS selection output $cssSelection = '---'; - if (getExtensionVersion('sql_patches') >= '0.0.6') $cssSelection = translateYesNo($content['ext_css']); + if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) $cssSelection = translateYesNo($content['ext_css']); // Prepare data for the row template $content = array( @@ -304,16 +313,18 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__); // Free result SQL_FREERESULT($result); - // Is the ID number valid and the task was found? + // Is the id number valid and the task was found? if (($ext_id > 0) && ($task_found == 1)) { - // ID is valid so begin with registration, we first want to it's real name from task management (subject column) + // id is valid so begin with registration, we first want to it's real name from task management (subject column) $result = SQL_QUERY_ESC("SELECT `subject` FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `id`=%s LIMIT 1", array(bigintval($ext_id)), __FILE__, __LINE__); list($subj) = SQL_FETCHROW($result); + + // Free result SQL_FREERESULT($result); // Disable cache update by default - $cache_update = 0; + $cache_update = '0'; if (!empty($subj)) { // Extract extension's name from subject... $ext_name = trim(substr($subj, 1, strpos($subj, ':') - 1)); @@ -326,25 +337,25 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__); // ... so we can finally register and load it in registration mode if (registerExtension($ext_name, $ext_id)) { // Errors? - if (getTotalFatalErrors() == 0) { + if (!ifFatalErrorsDetected()) { // Extension was found and successfully registered - loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_EXTENSION_REGISTERED'), $ext_name)); + loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_REGISTERED', $ext_name)); // Show next link if (isExtensionActive('task')) { loadTemplate('admin_next_link', false, array( 'url' => 'modules.php?module=admin&what=list_task', - 'title' => getMessage('ADMIN_EXT_REGISTER_NEXT_LINK') + 'title' => getMessage('ADMIN_EXTENSION_REGISTER_NEXT_LINK') )); } else { loadTemplate('admin_next_link', false, array( 'url' => 'modules.php?module=admin', - 'title' => getMessage('ADMIN_EXT_REGISTER_NEXT_LINK') + 'title' => getMessage('ADMIN_EXTENSION_REGISTER_NEXT_LINK') )); } } else { // Errors detected! - loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_EXTENSION_NOT_REGISTERED'), $ext_name)); + loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_NOT_REGISTERED', $ext_name)); } // Do we need to update cache file? @@ -353,14 +364,15 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__); // Remove cache file (will be auto-created again!) if ($GLOBALS['cache_instance']->loadCacheFile('config')) $GLOBALS['cache_instance']->removeCacheFile(); if ($GLOBALS['cache_instance']->loadCacheFile('extension')) $GLOBALS['cache_instance']->removeCacheFile(); + if ($GLOBALS['cache_instance']->loadCacheFile('filter')) $GLOBALS['cache_instance']->removeCacheFile(); if ($GLOBALS['cache_instance']->loadCacheFile('modules')) $GLOBALS['cache_instance']->removeCacheFile(); } // END - if - } elseif (getExtensionVersion($ext_name) != '') { + } elseif (isExtensionInstalled($ext_name)) { // Notify the admin that we have a problem here... loadTemplate('admin_settings_saved', false, getMessage('ADMIN_REG_FAILED_ALREADY')); } else { // Notify the admin that we have a problem here... - loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_REG_FAILED_404'), $ext_name)); + loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_REG_FAILED_404', $ext_name)); } } else { // Motify the admin that we have a problem here... @@ -370,11 +382,11 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__); // Extension was not found in task management loadTemplate('admin_settings_saved', false, getMessage('ADMIN_REG_FAILED_ID_404')); } - } elseif ($task_found == 0) { + } elseif ($task_found == '0') { // No longer assigned or old task loadTemplate('admin_settings_saved', false, getMessage('ADMIN_REG_FAILED_ASSIGED')); } else { - // ID is invalid + // id is invalid loadTemplate('admin_settings_saved', false, getMessage('ADMIN_REG_FAILED_INVALID')); } break; @@ -382,7 +394,7 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__); case 'demo': loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_NOT_SAVED')); break; -} +} // END - switch // [EOF] ?>