X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=textclient%2Fsrc%2Fcitadel.c;h=bd6f88cbddc8491c81ff3684d977df85a5aa4256;hb=d1dcc57fd3286c9e38b7f15eb2fb047279232628;hp=5821df40413c8b86f7fd7e85ebf8c66a5235aa96;hpb=5a202656af01ddc9db0640e4cc7a84f5974bc2d4;p=citadel.git

diff --git a/textclient/src/citadel.c b/textclient/src/citadel.c
index 5821df404..bd6f88cbd 100644
--- a/textclient/src/citadel.c
+++ b/textclient/src/citadel.c
@@ -1,15 +1,15 @@
 /*
  * Main source module for the client program.
  *
- * Copyright (c) 1987-2012 by the citadel.org team
+ * Copyright (c) 1987-2015 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.
+ * 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.
  *
- *  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.
+ * 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.
  */
 
 #include "sysdep.h"
@@ -41,9 +41,9 @@
 #include <stdarg.h>
 #include <errno.h>
 #include <libcitadel.h>
-#include "citadel.h"
+///#include "citadel.h"
 #include "citadel_ipc.h"
-#include "axdefs.h"
+//#include "axdefs.h"
 #include "routines.h"
 #include "routines2.h"
 #include "tuiconfig.h"
@@ -58,7 +58,7 @@
 #include "snprintf.h"
 #endif
 #include "screen.h"
-#include "citadel_dirs.h"
+///#include "citadel_dirs.h"
 
 #include "ecrash.h"
 #include "md5.h"
@@ -88,7 +88,7 @@ long uglistlsn[UGLISTLEN]; /* current read position for all the ungoto's. Not go
 int uglistsize = 0;
 char is_mail = 0;		/* nonzero when we're in a mail room */
 char axlevel = AxDeleted;		/* access level */
-char is_room_aide = 0;		/* boolean flag, 1 if room aide */
+char is_room_aide = 0;		/* boolean flag, 1 if room admin */
 int timescalled;
 int posted;
 unsigned userflags;
@@ -1005,13 +1005,12 @@ void system_info(CtdlIPC *ipc)
 	CtdlIPCServerInfo(ipc, buf);
 
 	scr_printf("You are connected to %s (%s) @%s\n", ipc->ServInfo.nodename, ipc->ServInfo.humannode, ipc->ServInfo.fqdn);
-	scr_printf("running %s with text client v%.2f,\n", ipc->ServInfo.software, (float)REV_LEVEL/100);
-	scr_printf("server build %s,\n", ipc->ServInfo.svn_revision, (float)REV_LEVEL/100);
-    scr_printf("and located in %s.\n", ipc->ServInfo.site_location);
-    scr_printf("Connected users %d / Active users %d / Highest message #%ld\n", mrtg_users, mrtg_active_users, mrtg_himessage);
-    scr_printf("Server uptime: %s\n", mrtg_server_uptime);
-    scr_printf("Your system administrator is %s.\n", ipc->ServInfo.sysadm);
-    scr_printf("Copyright (C)1987-2009 by the Citadel development team\n");
+	scr_printf("running %s with text client v%.2f,\n", ipc->ServInfo.software, (float)CLIENT_VERSION/100);
+	scr_printf("server build %s,\n", ipc->ServInfo.svn_revision, (float)CLIENT_VERSION/100);
+	scr_printf("and located in %s.\n", ipc->ServInfo.site_location);
+	scr_printf("Connected users %d / Active users %d / Highest message #%ld\n", mrtg_users, mrtg_active_users, mrtg_himessage);
+	scr_printf("Server uptime: %s\n", mrtg_server_uptime);
+	scr_printf("Your system administrator is %s.\n", ipc->ServInfo.sysadm);
 }
 
 /*
@@ -1101,8 +1100,8 @@ void get_serv_info(CtdlIPC *ipc, char *supplied_hostname)
 	moreprompt = ipc->ServInfo.moreprompt;
 
 	/* be nice and identify ourself to the server */
-	CtdlIPCIdentifySoftware(ipc, SERVER_TYPE, 0, REV_LEVEL,
-		 (ipc->isLocal ? "local" : CITADEL),
+	CtdlIPCIdentifySoftware(ipc, CLIENT_TYPE, 0, CLIENT_VERSION,
+		 (ipc->isLocal ? "local" : PACKAGE_STRING),
 		 (supplied_hostname) ? supplied_hostname : 
 		 /* Look up the , in the bible if you're confused */
 		 (locate_host(ipc, buf), buf), buf);
@@ -1419,9 +1418,9 @@ int main(int argc, char **argv)
 
 #ifdef HAVE_BACKTRACE
 	bzero(&params, sizeof(params));
-	params.filename = file_pid_paniclog;
+//	params.filename = file_pid_paniclog;
 //	panic_fd=open(file_pid_paniclog, O_APPEND|O_CREAT|O_DIRECT);
-	params.filep = fopen(file_pid_paniclog, "a+");
+///	params.filep = fopen(file_pid_paniclog, "a+");
 	params.debugLevel = ECRASH_DEBUG_VERBOSE;
 	params.dumpAllThreads = TRUE;
 	params.useBacktraceSymbols = 1;
@@ -1432,7 +1431,7 @@ int main(int argc, char **argv)
 	params.signals[2]=SIGBUS;
 	params.signals[3]=SIGABRT;
 
-	eCrash_Init(&params);
+///	eCrash_Init(&params);
 #endif	
 	setIPCErrorPrintf(scr_printf);
 	setCryptoStatusHook(statusHook);
@@ -1935,12 +1934,6 @@ NEWUSR:	if (IsEmptyStr(rc_password)) {
 			case 73:
 				cli_image_upload(ipc, "_roompic_");
 				break;
-
-			case 74:
-				snprintf(aaa, sizeof aaa, "_floorpic_|%d", curr_floor);
-				cli_image_upload(ipc, aaa);
-				break;
-
 			case 75:
 				enternew(ipc, "roomname", aaa, 20);
 				r = CtdlIPCChangeRoomname(ipc, aaa, bbb);