From 107e7612b56814bb4e7c2385b72e79811453fbd0 Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Tue, 7 Mar 2006 21:46:34 +0000
Subject: [PATCH] short php tags once more

---
 admin/handlevirus.php                  |  2 +-
 admin/process_email.php                |  2 +-
 auth/shibboleth/config.html            |  2 +-
 lang/en_utf8/block_loancalc.php        |  2 +-
 lib/editor/htmlarea/popups/preview.php |  2 +-
 mod/chat/gui_header_js/jsupdate.php    |  2 +-
 mod/data/field/file/mod.html           |  2 +-
 mod/data/field/menu/mod.html           |  2 +-
 mod/data/field/picture/mod.html        | 10 +++++-----
 mod/data/field/url/mod.html            |  2 +-
 mod/hotpot/show.php                    |  4 ++--
 question/category_class.php            |  2 +-
 user/message.html                      |  2 +-
 13 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/admin/handlevirus.php b/admin/handlevirus.php
index 5d4b022b5cf..f2b20e2126a 100644
--- a/admin/handlevirus.php
+++ b/admin/handlevirus.php
@@ -1,4 +1,4 @@
-<?
+<?php // $Id$
 /** This expects the output from a command like
  * clamscan -r --infected --no-summary <files> 2>&1 | php -d error_log=/path/to/log thisfile.php 
  * also it's important that the output of clamscan prints the FULL PATH to each infected file, so use absolute paths for area to scan
diff --git a/admin/process_email.php b/admin/process_email.php
index 66d5f855536..77f72c3f923 100755
--- a/admin/process_email.php
+++ b/admin/process_email.php
@@ -1,5 +1,5 @@
 #!/usr/bin/php -f
-<?
+<?php // $Id$
 define('FULLME','cron'); // prevent warnings
 //error_reporting(0);
 //ini_set('display_errors',0);
diff --git a/auth/shibboleth/config.html b/auth/shibboleth/config.html
index 42b7e686d97..82225c630d2 100755
--- a/auth/shibboleth/config.html
+++ b/auth/shibboleth/config.html
@@ -45,7 +45,7 @@
     <td align="right"><?php  print_string("auth_shib_convert_data", "auth") ?>:</td>
     <td>
     <input name="pluginconfig_convert_data" type="text" size="30" value="<?php echo $pluginconfig->convert_data?>"> 
-    <? 
+    <?php 
           if ($pluginconfig->convert_data && $pluginconfig->convert_data != '' && !is_readable($pluginconfig->convert_data)){
               echo '<br><font color="red">';
               print_string("auth_shib_convert_data_warning", "auth");
diff --git a/lang/en_utf8/block_loancalc.php b/lang/en_utf8/block_loancalc.php
index 1390a79817d..e3232451b84 100644
--- a/lang/en_utf8/block_loancalc.php
+++ b/lang/en_utf8/block_loancalc.php
@@ -1,4 +1,4 @@
-<?
+<?php // $Id$
 $string['loancalc'] = 'Loan calculator';
 $string['amountofloan'] = 'Amount of loan';
 $string['repaymentamount'] = 'Repayment amount';
diff --git a/lib/editor/htmlarea/popups/preview.php b/lib/editor/htmlarea/popups/preview.php
index e4f4854fdf7..553eda90b04 100644
--- a/lib/editor/htmlarea/popups/preview.php
+++ b/lib/editor/htmlarea/popups/preview.php
@@ -29,7 +29,7 @@
 </head>
 <body bgcolor="#ffffff">
 
-<? echo $imagetag ?>
+<?php echo $imagetag ?>
 
 </body>
 </html>
diff --git a/mod/chat/gui_header_js/jsupdate.php b/mod/chat/gui_header_js/jsupdate.php
index f8edc4a625c..8e0454e430a 100644
--- a/mod/chat/gui_header_js/jsupdate.php
+++ b/mod/chat/gui_header_js/jsupdate.php
@@ -146,6 +146,6 @@
                 echo '<embed src="../beep.wav" autostart="true" hidden="true" name="beep" />';
             }
         ?>
-       <a href="<? echo $refreshurl ?>" name="refreshLink">Refresh link</a>
+       <a href="<?php echo $refreshurl ?>" name="refreshLink">Refresh link</a>
     </body>
 </html>
diff --git a/mod/data/field/file/mod.html b/mod/data/field/file/mod.html
index e4d38fb7946..c116003fcfe 100755
--- a/mod/data/field/file/mod.html
+++ b/mod/data/field/file/mod.html
@@ -15,7 +15,7 @@
     </tr>
     <tr>
         <td>
-            <?php echo get_string('fielddescription', 'data'); ?>:</td><td><input style="width:300px;" type="text" name="description" id="description" value = "<? echo ($field->description);?>" />
+            <?php echo get_string('fielddescription', 'data'); ?>:</td><td><input style="width:300px;" type="text" name="description" id="description" value = "<?php echo ($field->description);?>" />
         </td>
     </tr>
     <tr>
diff --git a/mod/data/field/menu/mod.html b/mod/data/field/menu/mod.html
index 14920b2ba1c..bbca8b2bc23 100755
--- a/mod/data/field/menu/mod.html
+++ b/mod/data/field/menu/mod.html
@@ -15,7 +15,7 @@
     </tr>
     <tr>
         <td><?php echo get_string('fielddescription', 'data'); ?>:</td>
-        <td><input style="width:300px;" type="text" name="description" id="description" value = "<? echo ($field->description);?>" /></td>
+        <td><input style="width:300px;" type="text" name="description" id="description" value = "<?php echo ($field->description);?>" /></td>
     </tr>
     <tr>
         <td valign="top"><?php echo get_string('fieldoptions', 'data'); ?>:</td>
diff --git a/mod/data/field/picture/mod.html b/mod/data/field/picture/mod.html
index 34cc32dd6db..7b55351687b 100755
--- a/mod/data/field/picture/mod.html
+++ b/mod/data/field/picture/mod.html
@@ -15,7 +15,7 @@
             <?php echo get_string('fielddescription', 'data');?>:
         </td>
         <td>
-            <input style="width:300px;" type="text" name="description" id="description" value = "<? echo ($field->description);?>" />
+            <input style="width:300px;" type="text" name="description" id="description" value = "<?php echo ($field->description);?>" />
         </td>
     </tr>
     <tr>
@@ -23,7 +23,7 @@
             <?php echo get_string('fieldwidthsingleview', 'data');?>:
         </td>
         <td>
-            <input style="width:70px;" type="text" name="param1" id="param1" value = "<? if (!empty($field->param1)) echo $field->param1; ?>" />
+            <input style="width:70px;" type="text" name="param1" id="param1" value = "<?php if (!empty($field->param1)) echo $field->param1; ?>" />
         </td>
     </tr>
     <tr>
@@ -31,12 +31,12 @@
             <?php echo get_string('fieldheightsingleview', 'data');?>:
         </td>
         <td>
-            <input style="width:70px;" type="text" name="param2" id="param2" value = "<? if (!empty($field->param2)) echo $field->param2; ?>" />
+            <input style="width:70px;" type="text" name="param2" id="param2" value = "<?php if (!empty($field->param2)) echo $field->param2; ?>" />
         </td>
     </tr>
     <tr>
         <td>
-            <?php echo get_string('fieldwidthlistview', 'data');?>:</td><td><input style="width:70px;" type="text" name="param4" id="param4" value = "<? if (!empty($field->param4)) echo $field->param4; ?>" />
+            <?php echo get_string('fieldwidthlistview', 'data');?>:</td><td><input style="width:70px;" type="text" name="param4" id="param4" value = "<?php if (!empty($field->param4)) echo $field->param4; ?>" />
         </td>
     </tr>
     <tr>
@@ -44,7 +44,7 @@
             <?php echo get_string('fieldheightlistview', 'data');?>:
         </td>
         <td>
-            <input style="width:70px;" type="text" name="param5" id="param5" value = "<? if (!empty($field->param5)) echo $field->param5; ?>" />
+            <input style="width:70px;" type="text" name="param5" id="param5" value = "<?php if (!empty($field->param5)) echo $field->param5; ?>" />
         </td>
     </tr>
     <tr>
diff --git a/mod/data/field/url/mod.html b/mod/data/field/url/mod.html
index 8c7c855c2c0..d6632cdce95 100755
--- a/mod/data/field/url/mod.html
+++ b/mod/data/field/url/mod.html
@@ -18,7 +18,7 @@
             <?php echo get_string('fielddescription', 'data'); ?>:
         </td>
         <td>
-            <input style="width:350px;" type="text" name="description" id="description" value = "<? echo ($field->description);?>" />
+            <input style="width:350px;" type="text" name="description" id="description" value = "<?php echo ($field->description);?>" />
         </td>
     </tr>
     <tr>
diff --git a/mod/hotpot/show.php b/mod/hotpot/show.php
index d5e4867746a..923780f038d 100644
--- a/mod/hotpot/show.php
+++ b/mod/hotpot/show.php
@@ -34,10 +34,10 @@
 		}
 		if (obj && window.clipboardData) {
 			window.clipboardData.setData("Text", obj.innerText);
-			alert('<? print_string('copiedtoclipboard', 'hotpot') ?>');
+			alert('<?php print_string('copiedtoclipboard', 'hotpot') ?>');
 		}
 	}
-	document.write('<span class="helplink"> &nbsp; <a href="javascript:copy_contents()"><? print_string('copytoclipboard', 'hotpot') ?></A></span>');
+	document.write('<span class="helplink"> &nbsp; <a href="javascript:copy_contents()"><?php print_string('copytoclipboard', 'hotpot') ?></A></span>');
 -->
 </script>
 <?php
diff --git a/question/category_class.php b/question/category_class.php
index 83fc936f498..240d596b41d 100644
--- a/question/category_class.php
+++ b/question/category_class.php
@@ -1,4 +1,4 @@
-<? // $Id:
+<?php // $Id$
 /**
 * Class question_category_object
 *
diff --git a/user/message.html b/user/message.html
index 09b257523de..0db9f18474a 100644
--- a/user/message.html
+++ b/user/message.html
@@ -49,7 +49,7 @@
 <tr><td align="center" colspan="2"><input type="submit" name="preview" value="Preview" /></td></tr>
 </table>
 <?php print_simple_box_end(); ?>
-<table align="center"><tr><th colspan="4"><? print_string('currentlyselectedusers'); ?></th></tr>
+<table align="center"><tr><th colspan="4"><?php print_string('currentlyselectedusers'); ?></th></tr>
 <?php
     if (count($SESSION->emailto[$id])) {
         if (!$course->teacher) {