Changeset 283

Timestamp:

09/21/05 14:20:31 (19 years ago)

Author:

Kris Deugau

Message:

/branches/privdata

Add display for restricted data to delete confirmation page

Location:

branches/privdata

Files:

• cgi-bin/main.cgi (modified) (2 diffs)
• confirmRemove.html (modified) (1 diff)

branches/privdata/cgi-bin/main.cgi

@@ -1166 +1166 @@
 
     # Unassigning a static IP
-    my $sth = $ip_dbh->prepare("select ip,custid,city,type,notes,circuitid from poolips".
-        " where ip='$webvar{block}'");
+    my $sth = $ip_dbh->prepare("select ip,custid,city,type,notes,circuitid,privdata".
+        " from poolips where ip='$webvar{block}'");
     $sth->execute();
 #  croak $sth->errstr() if($sth->errstr());
 
-    $sth->bind_columns(\$cidr, \$custid, \$city, \$alloctype, \$notes, \$circid);
+    $sth->bind_columns(\$cidr, \$custid, \$city, \$alloctype, \$notes, \$circid,
+        \$privdata);
     $sth->fetch() || croak $sth->errstr;
 
   } else { # done with alloctype=~ /^.i$/
 
-    my $sth = $ip_dbh->prepare("select cidr,custid,type,city,circuitid,description,notes from ".
-        "allocations where cidr='$webvar{block}'");
+    my $sth = $ip_dbh->prepare("select cidr,custid,type,city,circuitid,description,notes,privdata".
+        " from allocations where cidr='$webvar{block}'");
     $sth->execute();
 #       croak $sth->errstr() if($sth->errstr());
 
-    $sth->bind_columns(\$cidr, \$custid, \$alloctype, \$city, \$circid, \$desc, \$notes);
+    $sth->bind_columns(\$cidr, \$custid, \$alloctype, \$city, \$circid, \$desc,
+        \$notes, \$privdata);
     $sth->fetch() || carp $sth->errstr;
   } # end cases for different alloctypes
@@ -1204 +1206 @@
     $html =~ s|<!--warn-->|<tr bgcolor="black"><td colspan="2"><div class="red">Warning: clicking confirm will remove this record entirely.</div></td></tr>|;
   }
+
+  my $i = 1;
+  # Check to see if user is allowed to do anything with sensitive data
+  if ($IPDBacl{$authuser} =~ /s/) {
+    $privdata = qq(<tr class="color).($i%2).qq("><td>Restricted data:</td>).
+        qq(<td class=regular>$privdata</td></tr>\n);
+    $i++;
+  }
+  $html =~ s/\$\$PRIVDATA\$\$/$privdata/g;
+
+  $i = ++$i % 2;
+  $html =~ s/\$\$BUTTONROWCOLOUR\$\$/color$i/;
 
   print $html;

branches/privdata/confirmRemove.html

@@ -10 +10 @@
 <tr class="color1"><td valign="top">Description/Name:</td><td>$$DESC$$</td></tr>
 <tr class="color2"><td valign="top">Notes:</td><td>$$NOTES$$</td></tr>
+$$PRIVDATA$$
 <!--warn-->
 <input type="hidden" name="action" value="$$ACTION$$">
-<tr class="color1"><td class="center" colspan=2>
+<tr class="$$BUTTONROWCOLOUR$$"><td class="center" colspan=2>
 <input type="button" value="Back" onclick="history.go(-1)"><input type="submit" value="Confirm">
 </td></tr>