Tweak the default motd/opermotd slightly.

Also, remove the - at the start of the MOTD field. This is cargo
culted from irc2 and theres no real reason to actually do this.

diff --git a/docs/conf/motd.txt.example b/docs/conf/motd.txt.example
index c5266f84468f54f73c0ae7a2df96e7f3413fbd36..9281cd4b92d89059e9f74735478b7dc63d3eb89a 100644 (file)
--- a/docs/conf/motd.txt.example
+++ b/docs/conf/motd.txt.example
@@ -1,19 +1,18 @@
-
  _____                        _____   _____    _____      _
 |_   _|                      |_   _| |  __ \  / ____|    | |
   | |    _ __    ___   _ __    | |   | |__) || |       __| |
   | |   | '_ \  / __| | '_ \   | |   |  _  / | |      / _` |
  _| |_  | | | | \__ \ | |_) | _| |_  | | \ \ | |____ | (_| |
 |_____| |_| |_| |___/ | .__/ |_____| |_|  \_\ \_____| \__,_|
-    __________________| |_______________________________
-   |__________________|_|_______________________________|
+ _____________________| |__________________________________
+|_____________________|_|__________________________________|
 
-                        Putting the ricer in IRCer since 2007
+                         \iPowering IRC communities since 2006\x
 
        //\
-       V  \    WELCOME TO AN INSPIRCD NETWORK
-        \  \_    If you see this, I am probably new.
-         \,'.`-.   If I'm not new, my owner is lazy.
+       V  \    \bWELCOME TO AN \c13I\c04N\c07S\c08P\c03I\c10R\c12C\c06D\c99 NETWORK\x
+        \  \_    If you see this, I'm probably new.
+         \,'.`-.   If I'm not new, my owner is lazy. ;-)
           |\ `. `.
           ( \  `. `-.                        _,.-:\
            \ \   `.  `-._             __..--' ,-';/
@@ -24,18 +23,16 @@
                     `-.__  `----"""    __.-'
                          `--..____..--'
 
-        ---- To change, see motd.txt.example -----
-       /                                          \
-      /   * Web: https://www.inspircd.org          \
-      |   * IRC: irc.inspircd.org #inspircd        |
-      |   * Docs: https://docs.inspircd.org        |
-      |   * Bugs: https://inspircd.org/bugs        |
-      |                                            |
-      | We hope you like this software. Please do  |
-      | make  sure  you  put  some  effort  into   |
-      | your configuration, though, so you love it.|
-      | Enjoy.                                     |
-      |                                            |
-      \                   -- The InspIRCd Team    /
-       -------------------------------------------
-
+      +---- To change this see \bmotd.txt.example\x ----+
+      |                                             |
+      |   * \bWeb:\x https://www.inspircd.org           |
+      |   * \bIRC:\x irc.inspircd.org #inspircd         |
+      |   * \bDocs:\x https://docs.inspircd.org         |
+      |   * \bBugs:\x https://inspircd.org/bugs         |
+      |                                             |
+      | We hope you like this software.  Please do  |
+      | make sure to customise your configuration,  |
+      | though, so you love it.  Enjoy.             |
+      |                                             |
+      |                        -- The InspIRCd Team |
+      +---------------------------------------------+

diff --git a/docs/conf/opermotd.txt.example b/docs/conf/opermotd.txt.example
index 7e1c82f33717ca3088a96207703c3485a2542fbb..a25d903805055457a5b10fa1ad05c22d7c2ca7b1 100644 (file)
--- a/docs/conf/opermotd.txt.example
+++ b/docs/conf/opermotd.txt.example
@@ -1,19 +1,18 @@
-
  _____                        _____   _____    _____      _
 |_   _|                      |_   _| |  __ \  / ____|    | |
   | |    _ __    ___   _ __    | |   | |__) || |       __| |
   | |   | '_ \  / __| | '_ \   | |   |  _  / | |      / _` |
  _| |_  | | | | \__ \ | |_) | _| |_  | | \ \ | |____ | (_| |
 |_____| |_| |_| |___/ | .__/ |_____| |_|  \_\ \_____| \__,_|
-    __________________| |_______________________________
-   |__________________|_|_______________________________|
+ _____________________| |__________________________________
+|_____________________|_|__________________________________|
 
-                        Putting the ricer in IRCer since 2007
+                         \iPowering IRC communities since 2006\x
 
        //\
-       V  \    WELCOME TO AN INSPIRCD NETWORK
-        \  \_    If you see this, I am probably new.
-         \,'.`-.   If I'm not new, my owner is lazy.
+       V  \    \bWELCOME TO AN \c13I\c04N\c07S\c08P\c03I\c10R\c12C\c06D\c99 NETWORK\x
+        \  \_    If you see this, I'm probably new.
+         \,'.`-.   If I'm not new, my owner is lazy. ;-)
           |\ `. `.
           ( \  `. `-.                        _,.-:\
            \ \   `.  `-._             __..--' ,-';/
@@ -24,18 +23,16 @@
                     `-.__  `----"""    __.-'
                          `--..____..--'
 
-        -- To change, see opermotd.txt.example ---
-       /                                          \
-      /   * Web: https://www.inspircd.org          \
-      |   * IRC: irc.inspircd.org #inspircd        |
-      |   * Docs: https://docs.inspircd.org        |
-      |   * Bugs: https://inspircd.org/bugs        |
-      |                                            |
-      | We hope you like this software. Please do  |
-      | make  sure  you  put  some  effort  into   |
-      | your configuration, though, so you love it.|
-      | Enjoy.                                     |
-      |                                            |
-      \                   -- The InspIRCd Team    /
-       -------------------------------------------
-
+      +-- To change this see \bopermotd.txt.example\x --+
+      |                                             |
+      |   * \bWeb:\x https://www.inspircd.org           |
+      |   * \bIRC:\x irc.inspircd.org #inspircd         |
+      |   * \bDocs:\x https://docs.inspircd.org         |
+      |   * \bBugs:\x https://inspircd.org/bugs         |
+      |                                             |
+      | We hope you like this software.  Please do  |
+      | make sure to customise your configuration,  |
+      | though, so you love it.  Enjoy.             |
+      |                                             |
+      |                        -- The InspIRCd Team |
+      +---------------------------------------------+

diff --git a/src/coremods/core_info/cmd_motd.cpp b/src/coremods/core_info/cmd_motd.cpp
index 84a0e570fbe157c6d17bb0460becf997079d7c8b..1422ffa0331efceb70284e0bb14cb4f137fa7b45 100644 (file)
--- a/src/coremods/core_info/cmd_motd.cpp
+++ b/src/coremods/core_info/cmd_motd.cpp
@@ -59,7 +59,7 @@ CmdResult CommandMotd::Handle(User* user, const Params& parameters)
        user->WriteRemoteNumeric(RPL_MOTDSTART, InspIRCd::Format("%s message of the day", ServerInstance->Config->ServerName.c_str()));
 
        for (file_cache::iterator i = motd->second.begin(); i != motd->second.end(); i++)
-               user->WriteRemoteNumeric(RPL_MOTD, InspIRCd::Format("- %s", i->c_str()));
+               user->WriteRemoteNumeric(RPL_MOTD, InspIRCd::Format(" %s", i->c_str()));
 
        user->WriteRemoteNumeric(RPL_ENDOFMOTD, "End of message of the day.");