diff --git a/admin/admin_main.php b/admin/admin_main.php index 8cc5088d..d80579b7 100644 --- a/admin/admin_main.php +++ b/admin/admin_main.php @@ -41,6 +41,7 @@ require(HESK_PATH . 'hesk_settings.inc.php'); require(HESK_PATH . 'inc/common.inc.php'); require(HESK_PATH . 'inc/admin_functions.inc.php'); require(HESK_PATH . 'inc/status_functions.inc.php'); +require(HESK_PATH . 'inc/mail_functions.inc.php'); hesk_load_database_functions(); hesk_session_start(); @@ -52,49 +53,52 @@ define('MAIN_PAGE', 1); define('PAGE_TITLE', 'ADMIN_HOME'); /* Print header */ -require_once(HESK_PATH . 'inc/headerAdmin.inc.php'); +require_once(HESK_PATH . 'inc/header_new_admin.inc.php'); +require_once(HESK_PATH . 'inc/new_admin_header_and_sidebar.inc.php'); + +/* Reset default settings? */ +if (isset($_GET['reset']) && hesk_token_check()) { + $res = hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` SET `default_list`='' WHERE `id` = '" . intval($_SESSION['id']) . "' LIMIT 1"); + $_SESSION['default_list'] = ''; +} /* Get default settings */ +else { + parse_str($_SESSION['default_list'], $defaults); + $_GET = isset($_GET) && is_array($_GET) ? array_merge($_GET, $defaults) : $defaults; +} -/* Print admin navigation */ -require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); ?> - -
-
- -
-

' . $hesklang['open_tickets'] . ' ' . $hesklang['nti'] . '

-
'; // The rest of the panel will be printed by print_tickets.inc.php +
+ +
+
+

+ +

+
+ +
+
+
+ '; + /* Print forms for listing and searching tickets */ + require(HESK_PATH . 'inc/show_search_form.inc.php'); + } else { + echo '

' . $hesklang['na_view_tickets'] . '

'; } - - /* Reset default settings? */ - if (isset($_GET['reset']) && hesk_token_check()) { - $res = hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` SET `default_list`='' WHERE `id` = '" . intval($_SESSION['id']) . "' LIMIT 1"); - $_SESSION['default_list'] = ''; - } /* Get default settings */ - else { - parse_str($_SESSION['default_list'], $defaults); - $_GET = isset($_GET) && is_array($_GET) ? array_merge($_GET, $defaults) : $defaults; - } - - /* Print the list of tickets */ - require(HESK_PATH . 'inc/print_tickets.inc.php'); - - echo " 
"; - - /* Print forms for listing and searching tickets */ - require(HESK_PATH . 'inc/show_search_form.inc.php'); - } else { - echo '

' . $hesklang['na_view_tickets'] . '

'; - } - - $hesk_settings['hesk_license']('HMgPSAxOw0KaWYgKGZpbGVfZXhpc3RzKEhFU0tfUEFUSCAuI + ?> +
+
+
+
+  
'; - - /* Clean unneeded session variables */ - hesk_cleanSessionVars('hide'); - ?> + /* Clean unneeded session variables */ + hesk_cleanSessionVars('hide'); + ?> +
-
+ diff --git a/admin/admin_new_main.php b/admin/admin_new_main.php deleted file mode 100644 index 09ac73db..00000000 --- a/admin/admin_new_main.php +++ /dev/null @@ -1,115 +0,0 @@ -install folder from your server for security reasons then refresh this page!'); -//} - -/* Get all the required files and functions */ -require(HESK_PATH . 'hesk_settings.inc.php'); -require(HESK_PATH . 'inc/common.inc.php'); -require(HESK_PATH . 'inc/admin_functions.inc.php'); -require(HESK_PATH . 'inc/status_functions.inc.php'); -require(HESK_PATH . 'inc/mail_functions.inc.php'); -hesk_load_database_functions(); - -hesk_session_start(); -hesk_dbConnect(); -hesk_isLoggedIn(); - -define('CALENDAR', 1); -define('MAIN_PAGE', 1); -define('PAGE_TITLE', 'ADMIN_HOME'); - -/* Print header */ -require_once(HESK_PATH . 'inc/header_new_admin.inc.php'); -require_once(HESK_PATH . 'inc/new_admin_header_and_sidebar.inc.php'); -require_once(HESK_PATH . 'hesk_settings.inc.php'); -require_once(HESK_PATH . 'inc/common.inc.php'); -require_once(HESK_PATH . 'inc/admin_functions.inc.php'); -require_once(HESK_PATH . 'inc/status_functions.inc.php'); -require_once(HESK_PATH . 'inc/ticket/get_tickets.inc.php'); - -$statuses = mfh_getAllStatuses(); -$search_filter = get_empty_filter(); -$search_filter['status'] = array(); -foreach ($statuses as $status) { - if (!$status['IsClosed']) { - $search_filter['status'][] = $status['ID']; - } -} -$search_filter['critical_on_top'] = true; - - -hesk_handle_messages(); -?> -
-
-
-

- -

-
- -
-
-
- -

- - - - - - - -
- -
-
- -
-
-
- - diff --git a/css/colors.css b/css/colors.css index 971fd4ed..98958082 100644 --- a/css/colors.css +++ b/css/colors.css @@ -1,3 +1,11 @@ .white { color: #fff; +} + +.red { + color: red; +} + +.green { + color: green; } \ No newline at end of file diff --git a/inc/ticket_list.inc.php b/inc/ticket_list.inc.php index ffce162c..7d67dd1d 100644 --- a/inc/ticket_list.inc.php +++ b/inc/ticket_list.inc.php @@ -58,7 +58,6 @@ $result = hesk_dbQuery($sql_count); $total = hesk_dbResult($result); //-- Precondition: The panel has already been created, and there is NO open
tag yet. -echo '
'; if ($total > 0) { /* This query string will be used to browse pages */ @@ -244,13 +243,13 @@ if ($total > 0) { $owner = ''; $first_line = '(' . $hesklang['unas'] . ')' . " \n\n"; if ($ticket['owner'] == $_SESSION['id']) { - $owner = ' '; + $owner = ' '; $first_line = $hesklang['tasy2'] . " \n\n"; } elseif ($ticket['owner']) { if (!isset($admins[$ticket['owner']])) { $admins[$ticket['owner']] = $hesklang['e_udel']; } - $owner = ' '; + $owner = ' '; $first_line = $hesklang['taso3'] . ' ' . $admins[$ticket['owner']] . " \n\n"; } @@ -422,11 +421,15 @@ if ($total > 0) { } // End while ?> -
- -  
+
+
+ + + + +