maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Merge remote-tracking branch 'origin/0.9.31'

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2013-12-15 11:40:22 +01:00
parent b18afacedb b8f963cd29
commit 4667ccbe43
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
customer_tickets.php
View File

@@ -23,7 +23,7 @@ require './lib/init.php';
if (isset($_POST['id'])) { if (isset($_POST['id'])) {
$id = intval($_POST['id']); $id = intval($_POST['id']);
//Check if the current user is allowed to see the current ticket. //Check if the current user is allowed to see the current ticket.
$stmt = Database::prepare("SELECT `id` FROM `panel_tickets` WHERE `id` = :id AND `customerid` = :customerid"); $stmt = Database::prepare("SELECT `id` FROM `panel_tickets` WHERE `id` = :id AND `customerid` = :customerid");
$result = Database::pexecute_first($stmt, array("id" => $id, "customerid" => $userinfo['customerid'])); $result = Database::pexecute_first($stmt, array("id" => $id, "customerid" => $userinfo['customerid']));
@@ -44,15 +44,11 @@ if($page == 'overview') {
$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_tickets::tickets"); $log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_tickets::tickets");
$fields = array( $fields = array(
'status' => $lng['ticket']['status'], 'status' => $lng['ticket']['status'],
'priority' => $lng['ticket']['priority'],
'lastchange' => $lng['ticket']['lastchange'], 'lastchange' => $lng['ticket']['lastchange'],
'ticket_answers' => $lng['ticket']['ticket_answers'],
'subject' => $lng['ticket']['subject'], 'subject' => $lng['ticket']['subject'],
'lastreplier' => $lng['ticket']['lastreplier'] 'lastreplier' => $lng['ticket']['lastreplier']
); );
$paging = new paging($userinfo, TABLE_PANEL_TICKETS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']); $paging = new paging($userinfo, TABLE_PANEL_TICKETS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
$paging->sortfield = 'lastchange';
$paging->sortorder = 'desc';
$stmt = Database::prepare('SELECT `main`.`id`, (SELECT COUNT(`sub`.`id`) FROM `' . TABLE_PANEL_TICKETS . '` `sub` $stmt = Database::prepare('SELECT `main`.`id`, (SELECT COUNT(`sub`.`id`) FROM `' . TABLE_PANEL_TICKETS . '` `sub`
WHERE `sub`.`answerto` = `main`.`id`) AS `ticket_answers`, `main`.`lastchange`, `main`.`subject`, `main`.`status`, `main`.`lastreplier`, `main`.`priority` WHERE `sub`.`answerto` = `main`.`id`) AS `ticket_answers`, `main`.`lastchange`, `main`.`subject`, `main`.`status`, `main`.`lastreplier`, `main`.`priority`
FROM `' . TABLE_PANEL_TICKETS . '` as `main` FROM `' . TABLE_PANEL_TICKETS . '` as `main`
@@ -61,7 +57,7 @@ if($page == 'overview') {
AND `customerid`= :customerid ' . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit() AND `customerid`= :customerid ' . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit()
); );
Database::pexecute($stmt, array("customerid" => $userinfo['customerid'])); Database::pexecute($stmt, array("customerid" => $userinfo['customerid']));
$paging->setEntries(Database::num_rows()); $paging->setEntries(Database::num_rows());
$sortcode = $paging->getHtmlSortCode($lng); $sortcode = $paging->getHtmlSortCode($lng);
$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s); $arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
@@ -171,7 +167,7 @@ if($page == 'overview') {
$newticket->Set('by', '0', true, true); $newticket->Set('by', '0', true, true);
$newticket->Insert(); $newticket->Insert();
$log->logAction(USR_ACTION, LOG_NOTICE, "opened support-ticket '" . $newticket->Get('subject') . "'"); $log->logAction(USR_ACTION, LOG_NOTICE, "opened support-ticket '" . $newticket->Get('subject') . "'");
$stmt = Database::prepare('UPDATE `' . TABLE_PANEL_CUSTOMERS . '` $stmt = Database::prepare('UPDATE `' . TABLE_PANEL_CUSTOMERS . '`
SET `tickets_used`=`tickets_used` + 1 SET `tickets_used`=`tickets_used` + 1
WHERE `customerid`= :customerid' WHERE `customerid`= :customerid'
@@ -192,7 +188,7 @@ if($page == 'overview') {
ORDER BY `logicalorder`, `name` ASC' ORDER BY `logicalorder`, `name` ASC'
); );
$result = Database::pexecute_first($result_stmt, array("adminid" => $userinfo['adminid'])); $result = Database::pexecute_first($result_stmt, array("adminid" => $userinfo['adminid']));
if (isset($result['name']) && $result['name'] != '') { if (isset($result['name']) && $result['name'] != '') {
$result2_stmt = Database::prepare('SELECT `id`, `name` FROM `' . TABLE_PANEL_TICKET_CATS . '` $result2_stmt = Database::prepare('SELECT `id`, `name` FROM `' . TABLE_PANEL_TICKET_CATS . '`
WHERE `adminid` = :adminid WHERE `adminid` = :adminid
@@ -304,7 +300,7 @@ if($page == 'overview') {
WHERE `id`= :id ' WHERE `id`= :id '
); );
$row = Database::pexecute_first($result_stmt, array("id" => $mainticket->Get('category'))); $row = Database::pexecute_first($result_stmt, array("id" => $mainticket->Get('category')));
$andere_stmt = Database::prepare('SELECT * FROM `' . TABLE_PANEL_TICKETS . '` $andere_stmt = Database::prepare('SELECT * FROM `' . TABLE_PANEL_TICKETS . '`
WHERE `answerto`= :answerto WHERE `answerto`= :answerto
ORDER BY `lastchange` ASC' ORDER BY `lastchange` ASC'

4
templates/Froxlor/customer/tickets/tickets.tpl
View File

@@ -39,11 +39,11 @@ $header
<thead> <thead>
<tr> <tr>
<th>{$lng['ticket']['lastchange']}&nbsp;{$arrowcode['lastchange']}</th> <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']['subject']}&nbsp;{$arrowcode['subject']}</th>
<th>{$lng['ticket']['status']}&nbsp;{$arrowcode['status']}</th> <th>{$lng['ticket']['status']}&nbsp;{$arrowcode['status']}</th>
<th>{$lng['ticket']['lastreplier']}&nbsp;{$arrowcode['lastreplier']}</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> <th>{$lng['panel']['options']}</th>
</tr> </tr>
</thead> </thead>

4
templates/Sparkle/customer/tickets/tickets.tpl vendored
View File

@@ -39,11 +39,11 @@ $header
<thead> <thead>
<tr> <tr>
<th>{$lng['ticket']['lastchange']}&nbsp;{$arrowcode['lastchange']}</th> <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']['subject']}&nbsp;{$arrowcode['subject']}</th>
<th>{$lng['ticket']['status']}&nbsp;{$arrowcode['status']}</th> <th>{$lng['ticket']['status']}&nbsp;{$arrowcode['status']}</th>
<th>{$lng['ticket']['lastreplier']}&nbsp;{$arrowcode['lastreplier']}</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> <th>{$lng['panel']['options']}</th>
</tr> </tr>
</thead> </thead>