Changeset 353 for branches

Timestamp:

11/08/06 15:34:48 (18 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Update ipdb.psql with current alloctypes
Change "Internal netblock" entry to be visible in allocation lists
Remove hackery in admin.cgi that allowed changing a block to
"Internal netblock" even if it wasn't retrieved from the database
like everything else.

Location:

branches/stable/cgi-bin

Files:

• admin.cgi (modified) (1 diff)
• ipdb.psql (modified) (2 diffs)

branches/stable/cgi-bin/admin.cgi

@@ -467 +467 @@
         " value='$types[0]'>$types[1]</option>\n";
     }
-    print "<option". (($data[2] eq 'in') ? ' selected' : '') .
-        " value='in'>Internal netblock</option>\n</select></td>\n";
 
     print qq(<td><input name=city value="$data[3]"></td>\n).

branches/stable/cgi-bin/ipdb.psql

@@ -147 +147 @@
 we      Dynamic WiFi block      Dynamic WiFi block      104     WL-RES  ISP-WIFI
 ve      Dynamic VoIP block      Dynamic VoIP block      105     DYN-VOIP        ISP
-li      Static IP - LAN/POP     Static LAN/POP IP       190     6750400 ISP
-ld      Static Pool - LAN/POP   LAN pool        191     6750400 ISP
+li      Static IP - LAN/POP     Static LAN/POP IP       190     NOC-VPN ISP
+li      Static IP - Management  Static management IP    191     NOC-VPN ISP
+ld      Static Pool - LAN/POP   LAN pool        195     NOC-VPN ISP
+ld      Static Pool - Management        Management pool 196     NOC-VPN ISP
+in      Internal netblock       Internal netblock       199     6750400 ISP
 wc      Reserve for CORE/WAN blocks     CORE/WAN blocks 200     6750400 ISP
 pc      Reserve for dynamic-route DSL netblocks Dynamic-route netblocks 201     6750400 ISP-STATIC-DSL
@@ -158 +161 @@
 fr      Fibre   Fibre   223             ISP
 rm      Routing Routed netblock 500     6750400 ISP
-in      Internal netblock       Internal netblock       990     6750400 ISP
 mm      Master block    Master block    999     6750400 ISP
 \.