Merge branch 'master' of git://github.com/psy-q/citadel

diff --git a/webcit/static/t/aide/edituser/detailview.html b/webcit/static/t/aide/edituser/detailview.html
index 8396782b1ea00e21775db892b3cb47a6dfb59bb7..8b4acd848e74521ef289fe53a630f68aba7bedec 100644 (file)
--- a/webcit/static/t/aide/edituser/detailview.html
+++ b/webcit/static/t/aide/edituser/detailview.html
@@ -4,37 +4,75 @@
   <h1><?_("Edit user account: ")><?USERLIST:USERNAME("X")></h1>
 </div>
 <div id="content" class="service">
-<table class="useredit_background"><tr><td>
-<form method="POST" action="edituser">
-<input type="hidden" name="username" value="<?USERLIST:USERNAME("X")>">
-<input type="hidden" name="is_new" value="<?BSTR("is_new")>">
-<input type="hidden" name="usernum" value="<?USERLIST:UID>">
-<input type="hidden" name="nonce" value="<?NONCE>"> 
-<input type="hidden" name="flags" value="<?USERLIST:FLAGS>">
-<center><table>
-<tr><td><?_("User name:")></td><td><input type="text" name="newname" value="<?USERLIST:USERNAME("X")>" maxlength="63"></td></tr>
-<tr><td><?_("Password")></td><td><input type="password" name="password" value="<?USERLIST:PASSWD("X")>" maxlength="20"></td></tr>
-<tr><td><?_("Permission to send Internet mail")></td><td><input type="checkbox" name="inetmail" value="yes" <?%("COND:USERLIST:FLAG:USE_INTERNET", 1, 1, 1, "checked", "")>></td></tr>
-<tr><td><?_("Number of logins")></td><td><input type="text" name="timescalled" value="<?USERLIST:NLOGONS>" maxlength="6"></td></tr>
-<tr><td><?_("Messages submitted")></td><td><input type="text" name="msgsposted" value="<?USERLIST:NPOSTS>" maxlength="6"></td></tr>
-<tr><td><?_("Access level")></td><td><select name="axlevel">
-        <option <?%("COND:USERACCESS", 1, 1, #"AxDeleted", 'selected="selected"', "")> value="0">0 - <?_("Deleted")></option>
-        <option <?%("COND:USERACCESS", 1, 1, #"AxNewU", 'selected="selected"', "")> value="1">1 - <?_("New User")></option>
-        <option <?%("COND:USERACCESS", 1, 1, #"AxProbU", 'selected="selected"', "")> value="2">2 - <?_("Problem User")></option>
-        <option <?%("COND:USERACCESS", 1, 1, #"AxLocU", 'selected="selected"', "")> value="3">3 - <?_("Local User")></option>
-        <option <?%("COND:USERACCESS", 1, 1, #"AxNetU", 'selected="selected"', "")> value="4">4 - <?_("Network User")></option>
-        <option <?%("COND:USERACCESS", 1, 1, #"AxPrefU", 'selected="selected"', "")> value="5">5 - <?_("Preferred User")></option>
-        <option <?%("COND:USERACCESS", 1, 1, #"AxAideU", 'selected="selected"', "")> value="6">6 - <?_("Aide")></option>
-</select></td></tr>
-<tr><td><?_("User ID number")></td><td><input type="text" name="usernum" value="<?USERLIST:UID>" maxlength="7"></td></tr>
-<tr><td><?_("Date and time of last login")></td><td><select name="lastcall">
-  <option selected value="<?USERLIST:LASTLOGON:NO>"><?USERLIST:LASTLOGON:STR></option>
-  <option value="<?DATE:NOW:NO>"><?DATE:NOW:STR></option>
-</select></td></tr>
- 
-<tr><td><?_("Auto-purge after this many days")></td><td><input type="text" name="purgedays" value="<?USERLIST:DAYSTILLPURGE>" maxlength="5"></td></tr>
+<table class="useredit_background">
+  <tr>
+    <td>
+      <form method="POST" action="edituser">
+      <input type="hidden" name="username" value="<?USERLIST:USERNAME("X")>">
+      <input type="hidden" name="is_new" value="<?BSTR("is_new")>">
+      <input type="hidden" name="usernum" value="<?USERLIST:UID>">
+      <input type="hidden" name="nonce" value="<?NONCE>"> 
+      <input type="hidden" name="flags" value="<?USERLIST:FLAGS>">
+      <center>
+      
+        <table>
+          <tr>
+            <td><?_("User name:")></td>
+            <td><input type="text" name="newname" value="<?USERLIST:USERNAME("X")>" maxlength="63"></td>
+          </tr>
+          <tr>
+            <td><?_("Password")></td>
+            <td><input type="password" name="password" value="<?USERLIST:PASSWD("X")>" maxlength="20"></td>
+          </tr>
+          <tr>
+            <td><?_("Permission to send Internet mail")></td>
+            <td><input type="checkbox" name="inetmail" value="yes" <?%("COND:USERLIST:FLAG:USE_INTERNET", 1, 1, 1, "checked", "")>></td>
+          </tr>
+          <tr>
+            <td><?_("Number of logins")></td>
+            <td><input type="text" name="timescalled" value="<?USERLIST:NLOGONS>" maxlength="6"></td>
+          </tr>
+          <tr>
+            <td><?_("Messages submitted")></td>
+            <td><input type="text" name="msgsposted" value="<?USERLIST:NPOSTS>" maxlength="6"></td>
+          </tr>
+          <tr>
+            <td><?_("Access level")></td>
+            <td>
+              <select name="axlevel">
+                <option <?%("COND:USERACCESS", 1, 1, #"AxDeleted", 'selected="selected"', "")> value="0">0 - <?_("Deleted")></option>
+                <option <?%("COND:USERACCESS", 1, 1, #"AxNewU", 'selected="selected"', "")> value="1">1 - <?_("New User")></option>
+                <option <?%("COND:USERACCESS", 1, 1, #"AxProbU", 'selected="selected"', "")> value="2">2 - <?_("Problem User")></option>
+                <option <?%("COND:USERACCESS", 1, 1, #"AxLocU", 'selected="selected"', "")> value="3">3 - <?_("Local User")></option>
+                <option <?%("COND:USERACCESS", 1, 1, #"AxNetU", 'selected="selected"', "")> value="4">4 - <?_("Network User")></option>
+                <option <?%("COND:USERACCESS", 1, 1, #"AxPrefU", 'selected="selected"', "")> value="5">5 - <?_("Preferred User")></option>
+                <option <?%("COND:USERACCESS", 1, 1, #"AxAideU", 'selected="selected"', "")> value="6">6 - <?_("Aide")></option>
+              </select>
+             </td>
+          </tr>
+          <tr>
+            <td><?_("User ID number")></td>
+            <td><input type="text" name="usernum" value="<?USERLIST:UID>" maxlength="7"></td>
+          </tr>
+          <tr>
+            <td><?_("Date and time of last login")></td>
+            <td>
+              <select name="lastcall">
+              <option selected value="<?USERLIST:LASTLOGON:NO>"><?USERLIST:LASTLOGON:STR></option>
+              <option value="<?DATE:NOW:NO>"><?DATE:NOW:STR></option>
+              </select>
+            </td>
+          </tr>
+          
+          <tr>
+            <td><?_("Auto-purge after this many days")></td>
+            <td><input type="text" name="purgedays" value="<?USERLIST:DAYSTILLPURGE>" maxlength="5"></td>
+          </tr>
+          </table>
+    
+        <input type="submit" name="ok_button" value="<?_("Save changes")>">&nbsp; <input type="submit" name="cancel" value="<?_("Cancel")>"><br /><br /></form>
+      </center>
+    </td>
+  </tr>
 </table>
-<input type="submit" name="ok_button" value="<?_("Save changes")>">&nbsp; <input type="submit" name="cancel" value="<?_("Cancel")>"><br /><br /></form>
-</center>
-</td></tr></table>
-<?=("trailing")>
+<?=("trailing")>
\ No newline at end of file

diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index c2bf41d47ead02572c55867f203341df14064c76..88dd0cb36cedb3586ec53086f6788bfefb8ceef2 100644 (file)
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -264,7 +264,7 @@ void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, wc_mime_att
        strcpy(org, "");
 
        if (!full) {
-               StrBufAppendPrintf(Target, "<TD>");
+               StrBufAppendPrintf(Target, "<td>");
                name = vcard_get_prop(v, "fn", 1, 0, 0);
                if (name != NULL) {
                        StrEscAppend(Target, NULL, name, 0, 0);
@@ -277,12 +277,12 @@ void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, wc_mime_att
                else {
                        StrBufAppendPrintf(Target, "&nbsp;");
                }
-               StrBufAppendPrintf(Target, "</TD>");
+               StrBufAppendPrintf(Target, "</td>");
                return;
        }
 
-       StrBufAppendPrintf(Target, "<div align=center>"
-               "<table bgcolor=#aaaaaa width=50%%>");
+       StrBufAppendPrintf(Target, "<div align=\"center\">"
+               "<table bgcolor=\"#aaaaaa\" width=\"50%%\">");
        for (pass=1; pass<=2; ++pass) {
 
                if (v->numprops) for (i=0; i<(v->numprops); ++i) {
@@ -396,9 +396,9 @@ void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, wc_mime_att
                        }
                        else if (!strcasecmp(firsttoken, "adr")) {
                                if (pass == 2) {
-                                       StrBufAppendPrintf(Target, "<TR><TD>");
+                                       StrBufAppendPrintf(Target, "<tr><td>");
                                        StrBufAppendPrintf(Target, _("Address:"));
-                                       StrBufAppendPrintf(Target, "</TD><TD>");
+                                       StrBufAppendPrintf(Target, "</td><td>");
                                        for (j=0; j<num_tokens(thisvalue, ';'); ++j) {
                                                extract_token(buf, thisvalue, j, ';', sizeof buf);
                                                if (!IsEmptyStr(buf)) {
@@ -407,7 +407,7 @@ void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, wc_mime_att
                                                        else StrBufAppendPrintf(Target, " ");
                                                }
                                        }
-                                       StrBufAppendPrintf(Target, "</TD></TR>\n");
+                                       StrBufAppendPrintf(Target, "</td></tr>\n");
                                }
                        }
                        /* else if (!strcasecmp(firsttoken, "photo") && full && pass == 2) { 
@@ -445,23 +445,23 @@ void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, wc_mime_att
                }
        
                if (pass == 1) {
-                       StrBufAppendPrintf(Target, "<TR BGCOLOR=\"#AAAAAA\">"
-                       "<TD COLSPAN=2 BGCOLOR=\"#FFFFFF\">"
-                       "<IMG ALIGN=CENTER src=\"static/viewcontacts_48x.gif\">"
-                       "<FONT SIZE=+1><B>");
+                       StrBufAppendPrintf(Target, "<tr bgcolor=\"#aaaaaa\">"
+      "<td colspan=2 bgcolor=\"#ffffff\">"
+      "<img align=\"center\" src=\"static/viewcontacts_48x.gif\">"
+      "<font size=\"+1\"><b>");
                        StrEscAppend(Target, NULL, fullname, 0, 0);
-                       StrBufAppendPrintf(Target, "</B></FONT>");
+                       StrBufAppendPrintf(Target, "</b></font>");
                        if (!IsEmptyStr(title)) {
-                               StrBufAppendPrintf(Target, "<div align=right>");
+                               StrBufAppendPrintf(Target, "<div align=\"right>\"");
                                StrEscAppend(Target, NULL, title, 0, 0);
                                StrBufAppendPrintf(Target, "</div>");
                        }
                        if (!IsEmptyStr(org)) {
-                               StrBufAppendPrintf(Target, "<div align=right>");
+                               StrBufAppendPrintf(Target, "<div align=\"right\">");
                                StrEscAppend(Target, NULL, org, 0, 0);
                                StrBufAppendPrintf(Target, "</div>");
                        }
-                       StrBufAppendPrintf(Target, "</TD></TR>\n");
+                       StrBufAppendPrintf(Target, "</td></tr>\n");
                
                        if (!IsEmptyStr(phone)) {
                                StrBufAppendPrintf(Target, "<tr><td>");
@@ -601,7 +601,7 @@ void do_addrbook_view(addrbookent *addrbook, int num_ab) {
                                end_tab(page-1, num_pages);
                        }
                        begin_tab(page, num_pages);
-                       wc_printf("<table border=0 cellspacing=0 cellpadding=3 width=100%%>\n");
+                       wc_printf("<table border=\"0\" cellspacing=\"0\" cellpadding=\"3\" width=\"100%%\">\n");
                        displayed = 0;
                }
 
@@ -611,7 +611,7 @@ void do_addrbook_view(addrbookent *addrbook, int num_ab) {
                        }
                        bg = 1 - bg;
                        wc_printf("<tr bgcolor=\"#%s\">",
-                               (bg ? "DDDDDD" : "FFFFFF")
+                               (bg ? "dddddd" : "ffffff")
                        );
                }
        
@@ -843,7 +843,7 @@ void do_edit_vcard(long msgnum, char *partnum,
 
        wc_printf("<table class=\"vcard_edit_background\"><tr><td>\n");
 
-       wc_printf("<table border=0><tr>"
+       wc_printf("<table border=\"0\"><tr>"
                "<td>%s</td>"
                "<td>%s</td>"
                "<td>%s</td>"
@@ -893,7 +893,7 @@ void do_edit_vcard(long msgnum, char *partnum,
 
        wc_printf("</td><td>");
 
-       wc_printf("<table border=0>");
+       wc_printf("<table border=\"0\">");
        wc_printf("<tr><td>");
        wc_printf(_("PO box:"));
        wc_printf("</td><td>"