X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fmrtg%2Fserv_mrtg.c;h=0402461db3ef08998cbc5b2b0ababa947e15ae73;hb=2ab397b00a1b34613748e3cf23503d4a9f7ada67;hp=2ee6f4b23ee22812708d38add97789519aa15dd1;hpb=c1b1936458ccd0d517148615a6ed753f6a3e30c2;p=citadel.git

diff --git a/citadel/modules/mrtg/serv_mrtg.c b/citadel/modules/mrtg/serv_mrtg.c
index 2ee6f4b23..0402461db 100644
--- a/citadel/modules/mrtg/serv_mrtg.c
+++ b/citadel/modules/mrtg/serv_mrtg.c
@@ -1,27 +1,19 @@
 /*
- * $Id$
- *
  * This module supplies statistics about the activity levels of your Citadel
  * system.  We didn't bother writing a reporting module, because there is
  * already an excellent tool called MRTG (Multi Router Traffic Grapher) which
  * is available at http://www.mrtg.org that can fetch data using external
  * scripts.  This module supplies data in the format expected by MRTG.
  *
- * Copyright (c) 1987-2009 by the citadel.org team
- *
- *  This program is free 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.
+ * Copyright (c) 1987-2015 by the citadel.org team
  *
- *  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 open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
  *
- *  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
+ * 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"
@@ -56,7 +48,6 @@
 #include "config.h"
 #include "control.h"
 #include "user_ops.h"
-#include "policy.h"
 #include "database.h"
 #include "msgbase.h"
 
@@ -81,7 +72,7 @@ void mrtg_output(long value1, long value2) {
 	cprintf("%ld\n", value2);
 	cprintf("%d days, %d hours, %d minutes\n",
 		uptime_days, uptime_hours, uptime_minutes);
-	cprintf("%s\n", config.c_humannode);
+	cprintf("%s\n", CtdlGetConfigStr("c_humannode"));
 	cprintf("000\n");
 }
 
@@ -119,7 +110,7 @@ void mrtg_users(void) {
  * Volume of messages submitted
  */
 void mrtg_messages(void) {
-	mrtg_output(CitControl.MMhighest, 0L);
+	mrtg_output(CtdlGetConfigLong("MMhighest"), 0);
 }
 
 
@@ -184,6 +175,6 @@ CTDL_MODULE_INIT(mrtg)
 	        CtdlRegisterProtoHook(cmd_mrtg, "MRTG", "Supply stats to MRTG");
 	}
 	
-	/* return our Subversion id for the Log */
-        return "$Id$";
+	/* return our module name for the log */
+        return "mrtg";
 }