diff -x setup.php -x zones.tpl -x '*~' -Nr --unified=5 eazydns_2.0.3_html/content_clients_domain.php dns/content_clients_domain.php --- eazydns_2.0.3_html/content_clients_domain.php 2003-12-29 19:20:27.000000000 +0100 +++ dns/content_clients_domain.php 2005-07-13 21:56:42.000000000 +0200 @@ -103,10 +103,16 @@ alert(\"".$ezd_lan["syn_nsrc"]."\"); history.back() //-->"); exit; } + // + if ($typ == "TXT") + { + $opt2=addslashes($opt2); + } + // mysql_query("UPDATE eazydns_domain SET seriennummer='$seriennummer', work='1' WHERE domainID ='$domainID'"); if($eintraegeID ==""){ mysql_query("INSERT INTO eazydns_eintraege (domainID, typ, opt1, opt2, opt3, opt4) VALUES ('$domainID', '$typ', '$opt1', '$opt2', '$opt3', '$opt4')"); }else{ mysql_query("UPDATE eazydns_eintraege SET opt1='$opt1', opt2='$opt2', opt3='$opt3', opt4='$opt4' WHERE eintraegeID ='$eintraegeID'"); @@ -316,10 +322,18 @@ $seriennummer = $res_soa[1]; $verwaltungsemail = $res_soa[2]; $authorativer_nameserver = $res_soa[3]; $domainID = $res_soa[4]; +// +$vjp_only_PTR=false; +if ((substr($domain, -13)==".in-addr.arpa")||(substr($domain, -12)==".in-addr.int")||(substr($domain, -9)==".ip6.arpa")||(substr($domain, -8)==".ip6.int")) +{ + $vjp_only_PTR=true; // Zeigt an, das nur PTRs angezeigt werden sollen +} +// + if($ezd_userrights == "reseller"){ $query_add = "rights_3,rights_5"; } if($ezd_userrights == "client"){ $query_add = "rights_4,rights_6"; @@ -341,10 +355,15 @@ + +if (!$vjp_only_PTR) { +// +?>

@@ -477,10 +496,15 @@
+ +} // END: if (!$vjp_only_PTR) { +// +?>

@@ -512,10 +536,83 @@
+ + + +

+ + + + + + + + + + + + + + + + + +
+ + +

+ + + + + + + + + + + + + + + + + +
+ + - + +$query_a = mysql_query("SELECT eintraegeID, opt1, opt2, opt3, opt4 FROM eazydns_eintraege WHERE domainID ='$domainID' AND eintraegeID ='$eintraegeID'"); +$res_a = mysql_fetch_row($query_a); +$eintraegeID = $res_a[0]; +$opt1 = $res_a[1]; if($opt1==""){$opt1=$domname;} +$opt2 = $res_a[2]; +$opt3 = $res_a[3]; if($opt3==""){$opt3=$conf_ttl;} +$opt4 = $res_a[4]; +?> + + + + + + + + + + + + + + + + + + + + + + + + + + +?>   "> diff -x setup.php -x zones.tpl -x '*~' -Nr --unified=5 eazydns_2.0.3_html/content_clients_import.php dns/content_clients_import.php --- eazydns_2.0.3_html/content_clients_import.php 2003-08-12 16:51:56.000000000 +0200 +++ dns/content_clients_import.php 2005-09-10 21:26:57.065192576 +0200 @@ -13,10 +13,17 @@ exit; } for ($i = 0; $i < count($dom_array); $i++) { $domain = $dom_array[$i]; +// +$vjp_only_PTR=false; +if ((substr($domain, -13)==".in-addr.arpa")||(substr($domain, -12)==".in-addr.int")||(substr($domain, -9)==".ip6.arpa")||(substr($domain, -8)==".ip6.int")) +{ + $vjp_only_PTR=true; // Zeigt an, das nur PTRs angezeigt werden sollen +} +// $query_domaincheck = mysql_query("SELECT domainID FROM eazydns_domain WHERE domain ='$domain'"); if(mysql_num_rows($query_domaincheck) != 0){ echo""; @@ -117,18 +138,23 @@ ?> (Naechste Zeile geaendert) +$query_rights_reseller = mysql_query("SELECT $suchrechte2 authorativer_nameserver,secondary_nameserver,standard_ip,third_nameserver FROM eazydns_config WHERE userID='$ezd_userID'"); +// $result_rights_reseller = mysql_fetch_row($query_rights_reseller); $reseller_rights_1 = $result_rights_reseller[0]; $reseller_rights_3 = $result_rights_reseller[1]; $reseller_rights_5 = $result_rights_reseller[2]; $authorativer_nameserver = $result_rights_reseller[3]; $secondary_nameserver = $result_rights_reseller[4]; $standard_ip = $result_rights_reseller[5]; +// +$third_nameserver = $result_rights_reseller[6]; +// if($ezd_userrights == "admin"){ $reseller_rights_1 = 1; $reseller_rights_3 = 1; $reseller_rights_5 = 1; } @@ -140,10 +166,16 @@ + + + + + + @@ -151,10 +183,16 @@ + + + + + + diff -x setup.php -x zones.tpl -x '*~' -Nr --unified=5 eazydns_2.0.3_html/content_clients_user.php dns/content_clients_user.php --- eazydns_2.0.3_html/content_clients_user.php 2003-08-12 16:51:56.000000000 +0200 +++ dns/content_clients_user.php 2005-09-10 17:10:47.771680336 +0200 @@ -14,10 +14,20 @@ alert(\"".$ezd_lan["syn_eingabe"]."\"); history.back() //-->"); exit; } +// +if ( ($third_nameserver!="") && (eingabepruefen($third_nameserver,1) == 1) ) +{ + echo(""); + exit; +} +// if(anzahldomainspruefen($ezd_userID,$ezd_userrights,$rights_2) == 1){ echo(""); @@ -37,14 +47,18 @@ alert(\"".$ezd_lan["benutzername"]." $user ".$ezd_lan["belegt"]."\"); history.back() //-->"); exit; } - mysql_query("INSERT INTO eazydns_config (user, pass, userrights, verwaltungsemail, authorativer_nameserver, resellerID, rights_1,rights_2,rights_3,rights_4, secondary_nameserver,rights_5,rights_6,standard_ip,rights_7,rights_8) VALUES ('$user', PASSWORD('$pass1'), 'client', '$verwaltungsemail', '$authorativer_nameserver', '$ezd_userID', '$rights_1', '$rights_2', '$rights_3', '$rights_4', '$secondary_nameserver', '$rights_5', '$rights_6','$standard_ip', '$rights_7', '$rights_8');"); + // (Naechste Zeile geaendert) + mysql_query("INSERT INTO eazydns_config (user, pass, userrights, verwaltungsemail, authorativer_nameserver, resellerID, rights_1,rights_2,rights_3,rights_4, secondary_nameserver,rights_5,rights_6,standard_ip,rights_7,rights_8,third_nameserver) VALUES ('$user', PASSWORD('$pass1'), 'client', '$verwaltungsemail', '$authorativer_nameserver', '$ezd_userID', '$rights_1', '$rights_2', '$rights_3', '$rights_4', '$secondary_nameserver', '$rights_5', '$rights_6','$standard_ip', '$rights_7', '$rights_8', '$third_nameserver');"); + // } }else{ - mysql_query("UPDATE eazydns_config SET user='$user', verwaltungsemail='$verwaltungsemail', authorativer_nameserver='$authorativer_nameserver', secondary_nameserver='$secondary_nameserver', rights_2='$rights_2', rights_4='$rights_4', rights_5='$rights_5', rights_6='$rights_6',standard_ip='$standard_ip', rights_7='$rights_7', rights_8='$rights_8' WHERE userID='$userID'"); + // (Naechste Zeile geaendert) + mysql_query("UPDATE eazydns_config SET user='$user', verwaltungsemail='$verwaltungsemail', authorativer_nameserver='$authorativer_nameserver', secondary_nameserver='$secondary_nameserver', rights_2='$rights_2', rights_4='$rights_4', rights_5='$rights_5', rights_6='$rights_6',standard_ip='$standard_ip', rights_7='$rights_7', rights_8='$rights_8', third_nameserver='$third_nameserver' WHERE userID='$userID'"); + // if($pass1!=""){ if($pass1 != $pass2){ echo(""); exit; } - +// + if ( ($third_nameserver!="") && (eingabepruefen($third_nameserver,1)==1) ) + { + echo(""); + exit; + } +// if($userID ==""){ if($pass1 != $pass2){ echo(""); exit; } - - mysql_query("INSERT INTO eazydns_config (user, pass, userrights, verwaltungsemail, authorativer_nameserver, resellerID, rights_1,rights_2,rights_3,rights_4, secondary_nameserver,rights_5,rights_6,standard_ip,rights_7,rights_8) VALUES ('$user', PASSWORD('$pass1'), 'reseller', '$verwaltungsemail', '$authorativer_nameserver', '0', '$rights_1', '$rights_2', '$rights_3', '$rights_4', '$secondary_nameserver', '$rights_5', '$rights_6','$standard_ip', '$rights_7', '$rights_8');"); +// (Naechste Zeile) + mysql_query("INSERT INTO eazydns_config (user, pass, userrights, verwaltungsemail, authorativer_nameserver, resellerID, rights_1,rights_2,rights_3,rights_4, secondary_nameserver,rights_5,rights_6,standard_ip,rights_7,rights_8,third_nameserver) VALUES ('$user', PASSWORD('$pass1'), 'reseller', '$verwaltungsemail', '$authorativer_nameserver', '0', '$rights_1', '$rights_2', '$rights_3', '$rights_4', '$secondary_nameserver', '$rights_5', '$rights_6','$standard_ip', '$rights_7', '$rights_8', '$third_nameserver');"); +// $resellerID = mysql_insert_id(); mysql_query("UPDATE eazydns_config SET resellerID='$resellerID' WHERE userID='$resellerID'"); } }else{ - mysql_query("UPDATE eazydns_config SET user='$user', verwaltungsemail='$verwaltungsemail', authorativer_nameserver='$authorativer_nameserver', rights_1='$rights_1', rights_2='$rights_2', rights_3='$rights_3', rights_4='$rights_4', secondary_nameserver='$secondary_nameserver', rights_5='$rights_5', rights_6='$rights_6',standard_ip='$standard_ip', rights_7='$rights_7', rights_8='$rights_8' WHERE userID='$userID'"); +// (Naechste Zeile) + mysql_query("UPDATE eazydns_config SET user='$user', verwaltungsemail='$verwaltungsemail', authorativer_nameserver='$authorativer_nameserver', rights_1='$rights_1', rights_2='$rights_2', rights_3='$rights_3', rights_4='$rights_4', secondary_nameserver='$secondary_nameserver', rights_5='$rights_5', rights_6='$rights_6',standard_ip='$standard_ip', rights_7='$rights_7', rights_8='$rights_8', third_nameserver='$third_nameserver' WHERE userID='$userID'"); +// if($pass1!=""){ if($pass1 != $pass2){ echo(""); exit; } +// +if ( ($third_nameserver!="") && (eingabepruefen($third_nameserver,1) == 1) ) +{ + echo(""); + exit; +} +// if($userID ==""){ if($pass1 != $pass2){ echo(""); exit; } - - mysql_query("INSERT INTO eazydns_config (user, pass, userrights, verwaltungsemail, authorativer_nameserver, resellerID, rights_1,rights_2,rights_3,rights_4, secondary_nameserver,rights_5,rights_6,standard_ip, rights_7, rights_8) VALUES ('$user', PASSWORD('$pass1'), 'reseller', '$verwaltungsemail', '$authorativer_nameserver', '0', '$rights_1', '$rights_2', '$rights_3', '$rights_4', '$secondary_nameserver', '$rights_5', '$rights_6', '$rights_7', '$rights_8','$standard_ip');"); + // <-- BEGIN PATCH --> (Folgende Zeile geaendert) + mysql_query("INSERT INTO eazydns_config (user, pass, userrights, verwaltungsemail, authorativer_nameserver, resellerID, rights_1,rights_2,rights_3,rights_4, secondary_nameserver,rights_5,rights_6,standard_ip, rights_7, rights_8, third_nameserver) VALUES ('$user', PASSWORD('$pass1'), 'reseller', '$verwaltungsemail', '$authorativer_nameserver', '0', '$rights_1', '$rights_2', '$rights_3', '$rights_4', '$secondary_nameserver', '$rights_5', '$rights_6', '$rights_7', '$rights_8','$standard_ip', '$third_nameserver');"); + // $resellerID = mysql_insert_id(); mysql_query("UPDATE eazydns_config SET resellerID='$resellerID' WHERE userID='$resellerID'"); } }else{ - mysql_query("UPDATE eazydns_config SET user='$user', verwaltungsemail='$verwaltungsemail', authorativer_nameserver='$authorativer_nameserver', rights_1='$rights_1', rights_2='$rights_2', rights_3='$rights_3', rights_4='$rights_4', secondary_nameserver='$secondary_nameserver', rights_5='$rights_5', rights_6='$rights_6',standard_ip='$standard_ip', rights_7='$rights_7', rights_8='$rights_8' WHERE userID='$userID'"); + // <-- BEGIN PATCH --> (Folgende Zeile geaendert) + mysql_query("UPDATE eazydns_config SET user='$user', verwaltungsemail='$verwaltungsemail', authorativer_nameserver='$authorativer_nameserver', rights_1='$rights_1', rights_2='$rights_2', rights_3='$rights_3', rights_4='$rights_4', secondary_nameserver='$secondary_nameserver', rights_5='$rights_5', rights_6='$rights_6',standard_ip='$standard_ip', rights_7='$rights_7', rights_8='$rights_8', third_nameserver='$third_nameserver' WHERE userID='$userID'"); + // if($pass1!=""){ if($pass1 != $pass2){ echo(""); exit; } +// + if ( ($third_nameserver != "") && (eingabepruefen($third_nameserver,1)==1) ) + { + echo(""); + exit; + } +// $sprache = strtolower($sprache); - mysql_query("UPDATE eazydns_config SET verwaltungsemail='$verwaltungsemail', authorativer_nameserver='$authorativer_nameserver', secondary_nameserver='$secondary_nameserver',standard_ip='$standard_ip',sprache='$sprache' WHERE userID='$ezd_userID'"); + mysql_query("UPDATE eazydns_config SET verwaltungsemail='$verwaltungsemail', authorativer_nameserver='$authorativer_nameserver', secondary_nameserver='$secondary_nameserver',standard_ip='$standard_ip',sprache='$sprache',third_nameserver='$third_nameserver' WHERE userID='$ezd_userID'"); $go = ""; echo(""); } if($go==""){ - $query_clients = mysql_query("SELECT verwaltungsemail, authorativer_nameserver, secondary_nameserver,standard_ip,sprache $query_add FROM eazydns_config WHERE userID='$ezd_userID'"); + $query_clients = mysql_query("SELECT verwaltungsemail, authorativer_nameserver, secondary_nameserver,standard_ip,sprache,third_nameserver $query_add FROM eazydns_config WHERE userID='$ezd_userID'"); $res_clients = mysql_fetch_row($query_clients); $verwaltungsemail = $res_clients[0]; $authorativer_nameserver = $res_clients[1]; $secondary_nameserver = $res_clients[2]; $standard_ip = $res_clients[3]; $sprache = ucfirst($res_clients[4]); - $reseller_rights_3 = $res_clients[5]; - $reseller_rights_5 = $res_clients[6]; +// +// Der dritte Nameserver muss vorgeschoben werden, also muessen die Indices +// der reseller_rights nach hinten wandern + $third_nameserver = $res_clients[5]; + $reseller_rights_3 = $res_clients[6]; + $reseller_rights_5 = $res_clients[7]; +// if($sprache == ""){ $sprache = ucfirst($ezd_default_language); } if($ezd_userrights == "admin"){ $reseller_rights_3 = 1; @@ -56,11 +72,20 @@ + + + + + + + + + diff -x setup.php -x zones.tpl -x '*~' -Nr --unified=5 eazydns_2.0.3_html/languages/deutsch.php dns/languages/deutsch.php --- eazydns_2.0.3_html/languages/deutsch.php 2003-08-12 18:15:27.000000000 +0200 +++ dns/languages/deutsch.php 2005-09-10 16:53:27.817777360 +0200 @@ -35,10 +35,11 @@ $ezd_lan["keine_domain"] ="Leider konnte keine Domain mit den angegebenen Kriterien gefunden werden."; $ezd_lan["seriennummer"] ="Seriennummer"; $ezd_lan["email"] ="E-Mail"; $ezd_lan["pns"] ="Primärer Nameserver"; $ezd_lan["sns"] ="Sekundärer Nameserver"; +$ezd_lan["tns"] ="Tertiärer Nameserver"; $ezd_lan["soa_record"] ="SOA Record"; $ezd_lan["a_record"] ="A Record"; $ezd_lan["aaaa_record"] ="AAAA Record"; $ezd_lan["ns_record"] ="NS Record"; $ezd_lan["host"] ="Host"; @@ -123,6 +124,12 @@ $ezd_lan["auth_fail"] ="401 - ZUGRIFF VERWEIGERT"; $ezd_lan["dom_zugeordnet"] = "Domain(s) übergeben"; $ezd_lan["res_zugeordnet"] = "Kunde(n) übergeben"; $ezd_lan["rechte_dyn"] = "kann dynamische IP anlegen"; $ezd_lan["anzahl_domains"] = "Sie haben versucht, mehr Domains anzulegen/zuzuweisen als erlaubt"; +// +$ezd_lan["txt"] = "Eintrag"; +$ezd_lan["txt_record"] = "TXT Record"; +$ezd_lan["ptr"] = "Reverse Name"; +$ezd_lan["ptr_record"] = "PTR Record"; +// ?> \ Kein Zeilenumbruch am Dateiende. diff -x setup.php -x zones.tpl -x '*~' -Nr --unified=5 eazydns_2.0.3_html/languages/english.php dns/languages/english.php --- eazydns_2.0.3_html/languages/english.php 2003-08-12 18:15:28.000000000 +0200 +++ dns/languages/english.php 2005-09-10 16:55:09.627299960 +0200 @@ -35,10 +35,11 @@ $ezd_lan["keine_domain"] ="no domain with your search terms found."; $ezd_lan["seriennummer"] ="Serial"; $ezd_lan["email"] ="email"; $ezd_lan["pns"] ="primary nameserver"; $ezd_lan["sns"] ="secondary nameserver"; +$ezd_lan["tns"] ="tertiary nameserver"; $ezd_lan["soa_record"] ="SOA record"; $ezd_lan["a_record"] ="A record"; $ezd_lan["aaaa_record"] ="AAAA Record"; $ezd_lan["ns_record"] ="NS record"; $ezd_lan["host"] ="host"; @@ -123,6 +124,13 @@ $ezd_lan["auth_fail"] ="401 - ACCESS DENIED"; $ezd_lan["dom_zugeordnet"] = "domain(s) transfered"; $ezd_lan["res_zugeordnet"] = "client(s) transfered"; $ezd_lan["rechte_dyn"] = "can create dynamic IP"; $ezd_lan["anzahl_domains"] = "you have tried to create/assign more domains than allowed"; + +// +$ezd_lan["txt"] = "Entry"; +$ezd_lan["txt_record"] = "TXT record"; +$ezd_lan["ptr"] = "Reverse Name"; +$ezd_lan["ptr_record"] = "PTR Record"; +// ?> \ Kein Zeilenumbruch am Dateiende. diff -x setup.php -x zones.tpl -x '*~' -Nr --unified=5 eazydns_2.0.3_html/languages/italian.php dns/languages/italian.php --- eazydns_2.0.3_html/languages/italian.php 2003-08-12 18:15:27.000000000 +0200 +++ dns/languages/italian.php 2005-09-10 16:55:44.345022064 +0200 @@ -35,10 +35,11 @@ $ezd_lan["keine_domain"] ="nessun dominio con i termini di ricerca inseriti."; $ezd_lan["seriennummer"] ="seriale"; $ezd_lan["email"] ="email"; $ezd_lan["pns"] ="nameserver primario"; $ezd_lan["sns"] ="nameserver secondario"; +$ezd_lan["tns"] ="nameserver no. 3"; $ezd_lan["soa_record"] ="record SOA"; $ezd_lan["a_record"] ="record A"; $ezd_lan["aaaa_record"] ="record AAAA"; $ezd_lan["ns_record"] ="record NS"; $ezd_lan["host"] ="host"; @@ -123,6 +124,13 @@ $ezd_lan["auth_fail"] ="401 - ACCESSO NEGATO"; $ezd_lan["dom_zugeordnet"] = "dominio/i trasferito"; $ezd_lan["res_zugeordnet"] = "cliente/i trasferito"; $ezd_lan["rechte_dyn"] = "può generare IP dinamico"; $ezd_lan["anzahl_domains"] = "avete provato a create/assign più dominii di quanto conceduti"; + +// +$ezd_lan["txt"] = "entry"; +$ezd_lan["txt_record"] = "record TXT"; +$ezd_lan["ptr"] = "Reverse Name"; +$ezd_lan["ptr_record"] = "PTR Record"; +// ?> \ Kein Zeilenumbruch am Dateiende. diff -x setup.php -x zones.tpl -x '*~' -Nr --unified=5 eazydns_2.0.3_html/languages/nederlands.php dns/languages/nederlands.php --- eazydns_2.0.3_html/languages/nederlands.php 2003-08-12 18:15:27.000000000 +0200 +++ dns/languages/nederlands.php 2005-09-10 16:56:12.099802696 +0200 @@ -35,10 +35,11 @@ $ezd_lan["keine_domain"] ="Geen domein met uw zoekcriteria gevonden."; $ezd_lan["seriennummer"] ="Serienummer (YYYYMMDD##)"; $ezd_lan["email"] ="E-mail"; $ezd_lan["pns"] ="Primaire nameserver"; $ezd_lan["sns"] ="Secondaire nameserver"; +$ezd_lan["tns"] ="3. nameserver"; $ezd_lan["soa_record"] ="SOA record"; $ezd_lan["a_record"] ="A record"; $ezd_lan["aaaa_record"] ="AAAA Record"; $ezd_lan["ns_record"] ="NS record"; $ezd_lan["host"] ="host"; @@ -123,6 +124,13 @@ $ezd_lan["auth_fail"] ="401 - toegang geweigerd"; $ezd_lan["dom_zugeordnet"] = "Domein(en) veranderen"; $ezd_lan["res_zugeordnet"] = "Klant(en) veranderen"; $ezd_lan["rechte_dyn"] = "Kan dynamic IP aanmaken"; $ezd_lan["anzahl_domains"] = "U heeft meer domeinen ingevoerd als toegestaan! Neem contact op met onze administratie indien U meer domeinen wenst."; + +// +$ezd_lan["txt"] = "Entry"; +$ezd_lan["txt_record"] = "TXT Record"; +$ezd_lan["ptr"] = "Reverse Name"; +$ezd_lan["ptr_record"] = "PTR Record"; +// ?> diff -x setup.php -x zones.tpl -x '*~' -Nr --unified=5 eazydns_2.0.3_html/README.patch dns/README.patch --- eazydns_2.0.3_html/README.patch 1970-01-01 01:00:00.000000000 +0100 +++ dns/README.patch 2005-09-10 21:37:13.668454632 +0200 @@ -0,0 +1,14 @@ +Achtung! Dieser Patch benötigt eine Änderung an der eazydns +Datenbank, um einen dritten Nameserver zu unterstützen: + +ALTER TABLE `eazydns_config` ADD `third_nameserver` CHAR( 250 ) AFTER `secondary_nameserver`; + +Damit alle drei Nameserver beim Anlegen auch wirklich in die +Zone eingetragen werden, muß man die Datei zones.tpl anpassen: + +NS#$domain#$authorativer_nameserver#$conf_ttl +NS#$domain#$secondary_nameserver#$conf_ttl +NS#$domain#$third_nameserver#$conf_ttl + +Die ersten beiden Einträge müssen schon für die beiden ersten +Nameserver vorhanden sein, der letzte Eintrag ist neu.