diff --git a/admin/addshift.php b/admin/addshift.php
index 008a894a..6a1cbe63 100644
--- a/admin/addshift.php
+++ b/admin/addshift.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Add and modify shifts by questionnaire
  *
@@ -231,7 +231,7 @@ if ($questionnaire_id != false)
 	?>
 		<form method="post" action="">
 		<table>
-	<?
+	<?php 
 		print "<tr><th>" . T_("Day") . "</th><th>" . T_("Start") . "</th><th>" . T_("End") . "</th><th>" . T_("Use shift?") . "</th></tr>";
 		$count = 1;
 		foreach($shifts as $shift)
@@ -257,12 +257,12 @@ if ($questionnaire_id != false)
 		<!--<tr><td/><td/><td/><td>Select all</td></tr>-->
 		</table>
 		<!--<p><input type="submit" name="addshift" value="Add Shift"/></p>-->
-		<p><input type="submit" name="submit" value="<? echo T_("Submit changes"); ?>"/></p>
-		<p><input type="hidden" name="year" value="<? echo $year; ?>"/></p>
-		<p><input type="hidden" name="woy" value="<? echo $woy; ?>"/></p>
-		<p><input type="hidden" name="qid" value="<? echo $questionnaire_id; ?>"/></p>
+		<p><input type="submit" name="submit" value="<?php  echo T_("Submit changes"); ?>"/></p>
+		<p><input type="hidden" name="year" value="<?php  echo $year; ?>"/></p>
+		<p><input type="hidden" name="woy" value="<?php  echo $woy; ?>"/></p>
+		<p><input type="hidden" name="qid" value="<?php  echo $questionnaire_id; ?>"/></p>
 		</form>
-	<?
+	<?php 
 }	
 	
 xhtml_foot();
diff --git a/admin/assignsample.php b/admin/assignsample.php
index 8b23380a..895962dd 100644
--- a/admin/assignsample.php
+++ b/admin/assignsample.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Assign sample(s) to a questionnaire
  *
@@ -135,8 +135,8 @@ if ($questionnaire_id != false)
 		print "<h1>" . T_("Add a sample to this questionnaire:") . "</h1>";
 		?>
 		<form action="" method="get">
-		<p><label for="sample"><? echo T_("Select sample:"); ?></label><select name="sample" id="sample">
-		<?
+		<p><label for="sample"><?php  echo T_("Select sample:"); ?></label><select name="sample" id="sample">
+		<?php 
 	
 		foreach($qs as $q)
 		{
@@ -145,14 +145,14 @@ if ($questionnaire_id != false)
 	
 		?>
 		</select><br/>
-		<label for="call_max"><? echo T_("Max calls (0 for unlimited)"); ?></label><input type="text" name="call_max" id="call_max" value="0"/><br/>
-		<label for="call_attempt_max"><? echo T_("Max call attempts (0 for unlimited)"); ?></label><input type="text" name="call_attempt_max" id="call_attempt_max" value="0"/>		<br/>
-		<label for="answering_machine_messages"><? echo T_("Number of answering machine messages to leave per case (0 for never)"); ?></label><input type="text" name="answering_machine_messages" id="answering_machine_messages" value="1"/>		<br/>
-		<label for="selecttype"><? echo T_("Select from sample randomly? (otherwise sequentially)"); ?></label><input type="checkbox" id = "selecttype" name="selecttype" />		<br/>
-		<input type="hidden" name="questionnaire_id" value="<? print($questionnaire_id); ?>"/>
+		<label for="call_max"><?php  echo T_("Max calls (0 for unlimited)"); ?></label><input type="text" name="call_max" id="call_max" value="0"/><br/>
+		<label for="call_attempt_max"><?php  echo T_("Max call attempts (0 for unlimited)"); ?></label><input type="text" name="call_attempt_max" id="call_attempt_max" value="0"/>		<br/>
+		<label for="answering_machine_messages"><?php  echo T_("Number of answering machine messages to leave per case (0 for never)"); ?></label><input type="text" name="answering_machine_messages" id="answering_machine_messages" value="1"/>		<br/>
+		<label for="selecttype"><?php  echo T_("Select from sample randomly? (otherwise sequentially)"); ?></label><input type="checkbox" id = "selecttype" name="selecttype" />		<br/>
+		<input type="hidden" name="questionnaire_id" value="<?php  print($questionnaire_id); ?>"/>
 		<input type="submit" name="add_sample" value="Add sample"/></p>
 		</form>
-		<?
+		<?php 
 	}
 }
 xhtml_foot();
diff --git a/admin/availability.php b/admin/availability.php
index d1f0b81b..c170d6c9 100644
--- a/admin/availability.php
+++ b/admin/availability.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Modify availability within this availability group
  *
@@ -132,7 +132,7 @@ translate_array($daysofweek,array("description"));
 ?>
 	<form method="post" action="">
 	<table>
-<?
+<?php 
 	print "<tr><th>" . T_("Day") . "</th><th>" . T_("Start") . "</th><th>" . T_("End") . "</th></tr>";
 	$count = 0;
 	foreach($availabilitys as $availability)
@@ -149,11 +149,11 @@ translate_array($daysofweek,array("description"));
 
 ?>
 	</table>
-	<div><a onclick="addRow(); return false;" href="#"><? echo T_("Add row"); ?></a></div>
-	<p><input type="submit" name="submit" value="<? echo T_("Save changes to availabilities"); ?>"/></p>
-	<input type="hidden" name="availability_group" value="<? echo $availability_group;?>"/>
+	<div><a onclick="addRow(); return false;" href="#"><?php  echo T_("Add row"); ?></a></div>
+	<p><input type="submit" name="submit" value="<?php  echo T_("Save changes to availabilities"); ?>"/></p>
+	<input type="hidden" name="availability_group" value="<?php  echo $availability_group;?>"/>
 	</form>
-<?
+<?php 
 	
 
 xhtml_foot();
diff --git a/admin/availabilitygroup.php b/admin/availabilitygroup.php
index 991f2213..080cf329 100644
--- a/admin/availabilitygroup.php
+++ b/admin/availabilitygroup.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * List and create availability groups
  *
@@ -97,10 +97,10 @@ else
 //add a note
 ?>
 <form method="get" action="?">
-	<p><input type="text" class="textclass" name="availability_group" id="availability_group"/><input class="submitclass" type="submit" name="submit" value="<? echo T_("Add availability group"); ?>"/>
+	<p><input type="text" class="textclass" name="availability_group" id="availability_group"/><input class="submitclass" type="submit" name="submit" value="<?php  echo T_("Add availability group"); ?>"/>
 	</p>
 </form>
-<?
+<?php 
 
 xhtml_foot();
 
diff --git a/admin/bulkappointment.php b/admin/bulkappointment.php
index 4207539a..3e525049 100644
--- a/admin/bulkappointment.php
+++ b/admin/bulkappointment.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Generate bulk appointments from a Headered CSV file
  *
@@ -217,7 +217,7 @@ else if (isset($_POST['import_file']))
 	xhtml_head("queXS",true,array("../css/table.css"));
 	?>
 	<form action="" method="post">
-	<?
+	<?php 
 
 	$tmpfname = tempnam(TEMPORARY_DIRECTORY, "FOO");
 	move_uploaded_file($_FILES['file']['tmp_name'],$tmpfname);
@@ -231,10 +231,10 @@ else if (isset($_POST['import_file']))
 		xhtml_table($todo,array(0,1,2,3),$todoh);
 		?>
 		<form action="" method="post">
-		<p><input type="hidden" name="tmpfname" value="<? echo $tmpfname; ?>" /></p>
-		<p><input type="submit" name="import_file" value="<? echo T_("Accept and generate bulk appointments"); ?>"/></p>
+		<p><input type="hidden" name="tmpfname" value="<?php  echo $tmpfname; ?>" /></p>
+		<p><input type="submit" name="import_file" value="<?php  echo T_("Accept and generate bulk appointments"); ?>"/></p>
 		</form>
-		<?
+		<?php 
 	}
 	else
 		print "<p>" . T_("The file does not contain at least caseid, starttime and endtime columns. Please try again.") ."</p>";
@@ -258,11 +258,11 @@ else
 	</table></div>
 	<form enctype="multipart/form-data" action="" method="post">
 	<p><input type="hidden" name="MAX_FILE_SIZE" value="1000000000" /></p>
-	<p><? echo T_("Choose the CSV file to upload:"); ?><input name="file" type="file" /></p>
-	<p><input type="submit" name="import_file" value="<? echo T_("Load bulk appointment CSV"); ?>"/></p>
+	<p><?php  echo T_("Choose the CSV file to upload:"); ?><input name="file" type="file" /></p>
+	<p><input type="submit" name="import_file" value="<?php  echo T_("Load bulk appointment CSV"); ?>"/></p>
 	</form>
 
-	<?
+	<?php 
 	xhtml_foot();
 
 }
diff --git a/admin/callhistory.php b/admin/callhistory.php
index 7b682d42..108a00ca 100644
--- a/admin/callhistory.php
+++ b/admin/callhistory.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Display a list of calls and outcomes for all calls  
  *
diff --git a/admin/callrestrict.php b/admin/callrestrict.php
index ee1065bd..d8c49251 100644
--- a/admin/callrestrict.php
+++ b/admin/callrestrict.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Modify the call restriction times 
  *
@@ -114,7 +114,7 @@ translate_array($daysofweek,array("description"));
 ?>
 	<form method="post" action="">
 	<table>
-<?
+<?php 
 	print "<tr><th>" . T_("Day") . "</th><th>" . T_("Start") . "</th><th>" . T_("End") . "</th></tr>";
 	$count = 0;
 	foreach($shifts as $shift)
@@ -131,10 +131,10 @@ translate_array($daysofweek,array("description"));
 
 ?>
 	</table>
-	<div><a onclick="addRow(); return false;" href="#"><? echo T_("Add row"); ?></a></div>
-	<p><input type="submit" name="submit" value="<? echo T_("Save changes to restriction times"); ?>"/></p>
+	<div><a onclick="addRow(); return false;" href="#"><?php  echo T_("Add row"); ?></a></div>
+	<p><input type="submit" name="submit" value="<?php  echo T_("Save changes to restriction times"); ?>"/></p>
 	</form>
-<?
+<?php 
 	
 
 xhtml_foot();
diff --git a/admin/casesbyoutcome.php b/admin/casesbyoutcome.php
index 2de53aec..09d65fd6 100644
--- a/admin/casesbyoutcome.php
+++ b/admin/casesbyoutcome.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Display a list of cases for a questionnaire based on the current outcome 
  *
diff --git a/admin/centreinfo.php b/admin/centreinfo.php
index 8751b2d0..e7b9fa63 100644
--- a/admin/centreinfo.php
+++ b/admin/centreinfo.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Set information about this centre for diplay to operators
  *
@@ -63,10 +63,10 @@ xhtml_head(T_("Set centre information"),true,false,array("../js/window.js"));
 
 		?>
 		<form action="" method="post"><p>
-		<label for="information"><? echo T_("Set centre information: "); ?></label><? echo $CKEditor->editor("information",get_setting("information")); ?>
-		<input type="submit" name="update" value="<? echo T_("Update centre information"); ?>"/></p>
+		<label for="information"><?php  echo T_("Set centre information: "); ?></label><?php  echo $CKEditor->editor("information",get_setting("information")); ?>
+		<input type="submit" name="update" value="<?php  echo T_("Update centre information"); ?>"/></p>
 		</form>
-		<?
+		<?php 
 xhtml_foot();
 
 
diff --git a/admin/clientquestionnaire.php b/admin/clientquestionnaire.php
index c5c50c2f..410876f2 100644
--- a/admin/clientquestionnaire.php
+++ b/admin/clientquestionnaire.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Assign clients to questionnaires in a checkbox matrix
  *
@@ -153,7 +153,7 @@ xhtml_head(T_("Assign clients to questionnaires"),false,array("../css/table.css"
 
 <script type="text/javascript">
 
-<?
+<?php 
 print "questionnaire_id = new Array(";
 
 $s = "";
@@ -236,7 +236,7 @@ function checkVid(v)
 <body>
 
 
-<?
+<?php 
 
 
 
diff --git a/admin/clients.php b/admin/clients.php
index dd60c45f..68f46f2c 100644
--- a/admin/clients.php
+++ b/admin/clients.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Create a client and link to a webserver username for authentication
  *
@@ -97,25 +97,25 @@ $rs = $db->GetAll($sql);
 if ($a)
 {
 ?>
-	<h3><? echo $a; ?></h3>
-<?
+	<h3><?php  echo $a; ?></h3>
+<?php 
 }
 ?>
-<h1><? echo T_("Add a client"); ?></h1>
-<p><? echo T_("Adding a client here will allow them to access project information in the client subdirectory. You can assign a client to a particular project using the"); ?> <a href="clientquestionnaire.php"><? echo T_("Assign client to Questionnaire"); ?></a> <? echo T_("tool."); ?></p>
-<p><? echo T_("Use this form to enter the username of a user based on your directory security system. For example, if you have secured the base directory of queXS using Apache file based security, enter the usernames of the users here."); ?></p>
+<h1><?php  echo T_("Add a client"); ?></h1>
+<p><?php  echo T_("Adding a client here will allow them to access project information in the client subdirectory. You can assign a client to a particular project using the"); ?> <a href="clientquestionnaire.php"><?php  echo T_("Assign client to Questionnaire"); ?></a> <?php  echo T_("tool."); ?></p>
+<p><?php  echo T_("Use this form to enter the username of a user based on your directory security system. For example, if you have secured the base directory of queXS using Apache file based security, enter the usernames of the users here."); ?></p>
 <form enctype="multipart/form-data" action="" method="post">
-	<p><? echo T_("Enter the username of a client to add:"); ?> <input name="client" type="text"/></p>
-	<? if (HTPASSWD_PATH !== false && HTGROUP_PATH !== false) { ?>
-	<p><? echo T_("Enter the password of a client to add:"); ?> <input name="password" type="text"/></p>
-<? } ?>
-	<p><? echo T_("Enter the first name of a client to add:"); ?> <input name="firstname" type="text"/></p>
-	<p><? echo T_("Enter the surname of a client to add:"); ?> <input name="lastname" type="text"/></p>
-	<p><a href='timezonetemplate.php'><? echo T_("Enter the Time Zone of a client to add:"); echo "</a>"; display_chooser($rs,"Time_zone_name","Time_zone_name",false,false,false,false,array("value",DEFAULT_TIME_ZONE)); ?> </p>
-	<p><input type="submit" value="<? echo T_("Add user"); ?>" /></p>
+	<p><?php  echo T_("Enter the username of a client to add:"); ?> <input name="client" type="text"/></p>
+	<?php  if (HTPASSWD_PATH !== false && HTGROUP_PATH !== false) { ?>
+	<p><?php  echo T_("Enter the password of a client to add:"); ?> <input name="password" type="text"/></p>
+<?php  } ?>
+	<p><?php  echo T_("Enter the first name of a client to add:"); ?> <input name="firstname" type="text"/></p>
+	<p><?php  echo T_("Enter the surname of a client to add:"); ?> <input name="lastname" type="text"/></p>
+	<p><a href='timezonetemplate.php'><?php  echo T_("Enter the Time Zone of a client to add:"); echo "</a>"; display_chooser($rs,"Time_zone_name","Time_zone_name",false,false,false,false,array("value",DEFAULT_TIME_ZONE)); ?> </p>
+	<p><input type="submit" value="<?php  echo T_("Add user"); ?>" /></p>
 </form>
 
-<?
+<?php 
 
 xhtml_foot();
 
diff --git a/admin/databasestrings.php b/admin/databasestrings.php
index 6deb9854..52dcd1b4 100755
--- a/admin/databasestrings.php
+++ b/admin/databasestrings.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * A list of database strings for translation
  *
diff --git a/admin/dataoutput.php b/admin/dataoutput.php
index 87b663ae..e7a1633f 100644
--- a/admin/dataoutput.php
+++ b/admin/dataoutput.php
@@ -1,5 +1,4 @@
-<?php
-/**
+<?php /**
  * Output data as a fixed width ASCII file
  *
  *
diff --git a/admin/displayappointments.php b/admin/displayappointments.php
index 4594e3dc..9602a935 100644
--- a/admin/displayappointments.php
+++ b/admin/displayappointments.php
@@ -1,5 +1,4 @@
-<?php
-/**
+<?php /**
  * Display appointments
  *
  *
diff --git a/admin/extensionstatus.php b/admin/extensionstatus.php
index 6ad4aeeb..d0c7a297 100644
--- a/admin/extensionstatus.php
+++ b/admin/extensionstatus.php
@@ -1,5 +1,4 @@
-<?php
-/**
+<?php /**
  * Display extension status
  *
  *
diff --git a/admin/import.php b/admin/import.php
index fbc2bb16..edd02eec 100644
--- a/admin/import.php
+++ b/admin/import.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Import a sample from a Headered CSV file
  *
@@ -87,7 +87,7 @@ else if (isset($_POST['import_file']))
 	xhtml_head(T_("Import: Select columns to import"));
 	?>
 	<form action="" method="post">
-	<?
+	<?php 
 
 	$tmpfname = tempnam(TEMPORARY_DIRECTORY, "FOO");
 	move_uploaded_file($_FILES['file']['tmp_name'],$tmpfname);
@@ -97,12 +97,12 @@ else if (isset($_POST['import_file']))
 
 
 	?>
-	<p><input type="hidden" name="description" value="<? if (isset($_POST['description'])) print($_POST['description']); ?>"/></p>
-	<p><input type="hidden" name="filename" value="<? echo $tmpfname; ?>"/></p>
+	<p><input type="hidden" name="description" value="<?php  if (isset($_POST['description'])) print($_POST['description']); ?>"/></p>
+	<p><input type="hidden" name="filename" value="<?php  echo $tmpfname; ?>"/></p>
 	<p><input type="submit" name="import_form"/></p>
 	</form>
 
-	<?
+	<?php 
 	xhtml_foot();
 
 }
@@ -114,12 +114,12 @@ else
 
 	<form enctype="multipart/form-data" action="" method="post">
 	<p><input type="hidden" name="MAX_FILE_SIZE" value="1000000000" /></p>
-	<p><? echo T_("Choose the CSV sample file to upload:"); ?><input name="file" type="file" /></p>
-	<p><? echo T_("Description for file:"); ?><input name="description" type="text" /></p>
-	<p><input type="submit" name="import_file" value="<? echo T_("Add sample"); ?>"/></p>
+	<p><?php  echo T_("Choose the CSV sample file to upload:"); ?><input name="file" type="file" /></p>
+	<p><?php  echo T_("Description for file:"); ?><input name="description" type="text" /></p>
+	<p><input type="submit" name="import_file" value="<?php  echo T_("Add sample"); ?>"/></p>
 	</form>
 
-	<?
+	<?php 
 	xhtml_foot();
 
 }
diff --git a/admin/index.php b/admin/index.php
index f8bcc807..7d900207 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -1,5 +1,4 @@
-<?php
-/**
+<?php /**
  * Display an index of Admin tools
  *
  *
diff --git a/admin/new.php b/admin/new.php
index f3ba8d16..89ab8a29 100644
--- a/admin/new.php
+++ b/admin/new.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Create a queXS questionnaire and link it to a LimeSurvey questionnaire
  *
@@ -113,8 +113,8 @@ if (isset($_POST['import_file']))
 ?>
 	<form enctype="multipart/form-data" action="" method="post">
 	<p><input type="hidden" name="MAX_FILE_SIZE" value="1000000000" /></p>
-	<p><? echo T_("Name for questionnaire:"); ?> <input type="text" name="description"/></p>
-	<p><? echo T_("Select limesurvey instrument:"); 
+	<p><?php  echo T_("Name for questionnaire:"); ?> <input type="text" name="description"/></p>
+	<p><?php  echo T_("Select limesurvey instrument:"); 
 $sql = "SELECT s.sid as sid, sl.surveyls_title AS title
 	FROM " . LIME_PREFIX . "surveys AS s
 	LEFT JOIN " . LIME_PREFIX . "surveys_languagesettings AS sl ON ( s.sid = sl.surveyls_survey_id)
@@ -137,9 +137,9 @@ else
 	print "<a href='" . LIME_URL ."admin/admin.php?action=newsurvey'>" . T_("Create an instrument in Limesurvey") ."</a>";
 }
 ?></p>
-<p><? echo T_("Respondent selection type:"); ?>
-<select name="selectrs" onchange="if(this.value=='old') show(this,'rstext'); else hide(this,'rstext');"><option value="none"><? echo T_("No respondent selection (go straight to questionnaire)"); ?></option><option value="old"><? echo T_("Use basic respondent selection text (below)"); ?></option>
-<?
+<p><?php  echo T_("Respondent selection type:"); ?>
+<select name="selectrs" onchange="if(this.value=='old') show(this,'rstext'); else hide(this,'rstext');"><option value="none"><?php  echo T_("No respondent selection (go straight to questionnaire)"); ?></option><option value="old"><?php  echo T_("Use basic respondent selection text (below)"); ?></option>
+<?php 
 $sql = "SELECT s.sid as sid, sl.surveyls_title AS title
 	FROM " . LIME_PREFIX . "surveys AS s
 	LEFT JOIN " . LIME_PREFIX . "surveys_languagesettings AS sl ON ( s.sid = sl.surveyls_survey_id
@@ -176,20 +176,20 @@ $ckeditorConfig = array("toolbar" => array(array("tokens","-","Source"),
 	
 
 ?></select></p>
-<p><? echo T_("Restrict appointments to shifts?"); ?> <input name="ras" type="checkbox" checked="checked"/></p>
-<p><? echo T_("Restrict work to shifts?"); ?> <input name="rws" type="checkbox" checked="checked"/></p>
-<p><? echo T_("Questionnaire for testing only?"); ?> <input name="testing" type="checkbox"/></p>
+<p><?php  echo T_("Restrict appointments to shifts?"); ?> <input name="ras" type="checkbox" checked="checked"/></p>
+<p><?php  echo T_("Restrict work to shifts?"); ?> <input name="rws" type="checkbox" checked="checked"/></p>
+<p><?php  echo T_("Questionnaire for testing only?"); ?> <input name="testing" type="checkbox"/></p>
 <div id='rstext' style='display:none;'>
-<p><? echo T_("Respondent selection introduction:"); echo $CKEditor->editor("rs_intro","",$ckeditorConfig);?></p>
-<p><? echo T_("Respondent selection project introduction:"); echo $CKEditor->editor("rs_project_intro","",$ckeditorConfig);?></p>
-<p><? echo T_("Respondent selection callback (already started questionnaire):"); echo $CKEditor->editor("rs_callback","",$ckeditorConfig);?> </p>
-<p><? echo T_("Message to leave on an answering machine:"); echo $CKEditor->editor("rs_answeringmachine","",$ckeditorConfig);?> </p>
+<p><?php  echo T_("Respondent selection introduction:"); echo $CKEditor->editor("rs_intro","",$ckeditorConfig);?></p>
+<p><?php  echo T_("Respondent selection project introduction:"); echo $CKEditor->editor("rs_project_intro","",$ckeditorConfig);?></p>
+<p><?php  echo T_("Respondent selection callback (already started questionnaire):"); echo $CKEditor->editor("rs_callback","",$ckeditorConfig);?> </p>
+<p><?php  echo T_("Message to leave on an answering machine:"); echo $CKEditor->editor("rs_answeringmachine","",$ckeditorConfig);?> </p>
 </div>
-<p><? echo T_("Project end text (thank you screen):");echo $CKEditor->editor("rs_project_end","",$ckeditorConfig); ?></p>
-<p><? echo T_("Project information for interviewers/operators:");echo $CKEditor->editor("info","",$ckeditorConfig);?></p>
-<p><input type="submit" name="import_file" value="<? echo T_("Create Questionnaire"); ?>"/></p>
+<p><?php  echo T_("Project end text (thank you screen):");echo $CKEditor->editor("rs_project_end","",$ckeditorConfig); ?></p>
+<p><?php  echo T_("Project information for interviewers/operators:");echo $CKEditor->editor("info","",$ckeditorConfig);?></p>
+<p><input type="submit" name="import_file" value="<?php  echo T_("Create Questionnaire"); ?>"/></p>
 </form>
-<?
+<?php 
 xhtml_foot();
 
 
diff --git a/admin/operatorlist.php b/admin/operatorlist.php
index e333ce49..1df24930 100644
--- a/admin/operatorlist.php
+++ b/admin/operatorlist.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * List operators and allow for customised VoIP downloads, changing passwords, disabling, etc
  *
diff --git a/admin/operatorperformance.php b/admin/operatorperformance.php
index 2691dbbd..a0549554 100644
--- a/admin/operatorperformance.php
+++ b/admin/operatorperformance.php
@@ -1,5 +1,4 @@
-<?php
-/**
+<?php /**
  * Display operator performance
  *
  *
diff --git a/admin/operatorquestionnaire.php b/admin/operatorquestionnaire.php
index 85b611a7..36d99cb1 100644
--- a/admin/operatorquestionnaire.php
+++ b/admin/operatorquestionnaire.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Assign operators to questionnaires in a checkbox matrix
  *
@@ -158,7 +158,7 @@ xhtml_head(T_("Assign operators to questionnaires"),false,array("../css/table.cs
 
 <script type="text/javascript">
 
-<?
+<?php 
 print "questionnaire_id = new Array(";
 
 $s = "";
@@ -241,7 +241,7 @@ function checkVid(v)
 <body>
 
 
-<?
+<?php 
 
 
 
diff --git a/admin/operators.php b/admin/operators.php
index aefdb6a8..26d936d6 100644
--- a/admin/operators.php
+++ b/admin/operators.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Create an operator and link to a webserver username for authentication
  *
@@ -173,8 +173,8 @@ xhtml_head(T_("Add an operator"));
 if ($a)
 {
 ?>
-	<h3><? echo $a; ?></h3>
-<?
+	<h3><?php  echo $a; ?></h3>
+<?php 
 }
 
 $sql = "SELECT Time_zone_name as value, Time_zone_name as description
@@ -183,29 +183,29 @@ $sql = "SELECT Time_zone_name as value, Time_zone_name as description
 $rs = $db->GetAll($sql);
 
 ?>
-<h1><? echo T_("Add an operator"); ?></h1>
-<p><? echo T_("Adding an operator here will give the user the ability to call cases"); ?> <a href="operatorquestionnaire.php"><? echo T_("Assign Operator to Questionnaire"); ?></a> <? echo T_("tool"); ?>.</p>
-<p><? echo T_("Use this form to enter the username of a user based on your directory security system. For example, if you have secured the base directory of queXS using Apache file based security, enter the usernames of the users here."); ?></p>
+<h1><?php  echo T_("Add an operator"); ?></h1>
+<p><?php  echo T_("Adding an operator here will give the user the ability to call cases"); ?> <a href="operatorquestionnaire.php"><?php  echo T_("Assign Operator to Questionnaire"); ?></a> <?php  echo T_("tool"); ?>.</p>
+<p><?php  echo T_("Use this form to enter the username of a user based on your directory security system. For example, if you have secured the base directory of queXS using Apache file based security, enter the usernames of the users here."); ?></p>
 <form enctype="multipart/form-data" action="" method="post">
-	<p><? echo T_("Enter the username of an operator to add:"); ?> <input name="operator" type="text"/></p>
-<? if (HTPASSWD_PATH !== false && HTGROUP_PATH !== false) { ?>
-	<p><? echo T_("Enter the password of an operator to add:"); ?> <input name="password" type="text"/></p>
-<? } ?>
-	<p><? echo T_("Enter the first name of an operator to add:"); ?> <input name="firstname" type="text"/></p>
-	<p><? echo T_("Enter the surname of an operator to add:"); ?> <input name="lastname" type="text"/></p>
-	<p><a href='timezonetemplate.php'><? echo T_("Enter the Time Zone of an operator to add:"); echo "</a>"; display_chooser($rs,"Time_zone_name","Time_zone_name",false,false,false,false,array("value",DEFAULT_TIME_ZONE)); ?> </p>
-<? if (FREEPBX_PATH == false) { ?>
-	<p><? echo T_("Enter the telephone extension number:"); ?> <input name="extension" type="text"/></p>
-	<p><? echo T_("Enter the telephone extension password:"); ?> <input name="extensionp" type="text"/></p>
-<? } ?>
-	<p><? echo T_("Will this operator be using VoIP?"); ?> <input name="voip" type="checkbox" checked="checked"/></p>
-	<p><? echo T_("Is the operator a normal interviewer?"); ?> <input name="temporary" type="checkbox" checked="checked"/></p>
-	<p><? echo T_("Is the operator a supervisor?"); ?> <input name="supervisor" type="checkbox"/></p>
-	<p><? echo T_("Is the operator a refusal converter?"); ?> <input name="refusal" type="checkbox"/></p>
-	<p><input type="submit" value="<? echo T_("Add user"); ?>" /></p>
+	<p><?php  echo T_("Enter the username of an operator to add:"); ?> <input name="operator" type="text"/></p>
+<?php  if (HTPASSWD_PATH !== false && HTGROUP_PATH !== false) { ?>
+	<p><?php  echo T_("Enter the password of an operator to add:"); ?> <input name="password" type="text"/></p>
+<?php  } ?>
+	<p><?php  echo T_("Enter the first name of an operator to add:"); ?> <input name="firstname" type="text"/></p>
+	<p><?php  echo T_("Enter the surname of an operator to add:"); ?> <input name="lastname" type="text"/></p>
+	<p><a href='timezonetemplate.php'><?php  echo T_("Enter the Time Zone of an operator to add:"); echo "</a>"; display_chooser($rs,"Time_zone_name","Time_zone_name",false,false,false,false,array("value",DEFAULT_TIME_ZONE)); ?> </p>
+<?php  if (FREEPBX_PATH == false) { ?>
+	<p><?php  echo T_("Enter the telephone extension number:"); ?> <input name="extension" type="text"/></p>
+	<p><?php  echo T_("Enter the telephone extension password:"); ?> <input name="extensionp" type="text"/></p>
+<?php  } ?>
+	<p><?php  echo T_("Will this operator be using VoIP?"); ?> <input name="voip" type="checkbox" checked="checked"/></p>
+	<p><?php  echo T_("Is the operator a normal interviewer?"); ?> <input name="temporary" type="checkbox" checked="checked"/></p>
+	<p><?php  echo T_("Is the operator a supervisor?"); ?> <input name="supervisor" type="checkbox"/></p>
+	<p><?php  echo T_("Is the operator a refusal converter?"); ?> <input name="refusal" type="checkbox"/></p>
+	<p><input type="submit" value="<?php  echo T_("Add user"); ?>" /></p>
 </form>
 
-<?
+<?php 
 
 xhtml_foot();
 
diff --git a/admin/operatorskill.php b/admin/operatorskill.php
index a7ae84fe..df1c2473 100644
--- a/admin/operatorskill.php
+++ b/admin/operatorskill.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Assign operators to skills in a checkbox matrix
  *
@@ -152,7 +152,7 @@ xhtml_head(T_("Assign operators to Skills"),false,array("../css/table.css"));
 
 <script type="text/javascript">
 
-<?
+<?php 
 print "outcome_type_id = new Array(";
 
 $s = "";
@@ -235,7 +235,7 @@ function checkVid(v)
 <body>
 
 
-<?
+<?php 
 
 
 
diff --git a/admin/outcomes.php b/admin/outcomes.php
index 6bd22057..12990016 100644
--- a/admin/outcomes.php
+++ b/admin/outcomes.php
@@ -1,5 +1,4 @@
-<?php
-/**
+<?php /**
  * Display outcomes by questionnaire
  *
  *
diff --git a/admin/process.php b/admin/process.php
index c6f3e84b..c6da8ad4 100644
--- a/admin/process.php
+++ b/admin/process.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Run the VoIP monitoring process and monitor it via the database
  *
diff --git a/admin/questionnaireavailability.php b/admin/questionnaireavailability.php
index d27cb02a..20550393 100644
--- a/admin/questionnaireavailability.php
+++ b/admin/questionnaireavailability.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Assign availability groups to a questionnaire
  *
@@ -132,8 +132,8 @@ if ($questionnaire_id != false)
 		print "<h2>" . T_("Add an availability group to this questionnaire:") . "</h2>";
 		?>
 		<form action="" method="get">
-		<p><label for="availability_group"><? echo T_("Select availability group:"); ?></label><select name="availability_group" id="availability_group">
-		<?
+		<p><label for="availability_group"><?php  echo T_("Select availability group:"); ?></label><select name="availability_group" id="availability_group">
+		<?php 
 	
 		foreach($qs as $q)
 		{
@@ -142,10 +142,10 @@ if ($questionnaire_id != false)
 	
 		?>
 		</select><br/>
-		<input type="hidden" name="questionnaire_id" value="<? print($questionnaire_id); ?>"/>
+		<input type="hidden" name="questionnaire_id" value="<?php  print($questionnaire_id); ?>"/>
 		<input type="submit" name="add_availability" value="Add availability group"/></p>
 		</form>
-		<?
+		<?php 
 	}
 }
 xhtml_foot();
diff --git a/admin/questionnairelist.php b/admin/questionnairelist.php
index c970c25b..f90ebdd4 100644
--- a/admin/questionnairelist.php
+++ b/admin/questionnairelist.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Manage questionnaires by editing them or disabling/enabling them
  *
@@ -160,22 +160,22 @@ if (isset($_GET['modify']))
 	echo "<p><a href='?'>" . T_("Go back") . "</a></p>";
 	echo "<p><a href='" . LIME_URL . "admin/admin.php?sid={$rs['lime_sid']}'>" . T_("Edit instrument in Limesurvey") . "</a></p>";
 	?>
-		<form action="?modify=<? echo $questionnaire_id; ?>" method="post">
-		<p><? echo T_("Name for questionnaire:"); ?> <input type="text" name="description" value="<? echo $rs['description']; ?>"/></p>
-		<p><? echo T_("Restrict appointments to shifts?"); ?> <input name="ras" type="checkbox" <? echo $ras; ?>/></p>
-		<p><? echo T_("Restrict work to shifts?"); ?> <input name="rws" type="checkbox" <? echo $rws; ?>/></p>
-		<p><? echo T_("Questionnaire for testing only?"); ?> <input name="testing" type="checkbox" disabled="true" <? echo $testing; ?>/></p>
-		<? if ($rs['respondent_selection'] == 1 && empty($rs['lime_rs_sid'])) { ?>
-		<p><? echo T_("Respondent selection introduction:"); echo $CKEditor->editor("rs_intro",$rs['rs_intro'],$ckeditorConfig);?></p>
-		<p><? echo T_("Respondent selection project introduction:"); echo $CKEditor->editor("rs_project_intro",$rs['rs_project_intro'],$ckeditorConfig);?></p>
-		<p><? echo T_("Respondent selection callback (already started questionnaire):"); echo $CKEditor->editor("rs_callback",$rs['rs_callback'],$ckeditorConfig);?> </p>
-		<p><? echo T_("Message to leave on an answering machine:"); echo $CKEditor->editor("rs_answeringmachine",$rs['rs_answeringmachine'],$ckeditorConfig);?> </p>
-		<? } else if (!empty($rs['lime_rs_sid'])) { echo "<p><a href='" . LIME_URL . "admin/admin.php?sid={$rs['lime_rs_sid']}'>" . T_("Edit respondent selection instrument in Limesurvey") . "</a></p>"; } ?>
-		<p><? echo T_("Project end text (thank you screen):");echo $CKEditor->editor("rs_project_end",$rs['rs_project_end'],$ckeditorConfig); ?></p>
-		<p><? echo T_("Project information for interviewers/operators:");echo $CKEditor->editor("info",$rs['info'],$ckeditorConfig); ?></p>
-		<p><input type="submit" name="update" value="<? echo T_("Update Questionnaire"); ?>"/></p>
+		<form action="?modify=<?php  echo $questionnaire_id; ?>" method="post">
+		<p><?php  echo T_("Name for questionnaire:"); ?> <input type="text" name="description" value="<?php  echo $rs['description']; ?>"/></p>
+		<p><?php  echo T_("Restrict appointments to shifts?"); ?> <input name="ras" type="checkbox" <?php  echo $ras; ?>/></p>
+		<p><?php  echo T_("Restrict work to shifts?"); ?> <input name="rws" type="checkbox" <?php  echo $rws; ?>/></p>
+		<p><?php  echo T_("Questionnaire for testing only?"); ?> <input name="testing" type="checkbox" disabled="true" <?php  echo $testing; ?>/></p>
+		<?php  if ($rs['respondent_selection'] == 1 && empty($rs['lime_rs_sid'])) { ?>
+		<p><?php  echo T_("Respondent selection introduction:"); echo $CKEditor->editor("rs_intro",$rs['rs_intro'],$ckeditorConfig);?></p>
+		<p><?php  echo T_("Respondent selection project introduction:"); echo $CKEditor->editor("rs_project_intro",$rs['rs_project_intro'],$ckeditorConfig);?></p>
+		<p><?php  echo T_("Respondent selection callback (already started questionnaire):"); echo $CKEditor->editor("rs_callback",$rs['rs_callback'],$ckeditorConfig);?> </p>
+		<p><?php  echo T_("Message to leave on an answering machine:"); echo $CKEditor->editor("rs_answeringmachine",$rs['rs_answeringmachine'],$ckeditorConfig);?> </p>
+		<?php  } else if (!empty($rs['lime_rs_sid'])) { echo "<p><a href='" . LIME_URL . "admin/admin.php?sid={$rs['lime_rs_sid']}'>" . T_("Edit respondent selection instrument in Limesurvey") . "</a></p>"; } ?>
+		<p><?php  echo T_("Project end text (thank you screen):");echo $CKEditor->editor("rs_project_end",$rs['rs_project_end'],$ckeditorConfig); ?></p>
+		<p><?php  echo T_("Project information for interviewers/operators:");echo $CKEditor->editor("info",$rs['info'],$ckeditorConfig); ?></p>
+		<p><input type="submit" name="update" value="<?php  echo T_("Update Questionnaire"); ?>"/></p>
 		</form>
-	<?
+	<?php 
 	
 }
 else
diff --git a/admin/questionnaireprefill.php b/admin/questionnaireprefill.php
index bc1542d4..58e6a7d1 100644
--- a/admin/questionnaireprefill.php
+++ b/admin/questionnaireprefill.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Select and set questions to pre fill in the questionnaire
  *
@@ -171,16 +171,16 @@ if ($questionnaire_id != false)
 		?>
 		<form action="" method="get">
 		<p>
-		<label for="value"><? echo T_("The value to pre fill"); ?> </label><input type="text" name="value" id="value"/>		<br/>
-		<label for="svar"><? echo T_("or: Select pre fill from sample list"); ?> </label>
-<?	//display a list of possible sample variables for this questionnaire
+		<label for="value"><?php  echo T_("The value to pre fill"); ?> </label><input type="text" name="value" id="value"/>		<br/>
+		<label for="svar"><?php  echo T_("or: Select pre fill from sample list"); ?> </label>
+<?php 	//display a list of possible sample variables for this questionnaire
 		display_chooser($db->GetAll($sql),"svar","svar",true,false,false,false,false);
 ?>		<br/>
-	<input type="hidden" name="questionnaire_id" value="<? print($questionnaire_id); ?>"/>
-		<input type="hidden" name="sgqa" value="<? print($sgqa); ?>"/>
-		<input type="submit" name="add_prefill" value="<? print(T_("Add pre fill")); ?>"/></p>
+	<input type="hidden" name="questionnaire_id" value="<?php  print($questionnaire_id); ?>"/>
+		<input type="hidden" name="sgqa" value="<?php  print($sgqa); ?>"/>
+		<input type="submit" name="add_prefill" value="<?php  print(T_("Add pre fill")); ?>"/></p>
 		</form>
-		<?
+		<?php 
 	}
 }
 xhtml_foot();
diff --git a/admin/quota.php b/admin/quota.php
index caadc0d8..b30fc85b 100755
--- a/admin/quota.php
+++ b/admin/quota.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Set quota's for answered questions 
  *
@@ -210,15 +210,15 @@ if ($questionnaire_id != false)
 			?>
 			<form action="" method="get">
 			<p>
-			<label for="value"><? echo T_("The code value to compare"); ?> </label><input type="text" name="value" id="value"/>		<br/>
-			<label for="comparison"><? echo T_("The type of comparison"); ?></label><select name="comparison" id="comparison"><option value="LIKE">LIKE</option><option value="NOT LIKE">NOT LIKE</option><option value="=">=</option><option value="!=">!=</option><option value="&lt;">&lt;</option><option value="&gt;">&gt;</option><option value="&lt;=">&lt;=</option><option value="&gt;=">&gt;=</option></select><br/>
-			<label for="completions"><? echo T_("The number of completions to stop calling at"); ?> </label><input type="text" name="completions" id="completions"/>		<br/>
-			<input type="hidden" name="questionnaire_id" value="<? print($questionnaire_id); ?>"/>
-			<input type="hidden" name="sample_import_id" value="<? print($sample_import_id); ?>"/>
-			<input type="hidden" name="sgqa" value="<? print($sgqa); ?>"/>
-			<input type="submit" name="add_quota" value="<? print(T_("Add quota")); ?>"/></p>
+			<label for="value"><?php  echo T_("The code value to compare"); ?> </label><input type="text" name="value" id="value"/>		<br/>
+			<label for="comparison"><?php  echo T_("The type of comparison"); ?></label><select name="comparison" id="comparison"><option value="LIKE">LIKE</option><option value="NOT LIKE">NOT LIKE</option><option value="=">=</option><option value="!=">!=</option><option value="&lt;">&lt;</option><option value="&gt;">&gt;</option><option value="&lt;=">&lt;=</option><option value="&gt;=">&gt;=</option></select><br/>
+			<label for="completions"><?php  echo T_("The number of completions to stop calling at"); ?> </label><input type="text" name="completions" id="completions"/>		<br/>
+			<input type="hidden" name="questionnaire_id" value="<?php  print($questionnaire_id); ?>"/>
+			<input type="hidden" name="sample_import_id" value="<?php  print($sample_import_id); ?>"/>
+			<input type="hidden" name="sgqa" value="<?php  print($sgqa); ?>"/>
+			<input type="submit" name="add_quota" value="<?php  print(T_("Add quota")); ?>"/></p>
 			</form>
-			<?
+			<?php 
 		}
 	}
 }
diff --git a/admin/quotareport.php b/admin/quotareport.php
index 0cd2a27b..358b22df 100644
--- a/admin/quotareport.php
+++ b/admin/quotareport.php
@@ -1,5 +1,4 @@
-<?php
-/**
+<?php /**
  * Display a report of all quota's
  * a. (Standard quota) Monitor outcomes of questions in completed questionnaires, and exclude selected sample records when completion limit is reached
  * b. (Replicate quota) Exclude selected sample records 
diff --git a/admin/quotarow.php b/admin/quotarow.php
index 6d04510d..93f056b7 100755
--- a/admin/quotarow.php
+++ b/admin/quotarow.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Set quota's for answered questions and be able to exclude sample records by row 
  * instead of an entire sample
@@ -297,24 +297,24 @@ if ($questionnaire_id != false)
 				?>
 				<form action="" method="get">
 				<p>
-				<label for="description"><? echo T_("Describe this quota"); ?> </label><input type="text" name="description" id="description"/>		<br/>
-				<label for="priority"><? echo T_("Quota priority (50 is default, 100 highest, 0 lowest)"); ?> </label><input type="text" name="priority" id="priority" value="50"/>		<br/>
-				<label for="autoprioritise"><? echo T_("Should the priority be automatically updated based on the number of completions in this quota?"); ?> </label><input type="checkbox" name="autoprioritise" id="autoprioritise"/>		<br/>
-				<? if ($sgqa != -1) { if ($sgqa != -2) { ?>
-				<label for="value"><? echo T_("The code value to compare"); ?> </label><input type="text" name="value" id="value"/>		<br/>
-				<label for="comparison"><? echo T_("The type of comparison"); ?></label><select name="comparison" id="comparison"><option value="LIKE">LIKE</option><option value="NOT LIKE">NOT LIKE</option><option value="=">=</option><option value="!=">!=</option><option value="&lt;">&lt;</option><option value="&gt;">&gt;</option><option value="&lt;=">&lt;=</option><option value="&gt;=">&gt;=</option></select><br/>
-				<? } else { ?>
+				<label for="description"><?php  echo T_("Describe this quota"); ?> </label><input type="text" name="description" id="description"/>		<br/>
+				<label for="priority"><?php  echo T_("Quota priority (50 is default, 100 highest, 0 lowest)"); ?> </label><input type="text" name="priority" id="priority" value="50"/>		<br/>
+				<label for="autoprioritise"><?php  echo T_("Should the priority be automatically updated based on the number of completions in this quota?"); ?> </label><input type="checkbox" name="autoprioritise" id="autoprioritise"/>		<br/>
+				<?php  if ($sgqa != -1) { if ($sgqa != -2) { ?>
+				<label for="value"><?php  echo T_("The code value to compare"); ?> </label><input type="text" name="value" id="value"/>		<br/>
+				<label for="comparison"><?php  echo T_("The type of comparison"); ?></label><select name="comparison" id="comparison"><option value="LIKE">LIKE</option><option value="NOT LIKE">NOT LIKE</option><option value="=">=</option><option value="!=">!=</option><option value="&lt;">&lt;</option><option value="&gt;">&gt;</option><option value="&lt;=">&lt;=</option><option value="&gt;=">&gt;=</option></select><br/>
+				<?php  } else { ?>
 				<input type="hidden" name="value" value="-2"/>
 				<input type="hidden" name="comparison" value="-2"/>
-				<? } ?>
-				<label for="completions"><? echo T_("The number of completions to stop calling at"); ?> </label><input type="text" name="completions" id="completions"/>		<br/>
-				<? } else { ?>
+				<?php  } ?>
+				<label for="completions"><?php  echo T_("The number of completions to stop calling at"); ?> </label><input type="text" name="completions" id="completions"/>		<br/>
+				<?php  } else { ?>
 				<input type="hidden" name="value" value="-1"/>
 				<input type="hidden" name="comparison" value="-1"/>
 				<input type="hidden" name="completions" value="-1"/>
-				<? } ?>
-				<label for="exclude_val"><? echo T_("Exclude from the sample where the value is like"); ?></label>
-				<?
+				<?php  } ?>
+				<label for="exclude_val"><?php  echo T_("Exclude from the sample where the value is like"); ?></label>
+				<?php 
 				
 				$sql = "SELECT sv.val as value, sv.val as description, ''  AS selected
 					FROM sample_var AS sv, sample AS s
@@ -327,13 +327,13 @@ if ($questionnaire_id != false)
 				flush();
 				?>
 				<br/>
-				<input type="hidden" name="exclude_var" value="<? print($sample_var); ?>"/>
-				<input type="hidden" name="questionnaire_id" value="<? print($questionnaire_id); ?>"/>
-				<input type="hidden" name="sample_import_id" value="<? print($sample_import_id); ?>"/>
-				<input type="hidden" name="sgqa" value="<? print($sgqa); ?>"/>
-				<input type="submit" name="add_quota" value="<? print(T_("Add row quota")); ?>"/></p>
+				<input type="hidden" name="exclude_var" value="<?php  print($sample_var); ?>"/>
+				<input type="hidden" name="questionnaire_id" value="<?php  print($questionnaire_id); ?>"/>
+				<input type="hidden" name="sample_import_id" value="<?php  print($sample_import_id); ?>"/>
+				<input type="hidden" name="sgqa" value="<?php  print($sgqa); ?>"/>
+				<input type="submit" name="add_quota" value="<?php  print(T_("Add row quota")); ?>"/></p>
 				</form>
-				<?
+				<?php 
 			}
 		}
 	}
diff --git a/admin/samplecallattempts.php b/admin/samplecallattempts.php
index 75a82a3a..60b6e838 100644
--- a/admin/samplecallattempts.php
+++ b/admin/samplecallattempts.php
@@ -1,5 +1,4 @@
-<?php
-/**
+<?php /**
  * Display sample call attempt report (A listing of how many attempts made for cases within a sample)
  *
  *
diff --git a/admin/samplesearch.php b/admin/samplesearch.php
index 79d550ef..37e9fddb 100644
--- a/admin/samplesearch.php
+++ b/admin/samplesearch.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Select and search within a sample to see what case(s) is/are assigned to a sample record
  * and if so to look at them, otherwise give the option to remove a sample record
@@ -153,12 +153,12 @@ if ($sample_import_id != false)
 	?>
 	<form action="" method="get">
 	<p>
-		<label for="search"><? echo T_("Search for:"); ?></label><input type="text" name="search" id="search"/><br/>
-		<input type="hidden" name="sample_import_id" value="<? print($sample_import_id); ?>"/>
-		<input type="submit" name="searchsub" value="<? echo T_("Start search"); ?>"/>
+		<label for="search"><?php  echo T_("Search for:"); ?></label><input type="text" name="search" id="search"/><br/>
+		<input type="hidden" name="sample_import_id" value="<?php  print($sample_import_id); ?>"/>
+		<input type="submit" name="searchsub" value="<?php  echo T_("Start search"); ?>"/>
 	</p>
 	</form>
-	<?
+	<?php 
 }
 xhtml_foot();
 
diff --git a/admin/shiftreport.php b/admin/shiftreport.php
index 060f5c6b..2146cabb 100644
--- a/admin/shiftreport.php
+++ b/admin/shiftreport.php
@@ -1,5 +1,4 @@
-<?php
-/**
+<?php /**
  * List and edit reports on shifts
  *
  *
diff --git a/admin/shifttemplate.php b/admin/shifttemplate.php
index 6b77efa2..8c7eca1b 100644
--- a/admin/shifttemplate.php
+++ b/admin/shifttemplate.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Modify the standard shift template
  *
@@ -114,7 +114,7 @@ translate_array($daysofweek,array("description"));
 ?>
 	<form method="post" action="">
 	<table>
-<?
+<?php 
 	print "<tr><th>" . T_("Day") . "</th><th>" . T_("Start") . "</th><th>" . T_("End") . "</th></tr>";
 	$count = 0;
 	foreach($shifts as $shift)
@@ -131,10 +131,10 @@ translate_array($daysofweek,array("description"));
 
 ?>
 	</table>
-	<div><a onclick="addRow(); return false;" href="#"><? echo T_("Add row"); ?></a></div>
-	<p><input type="submit" name="submit" value="<? echo T_("Save changes to shifts"); ?>"/></p>
+	<div><a onclick="addRow(); return false;" href="#"><?php  echo T_("Add row"); ?></a></div>
+	<p><input type="submit" name="submit" value="<?php  echo T_("Save changes to shifts"); ?>"/></p>
 	</form>
-<?
+<?php 
 	
 
 xhtml_foot();
diff --git a/admin/supervisor.php b/admin/supervisor.php
index da66fcad..7ced9ad5 100644
--- a/admin/supervisor.php
+++ b/admin/supervisor.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * View cases referred to the supervisor and add notes/assign outcomes
  *
@@ -105,10 +105,10 @@ if (!empty($rs))
 ?>
 <form action="" method="get">
 <p>
-<label for="case_id"><? echo T_("Case id:"); ?> </label><input type="text" name="case_id" id="case_id" value="<? echo $case_id; ?>"/>
-<input type="submit" name="case_form" value="<? echo T_("Select case"); ?>"/></p>
+<label for="case_id"><?php  echo T_("Case id:"); ?> </label><input type="text" name="case_id" id="case_id" value="<?php  echo $case_id; ?>"/>
+<input type="submit" name="case_form" value="<?php  echo T_("Select case"); ?>"/></p>
 </form>
-<?
+<?php 
 
 if (isset($_GET['call_id']))
 {
@@ -127,7 +127,7 @@ if (isset($_GET['call_id']))
 	
 		?>
 		<form method="get" action="?">
-		<?              
+		<?php               
 			$sql = "SELECT o.outcome_id as value,description, CASE WHEN o.outcome_id = c.outcome_id THEN 'selected=\'selected\'' ELSE '' END AS selected
 				FROM outcome as o, `call` as c
 				WHERE c.call_id = '$call_id'";
@@ -136,9 +136,9 @@ if (isset($_GET['call_id']))
 			translate_array($rs2,array("description"));
 			display_chooser($rs2, "set_outcome_id", "set_outcome_id",true,false,false);
 		?>
-		<p><input type="hidden" name="call_id" value="<? echo $call_id;?>"/><input type="hidden" name="case_id" value="<? echo $case_id;?>"/><input class="submitclass" type="submit" name="submit" value="<? echo T_("Set outcome"); ?>"/></p>
+		<p><input type="hidden" name="call_id" value="<?php  echo $call_id;?>"/><input type="hidden" name="case_id" value="<?php  echo $case_id;?>"/><input class="submitclass" type="submit" name="submit" value="<?php  echo T_("Set outcome"); ?>"/></p>
 		</form>
-		<?
+		<?php 
 	}
 }
 if ($case_id != false)
@@ -289,10 +289,10 @@ if ($case_id != false)
 		?>
 		<form method="get" action="?">
 			<p>
-			<input type="hidden" name="case_id" value="<? echo $case_id;?>"/><input type="text" class="textclass" name="note" id="note"/><input class="submitclass" type="submit" name="submit" value="<? echo T_("Add note"); ?>"/>
+			<input type="hidden" name="case_id" value="<?php  echo $case_id;?>"/><input type="text" class="textclass" name="note" id="note"/><input class="submitclass" type="submit" name="submit" value="<?php  echo T_("Add note"); ?>"/>
 			</p>
 		</form>
-		<?
+		<?php 
 		
 		//Modify the case in Limesurvey
 
@@ -309,7 +309,7 @@ if ($case_id != false)
 
 		?>
 		<form method="get" action="?">
-		<?              
+		<?php               
 			$sql = "SELECT outcome_id as value,description, CASE WHEN outcome_id = '$current_outcome_id' THEN 'selected=\'selected\'' ELSE '' END AS selected
 				FROM outcome";
 	
@@ -318,9 +318,9 @@ if ($case_id != false)
 			display_chooser($rs2, "outcome_id", "outcome_id",true,false,false);
 	
 		?>
-		<p><input type="hidden" name="case_id" value="<? echo $case_id;?>"/><input class="submitclass" type="submit" name="submit" value="<? echo T_("Set outcome"); ?>"/></p>
+		<p><input type="hidden" name="case_id" value="<?php  echo $case_id;?>"/><input class="submitclass" type="submit" name="submit" value="<?php  echo T_("Set outcome"); ?>"/></p>
 		</form>
-		<?
+		<?php 
 
 		//view availability
 		if (is_using_availability($case_id))
@@ -355,9 +355,9 @@ if ($case_id != false)
 			
 			}
 			?>
-			<p><input type="hidden" name="case_id" value="<? echo $case_id;?>"/><input class="submitclass" type="submit" name="submitag" value="<? echo T_("Update case availability"); ?>"/></p>
+			<p><input type="hidden" name="case_id" value="<?php  echo $case_id;?>"/><input class="submitclass" type="submit" name="submitag" value="<?php  echo T_("Update case availability"); ?>"/></p>
 			</form>
-			<?
+			<?php 
 		}
 		else
 		{
@@ -370,7 +370,7 @@ if ($case_id != false)
 		print "<h3>" . T_("Assign this case to operator (will appear as next case for them)") . "</h3>";
 		?>
 		<form method="get" action="?">
-		<?              
+		<?php               
 			$sql = "SELECT operator_id as value,CONCAT(firstName,' ', lastName) as description, CASE WHEN next_case_id = '$case_id' THEN 'selected=\'selected\'' ELSE '' END AS selected
 				FROM operator
 				WHERE enabled = 1";
@@ -379,9 +379,9 @@ if ($case_id != false)
 			display_chooser($rs3, "operator_id", "operator_id",true,false,false);
 	
 		?>
-		<p><input type="hidden" name="case_id" value="<? echo $case_id;?>"/><input class="submitclass" type="submit" name="submit" value="<? echo T_("Assign this case to operator"); ?>"/></p>
+		<p><input type="hidden" name="case_id" value="<?php  echo $case_id;?>"/><input class="submitclass" type="submit" name="submit" value="<?php  echo T_("Assign this case to operator"); ?>"/></p>
 		</form>
-		<?
+		<?php 
 
 	
 	}
diff --git a/admin/systemsort.php b/admin/systemsort.php
index 27bbcbfc..2542768e 100644
--- a/admin/systemsort.php
+++ b/admin/systemsort.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Run the system wide case sorting process and monitor it's progress
  *
diff --git a/admin/systemsortprocess.php b/admin/systemsortprocess.php
index da575052..ae93d4b5 100644
--- a/admin/systemsortprocess.php
+++ b/admin/systemsortprocess.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Run the system wide case sorting process
  *
diff --git a/admin/timezonetemplate.php b/admin/timezonetemplate.php
index c9255415..2cd472be 100644
--- a/admin/timezonetemplate.php
+++ b/admin/timezonetemplate.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Modify the default timezones
  *
@@ -113,10 +113,10 @@ foreach($qs as $q)
 print "<h1>" . T_("Add a Timezone:") . "</h1>";
 		?>
 		<form action="" method="get"><p>
-		<label for="time_zone"><? echo T_("Timezone: "); ?></label><? display_chooser($tzl, 'time_zone', 'time_zone', false,  false, false, false, false); ?>
-		<input type="submit" name="add_timezone" value="<? echo T_("Add Timezone"); ?>"/></p>
+		<label for="time_zone"><?php  echo T_("Timezone: "); ?></label><?php  display_chooser($tzl, 'time_zone', 'time_zone', false,  false, false, false, false); ?>
+		<input type="submit" name="add_timezone" value="<?php  echo T_("Add Timezone"); ?>"/></p>
 		</form>
-		<?
+		<?php 
 xhtml_foot();
 
 
diff --git a/admin/voipmonitor.php b/admin/voipmonitor.php
index a0fdcf89..5bd29192 100644
--- a/admin/voipmonitor.php
+++ b/admin/voipmonitor.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Run the VoIP monitoring process and monitor it via the database
  *
diff --git a/client/index.php b/client/index.php
index 626f055c..ce8d4ccb 100644
--- a/client/index.php
+++ b/client/index.php
@@ -1,5 +1,4 @@
-<?php
-/**
+<?php /**
  * Display outcomes for each questionnaire assigned to this client
  *
  *
diff --git a/functions/functions.aapor.php b/functions/functions.aapor.php
index 2975d8b5..3286d311 100644
--- a/functions/functions.aapor.php
+++ b/functions/functions.aapor.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Functions to calculate AAPOR outcomes based on Standard Definitions here:
  *
diff --git a/functions/functions.calendar.php b/functions/functions.calendar.php
index be921984..488e21e2 100644
--- a/functions/functions.calendar.php
+++ b/functions/functions.calendar.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Functions relating to appointment times and calendars
  *
@@ -495,8 +495,7 @@ function display_calendar($respondent_id, $questionnaire_id, $year = false, $mon
 	<th>S</th>
 	<th>S</th>
 	</tr>
-<?php
-
+<?php 
 
 	while ( $Day = $Month->fetch() ) {
 
@@ -564,7 +563,7 @@ function display_calendar($respondent_id, $questionnaire_id, $year = false, $mon
 	</td>
 	</tr>
 	</table>
-	<?
+	<?php 
 	print "<div>" . date('l j F Y',mktime(0,0,0,$month,$day,$year)) . "</div>";
 }
 
diff --git a/functions/functions.client.php b/functions/functions.client.php
index 6eff5078..d1ec7479 100644
--- a/functions/functions.client.php
+++ b/functions/functions.client.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Client functions
  *
diff --git a/functions/functions.display.php b/functions/functions.display.php
index c8f1ec51..e78a338f 100644
--- a/functions/functions.display.php
+++ b/functions/functions.display.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Functions relating to displaying for XHTML
  *
diff --git a/functions/functions.freepbx.php b/functions/functions.freepbx.php
index 22ec5839..cdc63044 100644
--- a/functions/functions.freepbx.php
+++ b/functions/functions.freepbx.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * FreePBX Functions
  *
diff --git a/functions/functions.htpasswd.php b/functions/functions.htpasswd.php
index 328d75ba..0aebfb74 100644
--- a/functions/functions.htpasswd.php
+++ b/functions/functions.htpasswd.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * htpasswd/htgroup functions for authentication integration
  *
diff --git a/functions/functions.import.php b/functions/functions.import.php
index c814a460..e32475b1 100644
--- a/functions/functions.import.php
+++ b/functions/functions.import.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Functions relating to importing a sample file (from CSV)
  *
diff --git a/functions/functions.input.php b/functions/functions.input.php
index 974d1ece..57fcf1d0 100644
--- a/functions/functions.input.php
+++ b/functions/functions.input.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Input conversion functions
  *
diff --git a/functions/functions.limesurvey.php b/functions/functions.limesurvey.php
index adf33a9b..48bd5d92 100644
--- a/functions/functions.limesurvey.php
+++ b/functions/functions.limesurvey.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 
 /**
  * Functions relating to integration with {@link http://www.limesurvey.org/ LimeSurvey}
diff --git a/functions/functions.operator.php b/functions/functions.operator.php
index 8f7c10de..23c7bbd9 100644
--- a/functions/functions.operator.php
+++ b/functions/functions.operator.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Operator functions for interacting with the database and getting/storing state
  *
diff --git a/functions/functions.performance.php b/functions/functions.performance.php
index b75a2080..12bb062a 100644
--- a/functions/functions.performance.php
+++ b/functions/functions.performance.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Functions that display data about the project
  *
diff --git a/functions/functions.process.php b/functions/functions.process.php
index 325c2ad5..0e451bdb 100644
--- a/functions/functions.process.php
+++ b/functions/functions.process.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Functions related to the backgrounding of processes and the process table in the database
  *
diff --git a/functions/functions.template.php b/functions/functions.template.php
index bd51f8b8..3c4d9e7c 100644
--- a/functions/functions.template.php
+++ b/functions/functions.template.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Template of functions
  *
diff --git a/functions/functions.voip.php b/functions/functions.voip.php
index 50f1df64..029574c6 100644
--- a/functions/functions.voip.php
+++ b/functions/functions.voip.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Functions to interact with Asterisk
  *      Some examples taken from {@link http://www.voip-info.org/wiki/index.php?page=Asterisk+manager+Example%3A+PHP voip-info.org}
diff --git a/functions/functions.xhtml.php b/functions/functions.xhtml.php
index c9d91281..77fbffb0 100644
--- a/functions/functions.xhtml.php
+++ b/functions/functions.xhtml.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Functions related to XHTML code generation
  *
@@ -50,8 +50,8 @@ print "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
 	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" 
 	   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 	<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-	<head><title><? if (empty($title)) print "queXS"; else print "queXS: $title"; ?></title>
-<?
+	<head><title><?php  if (empty($title)) print "queXS"; else print "queXS: $title"; ?></title>
+<?php 
 	if ($css)
 		foreach ($css as $c) print "<link rel='stylesheet' href='$c' type='text/css'></link>";
 	if ($javascript)
@@ -67,7 +67,7 @@ print "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
 	if (!$body) return;
 ?>
 	</head>
-<?
+<?php 
 	if ($bodytext) print "<body $bodytext>"; else print "<body>";
 }
 
@@ -83,7 +83,7 @@ function xhtml_foot()
 	</body>
 	</html>
 
-<?
+<?php 
 }
 
 /**