[vPostMaster] [Patch] Tabindex patch, updated for 1.44
CyberLeo Kitsana
cyberleo at cyberleo.net
Sat Jun 28 23:42:39 MDT 2008
This is my previous tabindex patch, updated for vPostMaster 1.44.
- Adds proper tab indexing for the new extra attributes functionality
- domain_create.php
- domain_view.php
- user_create.php
- user_view.php
Enjoy!
--
Fuzzy love,
-CyberLeo
Technical Administrator
CyberLeo.Net Webhosting
http://www.CyberLeo.Net
<CyberLeo at CyberLeo.Net>
Furry Peace! - http://wwww.fur.com/peace/
-------------- next part --------------
diff -ur vpostmaster-www-orig/adminuser_create.php vpostmaster-www/adminuser_create.php
--- vpostmaster-www-orig/adminuser_create.php 2008-06-18 16:50:44.000000000 -0500
+++ vpostmaster-www/adminuser_create.php 2008-06-29 00:21:08.000000000 -0500
@@ -131,19 +131,19 @@
<tr><td><label for="password1">Password:</label></td><td>
<input id="password1" type="password" name="password1", value="<?php echo
- $info['password1']; ?>" size="30" maxlen="64" />
+ $info['password1']; ?>" size="30" maxlen="64" <?php echo vpm_tabindex(); ?>/>
</td><td class="formdesc">Password for the new user.
</td></tr>
<tr><td><label for="password2">Password (again):</label></td><td>
<input id="password2" type="password" name="password2", value="<?php echo
- $info['password1']; ?>" size="30" maxlen="64" />
+ $info['password1']; ?>" size="30" maxlen="64" <?php echo vpm_tabindex(); ?>/>
</td><td class="formdesc">Verify password.
</td></tr>
<tr><td><label for="issuperuser">Superuser:</label></td><td>
<input id="issuperuser" type="checkbox" name="issuperuser" value="t"
- <?php if ($info["issuperuser"] == "t") { echo "checked"; } ?> />
+ <?php if ($info["issuperuser"] == "t") { echo "checked=\"checked\""; } echo vpm_tabindex(); ?> />
</td><td class="formdesc">
If checked, account has super-user privileges.
<?php
@@ -154,7 +154,7 @@
</td></tr>
<tr><td><label for="domains">Domains:</label></td><td>
- <textarea id="domains" name="domains" cols="30" rows="8"><?php
+ <textarea id="domains" name="domains" cols="30" rows="8" <?php echo vpm_tabindex(); ?> ><?php
echo $info['domains']; ?></textarea>
</td><td class="formdesc">
One per line list of domains managed. Leave blank if superuser.
@@ -165,7 +165,7 @@
</td></tr>
<tr><td colspan="3"><input type="submit" name="submit" value="Create"
- /></td></tr>
+ <?php echo vpm_tabindex(); ?>/></td></tr>
</form></table>
<?php } # end of showForm ?>
diff -ur vpostmaster-www-orig/adminuser_lookup.php vpostmaster-www/adminuser_lookup.php
--- vpostmaster-www-orig/adminuser_lookup.php 2008-06-18 16:50:44.000000000 -0500
+++ vpostmaster-www/adminuser_lookup.php 2008-06-29 00:21:18.000000000 -0500
@@ -28,7 +28,7 @@
<input type="hidden" value="<?php echo $userData['name']; ?>"
name="name" />
<input type="submit" name="submit"
- value="<?php echo $userData['name']; ?>" />
+ value="<?php echo $userData['name']; ?>" <?php echo vpm_tabindex(); ?>/>
</form></td></tr>
<?php
}
diff -ur vpostmaster-www-orig/adminuser_passwd.php vpostmaster-www/adminuser_passwd.php
--- vpostmaster-www-orig/adminuser_passwd.php 2008-06-18 16:50:44.000000000 -0500
+++ vpostmaster-www/adminuser_passwd.php 2008-06-29 00:21:19.000000000 -0500
@@ -86,18 +86,18 @@
<form method="POST" action="adminuser_passwd.php"><table>
<tr><td><label for="pw1">Password:</label></td><td>
<input type="password" id="pw1" name="password1", value="<?php echo
- $info['password1']; ?>" size="30" maxlen="64" />
+ $info['password1']; ?>" size="30" maxlen="64" <?php echo vpm_tabindex(); ?>/>
</td><td class="formdesc">Your new password.
</td></tr>
<tr><td><label for="pw2">Password (again):</label></td><td>
<input type="password" id="pw2" name="password2", value="<?php echo
- $info['password1']; ?>" size="30" maxlen="64" />
+ $info['password1']; ?>" size="30" maxlen="64" <?php echo vpm_tabindex(); ?>/>
</td><td class="formdesc">Verify your new password.
</td></tr>
<tr><td colspan="3"><input type="submit" name="submit"
- value="Change Password" /></td></tr>
+ value="Change Password" <?php echo vpm_tabindex(); ?>/></td></tr>
</form></table>
<?php } # end of showForm ?>
diff -ur vpostmaster-www-orig/adminuser_view.php vpostmaster-www/adminuser_view.php
--- vpostmaster-www-orig/adminuser_view.php 2008-06-18 16:50:44.000000000 -0500
+++ vpostmaster-www/adminuser_view.php 2008-06-29 00:21:20.000000000 -0500
@@ -198,20 +198,20 @@
<tr><td><label for="password1">Password:</label></td><td>
<input id="password1" type="password" name="password1"
value="<?php if
- (!$initialLoad) { echo $info["password1"]; } ?>" />
+ (!$initialLoad) { echo $info["password1"]; } ?>" <?php echo vpm_tabindex(); ?> />
</td><td class="formdesc">
Change the password. Otherwise, leave blank.
</td></tr>
<tr><td><label for="password2">Password (Again):</label></td><td>
<input id="password2" type="password" name="password2"
value="<?php if
- (!$initialLoad) { echo $info["password2"]; } ?>" />
+ (!$initialLoad) { echo $info["password2"]; } ?>" <?php echo vpm_tabindex(); ?> />
</td><td class="formdesc">
Verify the changed password. Otherwise, leave blank.
</td></tr>
<tr><td><label for="issuperuser">Superuser:</label></td><td>
<input id="issuperuser" type="checkbox" name="issuperuser" value="t"
- <?php if ($info["issuperuser"] == "t") { echo "checked"; } ?> />
+ <?php if ($info["issuperuser"] == "t") { echo "checked=\"checked\""; } echo vpm_tabindex(); ?> />
</td><td class="formdesc">
Enable superuser role. Be careful not to lock yourself out
of the system by changing this.
@@ -221,7 +221,7 @@
?>
</td></tr>
<tr><td><label for="domains">Domains:</label></td><td>
- <textarea id="domains" name="domains" cols="30" rows="8"><?php
+ <textarea id="domains" name="domains" cols="30" rows="8" <?php echo vpm_tabindex(); ?> ><?php
echo $info['domains']; ?></textarea>
</td><td class="formdesc">
List of managed domains, one domain per line. Leave blank for
@@ -234,7 +234,7 @@
<?php if ($canChangePassword || $canEdit) { ?>
<tr><td colspan="1"><input type="submit" name="submit" value="Update"
- /></form>
+ <?php echo vpm_tabindex(); ?> /></form>
</td>
<td colspan="1"> </td>
<td colspan="1">
@@ -247,7 +247,7 @@
echo $info['name']; ?>>>>"
class="delete_button"
onClick="return verify_action('This action will permanently remove this admin user. Are you sure you want to continue?');"
- />
+ <?php echo vpm_tabindex(); ?> />
</form>
<?php } ?>
</td>
diff -ur vpostmaster-www-orig/code.php vpostmaster-www/code.php
--- vpostmaster-www-orig/code.php 2008-06-18 16:50:44.000000000 -0500
+++ vpostmaster-www/code.php 2008-06-29 00:21:21.000000000 -0500
@@ -9,6 +9,11 @@
# Location of the file with the database connect string
$GLOBALS["vpmDbConnectFile"] = "/usr/lib/vpostmaster/etc/wwwdb.conf";
+ ######################################
+ function vpm_tabindex() {
+ if (!isset($GLOBALS['vpm_tabindex'])) $GLOBALS['vpm_tabindex'] = 0;
+ return sprintf(' tabindex="%u" ', ++$GLOBALS['vpm_tabindex']);
+ }
######################################
function vpm_getpost_false($fieldname) #{{{1
@@ -305,11 +310,11 @@
}
if (!$isLoggedIn && $usersData) {
if ($domainData['active'] != "t") {
- array_push($errors, "Account is disabled");
+ array_push($errors, "Domain is disabled");
return($errors);
}
if ($usersData['active'] != "t") {
- array_push($errors, "Domain is disabled");
+ array_push($errors, "Account is disabled");
return($errors);
}
$tryPw = crypt($password, substr($usersData["cryptedpasswd"], 0, 2));
@@ -472,7 +477,7 @@
}
else {
echo "<input type=\"text\" name=\"${field}\" value=\"" .
- $data[$field] . "\" $extra />";
+ $data[$field] . "\" $extra " . vpm_tabindex() . " />";
}
}
@@ -1032,7 +1037,7 @@
echo "<tr><td class=\"${class}\"><label for=\"${setting[0]}\">" .
"${setting[1]}</label>:</td><td>";
if ($setting[2] != NULL) {
- echo "<select id=\"${setting[0]}\" name=\"${setting[0]}\">";
+ echo "<select id=\"${setting[0]}\" name=\"${setting[0]}\" " . vpm_tabindex() . ">";
foreach ($setting[2] as $option) {
echo "<option value=\"${option[0]}\"";
if ($info[$setting[0]] == $option[0]) { echo "selected"; }
@@ -1041,7 +1046,7 @@
echo "</select>";
} else {
echo "<input id=\"${setting[0]}\" name=\"${setting[0]}\" " .
- "value=\"${info[$setting[0]]}\" ${setting[4]} />";
+ "value=\"${info[$setting[0]]}\" ${setting[4]} " . vpm_tabindex() . "/>";
}
echo "</td><td class=\"formdesc\">${setting[5]}</td></tr>";
}
diff -ur vpostmaster-www-orig/domain_create.php vpostmaster-www/domain_create.php
--- vpostmaster-www-orig/domain_create.php 2008-06-18 16:50:44.000000000 -0500
+++ vpostmaster-www/domain_create.php 2008-06-29 00:30:05.000000000 -0500
@@ -112,8 +112,9 @@
</td></tr>
<tr><td><label for="active">Active:</label></td><td>
<input TYPE="checkbox" ID="active" NAME="active" VALUE="t"
- <?php if ($domaininfo["active"] == "t") { echo "checked"; } ?>
- <?php if ($isAdmin) { echo "disabled readonly"; } ?>
+ <?php if ($domaininfo["active"] == "t") { echo "checked=\"checked\""; } ?>
+ <?php if ($isAdmin) { echo "disabled=\"disabled\" readonly=\"readonly\""; } ?>
+ <?php echo vpm_tabindex(); ?>
/>
</td><td class="formdesc">
If not checked, the server acts as if this domain does not exist.
@@ -127,8 +128,9 @@
Attributes:</label></td><td>
<input TYPE="checkbox" ID="active" NAME="allowextraattributes" VALUE="t"
<?php if ($domaininfo["allowextraattributes"] == "t") {
- echo "checked"; } ?>
- <?php if ($isAdmin) { echo "disabled readonly"; } ?>
+ echo "checked=\"checked\""; } ?>
+ <?php if ($isAdmin) { echo "disabled=\"disabled\" readonly=\"readonly\""; } ?>
+ <?php echo vpm_tabindex(); ?>
/>
</td><td class="formdesc">
Extra attributes can be defined in the database, if this field is
@@ -141,5 +143,5 @@
</td></tr>
<tr><td colspan="3"><input type="submit" name="submit" value="Create"
- /></td></tr>
+ <?php echo vpm_tabindex(); ?> /></td></tr>
</form></table>
diff -ur vpostmaster-www-orig/domain_defaults.php vpostmaster-www/domain_defaults.php
--- vpostmaster-www-orig/domain_defaults.php 2008-06-18 16:50:44.000000000 -0500
+++ vpostmaster-www/domain_defaults.php 2008-06-29 00:21:32.000000000 -0500
@@ -140,6 +140,6 @@
echo "<table><form action=\"domain_defaults.php\" method=\"POST\">";
vpm_display_settings($vpm_settings, $errorfields, $info);
echo "<tr><td colspan=\"3\"><input type=\"submit\" name=\"submit\" " .
- "value=\"Update\" /></td></tr>";
+ "value=\"Update\" " . vpm_tabindex() . " /></td></tr>";
echo "<form></table>";
?>
diff -ur vpostmaster-www-orig/domain_delete.php vpostmaster-www/domain_delete.php
--- vpostmaster-www-orig/domain_delete.php 2008-06-18 16:50:44.000000000 -0500
+++ vpostmaster-www/domain_delete.php 2008-06-29 00:21:33.000000000 -0500
@@ -55,7 +55,7 @@
<input type="submit" name="submit"
value="Click here if you are SURE you want to delete <?php
echo $name; ?>"
- class="delete_button" />
+ class="delete_button" <?php echo vpm_tabindex(); ?> />
</form>
<?php
}
diff -ur vpostmaster-www-orig/domain_select.php vpostmaster-www/domain_select.php
--- vpostmaster-www-orig/domain_select.php 2008-06-18 16:50:44.000000000 -0500
+++ vpostmaster-www/domain_select.php 2008-06-29 00:21:34.000000000 -0500
@@ -37,7 +37,7 @@
echo "<tr ${tridstr}><td><form action=\"domain_view.php\" " .
"method=\"POST\"><input type=\"hidden\" " .
"value=\"${domain}\" /><input type=\"submit\" " .
- "name=\"selectdomain\" value=\"${domain}\" " .
+ "name=\"selectdomain\" value=\"${domain}\" " . vpm_tabindex() .
"/></form></td><td align=center>${activecount}</td></tr>\n";
}
echo "<tr><td align=\"right\"><b>Total Users:</b></td>";
diff -ur vpostmaster-www-orig/domain_view.php vpostmaster-www/domain_view.php
--- vpostmaster-www-orig/domain_view.php 2008-06-18 16:50:44.000000000 -0500
+++ vpostmaster-www/domain_view.php 2008-06-29 00:29:47.000000000 -0500
@@ -184,8 +184,9 @@
</td></tr>
<tr><td><label for="active">Active:</label></td><td>
<input TYPE="checkbox" NAME="active" id="active" VALUE="t"
- <?php if ($domaininfo["active"] == "t") { echo "checked"; } ?>
- <?php if ($isAdmin) { echo "disabled readonly"; } ?>
+ <?php if ($domaininfo["active"] == "t") { echo "checked=\"checked\""; } ?>
+ <?php if ($isAdmin) { echo "disabled=\"disabled\" readonly=\"readonly\""; } ?>
+ <?php echo vpm_tabindex(); ?>
/>
</td><td class="formdesc">
If not checked, the server acts as if this domain does not exist.
@@ -198,8 +199,9 @@
Attributes:</label></td><td>
<input TYPE="checkbox" ID="active" NAME="allowextraattributes" VALUE="t"
<?php if ($domaininfo["allowextraattributes"] == "t") {
- echo "checked"; } ?>
- <?php if ($isAdmin) { echo "disabled readonly"; } ?>
+ echo "checked=\"checked\""; } ?>
+ <?php if ($isAdmin) { echo "disabled=\"disabled\" readonly=\"readonly\""; } ?>
+ <?php echo vpm_tabindex(); ?>
/>
</td><td class="formdesc">
Extra attributes can be defined in the database, if this field is
@@ -212,7 +214,7 @@
</td></tr>
<?php if (!$isAdmin) { ?>
- <tr><td colspan="1"><input type="submit" name="submit" value="Update"/></form>
+ <tr><td colspan="1"><input type="submit" name="submit" value="Update" <?php echo vpm_tabindex(); ?>/></form>
</td>
<td colspan="1"> </td>
<td colspan="1">
@@ -222,7 +224,7 @@
<input type="submit" name="submit"
value="<<<Delete <?php
echo $domaininfo['name']; ?>>>>"
- class="delete_button" />
+ class="delete_button" <?php echo vpm_tabindex(); ?> />
</td>
</tr>
<?php } ?>
diff -ur vpostmaster-www-orig/login.php vpostmaster-www/login.php
--- vpostmaster-www-orig/login.php 2008-06-18 16:50:44.000000000 -0500
+++ vpostmaster-www/login.php 2008-06-29 00:21:36.000000000 -0500
@@ -65,9 +65,9 @@
<form method="POST"><table>
<tr><td><label for="login_username">User name:</label></td>
<td><input id="login_username" type="text" name="username"
- <?php echo "value=\"$username\""; ?> ></td></tr>
+ <?php echo "value=\"$username\""; ?> <?php echo vpm_tabindex(); ?> /></td></tr>
<tr><td><label for="login_password">Password:</label></td>
<td><input id="login_password" type="password" name="password"
- <?php echo "value=\"$password\""; ?> ></td></tr>
- <tr><td colspan="2"><input type="submit" name="login" value="Login"></td></tr>
+ <?php echo "value=\"$password\""; ?> <?php echo vpm_tabindex(); ?> /></td></tr>
+ <tr><td colspan="2"><input type="submit" name="login" value="Login" <?php echo vpm_tabindex(); ?> /></td></tr>
</table></form>
diff -ur vpostmaster-www-orig/system_defaults.php vpostmaster-www/system_defaults.php
--- vpostmaster-www-orig/system_defaults.php 2008-06-18 16:50:44.000000000 -0500
+++ vpostmaster-www/system_defaults.php 2008-06-29 00:21:37.000000000 -0500
@@ -129,6 +129,6 @@
echo "<table><form action=\"system_defaults.php\" method=\"POST\">";
vpm_display_settings($vpm_settings, $errorfields, $info);
echo "<tr><td colspan=\"3\"><input type=\"submit\" name=\"submit\" " .
- "value=\"Update\" /></td></tr>";
+ "value=\"Update\" " . vpm_tabindex() . "/></td></tr>";
echo "<form></table>";
?>
diff -ur vpostmaster-www-orig/user_create.php vpostmaster-www/user_create.php
--- vpostmaster-www-orig/user_create.php 2008-06-18 16:50:44.000000000 -0500
+++ vpostmaster-www/user_create.php 2008-06-29 00:29:19.000000000 -0500
@@ -280,7 +280,7 @@
<form method="POST" action="user_create.php"><table>
<tr><td><label for="name">Login:</label></td><td>
<input type="text" id="name" name="name", value="<?php echo
- $info["name"]; ?>" size="30" maxlen="64" />
+ $info["name"]; ?>" size="30" maxlen="64" <?php echo vpm_tabindex(); ?> />
</td><td class="formdesc">
Name of the user.
<?php echo
@@ -291,19 +291,20 @@
<tr><td><label for="password1">Password:</label></td><td>
<input type="password" id="password1" name="password1", value="<?php echo
- $info['password1']; ?>" size="30" maxlen="64" />
+ $info['password1']; ?>" size="30" maxlen="64" <?php echo vpm_tabindex(); ?> />
</td><td class="formdesc">Password for the new user.
</td></tr>
<tr><td><label for="password2">Password (again):</label></td><td>
<input type="password" id="password2" name="password2", value="<?php echo
- $info['password1']; ?>" size="30" maxlen="64" />
+ $info['password1']; ?>" size="30" maxlen="64" <?php echo vpm_tabindex(); ?> />
</td><td class="formdesc">Verify password for the user.
</td></tr>
<tr><td><label for="active">Active:</label></td><td>
<input TYPE="checkbox" id="active" NAME="active" VALUE="t"
- <?php if ($info["active"] == "t") { echo "checked"; } ?> />
+ <?php if ($info["active"] == "t") { echo "checked=\"checked\""; } ?>
+ <?php echo vpm_tabindex(); ?> />
</td><td class="formdesc">
Accept (checked; default) or reject email for user.
<?php echo
@@ -315,7 +316,7 @@
<tr><td><label for="ld">Local Delivery:</label></td><td>
<input TYPE="checkbox" id="ld" NAME="localdeliveryenabled" VALUE="t"
<?php if ($info["localdeliveryenabled"] == "t")
- { echo "checked"; } ?> />
+ { echo "checked=\"checked\""; } ?> <?php echo vpm_tabindex(); ?> />
</td><td class="formdesc">
Deliver mail locally (checked); forward (unchecked + set
forwarding address below) or store and forward (checked + set
@@ -327,7 +328,7 @@
</td></tr>
<tr><td><label for="forwardto">Forward To:</label></td><td>
- <textarea id="forwardto" name="forwardto" rows="5" cols="30"><?php echo
+ <textarea id="forwardto" name="forwardto" rows="5" cols="30" <?php echo vpm_tabindex(); ?> ><?php echo
$info["forwardto"]; ?></textarea>
</td><td class="formdesc">
Forward to email addresses, one per line.
@@ -339,7 +340,7 @@
<tr><td><label for="quota">Quota:</label></td><td>
<input type="text" id="quota" name="quotainmegabytes", value="<?php echo
- $info["quotainmegabytes"]; ?>" size="4" maxlen="4" />MB
+ $info["quotainmegabytes"]; ?>" size="4" maxlen="4" <?php echo vpm_tabindex(); ?> />MB
</td><td class="formdesc">
Optionally, the maximum size of the users mailbox in megabytes.
<?php echo
@@ -358,11 +359,12 @@
$attributeChecked = "";
if (array_key_exists("extra_${attribute['id']}", $info)
&& $info["extra_${attribute['id']}"] == 'true') {
- $attributeChecked = "checked";
+ $attributeChecked = "checked=\"checked\"";
}
echo "<input TYPE=\"checkbox\" " .
"id=\"extra_${attribute['id']}\" " .
"NAME=\"extra_${attribute['id']}\" VALUE=\"true\" " .
+ vpm_tabindex() .
"${attributeChecked} />";
} else if ($attribute["class"] == 'TEXT') {
$attributeValue = "";
@@ -372,6 +374,7 @@
echo "<input TYPE=\"text\" id=\"extra_${attribute['id']}\" " .
"NAME=\"extra_${attribute['id']}\" " .
"SIZE=\"30\" MAXLEN=\"4096\" " .
+ vpm_tabindex() .
"VALUE=\"${attributeValue}\" />";
}
echo "</td><td class=\"formdesc\">" .
@@ -381,7 +384,7 @@
?>
<tr><td colspan="3"><input type="submit" name="submit" value="Create"
- /></td></tr>
+ <?php echo vpm_tabindex(); ?> /></td></tr>
</form></table>
<?php } # end of showForm ?>
diff -ur vpostmaster-www-orig/user_delete.php vpostmaster-www/user_delete.php
--- vpostmaster-www-orig/user_delete.php 2008-06-18 16:50:44.000000000 -0500
+++ vpostmaster-www/user_delete.php 2008-06-29 00:21:39.000000000 -0500
@@ -55,7 +55,7 @@
<input type="submit" name="submit"
value="Click here if you are SURE you want to delete '<?php
echo $username; ?>'"
- class="delete_button" />
+ class="delete_button" <?php echo vpm_tabindex(); ?> />
</form>
<?php
}
diff -ur vpostmaster-www-orig/user_lookup.php vpostmaster-www/user_lookup.php
--- vpostmaster-www-orig/user_lookup.php 2008-06-18 16:50:44.000000000 -0500
+++ vpostmaster-www/user_lookup.php 2008-06-29 00:21:40.000000000 -0500
@@ -64,20 +64,20 @@
<form method="POST" action="user_lookup.php">
<label for="search">Search for User</label>
<input id="search" type="text" name="search"
- value="<?php echo $searchString; ?>" />
- <input type="submit" name="submit" value="Search" />
+ value="<?php echo $searchString; ?>" <?php echo vpm_tabindex(); ?> />
+ <input type="submit" name="submit" value="Search" <?php echo vpm_tabindex(); ?> />
</form><br />
<?php
# display header
if ($showPrevious) {
echo ("<a href=\"user_lookup.php?offset=${offsetPrevious}" .
- "&search=${searchString}\"><<< Previous</a>" .
+ "&search=${searchString}\" " . vpm_tabindex() . "><<< Previous</a>" .
" ");
}
if ($showNext) {
echo (" <a href=\"user_lookup.php?" .
- "offset=${offsetNext}&search=${searchString}\">Next " .
+ "offset=${offsetNext}&search=${searchString}\" " . vpm_tabindex() . ">Next " .
">>></a>");
}
@@ -120,7 +120,7 @@
"title=\"Select this user for a multiple action\" " .
"type=\"checkbox\" name=\"multiselect\" " .
"value=\"${row['name']}\" /></td> --><td><a " .
- "href=\"user_view.php?username=${row['name']}\">" .
+ "href=\"user_view.php?username=${row['name']}\" " . vpm_tabindex() . ">" .
"${row['name']}@${row['domainsname']}</a></td>" .
"<td>$status</td><td>$accttype</td><td>${quota}</td>" .
"<td>$forwardto</td></tr>");
diff -ur vpostmaster-www-orig/user_rules.php vpostmaster-www/user_rules.php
--- vpostmaster-www-orig/user_rules.php 2008-06-18 16:50:44.000000000 -0500
+++ vpostmaster-www/user_rules.php 2008-06-29 00:21:45.000000000 -0500
@@ -208,7 +208,7 @@
echo "<tr ${tridstr}>";
echo "<td><input type=\"checkbox\" name=\"selectedids[]\" " .
"title=\"Check to delete this rule\" " .
- "value=\"${row['id']}\" /></td>";
+ "value=\"${row['id']}\" " . vpm_tabindex() . "/></td>";
echo "<td>${row['precedence']}</td>";
echo "<td>${row['action']}</td>";
echo "<td>${row['sender']}</td>";
@@ -220,7 +220,7 @@
}
if ($sentRow) {
echo "<tr><td colspan=\"8\"><input type=\"submit\" " .
- "name=\"submit\" value=\"Delete Selected\" /></td></tr>";
+ "name=\"submit\" value=\"Delete Selected\" " . vpm_tabindex() . "/></td></tr>";
echo "</form></table>";
}
pg_free_result($result);
@@ -242,13 +242,13 @@
<tr><td><label for="precedence">Precedence:</label></td><td><input
type="text" name="precedence" id="precedence"
value="<?php echo $info["precedence"]; ?>"
- size="3" maxlength="3" /></td><td class="formdesc">
+ size="3" maxlength="3" <?php echo vpm_tabindex(); ?> /></td><td class="formdesc">
Rules are evaluated from highest priority to lowest.
Multiple rules can exist at the same precedence. The highest
precedence rule determines the action taken.
</td></tr>
<tr><td><label for="action">Action:</label></td><td>
- <select id="action" name="action">
+ <select id="action" name="action" <?php echo vpm_tabindex(); ?> >
<option value="reject" <?php if ($info["action"] == "reject") {
echo "selected"; } ?>>Reject</option>
<option value="accept" <?php if ($info["action"] == "accept") {
@@ -269,14 +269,14 @@
</td></tr>
<tr><td><label for="sender">Sender Address:</label></td>
<td><input type="text" name="sender" id="sender"
- value="<?php echo $info["sender"]; ?>" /></td><td class="formdesc">
+ value="<?php echo $info["sender"]; ?>" <?php echo vpm_tabindex(); ?> /></td><td class="formdesc">
The envelope sender address. This must be a full e-mail address
(user at example.com). May also include the prefix "regex:" for a
regular expression match.
</td></tr>
<tr><td><label for="recipient">Recipient Address:</label></td>
<td><input type="text" name="recipient" id="recipient"
- value="<?php echo $info["recipient"]; ?>" /></td><td class="formdesc">
+ value="<?php echo $info["recipient"]; ?>" <?php echo vpm_tabindex(); ?> /></td><td class="formdesc">
The envelope recipient address. This is your
address, including any extension informaiton. This must be
a full e-mail address (user at example.com). May also include
@@ -284,22 +284,22 @@
</td></tr>
<tr><td><label for="heloname">Helo Name</label></td>
<td><input type="text" name="heloname" id="heloname"
- value="<?php echo $info["heloname"]; ?>" /></td><td class="formdesc">
+ value="<?php echo $info["heloname"]; ?>" <?php echo vpm_tabindex(); ?> /></td><td class="formdesc">
The HELO name sent by the client. May also include the prefix
"regex:" for a regular expression match.
</td></tr>
<tr><td><label for="remotename">Remote Host Name:</label></td>
<td><input type="text" name="remotename" id="remotename"
- value="<?php echo $info["remotename"]; ?>" /></td><td class="formdesc">
+ value="<?php echo $info["remotename"]; ?>" <?php echo vpm_tabindex(); ?> /></td><td class="formdesc">
The remote host name (if available). May also include the
prefix "regex:" for a regular expression match.
</td></tr>
<tr><td><label for="remoteip">Remote IP Address:</label></td>
<td><input type="text" name="remoteip" id="remoteip"
value="<?php echo $info["remoteip"]; ?>"
- size="15" maxlength="15" /></td><td class="formdesc">
+ size="15" maxlength="15" <?php echo vpm_tabindex(); ?> /></td><td class="formdesc">
The remote host's IP address.
</td></tr>
<tr><td colspan="3"><input type="submit" name="submit" value="Add Rule"
- /></td></tr>
+ <?php echo vpm_tabindex(); ?>/></td></tr>
</table></form>
diff -ur vpostmaster-www-orig/user_settings.php vpostmaster-www/user_settings.php
--- vpostmaster-www-orig/user_settings.php 2008-06-18 16:50:44.000000000 -0500
+++ vpostmaster-www/user_settings.php 2008-06-29 00:21:46.000000000 -0500
@@ -132,6 +132,6 @@
echo "<table><form action=\"user_settings.php\" method=\"POST\">";
vpm_display_settings($vpm_settings, $errorfields, $info);
echo "<tr><td colspan=\"3\"><input type=\"submit\" name=\"submit\" " .
- "value=\"Update\" /></td></tr>";
+ "value=\"Update\" " . vpm_tabindex() . "/></td></tr>";
echo "<form></table>";
?>
diff -ur vpostmaster-www-orig/user_view.php vpostmaster-www/user_view.php
--- vpostmaster-www-orig/user_view.php 2008-06-18 16:50:44.000000000 -0500
+++ vpostmaster-www/user_view.php 2008-06-29 00:29:05.000000000 -0500
@@ -329,21 +329,22 @@
<tr><td><label for="password1">Password:</label></td><td>
<input type="password" id="password1" name="password1", value="<?php echo
- $info['password1']; ?>" size="30" maxlen="64" />
+ $info['password1']; ?>" size="30" maxlen="64" <?php echo vpm_tabindex(); ?> />
</td><td class="formdesc">Type a new password if you wish to change it.
</td></tr>
<tr><td><label for="password2">Password (again):</label></td><td>
<input type="password" id="password2" name="password2", value="<?php echo
- $info['password2']; ?>" size="30" maxlen="64" />
+ $info['password2']; ?>" size="30" maxlen="64" <?php echo vpm_tabindex(); ?> />
</td><td class="formdesc">Verify new password for the user.
</td></tr>
<?php if (!$isUser) { ?>
<tr><td><label for="active">Active:</label></td><td>
<input TYPE="checkbox" id="active" NAME="active" VALUE="t"
- <?php if ($info["active"] == "t") { echo "checked"; } ?>
- <?php if ($isUser) { echo "disabled readonly"; } ?>
+ <?php if ($info["active"] == "t") { echo "checked=\"checked\""; } ?>
+ <?php if ($isUser) { echo "disabled=\"disabled\" readonly=\"readonly\""; } ?>
+ <?php echo vpm_tabindex(); ?>
/>
</td><td class="formdesc">
Check to receive email. Uncheck to reject all email for this
@@ -358,7 +359,7 @@
<tr><td><label for="ld">Local Delivery:</label></td><td>
<input TYPE="checkbox" id="ld" NAME="localdeliveryenabled" VALUE="t"
<?php if ($info["localdeliveryenabled"] == "t")
- { echo "checked"; } ?> />
+ { echo "checked=\"checked\""; } ?> <?php echo vpm_tabindex(); ?> />
</td><td class="formdesc">
Deliver mail locally (checked); forward (unchecked + set
forwarding address below) or store and forward (checked + set
@@ -370,7 +371,7 @@
</td></tr>
<tr><td><label for="forwardto">Forward To:</label></td><td>
- <textarea id="forwardto" name="forwardto" rows="5" cols="30"><?php echo
+ <textarea id="forwardto" name="forwardto" rows="5" cols="30" <?php echo vpm_tabindex(); ?> ><?php echo
$info["forwardto"]; ?></textarea>
</td><td class="formdesc">
Forward to email addresses, one per line.
@@ -383,7 +384,7 @@
<tr><td><label for="quota">Quota:</label></td><td>
<input type="text" id="quota" name="quotainmegabytes", value="<?php echo
$info["quotainmegabytes"]; ?>" size="4" maxlen="4"
- <?php if ($isUser) { echo "disabled readonly"; } ?>
+ <?php if ($isUser) { echo "disabled=\"disabled\" readonly=\"readonly\""; } echo vpm_tabindex(); ?>
/>MB
</td><td class="formdesc">
Optionally, the mailbox quota in megabytes.
@@ -403,11 +404,12 @@
$attributeChecked = "";
if (array_key_exists("extra_${attribute['id']}", $info)
&& $info["extra_${attribute['id']}"] == 'true') {
- $attributeChecked = "checked";
+ $attributeChecked = "checked=\"checked\"";
}
echo "<input TYPE=\"checkbox\" " .
"id=\"extra_${attribute['id']}\" " .
"NAME=\"extra_${attribute['id']}\" VALUE=\"true\" " .
+ vpm_tabindex() .
"${attributeChecked} />";
} else if ($attribute["class"] == 'TEXT') {
$attributeValue = "";
@@ -417,6 +419,7 @@
echo "<input TYPE=\"text\" id=\"extra_${attribute['id']}\" " .
"NAME=\"extra_${attribute['id']}\" " .
"SIZE=\"30\" MAXLEN=\"4096\" " .
+ vpm_tabindex() .
"VALUE=\"${attributeValue}\" />";
}
echo "</td><td class=\"formdesc\">" .
@@ -426,7 +429,7 @@
?>
<tr><td colspan="3"><input type="submit" name="submit" value="Update"
- /></td></tr>
+ <?php echo vpm_tabindex(); ?> /></td></tr>
</form></table>
<?php if ($canDelete) { ?>
@@ -436,7 +439,7 @@
<input type="submit" name="submit"
value="<<<Delete '<?php
echo $info['username']; ?>'>>>"
- class="delete_button" />
+ class="delete_button" <?php echo vpm_tabindex(); ?> />
</form>
<?php } ?>
More information about the vPostMaster
mailing list