X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=e6019df0cf0e0541dd52e81e44b6b2b4f0e55cb5;hb=896793e2aceee9b4db08bb304ec8fdc5f192ba18;hp=1b85cbead7f86951fc864885b97bacdd709d16ad;hpb=a443166d3f417109c905dc399ee7149ca4de6319;p=mailer.git diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php index 1b85cbead7..e6019df0cf 100644 --- a/inc/modules/admin/overview-inc.php +++ b/inc/modules/admin/overview-inc.php @@ -192,7 +192,7 @@ LIMIT 1", // Initialize variables (no title for SQL commands by default) $ext_name = ''; $ext_ver = ''; - $title = '{--TASK_NO_TITLE--}'; + $title = '{--ADMIN_TASK_NO_SQL_TITLE--}'; // Shall I list SQL commands assigned to an extension installation or update task? if ((isVerboseSqlEnabled()) || (!isExtensionInstalled('sql_patches'))) { @@ -245,7 +245,7 @@ LIMIT 1", // Add SQLs to a table if ((!empty($ext_name)) && (isVerboseSqlEnabled())) { // Add verbose SQL table - $taskData['text'] .= addExtensionVerboseSqlTable($title, ' class="admin_table top left right"', true, '100%') . "
\n"; + $taskData['text'] .= addExtensionVerboseSqlTable($title, ' class="admin_table top left right"', true, '100%') . '
'; } // END - if } elseif ((!empty($ext_name)) && (!empty($ext_ver))) { // Run SQL commands in dry mode but only return the notes @@ -278,18 +278,14 @@ LIMIT 1", switch ($taskData['task_type']) { case 'EXTENSION': // Install new extensions $ext_name = substr($taskData['subject'], 1, strpos($taskData['subject'], ':') - 1); - $result_lines = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_extensions` WHERE `ext_name`='%s' LIMIT 1", - array($ext_name), __FILE__, __LINE__); - $lines = SQL_NUMROWS($result_lines); - SQL_FREERESULT($result_lines); - if ($lines == '0') { - // New extension found + if (!isExtensionInstalled($ext_name)) { + // New (not yet installed) extension found $OUT .= loadTemplate('admin_extension_reg_form', true, array( 'id' => bigintval($taskId), 'ext_name' => $ext_name )); } else { - // Task is closed so nothing is todo + // Extension is already installed $OUT .= '
{--ADMIN_EXTENSION_ALREADY_REGISTERED--}
'; // Close task but not already closed, solved, deleted or update tasks