[otrs-cvs] CVS: otrs/scripts apache-perl-startup.pl,1.22,1.23
apache2-perl-startup.pl,1.24,1.25 backup.pl,1.5,1.6 login.pl,1.3,1.4
restore.pl,1.2,1.3 webform.pl,1.6,1.7
cvs-log at otrs.org
cvs-log at otrs.org
Thu Nov 2 13:21:03 CET 2006
Update of /home/cvs/otrs/scripts
In directory lancelot:/tmp/cvs-serv11671/scripts
Modified Files:
apache-perl-startup.pl apache2-perl-startup.pl backup.pl
login.pl restore.pl webform.pl
Log Message:
removed # --
Index: apache-perl-startup.pl
===================================================================
RCS file: /home/cvs/otrs/scripts/apache-perl-startup.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** apache-perl-startup.pl 7 Oct 2006 16:26:45 -0000 1.22
--- apache-perl-startup.pl 2 Nov 2006 12:20:59 -0000 1.23
***************
*** 5,11 ****
$ENV{GATEWAY_INTERFACE} =~ /^CGI-Perl/ or die "GATEWAY_INTERFACE not Perl!";
- # --
# set otrs lib path!
- # --
use lib "/opt/otrs/";
use lib "/opt/otrs/Kernel/cpan-lib";
--- 5,9 ----
Index: apache2-perl-startup.pl
===================================================================
RCS file: /home/cvs/otrs/scripts/apache2-perl-startup.pl,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** apache2-perl-startup.pl 7 Oct 2006 16:23:21 -0000 1.24
--- apache2-perl-startup.pl 2 Nov 2006 12:20:59 -0000 1.25
***************
*** 7,13 ****
$ENV{MOD_PERL} =~ /mod_perl/ or die "MOD_PERL not used!";
- # --
# set otrs lib path!
- # --
use lib "/opt/otrs/";
use lib "/opt/otrs/Kernel/cpan-lib";
--- 7,11 ----
Index: backup.pl
===================================================================
RCS file: /home/cvs/otrs/scripts/backup.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** backup.pl 29 Aug 2006 17:51:09 -0000 1.5
--- backup.pl 2 Nov 2006 12:21:00 -0000 1.6
***************
*** 40,46 ****
use Date::Pcalc qw(Today Today_and_Now Add_Delta_Days);
- # --
# get options
- # --
my %Opts = ();
my $Compress = '';
--- 40,44 ----
***************
*** 243,245 ****
print "failed\n";
}
-
--- 241,242 ----
Index: login.pl
===================================================================
RCS file: /home/cvs/otrs/scripts/login.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** login.pl 26 Aug 2006 17:44:22 -0000 1.3
--- login.pl 2 Nov 2006 12:21:00 -0000 1.4
***************
*** 28,34 ****
my $CGI = new CGI;
- # --
# config options
- # --
my $OTRSLocation = 'http://otrs.example.com/otrs/index.pl';
my $RequestedURL = $CGI->param('RequestedURL') || '';
--- 28,32 ----
***************
*** 36,42 ****
my $Reason = $CGI->param('Reason') || '';
- # --
# reason param translation
- # --
my $ReasonTranslation = {
SystemError => 'System error! Contact your admin!',
--- 34,38 ----
***************
*** 47,53 ****
};
- # --
# html page
- # --
print "Content-Type: text/html
--- 43,47 ----
***************
*** 86,88 ****
";
-
--- 80,81 ----
Index: restore.pl
===================================================================
RCS file: /home/cvs/otrs/scripts/restore.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** restore.pl 29 Aug 2006 17:51:09 -0000 1.2
--- restore.pl 2 Nov 2006 12:21:00 -0000 1.3
***************
*** 34,40 ****
use Getopt::Std;
! # --
# get options
- # --
my %Opts = ();
my $DB = '';
--- 34,39 ----
use Getopt::Std;
!
# get options
my %Opts = ();
my $DB = '';
***************
*** 176,178 ****
}
}
-
--- 175,176 ----
Index: webform.pl
===================================================================
RCS file: /home/cvs/otrs/scripts/webform.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** webform.pl 3 Oct 2006 14:34:47 -0000 1.6
--- webform.pl 2 Nov 2006 12:21:00 -0000 1.7
***************
*** 31,38 ****
$VERSION =~ s/^\$.*:\W(.*)\W.+?$/$1/;
!
! # --
# web form options
! # --
my $Ident = 'ahfiw2Fw32r230dddl2foeo3r';
# sendmail location and options
--- 31,37 ----
$VERSION =~ s/^\$.*:\W(.*)\W.+?$/$1/;
! # --------------------------
# web form options
! # --------------------------
my $Ident = 'ahfiw2Fw32r230dddl2foeo3r';
# sendmail location and options
***************
*** 51,57 ****
);
! # --
# html header
! # --
sub Header {
my %Param = @_;
--- 50,57 ----
);
! # --------------------------
# html header
! # --------------------------
!
sub Header {
my %Param = @_;
***************
*** 70,76 ****
return $Output;
}
! # --
# html footer
! # --
sub Footer {
(my $Output = <<EOF);
--- 70,78 ----
return $Output;
}
!
! # -------------------------
# html footer
! # -------------------------
!
sub Footer {
(my $Output = <<EOF);
***************
*** 82,88 ****
return $Output;
}
! # --
# Thanks
! # --
sub Thanks {
my %Param = @_;
--- 84,92 ----
return $Output;
}
!
! # -------------------------
# Thanks
! # -------------------------
!
sub Thanks {
my %Param = @_;
***************
*** 93,99 ****
return $Output;
}
! # --
# error
! # --
sub Error {
my %Param = @_;
--- 97,105 ----
return $Output;
}
!
! # ----------------------
# error
! # ----------------------
!
sub Error {
my %Param = @_;
***************
*** 104,110 ****
}
! # --
# start the real actions
! # --
my $CGI = new CGI;
my %GetParam = ();
--- 110,116 ----
}
! # ------------------------
# start the real actions
! # ------------------------
my $CGI = new CGI;
my %GetParam = ();
***************
*** 120,126 ****
}
! # --
# web form
! # --
sub WebForm {
print Header(Title => 'Submit Request');
--- 126,132 ----
}
! # ------------------------
# web form
! # ------------------------
sub WebForm {
print Header(Title => 'Submit Request');
***************
*** 164,176 ****
print Footer();
}
! # --
# send email
! # --
sub SendMail {
my %Param = @_;
my $Output = '';
! # --
# check needed params
- # --
foreach (qw(From FromEmail Subject Topic Body)) {
if (!$Param{$_}) {
--- 170,182 ----
print Footer();
}
! # --------------------------
# send email
! # --------------------------
!
sub SendMail {
my %Param = @_;
my $Output = '';
!
# check needed params
foreach (qw(From FromEmail Subject Topic Body)) {
if (!$Param{$_}) {
***************
*** 184,190 ****
return;
}
! # --
# simple email check
- # ---
my $NonAscii = "\x80-\xff"; # Non-ASCII-Chars are not allowed
my $Nqtext = "[^\\\\$NonAscii\015\012\"]";
--- 190,195 ----
return;
}
!
# simple email check
my $NonAscii = "\x80-\xff"; # Non-ASCII-Chars are not allowed
my $Nqtext = "[^\\\\$NonAscii\015\012\"]";
***************
*** 207,213 ****
return;
}
- # --
# build email
- # --
my @Mail = ("From: $Param{From} <$Param{FromEmail}>\n");
push @Mail, "To: $Param{Topic} <$OTRSEmail>\n";
--- 212,216 ----
***************
*** 224,237 ****
push @Mail, $Param{Body};
push @Mail, "\n";
! # --
# send mail
- # --
$Param{From} =~ s/"|;|'|<|>|\|| //ig;
if (open(MAIL, "|$Sendmail $Param{From} ")) {
print MAIL @Mail;
close(MAIL);
! # --
# thanks!
- # --
$Output = Header(Title => 'Thanks!');
$Output .= Thanks(%Param);
--- 227,238 ----
push @Mail, $Param{Body};
push @Mail, "\n";
!
# send mail
$Param{From} =~ s/"|;|'|<|>|\|| //ig;
if (open(MAIL, "|$Sendmail $Param{From} ")) {
print MAIL @Mail;
close(MAIL);
!
# thanks!
$Output = Header(Title => 'Thanks!');
$Output .= Thanks(%Param);
***************
*** 247,250 ****
}
}
- # --
-
--- 248,249 ----
More information about the cvs-log
mailing list