[otrs-cvs] CVS: otrs/Kernel/Output/HTML ArticleCheckPGP.pm, 1.10,
1.11 Layout.pm,1.21,1.22
cvs-log at otrs.org
cvs-log at otrs.org
Mon Jan 1 23:36:27 CET 2007
- Next message: [otrs-cvs] CVS: otrs/Kernel/Modules AdminCustomerUser.pm, 1.43,
1.44
AdminResponse.pm, 1.18, 1.19 AgentInfo.pm, 1.4, 1.5 AgentSpelling.pm, 1.16,
1.17
AgentTicketCompose.pm,1.22,1.23 AgentTicketCustomerFollowUp.pm,1.8,1.9
AgentTicketHistory.pm,1.5,1.6 AgentTicketMailbox.pm,1.13,1.14
AgentTicketMerge.pm,1.12,1.13 AgentTicketMove.pm,1.13,1.14
AgentTicketNote.pm,1.19,1.20 AgentTicketPhone.pm,1.28,1.29
AgentTicketPlain.pm,1.4,1.5 CustomerPreferences.pm,1.13,1.14
CustomerTicketMessage.pm,1.12,1.13 CustomerTicketOverView.pm,1.39,1.40
CustomerTicketSearch.pm,1.22,1.23 Installer.pm,1.41,1.42
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /home/cvs/otrs/Kernel/Output/HTML
In directory lancelot:/tmp/cvs-serv22308/Kernel/Output/HTML
Modified Files:
ArticleCheckPGP.pm Layout.pm
Log Message:
code cleanup
Index: ArticleCheckPGP.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Output/HTML/ArticleCheckPGP.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** ArticleCheckPGP.pm 30 Dec 2006 02:56:55 -0000 1.10
--- ArticleCheckPGP.pm 1 Jan 2007 22:36:24 -0000 1.11
***************
*** 1,5 ****
# --
# Kernel/Output/HTML/ArticleCheckPGP.pm
! # Copyright (C) 2001-2006 OTRS GmbH, http://otrs.org/
# --
# $Id$
--- 1,5 ----
# --
# Kernel/Output/HTML/ArticleCheckPGP.pm
! # Copyright (C) 2001-2007 OTRS GmbH, http://otrs.org/
# --
# $Id$
***************
*** 104,111 ****
# check mime pgp
else {
! # check body
! # if body =~ application/pgp-encrypted
! # if crypted, decrypt it
! # remember that it was crypted!
# write email to fs
--- 104,111 ----
# check mime pgp
else {
! # check body
! # if body =~ application/pgp-encrypted
! # if crypted, decrypt it
! # remember that it was crypted!
# write email to fs
***************
*** 158,171 ****
# updated article body
$Self->{TicketObject}->ArticleUpdate(
! TicketID => $Param{Article}->{TicketID},
! ArticleID => $Self->{ArticleID},
! Key => 'Body',
! Value => $Body,
! UserID => $Self->{UserID},
);
# delete crypted attachments
$Self->{TicketObject}->ArticleDeleteAttachment(
! ArticleID => $Self->{ArticleID},
! UserID => $Self->{UserID},
);
# write attachments to the storage
--- 158,171 ----
# updated article body
$Self->{TicketObject}->ArticleUpdate(
! TicketID => $Param{Article}->{TicketID},
! ArticleID => $Self->{ArticleID},
! Key => 'Body',
! Value => $Body,
! UserID => $Self->{UserID},
);
# delete crypted attachments
$Self->{TicketObject}->ArticleDeleteAttachment(
! ArticleID => $Self->{ArticleID},
! UserID => $Self->{UserID},
);
# write attachments to the storage
Index: Layout.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Output/HTML/Layout.pm,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** Layout.pm 18 Dec 2006 07:27:59 -0000 1.21
--- Layout.pm 1 Jan 2007 22:36:24 -0000 1.22
***************
*** 1,5 ****
# --
# Kernel/Output/HTML/Layout.pm - provides generic HTML output
! # Copyright (C) 2001-2006 OTRS GmbH, http://otrs.org/
# --
# $Id$
--- 1,5 ----
# --
# Kernel/Output/HTML/Layout.pm - provides generic HTML output
! # Copyright (C) 2001-2007 OTRS GmbH, http://otrs.org/
# --
# $Id$
***************
*** 87,93 ****
Action => $Self->{Action},
);
- # --
# set charset if there is no charset given
- # --
$Self->{UserCharset} = $Self->{LanguageObject}->GetRecommendedCharset();
$Self->{Charset} = $Self->{UserCharset}; # just for compat.
--- 87,91 ----
***************
*** 95,101 ****
$Self->{SessionName} = $Param{SessionName} || 'SessionID';
$Self->{CGIHandle} = $ENV{'SCRIPT_NAME'} || 'No-$ENV{"SCRIPT_NAME"}';
- # --
# baselink
- # --
$Self->{Baselink} = "$Self->{CGIHandle}?";
$Self->{Time} = $Self->{LanguageObject}->Time(
--- 93,97 ----
***************
*** 107,113 ****
Format => 'DateFormatLong',
);
- # --
# check browser (defaut is IE because I don't have IE)
- # --
$Self->{BrowserWrap} = 'physical';
$Self->{Browser} = 'Unknown';
--- 103,107 ----
***************
*** 351,355 ****
);
foreach my $Block (reverse @Blocks) {
! $$TemplateString =~ s{
<!--\s{0,1}dtl:block:$Block->{Name}\s{0,1}-->(.+?)<!--\s{0,1}dtl:block:$Block->{Name}\s{0,1}-->
}
--- 345,349 ----
);
foreach my $Block (reverse @Blocks) {
! $$TemplateString =~ s{
<!--\s{0,1}dtl:block:$Block->{Name}\s{0,1}-->(.+?)<!--\s{0,1}dtl:block:$Block->{Name}\s{0,1}-->
}
***************
*** 452,461 ****
my $TemplateString = '';
if (defined($Param{Template}) && ref($Param{Template}) eq 'ARRAY') {
! foreach (@{$Param{Template}}) {
! $TemplateString .= $_;
! }
}
elsif (defined($Param{Template})) {
! $TemplateString = $Param{Template};
}
elsif ($Param{TemplateFile}) {
--- 446,455 ----
my $TemplateString = '';
if (defined($Param{Template}) && ref($Param{Template}) eq 'ARRAY') {
! foreach (@{$Param{Template}}) {
! $TemplateString .= $_;
! }
}
elsif (defined($Param{Template})) {
! $TemplateString = $Param{Template};
}
elsif ($Param{TemplateFile}) {
***************
*** 511,517 ****
if (defined($ID)) {
$ID .= ":";
! }
! if (defined($LayerHash{$i})) {
! $ID .= $LayerHash{$i};
}
}
--- 505,511 ----
if (defined($ID)) {
$ID .= ":";
! }
! if (defined($LayerHash{$i})) {
! $ID .= $LayerHash{$i};
}
}
***************
*** 573,659 ****
my $LineCount = 0;
foreach my $Line (@Template) {
! $LineCount++;
! # add missing new line (striped from split)
! if ($LineCount != $#Template+1) {
! $Line .= "\n";
! }
! if ($Line =~ /<dtl/) {
! # --
! # do template set (<dtl set $Data{"adasd"} = "lala">)
! # do system call (<dtl system-call $Data{"adasd"} = "uptime">)
! # --
! $Line =~ s{
! <dtl\W(system-call|set)\W\$(Data|Env|Config)\{\"(.+?)\"\}\W=\W\"(.+?)\">
! }
! {
! my $Data = '';
! if ($1 eq "set") {
! $Data = $4;
! }
! else {
! open (SYSTEM, " $4 | ") || print STDERR "Can't open $4: $!";
! while (<SYSTEM>) {
! $Data .= $_;
! }
! close (SYSTEM);
! }
!
! $GlobalRef->{"$2Ref"}->{$3} = $Data;
! # output replace with nothing!
! "";
! }egx;
!
! # --
! # do template if dynamic
! # --
! $Line =~ s{
! <dtl\Wif\W\(\$(Env|Data|Text|Config)\{\"(.*)\"\}\W(eq|ne|=~|!~)\W\"(.*)\"\)\W\{\W\$(Data|Env|Text)\{\"(.*)\"\}\W=\W\"(.*)\";\W\}>
! }
! {
! my $Type = $1 || '';
! my $TypeKey = $2 || '';
! my $Con = $3 || '';
! my $ConVal = defined $4 ? $4 : '';
! my $IsType = $5 || '';
! my $IsKey = $6 || '';
! my $IsValue = $7 || '';
! # --
! # do ne actions
! # --
! if ($Type eq 'Text') {
! my $Tmp = $Self->{LanguageObject}->Get($TypeKey, $Param{TemplateFile}) || '';
! if (eval '($Tmp '.$Con.' $ConVal)') {
! $GlobalRef->{$IsType.'Ref'}->{$IsKey} = $IsValue;
! # output replace with nothing!
! "";
! }
! }
! elsif ($Type eq 'Env' || $Type eq 'Data') {
! my $Tmp = $GlobalRef->{$Type.'Ref'}->{$TypeKey};
! if (!defined($Tmp)) {
! $Tmp = '';
! }
! if (eval '($Tmp '.$Con.' $ConVal)') {
! $GlobalRef->{$IsType.'Ref'}->{$IsKey} = $IsValue;
! # output replace with nothing!
! "";
! }
! else {
! # output replace with nothing!
! "";
! }
! }
! elsif ($Type eq 'Config') {
! my $Tmp = $Self->{ConfigObject}->Get($TypeKey);
! if (defined($Tmp) && eval '($Tmp '.$Con.' $ConVal)') {
! $GlobalRef->{$IsType.'Ref'}->{$IsKey} = $IsValue;
! "";
! }
! }
! }egx;
}
- # --
# variable & env & config replacement (three times)
- # --
foreach (1..3) {
$Line =~ s{
--- 567,645 ----
my $LineCount = 0;
foreach my $Line (@Template) {
! $LineCount++;
! # add missing new line (striped from split)
! if ($LineCount != $#Template+1) {
! $Line .= "\n";
! }
! if ($Line =~ /<dtl/) {
! # do template set (<dtl set $Data{"adasd"} = "lala">)
! # do system call (<dtl system-call $Data{"adasd"} = "uptime">)
! $Line =~ s{
! <dtl\W(system-call|set)\W\$(Data|Env|Config)\{\"(.+?)\"\}\W=\W\"(.+?)\">
! }
! {
! my $Data = '';
! if ($1 eq "set") {
! $Data = $4;
! }
! else {
! open (SYSTEM, " $4 | ") || print STDERR "Can't open $4: $!";
! while (<SYSTEM>) {
! $Data .= $_;
! }
! close (SYSTEM);
! }
!
! $GlobalRef->{"$2Ref"}->{$3} = $Data;
! # output replace with nothing!
! "";
! }egx;
!
! # do template if dynamic
! $Line =~ s{
! <dtl\Wif\W\(\$(Env|Data|Text|Config)\{\"(.*)\"\}\W(eq|ne|=~|!~)\W\"(.*)\"\)\W\{\W\$(Data|Env|Text)\{\"(.*)\"\}\W=\W\"(.*)\";\W\}>
! }
! {
! my $Type = $1 || '';
! my $TypeKey = $2 || '';
! my $Con = $3 || '';
! my $ConVal = defined $4 ? $4 : '';
! my $IsType = $5 || '';
! my $IsKey = $6 || '';
! my $IsValue = $7 || '';
! # do ne actions
! if ($Type eq 'Text') {
! my $Tmp = $Self->{LanguageObject}->Get($TypeKey, $Param{TemplateFile}) || '';
! if (eval '($Tmp '.$Con.' $ConVal)') {
! $GlobalRef->{$IsType.'Ref'}->{$IsKey} = $IsValue;
! # output replace with nothing!
! "";
! }
! }
! elsif ($Type eq 'Env' || $Type eq 'Data') {
! my $Tmp = $GlobalRef->{$Type.'Ref'}->{$TypeKey};
! if (!defined($Tmp)) {
! $Tmp = '';
! }
! if (eval '($Tmp '.$Con.' $ConVal)') {
! $GlobalRef->{$IsType.'Ref'}->{$IsKey} = $IsValue;
! # output replace with nothing!
! "";
! }
! else {
! # output replace with nothing!
! "";
! }
! }
! elsif ($Type eq 'Config') {
! my $Tmp = $Self->{ConfigObject}->Get($TypeKey);
! if (defined($Tmp) && eval '($Tmp '.$Con.' $ConVal)') {
! $GlobalRef->{$IsType.'Ref'}->{$IsKey} = $IsValue;
! "";
! }
! }
! }egx;
}
# variable & env & config replacement (three times)
foreach (1..3) {
$Line =~ s{
***************
*** 661,746 ****
}
{
! if ($1 eq "Data" || $1 eq "Env") {
! if (defined $GlobalRef->{"$1Ref"}->{$2}) {
! $GlobalRef->{"$1Ref"}->{$2};
! }
! else {
! # output replace with nothing!
! "";
! }
! }
! elsif ($1 eq "QEnv") {
! my $Text = $2;
! if (!defined($Text) || $Text =~ /^","(.+?)$/) {
! "";
! }
! elsif ($Text =~ /^(.+?)","(.+?)$/) {
! if (defined $GlobalRef->{"EnvRef"}->{$1}) {
! $Self->Ascii2Html(Text => $GlobalRef->{"EnvRef"}->{$1}, Max => $2);
! }
! else {
! # output replace with nothing!
! "";
! }
! }
! else {
! if (defined $GlobalRef->{"EnvRef"}->{$Text}) {
! $Self->Ascii2Html(Text => $GlobalRef->{"EnvRef"}->{$Text});
! }
! else {
! # output replace with nothing!
! "";
! }
! }
! }
! elsif ($1 eq "QData") {
! my $Text = $2;
! if (!defined($Text) || $Text =~ /^","(.+?)$/) {
! "";
! }
! elsif ($Text =~ /^(.+?)","(.+?)$/) {
! if (defined $GlobalRef->{"DataRef"}->{$1}) {
! $Self->Ascii2Html(Text => $GlobalRef->{"DataRef"}->{$1}, Max => $2);
! }
! else {
! # output replace with nothing!
! "";
! }
! }
! else {
! if (defined $GlobalRef->{"DataRef"}->{$Text}) {
! $Self->Ascii2Html(Text => $GlobalRef->{"DataRef"}->{$Text});
! }
! else {
! # output replace with nothing!
! "";
! }
! }
! }
! # link encode
! elsif ($1 eq "LQData") {
! if (defined $GlobalRef->{"DataRef"}->{$2}) {
! $Self->LinkEncode($GlobalRef->{"DataRef"}->{$2});
! }
! else {
! # output replace with nothing!
! "";
! }
! }
! # replace with
! elsif ($1 eq "Config") {
! if (defined $Self->{ConfigObject}->Get($2)) {
! $Self->{ConfigObject}->Get($2);
! }
! else {
! # output replace with nothing!
! "";
! }
! }
! # include dtl files
! elsif ($1 eq "Include") {
! $Param{TemplateFile} = $2;
! $Self->Output(%Param);
! }
}egx;
}
--- 647,732 ----
}
{
! if ($1 eq "Data" || $1 eq "Env") {
! if (defined $GlobalRef->{"$1Ref"}->{$2}) {
! $GlobalRef->{"$1Ref"}->{$2};
! }
! else {
! # output replace with nothing!
! "";
! }
! }
! elsif ($1 eq "QEnv") {
! my $Text = $2;
! if (!defined($Text) || $Text =~ /^","(.+?)$/) {
! "";
! }
! elsif ($Text =~ /^(.+?)","(.+?)$/) {
! if (defined $GlobalRef->{"EnvRef"}->{$1}) {
! $Self->Ascii2Html(Text => $GlobalRef->{"EnvRef"}->{$1}, Max => $2);
! }
! else {
! # output replace with nothing!
! "";
! }
! }
! else {
! if (defined $GlobalRef->{"EnvRef"}->{$Text}) {
! $Self->Ascii2Html(Text => $GlobalRef->{"EnvRef"}->{$Text});
! }
! else {
! # output replace with nothing!
! "";
! }
! }
! }
! elsif ($1 eq "QData") {
! my $Text = $2;
! if (!defined($Text) || $Text =~ /^","(.+?)$/) {
! "";
! }
! elsif ($Text =~ /^(.+?)","(.+?)$/) {
! if (defined $GlobalRef->{"DataRef"}->{$1}) {
! $Self->Ascii2Html(Text => $GlobalRef->{"DataRef"}->{$1}, Max => $2);
! }
! else {
! # output replace with nothing!
! "";
! }
! }
! else {
! if (defined $GlobalRef->{"DataRef"}->{$Text}) {
! $Self->Ascii2Html(Text => $GlobalRef->{"DataRef"}->{$Text});
! }
! else {
! # output replace with nothing!
! "";
! }
! }
! }
! # link encode
! elsif ($1 eq "LQData") {
! if (defined $GlobalRef->{"DataRef"}->{$2}) {
! $Self->LinkEncode($GlobalRef->{"DataRef"}->{$2});
! }
! else {
! # output replace with nothing!
! "";
! }
! }
! # replace with
! elsif ($1 eq "Config") {
! if (defined $Self->{ConfigObject}->Get($2)) {
! $Self->{ConfigObject}->Get($2);
! }
! else {
! # output replace with nothing!
! "";
! }
! }
! # include dtl files
! elsif ($1 eq "Include") {
! $Param{TemplateFile} = $2;
! $Self->Output(%Param);
! }
}egx;
}
***************
*** 748,754 ****
$Output .= $Line;
}
- # --
# do time translation (with seconds)
- # --
foreach (1..1) {
$Output =~ s{
--- 734,738 ----
***************
*** 764,770 ****
}egx;
}
- # --
# do time translation (without seconds)
- # --
foreach (1..1) {
$Output =~ s{
--- 748,752 ----
***************
*** 780,786 ****
}egx;
}
- # --
# do date translation
- # --
foreach (1..1) {
$Output =~ s{
--- 762,766 ----
***************
*** 791,797 ****
}egx;
}
- # --
# do translation
- # --
foreach (1..2) {
$Output =~ s{
--- 771,775 ----
***************
*** 825,831 ****
}egx;
}
- # --
# do html quote
- # --
foreach (1..1) {
$Output =~ s{
--- 803,807 ----
***************
*** 846,853 ****
}egx;
}
- # --
# Check if the browser sends the session id cookie!
# If not, add the session id to the links and forms!
- # --
if (!$Self->{SessionIDCookie}) {
# rewrite a hrefs
--- 822,827 ----
***************
*** 861,866 ****
my $RealEnd = $4;
if ($Target =~ /^(http:|https:|#|ftp:)/i ||
! $Target !~ /\.(pl|php|cgi|fcg|fcgi|fpl)(\?|$)/ ||
! $Target =~ /(\?|&)\Q$Self->{SessionName}\E=/) {
$AHref.$Target.$End.$RealEnd;
}
--- 835,840 ----
my $RealEnd = $4;
if ($Target =~ /^(http:|https:|#|ftp:)/i ||
! $Target !~ /\.(pl|php|cgi|fcg|fcgi|fpl)(\?|$)/ ||
! $Target =~ /(\?|&)\Q$Self->{SessionName}\E=/) {
$AHref.$Target.$End.$RealEnd;
}
***************
*** 878,883 ****
my $End = $3;
if ($Target =~ /^(http:|https:)/i || !$Self->{SessionID} ||
! $Target !~ /\.(pl|php|cgi|fcg|fcgi|fpl)(\?|$)/ ||
! $Target =~ /\Q$Self->{SessionName}\E/) {
$AHref.$Target.$End;
}
--- 852,857 ----
my $End = $3;
if ($Target =~ /^(http:|https:)/i || !$Self->{SessionID} ||
! $Target !~ /\.(pl|php|cgi|fcg|fcgi|fpl)(\?|$)/ ||
! $Target =~ /\Q$Self->{SessionName}\E/) {
$AHref.$Target.$End;
}
***************
*** 902,908 ****
}iegx;
}
- # --
# do correct direction
- # --
if ($Self->{LanguageObject}->{TextDirection} && $Self->{LanguageObject}->{TextDirection} eq 'rtl') {
$Output =~ s{
--- 876,880 ----
***************
*** 919,927 ****
}iegx;
$Output =~ s{
! align="(left|right)"
}
{
if ($1 =~ /left/i) {
! "align=\"right\"";
}
else {
--- 891,899 ----
}iegx;
$Output =~ s{
! align="(left|right)"
}
{
if ($1 =~ /left/i) {
! "align=\"right\"";
}
else {
***************
*** 1420,1424 ****
$Link = "http://$Link";
}
! "<a href=\"$Link\" target=\"$Target\">$OrigText<\/a>$OrigTextEnd";
}egxi;
# do mail to quote
--- 1392,1396 ----
$Link = "http://$Link";
}
! "<a href=\"$Link\" target=\"$Target\">$OrigText<\/a>$OrigTextEnd";
}egxi;
# do mail to quote
***************
*** 1535,1541 ****
$OnStuff = " onclick=\"$Param{OnClick}\" ";
}
- # --
# set default value
- # --
my $NoSelectedDataGiven = 0;
if ($Selected eq '-not-possible-to-use-' && $SelectedID eq '-not-possible-to-use-') {
--- 1507,1511 ----
***************
*** 1554,1564 ****
$Selected = $Self->{ConfigObject}->Get('DefaultLanguage');
}
! elsif ($NoSelectedDataGiven) {
! # else set 1?
# $SelectedID = 1;
! }
! # --
# build select string
- # --
$Output .= "<select name=\"$Name\" $Multiple $OnStuff $Size>\n";
if ($PossibleNone) {
--- 1524,1532 ----
$Selected = $Self->{ConfigObject}->Get('DefaultLanguage');
}
! # elsif ($NoSelectedDataGiven) {
! # # else set 1?
# $SelectedID = 1;
! # }
# build select string
$Output .= "<select name=\"$Name\" $Multiple $OnStuff $Size>\n";
if ($PossibleNone) {
***************
*** 1574,1585 ****
my @Order = ();
if ($SortBy eq 'Key') {
! foreach (sort keys %Data) {
! push (@Order, $_);
! }
}
else {
! foreach (sort {$Data{$a} cmp $Data{$b}} keys %Data) {
! push (@Order, $_);
! }
}
foreach (@Order) {
--- 1542,1553 ----
my @Order = ();
if ($SortBy eq 'Key') {
! foreach (sort keys %Data) {
! push (@Order, $_);
! }
}
else {
! foreach (sort {$Data{$a} cmp $Data{$b}} keys %Data) {
! push (@Order, $_);
! }
}
foreach (@Order) {
***************
*** 1595,1602 ****
# build select string
if ($_ eq $SelectedID || $Data{$_} eq $Selected || $Param{SelectedIDRefArrayOK}->{$_}) {
! $Output .= ' <option selected value="'.$Self->Ascii2Html(Text => $_).'">';
}
else {
! $Output .= ' <option value="'.$Self->Ascii2Html(Text => $_).'">';
}
if ($LT) {
--- 1563,1570 ----
# build select string
if ($_ eq $SelectedID || $Data{$_} eq $Selected || $Param{SelectedIDRefArrayOK}->{$_}) {
! $Output .= ' <option selected value="'.$Self->Ascii2Html(Text => $_).'">';
}
else {
! $Output .= ' <option value="'.$Self->Ascii2Html(Text => $_).'">';
}
if ($LT) {
***************
*** 1753,1757 ****
my $Output = '';
if (!$Param{Action}) {
! $Param{Action} = '$Env{"Action"}';
}
# with utf-8 can everything be shown
--- 1721,1725 ----
my $Output = '';
if (!$Param{Action}) {
! $Param{Action} = '$Env{"Action"}';
}
# with utf-8 can everything be shown
***************
*** 1782,1790 ****
my $Output = '';
if (!$Param{Action}) {
! $Param{Action} = '$Env{"Action"}';
}
- # --
# check if it is a text/plain email
- # --
if ($Param{MimeType} && $Param{MimeType} !~ /text\/plain/i) {
$Output = '<p><i class="small">$Text{"This is a"} '.$Param{MimeType}.
--- 1750,1756 ----
my $Output = '';
if (!$Param{Action}) {
! $Param{Action} = '$Env{"Action"}';
}
# check if it is a text/plain email
if ($Param{MimeType} && $Param{MimeType} !~ /text\/plain/i) {
$Output = '<p><i class="small">$Text{"This is a"} '.$Param{MimeType}.
***************
*** 2184,2188 ****
if ($Self->{ConfigObject}->Get('TimeZoneUser') && $Self->{UserTimeZone}) {
my $TimeStamp = $Self->{TimeObject}->TimeStamp2SystemTime(
! String => $Param{$Prefix."Year"}."-".$Param{$Prefix."Month"}."-".$Param{$Prefix."Day"}." ".$Param{$Prefix."Hour"}.":".$Param{$Prefix."Minute"}.":00",
);
$TimeStamp = $TimeStamp - ($Self->{UserTimeZone}*60*60);
--- 2150,2155 ----
if ($Self->{ConfigObject}->Get('TimeZoneUser') && $Self->{UserTimeZone}) {
my $TimeStamp = $Self->{TimeObject}->TimeStamp2SystemTime(
! String => $Param{$Prefix."Year"}."-".$Param{$Prefix."Month"}."-".$Param{$Prefix."Day"}." ".
! $Param{$Prefix."Hour"}.":".$Param{$Prefix."Minute"}.":00",
);
$TimeStamp = $TimeStamp - ($Self->{UserTimeZone}*60*60);
***************
*** 2209,2213 ****
$Param{$Prefix."Year"} && $Param{$Prefix."Month"} && $Param{$Prefix."Day"}) {
my $TimeStamp = $Self->{TimeObject}->TimeStamp2SystemTime(
! String => $Param{$Prefix."Year"}."-".$Param{$Prefix."Month"}."-".$Param{$Prefix."Day"}." ".$Param{$Prefix."Hour"}.":".$Param{$Prefix."Minute"}.":00",
);
$TimeStamp = $TimeStamp + ($Self->{UserTimeZone}*60*60);
--- 2176,2181 ----
$Param{$Prefix."Year"} && $Param{$Prefix."Month"} && $Param{$Prefix."Day"}) {
my $TimeStamp = $Self->{TimeObject}->TimeStamp2SystemTime(
! String => $Param{$Prefix."Year"}."-".$Param{$Prefix."Month"}."-".$Param{$Prefix."Day"}." ".
! $Param{$Prefix."Hour"}.":".$Param{$Prefix."Minute"}.":00",
);
$TimeStamp = $TimeStamp + ($Self->{UserTimeZone}*60*60);
***************
*** 2229,2233 ****
}
else {
! $Param{Year} = "<input type=\"text\" name=\"".$Prefix."Year\" size=\"4\" maxlength=\"4\" value=\"".sprintf("%02d", ($Param{$Prefix.'Year'} || $Y))."\">";
}
# month
--- 2197,2202 ----
}
else {
! $Param{Year} = "<input type=\"text\" name=\"".$Prefix."Year\" size=\"4\" maxlength=\"4\" ".
! "value=\"".sprintf("%02d", ($Param{$Prefix.'Year'} || $Y))."\">";
}
# month
***************
*** 2245,2249 ****
}
else {
! $Param{Month} = "<input type=\"text\" name=\"".$Prefix."Month\" size=\"2\" maxlength=\"2\" value=\"".sprintf("%02d", ($Param{$Prefix.'Month'} || $M))."\">";
}
# day
--- 2214,2219 ----
}
else {
! $Param{Month} = "<input type=\"text\" name=\"".$Prefix."Month\" size=\"2\" maxlength=\"2\" ".
! "value=\"".sprintf("%02d", ($Param{$Prefix.'Month'} || $M))."\">";
}
# day
***************
*** 2261,2265 ****
}
else {
! $Param{Day} = "<input type=\"text\" name=\"".$Prefix."Day\" size=\"2\" maxlength=\"2\" value=\"".($Param{$Prefix.'Day'} || $D)."\">";
}
if ($Format eq 'DateInputFormatLong') {
--- 2231,2236 ----
}
else {
! $Param{Day} = "<input type=\"text\" name=\"".$Prefix."Day\" size=\"2\" maxlength=\"2\" ".
! "value=\"".($Param{$Prefix.'Day'} || $D)."\">";
}
if ($Format eq 'DateInputFormatLong') {
***************
*** 2278,2282 ****
}
else {
! $Param{Hour} = "<input type=\"text\" name=\"".$Prefix."Hour\" size=\"2\" maxlength=\"2\" value=\"".sprintf("%02d", (defined($Param{$Prefix.'Hour'}) ? int($Param{$Prefix.'Hour'}) : $h))."\">";
}
# minute
--- 2249,2254 ----
}
else {
! $Param{Hour} = "<input type=\"text\" name=\"".$Prefix."Hour\" size=\"2\" maxlength=\"2\" ".
! "value=\"".sprintf("%02d", (defined($Param{$Prefix.'Hour'}) ? int($Param{$Prefix.'Hour'}) : $h))."\">";
}
# minute
***************
*** 2294,2298 ****
}
else {
! $Param{Minute} = "<input type=\"text\" name=\"".$Prefix."Minute\" size=\"2\" maxlength=\"2\" value=\"".sprintf("%02d", (defined($Param{$Prefix.'Minute'}) ? int($Param{$Prefix.'Minute'}) : $m))."\">";
}
}
--- 2266,2271 ----
}
else {
! $Param{Minute} = "<input type=\"text\" name=\"".$Prefix."Minute\" size=\"2\" maxlength=\"2\" ".
! "value=\"".sprintf("%02d", (defined($Param{$Prefix.'Minute'}) ? int($Param{$Prefix.'Minute'}) : $m))."\">";
}
}
***************
*** 2658,2661 ****
--- 2631,2636 ----
1;
+ =back
+
=head1 TERMS AND CONDITIONS
- Next message: [otrs-cvs] CVS: otrs/Kernel/Modules AdminCustomerUser.pm, 1.43,
1.44
AdminResponse.pm, 1.18, 1.19 AgentInfo.pm, 1.4, 1.5 AgentSpelling.pm, 1.16,
1.17
AgentTicketCompose.pm,1.22,1.23 AgentTicketCustomerFollowUp.pm,1.8,1.9
AgentTicketHistory.pm,1.5,1.6 AgentTicketMailbox.pm,1.13,1.14
AgentTicketMerge.pm,1.12,1.13 AgentTicketMove.pm,1.13,1.14
AgentTicketNote.pm,1.19,1.20 AgentTicketPhone.pm,1.28,1.29
AgentTicketPlain.pm,1.4,1.5 CustomerPreferences.pm,1.13,1.14
CustomerTicketMessage.pm,1.12,1.13 CustomerTicketOverView.pm,1.39,1.40
CustomerTicketSearch.pm,1.22,1.23 Installer.pm,1.41,1.42
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the cvs-log
mailing list