From ec5c6fa8337a1610f73dc2facf15393693068b6b Mon Sep 17 00:00:00 2001
From: Adam Zammit <adam.zammit@acspri.org.au>
Date: Thu, 24 Jan 2013 15:32:30 +1100
Subject: [PATCH] Replaced short tags with long ones

---
 appointment.php                    |  48 +++++------
 appointmentlist.php                |   2 +-
 availability.php                   |   2 +-
 call.php                           |   2 +-
 call_interface2.php                |   2 +-
 callhistory.php                    |   2 +-
 calllist.php                       |   2 +-
 casenote.php                       |   8 +-
 config.default.php                 |   2 +-
 config.inc.local.php.example       |   2 +-
 config.inc.php                     |   2 +-
 contactdetails.php                 |  10 +--
 db.inc.php                         |   2 +-
 endwork.php                        |   2 +-
 index.php                          | 124 ++++++++++++++---------------
 index_interface2.php               | 106 ++++++++++++------------
 info.php                           |   2 +-
 lang.inc.php                       |   2 +-
 nocallavailable.php                |   6 +-
 nocaseavailable.php                |  30 +++----
 performance.php                    |   2 +-
 project_info.php                   |   2 +-
 record.php                         |   2 +-
 respondent.php                     |  10 +--
 rs_answeringmachine.php            |  16 ++--
 rs_answeringmachine_interface2.php |  16 ++--
 rs_business.php                    |  10 +--
 rs_business_interface2.php         |  10 +--
 rs_callback.php                    |  10 +--
 rs_callback_interface2.php         |  10 +--
 rs_intro.php                       |  38 ++++-----
 rs_intro_interface2.php            |  38 ++++-----
 rs_project_end.php                 |   6 +-
 rs_project_end_interface2.php      |   6 +-
 rs_project_intro.php               |  14 ++--
 rs_project_intro_interface2.php    |  14 ++--
 rs_quota_end.php                   |  10 +--
 shifts.php                         |   2 +-
 status.php                         |   2 +-
 status_interface2.php              |   2 +-
 supervisor.php                     |   2 +-
 waitnextcase_interface2.php        |   8 +-
 42 files changed, 294 insertions(+), 294 deletions(-)

diff --git a/appointment.php b/appointment.php
index 510e0651..9118def4 100644
--- a/appointment.php
+++ b/appointment.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Create an appointment for the currently assigned case
  *
@@ -129,12 +129,12 @@ if(isset($_GET['respondent_id']) && $_GET['respondent_id'] == 0)
 {
 	//ability to create a new one
 	?>
-	<p><? echo T_("Create new respondent:"); ?></p>
+	<p><?php  echo T_("Create new respondent:"); ?></p>
 	<form id="addRespondent" method="post" action="">
-	<? display_respondent_form(); ?>
-	<p><input type="submit" value="<? echo T_("Add this respondent"); ?>"/></p>
+	<?php  display_respondent_form(); ?>
+	<p><input type="submit" value="<?php  echo T_("Add this respondent"); ?>"/></p>
 	</form>
-	<?
+	<?php 
 }
 else if(isset($_GET['respondent_id']))
 {
@@ -179,18 +179,18 @@ else if(isset($_GET['respondent_id']))
 				{
 					//ability to add a new one
 					?>
-					<p><? echo T_("Add new phone number (with area code, eg 0398761234):"); ?></p>
+					<p><?php  echo T_("Add new phone number (with area code, eg 0398761234):"); ?></p>
 					<form id="addPhone" method="get" action="">
 					<p><input type="text" name="phonenum"/></p>
-					<p><input type="submit" value="<? echo T_("Add this phone number"); ?>"/>
-					<input type="hidden" name="start" value="<? print $_GET['start']; ?>"/>
-					<input type="hidden" name="end" value="<? print $_GET['end']; ?>"/>
-					<input type="hidden" name="d" value="<? print $day; ?>"/>
-					<input type="hidden" name="m" value="<? print $month; ?>"/>
-					<input type="hidden" name="y" value="<? print $year; ?>"/>
-					<input type="hidden" name="respondent_id" value="<? print $respondent_id; ?>"/></p>
+					<p><input type="submit" value="<?php  echo T_("Add this phone number"); ?>"/>
+					<input type="hidden" name="start" value="<?php  print $_GET['start']; ?>"/>
+					<input type="hidden" name="end" value="<?php  print $_GET['end']; ?>"/>
+					<input type="hidden" name="d" value="<?php  print $day; ?>"/>
+					<input type="hidden" name="m" value="<?php  print $month; ?>"/>
+					<input type="hidden" name="y" value="<?php  print $year; ?>"/>
+					<input type="hidden" name="respondent_id" value="<?php  print $respondent_id; ?>"/></p>
 					</form>
-					<?
+					<?php 
 				}
 				else
 				{
@@ -201,20 +201,20 @@ else if(isset($_GET['respondent_id']))
 					}
 	
 					?>
-					<p><? echo T_("Appointment:"); ?></p>
+					<p><?php  echo T_("Appointment:"); ?></p>
 					<form id="appointment" method="post" action="">
-					<? print "<p>" . T_("Accept appointment from ") .convert_time($_GET['start']).T_(" till ").convert_time($_GET['end']).T_(" on ") . "$day/$month/$year? " . T_("on") . " $phonenum </p>"; ?>
+					<?php  print "<p>" . T_("Accept appointment from ") .convert_time($_GET['start']).T_(" till ").convert_time($_GET['end']).T_(" on ") . "$day/$month/$year? " . T_("on") . " $phonenum </p>"; ?>
 					<p>
-					<input type="hidden" name="start" value="<? print $_GET['start']; ?>"/>
-					<input type="hidden" name="end" value="<? print $_GET['end']; ?>"/>
-					<input type="hidden" name="day" value="<? print $day; ?>"/>
-					<input type="hidden" name="month" value="<? print $month; ?>"/>
-					<input type="hidden" name="year" value="<? print $year; ?>"/>
-					<input type="hidden" name="respondent_id" value="<? print $respondent_id; ?>"/>
-					<input type="hidden" name="contact_phone_id" value="<? print $contact_phone_id; ?>"/>
+					<input type="hidden" name="start" value="<?php  print $_GET['start']; ?>"/>
+					<input type="hidden" name="end" value="<?php  print $_GET['end']; ?>"/>
+					<input type="hidden" name="day" value="<?php  print $day; ?>"/>
+					<input type="hidden" name="month" value="<?php  print $month; ?>"/>
+					<input type="hidden" name="year" value="<?php  print $year; ?>"/>
+					<input type="hidden" name="respondent_id" value="<?php  print $respondent_id; ?>"/>
+					<input type="hidden" name="contact_phone_id" value="<?php  print $contact_phone_id; ?>"/>
 					<input type="submit" value="Make appointment"/></p>
 					</form>
-					<?
+					<?php 
 				}
 			}
 			
diff --git a/appointmentlist.php b/appointmentlist.php
index 9a353039..3cf0becf 100644
--- a/appointmentlist.php
+++ b/appointmentlist.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Display appointments for this case and their outcomes if any
  *
diff --git a/availability.php b/availability.php
index 58a4d406..71172af2 100644
--- a/availability.php
+++ b/availability.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Update case availability
  *
diff --git a/call.php b/call.php
index c9c10bb7..99b8d515 100644
--- a/call.php
+++ b/call.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Popup screen to manage calling and hanging up and assigning outcomes to calls
  *
diff --git a/call_interface2.php b/call_interface2.php
index 3b0f0c96..f31c7866 100644
--- a/call_interface2.php
+++ b/call_interface2.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Popup screen to manage calling and hanging up and assigning outcomes to calls
  *
diff --git a/callhistory.php b/callhistory.php
index b39f30cf..1f352107 100644
--- a/callhistory.php
+++ b/callhistory.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Display a list of calls and outcomes for this operator over time
  *
diff --git a/calllist.php b/calllist.php
index 6b9158e9..418226d9 100644
--- a/calllist.php
+++ b/calllist.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Display a list of calls and outcomes for this case
  *
diff --git a/casenote.php b/casenote.php
index b416de9d..c7f000e2 100644
--- a/casenote.php
+++ b/casenote.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Display notes for this case and the ability to add notes
  *
@@ -63,12 +63,12 @@ if (isset($_GET['add']))
 ?>
 	<form method="post" action="?">
 		<p>
-		<input type="text" class="textclass" name="note" id="note"/><input class="submitclass" type="submit" name="submit" value="<? echo T_("Add note"); ?>"/>
+		<input type="text" class="textclass" name="note" id="note"/><input class="submitclass" type="submit" name="submit" value="<?php  echo T_("Add note"); ?>"/>
 		</p>
 	</form>
-	<p><a href="?"><? echo T_("Go back"); ?></a></p>
+	<p><a href="?"><?php  echo T_("Go back"); ?></a></p>
 
-<?
+<?php 
 }
 else
 {
diff --git a/config.default.php b/config.default.php
index 14f6d13c..6b705325 100644
--- a/config.default.php
+++ b/config.default.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Default Configuration file
  *
diff --git a/config.inc.local.php.example b/config.inc.local.php.example
index ab524fcd..542ab098 100644
--- a/config.inc.local.php.example
+++ b/config.inc.local.php.example
@@ -1,4 +1,4 @@
-<?
+<?php
 /**
  * Configuration file
  *
diff --git a/config.inc.php b/config.inc.php
index fc527272..a913905e 100644
--- a/config.inc.php
+++ b/config.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Configuration file
  *
diff --git a/contactdetails.php b/contactdetails.php
index 914d5e82..cc879074 100644
--- a/contactdetails.php
+++ b/contactdetails.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Display sample details of respondent
  *
@@ -86,12 +86,12 @@ if (isset($_GET['respondent_id']) && $_GET['respondent_id'] == 0)
 {
 ?>
 	<form method="post" action="?">
-	<? display_respondent_form(false,$case_id); ?>
-	<div class="text"><input type='submit' name='submit' id='submit' value='<? echo T_("Add respondent"); ?>'/></div>
+	<?php  display_respondent_form(false,$case_id); ?>
+	<div class="text"><input type='submit' name='submit' id='submit' value='<?php  echo T_("Add respondent"); ?>'/></div>
 	</form>
-	<div><a href="?"><? echo T_("Go back"); ?></a></div>
+	<div><a href="?"><?php  echo T_("Go back"); ?></a></div>
 
-<?
+<?php 
 }
 else
 {
diff --git a/db.inc.php b/db.inc.php
index 86633e91..568c37ba 100644
--- a/db.inc.php
+++ b/db.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Database configuration file
  *
diff --git a/endwork.php b/endwork.php
index c27f01ce..59ab7f20 100644
--- a/endwork.php
+++ b/endwork.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Display the end work screen to the operator
  *
diff --git a/index.php b/index.php
index dd302561..3a5ed9d0 100644
--- a/index.php
+++ b/index.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Display the main page including all panels and tabs
  *
@@ -133,17 +133,17 @@ print $script;
 ?>
 
 <div id="casefunctions" class="header">
-	<div class='box'><a href="javascript:poptastic('call.php?end=end');"><? echo T_("End"); ?></a></div>
-	<div class='box'><a href="javascript:poptastic('appointment.php');"><? echo T_("Appointment"); ?></a></div>
-	<div class='box important'><a href="javascript:poptastic('call.php');"><? echo T_("Call/Hangup"); ?></a></div>
-	<div class='box'><a href="javascript:poptastic('supervisor.php');"><? echo T_("Supervisor"); ?></a></div>
-	<div class='box' id='recbox'><a id='reclink' class='offline' href="javascript:poptastic('record.php?start=start');"><? echo T_("Start REC"); ?></a></div>
-	<? if (HEADER_EXPANDER_MANUAL){ ?> <div class='headerexpand'><img id='headerexpandimage' src='./images/arrow-up-2.png' alt='<? echo T_('Arrow for expanding or contracting'); ?>'/></div> <? } ?>
-	<div class='box'><a href='index.php?'><? echo T_("Restart"); ?></a></div>
+	<div class='box'><a href="javascript:poptastic('call.php?end=end');"><?php  echo T_("End"); ?></a></div>
+	<div class='box'><a href="javascript:poptastic('appointment.php');"><?php  echo T_("Appointment"); ?></a></div>
+	<div class='box important'><a href="javascript:poptastic('call.php');"><?php  echo T_("Call/Hangup"); ?></a></div>
+	<div class='box'><a href="javascript:poptastic('supervisor.php');"><?php  echo T_("Supervisor"); ?></a></div>
+	<div class='box' id='recbox'><a id='reclink' class='offline' href="javascript:poptastic('record.php?start=start');"><?php  echo T_("Start REC"); ?></a></div>
+	<?php  if (HEADER_EXPANDER_MANUAL){ ?> <div class='headerexpand'><img id='headerexpandimage' src='./images/arrow-up-2.png' alt='<?php  echo T_('Arrow for expanding or contracting'); ?>'/></div> <?php  } ?>
+	<div class='box'><a href='index.php?'><?php  echo T_("Restart"); ?></a></div>
 </div>
 
 <div id="content" class="content">
-<? 
+<?php  
 
 $case_id = get_case_id($operator_id,true);
 $ca = get_call_attempt($operator_id,true);
@@ -168,11 +168,11 @@ xhtml_object($data,"main-content");
 </div>
 
 <div id="respondent" class="header">
-<?xhtml_object("respondent.php","main-respondent");?>
+<?php xhtml_object("respondent.php","main-respondent");?>
 </div>
 
 <div id="qstatus" class="header">
-<?xhtml_object("status.php","main-qstatus");?>
+<?php xhtml_object("status.php","main-qstatus");?>
 </div>
 
 
@@ -181,92 +181,92 @@ xhtml_object($data,"main-content");
 
 <div class="tabber" id="tab-main">
 
-<? if (TAB_CASENOTES) { ?>
-     <div class="tabbertab <? if ((DEFAULT_TAB == 'casenotes' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'casenotes' && $appointment)) 
+<?php  if (TAB_CASENOTES) { ?>
+     <div class="tabbertab <?php  if ((DEFAULT_TAB == 'casenotes' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'casenotes' && $appointment)) 
 					print "tabbertabdefault"; ?>">
-	  <h2><? echo T_("Notes"); ?></h2>
-	  <div id="div-casenotes" class="tabberdiv"><?xhtml_object("casenote.php","main-casenotes");?></div>
+	  <h2><?php  echo T_("Notes"); ?></h2>
+	  <div id="div-casenotes" class="tabberdiv"><?php xhtml_object("casenote.php","main-casenotes");?></div>
    </div>
-<? }?>
+<?php  }?>
 
-<? if ($availability) { ?>
-     <div class="tabbertab <? if ((DEFAULT_TAB == 'availability' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'availability' && $appointment)) 
+<?php  if ($availability) { ?>
+     <div class="tabbertab <?php  if ((DEFAULT_TAB == 'availability' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'availability' && $appointment)) 
 					print "tabbertabdefault"; ?>">
-	  <h2><? echo T_("Availability"); ?></h2>
-	  <div id="div-casenotes" class="tabberdiv"><?xhtml_object("availability.php","main-casenotes");?></div>
+	  <h2><?php  echo T_("Availability"); ?></h2>
+	  <div id="div-casenotes" class="tabberdiv"><?php xhtml_object("availability.php","main-casenotes");?></div>
    </div>
-<? }?>
+<?php  }?>
 
 
 
-<? if (TAB_CONTACTDETAILS) { ?>
-     <div class="tabbertab <? if ((DEFAULT_TAB == 'contactdetails' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'contactdetails' && $appointment)) 
+<?php  if (TAB_CONTACTDETAILS) { ?>
+     <div class="tabbertab <?php  if ((DEFAULT_TAB == 'contactdetails' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'contactdetails' && $appointment)) 
 					print "tabbertabdefault"; ?>">
-	  <h2><? echo T_("Contact details"); ?></h2>
-	  <div id="div-contactdetails" class="tabberdiv"><?xhtml_object("contactdetails.php","main-contactdetails");?></div>
+	  <h2><?php  echo T_("Contact details"); ?></h2>
+	  <div id="div-contactdetails" class="tabberdiv"><?php xhtml_object("contactdetails.php","main-contactdetails");?></div>
    </div>
-<? }?>
+<?php  }?>
 
 
-<? if (TAB_CALLLIST) { ?>
-     <div class="tabbertab <? if ((DEFAULT_TAB == 'calllist' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'calllist' && $appointment)) 
+<?php  if (TAB_CALLLIST) { ?>
+     <div class="tabbertab <?php  if ((DEFAULT_TAB == 'calllist' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'calllist' && $appointment)) 
 					print "tabbertabdefault"; ?>">
-	  <h2><? echo T_("Call history"); ?></h2>
-	  <div id="div-calllist" class="tabberdiv"><?xhtml_object("calllist.php","main-calllist");?></div>
+	  <h2><?php  echo T_("Call history"); ?></h2>
+	  <div id="div-calllist" class="tabberdiv"><?php xhtml_object("calllist.php","main-calllist");?></div>
      </div>
-<? }?>
+<?php  }?>
 
 
-<? if (TAB_SHIFTS) { ?>
-     <div class="tabbertab <? if ((DEFAULT_TAB == 'shifts' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'shifts' && $appointment)) 
+<?php  if (TAB_SHIFTS) { ?>
+     <div class="tabbertab <?php  if ((DEFAULT_TAB == 'shifts' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'shifts' && $appointment)) 
 					print "tabbertabdefault"; ?>" id="tab-shifts">
-	  <h2><? echo T_("Shifts"); ?></h2>
-	  <div id="div-shifts" class="tabberdiv"><?xhtml_object("shifts.php","main-shifts");?></div>
+	  <h2><?php  echo T_("Shifts"); ?></h2>
+	  <div id="div-shifts" class="tabberdiv"><?php xhtml_object("shifts.php","main-shifts");?></div>
      </div>
-<? }?>
+<?php  }?>
 
 
-<? if (TAB_APPOINTMENTLIST) { ?>
-     <div class="tabbertab <? if ((DEFAULT_TAB == 'appointmentlist' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'appointmentlist' && $appointment)) 
+<?php  if (TAB_APPOINTMENTLIST) { ?>
+     <div class="tabbertab <?php  if ((DEFAULT_TAB == 'appointmentlist' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'appointmentlist' && $appointment)) 
 					print "tabbertabdefault"; ?>">
-	  <h2><? echo T_("Appointments"); ?></h2>
-	  <div id="div-appointmentlist" class="tabberdiv"><?xhtml_object("appointmentlist.php","main-appointmentlist");?></div>
+	  <h2><?php  echo T_("Appointments"); ?></h2>
+	  <div id="div-appointmentlist" class="tabberdiv"><?php xhtml_object("appointmentlist.php","main-appointmentlist");?></div>
      </div>
-<? }?>
+<?php  }?>
 
 
-<? if (TAB_PERFORMANCE) { ?>
-     <div class="tabbertab <? if ((DEFAULT_TAB == 'performance' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'performance' && $appointment)) 
+<?php  if (TAB_PERFORMANCE) { ?>
+     <div class="tabbertab <?php  if ((DEFAULT_TAB == 'performance' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'performance' && $appointment)) 
 					print "tabbertabdefault"; ?>">
-	  <h2><? echo T_("Performance"); ?></h2>
-	  <div id="div-performance" class="tabberdiv"><?xhtml_object("performance.php","main-performance");?></div>
+	  <h2><?php  echo T_("Performance"); ?></h2>
+	  <div id="div-performance" class="tabberdiv"><?php xhtml_object("performance.php","main-performance");?></div>
      </div>
-<? }?>
+<?php  }?>
 
-<? if (TAB_CALLHISTORY) { ?>
-     <div class="tabbertab <? if ((DEFAULT_TAB == 'callhistory' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'callhistory' && $appointment)) 
+<?php  if (TAB_CALLHISTORY) { ?>
+     <div class="tabbertab <?php  if ((DEFAULT_TAB == 'callhistory' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'callhistory' && $appointment)) 
 					print "tabbertabdefault"; ?>">
-	  <h2><? echo T_("Work history"); ?></h2>
-	  <div id="div-callhistory" class="tabberdiv"><?xhtml_object("callhistory.php","main-callhistory");?></div>
+	  <h2><?php  echo T_("Work history"); ?></h2>
+	  <div id="div-callhistory" class="tabberdiv"><?php xhtml_object("callhistory.php","main-callhistory");?></div>
      </div>
-<? }?>
+<?php  }?>
 
-<? if (TAB_PROJECTINFO) { ?>
-     <div class="tabbertab <? if ((DEFAULT_TAB == 'projectinfo' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'projectinfo' && $appointment)) 
+<?php  if (TAB_PROJECTINFO) { ?>
+     <div class="tabbertab <?php  if ((DEFAULT_TAB == 'projectinfo' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'projectinfo' && $appointment)) 
 					print "tabbertabdefault"; ?>">
-	  <h2><? echo T_("Project information"); ?></h2>
-	  <div id="div-projectinfo" class="tabberdiv"><?xhtml_object("project_info.php","main-projectinfo");?></div>
+	  <h2><?php  echo T_("Project information"); ?></h2>
+	  <div id="div-projectinfo" class="tabberdiv"><?php xhtml_object("project_info.php","main-projectinfo");?></div>
      </div>
-<? }?>
+<?php  }?>
 
 
-<? if (TAB_INFO) { ?>
-     <div class="tabbertab <? if ((DEFAULT_TAB == 'info' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'info' && $appointment)) 
+<?php  if (TAB_INFO) { ?>
+     <div class="tabbertab <?php  if ((DEFAULT_TAB == 'info' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'info' && $appointment)) 
 					print "tabbertabdefault"; ?>">
-	  <h2><? echo T_("Info"); ?></h2>
-	  <div id="div-info" class="tabberdiv"><?xhtml_object("info.php","main-info");?></div>
+	  <h2><?php  echo T_("Info"); ?></h2>
+	  <div id="div-info" class="tabberdiv"><?php xhtml_object("info.php","main-info");?></div>
      </div>
-<? }?>
+<?php  }?>
 
 
 </div>
@@ -274,7 +274,7 @@ xhtml_object($data,"main-content");
 
 </div>
 
-<?
+<?php 
 
 xhtml_foot();
 
diff --git a/index_interface2.php b/index_interface2.php
index 115d0507..b0034e8a 100644
--- a/index_interface2.php
+++ b/index_interface2.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Display the main page including all panels and tabs
  *
@@ -198,15 +198,15 @@ print $script;
 ?>
 
 <ul id="casefunctions" class="header">
-       <li id="item_1"><a href="javascript:poptastic('call_interface2.php');"><? echo T_("Outcome"); ?> <img src="css/images/play.jpg" /></a></li>
-    <li id="item_2_e" class="item_2_full_height"><a href="javascript:poptastic('appointment.php');"><? echo T_("Appointment"); ?> <img src="css/images/plius.jpg" /></a></li>
-    <li id="item_3_e" class="item_3_full_height"><a href="?endwork=endwork"><? echo T_("End work"); ?> <img src="css/images/end.jpg" /></a></li>
+       <li id="item_1"><a href="javascript:poptastic('call_interface2.php');"><?php  echo T_("Outcome"); ?> <img src="css/images/play.jpg" /></a></li>
+    <li id="item_2_e" class="item_2_full_height"><a href="javascript:poptastic('appointment.php');"><?php  echo T_("Appointment"); ?> <img src="css/images/plius.jpg" /></a></li>
+    <li id="item_3_e" class="item_3_full_height"><a href="?endwork=endwork"><?php  echo T_("End work"); ?> <img src="css/images/end.jpg" /></a></li>
 </ul>
 
 
 
 <div id="content" class="content">
-<? 
+<?php  
 
 $case_id = get_case_id($operator_id,true);
 $ca = get_call_attempt($operator_id,true);
@@ -278,8 +278,8 @@ xhtml_object($data,"main-content");
 </div>
 
 <div id="qstatus" class="header">
-<?xhtml_object("status_interface2.php","main-qstatus");?>
-<? if (HEADER_EXPANDER_MANUAL){ ?> <div class='headerexpand'><img id='headerexpandimage' src='./images/arrow-up-2.jpg' alt='<? echo T_('Arrow for expanding or contracting'); ?>'/></div> <? } ?>
+<?php xhtml_object("status_interface2.php","main-qstatus");?>
+<?php  if (HEADER_EXPANDER_MANUAL){ ?> <div class='headerexpand'><img id='headerexpandimage' src='./images/arrow-up-2.jpg' alt='<?php  echo T_('Arrow for expanding or contracting'); ?>'/></div> <?php  } ?>
 </div>
 
 
@@ -288,82 +288,82 @@ xhtml_object($data,"main-content");
 
 <div class="tabber" id="tab-main">
 
-<? if (TAB_CASENOTES) { ?>
-     <div class="tabbertab <? if ((DEFAULT_TAB == 'casenotes' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'casenotes' && $appointment)) 
+<?php  if (TAB_CASENOTES) { ?>
+     <div class="tabbertab <?php  if ((DEFAULT_TAB == 'casenotes' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'casenotes' && $appointment)) 
 					print "tabbertabdefault"; ?>">
-	  <h2><? echo T_("Notes"); ?></h2>
-	  <div id="div-casenotes" class="tabberdiv"><?xhtml_object("casenote.php","main-casenotes");?></div>
+	  <h2><?php  echo T_("Notes"); ?></h2>
+	  <div id="div-casenotes" class="tabberdiv"><?php xhtml_object("casenote.php","main-casenotes");?></div>
    </div>
-<? }?>
+<?php  }?>
 
-<? if (TAB_CONTACTDETAILS) { ?>
-     <div class="tabbertab <? if ((DEFAULT_TAB == 'contactdetails' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'contactdetails' && $appointment)) 
+<?php  if (TAB_CONTACTDETAILS) { ?>
+     <div class="tabbertab <?php  if ((DEFAULT_TAB == 'contactdetails' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'contactdetails' && $appointment)) 
 					print "tabbertabdefault"; ?>">
-	  <h2><? echo T_("Contact details"); ?></h2>
-	  <div id="div-contactdetails" class="tabberdiv"><?xhtml_object("contactdetails.php","main-contactdetails");?></div>
+	  <h2><?php  echo T_("Contact details"); ?></h2>
+	  <div id="div-contactdetails" class="tabberdiv"><?php xhtml_object("contactdetails.php","main-contactdetails");?></div>
    </div>
-<? }?>
+<?php  }?>
 
 
-<? if (TAB_CALLLIST) { ?>
-     <div class="tabbertab <? if ((DEFAULT_TAB == 'calllist' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'calllist' && $appointment)) 
+<?php  if (TAB_CALLLIST) { ?>
+     <div class="tabbertab <?php  if ((DEFAULT_TAB == 'calllist' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'calllist' && $appointment)) 
 					print "tabbertabdefault"; ?>">
-	  <h2><? echo T_("Call history"); ?></h2>
-	  <div id="div-calllist" class="tabberdiv"><?xhtml_object("calllist.php","main-calllist");?></div>
+	  <h2><?php  echo T_("Call history"); ?></h2>
+	  <div id="div-calllist" class="tabberdiv"><?php xhtml_object("calllist.php","main-calllist");?></div>
      </div>
-<? }?>
+<?php  }?>
 
 
-<? if (TAB_SHIFTS) { ?>
-     <div class="tabbertab <? if ((DEFAULT_TAB == 'shifts' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'shifts' && $appointment)) 
+<?php  if (TAB_SHIFTS) { ?>
+     <div class="tabbertab <?php  if ((DEFAULT_TAB == 'shifts' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'shifts' && $appointment)) 
 					print "tabbertabdefault"; ?>" id="tab-shifts">
-	  <h2><? echo T_("Shifts"); ?></h2>
-	  <div id="div-shifts" class="tabberdiv"><?xhtml_object("shifts.php","main-shifts");?></div>
+	  <h2><?php  echo T_("Shifts"); ?></h2>
+	  <div id="div-shifts" class="tabberdiv"><?php xhtml_object("shifts.php","main-shifts");?></div>
      </div>
-<? }?>
+<?php  }?>
 
 
-<? if (TAB_APPOINTMENTLIST) { ?>
-     <div class="tabbertab <? if ((DEFAULT_TAB == 'appointmentlist' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'appointmentlist' && $appointment)) 
+<?php  if (TAB_APPOINTMENTLIST) { ?>
+     <div class="tabbertab <?php  if ((DEFAULT_TAB == 'appointmentlist' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'appointmentlist' && $appointment)) 
 					print "tabbertabdefault"; ?>">
-	  <h2><? echo T_("Appointments"); ?></h2>
-	  <div id="div-appointmentlist" class="tabberdiv"><?xhtml_object("appointmentlist.php","main-appointmentlist");?></div>
+	  <h2><?php  echo T_("Appointments"); ?></h2>
+	  <div id="div-appointmentlist" class="tabberdiv"><?php xhtml_object("appointmentlist.php","main-appointmentlist");?></div>
      </div>
-<? }?>
+<?php  }?>
 
 
-<? if (TAB_PERFORMANCE) { ?>
-     <div class="tabbertab <? if ((DEFAULT_TAB == 'performance' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'performance' && $appointment)) 
+<?php  if (TAB_PERFORMANCE) { ?>
+     <div class="tabbertab <?php  if ((DEFAULT_TAB == 'performance' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'performance' && $appointment)) 
 					print "tabbertabdefault"; ?>">
-	  <h2><? echo T_("Performance"); ?></h2>
-	  <div id="div-performance" class="tabberdiv"><?xhtml_object("performance.php","main-performance");?></div>
+	  <h2><?php  echo T_("Performance"); ?></h2>
+	  <div id="div-performance" class="tabberdiv"><?php xhtml_object("performance.php","main-performance");?></div>
      </div>
-<? }?>
+<?php  }?>
 
-<? if (TAB_CALLHISTORY) { ?>
-     <div class="tabbertab <? if ((DEFAULT_TAB == 'callhistory' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'callhistory' && $appointment)) 
+<?php  if (TAB_CALLHISTORY) { ?>
+     <div class="tabbertab <?php  if ((DEFAULT_TAB == 'callhistory' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'callhistory' && $appointment)) 
 					print "tabbertabdefault"; ?>">
-	  <h2><? echo T_("Work history"); ?></h2>
-	  <div id="div-callhistory" class="tabberdiv"><?xhtml_object("callhistory.php","main-callhistory");?></div>
+	  <h2><?php  echo T_("Work history"); ?></h2>
+	  <div id="div-callhistory" class="tabberdiv"><?php xhtml_object("callhistory.php","main-callhistory");?></div>
      </div>
-<? }?>
+<?php  }?>
 
-<? if (TAB_PROJECTINFO) { ?>
-     <div class="tabbertab <? if ((DEFAULT_TAB == 'projectinfo' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'projectinfo' && $appointment)) 
+<?php  if (TAB_PROJECTINFO) { ?>
+     <div class="tabbertab <?php  if ((DEFAULT_TAB == 'projectinfo' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'projectinfo' && $appointment)) 
 					print "tabbertabdefault"; ?>">
-	  <h2><? echo T_("Project information"); ?></h2>
-	  <div id="div-projectinfo" class="tabberdiv"><?xhtml_object("project_info.php","main-projectinfo");?></div>
+	  <h2><?php  echo T_("Project information"); ?></h2>
+	  <div id="div-projectinfo" class="tabberdiv"><?php xhtml_object("project_info.php","main-projectinfo");?></div>
      </div>
-<? }?>
+<?php  }?>
 
 
-<? if (TAB_INFO) { ?>
-     <div class="tabbertab <? if ((DEFAULT_TAB == 'info' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'info' && $appointment)) 
+<?php  if (TAB_INFO) { ?>
+     <div class="tabbertab <?php  if ((DEFAULT_TAB == 'info' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'info' && $appointment)) 
 					print "tabbertabdefault"; ?>">
-	  <h2><? echo T_("Info"); ?></h2>
-	  <div id="div-info" class="tabberdiv"><?xhtml_object("info.php","main-info");?></div>
+	  <h2><?php  echo T_("Info"); ?></h2>
+	  <div id="div-info" class="tabberdiv"><?php xhtml_object("info.php","main-info");?></div>
      </div>
-<? }?>
+<?php  }?>
 
 
 </div>
@@ -371,7 +371,7 @@ xhtml_object($data,"main-content");
 
 </div>
 
-<?
+<?php 
 
 xhtml_foot();
 
diff --git a/info.php b/info.php
index 54d2c80f..700e0e30 100644
--- a/info.php
+++ b/info.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Display information about this centre
  *
diff --git a/lang.inc.php b/lang.inc.php
index da95fab8..5d7b9d26 100644
--- a/lang.inc.php
+++ b/lang.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Language configuration file
  *
diff --git a/nocallavailable.php b/nocallavailable.php
index dd123952..8cdf7d77 100644
--- a/nocallavailable.php
+++ b/nocallavailable.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Display error message when no current call available
  *
@@ -51,8 +51,8 @@ if (AUTO_LOGOUT_MINUTES !== false)
 xhtml_head(T_("No call available"),true,array("css/table.css"),$js);
 
 ?>
-<h1><? echo T_("Please click on:") . " " . T_("Call/Hangup") . " " .T_("to display call script"); ?></h1>
-<?
+<h1><?php  echo T_("Please click on:") . " " . T_("Call/Hangup") . " " .T_("to display call script"); ?></h1>
+<?php 
 
 xhtml_foot();
 
diff --git a/nocaseavailable.php b/nocaseavailable.php
index 923e6477..c0d47dce 100644
--- a/nocaseavailable.php
+++ b/nocaseavailable.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Display error message when no cases available
  *
@@ -65,10 +65,10 @@ xhtml_head(T_("No case available"),true,array("css/table.css"),$js);
 $operator_id = get_operator_id();
 
 ?>
-<h1><? echo T_("There is no case currently available"); ?></h1>
-<h2><? echo T_("Reasons:"); ?></h2>
+<h1><?php  echo T_("There is no case currently available"); ?></h1>
+<h2><?php  echo T_("Reasons:"); ?></h2>
 
-<?
+<?php 
 
 /**
  * check for reasons why no case is displayed
@@ -85,13 +85,13 @@ $sql = "SELECT oq.questionnaire_id, q.description
 $rs = $db->GetAll($sql);
 
 ?>
-<p><? echo T_("Assigned questionnaires:"); ?></p>
-<?
+<p><?php  echo T_("Assigned questionnaires:"); ?></p>
+<?php 
 if (!empty($rs))
 	xhtml_table($rs,array("questionnaire_id","description"),array(T_("ID"),T_("Description")));
 else
 {
-	?> <p class='error'><? echo T_("ERROR: No questionnaires assigned to you"); ?></p> <?
+	?> <p class='error'><?php  echo T_("ERROR: No questionnaires assigned to you"); ?></p> <?php 
 }
 
 
@@ -109,13 +109,13 @@ $sql = "SELECT q.description, CONVERT_TZ(sh.start, 'UTC', o.Time_zone_name) as s
 $rs = $db->GetAll($sql);
 
 ?>
-<p><? echo T_("Current shifts available:"); ?></p>
-<?
+<p><?php  echo T_("Current shifts available:"); ?></p>
+<?php 
 if (!empty($rs))
 	xhtml_table($rs,array("description","st","en"),array(T_("Questionnaire"),T_("Shift start"),T_("Shift end")));
 else
 {
-	?> <p class='error'><? echo T_("ERROR: No shifts at this time"); ?></p> <?
+	?> <p class='error'><?php  echo T_("ERROR: No shifts at this time"); ?></p> <?php 
 }
 
 //call restrictions and outside times
@@ -135,11 +135,11 @@ $sql = "SELECT count(*) as c
 $rs = $db->GetRow($sql);
 
 ?>
-<p><? echo T_("Call restrictions:"); ?></p>
-<?
+<p><?php  echo T_("Call restrictions:"); ?></p>
+<?php 
 if ($rs['c'] == 0)
 {
-	?> <p class='error'><? echo T_("ERROR: There are no cases available that fall within call restrictions"); ?></p> <?
+	?> <p class='error'><?php  echo T_("ERROR: There are no cases available that fall within call restrictions"); ?></p> <?php 
 }
 else
 {
@@ -149,8 +149,8 @@ else
 
 
 ?>
-<p><? echo T_("Limesurvey links:"); ?></p>
-<?
+<p><?php  echo T_("Limesurvey links:"); ?></p>
+<?php 
 
 //no link to limesurvey
 $sql = "SELECT q.lime_sid, q.description
diff --git a/performance.php b/performance.php
index 8ac69e02..29ae3b66 100644
--- a/performance.php
+++ b/performance.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Display the performance of this operator
  *
diff --git a/project_info.php b/project_info.php
index f0aa3e32..66284935 100644
--- a/project_info.php
+++ b/project_info.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Display information about this project
  *
diff --git a/record.php b/record.php
index 4faf56ba..cccfcfd6 100644
--- a/record.php
+++ b/record.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Record calls using Asterisk (if enabled)
  *
diff --git a/respondent.php b/respondent.php
index 0e1993a6..f9e0bd1c 100644
--- a/respondent.php
+++ b/respondent.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Display a list of respondents for this case, and the ability to add them if necessary
  *
@@ -90,12 +90,12 @@ if (isset($_GET['respondent_id']) && $_GET['respondent_id'] == 0)
 {
 ?>
 	<form method="post" action="?">
-	<? display_respondent_form(false,$case_id); ?>
-	<div><input type='submit' name='submit' id='submit' value='<? echo T_("Add respondent"); ?>'/></div>
+	<?php  display_respondent_form(false,$case_id); ?>
+	<div><input type='submit' name='submit' id='submit' value='<?php  echo T_("Add respondent"); ?>'/></div>
 	</form>
-	<div><a href="?"><? echo T_("Go back"); ?></a></div>
+	<div><a href="?"><?php  echo T_("Go back"); ?></a></div>
 
-<?
+<?php 
 }
 else
 {
diff --git a/rs_answeringmachine.php b/rs_answeringmachine.php
index d1624b2f..d282fe62 100644
--- a/rs_answeringmachine.php
+++ b/rs_answeringmachine.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Respondent selection - Answering machine
  *
@@ -78,18 +78,18 @@ else
 	print "<p class='rstext'>" . T_("Do not leave a message, please hang up") . "</p>";
 
 ?>
-<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=29');"><? echo T_("End call with outcome: Business answering machine"); ?></a></p>
-<?
+<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=29');"><?php  echo T_("End call with outcome: Business answering machine"); ?></a></p>
+<?php 
 if ($leavemessage)
 {
 ?>
-<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=23');"><? echo T_("End call with outcome: Answering machine Message left"); ?></a></p>
-<?
+<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=23');"><?php  echo T_("End call with outcome: Answering machine Message left"); ?></a></p>
+<?php 
 }
 ?>
-<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=24');"><? echo T_("End call with outcome: Answering machine No message left"); ?></a></p>
-<p class='rsoption'><a href="rs_intro.php"><? echo T_("Go Back"); ?></a></p>
-<?
+<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=24');"><?php  echo T_("End call with outcome: Answering machine No message left"); ?></a></p>
+<p class='rsoption'><a href="rs_intro.php"><?php  echo T_("Go Back"); ?></a></p>
+<?php 
 
 xhtml_foot();
 
diff --git a/rs_answeringmachine_interface2.php b/rs_answeringmachine_interface2.php
index 2d7bebb2..7ab47cd2 100644
--- a/rs_answeringmachine_interface2.php
+++ b/rs_answeringmachine_interface2.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Respondent selection - Answering machine
  *
@@ -78,18 +78,18 @@ else
 	print "<p class='rstext'>" . T_("Do not leave a message, please hang up") . "</p>";
 
 ?>
-<p class='rsoption'><a href="javascript:parent.location.href = 'index_interface2.php?outcome=29&endcase=endcase'"><? echo T_("End call with outcome: Business answering machine"); ?></a></p>
-<?
+<p class='rsoption'><a href="javascript:parent.location.href = 'index_interface2.php?outcome=29&endcase=endcase'"><?php  echo T_("End call with outcome: Business answering machine"); ?></a></p>
+<?php 
 if ($leavemessage)
 {
 ?>
-<p class='rsoption'><a href="javascript:parent.location.href = 'index_interface2.php?outcome=23&endcase=endcase'"><? echo T_("End call with outcome: Answering machine Message left"); ?></a></p>
-<?
+<p class='rsoption'><a href="javascript:parent.location.href = 'index_interface2.php?outcome=23&endcase=endcase'"><?php  echo T_("End call with outcome: Answering machine Message left"); ?></a></p>
+<?php 
 }
 ?>
-<p class='rsoption'><a href="javascript:parent.location.href = 'index_interface2.php?outcome=24&endcase=endcase'"><? echo T_("End call with outcome: Answering machine No message left"); ?></a></p>
-<p class='rsoption'><a href="rs_intro_interface2.php"><? echo T_("Go Back"); ?></a></p>
-<?
+<p class='rsoption'><a href="javascript:parent.location.href = 'index_interface2.php?outcome=24&endcase=endcase'"><?php  echo T_("End call with outcome: Answering machine No message left"); ?></a></p>
+<p class='rsoption'><a href="rs_intro_interface2.php"><?php  echo T_("Go Back"); ?></a></p>
+<?php 
 
 xhtml_foot();
 
diff --git a/rs_business.php b/rs_business.php
index d1fbb789..8d226b15 100644
--- a/rs_business.php
+++ b/rs_business.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Respondent selection - Business answers
  *
@@ -56,11 +56,11 @@ xhtml_head(T_("Respondent Selection - Business answers"),true,array("css/rs.css"
 
 
 ?>
-<p class='rstext'><? echo T_("Sorry to bother you, I have called the wrong number")?></p>
+<p class='rstext'><?php  echo T_("Sorry to bother you, I have called the wrong number")?></p>
 
-<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=16');"><? echo T_("End call with outcome: Business number"); ?></a></p>
-<p class='rsoption'><a href="rs_intro.php"><? echo T_("Go Back"); ?></a></p>
-<?
+<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=16');"><?php  echo T_("End call with outcome: Business number"); ?></a></p>
+<p class='rsoption'><a href="rs_intro.php"><?php  echo T_("Go Back"); ?></a></p>
+<?php 
 
 xhtml_foot();
 
diff --git a/rs_business_interface2.php b/rs_business_interface2.php
index 9decfa5d..ad5c7a27 100644
--- a/rs_business_interface2.php
+++ b/rs_business_interface2.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Respondent selection - Business answers
  *
@@ -56,11 +56,11 @@ xhtml_head(T_("Respondent Selection - Business answers"),true,array("css/rs.css"
 
 
 ?>
-<p class='rstext'><? echo T_("Sorry to bother you, I have called the wrong number")?></p>
+<p class='rstext'><?php  echo T_("Sorry to bother you, I have called the wrong number")?></p>
 
-<p class='rsoption'><a href="javascript:parent.location.href = 'index_interface2.php?outcome=16&endcase=endcase'"><? echo T_("End call with outcome: Business number"); ?></a></p>
-<p class='rsoption'><a href="rs_intro_interface2.php"><? echo T_("Go Back"); ?></a></p>
-<?
+<p class='rsoption'><a href="javascript:parent.location.href = 'index_interface2.php?outcome=16&endcase=endcase'"><?php  echo T_("End call with outcome: Business number"); ?></a></p>
+<p class='rsoption'><a href="rs_intro_interface2.php"><?php  echo T_("Go Back"); ?></a></p>
+<?php 
 
 xhtml_foot();
 
diff --git a/rs_callback.php b/rs_callback.php
index 1c9f7dad..8ae023bf 100644
--- a/rs_callback.php
+++ b/rs_callback.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Respondent selection - Call back (respondent already started questionnaire) 
  *
@@ -84,10 +84,10 @@ print "<p class='rstext'>" . T_("You are: ") . round(limesurvey_percent_complete
 
 ?>
 
-<p class='rsoption'><a href="<? print(get_limesurvey_url($operator_id)); ?>"><? echo T_("Yes - Continue where we left off"); ?></a></p>
-<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=8');"><? echo T_("End call with outcome: Refusal by respondent"); ?></a></p>
-<p class='rsoption'><a href="rs_intro.php"><? echo T_("Go Back"); ?></a></p>
-<?
+<p class='rsoption'><a href="<?php  print(get_limesurvey_url($operator_id)); ?>"><?php  echo T_("Yes - Continue where we left off"); ?></a></p>
+<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=8');"><?php  echo T_("End call with outcome: Refusal by respondent"); ?></a></p>
+<p class='rsoption'><a href="rs_intro.php"><?php  echo T_("Go Back"); ?></a></p>
+<?php 
 
 xhtml_foot();
 
diff --git a/rs_callback_interface2.php b/rs_callback_interface2.php
index 0791fad4..d46b6559 100644
--- a/rs_callback_interface2.php
+++ b/rs_callback_interface2.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Respondent selection - Call back (respondent already started questionnaire) 
  *
@@ -84,10 +84,10 @@ print "<p class='rstext'>" . T_("You are: ") . round(limesurvey_percent_complete
 
 ?>
 
-<p class='rsoption'><a href="<? print(get_limesurvey_url($operator_id)); ?>"><? echo T_("Yes - Continue where we left off"); ?></a></p>
-<p class='rsoption'><a href="javascript:parent.location.href = 'index_interface2.php?outcome=8&endcase=endcase'"><? echo T_("End call with outcome: Refusal by respondent"); ?></a></p>
-<p class='rsoption'><a href="rs_intro_interface2.php"><? echo T_("Go Back"); ?></a></p>
-<?
+<p class='rsoption'><a href="<?php  print(get_limesurvey_url($operator_id)); ?>"><?php  echo T_("Yes - Continue where we left off"); ?></a></p>
+<p class='rsoption'><a href="javascript:parent.location.href = 'index_interface2.php?outcome=8&endcase=endcase'"><?php  echo T_("End call with outcome: Refusal by respondent"); ?></a></p>
+<p class='rsoption'><a href="rs_intro_interface2.php"><?php  echo T_("Go Back"); ?></a></p>
+<?php 
 
 xhtml_foot();
 
diff --git a/rs_intro.php b/rs_intro.php
index 955f1113..38a41293 100644
--- a/rs_intro.php
+++ b/rs_intro.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Respondent selection introduction 
  *
@@ -89,41 +89,41 @@ if (limesurvey_percent_complete($case_id) == false)
 	{
 		//If nothing is specified as a project introduction, skip straight to questionnaire
 		?>
-		<p class='rsoption'><a href="<? print(get_limesurvey_url($operator_id)); ?>"><? echo T_("Yes - Continue"); ?></a></p>
-		<?
+		<p class='rsoption'><a href="<?php  print(get_limesurvey_url($operator_id)); ?>"><?php  echo T_("Yes - Continue"); ?></a></p>
+		<?php 
 	}
 	else
 	{
 		?>
-		<p class='rsoption'><a href="rs_project_intro.php"><? echo T_("Yes - Continue"); ?></a></p>
-		<?
+		<p class='rsoption'><a href="rs_project_intro.php"><?php  echo T_("Yes - Continue"); ?></a></p>
+		<?php 
 	}
 } else {
 	if(empty($r['rs_callback']))
 	{
 		//If nothing is specified as a callback screen, skip straight to questionnaire
 		?>
-		<p class='rsoption'><a href="<? print(get_limesurvey_url($operator_id)); ?>"><? echo T_("Yes - Continue"); ?></a></p>
-		<?
+		<p class='rsoption'><a href="<?php  print(get_limesurvey_url($operator_id)); ?>"><?php  echo T_("Yes - Continue"); ?></a></p>
+		<?php 
 	}
 	else
 	{
 		?>
-		<p class='rsoption'><a href="rs_callback.php"><? echo T_("Yes - Continue"); ?></a></p>
-		<?
+		<p class='rsoption'><a href="rs_callback.php"><?php  echo T_("Yes - Continue"); ?></a></p>
+		<?php 
 	}
 }
 ?>
-<p class='rsoption'><a href="rs_business.php"><? echo T_("Business number"); ?></a></p>
-<p class='rsoption'><a href="rs_answeringmachine.php"><? echo T_("Answering machine"); ?></a></p>
-<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=2');"><? echo T_("End call with outcome: No answer (ring out or busy) "); ?></a></p>
-<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=18');"><? echo T_("End call with outcome: Accidental hang up"); ?></a></p>
-<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=6');"><? echo T_("End call with outcome: Refusal by unknown person"); ?></a></p>
-<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=8');"><? echo T_("End call with outcome: Refusal by respondent"); ?></a></p>
-<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=17');"><? echo T_("End call with outcome: No eligible respondent (person never available on this number)"); ?></a></p>
-<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=31');"><? echo T_("End call with outcome: Non contact (person not currently available on this number: no appointment made)"); ?></a></p>
-<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=30');"><? echo T_("End call with outcome: Out of sample (already completed in another mode)"); ?></a></p>
-<?
+<p class='rsoption'><a href="rs_business.php"><?php  echo T_("Business number"); ?></a></p>
+<p class='rsoption'><a href="rs_answeringmachine.php"><?php  echo T_("Answering machine"); ?></a></p>
+<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=2');"><?php  echo T_("End call with outcome: No answer (ring out or busy) "); ?></a></p>
+<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=18');"><?php  echo T_("End call with outcome: Accidental hang up"); ?></a></p>
+<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=6');"><?php  echo T_("End call with outcome: Refusal by unknown person"); ?></a></p>
+<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=8');"><?php  echo T_("End call with outcome: Refusal by respondent"); ?></a></p>
+<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=17');"><?php  echo T_("End call with outcome: No eligible respondent (person never available on this number)"); ?></a></p>
+<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=31');"><?php  echo T_("End call with outcome: Non contact (person not currently available on this number: no appointment made)"); ?></a></p>
+<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=30');"><?php  echo T_("End call with outcome: Out of sample (already completed in another mode)"); ?></a></p>
+<?php 
 
 xhtml_foot();
 
diff --git a/rs_intro_interface2.php b/rs_intro_interface2.php
index ca8d738b..96fb1969 100644
--- a/rs_intro_interface2.php
+++ b/rs_intro_interface2.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Respondent selection introduction 
  *
@@ -89,41 +89,41 @@ if (limesurvey_percent_complete($case_id) == false)
 	{
 		//If nothing is specified as a project introduction, skip straight to questionnaire
 		?>
-		<p class='rsoption'><a href="<? print(get_limesurvey_url($operator_id)); ?>"><? echo T_("Yes - Continue"); ?></a></p>
-		<?
+		<p class='rsoption'><a href="<?php  print(get_limesurvey_url($operator_id)); ?>"><?php  echo T_("Yes - Continue"); ?></a></p>
+		<?php 
 	}
 	else
 	{
 		?>
-		<p class='rsoption'><a href="rs_project_intro_interface2.php"><? echo T_("Yes - Continue"); ?></a></p>
-		<?
+		<p class='rsoption'><a href="rs_project_intro_interface2.php"><?php  echo T_("Yes - Continue"); ?></a></p>
+		<?php 
 	}
 } else {
 	if(empty($r['rs_callback']))
 	{
 		//If nothing is specified as a callback screen, skip straight to questionnaire
 		?>
-		<p class='rsoption'><a href="<? print(get_limesurvey_url($operator_id)); ?>"><? echo T_("Yes - Continue"); ?></a></p>
-		<?
+		<p class='rsoption'><a href="<?php  print(get_limesurvey_url($operator_id)); ?>"><?php  echo T_("Yes - Continue"); ?></a></p>
+		<?php 
 	}
 	else
 	{
 		?>
-		<p class='rsoption'><a href="rs_callback_interface2.php"><? echo T_("Yes - Continue"); ?></a></p>
-		<?
+		<p class='rsoption'><a href="rs_callback_interface2.php"><?php  echo T_("Yes - Continue"); ?></a></p>
+		<?php 
 	}
 }
 ?>
-<p class='rsoption'><a href="rs_business_interface2.php"><? echo T_("Business number"); ?></a></p>
-<p class='rsoption'><a href="rs_answeringmachine_interface2.php"><? echo T_("Answering machine"); ?></a></p>
-<p class='rsoption'><a href="javascript:parent.location.href = 'index_interface2.php?outcome=2&endcase=endcase'"><? echo T_("End call with outcome: No answer (ring out or busy) "); ?></a></p>
-<p class='rsoption'><a href="javascript:parent.location.href = 'index_interface2.php?outcome=18&endcase=endcase'"><? echo T_("End call with outcome: Accidental hang up"); ?></a></p>
-<p class='rsoption'><a href="javascript:parent.location.href = 'index_interface2.php?outcome=6&endcase=endcase'"><? echo T_("End call with outcome: Refusal by unknown person"); ?></a></p>
-<p class='rsoption'><a href="javascript:parent.location.href = 'index_interface2.php?outcome=8&endcase=endcase'"><? echo T_("End call with outcome: Refusal by respondent"); ?></a></p>
-<p class='rsoption'><a href="javascript:parent.location.href = 'index_interface2.php?outcome=17&endcase=endcase'"><? echo T_("End call with outcome: No eligible respondent (person never available on this number)"); ?></a></p>
-<p class='rsoption'><a href="javascript:parent.location.href = 'index_interface2.php?outcome=31&endcase=endcase'"><? echo T_("End call with outcome: Non contact (person not currently available on this number: no appointment made)"); ?></a></p>
-<p class='rsoption'><a href="javascript:parent.location.href = 'index_interface2.php?outcome=30&endcase=endcase'"><? echo T_("End call with outcome: Out of sample (already completed in another mode)"); ?></a></p>
-<?
+<p class='rsoption'><a href="rs_business_interface2.php"><?php  echo T_("Business number"); ?></a></p>
+<p class='rsoption'><a href="rs_answeringmachine_interface2.php"><?php  echo T_("Answering machine"); ?></a></p>
+<p class='rsoption'><a href="javascript:parent.location.href = 'index_interface2.php?outcome=2&endcase=endcase'"><?php  echo T_("End call with outcome: No answer (ring out or busy) "); ?></a></p>
+<p class='rsoption'><a href="javascript:parent.location.href = 'index_interface2.php?outcome=18&endcase=endcase'"><?php  echo T_("End call with outcome: Accidental hang up"); ?></a></p>
+<p class='rsoption'><a href="javascript:parent.location.href = 'index_interface2.php?outcome=6&endcase=endcase'"><?php  echo T_("End call with outcome: Refusal by unknown person"); ?></a></p>
+<p class='rsoption'><a href="javascript:parent.location.href = 'index_interface2.php?outcome=8&endcase=endcase'"><?php  echo T_("End call with outcome: Refusal by respondent"); ?></a></p>
+<p class='rsoption'><a href="javascript:parent.location.href = 'index_interface2.php?outcome=17&endcase=endcase'"><?php  echo T_("End call with outcome: No eligible respondent (person never available on this number)"); ?></a></p>
+<p class='rsoption'><a href="javascript:parent.location.href = 'index_interface2.php?outcome=31&endcase=endcase'"><?php  echo T_("End call with outcome: Non contact (person not currently available on this number: no appointment made)"); ?></a></p>
+<p class='rsoption'><a href="javascript:parent.location.href = 'index_interface2.php?outcome=30&endcase=endcase'"><?php  echo T_("End call with outcome: Out of sample (already completed in another mode)"); ?></a></p>
+<?php 
 
 xhtml_foot();
 
diff --git a/rs_project_end.php b/rs_project_end.php
index 89dc0d03..dc13621f 100644
--- a/rs_project_end.php
+++ b/rs_project_end.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Respondent selection - Project End
  *
@@ -90,8 +90,8 @@ if (!is_voip_enabled($operator_id) && AUTO_COMPLETE_OUTCOME)
 else
 {
 	?>
-	<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=10');"><? echo T_("End call with outcome: Complete"); ?></a></p>
-	<?
+	<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=10');"><?php  echo T_("End call with outcome: Complete"); ?></a></p>
+	<?php 
 }
 xhtml_foot();
 
diff --git a/rs_project_end_interface2.php b/rs_project_end_interface2.php
index 7731b9b7..65ec4372 100644
--- a/rs_project_end_interface2.php
+++ b/rs_project_end_interface2.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Respondent selection - Project End
  *
@@ -82,8 +82,8 @@ if (!is_voip_enabled($operator_id) && AUTO_COMPLETE_OUTCOME)
 else
 {
 	?>
-	<p class='rsoption'><a href="javascript:parent.location.href = 'index_interface2.php?outcome=10&endcase=endcase'"><? echo T_("End call with outcome: Complete"); ?></a></p>
-	<?
+	<p class='rsoption'><a href="javascript:parent.location.href = 'index_interface2.php?outcome=10&endcase=endcase'"><?php  echo T_("End call with outcome: Complete"); ?></a></p>
+	<?php 
 }
 xhtml_foot();
 
diff --git a/rs_project_intro.php b/rs_project_intro.php
index 9f939e7a..8b9c3fb5 100644
--- a/rs_project_intro.php
+++ b/rs_project_intro.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Respondent selection - Project Introduction 
  *
@@ -76,15 +76,15 @@ print "<p class='rstext'>" . template_replace($r['rs_project_intro'],$operator_i
 
 ?>
 
-<p class='rsoption'><a href="<? print(get_limesurvey_url($operator_id)); ?>"><? echo T_("Yes - Continue"); ?></a></p>
+<p class='rsoption'><a href="<?php  print(get_limesurvey_url($operator_id)); ?>"><?php  echo T_("Yes - Continue"); ?></a></p>
 
-<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=8');"><? echo T_("End call with outcome: Refusal by respondent"); ?></a></p>
-<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=17');"><? echo T_("End call with outcome: No eligible respondent (person not available on this number)"); ?></a></p>
-<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=30');"><? echo T_("End call with outcome: Out of sample (already completed in another mode)"); ?></a></p>
+<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=8');"><?php  echo T_("End call with outcome: Refusal by respondent"); ?></a></p>
+<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=17');"><?php  echo T_("End call with outcome: No eligible respondent (person not available on this number)"); ?></a></p>
+<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=30');"><?php  echo T_("End call with outcome: Out of sample (already completed in another mode)"); ?></a></p>
 
-<p class='rsoption'><a href="rs_intro.php"><? echo T_("Go Back"); ?></a></p>
+<p class='rsoption'><a href="rs_intro.php"><?php  echo T_("Go Back"); ?></a></p>
 
-<?
+<?php 
 
 xhtml_foot();
 
diff --git a/rs_project_intro_interface2.php b/rs_project_intro_interface2.php
index 439a96d3..246f3be1 100644
--- a/rs_project_intro_interface2.php
+++ b/rs_project_intro_interface2.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Respondent selection - Project Introduction 
  *
@@ -76,15 +76,15 @@ print "<p class='rstext'>" . template_replace($r['rs_project_intro'],$operator_i
 
 ?>
 
-<p class='rsoption'><a href="<? print(get_limesurvey_url($operator_id)); ?>"><? echo T_("Yes - Continue"); ?></a></p>
+<p class='rsoption'><a href="<?php  print(get_limesurvey_url($operator_id)); ?>"><?php  echo T_("Yes - Continue"); ?></a></p>
 
-<p class='rsoption'><a href="javascript:parent.location.href = 'index_interface2.php?outcome=8&endcase=endcase'"><? echo T_("End call with outcome: Refusal by respondent"); ?></a></p>
-<p class='rsoption'><a href="javascript:parent.location.href = 'index_interface2.php?outcome=17&endcase=endcase'"><? echo T_("End call with outcome: No eligible respondent (person not available on this number)"); ?></a></p>
-<p class='rsoption'><a href="javascript:parent.location.href = 'index_interface2.php?outcome=30&endcase=endcase'"><? echo T_("End call with outcome: Out of sample (already completed in another mode)"); ?></a></p>
+<p class='rsoption'><a href="javascript:parent.location.href = 'index_interface2.php?outcome=8&endcase=endcase'"><?php  echo T_("End call with outcome: Refusal by respondent"); ?></a></p>
+<p class='rsoption'><a href="javascript:parent.location.href = 'index_interface2.php?outcome=17&endcase=endcase'"><?php  echo T_("End call with outcome: No eligible respondent (person not available on this number)"); ?></a></p>
+<p class='rsoption'><a href="javascript:parent.location.href = 'index_interface2.php?outcome=30&endcase=endcase'"><?php  echo T_("End call with outcome: Out of sample (already completed in another mode)"); ?></a></p>
 
-<p class='rsoption'><a href="rs_intro_interface2.php"><? echo T_("Go Back"); ?></a></p>
+<p class='rsoption'><a href="rs_intro_interface2.php"><?php  echo T_("Go Back"); ?></a></p>
 
-<?
+<?php 
 
 xhtml_foot();
 
diff --git a/rs_quota_end.php b/rs_quota_end.php
index a3ed9999..b9943598 100644
--- a/rs_quota_end.php
+++ b/rs_quota_end.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Respondent selection - Project End due to full quota
  *
@@ -69,14 +69,14 @@ print "<p class='rstext'>" . template_replace($_GET['message'],$operator_id,$cas
 if (ALTERNATE_INTERFACE && !is_voip_enabled($operator_id))
 {
 ?>
-<p class='rsoption'><a href="javascript:parent.location.href = 'index_interface2.php?outcome=32&endcase=endcase'"><? echo T_("End call with outcome: Quota filled"); ?></a></p>
-<?
+<p class='rsoption'><a href="javascript:parent.location.href = 'index_interface2.php?outcome=32&endcase=endcase'"><?php  echo T_("End call with outcome: Quota filled"); ?></a></p>
+<?php 
 } 
 else
 {
 ?>
-<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=32');"><? echo T_("End call with outcome: Quota filled"); ?></a></p>
-<?
+<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=32');"><?php  echo T_("End call with outcome: Quota filled"); ?></a></p>
+<?php 
 }
 
 xhtml_foot();
diff --git a/shifts.php b/shifts.php
index 8b0bdb89..057bc117 100644
--- a/shifts.php
+++ b/shifts.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Display the shifts for this case, if no case, show all shifts that the operator is assigned to
  *
diff --git a/status.php b/status.php
index c110d7bd..08963f84 100644
--- a/status.php
+++ b/status.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Display status of case
  *
diff --git a/status_interface2.php b/status_interface2.php
index e7e28dac..579895ea 100644
--- a/status_interface2.php
+++ b/status_interface2.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Display status of case
  *
diff --git a/supervisor.php b/supervisor.php
index 790908dd..a26d578b 100644
--- a/supervisor.php
+++ b/supervisor.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Supervisor help functions
  *
diff --git a/waitnextcase_interface2.php b/waitnextcase_interface2.php
index 3c28e691..cdb76828 100644
--- a/waitnextcase_interface2.php
+++ b/waitnextcase_interface2.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /**
  * Display the main page including all panels and tabs
  *
@@ -51,12 +51,12 @@ xhtml_head(T_("queXS"), false, array("css/index_interface2.css","css/tabber_inte
 ?>
 <div id="header_line"></div>
 <ul class="wait_wrapper">
-	<li class="wait_li_1"><a href="index_interface2.php"><? echo T_("Get a new case"); ?> <img src="css/images/play.jpg" /></a></li>
-    <li class="wait_li_2"><a href="endwork.php"><? echo T_("End work"); ?> <img src="css/images/end.jpg" /></a></li>
+	<li class="wait_li_1"><a href="index_interface2.php"><?php  echo T_("Get a new case"); ?> <img src="css/images/play.jpg" /></a></li>
+    <li class="wait_li_2"><a href="endwork.php"><?php  echo T_("End work"); ?> <img src="css/images/end.jpg" /></a></li>
 
 </ul>
 
-<?
+<?php 
 
 xhtml_foot();