# HG changeset patch
# User peter
# Date 1201966744 0
# Node ID e1b918eaf69a598e288f442063f79260f631b5d9
# Parent  47248e2af079663fc21378f3ada60b2e192c7ced
[feladat @ 118]
Removed the requirement of enabeling the PHP setting short_open_tag by changing all short open tags (<?) to the 'normal' tags (<?php).

diff -r 47248e2af079 -r e1b918eaf69a add_record.php
--- a/add_record.php	Tue Jan 29 21:32:48 2008 +0000
+++ b/add_record.php	Sat Feb 02 15:39:04 2008 +0000
@@ -37,25 +37,25 @@
 include_once("inc/header.inc.php");
 ?>
 
-    <h2><? echo _('Add record to zone'); ?> "<? echo get_domain_name_from_id($_GET["id"]) ?>"</H2>
+    <h2><?php echo _('Add record to zone'); ?> "<?php echo get_domain_name_from_id($_GET["id"]) ?>"</H2>
 
     <form method="post">
-     <input type="hidden" name="zoneid" value="<? echo $_GET["id"] ?>">
+     <input type="hidden" name="zoneid" value="<?php echo $_GET["id"] ?>">
      <table border="0" cellspacing="4">
       <tr>
-       <td class="n"><? echo _('Name'); ?></td>
+       <td class="n"><?php echo _('Name'); ?></td>
        <td class="n">&nbsp;</td>
-       <td class="n"><? echo _('Type'); ?></td>
-       <td class="n"><? echo _('Priority'); ?></td>
-       <td class="n"><? echo _('Content'); ?></td>
-       <td class="n"><? echo _('TTL'); ?></td>
+       <td class="n"><?php echo _('Type'); ?></td>
+       <td class="n"><?php echo _('Priority'); ?></td>
+       <td class="n"><?php echo _('Content'); ?></td>
+       <td class="n"><?php echo _('TTL'); ?></td>
       </tr>
       <tr>
-       <td class="n"><input type="text" name="name" class="input">.<? echo get_domain_name_from_id($_GET["id"]) ?></td>
+       <td class="n"><input type="text" name="name" class="input">.<?php echo get_domain_name_from_id($_GET["id"]) ?></td>
        <td class="n">IN</td>
        <td class="n">
         <select name="type">
-<?
+<?php
 $dname = get_domain_name_from_id($_GET["id"]);
 foreach (get_record_types() as $c) {
         if (eregi('in-addr.arpa', $dname) && strtoupper($c) == 'PTR') {
@@ -65,18 +65,18 @@
         } else {
                 unset($add);
         }
-        ?><option<? echo $add ?> value="<? echo $c ?>"><? echo $c ?></option><?
+        ?><option<?php echo $add ?> value="<?php echo $c ?>"><?php echo $c ?></option><?php
 }
 ?>
         </select>
        </td>
        <td class="n"><input type="text" name="prio" class="sinput"></td>
        <td class="n"><input type="text" name="content" class="input"></td>
-       <td class="n"><input type="text" name="ttl" class="sinput" value="<? echo $DEFAULT_TTL?>"></td>
+       <td class="n"><input type="text" name="ttl" class="sinput" value="<?php echo $DEFAULT_TTL?>"></td>
       </tr>
      </table>
      <br>
-     <input type="submit" name="commit" value="<? echo _('Add record'); ?>" class="button">
+     <input type="submit" name="commit" value="<?php echo _('Add record'); ?>" class="button">
     </form>
 
-<? include_once("inc/footer.inc.php"); ?>
+<?php include_once("inc/footer.inc.php"); ?>
diff -r 47248e2af079 -r e1b918eaf69a add_supermaster.php
--- a/add_supermaster.php	Tue Jan 29 21:32:48 2008 +0000
+++ b/add_supermaster.php	Sat Feb 02 15:39:04 2008 +0000
@@ -59,43 +59,43 @@
     
     if ($error != "")
     {
-    	?><div class="error"><? echo _('Error'); ?>: <? echo $error; ?></div><?
+    	?><div class="error"><?php echo _('Error'); ?>: <?php echo $error; ?></div><?php
     }
     elseif ($success != "")
     {
-    	?><div class="success"><? echo $success; ?></div><?
+    	?><div class="success"><?php echo $success; ?></div><?php
     }
     
     ?>
-    <h2><? echo _('Add supermaster'); ?></h2>
+    <h2><?php echo _('Add supermaster'); ?></h2>
     <form method="post" action="add_supermaster.php">
      <table>
       <tr>
-       <td class="n"><? echo _('IP address of supermaster'); ?>:</td>
+       <td class="n"><?php echo _('IP address of supermaster'); ?>:</td>
        <td class="n">
-        <input type="text" class="input" name="master_ip" value="<? if ($error) print $_POST["master_ip"]; ?>">
+        <input type="text" class="input" name="master_ip" value="<?php if ($error) print $_POST["master_ip"]; ?>">
        </td>
       </tr>
       <tr>
-       <td class="n"><? echo _('Hostname in NS record'); ?>:</td>
+       <td class="n"><?php echo _('Hostname in NS record'); ?>:</td>
        <td class="n">
-        <input type="text" class="input" name="ns_name" value="<? if ($error) print $_POST["ns_name"]; ?>">
+        <input type="text" class="input" name="ns_name" value="<?php if ($error) print $_POST["ns_name"]; ?>">
        </td>
       </tr>
       <tr>
-       <td class="n"><? echo _('Account'); ?>:</td>
+       <td class="n"><?php echo _('Account'); ?>:</td>
        <td class="n">
-        <input type="text" class="input" name="account" value="<? if ($error) print $_POST["account"]; ?>">
+        <input type="text" class="input" name="account" value="<?php if ($error) print $_POST["account"]; ?>">
        </td>
       </tr>
       <tr>
        <td class="n">&nbsp;</td>
        <td class="n">
-        <input type="submit" class="button" name="submit" value="<? echo _('Add supermaster'); ?>">
+        <input type="submit" class="button" name="submit" value="<?php echo _('Add supermaster'); ?>">
        </td>
       </tr>
      </table>
     </form>
-<?
+<?php
 include_once("inc/footer.inc.php");
 ?>
diff -r 47248e2af079 -r e1b918eaf69a add_zone_master.php
--- a/add_zone_master.php	Tue Jan 29 21:32:48 2008 +0000
+++ b/add_zone_master.php	Sat Feb 02 15:39:04 2008 +0000
@@ -66,16 +66,16 @@
 
 	if ($error != "")
 	{
-	        ?><div class="error"><? echo _('Error'); ?>: <? echo $error; ?></div><?
+	        ?><div class="error"><?php echo _('Error'); ?>: <?php echo $error; ?></div><?php
 	}
 	elseif ($success != "")
 	{
-		?><div class="success"><? echo $success; ?></div><?
+		?><div class="success"><?php echo $success; ?></div><?php
 	}
 
 	?>
 	<h2>Add master zone</h2>
-	<?
+	<?php
 
 	// Zone type set to master and native only, slave zones are created
 	// on a different page. 
@@ -85,61 +85,61 @@
         <form method="post" action="add_zone_master.php">
          <table>
           <tr>
-           <td class="n"><? echo _('Zone name'); ?>:</td>
+           <td class="n"><?php echo _('Zone name'); ?>:</td>
            <td class="n">
-            <input type="text" class="input" name="domain" value="<? if ($error) print $_POST["domain"]; ?>">
+            <input type="text" class="input" name="domain" value="<?php if ($error) print $_POST["domain"]; ?>">
            </td>
           </tr>
           <tr>
-           <td class="n"><? echo _('Web IP'); ?>:</td>
+           <td class="n"><?php echo _('Web IP'); ?>:</td>
            <td class="n">
-            <input type="text" class="input" name="webip" value="<? if ($error) print $_POST["webip"]; ?>">
+            <input type="text" class="input" name="webip" value="<?php if ($error) print $_POST["webip"]; ?>">
            </td>
           </tr>
           <tr>
-           <td class="n"><? echo _('Mail IP'); ?>:</TD>
+           <td class="n"><?php echo _('Mail IP'); ?>:</TD>
            <td class="n">
-            <input type="text" class="input" name="mailip" value="<? if ($error) print $_POST["mailip"]; ?>">
+            <input type="text" class="input" name="mailip" value="<?php if ($error) print $_POST["mailip"]; ?>">
            </td>
           </tr>
           <tr>
-           <td class="n"><? echo _('Owner'); ?>:</td>
+           <td class="n"><?php echo _('Owner'); ?>:</td>
            <td class="n">
             <select name="owner">
-        <?
+        <?php
         foreach ($users as $u)
         {
-           ?><option value="<? echo $u['id'] ?>"><? echo $u['fullname'] ?></option><?
+           ?><option value="<?php echo $u['id'] ?>"><?php echo $u['fullname'] ?></option><?php
         }
         ?>
             </select>
            </td>
           </tr>
           <tr>
-           <td class="n"><? echo _('Zone type'); ?>:</td>
+           <td class="n"><?php echo _('Zone type'); ?>:</td>
            <td class="n">
             <select name="dom_type">
-        <?
+        <?php
         foreach($zone_types as $s)
         {
-           ?><option value="<? echo $s?>"><? echo $s ?></option><?
+           ?><option value="<?php echo $s?>"><?php echo $s ?></option><?php
         }
         ?>
             </select>
            </td>
           </tr>
           <tr>
-           <td class="n"><? echo _('Create zone without applying records-template'); ?>:</td>
+           <td class="n"><?php echo _('Create zone without applying records-template'); ?>:</td>
 	   <td class="n"><input type="checkbox" name="empty" value="1"></td>
 	  </tr>
           <tr>
 	   <td class="n">&nbsp;</td>
 	   <td class="n">
-	    <input type="submit" class="button" name="submit" value="<? echo _('Add zone'); ?>">
+	    <input type="submit" class="button" name="submit" value="<?php echo _('Add zone'); ?>">
 	   </td>
 	  </tr>
          </table>
         </form>
-<?
+<?php
 
 include_once("inc/footer.inc.php");
diff -r 47248e2af079 -r e1b918eaf69a add_zone_slave.php
--- a/add_zone_slave.php	Tue Jan 29 21:32:48 2008 +0000
+++ b/add_zone_slave.php	Sat Feb 02 15:39:04 2008 +0000
@@ -61,39 +61,39 @@
 
 	if ($error != "")
 	{
-	        ?><div class="error"><? echo _('Error'); ?>: <? echo $error; ?></div><?
+	        ?><div class="error"><?php echo _('Error'); ?>: <?php echo $error; ?></div><?php
 	}
 	elseif ($success != "")
 	{
-		?><div class="success"><? echo $success; ?></div><?
+		?><div class="success"><?php echo $success; ?></div><?php
 	}
 	
 	$users = show_users();
 	
 	?>
-	    <h2><? echo _('Add slave zone'); ?></h2>
+	    <h2><?php echo _('Add slave zone'); ?></h2>
 	    <form method="post" action="add_zone_slave.php">
 	     <table>
 	      <tr>
-	       <td class="n"><? echo _('Zone name'); ?>:</td>
+	       <td class="n"><?php echo _('Zone name'); ?>:</td>
 	       <td class="n">
-	        <input type="text" class="input" name="domain" value="<? if ($error) print $_POST["domain"]; ?>">
+	        <input type="text" class="input" name="domain" value="<?php if ($error) print $_POST["domain"]; ?>">
 	       </td>
 	      </tr>
 	      <tr>
-	       <td class="n"><? echo _('IP of master NS'); ?>:</td>
+	       <td class="n"><?php echo _('IP of master NS'); ?>:</td>
 	       <td class="n">
-	        <input type="text" class="input" name="slave_master" value="<? if ($error) print $_POST["slave_master"]; ?>">
+	        <input type="text" class="input" name="slave_master" value="<?php if ($error) print $_POST["slave_master"]; ?>">
 	       </td>
 	      </tr>
 	      <tr>
-	       <td class="n"><? echo _('Owner'); ?>:</td>
+	       <td class="n"><?php echo _('Owner'); ?>:</td>
 	       <td class="n">
 	        <select name="owner">
-	         <? 
+	         <?php 
 	         foreach ($users as $u)
 	         {
-	           ?><option value="<? echo $u['id'] ?>"><? echo $u['fullname'] ?></option><?
+	           ?><option value="<?php echo $u['id'] ?>"><?php echo $u['fullname'] ?></option><?php
 	         } 
 	        ?>
 	        </select>
@@ -102,11 +102,11 @@
 	      <tr>
 	       <td class="n">&nbsp;</td>
 	       <td class="n">
-	        <input type="submit" class="button" name="submit" value="<? echo _('Add domain'); ?>">
+	        <input type="submit" class="button" name="submit" value="<?php echo _('Add domain'); ?>">
 	       </td>
 	      </tr>
 	     </table>
 	    </form>
-<?
+<?php
 include_once("inc/footer.inc.php");
 ?>
diff -r 47248e2af079 -r e1b918eaf69a change_password.php
--- a/change_password.php	Tue Jan 29 21:32:48 2008 +0000
+++ b/change_password.php	Sat Feb 02 15:39:04 2008 +0000
@@ -35,30 +35,30 @@
 
 include_once("inc/header.inc.php");
 ?>
-    <h2><? echo _('Change password'); ?></h2>
+    <h2><?php echo _('Change password'); ?></h2>
     <form method="post" action="change_password.php">
      <table border="0" CELLSPACING="4">
       <tr>
-       <td class="n"><? echo _('Current password'); ?>:</td>
+       <td class="n"><?php echo _('Current password'); ?>:</td>
        <td class="n"><input type="password" class="input" NAME="currentpass" value=""></td>
       </tr>
       <tr>
-       <td class="n"><? echo _('New password'); ?>:</td>
+       <td class="n"><?php echo _('New password'); ?>:</td>
        <td class="n"><input type="password" class="input" NAME="newpass" value=""></td>
       </tr>
       <tr>
-       <td class="n"><? echo _('New password'); ?>:</td>
+       <td class="n"><?php echo _('New password'); ?>:</td>
        <td class="n"><input type="password" class="input" NAME="newpass2" value=""></td>
       </tr>
       <tr>
        <td class="n">&nbsp;</td>
        <td class="n">
-        <input type="submit" class="button" NAME="submit" value="<? echo _('Change password'); ?>">
+        <input type="submit" class="button" NAME="submit" value="<?php echo _('Change password'); ?>">
        </td>
       </tr>
      </table>
     </form>
 
-<?
+<?php
 include_once("inc/footer.inc.php");
 ?>
diff -r 47248e2af079 -r e1b918eaf69a delete_domain.php
--- a/delete_domain.php	Tue Jan 29 21:32:48 2008 +0000
+++ b/delete_domain.php	Sat Feb 02 15:39:04 2008 +0000
@@ -36,8 +36,8 @@
         }
         include_once("inc/header.inc.php");
         $info = get_domain_info_from_id($_GET["id"]);
-        ?><h2><? echo _('Delete zone'); ?> "<? echo $info["name"] ?>"</h2>
-        <?
+        ?><h2><?php echo _('Delete zone'); ?> "<?php echo $info["name"] ?>"</h2>
+        <?php
 	if($info["owner"])
 	{
 		print (_('Owner') . ": " . $info["owner"] . "<br>"); 
@@ -55,11 +55,11 @@
 		}
 	}
 	?>
-	<font class="warning"><? echo _('Are you sure?'); ?></font>
+	<font class="warning"><?php echo _('Are you sure?'); ?></font>
 	<br><br>
-	<input type="button" class="button" OnClick="location.href='<? echo $_SERVER["REQUEST_URI"] ?>&confirm=1'" value="<? echo _('Yes'); ?>">
-	<input type="button" class="button" OnClick="location.href='<? echo $_SERVER["REQUEST_URI"] ?>&confirm=0'" value="<? echo _('No'); ?>">
-	<?
+	<input type="button" class="button" OnClick="location.href='<?php echo $_SERVER["REQUEST_URI"] ?>&confirm=1'" value="<?php echo _('Yes'); ?>">
+	<input type="button" class="button" OnClick="location.href='<?php echo $_SERVER["REQUEST_URI"] ?>&confirm=0'" value="<?php echo _('No'); ?>">
+	<?php
 } elseif ($_GET["edit"]) {
         include_once("inc/header.inc.php");
 } else {
diff -r 47248e2af079 -r e1b918eaf69a delete_record.php
--- a/delete_record.php	Tue Jan 29 21:32:48 2008 +0000
+++ b/delete_record.php	Sat Feb 02 15:39:04 2008 +0000
@@ -43,17 +43,17 @@
         include_once("inc/header.inc.php");
         ?>
 	
-	<h2><? echo _('Delete record'); ?> "<?
+	<h2><?php echo _('Delete record'); ?> "<?php
         $data = get_record_from_id($_GET["id"]);
         print $data["name"]." IN ".$data["type"]." ".$data["content"];
-        ?>"</h2><?
+        ?>"</h2><?php
         if (($data["type"] == "NS" && $data["name"] == get_domain_name_from_id($_GET["domain"])) || $data["type"] == "SOA") {
                 print "<font class=\"warning\">" . _('You are trying to delete a record that is needed for this zone to work.') . "</font><br>";
         }
-        ?><br><font class="warning"><? echo _('Are you sure?'); ?></font><br><br>
-        <input type="button" class="button" OnClick="location.href='<? echo $_SERVER["REQUEST_URI"] ?>&confirm=1'" value="<? echo _('Yes'); ?>"> 
-	<input type="button" class="button" OnClick="location.href='<? echo $_SERVER["REQUEST_URI"] ?>&confirm=0'" value="<? echo _('No'); ?>">
-        <?
+        ?><br><font class="warning"><?php echo _('Are you sure?'); ?></font><br><br>
+        <input type="button" class="button" OnClick="location.href='<?php echo $_SERVER["REQUEST_URI"] ?>&confirm=1'" value="<?php echo _('Yes'); ?>"> 
+	<input type="button" class="button" OnClick="location.href='<?php echo $_SERVER["REQUEST_URI"] ?>&confirm=0'" value="<?php echo _('No'); ?>">
+        <?php
 } else {
         include_once("inc/header.inc.php");
         echo _('Nothing to do!');
diff -r 47248e2af079 -r e1b918eaf69a delete_supermaster.php
--- a/delete_supermaster.php	Tue Jan 29 21:32:48 2008 +0000
+++ b/delete_supermaster.php	Sat Feb 02 15:39:04 2008 +0000
@@ -37,13 +37,13 @@
         include_once("inc/header.inc.php");
 	$info = get_supermaster_info_from_ip($_GET["master_ip"]);
         ?>
-	<h2><? echo _('Delete supermaster'); ?> "<? echo $_GET["master_ip"] ?>"</h2>
-	<? echo _('Hostname in NS record'); ?>: <? echo $info["ns_name"] ?><br>
-	<? echo _('Account'); ?>: <? echo $info["account"] ?><br><br>
-        <font class="warning"><? echo _('Are you sure?'); ?></font><br><br>
-        <input type="button" class="button" OnClick="location.href='<? echo $_SERVER["REQUEST_URI"] ?>&confirm=1'" value="<? echo _('Yes'); ?>"> 
-	<input type="button" class="button" OnClick="location.href='<? echo $_SERVER["REQUEST_URI"] ?>&confirm=0'" value="<? echo _('No'); ?>">
-        <?
+	<h2><?php echo _('Delete supermaster'); ?> "<?php echo $_GET["master_ip"] ?>"</h2>
+	<?php echo _('Hostname in NS record'); ?>: <?php echo $info["ns_name"] ?><br>
+	<?php echo _('Account'); ?>: <?php echo $info["account"] ?><br><br>
+        <font class="warning"><?php echo _('Are you sure?'); ?></font><br><br>
+        <input type="button" class="button" OnClick="location.href='<?php echo $_SERVER["REQUEST_URI"] ?>&confirm=1'" value="<?php echo _('Yes'); ?>"> 
+	<input type="button" class="button" OnClick="location.href='<?php echo $_SERVER["REQUEST_URI"] ?>&confirm=0'" value="<?php echo _('No'); ?>">
+        <?php
 } else {
         include_once("inc/header.inc.php");
         echo _('Nothing to do!');
diff -r 47248e2af079 -r e1b918eaf69a delete_user.php
--- a/delete_user.php	Tue Jan 29 21:32:48 2008 +0000
+++ b/delete_user.php	Sat Feb 02 15:39:04 2008 +0000
@@ -54,13 +54,13 @@
         include_once("inc/header.inc.php");
         ?>
 	
-    <h3><? echo _('Delete user'); ?> "<? echo get_fullname_from_userid($id) ?>"</h3>
+    <h3><?php echo _('Delete user'); ?> "<?php echo get_fullname_from_userid($id) ?>"</h3>
      <form method="post">
-        <?
+        <?php
         $domains = get_domains_from_userid($id);
         if (count($domains) > 0) 
         {
-        	echo _('This user has access to the following zone(s)'); ?> :<BR><?
+        	echo _('This user has access to the following zone(s)'); ?> :<BR><?php
                 $users = show_users($id);
                 if(count($users) < 1) 
                 {
@@ -72,33 +72,33 @@
                  <tr>
 		  <td class="n">Delete</td>
 		  <td class="n">Name</td>
-		<? if (!$no_users) { ?>
+		<?php if (!$no_users) { ?>
 		  <td class="n">New owner</td>
-		<? } ?>
+		<?php } ?>
 		 </tr>
-                <?
+                <?php
                 foreach ($domains as $d) 
                 {
                         ?>
                  <tr>
-		  <td class="n" align="center"><?
+		  <td class="n" align="center"><?php
                         if ($no_users) 
                      	{ 
-                     		?><input type="hidden" name="delete[]" value="<? echo $d["id"] ?>"><?
+                     		?><input type="hidden" name="delete[]" value="<?php echo $d["id"] ?>"><?php
                         } 
-                        ?><input type="checkbox"<? echo $add ?> name="delete[]" value="<? echo $d["id"] ?>"></td><td class="n"><? echo $d["name"] ?></td><td class="n"><? 
+                        ?><input type="checkbox"<?php echo $add ?> name="delete[]" value="<?php echo $d["id"] ?>"></td><td class="n"><?php echo $d["name"] ?></td><td class="n"><?php 
                         if (!$no_users) 
                         { 
-                        	?><select name="domain[<? echo $d["id"] ?>]"><?
+                        	?><select name="domain[<?php echo $d["id"] ?>]"><?php
                         	foreach($users as $u) 
                         	{
-                        	        ?><option value="<? echo $u["id"] ?>"><? echo $u["fullname"] ?></option><?
+                        	        ?><option value="<?php echo $u["id"] ?>"><?php echo $u["fullname"] ?></option><?php
                         	}
-                        	?></select></td><? 
+                        	?></select></td><?php 
                         } 
-                        ?></tr><?
+                        ?></tr><?php
                 }
-                ?></table><?
+                ?></table><?php
         }
         
         $message = _('You are going to delete this user, are you sure?');
@@ -108,11 +108,11 @@
         }
 
         ?>
-        <font class="warning"><? echo $message ?></font><br>
-        <input type="hidden" name="id" value="<? echo $id ?>">
+        <font class="warning"><?php echo $message ?></font><br>
+        <input type="hidden" name="id" value="<?php echo $id ?>">
         <input type="hidden" name="confirm" value="1">
-        <input type="submit" class="button" value="<? echo _('Yes'); ?>"> <input type="button" class="button" OnClick="location.href='users.php'" value="<? echo _('No'); ?>"></FORM>
-        <?
+        <input type="submit" class="button" value="<?php echo _('Yes'); ?>"> <input type="button" class="button" OnClick="location.href='users.php'" value="<?php echo _('No'); ?>"></FORM>
+        <?php
         include_once("inc/footer.inc.php");
 } 
 else 
diff -r 47248e2af079 -r e1b918eaf69a edit.php
--- a/edit.php	Tue Jan 29 21:32:48 2008 +0000
+++ b/edit.php	Sat Feb 02 15:39:04 2008 +0000
@@ -60,67 +60,67 @@
 if (strlen($recordOwnerError)) {
 ?>
   <div class="error"><?php echo _('Error'); ?>: <?php echo _($recordOwnerError); ?></div>
-<?php	
+<?php
 }
 
 if(!isset($info["ownerid"]) && $domain_type != "SLAVE")
 {
 ?>
-    <div class="error"><? echo _('Error'); ?>: <? echo ('There is no owner for this zone, please assign someone.'); ?></div>
-<?
+    <div class="error"><?php echo _('Error'); ?>: <?php echo ('There is no owner for this zone, please assign someone.'); ?></div>
+<?php
 }
 if ($domain_type == "SLAVE" && ! $slave_master )
 {
 ?>
-    <div class="error"><? echo _('Error'); ?>: <? echo _('Type of this zone is "slave", but there is no IP address for it\'s master given.'); ?></div>
-<?
+    <div class="error"><?php echo _('Error'); ?>: <?php echo _('Type of this zone is "slave", but there is no IP address for it\'s master given.'); ?></div>
+<?php
 }
 ?>
-    <h2><? echo _('Edit zone'); ?> "<? echo get_domain_name_from_id($_GET["id"]) ?>"</h2>
-<?
+    <h2><?php echo _('Edit zone'); ?> "<?php echo get_domain_name_from_id($_GET["id"]) ?>"</h2>
+<?php
 if (level(5)) 
 { ?>	
        <div id="meta">
         <div id="meta-left">
 	 <table>
    	  <tr>
-  	   <th colspan="2"><? echo _('Owner of zone'); ?></th>
+  	   <th colspan="2"><?php echo _('Owner of zone'); ?></th>
   	  </tr>
-<?
+<?php
 	if(isset($info["ownerid"]))
 	{
 		$userRes = get_users_from_domain_id($_GET["id"]);
 		foreach($userRes as $user)
 		{ ?>
   	  <tr>
-  	   <form method="post" action="edit.php?id=<? echo $_GET['id']?>">
+  	   <form method="post" action="edit.php?id=<?php echo $_GET['id']?>">
   	    <td>
-	     <? echo $user["fullname"]?>
+	     <?php echo $user["fullname"]?>
 	    </td>
             <td>
-  	     <input type="hidden" name="del_user" value="<? echo $user["id"]?>">
-             <input type="submit" class="sbutton" name="co" value="<? echo _('Delete'); ?>">
+  	     <input type="hidden" name="del_user" value="<?php echo $user["id"]?>">
+             <input type="submit" class="sbutton" name="co" value="<?php echo _('Delete'); ?>">
   	    </td>
            </form>
   	  </tr>
-<?
+<?php
 		}
 	}
 	else
 	{
 ?>
 	  <tr>
-	   <td><? echo _('No owner set or this zone!'); ?></td>
+	   <td><?php echo _('No owner set or this zone!'); ?></td>
 	  </tr>
-<?
+<?php
 	}
   ?>
           <tr>
-  	   <form method="post" action="edit.php?id=<? echo $_GET['id']?>">
+  	   <form method="post" action="edit.php?id=<?php echo $_GET['id']?>">
   	    <td>
-  	     <input type="hidden" name="domain" value="<? echo $_GET["id"] ?>">
+  	     <input type="hidden" name="domain" value="<?php echo $_GET["id"] ?>">
   	     <select name="newowner">
-  			<?
+  			<?php
   			$users = show_users();
   			foreach ($users as $u)
   			{
@@ -130,29 +130,29 @@
   					$add = " SELECTED";
   				}
   				?>
-  				<option<? echo $add ?> value="<? echo $u["id"] ?>"><? echo $u["fullname"] ?></option><?
+  				<option<?php echo $add ?> value="<?php echo $u["id"] ?>"><?php echo $u["fullname"] ?></option><?php
   			}
   			?>
   			</select>
   	    </td>
   	    <td>
-     	     <input type="submit" class="sbutton" name="co" value="<? echo _('Add'); ?>">
+     	     <input type="submit" class="sbutton" name="co" value="<?php echo _('Add'); ?>">
             </td>
   	   </form>
   	  </tr>
          </table>
-	</div> <? // eo div meta-left ?>
+	</div> <?php // eo div meta-left ?>
         <div id="meta-right">
          <table>
 	  <tr>
-	   <th colspan="2"><? echo _('Type of zone'); ?></th>
+	   <th colspan="2"><?php echo _('Type of zone'); ?></th>
 	  </tr>
-	  <form action="<? echo $_SERVER['PHP_SELF']?>?id=<? echo $_GET['id']?>" method="post">
-	   <input type="hidden" name="domain" value="<? echo $_GET["id"] ?>">
+	  <form action="<?php echo $_SERVER['PHP_SELF']?>?id=<?php echo $_GET['id']?>" method="post">
+	   <input type="hidden" name="domain" value="<?php echo $_GET["id"] ?>">
 	   <tr>
 	    <td>
 	     <select name="newtype">
-<?
+<?php
 	foreach($server_types as $s)
 	{
 		unset($add);
@@ -161,44 +161,44 @@
 			$add = " SELECTED";
 		}
 ?>
-              <option<? echo $add ?> value="<? echo $s?>"><? echo $s?></option><?
+              <option<?php echo $add ?> value="<?php echo $s?>"><?php echo $s?></option><?php
 	}
 ?>
              </select>
             </td>
 	    <td>
-	     <input type="submit" class="sbutton" name="type_change" value="<? echo _('Change'); ?>">
+	     <input type="submit" class="sbutton" name="type_change" value="<?php echo _('Change'); ?>">
 	    </td>
 	   </tr>
 	  </form>
 
-<?
+<?php
 	if ($domain_type == "SLAVE" ) 
 	{ 
 		$slave_master=get_domain_slave_master($_GET['id']);
 ?>
           <tr>
 	   <th colspan="2">
-	    <? echo _('IP address of master NS'); ?>
+	    <?php echo _('IP address of master NS'); ?>
 	   </th>
 	  </tr>
-	  <form action="<? echo $_SERVER['PHP_SELF']?>?&amp;id=<? echo $_GET['id']?>" method="post">
-	   <input type="hidden" name="domain" value="<? echo $_GET["id"] ?>">
+	  <form action="<?php echo $_SERVER['PHP_SELF']?>?&amp;id=<?php echo $_GET['id']?>" method="post">
+	   <input type="hidden" name="domain" value="<?php echo $_GET["id"] ?>">
 	   <tr>
 	    <td>
-	     <input type="text" name="slave_master" value="<? echo $slave_master; ?>" class="input">
+	     <input type="text" name="slave_master" value="<?php echo $slave_master; ?>" class="input">
             </td>
             <td>
-	     <input type="submit" class="sbutton" name="change_slave_master" value="<? echo _('Change'); ?>">
+	     <input type="submit" class="sbutton" name="change_slave_master" value="<?php echo _('Change'); ?>">
             </td>
            </tr>
           </form>
-<?
+<?php
 	}
 ?>
          </table>  
-        </div> <? // eo div meta-right ?>
-       </div> <? // eo div meta 
+        </div> <?php // eo div meta-right ?>
+       </div> <?php // eo div meta 
 }
 else
 {
@@ -207,48 +207,48 @@
         <div id="meta-right">
          <table>
  	  <tr>
- 	   <th><? echo _('Type of zone'); ?></th><td class="y"><? echo $domain_type; ?></td>
+ 	   <th><?php echo _('Type of zone'); ?></th><td class="y"><?php echo $domain_type; ?></td>
 	  </tr>
-<?
+<?php
 	if ($domain_type == "SLAVE" &&  $slave_master )
 	{
 ?>
 	  <tr>
-	   <th><? echo _('IP address of master NS'); ?></th><td class="y"><? echo $slave_master; ?></td>
+	   <th><?php echo _('IP address of master NS'); ?></th><td class="y"><?php echo $slave_master; ?></td>
 	  </tr>
-<?
+<?php
 	}
 ?>
          </table>
-        </div> <? //eo div meta-right ?>
-        </div> <? // eo div meta
+        </div> <?php //eo div meta-right ?>
+        </div> <?php // eo div meta
 }
 ?>
        <div id="meta">
-<?
+<?php
 	if ($_SESSION[$_GET["id"]."_ispartial"] != 1 && $domain_type != "SLAVE" )
 	{
 ?>
-        <input type="button" class="button" OnClick="location.href='add_record.php?id=<? echo $_GET["id"] ?>'" value="<? echo _('Add record'); ?>">&nbsp;&nbsp;
-<?
+        <input type="button" class="button" OnClick="location.href='add_record.php?id=<?php echo $_GET["id"] ?>'" value="<?php echo _('Add record'); ?>">&nbsp;&nbsp;
+<?php
 	}
 	if (level(5))
 	{
 ?>
-	<input type="button" class="button" OnClick="location.href='delete_domain.php?id=<? echo $_GET["id"] ?>'" value="<? echo _('Delete zone'); ?>">
-<?
+	<input type="button" class="button" OnClick="location.href='delete_domain.php?id=<?php echo $_GET["id"] ?>'" value="<?php echo _('Delete zone'); ?>">
+<?php
 	}
 ?>
-        </div> <? // eo div meta ?>
+        </div> <?php // eo div meta ?>
        <div class="showmax">
-<?
+<?php
 show_pages($info["numrec"],ROWAMOUNT,$_GET["id"]);
 ?>
-        </div> <? // eo div showmax ?>
-         <form action="<? echo $_SERVER["PHP_SELF"]?>?id=<? echo $_GET["id"]?>" method="post">
+        </div> <?php // eo div showmax ?>
+         <form action="<?php echo $_SERVER["PHP_SELF"]?>?id=<?php echo $_GET["id"]?>" method="post">
           <input type="hidden" name="action" value="record-user">
           <table>
-<?
+<?php
 $countinput=0;
 $rec_result = get_records_from_domain_id($_GET["id"],ROWSTART,ROWAMOUNT);
 if($rec_result != -1)
@@ -256,50 +256,50 @@
 ?>
            <tr>
 	    <th>&nbsp;</th>
-<? 
+<?php 
 	if (level(10) && $domain_type != "SLAVE") 
 	{ 
 		echo "<th class=\"n\">" . _('Sub-owners') . "</td>"; 
 	} 
 ?>
-	    <th><? echo _('Name'); ?></th>
-	    <th><? echo _('Type'); ?></th>
-	    <th><? echo _('Content'); ?></th>
-	    <th><? echo _('Priority'); ?></th>
-	    <th><? echo _('TTL'); ?></th>
+	    <th><?php echo _('Name'); ?></th>
+	    <th><?php echo _('Type'); ?></th>
+	    <th><?php echo _('Content'); ?></th>
+	    <th><?php echo _('Priority'); ?></th>
+	    <th><?php echo _('TTL'); ?></th>
            </tr>
-<?
+<?php
   	$recs = sort_zone($rec_result);
   	foreach($recs as $r)
   	{
 ?>
            <tr>
 	    <td class="n">
-<?
+<?php
 		if ($domain_type != "SLAVE" )
 		{	
 			if(level(5) || (!($r["type"] == "SOA" && !$GLOBALS["ALLOW_SOA_EDIT"]) && !($r["type"] == "NS" && !$GLOBALS["ALLOW_NS_EDIT"])))
 			{
 ?>
-			     <a href="edit_record.php?id=<? echo $r['id'] ?>&amp;domain=<? echo $_GET["id"] ?>"><img src="images/edit.gif" alt="[ <? echo _('Edit record'); ?> ]"></a>
-			     <a href="delete_record.php?id=<? echo $r['id'] ?>&amp;domain=<? echo $_GET["id"] ?>"><img src="images/delete.gif" ALT="[ <? echo _('Delete record'); ?> ]" BORDER="0"></a>
-<?
+			     <a href="edit_record.php?id=<?php echo $r['id'] ?>&amp;domain=<?php echo $_GET["id"] ?>"><img src="images/edit.gif" alt="[ <?php echo _('Edit record'); ?> ]"></a>
+			     <a href="delete_record.php?id=<?php echo $r['id'] ?>&amp;domain=<?php echo $_GET["id"] ?>"><img src="images/delete.gif" ALT="[ <?php echo _('Delete record'); ?> ]" BORDER="0"></a>
+<?php
 			}
 		}
 		if(level(10) && $domain_type != "SLAVE") 
 		{ 
 ?>
-		     <input type="checkbox" name="rowid[<? echo $countinput++?>]" value="<? echo $r['id']?>" />
-<? 
+		     <input type="checkbox" name="rowid[<?php echo $countinput++?>]" value="<?php echo $r['id']?>" />
+<?php 
 		}
 ?>
             </td>
-<? 
+<?php 
 		if (level(10) && $domain_type != "SLAVE") 
 		{ 
 ?>
             <td class="n">
-<? 
+<?php 
 			$x_result = $db->query("SELECT r.user_id,u.username,u.fullname FROM record_owners as r, users as u WHERE r.record_id=".$db->quote($r['id'])." AND u.id=r.user_id");
 			echo "<select style=\"width:120px;\">";
 			while ($x_r = $x_result->fetchRow()) {
@@ -308,26 +308,26 @@
 			echo "</select>";
 ?>
             </td>
-<? 
+<?php 
 		} 
 ?>
-	    <td class="y"><? echo $r['name'] ?></td>
-	    <td class="y"><? echo $r['type'] ?></td>
-	    <td class="y"><? echo $r['content'] ?></td>
-<?
+	    <td class="y"><?php echo $r['name'] ?></td>
+	    <td class="y"><?php echo $r['type'] ?></td>
+	    <td class="y"><?php echo $r['content'] ?></td>
+<?php
 		if ($r['prio'] != 0) 
 		{
 ?>
-            <td class="y"><? echo $r['prio']; ?></td>
-<?
+            <td class="y"><?php echo $r['prio']; ?></td>
+<?php
 		} else {
 ?>
-            <td class="n"></td><?
+            <td class="n"></td><?php
 		}
 ?>
-            <td class="y"><? echo $r['ttl'] ?></td>
+            <td class="y"><?php echo $r['ttl'] ?></td>
 	   </tr>
-<?
+<?php
 	}
 }
 else
@@ -335,30 +335,30 @@
 ?>
            <tr>
             <td class="n">
-	     <div class="warning"><? echo _('No records for this zone.'); ?></div>
+	     <div class="warning"><?php echo _('No records for this zone.'); ?></div>
 	    </td>
            </tr>
-<?
+<?php
 }
 ?>
           </table>
 
-<?
+<?php
 if ($domain_type != "SLAVE")
 {
 	if (level(10)) { ?>
 	   <img src="images/arrow.png" alt="arrow" class="edit-assign-to-user">
 	   <select name="userid">
-		<?
+		<?php
 		$users = show_users();
 		foreach ($users as $user) {
 			echo "<option value=\"".$user[id]."\">".$user[fullname]."</option>";
 		}
 		?>
            </select>
-	   <input type="submit" class="button" value="<? echo _('Assign to user'); ?>">
+	   <input type="submit" class="button" value="<?php echo _('Assign to user'); ?>">
 	  </form>
-<? 
+<?php 
 	} 
 }
 include_once("inc/footer.inc.php");
diff -r 47248e2af079 -r e1b918eaf69a edit_record.php
--- a/edit_record.php	Tue Jan 29 21:32:48 2008 +0000
+++ b/edit_record.php	Sat Feb 02 15:39:04 2008 +0000
@@ -1,4 +1,4 @@
-<?
+<?php
 
 /*  PowerAdmin, a friendly web-based admin tool for PowerDNS.
  *  See <https://rejo.zenger.nl/poweradmin> for more details.
@@ -46,8 +46,8 @@
 }
 include_once("inc/header.inc.php");
 ?>
-    <h2><? echo _('Edit record in zone'); ?> "<? echo  get_domain_name_from_id($_GET["domain"]) ?>"</h2>
-<?
+    <h2><?php echo _('Edit record in zone'); ?> "<?php echo  get_domain_name_from_id($_GET["domain"]) ?>"</h2>
+<?php
 
 $x_result = $db->query("SELECT r.id,u.fullname FROM record_owners as r, users as u WHERE r.record_id=".$db->quote($_GET['id'])." AND u.id=r.user_id");
 if (level(10) && ($x_result->numRows() > 0)) 
@@ -57,65 +57,65 @@
      <div id="meta-left">
       <table>
        <tr>
-        <th><? echo _('Sub-owners'); ?></td>
+        <th><?php echo _('Sub-owners'); ?></td>
         <th>&nbsp;</td>
        </tr>
-<?
+<?php
 	while ($x_r = $x_result->fetchRow()) 
 	{
 ?>
         <tr>
-	 <td class="tdbg"><? echo $x_r["fullname"]; ?></td>
-	 <td class="tdbg"><a href="<? echo $_SERVER["PHP_SELF"]; ?>?id=<? echo $_GET["id"]; ?>&amp;domain=<? echo $_GET["domain"]; ?>&amp;delid=<? echo $x_r["id"]; ?>"><img src="images/delete.gif" alt="trash"></a></td>
+	 <td class="tdbg"><?php echo $x_r["fullname"]; ?></td>
+	 <td class="tdbg"><a href="<?php echo $_SERVER["PHP_SELF"]; ?>?id=<?php echo $_GET["id"]; ?>&amp;domain=<?php echo $_GET["domain"]; ?>&amp;delid=<?php echo $x_r["id"]; ?>"><img src="images/delete.gif" alt="trash"></a></td>
 	</tr>
-<?
+<?php
 	}
 ?>
        </table>
       </div>
      </div>
-<? 
+<?php 
 }
 ?>
     <form method="post" action="edit_record.php">
-     <input type="hidden" name="recordid" value="<? echo  $_GET["id"] ?>">
-     <input type="hidden" name="domainid" value="<? echo  $_GET["domain"] ?>">
+     <input type="hidden" name="recordid" value="<?php echo  $_GET["id"] ?>">
+     <input type="hidden" name="domainid" value="<?php echo  $_GET["domain"] ?>">
      <table>
       <tr>
-       <th><? echo _('Name'); ?></td>
+       <th><?php echo _('Name'); ?></td>
        <th>&nbsp;</td>
-       <th><? echo _('Type'); ?></td>
-       <th><? echo _('Priority'); ?></td>
-       <th><? echo _('Content'); ?></td>
-       <th><? echo _('TTL'); ?></td>
+       <th><?php echo _('Type'); ?></td>
+       <th><?php echo _('Priority'); ?></td>
+       <th><?php echo _('Content'); ?></td>
+       <th><?php echo _('TTL'); ?></td>
       </tr>
-<?
+<?php
 	$rec = get_record_from_id($_GET["id"]);
 ?>
        <tr>
         <td>
-<? 
+<?php 
 if ($_SESSION[$_GET["domain"]."_ispartial"] == 1)  
 {
 ?>
-         <input type="hidden" name="name" value="<? echo  trim(str_replace(get_domain_name_from_id($_GET["domain"]), '', $rec["name"]), '.')?>" class="input">
+         <input type="hidden" name="name" value="<?php echo  trim(str_replace(get_domain_name_from_id($_GET["domain"]), '', $rec["name"]), '.')?>" class="input">
 
-<? echo  trim(str_replace(get_domain_name_from_id($_GET["domain"]), '', $rec["name"]), '.') ?>
-<? 
+<?php echo  trim(str_replace(get_domain_name_from_id($_GET["domain"]), '', $rec["name"]), '.') ?>
+<?php 
 } 
 else 
 { 
 ?>
-         <input type="text" name="name" value="<? echo  trim(str_replace(get_domain_name_from_id($_GET["domain"]), '', $rec["name"]), '.') ?>" class="input">
-<? 
+         <input type="text" name="name" value="<?php echo  trim(str_replace(get_domain_name_from_id($_GET["domain"]), '', $rec["name"]), '.') ?>" class="input">
+<?php 
 } 
 ?>
-.<? echo  get_domain_name_from_id($_GET["domain"]) ?>
+.<?php echo  get_domain_name_from_id($_GET["domain"]) ?>
         </td>
 	<td class="n">IN</td>
 	<td>
 	 <select name="type">
-<?
+<?php
 foreach (get_record_types() as $c)
 {
 	if ($c == $rec["type"])
@@ -127,22 +127,22 @@
 		$add = "";
 	}
 	?>
-	<option<? echo  $add ?> value="<? echo  $c ?>"><? echo  $c ?></option><?
+	<option<?php echo  $add ?> value="<?php echo  $c ?>"><?php echo  $c ?></option><?php
 }
 
 ?>
          </select>
 	</td>
-	<td><input type="text" name="prio" value="<? echo  $rec["prio"] ?>" class="sinput"></td>
-	<td><input type="text" name="content" value="<? echo  $rec["content"] ?>" class="input"></td>
-	<td><input type="text" name="ttl" value="<? echo  $rec["ttl"] ?>" class="sinput"></td>
+	<td><input type="text" name="prio" value="<?php echo  $rec["prio"] ?>" class="sinput"></td>
+	<td><input type="text" name="content" value="<?php echo  $rec["content"] ?>" class="input"></td>
+	<td><input type="text" name="ttl" value="<?php echo  $rec["ttl"] ?>" class="sinput"></td>
        </tr>
       </table>
       <p>
-       <input type="submit" name="commit" value="<? echo _('Commit changes'); ?>" class="button">&nbsp;&nbsp;
-       <input type="reset" name="reset" value="<? echo _('Reset changes'); ?>" class="button">
+       <input type="submit" name="commit" value="<?php echo _('Commit changes'); ?>" class="button">&nbsp;&nbsp;
+       <input type="reset" name="reset" value="<?php echo _('Reset changes'); ?>" class="button">
       </p>
      </form>
-<?
+<?php
 include_once("inc/footer.inc.php");
 ?>
diff -r 47248e2af079 -r e1b918eaf69a edit_user.php
--- a/edit_user.php	Tue Jan 29 21:32:48 2008 +0000
+++ b/edit_user.php	Sat Feb 02 15:39:04 2008 +0000
@@ -51,57 +51,57 @@
 	error("You do not have the required access level.");
 }
 ?>
-    <h2><? echo _('Edit user'); ?> "<? echo get_fullname_from_userid($_GET["id"]) ?>"</h2>
-<?
+    <h2><?php echo _('Edit user'); ?> "<?php echo get_fullname_from_userid($_GET["id"]) ?>"</h2>
+<?php
 $r = array();
 $r = get_user_info($_GET["id"]);
 ?>
     <form method="post">
-     <input type="HIDDEN" name="number" value="<? echo $_GET["id"] ?>">
+     <input type="HIDDEN" name="number" value="<?php echo $_GET["id"] ?>">
      <table>
       <tr>
-       <td class="n"><? echo _('User name'); ?>:</td>
-       <td class="n"><input type="text" class="input" name="username" value="<? echo $r["username"]?>"></td>
+       <td class="n"><?php echo _('User name'); ?>:</td>
+       <td class="n"><input type="text" class="input" name="username" value="<?php echo $r["username"]?>"></td>
       </tr>
       <tr>
-       <td class="n"><? echo _('Full name'); ?>:</td>
-       <td class="n"><input type="text" class="input" name="fullname" value="<? echo $r["fullname"]?>"></td>
+       <td class="n"><?php echo _('Full name'); ?>:</td>
+       <td class="n"><input type="text" class="input" name="fullname" value="<?php echo $r["fullname"]?>"></td>
       </tr>
       <tr>
-       <td class="n"><? echo _('Password'); ?>:</td>
+       <td class="n"><?php echo _('Password'); ?>:</td>
        <td class="n"><input type="password" class="input" name="password" value=""></td>
       </tr>
       <tr>
-       <td class="n"><? echo _('E-mail'); ?>:</td>
-       <td class="n"><input type="text" class="input" name="email" value="<? echo $r["email"]?>"></td>
+       <td class="n"><?php echo _('E-mail'); ?>:</td>
+       <td class="n"><input type="text" class="input" name="email" value="<?php echo $r["email"]?>"></td>
       </tr>
       <tr>
-       <td class="n"><? echo _('User level'); ?>:</td>
+       <td class="n"><?php echo _('User level'); ?>:</td>
        <td class="n">
         <select name="level">
-	 <option value="1" <? if($r["level"] == 1) { echo "selectED"; } ?>>1 (<? echo _('Normal user'); ?>)</option>
-	 <option value="5" <? if($r["level"] == 5) { echo "selectED"; } ?>>5 (<? echo _('Administrator'); ?>)</option>
-	 <option value="10" <? if($r["level"] == 10) { echo "selectED"; } ?>>10 (<? echo _('Administrator w/ user admin rights'); ?>)</option>
+	 <option value="1" <?php if($r["level"] == 1) { echo "selectED"; } ?>>1 (<?php echo _('Normal user'); ?>)</option>
+	 <option value="5" <?php if($r["level"] == 5) { echo "selectED"; } ?>>5 (<?php echo _('Administrator'); ?>)</option>
+	 <option value="10" <?php if($r["level"] == 10) { echo "selectED"; } ?>>10 (<?php echo _('Administrator w/ user admin rights'); ?>)</option>
 	</select>
        </td>
       </tr>
       <tr>
-       <td class="n"><? echo _('Description'); ?>:</td>
+       <td class="n"><?php echo _('Description'); ?>:</td>
        <td class="n">
-        <textarea rows="6" cols="30" class="inputarea" name="description"><? echo $r["description"]?></textarea>
+        <textarea rows="6" cols="30" class="inputarea" name="description"><?php echo $r["description"]?></textarea>
        </td>
       </tr>
       <tr>
-       <td class="n"><? echo _('Active'); ?>:</td>
-       <td class="n"><input type="checkbox" name="active" value="1" <? if($r["active"]) { ?>CHECKED<? } ?>></td>
+       <td class="n"><?php echo _('Active'); ?>:</td>
+       <td class="n"><input type="checkbox" name="active" value="1" <?php if($r["active"]) { ?>CHECKED<?php } ?>></td>
       </tr>
       <tr>
        <td class="n">&nbsp;</td>
-       <td class="n"><input type="submit" class="button" name="commit" value="<? echo _('Commit changes'); ?>"></td>
+       <td class="n"><input type="submit" class="button" name="commit" value="<?php echo _('Commit changes'); ?>"></td>
       </tr>
      </table>
     </form>
-<?
+<?php
 
 include_once("inc/footer.inc.php");
 
diff -r 47248e2af079 -r e1b918eaf69a inc/auth.inc.php
--- a/inc/auth.inc.php	Tue Jan 29 21:32:48 2008 +0000
+++ b/inc/auth.inc.php	Sat Feb 02 15:39:04 2008 +0000
@@ -1,4 +1,4 @@
-<?
+<?php
 
 /*  PowerAdmin, a friendly web-based admin tool for PowerDNS.
  *  See <https://rejo.zenger.nl/poweradmin> for more details.
@@ -84,28 +84,28 @@
 		print "<div class=\"$type\">$msg</div>\n";
 	}
 	?>
-	<h2><? echo _('Login'); ?></h2>
-	<?
+	<h2><?php echo _('Login'); ?></h2>
+	<?php
 	?>
-	<form method="post" action="<? echo $_SERVER["PHP_SELF"] ?>">
+	<form method="post" action="<?php echo $_SERVER["PHP_SELF"] ?>">
 	 <table border="0">
 	  <tr>
-	   <td class="n"><? echo _('Login'); ?>:</td>
+	   <td class="n"><?php echo _('Login'); ?>:</td>
 	   <td class="n"><input type="text" class="input" name="username"></td>
 	  </tr>
 	  <tr>
-	   <td class="n"><? echo _('Password'); ?>:</td>
+	   <td class="n"><?php echo _('Password'); ?>:</td>
 	   <td class="n"><input type="password" class="input" name="password"></td>
 	  </tr>
 	  <tr>
 	   <td class="n">&nbsp;</td>
 	   <td class="n">
-	    <input type="submit" name="authenticate" class="button" value=" <? echo _('Login'); ?> ">
+	    <input type="submit" name="authenticate" class="button" value=" <?php echo _('Login'); ?> ">
 	   </td>
 	  </tr>
 	 </table>
 	</form>
-	<?
+	<?php
 	include_once('inc/footer.inc.php');
 	exit;
 }
diff -r 47248e2af079 -r e1b918eaf69a inc/database.inc.php
--- a/inc/database.inc.php	Tue Jan 29 21:32:48 2008 +0000
+++ b/inc/database.inc.php	Sat Feb 02 15:39:04 2008 +0000
@@ -1,4 +1,4 @@
-<?
+<?php
 
 /*  PowerAdmin, a friendly web-based admin tool for PowerDNS.
  *  See <https://rejo.zenger.nl/poweradmin> for more details.
@@ -26,9 +26,9 @@
         // General function for printing critical errors.
         include_once("header.inc.php");
         ?>
-	<h2><? echo _('Oops! An error occured!'); ?></h2>
-	<p class="error"><? echo $msg->getDebugInfo(); ?></p>
-	<?        
+	<h2><?php echo _('Oops! An error occured!'); ?></h2>
+	<p class="error"><?php echo $msg->getDebugInfo(); ?></p>
+	<?php        
 	include_once("footer.inc.php");
         die();
 }
diff -r 47248e2af079 -r e1b918eaf69a inc/dns.inc.php
--- a/inc/dns.inc.php	Tue Jan 29 21:32:48 2008 +0000
+++ b/inc/dns.inc.php	Sat Feb 02 15:39:04 2008 +0000
@@ -1,4 +1,4 @@
-<?
+<?php
 
 /*  PowerAdmin, a friendly web-based admin tool for PowerDNS.
  *  See <https://rejo.zenger.nl/poweradmin> for more details.
diff -r 47248e2af079 -r e1b918eaf69a inc/error.inc.php
--- a/inc/error.inc.php	Tue Jan 29 21:32:48 2008 +0000
+++ b/inc/error.inc.php	Sat Feb 02 15:39:04 2008 +0000
@@ -1,4 +1,4 @@
-<?
+<?php
 
 /*  PowerAdmin, a friendly web-based admin tool for PowerDNS.
  *  See <https://rejo.zenger.nl/poweradmin> for more details.
diff -r 47248e2af079 -r e1b918eaf69a inc/footer.inc.php
--- a/inc/footer.inc.php	Tue Jan 29 21:32:48 2008 +0000
+++ b/inc/footer.inc.php	Sat Feb 02 15:39:04 2008 +0000
@@ -1,4 +1,4 @@
-<?
+<?php
 
 /*  PowerAdmin, a friendly web-based admin tool for PowerDNS.
  *  See <https://rejo.zenger.nl/poweradmin> for more details.
@@ -30,7 +30,7 @@
   <div class="footer">
    <a href="https://rejo.zenger.nl/poweradmin/">a complete(r) <strong>poweradmin</strong></a> - <a href="https://code.krikkit.nl/trac/poweradmin/wiki/Credits">credits</a>
   </div>
-<?
+<?php
 if(file_exists('inc/custom_footer.inc.php')) 
 {
 	include('inc/custom_footer.inc.php');
diff -r 47248e2af079 -r e1b918eaf69a inc/header.inc.php
--- a/inc/header.inc.php	Tue Jan 29 21:32:48 2008 +0000
+++ b/inc/header.inc.php	Sat Feb 02 15:39:04 2008 +0000
@@ -1,4 +1,4 @@
-<?
+<?php
 
 /*  PowerAdmin, a friendly web-based admin tool for PowerDNS.
  *  See <https://rejo.zenger.nl/poweradmin> for more details.
@@ -24,50 +24,50 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
  <head>
-  <title><? echo _('Poweradmin'); ?></title>
-  <link rel=stylesheet href="style/<? echo $STYLE; ?>.inc.php" type="text/css">
+  <title><?php echo _('Poweradmin'); ?></title>
+  <link rel=stylesheet href="style/<?php echo $STYLE; ?>.inc.php" type="text/css">
  </head>
  <body>
-<?
+<?php
 if(file_exists('inc/custom_header.inc.php')) 
 {
 	include('inc/custom_header.inc.php');
 }
 ?>
-  <h1><? echo _('Poweradmin'); ?></h1> 
-<?
+  <h1><?php echo _('Poweradmin'); ?></h1> 
+<?php
 if (isset($_SESSION["userid"]))
 {
 ?>
   
 	  <div class="menu">
-	   <span class="menuitem"><a href="index.php"><? echo _('Index'); ?></a></span>
-	   <span class="menuitem"><a href="search.php"><? echo _('Search zones or records'); ?></a></span>
-	   <span class="menuitem"><a href="list_zones.php"><? echo _('List all zones'); ?></a></span>
-	<?
+	   <span class="menuitem"><a href="index.php"><?php echo _('Index'); ?></a></span>
+	   <span class="menuitem"><a href="search.php"><?php echo _('Search zones or records'); ?></a></span>
+	   <span class="menuitem"><a href="list_zones.php"><?php echo _('List all zones'); ?></a></span>
+	<?php
 	if (level(5))
 	{
 	?>
-	   <span class="menuitem"><a href="list_supermasters.php"><? echo _('List all supermasters'); ?></a></span>
-	   <span class="menuitem"><a href="add_zone_master.php"><? echo _('Add master zone'); ?></a></span>
-	   <span class="menuitem"><a href="add_zone_slave.php"><? echo _('Add slave zone'); ?></a></span>
-	   <span class="menuitem"><a href="add_supermaster.php"><? echo _('Add supermaster'); ?></a></span>
-	<?
+	   <span class="menuitem"><a href="list_supermasters.php"><?php echo _('List all supermasters'); ?></a></span>
+	   <span class="menuitem"><a href="add_zone_master.php"><?php echo _('Add master zone'); ?></a></span>
+	   <span class="menuitem"><a href="add_zone_slave.php"><?php echo _('Add slave zone'); ?></a></span>
+	   <span class="menuitem"><a href="add_supermaster.php"><?php echo _('Add supermaster'); ?></a></span>
+	<?php
 	}
 	?>
-	   <span class="menuitem"><a href="change_password.php"><? echo _('Change password'); ?></a></span>
-	<?
+	   <span class="menuitem"><a href="change_password.php"><?php echo _('Change password'); ?></a></span>
+	<?php
 	if (level(10))
 	{
 	?>
-	   <span class="menuitem"><a href="users.php"><? echo _('User administration'); ?></a></span>
-	<?
+	   <span class="menuitem"><a href="users.php"><?php echo _('User administration'); ?></a></span>
+	<?php
 	}
 	?>
-	   <span class="menuitem"><a href="index.php?logout"><? echo _('Logout'); ?></a></span>
+	   <span class="menuitem"><a href="index.php?logout"><?php echo _('Logout'); ?></a></span>
 
 	  </div> <!-- /menu -->
-<?
+<?php
 }
 ?>
   <div class="content">
diff -r 47248e2af079 -r e1b918eaf69a inc/i18n.inc.php
--- a/inc/i18n.inc.php	Tue Jan 29 21:32:48 2008 +0000
+++ b/inc/i18n.inc.php	Sat Feb 02 15:39:04 2008 +0000
@@ -1,4 +1,4 @@
-<?
+<?php
 
 /*  PowerAdmin, a friendly web-based admin tool for PowerDNS.
  *  See <https://rejo.zenger.nl/poweradmin> for more details.
diff -r 47248e2af079 -r e1b918eaf69a inc/record.inc.php
--- a/inc/record.inc.php	Tue Jan 29 21:32:48 2008 +0000
+++ b/inc/record.inc.php	Sat Feb 02 15:39:04 2008 +0000
@@ -1,4 +1,4 @@
-<?
+<?php
 
 /*  PowerAdmin, a friendly web-based admin tool for PowerDNS.
  *  See <https://rejo.zenger.nl/poweradmin> for more details.
diff -r 47248e2af079 -r e1b918eaf69a inc/toolkit.inc.php
--- a/inc/toolkit.inc.php	Tue Jan 29 21:32:48 2008 +0000
+++ b/inc/toolkit.inc.php	Sat Feb 02 15:39:04 2008 +0000
@@ -1,4 +1,4 @@
-<?
+<?php
 
 /*  PowerAdmin, a friendly web-based admin tool for PowerDNS.
  *  See <https://rejo.zenger.nl/poweradmin> for more details.
@@ -196,9 +196,9 @@
 	{
 		include_once("header.inc.php");
 	?>
-	<p><? echo _('Oops! An error occured!'); ?></p>
-	<p><? echo nl2br($msg) ?></p>
-	<?
+	<p><?php echo _('Oops! An error occured!'); ?></p>
+	<p><?php echo nl2br($msg) ?></p>
+	<?php
 		include_once("footer.inc.php");
 		die();
 	}
@@ -216,11 +216,11 @@
 {
     include_once("header.inc.php");
     ?>
-    <P><TABLE CLASS="messagetable"><TR><TD CLASS="message"><H2><? echo _('Success!'); ?></H2>
+    <P><TABLE CLASS="messagetable"><TR><TD CLASS="message"><H2><?php echo _('Success!'); ?></H2>
     <BR>
 	<FONT STYLE="font-weight: Bold">
 	<P>
-	<?
+	<?php
     if($msg)
     {
         echo nl2br($msg);
@@ -233,10 +233,10 @@
     </P>
     <BR>
     <P>
-    <a href="javascript:history.go(-1)">&lt;&lt; <? echo _('back'); ?></a></FONT>
+    <a href="javascript:history.go(-1)">&lt;&lt; <?php echo _('back'); ?></a></FONT>
     </P>
     </TD></TR></TABLE></P>
-    <?
+    <?php
     include_once("footer.inc.php");
 }
 
diff -r 47248e2af079 -r e1b918eaf69a inc/users.inc.php
--- a/inc/users.inc.php	Tue Jan 29 21:32:48 2008 +0000
+++ b/inc/users.inc.php	Sat Feb 02 15:39:04 2008 +0000
@@ -1,4 +1,4 @@
-<?
+<?php
 
 /*  PowerAdmin, a friendly web-based admin tool for PowerDNS.
  *  See <https://rejo.zenger.nl/poweradmin> for more details.
diff -r 47248e2af079 -r e1b918eaf69a index.php
--- a/index.php	Tue Jan 29 21:32:48 2008 +0000
+++ b/index.php	Sat Feb 02 15:39:04 2008 +0000
@@ -23,33 +23,33 @@
 require_once("inc/toolkit.inc.php");
 include_once("inc/header.inc.php");
 ?>
-   <h3><? echo _('Welcome'); ?>, <? echo $_SESSION["name"] ?></h3>
+   <h3><?php echo _('Welcome'); ?>, <?php echo $_SESSION["name"] ?></h3>
    <ul>
-    <li><a href="search.php"><? echo _('Search zones or records'); ?></a></li>
-    <li><a href="list_zones.php"><? echo _('List all zones'); ?></a></li>
-<?
+    <li><a href="search.php"><?php echo _('Search zones or records'); ?></a></li>
+    <li><a href="list_zones.php"><?php echo _('List all zones'); ?></a></li>
+<?php
 if (level(5))
 {
 ?>
-    <li><a href="list_supermasters.php"><? echo _('List all supermasters'); ?></a></li>
-    <li><a href="add_zone_master.php"><? echo _('Add master zone'); ?></a></li>
-    <li><a href="add_zone_slave.php"><? echo _('Add slave zone'); ?></a></li>
-    <li><a href="add_supermaster.php"><? echo _('Add supermaster'); ?></a></li>
-<?
+    <li><a href="list_supermasters.php"><?php echo _('List all supermasters'); ?></a></li>
+    <li><a href="add_zone_master.php"><?php echo _('Add master zone'); ?></a></li>
+    <li><a href="add_zone_slave.php"><?php echo _('Add slave zone'); ?></a></li>
+    <li><a href="add_supermaster.php"><?php echo _('Add supermaster'); ?></a></li>
+<?php
 }
 ?>
-    <li><a href="change_password.php"><? echo _('Change password'); ?></a></li>
-<?
+    <li><a href="change_password.php"><?php echo _('Change password'); ?></a></li>
+<?php
 if (level(10))
 {
 ?>
-    <li><a href="users.php"><? echo _('User administration'); ?></a></li>
-<?
+    <li><a href="users.php"><?php echo _('User administration'); ?></a></li>
+<?php
 }
 ?>
-    <li><a href="index.php?logout"><? echo _('Logout'); ?></a></li>
+    <li><a href="index.php?logout"><?php echo _('Logout'); ?></a></li>
    </ul>
 
-<?
+<?php
 include_once("inc/footer.inc.php");
 ?>
diff -r 47248e2af079 -r e1b918eaf69a install.php
--- a/install.php	Tue Jan 29 21:32:48 2008 +0000
+++ b/install.php	Sat Feb 02 15:39:04 2008 +0000
@@ -58,10 +58,10 @@
         if ($msg)
 	    {
 		?>
-                <P><TABLE CLASS="error"><TR><TD CLASS="error"><H2><? echo _('Oops! An error occured!'); ?></H2>
+                <P><TABLE CLASS="error"><TR><TD CLASS="error"><H2><?php echo _('Oops! An error occured!'); ?></H2>
        	        <BR>
-               	<FONT STYLE="font-weight: Bold"><?= nl2br($msg) ?><BR><BR><a href="javascript:history.go(-1)">&lt;&lt; back</a></FONT><BR></TABLE>
-                <?
+               	<FONT STYLE="font-weight: Bold"><?php nl2br($msg) ?><BR><BR><a href="javascript:history.go(-1)">&lt;&lt; back</a></FONT><BR></TABLE>
+                <?php
       	        die();
         }
 	    else
@@ -180,12 +180,12 @@
 		{
 
 			?>
-<h2><? echo _('PowerAdmin has succesfully been installed.'); ?></h2>
+<h2><?php echo _('PowerAdmin has succesfully been installed.'); ?></h2>
 <br />
-<? echo _('Remove this file (install.php) from your webdir.'); ?><br />
-<b><? echo _('WARNING'); ?>:</b> <? echo _('PowerAdmin will not work until you delete install.php'); ?><br />
+<?php echo _('Remove this file (install.php) from your webdir.'); ?><br />
+<b><?php echo _('WARNING'); ?>:</b> <?php echo _('PowerAdmin will not work until you delete install.php'); ?><br />
 <br />
-<? echo _('You can click'); ?> <a href="index.php">here</a> <? echo _('to start using PowerAdmin'); ?>
+<?php echo _('You can click'); ?> <a href="index.php">here</a> <?php echo _('to start using PowerAdmin'); ?>
 </BODY></HTML>
 <?php
 			die();
@@ -202,24 +202,24 @@
 {
 ?>
 
-<H2><? echo _('PowerAdmin for PowerDNS'); ?></H2>
+<H2><?php echo _('PowerAdmin for PowerDNS'); ?></H2>
 <BR>
-<B><? echo _('This config file will setup your database to be ready for PowerAdmin. Please fill in the next fields which will create an
+<B><?php echo _('This config file will setup your database to be ready for PowerAdmin. Please fill in the next fields which will create an
 administrator login.'); ?><BR>
-<? echo _('Fields marked with a'); ?> <FONT COLOR="#FF0000">*</FONT> <? echo _('are required.'); ?>
+<?php echo _('Fields marked with a'); ?> <FONT COLOR="#FF0000">*</FONT> <?php echo _('are required.'); ?>
 </B><BR><BR>
 
 <FORM METHOD="post">
 <TABLE BORDER="0" CELLSPACING="4">
-<TR><TD CLASS="tdbg"><? echo _('Login Name'); ?>:</TD><TD WIDTH="510" CLASS="tdbg"><INPUT TYPE="text" CLASS="input" NAME="login" VALUE=""> <FONT COLOR="#FF0000">*</FONT> </TD></TR>
-<TR><TD CLASS="tdbg"><? echo _('Password'); ?>:</TD><TD WIDTH="510" CLASS="tdbg"><INPUT TYPE="password" CLASS="input" NAME="password" VALUE=""> <FONT COLOR="#FF0000">*</FONT> </TD></TR>
-<TR><TD CLASS="tdbg"><? echo _('Full name'); ?>:</TD><TD WIDTH="510" CLASS="tdbg"><INPUT TYPE="text" CLASS="input" NAME="fullname" VALUE=""> <FONT COLOR="#FF0000">*</FONT> </TD></TR>
-<TR><TD CLASS="tdbg"><? echo _('Email'); ?>:</TD><TD CLASS="tdbg"><INPUT TYPE="text" CLASS="input" NAME="email" VALUE=""> <FONT COLOR="#FF0000">*</FONT> </TD></TR>
-<TR><TD CLASS="tdbg"><? echo _('Description'); ?>:</TD><TD CLASS="tdbg"><TEXTAREA ROWS="6" COLS="30" CLASS="inputarea" NAME="description"></TEXTAREA></TD></TR>
-<TR><TD CLASS="tdbg">&nbsp;</TD><TD CLASS="tdbg"><INPUT TYPE="submit" CLASS="button" NAME="submit" VALUE="<? echo _('Make Account'); ?>"></TD></TR>
+<TR><TD CLASS="tdbg"><?php echo _('Login Name'); ?>:</TD><TD WIDTH="510" CLASS="tdbg"><INPUT TYPE="text" CLASS="input" NAME="login" VALUE=""> <FONT COLOR="#FF0000">*</FONT> </TD></TR>
+<TR><TD CLASS="tdbg"><?php echo _('Password'); ?>:</TD><TD WIDTH="510" CLASS="tdbg"><INPUT TYPE="password" CLASS="input" NAME="password" VALUE=""> <FONT COLOR="#FF0000">*</FONT> </TD></TR>
+<TR><TD CLASS="tdbg"><?php echo _('Full name'); ?>:</TD><TD WIDTH="510" CLASS="tdbg"><INPUT TYPE="text" CLASS="input" NAME="fullname" VALUE=""> <FONT COLOR="#FF0000">*</FONT> </TD></TR>
+<TR><TD CLASS="tdbg"><?php echo _('Email'); ?>:</TD><TD CLASS="tdbg"><INPUT TYPE="text" CLASS="input" NAME="email" VALUE=""> <FONT COLOR="#FF0000">*</FONT> </TD></TR>
+<TR><TD CLASS="tdbg"><?php echo _('Description'); ?>:</TD><TD CLASS="tdbg"><TEXTAREA ROWS="6" COLS="30" CLASS="inputarea" NAME="description"></TEXTAREA></TD></TR>
+<TR><TD CLASS="tdbg">&nbsp;</TD><TD CLASS="tdbg"><INPUT TYPE="submit" CLASS="button" NAME="submit" VALUE="<?php echo _('Make Account'); ?>"></TD></TR>
 </TABLE>
 </FORM>
 
 <BR><BR>
 <FONT CLASS="footer"><B>PowerAdmin v1.0</B>&nbsp;Copyright &copy;2002 The
-PowerAdmin Team</FONT></BODY></HTML><? } ?>
+PowerAdmin Team</FONT></BODY></HTML><?php } ?>
diff -r 47248e2af079 -r e1b918eaf69a list_supermasters.php
--- a/list_supermasters.php	Tue Jan 29 21:32:48 2008 +0000
+++ b/list_supermasters.php	Sat Feb 02 15:39:04 2008 +0000
@@ -25,9 +25,9 @@
 if (!level(5))
 {
 ?>
-     <h3><? echo _('Oops!'); ?></h3>
-     <p><? echo _('You are not allowed to add supermasters with your current access level!'); ?></p>
-<?
+     <h3><?php echo _('Oops!'); ?></h3>
+     <p><?php echo _('You are not allowed to add supermasters with your current access level!'); ?></p>
+<?php
 } 
 else
 {
@@ -36,25 +36,25 @@
 	$num_supermasters = ($supermasters == -1) ? 0 : count($supermasters);
 	?>
 
-	   <h3><? printf(_('List all %s supermasters'), $num_supermasters); ?></h3>
+	   <h3><?php printf(_('List all %s supermasters'), $num_supermasters); ?></h3>
 	   <table>
 	    <tr>
 	     <th>&nbsp;</td>
-	     <th><? echo _('IP address of supermaster'); ?></td>
-	     <th><? echo _('Hostname in NS record'); ?></td>
-	     <th><? echo _('Account'); ?></td>
+	     <th><?php echo _('IP address of supermaster'); ?></td>
+	     <th><?php echo _('Hostname in NS record'); ?></td>
+	     <th><?php echo _('Account'); ?></td>
 	    </tr>
-	<?
+	<?php
 	   if ($num_supermasters == 0)
 	   {
 	?>
 	    <tr>
 	     <td class="n">&nbsp;</td>
 	     <td class="n" colspan="3">
-	      <? echo _('No supermasters in this listing, sorry.'); ?>
+	      <?php echo _('No supermasters in this listing, sorry.'); ?>
 	     </td>
 	    </tr>
-	<?
+	<?php
 	   }
 	   else
 	   {
@@ -63,18 +63,18 @@
 	?>
 	    <tr>
 	     <td class="n">
-	      <a href="delete_supermaster.php?master_ip=<? echo $c["master_ip"] ?>"><img src="images/delete.gif" title="<? print _('Delete supermaster') . ' ' . $c["master_ip"]; ?>" alt="[ <? echo _('Delete supermaster'); ?> ]"></a>
+	      <a href="delete_supermaster.php?master_ip=<?php echo $c["master_ip"] ?>"><img src="images/delete.gif" title="<?php print _('Delete supermaster') . ' ' . $c["master_ip"]; ?>" alt="[ <?php echo _('Delete supermaster'); ?> ]"></a>
 	     </td>
-	     <td class="y"><? echo $c["master_ip"] ?></td>
-	     <td class="y"><? echo $c["ns_name"] ?></td>
-	     <td class="y"><? echo $c["account"] ?></td>
+	     <td class="y"><?php echo $c["master_ip"] ?></td>
+	     <td class="y"><?php echo $c["ns_name"] ?></td>
+	     <td class="y"><?php echo $c["account"] ?></td>
 	    </tr>
-	<?
+	<?php
 		   }
 	   }
 	?>
 	   </table>
-<?
+<?php
 }
 
 include_once("inc/footer.inc.php");
diff -r 47248e2af079 -r e1b918eaf69a list_zones.php
--- a/list_zones.php	Tue Jan 29 21:32:48 2008 +0000
+++ b/list_zones.php	Sat Feb 02 15:39:04 2008 +0000
@@ -25,8 +25,8 @@
 $num_all_domains = zone_count(0);
 $doms = zone_count(0, LETTERSTART);
 ?>
-   <h2><? echo _('List all zones'); ?></h2>
-<?
+   <h2><?php echo _('List all zones'); ?></h2>
+<?php
         echo "<div class=\"showmax\">";
         show_pages($doms,ROWAMOUNT);
         echo "</div>";
@@ -41,14 +41,14 @@
    <table>
     <tr>
      <th>&nbsp;</th>
-     <th><? echo _('Name'); ?></th>
-     <th><? echo _('Type'); ?></th>
-     <th><? echo _('Records'); ?></th>
-     <th><? echo _('Owner'); ?></th>
+     <th><?php echo _('Name'); ?></th>
+     <th><?php echo _('Type'); ?></th>
+     <th><?php echo _('Records'); ?></th>
+     <th><?php echo _('Owner'); ?></th>
     </tr>
     <tr>
 
-<?
+<?php
 if ($num_all_domains < ROWAMOUNT) {
    $doms = get_domains(0,"all",ROWSTART,ROWAMOUNT);
 } else {
@@ -62,9 +62,9 @@
 	?>
     <tr>
      <td>&nbsp;</td>
-     <td colspan="4"><? echo _('There are no zones.'); ?></td>
+     <td colspan="4"><?php echo _('There are no zones.'); ?></td>
     </tr>
-<?
+<?php
 }
 
 // If he has domains, dump them (duh)
@@ -76,21 +76,21 @@
 		
     <tr>
      <td>
-      <a href="edit.php?id=<? echo $c["id"] ?>"><img src="images/edit.gif" title="<? echo _('Edit zone') . " " . $c['name']; ?>" alt="[ <? echo _('Edit zone') . " " . $c['name']; ?> ]"></a>
-<?
+      <a href="edit.php?id=<?php echo $c["id"] ?>"><img src="images/edit.gif" title="<?php echo _('Edit zone') . " " . $c['name']; ?>" alt="[ <?php echo _('Edit zone') . " " . $c['name']; ?> ]"></a>
+<?php
 		if (level(5))
 		{
 ?>
-      <a href="delete_domain.php?id=<? echo $c["id"] ?>"><img src="images/delete.gif" title="<? print _('Delete zone') . " " . $c['name']; ?>" alt="[<? echo _('Delete zone') . " " . $c['name']; ?>]"></a>
-<?
+      <a href="delete_domain.php?id=<?php echo $c["id"] ?>"><img src="images/delete.gif" title="<?php print _('Delete zone') . " " . $c['name']; ?>" alt="[<?php echo _('Delete zone') . " " . $c['name']; ?>]"></a>
+<?php
 		}
 ?>
      </td>
-     <td class="y"><? echo $c["name"] ?></td>
-     <td class="y"><? echo strtolower(get_domain_type($c["id"])) ?></td>
-     <td class="y"><? echo $c["numrec"] ?></td>
+     <td class="y"><?php echo $c["name"] ?></td>
+     <td class="y"><?php echo strtolower(get_domain_type($c["id"])) ?></td>
+     <td class="y"><?php echo $c["numrec"] ?></td>
 
-<?
+<?php
 		$zone_owners = get_owners_from_domainid($c["id"]);
 		if ($zone_owners == "")
 		{
@@ -107,25 +107,25 @@
 ?>
    </table>
 
-<?
+<?php
 if ($num_all_domains < ROWAMOUNT) {
 ?>
-   <p><? printf(_('This lists shows all %s zones(s) you have access to.'), $num_all_domains); ?></p>
-<?
+   <p><?php printf(_('This lists shows all %s zones(s) you have access to.'), $num_all_domains); ?></p>
+<?php
 }
 else
 {
 ?>
-   <p><? printf(_('This lists shows %s out of %s zones you have access to.'), $num_show_domains, $num_all_domains); ?></p>
-<?
+   <p><?php printf(_('This lists shows %s out of %s zones you have access to.'), $num_show_domains, $num_all_domains); ?></p>
+<?php
 }
 ?>
 
 
-<? // RZ TODO Check next, does it work? 
+<?php // RZ TODO Check next, does it work? 
 //  <small> echo _('You only administer some records of domains marked with an (*).'); </small>
 ?>
 
-<?
+<?php
 include_once("inc/footer.inc.php");
 ?>
diff -r 47248e2af079 -r e1b918eaf69a search.php
--- a/search.php	Tue Jan 29 21:32:48 2008 +0000
+++ b/search.php	Sat Feb 02 15:39:04 2008 +0000
@@ -31,17 +31,17 @@
 include_once('inc/header.inc.php');
 ?>
 
-    <h2><? echo _('Search zones or records'); ?></h2>
+    <h2><?php echo _('Search zones or records'); ?></h2>
     <h3>Query</h3>
     <table>
-     <form method="post" action="<? echo $_SERVER['PHP_SELF']?>">
+     <form method="post" action="<?php echo $_SERVER['PHP_SELF']?>">
       <tr>
-       <td class="n"><? echo _('Enter a hostname or IP address'); ?></td>
+       <td class="n"><?php echo _('Enter a hostname or IP address'); ?></td>
        <td class="n"><input type="text" class="input" name="q"></td>
       </tr>
       <tr>
        <td class="n">&nbsp;</td>
-       <td class="n"><input type="submit" class="button" name="s_submit" value="<? echo _('Search'); ?>"></td>
+       <td class="n"><input type="submit" class="button" name="s_submit" value="<?php echo _('Search'); ?>"></td>
       </tr>
      </form>
     </table>
@@ -56,28 +56,28 @@
 	if (count($search_result) == 2 && count($search_result['domains']))
   	{
 	?>
-	<h4><? echo _('Zones found'); ?>:</h4>
+	<h4><?php echo _('Zones found'); ?>:</h4>
 	<table>
 	 <tr>
 	  <th>&nbsp;</th>
-	  <th><? echo _('Name'); ?></th>
-	  <th><? echo _('Records'); ?></th>
-	  <th><? echo _('Owner'); ?></th>
+	  <th><?php echo _('Name'); ?></th>
+	  <th><?php echo _('Records'); ?></th>
+	  <th><?php echo _('Owner'); ?></th>
          </tr>
 <?php
 foreach($search_result['domains'] as $d)
 {
 ?>
          <tr>
-<?
+<?php
   if (level(5))
   {
   ?>
      <td class="n">
-      <a href="edit.php?id=<? echo $d["id"] ?>"><img src="images/edit.gif" title="<? echo _('Edit zone') . " " . $d['name']; ?>" alt="[ <? echo _('Edit zone') . " " . $d['name']; ?> ]"></a>
-      <a href="delete_domain.php?id=<? echo $d["id"] ?>"><img src="images/delete.gif" title="<? print _('Delete zone') . " " . $d['name']; ?>" alt="[<? echo _('Delete zone') . " " . $d['name']; ?>]"></a>
+      <a href="edit.php?id=<?php echo $d["id"] ?>"><img src="images/edit.gif" title="<?php echo _('Edit zone') . " " . $d['name']; ?>" alt="[ <?php echo _('Edit zone') . " " . $d['name']; ?> ]"></a>
+      <a href="delete_domain.php?id=<?php echo $d["id"] ?>"><img src="images/delete.gif" title="<?php print _('Delete zone') . " " . $d['name']; ?>" alt="[<?php echo _('Delete zone') . " " . $d['name']; ?>]"></a>
      </td>
-<?
+<?php
 }
 else
 {
@@ -85,12 +85,12 @@
      <td class="n">
       &nbsp;
      </td>
-<?
+<?php
 }
 ?>
-     <td class="y"><? echo $d['name']?></td>
-     <td class="y"><? echo $d['numrec']?></td>
-     <td class="y"><? echo get_owner_from_id($d['owner'])?></td>
+     <td class="y"><?php echo $d['name']?></td>
+     <td class="y"><?php echo $d['numrec']?></td>
+     <td class="y"><?php echo get_owner_from_id($d['owner'])?></td>
     </tr>
 			<?php
 		} // end foreach ...
@@ -104,16 +104,16 @@
 	if(count($search_result['records']))
 	{
 		?>
-		<b><? echo _('Records found'); ?>:</b>
+		<b><?php echo _('Records found'); ?>:</b>
 		<p>
 		<table>
 			<tr>
 				<td class="n">&nbsp;</td>
-				<td class="n"><? echo _('Name'); ?></td>
-				<td class="n"><? echo _('Type'); ?></td>
-				<td class="n"><? echo _('Content'); ?></td>
-				<td class="n"><? echo _('Priority'); ?></td>
-				<td class="n"><? echo _('TTL'); ?></td>
+				<td class="n"><?php echo _('Name'); ?></td>
+				<td class="n"><?php echo _('Type'); ?></td>
+				<td class="n"><?php echo _('Content'); ?></td>
+				<td class="n"><?php echo _('Priority'); ?></td>
+				<td class="n"><?php echo _('TTL'); ?></td>
 			</tr>
 		<?php
 		foreach($search_result['records'] as $r)
@@ -129,25 +129,25 @@
 			  $GLOBALS["ALLOW_NS_EDIT"] != 1))
 			{
 				?>
-				<a href="edit_record.php?id=<? echo $r['id']?>&amp;domain=<? echo $r['domain_id']?>"><img src="images/edit.gif" alt="[ <? echo _('Edit record'); ?> ]" border="0"></a>
-				<a href="delete_record.php?id=<? echo $r['id']?>&amp;domain=<? echo $r['domain_id']?>"><img src="images/delete.gif" alt="[ <? echo _('Delete record'); ?> ]" border="0"></a>
+				<a href="edit_record.php?id=<?php echo $r['id']?>&amp;domain=<?php echo $r['domain_id']?>"><img src="images/edit.gif" alt="[ <?php echo _('Edit record'); ?> ]" border="0"></a>
+				<a href="delete_record.php?id=<?php echo $r['id']?>&amp;domain=<?php echo $r['domain_id']?>"><img src="images/delete.gif" alt="[ <?php echo _('Delete record'); ?> ]" border="0"></a>
 				<?php 
 			} // big if ;-)
 			?>
 			</td>
-			<td class="y"><? echo $r['name']?></td>
-			<td class="y"><? echo $r['type']?></td>
-			<td class="y"><? echo $r['content']?></td>
+			<td class="y"><?php echo $r['name']?></td>
+			<td class="y"><?php echo $r['type']?></td>
+			<td class="y"><?php echo $r['content']?></td>
 			<?php
 			if ($r['prio'] != 0)
 			{
-				?><td class="y"><? echo $r['prio']?></td><?php
+				?><td class="y"><?php echo $r['prio']?></td><?php
 			}
 			else 
 			{
 			?><td class="n"></td><?php
 			} // else
-			?><td class="y"><? echo $r['ttl']?></td>
+			?><td class="y"><?php echo $r['ttl']?></td>
 			</tr>
 			<?php
 		} // foreach
@@ -161,11 +161,11 @@
 		<table border="0" cellspacing="4">
 			<tr>
 				<td width="510" class="n">
-				<? echo _('Nothing found for query'); ?> "<? echo $_POST['q']?>".
+				<?php echo _('Nothing found for query'); ?> "<?php echo $_POST['q']?>".
 				</td>
 			</tr>
 		</table>
-	<?
+	<?php
 	}
 		
 }
diff -r 47248e2af079 -r e1b918eaf69a style/example.inc.php
--- a/style/example.inc.php	Tue Jan 29 21:32:48 2008 +0000
+++ b/style/example.inc.php	Sat Feb 02 15:39:04 2008 +0000
@@ -146,7 +146,7 @@
 
 
 
-<?
+<?php
 include_once("../inc/config.inc.php");
 ?>
 
diff -r 47248e2af079 -r e1b918eaf69a style/style.css.php
--- a/style/style.css.php	Tue Jan 29 21:32:48 2008 +0000
+++ b/style/style.css.php	Sat Feb 02 15:39:04 2008 +0000
@@ -28,12 +28,12 @@
 A:visited { color: #000000}
 A:active { color: #000000}
 A:hover {text-decoration: none}
-BODY {font-family: Verdana, Arial, Helvetica; background-image: url("<?= $GLOBALS["BASE_URL"].$GLOBALS["BASE_PATH"] ?>images/background.jpg");}
-TABLE {background-color: <?= $bgcolor ?>; border: 1px solid #000000; width: 900px;}
+BODY {font-family: Verdana, Arial, Helvetica; background-image: url("<?php echo $GLOBALS["BASE_URL"].$GLOBALS["BASE_PATH"]; ?>images/background.jpg");}
+TABLE {background-color: <?php echo $bgcolor; ?>; border: 1px solid #000000; width: 900px;}
 TD {background-color: White; font-size: 12px;}
-TR {background-color: <?= $bgcolor ?>}
+TR {background-color: <?php echo $bgcolor; ?>}
 .TDBG {
-        background-color: <?= $bgcolor ?>;
+        background-color: <?php echo $bgcolor; ?>;
 }
 .ERROR {
         background-color: #FF0000;
@@ -41,13 +41,13 @@
         width: 600px;
 }
 .MESSAGETABLE {
-        background-color: <?= $bgcolor ?>;
+        background-color: <?php echo $bgcolor; ?>;
         border: 1px solid;
         width: 600px;
 }
 
 .MESSAGE {
-        background-color: <?= $bgcolor ?>;
+        background-color: <?php echo $bgcolor; ?>;
         width: 600px;
 }
 .NONE {
@@ -64,7 +64,7 @@
         BORDER-LEFT: #999999 1px solid;
         BORDER-RIGHT: #999999 1px solid;
         BORDER-TOP: #999999 1px solid;
-        BACKGROUND-COLOR: <?= $bgcolor ?>;
+        BACKGROUND-COLOR: <?php echo $bgcolor; ?>;
         COLOR: #000000;
         BORDER-COLOR: #000000;
         FONT-FAMILY: Verdana;
@@ -77,7 +77,7 @@
         BORDER-LEFT: #999999 1px solid;
         BORDER-RIGHT: #999999 1px solid;
         BORDER-TOP: #999999 1px solid;
-        BACKGROUND-COLOR: <?= $bgcolor ?>;
+        BACKGROUND-COLOR: <?php echo $bgcolor; ?>;
         COLOR: #000000;
         BORDER-COLOR: #000000;
         FONT-FAMILY: Verdana;
diff -r 47248e2af079 -r e1b918eaf69a test_setup.php
--- a/test_setup.php	Tue Jan 29 21:32:48 2008 +0000
+++ b/test_setup.php	Sat Feb 02 15:39:04 2008 +0000
@@ -51,16 +51,16 @@
 
 if($bad)
 {
-	?><TABLE CLASS="error"><TR><TD CLASS="error"><H2><? echo _('Not all tables are ok!'); ?></H2><?
+	?><TABLE CLASS="error"><TR><TD CLASS="error"><H2><?php echo _('Not all tables are ok!'); ?></H2><?php
 }
 else
 {
-	?><TABLE CLASS="messagetable"><TR><TD CLASS="message"><H2><? echo _('Successful!'); ?></H2><?
+	?><TABLE CLASS="messagetable"><TR><TD CLASS="message"><H2><?php echo _('Successful!'); ?></H2><?php
 }
 ?>
 <BR>
 <FONT STYLE="font-weight: Bold">
-<?
+<?php
 if($bad)
 {
 	echo _('Sorry, but there are error(s) found in the following table(s):'); 
@@ -68,7 +68,7 @@
 	{
 		echo " '$table'";
 		}
-		?>.</P><P><? echo _('Please fix these errors and run the script again.'); ?></P><?
+		?>.</P><P><?php echo _('Please fix these errors and run the script again.'); ?></P><?php
 	}
 	else
 	{
@@ -76,6 +76,6 @@
 	}
 ?>
 <BR></TD></TR></TABLE></P>
-<?
+<?php
 	include_once("inc/footer.inc.php");
 ?>
diff -r 47248e2af079 -r e1b918eaf69a users.php
--- a/users.php	Tue Jan 29 21:32:48 2008 +0000
+++ b/users.php	Sat Feb 02 15:39:04 2008 +0000
@@ -54,33 +54,33 @@
 if ($error != "") 
 {
 ?>
-	<div class="error"><? echo $error ; ?></div>
-<?
+	<div class="error"><?php echo $error ; ?></div>
+<?php
 }
 ?>
-    <h2><? echo _('User admin'); ?></h2>
-<?
+    <h2><?php echo _('User admin'); ?></h2>
+<?php
 if (!level(10)) 
 {
 	error(ERR_LEVEL_10);
 }
 ?>
-     <h3><? echo _('Current users'); ?></h3>
-<?
+     <h3><?php echo _('Current users'); ?></h3>
+<?php
 $users = show_users('');
 ?>  
 
       <table>
        <tr>
         <th>&nbsp;</th>
-        <th><? echo _('Name'); ?></th>
-        <th><? echo _('Zones'); ?> (<? echo _('access'); ?>)</th>
-        <th><? echo _('Zones'); ?> (<? echo _('owner'); ?>)</th>
-        <th><? echo _('Zone list'); ?></th>
-        <th><? echo _('Level'); ?></th>
-        <th><? echo _('Status'); ?></th>
+        <th><?php echo _('Name'); ?></th>
+        <th><?php echo _('Zones'); ?> (<?php echo _('access'); ?>)</th>
+        <th><?php echo _('Zones'); ?> (<?php echo _('owner'); ?>)</th>
+        <th><?php echo _('Zone list'); ?></th>
+        <th><?php echo _('Level'); ?></th>
+        <th><?php echo _('Status'); ?></th>
        </tr>
-<?
+<?php
 $users = show_users('',ROWSTART,ROWAMOUNT);
 foreach ($users as $c)
 {
@@ -88,76 +88,76 @@
 	$num_zones_access = count($domains);
 ?>
        <tr>
-        <td class="n"><a href="delete_user.php?id=<? echo $c["id"] ?>"><img src="images/delete.gif" alt="[ <? echo _('Delete user'); ?> ]"></a></td>
-        <td class="n"><a href="edit_user.php?id=<? echo $c["id"] ?>"><? echo $c["fullname"] ?></A> (<? echo $c["username"] ?>)</td>
-        <td class="n"><? echo $num_zones_access ?></td>
-        <td class="n"><? echo $c["numdomains"] ?></td>
+        <td class="n"><a href="delete_user.php?id=<?php echo $c["id"] ?>"><img src="images/delete.gif" alt="[ <?php echo _('Delete user'); ?> ]"></a></td>
+        <td class="n"><a href="edit_user.php?id=<?php echo $c["id"] ?>"><?php echo $c["fullname"] ?></A> (<?php echo $c["username"] ?>)</td>
+        <td class="n"><?php echo $num_zones_access ?></td>
+        <td class="n"><?php echo $c["numdomains"] ?></td>
         <td class="n">
-        <?
+        <?php
         foreach ($domains as $d)
         {
-                ?><a href="delete_domain.php?id=<? echo $d["id"] ?>"><img src="images/delete.gif" alt="[ <? echo _('Delete domain'); ?> ]"></a>&nbsp;<a href="edit.php?id=<? echo $d["id"] ?>"><? echo $d["name"] ?><? if ($d["partial"] == "1") { echo " *"; } ; ?></a><br><?
+                ?><a href="delete_domain.php?id=<?php echo $d["id"] ?>"><img src="images/delete.gif" alt="[ <?php echo _('Delete domain'); ?> ]"></a>&nbsp;<a href="edit.php?id=<?php echo $d["id"] ?>"><?php echo $d["name"] ?><?php if ($d["partial"] == "1") { echo " *"; } ; ?></a><br><?php
         }
         ?></td>
-	<td class="n"><? echo $c["level"] ?></td>
-	<td class="n"><? echo get_status($c["active"]) ?></td>
-       </tr><?
+	<td class="n"><?php echo $c["level"] ?></td>
+	<td class="n"><?php echo get_status($c["active"]) ?></td>
+       </tr><?php
         print "\n";
 }
 ?>
        
       </table>
-      <p><? echo _('Users may only change some of the records of zones marked with an (*).'); ?></p>
-      <p><? echo _('Number of users') ;?>: <? echo count($users); ?>.</p>
+      <p><?php echo _('Users may only change some of the records of zones marked with an (*).'); ?></p>
+      <p><?php echo _('Number of users') ;?>: <?php echo count($users); ?>.</p>
       <div class="showmax">
-<?
+<?php
 show_pages(count($users),ROWAMOUNT);
 ?>
-      </div> <? // eo div showmax ?>
+      </div> <?php // eo div showmax ?>
 
-      <h3><? echo _('Create new user'); ?></h3>
+      <h3><?php echo _('Create new user'); ?></h3>
       <form method="post" action="users.php">
        <table>
         <tr>
-         <td class="n"><? echo _('User name'); ?>:</td>
-         <td class="n"><input type="text" class="input" name="username" value="<? if ($error) print $_POST["username"]; ?>"></td>
+         <td class="n"><?php echo _('User name'); ?>:</td>
+         <td class="n"><input type="text" class="input" name="username" value="<?php if ($error) print $_POST["username"]; ?>"></td>
 	</tr>
 	<tr>
-	 <td class="n"><? echo _('Full name'); ?>:</td>
-	 <td class="n"><input type="text" class="input" NAME="fullname" VALUE="<? if ($error) print $_POST["fullname"]; ?>"></td>
+	 <td class="n"><?php echo _('Full name'); ?>:</td>
+	 <td class="n"><input type="text" class="input" NAME="fullname" VALUE="<?php if ($error) print $_POST["fullname"]; ?>"></td>
 	</tr>
 	<tr>
-	 <td class="n"><? echo _('Password'); ?>:</td>
-	 <td class="n"><input type="password" class="input" NAME="password" VALUE="<? if ($error) print $_POST["password"]; ?>"></td>
+	 <td class="n"><?php echo _('Password'); ?>:</td>
+	 <td class="n"><input type="password" class="input" NAME="password" VALUE="<?php if ($error) print $_POST["password"]; ?>"></td>
 	</tr>
 	<tr>
-	 <td class="n"><? echo _('E-mail'); ?>:</td>
-	 <td class="n"><input type="text" class="input" NAME="email" VALUE="<? if ($error) print $_POST["email"]; ?>"></td>
+	 <td class="n"><?php echo _('E-mail'); ?>:</td>
+	 <td class="n"><input type="text" class="input" NAME="email" VALUE="<?php if ($error) print $_POST["email"]; ?>"></td>
 	</tr>
 	<tr>
-	 <td class="n"><? echo _('User level'); ?>:</td>
+	 <td class="n"><?php echo _('User level'); ?>:</td>
 	 <td class="n">
 	  <select name="level">
-	   <option value="1">1 (<? echo leveldescription(1) ?>)</option>
-	   <option value="5">5 (<? echo leveldescription(5) ?>)</option>
-	   <option value="10">10 (<? echo leveldescription(10) ?>)</option>
+	   <option value="1">1 (<?php echo leveldescription(1) ?>)</option>
+	   <option value="5">5 (<?php echo leveldescription(5) ?>)</option>
+	   <option value="10">10 (<?php echo leveldescription(10) ?>)</option>
 	  </select>
 	 </td>
 	</tr>
         <tr>
-	 <td class="n"><? echo _('Description'); ?>:</td>
-	 <td class="n"><textarea rows="6" cols="30" class="inputarea" name="description"><? if ($error) print $_POST["description"]; ?></textarea></td>
+	 <td class="n"><?php echo _('Description'); ?>:</td>
+	 <td class="n"><textarea rows="6" cols="30" class="inputarea" name="description"><?php if ($error) print $_POST["description"]; ?></textarea></td>
 	</tr>
 	<tr>
-	 <td class="n"><? echo _('Active'); ?>:</td>
+	 <td class="n"><?php echo _('Active'); ?>:</td>
 	 <td class="n"><input type="checkbox" name="active" value="1" checked></td>
 	</tr>
 	<tr>
 	 <td class="n">&nbsp;</td>
-	 <td class="n"><input type="submit" class="button" name="submit" value="<? echo _('Add user'); ?>"></td>
+	 <td class="n"><input type="submit" class="button" name="submit" value="<?php echo _('Add user'); ?>"></td>
 	</tr>
        </table>
       </form>
-<?
+<?php
 include_once("inc/footer.inc.php");
 ?>