[otrs-cvs] CVS: otrs/Kernel/System/Web InterfaceAgent.pm, 1.14,
1.15 InterfaceCustomer.pm,1.13,1.14 InterfacePublic.pm,1.8,1.9
cvs-log at otrs.org
cvs-log at otrs.org
Thu Nov 2 13:21:00 CET 2006
Update of /home/cvs/otrs/Kernel/System/Web
In directory lancelot:/tmp/cvs-serv11671/Kernel/System/Web
Modified Files:
InterfaceAgent.pm InterfaceCustomer.pm InterfacePublic.pm
Log Message:
removed # --
Index: InterfaceAgent.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/System/Web/InterfaceAgent.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** InterfaceAgent.pm 5 Oct 2006 01:46:33 -0000 1.14
--- InterfaceAgent.pm 2 Nov 2006 12:20:58 -0000 1.15
***************
*** 18,24 ****
$VERSION =~ s/^\$.*:\W(.*)\W.+?$/$1/;
- # --
# all framework needed modules
- # --
use Kernel::Config;
use Kernel::System::Log;
--- 18,22 ----
***************
*** 74,80 ****
$Self->{PerformanceLogStart} = time();
- # --
# create common framework objects 1/3
- # --
$Self->{ConfigObject} = Kernel::Config->new();
$Self->{LogObject} = Kernel::System::Log->new(
--- 72,76 ----
***************
*** 89,95 ****
WebRequest => $Param{WebRequest} || 0,
);
! # --
# debug info
- # --
if ($Self->{Debug}) {
$Self->{LogObject}->Log(
--- 85,90 ----
WebRequest => $Param{WebRequest} || 0,
);
!
# debug info
if ($Self->{Debug}) {
$Self->{LogObject}->Log(
***************
*** 111,117 ****
sub Run {
my $Self = shift;
! # --
# get common framework params
- # --
my %Param = ();
# get session id
--- 106,111 ----
sub Run {
my $Self = shift;
!
# get common framework params
my %Param = ();
# get session id
***************
*** 132,155 ****
|| $FramworkPrams->{$Key};
}
! # --
# Check if the brwoser sends the SessionID cookie and set the SessionID-cookie
# as SessionID! GET or POST SessionID have the lowest priority.
- # --
if ($Self->{ConfigObject}->Get('SessionUseCookie')) {
! $Param{SessionIDCookie} = $Self->{ParamObject}->GetCookie(Key => $Param{SessionName});
! if ($Param{SessionIDCookie}) {
! $Param{SessionID} = $Param{SessionIDCookie};
! }
}
! # --
# create common framework objects 2/3
! # --
! $Self->{LayoutObject} = Kernel::Output::HTML::Layout->new(
%{$Self},
Lang => $Param{Lang},
);
! # --
# check common objects
- # --
$Self->{DBObject} = Kernel::System::DB->new(%{$Self});
if (!$Self->{DBObject}) {
--- 126,146 ----
|| $FramworkPrams->{$Key};
}
!
# Check if the brwoser sends the SessionID cookie and set the SessionID-cookie
# as SessionID! GET or POST SessionID have the lowest priority.
if ($Self->{ConfigObject}->Get('SessionUseCookie')) {
! $Param{SessionIDCookie} = $Self->{ParamObject}->GetCookie(Key => $Param{SessionName});
! if ($Param{SessionIDCookie}) {
! $Param{SessionID} = $Param{SessionIDCookie};
! }
}
!
# create common framework objects 2/3
! $Self->{LayoutObject} = Kernel::Output::HTML::Layout->new(
%{$Self},
Lang => $Param{Lang},
);
!
# check common objects
$Self->{DBObject} = Kernel::System::DB->new(%{$Self});
if (!$Self->{DBObject}) {
***************
*** 170,183 ****
exit (1);
}
! # --
# create common framework objects 3/3
- # --
$Self->{UserObject} = Kernel::System::User->new(%{$Self});
$Self->{GroupObject} = Kernel::System::Group->new(%{$Self});
$Self->{PermissionObject} = Kernel::System::Permission->new(%{$Self});
$Self->{SessionObject} = Kernel::System::AuthSession->new(%{$Self});
! # --
# application and add on application common objects
- # --
my %CommonObject = %{$Self->{ConfigObject}->Get('Frontend::CommonObject')};
foreach my $Key (keys %CommonObject) {
--- 161,172 ----
exit (1);
}
!
# create common framework objects 3/3
$Self->{UserObject} = Kernel::System::User->new(%{$Self});
$Self->{GroupObject} = Kernel::System::Group->new(%{$Self});
$Self->{PermissionObject} = Kernel::System::Permission->new(%{$Self});
$Self->{SessionObject} = Kernel::System::AuthSession->new(%{$Self});
!
# application and add on application common objects
my %CommonObject = %{$Self->{ConfigObject}->Get('Frontend::CommonObject')};
foreach my $Key (keys %CommonObject) {
***************
*** 193,199 ****
}
}
! # --
# get common application and add on application params
- # --
my %CommonObjectParam = %{$Self->{ConfigObject}->Get('Frontend::CommonParam')};
foreach my $Key (keys %CommonObjectParam) {
--- 182,187 ----
}
}
!
# get common application and add on application params
my %CommonObjectParam = %{$Self->{ConfigObject}->Get('Frontend::CommonParam')};
foreach my $Key (keys %CommonObjectParam) {
***************
*** 202,208 ****
# security check Action Param (replace non word chars)
$Param{Action} =~ s/\W//g;
! # --
# check request type
- # --
if ($Param{Action} eq "Login") {
# get params
--- 190,195 ----
# security check Action Param (replace non word chars)
$Param{Action} =~ s/\W//g;
!
# check request type
if ($Param{Action} eq "Login") {
# get params
***************
*** 315,321 ****
}
}
! # --
# Logout
- # --
elsif ($Param{Action} eq "Logout"){
if ($Self->{SessionObject}->CheckSessionID(SessionID => $Param{SessionID})) {
--- 302,307 ----
}
}
!
# Logout
elsif ($Param{Action} eq "Logout"){
if ($Self->{SessionObject}->CheckSessionID(SessionID => $Param{SessionID})) {
***************
*** 385,391 ****
}
}
! # --
# user lost password
- # --
elsif ($Param{Action} eq "LostPassword"){
# check feature
--- 371,376 ----
}
}
!
# user lost password
elsif ($Param{Action} eq "LostPassword"){
# check feature
***************
*** 447,453 ****
}
}
! # --
# show login site
- # --
elsif (!$Param{SessionID}) {
# create AuthObject
--- 432,437 ----
}
}
!
# show login site
elsif (!$Param{SessionID}) {
# create AuthObject
***************
*** 476,482 ****
}
}
! # --
# run modules if exists a version value
- # --
elsif ($Self->{MainObject}->Require("Kernel::Modules::$Param{Action}")) {
# check session id
--- 460,465 ----
}
}
!
# run modules if exists a version value
elsif ($Self->{MainObject}->Require("Kernel::Modules::$Param{Action}")) {
# check session id
***************
*** 519,525 ****
}
}
! # --
# run module
- # --
else {
# get session data
--- 502,507 ----
}
}
!
# run module
else {
# get session data
***************
*** 688,694 ****
}
}
! # --
# else print an error screen
- # --
else {
# create new LayoutObject with '%Param'
--- 670,675 ----
}
}
!
# else print an error screen
else {
# create new LayoutObject with '%Param'
***************
*** 706,712 ****
print $Self->{LayoutObject}->Footer();
}
! # --
# debug info
- # --
if ($Self->{Debug}) {
$Self->{LogObject}->Log(
--- 687,692 ----
print $Self->{LayoutObject}->Footer();
}
!
# debug info
if ($Self->{Debug}) {
$Self->{LogObject}->Log(
***************
*** 715,724 ****
);
}
! # --
# db disconnect && undef %Param
- # --
$Self->{DBObject}->Disconnect();
undef %Param;
}
1;
--- 695,704 ----
);
}
!
# db disconnect && undef %Param
$Self->{DBObject}->Disconnect();
undef %Param;
}
+
1;
Index: InterfaceCustomer.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/System/Web/InterfaceCustomer.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** InterfaceCustomer.pm 31 Oct 2006 15:26:54 -0000 1.13
--- InterfaceCustomer.pm 2 Nov 2006 12:20:58 -0000 1.14
***************
*** 18,24 ****
$VERSION =~ s/^\$.*:\W(.*)\W.+?$/$1/;
- # --
# all framework needed modules
- # --
use Kernel::Config;
use Kernel::System::Log;
--- 18,22 ----
***************
*** 73,79 ****
$Self->{PerformanceLogStart} = time();
- # --
# create common framework objects 1/3
- # --
$Self->{ConfigObject} = Kernel::Config->new();
$Self->{LogObject} = Kernel::System::Log->new(
--- 71,75 ----
***************
*** 88,94 ****
WebRequest => $Param{WebRequest} || 0,
);
! # --
# debug info
- # --
if ($Self->{Debug}) {
$Self->{LogObject}->Log(
--- 84,89 ----
WebRequest => $Param{WebRequest} || 0,
);
!
# debug info
if ($Self->{Debug}) {
$Self->{LogObject}->Log(
***************
*** 110,116 ****
sub Run {
my $Self = shift;
! # --
# get common framework params
- # --
my %Param = ();
# get session id
--- 105,110 ----
sub Run {
my $Self = shift;
!
# get common framework params
my %Param = ();
# get session id
***************
*** 131,138 ****
|| $FramworkPrams->{$Key};
}
! # --
# Check if the brwoser sends the SessionID cookie and set the SessionID-cookie
# as SessionID! GET or POST SessionID have the lowest priority.
- # --
if ($Self->{ConfigObject}->Get('SessionUseCookie')) {
$Param{SessionIDCookie} = $Self->{ParamObject}->GetCookie(Key => $Param{SessionName});
--- 125,131 ----
|| $FramworkPrams->{$Key};
}
!
# Check if the brwoser sends the SessionID cookie and set the SessionID-cookie
# as SessionID! GET or POST SessionID have the lowest priority.
if ($Self->{ConfigObject}->Get('SessionUseCookie')) {
$Param{SessionIDCookie} = $Self->{ParamObject}->GetCookie(Key => $Param{SessionName});
***************
*** 141,147 ****
}
}
! # --
# create common framework objects 2/3
- # --
$Self->{LayoutObject} = Kernel::Output::HTML::Layout->new(
%{$Self},
--- 134,139 ----
}
}
!
# create common framework objects 2/3
$Self->{LayoutObject} = Kernel::Output::HTML::Layout->new(
%{$Self},
***************
*** 149,155 ****
);
- # --
# check common objects
- # --
$Self->{DBObject} = Kernel::System::DB->new(%{$Self});
if (!$Self->{DBObject}) {
--- 141,145 ----
***************
*** 170,182 ****
exit (1);
}
! # --
# create common framework objects 3/3
- # --
$Self->{UserObject} = Kernel::System::CustomerUser->new(%{$Self});
$Self->{GroupObject} = Kernel::System::CustomerGroup->new(%{$Self});
$Self->{SessionObject} = Kernel::System::AuthSession->new(%{$Self});
! # --
# application and add on application common objects
- # --
my %CommonObject = %{$Self->{ConfigObject}->Get('CustomerFrontend::CommonObject')};
foreach my $Key (keys %CommonObject) {
--- 160,170 ----
exit (1);
}
!
# create common framework objects 3/3
$Self->{UserObject} = Kernel::System::CustomerUser->new(%{$Self});
$Self->{GroupObject} = Kernel::System::CustomerGroup->new(%{$Self});
$Self->{SessionObject} = Kernel::System::AuthSession->new(%{$Self});
!
# application and add on application common objects
my %CommonObject = %{$Self->{ConfigObject}->Get('CustomerFrontend::CommonObject')};
foreach my $Key (keys %CommonObject) {
***************
*** 192,198 ****
}
}
! # --
# get common application and add on application params
- # --
my %CommonObjectParam = %{$Self->{ConfigObject}->Get('CustomerFrontend::CommonParam')};
foreach my $Key (keys %CommonObjectParam) {
--- 180,185 ----
}
}
!
# get common application and add on application params
my %CommonObjectParam = %{$Self->{ConfigObject}->Get('CustomerFrontend::CommonParam')};
foreach my $Key (keys %CommonObjectParam) {
***************
*** 201,207 ****
# security check Action Param (replace non word chars)
$Param{Action} =~ s/\W//g;
! # --
# check request type
- # --
if ($Param{Action} eq "Login") {
# get params
--- 188,193 ----
# security check Action Param (replace non word chars)
$Param{Action} =~ s/\W//g;
!
# check request type
if ($Param{Action} eq "Login") {
# get params
***************
*** 264,270 ****
%{$Self},
);
! # --
# redirect with new session id and old params
- # --
# prepare old redirect URL -- do not redirect to Login or Logout (loop)!
if ($Param{RequestedURL} =~ /Action=(Logout|Login)/) {
--- 250,255 ----
%{$Self},
);
!
# redirect with new session id and old params
# prepare old redirect URL -- do not redirect to Login or Logout (loop)!
if ($Param{RequestedURL} =~ /Action=(Logout|Login)/) {
***************
*** 298,304 ****
}
}
! # --
# Logout
- # --
elsif ($Param{Action} eq "Logout"){
if ($Self->{SessionObject}->CheckSessionID(SessionID => $Param{SessionID})) {
--- 283,288 ----
}
}
!
# Logout
elsif ($Param{Action} eq "Logout"){
if ($Self->{SessionObject}->CheckSessionID(SessionID => $Param{SessionID})) {
***************
*** 368,374 ****
}
}
! # --
# CustomerLostPassword
- # --
elsif ($Param{Action} eq "CustomerLostPassword"){
# check feature
--- 352,357 ----
}
}
!
# CustomerLostPassword
elsif ($Param{Action} eq "CustomerLostPassword"){
# check feature
***************
*** 424,430 ****
}
}
! # --
# create new customer account
- # --
elsif ($Param{Action} eq "CustomerCreateAccount"){
# check feature
--- 407,412 ----
}
}
!
# create new customer account
elsif ($Param{Action} eq "CustomerCreateAccount"){
# check feature
***************
*** 522,528 ****
}
}
! # --
# show login site
- # --
elsif (!$Param{SessionID}) {
# create AuthObject
--- 504,509 ----
}
}
!
# show login site
elsif (!$Param{SessionID}) {
# create AuthObject
***************
*** 551,557 ****
}
}
! # --
# run modules if exists a version value
- # --
elsif ($Self->{MainObject}->Require("Kernel::Modules::$Param{Action}")) {
# check session id
--- 532,537 ----
}
}
!
# run modules if exists a version value
elsif ($Self->{MainObject}->Require("Kernel::Modules::$Param{Action}")) {
# check session id
***************
*** 585,591 ****
}
}
! # --
# run module
- # --
else {
# get session data
--- 565,570 ----
}
}
!
# run module
else {
# get session data
***************
*** 715,721 ****
}
}
! # --
# else print an error screen
- # --
else {
# create new LayoutObject with '%Param'
--- 694,699 ----
}
}
!
# else print an error screen
else {
# create new LayoutObject with '%Param'
***************
*** 733,739 ****
print $Self->{LayoutObject}->CustomerFooter();
}
! # --
# debug info
- # --
if ($Self->{Debug}) {
$Self->{LogObject}->Log(
--- 711,716 ----
print $Self->{LayoutObject}->CustomerFooter();
}
!
# debug info
if ($Self->{Debug}) {
$Self->{LogObject}->Log(
***************
*** 742,751 ****
);
}
- # --
# db disconnect && undef %Param
- # --
$Self->{DBObject}->Disconnect();
undef %Param;
}
1;
--- 719,727 ----
);
}
# db disconnect && undef %Param
$Self->{DBObject}->Disconnect();
undef %Param;
}
+
1;
Index: InterfacePublic.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/System/Web/InterfacePublic.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** InterfacePublic.pm 5 Oct 2006 01:46:33 -0000 1.8
--- InterfacePublic.pm 2 Nov 2006 12:20:58 -0000 1.9
***************
*** 18,24 ****
$VERSION =~ s/^\$.*:\W(.*)\W.+?$/$1/;
- # --
# all framework needed modules
- # --
use Kernel::Config;
use Kernel::System::Log;
--- 18,22 ----
***************
*** 70,76 ****
$Self->{PerformanceLogStart} = time();
- # --
# create common framework objects 1/3
- # --
$Self->{ConfigObject} = Kernel::Config->new();
$Self->{LogObject} = Kernel::System::Log->new(
--- 68,72 ----
***************
*** 85,91 ****
WebRequest => $Param{WebRequest} || 0,
);
! # --
# debug info
- # --
if ($Self->{Debug}) {
$Self->{LogObject}->Log(
--- 81,86 ----
WebRequest => $Param{WebRequest} || 0,
);
!
# debug info
if ($Self->{Debug}) {
$Self->{LogObject}->Log(
***************
*** 108,114 ****
sub Run {
my $Self = shift;
! # --
# get common framework params
- # --
my %Param = ();
# get session id
--- 103,108 ----
sub Run {
my $Self = shift;
!
# get common framework params
my %Param = ();
# get session id
***************
*** 130,137 ****
|| $FramworkPrams->{$Key};
}
! # --
# Check if the brwoser sends the SessionID cookie and set the SessionID-cookie
# as SessionID! GET or POST SessionID have the lowest priority.
- # --
if ($Self->{ConfigObject}->Get('SessionUseCookie')) {
$Param{SessionIDCookie} = $Self->{ParamObject}->GetCookie(Key => $Param{SessionName});
--- 124,130 ----
|| $FramworkPrams->{$Key};
}
!
# Check if the brwoser sends the SessionID cookie and set the SessionID-cookie
# as SessionID! GET or POST SessionID have the lowest priority.
if ($Self->{ConfigObject}->Get('SessionUseCookie')) {
$Param{SessionIDCookie} = $Self->{ParamObject}->GetCookie(Key => $Param{SessionName});
***************
*** 140,146 ****
}
}
! # --
# create common framework objects 2/3
- # --
$Self->{LayoutObject} = Kernel::Output::HTML::Layout->new(
%Param,
--- 133,138 ----
}
}
!
# create common framework objects 2/3
$Self->{LayoutObject} = Kernel::Output::HTML::Layout->new(
%Param,
***************
*** 149,155 ****
Lang => $Param{Lang},
);
! # --
# check common objects
- # --
$Self->{DBObject} = Kernel::System::DB->new(%{$Self});
if (!$Self->{DBObject}) {
--- 141,146 ----
Lang => $Param{Lang},
);
!
# check common objects
$Self->{DBObject} = Kernel::System::DB->new(%{$Self});
if (!$Self->{DBObject}) {
***************
*** 170,180 ****
exit (1);
}
! # --
# create common framework objects 3/3
- # --
$Self->{UserObject} = Kernel::System::CustomerUser->new(%{$Self});
! # --
# application and add on application common objects
- # --
my %CommonObject = %{$Self->{ConfigObject}->Get('PublicFrontend::CommonObject')};
foreach my $Key (keys %CommonObject) {
--- 161,169 ----
exit (1);
}
!
# create common framework objects 3/3
$Self->{UserObject} = Kernel::System::CustomerUser->new(%{$Self});
!
# application and add on application common objects
my %CommonObject = %{$Self->{ConfigObject}->Get('PublicFrontend::CommonObject')};
foreach my $Key (keys %CommonObject) {
***************
*** 190,196 ****
}
}
! # --
# get common application and add on application params
- # --
my %CommonObjectParam = %{$Self->{ConfigObject}->Get('PublicFrontend::CommonParam')};
foreach my $Key (keys %CommonObjectParam) {
--- 179,184 ----
}
}
!
# get common application and add on application params
my %CommonObjectParam = %{$Self->{ConfigObject}->Get('PublicFrontend::CommonParam')};
foreach my $Key (keys %CommonObjectParam) {
***************
*** 199,205 ****
# security check Action Param (replace non word chars)
$Param{Action} =~ s/\W//g;
! # --
# run modules if exists a version value
- # --
if ($Self->{MainObject}->Require("Kernel::Modules::$Param{Action}")) {
# module registry
--- 187,192 ----
# security check Action Param (replace non word chars)
$Param{Action} =~ s/\W//g;
!
# run modules if exists a version value
if ($Self->{MainObject}->Require("Kernel::Modules::$Param{Action}")) {
# module registry
***************
*** 259,265 ****
}
}
! # --
# else print an error screen
- # --
else {
# print error
--- 246,251 ----
}
}
!
# else print an error screen
else {
# print error
***************
*** 268,274 ****
print $Self->{LayoutObject}->CustomerFooter();
}
! # --
# debug info
- # --
if ($Self->{Debug}) {
$Self->{LogObject}->Log(
--- 254,259 ----
print $Self->{LayoutObject}->CustomerFooter();
}
!
# debug info
if ($Self->{Debug}) {
$Self->{LogObject}->Log(
***************
*** 277,286 ****
);
}
! # --
# db disconnect && undef %Param
- # --
$Self->{DBObject}->Disconnect();
undef %Param;
}
1;
--- 262,271 ----
);
}
!
# db disconnect && undef %Param
$Self->{DBObject}->Disconnect();
undef %Param;
}
+
1;
More information about the cvs-log
mailing list