SUBST: Dynamicaly generate contexts

[citadel.git] / webcit / useredit.c

diff --git a/webcit/useredit.c b/webcit/useredit.c
index ef1be72b6b50b7fd2653ef25249fff7963f8bfe7..9e70f81d3c5dbc0b7467365d4bd3ecc649884382 100644 (file)
--- a/webcit/useredit.c
+++ b/webcit/useredit.c
@@ -1,25 +1,19 @@
 /*
- * Copyright (c) 1996-2011 by the citadel.org team
+ * Copyright (c) 1996-2012 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 as
- * published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
+ * modify it under the terms of the GNU General Public License, version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 #include "webcit.h"
 #include "webserver.h"
 
-
+CtxType CTX_USERLIST = CTX_NONE;
 /*
  *  show a list of available users to edit them
  *  message the header message???
@@ -336,80 +330,80 @@ HashList *iterate_load_userlist(StrBuf *Target, WCTemplputParams *TP)
 
 void tmplput_USERLIST_UserName(StrBuf *Target, WCTemplputParams *TP)
 {
-       UserListEntry *ul = (UserListEntry*) CTX;
+       UserListEntry *ul = (UserListEntry*) CTX(CTX_USERLIST);
        StrBufAppendTemplate(Target, TP, ul->UserName, 0);
 }
 
 void tmplput_USERLIST_Password(StrBuf *Target, WCTemplputParams *TP)
 {
-       UserListEntry *ul = (UserListEntry*) CTX;
+       UserListEntry *ul = (UserListEntry*) CTX(CTX_USERLIST);
        StrBufAppendTemplate(Target, TP, ul->Passvoid, 0);
 }
 
 void tmplput_USERLIST_AccessLevelNo(StrBuf *Target, WCTemplputParams *TP)
 {
-       UserListEntry *ul = (UserListEntry*) CTX;
+       UserListEntry *ul = (UserListEntry*) CTX(CTX_USERLIST);
 
        StrBufAppendPrintf(Target, "%d", ul->AccessLevel, 0);
 }
 
 void tmplput_USERLIST_AccessLevelStr(StrBuf *Target, WCTemplputParams *TP)
 {
-       UserListEntry *ul = (UserListEntry*) CTX;
+       UserListEntry *ul = (UserListEntry*) CTX(CTX_USERLIST);
        
        StrBufAppendBufPlain(Target, _(axdefs[ul->AccessLevel]), -1, 0);
 }
 
 void tmplput_USERLIST_UID(StrBuf *Target, WCTemplputParams *TP)
 {
-       UserListEntry *ul = (UserListEntry*) CTX;
+       UserListEntry *ul = (UserListEntry*) CTX(CTX_USERLIST);
 
        StrBufAppendPrintf(Target, "%d", ul->UID, 0);
 }
 
 void tmplput_USERLIST_LastLogonNo(StrBuf *Target, WCTemplputParams *TP)
 {
-       UserListEntry *ul = (UserListEntry*) CTX;
+       UserListEntry *ul = (UserListEntry*) CTX(CTX_USERLIST);
 
        StrBufAppendPrintf(Target,"%ld", ul->LastLogonT, 0);
 }
 void tmplput_USERLIST_LastLogonStr(StrBuf *Target, WCTemplputParams *TP)
 {
-       UserListEntry *ul = (UserListEntry*) CTX;
+       UserListEntry *ul = (UserListEntry*) CTX(CTX_USERLIST);
        StrEscAppend(Target, NULL, asctime(localtime(&ul->LastLogonT)), 0, 0);
 }
 
 void tmplput_USERLIST_nLogons(StrBuf *Target, WCTemplputParams *TP)
 {
-       UserListEntry *ul = (UserListEntry*) CTX;
+       UserListEntry *ul = (UserListEntry*) CTX(CTX_USERLIST);
 
        StrBufAppendPrintf(Target, "%d", ul->nLogons, 0);
 }
 
 void tmplput_USERLIST_nPosts(StrBuf *Target, WCTemplputParams *TP)
 {
-       UserListEntry *ul = (UserListEntry*) CTX;
+       UserListEntry *ul = (UserListEntry*) CTX(CTX_USERLIST);
 
        StrBufAppendPrintf(Target, "%d", ul->nPosts, 0);
 }
 
 void tmplput_USERLIST_Flags(StrBuf *Target, WCTemplputParams *TP)
 {
-       UserListEntry *ul = (UserListEntry*) CTX;
+       UserListEntry *ul = (UserListEntry*) CTX(CTX_USERLIST);
 
        StrBufAppendPrintf(Target, "%d", ul->Flags, 0);
 }
 
 void tmplput_USERLIST_DaysTillPurge(StrBuf *Target, WCTemplputParams *TP)
 {
-       UserListEntry *ul = (UserListEntry*) CTX;
+       UserListEntry *ul = (UserListEntry*) CTX(CTX_USERLIST);
 
        StrBufAppendPrintf(Target, "%d", ul->DaysTillPurge, 0);
 }
 
 int ConditionalUser(StrBuf *Target, WCTemplputParams *TP)
 {
-       UserListEntry *ul = (UserListEntry*) CTX;
+       UserListEntry *ul = (UserListEntry*) CTX(CTX_USERLIST);
        if (havebstr("usernum")) {
                return ibstr("usernum") == ul->UID;
        }
@@ -422,13 +416,13 @@ int ConditionalUser(StrBuf *Target, WCTemplputParams *TP)
 
 int ConditionalFlagINetEmail(StrBuf *Target, WCTemplputParams *TP)
 {
-       UserListEntry *ul = (UserListEntry*) CTX;
+       UserListEntry *ul = (UserListEntry*) CTX(CTX_USERLIST);
        return (ul->Flags & US_INTERNET) != 0;
 }
 
 int ConditionalUserAccess(StrBuf *Target, WCTemplputParams *TP)
 {
-       UserListEntry *ul = (UserListEntry*) CTX;
+       UserListEntry *ul = (UserListEntry*) CTX(CTX_USERLIST);
        
        if (ul == NULL)
                return 0;
@@ -442,7 +436,7 @@ int ConditionalUserAccess(StrBuf *Target, WCTemplputParams *TP)
 }
 int ConditionalHaveBIO(StrBuf *Target, WCTemplputParams *TP)
 {
-       UserListEntry *ul = (UserListEntry*) CTX;
+       UserListEntry *ul = (UserListEntry*) CTX(CTX_USERLIST);
        
        if (ul == NULL)
                return 0;
@@ -467,8 +461,10 @@ void tmplput_USER_BIO(StrBuf *Target, WCTemplputParams *TP)
                        if ( (StrLength(Buf)==3) && 
                             !strcmp(ChrPtr(Buf), "000")) 
                                Done = 1;
-                       else
+                       else {
                                StrBufAppendBuf(BioBuf, Buf, 0);
+                               StrBufAppendBufPlain(BioBuf, HKEY("\n"), 0);
+                       }
                }
                StrBufAppendTemplate(Target, TP, BioBuf, 1);
                FreeStrBuf(&BioBuf);
@@ -806,19 +802,11 @@ void _display_edituser(void) {
        display_edituser(NULL, 0);
 }
 
-void showuser(void)
-{
-       output_headers(1, 0, 0, 0, 1, 0);
-       do_template("user_show");
-       end_burst();
-}
-
-
 void 
 InitModule_USEREDIT
 (void)
 {
-       WebcitAddUrlHandler(HKEY("showuser"), "", 0, showuser, 0);
+       RegisterCTX(CTX_USERLIST);
        WebcitAddUrlHandler(HKEY("select_user_to_edit"), "", 0, _select_user_to_edit, 0);
        WebcitAddUrlHandler(HKEY("display_edituser"), "", 0, _display_edituser, 0);
        WebcitAddUrlHandler(HKEY("edituser"), "", 0, edituser, 0);