All resets rewritten, missing svn:properties added

[mailer.git] / inc / modules / admin / admin-inc.php

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 3a053f102646cada334612ff856588526a745621..9ac1fadacc115d2a1399a7575ed01ab1d444e174 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -253,7 +253,7 @@ ORDER BY
                $OUT .= '<ul class="admin_menu_main">';
                // @TODO Rewrite this to $content = SQL_FETCHARRAY()
                while (list($menu, $title, $descr) = SQL_FETCHROW($result_main)) {
-                       if ((isExtensionActive('admins')) && (getExtensionVersion('admins') > '0.2.0')) {
+                       if (isExtensionInstalledAndNewer('admins', '0.2.0')) {
                                $ACL = adminsCheckAdminAcl($menu, '');
                        } else {
                                // @TODO ACL is 'allow'... hmmm
@@ -325,7 +325,7 @@ ORDER BY
                                        // @TODO Rewrite this to $content = SQL_FETCHARRAY()
                                        while (list($what_sub, $title_what, $desc_what) = SQL_FETCHROW($result_what)) {
                                                // Check for access level
-                                               if ((isExtensionActive('admins')) && (getExtensionVersion('admins') > '0.2.0')) {
+                                               if (isExtensionInstalledAndNewer('admins', '0.2.0')) {
                                                        $ACL = adminsCheckAdminAcl('', $what_sub);
                                                } else {
                                                        // @TODO ACL is 'allow'... hmmm
@@ -861,7 +861,7 @@ function adminBuilderStatusHandler ($mode, $IDs, $table, $columns, $filterFuncti
                                        } // END - if
                                } elseif (isset($content[$column])) {
                                        // Unfinished!
-                                       app_die(__FUNCTION__, __LINE__, ":UNFINISHED: id={$id}/{$column}[".gettype($statusInfo)."] = {$content[$column]}");
+                                       debug_report_bug(__FUNCTION__, __LINE__, ":UNFINISHED: id={$id}/{$column}[".gettype($statusInfo)."] = {$content[$column]}");
                                }
                        } // END - foreach
 
@@ -1201,7 +1201,7 @@ function adminUpdateTaskData ($id, $row, $data) {
        // Is the id not set, then we need a backtrace here... :(
        if ($id <= 0) {
                // Initiate backtrace
-               debug_report_bug(sprintf("id is invalid: %s. row=%s, data=%s",
+               debug_report_bug(__FUNCTION__, __LINE__, sprintf("id is invalid: %s. row=%s, data=%s",
                        $id,
                        $row,
                        $data
@@ -1268,7 +1268,7 @@ function generateAdminLink ($adminId) {
                                $adminLink = '<a href="' . generateEmailLink(getAdminEmail($adminId), 'admins') . '" title="{--ADMIN_CONTACT_LINK_TITLE--}">' . $login . '</a>';
                        } else {
                                // Extension not found
-                               $adminLink = getMaskedMessage('EXTENSION_PROBLEM_NOT_INSTALLED', 'admins');
+                               $adminLink = getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', 'admins');
                        }
                } else {
                        // Maybe deleted?