Index: /trunk/DNSDB.pm =================================================================== --- /trunk/DNSDB.pm (revision 37) +++ /trunk/DNSDB.pm (revision 38) @@ -175,5 +175,12 @@ return ('FAIL',"Need domain status") if !defined($state); + my $sth = $dbh->prepare("SELECT domain_id FROM domains WHERE domain=?"); my $dom_id; + +# quick check to start to see if we've already got one + $sth->execute($domain); + ($dom_id) = $sth->fetchrow_array; + + return ('FAIL', "Domain already exists") if $dom_id; # Allow transactions, and raise an exception on errors so we can catch it later. @@ -292,7 +299,16 @@ local $dbh->{RaiseError} = 1; + my $sth = $dbh->prepare("SELECT group_id FROM groups WHERE group_name=?"); + my $group_id; + +# quick check to start to see if we've already got one + $sth->execute($groupname); + ($group_id) = $sth->fetchrow_array; + + return ('FAIL', "Group already exists") if $group_id; + # Wrap all the SQL in a transaction eval { - my $sth = $dbh->prepare("INSERT INTO groups (parent_group_id,group_name) VALUES (?,?)"); + $sth = $dbh->prepare("INSERT INTO groups (parent_group_id,group_name) VALUES (?,?)"); $sth->execute($pargroup,$groupname); @@ -454,5 +470,12 @@ my $phone = shift || ''; # not going format-check + my $sth = $dbh->prepare("SELECT user_id FROM users WHERE username=?"); my $user_id; + +# quick check to start to see if we've already got one + $sth->execute($username); + ($user_id) = $sth->fetchrow_array; + + return ('FAIL', "User already exists") if $user_id; # Allow transactions, and raise an exception on errors so we can catch it later. Index: /trunk/dns.cgi =================================================================== --- /trunk/dns.cgi (revision 37) +++ /trunk/dns.cgi (revision 38) @@ -25,4 +25,5 @@ my @debugbits; # temp, to be spit out near the end of processing +my $debugenv = 0; # Let's do these templates right... @@ -68,6 +69,6 @@ # default -my $perpage = 15; -#my $perpage = 3; +#my $perpage = 15; +my $perpage = 3; my $offset = ($webvar{offset} ? $webvar{offset} : 0); @@ -481,5 +482,5 @@ $msg = "Passwords don't match"; } else { - ($code,$msg) = addUser($dbh,$webvar{username}, $webvar{group}, $webvar{pass1}, + ($code,$msg) = addUser($dbh,$webvar{uname}, $webvar{group}, $webvar{pass1}, ($webvar{makeactive} eq 'on' ? 1 : 0), $webvar{accttype}, $webvar{fname}, $webvar{lname}, $webvar{phone}); @@ -490,8 +491,7 @@ changepage(page => "useradmin"); } else { -# oooh, yeah, this is supposed to be a redirect. er, maybe. whee. -# $page = HTML::Template->new(filename => "$templatedir/newuser.tmpl"); +# oddity - apparently, xhtml 1.0 strict swallows username as an HTML::Template var. O_o $page->param(add_failed => 1); - $page->param(username => $webvar{username}); + $page->param(uname => $webvar{uname}); $page->param(fname => $webvar{fname}); $page->param(lname => $webvar{lname}); @@ -502,5 +502,5 @@ } - $page->param(add_failed => 1); +# $page->param(add_failed => 1); } elsif ($webvar{page} eq 'deluser') { @@ -654,5 +654,9 @@ # stuff for menu group change. nb: this is icky. fill_grouplist("grouplist"); - $page->param(whereami => $ENV{REQUEST_URI}); +# @#$%@%@#% XHTML - & in a URL must be escaped. >:( + my $tmp_ruri = $ENV{REQUEST_URI}; + $tmp_ruri =~ s/\&([a-z])/\&\;$1/g; +# $page->param(whereami => $ENV{REQUEST_URI}); + $page->param(whereami => $tmp_ruri); } @@ -662,18 +666,20 @@ print $page->output; -print "
webvar keys: 
\n";
-foreach my $key (keys %webvar) {
-  print "key: $key\tval: $webvar{$key}\n";
-}
-print "
\nsession:\n
\n";
-my $sesdata = $session->dataref();
-foreach my $key (keys %$sesdata) {
-  print "key: $key\tval: ".$sesdata->{$key}."\n";
-}
-print "
\nENV:\n
\n";
-foreach my $key (keys %ENV) {
-  print "key: $key\tval: $ENV{$key}\n";
-}
-print "
\n"; +if ($debugenv) { + print "
webvar keys: 
\n";
+  foreach my $key (keys %webvar) {
+    print "key: $key\tval: $webvar{$key}\n";
+  }
+  print "
\nsession:\n
\n";
+  my $sesdata = $session->dataref();
+  foreach my $key (keys %$sesdata) {
+    print "key: $key\tval: ".$sesdata->{$key}."\n";
+  }
+  print "
\nENV:\n
\n";
+  foreach my $key (keys %ENV) {
+    print "key: $key\tval: $ENV{$key}\n";
+  }
+  print "
\n"; +} print $footer->output; Index: unk/templates/Login.html =================================================================== --- /trunk/templates/Login.html (revision 37) +++ (revision ) @@ -1,51 +1,0 @@ - - - - - Login - - -
- - - - - - -
- - - - - - - - - - - - - - - - - - -
Please -log in
Email Address:
-
-
Password:
-

-
-
-
-
-
-
- - Index: /trunk/templates/axfr.tmpl =================================================================== --- /trunk/templates/axfr.tmpl (revision 37) +++ /trunk/templates/axfr.tmpl (revision 38) @@ -5,15 +5,16 @@ -
- - - + +
+ + + - - + + - + @@ -21,5 +22,5 @@ @@ -27,23 +28,24 @@ - + - + - + - + - +
Error:
Import domains via AXFR
Error:
Import domains via AXFR
Import from host: value=""> value="" />
Rewrite SOA to group default? checked> checked="checked" />
Rewrite NS to group default? checked> checked="checked" />
Import as active? checked> checked="checked" />
Domains to import:
(one per line)
+
@@ -51,5 +53,5 @@
- + Index: /trunk/templates/conf_del.tmpl =================================================================== --- /trunk/templates/conf_del.tmpl (revision 37) +++ /trunk/templates/conf_del.tmpl (revision 38) @@ -4,5 +4,5 @@ Index: /trunk/templates/deldom.tmpl =================================================================== --- /trunk/templates/deldom.tmpl (revision 37) +++ /trunk/templates/deldom.tmpl (revision 38) @@ -5,5 +5,5 @@
AXFR Import Results
AXFR Import Results

Are you really sure you want to delete record ?

-cancel   |   confirm +cancel   |   confirm

Are you really sure you want to delete domain ?

-cancel   |   confirm +cancel   |   confirm
Index: /trunk/templates/delgrp.tmpl =================================================================== --- /trunk/templates/delgrp.tmpl (revision 37) +++ /trunk/templates/delgrp.tmpl (revision 38) @@ -5,6 +5,6 @@

Are you really sure you want to delete group ?

-cancel   |   -confirm +cancel   |   +confirm Index: /trunk/templates/delrec.tmpl =================================================================== --- /trunk/templates/delrec.tmpl (revision 37) +++ /trunk/templates/delrec.tmpl (revision 38) @@ -4,7 +4,7 @@ -

Are you really sure you want to delete record:
+

Are you really sure you want to delete record:

-cancel   |   confirm +cancel   |   confirm Index: /trunk/templates/deluser.tmpl =================================================================== --- /trunk/templates/deluser.tmpl (revision 37) +++ /trunk/templates/deluser.tmpl (revision 38) @@ -4,5 +4,6 @@ -

Are you really sure you want to delete user ?

cancel   |   confirm +

Are you really sure you want to delete user ?

+cancel   |   confirm Index: /trunk/templates/dns.css =================================================================== --- /trunk/templates/dns.css (revision 37) +++ /trunk/templates/dns.css (revision 38) @@ -18,4 +18,12 @@ border: 0; } +img { + border: 0px; +} +fieldset { + border: none; + padding: 0px; + margin: 0px; +} table.login { @@ -27,7 +35,12 @@ background-color: #F0F0F0; } +table.container { + background-color: #FFFFFF; + border: none; +} table.wholepage { width: 100%; } + tr.row0 { background-color: #FFFFFF; @@ -47,5 +60,7 @@ background-color: #F0F0F0; } + td.tblsubmit { + background-color: #F0F0F0; text-align: center; } Index: /trunk/templates/dnsq.tmpl =================================================================== --- /trunk/templates/dnsq.tmpl (revision 37) +++ /trunk/templates/dnsq.tmpl (revision 38) @@ -7,13 +7,14 @@
Query error:
-
- - + +
+ + - + - + @@ -22,5 +23,5 @@ @@ -29,13 +30,14 @@ - + - + - +
DNS Query
DNS Query
Host/Name:
Non-recursive query: checked> checked="checked" />
Use this server:
+
@@ -43,14 +45,14 @@ - + - - + @@ -59,5 +61,5 @@ - + @@ -67,5 +69,5 @@ - + Index: /trunk/templates/domlist.tmpl =================================================================== --- /trunk/templates/domlist.tmpl (revision 37) +++ /trunk/templates/domlist.tmpl (revision 38) @@ -10,42 +10,42 @@
Query:
Query:
+
Response from :
Response from :
Authority:
Authority:
Additional information:
Additional information:
- + + - + - +
Domain list
Domain list
-insert search box here
insert search box here
insert letter search here
insert letter search here
New Domain
New Domain
- +
- - - + + + - - - + + + - - + + - - - - - + + + + + - +
Domain <TMPL_VAR NAME=sortorder>Status <TMPL_VAR NAME=sortorder>Group <TMPL_VAR NAME=sortorder>Domain <TMPL_VAR NAME=sortorder>Status <TMPL_VAR NAME=sortorder>Group <TMPL_VAR NAME=sortorder> DomainStatusGroupDomainStatusGroup Change StatusDeleteChange StatusDelete
activatedeactivateactivatedeactivate[ Delete ]
No domains found
No domains found
Index: /trunk/templates/editsoa.tmpl =================================================================== --- /trunk/templates/editsoa.tmpl (revision 37) +++ /trunk/templates/editsoa.tmpl (revision 38) @@ -66,5 +66,5 @@ -
+
Index: /trunk/templates/footer.tmpl =================================================================== --- /trunk/templates/footer.tmpl (revision 37) +++ /trunk/templates/footer.tmpl (revision 38) @@ -3,5 +3,5 @@