Changeset 255 for trunk

Timestamp:

05/31/05 14:18:35 (20 years ago)

Author:

Kris Deugau

Message:

/trunk

Merge "Last Modified" display from /branches/stable r245
main.cgi did not merge cleanly due to SWIP hack in /branches/stable r244

Location:

trunk

Files:

• cgi-bin/main.cgi (modified) (3 diffs)
• editDisplay.html (modified) (1 diff)

trunk/cgi-bin/main.cgi

@@ -920 +920 @@
   # because I'm lazy, we'll try to make the SELECT's bring out identical)ish) data
   if ($webvar{block} =~ /\/32$/) {
-    $sql = "select ip,custid,type,city,circuitid,description,notes from poolips where ip='$webvar{block}'";
+    $sql = "select ip,custid,type,city,circuitid,description,notes,modifystamp from poolips where ip='$webvar{block}'";
   } else {
-    $sql = "select cidr,custid,type,city,circuitid,description,notes from allocations where cidr='$webvar{block}'"
+    $sql = "select cidr,custid,type,city,circuitid,description,notes,modifystamp from allocations where cidr='$webvar{block}'"
   }
 
@@ -981 +981 @@
     $html =~ s/\$\$NOTES\$\$/$data[6]/g;
   }
+  my ($lastmod,undef) = split /\s+/, $data[7];
+  $html =~ s/\$\$LASTMOD\$\$/$lastmod/g;
+
+  # Allows us to "correctly" colour backgrounds in table
+  my $i=1;
 
   # More ACL trickery - we can live with forms that don't submit,
@@ -986 +991 @@
   # can't leave the submit buttons there.
   my $updok = '';
-  my $i=2;
   if ($IPDBacl{$authuser} =~ /c/) {
     $updok = qq(<tr class="color$i"><td colspan=2><div class="center">).
         qq(<input type="submit" value=" Update this block " class="regular">).
         "</div></td></tr></form>\n";
-    $i--;
+    $i++;
   }
   $html =~ s/\$\$UPDOK\$\$/$updok/g;

trunk/editDisplay.html

@@ -14 +14 @@
 <tr class="color2"><td class=heading>CustID:</td><td class="regular">$$CUSTID$$</td></tr>
 
-<tr class="color1"><td class="heading">Circuit ID:</td><td class="regular">$$CIRCID$$</td></tr>
+<tr class="color1"><td class=heading>Last modified:</td><td class=regular>$$LASTMOD$$</td></tr>
 
-<tr class="color2"><td class="heading">Description/Name:</td><td class="regular">$$DESC$$</td></tr>
+<tr class="color2"><td class="heading">Circuit ID:</td><td class="regular">$$CIRCID$$</td></tr>
 
-<tr class="color1"><td class="heading" valign="top">Notes:</td><td class="regular">$$NOTES$$</td></tr>
+<tr class="color1"><td class="heading">Description/Name:</td><td class="regular">$$DESC$$</td></tr>
+
+<tr class="color2"><td class="heading" valign="top">Notes:</td><td class="regular">$$NOTES$$</td></tr>
 
 $$UPDOK$$