CtdlEncodeBase64() - only add linebreaks if told to by the caller.

[citadel.git] / webcit / auth.c

diff --git a/webcit/auth.c b/webcit/auth.c
index c6ee328e43a785c842d0243eaa4fa94c7c169f1a..74d9237e94d9d47358ca47e3dcf582ddf01c4fb9 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -1,7 +1,7 @@
 /*
  * These functions handle authentication of users to a Citadel server.
  *
- * 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.
@@ -409,45 +409,9 @@ void finalize_openid_login(void)
 
 /*
  * Display a welcome screen to the user.
- *
- * If this is the first time login, and the web based setup is enabled, 
- * lead the user through the setup routines
  */
-void do_welcome(void)
-{
+void do_welcome(void) {
        StrBuf *Buf;
-#ifdef XXX_NOT_FINISHED_YET_XXX
-       FILE *fp;
-       int i;
-
-       /**
-        * See if we have to run the first-time setup wizard
-        */
-       if (WC->is_aide) {
-               if (!setup_wizard) {
-                       int len;
-                       sprintf(wizard_filename, "setupwiz.%s.%s",
-                               abs(HashLittle(ctdlhost, strlen(ctdlhost))),
-                               abs(HashLittle(ctdlport, strlen(ctdlport)))
-                       );
-
-                       fp = fopen(wizard_filename, "r");
-                       if (fp != NULL) {
-                               fgets(buf, sizeof buf, fp);
-                               buf[strlen(buf)-1] = 0;
-                               fclose(fp);
-                               if (atoi(buf) == serv_info.serv_rev_level) {
-                                       setup_wizard = 1;       /* already run */
-                               }
-                       }
-               }
-
-               if (!setup_wizard) {
-                       http_redirect("setup_wizard");
-               }
-       }
-#endif
-
        /*
         * Go to the user's preferred start page
         */
@@ -522,8 +486,7 @@ void monitor(void)
        );
        begin_burst();
 
-       wc_printf("Connection to Citadel server at %s:%s : %s\r\n",
-               ctdlhost, ctdlport,
+       wc_printf("Connection to Citadel server in %s : %s\r\n", ctdl_dir,
                (WC->connected ? "SUCCESS" : "FAIL")
        );