L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some minor cleanups, nothing functional, just code-level niceness mostly.

Browse Source 
- xhtml cleanups, mostly from Peter Bazira
   - removed all short php tags
This commit is contained in:
moodler
2003-05-15 14:34:48 +00:00
parent c6a0f9d5bf
commit 6bebcf8d72
7 changed files with 254 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files
login/change_password_form.html
+35 -34
View File
@@ -1,34 +1,35 @@
<P><B><? print_string("allfieldsrequired") ?></B></P>
<form name="form" method="post" action="change_password.php">
<table cellpadding=10>
<tr valign=top>
<td><P><? print_string("username") ?>:</P></td>
<td><input type="text" name="username" size=25 value="<? p($frm->username) ?>">
<? formerr($err->username) ?>
</td>
</tr>
<tr valign=top>
<td><P><? print_string("password") ?>:</P></td>
<td><input type="password" name="password" size=25 value="<? p($frm->password) ?>">
<? formerr($err->password) ?>
</td>
</tr>
<tr valign=top>
<td><P><? print_string("newpassword") ?>:</P></td>
<td><input type="password" name="newpassword1" size=25 value="<? p($frm->newpassword1) ?>">
<? formerr($err->newpassword1) ?>
</td>
</tr>
<tr valign=top>
<td><P><? print_string("newpassword") ?> (<? print_string("again") ?>):</P></td>
<td><input type="password" name="newpassword2" size=25 value="<? p($frm->newpassword2) ?>">
<? formerr($err->newpassword2) ?>
</td>
</tr>
<tr>
<td></td>
<td><input type="hidden" name="id" value="<?=$frm->id?>">
<input type="submit" value="<? print_string("changepassword") ?>"></td>
</table>
</form>
<p><b><?php print_string("allfieldsrequired") ?></b></p>
<form action="change_password.php" method="post" name="form" id="form">
<table cellpadding="10">
<tr valign="top">
<td><p><?php print_string("username") ?>:</p></td>
<td><input type="text" name="username" size="25" value="<?php p($frm->username) ?>" />
<?php formerr($err->username) ?>
</td>
</tr>
<tr valign="top">
<td><p><?php print_string("password") ?>:</p></td>
<td><input type="password" name="password" size="25" value="<?php p($frm->password) ?>" />
<?php formerr($err->password) ?>
</td>
</tr>
<tr valign="top">
<td><p><?php print_string("newpassword") ?>:</p></td>
<td><input type="password" name="newpassword1" size="25" value="<?php p($frm->newpassword1) ?>" />
<?php formerr($err->newpassword1) ?>
</td>
</tr>
<tr valign="top">
<td><p><?php print_string("newpassword") ?> (<?php print_string("again") ?>):</p></td>
<td><input type="password" name="newpassword2" size="25" value="<?php p($frm->newpassword2) ?>" />
<?php formerr($err->newpassword2) ?>
</td>
</tr>
<tr>
<td></td>
<td><input type="hidden" name="id" value="<?php p($frm->id)?>" />
<input type="submit" value="<?php print_string("changepassword") ?>" /></td>
</tr>
</table>
</form>
login/forgot_password_form.html
+28 -25
View File
@@ -1,25 +1,28 @@
<table cellpadding=20 align=center>
<tr valign=top>
<td width=300 class=normal>
<p><? print_string("enteremailaddress") ?>
</td>
<td bgcolor="<?=$THEME->cellheading?>">
<form name="form" method="post" action="<?=$ME?>">
<table>
<tr>
<td class=label><? print_string("email") ?>:</td>
<td><input type="text" name="email" size=25 value="<? p($frm->email) ?>">
<? if (!empty($err->email)) {formerr($err->email);} ?>
</tr>
<tr>
<td></td>
<td><input type="submit" value="<? print_string("ok") ?>">
<input type="button" value="<? print_string("cancel") ?>" onClick="javascript: history.go(-1)">
</td>
</table>
</form>
</td>
</tr>
</table>
<table cellpadding="20" align="center">
<tr valign="top">
<td width="300" class="normal">
<p><?php print_string("enteremailaddress") ?> </p>
</td>
<td bgcolor="<?php p($THEME->cellheading)?>">
<form action="<?php p($ME) ?>" method="post" name="form" id="form">
<table>
<tr>
<td class="label"><?php print_string("email") ?>:</td>
<td><input type="text" name="email" size="25" value="<?php p($frm->email) ?>" />
<?php if (!empty($err->email)) {formerr($err->email);} ?>
</td>
</tr>
<tr>
<td></td>
<td><input type="submit" value="<?php print_string("ok") ?>" />
<input type="button" value="<?php print_string("cancel") ?>" onClick="javascript: history.go(-1)" />
</td>
</tr>
</table>
</form>
</td>
</tr>
</table>
login/index.php
+2 -1
View File
@@ -28,7 +28,8 @@
if ($user) {
if (! $user->confirmed ) { // they never confirmed via email
print_header(get_string("mustconfirm"), get_string("mustconfirm") );
include("index_confirm.html");
print_heading(get_string("mustconfirm"));
print_simple_box(get_string("emailconfirmsent", "", $user->email), "center");
print_footer();
die;
}
login/index_confirm.html
-4
View File
@@ -1,4 +0,0 @@
<CENTER>
<H2><? print_string("mustconfirm") ?></H2>
<? print_string("emailconfirmsent", "", $user->email) ?>
login/index_form.html
+81 -83
View File
@@ -1,59 +1,57 @@
<CENTER>
<TABLE WIDTH="90%" BORDER="0" CELLSPACING="10" CELLPADDING="5" ALIGN="CENTER">
<TR>
<? if ($show_instructions) { ?>
<TD WIDTH="50%" bgcolor=<?=$THEME->cellheading2?> class="headingblock">
<P ALIGN="CENTER"><B><FONT SIZE=3><? print_string("returningtosite") ?></FONT></B></P>
</TD>
<TD WIDTH="50%" bgcolor=<?=$THEME->cellheading2?> class="headingblock">
<P ALIGN="CENTER"><B><FONT SIZE=3><? print_string("firsttime") ?></FONT></B></P>
</TD>
<? } ?>
</TR>
<TR>
<TD WIDTH="50%" VALIGN="TOP" bgcolor="<?=$THEME->cellcontent2?>" class="generalbox"> <FONT SIZE=2>
<P ALIGN="CENTER"><? print_string("loginusing") ?>:<BR>
(<? print_string("cookiesenabled") ?>)<BR>
<? formerr($errormsg) ?>
<table width="90%" border="0" cellspacing="10" cellpadding="5" align="center">
<tr>
<?php if ($show_instructions) { ?>
<td width="50%" bgcolor="<?php p($THEME->cellheading2) ?>" class="headingblock">
<p align="center"><b><font size="3"><? print_string("returningtosite") ?></font></b></p>
</td>
<td width="50%" bgcolor="<?php p($THEME->cellheading2) ?>" class="headingblock">
<p align="center"><b><font size="3"><? print_string("firsttime") ?></font></b></p>
</td>
<?php } ?>
</tr>
<tr>
<td width="50%" valign="top" bgcolor="<?php p($THEME->cellcontent2) ?>" class="generalbox"> <font size="2">
<p align="center"><?php print_string("loginusing") ?>:<br />
(<?php print_string("cookiesenabled") ?>)<br />
<?php formerr($errormsg) ?>
</p></font>
<FORM NAME="form" ACTION="index.php" METHOD=post>
<form action="index.php" method="post" name="form" id="form">
<table border="0" align="center">
<tr>
<td width="80%"><FONT SIZE=2>
<TABLE ALIGN=center>
<TR>
<TD align=right><P><FONT SIZE=2><? print_string("username") ?>:</FONT></P></TD>
<TD><INPUT TYPE="text" NAME="username" SIZE="15" value="<? p($frm->username) ?>">
</TD>
</TR>
<TR>
<TD height="24" align=right><P><FONT SIZE=2><? print_string("password") ?>:</FONT></P></TD>
<TD><INPUT TYPE="password" NAME="password" SIZE="15" value="<? p($frm->password) ?>">
</TD>
</TR>
</TABLE>
</FONT></td>
<td width="20%"><font size=2>
<input type="submit" name="Submit" value="<? print_string("login") ?>">
<td width="80%"><font size="2">
<table align="center">
<tr>
<td align="right"><p><font size="2"><?php print_string("username") ?>:</font></p></td>
<td><input type="text" name="username" size="15" value="<?php p($frm->username) ?>" />
</td>
</tr>
<tr>
<td height="24" align="right"><p><font size="2"><?php print_string("password") ?>:</font></p></td>
<td><input type="password" name="password" size="15" value="<?php p($frm->password) ?>" />
</td>
</tr>
</table>
</font></td>
<td width="20%"><font size="2">
<input type="submit" name="Submit" value="<?php print_string("login") ?>" />
</font></td>
</tr>
</table>
</FORM>
<FONT SIZE=2>
<BLOCKQUOTE>
<? if ($CFG->guestloginbutton) { ?>
<HR>
<P ALIGN=CENTER><? print_string("someallowguest") ?>:</P>
<CENTER>
<FORM NAME="form2" ACTION="index.php" METHOD=post>
<INPUT TYPE="hidden" NAME="username" VALUE="guest">
<INPUT TYPE="hidden" NAME="password" VALUE="guest">
<INPUT type="submit" NAME="Submit" VALUE="<? print_string("loginguest") ?>">
</FORM>
</CENTER>
<? } ?>
<? if ($CFG->changepassword or $CFG->auth == "email" or $CFG->auth == "none") {
</form>
<font size="2">
<blockquote>
<?php if ($CFG->guestloginbutton) { ?>
<hr />
<p align="center"><?php print_string("someallowguest") ?>:</p>
<center>
<form action="index.php" method="post" name="form2" id="form2">
<input type="hidden" name="username" value="guest" />
<input type="hidden" name="password" value="guest" />
<input type="submit" name="Submit" value="<?php print_string("loginguest") ?>" />
</form>
</center>
<?php } ?>
<?php if ($CFG->changepassword or $CFG->auth == "email" or $CFG->auth == "none") {
if ($CFG->auth == "email" or $CFG->auth == "none") {
$changepassword = "forgot_password.php";
$changebuttonname = get_string("senddetails");
@@ -63,49 +61,49 @@
}
?>
<HR>
<P ALIGN=CENTER><? print_string("forgotten") ?></P>
<CENTER>
<FORM NAME="form3" ACTION="<?=$changepassword ?>" METHOD=get>
<INPUT type="submit" VALUE="<?=$changebuttonname?>">
</FORM>
</CENTER>
<? } ?>
</BLOCKQUOTE>
</FONT> </TD>
<? if ($show_instructions) { ?>
<TD WIDTH="50%" VALIGN="TOP" bgcolor="<?=$THEME->cellcontent2?>" class="generalbox">
<FONT SIZE=2>
<? switch ($CFG->auth) {
<hr />
<p align="center"><?php print_string("forgotten") ?></p>
<center>
<form action="<?php p($changepassword) ?>" method="get" name="form3" id="form3">
<input type="submit" value="<?php p($changebuttonname) ?>" />
</form>
</center>
<?php } ?>
</blockquote>
</font> </td>
<?php if ($show_instructions) { ?>
<td width="50%" valign="top" bgcolor="<?php p($THEME->cellcontent2) ?>" class="generalbox">
<font size="2">
<?php switch ($CFG->auth) {
case "email": ?>
<P><? print_string("loginsteps", "", "signup.php") ?></P>
</FONT>
<CENTER>
<FORM NAME="form4" ACTION="signup.php" METHOD=get>
<INPUT type="submit" VALUE="<? print_string("startsignup") ?>">
</FORM>
</CENTER>
<? break;
<p><?php print_string("loginsteps", "", "signup.php") ?></p>
</font>
<center>
<form action="signup.php" method="get" name="form4" id="form4">
<input type="submit" value="<?php print_string("startsignup") ?>" />
</form>
</center>
<?php break;
case "none":
echo "<P>".get_string("loginstepsnone")."</P>";
break;
default:
echo "<BLOCKQUOTE>";
echo format_text($CFG->auth_instructions);
echo "</BLOCKQUOTE>";
echo "</blockquote>";
require_once("../auth/$CFG->auth/lib.php");
if (isset($CFG->auth_user_create) and $CFG->auth_user_create==1 and function_exists('auth_user_create') ){?>
<FORM NAME="form4" ACTION="signup.php" METHOD=get>
<INPUT type="submit" VALUE="<? print_string("startsignup") ?>">
</FORM>
</CENTER>
<?
<form action="signup.php" method="get" name="form4" id="form4">
<input type="submit" value="<?php print_string("startsignup") ?>" />
</form>
</td></tr>
<?php
}
}
?>
</TD>
<? } ?>
</TR>
</TABLE>
<?php } ?>
</table>
login/signup.php
+1 -4
View File
@@ -36,10 +36,7 @@
$emailconfirm = get_string("emailconfirm");
print_header($emailconfirm, $emailconfirm, $emailconfirm);
echo "<CENTER>";
print_string("emailconfirmsent", "", $user->email);
echo "</CENTER>";
print_footer();
notice(get_string("emailconfirmsent", "", $user->email), $CFG->wwwroot);
exit;
}
}
login/signup_form.html
+107 -103
View File
@@ -1,103 +1,107 @@
<?PHP
if (empty($user->username)) {
$user->username = "";
}
if (empty($user->password)) {
$user->password = "";
}
if (empty($user->email)) {
$user->email = "";
}
if (empty($user->firstname)) {
$user->firstname = "";
}
if (empty($user->lastname)) {
$user->lastname = "";
}
if (empty($user->idnumber)) {
$user->idnumber = "";
}
if (empty($user->phone)) {
$user->phone = "";
}
if (empty($user->city)) {
$user->city = "";
}
if (empty($user->country)) {
$user->country = "";
}
?>
<CENTER>
<table cellpadding=20> <tr> <td bgcolor="<?=$THEME->cellcontent2 ?>" class="generalbox">
<form name="form" method="post" action="signup.php">
<table>
<tr valign=top>
<td colspan=2><P><B><? print_string("createuserandpass") ?>:</td>
</tr>
<tr valign=top>
<td><P><? print_string("username") ?>:</td>
<td><input type="text" name="username" size=12 value="<? p($user->username) ?>">
<? if (!empty($err->username)) { formerr($err->username); } ?>
</td>
</tr>
<tr valign=top>
<td><P><? print_string("password") ?>:</td>
<td><input type="password" name="password" size=12 value="<? p($user->password) ?>">
<? if (!empty($err->password)) { formerr($err->password); } ?>
</td>
</tr>
<tr valign=top>
<td colspan=2><P><BR><B><? print_string("supplyinfo") ?>:</B><BR>(<? print_string("emailmustbereal") ?>)</P>
</tr>
<tr valign=top>
<td><P><? print_string("email") ?>:</td>
<td><input type="text" name="email" size=25 value="<? p($user->email) ?>">
<? if (!empty($err->email)) { formerr($err->email); } ?>
</td>
</tr>
<tr valign=top>
<td><P><? print_string("firstname") ?>:</td>
<td><input type="text" name="firstname" size=25 value="<? p($user->firstname) ?>">
<? if (!empty($err->firstname)) { formerr($err->firstname);} ?>
</td>
</tr>
<tr valign=top>
<td><P><? print_string("lastname") ?>:</td>
<td><input type="text" name="lastname" size=25 value="<? p($user->lastname) ?>">
<? if (!empty($err->lastname)) { formerr($err->lastname);} ?>
</td>
</tr>
<tr valign=top>
<td><P><? print_string("idnumber") ?>:</td>
<td><input type="text" name="idnumber" size=25 value="<? p($user->idnumber) ?>"> (<? print_string("optional") ?>)
<? if (!empty($err->idnumber)) { formerr($err->idnumber);} ?>
</td>
</tr>
<tr valign=top>
<td><P><? print_string("phone") ?>:</td>
<td><input type="text" name="phone" size=25 value="<? p($user->phone) ?>"> (<? print_string("optional") ?>)
<? if (!empty($err->phone)) { formerr($err->phone);} ?>
</td>
</tr>
<tr valign=top>
<td><P><? print_string("city") ?>:</td>
<td><input type="text" name="city" size=25 value="<? p($user->city) ?>">
<? if (!empty($err->city)) { formerr($err->city);} ?>
</td>
</tr>
<tr valign=top>
<td><P><? print_string("country") ?>:</td>
<td><? choose_from_menu ($COUNTRIES, "country", $user->country, get_string("selectacountry"), "", "") ?>
<? if (!empty($err->country)) { formerr($err->country);} ?>
</td>
</tr>
<tr>
<td></td>
<td><input type="submit" value="<? print_string("createaccount") ?>"></td>
</table>
</form>
</td></tr></table>
<?php
if (empty($user->username)) {
$user->username = "";
}
if (empty($user->password)) {
$user->password = "";
}
if (empty($user->email)) {
$user->email = "";
}
if (empty($user->firstname)) {
$user->firstname = "";
}
if (empty($user->lastname)) {
$user->lastname = "";
}
if (empty($user->idnumber)) {
$user->idnumber = "";
}
if (empty($user->phone)) {
$user->phone = "";
}
if (empty($user->city)) {
$user->city = "";
}
if (empty($user->country)) {
$user->country = "";
}
?>
<table cellpadding="20" align="center"> <tr> <td bgcolor="<?php p($THEME->cellcontent2) ?>" class="generalbox">
<form action="signup.php" method="post" name="form" id="form">
<table>
<tr valign="top">
<td colspan="2"><p><b><?php print_string("createuserandpass") ?>:</b></p></td>
</tr>
<tr valign="top">
<td><p><?php print_string("username") ?>:</p></td>
<td><input type="text" name="username" size="12" value="<?php p($user->username) ?>" />
<?php if (!empty($err->username)) { formerr($err->username); } ?>
</td>
</tr>
<tr valign="top">
<td><p><?php print_string("password") ?>:</p></td>
<td><input type="password" name="password" size="12" value="<?php p($user->password) ?>" />
<?php if (!empty($err->password)) { formerr($err->password); } ?>
</td>
</tr>
<tr valign="top">
<td colspan="2"><p><br />
<b><?php print_string("supplyinfo") ?>:</b><br />
(<?php print_string("emailmustbereal") ?>)</p>
</td>
</tr>
<tr valign="top">
<td><p><?php print_string("email") ?>:</p></td>
<td><input type="text" name="email" size="25" value="<?php p($user->email) ?>" />
<?php if (!empty($err->email)) { formerr($err->email); } ?>
</td>
</tr>
<tr valign="top">
<td><p><?php print_string("firstname") ?>:</p></td>
<td><input type="text" name="firstname" size="25" value="<?php p($user->firstname) ?>" />
<?php if (!empty($err->firstname)) { formerr($err->firstname);} ?>
</td>
</tr>
<tr valign="top">
<td><p><?php print_string("lastname") ?>:</p></td>
<td><input type="text" name="lastname" size="25" value="<?php p($user->lastname) ?>" />
<?php if (!empty($err->lastname)) { formerr($err->lastname);} ?>
</td>
</tr>
<tr valign="top">
<td><p><?php print_string("idnumber") ?>:</p></td>
<td><input type="text" name="idnumber" size="25" value="<?php p($user->idnumber) ?>" />
(<?php print_string("optional") ?>)
<?php if (!empty($err->idnumber)) { formerr($err->idnumber);} ?>
</td>
</tr>
<tr valign="top">
<td><p><?php print_string("phone") ?>:</p></td>
<td><input type="text" name="phone" size="25" value="<?php p($user->phone) ?>" />
(<?php print_string("optional") ?>)
<?php if (!empty($err->phone)) { formerr($err->phone);} ?>
</td>
</tr>
<tr valign="top">
<td><p><?php print_string("city") ?>:</p></td>
<td><input type="text" name="city" size="25" value="<?php p($user->city) ?>" />
<?php if (!empty($err->city)) { formerr($err->city);} ?>
</td>
</tr>
<tr valign="top">
<td><p><?php print_string("country") ?>:</p></td>
<td><?php choose_from_menu ($COUNTRIES, "country", $user->country, get_string("selectacountry"), "", "") ?>
<?php if (!empty($err->country)) { formerr($err->country);} ?>
</td>
</tr>
<tr>
<td></td>
<td><input type="submit" value="<?php print_string("createaccount") ?>" /></td>
</tr>
</table>
</form>
</td></tr></table>