From 8dcade976dafc9caa0309226818add8c9705e9a2 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Fri, 5 Feb 2010 08:23:19 +0000 Subject: [PATCH] - fixing undefined variables in various files - removed unneeded require() in admin_aps.php, fixes #6 - design-correction in archivesearch.tpl --- admin_aps.php | 1 - admin_message.php | 6 ++--- admin_tickets.php | 1 + lib/classes/aps/class.ApsParser.php | 9 ++++++- templates/admin/admins/admins_admin.tpl | 2 +- templates/admin/domains/domains_domain.tpl | 2 +- templates/admin/ticket/archivesearch.tpl | 28 +++++++++++----------- 7 files changed, 28 insertions(+), 21 deletions(-) diff --git a/admin_aps.php b/admin_aps.php index dcdece3c..57fb4af2 100644 --- a/admin_aps.php +++ b/admin_aps.php @@ -21,7 +21,6 @@ define('AREA', 'admin'); require ("./lib/init.php"); -require ("./lib/class_apsparser.php"); $Id = 0; if(isset($_GET['id']))$Id = (int)$_GET['id']; diff --git a/admin_message.php b/admin_message.php index 91417d40..d0969a3e 100644 --- a/admin_message.php +++ b/admin_message.php @@ -47,7 +47,7 @@ if($page == 'message') && $userinfo['customers_see_all'] == '1') { $log->logAction(ADM_ACTION, LOG_NOTICE, "sending messages to admins"); - $result = $db->query('SELECT `firstname`, `name`, `email` FROM `' . TABLE_PANEL_ADMINS . "`"); + $result = $db->query('SELECT `name`, `email` FROM `' . TABLE_PANEL_ADMINS . "`"); } elseif($_POST['receipient'] == 1) { @@ -78,9 +78,9 @@ if($page == 'message') while($row = $db->fetch_array($result)) { - $mail->AddAddress($row['email'], $row['firstname'] . ' ' . $row['name']); + $mail->AddAddress($row['email'], (isset($row['firstname']) ? $row['firstname'] . ' ' : '') . $row['name']); $mail->From = $userinfo['email']; - $mail->FromName = $userinfo['firstname'] . ' ' . $userinfo['name']; + $mail->FromName = (isset($userinfo['firstname']) ? $userinfo['firstname'] . ' ' : '') . $userinfo['name']; if(!$mail->Send()) { diff --git a/admin_tickets.php b/admin_tickets.php index 711d2d77..4392ae8f 100644 --- a/admin_tickets.php +++ b/admin_tickets.php @@ -742,6 +742,7 @@ elseif($page == 'archive' $ticket_replies = ''; $mainticket = ticket::getInstanceOf($userinfo, $db, $settings, (int)$id); $lastchange = date("d.m.Y H:i\h", $mainticket->Get('lastchange')); + $dt = date("d.m.Y H:i\h", $mainticket->Get('dt')); $status = ticket::getStatusText($lng, $mainticket->Get('status')); $isclosed = 1; diff --git a/lib/classes/aps/class.ApsParser.php b/lib/classes/aps/class.ApsParser.php index 218d1bef..40811f32 100644 --- a/lib/classes/aps/class.ApsParser.php +++ b/lib/classes/aps/class.ApsParser.php @@ -1710,7 +1710,14 @@ class ApsParser return; } - $CustomerId = $this->userinfo['customerid']; + if(isset($this->userinfo['customerid'])) + { + $CustomerId = $this->userinfo['customerid']; + } + else + { + $CustomerId = -1; + } $AdminId = $this->userinfo['adminid']; $PackagesPerSite = $this->settings['aps']['items_per_page']; diff --git a/templates/admin/admins/admins_admin.tpl b/templates/admin/admins/admins_admin.tpl index 47c5f90e..ea3b0021 100644 --- a/templates/admin/admins/admins_admin.tpl +++ b/templates/admin/admins/admins_admin.tpl @@ -1,5 +1,5 @@ - {$row['loginname']}{$row['loginname']} + {$row['loginname']}{$row['loginname']} {$row['name']} {$row['customers_used']}/{$row['customers']}
{$row['domains_used']}/{$row['domains']} {$row['diskspace_used']}/{$row['diskspace']} (MB)
{$row['traffic_used']}/{$row['traffic']} (GB) diff --git a/templates/admin/domains/domains_domain.tpl b/templates/admin/domains/domains_domain.tpl index 447139f8..2da71bf3 100644 --- a/templates/admin/domains/domains_domain.tpl +++ b/templates/admin/domains/domains_domain.tpl @@ -1,5 +1,5 @@ - {$row['domain']} ({$lng['admin']['stdsubdomain']}) + {$row['domain']} ({$lng['admin']['stdsubdomain']}) {$row['ipandport']} {$row['customername']} ({$row['loginname']}) {$lng['panel']['edit']} diff --git a/templates/admin/ticket/archivesearch.tpl b/templates/admin/ticket/archivesearch.tpl index 605a9829..cff53d62 100644 --- a/templates/admin/ticket/archivesearch.tpl +++ b/templates/admin/ticket/archivesearch.tpl @@ -5,23 +5,23 @@ $header - + - - - - - - - - - - $tickets - - + + + + + + + + + + $tickets + + - +
 {$lng['ticket']['archivesearch']} {$lng['ticket']['archivesearch']}  
{$lng['ticket']['archivedtime']}{$lng['ticket']['ticket_answers']}{$lng['ticket']['subject']}{$lng['ticket']['lastreplier']}{$lng['ticket']['priority']} 
{$lng['ticket']['archivedtime']}{$lng['ticket']['ticket_answers']}{$lng['ticket']['subject']}{$lng['ticket']['lastreplier']}{$lng['ticket']['priority']} 
{$lng['ticket']['noresults']}{$lng['ticket']['noresults']}