projects
/
citadel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'configdb' of ssh://git.citadel.org/appl/gitroot/citadel
[citadel.git]
/
citadel
/
modules
/
mrtg
/
serv_mrtg.c
diff --git
a/citadel/modules/mrtg/serv_mrtg.c
b/citadel/modules/mrtg/serv_mrtg.c
index 6abd80cf10a80bb82a46cc3fa3f6b4540bff27ee..0402461db3ef08998cbc5b2b0ababa947e15ae73 100644
(file)
--- a/
citadel/modules/mrtg/serv_mrtg.c
+++ b/
citadel/modules/mrtg/serv_mrtg.c
@@
-5,21
+5,15
@@
* is available at http://www.mrtg.org that can fetch data using external
* scripts. This module supplies data in the format expected by MRTG.
*
* 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-201
2
by the citadel.org team
+ * Copyright (c) 1987-201
5
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"
*/
#include "sysdep.h"
@@
-78,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("%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");
}
cprintf("000\n");
}
@@
-116,7
+110,7
@@
void mrtg_users(void) {
* Volume of messages submitted
*/
void mrtg_messages(void) {
* Volume of messages submitted
*/
void mrtg_messages(void) {
- mrtg_output(C
itControl.MMhighest, 0L
);
+ mrtg_output(C
tdlGetConfigLong("MMhighest"), 0
);
}
}