[Blahzdns-cvs] blahzdns dns.inc.php,1.21,1.22 import.php,1.7,1.8

[Mike R. <ms...@us...>]

Update of /cvsroot/blahzdns/blahzdns
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27617

Modified Files:
	dns.inc.php import.php 
Log Message:
Add A6 Support for Bind.


Index: import.php
===================================================================
RCS file: /cvsroot/blahzdns/blahzdns/import.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** import.php	20 Sep 2003 04:33:37 -0000	1.7
--- import.php	13 May 2005 20:10:11 -0000	1.8
***************
*** 174,183 ****
  					}
  				}
! /*				else if(preg_match("/\baaaa\b/i",$line[3])) {
! 					$recordTypeId=getRecordId("AAAA");
  					if($line[0] == "$domain.") {
  						$query = "INSERT INTO  RECORDS (RECORDID,ZONEID,MODUSER,RECORDTYPEID,RECORD,TTL,MXPRIORITY,VALUE)\n".
  						"VALUES ('','$zoneid','$userId','$recordTypeId','@','$line[1]',NULL,'$line[4]')";
! 						logMessage($user,$ip,"ADDRECORD","A Record @ added to zone $domain");
  					}
  					else {
--- 174,183 ----
  					}
  				}
! 				else if(preg_match("/\ba6\b/i",$line[3])) {
! 					$recordTypeId=getRecordId("A6");
  					if($line[0] == "$domain.") {
  						$query = "INSERT INTO  RECORDS (RECORDID,ZONEID,MODUSER,RECORDTYPEID,RECORD,TTL,MXPRIORITY,VALUE)\n".
  						"VALUES ('','$zoneid','$userId','$recordTypeId','@','$line[1]',NULL,'$line[4]')";
! 						logMessage($user,$ip,"ADDRECORD","A6 Record @ added to zone $domain");
  					}
  					else {
***************
*** 186,192 ****
  						$query = "INSERT INTO RECORDS (RECORDID,ZONEID,MODUSER,RECORDTYPEID,RECORD,TTL,MXPRIORITY,VALUE)\n".
  						"VALUES ('','$zoneid','$userId','$recordTypeId','$dest[0]','$line[1]',NULL,'$line[4]')";
! 						logMessage($user,$ip,"ADDRECORD","A Record $dest[0] added to zone $domain");
  					}
! 				}*/ 
  				else if(preg_match("/\ba\b/i",$line[3])) {
  					$recordTypeId=getRecordId("A");
--- 186,192 ----
  						$query = "INSERT INTO RECORDS (RECORDID,ZONEID,MODUSER,RECORDTYPEID,RECORD,TTL,MXPRIORITY,VALUE)\n".
  						"VALUES ('','$zoneid','$userId','$recordTypeId','$dest[0]','$line[1]',NULL,'$line[4]')";
! 						logMessage($user,$ip,"ADDRECORD","A6 Record $dest[0] added to zone $domain");
  					}
! 				} 
  				else if(preg_match("/\ba\b/i",$line[3])) {
  					$recordTypeId=getRecordId("A");

Index: dns.inc.php
===================================================================
RCS file: /cvsroot/blahzdns/blahzdns/dns.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** dns.inc.php	26 Apr 2004 02:03:55 -0000	1.21
--- dns.inc.php	13 May 2005 20:10:11 -0000	1.22
***************
*** 171,174 ****
--- 171,175 ----
  function getRecordTypeSelect() {
  	global $db;
+ 	global $config;
  	$query = "SELECT RECORDTYPEID,NAME FROM RECORDTYPE";
  	//Perform query
***************
*** 177,180 ****
--- 178,183 ----
  	$output = "<SELECT NAME=\"RECORDTYPE\">\n";
  	while ($myrow = mysql_fetch_row($result)) {
+ 		if (($config['OUTPUT_FORMAT'] == "djbdns" && $myrow[1] != "A6") || (
+ 			$config['OUTPUT_FORMAT'] == "bind" )) {
  		if($count == 0) {
  			$output .= "<OPTION SELECTED VALUE=\"$myrow[0]\">$myrow[1]</OPTION>\n";
***************
*** 183,186 ****
--- 186,190 ----
  		 	$output .= "<OPTION VALUE=\"$myrow[0]\">$myrow[1]</OPTION>\n";
  		}
+ 		}
  		$count++;
  	}