Tidy up of a code - took out all the short PHP tags

diff --git a/user/edit.html b/user/edit.html
index cd5b2b70070485b7a3ea67465c935ce6c0fa2277..5d1c9f6e4e20ae82b3ba1fea6e3f7d5e0f264a33 100644 (file)
--- a/user/edit.html
+++ b/user/edit.html
@@ -1,4 +1,4 @@
-<?PHP
+<?php
    if (!isset($user->htmleditor)) {
        $user->htmleditor = 1;
    }
@@ -8,12 +8,12 @@
 
 ?>
 
-<FORM METHOD="post" ENCTYPE="multipart/form-data" action="edit.php">
+<form method="post" enctype="multipart/form-data" action="edit.php">
 <table cellpadding=9 cellspacing=0 >
-<?
+<?php
 if (isadmin()) {
     echo "<tr valign=top>";
-    echo "<td><P>".get_string("username").":</td>";
+    echo "<td><p>".get_string("username").":</td>";
     if($CFG->auth == "email" || $CFG->auth == "none" || $CFG->auth == "manual"){
         echo "<td><input type=text name=username size=20 value=\"";
         p($user->username);
@@ -28,7 +28,7 @@ if (isadmin()) {
 
     if($CFG->auth == "email" || $CFG->auth == "none" || $CFG->auth == "manual"){
         echo "<tr valign=top>";
-        echo "<td><P>".get_string("newpassword").":</td>";
+        echo "<td><p>".get_string("newpassword").":</td>";
         echo "<td><input type=text name=newpassword size=20 value=\"";
         if (isset($user->newpassword)) p($user->newpassword);
             echo "\">";
@@ -44,26 +44,26 @@ if (isadmin()) {
 }
 ?>
 <tr valign=top>
-    <td><P><? print_string("firstname") ?>:</td>
-    <td><input type="text" name="firstname" size=30 value="<? p($user->firstname) ?>">
-    <? if (isset($err["firstname"])) formerr($err["firstname"]); ?>
+    <td><p><?php print_string("firstname") ?>:</td>
+    <td><input type="text" name="firstname" size=30 value="<?php p($user->firstname) ?>">
+    <?php if (isset($err["firstname"])) formerr($err["firstname"]); ?>
     </td>
 </tr>
 <tr valign=top>
-    <td><P><? print_string("lastname") ?>:</td>
-    <td><input type="text" name="lastname" size=30 value="<? p($user->lastname) ?>">
-    <? if (isset($err["lastname"])) formerr($err["lastname"]); ?>
+    <td><p><?php print_string("lastname") ?>:</td>
+    <td><input type="text" name="lastname" size=30 value="<?php p($user->lastname) ?>">
+    <?php if (isset($err["lastname"])) formerr($err["lastname"]); ?>
     </td>
 </tr>
 <tr valign=top>
-    <td><P><? print_string("email") ?>:</td>
-    <td><input type="text" name="email" size=30 value="<? p($user->email) ?>">
-    <? if (isset($err["email"])) formerr($err["email"]); ?>
+    <td><p><?php print_string("email") ?>:</td>
+    <td><input type="text" name="email" size=30 value="<?php p($user->email) ?>">
+    <?php if (isset($err["email"])) formerr($err["email"]); ?>
     </td>
 </tr>
 <tr valign=top>
-    <td><P><? print_string("emaildisplay") ?>:</td>
-    <td><? 
+    <td><p><?php print_string("emaildisplay") ?>:</td>
+    <td><?php 
     $choices["0"] = get_string("emaildisplayno");
     $choices["1"] = get_string("emaildisplayyes");
     $choices["2"] = get_string("emaildisplaycourse");
@@ -71,46 +71,46 @@ if (isadmin()) {
     </td>
 </tr>
 <tr valign=top>
-    <td><P><? print_string("emailformat") ?>:</td>
-    <td><? 
+    <td><p><?php print_string("emailformat") ?>:</td>
+    <td><?php 
     unset($choices);
     $choices["0"] = get_string("textformat");
     $choices["1"] = get_string("htmlformat");
     choose_from_menu ($choices, "mailformat", $user->mailformat, "") ?>
     </td>
 </tr>
-<? if ($CFG->htmleditor) { ?>
+<?php if ($CFG->htmleditor) { ?>
 <tr valign=top>
-    <td><P><? print_string("textediting") ?>:</td>
-    <td><? 
+    <td><p><?php print_string("textediting") ?>:</td>
+    <td><?php 
     unset($choices);
     $choices["0"] = get_string("texteditor");
     $choices["1"] = get_string("htmleditor");
     choose_from_menu ($choices, "htmleditor", $user->htmleditor, "") ?>
     </td>
 </tr>
-<? } ?>
+<?php } ?>
 <tr valign=top>
-    <td><P><? print_string("city") ?>:</td>
-    <td><input type="text" name="city" size=25 value="<? p($user->city) ?>">
-    <? if (isset($err["city"])) formerr($err["city"]); ?>
+    <td><p><?php print_string("city") ?>:</td>
+    <td><input type="text" name="city" size=25 value="<?php p($user->city) ?>">
+    <?php if (isset($err["city"])) formerr($err["city"]); ?>
     </td>
 </tr>
 <tr valign=top>
-    <td><P><? print_string("country") ?>:</td>
-    <td><? 
+    <td><p><?php print_string("country") ?>:</td>
+    <td><?php 
 
     if (!$user->country and $CFG->country) {
         $user->country = $CFG->country;
     }
     
     choose_from_menu ($COUNTRIES, "country", $user->country, get_string("selectacountry")."...", "", "") ?>
-    <? if (isset($err["country"])) formerr($err["country"]); ?>
+    <?php if (isset($err["country"])) formerr($err["country"]); ?>
     </td>
 </tr>
 <tr valign=top>
-    <td><P><? print_string("preferredlanguage") ?>:</td>
-    <td><? if ($languages = get_list_of_languages()) {
+    <td><p><?php print_string("preferredlanguage") ?>:</td>
+    <td><?php if ($languages = get_list_of_languages()) {
                if (!$user->lang) {
                    $user->lang = $CFG->lang;
                }
@@ -121,8 +121,8 @@ if (isadmin()) {
     </td>
 </tr>
 <tr valign=top>
-    <td><P><? print_string("timezone") ?>:</td>
-    <td><?
+    <td><p><?php print_string("timezone") ?>:</td>
+    <td><?php
        if (abs($user->timezone) > 13) {
            $user->timezone = 99;
        }
@@ -147,74 +147,74 @@ if (isadmin()) {
     </td>
 </tr>
 <tr valign=top>
-    <td><P><? print_string("userdescription") ?>:</td>
-    <td><? if (isset($err["description"])) {
+    <td><p><?php print_string("userdescription") ?>:</td>
+    <td><?php if (isset($err["description"])) {
                formerr($err["description"]);
-               echo "<BR>";
+               echo "<br />";
            } ?>
-    <TEXTAREA NAME=description COLS=50 ROWS=10 WRAP=virtual><? p($user->description) ?></TEXTAREA> 
-    <? helpbutton("text", get_string("helptext")) ?>
+    <textarea name=description cols=50 rows=10 wrap=virtual><?php p($user->description) ?></textarea> 
+    <?php helpbutton("text", get_string("helptext")) ?>
     </td>
 </tr>
 <tr>
-    <td colspan=2><BR><B><? print_string("followingoptional") ?>:</B></td>
+    <td colspan=2><br /><b><?php print_string("followingoptional") ?>:</b></td>
 </tr>
 
 
-<? if (!empty($CFG->gdversion)) {  ?>
+<?php if (!empty($CFG->gdversion)) {  ?>
 <tr valign=top>
-    <td><P><? print_string("newpicture") ?>:</td>
+    <td><p><?php print_string("newpicture") ?>:</td>
     <td>
-    <INPUT type="hidden" name="MAX_FILE_SIZE" value="<? echo get_max_upload_file_size() ?>">
+    <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo get_max_upload_file_size() ?>">
     <input type="file" name="imagefile" size=40>
-    <? helpbutton("picture", get_string("helppicture"));
+    <?php helpbutton("picture", get_string("helppicture"));
        print_string("maxsize", "", display_size(get_max_upload_file_size())); 
        if (isset($err["imagefile"])) formerr($err["imagefile"]);
     ?>
     </td>
 </tr>
-<? }  ?>
+<?php }  ?>
 
 <tr valign=top>
-    <td><P><? print_string("webpage") ?>:</td>
-    <td><input type="text" name="url" size=50 value="<? p($user->url) ?>">
-    <? if (isset($err["url"])) formerr($err["url"]); ?>
+    <td><p><?php print_string("webpage") ?>:</td>
+    <td><input type="text" name="url" size=50 value="<?php p($user->url) ?>">
+    <?php if (isset($err["url"])) formerr($err["url"]); ?>
     </td>
 </tr>
 <tr valign=top>
-    <td><P><? print_string("icqnumber") ?>:</td>
-    <td><input type="text" name="icq" size=25 value="<? p($user->icq) ?>">
-    <? if (isset($err["icq"])) formerr($err["icq"]); ?>
+    <td><p><?php print_string("icqnumber") ?>:</td>
+    <td><input type="text" name="icq" size=25 value="<?php p($user->icq) ?>">
+    <?php if (isset($err["icq"])) formerr($err["icq"]); ?>
     </td>
 </tr>
 <tr valign=top>
-    <td><P><? print_string("idnumber") ?>:</td>
-    <td><input type="text" name="idnumber" size=25 value="<? p($user->idnumber) ?>"> <? p($teacheronly) ?>
-    <? if (isset($err["idnumber"])) formerr($err["idnumber"]); ?>
+    <td><p><?php print_string("idnumber") ?>:</td>
+    <td><input type="text" name="idnumber" size=25 value="<?php p($user->idnumber) ?>"> <?php p($teacheronly) ?>
+    <?php if (isset($err["idnumber"])) formerr($err["idnumber"]); ?>
     </td>
 </tr>
 <tr valign=top>
-    <td><P><? print_string("phone") ?> 1:</td>
-    <td><input type="text" name="phone1" size=25 value="<? p($user->phone1) ?>"> <? p($teacheronly) ?>
-    <? if (isset($err["phone1"])) formerr($err["phone1"]); ?>
+    <td><p><?php print_string("phone") ?> 1:</td>
+    <td><input type="text" name="phone1" size=25 value="<?php p($user->phone1) ?>"> <?php p($teacheronly) ?>
+    <?php if (isset($err["phone1"])) formerr($err["phone1"]); ?>
     </td>
 </tr>
 <tr valign=top>
-    <td><P><? print_string("phone") ?> 2:</td>
-    <td><input type="text" name="phone2" size=25 value="<? p($user->phone2) ?>"> <? p($teacheronly) ?>
-    <? if (isset($err["phone2"])) formerr($err["phone2"]); ?>
+    <td><p><?php print_string("phone") ?> 2:</td>
+    <td><input type="text" name="phone2" size=25 value="<?php p($user->phone2) ?>"> <?php p($teacheronly) ?>
+    <?php if (isset($err["phone2"])) formerr($err["phone2"]); ?>
     </td>
 </tr>
 <tr valign=top>
-    <td><P><? print_string("address") ?>:</td>
-    <td><input type="text" name="address" size=25 value="<? p($user->address) ?>"> <? p($teacheronly) ?>
-    <? if (isset($err["address"])) formerr($err["address"]); ?>
+    <td><p><?php print_string("address") ?>:</td>
+    <td><input type="text" name="address" size=25 value="<?php p($user->address) ?>"> <?php p($teacheronly) ?>
+    <?php if (isset($err["address"])) formerr($err["address"]); ?>
     </td>
 </tr>
 <tr>
     <td></td>
-    <td align=right><input type="submit" value="<? print_string("updatemyprofile") ?>"></td>
-</TABLE>
-<INPUT type="hidden" name="course" value="<? p($course->id) ?>">
-<INPUT type="hidden" name="id" value="<? p($user->id) ?>"> 
-</FORM>
+    <td align=right><input type="submit" value="<?php print_string("updatemyprofile") ?>"></td>
+</table>
+<input type="hidden" name="course" value="<?php p($course->id) ?>">
+<input type="hidden" name="id" value="<?php p($user->id) ?>"> 
+</form>