X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-extensions.php;h=5e129636a35d532524ab9beaf5bc2527737fdfb6;hp=0e130785efd3b65dea30979f9401d048c5420b39;hb=330dbb3e2b34450cd1665497506455e195a0a166;hpb=29157685184b9aa2ddbf42e9d2e49141af95f7e2 diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php index 0e130785ef..5e129636a3 100644 --- a/inc/modules/admin/what-extensions.php +++ b/inc/modules/admin/what-extensions.php @@ -14,11 +14,9 @@ * $Date:: $ * * $Tag:: 0.2.1-FINAL $ * * $Author:: $ * - * Needs to be in all Files and every File needs "svn propset * - * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * - * Copyright (c) 2009, 2010 by Mailer Developer Team * + * Copyright (c) 2009 - 2011 by Mailer Developer Team * * For more information visit: http://www.mxchange.org * * * * This program is free software; you can redistribute it and/or modify * @@ -43,7 +41,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { } // END - if // Add description as navigation point -addMenuDescription('admin', __FILE__); +addYouAreHereLink('admin', __FILE__); // Normally we want the overview of all registered extensions $do = 'overview'; @@ -60,7 +58,7 @@ if (isGetRequestParameterSet('reg_ext')) { // Shall we keep the extension always active? if ((isset($GLOBALS['cache_array']['always_active'][getExtensionName($ext_id)])) && ($GLOBALS['cache_array']['always_active'][getExtensionName($ext_id)] == 'Y') && ($ext_active == 'Y')) { // Keep this extension active! - loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_ALWAYS_ACTIVE', getExtensionName($ext_id))); + displayMessage('{%message,ADMIN_EXTENSION_ALWAYS_ACTIVE=' . $ext_id . '%}'); } else { // Deactivation is default $active = 'N'; @@ -116,7 +114,7 @@ if (isGetRequestParameterSet('reg_ext')) { switch ($active) { case 'Y': setExtensionMode('activate'); break; case 'N': setExtensionMode('deactivate'); break; - } // END - if + } // END - switch // Run embeded SQL commands doExtensionSqls($ext_id, getExtensionMode()); @@ -136,12 +134,12 @@ if (isGetRequestParameterSet('reg_ext')) { // Load required data 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", + $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); SQL_FREERESULT($result); } else { - $result = SQL_QUERY_ESC("SELECT ext_active FROM `{?_MYSQL_PREFIX?}_extensions` WHERE `id`=%s LIMIT 1", + $result = SQL_QUERY_ESC("SELECT `ext_active` FROM `{?_MYSQL_PREFIX?}_extensions` WHERE `id`=%s LIMIT 1", array(bigintval($ext_id)), __FILE__, __LINE__); list($active) = SQL_FETCHROW($result); SQL_FREERESULT($result); @@ -190,7 +188,7 @@ if (isGetRequestParameterSet('reg_ext')) { // Listing of SQLs enabled? if (isVerboseSqlEnabled()) { // Load SQL commands in remove mode - if (loadExtension($ext_name, 'remove', '', true)) { + if (loadExtension($ext_name, 'remove', '0.0.0', true)) { // Generate extra table with loaded SQL commands $VERBOSE_OUT = addExtensionVerboseSqlTable(); } // END - if @@ -200,7 +198,6 @@ if (isGetRequestParameterSet('reg_ext')) { $content = array( 'id' => $ext_id, 'ext_name' => $ext_name, - 'ext_ver' => getExtensionVersion($ext_name), 'verbose' => $VERBOSE_OUT ); @@ -220,7 +217,7 @@ if (isGetRequestParameterSet('reg_ext')) { // Load template loadTemplate('admin_extensions_delete', false, $OUT); $do = 'delete'; -} elseif ((isFormSent('remove')) && (ifPostContainsSelections()) && (!isDemoModeActive())) { +} elseif ((isFormSent('do_delete')) && (ifPostContainsSelections()) && (!isDemoModeActive())) { // Remove extensions from DB (you have to delete all files manually!) $cache_update = '0'; foreach (postRequestParameter('sel') as $ext_id => $active) { @@ -244,7 +241,7 @@ if (isGetRequestParameterSet('reg_ext')) { $do = 'demo'; } elseif (isGetRequestParameterSet('registered')) { // Extensions changed - loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_REGISTERED', getExtensionName(getRequestParameter('registered')))); + displayMessage('{%message,ADMIN_EXTENSION_REGISTERED=' . getExtensionName(getRequestParameter('registered')) . '%}'); // Show next link if (isExtensionActive('task')) { @@ -260,13 +257,13 @@ if (isGetRequestParameterSet('reg_ext')) { } } elseif (isGetRequestParameterSet('changed')) { // Extensions changed - loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_CHANGED', bigintval(getRequestParameter('changed')))); + displayMessage('{%message,ADMIN_EXTENSION_CHANGED=' . bigintval(getRequestParameter('changed')) . '%}'); } elseif (isGetRequestParameterSet('edited')) { // Extensions changed - loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_EDITED', bigintval(getRequestParameter('edited')))); + displayMessage('{%message,ADMIN_EXTENSION_EDITED=' . bigintval(getRequestParameter('edited')) . '%}'); } elseif (isGetRequestParameterSet('removed')) { // Extensions changed - loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSIONS_REMOVED', bigintval(getRequestParameter('removed')))); + displayMessage('{%message,ADMIN_EXTENSIONS_REMOVED=' . bigintval(getRequestParameter('removed')) . '%}'); } // Shall we display active/inactive extensions? @@ -281,7 +278,11 @@ switch ($do) { if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) { // Load extension data with CSS informations $result = SQL_QUERY("SELECT - `id` AS ext_id, `ext_name`, `ext_active`, `ext_has_css` AS ext_css, `ext_version` + `id` AS `ext_id`, + `ext_name`, + `ext_active`, + `ext_has_css` AS `ext_css`, + `ext_version` FROM `{?_MYSQL_PREFIX?}_extensions` ".$where." @@ -290,7 +291,10 @@ ORDER BY } else { // Load extension data without CSS informations $result = SQL_QUERY("SELECT - `id` AS ext_id, `ext_name`, `ext_active`, `ext_version` + `id` AS `ext_id`, + `ext_name`, + `ext_active`, + `ext_version` FROM `{?_MYSQL_PREFIX?}_extensions` ".$where." @@ -305,7 +309,9 @@ ORDER BY while ($content = SQL_FETCHARRAY($result)) { // Prepare CSS selection output $cssSelection = '---'; - if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) $cssSelection = translateYesNo($content['ext_css']); + if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) { + $cssSelection = '{%pipe,translateYesNo=' . $content['ext_css'] . '%}'; + } // END - if // Prepare data for the row template $content['ext_css'] = $cssSelection; @@ -321,20 +327,16 @@ ORDER BY loadTemplate('admin_extensions', false, $OUT); } else { // No extensions are registered - loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_EXTENSION_REGISTERED--}'); + displayMessage('{--ADMIN_NO_EXTENSION_REGISTERED--}'); } break; case 'register': // Register new extension - $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `assigned_admin`=%s AND `task_type`='EXTENSION' LIMIT 1", - array(getCurrentAdminId()), __FILE__, __LINE__); - $task_found = SQL_NUMROWS($result); - - // Free result - SQL_FREERESULT($result); + // Do we have some tasks? + $numTasks = countSumTotalData(getCurrentAdminId(), 'task_system', 'id', 'assigned_admin', true, "AND `task_type`='EXTENSION'"); // Is the id number valid and the task was found? - if (($taskId > 0) && ($task_found == 1)) { + if (($taskId > 0) && ($numTasks > 0)) { // 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($taskId)), __FILE__, __LINE__); @@ -362,7 +364,7 @@ ORDER BY redirectToUrl('modules.php?module=admin&what=extensions&registered=' . getExtensionId($ext_name)); } else { // Errors detected! - loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_NOT_REGISTERED', $ext_name)); + displayMessage('{%message,ADMIN_EXTENSION_NOT_REGISTERED=' . $ext_name . '%}'); } // Do we need to update cache file? @@ -376,30 +378,30 @@ ORDER BY } // END - if } elseif (isExtensionInstalled($ext_name)) { // Notify the admin that we have a problem here... - loadTemplate('admin_settings_saved', false, '{--ADMIN_EXTENSION_REGISTRATION_FAILED_ALREADY--}'); + displayMessage('{--ADMIN_EXTENSION_REGISTRATION_FAILED_ALREADY--}'); } else { // Notify the admin that we have a problem here... - loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_REGISTRATION_FAILED_404', $ext_name)); + displayMessage('{%message,ADMIN_EXTENSION_REGISTRATION_FAILED_404=' . $ext_name . '%}'); } } else { // Motify the admin that we have a problem here... - loadTemplate('admin_settings_saved', false, '{--ADMIN_EXTENSION_REGISTRATION_FAILED_DEPRECATED--}'); + displayMessage('{--ADMIN_EXTENSION_REGISTRATION_FAILED_DEPRECATED--}'); } } else { // Extension was not found in task management - loadTemplate('admin_settings_saved', false, '{--ADMIN_EXTENSION_REGISTRATION_FAILED_ID_404--}'); + displayMessage('{--ADMIN_EXTENSION_REGISTRATION_FAILED_ID_404--}'); } - } elseif ($task_found == '0') { + } elseif ($numTasks == '0') { // No longer assigned or old task - loadTemplate('admin_settings_saved', false, '{--ADMIN_EXTENSION_REGISTRATION_FAILED_ASSIGED--}'); + displayMessage('{--ADMIN_EXTENSION_REGISTRATION_FAILED_ASSIGED--}'); } else { // id is invalid - loadTemplate('admin_settings_saved', false, '{--ADMIN_EXTENSION_REGISTRATION_FAILED_INVALID--}'); + displayMessage('{--ADMIN_EXTENSION_REGISTRATION_FAILED_INVALID--}'); } break; case 'demo': - loadTemplate('admin_settings_saved', false, '{--SETTINGS_NOT_SAVED--}'); + displayMessage('{--SETTINGS_NOT_SAVED--}'); break; } // END - switch