changed version numbering (separate stable and dev versions)

[NeonServV5.git] / src / modules / global.mod / cmd_global_netinfo.c

diff --git a/src/modules/global.mod/cmd_global_netinfo.c b/src/modules/global.mod/cmd_global_netinfo.c
index 3d01c989f0da3089f78e614233636fc63f9f7170..02a04261e8fd297b5d4df36228c99e3bb4312bd7 100644 (file)
--- a/src/modules/global.mod/cmd_global_netinfo.c
+++ b/src/modules/global.mod/cmd_global_netinfo.c
@@ -1,4 +1,4 @@
-/* cmd_global_netinfo.c - NeonServ v5.3
+/* cmd_global_netinfo.c - NeonServ v5.5
  * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -22,14 +22,14 @@
 */
 
 CMD_BIND(global_cmd_netinfo) {
-    reply(getTextBot(), user, "NS_NETINFO_HEADER");
+    reply(textclient, user, "NS_NETINFO_HEADER");
     char tmp[MAXLEN];
     struct Table *table;
     table = table_init(2, 19, 0);
     char *content[2];
     
     content[0] = get_language_string(user, "NS_NETINFO_UPTIME");
-    content[1] = timeToStr(user, (time(0) - start_time), 3, tmp);
+    content[1] = timeToStr(user, (time(0) - getStartTime()), 3, tmp);
     table_add(table, content);
     
     content[0] = get_language_string(user, "NS_NETINFO_BOTS");
@@ -146,31 +146,31 @@ CMD_BIND(global_cmd_netinfo) {
     
     #ifdef HAVE_THREADS
     content[0] = get_language_string(user, "NS_NETINFO_THREADS");
-    sprintf(tmp, "%d (current thread: %i)", running_threads, getCurrentThreadID());
+    sprintf(tmp, "%d (current thread: %i)", getRunningThreads(), getCurrentThreadID());
     content[1] = tmp;
     table_add(table, content);
     #endif
     
-    if(strcmp(revision, ""))
-        sprintf(tmp, "%s.%d  (%s)", NEONSERV_VERSION, patchlevel, revision);
+    if(strcmp(get_revision(), ""))
+        sprintf(tmp, "%s.%d (%s: %s)", NEONSERV_VERSION, get_patchlevel(), (is_stable_revision() ? "stable" : "dev"), (is_stable_revision() ? get_revision() : get_dev_revision()));
     else 
-        sprintf(tmp, "%s.%d", NEONSERV_VERSION, patchlevel);
+        sprintf(tmp, "%s.%d", NEONSERV_VERSION, get_patchlevel());
     content[0] = get_language_string(user, "NS_NETINFO_VERSION");
     content[1] = tmp;
     table_add(table, content);
     
     content[0] = get_language_string(user, "NS_NETINFO_COMPILER");
-    content[1] = build_language_string(user, tmp, "NS_NETINFO_COMPILER_VALUE", COMPILER, creation);
+    content[1] = build_language_string(user, tmp, "NS_NETINFO_COMPILER_VALUE", COMPILER, get_creation());
     table_add(table, content);
     
     content[0] = get_language_string(user, "NS_NETINFO_CODE");
-    content[1] = build_language_string(user, tmp, "NS_NETINFO_CODE_VALUE", codelines);
+    content[1] = build_language_string(user, tmp, "NS_NETINFO_CODE_VALUE", get_codelines());
     table_add(table, content);
     
     char **table_lines = table_end(table);
     int i;
     for(i = 0; i < table->entrys; i++) {
-        reply(getTextBot(), user, table_lines[i]);
+        reply(textclient, user, table_lines[i]);
     }
     table_free(table);
 }