X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fsummary.c;h=faa4f45b2d82b02e59316919d1d2e7247ce4dc88;hb=HEAD;hp=332971ff4da03f95313cac243ea79c40b707a7d4;hpb=85364efb787d12d551db7c3ee5d51cac611aeae9;p=citadel.git diff --git a/webcit/summary.c b/webcit/summary.c index 332971ff4..5dbe60435 100644 --- a/webcit/summary.c +++ b/webcit/summary.c @@ -1,7 +1,7 @@ /* * Displays the "Summary Page" * - * Copyright (c) 1996-2012 by the citadel.org team + * Copyright (c) 1996-2021 by the citadel.org team * * This program is open source software. You can redistribute it and/or * modify it under the terms of the GNU General Public License, version 3. @@ -94,7 +94,6 @@ void tasks_section(void) { long HKLen; void *vMsg; message_summary *Msg; - wcsession *WCC = WC; StrBuf *Buf; SharedMessageStatus Stat; @@ -107,16 +106,16 @@ void tasks_section(void) { gotoroom(Buf); FreeStrBuf(&Buf); - if (WCC->CurRoom.view != VIEW_TASKS) { + if (WC->CurRoom.view != VIEW_TASKS) { num_msgs = 0; } else { - num_msgs = load_msg_ptrs("MSGS ALL", NULL, &Stat, NULL); + num_msgs = load_msg_ptrs("MSGS ALL", NULL, NULL, &Stat, NULL, NULL, NULL, NULL, 0); } if (num_msgs > 0) { - at = GetNewHashPos(WCC->summ, 0); - while (GetNextHashPos(WCC->summ, at, &HKLen, &HashKey, &vMsg)) { + at = GetNewHashPos(WC->summ, 0); + while (GetNextHashPos(WC->summ, at, &HKLen, &HashKey, &vMsg)) { Msg = (message_summary*) vMsg; tasks_LoadMsgFromServer(NULL, NULL, Msg, 0, 0); } @@ -143,7 +142,6 @@ void calendar_section(void) { long HKLen; void *vMsg; message_summary *Msg; - wcsession *WCC = WC; StrBuf *Buf; void *v = NULL; SharedMessageStatus Stat; @@ -160,7 +158,7 @@ void calendar_section(void) { num_msgs = 0; } else { - num_msgs = load_msg_ptrs("MSGS ALL", NULL, &Stat, NULL); + num_msgs = load_msg_ptrs("MSGS ALL", NULL, NULL, &Stat, NULL, NULL, NULL, NULL, 0); } calendar_GetParamsGetServerCall(&Stat, &v, @@ -172,8 +170,8 @@ void calendar_section(void) { if (num_msgs > 0) { - at = GetNewHashPos(WCC->summ, 0); - while (GetNextHashPos(WCC->summ, at, &HKLen, &HashKey, &vMsg)) { + at = GetNewHashPos(WC->summ, 0); + while (GetNextHashPos(WC->summ, at, &HKLen, &HashKey, &vMsg)) { Msg = (message_summary*) vMsg; calendar_LoadMsgFromServer(NULL, &v, Msg, 0, 0); } @@ -214,14 +212,9 @@ InitModule_SUMMARY (void) { RegisterNamespace("TIME:NOW", 0, 0, tmplput_output_date, NULL, CTX_NONE); - RegisterNamespace("SUMMARY:NEWMESSAGES_SELECTION", 0, 0, tmplput_new_messages_section, NULL, CTX_NONE); - RegisterNamespace("SUMMARY:TASKSSECTION", 0, 0, tmplput_tasks_section, NULL, CTX_NONE); - RegisterNamespace("SUMMARY:CALENDAR_SECTION", 0, 0, tmplput_calendar_section, NULL, CTX_NONE); - WebcitAddUrlHandler(HKEY("summary"), "", 0, display_summary_page, ANONYMOUS); WebcitAddUrlHandler(HKEY("new_messages_html"), "", 0, new_messages_section, AJAX); WebcitAddUrlHandler(HKEY("tasks_inner_html"), "", 0, tasks_section, AJAX); WebcitAddUrlHandler(HKEY("calendar_inner_html"), "", 0, calendar_section, AJAX); - }