Rewrites/fixes for surfbar

[mailer.git] / inc / extensions-functions.php

diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php
index 2aab347cb82b7ead98fe349cccb3ad24b298706b..af6f615564a4c64766b55fc337f9023e12d8386b 100644 (file)
--- a/inc/extensions-functions.php
+++ b/inc/extensions-functions.php
@@ -738,9 +738,6 @@ function addExtensionVerboseSqlTable ($title = '', $dashed = '', $switch = false
 
        // Do we have queries?
        if ((isExtensionInstalledAndNewer('sql_patches', '0.0.7')) && (getConfig('verbose_sql') == 'Y')) {
-               // Init switch color
-               $SW = 2;
-
                // Get all SQLs
                foreach (getExtensionSqls() as $sqls) {
                        // New array format is recursive
@@ -752,16 +749,12 @@ function addExtensionVerboseSqlTable ($title = '', $dashed = '', $switch = false
                                if (!empty($sql)) {
                                        // Prepare output for template
                                        $content = array(
-                                               'sw'  => $SW,
                                                'i'   => ($idx+1),
                                                'sql' => $sql
                                        );
 
                                        // Load row template
                                        $OUT .= loadTemplate('admin_ext_sql_row', true, $content);
-
-                                       // Switch color
-                                       $SW = 3 - $SW;
                                } // END - if
                        } // END - foreach
                } // END - foreach
@@ -921,7 +914,7 @@ function doDeactivateExtension($ext_name) {
 
                // Notify the admin
                sendAdminNotification(
-                       getMessage('ADMIN_SUBJECT_EXTENSION_DEACTIVATED'),
+                       '{--ADMIN_EXTENSION_DEACTIVATED_SUBJECT--}',
                        'admin_ext_deactivated',
                        array('ext_name' => $ext_name)
                );
@@ -944,7 +937,7 @@ function isExtensionOlder ($ext_name, $ext_ver) {
 // Creates a new task for updated extension
 function createExtensionUpdateTask ($adminId, $ext_name, $ext_ver, $notes) {
        // Create subject line
-       $subject = '[UPDATE-' . $ext_name . '-' . $ext_ver . ':] {--ADMIN_UPDATE_EXTENSION_SUBJ--}';
+       $subject = '[UPDATE-' . $ext_name . '-' . $ext_ver . ':] {--ADMIN_UPDATE_EXTENSION_SUBJECT--}';
 
        // Get task id
        $taskId = determineTaskIdBySubject($subject);
@@ -1005,7 +998,7 @@ function createNewExtensionTask ($ext_name) {
 // Creates a task for automatically deactivated (deprecated) extension
 function createExtensionDeactivationTask ($ext_name) {
        // Create subject line
-       $subject = sprintf("[%s:] %s", $ext_name, '{--TASK_SUBJ_EXTENSION_DEACTIVATED--}');
+       $subject = sprintf("[%s:] %s", $ext_name, '{--ADMIN_TASK_EXTENSION_DEACTIVATED_SUBJECT--}');
 
        // Get task id
        $taskId = determineTaskIdBySubject($subject);