{
output_headers(1, 1, 1, 0, 0, 0);
- svprintf("BOXTITLE", WCS_STRING, _("Zapped (forgotten) rooms"));
+ svput("BOXTITLE", WCS_STRING, _("Zapped (forgotten) rooms"));
do_template("beginbox");
listrms("LZRM -1");
serv_getln(buf, sizeof buf);
}
else if (WC->wc_view == VIEW_ADDRESSBOOK) {
- wprintf("<img height=48 width=48 src=\""
+ wprintf("<img class=\"roompic\" alt=\"\" src=\""
"static/viewcontacts_48x.gif"
"\">"
);
}
else if ( (WC->wc_view == VIEW_CALENDAR) || (WC->wc_view == VIEW_CALBRIEF) ) {
- wprintf("<img height=48 width=48 src=\""
+ wprintf("<img class=\"roompic\" alt=\"\" src=\""
"static/calarea_48x.gif"
"\">"
);
}
else if (WC->wc_view == VIEW_TASKS) {
- wprintf("<img height=48 width=48 src=\""
+ wprintf("<img class=\"roompic\" alt=\"\" src=\""
"static/taskmanag_48x.gif"
"\">"
);
}
else if (WC->wc_view == VIEW_NOTES) {
- wprintf("<img height=48 width=48 src=\""
+ wprintf("<img class=\"roompic\" alt=\"\" src=\""
"static/storenotes_48x.gif"
"\">"
);
}
else if (WC->wc_view == VIEW_MAILBOX) {
- wprintf("<img height=48 width=48 src=\""
+ wprintf("<img class=\"roompic\" alt=\"\" src=\""
"static/privatemess_48x.gif"
"\">"
);
}
else {
- wprintf("<img height=48 width=48 src=\""
+ wprintf("<img class=\"roompic\" alt=\"\" src=\""
"static/chatrooms_48x.gif"
"\">"
);
int i;
wprintf("<form name=\"viewomatic\" action=\"changeview\">\n");
- wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+ wprintf("\t<div style=\"display: inline;\">\n\t<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
wprintf("<label for=\"view_name\">");
wprintf(_("View as:"));
wprintf("</label> "
wprintf("</option>\n");
}
}
- wprintf("</select></form>\n");
+ wprintf("</select></div></form>\n");
}
*/
void embed_search_o_matic(void) {
wprintf("<form name=\"searchomatic\" action=\"do_search\">\n");
- wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+ wprintf("<div style=\"display: inline;\"><input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
wprintf("<label for=\"search_name\">");
wprintf(_("Search: "));
- wprintf("</label> <input ");
+ wprintf("</label><input ");
wprintf("%s", serv_info.serv_fulltext_enabled ? "" : "disabled ");
wprintf("type=\"text\" name=\"query\" size=\"15\" maxlength=\"128\" "
"id=\"search_name\" class=\"inputbox\">\n"
);
- wprintf("</form>\n");
+ wprintf("</div></form>\n");
}
strcpy (with_files, "");
stresc(sanitized_roomname, 256, WC->wc_roomname, 1, 1);
- svprintf("ROOMNAME", WCS_STRING, "%s", sanitized_roomname);
- svprintf("NUMMSGS", WCS_STRING,
+ svprintf(HKEY("ROOMNAME"), WCS_STRING, "%s", sanitized_roomname);
+ svprintf(HKEY("NUMMSGS"), WCS_STRING,
_("%d new of %d messages%s"),
extract_int(&got[4], 1),
extract_int(&got[4], 2),
if (navbar_style == navbar_default) wprintf(
"<li class=\"ungoto\">"
"<a href=\"ungoto\">"
- "<img align=\"middle\" src=\"static/ungoto2_24x.gif\" border=\"0\">"
+ "<img src=\"static/ungoto2_24x.gif\" alt=\"\">"
"<span class=\"navbar_link\">%s</span></A>"
"</li>\n", _("Ungoto")
);
wprintf(
"<li class=\"newmess\">"
"<a href=\"readnew\">"
- "<img align=\"middle\" src=\"static/newmess2_24x.gif\" border=\"0\">"
+ "<img src=\"static/newmess2_24x.gif\" alt=\"\">"
"<span class=\"navbar_link\">%s</span></A>"
"</li>\n", _("Read new messages")
);
wprintf(
"<li class=\"viewcontacts\">"
"<a href=\"readfwd\">"
- "<img align=\"middle\" src=\"static/viewcontacts_24x.gif\" "
- "border=\"0\">"
+ "<img src=\"static/viewcontacts_24x.gif\" "
+ "alt=\"\">"
"<span class=\"navbar_link\">"
"%s"
"</span></a></li>\n", _("View contacts")
wprintf(
"<li class=\"staskday\">"
"<a href=\"readfwd?calview=day\">"
- "<img align=\"middle\" src=\"static/taskday2_24x.gif\" "
- "border=\"0\">"
+ "<img src=\"static/taskday2_24x.gif\" "
+ "alt=\"\">"
"<span class=\"navbar_link\">"
"%s"
"</span></a></li>\n", _("Day view")
wprintf(
"<li class=\"monthview\">"
"<a href=\"readfwd?calview=month\">"
- "<img align=\"middle\" src=\"static/monthview2_24x.gif\" "
- "border=\"0\">"
+ "<img src=\"static/monthview2_24x.gif\" "
+ "alt=\"\">"
"<span class=\"navbar_link\">"
"%s"
"</span></a></li>\n", _("Month view")
wprintf(
"<li class=\"monthview\">"
"<a href=\"readfwd?calview=month\">"
- "<img align=\"middle\" src=\"static/monthview2_24x.gif\" "
- "border=\"0\">"
+ "<img src=\"static/monthview2_24x.gif\" "
+ "alt=\"\">"
"<span class=\"navbar_link\">"
"%s"
"</span></a></li>\n", _("Calendar list")
wprintf(
"<li class=\"taskmanag\">"
"<a href=\"readfwd\">"
- "<img align=\"middle\" src=\"static/taskmanag_24x.gif\" "
- "border=\"0\">"
+ "<img src=\"static/taskmanag_24x.gif\" "
+ "alt=\"\">"
"<span class=\"navbar_link\">"
"%s"
"</span></a></li>\n", _("View tasks")
wprintf(
"<li class=\"viewnotes\">"
"<a href=\"readfwd\">"
- "<img align=\"middle\" src=\"static/viewnotes_24x.gif\" "
- "border=\"0\">"
+ "<img src=\"static/viewnotes_24x.gif\" "
+ "alt=\"\">"
"<span class=\"navbar_link\">"
"%s"
"</span></a></li>\n", _("View notes")
wprintf(
"<li class=\"readallmess\">"
"<a href=\"readfwd\">"
- "<img align=\"middle\" src=\"static/readallmess3_24x.gif\" "
- "border=\"0\">"
+ "<img src=\"static/readallmess3_24x.gif\" "
+ "alt=\"\">"
"<span class=\"navbar_link\">"
"%s"
"</span></a></li>\n", _("View message list")
wprintf(
"<li class=\"readallmess\">"
"<a href=\"readfwd\">"
- "<img align=\"middle\" src=\"static/readallmess3_24x.gif\" "
- "border=\"0\">"
+ "<img src=\"static/readallmess3_24x.gif\" "
+ "alt=\"\">"
"<span class=\"navbar_link\">"
"%s"
"</span></a></li>\n", _("Wiki home")
wprintf(
"<li class=\"readallmess\">"
"<a href=\"readfwd\">"
- "<img align=\"middle\" src=\"static/readallmess3_24x.gif\" "
- "border=\"0\">"
+ "<img src=\"static/readallmess3_24x.gif\" "
+ "alt=\"\">"
"<span class=\"navbar_link\">"
"%s"
"</span></a></li>\n", _("Read all messages")
wprintf(
"<li class=\"addnewcontact\">"
"<a href=\"display_enter\">"
- "<img align=\"middle\" src=\"static/addnewcontact_24x.gif\" "
- "border=\"0\"><span class=\"navbar_link\">"
+ "<img src=\"static/addnewcontact_24x.gif\" "
+ "alt=\"\"><span class=\"navbar_link\">"
"%s"
"</span></a></li>\n", _("Add new contact")
);
case VIEW_CALENDAR:
case VIEW_CALBRIEF:
wprintf("<li class=\"addevent\"><a href=\"display_enter");
- if (!IsEmptyStr(bstr("year" ))) wprintf("?year=%s", bstr("year"));
- if (!IsEmptyStr(bstr("month"))) wprintf("?month=%s", bstr("month"));
- if (!IsEmptyStr(bstr("day" ))) wprintf("?day=%s", bstr("day"));
+ if (havebstr("year" )) wprintf("?year=%s", bstr("year"));
+ if (havebstr("month")) wprintf("?month=%s", bstr("month"));
+ if (havebstr("day" )) wprintf("?day=%s", bstr("day"));
wprintf("\">"
- "<img align=\"middle\" src=\"static/addevent_24x.gif\" "
- "border=\"0\"><span class=\"navbar_link\">"
+ "<img src=\"static/addevent_24x.gif\" "
+ "alt=\"\"><span class=\"navbar_link\">"
"%s"
"</span></a></li>\n", _("Add new event")
);
wprintf(
"<li class=\"newmess\">"
"<a href=\"display_enter\">"
- "<img align=\"middle\" src=\"static/newmess3_24x.gif\" "
- "border=\"0\"><span class=\"navbar_link\">"
+ "<img src=\"static/newmess3_24x.gif\" "
+ "alt=\"\"><span class=\"navbar_link\">"
"%s"
"</span></a></li>\n", _("Add new task")
);
case VIEW_NOTES:
wprintf(
"<li class=\"enternewnote\">"
- "<a href=\"javascript:add_new_note();\">"
- "<img align=\"middle\" src=\"static/enternewnote_24x.gif\" "
- "border=\"0\"><span class=\"navbar_link\">"
+ "<a href=\"add_new_note\">"
+ "<img src=\"static/enternewnote_24x.gif\" "
+ "alt=\"\"><span class=\"navbar_link\">"
"%s"
"</span></a></li>\n", _("Add new note")
);
wprintf(
"<li class=\"newmess\">"
"<a href=\"display_enter?wikipage=%s\">"
- "<img align=\"middle\" src=\"static/newmess3_24x.gif\" "
- "border=\"0\"><span class=\"navbar_link\">"
+ "<img src=\"static/newmess3_24x.gif\" "
+ "alt=\"\"><span class=\"navbar_link\">"
"%s"
"</span></a></li>\n", buf, _("Edit this page")
);
wprintf(
"<li class=\"newmess\">"
"<a href=\"display_enter\">"
- "<img align=\"middle\" src=\"static/newmess3_24x.gif\" "
- "border=\"0\"><span class=\"navbar_link\">"
+ "<img src=\"static/newmess3_24x.gif\" "
+ "alt=\"\"><span class=\"navbar_link\">"
"%s"
"</span></a></li>\n", _("Write mail")
);
wprintf(
"<li class=\"newmess\">"
"<a href=\"display_enter\">"
- "<img align=\"middle\" src=\"static/newmess3_24x.gif\" "
- "border=\"0\"><span class=\"navbar_link\">"
+ "<img src=\"static/newmess3_24x.gif\" "
+ "alt=\"\"><span class=\"navbar_link\">"
"%s"
"</span></a></li>\n", _("Enter a message")
);
"<li class=\"skipthisroom\">"
"<a href=\"skip\" "
"title=\"%s\">"
- "<img align=\"middle\" src=\"static/skipthisroom_24x.gif\" border=\"0\">"
+ "<img src=\"static/skipthisroom_24x.gif\" alt=\"\">"
"<span class=\"navbar_link\">%s</span></a>"
"</li>\n",
_("Leave all messages marked as unread, go to next room with unread messages"),
"<li class=\"markngo\">"
"<a href=\"gotonext\" "
"title=\"%s\">"
- "<img align=\"middle\" src=\"static/markngo_24x.gif\" border=\"0\">"
+ "<img src=\"static/markngo_24x.gif\" alt=\"\">"
"<span class=\"navbar_link\">%s</span></a>"
"</li>\n",
_("Mark all messages as read, go to next room with unread messages"),
get_roomflags (&RoomFlags);
- if (!strcasecmp(bstr("QR2_SelfList"), "yes"))
+ if (yesbstr("QR2_SelfList"))
RoomFlags.flags2 = RoomFlags.flags2 | QR2_SELFLIST;
else
RoomFlags.flags2 = RoomFlags.flags2 & ~QR2_SELFLIST;
- if (!strcasecmp(bstr("QR2_SMTP_PUBLIC"), "yes"))
+ if (yesbstr("QR2_SMTP_PUBLIC"))
RoomFlags.flags2 = RoomFlags.flags2 | QR2_SMTP_PUBLIC;
else
RoomFlags.flags2 = RoomFlags.flags2 & ~QR2_SMTP_PUBLIC;
- if (!strcasecmp(bstr("QR2_Moderated"), "yes"))
+ if (yesbstr("QR2_Moderated"))
RoomFlags.flags2 = RoomFlags.flags2 | QR2_MODERATED;
else
RoomFlags.flags2 = RoomFlags.flags2 & ~QR2_MODERATED;
- if (!strcasecmp(bstr("QR2_SubsOnly"), "yes"))
+ if (yesbstr("QR2_SubsOnly"))
RoomFlags.flags2 = RoomFlags.flags2 | QR2_SMTP_PUBLIC;
else
RoomFlags.flags2 = RoomFlags.flags2 & ~QR2_SMTP_PUBLIC;
int bump;
- if (IsEmptyStr(bstr("ok_button"))) {
+ if (!havebstr("ok_button")) {
strcpy(WC->ImportantMessage,
_("Cancelled. Changes were not saved."));
display_editroom();
er_flags &= ~QR_MAILBOX;
}
- if (!strcmp(bstr("prefonly"), "yes")) {
+ if (yesbstr("prefonly")) {
er_flags |= QR_PREFONLY;
} else {
er_flags &= ~QR_PREFONLY;
}
- if (!strcmp(bstr("readonly"), "yes")) {
+ if (yesbstr("readonly")) {
er_flags |= QR_READONLY;
} else {
er_flags &= ~QR_READONLY;
}
- if (!strcmp(bstr("collabdel"), "yes")) {
+ if (yesbstr("collabdel")) {
er_flags2 |= QR2_COLLABDEL;
} else {
er_flags2 &= ~QR2_COLLABDEL;
}
- if (!strcmp(bstr("permanent"), "yes")) {
+ if (yesbstr("permanent")) {
er_flags |= QR_PERMANENT;
} else {
er_flags &= ~QR_PERMANENT;
}
- if (!strcmp(bstr("subjectreq"), "yes")) {
+ if (yesbstr("subjectreq")) {
er_flags2 |= QR2_SUBJECTREQ;
} else {
er_flags2 &= ~QR2_SUBJECTREQ;
}
- if (!strcmp(bstr("network"), "yes")) {
+ if (yesbstr("network")) {
er_flags |= QR_NETWORK;
} else {
er_flags &= ~QR_NETWORK;
}
- if (!strcmp(bstr("directory"), "yes")) {
+ if (yesbstr("directory")) {
er_flags |= QR_DIRECTORY;
} else {
er_flags &= ~QR_DIRECTORY;
}
- if (!strcmp(bstr("ulallowed"), "yes")) {
+ if (yesbstr("ulallowed")) {
er_flags |= QR_UPLOAD;
} else {
er_flags &= ~QR_UPLOAD;
}
- if (!strcmp(bstr("dlallowed"), "yes")) {
+ if (yesbstr("dlallowed")) {
er_flags |= QR_DOWNLOAD;
} else {
er_flags &= ~QR_DOWNLOAD;
}
- if (!strcmp(bstr("visdir"), "yes")) {
+ if (yesbstr("visdir")) {
er_flags |= QR_VISDIR;
} else {
er_flags &= ~QR_VISDIR;
if (!strcmp(bstr("bump"), "yes"))
bump = 1;
- er_floor = atoi(bstr("er_floor"));
+ er_floor = ibstr("er_floor");
sprintf(buf, "SETR %s|%s|%s|%u|%d|%d|%d|%d|%u",
er_name, er_password, er_dirname, er_flags, bump, er_floor,
strcpy(username, bstr("username"));
- if (!IsEmptyStr(bstr("kick_button"))) {
+ if (havebstr("kick_button")) {
sprintf(buf, "KICK %s", username);
serv_puts(buf);
serv_getln(buf, sizeof buf);
}
}
- if (!IsEmptyStr(bstr("invite_button"))) {
+ if (havebstr("invite_button")) {
sprintf(buf, "INVT %s", username);
serv_puts(buf);
serv_getln(buf, sizeof buf);
output_headers(1, 1, 1, 0, 0, 0);
- svprintf("BOXTITLE", WCS_STRING, _("Create a new room"));
+ svprintf(HKEY("BOXTITLE"), WCS_STRING, _("Create a new room"));
do_template("beginbox");
wprintf("<form name=\"create_room_form\" method=\"POST\" action=\"entroom\">\n");
int er_num_type;
int er_view;
- if (IsEmptyStr(bstr("ok_button"))) {
+ if (!havebstr("ok_button")) {
strcpy(WC->ImportantMessage,
_("Cancelled. No new room was created."));
display_main_menu();
strcpy(er_name, bstr("er_name"));
strcpy(er_type, bstr("type"));
strcpy(er_password, bstr("er_password"));
- er_floor = atoi(bstr("er_floor"));
- er_view = atoi(bstr("er_view"));
+ er_floor = ibstr("er_floor");
+ er_view = ibstr("er_view");
er_num_type = 0;
if (!strcmp(er_type, "hidden"))
{
output_headers(1, 1, 1, 0, 0, 0);
- svprintf("BOXTITLE", WCS_STRING, _("Go to a hidden room"));
+ svprintf(HKEY("BOXTITLE"), WCS_STRING, _("Go to a hidden room"));
do_template("beginbox");
wprintf("<p>");
char hold_rm[SIZ];
char buf[SIZ];
- if (IsEmptyStr(bstr("ok_button"))) {
+ if (!havebstr("ok_button")) {
display_main_menu();
return;
}
*/
strcpy(final_destination, WC->wc_roomname);
- if (!IsEmptyStr(bstr("ok_button"))) {
+ if (havebstr("ok_button")) {
serv_printf("GOTO %s", WC->wc_roomname);
serv_getln(buf, sizeof buf);
if (buf[0] == '2') {
char cmpb0[SIZ];
char cmpb1[SIZ];
int i, num_addrs;
-
- if (!IsEmptyStr(bstr("line_pop3host"))) {
+ // TODO: do line dynamic!
+ if (havebstr("line_pop3host")) {
strcpy(line, bstr("prefix"));
strcat(line, bstr("line_pop3host"));
strcat(line, "|");
strcat(line, "|");
strcat(line, bstr("line_pop3pass"));
strcat(line, "|");
- strcat(line, atoi(bstr("line_pop3keep")) ? "1" : "0" );
+ strcat(line, ibstr("line_pop3keep") ? "1" : "0" );
strcat(line, "|");
- sprintf(&line[strlen(line)],"%ld", atol(bstr("line_pop3int")));
+ sprintf(&line[strlen(line)],"%ld", lbstr("line_pop3int"));
strcat(line, bstr("suffix"));
}
- else if (!IsEmptyStr(bstr("line"))) {
+ else if (havebstr("line")) {
strcpy(line, bstr("prefix"));
strcat(line, bstr("line"));
strcat(line, bstr("suffix"));
serv_puts(buf);
}
- if (!IsEmptyStr(bstr("add_button"))) {
+ if (havebstr("add_button")) {
num_addrs = num_tokens(bstr("line"), ',');
if (num_addrs < 2) {
/* just adding one node or address */
void change_view(void) {
int view;
- view = atol(bstr("view"));
+ view = lbstr("view");
do_change_view(view);
}
if (levels == 1) {
/** Begin inner box */
stresc(boxtitle, 256, floor_name, 1, 0);
- svprintf("BOXTITLE", WCS_STRING, boxtitle);
+ svprintf(HKEY("BOXTITLE"), WCS_STRING, boxtitle);
do_template("beginbox");
}
wprintf("<a href=\"dotgoto?room=");
urlescputs(fold[i].room);
wprintf("\">");
- wprintf("<img align=\"middle\" border=0 src=\"static/%s\" alt=\"\"> ", icon);
+ wprintf("<img border=0 src=\"static/%s\" alt=\"\"> ", icon);
}
else {
wprintf("<i>");
/** Determine whether the user is trying to change views */
if (bstr("view") != NULL) {
- if (!IsEmptyStr(bstr("view"))) {
+ if (havebstr("view")) {
set_preference("roomlistview", bstr("view"), 1);
}
}
void set_room_policy(void) {
char buf[SIZ];
- if (IsEmptyStr(bstr("ok_button"))) {
+ if (!havebstr("ok_button")) {
strcpy(WC->ImportantMessage,
_("Cancelled. Changes were not saved."));
display_editroom();
return;
}
- serv_printf("SPEX room|%d|%d", atoi(bstr("roompolicy")), atoi(bstr("roomvalue")));
+ serv_printf("SPEX room|%d|%d", ibstr("roompolicy"), ibstr("roomvalue"));
serv_getln(buf, sizeof buf);
strcpy(WC->ImportantMessage, &buf[4]);
if (WC->axlevel >= 6) {
strcat(WC->ImportantMessage, "<br />\n");
- serv_printf("SPEX floor|%d|%d", atoi(bstr("floorpolicy")), atoi(bstr("floorvalue")));
+ serv_printf("SPEX floor|%d|%d", ibstr("floorpolicy"), bstr("floorvalue"));
serv_getln(buf, sizeof buf);
strcat(WC->ImportantMessage, &buf[4]);
}
projects / citadel.git / blobdiff