Hide obsolete server functions from webcit UI

diff --git a/webcit/static/t/aide/global_config.html b/webcit/static/t/aide/global_config.html
index e8019c769f14c55e491f545930658bb789362d64..8ff8ba45fe8d532971b90a9ebae854e40c56d491 100644 (file)
--- a/webcit/static/t/aide/global_config.html
+++ b/webcit/static/t/aide/global_config.html
@@ -1,7 +1,5 @@
 <ul class="adminitems">
 <li><a href="do_template?template=aide_display_sitewide_config"><?_("Edit site-wide configuration")></a></li>
 <li><a href="do_template?template=aide_display_inetconf"><?_("Domain names and Internet mail configuration")></a></li>
-<li><a href="do_template?template=aide_display_ignetconf"><?_("Configure replication with other Citadel servers")></a></li>
-<li><a href="do_template?template=aide_display_logstatus"><?_("Enable/Disable logging of the server components")></a></li>
 <li><a href="dotskip?room=__CitadelSMTPspoolout__&view=11"><?_("View the outbound SMTP queue")></a></li>
 </ul>

diff --git a/webcit/wiki.c b/webcit/wiki.c
index 45dd313e6c70816214ce9a71b906dfdafcdfa2fe..b1822e951a0ee17d5df2bcc5b63d6df8cb467977 100644 (file)
--- a/webcit/wiki.c
+++ b/webcit/wiki.c
@@ -1,7 +1,7 @@
 /*
  * Functions pertaining to rooms with a wiki view
  *
- * Copyright (c) 2009-2012 by the citadel.org team
+ * Copyright (c) 2009-2018 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.
@@ -126,19 +126,11 @@ void tmplput_display_wiki_history(StrBuf *Target, WCTemplputParams *TP)
 
                        wc_printf("<tr bgcolor=\"%s\">", ((row%2) ? "#FFFFFF" : "#DDDDDD"));
                        wc_printf("<td>%s</td><td>", rev_date_displayed);
-                       if (!strcasecmp(ChrPtr(node), (char *)WC->serv_info->serv_nodename)) {
-                               escputs(ChrPtr(author));
-                               wc_printf(" @ ");
-                               escputs(ChrPtr(node));
-                       }
-                       else {
-                               wc_printf("<a href=\"showuser?who=");
-                               urlescputs(ChrPtr(author));
-                               wc_printf("\">");
-                               escputs(ChrPtr(author));
-                               wc_printf("</a>");
-                       }
-                       wc_printf("</td>");
+                       wc_printf("<a href=\"showuser?who=");
+                       urlescputs(ChrPtr(author));
+                       wc_printf("\">");
+                       escputs(ChrPtr(author));
+                       wc_printf("</a></td>");
 
                        if (row == 0) {
                                wc_printf("<td><a href=\"wiki?page=%s", bstr("page"));