[vPostMaster] Control panel tab index

CyberLeo Kitsana cyberleo at cyberleo.net
Mon Jan 7 06:25:48 MST 2008


Hi!

Here's a patch to make tab indexing in the control panel a bit more 
natural. With it, tab moves to the next editable field, instead of 
jumping to any links between fields.

It is designed to apply within the 'vpostmaster-1.42' directory, prior 
to installation.

This was a little easier than the patch to convert everything to use MySQL.

Thanks!

-- 
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	2006-12-07 23:24:25.000000000 -0600
+++ vpostmaster-www/adminuser_create.php	2008-01-07 06:35:21.000000000 -0600
@@ -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_delete.php vpostmaster-www/adminuser_delete.php
--- vpostmaster-www-orig/adminuser_delete.php	2006-12-07 23:24:25.000000000 -0600
+++ vpostmaster-www/adminuser_delete.php	2008-01-07 05:23:11.000000000 -0600
@@ -8,7 +8,7 @@
    vpm_start();
 
    #  setup
-   $ret = vpm_validateform("name", "Name", "/^[-a-z0-9+._]+$/",
+   $ret = vpm_validateform("name", "Name", "/^[-a-z0-9+ at ._]+$/",
          1, 50, 1);
    $name = $ret[1];
    if ($ret[0] != "successful" ) {
diff -ur vpostmaster-www-orig/adminuser_lookup.php vpostmaster-www/adminuser_lookup.php
--- vpostmaster-www-orig/adminuser_lookup.php	2006-12-07 23:24:25.000000000 -0600
+++ vpostmaster-www/adminuser_lookup.php	2008-01-07 05:50:53.000000000 -0600
@@ -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	2006-12-07 23:24:25.000000000 -0600
+++ vpostmaster-www/adminuser_passwd.php	2008-01-07 05:50:01.000000000 -0600
@@ -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	2006-12-07 23:24:25.000000000 -0600
+++ vpostmaster-www/adminuser_view.php	2008-01-07 06:52:56.000000000 -0600
@@ -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">&nbsp;</td>
               <td colspan="1">
@@ -247,7 +247,7 @@
                         echo $info['name']; ?>&gt;&gt;&gt;"
                         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	2006-12-07 23:24:25.000000000 -0600
+++ vpostmaster-www/code.php	2008-01-07 06:57:38.000000000 -0600
@@ -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() . " />";
       }
    }
 
@@ -1023,7 +1028,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"; }
@@ -1032,7 +1037,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>";
       }
Only in vpostmaster-www: debug.backtrace.php
diff -ur vpostmaster-www-orig/domain_create.php vpostmaster-www/domain_create.php
--- vpostmaster-www-orig/domain_create.php	2006-12-07 23:24:25.000000000 -0600
+++ vpostmaster-www/domain_create.php	2008-01-07 06:42:51.000000000 -0600
@@ -111,8 +111,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.
@@ -124,5 +125,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	2006-12-07 23:24:25.000000000 -0600
+++ vpostmaster-www/domain_defaults.php	2008-01-07 06:58:52.000000000 -0600
@@ -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	2006-12-07 23:24:25.000000000 -0600
+++ vpostmaster-www/domain_delete.php	2008-01-07 06:43:54.000000000 -0600
@@ -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	2006-12-07 23:24:25.000000000 -0600
+++ vpostmaster-www/domain_select.php	2008-01-07 05:58:49.000000000 -0600
@@ -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	2006-12-07 23:24:25.000000000 -0600
+++ vpostmaster-www/domain_view.php	2008-01-07 06:44:18.000000000 -0600
@@ -147,8 +147,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.
@@ -159,7 +160,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">&nbsp;</td>
          <td colspan="1">
@@ -169,7 +170,7 @@
                <input type="submit" name="submit"
                   value="&lt;&lt;&lt;Delete <?php
                   echo $domaininfo['name']; ?>&gt;&gt;&gt;"
-                  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	2006-12-07 23:24:25.000000000 -0600
+++ vpostmaster-www/login.php	2008-01-07 06:44:59.000000000 -0600
@@ -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>
Only in vpostmaster-www: pgshim.php
Only in vpostmaster-www: standard.inc.php
diff -ur vpostmaster-www-orig/system_defaults.php vpostmaster-www/system_defaults.php
--- vpostmaster-www-orig/system_defaults.php	2006-12-07 23:24:25.000000000 -0600
+++ vpostmaster-www/system_defaults.php	2008-01-07 06:59:35.000000000 -0600
@@ -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	2006-12-07 23:24:25.000000000 -0600
+++ vpostmaster-www/user_create.php	2008-01-07 07:00:19.000000000 -0600
@@ -203,7 +203,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
@@ -214,19 +214,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
@@ -238,7 +239,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
@@ -250,7 +251,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.
@@ -262,7 +263,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
@@ -272,7 +273,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/user_delete.php vpostmaster-www/user_delete.php
--- vpostmaster-www-orig/user_delete.php	2006-12-07 23:24:25.000000000 -0600
+++ vpostmaster-www/user_delete.php	2008-01-07 06:10:25.000000000 -0600
@@ -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	2006-12-07 23:24:25.000000000 -0600
+++ vpostmaster-www/user_lookup.php	2008-01-07 06:48:53.000000000 -0600
@@ -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}\">&lt;&lt;&lt; Previous</a>" .
+               "&search=${searchString}\" " . vpm_tabindex() . ">&lt;&lt;&lt; Previous</a>" .
                "&nbsp;&nbsp;&nbsp;");
          }
       if ($showNext) {
          echo ("&nbsp;&nbsp;&nbsp;<a href=\"user_lookup.php?" .
-               "offset=${offsetNext}&search=${searchString}\">Next " .
+               "offset=${offsetNext}&search=${searchString}\" " . vpm_tabindex() . ">Next " .
                "&gt;&gt;&gt;</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	2006-12-07 23:24:25.000000000 -0600
+++ vpostmaster-www/user_rules.php	2008-01-07 06:21:15.000000000 -0600
@@ -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	2006-12-07 23:24:25.000000000 -0600
+++ vpostmaster-www/user_settings.php	2008-01-07 07:01:08.000000000 -0600
@@ -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	2006-12-07 23:24:25.000000000 -0600
+++ vpostmaster-www/user_view.php	2008-01-07 06:51:26.000000000 -0600
@@ -226,21 +226,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
@@ -255,7 +256,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
@@ -267,7 +268,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. 
@@ -280,7 +281,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.
@@ -291,7 +292,7 @@
       </td></tr>
 
       <tr><td colspan="3"><input type="submit" name="submit" value="Update"
-            /></td></tr>
+            <?php echo vpm_tabindex(); ?> /></td></tr>
 </form></table>
 
 <?php if ($canDelete) { ?>
@@ -301,7 +302,7 @@
    <input type="submit" name="submit"
       value="&lt;&lt;&lt;Delete '<?php
          echo $info['username']; ?>'&gt;&gt;&gt;"
-      class="delete_button" />
+      class="delete_button" <?php echo vpm_tabindex(); ?> />
 </form>
 <?php } ?>
 


More information about the vPostMaster mailing list