OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-registry Date: 05-Jul-2006 17:41:42
Branch: HEAD Handle: 2006070516414200
Modified files:
openpkg-registry registry-ui.pl
Log:
commit deferred indentation
Summary:
Revision Changes Path
1.65 +78 -79 openpkg-registry/registry-ui.pl
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-registry/registry-ui.pl
============================================================================
$ cvs diff -u -r1.64 -r1.65 registry-ui.pl
--- openpkg-registry/registry-ui.pl 5 Jul 2006 15:37:55 -0000 1.64
+++ openpkg-registry/registry-ui.pl 5 Jul 2006 15:41:42 -0000 1.65
@@ -155,94 +155,93 @@
&viewgif($cgi->param("name"));
goto CUS;
}
-else { #FIXME defer indentation making diff better readable
-
-# pages below require database access
-#
-$dbh = &dbopen("registry");
-if (not defined $dbh) {
- &viewprettyerror("Registry database backend unavailable", &prettydbi());
- goto CUS;
-}
-$dbs = &dbopen("session");
-if (not defined $dbs) {
- &viewprettyerror("Session database not accessible", &prettydbi());
- goto CUS;
-}
-
-# establish CGI Session object
-CGI::Session->name("registry-sid");
-$session = new CGI::Session(
- "driver:sqlite;serializer:Storable;id:uuid", $sid, { Handle => $dbs,
TableName => 'session' }
-);
-if (not defined $session) {
- &viewprettyerror("Session handling failed", "");
- goto CUS;
-}
-# response cookies for session persistency
-$session->expire("+3600s");
-if ($session->is_new()) {
- $response->{header}->{cookie} = $cgi->cookie(
- -name => $session->name(),
- -value => $session->id(),
- -expires => sprintf("+%ds", $session->expires()),
- -path => $cgi->url(-absolute => 1)
- )
-}
-
-if ($cfg->{identification}->{mode} eq "ase") {
- # establish ASE object
+else {
+ # pages below require database access
#
- $ase = new OSSP::ase::client(
- -server => "http://registry.openpkg.org/ase";,
- -cgi => $cgi,
- -mode => "page",
- -session => $session,
+ $dbh = &dbopen("registry");
+ if (not defined $dbh) {
+ &viewprettyerror("Registry database backend unavailable",
&prettydbi());
+ goto CUS;
+ }
+ $dbs = &dbopen("session");
+ if (not defined $dbs) {
+ &viewprettyerror("Session database not accessible", &prettydbi());
+ goto CUS;
+ }
+
+ # establish CGI Session object
+ CGI::Session->name("registry-sid");
+ $session = new CGI::Session(
+ "driver:sqlite;serializer:Storable;id:uuid", $sid, { Handle => $dbs,
TableName => 'session' }
);
- if (not defined $ase) {
- &viewprettyerror("Affiliation Services Environment", "");
+ if (not defined $session) {
+ &viewprettyerror("Session handling failed", "");
goto CUS;
}
-
- # give it a chance to run
- #
- if ($ase->responsible()) {
- if($ase->action()) {
- print $ase->response();
+ # response cookies for session persistency
+ $session->expire("+3600s");
+ if ($session->is_new()) {
+ $response->{header}->{cookie} = $cgi->cookie(
+ -name => $session->name(),
+ -value => $session->id(),
+ -expires => sprintf("+%ds", $session->expires()),
+ -path => $cgi->url(-absolute => 1)
+ )
+ }
+
+ if ($cfg->{identification}->{mode} eq "ase") {
+ # establish ASE object
+ #
+ $ase = new OSSP::ase::client(
+ -server => "http://registry.openpkg.org/ase";,
+ -cgi => $cgi,
+ -mode => "page",
+ -session => $session,
+ );
+ if (not defined $ase) {
+ &viewprettyerror("Affiliation Services Environment", "");
+ goto CUS;
}
- else {
- &viewprettyerror("Affiliation Services Environment",
$ase->error());
+
+ # give it a chance to run
+ #
+ if ($ase->responsible()) {
+ if($ase->action()) {
+ print $ase->response();
+ }
+ else {
+ &viewprettyerror("Affiliation Services Environment",
$ase->error());
+ }
+ goto CUS;
}
- goto CUS;
+ }
+
+ # continue to the pages that require database access
+ #
+ if ($requestedpage eq "login") {
+ &viewlogin();
+ }
+ elsif ($requestedpage eq "logout") {
+ &viewlogout();
+ }
+ elsif ($requestedpage eq "asecomeback") {
+ &viewasecomeback();
+ }
+ elsif ($requestedpage eq "association") {
+ &viewassociation();
+ }
+ elsif ($requestedpage eq "dropxml") {
+ &viewdropxml();
+ }
+ elsif ($requestedpage eq "ase") {
+ &viewemptypage();
+ }
+ else {
+ $cgi->delete_all();
+ &viewemptypage();
}
}
-# continue to the pages that require database access
-#
-if ($requestedpage eq "login") {
- &viewlogin();
-}
-elsif ($requestedpage eq "logout") {
- &viewlogout();
-}
-elsif ($requestedpage eq "asecomeback") {
- &viewasecomeback();
-}
-elsif ($requestedpage eq "association") {
- &viewassociation();
-}
-elsif ($requestedpage eq "dropxml") {
- &viewdropxml();
-}
-elsif ($requestedpage eq "ase") {
- &viewemptypage();
-}
-else {
- $cgi->delete_all();
- &viewemptypage();
-}
-} #FIXME defer indentation making diff better readable
-
# cleanup sequence
#
CUS:
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
