projects
/
irspy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Typo.
[irspy-moved-to-github.git]
/
web
/
htdocs
/
details
/
edit.mc
diff --git
a/web/htdocs/details/edit.mc
b/web/htdocs/details/edit.mc
index
73a938a
..
95686a1
100644
(file)
--- a/
web/htdocs/details/edit.mc
+++ b/
web/htdocs/details/edit.mc
@@
-1,4
+1,4
@@
-%# $Id: edit.mc,v 1.33 2007-05-03 12:43:04 mike Exp $
+%# $Id: edit.mc,v 1.37 2007-08-23 14:29:18 mike Exp $
<%args>
$op
$id => undef ### should be extracted using utf8param()
<%args>
$op
$id => undef ### should be extracted using utf8param()
@@
-40,6
+40,15
@@
my $protocol = utf8param($r, "protocol");
my $host = utf8param($r, "host");
my $port = utf8param($r, "port");
my $dbname = utf8param($r, "dbname");
my $host = utf8param($r, "host");
my $port = utf8param($r, "port");
my $dbname = utf8param($r, "dbname");
+
+if ((!defined $port || $port eq "") &&
+ (defined $protocol && $protocol ne "")) {
+ # Port-guessing based on defaults for each protocol
+ $port = $protocol eq "Z39.50" ? 210 : 80;
+ warn "guessed port $port";
+ $r->param(port => $port);
+}
+
my $newid;
if (defined $protocol && $protocol ne "" &&
defined $host && $host ne "" &&
my $newid;
if (defined $protocol && $protocol ne "" &&
defined $host && $host ne "" &&
@@
-59,6
+68,14
@@
if (!defined $id) {
print qq[<p class="error">
Please specify protocol, host, port and database name.</p>\n];
undef $update;
print qq[<p class="error">
Please specify protocol, host, port and database name.</p>\n];
undef $update;
+ } elsif ($host !~ /^\w+\.[\w.]*\w$/i) {
+ print qq[<p class="error">
+ This host name is not valid.</p>\n];
+ undef $update;
+ } elsif ($port !~ /^\d*$/i) {
+ print qq[<p class="error">
+ This port number is not valid.</p>\n];
+ undef $update;
} else {
# Creating new record, all necessary data is present. Check
# that the new record is not a duplicate of an existing one.
} else {
# Creating new record, all necessary data is present. Check
# that the new record is not a duplicate of an existing one.
@@
-346,7
+363,14
@@
if ($update && @changedFields) {
Changed <% $nchanges %> field<% $nchanges == 1 ? "" : "s" %>:
<% join(", ", map { xml_encode($_->[2]) } @changedFields) %>.
</p>
Changed <% $nchanges %> field<% $nchanges == 1 ? "" : "s" %>:
<% join(", ", map { xml_encode($_->[2]) } @changedFields) %>.
</p>
+% return if $op eq "new";
% }
% }
+ <p>
+ Although anyone is allowed to add a new target, please note that
+ <b>you will not be able to edit the newly added target unless you
+ have administrator privileges</b>. So please be sure that the
+ details are correct before submitting them.
+ </p>
<form method="get" action="">
<table class="fullrecord" border="1" cellspacing="0" cellpadding="5" width="100%">
<%perl>
<form method="get" action="">
<table class="fullrecord" border="1" cellspacing="0" cellpadding="5" width="100%">
<%perl>
@@
-380,6
+404,7
@@
foreach my $ref (@fields) {
<tr>
<td align="right" colspan="2">
<input type="submit" name="update" value="Update"/>
<tr>
<td align="right" colspan="2">
<input type="submit" name="update" value="Update"/>
+% $op = "edit" if $op eq "new" && defined $update;
<input type="hidden" name="op" value="<% xml_encode($op) %>"/>
% $id = $newid if defined $newid;
% if (defined $id) {
<input type="hidden" name="op" value="<% xml_encode($op) %>"/>
% $id = $newid if defined $newid;
% if (defined $id) {