diff --git a/CHANGELOG.md b/CHANGELOG.md index e45c4e1eb..b77a220bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -SourceBans Change Log +SourceBans (FORK) Change Log ============ ``` @@ -10,6 +10,19 @@ Legend: ? = Other stuff ``` +(26/12/14): Version 1.5.0F +----------------------- +01. * Integrated SourceComms +02. * Added TF2 Modern Theme as Default (Made by IceMan) +03. * Integrated SourceBans Checker +04. * Re-made SourceBans FAQ +05. * Added MvM and HL2 Map Pics +06. * Added Synergy to the Game List +07. + Re-arranged/Renamed Tabs +08. + Added More Robust LFI Patch +09. ! Fixed Plugin Pointing to wrong FAQ link +10. ? Optimized and updated IpToCountry.csv + (02/12/14): Version 1.4.13F ----------------------- 01. ! Fixed LFI EXPLOIT //Thanks jsifuentes @@ -18,8 +31,8 @@ Legend: (15/11/14): Version 1.4.12F ----------------------- 01. * Added Steam3 Support for Player Menu -02. ! Fixed Steam Family Sharing Ban Evasion. -03. * Added IP Ban checking from SourceSlueth +02. * Added IP Ban checking from SourceSlueth +03. ! Fixed Steam Family Sharing Ban Evasion. 04. ? Added SteamWorks Extension 05. ? Optimized and updated IpToCountry.csv diff --git a/game_upload/addons/sourcemod/plugins/sbchecker.smx b/game_upload/addons/sourcemod/plugins/sbchecker.smx index 0007b5b38..5b81bfc4e 100644 Binary files a/game_upload/addons/sourcemod/plugins/sbchecker.smx and b/game_upload/addons/sourcemod/plugins/sbchecker.smx differ diff --git a/game_upload/addons/sourcemod/plugins/sourcebans.smx b/game_upload/addons/sourcemod/plugins/sourcebans.smx index f8f221bc3..0ca22be76 100644 Binary files a/game_upload/addons/sourcemod/plugins/sourcebans.smx and b/game_upload/addons/sourcemod/plugins/sourcebans.smx differ diff --git a/game_upload/addons/sourcemod/plugins/sourcecomms.smx b/game_upload/addons/sourcemod/plugins/sourcecomms.smx index d9a5dbeb5..a9464bda2 100644 Binary files a/game_upload/addons/sourcemod/plugins/sourcecomms.smx and b/game_upload/addons/sourcemod/plugins/sourcecomms.smx differ diff --git a/game_upload/addons/sourcemod/scripting/sourcebans.sp b/game_upload/addons/sourcemod/scripting/sourcebans.sp index 57f86f13c..866d36957 100644 --- a/game_upload/addons/sourcemod/scripting/sourcebans.sp +++ b/game_upload/addons/sourcemod/scripting/sourcebans.sp @@ -6,7 +6,7 @@ #undef REQUIRE_PLUGIN #include -#define SB_VERSION "1.5.0F-dev" +#define SB_VERSION "1.5.0F" //GLOBAL DEFINES #define YELLOW 0x01 diff --git a/game_upload/addons/sourcemod/scripting/sourcecomms.sp b/game_upload/addons/sourcemod/scripting/sourcecomms.sp index cd248f157..af89e134f 100644 --- a/game_upload/addons/sourcemod/scripting/sourcecomms.sp +++ b/game_upload/addons/sourcemod/scripting/sourcecomms.sp @@ -12,7 +12,7 @@ Intergrated into SourceBans 1.5.0F */ #include #define UNBLOCK_FLAG ADMFLAG_CUSTOM2 -#define DATABASE "sourcecomms" +#define DATABASE "sourcebans" // #define DEBUG // #define LOG_QUERIES diff --git a/web_upload/images/type_c.png b/web_upload/images/type_c.png new file mode 100644 index 000000000..7a733b87a Binary files /dev/null and b/web_upload/images/type_c.png differ diff --git a/web_upload/images/type_v.png b/web_upload/images/type_v.png new file mode 100644 index 000000000..f7ebfcda3 Binary files /dev/null and b/web_upload/images/type_v.png differ diff --git a/web_upload/includes/IpToCountry.csv b/web_upload/includes/IpToCountry.csv index 26abec8e0..291451fde 100644 --- a/web_upload/includes/IpToCountry.csv +++ b/web_upload/includes/IpToCountry.csv @@ -45,7 +45,7 @@ # ============================================================================== # ============================================================================== # -# File Time Stamp : Wed Dec 3 06:40:01 2014 UTC. +# File Time Stamp : Fri Dec 26 06:40:01 2014 UTC. # Generator : ip.pl on http://Software77.net (A Webnet77 Company) # Software Author : BRM # Software Version : 5.9.6 @@ -1676,7 +1676,7 @@ "406183936","406188031","arin","1228089600","CA","CAN","Canada" "406188032","406192127","arin","1331251200","CA","CAN","Canada" "406192128","406208511","arin","1248393600","CA","CAN","Canada" -"406208512","406216703","arin","0","ZZ","ZZZ","Reserved" +"406208512","406216703","arin","1418688000","CA","CAN","Canada" "406216704","406220799","arin","1242864000","US","USA","United States" "406220800","406221311","arin","1242864000","US","USA","United States" "406221312","406221823","arin","1409788800","US","USA","United States" @@ -1788,10 +1788,7 @@ "409403392","409468927","arin","1205193600","US","USA","United States" "409468928","409501695","arin","855792000","US","USA","United States" "409501696","409509887","arin","855792000","US","USA","United States" -"409509888","409513983","arin","1416528000","CA","CAN","Canada" -"409513984","409514495","arin","1416528000","CA","CAN","Canada" -"409514496","409514751","arin","1416528000","CA","CAN","Canada" -"409514752","409518079","arin","0","ZZ","ZZZ","Reserved" +"409509888","409518079","arin","1416528000","CA","CAN","Canada" "409518080","409534463","arin","1399420800","US","USA","United States" "409534464","409550847","arin","1015545600","US","USA","United States" "409550848","409567231","arin","1404345600","CA","CAN","Canada" @@ -1872,7 +1869,8 @@ "412024832","412033023","arin","927244800","US","USA","United States" "412033024","412041215","arin","1167696000","US","USA","United States" "412041216","412057599","arin","1115078400","US","USA","United States" -"412057600","412073983","arin","0","ZZ","ZZZ","Reserved" +"412057600","412065791","arin","1418774400","CA","CAN","Canada" +"412065792","412073983","arin","0","ZZ","ZZZ","Reserved" "412073984","412082175","arin","1241481600","US","USA","United States" "412082176","412090367","arin","1172448000","US","USA","United States" "412090368","412106751","arin","932428800","US","USA","United States" @@ -1882,7 +1880,7 @@ "412188672","412221439","arin","996624000","US","USA","United States" "412221440","412229631","arin","939081600","CA","CAN","Canada" "412229632","412237823","arin","1395792000","CA","CAN","Canada" -"412237824","412254207","arin","0","ZZ","ZZZ","Reserved" +"412237824","412254207","arin","1419379200","CA","CAN","Canada" "412254208","412286975","arin","1301270400","US","USA","United States" "412286976","412352511","arin","939772800","US","USA","United States" "412352512","412368895","arin","941155200","US","USA","United States" @@ -4895,7 +4893,10 @@ "738000896","738066431","apnic","1248307200","JP","JPN","Japan" "738197504","754974719","arin","709948800","US","USA","United States" "754974720","755105791","arin","684374400","US","USA","United States" -"756023296","759169023","arin","0","ZZ","ZZZ","Reserved" +"756023296","757071871","arin","1418256000","US","USA","United States" +"757071872","758906879","arin","0","ZZ","ZZZ","Reserved" +"758906880","758972415","arin","0","ZZ","ZZZ","Reserved" +"758972416","759169023","arin","0","ZZ","ZZZ","Reserved" "771751936","771817471","ripencc","1281398400","RU","RUS","Russian Federation" "771817472","771883007","ripencc","1281484800","TR","TUR","Turkey" "771883008","771948543","ripencc","1281657600","TR","TUR","Turkey" @@ -6105,8 +6106,8 @@ "789577728","789839871","arin","1330473600","US","USA","United States" "789839872","790102015","arin","1330473600","US","USA","United States" "790102016","790626303","arin","600048000","CA","CAN","Canada" -"790626304","791674879","arin","600048000","CA","CAN","Canada" -"791674880","791937023","arin","600048000","CA","CAN","Canada" +"790626304","791674879","arin","1419292800","US","USA","United States" +"791674880","791937023","arin","1419292800","US","USA","United States" "791937024","792002559","arin","600048000","CA","CAN","Canada" "792002560","792068095","arin","1337040000","US","USA","United States" "792068096","792133631","arin","1333929600","CA","CAN","Canada" @@ -8170,7 +8171,7 @@ "1076527104","1076543487","arin","951264000","US","USA","United States" "1076543488","1076559871","arin","983318400","CA","CAN","Canada" "1076559872","1076625407","arin","950486400","US","USA","United States" -"1076625408","1076690943","arin","950745600","US","USA","United States" +"1076625408","1076690943","arin","0","ZZ","ZZZ","Reserved" "1076690944","1076707327","arin","951350400","US","USA","United States" "1076707328","1076723711","arin","951696000","US","USA","United States" "1076723712","1076731903","arin","951696000","US","USA","United States" @@ -8507,8 +8508,7 @@ "1081061376","1081065471","arin","1176854400","US","USA","United States" "1081065472","1081073663","arin","1110326400","US","USA","United States" "1081073664","1081081855","arin","1110326400","US","USA","United States" -"1081081856","1081114623","arin","961459200","US","USA","United States" -"1081114624","1081131007","arin","961459200","US","USA","United States" +"1081081856","1081131007","arin","0","ZZ","ZZZ","Reserved" "1081131008","1081139199","arin","997142400","US","USA","United States" "1081139200","1081143295","arin","997142400","US","USA","United States" "1081143296","1081147391","arin","1136851200","US","USA","United States" @@ -8629,7 +8629,7 @@ "1082933248","1082941439","arin","964656000","US","USA","United States" "1082941440","1082945535","arin","1144195200","US","USA","United States" "1082945536","1082949631","arin","1211932800","CA","CAN","Canada" -"1082949632","1082966015","arin","1059004800","US","USA","United States" +"1082949632","1082966015","arin","0","ZZ","ZZZ","Reserved" "1082966016","1082982399","arin","1092873600","US","USA","United States" "1082982400","1083015167","arin","1021852800","CA","CAN","Canada" "1083015168","1083031551","arin","1076025600","US","USA","United States" @@ -8917,7 +8917,7 @@ "1089970176","1089974271","arin","1154995200","PR","PRI","Puerto Rico" "1089974272","1089978367","arin","1213747200","US","USA","United States" "1089978368","1089986559","arin","1003968000","US","USA","United States" -"1089986560","1089994751","arin","1052697600","US","USA","United States" +"1089986560","1089994751","arin","0","ZZ","ZZZ","Reserved" "1089994752","1090125823","arin","949449600","US","USA","United States" "1090125824","1090129919","arin","1214784000","US","USA","United States" "1090129920","1090134015","arin","1260230400","US","USA","United States" @@ -11124,7 +11124,7 @@ "1157758976","1157763071","arin","1032998400","US","USA","United States" "1157763072","1157767167","arin","1168300800","US","USA","United States" "1157767168","1157775359","arin","1033344000","US","USA","United States" -"1157775360","1157783551","arin","1033430400","US","USA","United States" +"1157775360","1157783551","arin","0","ZZ","ZZZ","Reserved" "1157783552","1157791743","arin","1034035200","US","USA","United States" "1157791744","1157799935","arin","1034035200","US","USA","United States" "1157799936","1157808127","arin","1036368000","US","USA","United States" @@ -11820,7 +11820,7 @@ "1168883712","1168887807","arin","1236297600","US","USA","United States" "1168887808","1168891903","arin","1394064000","US","USA","United States" "1168891904","1168900095","arin","1280966400","US","USA","United States" -"1168900096","1168916479","arin","1236729600","US","USA","United States" +"1168900096","1168916479","arin","0","ZZ","ZZZ","Reserved" "1168916480","1168932863","arin","1237939200","CA","CAN","Canada" "1168932864","1168936959","arin","1237852800","US","USA","United States" "1168936960","1168941055","arin","1277683200","CA","CAN","Canada" @@ -11941,7 +11941,7 @@ "1176702976","1176707071","arin","1234137600","CA","CAN","Canada" "1176707072","1176715263","arin","1239580800","US","USA","United States" "1176715264","1176719359","arin","1236729600","US","USA","United States" -"1176719360","1176723455","arin","1246838400","US","USA","United States" +"1176719360","1176723455","arin","0","ZZ","ZZZ","Reserved" "1176723456","1176727551","arin","1246924800","US","USA","United States" "1176727552","1176731647","arin","1214179200","US","USA","United States" "1176731648","1176735743","arin","1237939200","PR","PRI","Puerto Rico" @@ -12174,7 +12174,7 @@ "1208721408","1208729599","arin","1139875200","CA","CAN","Canada" "1208729600","1208737791","arin","1098662400","US","USA","United States" "1208737792","1208745983","arin","1140048000","US","USA","United States" -"1208745984","1208762367","arin","1098662400","US","USA","United States" +"1208745984","1208762367","arin","0","ZZ","ZZZ","Reserved" "1208762368","1208770559","arin","1098835200","US","USA","United States" "1208770560","1208774655","arin","1140480000","CA","CAN","Canada" "1208774656","1208778751","arin","1211155200","US","USA","United States" @@ -13450,7 +13450,6 @@ "1280114688","1280118783","arin","1176768000","US","USA","United States" "1280118784","1280122879","arin","1222128000","US","USA","United States" "1280122880","1280126975","arin","1326153600","US","USA","United States" -"1280126976","1280131071","arin","1326153600","US","USA","United States" "1280131072","1280139263","arin","1176940800","CA","CAN","Canada" "1280139264","1280143359","arin","1177027200","US","USA","United States" "1280143360","1280147455","arin","1222214400","US","USA","United States" @@ -28315,7 +28314,7 @@ "1611218944","1611227135","arin","1216598400","US","USA","United States" "1611227136","1611235327","arin","1258675200","CA","CAN","Canada" "1611235328","1611251711","arin","1216857600","US","USA","United States" -"1611251712","1611268095","arin","1216944000","US","USA","United States" +"1611251712","1611268095","arin","0","ZZ","ZZZ","Reserved" "1611268096","1611399167","arin","1185235200","US","USA","United States" "1611399168","1611661311","arin","1184284800","US","USA","United States" "1611661312","1611792383","arin","1193097600","US","USA","United States" @@ -28587,7 +28586,7 @@ "1673920512","1673936895","arin","1185494400","US","USA","United States" "1673936896","1673945087","arin","1185494400","US","USA","United States" "1673945088","1673953279","arin","1218672000","US","USA","United States" -"1673953280","1673986047","arin","1219708800","US","USA","United States" +"1673953280","1673986047","arin","0","ZZ","ZZZ","Reserved" "1673986048","1674051583","arin","1217548800","CA","CAN","Canada" "1674051584","1674575871","arin","1185753600","US","USA","United States" "1674575872","1675624447","arin","1173657600","CA","CAN","Canada" @@ -32975,16 +32974,22 @@ "1760395264","1760403455","arin","1415836800","US","USA","United States" "1760403456","1760411647","arin","0","ZZ","ZZZ","Reserved" "1760411648","1760419839","arin","1416441600","US","USA","United States" -"1760419840","1760428031","arin","0","ZZ","ZZZ","Reserved" +"1760419840","1760428031","arin","1417564800","US","USA","United States" "1760428032","1760436223","arin","1415318400","US","USA","United States" -"1760436224","1760444415","arin","0","ZZ","ZZZ","Reserved" +"1760436224","1760444415","arin","1417564800","US","USA","United States" "1760444416","1760460799","arin","1415836800","US","USA","United States" "1760460800","1760477183","arin","1415836800","US","USA","United States" "1760477184","1760493567","arin","1416182400","US","USA","United States" "1760493568","1760526335","arin","1416873600","US","USA","United States" -"1760526336","1760559103","arin","0","ZZ","ZZZ","Reserved" +"1760526336","1760559103","arin","1417478400","US","USA","United States" "1760559104","1760624639","arin","1415318400","US","USA","United States" -"1760624640","1760690175","arin","0","ZZ","ZZZ","Reserved" +"1760624640","1760641023","arin","1417651200","US","USA","United States" +"1760641024","1760657407","arin","1418169600","US","USA","United States" +"1760657408","1760673791","arin","1418342400","CA","CAN","Canada" +"1760673792","1760677887","arin","0","ZZ","ZZZ","Reserved" +"1760677888","1760681983","arin","1417996800","US","USA","United States" +"1760681984","1760686079","arin","1419292800","US","USA","United States" +"1760686080","1760690175","arin","1418083200","US","USA","United States" "1760690176","1760755711","arin","1416268800","CA","CAN","Canada" "1760755712","1760759807","arin","1416182400","US","USA","United States" "1760759808","1760763903","arin","1415836800","US","USA","United States" @@ -32996,7 +33001,7 @@ "1760784384","1760788479","arin","1416441600","US","USA","United States" "1760788480","1760792575","arin","1416787200","US","USA","United States" "1760792576","1760796671","arin","1416528000","US","USA","United States" -"1760796672","1760800767","arin","0","ZZ","ZZZ","Reserved" +"1760796672","1760800767","arin","1417996800","US","USA","United States" "1760800768","1760804863","arin","1416528000","US","USA","United States" "1760804864","1760808959","arin","1416528000","US","USA","United States" "1760808960","1760813055","arin","1416528000","US","USA","United States" @@ -33012,7 +33017,7 @@ "1760828416","1760829439","arin","1415232000","US","USA","United States" "1760829440","1760830463","arin","1415318400","US","USA","United States" "1760830464","1760831487","arin","1415664000","US","USA","United States" -"1760831488","1760833535","arin","0","ZZ","ZZZ","Reserved" +"1760831488","1760833535","arin","1417996800","US","USA","United States" "1760833536","1760834559","arin","1416441600","US","USA","United States" "1760834560","1760835583","arin","1415232000","US","USA","United States" "1760835584","1760837631","arin","1415318400","US","USA","United States" @@ -33043,11 +33048,11 @@ "1760871424","1760872447","arin","1416355200","CA","CAN","Canada" "1760872448","1760874495","arin","0","ZZ","ZZZ","Reserved" "1760874496","1760875519","arin","1416873600","US","USA","United States" -"1760875520","1760876543","arin","0","ZZ","ZZZ","Reserved" +"1760875520","1760876543","arin","1418256000","US","USA","United States" "1760876544","1760877567","arin","1416441600","US","USA","United States" "1760877568","1760878591","arin","1416441600","US","USA","United States" "1760878592","1760880639","arin","1416441600","JM","JAM","Jamaica" -"1760880640","1760882687","arin","0","ZZ","ZZZ","Reserved" +"1760880640","1760882687","arin","1418688000","US","USA","United States" "1760882688","1760883711","arin","1416528000","US","USA","United States" "1760883712","1760884735","arin","1416787200","CA","CAN","Canada" "1760884736","1760886783","arin","1416528000","US","USA","United States" @@ -33055,11 +33060,103 @@ "1760887808","1760888831","arin","1416873600","CA","CAN","Canada" "1760888832","1760890879","arin","1416960000","US","USA","United States" "1760890880","1760891903","arin","1416873600","US","USA","United States" -"1760891904","1760892927","arin","0","ZZ","ZZZ","Reserved" +"1760891904","1760892927","arin","1417651200","US","USA","United States" "1760892928","1760894975","arin","1416873600","US","USA","United States" "1760894976","1760897023","arin","1416873600","US","USA","United States" "1760897024","1760899071","arin","1417392000","US","USA","United States" -"1760899072","1761607679","arin","0","ZZ","ZZZ","Reserved" +"1760899072","1760900095","arin","1417564800","GD","GRD","Grenada" +"1760900096","1760901119","arin","1417651200","US","USA","United States" +"1760901120","1760903167","arin","0","ZZ","ZZZ","Reserved" +"1760903168","1760904191","arin","1418169600","CA","CAN","Canada" +"1760904192","1760905215","arin","1417737600","US","USA","United States" +"1760905216","1760907263","arin","1417737600","US","USA","United States" +"1760907264","1760908287","arin","1417737600","US","USA","United States" +"1760908288","1760909311","arin","1417996800","US","USA","United States" +"1760909312","1760910335","arin","1417996800","VG","VGB","Virgin Islands (BRITISH)" +"1760910336","1760911359","arin","1417996800","GD","GRD","Grenada" +"1760911360","1760913407","arin","1417996800","US","USA","United States" +"1760913408","1760914431","arin","1418947200","US","USA","United States" +"1760914432","1760915455","arin","1418083200","US","USA","United States" +"1760915456","1760917503","arin","0","ZZ","ZZZ","Reserved" +"1760917504","1760918527","arin","1418083200","US","USA","United States" +"1760918528","1760919551","arin","1418083200","US","USA","United States" +"1760919552","1760921599","arin","1418169600","US","USA","United States" +"1760921600","1760922623","arin","1418083200","US","USA","United States" +"1760922624","1760923647","arin","1418083200","US","USA","United States" +"1760923648","1760924671","arin","1418169600","CA","CAN","Canada" +"1760924672","1760925695","arin","1418688000","US","USA","United States" +"1760925696","1760927743","arin","1418169600","CA","CAN","Canada" +"1760927744","1760929791","arin","1418169600","CA","CAN","Canada" +"1760929792","1760931839","arin","1419292800","US","USA","United States" +"1760931840","1760932863","arin","1418601600","US","USA","United States" +"1760932864","1760933887","arin","1418169600","US","USA","United States" +"1760933888","1760934911","arin","1418342400","US","USA","United States" +"1760934912","1760935935","arin","1418601600","US","USA","United States" +"1760935936","1760936959","arin","1418601600","US","USA","United States" +"1760936960","1760937983","arin","1418774400","US","USA","United States" +"1760937984","1760939007","arin","1418774400","CA","CAN","Canada" +"1760939008","1760940031","arin","1418688000","DM","DMA","Dominica" +"1760940032","1760942079","arin","1418688000","US","USA","United States" +"1760942080","1760944127","arin","1418688000","US","USA","United States" +"1760944128","1760945151","arin","1418774400","CA","CAN","Canada" +"1760945152","1760946175","arin","1418860800","US","USA","United States" +"1760946176","1760948223","arin","1419206400","US","USA","United States" +"1760948224","1760950271","arin","1418860800","US","USA","United States" +"1760950272","1760952319","arin","1418947200","US","USA","United States" +"1760952320","1760985087","arin","1418083200","US","USA","United States" +"1760985088","1761017855","arin","1419379200","CA","CAN","Canada" +"1761017856","1761026047","arin","1419379200","US","USA","United States" +"1761026048","1761034239","arin","1419379200","US","USA","United States" +"1761034240","1761042431","arin","1419379200","US","USA","United States" +"1761042432","1761050623","arin","0","ZZ","ZZZ","Reserved" +"1761050624","1761058815","arin","1417651200","US","USA","United States" +"1761058816","1761067007","arin","1418169600","US","USA","United States" +"1761067008","1761075199","arin","1418083200","US","USA","United States" +"1761075200","1761083391","arin","1418342400","CA","CAN","Canada" +"1761083392","1761148927","arin","1419292800","US","USA","United States" +"1761148928","1761165311","arin","1418601600","US","USA","United States" +"1761165312","1761181695","arin","1419292800","US","USA","United States" +"1761181696","1761198079","arin","1418947200","US","USA","United States" +"1761198080","1761214463","arin","1419379200","CA","CAN","Canada" +"1761214464","1761222655","arin","1418601600","GP","GLP","Guadeloupe" +"1761222656","1761230847","arin","1418601600","US","USA","United States" +"1761230848","1761239039","arin","1418601600","CA","CAN","Canada" +"1761239040","1761247231","arin","1418688000","US","USA","United States" +"1761247232","1761255423","arin","1418860800","US","USA","United States" +"1761255424","1761263615","arin","1418860800","US","USA","United States" +"1761263616","1761271807","arin","1419206400","US","USA","United States" +"1761271808","1761279999","arin","1419292800","US","USA","United States" +"1761280000","1761284095","arin","0","ZZ","ZZZ","Reserved" +"1761284096","1761288191","arin","1418688000","US","USA","United States" +"1761288192","1761292287","arin","1418601600","CA","CAN","Canada" +"1761292288","1761296383","arin","1418601600","US","USA","United States" +"1761296384","1761300479","arin","1418688000","US","USA","United States" +"1761300480","1761304575","arin","1418774400","US","USA","United States" +"1761304576","1761308671","arin","1418774400","CA","CAN","Canada" +"1761308672","1761312767","arin","1418947200","US","USA","United States" +"1761312768","1761316863","arin","1418947200","US","USA","United States" +"1761316864","1761320959","arin","1419206400","US","USA","United States" +"1761320960","1761325055","arin","1419379200","US","USA","United States" +"1761325056","1761329151","arin","1419379200","US","USA","United States" +"1761329152","1761333247","arin","0","ZZ","ZZZ","Reserved" +"1761333248","1761337343","arin","1419379200","US","USA","United States" +"1761337344","1761341439","arin","1419379200","US","USA","United States" +"1761341440","1761345535","arin","0","ZZ","ZZZ","Reserved" +"1761345536","1761476607","arin","1417737600","US","USA","United States" +"1761476608","1761478655","arin","1419206400","US","USA","United States" +"1761478656","1761479679","arin","1419206400","CA","CAN","Canada" +"1761479680","1761480703","arin","1419206400","US","USA","United States" +"1761480704","1761482751","arin","0","ZZ","ZZZ","Reserved" +"1761482752","1761484799","arin","1419292800","US","USA","United States" +"1761484800","1761485823","arin","1419292800","CA","CAN","Canada" +"1761485824","1761486847","arin","1419379200","US","USA","United States" +"1761486848","1761487871","arin","1419379200","US","USA","United States" +"1761487872","1761488895","arin","0","ZZ","ZZZ","Reserved" +"1761488896","1761489919","arin","1419379200","CA","CAN","Canada" +"1761489920","1761490943","arin","0","ZZ","ZZZ","Reserved" +"1761490944","1761492991","arin","1419379200","US","USA","United States" +"1761492992","1761497087","arin","0","ZZ","ZZZ","Reserved" +"1761497088","1761607679","arin","0","ZZ","ZZZ","Reserved" "1767899136","1768947711","afrinic","1384732800","DZ","DZA","Algeria" "1768947712","1769996287","afrinic","1379635200","NG","NGA","Nigeria" "1769996288","1772093439","afrinic","1306972800","MA","MAR","Morocco" @@ -38956,6 +39053,8 @@ "2214542336","2214543359","lacnic","1414540800","AR","ARG","Argentina" "2214543360","2214544383","lacnic","1415750400","BR","BRA","Brazil" "2214544384","2214545407","lacnic","1415750400","BR","BRA","Brazil" +"2214545408","2214546431","lacnic","1418774400","BR","BRA","Brazil" +"2214546432","2214547455","lacnic","1418688000","BR","BRA","Brazil" "2214547456","2214548479","lacnic","1415836800","BR","BRA","Brazil" "2214548480","2214549503","lacnic","1415836800","BR","BRA","Brazil" "2214549504","2214550527","lacnic","1416787200","BR","BRA","Brazil" @@ -38973,16 +39072,33 @@ "2214561792","2214562815","lacnic","1417392000","PE","PER","Peru" "2214562816","2214563839","lacnic","1416873600","BR","BRA","Brazil" "2214563840","2214564863","lacnic","1416787200","BR","BRA","Brazil" +"2214564864","2214565887","lacnic","1418256000","BR","BRA","Brazil" "2214565888","2214566911","lacnic","1416873600","BR","BRA","Brazil" +"2214566912","2214567935","lacnic","1417564800","BR","BRA","Brazil" "2214567936","2214568959","lacnic","1417046400","BR","BRA","Brazil" +"2214568960","2214569983","lacnic","1418774400","BR","BRA","Brazil" "2214569984","2214571007","lacnic","1416960000","BR","BRA","Brazil" "2214571008","2214572031","lacnic","1416960000","BR","BRA","Brazil" "2214572032","2214573055","lacnic","1417392000","BR","BRA","Brazil" +"2214573056","2214574079","lacnic","1418256000","AR","ARG","Argentina" "2214574080","2214575103","lacnic","1417478400","BR","BRA","Brazil" +"2214575104","2214576127","lacnic","1417996800","BR","BRA","Brazil" "2214576128","2214577151","lacnic","1417392000","PE","PER","Peru" "2214577152","2214578175","lacnic","1417392000","BR","BRA","Brazil" "2214578176","2214579199","lacnic","1417392000","BR","BRA","Brazil" "2214579200","2214580223","lacnic","1417478400","BR","BRA","Brazil" +"2214580224","2214581247","lacnic","1418256000","BR","BRA","Brazil" +"2214581248","2214582271","lacnic","1417996800","BR","BRA","Brazil" +"2214582272","2214583295","lacnic","1417564800","BR","BRA","Brazil" +"2214583296","2214584319","lacnic","1417996800","BR","BRA","Brazil" +"2214584320","2214585343","lacnic","1417651200","BR","BRA","Brazil" +"2214585344","2214586367","lacnic","1418169600","BR","BRA","Brazil" +"2214586368","2214587391","lacnic","1417564800","BR","BRA","Brazil" +"2214587392","2214588415","lacnic","1417564800","BR","BRA","Brazil" +"2214588416","2214589439","lacnic","1418169600","BR","BRA","Brazil" +"2214589440","2214590463","lacnic","1417651200","BR","BRA","Brazil" +"2214590464","2214591487","lacnic","1417651200","AR","ARG","Argentina" +"2214591488","2214592511","lacnic","1418256000","BR","BRA","Brazil" "2214592512","2214658047","arin","606528000","US","USA","United States" "2214658048","2214723583","arin","624240000","US","USA","United States" "2214723584","2214789119","arin","819936000","US","USA","United States" @@ -39234,6 +39350,37 @@ "2231333888","2231334911","lacnic","1415923200","BR","BRA","Brazil" "2231334912","2231335935","lacnic","1415750400","BR","BRA","Brazil" "2231335936","2231336959","lacnic","1416528000","MX","MEX","Mexico" +"2231336960","2231337983","lacnic","1418256000","BR","BRA","Brazil" +"2231337984","2231339007","lacnic","1418947200","HN","HND","Honduras" +"2231339008","2231340031","lacnic","1419206400","BR","BRA","Brazil" +"2231340032","2231341055","lacnic","1417737600","BR","BRA","Brazil" +"2231341056","2231342079","lacnic","1417996800","BR","BRA","Brazil" +"2231342080","2231343103","lacnic","1417996800","BR","BRA","Brazil" +"2231343104","2231344127","lacnic","1418342400","BR","BRA","Brazil" +"2231344128","2231345151","lacnic","1419292800","BR","BRA","Brazil" +"2231345152","2231346175","lacnic","1418688000","BR","BRA","Brazil" +"2231346176","2231347199","lacnic","1419206400","PY","PRY","Paraguay" +"2231347200","2231348223","lacnic","1418342400","BR","BRA","Brazil" +"2231348224","2231349247","lacnic","1418688000","BR","BRA","Brazil" +"2231349248","2231350271","lacnic","1418083200","BR","BRA","Brazil" +"2231350272","2231351295","lacnic","1418083200","BR","BRA","Brazil" +"2231351296","2231352319","lacnic","1418342400","BR","BRA","Brazil" +"2231352320","2231353343","lacnic","1418169600","BR","BRA","Brazil" +"2231353344","2231354367","lacnic","1418342400","BR","BRA","Brazil" +"2231354368","2231355391","lacnic","1418601600","BR","BRA","Brazil" +"2231356416","2231357439","lacnic","1418860800","BR","BRA","Brazil" +"2231357440","2231358463","lacnic","1418860800","SV","SLV","El Salvador" +"2231358464","2231359487","lacnic","1418774400","BR","BRA","Brazil" +"2231359488","2231360511","lacnic","1418601600","BR","BRA","Brazil" +"2231360512","2231361535","lacnic","1418601600","BR","BRA","Brazil" +"2231361536","2231362559","lacnic","1418342400","AR","ARG","Argentina" +"2231362560","2231363583","lacnic","1418342400","BR","BRA","Brazil" +"2231363584","2231364607","lacnic","1418947200","BR","BRA","Brazil" +"2231364608","2231365631","lacnic","1418342400","CL","CHL","Chile" +"2231365632","2231366655","lacnic","1419206400","BR","BRA","Brazil" +"2231366656","2231367679","lacnic","1418688000","BR","BRA","Brazil" +"2231367680","2231368703","lacnic","1418688000","BR","BRA","Brazil" +"2231368704","2231369727","lacnic","1418601600","BR","BRA","Brazil" "2231369728","2248146943","apnic","857174400","JP","JPN","Japan" "2248146944","2248148991","ripencc","1320105600","IT","ITA","Italy" "2248148992","2248151039","ripencc","1320105600","ES","ESP","Spain" @@ -39591,7 +39738,10 @@ "2269839360","2269904895","arin","830822400","US","USA","United States" "2269904896","2270167039","arin","830822400","US","USA","United States" "2270167040","2270429183","arin","830822400","US","USA","United States" -"2270429184","2270494719","arin","608428800","US","USA","United States" +"2270429184","2270461951","arin","608428800","US","USA","United States" +"2270461952","2270478335","arin","608428800","US","USA","United States" +"2270478336","2270486527","arin","608428800","US","USA","United States" +"2270486528","2270490623","arin","608428800","US","USA","United States" "2270494720","2270560255","arin","830822400","FR","FRA","France" "2270560256","2270691327","arin","830822400","FR","FRA","France" "2270691328","2270756863","arin","830822400","FR","FRA","France" @@ -40026,6 +40176,33 @@ "2314993664","2315059199","arin","632534400","US","USA","United States" "2315059200","2315124735","ripencc","632793600","GB","GBR","United Kingdom" "2315124736","2315190271","arin","632534400","US","USA","United States" +"2315255808","2315256831","lacnic","1418774400","BR","BRA","Brazil" +"2315256832","2315257855","lacnic","1418860800","BR","BRA","Brazil" +"2315257856","2315258879","lacnic","1418601600","AR","ARG","Argentina" +"2315258880","2315259903","lacnic","1419292800","CL","CHL","Chile" +"2315259904","2315260927","lacnic","1418688000","BR","BRA","Brazil" +"2315260928","2315261951","lacnic","1418860800","BR","BRA","Brazil" +"2315261952","2315262975","lacnic","1419206400","BR","BRA","Brazil" +"2315262976","2315263999","lacnic","1418860800","BR","BRA","Brazil" +"2315264000","2315265023","lacnic","1418688000","BR","BRA","Brazil" +"2315265024","2315266047","lacnic","1418860800","BR","BRA","Brazil" +"2315266048","2315267071","lacnic","1418688000","VE","VEN","Venezuela" +"2315267072","2315268095","lacnic","1418688000","BR","BRA","Brazil" +"2315268096","2315269119","lacnic","1419292800","BR","BRA","Brazil" +"2315269120","2315270143","lacnic","1418774400","BR","BRA","Brazil" +"2315270144","2315271167","lacnic","1418688000","AR","ARG","Argentina" +"2315272192","2315273215","lacnic","1418774400","BR","BRA","Brazil" +"2315273216","2315274239","lacnic","1418947200","BR","BRA","Brazil" +"2315274240","2315275263","lacnic","1418860800","BR","BRA","Brazil" +"2315275264","2315276287","lacnic","1419206400","BR","BRA","Brazil" +"2315276288","2315277311","lacnic","1419206400","BR","BRA","Brazil" +"2315277312","2315278335","lacnic","1418947200","BR","BRA","Brazil" +"2315279360","2315280383","lacnic","1419206400","BR","BRA","Brazil" +"2315280384","2315281407","lacnic","1419292800","BR","BRA","Brazil" +"2315281408","2315282431","lacnic","1419292800","BR","BRA","Brazil" +"2315282432","2315283455","lacnic","1418947200","AR","ARG","Argentina" +"2315284480","2315285503","lacnic","1419292800","BR","BRA","Brazil" +"2315285504","2315286527","lacnic","1419292800","PA","PAN","Panama" "2315321344","2315386879","arin","632534400","US","USA","United States" "2315386880","2315452415","arin","632534400","US","USA","United States" "2315452416","2315517951","ripencc","746841600","SE","SWE","Sweden" @@ -42085,12 +42262,10 @@ "2455109632","2455175167","arin","665020800","US","USA","United States" "2455175168","2455240703","ripencc","665020800","GB","GBR","United Kingdom" "2455240704","2455244799","arin","665020800","US","USA","United States" -"2455245568","2455245823","arin","665020800","US","USA","United States" "2455248128","2455248383","arin","1415059200","US","USA","United States" "2455248384","2455248895","arin","665020800","US","USA","United States" "2455265280","2455273471","arin","1410998400","US","USA","United States" "2455275520","2455277567","arin","1415923200","US","USA","United States" -"2455277568","2455278079","arin","665020800","US","USA","United States" "2455278592","2455279615","arin","665020800","US","USA","United States" "2455279616","2455281663","arin","665020800","US","USA","United States" "2455285760","2455289855","arin","665020800","US","USA","United States" @@ -46142,7 +46317,7 @@ "2732078080","2732079103","arin","1372118400","US","USA","United States" "2732079104","2732081151","arin","1372032000","US","USA","United States" "2732081152","2732082175","arin","1372032000","US","USA","United States" -"2732082176","2732083199","arin","0","ZZ","ZZZ","Reserved" +"2732082176","2732083199","arin","1419206400","US","USA","United States" "2732083200","2732084223","arin","1372118400","US","USA","United States" "2732084224","2732085247","arin","1372204800","US","USA","United States" "2732085248","2732086271","arin","1372204800","US","USA","United States" @@ -46179,7 +46354,7 @@ "2732127232","2732128255","arin","1373846400","US","USA","United States" "2732128256","2732130303","arin","1373587200","US","USA","United States" "2732130304","2732131327","arin","1373846400","US","USA","United States" -"2732131328","2732132351","arin","1373846400","US","USA","United States" +"2732131328","2732132351","arin","0","ZZ","ZZZ","Reserved" "2732132352","2732134399","arin","1373846400","US","USA","United States" "2732134400","2732135423","arin","1373846400","US","USA","United States" "2732135424","2732136447","arin","1373846400","US","USA","United States" @@ -46199,7 +46374,7 @@ "2732154880","2732156927","arin","1374105600","US","USA","United States" "2732156928","2732158975","arin","1374105600","US","USA","United States" "2732158976","2732159999","arin","1374105600","US","USA","United States" -"2732160000","2732161023","arin","1374105600","US","USA","United States" +"2732160000","2732161023","arin","0","ZZ","ZZZ","Reserved" "2732161024","2732162047","arin","1374105600","US","USA","United States" "2732162048","2732163071","arin","1374105600","US","USA","United States" "2732163072","2732164095","arin","1374192000","US","USA","United States" @@ -48772,7 +48947,8 @@ "2868625408","2868641791","arin","759369600","US","USA","United States" "2868641792","2868707327","arin","759369600","US","USA","United States" "2868707328","2868723711","arin","1412035200","US","USA","United States" -"2868723712","2868740095","arin","759369600","US","USA","United States" +"2868723712","2868731903","arin","1418601600","US","USA","United States" +"2868731904","2868740095","arin","759369600","US","USA","United States" "2868740096","2868772863","arin","759369600","US","USA","United States" "2868838400","2868903935","ripencc","441763200","BE","BEL","Belgium" "2868903936","2869035007","apnic","1301443200","SG","SGP","Singapore" @@ -48930,7 +49106,7 @@ "2904555520","2904817663","arin","1217980800","CA","CAN","Canada" "2904817664","2905079807","arin","1218758400","US","USA","United States" "2905079808","2905341951","arin","1219622400","US","USA","United States" -"2905341952","2905350143","arin","1222646400","US","USA","United States" +"2905341952","2905350143","arin","0","ZZ","ZZZ","Reserved" "2905350144","2905358335","arin","1263168000","US","USA","United States" "2905358336","2905374719","arin","1263945600","US","USA","United States" "2905374720","2905407487","arin","1260489600","US","USA","United States" @@ -49020,7 +49196,7 @@ "2916253696","2916286463","arin","1254700800","CA","CAN","Canada" "2916286464","2916319231","arin","1254700800","US","USA","United States" "2916319232","2916335615","arin","1254787200","PR","PRI","Puerto Rico" -"2916335616","2916351999","arin","1291161600","US","USA","United States" +"2916335616","2916351999","arin","0","ZZ","ZZZ","Reserved" "2916352000","2916360191","arin","1253232000","US","USA","United States" "2916360192","2916364287","arin","1253232000","US","USA","United States" "2916364288","2916368383","arin","1289174400","US","USA","United States" @@ -53588,6 +53764,7 @@ "3044278272","3044343807","lacnic","1344470400","AR","ARG","Argentina" "3044343808","3044409343","lacnic","1359936000","AR","ARG","Argentina" "3044409344","3044417535","lacnic","1344556800","AR","ARG","Argentina" +"3044417536","3044425727","lacnic","1372377600","PA","PAN","Panama" "3044425728","3044442111","lacnic","1344902400","AR","ARG","Argentina" "3044442112","3044446207","lacnic","1381449600","AR","ARG","Argentina" "3044446208","3044450303","lacnic","1382400000","CO","COL","Colombia" @@ -53671,6 +53848,7 @@ "3049758720","3049762815","lacnic","1374451200","AR","ARG","Argentina" "3049762816","3049766911","lacnic","1374451200","HN","HND","Honduras" "3049766912","3049775103","lacnic","1374537600","CO","COL","Colombia" +"3049775104","3049783295","lacnic","1373241600","PA","PAN","Panama" "3049783296","3050045439","lacnic","1346025600","CL","CHL","Chile" "3050045440","3050307583","lacnic","1375660800","CO","COL","Colombia" "3050307584","3050340351","lacnic","1348531200","VE","VEN","Venezuela" @@ -56771,6 +56949,7 @@ "3120611328","3120627711","lacnic","1276128000","AR","ARG","Argentina" "3120627712","3120644095","lacnic","1221004800","NI","NIC","Nicaragua" "3120644096","3120660479","lacnic","1307491200","DO","DOM","Dominican Republic" +"3120660480","3120668671","lacnic","1276646400","PA","PAN","Panama" "3120668672","3120676863","lacnic","1319155200","CO","COL","Colombia" "3120676864","3120680959","lacnic","1277424000","HT","HTI","Haiti" "3120680960","3120685055","lacnic","1314835200","AR","ARG","Argentina" @@ -56911,6 +57090,7 @@ "3126853632","3126870015","lacnic","1227657600","AR","ARG","Argentina" "3126870016","3126874111","lacnic","1327449600","VE","VEN","Venezuela" "3126874112","3126878207","lacnic","1331856000","CR","CRI","Costa Rica" +"3126878208","3126886399","lacnic","1327536000","PA","PAN","Panama" "3126886400","3126902783","lacnic","1287705600","AR","ARG","Argentina" "3126902784","3126904831","lacnic","1327968000","AR","ARG","Argentina" "3126904832","3126906879","lacnic","1316649600","AR","ARG","Argentina" @@ -56957,6 +57137,7 @@ "3130290176","3130292223","lacnic","1368403200","AR","ARG","Argentina" "3130292224","3130294271","lacnic","1368489600","AR","ARG","Argentina" "3130294272","3130302463","lacnic","1311897600","AR","ARG","Argentina" +"3130302464","3130310655","lacnic","1316390400","PA","PAN","Panama" "3130312704","3130314751","lacnic","1318809600","AR","ARG","Argentina" "3130314752","3130315775","lacnic","1312502400","CL","CHL","Chile" "3130315776","3130316799","lacnic","1313020800","CR","CRI","Costa Rica" @@ -57024,6 +57205,7 @@ "3133059072","3133063167","lacnic","1303862400","AR","ARG","Argentina" "3133063168","3133067263","lacnic","1293062400","AR","ARG","Argentina" "3133067264","3133071359","lacnic","1293580800","PA","PAN","Panama" +"3133071360","3133073407","lacnic","1292976000","PA","PAN","Panama" "3133073408","3133074431","lacnic","1294099200","CW","CUW","Curacao" "3133074432","3133075455","lacnic","1295568000","CL","CHL","Chile" "3133075456","3133079551","lacnic","1291248000","CW","CUW","Curacao" @@ -57814,7 +57996,8 @@ "3143045120","3143049215","lacnic","1252454400","BR","BRA","Brazil" "3143049216","3143053311","lacnic","1252454400","BR","BRA","Brazil" "3143053312","3143057407","lacnic","1291248000","BR","BRA","Brazil" -"3143057408","3143061503","lacnic","1252454400","BR","BRA","Brazil" +"3143057408","3143059455","lacnic","1418947200","BR","BRA","Brazil" +"3143059456","3143061503","lacnic","1418947200","BR","BRA","Brazil" "3143061504","3143065599","lacnic","1309824000","BR","BRA","Brazil" "3143065600","3143069695","lacnic","1252454400","BR","BRA","Brazil" "3143069696","3143073791","lacnic","1309737600","BR","BRA","Brazil" @@ -57955,7 +58138,7 @@ "3145261056","3145265151","lacnic","1267401600","BR","BRA","Brazil" "3145265152","3145269247","lacnic","1267574400","BR","BRA","Brazil" "3145269248","3145302015","lacnic","1266883200","BR","BRA","Brazil" -"3145302016","3145306111","lacnic","1267488000","BR","BRA","Brazil" +"3145302016","3145306111","lacnic","1419206400","BR","BRA","Brazil" "3145306112","3145308159","lacnic","1310601600","BR","BRA","Brazil" "3145308160","3145310207","lacnic","1347580800","BR","BRA","Brazil" "3145310208","3145314303","lacnic","1267574400","BR","BRA","Brazil" @@ -58898,6 +59081,7 @@ "3187834880","3187843071","lacnic","1146182400","CW","CUW","Curacao" "3187843072","3187851263","lacnic","1156377600","CW","CUW","Curacao" "3187851264","3187855359","lacnic","1170979200","PY","PRY","Paraguay" +"3187855360","3187857407","lacnic","1309996800","PA","PAN","Panama" "3187857408","3187859455","lacnic","1330041600","CR","CRI","Costa Rica" "3187859456","3187863551","lacnic","1176940800","PA","PAN","Panama" "3187863552","3187867647","lacnic","1316649600","AR","ARG","Argentina" @@ -58980,6 +59164,7 @@ "3188260864","3188264959","lacnic","1140480000","AR","ARG","Argentina" "3188264960","3188269055","lacnic","1293580800","AR","ARG","Argentina" "3188269056","3188273151","lacnic","1181260800","PA","PAN","Panama" +"3188273152","3188275199","lacnic","1257292800","PA","PAN","Panama" "3188275200","3188277247","lacnic","1257897600","CL","CHL","Chile" "3188277248","3188285439","lacnic","1155513600","CO","COL","Colombia" "3188285440","3188293631","lacnic","1202342400","CO","COL","Colombia" @@ -59019,6 +59204,7 @@ "3188523008","3188531199","lacnic","1141171200","CO","COL","Colombia" "3188531200","3188539391","lacnic","1168473600","CO","COL","Colombia" "3188539392","3188543487","lacnic","1156809600","CL","CHL","Chile" +"3188543488","3188545535","lacnic","1304985600","PA","PAN","Panama" "3188545536","3188547583","lacnic","1306368000","AR","ARG","Argentina" "3188547584","3188551679","lacnic","1187308800","CO","COL","Colombia" "3188551680","3188552703","lacnic","1315872000","AR","ARG","Argentina" @@ -60137,10 +60323,10 @@ "3221356544","3221422079","arin","599875200","US","USA","United States" "3221422080","3221487615","arin","1370563200","US","USA","United States" "3221487616","3221491711","arin","728352000","US","USA","United States" -"3221491712","3221495807","arin","1344297600","US","USA","United States" -"3221495808","3221503999","arin","1344297600","US","USA","United States" -"3221504000","3221520383","arin","1344297600","US","USA","United States" -"3221520384","3221553151","arin","1344297600","US","USA","United States" +"3221491712","3221495807","arin","728352000","US","USA","United States" +"3221495808","3221503999","arin","728352000","US","USA","United States" +"3221504000","3221520383","arin","728352000","US","USA","United States" +"3221520384","3221553151","arin","728352000","US","USA","United States" "3221553152","3221553663","arin","1399939200","US","USA","United States" "3221553664","3221553919","arin","523756800","US","USA","United States" "3221553920","3221554175","arin","773020800","US","USA","United States" @@ -62826,7 +63012,7 @@ "3224615680","3224615935","apnic","744508800","JP","JPN","Japan" "3224616192","3224616447","apnic","744508800","JP","JPN","Japan" "3224616448","3224616959","apnic","744508800","JP","JPN","Japan" -"3224616960","3224617471","arin","0","ZZ","ZZZ","Reserved" +"3224616960","3224617471","arin","1419206400","US","USA","United States" "3224617472","3224617727","apnic","744508800","JP","JPN","Japan" "3224617728","3224617983","apnic","744508800","JP","JPN","Japan" "3224617984","3224619007","apnic","604022400","JP","JPN","Japan" @@ -63513,7 +63699,7 @@ "3225420800","3225421823","arin","1354665600","US","USA","United States" "3225421824","3225423871","arin","1355270400","CA","CAN","Canada" "3225423872","3225424383","arin","766713600","US","USA","United States" -"3225424384","3225424895","arin","0","ZZ","ZZZ","Reserved" +"3225424384","3225424895","arin","1418860800","US","USA","United States" "3225424896","3225425919","arin","1354665600","US","USA","United States" "3225425920","3225426943","arin","1354752000","US","USA","United States" "3225426944","3225427199","ripencc","758419200","AT","AUT","Austria" @@ -63559,7 +63745,7 @@ "3225459968","3225460223","arin","727574400","US","USA","United States" "3225460224","3225460479","arin","710035200","US","USA","United States" "3225460480","3225460735","arin","623376000","CA","CAN","Canada" -"3225460736","3225460991","arin","0","ZZ","ZZZ","Reserved" +"3225460736","3225460991","arin","1417737600","US","USA","United States" "3225460992","3225461247","arin","623376000","CA","CAN","Canada" "3225461248","3225461759","arin","623376000","CA","CAN","Canada" "3225461760","3225462015","arin","623376000","CA","CAN","Canada" @@ -63568,13 +63754,13 @@ "3225462784","3225464831","arin","1355788800","US","USA","United States" "3225464832","3225468927","arin","1357171200","US","USA","United States" "3225468928","3225469951","arin","1355184000","CA","CAN","Canada" -"3225469952","3225470463","arin","0","ZZ","ZZZ","Reserved" +"3225469952","3225470463","arin","1418947200","CA","CAN","Canada" "3225470464","3225470719","arin","766713600","US","USA","United States" "3225470720","3225470975","arin","1412121600","US","USA","United States" "3225470976","3225471487","arin","1414713600","US","USA","United States" "3225471488","3225471743","ripencc","441763200","DE","DEU","Germany" "3225472256","3225472511","arin","1360800000","US","USA","United States" -"3225472512","3225473023","arin","0","ZZ","ZZZ","Reserved" +"3225472512","3225473023","arin","1417478400","US","USA","United States" "3225473024","3225477119","arin","1357257600","US","USA","United States" "3225477120","3225477631","arin","1416182400","US","USA","United States" "3225477632","3225478143","arin","993686400","US","USA","United States" @@ -63986,7 +64172,7 @@ "3225662976","3225663231","arin","634348800","US","USA","United States" "3225663232","3225663487","arin","634348800","US","USA","United States" "3225663488","3225663743","arin","634435200","US","USA","United States" -"3225663744","3225663999","arin","0","ZZ","ZZZ","Reserved" +"3225663744","3225663999","arin","1417564800","US","USA","United States" "3225664000","3225664255","arin","634435200","US","USA","United States" "3225664256","3225664511","arin","634435200","US","USA","United States" "3225664512","3225664767","arin","1414540800","US","USA","United States" @@ -64240,7 +64426,7 @@ "3225774080","3225776127","arin","1357257600","US","USA","United States" "3225776128","3225776383","arin","782956800","US","USA","United States" "3225776384","3225776639","arin","1416787200","US","USA","United States" -"3225776640","3225777151","arin","0","ZZ","ZZZ","Reserved" +"3225776640","3225777151","arin","1417996800","CA","CAN","Canada" "3225777152","3225777407","arin","632793600","AU","AUS","Australia" "3225777408","3225777663","arin","699753600","US","USA","United States" "3225777664","3225778175","arin","1415923200","US","USA","United States" @@ -64251,9 +64437,9 @@ "3225781248","3225782271","arin","1355961600","CA","CAN","Canada" "3225782272","3225783295","arin","1355961600","US","USA","United States" "3225783296","3225783551","arin","966556800","US","USA","United States" -"3225783552","3225783807","arin","0","ZZ","ZZZ","Reserved" +"3225783552","3225783807","arin","1417651200","US","USA","United States" "3225783808","3225784063","arin","694656000","US","USA","United States" -"3225784064","3225784319","arin","0","ZZ","ZZZ","Reserved" +"3225784064","3225784319","arin","1417478400","US","USA","United States" "3225784320","3225785343","arin","1356048000","US","USA","United States" "3225785344","3225785599","arin","1415923200","US","USA","United States" "3225785600","3225785855","arin","781142400","CA","CAN","Canada" @@ -64335,7 +64521,8 @@ "3225853952","3225854207","arin","645408000","US","USA","United States" "3225854208","3225854463","arin","645667200","US","USA","United States" "3225854464","3225854719","arin","645667200","US","USA","United States" -"3225854720","3225855231","arin","0","ZZ","ZZZ","Reserved" +"3225854720","3225854975","arin","1417564800","US","USA","United States" +"3225854976","3225855231","arin","1418256000","US","USA","United States" "3225855232","3225855487","arin","645667200","US","USA","United States" "3225855488","3225855743","arin","645667200","US","USA","United States" "3225855744","3225855999","arin","645840000","US","USA","United States" @@ -64407,9 +64594,9 @@ "3225877504","3225877759","arin","640483200","US","USA","United States" "3225877760","3225878015","arin","640483200","US","USA","United States" "3225878016","3225878271","arin","640483200","US","USA","United States" -"3225878272","3225878527","arin","0","ZZ","ZZZ","Reserved" +"3225878272","3225878527","arin","1418256000","US","USA","United States" "3225878528","3225944063","ripencc","953251200","SE","SWE","Sweden" -"3225944064","3225944575","arin","0","ZZ","ZZZ","Reserved" +"3225944064","3225944575","arin","1417996800","US","USA","United States" "3225944576","3225944831","arin","1417392000","US","USA","United States" "3225944832","3225945087","apnic","723859200","TW","TWN","Taiwan; Republic of China (ROC)" "3225945088","3225945343","apnic","723859200","TW","TWN","Taiwan; Republic of China (ROC)" @@ -64480,7 +64667,7 @@ "3226013440","3226013695","arin","647049600","US","USA","United States" "3226013696","3226013951","arin","647049600","US","USA","United States" "3226013952","3226014207","arin","647049600","US","USA","United States" -"3226014208","3226014463","arin","0","ZZ","ZZZ","Reserved" +"3226014208","3226014463","arin","1417478400","US","USA","United States" "3226014464","3226014719","ripencc","647136000","GB","GBR","United Kingdom" "3226014720","3226014975","ripencc","647136000","GB","GBR","United Kingdom" "3226014976","3226015231","apnic","647481600","NZ","NZL","New Zealand" @@ -64531,7 +64718,7 @@ "3226026496","3226026751","apnic","648691200","AU","AUS","Australia" "3226026752","3226027007","arin","648691200","US","USA","United States" "3226027008","3226027263","arin","649382400","US","USA","United States" -"3226027264","3226027519","arin","0","ZZ","ZZZ","Reserved" +"3226027264","3226027519","arin","1417737600","US","USA","United States" "3226027520","3226027775","arin","649382400","US","USA","United States" "3226027776","3226028031","arin","649382400","US","USA","United States" "3226028032","3226028287","arin","649382400","US","USA","United States" @@ -64569,7 +64756,7 @@ "3226065920","3226066175","arin","638409600","US","USA","United States" "3226066176","3226066431","arin","638409600","US","USA","United States" "3226066432","3226066687","arin","638409600","US","USA","United States" -"3226066688","3226066943","arin","0","ZZ","ZZZ","Reserved" +"3226066688","3226066943","arin","1418688000","US","USA","United States" "3226066944","3226067199","arin","638409600","US","USA","United States" "3226067200","3226067455","arin","651801600","US","USA","United States" "3226067456","3226067711","ripencc","651801600","BE","BEL","Belgium" @@ -64620,7 +64807,7 @@ "3226142720","3226142975","arin","638409600","CA","CAN","Canada" "3226142976","3226143231","arin","638409600","CA","CAN","Canada" "3226143232","3226143487","arin","638409600","CA","CAN","Canada" -"3226143488","3226143743","arin","0","ZZ","ZZZ","Reserved" +"3226143488","3226143743","arin","1417478400","US","USA","United States" "3226143744","3226143999","arin","638409600","CA","CAN","Canada" "3226144000","3226144255","arin","638409600","CA","CAN","Canada" "3226144256","3226144511","arin","646704000","CA","CAN","Canada" @@ -64671,7 +64858,7 @@ "3226155776","3226156031","arin","659923200","CA","CAN","Canada" "3226156032","3226156287","arin","659923200","CA","CAN","Canada" "3226156288","3226156543","arin","659923200","CA","CAN","Canada" -"3226156544","3226156799","arin","0","ZZ","ZZZ","Reserved" +"3226156544","3226156799","arin","1417737600","US","USA","United States" "3226156800","3226157055","arin","663984000","CA","CAN","Canada" "3226157056","3226157311","arin","679190400","CA","CAN","Canada" "3226157312","3226157567","arin","663897600","CA","CAN","Canada" @@ -64739,7 +64926,8 @@ "3226174464","3226174719","arin","697248000","CA","CAN","Canada" "3226174720","3226174975","arin","697248000","CA","CAN","Canada" "3226174976","3226175231","arin","693014400","CA","CAN","Canada" -"3226175232","3226175743","arin","0","ZZ","ZZZ","Reserved" +"3226175232","3226175487","arin","1417737600","US","USA","United States" +"3226175488","3226175743","arin","1418169600","US","USA","United States" "3226176000","3226176255","arin","674092800","CA","CAN","Canada" "3226176256","3226176511","arin","674092800","CA","CAN","Canada" "3226176512","3226176767","arin","674092800","CA","CAN","Canada" @@ -64789,14 +64977,15 @@ "3226187776","3226188031","arin","638409600","CA","CAN","Canada" "3226188032","3226188287","arin","638409600","CA","CAN","Canada" "3226188288","3226188543","arin","696556800","CA","CAN","Canada" -"3226188544","3226189055","arin","0","ZZ","ZZZ","Reserved" +"3226188544","3226188799","arin","1418083200","PR","PRI","Puerto Rico" +"3226188800","3226189055","arin","0","ZZ","ZZZ","Reserved" "3226189056","3226189311","arin","711849600","CA","CAN","Canada" -"3226189312","3226189567","arin","0","ZZ","ZZZ","Reserved" +"3226189312","3226189567","arin","1418342400","CA","CAN","Canada" "3226189568","3226189823","arin","798163200","CA","CAN","Canada" "3226189824","3226190847","arin","1356480000","US","USA","United States" "3226190848","3226191359","arin","1416960000","US","USA","United States" "3226191360","3226191615","arin","799027200","US","USA","United States" -"3226191616","3226191871","arin","0","ZZ","ZZZ","Reserved" +"3226191616","3226191871","arin","1418256000","US","USA","United States" "3226191872","3226192383","arin","799027200","CA","CAN","Canada" "3226192384","3226192639","arin","799027200","CA","CAN","Canada" "3226192640","3226192895","arin","696470400","CA","CAN","Canada" @@ -64804,9 +64993,9 @@ "3226193408","3226193663","arin","798854400","CA","CAN","Canada" "3226193664","3226193919","arin","762134400","CA","CAN","Canada" "3226193920","3226194175","arin","693014400","CA","CAN","Canada" -"3226194176","3226194431","arin","0","ZZ","ZZZ","Reserved" +"3226194176","3226194431","arin","1418601600","US","USA","United States" "3226194432","3226194687","arin","735264000","CA","CAN","Canada" -"3226194688","3226194943","arin","0","ZZ","ZZZ","Reserved" +"3226194688","3226194943","arin","1418256000","US","USA","United States" "3226194944","3226195199","arin","707443200","CA","CAN","Canada" "3226195200","3226195455","arin","741916800","CA","CAN","Canada" "3226195456","3226195967","arin","694310400","CA","CAN","Canada" @@ -64833,7 +65022,7 @@ "3226205184","3226205439","arin","694656000","CA","CAN","Canada" "3226205440","3226205695","arin","694828800","CA","CAN","Canada" "3226205696","3226205951","arin","694915200","CA","CAN","Canada" -"3226205952","3226206207","arin","0","ZZ","ZZZ","Reserved" +"3226205952","3226206207","arin","1418601600","US","USA","United States" "3226206208","3226207231","arin","1356480000","US","USA","United States" "3226207232","3226207743","arin","1416441600","US","USA","United States" "3226207744","3226212095","ripencc","650678400","GB","GBR","United Kingdom" @@ -64846,9 +65035,9 @@ "3226230784","3226234879","arin","651801600","US","USA","United States" "3226234880","3226235903","arin","651801600","US","USA","United States" "3226235904","3226236159","arin","638409600","US","USA","United States" -"3226236160","3226236415","arin","0","ZZ","ZZZ","Reserved" +"3226236160","3226236415","arin","1418342400","US","USA","United States" "3226236416","3226236927","arin","1416528000","US","USA","United States" -"3226236928","3226237183","arin","0","ZZ","ZZZ","Reserved" +"3226236928","3226237183","arin","1418601600","US","USA","United States" "3226237184","3226237439","arin","638409600","US","USA","United States" "3226237440","3226237695","apnic","638409600","AU","AUS","Australia" "3226237696","3226237951","ripencc","653529600","DE","DEU","Germany" @@ -64861,7 +65050,7 @@ "3226239488","3226239743","ripencc","653529600","DE","DEU","Germany" "3226239744","3226239999","ripencc","653529600","DE","DEU","Germany" "3226240000","3226240255","ripencc","653529600","DE","DEU","Germany" -"3226240256","3226240511","arin","0","ZZ","ZZZ","Reserved" +"3226240256","3226240511","arin","1418688000","US","USA","United States" "3226240512","3226240767","ripencc","720748800","DE","DEU","Germany" "3226240768","3226241023","ripencc","653529600","DE","DEU","Germany" "3226241024","3226241279","ripencc","653529600","DE","DEU","Germany" @@ -64909,7 +65098,7 @@ "3226252800","3226253055","arin","653702400","US","USA","United States" "3226253056","3226253311","arin","653702400","US","USA","United States" "3226253312","3226253567","arin","653702400","US","USA","United States" -"3226253568","3226253823","arin","0","ZZ","ZZZ","Reserved" +"3226253568","3226253823","arin","1418688000","US","USA","United States" "3226253824","3226254079","arin","653702400","US","USA","United States" "3226254080","3226254335","arin","653788800","US","USA","United States" "3226254336","3226254591","arin","653788800","US","USA","United States" @@ -64976,7 +65165,8 @@ "3226269952","3226270207","arin","655344000","US","USA","United States" "3226270208","3226270463","arin","655430400","US","USA","United States" "3226270464","3226270719","arin","646704000","US","USA","United States" -"3226271488","3226271999","arin","0","ZZ","ZZZ","Reserved" +"3226271488","3226271743","arin","0","ZZ","ZZZ","Reserved" +"3226271744","3226271999","arin","1418601600","US","USA","United States" "3226272000","3226272255","arin","646704000","US","USA","United States" "3226272256","3226272767","arin","646704000","US","USA","United States" "3226272768","3226273279","arin","646704000","US","USA","United States" @@ -64992,8 +65182,8 @@ "3226275840","3226276095","arin","656121600","US","USA","United States" "3226276352","3226276607","arin","656121600","US","USA","United States" "3226276608","3226276863","arin","656121600","US","USA","United States" -"3226276864","3226277375","arin","0","ZZ","ZZZ","Reserved" -"3226277376","3226277631","arin","0","ZZ","ZZZ","Reserved" +"3226276864","3226277375","arin","1417478400","US","USA","United States" +"3226277376","3226277631","arin","1418601600","US","USA","United States" "3226277632","3226277887","arin","658108800","US","USA","United States" "3226277888","3226278143","arin","656121600","US","USA","United States" "3226278144","3226278399","arin","656121600","US","USA","United States" @@ -65106,12 +65296,12 @@ "3226316288","3226316543","arin","696556800","US","USA","United States" "3226316544","3226316799","arin","696556800","US","USA","United States" "3226316800","3226317823","arin","1356480000","US","USA","United States" -"3226317824","3226318079","arin","0","ZZ","ZZZ","Reserved" +"3226317824","3226318079","arin","1418774400","US","USA","United States" "3226318080","3226318335","arin","696556800","US","USA","United States" "3226318336","3226318847","arin","1417392000","US","USA","United States" -"3226318848","3226319359","arin","0","ZZ","ZZZ","Reserved" +"3226318848","3226319359","arin","1417478400","US","USA","United States" "3226319360","3226319615","arin","696556800","US","USA","United States" -"3226319616","3226319871","arin","0","ZZ","ZZZ","Reserved" +"3226319616","3226319871","arin","1418947200","US","USA","United States" "3226319872","3226320895","arin","1356566400","US","USA","United States" "3226320896","3226329087","arin","696556800","US","USA","United States" "3226329088","3226331135","arin","696556800","US","USA","United States" @@ -65121,7 +65311,7 @@ "3226331904","3226332159","arin","0","ZZ","ZZZ","Reserved" "3226332160","3226333183","arin","1356566400","US","USA","United States" "3226333184","3226337279","arin","1358121600","US","USA","United States" -"3226337280","3226337535","arin","0","ZZ","ZZZ","Reserved" +"3226337280","3226337535","arin","1418688000","US","USA","United States" "3226337536","3226337791","arin","623376000","US","USA","United States" "3226337792","3226338303","arin","623376000","US","USA","United States" "3226338304","3226339327","arin","623376000","US","USA","United States" @@ -65139,7 +65329,7 @@ "3226386432","3226402815","arin","644198400","US","USA","United States" "3226402816","3226468351","arin","638409600","US","USA","United States" "3226468352","3226470399","arin","1357603200","US","USA","United States" -"3226470400","3226470655","arin","0","ZZ","ZZZ","Reserved" +"3226470400","3226470655","arin","1418774400","US","USA","United States" "3226470656","3226470911","arin","640915200","US","USA","United States" "3226470912","3226471167","arin","640915200","US","USA","United States" "3226471168","3226471423","arin","640915200","US","USA","United States" @@ -65152,9 +65342,10 @@ "3226473984","3226474239","arin","641088000","US","USA","United States" "3226474240","3226474495","arin","641174400","US","USA","United States" "3226474496","3226474751","lacnic","641433600","CL","CHL","Chile" -"3226474752","3226475263","arin","0","ZZ","ZZZ","Reserved" +"3226474752","3226475007","arin","0","ZZ","ZZZ","Reserved" +"3226475008","3226475263","arin","1418947200","US","USA","United States" "3226475264","3226475519","arin","641606400","US","USA","United States" -"3226475520","3226475775","arin","0","ZZ","ZZZ","Reserved" +"3226475520","3226475775","arin","1418860800","US","USA","United States" "3226475776","3226476031","arin","641606400","US","USA","United States" "3226476032","3226476287","arin","641606400","US","USA","United States" "3226476288","3226476543","ripencc","641692800","CH","CHE","Switzerland" @@ -65171,7 +65362,7 @@ "3226479104","3226479359","ripencc","641692800","CH","CHE","Switzerland" "3226479360","3226479615","arin","641692800","US","USA","United States" "3226479616","3226479871","arin","817257600","US","USA","United States" -"3226479872","3226480127","arin","0","ZZ","ZZZ","Reserved" +"3226479872","3226480127","arin","1418947200","US","USA","United States" "3226480128","3226480383","ripencc","642038400","GB","GBR","United Kingdom" "3226480384","3226480639","arin","642038400","US","USA","United States" "3226480640","3226480895","arin","642038400","US","USA","United States" @@ -65187,7 +65378,7 @@ "3226483200","3226483967","arin","0","ZZ","ZZZ","Reserved" "3226483968","3226484223","arin","643248000","US","USA","United States" "3226484224","3226484479","arin","667180800","US","USA","United States" -"3226484480","3226484735","arin","0","ZZ","ZZZ","Reserved" +"3226484480","3226484735","arin","1419206400","US","USA","United States" "3226484736","3226484991","arin","720835200","US","USA","United States" "3226484992","3226485247","arin","670464000","US","USA","United States" "3226485248","3226485503","arin","670809600","US","USA","United States" @@ -65198,7 +65389,8 @@ "3226486528","3226486783","arin","672624000","US","USA","United States" "3226486784","3226487039","arin","673228800","US","USA","United States" "3226487040","3226487295","arin","675648000","US","USA","United States" -"3226487296","3226488063","arin","0","ZZ","ZZZ","Reserved" +"3226487296","3226487807","arin","1417737600","US","USA","United States" +"3226487808","3226488063","arin","1418860800","US","USA","United States" "3226488064","3226488319","arin","677289600","US","USA","United States" "3226488320","3226488575","arin","643248000","US","USA","United States" "3226488576","3226488831","arin","643248000","US","USA","United States" @@ -65217,7 +65409,8 @@ "3226501120","3226517503","arin","1354665600","US","USA","United States" "3226517504","3226519551","arin","1357603200","US","USA","United States" "3226519552","3226520575","arin","1356566400","US","USA","United States" -"3226520576","3226521343","arin","0","ZZ","ZZZ","Reserved" +"3226520576","3226521087","arin","1418083200","US","USA","United States" +"3226521088","3226521343","arin","0","ZZ","ZZZ","Reserved" "3226521344","3226521599","arin","643420800","US","USA","United States" "3226521600","3226521855","arin","643420800","US","USA","United States" "3226521856","3226522111","lacnic","643420800","BR","BRA","Brazil" @@ -65236,39 +65429,47 @@ "3226533632","3226533887","arin","0","ZZ","ZZZ","Reserved" "3226533888","3226535935","arin","1357776000","US","USA","United States" "3226535936","3226536191","arin","708134400","US","USA","United States" -"3226536192","3226536959","arin","0","ZZ","ZZZ","Reserved" +"3226536192","3226536447","arin","0","ZZ","ZZZ","Reserved" +"3226536448","3226536959","arin","1418169600","US","USA","United States" "3226536960","3226537983","arin","1356566400","CA","CAN","Canada" "3226537984","3226542079","arin","1358121600","CA","CAN","Canada" "3226542080","3226546175","arin","1358121600","US","USA","United States" "3226546176","3226546431","arin","916185600","US","USA","United States" -"3226546432","3226547199","arin","0","ZZ","ZZZ","Reserved" +"3226546432","3226546687","arin","0","ZZ","ZZZ","Reserved" +"3226546688","3226547199","arin","1418169600","US","USA","United States" "3226547200","3226548223","arin","1356566400","CA","CAN","Canada" -"3226548224","3226548991","arin","0","ZZ","ZZZ","Reserved" +"3226548224","3226548735","arin","1418083200","CA","CAN","Canada" +"3226548736","3226548991","arin","0","ZZ","ZZZ","Reserved" "3226548992","3226549247","ripencc","769219200","BE","BEL","Belgium" "3226549248","3226549503","arin","0","ZZ","ZZZ","Reserved" "3226549504","3226550015","ripencc","809827200","GB","GBR","United Kingdom" -"3226550016","3226551039","arin","0","ZZ","ZZZ","Reserved" +"3226550016","3226550271","arin","1419206400","US","USA","United States" +"3226550272","3226550783","arin","1418083200","US","USA","United States" +"3226550784","3226551039","arin","0","ZZ","ZZZ","Reserved" "3226551040","3226551295","arin","676166400","US","USA","United States" "3226551296","3226551807","arin","676166400","US","USA","United States" -"3226551808","3226552831","arin","0","ZZ","ZZZ","Reserved" +"3226551808","3226552319","arin","1418774400","CA","CAN","Canada" +"3226552320","3226552831","arin","1419379200","VI","VIR","Virgin Islands (U.S.)" "3226552832","3226553087","arin","797644800","US","USA","United States" "3226553088","3226553343","arin","0","ZZ","ZZZ","Reserved" "3226553344","3226554367","arin","1356566400","US","USA","United States" "3226554368","3226555391","arin","1356652800","US","USA","United States" -"3226555392","3226555647","arin","0","ZZ","ZZZ","Reserved" +"3226555392","3226555647","arin","1419379200","CA","CAN","Canada" "3226555648","3226555903","arin","844300800","CA","CAN","Canada" -"3226555904","3226556415","arin","0","ZZ","ZZZ","Reserved" +"3226555904","3226556415","arin","1418256000","US","USA","United States" "3226556416","3226556671","arin","739756800","US","USA","United States" -"3226556672","3226557439","arin","0","ZZ","ZZZ","Reserved" +"3226556672","3226556927","arin","0","ZZ","ZZZ","Reserved" +"3226556928","3226557439","arin","1418342400","US","USA","United States" "3226557440","3226558463","arin","1356652800","US","USA","United States" "3226558464","3226558719","arin","0","ZZ","ZZZ","Reserved" "3226558720","3226558975","arin","751680000","US","USA","United States" -"3226558976","3226559487","arin","0","ZZ","ZZZ","Reserved" +"3226558976","3226559487","arin","1418860800","US","USA","United States" "3226559488","3226560511","arin","1356652800","US","USA","United States" "3226560512","3226561535","arin","1357084800","US","USA","United States" "3226561536","3226561791","arin","0","ZZ","ZZZ","Reserved" "3226561792","3226562047","ripencc","726883200","NO","NOR","Norway" -"3226562048","3226563071","arin","0","ZZ","ZZZ","Reserved" +"3226562048","3226562559","arin","1418342400","US","USA","United States" +"3226562560","3226563071","arin","1418342400","US","USA","United States" "3226563072","3226563327","arin","993686400","US","USA","United States" "3226563328","3226563583","arin","0","ZZ","ZZZ","Reserved" "3226563584","3226564607","arin","1357084800","US","USA","United States" @@ -65281,10 +65482,12 @@ "3226568704","3226569727","arin","1357171200","US","USA","United States" "3226569728","3226569983","arin","0","ZZ","ZZZ","Reserved" "3226569984","3226570239","arin","1077667200","US","USA","United States" -"3226570240","3226570751","arin","0","ZZ","ZZZ","Reserved" +"3226570240","3226570751","arin","1419206400","US","USA","United States" "3226570752","3226574847","arin","1358208000","US","USA","United States" "3226574848","3226575103","ripencc","746841600","FI","FIN","Finland" -"3226575104","3226576383","arin","0","ZZ","ZZZ","Reserved" +"3226575104","3226575359","arin","0","ZZ","ZZZ","Reserved" +"3226575360","3226575871","arin","1418342400","CA","CAN","Canada" +"3226575872","3226576383","arin","1418601600","CA","CAN","Canada" "3226576384","3226576639","arin","782956800","US","USA","United States" "3226576640","3226576895","arin","0","ZZ","ZZZ","Reserved" "3226576896","3226578943","arin","1358121600","CA","CAN","Canada" @@ -65304,16 +65507,17 @@ "3226585088","3226587135","arin","1358208000","US","USA","United States" "3226587136","3226591231","arin","1358380800","US","USA","United States" "3226591232","3226592255","arin","1357257600","CA","CAN","Canada" -"3226592256","3226592767","arin","0","ZZ","ZZZ","Reserved" +"3226592256","3226592767","arin","1418860800","US","USA","United States" "3226592768","3226593023","ripencc","441763200","DE","DEU","Germany" -"3226593024","3226593791","arin","0","ZZ","ZZZ","Reserved" +"3226593024","3226593279","arin","0","ZZ","ZZZ","Reserved" +"3226593280","3226593791","arin","0","ZZ","ZZZ","Reserved" "3226593792","3226594047","ripencc","441763200","GB","GBR","United Kingdom" "3226594048","3226594303","arin","0","ZZ","ZZZ","Reserved" "3226594304","3226595327","arin","1357257600","US","USA","United States" "3226595328","3226597375","arin","1358208000","US","USA","United States" "3226597376","3226598399","arin","1357257600","US","USA","United States" "3226598400","3226598911","arin","1055116800","US","USA","United States" -"3226598912","3226599423","arin","0","ZZ","ZZZ","Reserved" +"3226598912","3226599423","arin","1418688000","US","USA","United States" "3226599424","3226615807","arin","644025600","US","USA","United States" "3226615808","3226623999","arin","644025600","US","USA","United States" "3226624000","3226625023","arin","644025600","US","USA","United States" @@ -65358,7 +65562,8 @@ "3226635520","3226635775","arin","649296000","US","USA","United States" "3226635776","3226636031","afrinic","649296000","ZA","ZAF","South Africa" "3226636032","3226636287","apnic","649296000","AU","AUS","Australia" -"3226636288","3226637055","arin","0","ZZ","ZZZ","Reserved" +"3226636288","3226636799","arin","0","ZZ","ZZZ","Reserved" +"3226636800","3226637055","arin","0","ZZ","ZZZ","Reserved" "3226637056","3226637311","arin","649641600","US","USA","United States" "3226637312","3226637567","arin","649641600","US","USA","United States" "3226637568","3226637823","arin","649641600","US","USA","United States" @@ -65380,7 +65585,8 @@ "3226644480","3226648575","arin","680832000","US","USA","United States" "3226648576","3226652671","arin","680832000","US","USA","United States" "3226652672","3226652927","arin","680918400","US","USA","United States" -"3226652928","3226653695","arin","0","ZZ","ZZZ","Reserved" +"3226652928","3226653183","arin","0","ZZ","ZZZ","Reserved" +"3226653184","3226653695","arin","1419206400","US","USA","United States" "3226653696","3226653951","arin","650246400","US","USA","United States" "3226653952","3226654207","arin","650246400","US","USA","United States" "3226654208","3226654463","ripencc","650505600","PT","PRT","Portugal" @@ -65409,7 +65615,8 @@ "3226661120","3226661375","ripencc","638409600","DE","DEU","Germany" "3226661376","3226661887","arin","0","ZZ","ZZZ","Reserved" "3226661888","3226662143","arin","638409600","US","USA","United States" -"3226662144","3226662911","arin","0","ZZ","ZZZ","Reserved" +"3226662144","3226662399","arin","0","ZZ","ZZZ","Reserved" +"3226662400","3226662911","arin","0","ZZ","ZZZ","Reserved" "3226662912","3226664959","arin","1358294400","US","USA","United States" "3226664960","3226690815","ripencc","746841600","FI","FIN","Finland" "3226690816","3226691071","arin","652665600","CA","CAN","Canada" @@ -65422,7 +65629,7 @@ "3226692864","3226693119","arin","652665600","US","USA","United States" "3226693120","3226693375","arin","0","ZZ","ZZZ","Reserved" "3226693376","3226693631","arin","652665600","US","USA","United States" -"3226693632","3226694143","arin","0","ZZ","ZZZ","Reserved" +"3226693632","3226694143","arin","1419206400","US","USA","United States" "3226694144","3226694399","arin","652665600","US","USA","United States" "3226694400","3226694655","arin","653529600","US","USA","United States" "3226694656","3226694911","arin","653529600","US","USA","United States" @@ -65520,7 +65727,8 @@ "3226729216","3226729471","arin","655344000","US","USA","United States" "3226729472","3226729727","arin","655344000","US","USA","United States" "3226729728","3226729983","arin","655344000","US","USA","United States" -"3226729984","3226731007","arin","0","ZZ","ZZZ","Reserved" +"3226729984","3226730495","arin","1418947200","US","USA","United States" +"3226730496","3226731007","arin","0","ZZ","ZZZ","Reserved" "3226731008","3226731263","arin","655344000","US","USA","United States" "3226731264","3226731519","arin","655344000","US","USA","United States" "3226731520","3226731775","arin","0","ZZ","ZZZ","Reserved" @@ -65550,11 +65758,12 @@ "3226738432","3226738687","arin","656640000","US","USA","United States" "3226738688","3226738943","ripencc","656640000","NO","NOR","Norway" "3226738944","3226739199","ripencc","656640000","NO","NOR","Norway" -"3226739200","3226739711","arin","0","ZZ","ZZZ","Reserved" +"3226739200","3226739711","arin","1419379200","US","USA","United States" "3226739712","3226740735","arin","1357516800","US","USA","United States" "3226740736","3226742783","arin","656640000","US","USA","United States" "3226742784","3226743807","arin","1357516800","US","USA","United States" -"3226743808","3226744575","arin","0","ZZ","ZZZ","Reserved" +"3226743808","3226744319","arin","0","ZZ","ZZZ","Reserved" +"3226744320","3226744575","arin","0","ZZ","ZZZ","Reserved" "3226744576","3226744831","arin","656899200","US","USA","United States" "3226744832","3226745087","arin","656640000","US","USA","United States" "3226745088","3226745343","arin","656640000","US","USA","United States" @@ -74242,12 +74451,14 @@ "3234840576","3234840831","arin","716083200","US","USA","United States" "3234840832","3234841087","arin","716083200","US","USA","United States" "3234841088","3234841343","lacnic","716083200","BR","BRA","Brazil" +"3234841344","3234841599","lacnic","1418342400","BR","BRA","Brazil" "3234841600","3234841855","ripencc","716083200","PT","PRT","Portugal" "3234841856","3234842111","apnic","716083200","AU","AUS","Australia" "3234842112","3234842367","apnic","716083200","AU","AUS","Australia" "3234842368","3234842623","arin","716083200","US","USA","United States" "3234842624","3234843647","lacnic","1403049600","BR","BRA","Brazil" "3234843648","3234844159","lacnic","1411430400","MX","MEX","Mexico" +"3234844160","3234844415","lacnic","1418342400","BR","BRA","Brazil" "3234844416","3234844671","arin","716169600","US","USA","United States" "3234844672","3234844927","arin","725068800","US","USA","United States" "3234844928","3234845183","arin","716169600","US","USA","United States" @@ -74869,6 +75080,8 @@ "3236408320","3236408575","arin","718934400","CA","CAN","Canada" "3236408576","3236408831","arin","718934400","CA","CAN","Canada" "3236408832","3236409087","arin","718934400","CA","CAN","Canada" +"3236409088","3236409343","lacnic","1418947200","BR","BRA","Brazil" +"3236409344","3236409599","lacnic","1418947200","BR","BRA","Brazil" "3236409600","3236409855","arin","718934400","US","USA","United States" "3236409856","3236410111","arin","718934400","US","USA","United States" "3236410112","3236410367","arin","718934400","US","USA","United States" @@ -75322,6 +75535,7 @@ "3237288192","3237288447","arin","720144000","US","USA","United States" "3237288448","3237288959","arin","720144000","US","USA","United States" "3237288960","3237289471","arin","720144000","US","USA","United States" +"3237289472","3237289727","lacnic","1418947200","BR","BRA","Brazil" "3237289728","3237289983","arin","720144000","US","USA","United States" "3237289984","3237290239","arin","720144000","US","USA","United States" "3237290240","3237290495","arin","720144000","US","USA","United States" @@ -75441,7 +75655,7 @@ "3237328640","3237328895","arin","722044800","CA","CAN","Canada" "3237328896","3237329151","arin","722044800","US","USA","United States" "3237329152","3237329407","apnic","722044800","NZ","NZL","New Zealand" -"3237329408","3237329663","arin","722044800","US","USA","United States" +"3237329408","3237329663","arin","0","ZZ","ZZZ","Reserved" "3237329664","3237329919","arin","722044800","US","USA","United States" "3237329920","3237330175","arin","722044800","US","USA","United States" "3237330176","3237330431","arin","722044800","US","USA","United States" @@ -93920,7 +94134,9 @@ "3323215872","3323232255","arin","1345766400","US","USA","United States" "3323232256","3323240447","arin","1363824000","US","USA","United States" "3323240448","3323248639","arin","1364774400","US","USA","United States" -"3323248640","3323256831","arin","1364774400","US","USA","United States" +"3323248640","3323252735","arin","1364774400","US","USA","United States" +"3323252736","3323254783","arin","1364774400","US","USA","United States" +"3323254784","3323256831","arin","1418774400","US","USA","United States" "3323256832","3323265023","arin","1365379200","US","USA","United States" "3323265024","3323267071","arin","1364774400","US","USA","United States" "3323267072","3323269119","arin","722649600","US","USA","United States" @@ -95419,9 +95635,9 @@ "3326697216","3326697471","arin","1384905600","US","USA","United States" "3326697472","3326699519","arin","1365552000","US","USA","United States" "3326699520","3326699775","arin","1384905600","CA","CAN","Canada" -"3326699776","3326700031","arin","734572800","CA","CAN","Canada" -"3326700032","3326700543","arin","734572800","CA","CAN","Canada" -"3326700544","3326700799","arin","734572800","CA","CAN","Canada" +"3326699776","3326700031","arin","734572800","US","USA","United States" +"3326700032","3326700543","arin","734572800","US","USA","United States" +"3326700544","3326700799","arin","734572800","US","USA","United States" "3326700800","3326701055","arin","734745600","CA","CAN","Canada" "3326701056","3326701567","arin","734745600","CA","CAN","Canada" "3326701568","3326702591","arin","734745600","CA","CAN","Canada" @@ -95486,7 +95702,7 @@ "3326721280","3326721535","arin","737251200","CA","CAN","Canada" "3326721536","3326721791","arin","737251200","CA","CAN","Canada" "3326721792","3326722047","arin","737596800","CA","CAN","Canada" -"3326722048","3326726143","arin","774489600","CA","CAN","Canada" +"3326722048","3326726143","arin","774489600","US","USA","United States" "3326726144","3326726399","arin","738547200","CA","CAN","Canada" "3326726400","3326726655","arin","1384992000","US","USA","United States" "3326726656","3326726911","arin","1385078400","CA","CAN","Canada" @@ -97301,7 +97517,7 @@ "3331559424","3331559679","arin","738547200","US","USA","United States" "3331559680","3331559935","arin","738547200","US","USA","United States" "3331559936","3331560191","arin","738547200","US","USA","United States" -"3331560192","3331560447","arin","738547200","US","USA","United States" +"3331560192","3331560447","arin","0","ZZ","ZZZ","Reserved" "3331560448","3331560703","arin","738547200","US","USA","United States" "3331560704","3331560959","arin","738547200","US","USA","United States" "3331560960","3331561215","arin","738547200","US","USA","United States" @@ -102747,7 +102963,7 @@ "3341053952","3341054975","arin","1320192000","US","USA","United States" "3341054976","3341055999","arin","1320192000","US","USA","United States" "3341056000","3341057023","arin","1320278400","US","USA","United States" -"3341057024","3341058047","arin","1320624000","US","USA","United States" +"3341057024","3341058047","arin","0","ZZ","ZZZ","Reserved" "3341058048","3341059071","arin","1284940800","US","USA","United States" "3341059072","3341060095","arin","1284940800","US","USA","United States" "3341060096","3341062143","arin","1284940800","US","USA","United States" @@ -106361,7 +106577,7 @@ "3351780352","3351781375","arin","1317081600","US","USA","United States" "3351781376","3351785471","arin","765417600","US","USA","United States" "3351785472","3351786495","arin","1339027200","US","USA","United States" -"3351786496","3351787519","arin","0","ZZ","ZZZ","Reserved" +"3351786496","3351787519","arin","1339027200","US","USA","United States" "3351787520","3351789567","arin","1339027200","US","USA","United States" "3351789568","3351797759","arin","762652800","US","USA","United States" "3351797760","3351798783","arin","1339113600","US","USA","United States" @@ -106604,7 +106820,7 @@ "3352069120","3352070143","arin","1271808000","US","USA","United States" "3352070144","3352071167","arin","1271894400","US","USA","United States" "3352071168","3352072191","arin","1271894400","US","USA","United States" -"3352072192","3352074239","arin","1271894400","US","USA","United States" +"3352072192","3352074239","arin","0","ZZ","ZZZ","Reserved" "3352074240","3352075263","arin","1271894400","US","USA","United States" "3352075264","3352076287","arin","1271980800","US","USA","United States" "3352076288","3352077311","arin","1272240000","US","USA","United States" @@ -108488,6 +108704,8 @@ "3356078336","3356078591","lacnic","754012800","CL","CHL","Chile" "3356078592","3356079103","lacnic","754012800","CL","CHL","Chile" "3356079104","3356079359","lacnic","754012800","CL","CHL","Chile" +"3356079616","3356080127","lacnic","1417651200","MX","MEX","Mexico" +"3356080128","3356080639","lacnic","1417651200","MX","MEX","Mexico" "3356080896","3356081151","lacnic","754531200","NI","NIC","Nicaragua" "3356081152","3356082175","lacnic","754531200","NI","NIC","Nicaragua" "3356082176","3356082431","lacnic","754531200","NI","NIC","Nicaragua" @@ -108876,6 +109094,8 @@ "3356969472","3356969727","lacnic","823046400","MX","MEX","Mexico" "3356969728","3356969983","lacnic","1028505600","MX","MEX","Mexico" "3356969984","3356970495","lacnic","823046400","MX","MEX","Mexico" +"3356970496","3356971007","lacnic","1417737600","MX","MEX","Mexico" +"3356971008","3356971519","lacnic","1417737600","MX","MEX","Mexico" "3356971520","3356971775","lacnic","823046400","MX","MEX","Mexico" "3356971776","3356972031","lacnic","823046400","MX","MEX","Mexico" "3356972288","3356972543","lacnic","962755200","MX","MEX","Mexico" @@ -110634,7 +110854,11 @@ "3375452160","3375456255","lacnic","1306972800","BR","BRA","Brazil" "3375456256","3375464447","lacnic","1285200000","BR","BRA","Brazil" "3375464448","3375468543","lacnic","1125446400","BR","BRA","Brazil" -"3375468544","3375472639","lacnic","1277164800","BR","BRA","Brazil" +"3375468544","3375470591","lacnic","1277164800","BR","BRA","Brazil" +"3375470592","3375471103","lacnic","1277164800","BR","BRA","Brazil" +"3375471104","3375471615","lacnic","1277164800","BR","BRA","Brazil" +"3375471616","3375472127","lacnic","1277164800","BR","BRA","Brazil" +"3375472128","3375472639","lacnic","1277164800","BR","BRA","Brazil" "3375472640","3375476735","lacnic","1126828800","BR","BRA","Brazil" "3375476736","3375480831","lacnic","1148860800","BR","BRA","Brazil" "3375480832","3375484927","lacnic","1178150400","BR","BRA","Brazil" @@ -110803,6 +111027,7 @@ "3380822528","3380822783","lacnic","1417132800","NI","NIC","Nicaragua" "3380823040","3380824063","lacnic","1402358400","BR","BRA","Brazil" "3380824064","3380824319","lacnic","1166054400","MX","MEX","Mexico" +"3380824320","3380824575","lacnic","1418256000","GT","GTM","Guatemala" "3380825088","3380825343","lacnic","1172188800","MX","MEX","Mexico" "3380825344","3380825599","lacnic","1411344000","HT","HTI","Haiti" "3380826112","3380828159","lacnic","1401753600","BR","BRA","Brazil" @@ -121390,7 +121615,7 @@ "3422420992","3422552063","apnic","843955200","KR","KOR","Korea Republic of" "3422552064","3422814207","arin","768009600","US","USA","United States" "3422814208","3423076351","arin","768096000","US","USA","United States" -"3423076352","3423077375","arin","0","ZZ","ZZZ","Reserved" +"3423076352","3423077375","arin","1418947200","CA","CAN","Canada" "3423077376","3423078399","arin","1087171200","US","USA","United States" "3423078400","3423080447","arin","1086307200","US","USA","United States" "3423080448","3423081471","arin","1087171200","US","USA","United States" @@ -123729,7 +123954,7 @@ "3428433152","3428433407","arin","779673600","US","USA","United States" "3428433408","3428433663","arin","779673600","US","USA","United States" "3428433664","3428433919","arin","779673600","US","USA","United States" -"3428433920","3428434175","arin","1319673600","CA","CAN","Canada" +"3428433920","3428434175","arin","0","ZZ","ZZZ","Reserved" "3428434176","3428434431","arin","779673600","US","USA","United States" "3428434432","3428434687","arin","779673600","US","USA","United States" "3428434688","3428434943","arin","779760000","US","USA","United States" @@ -125375,7 +125600,12 @@ "3432806912","3432807423","arin","1292544000","US","USA","United States" "3432807424","3432808447","arin","1234396800","CA","CAN","Canada" "3432808448","3432816639","arin","783129600","US","USA","United States" -"3432816640","3432824831","arin","783734400","US","USA","United States" +"3432816640","3432820735","arin","783734400","US","USA","United States" +"3432820736","3432821247","arin","1418169600","US","USA","United States" +"3432821248","3432821503","arin","1418169600","US","USA","United States" +"3432821504","3432821759","arin","783734400","US","USA","United States" +"3432821760","3432822783","arin","783734400","US","USA","United States" +"3432822784","3432824831","arin","783734400","US","USA","United States" "3432824832","3432833023","arin","784166400","US","USA","United States" "3432833024","3432841215","arin","785462400","US","USA","United States" "3432841216","3432906751","arin","780105600","US","USA","United States" @@ -130916,7 +131146,7 @@ "3485229056","3485237247","arin","1017187200","US","USA","United States" "3485237248","3485253631","arin","919641600","US","USA","United States" "3485253632","3485270015","arin","976838400","US","USA","United States" -"3485270016","3485278207","arin","919641600","US","USA","United States" +"3485270016","3485278207","arin","0","ZZ","ZZZ","Reserved" "3485278208","3485286399","arin","1287532800","US","USA","United States" "3485286400","3485290495","arin","970790400","US","USA","United States" "3485290496","3485292543","arin","970790400","US","USA","United States" @@ -131529,7 +131759,7 @@ "3494246400","3494247423","arin","1156464000","US","USA","United States" "3494247424","3494248447","arin","1156809600","CA","CAN","Canada" "3494248448","3494250495","arin","1156723200","CA","CAN","Canada" -"3494250496","3494251519","arin","0","ZZ","ZZZ","Reserved" +"3494250496","3494251519","arin","1418947200","CA","CAN","Canada" "3494251520","3494252543","arin","0","ZZ","ZZZ","Reserved" "3494252544","3494253567","arin","1157414400","US","USA","United States" "3494253568","3494254591","arin","1157414400","US","USA","United States" @@ -131700,7 +131930,7 @@ "3494491136","3494492159","arin","1166659200","US","USA","United States" "3494492160","3494494207","arin","1166659200","US","USA","United States" "3494494208","3494496255","arin","1166745600","US","USA","United States" -"3494496256","3494498303","arin","0","ZZ","ZZZ","Reserved" +"3494496256","3494498303","arin","1418947200","US","USA","United States" "3494498304","3494499327","arin","1167264000","US","USA","United States" "3494499328","3494500351","arin","1167264000","US","USA","United States" "3494500352","3494502399","arin","1167264000","US","USA","United States" @@ -132021,7 +132251,7 @@ "3494934528","3494936575","arin","1184803200","US","USA","United States" "3494936576","3494938623","arin","1185148800","US","USA","United States" "3494938624","3494939647","arin","1185148800","CA","CAN","Canada" -"3494939648","3494940671","arin","1185148800","US","USA","United States" +"3494939648","3494940671","arin","0","ZZ","ZZZ","Reserved" "3494940672","3494942719","arin","1185148800","US","USA","United States" "3494942720","3494943743","arin","1185148800","US","USA","United States" "3494943744","3494944767","arin","1185235200","US","USA","United States" @@ -132845,7 +133075,7 @@ "3497156608","3497164799","arin","1178582400","US","USA","United States" "3497164800","3497181183","arin","1146787200","CA","CAN","Canada" "3497181184","3497197567","arin","1146787200","US","USA","United States" -"3497197568","3497205759","arin","1146787200","US","USA","United States" +"3497197568","3497205759","arin","0","ZZ","ZZZ","Reserved" "3497205760","3497213951","arin","1178582400","US","USA","United States" "3497213952","3497222143","arin","1146787200","US","USA","United States" "3497222144","3497230335","arin","1178668800","US","USA","United States" @@ -133158,7 +133388,7 @@ "3510501376","3510534143","arin","1174262400","US","USA","United States" "3510534144","3510542335","arin","920332800","US","USA","United States" "3510542336","3510546431","arin","990403200","US","USA","United States" -"3510546432","3510550527","arin","1094515200","US","USA","United States" +"3510546432","3510550527","arin","0","ZZ","ZZZ","Reserved" "3510550528","3510558719","arin","990403200","US","USA","United States" "3510558720","3510566911","arin","1043712000","US","USA","United States" "3510566912","3510632447","arin","859852800","US","USA","United States" @@ -133370,7 +133600,7 @@ "3514499072","3514564607","arin","870825600","US","USA","United States" "3514564608","3514572799","arin","966729600","US","USA","United States" "3514572800","3514580991","arin","1086739200","US","USA","United States" -"3514580992","3514589183","arin","924566400","GB","GBR","United Kingdom" +"3514580992","3514589183","arin","924566400","US","USA","United States" "3514589184","3514597375","arin","985305600","US","USA","United States" "3514597376","3514605567","arin","924480000","US","USA","United States" "3514605568","3514609663","arin","1185840000","US","USA","United States" @@ -133519,7 +133749,7 @@ "3516727296","3516792831","arin","974246400","US","USA","United States" "3516792832","3516858367","arin","877478400","US","USA","United States" "3516858368","3516866559","arin","877478400","US","USA","United States" -"3516866560","3516874751","arin","1086912000","US","USA","United States" +"3516866560","3516874751","arin","0","ZZ","ZZZ","Reserved" "3516874752","3516891135","arin","1084752000","US","USA","United States" "3516891136","3516895231","arin","1219190400","US","USA","United States" "3516895232","3516899327","arin","1260144000","US","USA","United States" @@ -137074,7 +137304,10 @@ "3626532864","3626549247","arin","904176000","US","USA","United States" "3626549248","3626565631","arin","970704000","US","USA","United States" "3626565632","3626598399","arin","942796800","US","USA","United States" -"3626598400","3626602495","arin","976492800","US","USA","United States" +"3626598400","3626600447","arin","976492800","US","USA","United States" +"3626600448","3626601471","arin","976492800","US","USA","United States" +"3626601472","3626601983","arin","1417478400","US","USA","United States" +"3626601984","3626602495","arin","976492800","US","USA","United States" "3626602496","3626606591","arin","1413763200","US","USA","United States" "3626606592","3626614783","arin","976579200","US","USA","United States" "3626614784","3626618879","arin","1158105600","US","USA","United States" @@ -137228,7 +137461,7 @@ "3628597248","3628662783","arin","905731200","US","USA","United States" "3628662784","3628679167","arin","928886400","US","USA","United States" "3628679168","3628683263","arin","1152489600","CA","CAN","Canada" -"3628683264","3628687359","arin","994896000","US","USA","United States" +"3628683264","3628687359","arin","0","ZZ","ZZZ","Reserved" "3628687360","3628695551","arin","994896000","US","USA","United States" "3628695552","3628711935","arin","928972800","US","USA","United States" "3628711936","3628720127","arin","928972800","US","USA","United States" @@ -137276,7 +137509,7 @@ "3629359104","3629367295","arin","962755200","US","USA","United States" "3629367296","3629371391","arin","963360000","US","USA","United States" "3629371392","3629375487","arin","1103587200","US","USA","United States" -"3629375488","3629383679","arin","963532800","US","USA","United States" +"3629375488","3629383679","arin","0","ZZ","ZZZ","Reserved" "3629383680","3629514751","arin","906595200","US","USA","United States" "3629514752","3629522943","arin","930096000","US","USA","United States" "3629522944","3629531135","arin","930096000","US","USA","United States" @@ -137377,7 +137610,7 @@ "3630870528","3630874623","arin","1110844800","US","USA","United States" "3630874624","3630891007","arin","1126483200","US","USA","United States" "3630891008","3630907391","arin","909619200","US","USA","United States" -"3630907392","3630923775","arin","971222400","US","USA","United States" +"3630907392","3630923775","arin","0","ZZ","ZZZ","Reserved" "3630923776","3630927871","arin","1354147200","US","USA","United States" "3630927872","3630931967","arin","1354233600","US","USA","United States" "3630931968","3630936063","arin","1354492800","US","USA","United States" @@ -137710,8 +137943,7 @@ "3634266112","3634274303","arin","962841600","US","USA","United States" "3634274304","3634278399","arin","1023235200","US","USA","United States" "3634278400","3634282495","arin","1115683200","US","USA","United States" -"3634282496","3634290687","arin","962928000","US","USA","United States" -"3634290688","3634294783","arin","962928000","US","USA","United States" +"3634282496","3634294783","arin","0","ZZ","ZZZ","Reserved" "3634294784","3634298879","arin","1207785600","US","USA","United States" "3634298880","3634331647","arin","914889600","US","USA","United States" "3634331648","3634348031","arin","914889600","US","USA","United States" @@ -137805,7 +138037,7 @@ "3635191808","3635199999","arin","1309219200","US","USA","United States" "3635200000","3635216383","arin","1309132800","US","USA","United States" "3635216384","3635232767","arin","933206400","US","USA","United States" -"3635232768","3635249151","arin","933292800","US","USA","United States" +"3635232768","3635249151","arin","0","ZZ","ZZZ","Reserved" "3635249152","3635253247","arin","1204675200","US","USA","United States" "3635253248","3635257343","arin","1248652800","US","USA","United States" "3635257344","3635265535","arin","982108800","US","USA","United States" @@ -138043,7 +138275,7 @@ "3637768192","3637772287","arin","1119225600","US","USA","United States" "3637772288","3637805055","arin","922665600","US","USA","United States" "3637805056","3637821439","arin","922665600","US","USA","United States" -"3637821440","3637829631","arin","985737600","US","USA","United States" +"3637821440","3637829631","arin","0","ZZ","ZZZ","Reserved" "3637829632","3637837823","arin","1021334400","US","USA","United States" "3637837824","3637870591","arin","923356800","US","USA","United States" "3637870592","3637886975","arin","923356800","US","USA","United States" @@ -138056,7 +138288,7 @@ "3638165504","3638181887","arin","935971200","CA","CAN","Canada" "3638181888","3638198271","arin","983750400","US","USA","United States" "3638198272","3638231039","arin","935971200","US","USA","United States" -"3638231040","3638247423","arin","1268352000","US","USA","United States" +"3638231040","3638247423","arin","0","ZZ","ZZZ","Reserved" "3638247424","3638251519","arin","973814400","US","USA","United States" "3638251520","3638255615","arin","1122508800","US","USA","United States" "3638255616","3638259711","arin","973814400","US","USA","United States" @@ -138174,7 +138406,7 @@ "3639017472","3639025663","arin","929664000","US","USA","United States" "3639025664","3639033855","arin","929664000","US","USA","United States" "3639033856","3639042047","arin","929664000","US","USA","United States" -"3639042048","3639050239","arin","1214265600","US","USA","United States" +"3639042048","3639050239","arin","0","ZZ","ZZZ","Reserved" "3639050240","3639054335","arin","1294272000","US","USA","United States" "3639054336","3639058431","arin","1055116800","US","USA","United States" "3639058432","3639066623","arin","930009600","US","USA","United States" diff --git a/web_upload/init.php b/web_upload/init.php index 01f1e95bf..5bfd1055c 100644 --- a/web_upload/init.php +++ b/web_upload/init.php @@ -81,10 +81,10 @@ // --------------------------------------------------- // Initial setup // --------------------------------------------------- -define('SB_SVN', true); +#define('SB_SVN', true); if(!defined('SB_VERSION')){ - define('SB_VERSION', '1.5.0F-dev'); - define('SB_REV', '$Rev: 476 $'); + define('SB_VERSION', '1.5.0F'); + define('SB_REV', '$Rev: 477 $'); } define('LOGIN_COOKIE_LIFETIME', (60*60*24*7)*2); define('COOKIE_PATH', '/'); diff --git a/web_upload/install/includes/data.sql b/web_upload/install/includes/data.sql index a5fcf2279..e94bed7e1 100644 --- a/web_upload/install/includes/data.sql +++ b/web_upload/install/includes/data.sql @@ -20,8 +20,8 @@ INSERT INTO `{prefix}_mods` (`mid`, `name`, `icon`, `modfolder`, `steam_universe (19, "Alien Swarm", 'alienswarm.png', 'alienswarm', '0'), (20, "E.Y.E: Divine Cybermancy", 'eye.png', 'eye', '0'), (21, "Nuclear Dawn", 'nucleardawn.png', 'nucleardawn', '0'), -(22, "Counter-Strike: Global Offensive", 'csgo.png', 'csgo', '1'); -(23, 'Synergy', 'synergy.png', 'synergy', '0'), +(22, "Counter-Strike: Global Offensive", 'csgo.png', 'csgo', '1'), +(23, 'Synergy', 'synergy.png', 'synergy', '0'); UPDATE `{prefix}_mods` SET `mid` = '0' WHERE `name` = 'Web'; diff --git a/web_upload/install/includes/struc.sql b/web_upload/install/includes/struc.sql index 78bf42ce1..041df9998 100644 --- a/web_upload/install/includes/struc.sql +++ b/web_upload/install/includes/struc.sql @@ -209,7 +209,7 @@ CREATE TABLE IF NOT EXISTS `{prefix}_submissions` ( PRIMARY KEY (`subid`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -CREATE TABLE `{prefix}_comms` ( +CREATE TABLE IF NOT EXISTS `{prefix}_comms` ( `bid` int(6) NOT NULL AUTO_INCREMENT, `authid` varchar(64) NOT NULL, `name` varchar(128) NOT NULL DEFAULT 'unnamed', @@ -231,5 +231,5 @@ CREATE TABLE `{prefix}_comms` ( KEY `RemoveType` (`RemoveType`), KEY `authid` (`authid`), KEY `created` (`created`), - KEY `aid` (`aid`), + KEY `aid` (`aid`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; \ No newline at end of file diff --git a/web_upload/install/init.php b/web_upload/install/init.php index 7cd83a87b..be7476b76 100644 --- a/web_upload/install/init.php +++ b/web_upload/install/init.php @@ -41,7 +41,7 @@ // Initial setup // --------------------------------------------------- if(!defined('SB_VERSION')){ - define('SB_VERSION', '1.5.0F-dev Installer'); + define('SB_VERSION', '1.5.0F Installer'); } define('LOGIN_COOKIE_LIFETIME', (60*60*24*7)*2); define('COOKIE_PATH', '/'); diff --git a/web_upload/pages/admin.blockit.php b/web_upload/pages/admin.blockit.php new file mode 100644 index 000000000..d4b13563f --- /dev/null +++ b/web_upload/pages/admin.blockit.php @@ -0,0 +1,149 @@ +HasAccess(ADMIN_OWNER|ADMIN_ADD_BAN)) +{ + echo "No Access"; + die(); +} +require_once(INCLUDES_PATH . '/xajax.inc.php'); +$xajax = new xajax(); +//$xajax->debugOn(); +$xajax->setRequestURI("./admin.blockit.php"); +$xajax->registerFunction("BlockPlayer"); +$xajax->registerFunction("LoadServers2"); +$xajax->processRequests(); +$username = $userbank->GetProperty("user"); + +function LoadServers2($check, $type, $length) { + $objResponse = new xajaxResponse(); + global $userbank, $username; + if(!$userbank->HasAccess(ADMIN_OWNER|ADMIN_ADD_BAN)) + { + $objResponse->redirect("index.php?p=login&m=no_access", 0); + $log = new CSystemLog("w", "Hacking Attempt", $username . " tried to use blockit, but doesn't have access."); + return $objResponse; + } + $id = 0; + $servers = $GLOBALS['db']->Execute("SELECT sid, rcon FROM ".DB_PREFIX."_servers WHERE enabled = 1 ORDER BY modid, sid;"); + while(!$servers->EOF) { + //search for player + if(!empty($servers->fields["rcon"])) { + $text = 'Searching...'; + $objResponse->addScript("xajax_BlockPlayer('".$check."', '".$servers->fields["sid"]."', '".$id."', '".$type."', '".$length."');"); + } + else { //no rcon = servercount + 1 ;) + $text = 'No rcon password.'; + $objResponse->addScript('set_counter(1);'); + } + $objResponse->addAssign("srv_".$id, "innerHTML", $text); + $id++; + $servers->MoveNext(); + } + return $objResponse; +} + +function BlockPlayer($check, $sid, $num, $type, $length) { + $objResponse = new xajaxResponse(); + global $userbank, $username; + $sid = (int)$sid; + $length = (int)$length; + + if(!$userbank->HasAccess(ADMIN_OWNER|ADMIN_ADD_BAN)) + { + $objResponse->redirect("index.php?p=login&m=no_access", 0); + $log = new CSystemLog("w", "Hacking Attempt", $username . " tried to process a playerblock, but doesnt have access."); + return $objResponse; + } + + //get the server data + $sdata = $GLOBALS['db']->GetRow("SELECT ip, port, rcon FROM ".DB_PREFIX."_servers WHERE sid = '".$sid."';"); + + //test if server is online + if($test = @fsockopen($sdata['ip'], $sdata['port'], $errno, $errstr, 2)) { + @fclose($test); + require_once(INCLUDES_PATH . "/CServerRcon.php"); + + $r = new CServerRcon($sdata['ip'], $sdata['port'], $sdata['rcon']); + + if(!$r->Auth()) + { + $GLOBALS['db']->Execute("UPDATE ".DB_PREFIX."_servers SET rcon = '' WHERE sid = '".$sid."' LIMIT 1;"); + $objResponse->addAssign("srv_$num", "innerHTML", "Wrong RCON Password, please change!"); + $objResponse->addScript('set_counter(1);'); + return $objResponse; + } + $ret = $r->rconCommand("status"); + + // show hostname instead of the ip, but leave the ip in the title + require_once("../includes/system-functions.php"); + $hostsearch = preg_match_all('/hostname:[ ]*(.+)/',$ret,$hostname,PREG_PATTERN_ORDER); + $hostname = trunc(htmlspecialchars($hostname[1][0]),25,false); + if(!empty($hostname)) + $objResponse->addAssign("srvip_$num", "innerHTML", "".$hostname.""); + + $gothim = false; + $search = preg_match_all(STATUS_PARSE,$ret,$matches,PREG_PATTERN_ORDER); + //search for the steamid on the server + foreach($matches[3] AS $match) { + if(substr($match, 8) == substr($check, 8)) { + // gotcha!!! kick him! + $gothim = true; + $GLOBALS['db']->Execute("UPDATE `".DB_PREFIX."_comms` SET sid = '".$sid."' WHERE authid = '".$check."' AND RemovedBy IS NULL;"); + $requri = substr($_SERVER['REQUEST_URI'], 0, strrpos($_SERVER['REQUEST_URI'], "pages/admin.blockit.php")); + $kick = $r->sendCommand("sc_fw_block ".$type." ".$length." ".$match); + $objResponse->addAssign("srv_$num", "innerHTML", "Player Found & blocked!!!"); + $objResponse->addScript("set_counter('-1');"); + return $objResponse; + } + } + + if(!$gothim) { + $objResponse->addAssign("srv_$num", "innerHTML", "Player not found."); + $objResponse->addScript('set_counter(1);'); + return $objResponse; + } + } else { + $objResponse->addAssign("srv_$num", "innerHTML", "Can't connect to server."); + $objResponse->addScript('set_counter(1);'); + return $objResponse; + } +} +$servers = $GLOBALS['db']->Execute("SELECT ip, port, rcon FROM ".DB_PREFIX."_servers WHERE enabled = 1 ORDER BY modid, sid;"); +$theme->assign('total', $servers->RecordCount()); +$serverlinks = array(); +$num = 0; +while(!$servers->EOF) { + $info = array(); + $info['num'] = $num; + $info['ip'] = $servers->fields["ip"]; + $info['port'] = $servers->fields["port"]; + array_push($serverlinks, $info); + $num++; + $servers->MoveNext(); +} +$theme->assign('servers', $serverlinks); +$theme->assign('xajax_functions', $xajax->printJavascript("../scripts", "xajax.js")); +$theme->assign('check', $_GET["check"]);// steamid or ip address +$theme->assign('type', $_GET['type']); +$theme->assign('length', $_GET['length']); + +$theme->left_delimiter = "-{"; +$theme->right_delimiter = "}-"; +$theme->display('page_blockit.tpl'); +$theme->left_delimiter = "{"; +$theme->right_delimiter = "}"; +?> \ No newline at end of file diff --git a/web_upload/pages/admin.comms.php b/web_upload/pages/admin.comms.php new file mode 100644 index 000000000..2dfd8cf47 --- /dev/null +++ b/web_upload/pages/admin.comms.php @@ -0,0 +1,93 @@ +GetAid()); + + +if(isset($_GET["rebanid"])) +{ + echo ''; +}elseif(isset($_GET["blockfromban"])) +{ + echo ''; +}elseif((isset($_GET['action']) && $_GET['action'] == "pasteBan") && isset($_GET['pName']) && isset($_GET['sid'])) { + echo ""; +} + +echo '
'; + // Add Ban + echo ' diff --git a/web_upload/pages/admin.comms.search.php b/web_upload/pages/admin.comms.search.php new file mode 100644 index 000000000..03fb16648 --- /dev/null +++ b/web_upload/pages/admin.comms.search.php @@ -0,0 +1,55 @@ +GetAll("SELECT * FROM `" . DB_PREFIX . "_admins` ORDER BY user ASC"); +$server_list = $GLOBALS['db']->Execute("SELECT sid, ip, port FROM `" . DB_PREFIX . "_servers` WHERE enabled = 1"); +$servers = array(); +$serverscript = ""; +$page = isset($_GET['page'])?$_GET['page']:1; + +$theme->assign('hideplayerips', (isset($GLOBALS['config']['banlist.hideplayerips']) && $GLOBALS['config']['banlist.hideplayerips'] == "1" && !$userbank->is_admin())); +$theme->assign('is_admin', $userbank->is_admin()); +$theme->assign('admin_list', $admin_list); +$theme->assign('server_list', $servers); +$theme->assign('server_script', $serverscript); + +$theme->display('box_admin_comms_search.tpl'); +?> + diff --git a/web_upload/pages/admin.edit.comms.php b/web_upload/pages/admin.edit.comms.php new file mode 100644 index 000000000..3ff1b6403 --- /dev/null +++ b/web_upload/pages/admin.edit.comms.php @@ -0,0 +1,169 @@ +ShowBox("Error", "Possible hacking attempt (URL Key mismatch)!", "red", "index.php?p=admin&c=comms");'; + PageDie(); +} +if(!isset($_GET['id']) || !is_numeric($_GET['id'])) +{ + echo ''; + PageDie(); +} + +$res = $GLOBALS['db']->GetRow(" + SELECT bid, ba.type, ba.authid, ba.name, created, ends, length, reason, ba.aid, ba.sid, ad.user, ad.gid + FROM ".DB_PREFIX."_comms AS ba + LEFT JOIN ".DB_PREFIX."_admins AS ad ON ba.aid = ad.aid + WHERE bid = {$_GET['id']}"); + +if (!$userbank->HasAccess(ADMIN_OWNER|ADMIN_EDIT_ALL_BANS)&&(!$userbank->HasAccess(ADMIN_EDIT_OWN_BANS) && $res[8]!=$userbank->GetAid())&&(!$userbank->HasAccess(ADMIN_EDIT_GROUP_BANS) && $res->fields['gid']!=$userbank->GetProperty('gid'))) +{ + echo ''; + PageDie(); +} + +isset($_GET["page"])?$pagelink = "&page=".$_GET["page"]:$pagelink = ""; + +$errorScript = ""; + +if(isset($_POST['name'])) +{ + $_POST['steam'] = trim($_POST['steam']); + $_POST['type'] = (int)$_POST['type']; + + // Form Validation + $error = 0; + // If they didn't type a steamid + if(empty($_POST['steam'])) + { + $error++; + $errorScript .= "$('steam.msg').innerHTML = 'You must type a Steam ID or Community ID';"; + $errorScript .= "$('steam.msg').setStyle('display', 'block');"; + } + else if((!is_numeric($_POST['steam']) + && !validate_steam($_POST['steam'])) + || (is_numeric($_POST['steam']) + && (strlen($_POST['steam']) < 15 + || !validate_steam($_POST['steam'] = FriendIDToSteamID($_POST['steam']))))) + { + $error++; + $errorScript .= "$('steam.msg').innerHTML = 'Please enter a valid Steam ID or Community ID';"; + $errorScript .= "$('steam.msg').setStyle('display', 'block');"; + } + + // Didn't type a custom reason + if($_POST['listReason'] == "other" && empty($_POST['txtReason'])) + { + $error++; + $errorScript .= "$('reason.msg').innerHTML = 'You must type a reason';"; + $errorScript .= "$('reason.msg').setStyle('display', 'block');"; + } + + // prune any old bans + PruneComms(); + + if($error == 0) + { + // Check if the new steamid is already banned + $chk = $GLOBALS['db']->GetRow("SELECT count(bid) AS count FROM ".DB_PREFIX."_comms WHERE authid = ? AND RemovedBy IS NULL AND type = ? AND bid != ? AND (length = 0 OR ends > UNIX_TIMESTAMP())", array($_POST['steam'], (int)$_POST['type'], (int)$_GET['id'])); + if((int)$chk[0] > 0) + { + $error++; + $errorScript .= "$('steam.msg').innerHTML = 'This SteamID is already blocked';"; + $errorScript .= "$('steam.msg').setStyle('display', 'block');"; + } + else + { + // Check if player is immune + $admchk = $userbank->GetAllAdmins(); + foreach($admchk as $admin) + { + if($admin['authid'] == $_POST['steam'] && $userbank->GetProperty('srv_immunity') < $admin['srv_immunity']) + { + $error++; + $errorScript .= "$('steam.msg').innerHTML = 'Admin ".$admin['user']." is immune';"; + $errorScript .= "$('steam.msg').setStyle('display', 'block');"; + break; + } + } + } + } + + $_POST['name'] = RemoveCode($_POST['name']); + $reason = RemoveCode(trim($_POST['listReason'] == "other"?$_POST['txtReason']:$_POST['listReason'])); + + if(!$_POST['banlength']) + $_POST['banlength'] = 0; + else + $_POST['banlength'] = (int)$_POST['banlength']*60; + + // Show the new values in the form + $res['name'] = $_POST['name']; + $res['authid'] = $_POST['steam']; + + $res['length'] = $_POST['banlength']; + $res['type'] = $_POST['type']; + $res['reason'] = $reason; + + // Only process if there are still no errors + if($error == 0) + { + $lengthrev = $GLOBALS['db']->Execute("SELECT length, authid, type FROM ".DB_PREFIX."_comms WHERE bid = '".(int)$_GET['id']."'"); + + + $edit = $GLOBALS['db']->Execute("UPDATE ".DB_PREFIX."_comms SET + `name` = ?, `type` = ?, `reason` = ?, `authid` = ?, + `length` = ?, + `ends` = `created` + ? + WHERE bid = ?", array($_POST['name'], $_POST['type'], $reason, $_POST['steam'], $_POST['banlength'], $_POST['banlength'], (int)$_GET['id'])); + + + if($_POST['banlength'] != $lengthrev->fields['length']) + $log = new CSystemLog("m", "Block edited", "Block for (" . $lengthrev->fields['authid'] . ") has been updated, before: length ".$lengthrev->fields['length'].", type ".$lengthrev->fields['type']."; now: length ".$_POST['banlength']." type ".$_POST->fields['type']); + echo ''; + } +} + +if(!$res) +{ + echo ''; +} + +$theme->assign('ban_name', $res['name']); +$theme->assign('ban_reason', $res['reason']); +$theme->assign('ban_authid', trim($res['authid'])); +$theme->assign('customreason', ((isset($GLOBALS['config']['bans.customreasons'])&&$GLOBALS['config']['bans.customreasons']!="")?unserialize($GLOBALS['config']['bans.customreasons']):false)); + +$theme->left_delimiter = "-{"; +$theme->right_delimiter = "}-"; +$theme->display('page_admin_edit_comms.tpl'); +$theme->left_delimiter = "{"; +$theme->right_delimiter = "}"; +?> + \ No newline at end of file diff --git a/web_upload/pages/page.commslist.php b/web_upload/pages/page.commslist.php new file mode 100644 index 000000000..6bfc1fbe9 --- /dev/null +++ b/web_upload/pages/page.commslist.php @@ -0,0 +1,727 @@ + 0) +{ + $page = intval($_GET['page']); + $pagelink = "&page=".$page; +} + +if (isset($_GET['a']) && $_GET['a'] == "ungag" && isset($_GET['id'])) +{ + if ($_GET['key'] != $_SESSION['banlist_postkey']) + die("Possible hacking attempt (URL Key mismatch)"); + //we have a multiple unban asking + $bid = intval($_GET['id']); + $res = $GLOBALS['db']->Execute("SELECT a.aid, a.gid FROM `".DB_PREFIX."_comms` c INNER JOIN ".DB_PREFIX."_admins a ON a.aid = c.aid WHERE bid = '".$bid."' AND c.type = 2;"); + if (!$userbank->HasAccess(ADMIN_OWNER|ADMIN_UNBAN) && + !($userbank->HasAccess(ADMIN_UNBAN_OWN_BANS) && $res->fields['aid'] == $userbank->GetAid()) && + !($userbank->HasAccess(ADMIN_UNBAN_GROUP_BANS) && $res->fields['gid'] == $userbank->GetProperty('gid'))) + { + die("You don't have access to this"); + } + + $row = $GLOBALS['db']->GetRow("SELECT b.authid, b.name, b.created, b.sid, UNIX_TIMESTAMP() as now + FROM ".DB_PREFIX."_comms b + LEFT JOIN ".DB_PREFIX."_servers s ON s.sid = b.sid + WHERE b.bid = ? AND b.RemoveType IS NULL AND b.type = 2 AND (b.length = '0' OR b.ends > UNIX_TIMESTAMP())",array($bid)); + if(empty($row) || !$row) + { + echo ""; + PageDie(); + } + + $unbanReason = htmlspecialchars(trim($_GET['ureason'])); + $ins = $GLOBALS['db']->Execute("UPDATE `".DB_PREFIX."_comms` SET + `RemovedBy` = ?, + `RemoveType` = 'U', + `RemovedOn` = UNIX_TIMESTAMP(), + `ureason` = ? + WHERE `bid` = ?;", + array( $userbank->GetAid(), $unbanReason, $bid)); + + $blocked = $GLOBALS['db']->GetAll("SELECT sid FROM `".DB_PREFIX."_servers` WHERE `enabled`=1"); + foreach($blocked as $tempban) + { + SendRconSilent(("sc_fw_ungag " . $row['authid']), $tempban['sid']); + } + + if($res){ + echo ""; + $log = new CSystemLog("m", "Player UnGagged", "'".StripQuotes($row['name'])."' (" . $row['authid'] . ") has been ungagged"); + }else{ + echo ""; + } +} +else if(isset($_GET['a']) && $_GET['a'] == "unmute" && isset($_GET['id'])) +{ + if ($_GET['key'] != $_SESSION['banlist_postkey']) + die("Possible hacking attempt (URL Key mismatch)"); + //we have a multiple unban asking + $bid = intval($_GET['id']); + $res = $GLOBALS['db']->Execute("SELECT a.aid, a.gid FROM `".DB_PREFIX."_comms` c INNER JOIN ".DB_PREFIX."_admins a ON a.aid = c.aid WHERE bid = '".$bid."' AND c.type = 1;"); + if (!$userbank->HasAccess(ADMIN_OWNER|ADMIN_UNBAN) && + !($userbank->HasAccess(ADMIN_UNBAN_OWN_BANS) && $res->fields['aid'] == $userbank->GetAid()) && + !($userbank->HasAccess(ADMIN_UNBAN_GROUP_BANS) && $res->fields['gid'] == $userbank->GetProperty('gid'))) + { + die("You don't have access to this"); + } + + $row = $GLOBALS['db']->GetRow("SELECT b.authid, b.name, b.created, b.sid, UNIX_TIMESTAMP() as now + FROM ".DB_PREFIX."_comms b + LEFT JOIN ".DB_PREFIX."_servers s ON s.sid = b.sid + WHERE b.bid = ? AND b.RemoveType IS NULL AND b.type = 1 AND (b.length = '0' OR b.ends > UNIX_TIMESTAMP())",array($bid)); + if(empty($row) || !$row) + { + echo ""; + PageDie(); + } + + $unbanReason = htmlspecialchars(trim($_GET['ureason'])); + $ins = $GLOBALS['db']->Execute("UPDATE `".DB_PREFIX."_comms` SET + `RemovedBy` = ?, + `RemoveType` = 'U', + `RemovedOn` = UNIX_TIMESTAMP(), + `ureason` = ? + WHERE `bid` = ?;", + array( $userbank->GetAid(), $unbanReason, $bid)); + + $blocked = $GLOBALS['db']->GetAll("SELECT sid FROM `".DB_PREFIX."_servers` WHERE `enabled`=1"); + foreach($blocked as $tempban) + { + SendRconSilent(("sc_fw_unmute " . $row['authid']), $tempban['sid']); + } + + if($res){ + echo ""; + $log = new CSystemLog("m", "Player UnMuted", "'".StripQuotes($row['name'])."' (" . $row['authid'] . ") has been unmuted"); + }else{ + echo ""; + } +} +else if(isset($_GET['a']) && $_GET['a'] == "delete") +{ + if ($_GET['key'] != $_SESSION['banlist_postkey']) + die("Possible hacking attempt (URL Key mismatch)"); + + if (!$userbank->HasAccess(ADMIN_OWNER|ADMIN_DELETE_BAN)) + { + echo ""; + PageDie(); + } + + $bid = intval($_GET['id']); + + $steam = $GLOBALS['db']->GetRow("SELECT name, authid, ends, length, RemoveType, type, UNIX_TIMESTAMP() AS now + FROM ".DB_PREFIX."_comms WHERE bid=?",array($bid)); + $end = (int)$steam['ends']; + $length = (int)$steam['length']; + $now = (int)$steam['now']; + + $cmd = ""; + + switch($steam['type']) + { + case 1: + $cmd = "sc_fw_unmute"; + break; + case 2: + $cmd = "sc_fw_ungag"; + break; + default: + break; + } + + $res = $GLOBALS['db']->Execute("DELETE FROM `".DB_PREFIX."_comms` WHERE `bid` = ?", array( $bid )); + + if(empty($steam['RemoveType']) && ($length == 0 || $end > $now)) + { + $blocked = $GLOBALS['db']->GetAll("SELECT sid FROM `".DB_PREFIX."_servers` WHERE `enabled`=1"); + foreach($blocked as $tempban) + { + SendRconSilent(($cmd . " " . $steam['authid']), $tempban['sid']); + } + } + + if($res) + { + echo ""; + $log = new CSystemLog("m", "Block Deleted", "Block '".StripQuotes($steam['name'])."' (" . $steam['authid'] . ") has been deleted."); + }else{ + echo ""; + } +} + +// LIMIT для SQL запроса - по номеру страницы и числу банов на страницу +$BansStart = intval(($page-1) * $BansPerPage); +$BansEnd = intval($BansStart+$BansPerPage); + +// hide inactive bans feature +if(isset($_GET["hideinactive"]) && $_GET["hideinactive"] == "true") {// hide + $_SESSION["hideinactive"] = true; + //ShowBox('Hide inactive bans', 'Inactive bans will be hidden from the banlist.', 'green', 'index.php?p=banlist', true); +} elseif(isset($_GET["hideinactive"]) && $_GET["hideinactive"] == "false") { // show + unset($_SESSION["hideinactive"]); + //ShowBox('Show inactive bans', 'Inactive bans will be shown in the banlist.', 'green', 'index.php?p=banlist', true); +} +if(isset($_SESSION["hideinactive"])) { + $hidetext = "Show"; + $hideinactive = " AND RemoveType IS NULL"; + $hideinactiven = " WHERE RemoveType IS NULL"; +} else { + $hidetext = "Hide"; + $hideinactive = ""; + $hideinactiven = ""; +} + + +if (isset($_GET['searchText'])) +{ + $search = '%'.trim($_GET['searchText']).'%'; + + $res = $GLOBALS['db']->Execute( + "SELECT bid ban_id, CO.type, CO.authid, CO.name player_name, created ban_created, ends ban_ends, length ban_length, reason ban_reason, CO.ureason unban_reason, CO.aid, AD.gid AS gid, adminIp, CO.sid ban_server, RemovedOn, RemovedBy, RemoveType row_type, + SE.ip server_ip, AD.user admin_name, MO.icon as mod_icon, + CAST(MID(CO.authid, 9, 1) AS UNSIGNED) + CAST('76561197960265728' AS UNSIGNED) + CAST(MID(CO.authid, 11, 10) * 2 AS UNSIGNED) AS community_id, + (SELECT count(*) FROM ".DB_PREFIX."_comms as BH WHERE (BH.authid = CO.authid AND BH.authid != '' AND BH.authid IS NOT NULL AND BH.type = 1)) as mute_count, + (SELECT count(*) FROM ".DB_PREFIX."_comms as BH WHERE (BH.authid = CO.authid AND BH.authid != '' AND BH.authid IS NOT NULL AND BH.type = 2)) as gag_count, + UNIX_TIMESTAMP() as c_time + FROM ".DB_PREFIX."_comms AS CO FORCE INDEX (created) + LEFT JOIN ".DB_PREFIX."_servers AS SE ON SE.sid = CO.sid + LEFT JOIN ".DB_PREFIX."_mods AS MO on SE.modid = MO.mid + LEFT JOIN ".DB_PREFIX."_admins AS AD ON CO.aid = AD.aid + WHERE CO.authid LIKE ? or CO.name LIKE ? or CO.reason LIKE ?".$hideinactive." + ORDER BY CO.created DESC LIMIT ?,?", + array($search,$search,$search,intval($BansStart),intval($BansPerPage))); + + + $res_count = $GLOBALS['db']->Execute("SELECT count(CO.bid) FROM ".DB_PREFIX."_comms AS CO WHERE CO.authid LIKE ? OR CO.name LIKE ? OR CO.reason LIKE ?" . $hideinactive + ,array($search,$search,$search)); +$searchlink = "&searchText=".$_GET["searchText"]; +} +elseif(!isset($_GET['advSearch'])) +{ + $res = $GLOBALS['db']->Execute( + "SELECT bid ban_id, CO.type, CO.authid, CO.name player_name, created ban_created, ends ban_ends, length ban_length, reason ban_reason, CO.ureason unban_reason, CO.aid, AD.gid AS gid, adminIp, CO.sid ban_server, RemovedOn, RemovedBy, RemoveType row_type, + SE.ip server_ip, AD.user admin_name, MO.icon as mod_icon, + CAST(MID(CO.authid, 9, 1) AS UNSIGNED) + CAST('76561197960265728' AS UNSIGNED) + CAST(MID(CO.authid, 11, 10) * 2 AS UNSIGNED) AS community_id, + (SELECT count(*) FROM ".DB_PREFIX."_comms as BH WHERE (BH.authid = CO.authid AND BH.authid != '' AND BH.authid IS NOT NULL AND BH.type = 1)) as mute_count, + (SELECT count(*) FROM ".DB_PREFIX."_comms as BH WHERE (BH.authid = CO.authid AND BH.authid != '' AND BH.authid IS NOT NULL AND BH.type = 2)) as gag_count, + UNIX_TIMESTAMP() as c_time + FROM ".DB_PREFIX."_comms AS CO FORCE INDEX (created) + LEFT JOIN ".DB_PREFIX."_servers AS SE ON SE.sid = CO.sid + LEFT JOIN ".DB_PREFIX."_mods AS MO on SE.modid = MO.mid + LEFT JOIN ".DB_PREFIX."_admins AS AD ON CO.aid = AD.aid + ".$hideinactiven." + ORDER BY created DESC + LIMIT ?,?", + array(intval($BansStart),intval($BansPerPage))); + + $res_count = $GLOBALS['db']->Execute("SELECT count(bid) FROM ".DB_PREFIX."_comms".$hideinactiven); + $searchlink = ""; +} + +$advcrit = array(); +if(isset($_GET['advSearch'])) +{ + $value = trim($_GET['advSearch']); + $type = $_GET['advType']; + switch($type) + { + case "name": + $where = "WHERE CO.name LIKE ?"; + $advcrit = array("%$value%"); + break; + case "banid": + $where = "WHERE CO.bid = ?"; + $advcrit = array($value); + break; + case "steamid": + $where = "WHERE CO.authid = ?"; + $advcrit = array($value); + break; + case "steam": + $where = "WHERE CO.authid LIKE ?"; + $advcrit = array("%$value%"); + break; + case "reason": + $where = "WHERE CO.reason LIKE ?"; + $advcrit = array("%$value%"); + break; + case "date": + $date = explode(",", $value); + $time = mktime(0,0,0,$date[1],$date[0],$date[2]); + $time2 = mktime(23,59,59,$date[1],$date[0],$date[2]); + $where = "WHERE CO.created > ? AND CO.created < ?"; + $advcrit = array($time, $time2); + break; + case "length": + $len = explode(",", $value); + $length_type = $len[0]; + $length = $len[1]*60; + $where = "WHERE CO.length "; + switch($length_type) { + case "e": + $where .= "="; + break; + case "h": + $where .= ">"; + break; + case "l": + $where .= "<"; + break; + case "eh": + $where .= ">="; + break; + case "el": + $where .= "<="; + break; + } + $where .= " ?"; + $advcrit = array($length); + break; + case "btype": + $where = "WHERE CO.type = ?"; + $advcrit = array($value); + break; + case "admin": + if($GLOBALS['config']['banlist.hideadminname']&&!$userbank->is_admin()) + { + $where = ""; + $advcrit = array(); + } + else { + $where = "WHERE CO.aid=?"; + $advcrit = array($value); + } + break; + case "where_banned": + $where = "WHERE CO.sid=?"; + $advcrit = array($value); + break; + case "bid": + $where = "WHERE CO.bid = ?"; + $advcrit = array($value); + break; + case "comment": + if($userbank->is_admin()) + { + $where = "WHERE CM.type ='C' AND CM.commenttxt LIKE ?"; + $advcrit = array("%$value%"); + } + else + { + $where = ""; + $advcrit = array(); + } + break; + default: + $where = ""; + $_GET['advType'] = ""; + $_GET['advSearch'] = ""; + $advcrit = array(); + break; + } + + $res = $GLOBALS['db']->Execute( + "SELECT CO.bid ban_id, CO.type, CO.authid, CO.name player_name, created ban_created, ends ban_ends, length ban_length, reason ban_reason, CO.ureason unban_reason, CO.aid, AD.gid AS gid, adminIp, CO.sid ban_server, RemovedOn, RemovedBy, RemoveType row_type, + SE.ip server_ip, AD.user admin_name, MO.icon as mod_icon, + CAST(MID(CO.authid, 9, 1) AS UNSIGNED) + CAST('76561197960265728' AS UNSIGNED) + CAST(MID(CO.authid, 11, 10) * 2 AS UNSIGNED) AS community_id, + (SELECT count(*) FROM ".DB_PREFIX."_comms as BH WHERE (BH.authid = CO.authid AND BH.authid != '' AND BH.authid IS NOT NULL AND BH.type = 1)) as mute_count, + (SELECT count(*) FROM ".DB_PREFIX."_comms as BH WHERE (BH.authid = CO.authid AND BH.authid != '' AND BH.authid IS NOT NULL AND BH.type = 2)) as gag_count, + UNIX_TIMESTAMP() as c_time + FROM ".DB_PREFIX."_comms AS CO FORCE INDEX (created) + LEFT JOIN ".DB_PREFIX."_servers AS SE ON SE.sid = CO.sid + LEFT JOIN ".DB_PREFIX."_mods AS MO on SE.modid = MO.mid + LEFT JOIN ".DB_PREFIX."_admins AS AD ON CO.aid = AD.aid + ".($type=="comment"&&$userbank->is_admin()?"LEFT JOIN ".DB_PREFIX."_comments AS CM ON CO.bid = CM.bid":"")." + ".$where.$hideinactive." + ORDER BY CO.created DESC + LIMIT ?,?", array_merge($advcrit, array(intval($BansStart),intval($BansPerPage)))); + + $res_count = $GLOBALS['db']->Execute("SELECT count(CO.bid) FROM ".DB_PREFIX."_comms AS CO + ".($type=="comment"&&$userbank->is_admin()?"LEFT JOIN ".DB_PREFIX."_comments AS CM ON CO.bid = CM.bid":"")." ".$where.$hideinactive, $advcrit); + $searchlink = "&advSearch=".$_GET['advSearch']."&advType=".$_GET['advType']; +} + +$BanCount = $res_count->fields[0]; +if ($BansEnd > $BanCount) $BansEnd = $BanCount; +if (!$res) +{ + echo "No Blocks Found."; + PageDie(); +} + +$view_comments = false; +$bans = array(); +while (!$res->EOF) +{ + $data = array(); + + $data['ban_id'] = $res->fields['ban_id']; + $data['type'] = $res->fields['type']; + $data['c_time'] = $res->fields['c_time']; + + $mute_count = (int)$res->fields['mute_count']; + $gag_count = (int)$res->fields['gag_count']; + $history_count = $mute_count + $gag_count; + + $delimiter = ""; + + // заюзаем иконку страны под отображение TYPE_MUTE or TYPE_GAG + switch((int)$data['type']) + { + case 1: + $data['type_icon'] = 'Mute'; + $mute_count = $mute_count - 1; + break; + case 2: + $data['type_icon'] = 'Chat'; + $gag_count = $gag_count - 1; + break; + default: + $data['type_icon'] = 'Unknown block type'; + break; + } + + $data['ban_date'] = SBDate($dateformat,$res->fields['ban_created']); + $data['player'] = addslashes($res->fields['player_name']); + $data['steamid'] = $res->fields['authid']; + $data['communityid'] = $res->fields['community_id']; + + if(isset($GLOBALS['config']['banlist.hideadminname']) && $GLOBALS['config']['banlist.hideadminname'] == "1" && !$userbank->is_admin()) + $data['admin'] = false; + else + $data['admin'] = stripslashes($res->fields['admin_name']); + $data['reason'] = stripslashes($res->fields['ban_reason']); + + if ($res->fields['ban_length'] > 0) + { + $data['ban_length'] = SecondsToString(intval($res->fields['ban_length'])); + $data['expires'] = SBDate($dateformat,$res->fields['ban_ends']); + } + else if ($res->fields['ban_length'] == 0) + { + $data['ban_length'] = 'Permanent'; + $data['expires'] = 'never'; + } + else + { + $data['ban_length'] = 'Session'; + $data['expires'] = 'n/a'; + } + + // Что за тип разбана - D? Я такой не видел, но оставлю так и быть.. for feature use... + if($res->fields['row_type'] == 'D' || $res->fields['row_type'] == 'U' || $res->fields['row_type'] == 'E' || ($res->fields['ban_length'] && $res->fields['ban_ends'] < $data['c_time'])) + { + $data['unbanned'] = true; + $data['class'] = "listtable_1_unbanned"; + + if($res->fields['row_type'] == "D") + $data['ub_reason'] = "(Deleted)"; + elseif($res->fields['row_type'] == "U") + $data['ub_reason'] = "(Unbanned)"; + else + $data['ub_reason'] = "(Expired)"; + + $data['ureason'] = stripslashes($res->fields['unban_reason']); + + $removedby = $GLOBALS['db']->GetRow("SELECT user FROM `".DB_PREFIX."_admins` WHERE aid = '".$res->fields['RemovedBy']."'"); + $data['removedby'] = ""; + if(isset($removedby[0])) + $data['removedby'] = $removedby[0]; + } + else + { + $data['unbanned'] = false; + $data['class'] = "listtable_1"; + $data['ub_reason'] = ""; + } + + $data['layer_id'] = 'layer_'.$res->fields['ban_id']; + // Запрос текущего статуса игрока для рисования ссылки на мьют или гаг + $alrdybnd = $GLOBALS['db']->Execute("SELECT count(bid) as count FROM `".DB_PREFIX."_comms` WHERE authid = '".$data['steamid']."' AND RemovedBy IS NULL AND type = '".$data['type']."' AND (length = 0 OR ends > UNIX_TIMESTAMP());"); + if($alrdybnd->fields['count']==0) + { + switch($data['type']) + { + case 1: + $data['reban_link'] = CreateLinkR(' ReMute',"index.php?p=admin&c=comms".$pagelink."&rebanid=".$res->fields['ban_id']."&key=".$_SESSION['banlist_postkey']."#^0"); + break; + case 2: + $data['reban_link'] = CreateLinkR(' ReGag',"index.php?p=admin&c=comms".$pagelink."&rebanid=".$res->fields['ban_id']."&key=".$_SESSION['banlist_postkey']."#^0"); + break; + default: + break; + } + } + else + $data['reban_link'] = false; + + + $data['edit_link'] = CreateLinkR(' Edit Details',"index.php?p=admin&c=comms&o=edit".$pagelink."&id=".$res->fields['ban_id']."&key=".$_SESSION['banlist_postkey']); + + switch($data['type']) + { + case 2: + $data['unban_link'] = CreateLinkR(' UnGag',"#","", "_self", false, "UnGag('".$res->fields['ban_id']."', '".$_SESSION['banlist_postkey']."', '".$pagelink."', '".StripQuotes($data['player'])."', 1);return false;"); + break; + case 1: + $data['unban_link'] = CreateLinkR(' UnMute',"#","", "_self", false, "UnMute('".$res->fields['ban_id']."', '".$_SESSION['banlist_postkey']."', '".$pagelink."', '".StripQuotes($data['player'])."', 1);return false;"); + break; + default: + break; + } + + $data['delete_link'] = CreateLinkR(' Delete Block',"#","", "_self", false, "RemoveBlock('".$res->fields['ban_id']."', '".$_SESSION['banlist_postkey']."', '".$pagelink."', '".StripQuotes($data['player'])."', 0);return false;"); + + $data['server_id'] = $res->fields['ban_server']; + + if(empty($res->fields['mod_icon'])) + { + $modicon = "web.png"; + } + else + { + $modicon = $res->fields['mod_icon']; + } + + $data['mod_icon'] = 'MOD ' . $data['type_icon']; + + if($history_count > 1) + $data['prevoff_link'] = $history_count . " " . CreateLinkR("(search)","index.php?p=commslist&searchText=" .$data['steamid']. "&Submit"); + else + $data['prevoff_link'] = "No previous blocks"; + + $mutes = ""; + $gags = ""; + if($mute_count > 0) + { + $mutes = $mute_count . ' Another mutes'; + if ($gag_count > 0) + $mutes = $mutes . " "; + } + if($gag_count > 0) + $gags = $gag_count . ' Another gags'; + + $data['server_id'] = $res->fields['ban_server']; + + //COMMENT STUFF + //----------------------------------- + if($userbank->is_admin()) { + $view_comments = true; + $commentres = $GLOBALS['db']->Execute("SELECT cid, aid, commenttxt, added, edittime, + (SELECT user FROM `".DB_PREFIX."_admins` WHERE aid = C.aid) AS comname, + (SELECT user FROM `".DB_PREFIX."_admins` WHERE aid = C.editaid) AS editname + FROM `".DB_PREFIX."_comments` AS C + WHERE C.type = 'C' AND bid = '".$data['ban_id']."' ORDER BY added desc"); + + if($commentres->RecordCount()>0) { + if ($mute_count > 0 || $gag_count > 0) + $delimiter = " "; + $comment = array(); + $morecom = 0; + while(!$commentres->EOF) { + $cdata = array(); + $cdata['morecom'] = ($morecom==1?true:false); + if($commentres->fields['aid'] == $userbank->GetAid() || $userbank->HasAccess(ADMIN_OWNER)) { + $cdata['editcomlink'] = CreateLinkR('\'\'','index.php?p=commslist&comment='.$data['ban_id'].'&ctype=C&cid='.$commentres->fields['cid'].$pagelink,'Edit Comment'); + if($userbank->HasAccess(ADMIN_OWNER)) { + $cdata['delcomlink'] = " :: Delete Comment\" target=\"_self\" onclick=\"RemoveComment(".$commentres->fields['cid'].",'C',".(isset($_GET["page"])?$_GET["page"]:-1).");\">"; + } + } + else { + $cdata['editcomlink'] = ""; + $cdata['delcomlink'] = ""; + } + + $cdata['comname'] = $commentres->fields['comname']; + $cdata['added'] = SBDate($dateformat, $commentres->fields['added']); + $cdata['commenttxt'] = str_replace("\n", "
", $commentres->fields['commenttxt']); + // Parse links and wrap them in a tag to be easily clickable + $cdata['commenttxt'] = preg_replace('@(https?://([-\w\.]+)+(:\d+)?(/([\w/_\.]*(\?\S+)?)?)?)@', '$1', $cdata['commenttxt']); + + if(!empty($commentres->fields['edittime'])) { + $cdata['edittime'] = SBDate($dateformat, $commentres->fields['edittime']); + $cdata['editname'] = $commentres->fields['editname']; + } + else { + $cdata['edittime'] = ""; + $cdata['editname'] = ""; + } + + $morecom = 1; + array_push($comment,$cdata); + $commentres->MoveNext(); + } + } + else + $comment = "None"; + + $data['commentdata'] = $comment; + } + + $data['addcomment'] = CreateLinkR(' Add Comment','index.php?p=commslist&comment='.$data['ban_id'].'&ctype=C'.$pagelink); + //----------------------------------- + $data['counts'] = $delimiter.$mutes.$gags; + + $data['ub_reason'] = (isset($data['ub_reason'])?$data['ub_reason']:""); + $data['banlength'] = $data['ban_length'] . " " . $data['ub_reason']; + $data['view_edit'] = ($userbank->HasAccess(ADMIN_OWNER|ADMIN_EDIT_ALL_BANS) || ($userbank->HasAccess(ADMIN_EDIT_OWN_BANS) && $res->fields['aid']==$userbank->GetAid()) || ($userbank->HasAccess(ADMIN_EDIT_GROUP_BANS) && $res->fields['gid']==$userbank->GetProperty('gid'))); + $data['view_unban'] = ($userbank->HasAccess(ADMIN_OWNER|ADMIN_UNBAN) || ($userbank->HasAccess(ADMIN_UNBAN_OWN_BANS) && $res->fields['aid']==$userbank->GetAid()) || ($userbank->HasAccess(ADMIN_UNBAN_GROUP_BANS) && $res->fields['gid']==$userbank->GetProperty('gid'))); + $data['view_delete'] = ($userbank->HasAccess(ADMIN_OWNER|ADMIN_DELETE_BAN)); + array_push($bans,$data); + $res->MoveNext(); +} + +if(isset($_GET['advSearch'])) + $advSearchString = "&advSearch=" . (isset($_GET['advSearch'])?$_GET['advSearch']:'') . "&advType=" . (isset($_GET['advType'])?$_GET['advType']:''); +else + $advSearchString = ''; + +if ($page > 1) +{ + if(isset($_GET['c']) && $_GET['c'] == "comms") + $prev = CreateLinkR('prev prev',"javascript:void(0);", "", "_self", false, $prev); + else + $prev = CreateLinkR('prev prev',"index.php?p=commslist&page=".($page-1).(isset($_GET['searchText']) > 0?"&searchText=".$_GET['searchText']:'' . $advSearchString)); +} +else +{ + $prev = ""; +} +if ($BansEnd < $BanCount) +{ + if(isset($_GET['c']) && $_GET['c'] == "comms") + { + if(!isset($nxt)) + $nxt = ""; + $next = CreateLinkR('next next',"javascript:void(0);", "", "_self", false, $nxt); + } + else + $next = CreateLinkR('next next',"index.php?p=commslist&page=".($page+1).(isset($_GET['searchText']) ?"&searchText=".$_GET['searchText']:'' . $advSearchString)); +} +else + $next = ""; + +//=================[ Start Layout ]================================== +$ban_nav = 'displaying '.$BansStart.' - '.$BansEnd.' of '.$BanCount.' results'; + +if (strlen($prev) > 0) +{ + $ban_nav .= ' | '.$prev.''; +} +if (strlen($next) > 0) +{ + $ban_nav .= ' | '.$next.''; +} +$pages = ceil($BanCount/$BansPerPage); +if($pages > 1) { + $ban_nav .= ' '; +} + +//COMMENT STUFF +//---------------------------------------- +if(isset($_GET["comment"])) { + $theme->assign('commenttype', (isset($_GET["cid"])?"Edit":"Add")); + if(isset($_GET["cid"])) { + $ceditdata = $GLOBALS['db']->GetRow("SELECT * FROM ".DB_PREFIX."_comments WHERE cid = '".(int)$_GET["cid"]."'"); + $ctext = $ceditdata['commenttxt']; + $cotherdataedit = " AND cid != '".(int)$_GET["cid"]."'"; + } + else + { + $cotherdataedit = ""; + $ctext = ""; + } + $cotherdata = $GLOBALS['db']->Execute("SELECT cid, aid, commenttxt, added, edittime, + (SELECT user FROM `".DB_PREFIX."_admins` WHERE aid = C.aid) AS comname, + (SELECT user FROM `".DB_PREFIX."_admins` WHERE aid = C.editaid) AS editname + FROM `".DB_PREFIX."_comments` AS C + WHERE type = ? AND bid = ?".$cotherdataedit." ORDER BY added desc", array($_GET["ctype"], $_GET["comment"])); + + $ocomments = array(); + while(!$cotherdata->EOF) + { + $coment = array(); + $coment['comname'] = $cotherdata->fields['comname']; + $coment['added'] = SBDate($dateformat, $cotherdata->fields['added']); + $coment['commenttxt'] = str_replace("\n", "
", $cotherdata->fields['commenttxt']); + // Parse links and wrap them in a tag to be easily clickable + $coment['commenttxt'] = preg_replace('@(https?://([-\w\.]+)+(:\d+)?(/([\w/_\.]*(\?\S+)?)?)?)@', '$1', $coment['commenttxt']); + if($cotherdata->fields['editname']!="") { + $coment['edittime'] = SBDate($dateformat, $cotherdata->fields['edittime']); + $coment['editname'] = $cotherdata->fields['editname']; + } + else { + $coment['editname'] = ""; + $coment['edittime'] = ""; + } + array_push($ocomments,$coment); + $cotherdata->MoveNext(); + } + + $theme->assign('page', (isset($_GET["page"])?$_GET["page"]:-1)); + $theme->assign('othercomments', $ocomments); + $theme->assign('commenttext', (isset($ctext)?$ctext:"")); + $theme->assign('ctype', $_GET["ctype"]); + $theme->assign('cid', (isset($_GET["cid"])?$_GET["cid"]:"")); +} +$theme->assign('view_comments',$view_comments); +$theme->assign('comment', (isset($_GET["comment"])?$_GET["comment"]:false)); +//---------------------------------------- + +unset($_SESSION['CountryFetchHndl']); + +$theme->assign('searchlink', $searchlink); +$theme->assign('hidetext', $hidetext); +$theme->assign('total_bans', $BanCount); +$theme->assign('active_bans', $BanCount); + +$theme->assign('ban_nav', $ban_nav); +$theme->assign('ban_list', $bans); +$theme->assign('admin_nick', $userbank->GetProperty("user")); + +$theme->assign('admin_postkey', $_SESSION['banlist_postkey']); +$theme->assign('hideadminname', (isset($GLOBALS['config']['banlist.hideadminname']) && $GLOBALS['config']['banlist.hideadminname'] == "1" && !$userbank->is_admin())); +$theme->assign('general_unban', $userbank->HasAccess(ADMIN_OWNER|ADMIN_UNBAN|ADMIN_UNBAN_OWN_BANS|ADMIN_UNBAN_GROUP_BANS)); +$theme->assign('can_delete', $userbank->HasAccess(ADMIN_DELETE_BAN)); +$theme->assign('view_bans', ($userbank->HasAccess(ADMIN_OWNER|ADMIN_EDIT_ALL_BANS|ADMIN_EDIT_OWN_BANS|ADMIN_EDIT_GROUP_BANS|ADMIN_UNBAN|ADMIN_UNBAN_OWN_BANS|ADMIN_UNBAN_GROUP_BANS|ADMIN_DELETE_BAN))); +$theme->display('page_comms.tpl'); +?> diff --git a/web_upload/themes/sb_default/theme.conf.php b/web_upload/themes/sb_default/theme.conf.php index a12d1d95f..05a1c49ad 100644 --- a/web_upload/themes/sb_default/theme.conf.php +++ b/web_upload/themes/sb_default/theme.conf.php @@ -18,7 +18,7 @@ define('theme_author', "SourceBans Development Team, Sarabveer(VEER™)"); // Set the version of the theme here -define('theme_version', "1.5.0F-dev"); +define('theme_version', "1.5.0F"); // Set the link of the theme here define('theme_link', "http://www.sourcebans.net"); diff --git a/web_upload/themes/sourcebans_dark/theme.conf.php b/web_upload/themes/sourcebans_dark/theme.conf.php index 9469e10e6..62fcc96ba 100644 --- a/web_upload/themes/sourcebans_dark/theme.conf.php +++ b/web_upload/themes/sourcebans_dark/theme.conf.php @@ -18,7 +18,7 @@ define('theme_author', "SourceBans Development Team, Sarabveer(VEER™)"); // Set the version of the theme here -define('theme_version', "1.5.0F-dev"); +define('theme_version', "1.5.0F"); // Set the link of the theme here define('theme_link', "http://www.sourcebans.net"); diff --git a/web_upload/updater/data/475.php b/web_upload/updater/data/475.php index ccaeb000a..6d5dfbc10 100644 --- a/web_upload/updater/data/475.php +++ b/web_upload/updater/data/475.php @@ -1,28 +1,28 @@ Execute("CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "_comms` ( - `bid` int(6) NOT NULL AUTO_INCREMENT, - `authid` varchar(64) NOT NULL, - `name` varchar(128) NOT NULL DEFAULT 'unnamed', - `created` int(11) NOT NULL DEFAULT '0', - `ends` int(11) NOT NULL DEFAULT '0', - `length` int(10) NOT NULL DEFAULT '0', - `reason` text NOT NULL, - `aid` int(6) NOT NULL DEFAULT '0', - `adminIp` varchar(32) NOT NULL DEFAULT '', - `sid` int(6) NOT NULL DEFAULT '0', - `RemovedBy` int(8) DEFAULT NULL, - `RemoveType` varchar(3) DEFAULT NULL, - `RemovedOn` int(11) DEFAULT NULL, - `type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '1 - Mute, 2 - Gag', - `ureason` text, - PRIMARY KEY (`bid`), - KEY `sid` (`sid`), - KEY `type` (`type`), - KEY `RemoveType` (`RemoveType`), - KEY `authid` (`authid`), - KEY `created` (`created`), - KEY `aid` (`aid`), - ) ENGINE=MyISAM DEFAULT CHARSET=utf8;" + `bid` int(6) NOT NULL AUTO_INCREMENT, + `authid` varchar(64) NOT NULL, + `name` varchar(128) NOT NULL DEFAULT 'unnamed', + `created` int(11) NOT NULL DEFAULT '0', + `ends` int(11) NOT NULL DEFAULT '0', + `length` int(10) NOT NULL DEFAULT '0', + `reason` text NOT NULL, + `aid` int(6) NOT NULL DEFAULT '0', + `adminIp` varchar(32) NOT NULL DEFAULT '', + `sid` int(6) NOT NULL DEFAULT '0', + `RemovedBy` int(8) DEFAULT NULL, + `RemoveType` varchar(3) DEFAULT NULL, + `RemovedOn` int(11) DEFAULT NULL, + `type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '1 - Mute, 2 - Gag', + `ureason` text, + PRIMARY KEY (`bid`), + KEY `sid` (`sid`), + KEY `type` (`type`), + KEY `RemoveType` (`RemoveType`), + KEY `authid` (`authid`), + KEY `created` (`created`), + KEY `aid` (`aid`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8;"); if(!$create) return false; return true; diff --git a/web_upload/updater/store.php b/web_upload/updater/store.php index c448c6959..1b9979b14 100644 --- a/web_upload/updater/store.php +++ b/web_upload/updater/store.php @@ -39,7 +39,8 @@ 353 => "353.php", 354 => "354.php", 355 => "355.php", - 356 => "356.php" - 475 => "475.php" + 356 => "356.php", + 475 => "475.php", + 476 => "476.php" ); ?> \ No newline at end of file