From 02f79821d405981bb1f2fe3d7a324dfad4c7cf14 Mon Sep 17 00:00:00 2001
From: Patrick Cool <patrick.cool@ugent.be>
Date: Sat, 6 Jan 2007 18:55:20 +0100
Subject: [PATCH] [svn r10605] replace <? with <?php

---
 main/survey/addanother.php                    |  4 +-
 main/survey/attach_existingsurvey.php         |  6 +--
 main/survey/attach_question.php               |  6 +--
 main/survey/attach_survey.php                 |  4 +-
 main/survey/blank.php                         | 28 +++++------
 main/survey/bluebreeze.php                    | 28 +++++------
 main/survey/create_from_existing_survey.php   |  4 +-
 main/survey/create_new_survey.php             |  4 +-
 main/survey/download.php                      |  4 +-
 main/survey/download1.php                     |  4 +-
 main/survey/existing_surveys_new.php          |  8 ++--
 main/survey/exp.php                           |  4 +-
 main/survey/group_add_question.php            |  8 ++--
 main/survey/group_list.php                    |  7 +--
 main/survey/mcma.php                          |  4 +-
 main/survey/mcma_edit.php                     | 31 +++++++------
 main/survey/mcma_view.php                     |  6 +--
 main/survey/mcsa.php                          | 23 +++++-----
 main/survey/mcsa_edit.php                     | 26 +++++------
 main/survey/mcsa_view.php                     |  6 +--
 main/survey/numbered.php                      | 46 +++++++------------
 main/survey/numbered_edit.php                 | 26 +++++------
 main/survey/numbered_view.php                 |  6 +--
 main/survey/open.php                          |  8 ++--
 main/survey/open_edit.php                     |  6 +--
 main/survey/preview_mcma.php                  | 10 ++--
 main/survey/preview_open.php                  |  6 +--
 main/survey/preview_yesno.php                 | 10 ++--
 main/survey/question.php                      |  6 +--
 main/survey/question_added.php                |  4 +-
 main/survey/question_list_new.php             |  6 +--
 main/survey/question_type.php                 |  6 +--
 main/survey/select_question.php               |  6 +--
 .../survey/select_question_group-uploaded.php | 20 ++++----
 main/survey/select_question_group.php         |  8 ++--
 main/survey/survey_all_courses.php            |  6 +--
 main/survey/survey_blank.php                  | 10 ++--
 37 files changed, 196 insertions(+), 209 deletions(-)

diff --git a/main/survey/addanother.php b/main/survey/addanother.php
index d3162784af..7f2fb0fcb7 100644
--- a/main/survey/addanother.php
+++ b/main/survey/addanother.php
@@ -23,7 +23,7 @@
 ==============================================================================
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: addanother.php 10603 2007-01-06 17:01:47Z pcool $
+* 	@version $Id: addanother.php 10605 2007-01-06 17:55:20Z pcool $
 ==============================================================================
 */
 
@@ -217,7 +217,7 @@ if(isset($group_id))
 		$gname=mysql_result($result,$i,'groupname');
 		*/
 ?>
-		<!--<option value="<?echo $groupid;?>" ><?php echo $gname;?></option>-->
+		<!--<option value="<?php echo $groupid;?>" ><?php echo $gname;?></option>-->
 <?php 	//}
 ?>
 
diff --git a/main/survey/attach_existingsurvey.php b/main/survey/attach_existingsurvey.php
index 53c696b161..b81af0bfd9 100644
--- a/main/survey/attach_existingsurvey.php
+++ b/main/survey/attach_existingsurvey.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: attach_existingsurvey.php 10603 2007-01-06 17:01:47Z pcool $
+* 	@version $Id: attach_existingsurvey.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 /*
@@ -255,7 +255,7 @@ window.open(inf+".htm", 'popup', 'width=600,height=600,toolbar = no, status = no
 <!-- month: january ->
 december -->
 <select name="fmonth">
-<?
+<?php 
 		for($i=1;$i<count($MonthsLong);$i++)
 		{
 			if($i<=9)
@@ -300,7 +300,7 @@ december -->
     <!-- month: january ->
 december -->
 <select name="end_fmonth">
-<?
+<?php 
 		for($i=1;$i<count($MonthsLong);$i++)
 		{
 			if($i<=9)
diff --git a/main/survey/attach_question.php b/main/survey/attach_question.php
index cd033dcda1..0acbd0d340 100644
--- a/main/survey/attach_question.php
+++ b/main/survey/attach_question.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: attach_question.php 10603 2007-01-06 17:01:47Z pcool $
+* 	@version $Id: attach_question.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 /*
@@ -266,7 +266,7 @@ window.open(inf+".htm", 'popup', 'width=900,height=800,toolbar = no, status = no
 <!-- month: january ->
 december -->
 <select name="fmonth">
-<?
+<?php 
 		for($i=1;$i<count($MonthsLong);$i++)
 		{
 			if($i<=9)
@@ -311,7 +311,7 @@ december -->
     <!-- month: january ->
 december -->
 <select name="end_fmonth">
-<?
+<?php 
 		for($i=1;$i<count($MonthsLong);$i++)
 		{
 			if($i<=9)
diff --git a/main/survey/attach_survey.php b/main/survey/attach_survey.php
index 1890d0d5ee..72a52c74f7 100644
--- a/main/survey/attach_survey.php
+++ b/main/survey/attach_survey.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: attach_survey.php 10603 2007-01-06 17:01:47Z pcool $
+* 	@version $Id: attach_survey.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 /*
@@ -263,7 +263,7 @@ window.open(inf+".htm", 'popup', 'width=900,height=800,toolbar = no, status = no
 <!-- month: january ->
 december -->
 <select name="fmonth">
-<?
+<?php 
 		for($i=1;$i<count($MonthsLong);$i++)
 		{
 			if($i<=9)
diff --git a/main/survey/blank.php b/main/survey/blank.php
index 2d2a8afeff..9e2f28a0b2 100644
--- a/main/survey/blank.php
+++ b/main/survey/blank.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: blank.php 10583 2007-01-02 14:47:19Z pcool $
+* 	@version $Id: blank.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -69,7 +69,7 @@ Display :: display_header();
 
 <table width="707" border="0" cellspacing="0" cellpadding="0">
 	<tr>
-    <?
+    <?php 
 		switch ($qtype)
 		{
 			/** @todo switch statement with hard coded language string => won't work in a language that is not English */
@@ -79,14 +79,14 @@ Display :: display_header();
 				<td width="100%" bgcolor="F6F5F5"><p><strong><?php echo get_lang('Question'); ?>: </strong><br />
 	            <?php echo html_entity_decode($ques);?><br />
 	            <strong><?php echo get_lang('Answers'); ?>:</strong>><br />
-				<textarea cols="50" rows="3" disabled='true'><?echo $answers[0];?></textarea>
+				<textarea cols="50" rows="3" disabled='true'><?php echo $answers[0];?></textarea>
 	            <input name="radiobutton" type="radio" value="radiobutton">
-				<textarea cols="50" rows="3" disabled='true'><?echo $answers[1];?></textarea>
+				<textarea cols="50" rows="3" disabled='true'><?php echo $answers[1];?></textarea>
 	            <input name="radiobutton" type="radio" value="radiobutton">
 				</td>
 				
 				<td width="10" height="161" bgcolor="F6F5F5">&nbsp;</td>
-				<?
+				<?php 
 				break;
 			}
 			
@@ -98,7 +98,7 @@ Display :: display_header();
 	            <?php echo $ques;?><br />
 				<br />
 				<strong><?php echo get_lang('Answers'); ?>: </strong><br />
-				<?
+				<?php 
 				$i=0;
 				for($p=1;$p<$count;$i++,$p++)
 				{
@@ -106,12 +106,12 @@ Display :: display_header();
 					<textarea cols="50" rows="3" disabled="true"><?php echo $answers[$i]; ?></textarea>
 					<input type="checkbox" name="checkbox" value="checkbox">
 					<br />
-				<?
+				<?php 
 				}
 				?>
 				</td>
 	          	<td width="8" height="161" bgcolor="F6F5F5">&nbsp;</td> 
-	          	<?
+	          	<?php 
 				break;
 			}
 			
@@ -123,7 +123,7 @@ Display :: display_header();
 	                <?php echo $ques;?><br />
 	                <br />
 	                <strong><?php echo get_lang('Answers'); ?>:</strong><br />
-					<?
+					<?php 
 					$i=0;
 					for($p=1;$p<$count;$i++,$p++)
 					{
@@ -131,12 +131,12 @@ Display :: display_header();
 	              		<textarea cols="50" rows="3" disabled='true'><?php echo $answers[$i]; ?></textarea>
 	              		<input name="radiobutton" type="radio" value="radiobutton">
 	              		<br />
-	              	<?
+	              	<?php 
 					}
 					?>
 	          		</td>
 	          		<td width="8" height="161" bgcolor="F6F5F5">&nbsp;</td>
-	          		<?
+	          		<?php 
 					break;
 			}
 			
@@ -150,7 +150,7 @@ Display :: display_header();
 	            <strong><?php echo get_lang('Answers'); ?>:</strong><br />
 	            <textarea  style="width: 100%" name="defaultext" rows=3 cols=60></textarea>
 	          	</td>
-	          	<?
+	          	<?php 
 				break;
 			}
 			
@@ -162,7 +162,7 @@ Display :: display_header();
 				<?php echo $ques;?><br />
 	            <br />
 	            <strong><?php echo get_lang('Answers'); ?>: </strong><br />
-				<?
+				<?php 
 				$i=0;
 				for($p=1;$p<$count;$i++,$p++)
 				{
@@ -182,7 +182,7 @@ Display :: display_header();
 		                <option value="<?php echo $i; ?>">10</option>
 					</select>
 					<br />
-		            <?
+		            <?php 
 				}
 	          	echo '</td>';
 				break;		
diff --git a/main/survey/bluebreeze.php b/main/survey/bluebreeze.php
index c896bbe6b3..884e8d96ee 100644
--- a/main/survey/bluebreeze.php
+++ b/main/survey/bluebreeze.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: bluebreeze.php 10583 2007-01-02 14:47:19Z pcool $
+* 	@version $Id: bluebreeze.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -83,11 +83,11 @@ Display :: display_header();
 			<td height="39" background="images_white/left.gif">&nbsp;</td>
           	<td><strong><?php echo get_lang('Question'); ?>: </strong><br />
           	<?php echo $ques;?><br /><br /><strong><?php echo get_lang('Answers'); ?>: </strong><br />
-          	<textarea cols="50" rows="3" disabled='true'><?echo $answers[0];?></textarea>
-          	<input name="radiobutton" type="radio" value="radiobutton"><br /><textarea cols="50" rows="3" disabled='true'><?echo $answers[1];?></textarea>
+          	<textarea cols="50" rows="3" disabled='true'><?php echo $answers[0];?></textarea>
+          	<input name="radiobutton" type="radio" value="radiobutton"><br /><textarea cols="50" rows="3" disabled='true'><?php echo $answers[1];?></textarea>
           	<input name="radiobutton" type="radio" value="radiobutton"></td>
           	<td background="images_white/right.gif">&nbsp;</td>
-			<?
+			<?php 
 			break;
 		}
 		
@@ -99,19 +99,19 @@ Display :: display_header();
         	<td><strong><?php echo get_lang('Question'); ?>: </strong><br />
         	<?php echo $ques;?><br />
         	<br /><strong><?php echo get_lang('Answers'); ?>: </strong><br />
-			<?
+			<?php 
 			$i=0;
 			for($p=1;$p<$count;$i++,$p++)
 			{
 			?>
 				<textarea cols="50" rows="3" disabled='true'><?php echo $answers[$i]; ?></textarea>
 				<input type="checkbox" name="checkbox" value="checkbox"><br />
-			<?
+			<?php 
 			}
 			?>
 			</td>
         	<td background="images_white/right.gif">&nbsp;</td>
-			<?
+			<?php 
 			break;
 		}
 		
@@ -120,19 +120,19 @@ Display :: display_header();
 		{?>
 		<td height="39" background="../survey/images_white/left.gif">&nbsp;</td>
         <td><strong><?php echo get_lang('Question'); ?>: </strong><br /><?php echo $ques;?><br /><br /><strong><?php echo get_lang('Answers'); ?>: </strong><br />
-		<?
+		<?php 
 		$i=0;
 		for($p=1;$p<$count;$i++,$p++)
 		{
 		?>
 		<textarea cols="50" rows="3" disabled='true'><?php echo $answers[$i]; ?></textarea>
 		<input name="radiobutton" type="radio" value="radiobutton"><br />
-		<?
+		<?php 
 		}
 		?>
 		</td>
         <td background="../survey/images_white/right.gif">&nbsp;</td>
-		<?
+		<?php 
 		break;
 		}
 		case "Open":
@@ -143,14 +143,14 @@ Display :: display_header();
         </TEXTAREA> 	
 		</td>
         <td background="../survey/images_white/right.gif">&nbsp;</td>
-		<?
+		<?php 
 		break;
 		}
 		case "Numbered":
 		{?>
 		<td height="39" background="../survey/images_white/left.gif">&nbsp;</td>
         <td><strong><?php echo get_lang('Question'); ?>: </strong><br /><?php echo $ques;?><br /><br /><strong><?php echo get_lang('Answers'); ?>: </strong><br />
-		<?
+		<?php 
 		$i=0;
 		for($p=1;$p<$count;$i++,$p++)
 		{
@@ -169,12 +169,12 @@ Display :: display_header();
 		<option value="$i">9</option>
 		<option value="$i">10</option>
 		</select><br />
-		<?
+		<?php 
 		}
 		?>
 		</td>
         <td background="../survey/images_white/right.gif">&nbsp;</td>
-		<?
+		<?php 
 		break;		
 		}
 		}
diff --git a/main/survey/create_from_existing_survey.php b/main/survey/create_from_existing_survey.php
index 51b6192845..f615fd370f 100644
--- a/main/survey/create_from_existing_survey.php
+++ b/main/survey/create_from_existing_survey.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: create_from_existing_survey.php 10583 2007-01-02 14:47:19Z pcool $
+* 	@version $Id: create_from_existing_survey.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 /*
@@ -170,7 +170,7 @@ if( isset($error_message) )
 		</tr>
 		</table>
 		</form>
-<?	
+<?php 	
     }
 	else
 	{
diff --git a/main/survey/create_new_survey.php b/main/survey/create_new_survey.php
index fadfc95f84..263b0b1553 100644
--- a/main/survey/create_new_survey.php
+++ b/main/survey/create_new_survey.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: create_new_survey.php 10603 2007-01-06 17:01:47Z pcool $
+* 	@version $Id: create_new_survey.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -294,7 +294,7 @@ if($surveyid = $_REQUEST['surveyid'])
 	    <!-- month: january ->
 	december -->
 	<select name="end_fmonth">
-		<?
+		<?php 
 			for($i=1;$i<=count($MonthsLong);$i++)
 			{
 				if($i<=9)
diff --git a/main/survey/download.php b/main/survey/download.php
index 6d7f7c6fc4..b450bb09fb 100644
--- a/main/survey/download.php
+++ b/main/survey/download.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /*
     DOKEOS - elearning and course management software
 
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: download.php 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: download.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 $filename="temp/test.csv";
diff --git a/main/survey/download1.php b/main/survey/download1.php
index b321ea6843..87d0b24cca 100644
--- a/main/survey/download1.php
+++ b/main/survey/download1.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /*
     DOKEOS - elearning and course management software
 
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: download1.php 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: download1.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 $survey_name=$_GET['survey_name'];
diff --git a/main/survey/existing_surveys_new.php b/main/survey/existing_surveys_new.php
index c04476c329..fd5d6df1b1 100644
--- a/main/survey/existing_surveys_new.php
+++ b/main/survey/existing_surveys_new.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: existing_surveys_new.php 10603 2007-01-06 17:01:47Z pcool $
+* 	@version $Id: existing_surveys_new.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 /*
@@ -76,7 +76,7 @@ function displayTemplate(url) {
 <table>
 <tr>
 <td>
-<?echo get_lang('SurveyName');?>&nbsp;<?echo $sname;?>
+<?php echo get_lang('SurveyName');?>&nbsp;<?php echo $sname;?>
 </td>
 </tr>
 <tr>
@@ -146,7 +146,7 @@ function displayTemplate(url) {
 		{$flag=1;}
 		?>		
 		</form>
-<?	
+<?php 	
     }
 	else
 	{
@@ -158,6 +158,6 @@ function displayTemplate(url) {
 <form action="select_question_group.php?cidReq=<?php echo $cidReq; ?>&db_name=<?php echo $db_name; ?>&surveyid=<?php echo $surveyid; ?>&curr_dbname=<?php echo $curr_dbname; ?>" method="post">
 <input type="submit" name="back1" value="<?php echo get_lang('Back'); ?>">
 </form>
-<?
+<?php 
 Display :: display_footer();
 ?> 
\ No newline at end of file
diff --git a/main/survey/exp.php b/main/survey/exp.php
index e92e26edf6..fb7f8c0b9b 100644
--- a/main/survey/exp.php
+++ b/main/survey/exp.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /*
     DOKEOS - elearning and course management software
 
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: exp.php 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: exp.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 $filename = 'account_history_'.date('mdY').'.csv';
diff --git a/main/survey/group_add_question.php b/main/survey/group_add_question.php
index a652da0218..15c0d6d12b 100644
--- a/main/survey/group_add_question.php
+++ b/main/survey/group_add_question.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: group_add_question.php 10603 2007-01-06 17:01:47Z pcool $
+* 	@version $Id: group_add_question.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 /*
@@ -96,7 +96,7 @@ $name = surveymanager :: get_groupname($gid);
 <td><?php api_display_tool_title($GName);?></td> 
 <td><?php api_display_tool_title($name);?></td>
 </tr>
-<?
+<?php 
 if( isset($error_message) )
 {
 	Display::display_error_message($error_message);	
@@ -168,12 +168,12 @@ function g_redirect($url,$mode)
        header("Refresh: 0; URL=\"$url\""); 
        exit;
      case 'META':
-       ?><meta http-equiv="refresh" content="0;url=<?php echo $url; ?>" /><?
+       ?><meta http-equiv="refresh" content="0;url=<?php echo $url; ?>" /><?php 
        exit;
      default: /* -- JavaScript */
        ?><script type="text/javascript">
        window.location.href='<?php echo $url; ?>';
-       </script><?
+       </script><?php 
   }
   exit;
 } 
diff --git a/main/survey/group_list.php b/main/survey/group_list.php
index a70f40f427..d6786b6846 100644
--- a/main/survey/group_list.php
+++ b/main/survey/group_list.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: group_list.php 10583 2007-01-02 14:47:19Z pcool $
+* 	@version $Id: group_list.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 /*
@@ -100,7 +100,7 @@ $table_group =  Database :: get_course_table('survey_group');
 		<input type="hidden" name="groupid" value="<?php echo $groupid; ?>">
 		<input type="hidden" name="db_name" value="<?php echo $db_name; ?>">
 		<input type="hidden" name="curr_dbname" value="<?php echo $curr_dbname;?>">
-	<?	
+	<?php 	
 		$gnames = array();
 		while ($obj = mysql_fetch_object($res))
 		{
@@ -143,7 +143,8 @@ $table_group =  Database :: get_course_table('survey_group');
 		</tr>
 		</table>
 		</form>
-<?	}
+<?php 
+	}
 	else
 	{
 		echo get_lang('NoSearchResults');
diff --git a/main/survey/mcma.php b/main/survey/mcma.php
index b45ec39d2d..0c6e2a928f 100644
--- a/main/survey/mcma.php
+++ b/main/survey/mcma.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /*
     DOKEOS - elearning and course management software
 
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: mcma.php 10603 2007-01-06 17:01:47Z pcool $
+* 	@version $Id: mcma.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 // name of the language file that needs to be included 
diff --git a/main/survey/mcma_edit.php b/main/survey/mcma_edit.php
index 4e0301074a..db2ae7100d 100644
--- a/main/survey/mcma_edit.php
+++ b/main/survey/mcma_edit.php
@@ -1,4 +1,4 @@
-<?
+<?php 
 /*
     DOKEOS - elearning and course management software
 
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: mcma_edit.php 10596 2007-01-05 14:09:55Z elixir_inter $
+* 	@version $Id: mcma_edit.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -161,10 +161,10 @@ if( isset($error_message) )
 	  <td valign="top"><strong><?php echo get_lang('SelectDisplayType'); ?></strong>&nbsp;</td>
 	  </tr>
 	  <tr><td>
-         <input type="radio" name="alignment" value="horizontal" <?if($rs->alignment=='horizontal' || $_POST['alignment']=='horizontal'){?>checked<?}?>>Horizontal</td>
+         <input type="radio" name="alignment" value="horizontal" <?php if($rs->alignment=='horizontal' || $_POST['alignment']=='horizontal'){?>checked<?php }?>>Horizontal</td>
       </tr>
 	  <tr><td>
-		 <input type="radio" name="alignment" value="vertical" <?if($rs->alignment=='vertical' || $_POST['alignment']=='vertical'){?>checked<?}?>>Vertical</td>
+		 <input type="radio" name="alignment" value="vertical" <?php if($rs->alignment=='vertical' || $_POST['alignment']=='vertical'){?>checked<?php }?>>Vertical</td>
 		 </tr>
 
 </td></tr>
@@ -360,33 +360,34 @@ if( isset($error_message) )
 					</td>
 					<td width="30" align="center" class="form_text">&nbsp; 
              		</td>
-<?					if($i>$start)
+<?php 
+					if($i>$start)
 					{
 ?>
 					<td width="30" align="center" class="form_text1"> 
 						<input type="image" src="../img/up.gif" width="24" height="24" border="0" onclick="this.form.submit();" name="<?echo "up".$i;?>" style="cursor:hand"> 
 					</td>
-<?					}
+<?php 				}
 					else
 					{
 ?>						<td width="30" align="center" class="form_text1"> 
 						</td>
-<?					}
+<?php 				}
 					$sn++;
 ?>
 
-<?					if($i<$end)
+<?php 				if($i<$end)
 					{
 ?>
 					<td width="30" align="center" class="form_text"> 
 						<input type="image" src="../img/down.gif" width="24" height="24" border="0" onclick="this.form.submit();" name="<?echo "down".$i;?>" style="cursor:hand"> 
 					</td>
-<?					}
+<?php 				}
 					else
 					{
 ?>						<td width="30" align="center" class="form_text1"> 
 						</td>
-<?					}
+<?php 				}
 ?>
 					<td width="30" align="center" class="form_text">
 
@@ -394,7 +395,7 @@ if( isset($error_message) )
 					
 					<input type="image" src="../img/delete.gif" width="24" height="24" border="0" style="cursor:hand" name="<?php echo "id".$i;?>" value="<?php echo $end; ?>" onclick="this.form.submit();">					
 			</tr>
-<?		}	
+<?php 	}	
 	}
 	
 ?>   
@@ -428,11 +429,11 @@ if( isset($error_message) )
 						
 			<input type="HIDDEN" name="end1" value="<?php echo $end; ?>">
 
-
-<?			if(isset($_POST['add_question']))
+<?php 
+			if(isset($_POST['add_question']))
 			{
-?>				<input type="hidden" name="add_question" value="<?php echo $_POST['add_question'];?>" >
-<?			}
+				echo '<input type="hidden" name="add_question" value="'.$_POST['add_question'].'" />';
+			}
 			$sql = "SELECT * FROM $curr_dbname.survey WHERE survey_id='$surveyid'";
 			$res=api_sql_query($sql);
 			$obj=mysql_fetch_object($res);
diff --git a/main/survey/mcma_view.php b/main/survey/mcma_view.php
index 33954f66e6..2cb8ebc16f 100644
--- a/main/survey/mcma_view.php
+++ b/main/survey/mcma_view.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: mcma_view.php 10583 2007-01-02 14:47:19Z pcool $
+* 	@version $Id: mcma_view.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -104,7 +104,7 @@ body {
 		
 		<td height="39" background="../survey/images_white/left.gif">&nbsp;</td>
         <td><strong>Question: </strong><br><?php echo $obj->caption;?><br><br><strong>Answers: </strong><br>
-		<?
+		<?php 
 		for($i=1;$i<10;$i++)
 		{
 			$temp = "a".$i;
@@ -115,7 +115,7 @@ body {
 		?>
 		<textarea cols="50" rows="3" disabled='true'><?php echo $obj->$temp; ?></textarea> 
 		<input type="checkbox" name="checkbox" value="checkbox"><br>
-		<?
+		<?php 
 			}
 		}
 		?>
diff --git a/main/survey/mcsa.php b/main/survey/mcsa.php
index dace021a14..5104425dc4 100644
--- a/main/survey/mcsa.php
+++ b/main/survey/mcsa.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: mcsa.php 10596 2007-01-05 14:09:55Z elixir_inter $
+* 	@version $Id: mcsa.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -185,8 +185,7 @@ if ($_POST['action'] == 'addquestion')
 		}
 	}
 }
-?>
-<?
+
 $tool = get_lang('AddAnotherQuestion');
 Display::display_header($tool);
 ?>
@@ -465,38 +464,38 @@ $start=1;$end=5;$upx=2;$upy=1;$dwnx=0;$dwny=1;$jd=0;$sn=1;
 					</td>
 					<td width="10" class="form_text"><img src="../img/blank.gif" width="10" height="8">
 					</td>										
-<?					if($i>$start)
+<?php 				if($i>$start)
 					{
 ?>
 					<td width="30" align="center" class="form_text1"> 
 						<input type="image" src="../img/up.gif" width="24" height="24" border="0" onclick="this.form.submit();" name="<?echo "up".$i;?>" style="cursor:hand"> 
 					</td>
-<?					}
+<?php				}
 					else
 					{
 ?>						<td width="30" align="center" class="form_text1"> 
 						</td>
-<?					}
+<?php				}
 					$sn++;
 ?>
 
-<?					if($i<$end)
+<?php				if($i<$end)
 					{
 ?>
 					<td width="30" align="center" class="form_text"> 
 						<input type="image" src="../img/down.gif" width="24" height="24" border="0" onclick="this.form.submit();" name="<?echo "down".$i;?>" style="cursor:hand"> 
 					</td>
-<?					}
+<?php				}
 					else
 					{
 ?>						<td width="30" align="center" class="form_text1"> 
 						</td>
-<?					}
+<?php				}
 ?>
 					<td width="30" align="center" class="form_text">					
 					<input type="image" src="../img/delete.gif" width="24" height="24" border="0" style="cursor:hand" name="<?php echo "id".$i;?>" value="<?php echo $end; ?>" onclick="this.form.submit();">	
 			</tr>
-<?		}	
+<?php	}	
 	}
 	
 ?>		
@@ -523,10 +522,10 @@ $start=1;$end=5;$upx=2;$upy=1;$dwnx=0;$dwny=1;$jd=0;$sn=1;
 
 			<input type="HIDDEN" name="end1" value="<?php echo $end; ?>">
 
-<?			if(isset($_POST['add_question']))
+<?php			if(isset($_POST['add_question']))
 			{
 ?>				<input type="hidden" name="add_question" value="<?php echo $_POST['add_question'];?>" >
-<?			}
+<?php			}
 
 			$sql = "SELECT * FROM $curr_dbname.survey WHERE survey_id='$surveyid'";
 			$res=api_sql_query($sql);
diff --git a/main/survey/mcsa_edit.php b/main/survey/mcsa_edit.php
index 78a3fd7411..6a240ee56a 100644
--- a/main/survey/mcsa_edit.php
+++ b/main/survey/mcsa_edit.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: mcsa_edit.php 10596 2007-01-05 14:09:55Z elixir_inter $
+* 	@version $Id: mcsa_edit.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -167,10 +167,10 @@ if( isset($error_message) )
 	  <td valign="top"><strong><?php echo get_lang('SelectDisplayType'); ?></strong>&nbsp;</td>
 	  </tr>
 	  <tr><td>
-         <input type="radio" name="alignment" value="horizontal" <?if($rs->alignment=='horizontal' || $_POST['alignment']=='horizontal'){?>checked<?}?>>Horizontal</td>
+         <input type="radio" name="alignment" value="horizontal" <?php if($rs->alignment=='horizontal' || $_POST['alignment']=='horizontal'){?>checked<?php }?>>Horizontal</td>
       </tr>
 	  <tr><td>
-		 <input type="radio" name="alignment" value="vertical" <?if($rs->alignment=='vertical' || $_POST['alignment']=='vertical'){?>checked<?}?>>Vertical</td>
+		 <input type="radio" name="alignment" value="vertical" <?php if($rs->alignment=='vertical' || $_POST['alignment']=='vertical'){?>checked<?php }?>>Vertical</td>
 		 </tr>
 
 </td></tr>
@@ -340,38 +340,38 @@ $start=1;$end=$check;$upx=2;$upy=1;$dwnx=0;$dwny=1;$jd=0;$sn=1;
 					</td>
 					<td width="10" class="form_text"><img src="../img/blank.gif" width="10" height="8">
 					</td>					
-<?					if($i>$start)
+<?php				if($i>$start)
 					{
 ?>
 					<td width="30" align="center" class="form_text1"> 
 						<input type="image" src="../img/up.gif" width="24" height="24" border="0" onclick="this.form.submit();" name="<?echo "up".$i;?>" style="cursor:hand"> 
 					</td>
-<?					}
+<?php				}
 					else
 					{
 ?>						<td width="30" align="center" class="form_text1"> 
 						</td>
-<?					}
+<?php				}
 					$sn++;
 ?>
 
-<?					if($i<$end)
+<?php				if($i<$end)
 					{
 ?>
 					<td width="30" align="center" class="form_text"> 
-						<input type="image" src="../img/down.gif" width="24" height="24" border="0" onclick="this.form.submit();" name="<?echo "down".$i;?>" style="cursor:hand"> 
+						<input type="image" src="../img/down.gif" width="24" height="24" border="0" onclick="this.form.submit();" name="<?php echo "down".$i;?>" style="cursor:hand"> 
 					</td>
-<?					}
+<?php				}
 					else
 					{
 ?>						<td width="30" align="center" class="form_text1"> 
 						</td>
-<?					}
+<?php				}
 ?>
 					<td width="30" align="center" class="form_text">					
 					<input type="image" src="../img/delete.gif" width="24" height="24" border="0" style="cursor:hand" name="<?php echo "id".$i;?>" value="<?php echo $end; ?>" onclick="this.form.submit();">	
 			</tr>
-<?		}	
+<?php	}	
 	}
 	
 ?>		
@@ -398,10 +398,10 @@ $start=1;$end=$check;$upx=2;$upy=1;$dwnx=0;$dwny=1;$jd=0;$sn=1;
 
 			<input type="HIDDEN" name="end1" value="<?php echo $end; ?>">
 
-<?			if(isset($_POST['add_question']))
+<?php		if(isset($_POST['add_question']))
 			{
 ?>				<input type="hidden" name="add_question" value="<?php echo $_POST['add_question'];?>" >
-<?			}
+<?php		}
 			$sql = "SELECT * FROM $curr_dbname.survey WHERE survey_id='$surveyid'";
 			$res=api_sql_query($sql);
 			$obj=mysql_fetch_object($res);
diff --git a/main/survey/mcsa_view.php b/main/survey/mcsa_view.php
index b90a5a4e23..1a43c77095 100644
--- a/main/survey/mcsa_view.php
+++ b/main/survey/mcsa_view.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: mcsa_view.php 10583 2007-01-02 14:47:19Z pcool $
+* 	@version $Id: mcsa_view.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -101,7 +101,7 @@ body {
         <tr>
 		<td height="39" background="../survey/images_white/left.gif">&nbsp;</td>
         <td><strong>Question: </strong><br><?php echo $obj->caption;?><br><br><strong>Answers: </strong><br>
-		<?
+		<?php
 		for($i=1;$i<10;$i++)
 		{
 			$temp = "a".$i;
@@ -112,7 +112,7 @@ body {
 		?>
 		<textarea cols="50" rows="3" disabled='true'><?php echo $obj->$temp;?></textarea>
 		<input name="radiobutton" type="radio" value="radiobutton"><br>
-		<?
+		<?php
 			}
 		}
 		?>
diff --git a/main/survey/numbered.php b/main/survey/numbered.php
index ce4978a4ca..08b5989999 100644
--- a/main/survey/numbered.php
+++ b/main/survey/numbered.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: numbered.php 10596 2007-01-05 14:09:55Z elixir_inter $
+* 	@version $Id: numbered.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -186,8 +186,7 @@ if ($_POST['action'] == 'addquestion')
 		}
 	}
 }
-?>
-<?
+
 $tool = get_lang('AddAnotherQuestion');
 Display::display_header($tool);
 select_question_type($add_question12,$groupid,$surveyid,$cidReq,$curr_dbname);
@@ -481,33 +480,33 @@ function checkLength(form){
 					<td width="10" class="form_text"><img src="../img/blank.gif" width="10" height="8">
 					</td>
 					
-<?					if($i>$start)
+<?php				if($i>$start)
 					{
 ?>
 					<td width="30" align="center" class="form_text1"> 
-						<input type="image" src="../img/up.gif" width="24" height="24" border="0" onclick="this.form.submit();" name="<?echo "up".$i;?>" style="cursor:hand"> 
+						<input type="image" src="../img/up.gif" width="24" height="24" border="0" onclick="this.form.submit();" name="<?php echo "up".$i;?>" style="cursor:hand"> 
 					</td>
-<?					}
+<?php				}
 					else
 					{
 ?>						<td width="30" align="center" class="form_text1"> 
 						</td>
-<?					}
+<?php				}
 					$sn++;
 ?>
 
-<?					if($i<$end)
+<?php				if($i<$end)
 					{
 ?>
 					<td width="30" align="center" class="form_text"> 
-						<input type="image" src="../img/down.gif" width="24" height="24" border="0" onclick="this.form.submit();" name="<?echo "down".$i;?>" style="cursor:hand"> 
+						<input type="image" src="../img/down.gif" width="24" height="24" border="0" onclick="this.form.submit();" name="<?php echo "down".$i;?>" style="cursor:hand"> 
 					</td>
-<?					}
+<?php				}
 					else
 					{
 ?>						<td width="30" align="center" class="form_text1"> 
 						</td>
-<?					}
+<?php				}
 ?>
 					<td width="30" align="center" class="form_text">
 
@@ -516,49 +515,38 @@ function checkLength(form){
 					<input type="image" src="../img/delete.gif" width="24" height="24" border="0" style="cursor:hand" name="<?php echo "id".$i;?>" value="<?php echo $end; ?>" onclick="this.form.submit();">
 					
 			</tr>
-<?		}	
+<?php	}	
 	}
 	
 ?>
-    
-		
 			</table>
-					
 											
 			<table width="100%" border="0" cellspacing="0" cellpadding="0">
 				<tr class="white_bg"> 
 					  <td height="30"><span class="form_text1">Add&nbsp;&nbsp;</span>
 							<select name="addnewrows" class="text_field_small" style="width:100px" onChange="this.form.submit();">
-								
-							
 								<option value="0" >0</option>
 								<option value="1" >1</option>
 								<option value="2" >2</option>
 								<option value="3" >3</option>
 								<option value="4" >4</option>
 								<option value="5" >5</option>
-								
 							</select>
 						  <a class="form_text1">New Answer</a>
-						  
 						<span class="form_text"><span class="form_text1">
-						
-						
 					</td>
 				</tr>
 			</table>
 
-	        <br>
-			<br>
+	        <br />
+			<br />
 			<div align="center">
-						
-
-			<input type="HIDDEN" name="end1" value="<?php echo $end; ?>">
+			<input type="hidden" name="end1" value="<?php echo $end; ?>">
 
-<?			if(isset($_POST['add_question']))
+<?php		if(isset($_POST['add_question']))
 			{
-?>				<input type="hidden" name="add_question" value="<?php echo $_POST['add_question'];?>" >
-<?			}
+				echo '<input type="hidden" name="add_question" value="'.$_POST['add_question'].'" />';
+			}
 
 			$sql = "SELECT * FROM $curr_dbname.survey WHERE survey_id='$surveyid'";
 			$res=api_sql_query($sql);
diff --git a/main/survey/numbered_edit.php b/main/survey/numbered_edit.php
index 113c9fead5..9e41c2199e 100644
--- a/main/survey/numbered_edit.php
+++ b/main/survey/numbered_edit.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: numbered_edit.php 10596 2007-01-05 14:09:55Z elixir_inter $
+* 	@version $Id: numbered_edit.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -305,38 +305,38 @@ $start=1;$end=$check;$upx=2;$upy=1;$dwnx=0;$dwny=1;$jd=0;$sn=1;
 					</td>					
 					<td class="form_bg"><textarea name="mutlichkboxtext[]" cols="50" rows="3" class="text_field" style="width:100%;"><?php echo $post_text; ?></textarea>
 					</td>
-<?					if($i>$start)
+<?php				if($i>$start)
 					{
 ?>
 					<td width="30" align="center" class="form_text1"> 
-						<input type="image" src="../img/up.gif" width="24" height="24" border="0" onclick="this.form.submit();" name="<?echo "up".$i;?>" style="cursor:hand"> 
+						<input type="image" src="../img/up.gif" width="24" height="24" border="0" onclick="this.form.submit();" name="<?php echo "up".$i;?>" style="cursor:hand"> 
 					</td>
-<?					}
+<?php				}
 					else
 					{
 ?>						<td width="30" align="center" class="form_text1"> 
 						</td>
-<?					}
+<?php				}
 					$sn++;
 ?>
 
-<?					if($i<$end)
+<?php				if($i<$end)
 					{
 ?>
 					<td width="30" align="center" class="form_text"> 
-						<input type="image" src="../img/down.gif" width="24" height="24" border="0" onclick="this.form.submit();" name="<?echo "down".$i;?>" style="cursor:hand"> 
+						<input type="image" src="../img/down.gif" width="24" height="24" border="0" onclick="this.form.submit();" name="<?php echo "down".$i;?>" style="cursor:hand"> 
 					</td>
-<?					}
+<?php				}
 					else
 					{
 ?>						<td width="30" align="center" class="form_text1"> 
 						</td>
-<?					}
+<?php				}
 ?>
 					<td width="30" align="center" class="form_text">					
 					<input type="image" src="../img/delete.gif" width="24" height="24" border="0" style="cursor:hand" name="<?php echo "id".$i;?>" value="<?php echo $end;?>" onclick="this.form.submit();">	
 			</tr>
-<?		}	
+<?php	}	
 	}
 	
 ?>		
@@ -360,7 +360,7 @@ $start=1;$end=$check;$upx=2;$upy=1;$dwnx=0;$dwny=1;$jd=0;$sn=1;
 	        <br>
 			<br>
 			<div align="center">	
-			<?
+			<?php
 			$sql = "SELECT * FROM $curr_dbname.survey WHERE survey_id='$surveyid'";
 			$res=api_sql_query($sql);
 			$obj=mysql_fetch_object($res);
@@ -384,8 +384,8 @@ $start=1;$end=$check;$upx=2;$upy=1;$dwnx=0;$dwny=1;$jd=0;$sn=1;
 			}
 			?>
 
-			<input type="HIDDEN" name="end1" value="<?php echo $end; ?>">
-			<input type="submit"  name="back" value="<?php echo get_lang('Back'); ?>">
+			<input type="hidden" name="end1" value="<?php echo $end; ?>" />
+			<input type="submit"  name="back" value="<?php echo get_lang('Back'); ?>" />
 			<input type="button" value="<?php echo get_lang('Preview');?>" onClick="preview('numbered','<?php echo $temp; ?>','<?php echo $Multi; ?>')">
 			<input type="submit"  name="update" value="<?php echo get_lang('Update'); ?>"> 
 			</div>
diff --git a/main/survey/numbered_view.php b/main/survey/numbered_view.php
index 1edb989b03..f711b224c7 100644
--- a/main/survey/numbered_view.php
+++ b/main/survey/numbered_view.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: numbered_view.php 10583 2007-01-02 14:47:19Z pcool $
+* 	@version $Id: numbered_view.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -100,7 +100,7 @@ body {
         <tr>
 		<td height="39" background="../survey/images_white/left.gif">&nbsp;</td>
         <td><strong>Question: </strong><br><?php echo $obj->caption;?><br><br><strong>Answers: </strong><br>
-		<?
+		<?php
 		for($i=1;$i<10;$i++)
 		{
 			$temp = "a".$i;
@@ -122,7 +122,7 @@ body {
 		<option value="$i">9</option>
 		<option value="$i">10</option>
 		</select><br>
-		<?
+		<?php
 			}
 		}
 		?>
diff --git a/main/survey/open.php b/main/survey/open.php
index 6528a739bf..fd90616a36 100644
--- a/main/survey/open.php
+++ b/main/survey/open.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: open.php 10596 2007-01-05 14:09:55Z elixir_inter $
+* 	@version $Id: open.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -143,8 +143,6 @@ if ($_POST['action'] == 'addquestion')
 		}
 	}
 }
-?>
-<?
 $tool = get_lang('AddAnotherQuestion');
 Display::display_header($tool);
 if( isset($error_message) )
@@ -233,9 +231,9 @@ border=0>
     <TD height=30>Default Text </TD></TR>
   <TR>
     <TD width=192 height=30><TEXTAREA onkeyup="this.value = this.value.slice(0, 200)" style="WIDTH: 100%" name="defaultext" rows=3 cols=60>
-	<?if(isset($_POST['defaultext']))echo $_POST['defaultext'];?></TEXTAREA> 
+	<?php if(isset($_POST['defaultext']))echo $_POST['defaultext'];?></TEXTAREA> 
     </TD></TR></TBODY></TABLE><BR>-->
-	<?
+	<?php
 	$sql = "SELECT * FROM $curr_dbname.survey WHERE survey_id='$surveyid'";
 			$res=api_sql_query($sql);
 			$obj=mysql_fetch_object($res);
diff --git a/main/survey/open_edit.php b/main/survey/open_edit.php
index 196f37b776..884c29f82f 100644
--- a/main/survey/open_edit.php
+++ b/main/survey/open_edit.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: open_edit.php 10596 2007-01-05 14:09:55Z elixir_inter $
+* 	@version $Id: open_edit.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -184,14 +184,14 @@ border=0>
     <TD height=30>Default Text </TD></TR>
   <TR>
     <TD width=192 height=30><TEXTAREA style="WIDTH: 100%" name="defaultext" rows=3 cols=60>
-	<?
+	<?php
 	if(isset($_POST['defaultext']))
 	echo $_POST['defaultext'];
 	else
 	echo $rs->ad;
 	?></TEXTAREA> 
     </TD></TR></TBODY></TABLE>--><BR>
-		<?
+		<?php
 			$sql = "SELECT * FROM $curr_dbname.survey WHERE survey_id='$surveyid'";
 			$res=api_sql_query($sql);
 			$obj=mysql_fetch_object($res);
diff --git a/main/survey/preview_mcma.php b/main/survey/preview_mcma.php
index 3fecf4b641..496a6dc7ec 100644
--- a/main/survey/preview_mcma.php
+++ b/main/survey/preview_mcma.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: preview_mcma.php 10603 2007-01-06 17:01:47Z pcool $
+* 	@version $Id: preview_mcma.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 /*
@@ -109,17 +109,17 @@ Display::display_header($tool_name);
   <td><?php echo get_lang('Question'); ?></td>
   </tr>
 <tr>
-<td><textarea  cols="50" rows="6" name="questions"> <?echo $enterquestion;?></textarea></td>
+<td><textarea  cols="50" rows="6" name="questions"> <?php echo $enterquestion;?></textarea></td>
 </tr>
 <tr>
   <td></br><?php echo get_lang('Answer'); ?></td>
   </tr>
   <tr>
-  <?
+  <?php
 	for($i=1;$i<=10;$i++)
 	{	
-		?><tr><td><textarea name="yes" cols="50" rows="3"><?echo $mutlichkboxtext[$i];?></textarea></td></tr>
-<?		
+		?><tr><td><textarea name="yes" cols="50" rows="3"><?php echo $mutlichkboxtext[$i];?></textarea></td></tr>
+<?php		
 	}  
   ?>
 <td></br><input type="button" name="back" value="<?php  echo get_lang('Back'); ?>" onClick="javascript:history.go(-1);"></td>
diff --git a/main/survey/preview_open.php b/main/survey/preview_open.php
index 516f6cf350..7cbd24ebb6 100644
--- a/main/survey/preview_open.php
+++ b/main/survey/preview_open.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: preview_open.php 10603 2007-01-06 17:01:47Z pcool $
+* 	@version $Id: preview_open.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 /*
@@ -106,13 +106,13 @@ Display::display_header($tool_name);
   <td><?php echo get_lang('Question'); ?></td>
   </tr>
 <tr>
-<td><textarea  cols="50" rows="6" name="questions"> <?echo $enterquestion;?></textarea></td>
+<td><textarea  cols="50" rows="6" name="questions"> <?php echo $enterquestion;?></textarea></td>
 </tr>
 <tr>
   <td></br><?php echo get_lang('Answer'); ?></td>
   </tr>
   <tr>
-<td><textarea  cols="50" rows="3" name="questions"> <?echo $enterquestion;?></textarea></td>
+<td><textarea  cols="50" rows="3" name="questions"> <?php echo $enterquestion;?></textarea></td>
 </tr>
   <td></br><input type="submit" value="<?php  echo get_lang('Back'); ?> "></td>
  <!-- <td></br><input type="submit" value="<?php  echo get_lang('Import'); ?>"></td>-->
diff --git a/main/survey/preview_yesno.php b/main/survey/preview_yesno.php
index 49bd961226..3870d20134 100644
--- a/main/survey/preview_yesno.php
+++ b/main/survey/preview_yesno.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: preview_yesno.php 10603 2007-01-06 17:01:47Z pcool $
+* 	@version $Id: preview_yesno.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 /*
@@ -129,17 +129,17 @@ $ques_type = $_GET['qtype'];
   <td><?php echo get_lang('Question'); ?></td>
   </tr>
 <tr>
-<td><textarea  cols="50" rows="6" name="questions"> <?echo $enterquestion;?></textarea></td>
+<td><textarea  cols="50" rows="6" name="questions"> <?php echo $enterquestion;?></textarea></td>
 </tr>
 <tr>
   <td></br><?php echo get_lang('Answer'); ?></td>
   </tr>
    <tr>
-  <?
+  <?php
 	for($i=1;$i<=2;$i++)
 	{	
-		?><tr><td><textarea cols="50" rows="3" name="yes"><?echo $mutlichkboxtext[$i];?></textarea></td></tr>
-<?		
+		?><tr><td><textarea cols="50" rows="3" name="yes"><?php echo $mutlichkboxtext[$i];?></textarea></td></tr>
+<?php		
 	}  
   ?>
 <tr>
diff --git a/main/survey/question.php b/main/survey/question.php
index ffe7cc1f3b..d5d2b6c864 100644
--- a/main/survey/question.php
+++ b/main/survey/question.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: question.php 10583 2007-01-02 14:47:19Z pcool $
+* 	@version $Id: question.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -106,8 +106,8 @@ body {
         <tr>
 		<td height="39" background="../survey/images_white/left.gif">&nbsp;</td>
         <td><strong>Question: </strong><br><?php echo $ques;?><br><br><strong>Answers: </strong><br>
-		<textarea name="textfield" cols="50" rows="3" disabled='true'><?echo $obj->a1;?></textarea>
-		<input name="radiobutton" type="radio" value="radiobutton"><br><textarea name="textfield" cols="50" rows="3" disabled='true'><?echo $obj->a2;?></textarea>
+		<textarea name="textfield" cols="50" rows="3" disabled='true'><?php echo $obj->a1;?></textarea>
+		<input name="radiobutton" type="radio" value="radiobutton"><br><textarea name="textfield" cols="50" rows="3" disabled='true'><?php echo $obj->a2;?></textarea>
 		<input name="radiobutton" type="radio" value="radiobutton"></td>
         <td background="../survey/images_white/right.gif">&nbsp;</td>
 		</tr>
diff --git a/main/survey/question_added.php b/main/survey/question_added.php
index 02d3eff5ee..4f9b55b15e 100644
--- a/main/survey/question_added.php
+++ b/main/survey/question_added.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: question_added.php 10559 2006-12-27 10:52:50Z pcool $
+* 	@version $Id: question_added.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 /*
@@ -145,7 +145,7 @@ if($qdeleted)
 	<input type="submit" name="addanotherg" value="<?php echo get_lang('AddAnotherGroup');?>">
 	<input type="submit" name="finish" value="<?php echo get_lang('FinishSurvey');?>">
 </form>	
-<?
+<?php
 /*
 ==============================================================================
 		FOOTER 
diff --git a/main/survey/question_list_new.php b/main/survey/question_list_new.php
index e5ed5a55dd..1bff3380b2 100644
--- a/main/survey/question_list_new.php
+++ b/main/survey/question_list_new.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: question_list_new.php 10583 2007-01-02 14:47:19Z pcool $
+* 	@version $Id: question_list_new.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 
@@ -182,7 +182,7 @@ function displayTemplate(url) {
 <table>
 <tr>
 <td><strong><?php echo get_lang('SurveyName'); ?></strong></td>
-<td><?echo $sname;?></td>
+<td><?php echo $sname;?></td>
 </tr>
 <tr><td></td></tr>
 <tr><td></td></tr>
@@ -251,7 +251,7 @@ function displayTemplate(url) {
 ?>
 		<table>
 		<tr>		
-		<td><input type="submit" name="back" value="<?echo get_lang('Back');?>"></td>
+		<td><input type="submit" name="back" value="<?php echo get_lang('Back');?>"></td>
 		<td><input type="submit" name="importquestion" value="<?php echo get_lang('ImportQuestion');?>"></td>
 		</tr>
 		</table>
diff --git a/main/survey/question_type.php b/main/survey/question_type.php
index 2d506a5f67..b5489dd9db 100644
--- a/main/survey/question_type.php
+++ b/main/survey/question_type.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: question_type.php 10584 2007-01-02 15:09:21Z pcool $
+* 	@version $Id: question_type.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 /*
@@ -64,12 +64,12 @@ api_display_tool_title($tool_name);
 <tr>
 
 <td>
-<?api_display_tool_title($group_name);?>
+<?php api_display_tool_title($group_name);?>
 </td>
 </tr>
 </table>
 
-<?
+<?php
 if( isset($error_message) )
 {
 	Display::display_error_message($error_message);	
diff --git a/main/survey/select_question.php b/main/survey/select_question.php
index 0c2855c282..f3738e762a 100644
--- a/main/survey/select_question.php
+++ b/main/survey/select_question.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: select_question.php 10584 2007-01-02 15:09:21Z pcool $
+* 	@version $Id: select_question.php 10605 2007-01-06 17:55:20Z pcool $
 */
 // including the global dokeos file
 require_once ('../inc/global.inc.php');
@@ -73,7 +73,7 @@ function select_question_type($add_question12,$groupid,$surveyid,$cidReq,$curr_d
 <td><?php api_display_tool_title($group_name); ?></td>
 </tr>
 </table>
-<?
+<?php
 if( isset($error_message) )
 {
 	Display::display_error_message($error_message);	
@@ -102,6 +102,6 @@ if( isset($error_message) )
 </tr>
 </table>
 </form>
-<?
+<?php
 }
 ?>
\ No newline at end of file
diff --git a/main/survey/select_question_group-uploaded.php b/main/survey/select_question_group-uploaded.php
index 8448817df4..bd1064ff78 100644
--- a/main/survey/select_question_group-uploaded.php
+++ b/main/survey/select_question_group-uploaded.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: select_question_group-uploaded.php 10603 2007-01-06 17:01:47Z pcool $
+* 	@version $Id: select_question_group-uploaded.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 
@@ -268,14 +268,14 @@ api_display_tool_title($tool_name);
 if($flag==1)
 {
 ?>
-<div align="center"><strong><font color="#FF0000"><?echo get_lang('AlreadyImported');?></font></strong></div>
-<?
+<div align="center"><strong><font color="#FF0000"><?php echo get_lang('AlreadyImported');?></font></strong></div>
+<?php
 }
 if(isset($messege) && $messege )
 {
 ?>
 <div align="center"><strong><font color="#FF0000">Already Imported !</font></strong></div>
-<?
+<?php
 }
 ?>
 <form method="post" action="<?php echo $_SERVER['PHP_SELF'];?>?cidReq=<?php echo $cidReq; ?>">
@@ -359,7 +359,7 @@ $result=api_sql_query($query);*/
 <input type="hidden" name="surveyid" value="<?php echo $surveyid; ?>">
 <input type="hidden" name="curr_dbname" value="<?php echo $curr_dbname;?>">
 <input type="hidden" name="page" value="<?php echo $page; ?>">
-<?
+<?php
 if(!empty($courses))
 {
 	/** @todo remove $curr_dbname from the parameters. This is not used. */
@@ -371,15 +371,15 @@ if(!empty($courses))
 	<input type="submit" name="addanother" value="<?php echo get_lang('AddAnotherQuestion');?>">
 	<input type="submit" name="addanotherg" value="<?php echo get_lang('AddNewGroup');?>">
 	<input type="submit" name="finish" value="<?php echo get_lang('FinishSurvey');?>">
-<?
+<?php
 }
 else
 {
 ?>
-    <input type="submit" name="back" value="<?echo get_lang('Back');?>">
-	<input type="submit" name="addanother" value="<?echo get_lang('AddAnotherQuestion');?>">
-	<input type="submit" name="addanotherg" value="<?echo get_lang('AddNewGroup');?>">
-<?
+    <input type="submit" name="back" value="<?php echo get_lang('Back');?>">
+	<input type="submit" name="addanother" value="<?php echo get_lang('AddAnotherQuestion');?>">
+	<input type="submit" name="addanotherg" value="<?php echo get_lang('AddNewGroup');?>">
+<?phps
 }	
 ?>
 </form>
diff --git a/main/survey/select_question_group.php b/main/survey/select_question_group.php
index 8ad4ec8a9b..f689a91439 100644
--- a/main/survey/select_question_group.php
+++ b/main/survey/select_question_group.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: select_question_group.php 10603 2007-01-06 17:01:47Z pcool $
+* 	@version $Id: select_question_group.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 
@@ -372,7 +372,7 @@ if(isset($messege) && $messege )
 <input type="hidden" name="groupid" value="<?php echo $groupid; ?>">
 <input type="hidden" name="surveyid" value="<?php echo $surveyid; ?>">
 <input type="hidden" name="page" value="<?php echo $page; ?>">
-<?
+<?php
 if(!empty($courses))
 {
 
@@ -385,7 +385,7 @@ if(!empty($courses))
 	<input type="submit" name="addanother" value="<?php echo get_lang('AddAnotherQuestion');?>">
 	<input type="submit" name="addanotherg" value="<?php echo get_lang('AddNewGroup');?>">
 	<input type="submit" name="finish" value="<?php echo get_lang('FinishSurvey');?>">
-<?
+<?php
 }
 else
 {
@@ -393,7 +393,7 @@ else
     <input type="submit" name="back" value="<?php echo get_lang('Back');?>">
 	<input type="submit" name="addanother" value="<?php echo get_lang('AddAnotherQuestion');?>">
 	<input type="submit" name="addanotherg" value="<?php echo get_lang('AddNewGroup');?>">
-<?
+<?php
 }	
 ?>
 </form>
diff --git a/main/survey/survey_all_courses.php b/main/survey/survey_all_courses.php
index 8dbe05b884..f827af7b50 100644
--- a/main/survey/survey_all_courses.php
+++ b/main/survey/survey_all_courses.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: survey_all_courses.php 10584 2007-01-02 15:09:21Z pcool $
+* 	@version $Id: survey_all_courses.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -180,7 +180,7 @@ function displayTemplate(url) {
 		{$flag=1;}
 		?>		
 		</form>
-<?	
+<?php	
     }
 	else
 	{
@@ -192,7 +192,7 @@ function displayTemplate(url) {
 	<form action="survey.php?cidReq=<?php echo $cidReq; ?>&db_name=<?php echo $db_name; ?>" method="post">
     <input type="submit" name="back1" value="<?php echo get_lang('Back'); ?>">
     </form>
-<?
+<?php
 /*
 -----------------------------------------------------------
 	Footer
diff --git a/main/survey/survey_blank.php b/main/survey/survey_blank.php
index 472980df53..ff466cb078 100644
--- a/main/survey/survey_blank.php
+++ b/main/survey/survey_blank.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: survey_blank.php 10584 2007-01-02 15:09:21Z pcool $
+* 	@version $Id: survey_blank.php 10605 2007-01-06 17:55:20Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -104,7 +104,7 @@ $res = api_sql_query($sql,__FILE__,__LINE__);
 ?>
 <table width="600" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#F6F5F5">
 
-<?
+<?php
 if ($numb=mysql_num_rows($res) > 0)
 	{	
 		?>
@@ -125,7 +125,7 @@ if ($numb=mysql_num_rows($res) > 0)
 		      <input type="hidden" name="mail" value="<?php echo $mail;?>">
 			  <input type="hidden" name="username" value="<?php echo $username;?>">
 	   <table width="100%"  border="0" cellpadding="0" cellspacing="0">
-		<?
+		<?php
 		$users = array ();
 		$i=$lower+1;
 		$group_array=array();
@@ -792,12 +792,12 @@ if ($numb=mysql_num_rows($res) > 0)
 					if($num >= $page) {echo "";
 					?>
 					<input type="button" value="Print" onClick="printpage()">
-					<?}
+					<?php }
 					else{ $sub_name = "Next";
 					?>			
 					<input type="submit" name="submit" value="<?php echo $sub_name; ?>">&nbsp;<input type="button"
 value="Print" onClick="printpage()"></td>
-					<?}?>
+					<?php }?>
 				  </tr>
 		</table>
 	  </form>