Merge remote-tracking branch 'origin/0.9.31'

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") . "\";");
 

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)
+	foreach ($configdirs as $data_dirname) {
-	{
+		if (is_dir($data_dirname)) {
-		if(is_dir($data_dirname))
-		{
 			$data_dirhandle = opendir($data_dirname);
-			while(false !== ($data_filename = readdir($data_dirhandle)))
+			while (false !== ($data_filename = readdir($data_dirhandle))) {
-			{
+				if ($data_filename != '.'
-				if($data_filename != '.' && $data_filename != '..' && $data_filename != '' && substr($data_filename, -4 ) == '.php')
+						&& $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
+	if ($selection != null
-		&& is_array($selection)
+			&& is_array($selection)
-		&& isset($selection[0])
+			&& isset($selection[0])
 	) {
 		$_data['groups'] = array();
-		foreach($data['groups'] as $group => $data)
+		foreach ($data['groups'] as $group => $data) {
-		{
+			if (in_array($group, $selection)) {
-			if(in_array($group, $selection)) {
+				$_data['groups'][$group] = $data;
-				$_data['groups'][$group] = $data;  
 			}
 		}
 		$data = $_data;

templates/Froxlor/admin/tickets/tickets.tpl

@@ -26,11 +26,11 @@ $header
 			<thead>
 				<tr>
 					<th>{$lng['ticket']['lastchange']}&nbsp;{$arrowcode['lastchange']}</th>
-					<th>{$lng['ticket']['ticket_answers']}&nbsp;{$arrowcode['ticket_answers']}</th>
+					<th>{$lng['ticket']['ticket_answers']}</th>
 					<th>{$lng['ticket']['subject']}&nbsp;{$arrowcode['subject']}</th>
 					<th>{$lng['ticket']['status']}&nbsp;{$arrowcode['status']}</th>
 					<th>{$lng['ticket']['lastreplier']}&nbsp;{$arrowcode['lastreplier']}</th>
-					<th>{$lng['ticket']['priority']}&nbsp;{$arrowcode['priority']}</th>
+					<th>{$lng['ticket']['priority']}</th>
 					<th>{$lng['panel']['options']}</th>
 				</tr>
 			</thead>

templates/Sparkle/admin/tickets/tickets.tpl

@@ -26,11 +26,11 @@ $header
 			<thead>
 				<tr>
 					<th>{$lng['ticket']['lastchange']}&nbsp;{$arrowcode['lastchange']}</th>
-					<th>{$lng['ticket']['ticket_answers']}&nbsp;{$arrowcode['ticket_answers']}</th>
+					<th>{$lng['ticket']['ticket_answers']}</th>
 					<th>{$lng['ticket']['subject']}&nbsp;{$arrowcode['subject']}</th>
 					<th>{$lng['ticket']['status']}&nbsp;{$arrowcode['status']}</th>
 					<th>{$lng['ticket']['lastreplier']}&nbsp;{$arrowcode['lastreplier']}</th>
-					<th>{$lng['ticket']['priority']}&nbsp;{$arrowcode['priority']}</th>
+					<th>{$lng['ticket']['priority']}</th>
 					<th>{$lng['panel']['options']}</th>
 				</tr>
 			</thead>