diff --git a/admin_tickets.php b/admin_tickets.php
index d6f30f67..f38311cc 100644
--- a/admin_tickets.php
+++ b/admin_tickets.php
@@ -63,15 +63,11 @@ if ($page == 'tickets'
$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_tickets");
$fields = array(
'status' => $lng['ticket']['status'],
- 'priority' => $lng['ticket']['priority'],
'lastchange' => $lng['ticket']['lastchange'],
- 'ticket_answers' => $lng['ticket']['ticket_answers'],
'subject' => $lng['ticket']['subject'],
'lastreplier' => $lng['ticket']['lastreplier']
);
$paging = new paging($userinfo, TABLE_PANEL_TICKETS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
- $paging->sortfield = 'lastchange';
- $paging->sortorder = 'desc';
$result_stmt = Database::prepare("
SELECT `main`.`id`, `main`.`customerid`, (
SELECT COUNT(`sub`.`id`)
@@ -170,8 +166,8 @@ if ($page == 'tickets'
$count++;
$_cid = $row['customerid'];
}
+ $i++;
}
- $i++;
}
eval("echo \"" . getTemplate("tickets/tickets") . "\";");
diff --git a/lib/functions/froxlor/function.loadConfigArrayDir.php b/lib/functions/froxlor/function.loadConfigArrayDir.php
index e8c4d44c..2295ff33 100644
--- a/lib/functions/froxlor/function.loadConfigArrayDir.php
+++ b/lib/functions/froxlor/function.loadConfigArrayDir.php
@@ -17,8 +17,8 @@
*
*/
-function loadConfigArrayDir()
-{
+function loadConfigArrayDir() {
+
// Workaround until we use gettext
global $lng, $theme;
@@ -26,7 +26,9 @@ function loadConfigArrayDir()
// so we can read from more than one directory
// and still be valid for old calls
$numargs = func_num_args();
- if($numargs <= 0) { return null; }
+ if($numargs <= 0) {
+ return null;
+ }
// variable that holds all dirs that will
// be parsed for inclusion
@@ -48,28 +50,25 @@ function loadConfigArrayDir()
$data_files = array();
$has_data = false;
- foreach($configdirs as $data_dirname)
- {
- if(is_dir($data_dirname))
- {
+ foreach ($configdirs as $data_dirname) {
+ if (is_dir($data_dirname)) {
$data_dirhandle = opendir($data_dirname);
- while(false !== ($data_filename = readdir($data_dirhandle)))
- {
- if($data_filename != '.' && $data_filename != '..' && $data_filename != '' && substr($data_filename, -4 ) == '.php')
- {
+ while (false !== ($data_filename = readdir($data_dirhandle))) {
+ if ($data_filename != '.'
+ && $data_filename != '..'
+ && $data_filename != ''
+ && substr($data_filename, -4 ) == '.php'
+ ) {
$data_files[] = $data_dirname . $data_filename;
}
}
$has_data = true;
}
}
-
- if($has_data)
- {
- sort($data_files);
- foreach($data_files as $data_filename)
- {
+ if ($has_data) {
+ sort($data_files);
+ foreach ($data_files as $data_filename) {
$data = array_merge_recursive($data, include($data_filename));
}
}
@@ -78,15 +77,14 @@ function loadConfigArrayDir()
// to select, we'll handle this here
// (this is for multiserver-client settings)
$_data = array();
- if($selection != null
- && is_array($selection)
- && isset($selection[0])
+ if ($selection != null
+ && is_array($selection)
+ && isset($selection[0])
) {
$_data['groups'] = array();
- foreach($data['groups'] as $group => $data)
- {
- if(in_array($group, $selection)) {
- $_data['groups'][$group] = $data;
+ foreach ($data['groups'] as $group => $data) {
+ if (in_array($group, $selection)) {
+ $_data['groups'][$group] = $data;
}
}
$data = $_data;
diff --git a/templates/Froxlor/admin/tickets/tickets.tpl b/templates/Froxlor/admin/tickets/tickets.tpl
index 752c6708..14e80b49 100644
--- a/templates/Froxlor/admin/tickets/tickets.tpl
+++ b/templates/Froxlor/admin/tickets/tickets.tpl
@@ -26,11 +26,11 @@ $header
| {$lng['ticket']['lastchange']} {$arrowcode['lastchange']} |
- {$lng['ticket']['ticket_answers']} {$arrowcode['ticket_answers']} |
+ {$lng['ticket']['ticket_answers']} |
{$lng['ticket']['subject']} {$arrowcode['subject']} |
{$lng['ticket']['status']} {$arrowcode['status']} |
{$lng['ticket']['lastreplier']} {$arrowcode['lastreplier']} |
- {$lng['ticket']['priority']} {$arrowcode['priority']} |
+ {$lng['ticket']['priority']} |
{$lng['panel']['options']} |
diff --git a/templates/Sparkle/admin/tickets/tickets.tpl b/templates/Sparkle/admin/tickets/tickets.tpl
index 27f2f797..e71c1462 100644
--- a/templates/Sparkle/admin/tickets/tickets.tpl
+++ b/templates/Sparkle/admin/tickets/tickets.tpl
@@ -26,11 +26,11 @@ $header
| {$lng['ticket']['lastchange']} {$arrowcode['lastchange']} |
- {$lng['ticket']['ticket_answers']} {$arrowcode['ticket_answers']} |
+ {$lng['ticket']['ticket_answers']} |
{$lng['ticket']['subject']} {$arrowcode['subject']} |
{$lng['ticket']['status']} {$arrowcode['status']} |
{$lng['ticket']['lastreplier']} {$arrowcode['lastreplier']} |
- {$lng['ticket']['priority']} {$arrowcode['priority']} |
+ {$lng['ticket']['priority']} |
{$lng['panel']['options']} |