diff --git a/auth/db/config.html b/auth/db/config.html
index db36f1b54ee..b1eff29d818 100644
--- a/auth/db/config.html
+++ b/auth/db/config.html
@@ -27,21 +27,21 @@
         $config->auth_dbpasstype = "plaintext";
     }
 ?>
-<tr valign="top"  BGCOLOR="<?=$THEME->cellheading2 ?>">
+<tr valign="top"  BGCOLOR="<?php echo $THEME->cellheading2 ?>">
 	<TD ALIGN=RIGHT><P>auth_dbhost:</TD>
 	<TD>
-        <INPUT name=auth_dbhost TYPE=text SIZE=30 VALUE="<?=$config->auth_dbhost?>">
-	<? if (isset($err["auth_dbhost"])) formerr($err["auth_dbhost"]); ?>
+        <INPUT name=auth_dbhost TYPE=text SIZE=30 VALUE="<?php echo $config->auth_dbhost?>">
+	<?php  if (isset($err["auth_dbhost"])) formerr($err["auth_dbhost"]); ?>
 	</TD>
     <TD>
-    <? print_string("auth_dbhost","auth") ?>
+    <?php  print_string("auth_dbhost","auth") ?>
     </TD>
 </TR>
 
-<TR VALIGN=TOP  BGCOLOR="<?=$THEME->cellheading2 ?>">
+<TR VALIGN=TOP  BGCOLOR="<?php echo $THEME->cellheading2 ?>">
 	<TD ALIGN=RIGHT><P>auth_dbtype:</TD>
 	<TD>
-    <? $dbtypes = array("access","ado_access", "ado", "ado_mssql", "borland_ibase", "csv", "db2", "fbsql", "firebird", "ibase", "informix72", "informix", "mssql", "mysql", "mysqlt", "oci805", "oci8", "oci8po", "odbc", "odbc_mssql", "odbc_oracle", "oracle", "postgres64", "postgres7", "postgres", "proxy", "sqlanywhere", "sybase", "vfp");
+    <?php  $dbtypes = array("access","ado_access", "ado", "ado_mssql", "borland_ibase", "csv", "db2", "fbsql", "firebird", "ibase", "informix72", "informix", "mssql", "mysql", "mysqlt", "oci805", "oci8", "oci8po", "odbc", "odbc_mssql", "odbc_oracle", "oracle", "postgres64", "postgres7", "postgres", "proxy", "sqlanywhere", "sybase", "vfp");
        foreach ($dbtypes as $dbtype) {
            $dboptions[$dbtype] = $dbtype;
        }
@@ -50,186 +50,186 @@
       
     </TD>
     <TD>
-    <? print_string("auth_dbtype","auth") ?>
+    <?php  print_string("auth_dbtype","auth") ?>
     </TD>
 </TR>
 
-<TR VALIGN=TOP  BGCOLOR="<?=$THEME->cellheading2 ?>">
+<TR VALIGN=TOP  BGCOLOR="<?php echo $THEME->cellheading2 ?>">
 	<TD ALIGN=RIGHT><P>auth_dbname:</TD>
 	<TD>
-    <INPUT name=auth_dbname TYPE=text SIZE=30 VALUE="<?=$config->auth_dbname?>">
-    <? if (isset($err["auth_dbname"]))formerr($err["auth_dbname"]); ?>
+    <INPUT name=auth_dbname TYPE=text SIZE=30 VALUE="<?php echo $config->auth_dbname?>">
+    <?php  if (isset($err["auth_dbname"]))formerr($err["auth_dbname"]); ?>
     </TD>
     <TD>
-    <? print_string("auth_dbname","auth") ?>
+    <?php  print_string("auth_dbname","auth") ?>
     </TD>
 </TR>
 
-<TR VALIGN=TOP  BGCOLOR="<?=$THEME->cellheading2 ?>">
+<TR VALIGN=TOP  BGCOLOR="<?php echo $THEME->cellheading2 ?>">
 	<TD ALIGN=RIGHT><P>auth_dbuser:</TD>
 	<TD>
-    <INPUT name=auth_dbuser TYPE=text SIZE=30 VALUE="<?=$config->auth_dbuser?>">
-    <? if (isset($err["auth_dbuser"])) formerr($err["auth_dbuser"]); ?>
+    <INPUT name=auth_dbuser TYPE=text SIZE=30 VALUE="<?php echo $config->auth_dbuser?>">
+    <?php  if (isset($err["auth_dbuser"])) formerr($err["auth_dbuser"]); ?>
     </TD>
     <TD>
-    <? print_string("auth_dbuser","auth") ?>
+    <?php  print_string("auth_dbuser","auth") ?>
     </TD>
 </TR>
 
-<TR VALIGN=TOP  BGCOLOR="<?=$THEME->cellheading2 ?>">
+<TR VALIGN=TOP  BGCOLOR="<?php echo $THEME->cellheading2 ?>">
 	<TD ALIGN=RIGHT><P>auth_dbpass:</TD>
 	<TD>
-    <INPUT name="auth_dbpass" TYPE="text" SIZE="30" VALUE="<?=$config->auth_dbpass?>">
-    <? if (isset($err["auth_dbpass"])) formerr($err["auth_dbpass"]); ?>
+    <INPUT name="auth_dbpass" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_dbpass?>">
+    <?php  if (isset($err["auth_dbpass"])) formerr($err["auth_dbpass"]); ?>
     </TD>
     <TD>
-    <? print_string("auth_dbpass","auth") ?>
+    <?php  print_string("auth_dbpass","auth") ?>
     </TD>
 </TR>
 
-<TR VALIGN=TOP  BGCOLOR="<?=$THEME->cellheading2 ?>">
+<TR VALIGN=TOP  BGCOLOR="<?php echo $THEME->cellheading2 ?>">
 	<TD ALIGN=RIGHT><P>auth_dbtable:</TD>
 	<TD>
-    <INPUT name="auth_dbtable" TYPE="text" SIZE="30" VALUE="<?=$config->auth_dbtable?>">
-    <? if (isset($err["auth_dbtable"])) formerr($err["auth_dbtable"]); ?>
+    <INPUT name="auth_dbtable" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_dbtable?>">
+    <?php  if (isset($err["auth_dbtable"])) formerr($err["auth_dbtable"]); ?>
     </TD>
     <TD>
-    <? print_string("auth_dbtable","auth") ?>
+    <?php  print_string("auth_dbtable","auth") ?>
     </TD>
 </TR>
 
-<TR VALIGN=TOP  BGCOLOR="<?=$THEME->cellheading2 ?>">
+<TR VALIGN=TOP  BGCOLOR="<?php echo $THEME->cellheading2 ?>">
 	<TD ALIGN=RIGHT><P>auth_dbfielduser:</TD>
 	<TD>
-    <INPUT name="auth_dbfielduser" TYPE="text" SIZE="30" VALUE="<?=$config->auth_dbfielduser?>">
-    <? if (isset($err["auth_dbfielduser"])) formerr($err["auth_dbfielduser"]); ?>
+    <INPUT name="auth_dbfielduser" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_dbfielduser?>">
+    <?php  if (isset($err["auth_dbfielduser"])) formerr($err["auth_dbfielduser"]); ?>
     </TD>
     <TD>
-    <? print_string("auth_dbfielduser","auth") ?>
+    <?php  print_string("auth_dbfielduser","auth") ?>
     </TD>
 </TR>
 
-<TR VALIGN=TOP  BGCOLOR="<?=$THEME->cellheading2 ?>">
+<TR VALIGN=TOP  BGCOLOR="<?php echo $THEME->cellheading2 ?>">
 	<TD ALIGN=RIGHT><P>auth_dbfieldpass:</TD>
 	<TD>
-    <INPUT name="auth_dbfieldpass" TYPE="text" SIZE="30" VALUE="<?=$config->auth_dbfieldpass?>">
-    <? if (isset($err["auth_dbfieldpass"])) formerr($err["auth_dbfieldpass"]); ?>
+    <INPUT name="auth_dbfieldpass" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_dbfieldpass?>">
+    <?php  if (isset($err["auth_dbfieldpass"])) formerr($err["auth_dbfieldpass"]); ?>
     </TD>
     <TD>
-    <? print_string("auth_dbfieldpass","auth") ?>
+    <?php  print_string("auth_dbfieldpass","auth") ?>
     </TD>
 </TR>
 
-<TR VALIGN=TOP  BGCOLOR="<?=$THEME->cellheading2 ?>">
+<TR VALIGN=TOP  BGCOLOR="<?php echo $THEME->cellheading2 ?>">
 	<TD ALIGN=RIGHT><P>auth_dbpasstype:</TD>
 	<TD>
-    <? $passtype["plaintext"] = get_string("plaintext", "auth");
+    <?php  $passtype["plaintext"] = get_string("plaintext", "auth");
        $passtype["md5"]       = get_string("md5", "auth");
        choose_from_menu($passtype, "auth_dbpasstype", $config->auth_dbpasstype, "");
     ?>
       
     </TD>
     <TD>
-    <? print_string("auth_dbpasstype","auth") ?>
+    <?php  print_string("auth_dbpasstype","auth") ?>
     </TD>
 </TR>
 
 
 <TR>
-	<TD ALIGN=RIGHT><P><? print_string("firstname") ?>:</TD>
+	<TD ALIGN=RIGHT><P><?php  print_string("firstname") ?>:</TD>
 	<TD>
-    <INPUT name="auth_user_firstname" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_firstname?>">
+    <INPUT name="auth_user_firstname" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_firstname?>">
     </TD>
     <TD rowspan=12 VALIGN=CENTER>
-    <? print_string("auth_dbextrafields","auth") ?>
+    <?php  print_string("auth_dbextrafields","auth") ?>
     </TD>
 </TR>
 
 <TR VALIGN=TOP>
-	<TD ALIGN=RIGHT><P><? print_string("lastname") ?>:</TD>
+	<TD ALIGN=RIGHT><P><?php  print_string("lastname") ?>:</TD>
 	<TD>
-    <INPUT name="auth_user_lastname" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_lastname?>">
+    <INPUT name="auth_user_lastname" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_lastname?>">
     </TD>
 </TR>
 
 <TR VALIGN=TOP>
-	<TD ALIGN=RIGHT><P><? print_string("email") ?>:</TD>
+	<TD ALIGN=RIGHT><P><?php  print_string("email") ?>:</TD>
 	<TD>
-    <INPUT name="auth_user_email" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_email?>">
+    <INPUT name="auth_user_email" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_email?>">
     </TD>
 </TR>
 
 <TR VALIGN=TOP>
-	<TD ALIGN=RIGHT><P><? print_string("phone") ?> 1:</TD>
+	<TD ALIGN=RIGHT><P><?php  print_string("phone") ?> 1:</TD>
 	<TD>
-    <INPUT name="auth_user_phone1" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_phone1?>">
+    <INPUT name="auth_user_phone1" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_phone1?>">
     </TD>
 </TR>
 
 <TR VALIGN=TOP>
-	<TD ALIGN=RIGHT><P><? print_string("phone") ?> 2:</TD>
+	<TD ALIGN=RIGHT><P><?php  print_string("phone") ?> 2:</TD>
 	<TD>
-    <INPUT name="auth_user_phone2" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_phone2?>">
+    <INPUT name="auth_user_phone2" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_phone2?>">
     </TD>
 </TR>
 
 <TR VALIGN=TOP>
-	<TD ALIGN=RIGHT><P><? print_string("department") ?>:</TD>
+	<TD ALIGN=RIGHT><P><?php  print_string("department") ?>:</TD>
 	<TD>
-    <INPUT name="auth_user_department" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_department?>">
+    <INPUT name="auth_user_department" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_department?>">
     </TD>
 </TR>
 
 <TR VALIGN=TOP>
-	<TD ALIGN=RIGHT><P><? print_string("address") ?>:</TD>
+	<TD ALIGN=RIGHT><P><?php  print_string("address") ?>:</TD>
 	<TD>
-    <INPUT name="auth_user_address" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_address?>">
+    <INPUT name="auth_user_address" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_address?>">
     </TD>
 </TR>
 
 <TR VALIGN=TOP>
-	<TD ALIGN=RIGHT><P><? print_string("city") ?>:</TD>
+	<TD ALIGN=RIGHT><P><?php  print_string("city") ?>:</TD>
 	<TD>
-    <INPUT name="auth_user_city" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_city?>">
+    <INPUT name="auth_user_city" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_city?>">
     </TD>
 </TR>
 
 <TR VALIGN=TOP>
-	<TD ALIGN=RIGHT><P><? print_string("country") ?>:</TD>
+	<TD ALIGN=RIGHT><P><?php  print_string("country") ?>:</TD>
 	<TD>
-    <INPUT name="auth_user_country" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_country?>">
+    <INPUT name="auth_user_country" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_country?>">
     </TD>
 </TR>
 
 <TR VALIGN=TOP>
-	<TD ALIGN=RIGHT><P><? print_string("description") ?>:</TD>
+	<TD ALIGN=RIGHT><P><?php  print_string("description") ?>:</TD>
 	<TD>
-    <INPUT name="auth_user_description" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_description?>">
+    <INPUT name="auth_user_description" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_description?>">
     </TD>
 </TR>
 
 <TR VALIGN=TOP>
-	<TD ALIGN=RIGHT><P><? print_string("idnumber") ?>:</TD>
+	<TD ALIGN=RIGHT><P><?php  print_string("idnumber") ?>:</TD>
 	<TD>
-    <INPUT name="auth_user_idnumber" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_idnumber?>">
+    <INPUT name="auth_user_idnumber" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_idnumber?>">
     </TD>
 </TR>
 
 <TR VALIGN=TOP>
-	<TD ALIGN=RIGHT><P><? print_string("language") ?>:</TD>
+	<TD ALIGN=RIGHT><P><?php  print_string("language") ?>:</TD>
 	<TD>
-    <INPUT name="auth_user_lang" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_lang?>">
+    <INPUT name="auth_user_lang" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_lang?>">
     </TD>
 </TR>
 
 
 <TR VALIGN=TOP>
-	<TD ALIGN=RIGHT><P><? print_string("instructions", "auth") ?>:</TD>
+	<TD ALIGN=RIGHT><P><?php  print_string("instructions", "auth") ?>:</TD>
 	<TD>
-    <TEXTAREA NAME=auth_instructions COLS=30 ROWS=10 WRAP=virtual><? p($config->auth_instructions) ?></TEXTAREA> 
+    <TEXTAREA NAME=auth_instructions COLS=30 ROWS=10 WRAP=virtual><?php  p($config->auth_instructions) ?></TEXTAREA> 
     </TD>
     <TD>
-    <? print_string("authinstructions","auth") ?>
-    <? helpbutton("text", get_string("helptext")) ?>
+    <?php  print_string("authinstructions","auth") ?>
+    <?php  helpbutton("text", get_string("helptext")) ?>
     </TD>
 </TR>
diff --git a/auth/imap/config.html b/auth/imap/config.html
index b8818a3ebd9..8a6dfb04d18 100644
--- a/auth/imap/config.html
+++ b/auth/imap/config.html
@@ -9,21 +9,21 @@
         $config->auth_imapport = "143";
     }
 ?>
-<tr valign="top" BGCOLOR="<?=$THEME->cellheading2 ?>">
+<tr valign="top" BGCOLOR="<?php echo $THEME->cellheading2 ?>">
 	<TD ALIGN=RIGHT><P>auth_imaphost:</TD>
 	<TD>
-        <INPUT name=auth_imaphost TYPE=text SIZE=30 VALUE="<?=$config->auth_imaphost?>">
-	<? if (isset($err["auth_imaphost"])) formerr($err["auth_imaphost"]); ?>
+        <INPUT name=auth_imaphost TYPE=text SIZE=30 VALUE="<?php echo $config->auth_imaphost?>">
+	<?php  if (isset($err["auth_imaphost"])) formerr($err["auth_imaphost"]); ?>
 	</TD>
     <TD>
-    <? print_string("auth_imaphost","auth") ?>
+    <?php  print_string("auth_imaphost","auth") ?>
     </TD>
 </TR>
 
-<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
+<TR VALIGN=TOP BGCOLOR="<?php echo $THEME->cellheading2 ?>">
 	<TD ALIGN=RIGHT><P>auth_imaptype:</TD>
 	<TD>
-    <? $imaptypes = array("imap","imapssl", "imapcert", "imaptls");
+    <?php  $imaptypes = array("imap","imapssl", "imapcert", "imaptls");
        foreach($imaptypes as $imaptype) {
            $imapoptions[$imaptype] = $imaptype;
        }
@@ -31,28 +31,28 @@
     ?>
     </TD>
     <TD>
-    <? print_string("auth_imaptype","auth") ?>
+    <?php  print_string("auth_imaptype","auth") ?>
     </TD>
 </TR>
 
-<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
+<TR VALIGN=TOP BGCOLOR="<?php echo $THEME->cellheading2 ?>">
 	<TD ALIGN=RIGHT><P>auth_imapport:</TD>
 	<TD>
-    <INPUT name=auth_imapport TYPE=text SIZE=6 VALUE="<?=$config->auth_imapport?>">
-    <? if (isset($err["auth_imapport"])) formerr($err["auth_imapport"]); ?>
+    <INPUT name=auth_imapport TYPE=text SIZE=6 VALUE="<?php echo $config->auth_imapport?>">
+    <?php  if (isset($err["auth_imapport"])) formerr($err["auth_imapport"]); ?>
     </TD>
     <TD>
-    <? print_string("auth_imapport","auth") ?>
+    <?php  print_string("auth_imapport","auth") ?>
     </TD>
 </TR>
 
 <TR VALIGN=TOP>
-	<TD ALIGN=RIGHT><P><? print_string("instructions", "auth") ?>:</TD>
+	<TD ALIGN=RIGHT><P><?php  print_string("instructions", "auth") ?>:</TD>
 	<TD>
-    <TEXTAREA NAME=auth_instructions COLS=30 ROWS=10 WRAP=virtual><? p($config->auth_instructions) ?></TEXTAREA> 
+    <TEXTAREA NAME=auth_instructions COLS=30 ROWS=10 WRAP=virtual><?php  p($config->auth_instructions) ?></TEXTAREA> 
     </TD>
     <TD>
-    <? print_string("authinstructions","auth") ?>
-    <? helpbutton("text", get_string("helptext")) ?>
+    <?php  print_string("authinstructions","auth") ?>
+    <?php  helpbutton("text", get_string("helptext")) ?>
     </TD>
 </TR>
diff --git a/auth/ldap/config.html b/auth/ldap/config.html
index bb13d3b011d..16238b8d674 100644
--- a/auth/ldap/config.html
+++ b/auth/ldap/config.html
@@ -18,196 +18,196 @@
         $config->ldap_bind_pw = "";
     }
 ?>
-<tr valign="top" BGCOLOR="<?=$THEME->cellheading2 ?>">
+<tr valign="top" BGCOLOR="<?php echo $THEME->cellheading2 ?>">
 	<TD ALIGN=RIGHT><P>ldap_host_url:</TD>
 	<TD>
-        <INPUT name=ldap_host_url TYPE=text SIZE=30 VALUE="<?=$config->ldap_host_url?>">
-	<? if (isset($err["ldap_host_url"])) formerr($err["ldap_host_url"]); ?>
+        <INPUT name=ldap_host_url TYPE=text SIZE=30 VALUE="<?php echo $config->ldap_host_url?>">
+	<?php  if (isset($err["ldap_host_url"])) formerr($err["ldap_host_url"]); ?>
 	</TD>
     <TD>
-    <? print_string("auth_ldap_host_url","auth") ?>
+    <?php  print_string("auth_ldap_host_url","auth") ?>
     </TD>
 </TR>
 
-<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
+<TR VALIGN=TOP BGCOLOR="<?php echo $THEME->cellheading2 ?>">
 	<TD ALIGN=RIGHT><P>ldap_contexts:</TD>
 	<TD>
-    <INPUT name=ldap_contexts TYPE=text SIZE=30 VALUE="<?=$config->ldap_contexts?>">
-    <? if (isset($err["ldap_contexts"])) formerr($err["ldap_contexts"]); ?>
+    <INPUT name=ldap_contexts TYPE=text SIZE=30 VALUE="<?php echo $config->ldap_contexts?>">
+    <?php  if (isset($err["ldap_contexts"])) formerr($err["ldap_contexts"]); ?>
     </TD>
     <TD>
-    <? print_string("auth_ldap_contexts","auth") ?>
+    <?php  print_string("auth_ldap_contexts","auth") ?>
     </TD>
 </TR>
 
-<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
+<TR VALIGN=TOP BGCOLOR="<?php echo $THEME->cellheading2 ?>">
 	<TD ALIGN=RIGHT><P>ldap_user_attribute:</TD>
 	<TD>
-    <INPUT name=ldap_user_attribute TYPE=text SIZE=30 VALUE="<?=$config->ldap_user_attribute?>">
-    <? if (isset($err["ldap_user_attribute"])) formerr($err["ldap_user_attribute"]); ?>
+    <INPUT name=ldap_user_attribute TYPE=text SIZE=30 VALUE="<?php echo $config->ldap_user_attribute?>">
+    <?php  if (isset($err["ldap_user_attribute"])) formerr($err["ldap_user_attribute"]); ?>
     </TD>
     <TD>
-    <? print_string("auth_ldap_user_attribute","auth") ?>
+    <?php  print_string("auth_ldap_user_attribute","auth") ?>
     </TD>
 </TR>
 
-<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
+<TR VALIGN=TOP BGCOLOR="<?php echo $THEME->cellheading2 ?>">
 	<TD ALIGN=RIGHT><P>ldap_search_sub:</TD>
 	<TD>
-    <INPUT name=ldap_search_sub TYPE=text SIZE=1 VALUE="<?=$config->ldap_search_sub?>">
-    <? if (isset($err["ldap_search_sub"])) formerr($err["ldap_search_sub"]); ?>
+    <INPUT name=ldap_search_sub TYPE=text SIZE=1 VALUE="<?php echo $config->ldap_search_sub?>">
+    <?php  if (isset($err["ldap_search_sub"])) formerr($err["ldap_search_sub"]); ?>
     </TD>
     <TD>
-    <? print_string("auth_ldap_search_sub","auth") ?>
+    <?php  print_string("auth_ldap_search_sub","auth") ?>
     </TD>
 </TR>
 
-<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
+<TR VALIGN=TOP BGCOLOR="<?php echo $THEME->cellheading2 ?>">
 	<TD ALIGN=RIGHT><P>ldap_bind_dn:</TD>
 	<TD>
-    <INPUT name=ldap_bind_dn TYPE=text SIZE=30 VALUE="<?=$config->ldap_bind_dn?>">
-    <? if (isset($err["ldap_bind_dn"])) formerr($err["ldap_bind_dn"]); ?>
+    <INPUT name=ldap_bind_dn TYPE=text SIZE=30 VALUE="<?php echo $config->ldap_bind_dn?>">
+    <?php  if (isset($err["ldap_bind_dn"])) formerr($err["ldap_bind_dn"]); ?>
     </TD><TD>
-    <? print_string("auth_ldap_bind_dn","auth") ?>
+    <?php  print_string("auth_ldap_bind_dn","auth") ?>
     </TD>
 </TR>
 
-<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
+<TR VALIGN=TOP BGCOLOR="<?php echo $THEME->cellheading2 ?>">
 	<TD ALIGN=RIGHT><P>ldap_bind_pw:</TD>
 	<TD>
-    <INPUT name=ldap_bind_pw TYPE=text SIZE=30 VALUE="<?=$config->ldap_bind_pw?>">
-    <? if (isset($err["ldap_bind_pw"])) formerr($err["ldap_bind_pw"]); ?>
+    <INPUT name=ldap_bind_pw TYPE=text SIZE=30 VALUE="<?php echo $config->ldap_bind_pw?>">
+    <?php  if (isset($err["ldap_bind_pw"])) formerr($err["ldap_bind_pw"]); ?>
     </TD><TD>
-    <? print_string("auth_ldap_bind_pw","auth") ?>
+    <?php  print_string("auth_ldap_bind_pw","auth") ?>
     </TD>
 </TR>
 
-<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
+<TR VALIGN=TOP BGCOLOR="<?php echo $THEME->cellheading2 ?>">
         <TD ALIGN=RIGHT><P>ldap_memberattribute:</TD>
         <TD>
-    <INPUT name=ldap_memberattribute TYPE=text SIZE=30 VALUE="<?=$config->ldap_memberattribute?>">
-    <? if (isset($err["ldap_memberattribute"])) formerr($err["ldap_memberattribute"]); ?>
+    <INPUT name=ldap_memberattribute TYPE=text SIZE=30 VALUE="<?php echo $config->ldap_memberattribute?>">
+    <?php  if (isset($err["ldap_memberattribute"])) formerr($err["ldap_memberattribute"]); ?>
     </TD><TD>
-    <? print_string("auth_ldap_memberattribute","auth") ?>
+    <?php  print_string("auth_ldap_memberattribute","auth") ?>
     </TD>
 </TR>
 
-<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
+<TR VALIGN=TOP BGCOLOR="<?php echo $THEME->cellheading2 ?>">
         <TD ALIGN=RIGHT><P>ldap_creators:</TD>
         <TD>
-    <INPUT name=ldap_creators TYPE=text SIZE=30 VALUE="<?=$config->ldap_creators?>">
-    <? if (isset($err["ldap_creators"])) formerr($err["ldap_creators"]); ?>
+    <INPUT name=ldap_creators TYPE=text SIZE=30 VALUE="<?php echo $config->ldap_creators?>">
+    <?php  if (isset($err["ldap_creators"])) formerr($err["ldap_creators"]); ?>
     </TD><TD>
-    <? print_string("auth_ldap_creators","auth") ?>
+    <?php  print_string("auth_ldap_creators","auth") ?>
     </TD>
 </TR>
 
-<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
+<TR VALIGN=TOP BGCOLOR="<?php echo $THEME->cellheading2 ?>">
 	<TD ALIGN=RIGHT><P>ldap_create_context:</TD>
 	<TD>
-    <INPUT name=ldap_create_context TYPE=text SIZE=30 VALUE="<?=$config->ldap_create_context?>">
-    <? if (isset($err["ldap_create_context"])) formerr($err["ldap_create_context"]); ?>
+    <INPUT name=ldap_create_context TYPE=text SIZE=30 VALUE="<?php echo $config->ldap_create_context?>">
+    <?php  if (isset($err["ldap_create_context"])) formerr($err["ldap_create_context"]); ?>
     </TD><TD>
-    <? print_string("auth_ldap_create_context","auth") ?>
+    <?php  print_string("auth_ldap_create_context","auth") ?>
     </TD>
 </TR>
 
 <TR>
-	<TD ALIGN=RIGHT><P><? print_string("firstname") ?>:</TD>
+	<TD ALIGN=RIGHT><P><?php  print_string("firstname") ?>:</TD>
 	<TD>
-    <INPUT name="auth_user_firstname" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_firstname?>">
+    <INPUT name="auth_user_firstname" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_firstname?>">
     </TD>
     <TD rowspan=12 VALIGN=CENTER>
-    <? print_string("auth_ldapextrafields","auth") ?>
+    <?php  print_string("auth_ldapextrafields","auth") ?>
     </TD>
 </TR>
 
 <TR VALIGN=TOP>
-	<TD ALIGN=RIGHT><P><? print_string("lastname") ?>:</TD>
+	<TD ALIGN=RIGHT><P><?php  print_string("lastname") ?>:</TD>
 	<TD>
-    <INPUT name="auth_user_lastname" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_lastname?>">
+    <INPUT name="auth_user_lastname" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_lastname?>">
     </TD>
 </TR>
 
 <TR VALIGN=TOP>
-	<TD ALIGN=RIGHT><P><? print_string("email") ?>:</TD>
+	<TD ALIGN=RIGHT><P><?php  print_string("email") ?>:</TD>
 	<TD>
-    <INPUT name="auth_user_email" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_email?>">
+    <INPUT name="auth_user_email" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_email?>">
     </TD>
 </TR>
 
 <TR VALIGN=TOP>
-	<TD ALIGN=RIGHT><P><? print_string("phone") ?> 1:</TD>
+	<TD ALIGN=RIGHT><P><?php  print_string("phone") ?> 1:</TD>
 	<TD>
-    <INPUT name="auth_user_phone1" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_phone1?>">
+    <INPUT name="auth_user_phone1" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_phone1?>">
     </TD>
 </TR>
 
 <TR VALIGN=TOP>
-	<TD ALIGN=RIGHT><P><? print_string("phone") ?> 2:</TD>
+	<TD ALIGN=RIGHT><P><?php  print_string("phone") ?> 2:</TD>
 	<TD>
-    <INPUT name="auth_user_phone2" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_phone2?>">
+    <INPUT name="auth_user_phone2" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_phone2?>">
     </TD>
 </TR>
 
 <TR VALIGN=TOP>
-	<TD ALIGN=RIGHT><P><? print_string("department") ?>:</TD>
+	<TD ALIGN=RIGHT><P><?php  print_string("department") ?>:</TD>
 	<TD>
-    <INPUT name="auth_user_department" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_department?>">
+    <INPUT name="auth_user_department" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_department?>">
     </TD>
 </TR>
 
 <TR VALIGN=TOP>
-	<TD ALIGN=RIGHT><P><? print_string("address") ?>:</TD>
+	<TD ALIGN=RIGHT><P><?php  print_string("address") ?>:</TD>
 	<TD>
-    <INPUT name="auth_user_address" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_address?>">
+    <INPUT name="auth_user_address" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_address?>">
     </TD>
 </TR>
 
 <TR VALIGN=TOP>
-	<TD ALIGN=RIGHT><P><? print_string("city") ?>:</TD>
+	<TD ALIGN=RIGHT><P><?php  print_string("city") ?>:</TD>
 	<TD>
-    <INPUT name="auth_user_city" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_city?>">
+    <INPUT name="auth_user_city" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_city?>">
     </TD>
 </TR>
 
 <TR VALIGN=TOP>
-	<TD ALIGN=RIGHT><P><? print_string("country") ?>:</TD>
+	<TD ALIGN=RIGHT><P><?php  print_string("country") ?>:</TD>
 	<TD>
-    <INPUT name="auth_user_country" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_country?>">
+    <INPUT name="auth_user_country" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_country?>">
     </TD>
 </TR>
 
 <TR VALIGN=TOP>
-	<TD ALIGN=RIGHT><P><? print_string("description") ?>:</TD>
+	<TD ALIGN=RIGHT><P><?php  print_string("description") ?>:</TD>
 	<TD>
-    <INPUT name="auth_user_description" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_description?>">
+    <INPUT name="auth_user_description" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_description?>">
     </TD>
 </TR>
 
 <TR VALIGN=TOP>
-	<TD ALIGN=RIGHT><P><? print_string("idnumber") ?>:</TD>
+	<TD ALIGN=RIGHT><P><?php  print_string("idnumber") ?>:</TD>
 	<TD>
-    <INPUT name="auth_user_idnumber" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_idnumber?>">
+    <INPUT name="auth_user_idnumber" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_idnumber?>">
     </TD>
 </TR>
 
 <TR VALIGN=TOP>
-	<TD ALIGN=RIGHT><P><? print_string("language") ?>:</TD>
+	<TD ALIGN=RIGHT><P><?php  print_string("language") ?>:</TD>
 	<TD>
-    <INPUT name="auth_user_lang" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_lang?>">
+    <INPUT name="auth_user_lang" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_lang?>">
     </TD>
 </TR>
 
 
 <TR VALIGN=TOP>
-	<TD ALIGN=RIGHT><P><? print_string("instructions", "auth") ?>:</TD>
+	<TD ALIGN=RIGHT><P><?php  print_string("instructions", "auth") ?>:</TD>
 	<TD>
-    <TEXTAREA NAME=auth_instructions COLS=30 ROWS=10 WRAP=virtual><? p($config->auth_instructions) ?></TEXTAREA> 
+    <TEXTAREA NAME=auth_instructions COLS=30 ROWS=10 WRAP=virtual><?php  p($config->auth_instructions) ?></TEXTAREA> 
     </TD>
     <TD>
-    <? print_string("authinstructions","auth") ?>
-    <? helpbutton("text", get_string("helptext")) ?>
+    <?php  print_string("authinstructions","auth") ?>
+    <?php  helpbutton("text", get_string("helptext")) ?>
     </TD>
 </TR>
 
diff --git a/auth/manual/config.html b/auth/manual/config.html
index 57c87aaf591..3114dcbf4c2 100644
--- a/auth/manual/config.html
+++ b/auth/manual/config.html
@@ -1,11 +1,11 @@
 <TR VALIGN=TOP>
-	<TD ALIGN=RIGHT><P><? print_string("instructions", "auth") ?>:</TD>
+	<TD ALIGN=RIGHT><P><?php  print_string("instructions", "auth") ?>:</TD>
 	<TD>
-    <TEXTAREA NAME=auth_instructions COLS=30 ROWS=10 WRAP=virtual><? p($config->auth_instructions) ?></TEXTAREA> 
+    <TEXTAREA NAME=auth_instructions COLS=30 ROWS=10 WRAP=virtual><?php  p($config->auth_instructions) ?></TEXTAREA> 
     </TD>
     <TD>
-    <? print_string("authinstructions","auth") ?>
-    <? helpbutton("text", get_string("helptext")) ?>
+    <?php  print_string("authinstructions","auth") ?>
+    <?php  helpbutton("text", get_string("helptext")) ?>
     </TD>
 </TR>
 
diff --git a/auth/nntp/config.html b/auth/nntp/config.html
index 453ffb8a6cd..3cf54ae3511 100644
--- a/auth/nntp/config.html
+++ b/auth/nntp/config.html
@@ -7,35 +7,35 @@
     }
 ?>
 
-<tr valign="top" BGCOLOR="<?=$THEME->cellheading2 ?>">
+<tr valign="top" BGCOLOR="<?php echo $THEME->cellheading2 ?>">
 	<TD ALIGN=RIGHT><P>auth_nntphost:</TD>
 	<TD>
-        <INPUT name="auth_nntphost" TYPE="text" SIZE=30 VALUE="<?=$config->auth_nntphost?>">
-	<? if (isset($err["auth_nntphost"]))  formerr($err["auth_nntphost"]); ?>
+        <INPUT name="auth_nntphost" TYPE="text" SIZE=30 VALUE="<?php echo $config->auth_nntphost?>">
+	<?php  if (isset($err["auth_nntphost"]))  formerr($err["auth_nntphost"]); ?>
 	</TD>
     <TD>
-    <? print_string("auth_nntphost","auth") ?>
+    <?php  print_string("auth_nntphost","auth") ?>
     </TD>
 </TR>
 
-<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
+<TR VALIGN=TOP BGCOLOR="<?php echo $THEME->cellheading2 ?>">
 	<TD ALIGN=RIGHT><P>auth_nntpport:</TD>
 	<TD>
-    <INPUT name=auth_nntpport TYPE=text SIZE=6 VALUE="<?=$config->auth_nntpport?>">
-    <? if (isset($err["auth_nntpport"])) formerr($err["auth_nntpport"]); ?>
+    <INPUT name=auth_nntpport TYPE=text SIZE=6 VALUE="<?php echo $config->auth_nntpport?>">
+    <?php  if (isset($err["auth_nntpport"])) formerr($err["auth_nntpport"]); ?>
     </TD>
     <TD>
-    <? print_string("auth_nntpport","auth") ?>
+    <?php  print_string("auth_nntpport","auth") ?>
     </TD>
 </TR>
 
 <TR VALIGN=TOP>
-	<TD ALIGN=RIGHT><P><? print_string("instructions", "auth") ?>:</TD>
+	<TD ALIGN=RIGHT><P><?php  print_string("instructions", "auth") ?>:</TD>
 	<TD>
-    <TEXTAREA NAME=auth_instructions COLS=30 ROWS=10 WRAP=virtual><? p($config->auth_instructions) ?></TEXTAREA> 
+    <TEXTAREA NAME=auth_instructions COLS=30 ROWS=10 WRAP=virtual><?php  p($config->auth_instructions) ?></TEXTAREA> 
     </TD>
     <TD>
-    <? print_string("authinstructions","auth") ?>
-    <? helpbutton("text", get_string("helptext")) ?>
+    <?php  print_string("authinstructions","auth") ?>
+    <?php  helpbutton("text", get_string("helptext")) ?>
     </TD>
 </TR>
diff --git a/auth/pop3/config.html b/auth/pop3/config.html
index 9e42e351a3c..bb97d877539 100644
--- a/auth/pop3/config.html
+++ b/auth/pop3/config.html
@@ -9,21 +9,21 @@
         $config->auth_pop3port = "110";
     }
 ?>
-<tr valign="top" BGCOLOR="<?=$THEME->cellheading2 ?>">
+<tr valign="top" BGCOLOR="<?php echo $THEME->cellheading2 ?>">
 	<TD ALIGN=RIGHT><P>auth_pop3host:</TD>
 	<TD>
-        <INPUT name=auth_pop3host TYPE=text SIZE=30 VALUE="<?=$config->auth_pop3host?>">
-	<? if (isset($err["auth_pop3host"])) formerr($err["auth_pop3host"]); ?>
+        <INPUT name=auth_pop3host TYPE=text SIZE=30 VALUE="<?php echo $config->auth_pop3host?>">
+	<?php  if (isset($err["auth_pop3host"])) formerr($err["auth_pop3host"]); ?>
 	</TD>
     <TD>
-    <? print_string("auth_pop3host","auth") ?>
+    <?php  print_string("auth_pop3host","auth") ?>
     </TD>
 </TR>
 
-<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
+<TR VALIGN=TOP BGCOLOR="<?php echo $THEME->cellheading2 ?>">
 	<TD ALIGN=RIGHT><P>auth_pop3type:</TD>
 	<TD>
-    <? $pop3types = array("pop3","pop3cert");
+    <?php  $pop3types = array("pop3","pop3cert");
        foreach($pop3types as $pop3type) {
            $pop3options[$pop3type] = $pop3type;
        }
@@ -31,28 +31,28 @@
     ?>
     </TD>
 <TD>
-    <? print_string("auth_pop3type","auth") ?>
+    <?php  print_string("auth_pop3type","auth") ?>
     </TD>
 </TR>
 
-<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
+<TR VALIGN=TOP BGCOLOR="<?php echo $THEME->cellheading2 ?>">
 	<TD ALIGN=RIGHT><P>auth_pop3port:</TD>
 	<TD>
-    <INPUT name=auth_pop3port TYPE=text SIZE=6 VALUE="<?=$config->auth_pop3port?>">
-    <? if (isset($err["auth_pop3port"])) formerr($err["auth_pop3port"]); ?>
+    <INPUT name=auth_pop3port TYPE=text SIZE=6 VALUE="<?php echo $config->auth_pop3port?>">
+    <?php  if (isset($err["auth_pop3port"])) formerr($err["auth_pop3port"]); ?>
     </TD>
     <TD>
-    <? print_string("auth_pop3port","auth") ?>
+    <?php  print_string("auth_pop3port","auth") ?>
     </TD>
 </TR>
 
 <TR VALIGN=TOP>
-	<TD ALIGN=RIGHT><P><? print_string("instructions", "auth") ?>:</TD>
+	<TD ALIGN=RIGHT><P><?php  print_string("instructions", "auth") ?>:</TD>
 	<TD>
-    <TEXTAREA NAME=auth_instructions COLS=30 ROWS=10 WRAP=virtual><? p($config->auth_instructions) ?></TEXTAREA> 
+    <TEXTAREA NAME=auth_instructions COLS=30 ROWS=10 WRAP=virtual><?php  p($config->auth_instructions) ?></TEXTAREA> 
     </TD>
     <TD>
-    <? print_string("authinstructions","auth") ?>
-    <? helpbutton("text", get_string("helptext")) ?>
+    <?php  print_string("authinstructions","auth") ?>
+    <?php  helpbutton("text", get_string("helptext")) ?>
     </TD>
 </TR>