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: 27-Nov-2005 00:31:49
Branch: HEAD Handle: 2005112623314800
Modified files:
openpkg-registry registry-ui.pl
Log:
switch page handling from hidden form fields to url params
Summary:
Revision Changes Path
1.27 +22 -40 openpkg-registry/registry-ui.pl
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-registry/registry-ui.pl
============================================================================
$ cvs diff -u -r1.26 -r1.27 registry-ui.pl
--- openpkg-registry/registry-ui.pl 26 Nov 2005 20:46:01 -0000 1.26
+++ openpkg-registry/registry-ui.pl 26 Nov 2005 23:31:48 -0000 1.27
@@ -71,6 +71,7 @@
$cfg->{canvas}->{url}="http://meta.openpkg.org/?path=project.registry.manage";;
$cfg->{canvas}->{mark_head}="<!-- CANVAS: HEAD -->";
$cfg->{canvas}->{mark_body}="<!-- CANVAS: BODY -->";
+$cfg->{page}->{default} = undef;
my $ase;
$ase = undef;
@@ -82,6 +83,9 @@
# create objects
my $cgi = new CGI;
my $myurl = $cgi->url(-relative => 1) || ".";
+my $requestedpage = $cgi->url_param("page");
+$requestedpage = $cfg->{page}->{default} if (not defined $requestedpage);
+$cgi->delete(-name=>'page');
# database handle and scratch variables
#
@@ -128,21 +132,21 @@
# first check for pages which do not require database access
#
-if ($cgi->param("page") eq "css") {
+if ($requestedpage eq "css") {
my $out;
$out = '';
$out .= &viewhttp('text/css', '+10s');
$out .= &viewcss();
print STDOUT $out;
}
-elsif ($cgi->param("page") eq "jpg") {
+elsif ($requestedpage eq "jpg") {
my $out;
$out = '';
$out .= &viewhttp('image/jpg', '+600s');
$out .= &viewjpg($cgi->param("name"));
print STDOUT $out;
}
-elsif ($cgi->param("page") eq "gif") {
+elsif ($requestedpage eq "gif") {
my $out;
$out = '';
$out .= &viewhttp('image/gif', '+600s');
@@ -209,25 +213,25 @@
# continue to the pages that require database access
#
-if ($cgi->param("page") eq "login") {
+if ($requestedpage eq "login") {
my $out;
$out = '';
$out .= &viewlogin();
print STDOUT &canvas($out);
}
-elsif ($cgi->param("page") eq "logout") {
+elsif ($requestedpage eq "logout") {
my $out;
$out = '';
$out .= &viewlogout();
print STDOUT &canvas($out);
}
-elsif ($cgi->param("page") eq "asecomeback") {
+elsif ($requestedpage eq "asecomeback") {
my $out;
$out = '';
$out .= &viewasecomeback();
print STDOUT &canvas($out);
}
-elsif ($cgi->param("page") eq "association") {
+elsif ($requestedpage eq "association") {
my $out;
$out = '';
$out .= viewhttpauthrequired("association");
@@ -236,7 +240,7 @@
$out .= &viewhtmltail();
print STDOUT &canvas($out);
}
-elsif (($cgi->param("page") eq "dropxml" or $cgi->param("page") eq "" ) and
not &uao()) {
+elsif ($requestedpage eq "dropxml" and not &uao()) {
my $out;
$out = '';
$out .= &viewhttp();
@@ -245,14 +249,14 @@
$out .= &viewhtmltail();
print STDOUT &canvas($out);
}
-elsif ($cgi->param("page") eq "dropxml" and &uao()) {
+elsif ($requestedpage eq "dropxml" and &uao()) {
my $out;
$out = '';
$out .= &viewhttp("plain/text");
$out .= &viewdropxml();
print STDOUT $out;
}
-elsif ($cgi->param("page") eq "ase") {
+elsif ($requestedpage eq "ase") {
my $out;
$out = '';
$out .= &viewhttp();
@@ -911,9 +915,7 @@
my ($html);
$html = '';
$html .= '<td>';
- $html .= $cgi->start_form();
- $cgi->delete(-name=>'page');
- $html .= "<div>" . $cgi->hidden(-name=>'page', -value => "association")
. "</div>";
+ $html .= $cgi->start_form(-action => "$myurl?page=association");
$html .= "<div>" . $cgi->submit('submit','association') . "</div>";
$html .= $cgi->end_form;
$html .= '</td>';
@@ -926,12 +928,7 @@
$html = '';
$html .= '<td>';
if ($cfg->{identification}->{mode} eq "ase") {
- $html .= $cgi->start_form(-action => $ase->url(-action => "login"));
- $cgi->delete(-name=>'page');
- $html .= "<div>" . $cgi->hidden(-name=>'page', -value => "ase") .
"</div>";
- $html .= "<div>" . $cgi->hidden(-name=>'ase-action', -value =>
"login") . "</div>";
- $html .= "<div>" . $cgi->hidden(-name=>'ase-mode_during', -value =>
"ase") . "</div>";
- $html .= "<div>" . $cgi->hidden(-name=>'ase-mode_after', -value =>
"asecomeback") . "</div>";
+ $html .= $cgi->start_form(-action => $ase->url(-action => "login",
-mode_during => "ase", -mode_after => "asecomeback"));
$html .= "<div>" . $cgi->submit('submit','login') . "</div>";
$html .= $cgi->end_form;
}
@@ -939,9 +936,7 @@
# nop
}
elsif ($cfg->{identification}->{mode} eq "naive") {
- $html .= $cgi->start_form();
- $cgi->delete(-name=>'page');
- $html .= "<div>" . $cgi->hidden(-name=>'page', -value => "login") .
"</div>";
+ $html .= $cgi->start_form(-action => "$myurl?page=login");
$html .= "<div>" . $cgi->submit('submit','login') . "</div>";
$html .= $cgi->textfield(
-name => 'username',
@@ -1077,12 +1072,7 @@
$html = '';
$html .= '<td>';
if ($cfg->{identification}->{mode} eq "ase") {
- $html .= $cgi->start_form(-action => $ase->url(-action => "logout"));
- $cgi->delete(-name=>'page');
- $html .= "<div>" . $cgi->hidden(-name=>'page', -value => "ase") .
"</div>";
- $html .= "<div>" . $cgi->hidden(-name=>'ase-action', -value =>
"logout") . "</div>";
- $html .= "<div>" . $cgi->hidden(-name=>'ase-mode_during', -value =>
"ase") . "</div>";
- $html .= "<div>" . $cgi->hidden(-name=>'ase-mode_after', -value =>
"dropxml") . "</div>";
+ $html .= $cgi->start_form(-action => $ase->url(-action => "logout",
-mode_during => "ase", -mode_after => "asecomeback"));
$html .= "<div>" . $cgi->submit('submit','logout') . "</div>";
$html .= $cgi->end_form;
}
@@ -1090,9 +1080,7 @@
# nop
}
elsif ($cfg->{identification}->{mode} eq "naive") {
- $html .= $cgi->start_form();
- $cgi->delete(-name=>'page');
- $html .= "<div>" . $cgi->hidden(-name=>'page', -value => "logout") .
"</div>";
+ $html .= $cgi->start_form(-action => "$myurl?page=logout");
$html .= "<div>" . $cgi->submit('submit','logout') . "</div>";
$html .= $cgi->end_form;
}
@@ -1132,9 +1120,7 @@
my $html;
$html = '';
$html .= '<td>';
- $html .= $cgi->start_form();
- $cgi->delete(-name=>'page');
- $html .= "<div>" . $cgi->hidden(-name=>'page', -value => "dropxml") .
"</div>";
+ $html .= $cgi->start_form(-action => "$myurl?page=dropxml");
$html .= "<div>" . $cgi->submit('submit','dropxml') . "</div>";
$html .= $cgi->end_form;
$html .= '</td>';
@@ -1271,7 +1257,7 @@
$html .= "<table class=\"association\">\n";
$html .= "<tr>";
$html .= "<td colspan=\"4\">";
- $html .= $cgi->start_form();
+ $html .= $cgi->start_form(-action => "$myurl?page=association");
$html .= "<h3>$headline</h3>";
$html .= "</td>";
$html .= "</tr>\n";
@@ -1339,8 +1325,6 @@
$html .= "<td colspan=\"2\">";
$cgi->delete(-name=>'username');
$html .= "<div>" . $cgi->hidden(-name=>'username', -value =>
$username) . "</div>";
- $cgi->delete(-name=>'page');
- $html .= "<div>" . $cgi->hidden(-name=>'page', -value =>
"association") . "</div>";
$html .= "<div>" . $cgi->submit("$mode/delete",'delete') . "</div>";
$html .= "</td>";
$html .= "<td colspan=\"2\">";
@@ -1603,9 +1587,7 @@
$html .= " <table class=\"menu\">\n";
$html .= " <tr>\n";
$html .= " <td>\n";
- $html .= $cgi->start_form();
- $cgi->delete(-name=>'page');
- $html .= "<div>" . $cgi->hidden(-name=>'page', -value => "dropxml") .
"</div>";
+ $html .= $cgi->start_form(-action => "$myurl?page=dropxml");
$html .= "<div>" . $cgi->textarea(
-name => 'data',
-columns => 80,
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
