Advertising network Ad-Promotion.net added, some cleanups

[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 44bd7de7abc40dbc25acdc2edb2b98c9bfb4cb06..ae6191a043e05021fe8b47ddbc5d7d0f1266c32a 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -177,10 +177,10 @@ function doAdminAction () {
        // Load header, footer, render menu
        $content['header'] = loadTemplate('admin_header' , true, $content);
        $content['footer'] = loadTemplate('admin_footer' , true, $content);
-       $content['menu']   = addAdminMenu($action, $what, true);
+       $content['menu']   = addAdminMenu($action, $what);
 
-       // Tableset header
-       loadTemplate('admin_main_header', false, $content);
+       // Load main template
+       loadTemplate('admin_main', false, $content);
 
        // Check if action/what pair is valid
        $result_action = SQL_QUERY_ESC("SELECT
@@ -289,7 +289,7 @@ ORDER BY
                                        $GLOBALS['menu']['title'][$mainContent['main_action']]       = $mainContent['main_title'];
                                        $GLOBALS['menu']['description'][$mainContent['main_action']] = $mainContent['main_descr'];
                                } // END - if
-                               $OUT .= '<li class="admin_menu">
+                               $OUT .= '<li class="admin_menu"' . addJavaScriptMenuContent('admin', $mainContent['main_action'], $action, $what) . '>
 <div class="nobr"><strong>&middot;</strong>&nbsp;';
 
                                if ($readable === true) {
@@ -317,8 +317,29 @@ ORDER BY
                                $OUT .= '</div>
 </li>';
 
-                               // Check for menu entries
-                               $result_what = SQL_QUERY_ESC("SELECT
+                               // Add sub menu
+                               $OUT .= addAdminSubMenu($mainContent, $action, $what);
+                       } // END - if
+               } // END - while
+
+               // Close ul-tag
+               $OUT .= '</ul>';
+
+               // Free memory
+               SQL_FREERESULT($result_main);
+       } // END - if
+
+       // Return content
+       return $OUT;
+}
+
+// Add admin sub menu
+function addAdminSubMenu ($mainContent, $action, $what) {
+       // Init content
+       $OUT = '';
+
+       // Check for menu entries
+       $result_what = SQL_QUERY_ESC("SELECT
        `what` AS `sub_what`,
        `title` AS `sub_title`,
        `descr` AS `sub_descr`
@@ -331,76 +352,69 @@ WHERE
 ORDER BY
        `sort` ASC,
        `id` DESC",
-                                       array($mainContent['main_action']), __FUNCTION__, __LINE__);
-
-                               // Remember the count for later checks
-                               setAdminMenuHasEntries($mainContent['main_action'], ((!SQL_HASZERONUMS($result_what)) && ($action == $mainContent['main_action'])));
-
-                               // Start li-tag for sub menu content
-                               $OUT .= '<li class="admin_menu_sub" id="action_menu_' . $mainContent['main_action'] . '">';
-
-                               // Do we have entries?
-                               if (ifAdminMenuHasEntries($mainContent['main_action'])) {
-                                       // Sub menu has been called
-                                       $SUB = true;
-                                       $OUT .= '<ul class="admin_menu_sub">';
-
-                                       // Load all entries
-                                       while ($subContent = SQL_FETCHARRAY($result_what)) {
-                                               // Filename
-                                               $inc = sprintf("inc/modules/admin/what-%s.php", $subContent['sub_what']);
-
-                                               // Is the file readable?
-                                               $readable = isIncludeReadable($inc);
-
-                                               // Is the current admin allowed to access this 'what' menu?
-                                               if (isAdminAllowedAccessMenu(NULL, $subContent['sub_what'])) {
-                                                       // Insert compiled title and description
-                                                       $GLOBALS['menu']['title'][$subContent['sub_what']]       = $subContent['sub_title'];
-                                                       $GLOBALS['menu']['description'][$subContent['sub_what']] = $subContent['sub_descr'];
-                                                       $OUT .= '<li class="admin_menu">
+               array($mainContent['main_action']), __FUNCTION__, __LINE__);
+
+       // Remember the count for later checks
+       setAdminMenuHasEntries($mainContent['main_action'], ((!SQL_HASZERONUMS($result_what)) && (($action == $mainContent['main_action']) || (isAdminMenuJavascriptEnabled()))));
+
+       // Start li-tag for sub menu content
+       $OUT .= '<li class="admin_menu_sub" id="action_menu_' . $mainContent['main_action'] . '"' . addStyleMenuContent('admin', $mainContent['main_action'], $action) . '>';
+
+       // Do we have entries?
+       if (ifAdminMenuHasEntries($mainContent['main_action'])) {
+               // Sub menu has been called
+               $SUB = true;
+               $OUT .= '<ul class="admin_menu_sub">';
+
+               // Load all entries
+               while ($subContent = SQL_FETCHARRAY($result_what)) {
+                       // Filename
+                       $inc = sprintf("inc/modules/admin/what-%s.php", $subContent['sub_what']);
+
+                       // Is the file readable?
+                       $readable = isIncludeReadable($inc);
+
+                       // Is the current admin allowed to access this 'what' menu?
+                       if (isAdminAllowedAccessMenu(NULL, $subContent['sub_what'])) {
+                               // Insert compiled title and description
+                               $GLOBALS['menu']['title'][$subContent['sub_what']]       = $subContent['sub_title'];
+                               $GLOBALS['menu']['description'][$subContent['sub_what']] = $subContent['sub_descr'];
+                               $OUT .= '<li class="admin_menu">
 <div class="nobr"><strong>--&gt;</strong>&nbsp;';
-                                                       if ($readable === true) {
-                                                               if ($what == $subContent['sub_what']) {
-                                                                       $OUT .= '<strong>';
-                                                               } else {
-                                                                       $OUT .= '[<a href="{%url=modules.php?module=admin&amp;what=' . $subContent['sub_what'] . '%}">';
-                                                               }
-                                                       } else {
-                                                               $OUT .= '<span class="bad" style="cursor:help" title="{%message,ADMIN_MENU_WHAT_404_TITLE=' . $subContent['sub_what'] . '%}">';
-                                                       }
-
-                                                       $OUT .= $subContent['sub_title'];
-
-                                                       if ($readable === true) {
-                                                               if ($what == $subContent['sub_what']) {
-                                                                       $OUT .= '</strong>';
-                                                               } else {
-                                                                       $OUT .= '</a>]';
-                                                               }
-                                                       } else {
-                                                               $OUT .= '</span>';
-                                                       }
-                                                       $OUT .= '</div>
-</li>';
-                                               } // END - if
-                                       } // END - while
+                               if ($readable === true) {
+                                       if ($what == $subContent['sub_what']) {
+                                               $OUT .= '<strong>';
+                                       } else {
+                                               $OUT .= '[<a href="{%url=modules.php?module=admin&amp;what=' . $subContent['sub_what'] . '%}">';
+                                       }
+                               } else {
+                                       $OUT .= '<span class="bad" style="cursor:help" title="{%message,ADMIN_MENU_WHAT_404_TITLE=' . $subContent['sub_what'] . '%}">';
+                               }
 
-                                       // Free memory
-                                       SQL_FREERESULT($result_what);
-                                       $OUT .= '</ul>';
-                               } // END - if
+                               $OUT .= $subContent['sub_title'];
 
-                               // Close li-tag
-                               $OUT .= '</li>';
+                               if ($readable === true) {
+                                       if ($what == $subContent['sub_what']) {
+                                               $OUT .= '</strong>';
+                                       } else {
+                                               $OUT .= '</a>]';
+                                       }
+                               } else {
+                                       $OUT .= '</span>';
+                               }
+                               $OUT .= '</div>
+</li>';
                        } // END - if
                } // END - while
 
                // Free memory
-               SQL_FREERESULT($result_main);
+               SQL_FREERESULT($result_what);
                $OUT .= '</ul>';
        } // END - if
 
+       // Close li-tag
+       $OUT .= '</li>';
+
        // Return content
        return $OUT;
 }
@@ -418,7 +432,9 @@ function addAdminSelectionBox ($adminId = NULL, $special = '') {
 
        // Query all entries
        $result = SQL_QUERY('SELECT
-       `id`,`login`' . $ADD . '
+       `id`,
+       `login`
+       ' . $ADD . '
 FROM
        `{?_MYSQL_PREFIX?}_admins`
 ORDER BY
@@ -680,7 +696,7 @@ function generateUserProfileLink ($userid, $title = '', $what = 'list_user') {
                $title = $userid;
        } elseif (!isValidUserId($userid)) {
                // User id zero is invalid
-               return '<strong>' . makeNullToZero($userid) . '</strong>';
+               return '<strong>' . convertNullToZero($userid) . '</strong>';
        }
 
        if (($title == '0') && ($what == 'list_refs')) {
@@ -894,7 +910,7 @@ function adminListBuilder ($listType, $tableName, $columns, $filterFunctions, $e
                                if ($key == $userIdColumn[0]) {
                                        // Add it again as raw id
                                        //* DEBUG: */ debug_report_bug(__FUNCTION__, __LINE__, 'key=' . $key . ',userIdColumn=' . $userIdColumn[0]);
-                                       $content[$userIdColumn[0]] = makeZeroToNull($value);
+                                       $content[$userIdColumn[0]] = convertZeroToNull($value);
                                        $content[$userIdColumn[0] . '_raw'] = $content[$userIdColumn[0]];
                                } // END - if