[otrs-cvs] CVS: otrs/Kernel/Modules AdminResponse.pm,1.17,1.18
AdminResponseAttachment.pm,1.14,1.15 AdminUser.pm,1.34,1.35
AgentCalendarSmall.pm,1.7,1.8 AgentPreferences.pm,1.31,1.32
AgentTicketAttachment.pm,1.4,1.5 AgentTicketCompose.pm,1.19,1.20
AgentTicketCustomer.pm,1.7,1.8 AgentTicketCustomerFollowUp.pm,1.7,1.8
AgentTicketMailbox.pm,1.12,1.13 AgentTicketMerge.pm,1.8,1.9
AgentTicketPhone.pm,1.25,1.26 AgentTicketQueue.pm,1.20,1.21
AgentZoom.pm,1.85,1.86 CustomerPreferences.pm,1.12,1.13
cvs-log at otrs.org
cvs-log at otrs.org
Thu Nov 2 13:20:54 CET 2006
Update of /home/cvs/otrs/Kernel/Modules
In directory lancelot:/tmp/cvs-serv11671/Kernel/Modules
Modified Files:
AdminResponse.pm AdminResponseAttachment.pm AdminUser.pm
AgentCalendarSmall.pm AgentPreferences.pm
AgentTicketAttachment.pm AgentTicketCompose.pm
AgentTicketCustomer.pm AgentTicketCustomerFollowUp.pm
AgentTicketMailbox.pm AgentTicketMerge.pm AgentTicketPhone.pm
AgentTicketQueue.pm AgentZoom.pm CustomerPreferences.pm
Log Message:
removed # --
Index: AdminResponse.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AdminResponse.pm,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** AdminResponse.pm 29 Aug 2006 17:17:24 -0000 1.17
--- AdminResponse.pm 2 Nov 2006 12:20:51 -0000 1.18
***************
*** 20,24 ****
$VERSION =~ s/^\$.*:\W(.*)\W.+?$/$1/;
- # --
sub new {
my $Type = shift;
--- 20,23 ----
***************
*** 47,51 ****
return $Self;
}
! # --
sub Run {
my $Self = shift;
--- 46,50 ----
return $Self;
}
!
sub Run {
my $Self = shift;
***************
*** 88,94 ****
elsif ($Param{Subaction} eq 'ChangeAction') {
if ($Self->{StdResponseObject}->StdResponseUpdate(%GetParam, UserID => $Self->{UserID})) {
- # --
# update attachments to response
- # --
my @NewIDs = $Self->{ParamObject}->GetArray(Param => 'IDs');
$Self->{StdAttachmentObject}->SetStdAttachmentsOfResponseID(
--- 87,91 ----
***************
*** 106,112 ****
elsif ($Param{Subaction} eq 'AddAction') {
if (my $Id = $Self->{StdResponseObject}->StdResponseAdd(%GetParam, UserID => $Self->{UserID})) {
- # --
# add attachments to response
- # --
my @NewIDs = $Self->{ParamObject}->GetArray(Param => 'IDs');
$Self->{StdAttachmentObject}->SetStdAttachmentsOfResponseID(
--- 103,107 ----
***************
*** 115,121 ****
UserID => $Self->{UserID},
);
- # --
# show next page
- # --
return $Self->{LayoutObject}->Redirect(
OP => "Action=AdminQueueResponses&Subaction=Response&ID=$Id",
--- 110,114 ----
***************
*** 149,153 ****
}
}
! # --
sub _Mask {
my $Self = shift;
--- 142,146 ----
}
}
!
sub _Mask {
my $Self = shift;
***************
*** 198,201 ****
return $Self->{LayoutObject}->Output(TemplateFile => 'AdminResponseForm', Data => \%Param);
}
! # --
1;
--- 191,194 ----
return $Self->{LayoutObject}->Output(TemplateFile => 'AdminResponseForm', Data => \%Param);
}
!
1;
Index: AdminResponseAttachment.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AdminResponseAttachment.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** AdminResponseAttachment.pm 31 Oct 2006 15:26:52 -0000 1.14
--- AdminResponseAttachment.pm 2 Nov 2006 12:20:51 -0000 1.15
***************
*** 20,24 ****
$VERSION =~ s/^\$.*:\W(.*)\W.+?$/$1/;
- # --
sub new {
my $Type = shift;
--- 20,23 ----
***************
*** 47,51 ****
return $Self;
}
! # --
sub Run {
my $Self = shift;
--- 46,50 ----
return $Self;
}
!
sub Run {
my $Self = shift;
***************
*** 109,115 ****
$Output .= $Self->{LayoutObject}->Footer();
}
! # --
# update responses of attachment
- # --
elsif ($Self->{Subaction} eq 'ChangeAttachment') {
my @NewIDs = $Self->{ParamObject}->GetArray(Param => 'IDs');
--- 108,113 ----
$Output .= $Self->{LayoutObject}->Footer();
}
!
# update responses of attachment
elsif ($Self->{Subaction} eq 'ChangeAttachment') {
my @NewIDs = $Self->{ParamObject}->GetArray(Param => 'IDs');
***************
*** 129,135 ****
$Output .= $Self->{LayoutObject}->Redirect(OP => "Action=$NextScreen");
}
! # --
# update attachments of response
- # --
elsif ($Self->{Subaction} eq 'ChangeResponse') {
my @NewIDs = $Self->{ParamObject}->GetArray(Param => 'IDs');
--- 127,132 ----
$Output .= $Self->{LayoutObject}->Redirect(OP => "Action=$NextScreen");
}
!
# update attachments of response
elsif ($Self->{Subaction} eq 'ChangeResponse') {
my @NewIDs = $Self->{ParamObject}->GetArray(Param => 'IDs');
***************
*** 154,158 ****
return $Output;
}
! # --
sub _Mask {
my $Self = shift;
--- 151,155 ----
return $Output;
}
!
sub _Mask {
my $Self = shift;
***************
*** 183,187 ****
return $Self->{LayoutObject}->Output(TemplateFile => 'AdminResponseAttachmentForm', Data => \%Param);
}
! # --
sub _MaskChange {
my $Self = shift;
--- 180,184 ----
return $Self->{LayoutObject}->Output(TemplateFile => 'AdminResponseAttachmentForm', Data => \%Param);
}
!
sub _MaskChange {
my $Self = shift;
***************
*** 226,229 ****
return $Self->{LayoutObject}->Output(TemplateFile => 'AdminResponseAttachmentChangeForm', Data => \%Param);
}
! # --
1;
--- 223,226 ----
return $Self->{LayoutObject}->Output(TemplateFile => 'AdminResponseAttachmentChangeForm', Data => \%Param);
}
!
1;
Index: AdminUser.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AdminUser.pm,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** AdminUser.pm 9 Oct 2006 17:38:03 -0000 1.34
--- AdminUser.pm 2 Nov 2006 12:20:51 -0000 1.35
***************
*** 45,51 ****
my %Param = @_;
$Param{NextScreen} = 'AdminUser';
! # --
# get user data 2 form
- # --
if ($Self->{ConfigObject}->Get('SwitchToUser') && $Self->{ParamObject}->GetParam(Param => 'Switch')) {
my $UserID = $Self->{ParamObject}->GetParam(Param => 'ID') || '';
--- 45,50 ----
my %Param = @_;
$Param{NextScreen} = 'AdminUser';
!
# get user data 2 form
if ($Self->{ConfigObject}->Get('SwitchToUser') && $Self->{ParamObject}->GetParam(Param => 'Switch')) {
my $UserID = $Self->{ParamObject}->GetParam(Param => 'ID') || '';
***************
*** 106,112 ****
return $Output;
}
! # --
# update action
- # --
elsif ($Self->{Subaction} eq 'ChangeAction') {
# get params
--- 105,110 ----
return $Output;
}
!
# update action
elsif ($Self->{Subaction} eq 'ChangeAction') {
# get params
***************
*** 178,184 ****
}
}
! # --
# add new user
! # --
elsif ($Self->{Subaction} eq 'AddAction') {
# get params
--- 176,182 ----
}
}
!
# add new user
!
elsif ($Self->{Subaction} eq 'AddAction') {
# get params
***************
*** 244,250 ****
}
}
! # --
# else ! print form
- # --
else {
my $Output = $Self->{LayoutObject}->Header();
--- 242,247 ----
}
}
!
# else ! print form
else {
my $Output = $Self->{LayoutObject}->Header();
Index: AgentCalendarSmall.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AgentCalendarSmall.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** AgentCalendarSmall.pm 29 Aug 2006 17:17:24 -0000 1.7
--- AgentCalendarSmall.pm 2 Nov 2006 12:20:51 -0000 1.8
***************
*** 20,24 ****
$VERSION =~ s/^\$.*:\W(.*)\W.+?$/$1/;
- # --
sub new {
my $Type = shift;
--- 20,23 ----
***************
*** 43,47 ****
return $Self;
}
! # --
sub Run {
my $Self = shift;
--- 42,46 ----
return $Self;
}
!
sub Run {
my $Self = shift;
***************
*** 155,161 ****
}
}
- # --
# start with page ...
- # --
$Output .= $Self->{LayoutObject}->Header(Type => 'Small');
$Output .= $Self->{LayoutObject}->Output(
--- 154,158 ----
Index: AgentPreferences.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AgentPreferences.pm,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** AgentPreferences.pm 29 Aug 2006 17:17:24 -0000 1.31
--- AgentPreferences.pm 2 Nov 2006 12:20:51 -0000 1.32
***************
*** 18,22 ****
$VERSION =~ s/^\$.*:\W(.*)\W.+?$/$1/;
- # --
sub new {
my $Type = shift;
--- 18,21 ----
***************
*** 41,45 ****
return $Self;
}
! # --
sub Run {
my $Self = shift;
--- 40,44 ----
return $Self;
}
!
sub Run {
my $Self = shift;
***************
*** 116,120 ****
}
}
! # --
sub AgentPreferencesForm {
my $Self = shift;
--- 115,119 ----
}
}
!
sub AgentPreferencesForm {
my $Self = shift;
Index: AgentTicketAttachment.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AgentTicketAttachment.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** AgentTicketAttachment.pm 29 Aug 2006 17:17:24 -0000 1.4
--- AgentTicketAttachment.pm 2 Nov 2006 12:20:51 -0000 1.5
***************
*** 19,23 ****
$VERSION =~ s/^\$.*:\W(.*)\W.+?$/$1/;
- # --
sub new {
my $Type = shift;
--- 19,22 ----
***************
*** 48,59 ****
return $Self;
}
! # --
sub Run {
my $Self = shift;
my %Param = @_;
my $Output = '';
! # --
# check params
- # --
if (!$Self->{FileID} || !$Self->{ArticleID}) {
$Self->{LogObject}->Log(
--- 47,57 ----
return $Self;
}
!
sub Run {
my $Self = shift;
my %Param = @_;
my $Output = '';
!
# check params
if (!$Self->{FileID} || !$Self->{ArticleID}) {
$Self->{LogObject}->Log(
***************
*** 63,69 ****
return $Self->{LayoutObject}->ErrorScreen();
}
! # --
# check permissions
- # --
my %ArticleData = $Self->{TicketObject}->ArticleGet(ArticleID => $Self->{ArticleID});
if (!$ArticleData{TicketID}) {
--- 61,66 ----
return $Self->{LayoutObject}->ErrorScreen();
}
!
# check permissions
my %ArticleData = $Self->{TicketObject}->ArticleGet(ArticleID => $Self->{ArticleID});
if (!$ArticleData{TicketID}) {
***************
*** 144,148 ****
}
}
- # --
-
1;
--- 141,143 ----
Index: AgentTicketCompose.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AgentTicketCompose.pm,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** AgentTicketCompose.pm 29 Sep 2006 16:33:47 -0000 1.19
--- AgentTicketCompose.pm 2 Nov 2006 12:20:52 -0000 1.20
***************
*** 269,275 ****
}
}
! # --
# check if there is an error
- # --
if (%Error) {
# get free text config options
--- 269,274 ----
}
}
!
# check if there is an error
if (%Error) {
# get free text config options
***************
*** 506,512 ****
$Data{ReplyTo} = '';
}
! # --
# get customer data
- # --
my %Customer = ();
if ($Ticket{CustomerUserID}) {
--- 505,510 ----
$Data{ReplyTo} = '';
}
!
# get customer data
my %Customer = ();
if ($Ticket{CustomerUserID}) {
***************
*** 515,521 ****
);
}
! # --
# check if original content isn't text/plain or text/html, don't use it
- # --
if ($Data{'ContentType'}) {
if($Data{'ContentType'} =~ /text\/html/i) {
--- 513,518 ----
);
}
!
# check if original content isn't text/plain or text/html, don't use it
if ($Data{'ContentType'}) {
if($Data{'ContentType'} =~ /text\/html/i) {
***************
*** 526,532 ****
}
}
! # --
# prepare body, subject, ReplyTo ...
- # --
# rewrap body if exists
if ($Data{Body}) {
--- 523,528 ----
}
}
!
# prepare body, subject, ReplyTo ...
# rewrap body if exists
if ($Data{Body}) {
***************
*** 598,602 ****
$Data{StdResponse} = $Self->{QueueObject}->GetStdResponse(ID => $GetParam{ResponseID});
- # --
# prepare salutation & signature
$Data{Salutation} = $Self->{QueueObject}->GetSalutation(%Ticket);
--- 594,597 ----
***************
*** 650,656 ****
$Data{$_} =~ s{<OTRS_CONFIG_(.+?)>}{$Self->{ConfigObject}->Get($1)}egx;
}
! # --
# check some values
- # --
foreach (qw(From To Cc Bcc)) {
if ($Data{$_}) {
--- 645,650 ----
$Data{$_} =~ s{<OTRS_CONFIG_(.+?)>}{$Self->{ConfigObject}->Get($1)}egx;
}
!
# check some values
foreach (qw(From To Cc Bcc)) {
if ($Data{$_}) {
Index: AgentTicketCustomer.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AgentTicketCustomer.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** AgentTicketCustomer.pm 27 Sep 2006 17:09:02 -0000 1.7
--- AgentTicketCustomer.pm 2 Nov 2006 12:20:52 -0000 1.8
***************
*** 19,23 ****
$VERSION =~ s/^\$.*:\W(.*)\W.+?$/$1/;
- # --
sub new {
my $Type = shift;
--- 19,22 ----
***************
*** 47,51 ****
return $Self;
}
! # --
sub Run {
my $Self = shift;
--- 46,50 ----
return $Self;
}
!
sub Run {
my $Self = shift;
***************
*** 140,144 ****
}
}
! # --
sub Form {
my $Self = shift;
--- 139,143 ----
}
}
!
sub Form {
my $Self = shift;
***************
*** 149,155 ****
$Output .= $Self->{LayoutObject}->NavigationBar();
my $TicketCustomerID = $Self->{CustomerID};
! # --
# print change form if ticket id is given
- # --
my %CustomerUserData = ();
if ($Self->{TicketID}) {
--- 148,153 ----
$Output .= $Self->{LayoutObject}->NavigationBar();
my $TicketCustomerID = $Self->{CustomerID};
!
# print change form if ticket id is given
my %CustomerUserData = ();
if ($Self->{TicketID}) {
***************
*** 185,191 ****
}
}
! # --
# get ticket ids with customer id
- # --
my @TicketIDs = ();
if ($CustomerUserData{UserID}) {
--- 183,188 ----
}
}
!
# get ticket ids with customer id
my @TicketIDs = ();
if ($CustomerUserData{UserID}) {
***************
*** 284,287 ****
return $Output;
}
! # --
1;
--- 281,284 ----
return $Output;
}
!
1;
Index: AgentTicketCustomerFollowUp.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AgentTicketCustomerFollowUp.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** AgentTicketCustomerFollowUp.pm 26 Oct 2006 11:18:09 -0000 1.7
--- AgentTicketCustomerFollowUp.pm 2 Nov 2006 12:20:52 -0000 1.8
***************
*** 54,60 ****
if ($Self->{Subaction} eq '' || !$Self->{Subaction}) {
! # --
# if there is no ticket id!
- # --
if (!$Self->{TicketID}) {
return $Self->{LayoutObject}->ErrorScreen(
--- 54,59 ----
if ($Self->{Subaction} eq '' || !$Self->{Subaction}) {
!
# if there is no ticket id!
if (!$Self->{TicketID}) {
return $Self->{LayoutObject}->ErrorScreen(
Index: AgentTicketMailbox.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AgentTicketMailbox.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** AgentTicketMailbox.pm 29 Aug 2006 17:17:24 -0000 1.12
--- AgentTicketMailbox.pm 2 Nov 2006 12:20:52 -0000 1.13
***************
*** 19,23 ****
$VERSION =~ s/^\$.*:\W(.*)\W.+?$/$1/;
- # --
sub new {
my $Type = shift;
--- 19,22 ----
***************
*** 46,53 ****
$Self->{PageShown} = $Self->{UserShowTickets} || $Self->{ConfigObject}->Get('PreferencesGroups')->{QueueViewShownTickets}->{DataSelected} || 10;
-
return $Self;
}
! # --
sub Run {
my $Self = shift;
--- 45,51 ----
$Self->{PageShown} = $Self->{UserShowTickets} || $Self->{ConfigObject}->Get('PreferencesGroups')->{QueueViewShownTickets}->{DataSelected} || 10;
return $Self;
}
!
sub Run {
my $Self = shift;
***************
*** 72,78 ****
);
- # --
# starting with page ...
- # --
my $Refresh = '';
if ($Self->{UserRefreshTime}) {
--- 70,74 ----
***************
*** 84,90 ****
$Output .= $Self->{LayoutObject}->NavigationBar();
my %LockedData = $Self->{TicketObject}->GetLockedCount(UserID => $Self->{UserID});
! # --
# get locked viewable tickets...
- # --
my @ViewableTickets = ();
my $SortByS = $SortBy;
--- 80,85 ----
$Output .= $Self->{LayoutObject}->NavigationBar();
my %LockedData = $Self->{TicketObject}->GetLockedCount(UserID => $Self->{UserID});
!
# get locked viewable tickets...
my @ViewableTickets = ();
my $SortByS = $SortBy;
***************
*** 160,166 ****
foreach my $TicketID (@ViewableTicketsTmp) {
my $Message = '';
! # --
# put all tickets to ToDo where last sender type is customer / system or ! UserID
- # --
# show just unseen tickets as new
if ($Self->{ConfigObject}->Get('Ticket::NewMessageMode') eq 'ArticleSeen') {
--- 155,160 ----
foreach my $TicketID (@ViewableTicketsTmp) {
my $Message = '';
!
# put all tickets to ToDo where last sender type is customer / system or ! UserID
# show just unseen tickets as new
if ($Self->{ConfigObject}->Get('Ticket::NewMessageMode') eq 'ArticleSeen') {
***************
*** 229,235 ****
);
}
! # --
# get article data
- # --
my $Counter = 0;
my $CounterShown = 0;
--- 223,228 ----
);
}
!
# get article data
my $Counter = 0;
my $CounterShown = 0;
***************
*** 257,263 ****
my $Message = '';
! # --
# put all tickets to ToDo where last sender type is customer / system or ! UserID
! # --
# show just unseen tickets as new
if ($Self->{ConfigObject}->Get('Ticket::NewMessageMode') eq 'ArticleSeen') {
--- 250,257 ----
my $Message = '';
! # -------------------------------------------
# put all tickets to ToDo where last sender type is customer / system or ! UserID
! # -------------------------------------------
!
# show just unseen tickets as new
if ($Self->{ConfigObject}->Get('Ticket::NewMessageMode') eq 'ArticleSeen') {
***************
*** 317,321 ****
return $Output;
}
! # --
sub MaskMailboxTicket {
my $Self = shift;
--- 311,315 ----
return $Output;
}
!
sub MaskMailboxTicket {
my $Self = shift;
***************
*** 399,403 ****
}
}
- # --
1;
-
--- 393,395 ----
Index: AgentTicketMerge.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AgentTicketMerge.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** AgentTicketMerge.pm 29 Aug 2006 17:17:24 -0000 1.8
--- AgentTicketMerge.pm 2 Nov 2006 12:20:52 -0000 1.9
***************
*** 19,23 ****
$VERSION =~ s/^\$.*:\W(.*)\W.+?$/$1/;
- # --
sub new {
my $Type = shift;
--- 19,22 ----
***************
*** 44,48 ****
return $Self;
}
! # --
sub Run {
my $Self = shift;
--- 43,47 ----
return $Self;
}
!
sub Run {
my $Self = shift;
***************
*** 174,178 ****
}
# send customer info?
! if ($Param{InformSender}) {
my %Ticket = $Self->{TicketObject}->TicketGet(TicketID => $Self->{TicketID});
$Param{Body} =~ s/<OTRS_TICKET>/$Ticket{TicketNumber}/g;
--- 173,177 ----
}
# send customer info?
! if (!$Param{InformSender}) {
my %Ticket = $Self->{TicketObject}->TicketGet(TicketID => $Self->{TicketID});
$Param{Body} =~ s/<OTRS_TICKET>/$Ticket{TicketNumber}/g;
***************
*** 193,199 ****
Charset => $Self->{LayoutObject}->{UserCharset},
)) {
- ###
- }
- else {
# error page
return $Self->{LayoutObject}->ErrorScreen();
--- 192,195 ----
***************
*** 288,291 ****
}
}
! # --
1;
--- 284,287 ----
}
}
!
1;
Index: AgentTicketPhone.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AgentTicketPhone.pm,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** AgentTicketPhone.pm 27 Oct 2006 11:14:33 -0000 1.25
--- AgentTicketPhone.pm 2 Nov 2006 12:20:52 -0000 1.26
***************
*** 114,120 ****
);
}
! # --
# get split article if given
! # --
# get ArticleID
my %Article = ();
--- 114,120 ----
);
}
!
# get split article if given
!
# get ArticleID
my %Article = ();
***************
*** 441,447 ****
$Error{NoSubmit} = 1;
}
! # --
# show customer info
- # --
my %CustomerData = ();
if ($Self->{ConfigObject}->Get('Ticket::Frontend::CustomerInfoCompose')) {
--- 441,446 ----
$Error{NoSubmit} = 1;
}
!
# show customer info
my %CustomerData = ();
if ($Self->{ConfigObject}->Get('Ticket::Frontend::CustomerInfoCompose')) {
***************
*** 457,463 ****
}
}
! # --
# check some values
- # --
foreach my $Email (Mail::Address->parse($GetParam{From})) {
if (!$Self->{CheckItemObject}->CheckEmail(Address => $Email->address())) {
--- 456,461 ----
}
}
!
# check some values
foreach my $Email (Mail::Address->parse($GetParam{From})) {
if (!$Self->{CheckItemObject}->CheckEmail(Address => $Email->address())) {
***************
*** 475,486 ****
}
if (%Error) {
! # --
# header
- # --
my $Output = $Self->{LayoutObject}->Header();
$Output .= $Self->{LayoutObject}->NavigationBar();
! # --
# html output
- # --
$Output .= $Self->_MaskPhoneNew(
QueueID => $Self->{QueueID},
--- 473,482 ----
}
if (%Error) {
!
# header
my $Output = $Self->{LayoutObject}->Header();
$Output .= $Self->{LayoutObject}->NavigationBar();
!
# html output
$Output .= $Self->_MaskPhoneNew(
QueueID => $Self->{QueueID},
Index: AgentTicketQueue.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AgentTicketQueue.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** AgentTicketQueue.pm 29 Sep 2006 13:06:25 -0000 1.20
--- AgentTicketQueue.pm 2 Nov 2006 12:20:52 -0000 1.21
***************
*** 21,25 ****
$VERSION =~ s/^\$.*:\W(.*)\W.+?$/$1/;
- # --
sub new {
my $Type = shift;
--- 21,24 ----
***************
*** 40,53 ****
}
}
! # --
# some new objects
- # --
$Self->{CustomerUserObject} = Kernel::System::CustomerUser->new(%Param);
$Self->{StateObject} = Kernel::System::State->new(%Param);
$Self->{LockObject} = Kernel::System::Lock->new(%Param);
- # --
# get config data
- # --
$Self->{ViewableSenderTypes} = $Self->{ConfigObject}->Get('Ticket::ViewableSenderTypes')
|| die 'No Config entry "Ticket::ViewableSenderTypes"!';
--- 39,49 ----
}
}
!
# some new objects
$Self->{CustomerUserObject} = Kernel::System::CustomerUser->new(%Param);
$Self->{StateObject} = Kernel::System::State->new(%Param);
$Self->{LockObject} = Kernel::System::Lock->new(%Param);
# get config data
$Self->{ViewableSenderTypes} = $Self->{ConfigObject}->Get('Ticket::ViewableSenderTypes')
|| die 'No Config entry "Ticket::ViewableSenderTypes"!';
***************
*** 57,63 ****
$Self->{ConfigObject}->Get('PreferencesGroups')->{QueueViewShownTickets}->{DataSelected} || 15;
- # --
# get params
- # --
$Self->{ViewAll} = $Self->{ParamObject}->GetParam(Param => 'ViewAll') || 0;
$Self->{Start} = $Self->{ParamObject}->GetParam(Param => 'Start') || 1;
--- 53,57 ----
***************
*** 69,75 ****
$Self->{Limit} = $Self->{MaxLimit};
}
! # --
# all static variables
- # --
my @ViewableStateIDs = $Self->{StateObject}->StateGetStatesByType(
Type => 'Viewable',
--- 63,68 ----
$Self->{Limit} = $Self->{MaxLimit};
}
!
# all static variables
my @ViewableStateIDs = $Self->{StateObject}->StateGetStatesByType(
Type => 'Viewable',
***************
*** 113,119 ****
# to get the output faster!
print $Output; $Output = '';
! # --
# check old tickets, show it and return if needed
- # --
my $NoEscalationGroup = $Self->{ConfigObject}->Get('Ticket::Frontend::NoEscalationGroup') || '';
if ($Self->{UserID} eq '1' ||
--- 106,111 ----
# to get the output faster!
print $Output; $Output = '';
!
# check old tickets, show it and return if needed
my $NoEscalationGroup = $Self->{ConfigObject}->Get('Ticket::Frontend::NoEscalationGroup') || '';
if ($Self->{UserID} eq '1' ||
***************
*** 143,149 ****
}
}
! # --
# build queue view ...
- # --
my @ViewableQueueIDs = ();
if ($Self->{QueueID} == 0) {
--- 135,140 ----
}
}
!
# build queue view ...
my @ViewableQueueIDs = ();
if ($Self->{QueueID} == 0) {
***************
*** 171,177 ****
Cached => 1,
);
- # --
# get data (viewable tickets...)
- # --
my @ViewableTickets = ();
my $SortBy = $Self->{ConfigObject}->Get('Ticket::Frontend::QueueSortBy::Default') || 'Age';
--- 162,166 ----
***************
*** 278,284 ****
}
}
- # --
# show ticket's
- # --
my $Counter = 0;
foreach (@ViewableTickets) {
--- 267,271 ----
***************
*** 340,346 ****
# fetch all std. responses ...
my %StdResponses = $Self->{QueueObject}->GetStdResponses(QueueID => $Article{QueueID});
- # --
# customer info
- # --
my %CustomerData = ();
if ($Self->{ConfigObject}->Get('Ticket::Frontend::CustomerInfoQueue')) {
--- 327,331 ----
***************
*** 356,362 ****
}
}
! # --
# build ticket view
- # --
foreach (qw(From To Cc Subject)) {
if ($Article{$_}) {
--- 341,346 ----
}
}
!
# build ticket view
foreach (qw(From To Cc Subject)) {
if ($Article{$_}) {
***************
*** 383,389 ****
# create human age
$Article{Age} = $Self->{LayoutObject}->CustomerAge(Age => $Article{Age}, Space => ' ');
! # --
# prepare escalation time
- # --
if ($Article{TicketOverTime}) {
if ($Article{TicketOverTime} <= -60*20) {
--- 367,372 ----
# create human age
$Article{Age} = $Self->{LayoutObject}->CustomerAge(Age => $Article{Age}, Space => ' ');
!
# prepare escalation time
if ($Article{TicketOverTime}) {
if ($Article{TicketOverTime} <= -60*20) {
***************
*** 429,435 ****
ArticleID => $Article{ArticleID},
);
! # --
# check if just a only html email
- # --
if (my $MimeTypeText = $Self->{LayoutObject}->CheckMimeType(%Article, Action => 'AgentTicketZoom')) {
$Article{BodyNote} = $MimeTypeText;
--- 412,417 ----
ArticleID => $Article{ArticleID},
);
!
# check if just a only html email
if (my $MimeTypeText = $Self->{LayoutObject}->CheckMimeType(%Article, Action => 'AgentTicketZoom')) {
$Article{BodyNote} = $MimeTypeText;
***************
*** 599,617 ****
my @MetaQueue = split(/::/, $Param{SelectedQueue});
$Level = $#MetaQueue+2;
! # --
# prepare shown queues (short names)
# - get queue total count -
- # --
foreach my $QueueRef (@QueuesNew) {
push (@ListedQueues, $QueueRef);
my %Queue = %$QueueRef;
my @Queue = split(/::/, $Queue{Queue});
! # --
# remember counted/used queues
- # --
$UsedQueue{$Queue{Queue}} = 1;
! # --
# move to short queue names
- # --
my $QueueName = '';
foreach (0..$#Queue) {
--- 581,596 ----
my @MetaQueue = split(/::/, $Param{SelectedQueue});
$Level = $#MetaQueue+2;
!
# prepare shown queues (short names)
# - get queue total count -
foreach my $QueueRef (@QueuesNew) {
push (@ListedQueues, $QueueRef);
my %Queue = %$QueueRef;
my @Queue = split(/::/, $Queue{Queue});
!
# remember counted/used queues
$UsedQueue{$Queue{Queue}} = 1;
!
# move to short queue names
my $QueueName = '';
foreach (0..$#Queue) {
***************
*** 669,681 ****
}
}
! # --
# remember to selected queue info
- # --
if ($QueueID eq $Queue{QueueID}) {
$Param{SelectedQueue} = $Queue{Queue};
$Param{AllSubTickets} = $Counter{$Queue{Queue}};
! # --
# build Page Navigator for AgentTicketQueue
- # --
$Param{PageShown} = $Param{'ViewableTickets'};
if ($Param{TicketsAvailAll} == 1 || $Param{TicketsAvailAll} == 0) {
--- 648,658 ----
}
}
!
# remember to selected queue info
if ($QueueID eq $Queue{QueueID}) {
$Param{SelectedQueue} = $Queue{Queue};
$Param{AllSubTickets} = $Counter{$Queue{Queue}};
!
# build Page Navigator for AgentTicketQueue
$Param{PageShown} = $Param{'ViewableTickets'};
if ($Param{TicketsAvailAll} == 1 || $Param{TicketsAvailAll} == 0) {
Index: AgentZoom.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AgentZoom.pm,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -r1.85 -r1.86
*** AgentZoom.pm 29 Aug 2006 17:17:24 -0000 1.85
--- AgentZoom.pm 2 Nov 2006 12:20:52 -0000 1.86
***************
*** 20,24 ****
$VERSION =~ s/^\$.*:\W(.*)\W.+?$/$1/;
- # --
sub new {
my $Type = shift;
--- 20,23 ----
***************
*** 39,43 ****
return $Self;
}
! # --
sub Run {
my $Self = shift;
--- 38,42 ----
return $Self;
}
!
sub Run {
my $Self = shift;
***************
*** 48,51 ****
return $Self->{LayoutObject}->Redirect(OP => $Redirect);
}
! # --
1;
--- 47,50 ----
return $Self->{LayoutObject}->Redirect(OP => $Redirect);
}
!
1;
Index: CustomerPreferences.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/CustomerPreferences.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** CustomerPreferences.pm 29 Aug 2006 17:17:24 -0000 1.12
--- CustomerPreferences.pm 2 Nov 2006 12:20:52 -0000 1.13
***************
*** 18,22 ****
$VERSION =~ s/^\$.*:\W(.*)\W.+?$/$1/;
- # --
sub new {
my $Type = shift;
--- 18,21 ----
***************
*** 44,48 ****
return $Self;
}
! # --
sub Run {
my $Self = shift;
--- 43,47 ----
return $Self;
}
!
sub Run {
my $Self = shift;
***************
*** 125,129 ****
}
}
! # --
sub CustomerPreferencesForm {
my $Self = shift;
--- 124,128 ----
}
}
!
sub CustomerPreferencesForm {
my $Self = shift;
More information about the cvs-log
mailing list