[otrs-cvs] CVS: otrs/Kernel/Modules CustomerAccept.pm,1.3,1.4
CustomerCalendarSmall.pm,1.3,1.4 CustomerTicketAttachment.pm,1.2,1.3
CustomerTicketMessage.pm,1.11,1.12 CustomerTicketOverView.pm,1.38,1.39
CustomerTicketPrint.pm,1.1,1.2 CustomerTicketSearch.pm,1.19,1.20
CustomerTicketZoom.pm,1.10,1.11 CustomerZoom.pm,1.33,1.34
Installer.pm,1.40,1.41
cvs-log at otrs.org
cvs-log at otrs.org
Thu Nov 2 14:02:07 CET 2006
Update of /home/cvs/otrs/Kernel/Modules
In directory lancelot:/tmp/cvs-serv14062/Kernel/Modules
Modified Files:
CustomerAccept.pm CustomerCalendarSmall.pm
CustomerTicketAttachment.pm CustomerTicketMessage.pm
CustomerTicketOverView.pm CustomerTicketPrint.pm
CustomerTicketSearch.pm CustomerTicketZoom.pm CustomerZoom.pm
Installer.pm
Log Message:
removed # --
Index: CustomerAccept.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/CustomerAccept.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** CustomerAccept.pm 29 Aug 2006 17:17:24 -0000 1.3
--- CustomerAccept.pm 2 Nov 2006 13:02:03 -0000 1.4
***************
*** 18,22 ****
$VERSION =~ s/^\$.*:\W(.*)\W.+?$/$1/;
- # --
sub new {
my $Type = shift;
--- 18,21 ----
***************
*** 43,47 ****
return $Self;
}
! # --
sub PreRun {
my $Self = shift;
--- 42,46 ----
return $Self;
}
!
sub PreRun {
my $Self = shift;
***************
*** 65,69 ****
}
}
! # --
sub Run {
my $Self = shift;
--- 64,68 ----
}
}
!
sub Run {
my $Self = shift;
***************
*** 114,117 ****
}
}
! # --
1;
--- 113,116 ----
}
}
!
1;
Index: CustomerCalendarSmall.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/CustomerCalendarSmall.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** CustomerCalendarSmall.pm 29 Aug 2006 17:17:24 -0000 1.3
--- CustomerCalendarSmall.pm 2 Nov 2006 13:02:03 -0000 1.4
***************
*** 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}->CustomerHeader(Type => 'Small');
$Output .= $Self->{LayoutObject}->Output(
--- 154,159 ----
}
}
!
# start with page ...
$Output .= $Self->{LayoutObject}->CustomerHeader(Type => 'Small');
$Output .= $Self->{LayoutObject}->Output(
Index: CustomerTicketAttachment.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/CustomerTicketAttachment.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** CustomerTicketAttachment.pm 29 Aug 2006 17:17:24 -0000 1.2
--- CustomerTicketAttachment.pm 2 Nov 2006 13:02:03 -0000 1.3
***************
*** 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;
***************
*** 109,113 ****
}
}
- # --
1;
--- 108,111 ----
Index: CustomerTicketMessage.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/CustomerTicketMessage.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** CustomerTicketMessage.pm 29 Aug 2006 17:17:24 -0000 1.11
--- CustomerTicketMessage.pm 2 Nov 2006 13:02:03 -0000 1.12
***************
*** 22,26 ****
$VERSION =~ s/^\$.*:\W(.*)\W.+?$/$1/;
- # --
sub new {
my $Type = shift;
--- 22,25 ----
***************
*** 57,61 ****
return $Self;
}
! # --
sub Run {
my $Self = shift;
--- 56,60 ----
return $Self;
}
!
sub Run {
my $Self = shift;
***************
*** 352,356 ****
}
}
! # --
sub _MaskNew {
my $Self = shift;
--- 351,355 ----
}
}
!
sub _MaskNew {
my $Self = shift;
***************
*** 457,460 ****
return $Self->{LayoutObject}->Output(TemplateFile => 'CustomerTicketMessage', Data => \%Param);
}
! # --
1;
--- 456,459 ----
return $Self->{LayoutObject}->Output(TemplateFile => 'CustomerTicketMessage', Data => \%Param);
}
!
1;
Index: CustomerTicketOverView.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/CustomerTicketOverView.pm,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** CustomerTicketOverView.pm 29 Aug 2006 17:17:24 -0000 1.38
--- CustomerTicketOverView.pm 2 Nov 2006 13:02:03 -0000 1.39
***************
*** 20,24 ****
$VERSION =~ s/^\$.*:\W(.*)\W.+?$/$1/;
- # --
sub new {
my $Type = shift;
--- 20,23 ----
***************
*** 53,57 ****
return $Self;
}
! # --
sub Run {
my $Self = shift;
--- 52,56 ----
return $Self;
}
!
sub Run {
my $Self = shift;
***************
*** 168,174 ****
return $Output;
}
! # --
# ShowTicket
- # --
sub ShowTicketStatus {
my $Self = shift;
--- 167,172 ----
return $Output;
}
!
# ShowTicket
sub ShowTicketStatus {
my $Self = shift;
***************
*** 205,209 ****
);
}
- # --
1;
--- 203,206 ----
Index: CustomerTicketPrint.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/CustomerTicketPrint.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** CustomerTicketPrint.pm 9 Oct 2006 07:55:35 -0000 1.1
--- CustomerTicketPrint.pm 2 Nov 2006 13:02:03 -0000 1.2
***************
*** 22,26 ****
$VERSION =~ s/^\$.*:\W(.*)\W.+?$/$1/;
- # --
sub new {
my $Type = shift;
--- 22,25 ----
***************
*** 51,55 ****
return $Self;
}
! # --
sub Run {
my $Self = shift;
--- 50,54 ----
return $Self;
}
!
sub Run {
my $Self = shift;
***************
*** 72,78 ****
TicketID => $Self->{TicketID},
UserID => $Self->{UserID})) {
! # --
# error screen, don't show ticket
- # --
return $Self->{LayoutObject}->NoPermission(WithHeader => 'yes');
}
--- 71,76 ----
TicketID => $Self->{TicketID},
UserID => $Self->{UserID})) {
!
# error screen, don't show ticket
return $Self->{LayoutObject}->NoPermission(WithHeader => 'yes');
}
***************
*** 272,276 ****
}
- # --
sub _PDFOutputTicketInfos {
my $Self = shift;
--- 270,273 ----
***************
*** 377,381 ****
}
- # --
sub _PDFOutputLinkedObjects {
my $Self = shift;
--- 374,377 ----
***************
*** 487,491 ****
}
- # --
sub _PDFOutputFreeTextFields { # TODO make
my $Self = shift;
--- 483,486 ----
***************
*** 500,504 ****
}
- # --
sub _PDFOutputCustomerInfos {
my $Self = shift;
--- 495,498 ----
***************
*** 575,579 ****
}
- # --
sub _PDFOutputArticles {
my $Self = shift;
--- 569,572 ----
***************
*** 723,727 ****
}
- # --
sub _HTMLMask {
my $Self = shift;
--- 716,719 ----
***************
*** 815,818 ****
return $Self->{LayoutObject}->Output(TemplateFile => 'AgentTicketPrint', Data => {%Param});
}
! # --
1;
--- 807,810 ----
return $Self->{LayoutObject}->Output(TemplateFile => 'AgentTicketPrint', Data => {%Param});
}
!
1;
Index: CustomerTicketSearch.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/CustomerTicketSearch.pm,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** CustomerTicketSearch.pm 29 Aug 2006 17:17:24 -0000 1.19
--- CustomerTicketSearch.pm 2 Nov 2006 13:02:03 -0000 1.20
***************
*** 23,27 ****
$VERSION =~ s/^\$.*:\W(.*)\W.+?$/$1/;
- # --
sub new {
my $Type = shift;
--- 23,26 ----
***************
*** 52,56 ****
return $Self;
}
! # --
sub Run {
my $Self = shift;
--- 51,55 ----
return $Self;
}
!
sub Run {
my $Self = shift;
***************
*** 450,454 ****
}
}
! # --
sub MaskForm {
my $Self = shift;
--- 449,453 ----
}
}
!
sub MaskForm {
my $Self = shift;
***************
*** 638,642 ****
);
}
! # --
sub MaskCSVResult {
my $Self = shift;
--- 637,641 ----
);
}
!
sub MaskCSVResult {
my $Self = shift;
***************
*** 651,655 ****
);
}
! # --
sub MaskPrintResult {
my $Self = shift;
--- 650,654 ----
);
}
!
sub MaskPrintResult {
my $Self = shift;
***************
*** 664,667 ****
);
}
! # --
1;
--- 663,666 ----
);
}
!
1;
Index: CustomerTicketZoom.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/CustomerTicketZoom.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** CustomerTicketZoom.pm 11 Oct 2006 15:43:09 -0000 1.10
--- CustomerTicketZoom.pm 2 Nov 2006 13:02:03 -0000 1.11
***************
*** 259,270 ****
$Article->{Atms} = \%AtmIndex;
}
- # --
# genterate output
- # --
my $Output = $Self->{LayoutObject}->CustomerHeader(Value => $Ticket{TicketNumber});
$Output .= $Self->{LayoutObject}->CustomerNavigationBar();
! # --
# show ticket
- # --
if ($Self->{Subaction} eq 'ShowHTMLeMail') {
# if it is a html email, drop normal header
--- 259,267 ----
$Article->{Atms} = \%AtmIndex;
}
# genterate output
my $Output = $Self->{LayoutObject}->CustomerHeader(Value => $Ticket{TicketNumber});
$Output .= $Self->{LayoutObject}->CustomerNavigationBar();
!
# show ticket
if ($Self->{Subaction} eq 'ShowHTMLeMail') {
# if it is a html email, drop normal header
***************
*** 279,285 ****
%GetParam,
);
! # --
# return if HTML email
- # --
if ($Self->{Subaction} eq 'ShowHTMLeMail') {
# if it is a html email, return here
--- 276,281 ----
%GetParam,
);
!
# return if HTML email
if ($Self->{Subaction} eq 'ShowHTMLeMail') {
# if it is a html email, return here
Index: CustomerZoom.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/CustomerZoom.pm,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** CustomerZoom.pm 29 Aug 2006 17:17:24 -0000 1.33
--- CustomerZoom.pm 2 Nov 2006 13:02:03 -0000 1.34
***************
*** 19,23 ****
$VERSION =~ s/^\$.*:\W(.*)\W.+?$/$1/;
- # --
sub new {
my $Type = shift;
--- 19,22 ----
***************
*** 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: Installer.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/Installer.pm,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** Installer.pm 9 Oct 2006 17:38:03 -0000 1.40
--- Installer.pm 2 Nov 2006 13:02:03 -0000 1.41
***************
*** 121,127 ****
}
}
! # --
# print form
- # --
if (!$Self->{Subaction}) {
$Output .= $Self->{LayoutObject}->Header(Title => 'License');
--- 121,126 ----
}
}
!
# print form
if (!$Self->{Subaction}) {
$Output .= $Self->{LayoutObject}->Header(Title => 'License');
***************
*** 140,146 ****
return $Output;
}
! # --
# do database settings
- # --
elsif ($Self->{Subaction} eq 'Start') {
if ($Self->ReConfigure()) {
--- 139,144 ----
return $Output;
}
!
# do database settings
elsif ($Self->{Subaction} eq 'Start') {
if ($Self->ReConfigure()) {
***************
*** 172,178 ****
}
}
! # --
# do database settings
- # --
elsif ($Self->{Subaction} eq 'DB') {
$Output .= $Self->{LayoutObject}->Header(Title => 'Installer');
--- 170,175 ----
}
}
!
# do database settings
elsif ($Self->{Subaction} eq 'DB') {
$Output .= $Self->{LayoutObject}->Header(Title => 'Installer');
***************
*** 210,214 ****
}
-
if ($DB{DBAction} eq 'Create') {
# FIXME !!! use $DB{Type}!!!
--- 207,210 ----
***************
*** 220,226 ****
},
);
! # --
# create db
- # --
$Self->{LayoutObject}->Block(
Name => 'DatabaseResultItem',
--- 216,221 ----
},
);
!
# create db
$Self->{LayoutObject}->Block(
Name => 'DatabaseResultItem',
***************
*** 257,263 ****
);
}
! # --
# create db tables
! # --
# read otrs-schema.mysql.sql and process stuff
my @SQL = $Self->ParseSQLFile("$DirOfSQLFiles/otrs-schema.mysql.sql");
--- 252,258 ----
);
}
!
# create db tables
!
# read otrs-schema.mysql.sql and process stuff
my @SQL = $Self->ParseSQLFile("$DirOfSQLFiles/otrs-schema.mysql.sql");
***************
*** 298,305 ****
Data => { },
);
! # --
# inital insert
# - read initial_insert.sql and process stuff -
! # --
@SQL = $Self->ParseSQLFile("$DirOfSQLFiles/initial_insert.sql");
$Self->{LayoutObject}->Block(
--- 293,300 ----
Data => { },
);
!
# inital insert
# - read initial_insert.sql and process stuff -
!
@SQL = $Self->ParseSQLFile("$DirOfSQLFiles/initial_insert.sql");
$Self->{LayoutObject}->Block(
***************
*** 338,345 ****
Data => { },
);
! # --
# foreign key
# - read otrs-schema-post.mysql.sql and process stuff -
! # --
@SQL = $Self->ParseSQLFile("$DirOfSQLFiles/otrs-schema-post.mysql.sql");
$Self->{LayoutObject}->Block(
--- 333,340 ----
Data => { },
);
!
# foreign key
# - read otrs-schema-post.mysql.sql and process stuff -
!
@SQL = $Self->ParseSQLFile("$DirOfSQLFiles/otrs-schema-post.mysql.sql");
$Self->{LayoutObject}->Block(
***************
*** 378,384 ****
Data => { },
);
! # --
# user add
- # --
$Self->{LayoutObject}->Block(
Name => 'DatabaseResultItem',
--- 373,378 ----
Data => { },
);
!
# user add
$Self->{LayoutObject}->Block(
Name => 'DatabaseResultItem',
***************
*** 415,421 ****
);
}
! # --
# Reload the grant tables of your mysql-daemon
- # --
$Self->{LayoutObject}->Block(
Name => 'DatabaseResultItem',
--- 409,414 ----
);
}
!
# Reload the grant tables of your mysql-daemon
$Self->{LayoutObject}->Block(
Name => 'DatabaseResultItem',
***************
*** 452,458 ****
);
}
! # --
# ReConfigure Config.pm
- # --
if ($Self->ReConfigure(
DatabaseHost => $DB{DatabaseHost},
--- 445,450 ----
);
}
!
# ReConfigure Config.pm
if ($Self->ReConfigure(
DatabaseHost => $DB{DatabaseHost},
***************
*** 557,563 ****
return $Output;
}
! # --
# do system settings
- # --
elsif ($Self->{Subaction} eq 'System') {
my %SystemIDs = ();
--- 549,554 ----
return $Output;
}
!
# do system settings
elsif ($Self->{Subaction} eq 'System') {
my %SystemIDs = ();
***************
*** 609,619 ****
$Output .= $Self->{LayoutObject}->Footer();
}
! # --
# do system settings action
- # --
elsif ($Self->{Subaction} eq 'Finish') {
! # --
# ReConfigure Config.pm
- # --
my %Config = ();
foreach (qw(SystemID FQDN AdminEmail Organization LogModule LogModule::LogFile
--- 600,608 ----
$Output .= $Self->{LayoutObject}->Footer();
}
!
# do system settings action
elsif ($Self->{Subaction} eq 'Finish') {
!
# ReConfigure Config.pm
my %Config = ();
foreach (qw(SystemID FQDN AdminEmail Organization LogModule LogModule::LogFile
***************
*** 663,669 ****
$Output .= $Self->{LayoutObject}->Footer();
}
! # --
# else! error!
- # --
else {
return $Self->{LayoutObject}->ErrorScreen(
--- 652,657 ----
$Output .= $Self->{LayoutObject}->Footer();
}
!
# else! error!
else {
return $Self->{LayoutObject}->ErrorScreen(
***************
*** 680,686 ****
my %Param = @_;
my $Config = '';
! # --
# perl quote
- # --
foreach (keys %Param) {
if ($Param{$_}) {
--- 668,673 ----
my %Param = @_;
my $Config = '';
!
# perl quote
foreach (keys %Param) {
if ($Param{$_}) {
***************
*** 688,694 ****
}
}
! # --
# read config file
- # --
open (IN, "< $Self->{Path}/Kernel/Config.pm") ||
return "Can't open $Self->{Path}/Kernel/Config.pm: $!";
--- 675,680 ----
}
}
!
# read config file
open (IN, "< $Self->{Path}/Kernel/Config.pm") ||
return "Can't open $Self->{Path}/Kernel/Config.pm: $!";
***************
*** 699,705 ****
else {
my $NewConfig = $_;
- # --
# replace config with %Param
- # --
foreach (keys %Param) {
if ($Param{$_} =~ /^[0-9]+$/ && $Param{$_} !~ /^0/) {
--- 685,689 ----
***************
*** 725,731 ****
}
}
- # --
# write new config file
- # --
open (OUT, "> $Self->{Path}/Kernel/Config.pm") ||
return "Can't open $Self->{Path}/Kernel/Config.pm: $!";
--- 709,713 ----
More information about the cvs-log
mailing list