Add travis config exempting 1.8

Anope 1.8.9 Release
Update NSIS scripts for Anope 1.8.9
2026-06-12 18:34:49 +02:00 · 2014-04-01 23:33:14 -04:00 · 2014-03-03 00:41:39 -05:00 · 2014-03-03 00:41:07 -05:00 · 2014-02-10 21:35:04 +01:00 · 2014-02-10 07:50:53 +01:00
286 changed files with 10620 additions and 4295 deletions
@@ -1,7 +1,35 @@
+*.so
+*.o
+*.s
 Makefile
+Makefile.inc
 autom4te.cache/
 config.cache
 config.log
 config.status
 include/sysconf.h
+include/version.h
+include/language.h
+lang/language.h
 src/bin/anoperc
+lang/cat
+lang/de
+lang/en_us
+lang/es
+lang/fr
+lang/gr
+lang/hun
+lang/index
+lang/it
+lang/langcheck
+lang/langcomp
+lang/nl
+lang/pl
+lang/pt
+lang/ru
+lang/tr
+lang/ja_utf8
+src/services
+src/tools/anopesmtp
+src/tools/db-merger
+src/tools/epona2anope
@@ -0,0 +1,3 @@
+branches:
+  except:
+    - 1.8
@@ -1,3 +1,78 @@
+Anope Version 1.8.9
+-------------------
+06/05  F Fixed modules being loaded regardless of the load abort signal. [#1527]
+08/16  F Fixed hs_request to show requested ident in memos               [#1545]
+08/16  F Fix kick reason in cs_suspend/cs_forbid if no reason is given   [#1544]
+12/09  F Fix undefined symbol error on Solaris11                         [  #00]
+
+Provided by Michael Wobst - 2013
+05/25  U Update Hybrid protocol module to support Hybrid 8.1
+06/21  U Update Hybrid protocol module to support vhosts
+
+Anope Version 1.8.8
+-------------------
+01/29  F Fixed user modes on BotServ bots on Unreal3.2.10                [#1474]
+02/13  F Do not allow invalid nicknames to be forbidden in ns_forbid     [  #00]
+
+Provided by Ryuunosuke Ayanokouzi - 2013
+02/17  A Added Japanese language support                                 [  #00]
+
+Provided by Anope Dev. <team@anope.org> - 2012
+02/22  F Fixed several grammar errors in docs/ (patch provided by Simba) [  #00]
+02/25  F Do not allow akill masks to end in @                            [#1380]
+07/14  F Fixed crash with cs_enforce and empty permanent channels        [  #00]
+12/23  A Added Hybrid 8.0 support. (Patch provided by Hybrid Team)       [  #00]
+12/23  R Removed experimental Hybrid 7.0 support.                        [  #00]
+
+Provided by Anope Dev. <team@anope.org> - 2011
+12/31  F Fixed os_svsnick to allow changing the case of a users' nick    [#1369]
+
+Anope Version 1.8.7
+-------------------
+08/18  A Added support for Hybrid's channel mode +S                      [#1319]
+08/18  A Added support for Hybrid's channel mode +O                      [#1320]
+08/21  A Added internal event when a nickcore is dropped.                [  #00]
+08/21  A Added internal event when a nickcore gets a new display nick.   [  #00]
+08/18  R Removed support for Hybrid's (old) channel mode +a              [#1318]
+12/15  C Added API support for SVSJOIN and SVSPART on UltimateIRCd 3.    [  #00]
+05/30  F Fixed removing vhosts on InspIRCd when m_cloaking is unloaded   [#1273]
+07/23  F Fixed a potential crash in the badwords kicker                  [  #00]
+08/09  F Fixed deopping the first user to join a channel during a burst  [#1287]
+08/10  F Fixed loading bs_fantasy_owner on InspIRCd 2.0 on startup       [  #00]
+08/21  F Send DROP event when forbidding nicks and channels.             [  #00]
+11/16  F Fixed ident being used instead of vident in some comparisons.   [  #00]
+11/20  F Fixed ignore not matching against users' real host or IP.       [  #00]
+12/06  F Fixed some typos in the spanish language file                   [  #00]
+
+Anope Version 1.8.6
+-------------------
+10/31  A Added support for plexus3's channel mode +z                     [#1202]
+02/23  A Added account tracking support to ratbox protocol module        [  #00]
+03/21  A Added support for Hybrid's m_services and m_change              [  #00]
+03/28  A Added internal events called when a module is loaded/unloaded.  [  #00]
+03/28  A Added internal events called when a command is added/deleted.   [  #00]
+09/11  F Fixed db-convert handling some vhost collisions                 [  #00]
+09/14  F Fixed ./configure failing with partial SQL installations        [  #00]
+09/28  F Fixed ForkForMail to always work                                [  #00]
+09/28  F Fixed /nickserv saset display to use nicktracking if enabled    [#1193]
+09/28  F Fixed /nickserv group to use nicktracking if enabled            [#1194]
+12/12  F Remove vhost requests from nicks that expire                    [  #00]
+12/15  F Fixed /cs enforce #channel to say SET was enforced not (null)   [#1213]
+12/23  F Fixed /cs (un)ban and akick from matching users real hosts/IP   [#1079]
+01/19  F Fixed 'make install' recompiling src/tools                      [#1227]
+01/21  F Fixed many incorrect apostrophe usages                          [#1223]
+01/28  F Fixed not introducing our clients with usermode k on InspIRCd2.0[  #00]
+01/29  F Updated german language file.                                   [  #00]
+02/05  F Fixed wiki URLs in Windows configure script                     [  #00]
+02/11  F Fixed build on Mac                                              [  #00]
+02/23  F Fixed rejoining our clients if they are kicked on a TS6 IRCd    [  #00]
+03/02  F Fixed showing SENDPASS in HELP to users who can't use it        [  #00]
+03/03  F Fixed opping our clients on ratbox when not using TS6           [  #00]
+03/04  F Fixed setting a users host in InspIRCd when vhost is turned off [  #00]
+03/24  F Fixed groups display nick showing in HS req memos for aliases.  [#1252]
+04/28  F Fixed missing NS REGISTER reply when ns_register is not loaded. [#1263]
+05/02  F Fixed crash in enc_md5 on Mac                                   [#1236]
+
 Anope Version 1.8.5
 -------------------
 05/05  A Added an internal event called when a nick is requested         [  #00]
@@ -8,6 +83,7 @@ Anope Version 1.8.5
 05/23  A Added old nick parameter to EVENT_CHANGE_NICK                   [  #00]
 08/13  A Added forking for mail sending on supporting operating systems  [  #00]
 09/05  A Added InspIRCd 2.0 support                                      [  #00]
+10/31  A Added support for Plexus3's channel mode +z                     [#1202]
 04/15  F Fixed os_info to backup its database on Windows                 [  #00]
 04/15  F Fixed a potential crash in cs_clear ops when using UnrealIRCd   [#1154]
 04/16  F Fixed missing TS6SID on FJOIN in inspircd12                     [  #00]
@@ -23,7 +99,7 @@ Anope Version 1.8.5
 09/10  F Fixed pseudo-clients always getting oper on InspIRCd.           [  #00]

 Provided by Han` <Han@mefalcon.org> - 2010
-8/14   F Updated german language file.                                   [  #00]
+08/14   F Updated german language file.                                   [  #00]

 Anope Version 1.8.4
 -------------------
@@ -1,3 +1,38 @@
+Anope Version 1.8.9
+-------------------
+** ADDED    CONFIGURATION DIRECTIVES **
+
+** MODIFIED CONFIGURATION DIRECTIVES **
+
+** DELETED  CONFIGURATION DIRECTIVES **
+
+Anope Version 1.8.8
+-------------------
+** ADDED    CONFIGURATION DIRECTIVES **
+
+** MODIFIED CONFIGURATION DIRECTIVES **
+
+** DELETED  CONFIGURATION DIRECTIVES **
+
+
+Anope Version 1.8.7
+-------------------
+** ADDED    CONFIGURATION DIRECTIVES **
+
+** MODIFIED CONFIGURATION DIRECTIVES **
+
+** DELETED  CONFIGURATION DIRECTIVES **
+
+
+Anope Version 1.8.6
+-------------------
+** ADDED    CONFIGURATION DIRECTIVES **
+
+** MODIFIED CONFIGURATION DIRECTIVES **
+
+** DELETED  CONFIGURATION DIRECTIVES **
+
+
 Anope Version 1.8.5
 -------------------
 ** ADDED    CONFIGURATION DIRECTIVES **
@@ -9,6 +44,7 @@ Anope Version 1.8.5
 # the use of forking (eg, not Windows).
 #

+#ForkForMail

 inspircd20 - IRCDModule

@@ -1,3 +1,39 @@
+Anope Version 1.8.9
+-------------------
+*** New Strings:
+
+*** Mod Strings:
+
+*** Del Strings:
+
+
+Anope Version 1.8.8
+-------------------
+*** New Strings:
+
+*** Mod Strings:
+
+*** Del Strings:
+
+
+Anope Version 1.8.7
+-------------------
+*** New Strings:
+
+*** Mod Strings:
+
+*** Del Strings:
+
+
+Anope Version 1.8.6
+-------------------
+*** New Strings:
+
+*** Mod Strings:
+
+*** Del Strings:
+
+
 Anope Version 1.8.5
 -------------------
 *** New Strings:
@@ -1,6 +1,21 @@
+Anope Version 1.8.9
+-------------------
+- NONE
+
+Anope Version 1.8.8
+-------------------
+- NONE
+
+Anope Version 1.8.7
+-------------------
+- NONE
+
+Anope Version 1.8.6
+-------------------
+- NONE
+
 Anope Version 1.8.5
 -------------------
-
 - NONE

 Anope Version 1.8.4
@@ -2,7 +2,7 @@
 #
 # Configuration script for Services.
 #
-# Anope (c) 2003-2010 Anope team
+# Anope (c) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #
 # This program is free but copyrighted software; see the file COPYING for
@@ -1,6 +1,6 @@
 # Makefile for Anope.
 #
-# (C) 2003-2010 Anope Team
+# (C) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #
 # This program is free but copyrighted software; see the file COPYING for
@@ -3644,6 +3644,7 @@ _ACEOF
 		else
 			CFLAGS="$hold_cflags"
 			LDFLAGS="$hold_ldflags"
+			LIBS=""
 		fi
 	fi

@@ -1,6 +1,6 @@
 dnl autoconf.in for Services.
 dnl
-dnl Anope (c) 2003-2010 Anope team
+dnl Anope (c) 2003-2014 Anope Team
 dnl Contact us at team@anope.org

 dnl This program is free but copyrighted software; see the file COPYING for
@@ -123,6 +123,7 @@ int main()
 		else
 			CFLAGS="$hold_cflags"
 			LDFLAGS="$hold_ldflags"
+			LIBS=""
 		fi
 	fi
 ])
@@ -78,7 +78,7 @@
 #     Bahamut 1.4.27 [or later]         - "bahamut"
 #     Charybdis 1.0 [or later]          - "charybdis"
 #     DreamForge 4.6.7                  - "dreamforge"
-#     Hybrid IRCd 7.0 [experimental]    - "hybrid"
+#     Hybrid IRCd 8.1                   - "hybrid"
 #     InspIRCd 1.1 [beta 8 or later]    - "inspircd11"
 #     InspIRCd 1.2 [RC3 or later]       - "inspircd12"
 #     InspIRCd 2.0                      - "inspircd20"
@@ -1,339 +1,347 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991

- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.  

-			    Preamble
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA

-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+                         Preamble
+
+ The licenses for most software are designed to take away your 
+freedom to share and change it. By contrast, the GNU General Public 
+License is intended to guarantee your freedom to share and change free 
+software--to make sure the software is free for all its users. This 
+General Public License applies to most of the Free Software 
+Foundation's software and to any other program whose authors commit to 
+using it. (Some other Free Software Foundation software is covered by 
+the GNU Lesser General Public License instead.) You can apply it to 
 your programs, too.

-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you 
+have the freedom to distribute copies of free software (and charge for 
+this service if you wish), that you receive source code or can get it 
+if you want it, that you can change the software or use pieces of it 
 in new free programs; and that you know you can do these things.

-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
+ To protect your rights, we need to make restrictions that forbid 
+anyone to deny you these rights or to ask you to surrender the rights. 
+These restrictions translate to certain responsibilities for you if you 
 distribute copies of the software, or if you modify it.

-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
+ For example, if you distribute copies of such a program, whether 
+gratis or for a fee, you must give the recipients all the rights that 
+you have. You must make sure that they, too, receive or can get the 
+source code. And you must show them these terms so they know their 
 rights.

-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
+ We protect your rights with two steps: (1) copyright the software, and 
+(2) offer you this license which gives you legal permission to copy, 
 distribute and/or modify the software.

-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
+ Also, for each author's protection and ours, we want to make certain 
+that everyone understands that there is no warranty for this free 
+software. If the software is modified by someone else and passed on, we 
+want its recipients to know that what they have is not the original, so 
+that any problems introduced by others will not reflect on the original 
 authors' reputations.

-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
+ Finally, any free program is threatened constantly by software 
+patents. We wish to avoid the danger that redistributors of a free 
+program will individually obtain patent licenses, in effect making the 
+program proprietary. To prevent this, we have made it clear that any 
 patent must be licensed for everyone's free use or not licensed at all.

-  The precise terms and conditions for copying, distribution and
+ The precise terms and conditions for copying, distribution and 
 modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
+
+                      GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".

-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
+ 0. This License applies to any program or other work which contains 
+a notice placed by the copyright holder saying it may be distributed 
+under the terms of this General Public License. The "Program", below, 
+refers to any such program or work, and a "work based on the Program" 
+means either the Program or any derivative work under copyright law: 
+that is to say, a work containing the Program or a portion of it, 
+either verbatim or with modifications and/or translated into another 
+language. (Hereinafter, translation is included without limitation in 
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not 
+covered by this License; they are outside its scope. The act of 
+running the Program is not restricted, and the output from the Program 
+is covered only if its contents constitute a work based on the 
+Program (independent of having been made by running the Program). 
 Whether that is true depends on what the Program does.

-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
+ 1. You may copy and distribute verbatim copies of the Program's 
+source code as you receive it, in any medium, provided that you 
+conspicuously and appropriately publish on each copy an appropriate 
+copyright notice and disclaimer of warranty; keep intact all the 
+notices that refer to this License and to the absence of any warranty; 
+and give any other recipients of the Program a copy of this License 
 along with the Program.

-You may charge a fee for the physical act of transferring a copy, and
+You may charge a fee for the physical act of transferring a copy, and 
 you may at your option offer warranty protection in exchange for a fee.

-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
+ 2. You may modify your copy or copies of the Program or any portion 
+of it, thus forming a work based on the Program, and copy and 
+distribute such modifications or work under the terms of Section 1 
 above, provided that you also meet all of these conditions:

-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
+   a) You must cause the modified files to carry prominent notices 
+   stating that you changed the files and the date of any change.

-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
+   b) You must cause any work that you distribute or publish, that in 
+   whole or in part contains or is derived from the Program or any 
+   part thereof, to be licensed as a whole at no charge to all third 
+   parties under the terms of this License.

-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
+   c) If the modified program normally reads commands interactively 
+   when run, you must cause it, when started running for such 
+   interactive use in the most ordinary way, to print or display an 
+   announcement including an appropriate copyright notice and a 
+   notice that there is no warranty (or else, saying that you provide 
+   a warranty) and that users may redistribute the program under 
+   these conditions, and telling the user how to view a copy of this 
+   License. (Exception: if the Program itself is interactive but 
+   does not normally print such an announcement, your work based on 
+   the Program is not required to print an announcement.)

-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
+These requirements apply to the modified work as a whole. If 
+identifiable sections of that work are not derived from the Program, 
+and can be reasonably considered independent and separate works in 
+themselves, then this License, and its terms, do not apply to those 
+sections when you distribute them as separate works. But when you 
+distribute the same sections as part of a whole which is a work based 
+on the Program, the distribution of the whole must be on the terms of 
+this License, whose permissions for other licensees extend to the entire 
+whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest 
+your rights to work written entirely by you; rather, the intent is to 
+exercise the right to control the distribution of derivative or 
 collective works based on the Program.

-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
+In addition, mere aggregation of another work not based on the Program 
+with the Program (or with a work based on the Program) on a volume of 
+a storage or distribution medium does not bring the other work under 
 the scope of this License.

-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
+ 3. You may copy and distribute the Program (or a work based on it, 
+under Section 2) in object code or executable form under the terms of 
 Sections 1 and 2 above provided that you also do one of the following:

-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
+   a) Accompany it with the complete corresponding machine-readable 
+   source code, which must be distributed under the terms of Sections 
+   1 and 2 above on a medium customarily used for software interchange; or,

-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
+   b) Accompany it with a written offer, valid for at least three years, 
+   to give any third party, for a charge no more than your cost of 
+   physically performing source distribution, a complete machine-readable 
+   copy of the corresponding source code, to be distributed under the terms 
+   of Sections 1 and 2 above on a medium customarily used for software 
+   interchange; or,

-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
+   c) Accompany it with the information you received as to the offer 
+   to distribute corresponding source code. (This alternative is allowed 
+   only for noncommercial distribution and only if you received the program 
+   in object code or executable form with such an offer, in accord with 
+   Subsection b above.)

-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
+The source code for a work means the preferred form of the work for 
+making modifications to it. For an executable work, complete source 
+code means all the source code for all modules it contains, plus any 
+associated interface definition files, plus the scripts used to 
+control compilation and installation of the executable. However, as a 
+special exception, the source code distributed need not include 
+anything that is normally distributed (in either source or binary 
+form) with the major components (compiler, kernel, and so on) of the 
+operating system on which the executable runs, unless that component 
 itself accompanies the executable.

-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
+If distribution of executable or object code is made by offering 
+access to copy from a designated place, then offering equivalent 
+access to copy the source code from the same place counts as 
+distribution of the source code, even though third parties are not 
 compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
+
+ 4. You may not copy, modify, sublicense, or distribute the Program 
+except as expressly provided under this License. Any attempt 
+otherwise to copy, modify, sublicense or distribute the Program is 
+void, and will automatically terminate your rights under this License. 
+However, parties who have received copies, or rights, from you under 
+this License will not have their licenses terminated so long as such 
 parties remain in full compliance.

-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
+ 5. You are not required to accept this License, since you have not 
+signed it. However, nothing else grants you permission to modify or 
+distribute the Program or its derivative works. These actions are 
+prohibited by law if you do not accept this License. Therefore, by 
+modifying or distributing the Program (or any work based on the 
+Program), you indicate your acceptance of this License to do so, and 
+all its terms and conditions for copying, distributing or modifying 
 the Program or works based on it.

-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
+ 6. Each time you redistribute the Program (or any work based on the 
+Program), the recipient automatically receives a license from the 
+original licensor to copy, distribute or modify the Program subject to 
+these terms and conditions. You may not impose any further 
+restrictions on the recipients' exercise of the rights granted herein. 
+You are not responsible for enforcing compliance by third parties to 
 this License.

-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
+ 7. If, as a consequence of a court judgment or allegation of patent 
+infringement or for any other reason (not limited to patent issues), 
+conditions are imposed on you (whether by court order, agreement or 
+otherwise) that contradict the conditions of this License, they do not 
+excuse you from the conditions of this License. If you cannot 
+distribute so as to satisfy simultaneously your obligations under this 
+License and any other pertinent obligations, then as a consequence you 
+may not distribute the Program at all. For example, if a patent license
+would not permit royalty-free redistribution of the Program by all those
+who receive copies directly or indirectly through you, then the only way
+you could satisfy both it and this License would be to refrain entirely
+from distribution of the Program.

-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
+If any portion of this section is held invalid or unenforceable under 
+any particular circumstance, the balance of the section is intended to 
+apply and the section as a whole is intended to apply in other 
 circumstances.

-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
+It is not the purpose of this section to induce you to infringe any 
+patents or other property right claims or to contest validity of any 
+such claims; this section has the sole purpose of protecting the 
+integrity of the free software distribution system, which is implemented 
+by public license practices. Many people have made generous contributions 
+to the wide range of software distributed through that system in reliance 
+on consistent application of that system; it is up to the author/donor to 
+decide if he or she is willing to distribute software through any other 
+system and a licensee cannot impose that choice.

-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
+This section is intended to make thoroughly clear what is believed to be 
+a consequence of the rest of this License.
+
+
+ 8. If the distribution and/or use of the Program is restricted in 
+certain countries either by patents or by copyrighted interfaces, the 
+original copyright holder who places the Program under this License 
+may add an explicit geographical distribution limitation excluding 
+those countries, so that distribution is permitted only in or among 
+countries not thus excluded. In such case, this License incorporates 
 the limitation as if written in the body of this License.

-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
+ 9. The Free Software Foundation may publish revised and/or new versions 
+of the General Public License from time to time. Such new versions will 
+be similar in spirit to the present version, but may differ in detail to 
 address new problems or concerns.

-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
+Each version is given a distinguishing version number. If the Program 
+specifies a version number of this License which applies to it and "any 
+later version", you have the option of following the terms and conditions 
+either of that version or of any later version published by the Free 
+Software Foundation. If the Program does not specify a version number of 
+this License, you may choose any version ever published by the Free Software 
 Foundation.

-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
+ 10. If you wish to incorporate parts of the Program into other free 
+programs whose distribution conditions are different, write to the author 
+to ask for permission. For software which is copyrighted by the Free 
+Software Foundation, write to the Free Software Foundation; we sometimes 
+make exceptions for this. Our decision will be guided by the two goals 
+of preserving the free status of all derivatives of our free software and 
 of promoting the sharing and reuse of software generally.

-			    NO WARRANTY
+                                 NO WARRANTY

-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY 
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN 
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES 
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED 
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS 
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE 
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, 
 REPAIR OR CORRECTION.

-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING 
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR 
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, 
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING 
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED 
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY 
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER 
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE 
 POSSIBILITY OF SUCH DAMAGES.

-		     END OF TERMS AND CONDITIONS
-
-	Appendix: How to Apply These Terms to Your New Programs
+                         END OF TERMS AND CONDITIONS

-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
+How to Apply These Terms to Your New Programs

-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
+ If you develop a new program, and you want it to be of the greatest 
+possible use to the public, the best way to achieve this is to make 
+it free software which everyone can redistribute and change under 
+these terms.
+
+ To do so, attach the following notices to the program. It is safest 
+to attach them to the start of each source file to most effectively 
+convey the exclusion of warranty; and each file should have at least 
 the "copyright" line and a pointer to where the full notice is found.

-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
+   <one line to give the program's name and an idea of what it does.>
+   Copyright (C) yyyy  name of author

-    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 2 of the License, or
-    (at your option) any later version.
+   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 2
+   of the License, or (at your option) any later version.

-    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.

-    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., 675 Mass Ave, Cambridge, MA 02139, USA.
+   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., 51 Franklin Street, Fifth Floor, Boston, MA  
+   02110-1301, USA.

 Also add information on how to contact you by electronic and paper mail.

-If the program is interactive, make it output a short notice like this
+If the program is interactive, make it output a short notice like this 
 when it starts in an interactive mode:

-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
+   Gnomovision version 69, Copyright (C) year name of author
+   Gnomovision comes with ABSOLUTELY NO WARRANTY; for details
+   type `show w'.  This is free software, and you are welcome
+   to redistribute it under certain conditions; type `show c' 
+   for details.

-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
+The hypothetical commands `show w' and `show c' should show the appropriate 
+parts of the General Public License. Of course, the commands you use may 
+be called something other than `show w' and `show c'; they could even be 
 mouse-clicks or menu items--whatever suits your program.

-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
+You should also get your employer (if you work as a programmer) or your 
+school, if any, to sign a "copyright disclaimer" for the program, if 
+necessary. Here is a sample; alter the names:

-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+   Yoyodyne, Inc., hereby disclaims all copyright interest in the program 
+   `Gnomovision' (which makes passes at compilers) written  by James Hacker.

-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
+   <signature of Ty Coon>, 1 April 1989
+   Ty Coon, President of Vice

 This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+proprietary programs. If your program is a subroutine library, you may 
+consider it more useful to permit linking proprietary applications with the 
+library. If this is what you want to do, use the GNU Lesser General 
 Public License instead of this License.
+
+
@@ -183,9 +183,9 @@ Anope Internal Events

    EVENT_BOT_BAN
        A BotServ bot has banned a user, e.g. kickers.
-	av[0]  The nick of the user banned.
-	av[1]  The Channel the user was banned from.
-	av[2]  The mask that was banned.
+        av[0]  The nick of the user banned.
+        av[1]  The Channel the user was banned from.
+        av[2]  The mask that was banned.

    EVENT_BOT_CHANGE
        The properties of a BotServ bot have been changed.
@@ -214,10 +214,10 @@ Anope Internal Events

    EVENT_BOT_FANTASY_NO_ACCESS
        A fantasy command of the bot has been triggered by someone without
-		access to BotServ FANTASY commands on the channel. This will NOT
-		trigger if someone with access has triggered a fantasy command; use
-		EVENT_BOT_FANTASY for those. Hook to both events to catch both event
-		triggers.
+        access to BotServ FANTASY commands on the channel. This will NOT
+        trigger if someone with access has triggered a fantasy command; use
+        EVENT_BOT_FANTASY for those. Hook to both events to catch both event
+        triggers.
        av[0]  The fantasy command that has been triggered without leading '!'.
        av[1]  The nickname of the user that has triggered the fantasy
               command.
@@ -234,9 +234,9 @@ Anope Internal Events

    EVENT_BOT_KICK
        A BotServ bot has kicked a user from a channel.
-	av[0]  The name of the user that has been kicked.
-	av[1]  The name of the channel the user was kicked from.
-	av[2]  The reason for the kick.
+        av[0]  The name of the user that has been kicked.
+        av[1]  The name of the channel the user was kicked from.
+        av[2]  The reason for the kick.

    EVENT_BOT_UNASSIGN
        A BotServ bot is being unassigned from a channel. This event is being
@@ -279,7 +279,7 @@ Anope Internal Events
        av[0]  The name of the channel that has been unsuspended.

    EVENT_CHANGE_NICK
-        A user has just changed it's nick.
+        A user has just changed its nick.
        av[0]  The new nickname of the user. Event is called after the user has been changed
               to this nickname.
        av[1]  The old nickname of the user.
@@ -314,7 +314,7 @@ Anope Internal Events
        av[0]  The new level of DefCon being invoked.

    EVENT_GROUP
-        A user has grouped it's nickname to another user group.
+        A user has grouped its nickname to another user group.
        av[0]  The nickname of the user that joined the group.

    EVENT_JOIN_CHANNEL
@@ -344,6 +344,18 @@ Anope Internal Events
        A user's nick has just been forbidden.
        av[0]  The nickname that has just been forbidden.

+    EVENT_CORE_DROPPED
+        A NickCore will be dropped. Usually send when the last alias is dopped.
+        This is send BEFORE the event that confirms deletion of the alias.
+        Note that this event is send before the core data is removed.
+        av[0]  The display nickname of the core that is being dropped.
+
+    EVENT_CORE_NEWDISPLAY
+        The display nick of a NickCore is being changed.
+        This is send BEFORE the actual change is made in the database.
+        av[0]  The old display nickname of the core.
+        av[1]  The new display nickname of the core.
+
    EVENT_NICK_GHOSTED
        A user has just been ghosted.
        av[0]  EVENT_START or EVENT_STOP. EVENT_START when the user is about
@@ -353,7 +365,7 @@ Anope Internal Events
        av[2]  The nickname being ghosted.

    EVENT_NICK_IDENTIFY
-        A user has just identified for it's nickname with NickServ.
+        A user has just identified for its nickname with NickServ.
        av[0]  The nickname of the user that just identified.

    EVENT_NICK_LOGOUT
@@ -368,7 +380,7 @@ Anope Internal Events
        av[2]  The nickname being recovered.

    EVENT_NICK_REGISTERED
-        A new user has just registered it's nickname. This event is being
+        A new user has just registered its nickname. This event is being
        emitted when the registration is completed, but the user modes have not
        yet been set.
        av[0]  The nickname of the newly registered user.
@@ -435,3 +447,30 @@ Anope Internal Events
        A user has left the network. This event is emitted before the internal
        removal is performed, so the user still exists internally.
        av[0]  The nickname of the user leaving the network.
+
+    EVENT_MODLOAD
+        A module has been loaded. This event is emitted after the loading
+        sequence has been finished: AnopeInit() has been called and the
+        module has already been added to the modules table.
+        av[0] Name of the loaded module.
+
+    EVENT_MODUNLOAD
+        A module has been unloaded. This event is emitted when the unloading
+        sequence is almost complete: AnopeFini() has been called and all
+        commands, hooks and callbacks have been removed. The module itself
+        is still in memory however.
+        av[0] Name of the unloaded module.
+
+    EVENT_ADDCOMMAND
+        A command hook has been added to anopes command table.
+        Note that the command may have previously existed and merely a new hook
+        was added before or after an existing command hook.
+        av[0] Name of the module adding the command.
+        av[1] Name of the command hook that was added.
+
+    EVENT_DELCOMMAND
+        A command hook has been removed from anopes command table.
+        Note that the command may still exist in anopes command table if other
+        modules have hooks for the same command.
+        av[0] Name of the module deleting the command.
+        av[1] Name of the command hook that was removed.
@@ -72,7 +72,7 @@ How To Add IRCd Support
    of each.

    1) Name: This member tells Anope about the IRCD's name. It may contain
-             text about it's name and version. This is used to identify the
+             text about its name and version. This is used to identify the
             build on startup.

    2) NickServ Mode: This is the user mode set by Anope on NickServ.
@@ -8,7 +8,7 @@ Anope MySQL Support
    core, we decided to save it for 2.0. However, having your db's easily 
    accessible on your website is still a great feature.

-    PHASE 1:Anope will be able to save all it's databases to MySQL. It will 
+    PHASE 1:Anope will be able to save all its databases to MySQL. It will 
    happen in conjunction with the current FFF databases. This first step is 
    nothing more than a MySQL dump of the databases (i.e. read-only), since 
    Anope will not (for now) read from Mysql. (COMPLETED)
@@ -167,7 +167,7 @@ Provided by Anope Dev. <team@anope.org>
 2003/07/20  Fixed chanserv badword MySQL issue
 2003/08/30  Allow for E/F lines when handling akilled host's joining the network
 2003/07/25  Added External socket support (*VERY* EXPERIMENTAL)
-2003/07/20  Made MySQL ns_id, na_id and ci_id useful by preserving it's value across updates
+2003/07/20  Made MySQL ns_id, na_id and ci_id useful by preserving its value across updates
 2003/07/20  Some MySQL Optimizations (MySQL 3.23.32+ required)

 Provided by DrStein
@@ -6,9 +6,9 @@ Anope Proxy Detector

 1) Introduction

-    Anope has had a built-in proxy detector since it's first version. Recently,
+    Anope has had a built-in proxy detector since its first version. Recently,
    however, this built-in proxy detector has been removed. This was because
-    the Anope team found that the proxy detector was showing it's age, and the
+    the Anope team found that the proxy detector was showing its age, and the
    time needed to restore it to a good state wasn't worth it, also considering
    that there are currently good alternatives out there which do the job as
    good as it can be done already.
@@ -1,7 +1,7 @@
 Anope - a set of IRC services for IRC networks
 ----------------------------------------------

-Anope is          2003-2010 Anope Team    <team@anope.org>.
+Anope is          2003-2014 Anope Team    <team@anope.org>.
 Based on Epona    2000-2002 PegSoft       <epona@pegsoft.net>.
 Based on Services 1996-1999 Andrew Church <achurch@achurch.org>.

@@ -202,7 +202,7 @@ Table of Contents
        * Bahamut 1.4.27 or later (including 1.8)
        * Charybdis 1.0 or later
        * DreamForge 4.6.7
-        * Hybrid 7 or later
+        * Hybrid 8.1 or later
        * InspIRCd 1.x, and 2.0
        * Plexus 2.0 or later (including 3.0)
        * PTlink 6.15 or later
@@ -366,13 +366,13 @@ Table of Contents

 6) Adding Your Translation Into The Source

-    First, get the latest svn version of Anope. This can be done by doing
-    'svn co http://anope.svn.sourceforge.net/svnroot/anope/stable ./anope-stable`
+    First, get the latest version of Anope. This can be done by doing
+    'git clone git://github.com/anope/anope anope-stable'

-    Second, Place your language file in lang/, and type 'svn add file.l`. Where file is
+    Second, Place your language file in lang/, and type 'git add file.l`. Where file is
    your language file.

-    Next, edit lang/Makefile and add your file into both the LANGOBJS variable and
+    Next, edit lang/Makefile(.win32) and add your file into both the LANGOBJS variable and
    the LANGSRCS variable (alphabetically please). Then, go down and add an entry for
    it similar the others, eg:
       en_us:    en_us.l    langcomp index
@@ -398,7 +398,7 @@ Table of Contents
       load_lang(LANG_PL, "pl");
       load_lang(LANG_BLAH, "blah");

-    Now use 'svn diff > language.diff` to get the changes you made, and if it looks good (test it)
+    Now use 'git diff HEAD > language.diff` to get the changes you made, and if it looks good (test it)
    email it to team@anope.org!

    Please be aware we will only include a new language if there is sufficient demand for it.
@@ -20,35 +20,25 @@ Anope for Windows
        * Current Anope source:
            http://sourceforge.net/project/showfiles.php?group_id=94081

-        If you have Visual C++ 6, 7 (.NET 2002/2003) or 8 (2005) skip ahead to step 2, else you
+        If you have Visual C++ 2008, 2010, or 2012 skip ahead to step 2, else you
        need to download the following free components from Microsoft. Once
-        downloaded, install these packages.
+        downloaded, install one of the following, for best results use MS VC 2010.

-		* Microsoft Visual C++ 2008 Express Edition:
-			http://www.microsoft.com/express/vc/
+		* Microsoft Visual C++ 2010 Express
+			http://www.microsoft.com/visualstudio/eng/products/visual-studio-2010-express

 		or

-        * Microsoft Visual C++ 2005 Express Edition:
-            http://msdn.microsoft.com/vstudio/express/visualc/download/
-            
-		then download and install:
+		* Microsoft Visual C++ 2008 Express Edition:
+			http://www.microsoft.com/en-us/download/details.aspx?id=14597

-        * Microsoft Windows PlatformSDK: (Requires WGA validation)
-	    http://www.microsoft.com/downloads/details.aspx?FamilyId=0BAF2B35-C656-4969-ACE8-E4C0C0716ADB&displaylang=en
+		* Microsoft Windows Platform SDK: (Requires WGA validation)
+			http://www.microsoft.com/en-us/download/details.aspx?id=3138

-	    (NOTE: Although this says for Windows Server 2003, it does infact work on all supported
-	    versions of Windows.)
-	    
-	    When installing, you should select the Custom option, and ensure that the top option relating to 
-	    the registering of environment varibales, is enabled in addition to the default selections.
+		* MySQL for Windows (only needed if building with MySQL enabled):
+			http://dev.mysql.com/

-	    If you do not do this, you may run into problems with the PSDK not being found properly during install.
-
-        * MySQL for Windows (only needed if building with MySQL enabled):
-            http://dev.mysql.com/
-
-	    (NOTE: Anope can be compiled against MySQL Version 3.23 and above)
+			(NOTE: Anope can be compiled against MySQL Version 3.23 and above)


    2) Unpack the Anope tarball with your favorite uncompression program
@@ -1,9 +1,9 @@
 /* Declarations for command data.
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
- * Please read COPYING and README for furhter details.
+ * Please read COPYING and README for further details.
 *
 * Based on the original code of Epona by Lara.
 * Based on the original code of Services by Andy Church. 
@@ -1,9 +1,9 @@
 /* Services configuration.
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
- * Please read COPYING and README for furhter details.
+ * Please read COPYING and README for further details.
 *
 * Based on the original code of Epona by Lara.
 * Based on the original code of Services by Andy Church. 
@@ -1,9 +1,9 @@
 /* Database file descriptor structure and file handling routine prototypes.
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
- * Please read COPYING and README for furhter details.
+ * Please read COPYING and README for further details.
 *
 * Based on the original code of Epona by Lara.
 * Based on the original code of Services by Andy Church. 
@@ -1,9 +1,9 @@
 /* Set default values for any constants that should be in include files but
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
- * Please read COPYING and README for furhter details.
+ * Please read COPYING and README for further details.
 *
 * Based on the original code of Epona by Lara.
 * Based on the original code of Services by Andy Church. 
@@ -1,9 +1,9 @@
 /* depricated.h
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
- * Please read COPYING and README for furhter details.
+ * Please read COPYING and README for further details.
 *
 * Based on the original code of Epona by Lara.
 * Based on the original code of Services by Andy Church. 
@@ -1,9 +1,9 @@
 /* Include file for high-level encryption routines.
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
- * Please read COPYING and README for furhter details.
+ * Please read COPYING and README for further details.
 *
 * Based on the original code of Epona by Lara.
 * Based on the original code of Services by Andy Church. 
@@ -1,9 +1,9 @@
 /* Prototypes and external variable declarations.
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
- * Please read COPYING and README for furhter details.
+ * Please read COPYING and README for further details.
 *
 * Based on the original code of Epona by Lara.
 * Based on the original code of Services by Andy Church. 
@@ -45,6 +45,8 @@
 #define EVENT_NICK_DROPPED "nick_dropped"
 #define EVENT_NICK_FORBIDDEN "nick_forbidden"
 #define EVENT_NICK_EXPIRE "nick_expire"
+#define EVENT_CORE_DROPPED "nickcore_dropped"
+#define EVENT_CORE_NEWDISPLAY "nickcore_newdisplay"
 #define EVENT_CHANGE_NICK "change_nick"
 #define EVENT_USER_LOGOFF "user_logoff"
 #define EVENT_NICK_GHOSTED "nick_ghosted"
@@ -64,3 +66,7 @@
 #define EVENT_ACCESS_CLEAR "access_clear"
 #define EVENT_NICK_LOGOUT "nick_logout"
 #define EVENT_CHAN_KICK "chan_kick"
+#define EVENT_MODLOAD "modload"
+#define EVENT_MODUNLOAD "modunload"
+#define EVENT_ADDCOMMAND "addcommand"
+#define EVENT_DELCOMMAND "delcommand"
@@ -1,9 +1,9 @@
 /* Prototypes and external variable declarations.
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
- * Please read COPYING and README for furhter details.
+ * Please read COPYING and README for further details.
 *
 * Based on the original code of Epona by Lara.
 * Based on the original code of Services by Andy Church. 
@@ -56,6 +56,7 @@ E void kill_user(char *source, char *user, char *reason);
 E void bad_password(User * u);
 E void sqline(char *mask, char *reason);
 E void common_unban(ChannelInfo * ci, char *nick);
+E void common_unban_full(ChannelInfo * ci, char *nick, boolean full);
 E void common_svsmode(User * u, char *modes, char *arg);

 /**** botserv.c ****/
@@ -154,6 +155,7 @@ E int entry_match_mask(Entry *e, char *mask, uint32 ip);
 E Entry *elist_match(EList *list, char *nick, char *user, char *host, uint32 ip);
 E Entry *elist_match_mask(EList *list, char *mask, uint32 ip);
 E Entry *elist_match_user(EList *list, User *u);
+E Entry *elist_match_user_full(EList *list, User *u, boolean full);
 E Entry *elist_find_mask(EList *list, char *mask);
 E long get_memuse(EList *list);

@@ -815,6 +817,7 @@ E void memoserv(User * u, char *buf);
 E void check_memos(User * u);
 E MemoInfo *getmemoinfo(const char *name, int *ischan, int *isforbid);
 E void memo_send(User * u, char *name, char *text, int z);
+E void memo_send_from(User * u, char *name, char *text, int z, char *source);
 E int delmemo(MemoInfo * mi, int num);

 /**** messages.c ****/
@@ -1175,6 +1178,7 @@ E int is_excepted(ChannelInfo * ci, User * user);
 E int is_excepted_mask(ChannelInfo * ci, char *mask);

 E int match_usermask(const char *mask, User * user);
+E int match_usermask_full(const char *mask, User * user, boolean full);
 E int match_userip(const char *mask, User * user, char *host);
 E void split_usermask(const char *mask, char **nick, char **user,
                      char **host);
@@ -1,6 +1,6 @@
 # Make file for Win32
 #
-# (C) 2003-2010 Anope Team
+# (C) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #
 # Please read COPYING and README for further details.
@@ -1,9 +1,9 @@
 /* Declarations of IRC message structures, variables, and functions.
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
- * Please read COPYING and README for furhter details.
+ * Please read COPYING and README for further details.
 *
 * Based on the original code of Epona by Lara.
 * Based on the original code of Services by Andy Church. 
@@ -1,9 +1,9 @@
 /* Modular support
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
- * Please read COPYING and README for furhter details.
+ * Please read COPYING and README for further details.
 *
 * Based on the original code of Epona by Lara.
 * Based on the original code of Services by Andy Church. 
@@ -1,9 +1,9 @@
 /* Include extra includes needed by most/all pseudo-clients.
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
- * Please read COPYING and README for furhter details.
+ * Please read COPYING and README for further details.
 *
 * Based on the original code of Epona by Lara.
 * Based on the original code of Services by Andy Church. 
@@ -1,9 +1,9 @@
 /*
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
- * Please read COPYING and README for furhter details.
+ * Please read COPYING and README for further details.
 *
 * Based on the original code of Epona by Lara.
 * Based on the original code of Services by Andy Church. 
@@ -324,7 +324,12 @@ struct ircdvars_ {
 	int admin;				/* Has Admin 			*/
 	int chansqline;				/* Supports Channel Sqlines	*/
 	int quitonkill;				/* IRCD sends QUIT when kill	*/
-	int svsmode_unban;			/* svsmode can be used to unban	*/
+	int svsmode_unban;			/* svsmode can be used to unban
+						 * Note the core no longer uses
+						 * this because it can lead to
+						 * users gaining other users IPs.
+						 * It is kept for API compatability.
+						 */
 	int protect;				/* Has protect modes		*/
 	int reversekickcheck;			/* Can reverse ban check	*/
 	int chanreg;				/* channel mode +r for register	*/
@@ -491,6 +496,8 @@ struct memo_ {
    ModuleData *moduleData; 	/* Module saved data attached to the Memo */
 #ifdef USE_MYSQL
 	uint32 id;		/* Database ID; see mysql.c */
+#else
+	uint32 notused;		/* ABI compat with no mysql */
 #endif
 };

@@ -1059,6 +1066,9 @@ typedef struct ignore_data {

 struct mailinfo_ {
 	FILE *pipe;
+	/* Used only with mail forking */
+	FILE *writepipe;
+	FILE *readpipe;
 	User *sender;
 	NickCore *recipient;
 	NickRequest *recip;
@@ -1318,9 +1328,10 @@ typedef struct ircd_modes_ {
 #define LANG_RU                13   	/* Russian */
 #define LANG_HUN               14   	/* Hungarian */
 #define LANG_PL                15   	/* Polish */
+#define LANG_JA_UTF8           16	/* Japanese (UTF-8 encoding) */

-#define NUM_LANGS              16	/* Number of languages */
-#define USED_LANGS             13	/* Number of languages provided */
+#define NUM_LANGS              17	/* Number of languages */
+#define USED_LANGS             14	/* Number of languages provided */


 #define DEF_LANGUAGE	LANG_EN_US
@@ -1,9 +1,9 @@
 /* Header for Services list handler.
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
- * Please read COPYING and README for furhter details.
+ * Please read COPYING and README for further details.
 *
 * Based on the original code of Epona by Lara.
 * Based on the original code of Services by Andy Church. 
@@ -1,9 +1,9 @@
 /*
 *
- * (C) 2004-2010 Anope Team
+ * (C) 2004-2014 Anope Team
 * Contact us at team@anope.org
 *
- * Please read COPYING and README for furhter details.
+ * Please read COPYING and README for further details.
 *
 * Based on the original code of Epona by Lara.
 * Based on the original code of Services by Andy Church. 
@@ -1,9 +1,9 @@
 /* Time-delay routine include stuff.
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
- * Please read COPYING and README for furhter details.
+ * Please read COPYING and README for further details.
 *
 * Based on the original code of Epona by Lara.
 * Based on the original code of Services by Andy Church. 
@@ -27,7 +27,7 @@ fi
 cat >version.h <<EOF
 /* Version information for Services.
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and CREDITS for further details.
@@ -1,9 +1,9 @@
 /* version file handler for win32.
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
- * Please read COPYING and README for furhter details.
+ * Please read COPYING and README for further details.
 *
 * Based on the original code of Epona by Lara.
 * Based on the original code of Services by Andy Church.
@@ -161,6 +161,8 @@ void write_version(FILE * fd)
    char buf[1024];
    short until_eof = 0;

+    if (!fdin)
+        return;
    while (fgets(buf, 1023, fdin)) {
        strip(buf);

@@ -173,7 +175,7 @@ void write_version(FILE * fd)
        if (!strcmp(buf, "cat >version.h <<EOF"))
            until_eof = 1;
    }
-
+    fclose(fdin);
 }

 void parse_line(FILE * fd, char *line)
@@ -1,7 +1,7 @@
 //
 // install.js - Windows Configuration
 //
-// (C) 2003-2010 Anope Team
+// (C) 2003-2014 Anope Team
 // Contact us at team@anope.org
 //
 // This program is free but copyrighted software; see the file COPYING for
@@ -58,8 +58,8 @@ var installerQuestions = [
                                                                                                f.WriteLine("MYSQL_C=mysql.c");
                                                                                                f.WriteLine("MYSQL_O=mysql.obj");
                                                                                                f.WriteLine("BASE_CFLAGS=/D USE_MYSQL /D USE_RDB $(BASE_CFLAGS) /D HAVE_MYSQL_MYSQL_H");
-                                                                                                f.WriteLine("MYPASQL_BUILD=$(CC) /LD $(MYSQL_INC_PATH) src\\mypasql.c /link $(MYSQL_LIB_PATH) $(LFLAGS) /DEF:src\mypasql.def libmysql.lib zlib.lib ws2_32.lib advapi32.lib /NODEFAULTLIB:LIBCMTD.lib");
-                                                                                                f.WriteLine("LIBS=$(LIBS) libmysql.lib zlib.lib");                                                                             
+                                                                                                f.WriteLine("MYPASQL_BUILD=$(CC) /LD $(MYSQL_INC_PATH) src\\mypasql.c /link $(MYSQL_LIB_PATH) $(LFLAGS) /DEF:src\mypasql.def libmysql.lib ws2_32.lib advapi32.lib /NODEFAULTLIB:LIBCMTD.lib");
+                                                                                                f.WriteLine("LIBS=$(LIBS) libmysql.lib");                                                                             
                                                                                        }
                                                                                        else {
                                                                                                f.WriteLine("USE_MYSQL=0");
@@ -70,34 +70,63 @@ var installerQuestions = [
                                       ];

 var buildPackages = [
+                                        {
+                                                         'name' : 'Microsoft Visual Studio 2012',
+                                                                    'libpaths' : [
+                                                                    'Program Files\\Microsoft Visual Studio 11.0\\VC\\lib',
+                                                                    'Program Files (x86)\\Microsoft Visual Studio 11.0\\VC\\lib',
+                                                                    'Program Files\\Microsoft SDKs\\Windows\\v7.0\\Lib',
+                                                                    'Program Files (x86)\\Microsoft SDKs\\Windows\\v7.0\\Lib',
+                                                                    ],
+                                                         'incpaths': [
+                                                                    'Program Files\\Microsoft Visual Studio 11.0\\VC\\include',
+                                                                    'Program Files (x86)\\Microsoft Visual Studio 11.0\\VC\\include',
+                                                                    'Program Files\\Microsoft SDKs\\Windows\\v7.0\\Include',
+                                                                    'Program Files (x86)\\Microsoft SDKs\\Windows\\v7.0\\Include',
+                                                                    ],
+                                                         'nmake' : [
+                                                                    'Program Files\\Microsoft Visual Studio 11.0\\VC\\bin',
+                                                                    'Program Files (x86)\\Microsoft Visual Studio 11.0\\VC\\bin',
+                                                                   ],
+                                                        'additional_switches' : [ '/w' ],
+                                                        'installedDrive' : 'C'
+                                        },
                                        {
                                                        'name' : 'Microsoft Visual Studio 2010 (64bit)',
                                                        'libpaths' : [
                                                                     'Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\lib',
-                                                                     'Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\Lib'
-								     ],
+                                                                     'Program Files\\Microsoft SDKs\\Windows\\v7.1\\Lib',
+                                                                     'Program Files\\Microsoft SDKs\\Windows\\v7.0\\Lib',
+                                                                     'Program Files (x86)\\Microsoft SDKs\\Windows\\v7.0A\\Lib'
+                                       ],
                                                        'incpaths': [
                                                                     'Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\include',
-                                                                     'Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\include'
-                                                         ],
+                                                                     'Program Files\\Microsoft SDKs\\Windows\\v7.1\\Include',
+                                                                     'Program Files\\Microsoft SDKs\\Windows\\v7.0\\Include',
+                                                                     'Program Files (x86)\\Microsoft SDKs\\Windows\\v7.0A\\Include'
+                                                                    ],
                                                         'nmake' : [
-                                                                     'Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\Bin',
-                                                         ],
-							 'additional_switches' : [ '/w' ],
-							 'installedDrive' : 'C'
+                                                                   'Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\bin',
+                                                                   ],
+                                                         'additional_switches' : [ '/w' ],
+                                                         'installedDrive' : 'C'
                                        },
                                        {
                                                        'name' : 'Microsoft Visual Studio 2010',
                                                        'libpaths' : [
                                                                     'Program Files\\Microsoft Visual Studio 10.0\\VC\\lib',
-                                                                     'Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\Lib'
+                                                                     'Program Files\\Microsoft SDKs\\Windows\\v7.1\\Lib',
+                                                                     'Program Files\\Microsoft SDKs\\Windows\\v7.0\\Lib',
+                                                                     'Program Files\\Microsoft SDKs\\Windows\\v7.0A\\Lib'
                                                                     ],
                                                        'incpaths' : [
                                                                     'Program Files\\Microsoft Visual Studio 10.0\\VC\\include',
-                                                                     'Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\Include'
+                                                                     'Program Files\\Microsoft SDKs\\Windows\\v7.1\\Include',
+                                                                     'Program Files\\Microsoft SDKs\\Windows\\v7.0\\Include',
+                                                                     'Program Files\\Microsoft SDKs\\Windows\\v7.0A\\Include'
                                                                     ],
                                                        'nmake' : [
-                                                                     'Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\Bin',
+                                                                  'Program Files\\Microsoft Visual Studio 10.0\\VC\\bin',
                                                                  ],
                                                        'additional_switches' : [ '/w' ],
                                                        'installedDrive' : 'C'
@@ -113,7 +142,7 @@ var buildPackages = [
                                                                     'Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\Include'
                                                                     ],
                                                        'nmake' : [
-														             'Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\Bin',
+                                                                  'Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\Bin',
                                                                  ],
                                                        'additional_switches' : [ '/w' ],
                                                        'installedDrive' : 'C'
@@ -151,8 +180,8 @@ var buildPackages = [
                                                                        ],
                                                        'additional_switches' : [
                                                                                                '/w'
-                                                                      	],
-							'installedDrive' : 'C'
+                                                                                ],
+                                                        'installedDrive' : 'C'
                                        },
                                        {                                        
                                                        'name' : 'Microsoft Visual Studio 2005 (Old PSDK)',
@@ -170,31 +199,26 @@ var buildPackages = [
                                                                        ],
                                                        'additional_switches' : [
                                                                                                '/w'
-                                                               		],
-							'installedDrive' : 'C'
-                                        },
-                                        
-                                        {
-                                                        'name' : 'Microsoft Visual Studio .NET 2003',
-                                                        'libpaths' : [
-                                                                                'Program Files\\Microsoft Visual Studio .NET 2003\\VC7\\Lib',
-                                                                                'Program Files\\Microsoft Visual Studio .NET 2003\\PlatformSDK\\Lib'
-                                                                         ],
-                                                        'incpaths' : [
-                                                                                'Program Files\\Microsoft Visual Studio .NET 2003\\VC7\\Include',
-                                                                                'Program Files\\Microsoft Visual Studio .NET 2003\\PlatformSDK\\Include'
-                                                                         ],
-                                                        'nmake' : [
-                                                                                'Program Files\\Microsoft Visual Studio .NET 2003\\VC7\\Bin',
-                                                                                ''
-                                                                        ],                                                                    
-                                                        'additional_switches' : false,
-							'installedDrive' : 'C'
+                                                               	                ],
+                                                         'installedDrive' : 'C'
                                        }
                                ];                  
                                                              
                                
        var mysqlVersions = [
+
+						{
+							'name' : 'MySQL 5.5',
+							'libpaths' : [
+									  'Program Files\\MySQL\\MySQL Server 5.5\\Lib'
+								],
+							'incpaths' : [
+									  'Program Files\\MySQL\\MySQL Server 5.5\\Include'
+								],
+							'dllfile' : 'Program Files\\MySQL\\MySQL Server 5.5\\bin\\libmysql.dll',
+							'installedDrive' : 'C'
+						},
+		
 						{
 							'name' : 'MySQL 5.1',
 							'libpaths' : [
@@ -328,7 +352,7 @@ var buildPackages = [
        if (!findCompiler()) {
                WScript.Echo("\nERROR: No suitable build tools were found!");
                WScript.Echo("Please ensure you have downloaded and installed a version of Visual C++ and/or PlatformSDK.\n");
-                WScript.Echo("For more information on the tools needed to build Anope on Windows, see:\nhttp://anope.info/wiki/Windows#Compiling\n");
+                WScript.Echo("For more information on the tools needed to build Anope on Windows, see:\nhttp://wiki.anope.org/index.php/Windows:1.8#Compiling\n");
        }
        else {
                WScript.Echo("\nBuild tools were found successfully!\n");
@@ -522,8 +546,7 @@ var buildPackages = [
                if (noPSDK) {
                        WScript.Echo("Some of the build tools were detected on your computer, but the essential PlatformSDK components were missing.");
                        WScript.Echo("You will need to download the PlatformSDK from the URL below, ensuring that the Core Windows files, and Debugging Tools are installed.");
-                        WScript.Echo("For more details on installing the PlatformSDK, visit http://anope.info/wiki/Windows#Compiling\n");
-                        WScript.Echo("PSDK: http://download.microsoft.com/download/a/5/f/a5f0d781-e201-4ab6-8c6a-9bb4efed1e1a/PSDK-x86.exe\n");                        
+                        WScript.Echo("For more details on installing the PlatformSDK, visit http://wiki.anope.org/index.php/Windows:1.8#Compiling\n");
                }
                return false;
        }
@@ -6,8 +6,8 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
     	   'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
   	   'RUNGROUP=${RUNGROUP}' 'USE_MODULES=${USE_MODULES}'

-LANGOBJS = cat de en_us es fr gr hun it nl pl pt ru tr
-LANGSRCS = cat.l de.l en_us.l es.l fr.l gr.l hun.l it.l nl.l pl.l pt.l ru.l tr.l
+LANGOBJS = cat de en_us es fr gr hun it ja_utf8 nl pl pt ru tr
+LANGSRCS = cat.l de.l en_us.l es.l fr.l gr.l hun.l it.l ja_utf8.l nl.l pl.l pt.l ru.l tr.l

 LANGCOMP = ./langcomp
 #LANGCOMP = ./langcomp -w
@@ -59,6 +59,8 @@ hun:      hun.l       langcomp index
 	./langcomp $@.l
 it:       it.l       langcomp index
 	./langcomp $@.l
+ja_utf8:  ja_utf8.l  langcomp index
+	./langcomp $@.l
 nl:       nl.l       langcomp index
 	./langcomp $@.l
 pl:       pl.l       langcomp index
@@ -3,8 +3,8 @@
 include ../Makefile.inc.win32


-LANGOBJS = cat de en_us es fr hun gr nl pl pt tr it ru
-LANGSRCS = cat de en_us.l es fr.l hun.l gr.l nl.l pl.l pt.l tr.l it.l ru.l
+LANGOBJS = cat de en_us es fr hun gr nl pl pt tr it ja_utf8 ru
+LANGSRCS = cat de en_us.l es fr.l hun.l gr.l nl.l pl.l pt.l tr.l it.l ja_utf8.l ru.l

 LANGCOMP = ./langcomp
 #LANGCOMP = ./langcomp -w
@@ -26,6 +26,7 @@ install: all
        -copy pt ..\$(DATDEST)\languages
        -copy tr ..\$(DATDEST)\languages
        -copy it ..\$(DATDEST)\languages
+        -copy ja_utf8 ..\$(DATDEST)\languages
        -copy ru ..\$(DATDEST)\languages

 clean:
@@ -59,6 +60,8 @@ tr:       tr.l       langtool.exe langcomp.exe index
        langcomp $@.l
 it:       it.l       langtool.exe langcomp.exe index
        langcomp $@.l
+ja_utf8:  ja_utf8.l  langtool.exe langcomp.exe index
+        langcomp $@.l
 ru:       ru.l       langtool.exe langcomp.exe index
        langcomp $@.l

@@ -1,9 +1,9 @@
 # Catalan Language File.
 #
-# (C) 2003-2010 Anope Team
+# (C) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #
-# Please read COPYING and README for furhter details.
+# Please read COPYING and README for further details.
 #
 # Based on the original code of Epona by Lara.
 # Based on the original code of Services by Andy Church. 
@@ -3287,7 +3287,7 @@ OPER_HELP_DEFCON
 	Syntax: DEFCON [1|2|3|4|5]

 	The defcon system can be used to implement a pre-defined
-	set of restrictions to services useful during an attemtped
+	set of restrictions to services useful during an attempted
 	attack on the network.

 OPER_HELP_DEFCON_NO_NEW_CHANNELS
@@ -3423,7 +3423,7 @@ NEWS_HELP_LOGON
 	
 	Edits or displays the list of logon news messages.  When a
 	user connects to the network, these messages will be sent
-	to them.  (However, no more than %s messages will be
+	to them.  (However, no more than %d messages will be
 	sent in order to avoid flooding the user.  If there are
 	more news messages, only the most recent will be sent.)
 	NewsCount can be configured in services.conf.
@@ -3437,7 +3437,7 @@ NEWS_HELP_OPER
 	
 	Edits or displays the list of oper news messages.  When a
 	user opers up (with the /OPER command), these messages will
-	be sent to them.  (However, no more than %s messages will
+	be sent to them.  (However, no more than %d messages will
 	be sent in order to avoid flooding the user.  If there are
 	more news messages, only the most recent will be sent.)
 	NewsCount can be configured in services.conf.
@@ -6765,9 +6765,9 @@ HOST_NO_VIDENT
 #
 ###########################################################################
 HOST_GROUP
-	All vhost's in the group %s have been set to %s
+	All vhosts in the group %s have been set to %s
 HOST_IDENT_GROUP
-	All vhost's in the group %s have been set to %s@%s
+	All vhosts in the group %s have been set to %s@%s

 ###########################################################################
 #
@@ -1,9 +1,9 @@
 # Deutsches Language file.
 #
-# (C) 2003-2010 Anope Team
+# (C) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #   
-# Please read COPYING and README for furhter details.
+# Please read COPYING and README for further details.
 #     
 # Based on the original code of Epona by Lara.
 # Based on the original code of Services by Andy Church. 
@@ -12,7 +12,7 @@
 # - Solltest du irgendwelche Rechtschreibfehler oder sonstige
 #   Verbesserungsvorschläge haben, immer her damit!
 #
-# INFO ::: Letzte Änderung:	08.08.2009	-- Han` -- Han@mefalcon.org --
+# INFO ::: Letzte Änderung:	29.01.2011	-- Han` -- Han@mefalcon.org --
 #
 ##########################################################################
 #
@@ -856,7 +856,7 @@ NICK_GLIST_FOOTER
 NICK_GLIST_REPLY
 	   %c%s
 NICK_GLIST_REPLY_ADMIN
-	   %c%s (wird in %s auslaufen)
+	   %c%s (wird am %s auslaufen)

 # RECOVER responses
 NICK_RECOVER_SYNTAX
@@ -3373,7 +3373,7 @@ NEWS_HELP_LOGON
 	
 	Zeigt oder bearbeitet die Liste der LogonNews.
 	Nach der Verbindung des Users werden diese Nachrichten
-	angezeigt. (Es werden jedoch nur max. %s angezeigt, um ein
+	angezeigt. (Es werden jedoch nur max. %d angezeigt, um ein
 	Flooding des Users zu verhindern. Wenn mehr News
 	existieren, werden nur die neuesten angezeigt.)
 	Die Anzahl der News können in der services.conf festgelegt werden.
@@ -3388,7 +3388,7 @@ NEWS_HELP_OPER
 	Zeigt oder bearbeitet die Liste der Oper-News.Nachdem 
 	sich ein User die Oper-Flags gesetzt hat (mit dem
 	/OPER Befehl) werden ihm diese Nachrichten angezeigt.
-	(Es werden jedoch nur max. %s Nachrichten angezeigt, um ein
+	(Es werden jedoch nur max. %d Nachrichten angezeigt, um ein
 	Flooding des Users zu verhindern. Wenn mehr News
 	existieren, werden nur die neüsten angezeigt.)
 	Die Anzahl der News können in der services.conf festgelegt werden.
@@ -4344,7 +4344,7 @@ CHAN_HELP_CMD_CLEAR
 	    CLEAR      Entfernt bestimmte Einstellungen des angegebenen Channel
 CHAN_HELP_CMD_DEVOICE
 	    DEVOICE    Enfernt den Voice-Status des angegebenen Nicknamens
-	               in einen Channel
+	               in einem Channel
 CHAN_HELP_CMD_GETKEY
 	    GETKEY     Gibt das Channel-Passwort wieder
 CHAN_HELP_CMD_INFO
@@ -4354,43 +4354,43 @@ CHAN_HELP_CMD_INVITE
 CHAN_HELP_CMD_KICK
 	    KICK       Kickt den angegebenen Nicknamen aus einen Channel
 CHAN_HELP_CMD_LIST
-	    LIST       Listet alle registrieten Channels des angegebene Muster
+	    LIST       Listet alle registrierten Channels des angegebene Muster
 CHAN_HELP_CMD_LOGOUT
-	    LOGOUT     Das Befehl wir den angegegenen Nickname abmelden
+	    LOGOUT     Meldet den angegebenen Nicknamen ab
 CHAN_HELP_CMD_OP
-	    OP         Gibt den angegebenen Nicknamen Op-Status in einen Channel
+	    OP         Gibt dem angegebenen Nicknamen Op-Status in einem Channel
 CHAN_HELP_CMD_TOPIC
 	    TOPIC      Ändert den Topic des angegebenen Channels
 CHAN_HELP_CMD_UNBAN
-	    UNBAN      Enfernt den oder die ban(s) die dich betreffen aus einen Channel
+	    UNBAN      Enfernt den oder die Bann(s) die Dich betreffen aus einem Channel
 CHAN_HELP_CMD_VOICE
-	    VOICE      Gibt den angegebenen User Voice-Status in einen Channel
+	    VOICE      Gibt dem angegebenen User Voice-Status in einem Channel
 CHAN_HELP_CMD_VOP
-	    VOP        Verwaltet die VOP-Liste von einen Channel
+	    VOP        Verwaltet die VOP-Liste eines Channels
 CHAN_HELP_CMD_DEHALFOP
 	    DEHALFOP   Enfernt den HalfOP-Status des angegebenen Nicknamens
-	               in einen Channel
+	               in einem Channel
 CHAN_HELP_CMD_DEOWNER
-	    DEOWNER    Entfernt dein Founder (Gründer) Status in einen Channel
+	    DEOWNER    Entfernt Deinen Founder (Gründer) Status in einem Channel
 CHAN_HELP_CMD_DEPROTECT
-	    DEPROTECT  Entfernt den schutz des angegebenen Nicknamens 
-	               in einen Channel
+	    DEPROTECT  Entfernt den Schutz des angegebenen Nicknamens 
+	               in einem Channel
 CHAN_HELP_CMD_HALFOP
-	    HALFOP     Gibt den angegebenen User HalfOP-Status in einen Channel
+	    HALFOP     Gibt dem angegebenen User HalfOP-Status in einem Channel
 CHAN_HELP_CMD_HOP
 	    HOP        Verwaltet die HOP-Liste von einen Channel
 CHAN_HELP_CMD_OWNER
-	    OWNER      Gibt dir Founder (Gründer) Staus in einen Channel
+	    OWNER      Gibt Dir Founder (Gründer) Status in einem Channel
 CHAN_HELP_CMD_PROTECT
-	    PROTECT    Schützt den angegebenen Nicknamen in einen Channel
+	    PROTECT    Schützt den angegebenen Nicknamen in einem Channel
 CHAN_HELP_CMD_ADMIN
-	    ADMIN      Schützt den angegebenen Nicknamen in einen Channel
+	    ADMIN      Schützt den angegebenen Nicknamen in einem Channel
 CHAN_HELP_CMD_DEADMIN
 	    DEADMIN    Entfernt den Schutz des angegebenen Nicknamens 
-	               in einen Channel
+	               in einem Channel
 CHAN_HELP_CMD_DEOP
 	    DEOP       Enfernt den OP-Status des angegebenen Nicknamens
-	               in einen Channel
+	               in einem Channel

 CHAN_HELP
 	Mit Hilfe von %S kann man Channel registrieren und
@@ -6354,20 +6354,20 @@ BOT_HELP_CMD_BADWORDS
 BOT_HELP_CMD_ACT
 	    ACT           Veranlaßt den Bot ein "/me" Befehl ausführen
 BOT_HELP_CMD_INFO
-	    INFO          Erlaubt dir Informationen über ein BotServ ServicesBot zu sehen
+	    INFO          Erlaubt Dir, Informationen über einen ServicesBot anzuzeigen
 BOT_HELP_CMD_SAY
-	    SAY           Veranlaßt ein Bot ein Text in einen Channel zu sagen
+	    SAY           Veranlaßt den Bot etwas in einem Channel zu sagen
 BOT_HELP_CMD_UNASSIGN
-	    UNASSIGN      Entfernt ein ServicesBot von einen Channel
+	    UNASSIGN      Entfernt ein ServicesBot von einem Channel
 BOT_HELP_CMD_BOT
 	    BOT           Verwaltung von Bots

 BOT_HELP
-	%S ist dafür geschaffen, Bots in Channels 
+	%S ist dafür geschaffen, Bots in Channels
 	einzubringen. Geschaffen wurde er für User, die
 	selbst keinen Bot ausfetzen können, oder auch Netzwerke,
-	die Bots verbieten. Mögliche Befehle siehe unten, 
-	die Syntax ist %R%S Befehl.  
+	die Bots verbieten. Mögliche Befehle siehe unten,
+	die Syntax ist %R%S Befehl.
 	
 	Für weitere Hilfe zu einem bestimmten Befehl
 	tippe %R%S HELP Befehl
@@ -1,6 +1,6 @@
 # United States English language file.
 #
-# (C) 2003-2010 Anope Team
+# (C) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #   
 # Please read COPYING and README for further details.
@@ -664,7 +664,7 @@ NICK_SASET_HIDE_STATUS_OFF
 	
 # SASET MSG responses
 NICK_SASET_MSG_SYNTAX
-	SASAET nickname MSG {ON | OFF}
+	SASET nickname MSG {ON | OFF}
 NICK_SASET_MSG_ON
 	Services will now reply to %s with messages.
 NICK_SASET_MSG_OFF
@@ -3283,7 +3283,7 @@ NEWS_HELP_LOGON
 	
 	Edits or displays the list of logon news messages.  When a
 	user connects to the network, these messages will be sent
-	to them.  (However, no more than %s messages will be
+	to them.  (However, no more than %d messages will be
 	sent in order to avoid flooding the user.  If there are
 	more news messages, only the most recent will be sent.)
 	NewsCount can be configured in services.conf.
@@ -3297,7 +3297,7 @@ NEWS_HELP_OPER
 	
 	Edits or displays the list of oper news messages.  When a
 	user opers up (with the /OPER command), these messages will
-	be sent to them.  (However, no more than %s messages will
+	be sent to them.  (However, no more than %d messages will
 	be sent in order to avoid flooding the user.  If there are
 	more news messages, only the most recent will be sent.)
 	NewsCount can be configured in services.conf.
@@ -6390,9 +6390,9 @@ HOST_OFF_UNREAL
 HOST_NO_VIDENT
 	Your IRCD does not support vIdent's, if this is incorrect, please report this as a possible bug
 HOST_GROUP
-	All vhost's in the group %s have been set to %s
+	All vhosts in the group %s have been set to %s
 HOST_IDENT_GROUP
-	All vhost's in the group %s have been set to %s@%s
+	All vhosts in the group %s have been set to %s@%s
 HOST_LIST_FOOTER
 	Displayed all records (Count: %d)
 HOST_LIST_RANGE_FOOTER
@@ -1,9 +1,9 @@
 # Spanish Language File.
 #
-# (C) 2003-2010 Anope Team
+# (C) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #
-# Please read COPYING and README for furhter details.
+# Please read COPYING and README for further details.
 #
 # Based on the original code of Epona by Lara.
 # Based on the original code of Services by Andy Church.
@@ -473,9 +473,9 @@ NICK_SET_PASSWORD_CHANGED_TO
 NICK_SET_LANGUAGE_SYNTAX
 	SET LANGUAGE numero
 NICK_SET_LANGUAGE_UNKNOWN
-	Numero de lenguage %d desconocido. Tipea %R%s HELP SET LANGUAGE para una lista de lenguages.
+	Numero de lenguaje %d desconocido. Tipea %R%s HELP SET LANGUAGE para una lista de lenguajes.
 NICK_SET_LANGUAGE_CHANGED
-	Lenguage cambiado a Español.
+	Lenguaje cambiado a Español.

 # SET URL responses
 NICK_SET_URL_CHANGED
@@ -3397,7 +3397,7 @@ NEWS_HELP_LOGON
 	
 	Edits or displays the list of logon news messages.  When a
 	user connects to the network, these messages will be sent
-	to them.  (However, no more than %s messages will be
+	to them.  (However, no more than %d messages will be
 	sent in order to avoid flooding the user.  If there are
 	more news messages, only the most recent will be sent.)
 	NewsCount can be configured in services.conf.
@@ -3411,7 +3411,7 @@ NEWS_HELP_OPER
 	
 	Edits or displays the list of oper news messages.  When a
 	user opers up (with the /OPER command), these messages will
-	be sent to them.  (However, no more than %s messages will
+	be sent to them.  (However, no more than %d messages will
 	be sent in order to avoid flooding the user.  If there are
 	more news messages, only the most recent will be sent.)
 	NewsCount can be configured in services.conf.
@@ -1,9 +1,9 @@
 # French language file.
 #
-# (C) 2003-2010 Anope Team
+# (C) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #
-# Please read COPYING and README for furhter details.
+# Please read COPYING and README for further details.
 #
 # Based on the original code of Epona by Lara.
 # Based on the original code of Services by Andy Church.
@@ -3483,7 +3483,7 @@ NEWS_HELP_LOGON
 	
 	Édite ou affiche la liste de messages Logon News. Lorsqu'un 
 	utilisateur se connecte au réseau, ces messages leur seront 
-	envoyés. (Cependant, pas plus de %s messages ne seront envoyés 
+	envoyés. (Cependant, pas plus de %d messages ne seront envoyés 
 	pour éviter le flood des utilisateurs. Si il y a plusieurs 
 	messages de news, seuls les plus récents seront envoyés.) Le 
 	nombre de news envoyées peut être configuré dans le 
@@ -3498,7 +3498,7 @@ NEWS_HELP_OPER
 	
 	Édite ou affiche la liste des messages Oper News. Quand un 
 	utilisateur utilise la commande /OPER, ces messages lui seront 
-	envoyés. (Cependant, pas plus de %s messages ne seront envoyés 
+	envoyés. (Cependant, pas plus de %d messages ne seront envoyés 
 	afin de ne pas flooder l'utilisateur. Si il y a plusieurs 
 	messages news, seuls les plus récents seront envoyés.) Le nombre 
 	de news envoyées peut être configuré dans le services.conf.
@@ -4652,7 +4652,7 @@ CHAN_HELP_SET_RESTRICTED
 CHAN_HELP_SET_SECURE
 	Syntaxe: SET canal SECURE {ON | OFF}
 	
-	Active ou désactive les caractéristiques de sécurité de %s pour 
+	Active ou désactive les caractéristiques de sécurité de %S pour 
 	un canal. Lorsque la Sécurité est active, seuls les 
 	utilisateurs qui ont enregistré leurs pseudos avec %s et qui sont 
 	identifiés avec leur mot de passe auront accès au canal sous 
@@ -1,9 +1,9 @@
 # Greek language file.
 #
-# (C) 2003-2010 Anope Team
+# (C) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #
-# Please read COPYING and README for furhter details.
+# Please read COPYING and README for further details.
 #
 # Based on the original code of Epona by Lara.
 # Based on the original code of Services by Andy Church.
@@ -3279,7 +3279,7 @@ OPER_HELP_DEFCON
 	Syntax: DEFCON [1|2|3|4|5]

 	The defcon system can be used to implement a pre-defined
-	set of restrictions to services useful during an attemtped
+	set of restrictions to services useful during an attempted
 	attack on the network.

 OPER_HELP_DEFCON_NO_NEW_CHANNELS
@@ -3415,7 +3415,7 @@ NEWS_HELP_LOGON
 	
 	Edits or displays the list of logon news messages.  When a
 	user connects to the network, these messages will be sent
-	to them.  (However, no more than %s messages will be
+	to them.  (However, no more than %d messages will be
 	sent in order to avoid flooding the user.  If there are
 	more news messages, only the most recent will be sent.)
 	NewsCount can be configured in services.conf.
@@ -3429,7 +3429,7 @@ NEWS_HELP_OPER
 	
 	Edits or displays the list of oper news messages.  When a
 	user opers up (with the /OPER command), these messages will
-	be sent to them.  (However, no more than %s messages will
+	be sent to them.  (However, no more than %d messages will
 	be sent in order to avoid flooding the user.  If there are
 	more news messages, only the most recent will be sent.)
 	NewsCount can be configured in services.conf.
@@ -6651,9 +6651,9 @@ HOST_NO_VIDENT
 #
 ###########################################################################
 HOST_GROUP
-	All vhost's in the group %s have been set to %s
+	All vhosts in the group %s have been set to %s
 HOST_IDENT_GROUP
-	All vhost's in the group %s have been set to %s@%s
+	All vhosts in the group %s have been set to %s@%s

 ###########################################################################
 #
@@ -1,6 +1,6 @@
 # Hungarian (magyar) language file.
 #
-# (C) 2003-2010 Anope Team
+# (C) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #    
 # Translated by:                                      
@@ -9,7 +9,7 @@
 # CJB CHAT Magyarország, http://cjbchat.hu     
 # Ez a fordítás a CJB Chat megrendelésére készült. 
 #
-# Please read COPYING and README for furhter details.
+# Please read COPYING and README for further details.
 #     
 # Based on the original code of Epona by Lara.
 # Based on the original code of Services by Andy Church. 
@@ -3349,7 +3349,7 @@ NEWS_HELP_LOGON
 	
 	Edits or displays the list of logon news messages.  When a
 	user connects to the network, these messages will be sent
-	to them.  (However, no more than %s messages will be
+	to them.  (However, no more than %d messages will be
 	sent in order to avoid flooding the user.  If there are
 	more news messages, only the most recent will be sent.)
 	NewsCount can be configured in services.conf.
@@ -3363,7 +3363,7 @@ NEWS_HELP_OPER
 	
 	Edits or displays the list of oper news messages.  When a
 	user opers up (with the /OPER command), these messages will
-	be sent to them.  (However, no more than %s messages will
+	be sent to them.  (However, no more than %d messages will
 	be sent in order to avoid flooding the user.  If there are
 	more news messages, only the most recent will be sent.)
 	NewsCount can be configured in services.conf.
@@ -1,6 +1,6 @@
 # Italian language file.
 #
-# (C) 2003-2010 Anope Team
+# (C) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #
 # Please read COPYING and README for further details.
@@ -3308,7 +3308,7 @@ NEWS_HELP_LOGON
 	
 	Edits or displays the list of logon news messages.  When a
 	user connects to the network, these messages will be sent
-	to them.  (However, no more than %s messages will be
+	to them.  (However, no more than %d messages will be
 	sent in order to avoid flooding the user.  If there are
 	more news messages, only the most recent will be sent.)
 	NewsCount can be configured in services.conf.
@@ -3322,7 +3322,7 @@ NEWS_HELP_OPER
 	
 	Edits or displays the list of oper news messages.  When a
 	user opers up (with the /OPER command), these messages will
-	be sent to them.  (However, no more than %s messages will
+	be sent to them.  (However, no more than %d messages will
 	be sent in order to avoid flooding the user.  If there are
 	more news messages, only the most recent will be sent.)
 	NewsCount can be configured in services.conf.
@@ -1,6 +1,6 @@
 /* Compiler for language definition files.
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -77,10 +77,12 @@ int read_index_file()
 	numstrings++;
    if (!(stringnames = calloc(sizeof(char *), numstrings))) {
 	perror("calloc(stringnames)");
+	fclose(f);
 	return -1;
    }
    if (!(strings = calloc(sizeof(char *), numstrings))) {
 	perror("calloc(strings)");
+	fclose(f);
 	return -1;
    }
    fseek(f, 0, SEEK_SET);
@@ -90,6 +92,7 @@ int read_index_file()
 	    buf[strlen(buf)-1] = '\0';
 	if (!(stringnames[i++] = anopeStrDup(buf))) {
 	    perror("strdup()");
+	    fclose(f);
 	    return -1;
 	}
    }
@@ -201,6 +204,7 @@ int main(int ac, char **av)
    }
    if (!(out = fopen(outfile, "wb"))) {
 	perror(outfile);
+	fclose(in);
 	return 1;
    }

@@ -1,9 +1,9 @@
 /* Language stuff generator for win32.
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
- * Please read COPYING and README for furhter details.
+ * Please read COPYING and README for further details.
 *
 * Based on the original code of Epona by Lara.
 * Based on the original code of Services by Andy Church. 
@@ -1,9 +1,9 @@
 # Dutch Language File
 #
-# (C) 2003-2010 Anope Team
+# (C) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #
-# Please read COPYING and README for furhter details.
+# Please read COPYING and README for further details.
 #
 # Based on the original code of Epona by Lara.
 # Based on the original code of Services by Andy Church.
@@ -3376,7 +3376,7 @@ NEWS_HELP_LOGON
 	Wijzigt de lijst met login nieuwsberichten of geeft deze weer.
 	Wanneer een gebruiker met het netwerk verbindt, worden deze
 	berichten naar hem/haar verzonden.  (Echter, er zullen nooit
-	meer dan %s berichten worden verstuurd om het flooden van de
+	meer dan %d berichten worden verstuurd om het flooden van de
 	gebruiker te voorkomen. Als er meer nieuwsberichten
 	zijn worden alleen de meest recente vestuurd.)
 	NewsCount kan geconfigureerd worden in services.conf.
@@ -3391,7 +3391,7 @@ NEWS_HELP_OPER
 	Wijzigt de lijst met oper nieuwsberichten of geeft deze weer.
 	Wanneer een gebruiker opert (dmv het /OPER commando), worden
 	deze berichtennaar hem/haar verzonden.  (Echter, er zullen
-	nooit meer dan %s berichten worden verstuurd om het flooden
+	nooit meer dan %d berichten worden verstuurd om het flooden
 	van de gebruiker te voorkomen. Als er meer nieuwsberichten 
 	zijn worden alleen de meest recente vestuurd.)
 	NewsCount kan geconfigureerd worden in services.conf.
@@ -6569,9 +6569,9 @@ HOST_OFF_UNREAL
 HOST_NO_VIDENT
 	Je IRCD ondersteunt geen vIdent's. Als dit niet klopt, rapporteer dit dan als een mogelijke bug
 HOST_GROUP
-	Alle vhost's in de groep %s zijn ingesteld op %s
+	Alle vhosts in de groep %s zijn ingesteld op %s
 HOST_IDENT_GROUP
-	Alle vhost's in de groep %s zijn ingesteld op %s@%s
+	Alle vhosts in de groep %s zijn ingesteld op %s@%s

 ###########################################################################
 #
@@ -14,7 +14,7 @@
 #
 ###########################################################################
 #
-# (C) 2003-2010 Anope Team
+# (C) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #   
 # Please read COPYING and README for further details.
@@ -845,7 +845,7 @@ NICK_SASET_HIDE_STATUS_OFF

 # SASET MSG responses
 NICK_SASET_MSG_SYNTAX
-	SASAET nick MSG {ON | OFF}
+	SASET nick MSG {ON | OFF}

 NICK_SASET_MSG_ON
 	Serwisy bêd± teraz wysy³aæ do %s wiadomo¶ci.
@@ -4392,7 +4392,7 @@ NEWS_HELP_LOGON
 	
 	Edytuje lub wy¶wietla listê wiadomo¶ci wysy³anych po
 	przy³±czeniu u¿ytkownika do sieci. Je¶li zdefniowanych
-	wiadomo¶ci jest wiêcej tylko najnowsze %s zostanie
+	wiadomo¶ci jest wiêcej tylko najnowsze %d zostanie
 	wys³anych (aby zapobiec floodowaniu). Warto¶æ NewsCount
 	mo¿e zostaæ zmieniona w pliku konfiguracyjym serwisów.
 	
@@ -4405,7 +4405,7 @@ NEWS_HELP_OPER
 	
 	Edytuje lub wy¶wietla listê wiadomo¶ci wysy³anych po
 	wykonaniu polecenia /OPER. Je¶li zdefiniowanych
-	wiadomo¶ci jest wiêcej tylko najnowsze %s zostanie
+	wiadomo¶ci jest wiêcej tylko najnowsze %d zostanie
 	wys³anych (aby zapobiec floodowaniu). Warto¶æ NewsCount
 	mo¿e zostaæ zmieniona w pliku konfiguracyjym serwisów.
 	
@@ -4800,7 +4800,7 @@ NICK_HELP_SET_HIDE
 	Sk³adnia: SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}
 	
 	To polecenie pozwala na ukrycie czê¶ci informacji, które
-	s± wy¶wietlane przez polecenie INFO serwisu %s.
+	s± wy¶wietlane przez polecenie %S INFO serwisu.
 	Pierwszy argument okre¶la ukrywan± informacjê:
 	EMAIL - adres e-mail, USERMASK - ostatnio u¿ywany host,
 	QUIT - ostatnia wiadomo¶æ po¿egnalna, STATUS - status
@@ -4926,7 +4926,7 @@ NICK_HELP_SASET_HIDE
 	Sk³adnia: SASET nick HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}
 	
 	To polecenie pozwala na ukrycie czê¶ci informacji, które
-	s± wy¶wietlane przez polecenie INFO serwisu %s.
+	s± wy¶wietlane przez polecenie %S INFO serwisu.
 	Pierwszy argument okre¶la ukrywan± informacjê:
 	EMAIL - adres e-mail, USERMASK - ostatnio u¿ywany host,
 	QUIT - ostatnia wiadomo¶æ po¿egnalna, STATUS - status
@@ -1,9 +1,9 @@
 # Portuguese language file.
 #
-# (C) 2003-2010 Anope Team
+# (C) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #
-# Please read COPYING and README for furhter details.
+# Please read COPYING and README for further details.
 #
 # Based on the original code of Epona by Lara.
 # Based on the original code of Services by Andy Church.
@@ -3325,7 +3325,7 @@ NEWS_HELP_LOGON
 	
 	Edits or displays the list of logon news messages.  When a
 	user connects to the network, these messages will be sent
-	to them.  (However, no more than %s messages will be
+	to them.  (However, no more than %d messages will be
 	sent in order to avoid flooding the user.  If there are
 	more news messages, only the most recent will be sent.)
 	NewsCount can be configured in services.conf.
@@ -3339,7 +3339,7 @@ NEWS_HELP_OPER
 	
 	Edits or displays the list of oper news messages.  When a
 	user opers up (with the /OPER command), these messages will
-	be sent to them.  (However, no more than %s messages will
+	be sent to them.  (However, no more than %d messages will
 	be sent in order to avoid flooding the user.  If there are
 	more news messages, only the most recent will be sent.)
 	NewsCount can be configured in services.conf.
@@ -6535,9 +6535,9 @@ HOST_OFF_UNREAL
 HOST_NO_VIDENT
 	Seu IRCD não suporta vIdent's, se isto não está certo, por favor reporte isso como um possível bug.
 HOST_GROUP
-	Todos os vhost's no grupo %s foram ajustados para %s
+	Todos os vhosts no grupo %s foram ajustados para %s
 HOST_IDENT_GROUP
-	Todos os vhost's no grupo %s foram ajustados para %s@%s
+	Todos os vhosts no grupo %s foram ajustados para %s@%s
 HOST_LIST_FOOTER
 	Exibidos todos os registros (Contador: %d)
 HOST_LIST_RANGE_FOOTER
@@ -1,6 +1,6 @@
 # Russian language file for Anope
 #
-# (C) 2003-2010 Anope Team
+# (C) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #
 # Please read COPYING and README for further details.
@@ -3299,7 +3299,7 @@ NEWS_HELP_LOGON
 	Ïîçâîëÿåò  óïðàâëÿòü ñïèñêîì íîâîñòåé,  êîòîðûå áóäóò àâòîìàòè÷åñêè
 	âûäàâàòüñÿ ïîëüçîâàòåëþ  ñðàçó æå, êàê òîëüêî îí ïîäêëþ÷èòñÿ ê ñåòè.
 	Ñòîèò çàìåòèòü, ÷òî âî èçáåæàíèå  ôëóäà ïîëüçîâàòåëü ïîëó÷èò òîëüêî
-	%s íîâîñòü(è), òàê ÷òî åñëè ó  âàñ â ñïèñêå èõ  áîëüøå - ïîêàçàíû
+	%d íîâîñòü(è), òàê ÷òî åñëè ó  âàñ â ñïèñêå èõ  áîëüøå - ïîêàçàíû
 	áóäóò òîëüêî  ïîñëåäíèå èç íèõ. Çíà÷åíèå  NewsCount,  îòâå÷àþùåå çà
 	îäíîâðåìåííî ïîñûëàåìîå êîë-âî íîâîñòåé, óêàçûâàåòñÿ â services.conf
 	
@@ -3320,7 +3320,7 @@ NEWS_HELP_OPER
 	ïîëüçîâàòåëü ïîëó÷èò ñòàòóñ IRC-îïåðàòîðà (èñïîëüçîâàâ êîìàíäó /OPER),
 	äàííûå ñîîáùåíèÿ áóäóò åìó îòïðàâëåíû àâòîìàòè÷åñêè.
 	Ñòîèò çàìåòèòü, ÷òî âî èçáåæàíèå  ôëóäà ïîëüçîâàòåëü ïîëó÷èò òîëüêî
-	%s íîâîñòü(è), òàê ÷òî åñëè ó  âàñ â ñïèñêå èõ  áîëüøå - ïîêàçàíû
+	%d íîâîñòü(è), òàê ÷òî åñëè ó  âàñ â ñïèñêå èõ  áîëüøå - ïîêàçàíû
 	áóäóò òîëüêî  ïîñëåäíèå èç íèõ. Çíà÷åíèå  NewsCount,  îòâå÷àþùåå çà
 	îäíîâðåìåííî ïîñûëàåìîå êîë-âî íîâîñòåé, óêàçûâàåòñÿ â services.conf
 	
@@ -1,9 +1,9 @@
 # Turkish language file.
 #
-# (C) 2003-2010 Anope Team
+# (C) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #
-# Please read COPYING and README for furhter details.
+# Please read COPYING and README for further details.
 #
 # Based on the original code of Epona by Lara.
 # Based on the original code of Services by Andy Church.
@@ -3418,7 +3418,7 @@ NEWS_HELP_LOGON
 	
 	Giriþ haberleri ve mesajlarýný düzenlemek icin kullanýlýr. 
 	Kullanýcý sunucuya baðlantýðý anda bu belirtilen mesajlar giris yapan kullanýcýya 
-	iletilir.  (Bununla beraber, %s adetten fazla mesaj kullanýcýya
+	iletilir.  (Bununla beraber, %d adetten fazla mesaj kullanýcýya
 	gonderilmez.  Eðer cok fazla mesaj eklenmiþ bulunuyor ise
 	bunlardan en yenileri kullanýcýya ulaþtýrýlýr.)
 	NewsCount(Giriþ haberleri) Özellikleri services.conf'ta belirtilmiþtir ve bu dosyadan ayarlanabilir.
@@ -3432,7 +3432,7 @@ NEWS_HELP_OPER
 	
 	Giriþ haberleri ve mesajlarýný düzenlemek icin kullanýlýr(Yönetici giriþleri). 
 	Kullanýcý sunucu içerisinde yönetici konumuna gectiði anda bu belirtilen mesajlar giris yapan operatore 
-	iletilir.  (Bununla beraber, %s adetten fazla mesaj yöneticiye
+	iletilir.  (Bununla beraber, %d adetten fazla mesaj yöneticiye
 	gonderilmez.  Eðer cok fazla mesaj eklenmiþ bulunuyor ise
 	bunlardan en yenileri kullanýcýya ulaþtýrýlýr.)
 	NewsCount(Giriþ haberleri) Özellikleri services.conf'ta belirtilmiþtir ve bu dosyadan ayarlanabilir.
@@ -1,6 +1,6 @@
 /* Various routines to perform simple actions.
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -125,9 +125,10 @@ void sqline(char *mask, char *reason)
 * Unban the nick from a channel
 * @param ci channel info for the channel
 * @param nick to remove the ban for
+ * @param full True to match against realhost
 * @return void
 */
-void common_unban(ChannelInfo * ci, char *nick)
+static void _common_unban(ChannelInfo * ci, char *nick, boolean full)
 {
    char *av[4];
    char *host = NULL;
@@ -162,47 +163,59 @@ void common_unban(ChannelInfo * ci, char *nick)
    if (host)
        ip = str_is_ip(host);

-    if (ircd->svsmode_unban) {
-        anope_cmd_unban(ci->name, nick);
+    if (ircdcap->tsmode) {
+        snprintf(buf, BUFSIZE - 1, "%ld", (long int) time(NULL));
+        av[0] = ci->name;
+        av[1] = buf;
+        av[2] = sstrdup("-b");
+        ac = 4;
    } else {
-        if (ircdcap->tsmode) {
-            snprintf(buf, BUFSIZE - 1, "%ld", (long int) time(NULL));
-            av[0] = ci->name;
-            av[1] = buf;
-            av[2] = sstrdup("-b");
-            ac = 4;
-        } else {
-            av[0] = ci->name;
-            av[1] = sstrdup("-b");
-            ac = 3;
-        }
-
-        for (ban = ci->c->bans->entries; ban; ban = next) {
-            next = ban->next;
-            if (entry_match(ban, u->nick, u->username, u->host, ip) ||
-                entry_match(ban, u->nick, u->username, u->vhost, ip) ||
-                entry_match(ban, u->nick, u->username, u->chost, ip)) {
-                anope_cmd_mode(whosends(ci), ci->name, "-b %s", ban->mask);
-                if (ircdcap->tsmode)
-                    av[3] = ban->mask;
-                else
-                    av[2] = ban->mask;
-
-                do_cmode(whosends(ci), ac, av);
-            }
-        }
-
-        if (ircdcap->tsmode)
-            free(av[2]);
-        else
-            free(av[1]);
+        av[0] = ci->name;
+        av[1] = sstrdup("-b");
+        ac = 3;
    }
+
+    for (ban = ci->c->bans->entries; ban; ban = next) {
+        next = ban->next;
+        if ((full && entry_match(ban, u->nick, u->username, u->host, ip)) ||
+            entry_match(ban, u->nick, u->vident, u->vhost, 0) ||
+            entry_match(ban, u->nick, u->username, u->chost, 0)) {
+            anope_cmd_mode(whosends(ci), ci->name, "-b %s", ban->mask);
+            if (ircdcap->tsmode)
+                av[3] = sstrdup(ban->mask);
+            else
+                av[2] = sstrdup(ban->mask);
+
+            do_cmode(whosends(ci), ac, av);
+
+            if (ircdcap->tsmode)
+                free(av[3]);
+            else
+                free(av[2]);
+        }
+    }
+
+    if (ircdcap->tsmode)
+        free(av[2]);
+    else
+        free(av[1]);
+
    /* host_resolve() sstrdup us this info so we gotta free it */
    if (host) {
        free(host);
    }
 }

+void common_unban(ChannelInfo * ci, char *nick)
+{
+	_common_unban(ci, nick, false);
+}
+
+void common_unban_full(ChannelInfo * ci, char *nick, boolean full)
+{
+	_common_unban(ci, nick, full);
+}
+
 /*************************************************************************/

 /**
@@ -1,6 +1,6 @@
 /* base64 routines.
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -295,7 +295,7 @@ char *encode_ip(unsigned char *ip)
    } else {
        s_ip = str_signed(ip);
        ia.s_addr = inet_addr(s_ip);
-        cp = (unsigned char *) ia.s_addr;
+        cp = (unsigned char *) &ia.s_addr;
        b64_encode((char *) &cp, sizeof(struct in_addr), buf, 25);
    }
    return buf;
@@ -305,14 +305,14 @@ int decode_ip(char *buf)
 {
    int len = strlen(buf);
    char targ[25];
-    struct in_addr ia;
+    struct in_addr *ia;

    b64_decode(buf, targ, 25);
-    ia = *(struct in_addr *) targ;
+    ia = (struct in_addr *) targ;
    if (len == 24) {            /* IPv6 */
        return 0;
    } else if (len == 8)        /* IPv4 */
-        return ia.s_addr;
+        return ia->s_addr;
    else                        /* Error?? */
        return 0;
 }
@@ -2,7 +2,7 @@
 #
 # Configuration script for Services
 #
-# (C) 2003-2010 Anope Team
+# (C) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #
 # Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /* BotServ functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -245,6 +245,7 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf)
                    mustkick = 1;
                } else if (bw->type == BW_SINGLE) {
                    int len = strlen(bw->word);
+		    int buf_len = strlen(nbuf);

                    if ((BSCaseSensitive && !strcmp(nbuf, bw->word))
                        || (!BSCaseSensitive
@@ -252,23 +253,13 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf)
                        mustkick = 1;
                        /* two next if are quite odd isn't it? =) */
                    } else if ((strchr(nbuf, ' ') == nbuf + len)
-                               &&
-                               ((BSCaseSensitive
-                                 && !strcmp(nbuf, bw->word))
-                                || (!BSCaseSensitive
-                                    && (stristr(nbuf, bw->word) ==
-                                        nbuf)))) {
+                               && ((BSCaseSensitive && strstr(nbuf, bw->word) == nbuf)
+                                || (!BSCaseSensitive && stristr(nbuf, bw->word) == nbuf))) {
                        mustkick = 1;
                    } else {
-                        if ((strrchr(nbuf, ' ') ==
-                             nbuf + strlen(nbuf) - len - 1)
-                            &&
-                            ((BSCaseSensitive
-                              && (strstr(nbuf, bw->word) ==
-                                  nbuf + strlen(nbuf) - len))
-                             || (!BSCaseSensitive
-                                 && (stristr(nbuf, bw->word) ==
-                                     nbuf + strlen(nbuf) - len)))) {
+                        if (len < buf_len && (strrchr(nbuf, ' ') == nbuf + buf_len - len - 1)
+                            && ((BSCaseSensitive && (strstr(nbuf, bw->word) == nbuf + buf_len - len))
+                             || (!BSCaseSensitive && (stristr(nbuf, bw->word) == nbuf + buf_len - len)))) {
                            mustkick = 1;
                        } else {
                            char *wordbuf = scalloc(len + 3, 1);
@@ -313,16 +304,10 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf)
                    }
                } else if (bw->type == BW_END) {
                    int len = strlen(bw->word);
+		    int buf_len = strlen(nbuf);

-                    if ((BSCaseSensitive
-                         &&
-                         (!strncmp
-                          (nbuf + strlen(nbuf) - len, bw->word, len)))
-                        || (!BSCaseSensitive
-                            &&
-                            (!strnicmp
-                             (nbuf + strlen(nbuf) - len, bw->word,
-                              len)))) {
+                    if ((BSCaseSensitive && len <= buf_len && !strncmp(nbuf + buf_len - len, bw->word, len))
+                        || (!BSCaseSensitive && len <= buf_len && !strnicmp(nbuf + buf_len - len, bw->word, len))) {
                        mustkick = 1;
                    } else {
                        char *wordbuf = scalloc(len + 2, 1);
@@ -675,7 +660,7 @@ static BanData *get_ban_data(Channel * c, User * u)
    if (!c || !u)
        return NULL;

-    snprintf(mask, sizeof(mask), "%s@%s", u->username,
+    snprintf(mask, sizeof(mask), "%s@%s", common_get_vident(u),
             common_get_vhost(u));

    for (bd = c->bd; bd; bd = next) {
@@ -789,11 +774,16 @@ void bot_join(ChannelInfo * ci)
                    anope_cmd_mode(whosends(ci), ci->name, "-b %s",
                                   ban->mask);
                    if (ircdcap->tsmode)
-                        av[3] = ban->mask;
+                        av[3] = sstrdup(ban->mask);
                    else
-                        av[2] = ban->mask;
+                        av[2] = sstrdup(ban->mask);

                    do_cmode(whosends(ci), ac, av);
+
+                    if (ircdcap->tsmode)
+                        free(av[3]);
+                    else
+                        free(av[2]);
                }
            }

@@ -1,6 +1,6 @@
 /* Channel-handling routines.
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -199,6 +199,8 @@ void chan_set_modes(const char *source, Channel * chan, int ac, char **av,
        /* Set the resulting mode buffer */
        anope_cmd_mode(whosends(chan->ci), chan->name, merge_args(ac, av));

+        chan_set_modes(whosends(chan->ci), chan, ac, av, check);
+
        return;
    }

@@ -640,6 +642,7 @@ void do_kick(const char *source, int ac, char **av)
    User *user;
    char *s, *t;
    struct u_chanlist *c;
+    Uid *uid;

    t = av[1];
    while (*(s = t)) {
@@ -647,6 +650,13 @@ void do_kick(const char *source, int ac, char **av)
        if (*t)
            *t++ = 0;

+	if (ircd->ts6 && UseTS6)
+	{
+		uid = find_nickuid(s);
+		if (uid)
+			s = uid->nick;
+	}
+
        /* If it is the bot that is being kicked, we make it rejoin the
         * channel and stop immediately.
         *      --lara
@@ -1470,7 +1480,7 @@ void chan_set_correct_modes(User * user, Channel * c, int give_modes)
     * Unless the channel has just been created. -heinz
     *     Or the user matches CA_AUTODEOP... -GD
     */
-    if (((ci->flags & CI_SECUREOPS) || (c->usercount == 1)
+    if (((ci->flags & CI_SECUREOPS) || (c->usercount == 1 && is_sync(user->server))
         || check_access(user, ci, CA_AUTODEOP))
        && !is_ulined(user->server->name)) {
        if (ircd->owner && (status & CUS_OWNER) && !is_founder(user, ci))
@@ -1733,6 +1743,7 @@ void chan_delete(Channel * c)
        while (c->bans->entries) {
            entry_delete(c->bans, c->bans->entries);
        }
+        free(c->bans);
    }

    if (ircd->except) {
@@ -1740,6 +1751,7 @@ void chan_delete(Channel * c)
            while (c->excepts->entries) {
                entry_delete(c->excepts, c->excepts->entries);
            }
+            free(c->excepts);
        }
    }

@@ -1748,6 +1760,7 @@ void chan_delete(Channel * c)
            while (c->invites->entries) {
                entry_delete(c->invites, c->invites->entries);
            }
+            free(c->invites);
        }
    }

@@ -1776,6 +1789,10 @@ void del_ban(Channel * chan, char *mask)

    if (ban) {
        entry_delete(chan->bans, ban);
+        if (chan->bans->count == 0) {
+            free(chan->bans);
+            chan->bans = NULL;
+        }

        if (debug)
            alog("debug: Deleted ban %s from channel %s", mask,
@@ -1800,6 +1817,10 @@ void del_exception(Channel * chan, char *mask)

    if (exception) {
        entry_delete(chan->excepts, exception);
+        if (chan->excepts->count == 0) {
+            free(chan->excepts);
+            chan->excepts = NULL;
+        }

        if (debug)
            alog("debug: Deleted except %s to channel %s", mask,
@@ -1822,6 +1843,10 @@ void del_invite(Channel * chan, char *mask)

    if (invite) {
        entry_delete(chan->invites, invite);
+        if(chan->invites->count == 0) {
+            free(chan->invites);
+            chan->invites = NULL;
+        }

        if (debug)
            alog("debug: Deleted invite %s to channel %s", mask,
@@ -2386,11 +2411,12 @@ Entry *elist_match_mask(EList * list, char *mask, uint32 ip)
 * Check if a user matches an entry on a list.
 * @param list EntryList that should be matched against
 * @param user The user to match against the entries
+ * @param full true to match against real host and real IP
 * @return Returns the first matching entry, if none, NULL is returned.
 */
-Entry *elist_match_user(EList * list, User * u)
+static Entry *_elist_match_user(EList * list, User * u, boolean full)
 {
-    Entry *res;
+    Entry *res = NULL;
    char *host;
    uint32 ip = 0;

@@ -2413,11 +2439,12 @@ Entry *elist_match_user(EList * list, User * u)
        ip = str_is_ip(host);

    /* Match what we ve got against the lists.. */
-    res = elist_match(list, u->nick, u->username, u->host, ip);
+    if (full)
+        res = elist_match(list, u->nick, u->username, u->host, ip);
    if (!res)
-        res = elist_match(list, u->nick, u->username, u->vhost, ip);
+        res = elist_match(list, u->nick, u->vident, u->vhost, 0);
    if (!res)
-        res = elist_match(list, u->nick, u->username, u->chost, ip);
+        res = elist_match(list, u->nick, u->username, u->chost, 0);

    if (host)
        free(host);
@@ -2425,6 +2452,16 @@ Entry *elist_match_user(EList * list, User * u)
    return res;
 }

+Entry *elist_match_user(EList *list, User *u)
+{
+	return _elist_match_user(list, u, false);
+}
+
+Entry *elist_match_user_full(EList *list, User *u, boolean full)
+{
+	return _elist_match_user(list, u, full);
+}
+
 /**
 * Find a entry identical to the given mask..
 * @param list EntryList that should be matched against
@@ -1,6 +1,6 @@
 /* ChanServ functions.
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -276,7 +276,7 @@ void listchans(int count_only, const char *chan)
            }
            if (ci->flags & CI_SUSPENDED) {
                printf
-                    ("This nickname is currently suspended by %s, reason: %s\n",
+                    ("This channel is currently suspended by %s, reason: %s\n",
                     ci->forbidby,
                     (ci->forbidreason ? ci->forbidreason : "No reason"));
            }
@@ -1,6 +1,6 @@
 /* Routines for looking up commands in a *Serv command list.
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /* Compatibility routines.
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /* Configuration file handling.
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -220,7 +220,7 @@ char *GlobalOnCycleMessage;
 char *GlobalOnCycleUP;
 char *ServicesRoot;
 char **ServicesRoots;
-int RootNumber;
+int RootNumber = 0;
 int SuperAdmin;
 int LogBot;
 int LogMaxUsers;
@@ -272,8 +272,8 @@ int OSOpersOnly;
 char *Modules;
 char *ModulesDelayed;
 char **ModulesAutoload;
-int ModulesNumber;
-int ModulesDelayedNumber;
+int ModulesNumber = 0;
+int ModulesDelayedNumber = 0;
 char **ModulesDelayedAutoload;

 /**
@@ -281,31 +281,31 @@ char **ModulesDelayedAutoload;
 **/
 char *HostCoreModules;
 char **HostServCoreModules;
-int HostServCoreNumber;
+int HostServCoreNumber = 0;

 char *MemoCoreModules;
 char **MemoServCoreModules;
-int MemoServCoreNumber;
+int MemoServCoreNumber = 0;

 char *HelpCoreModules;
 char **HelpServCoreModules;
-int HelpServCoreNumber;
+int HelpServCoreNumber = 0;

 char *BotCoreModules;
 char **BotServCoreModules;
-int BotServCoreNumber;
+int BotServCoreNumber = 0;

 char *OperCoreModules;
 char **OperServCoreModules;
-int OperServCoreNumber;
+int OperServCoreNumber = 0;

 char *NickCoreModules;
 char **NickServCoreModules;
-int NickServCoreNumber;
+int NickServCoreNumber = 0;

 char *ChanCoreModules;
 char **ChanServCoreModules;
-int ChanServCoreNumber;
+int ChanServCoreNumber = 0;


 char *MysqlHost;
@@ -346,7 +346,7 @@ int UnRestrictSAdmin;

 char *UlineServers;
 char **Ulines;
-int NumUlines;
+int NumUlines = 0;

 int UseTS6;

@@ -708,10 +708,16 @@ int parse_directive(Directive * d, char *dir, int ac, char *av[MAXPARAMS],
        /* Should we remove PARAM_DEPRECATED because it's
         * useless right now? -GD */
        if (d->params[i].type == PARAM_DEPRECATED) {
-            void (*func) (void);
+            union func_union
+            {
+                void *ptr;
+                void (*func)(void);
+            } u;
+
            error(linenum, "Deprecated directive `%s' used", d->name);
-            func = (void (*)(void)) (d->params[i].ptr);
-            func();             /* For clarity */
+
+            u.ptr = d->params[i].ptr;
+            u.func();
            continue;
        }
        if (optind >= ac) {
@@ -723,7 +729,7 @@ int parse_directive(Directive * d, char *dir, int ac, char *av[MAXPARAMS],
        }
        switch (d->params[i].type) {
        case PARAM_INT:
-            val = strtol(av[optind++], &s, 0);
+            val = strtol(av[optind++], &s, 10);
            if (*s) {
                error(linenum,
                      "%s: Expected an integer for parameter %d",
@@ -734,7 +740,7 @@ int parse_directive(Directive * d, char *dir, int ac, char *av[MAXPARAMS],
            *(int *) d->params[i].ptr = val;
            break;
        case PARAM_POSINT:
-            val = strtol(av[optind++], &s, 0);
+            val = strtol(av[optind++], &s, 10);
            if (*s || val <= 0) {
                error(linenum,
                      "%s: Expected a positive integer for parameter %d",
@@ -751,7 +757,7 @@ int parse_directive(Directive * d, char *dir, int ac, char *av[MAXPARAMS],
            *(int *) d->params[i].ptr = val;
            break;
        case PARAM_PORT:
-            val = strtol(av[optind++], &s, 0);
+            val = strtol(av[optind++], &s, 10);
            if (*s) {
                error(linenum,
                      "%s: Expected a port number for parameter %d",
@@ -768,8 +774,11 @@ int parse_directive(Directive * d, char *dir, int ac, char *av[MAXPARAMS],
            *(int *) d->params[i].ptr = val;
            break;
        case PARAM_STRING:
-/*	      if (reload && *(char **)d->params[i].ptr)
-	      	free(*(char **)d->params[i].ptr); */
+            /*
+	     * Anope_Free(*(char **)d->params[i].ptr);
+	     * Historically dumb modules pass uninitialized values here so
+	     * we can't free this
+	     */
            *(char **) d->params[i].ptr = sstrdup(av[optind++]);
            if (!d->params[i].ptr) {
                error(linenum, "%s: Out of memory", d->name);
@@ -926,7 +935,9 @@ int read_config(int reload)
                perror("Can't open " SERVICES_CONF);
            else
                alog("Can't open %s", SERVICES_CONF);
+#ifndef NOT_MAIN
        }
+#endif
        return 0;
    }
    while (fgets(buf, sizeof(buf), config)) {
@@ -1239,14 +1250,15 @@ int read_config(int reload)
    /* Services Root building */

    if (ServicesRoot && !reload) {      /* Check to prevent segmentation fault if it's missing */
-        RootNumber = 0;
+        while( RootNumber )
+            free(ServicesRoots[--RootNumber]);

        s = strtok(ServicesRoot, " ");
        do {
            if (s) {
                RootNumber++;
                ServicesRoots =
-                    realloc(ServicesRoots, sizeof(char *) * RootNumber);
+                    srealloc(ServicesRoots, sizeof(char *) * RootNumber);
                ServicesRoots[RootNumber - 1] = sstrdup(s);
            }
        } while ((s = strtok(NULL, " ")));
@@ -1260,43 +1272,70 @@ int read_config(int reload)
    /* Ulines */

    if (UlineServers) {
-        NumUlines = 0;
+        while( NumUlines )
+            free(Ulines[--NumUlines]);

        s = strtok(UlineServers, " ");
        do {
            if (s) {
                NumUlines++;
-                Ulines = realloc(Ulines, sizeof(char *) * NumUlines);
+                Ulines = srealloc(Ulines, sizeof(char *) * NumUlines);
                Ulines[NumUlines - 1] = sstrdup(s);
            }
        } while ((s = strtok(NULL, " ")));
    }

    /* Host Setters building... :P */
+    while( HostNumber )
+        free(HostSetters[--HostNumber]);
+    Anope_Free(HostSetters);
    HostSetters = buildStringList(HostSetter, &HostNumber);

    /* Modules Autoload building... :P */
+    while( ModulesNumber )
+        free(ModulesAutoload[--ModulesNumber]);
+    Anope_Free(ModulesAutoload);
    ModulesAutoload = buildStringList(Modules, &ModulesNumber);
-    ModulesDelayedAutoload =
-        buildStringList(ModulesDelayed, &ModulesDelayedNumber);
-    HostServCoreModules =
-        buildStringList(HostCoreModules, &HostServCoreNumber);
-    MemoServCoreModules =
-        buildStringList(MemoCoreModules, &MemoServCoreNumber);
-    HelpServCoreModules =
-        buildStringList(HelpCoreModules, &HelpServCoreNumber);

-    BotServCoreModules =
-        buildStringList(BotCoreModules, &BotServCoreNumber);
+    while( ModulesDelayedNumber )
+        free(ModulesDelayedAutoload[--ModulesDelayedNumber]);
+    Anope_Free(ModulesDelayedAutoload);
+    ModulesDelayedAutoload = buildStringList(ModulesDelayed, &ModulesDelayedNumber);

-    OperServCoreModules =
-        buildStringList(OperCoreModules, &OperServCoreNumber);
+    while( HostServCoreNumber )
+        free(HostServCoreModules[--HostServCoreNumber]);
+    Anope_Free(HostServCoreModules);
+    HostServCoreModules = buildStringList(HostCoreModules, &HostServCoreNumber);

-    ChanServCoreModules =
-        buildStringList(ChanCoreModules, &ChanServCoreNumber);
+    while( MemoServCoreNumber )
+        free(MemoServCoreModules[--MemoServCoreNumber]);
+    Anope_Free(MemoServCoreModules);
+    MemoServCoreModules = buildStringList(MemoCoreModules, &MemoServCoreNumber);

-    NickServCoreModules =
-        buildStringList(NickCoreModules, &NickServCoreNumber);
+    while( HelpServCoreNumber )
+        free(HelpServCoreModules[--HelpServCoreNumber]);
+    Anope_Free(HelpServCoreModules);
+    HelpServCoreModules = buildStringList(HelpCoreModules, &HelpServCoreNumber);
+
+    while( BotServCoreNumber )
+        free(BotServCoreModules[--BotServCoreNumber]);
+    Anope_Free(BotServCoreModules);
+    BotServCoreModules = buildStringList(BotCoreModules, &BotServCoreNumber);
+
+    while( OperServCoreNumber )
+        free(OperServCoreModules[--OperServCoreNumber]);
+    Anope_Free(OperServCoreModules);
+    OperServCoreModules = buildStringList(OperCoreModules, &OperServCoreNumber);
+
+    while( ChanServCoreNumber )
+        free(ChanServCoreModules[--ChanServCoreNumber]);
+    Anope_Free(ChanServCoreModules);
+    ChanServCoreModules = buildStringList(ChanCoreModules, &ChanServCoreNumber);
+
+    while( NickServCoreNumber )
+        free(NickServCoreModules[--NickServCoreNumber]);
+    Anope_Free(NickServCoreModules);
+    NickServCoreModules = buildStringList(NickCoreModules, &NickServCoreNumber);


    if (LimitSessions) {
@@ -1405,6 +1444,7 @@ int read_config(int reload)
        CHECK(UseMail);
        CHECK(NSForceEmail);
    } else {
+        Anope_Free(PreNickDBName);
        PreNickDBName = NULL;
        NSRExpire = 0;
    }
@@ -3,7 +3,7 @@ include ../../Makefile.inc.win32
 SRCS=bs_act.c bs_assign.c bs_badwords.c bs_bot.c bs_botlist.c bs_fantasy.c bs_fantasy_kick.c bs_fantasy_kickban.c bs_fantasy_owner.c bs_fantasy_seen.c bs_help.c bs_info.c bs_kick.c bs_say.c bs_set.c bs_unassign.c cs_access.c cs_akick.c cs_ban.c cs_clear.c cs_drop.c cs_forbid.c cs_getkey.c cs_getpass.c cs_help.c cs_identify.c cs_info.c cs_invite.c cs_kick.c cs_list.c cs_logout.c cs_modes.c cs_register.c cs_sendpass.c cs_set.c cs_status.c cs_suspend.c cs_topic.c cs_xop.c enc_none.c enc_md5.c enc_old.c enc_sha1.c he_help.c hs_del.c hs_delall.c hs_group.c hs_help.c hs_list.c hs_off.c hs_on.c hs_set.c hs_setall.c ms_cancel.c ms_check.c ms_del.c ms_help.c ms_info.c ms_list.c ms_read.c ms_rsend.c ms_send.c ms_sendall.c ms_set.c ms_staff.c ns_access.c ns_alist.c ns_drop.c ns_forbid.c ns_getemail.c ns_getpass.c ns_ghost.c ns_group.c ns_help.c ns_identify.c ns_info.c ns_list.c ns_logout.c ns_recover.c ns_register.c ns_release.c ns_sendpass.c ns_set.c ns_saset.c ns_status.c ns_suspend.c ns_update.c os_admin.c os_akill.c os_chankill.c os_chanlist.c os_clearmodes.c os_defcon.c os_global.c os_help.c os_ignore.c os_jupe.c os_kick.c os_logonnews.c os_mode.c os_modinfo.c os_modlist.c os_modload.c os_modunload.c os_noop.c os_oline.c os_oper.c os_opernews.c os_quit.c os_randomnews.c os_raw.c os_reload.c os_restart.c os_session.c os_set.c os_sgline.c os_shutdown.c os_sqline.c os_staff.c os_stats.c os_svsnick.c os_szline.c os_umode.c os_update.c os_userlist.c
 OBJECTS= $(SRCS:.c=.dll)
 CFLAGS=/LD /MD /D MODULE_COMPILE $(CFLAGS) /I"../../include"
-LFLAGS=/link ../anope.lib wsock32.lib $(LIBS) $(LFLAGS) $(MYSQL_LIB_PATH) /export:AnopeInit /export:AnopeFini /VERSION:$(VERSION)
+LFLAGS=/link ../anope.lib wsock32.lib $(LIBS) $(LFLAGS) $(MYSQL_LIB_PATH) /export:AnopeInit /export:AnopeFini /VERSION:1.8

 all: $(OBJECTS)

@@ -1,6 +1,6 @@
 /* BotServ core functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@

 #include "module.h"

-int do_act(User * u);
-void myBotServHelp(User * u);
+static int do_act(User * u);
+static void myBotServHelp(User * u);

 /**
 * Create the command, and tell anope about it.
@@ -50,7 +50,7 @@ void AnopeFini(void)
 * Add the help response to Anopes /bs help output.
 * @param u The user who is requesting help
 **/
-void myBotServHelp(User * u)
+static void myBotServHelp(User * u)
 {
    notice_lang(s_BotServ, u, BOT_HELP_CMD_ACT);
 }
@@ -60,7 +60,7 @@ void myBotServHelp(User * u)
 * @param u The user who issued the command
 * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
 **/
-int do_act(User * u)
+static int do_act(User * u)
 {
    ChannelInfo *ci;

@@ -1,6 +1,6 @@
 /* BotServ core functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@

 #include "module.h"

-int do_assign(User * u);
-void myBotServHelp(User * u);
+static int do_assign(User * u);
+static void myBotServHelp(User * u);

 /**
 * Create the command, and tell anope about it.
@@ -52,7 +52,7 @@ void AnopeFini(void)
 * Add the help response to Anopes /bs help output.
 * @param u The user who is requesting help
 **/
-void myBotServHelp(User * u)
+static void myBotServHelp(User * u)
 {
    notice_lang(s_BotServ, u, BOT_HELP_CMD_ASSIGN);
 }
@@ -62,7 +62,7 @@ void myBotServHelp(User * u)
 * @param u The user who issued the command
 * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
 **/
-int do_assign(User * u)
+static int do_assign(User * u)
 {
    char *chan = strtok(NULL, " ");
    char *nick = strtok(NULL, " ");
@@ -1,6 +1,6 @@
 /* BotServ core functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -14,11 +14,11 @@

 #include "module.h"

-int do_badwords(User * u);
-void myBotServHelp(User * u);
-int badwords_del_callback(User * u, int num, va_list args);
-int badwords_list(User * u, int index, ChannelInfo * ci, int *sent_header);
-int badwords_list_callback(User * u, int num, va_list args);
+static int do_badwords(User * u);
+static void myBotServHelp(User * u);
+static int badwords_del_callback(User * u, int num, va_list args);
+static int badwords_list(User * u, int index, ChannelInfo * ci, int *sent_header);
+static int badwords_list_callback(User * u, int num, va_list args);

 /**
 * Create the command, and tell anope about it.
@@ -57,7 +57,7 @@ void AnopeFini(void)
 * Add the help response to Anopes /bs help output.
 * @param u The user who is requesting help
 **/
-void myBotServHelp(User * u)
+static void myBotServHelp(User * u)
 {
    notice_lang(s_BotServ, u, BOT_HELP_CMD_BADWORDS);
 }
@@ -67,7 +67,7 @@ void myBotServHelp(User * u)
 * @param u The user who issued the command
 * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
 **/
-int do_badwords(User * u)
+static int do_badwords(User * u)
 {
    char *chan = strtok(NULL, " ");
    char *cmd = strtok(NULL, " ");
@@ -283,7 +283,7 @@ int do_badwords(User * u)
    return MOD_CONT;
 }

-int badwords_del_callback(User * u, int num, va_list args)
+static int badwords_del_callback(User * u, int num, va_list args)
 {
    BadWord *bw;
    ChannelInfo *ci = va_arg(args, ChannelInfo *);
@@ -303,7 +303,7 @@ int badwords_del_callback(User * u, int num, va_list args)
    return 1;
 }

-int badwords_list(User * u, int index, ChannelInfo * ci, int *sent_header)
+static int badwords_list(User * u, int index, ChannelInfo * ci, int *sent_header)
 {
    BadWord *bw = &ci->badwords[index];

@@ -325,7 +325,7 @@ int badwords_list(User * u, int index, ChannelInfo * ci, int *sent_header)
    return 1;
 }

-int badwords_list_callback(User * u, int num, va_list args)
+static int badwords_list_callback(User * u, int num, va_list args)
 {
    ChannelInfo *ci = va_arg(args, ChannelInfo *);
    int *sent_header = va_arg(args, int *);
@@ -1,6 +1,6 @@
 /* BotServ core functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -14,10 +14,10 @@

 #include "module.h"

-int do_bot(User * u);
-int delbot(BotInfo * bi);
-void myBotServHelp(User * u);
-void change_bot_nick(BotInfo * bi, char *newnick);
+static int do_bot(User * u);
+static int delbot(BotInfo * bi);
+static void myBotServHelp(User * u);
+static void change_bot_nick(BotInfo * bi, char *newnick);

 /**
 * Create the command, and tell anope about it.
@@ -56,7 +56,7 @@ void AnopeFini(void)
 * Add the help response to Anopes /bs help output.
 * @param u The user who is requesting help
 **/
-void myBotServHelp(User * u)
+static void myBotServHelp(User * u)
 {
    if (is_services_admin(u)) {
        notice_lang(s_BotServ, u, BOT_HELP_CMD_BOT);
@@ -68,7 +68,7 @@ void myBotServHelp(User * u)
 * @param u The user who issued the command
 * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
 **/
-int do_bot(User * u)
+static int do_bot(User * u)
 {
    BotInfo *bi;
    char *cmd = strtok(NULL, " ");
@@ -349,7 +349,7 @@ int do_bot(User * u)
    return MOD_CONT;
 }

-int delbot(BotInfo * bi)
+static int delbot(BotInfo * bi)
 {
    cs_remove_bot(bi);

@@ -372,7 +372,7 @@ int delbot(BotInfo * bi)
    return 1;
 }

-void change_bot_nick(BotInfo * bi, char *newnick)
+static void change_bot_nick(BotInfo * bi, char *newnick)
 {
    if (bi->next)
        bi->next->prev = bi->prev;
@@ -1,6 +1,6 @@
 /* BotServ core functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@

 #include "module.h"

-int do_botlist(User * u);
-void myBotServHelp(User * u);
+static int do_botlist(User * u);
+static void myBotServHelp(User * u);

 /**
 * Create the botlist command, and tell anope about it.
@@ -53,7 +53,7 @@ void AnopeFini(void)
 * Add the help response to Anopes /bs help output.
 * @param u The user who is requesting help
 **/
-void myBotServHelp(User * u)
+static void myBotServHelp(User * u)
 {
    notice_lang(s_BotServ, u, BOT_HELP_CMD_BOTLIST);
 }
@@ -63,7 +63,7 @@ void myBotServHelp(User * u)
 * @param u The user who issued the command
 * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
 **/
-int do_botlist(User * u)
+static int do_botlist(User * u)
 {
    int i, count = 0;
    BotInfo *bi;
@@ -1,6 +1,6 @@
 /* BotServ core fantasy functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -14,7 +14,7 @@

 #include "module.h"

-int do_fantasy(int argc, char **argv);
+static int do_fantasy(int argc, char **argv);

 /**
 * Create the hook, and tell anope about it.
@@ -49,7 +49,7 @@ void AnopeFini(void)
 * @param argv Argument list
 * @return MOD_CONT or MOD_STOP
 **/
-int do_fantasy(int argc, char **argv)
+static int do_fantasy(int argc, char **argv)
 {
    User *u;
    ChannelInfo *ci;
@@ -1,6 +1,6 @@
 /* BotServ core fantasy functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -14,7 +14,7 @@

 #include "module.h"

-int do_fantasy(int argc, char **argv);
+static int do_fantasy(int argc, char **argv);

 /**
 * Create the hook, and tell anope about it.
@@ -51,7 +51,7 @@ void AnopeFini(void)
 * @param argv Argument list
 * @return MOD_CONT or MOD_STOP
 **/
-int do_fantasy(int argc, char **argv)
+static int do_fantasy(int argc, char **argv)
 {
    User *u, *u2;
    ChannelInfo *ci;
@@ -1,6 +1,6 @@
 /* BotServ core fantasy functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -14,7 +14,7 @@

 #include "module.h"

-int do_fantasy(int argc, char **argv);
+static int do_fantasy(int argc, char **argv);

 /**
 * Create the hook, and tell anope about it.
@@ -51,7 +51,7 @@ void AnopeFini(void)
 * @param argv Argument list
 * @return MOD_CONT or MOD_STOP
 **/
-int do_fantasy(int argc, char **argv)
+static int do_fantasy(int argc, char **argv)
 {
    User *u, *u2;
    ChannelInfo *ci;
@@ -1,6 +1,6 @@
 /* BotServ core fantasy functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -14,7 +14,7 @@

 #include "module.h"

-int do_fantasy(int argc, char **argv);
+static int do_fantasy(int argc, char **argv);

 /**
 * Create the hook, and tell anope about it.
@@ -31,12 +31,6 @@ int AnopeInit(int argc, char **argv)
        (VERSION_STRING);
    moduleSetType(CORE);

-    /* No need to load of we don't support owner */
-    if (!ircd->owner) {
-        alog("Your ircd doesn't support the owner channelmode; bs_fantasy_owner won't be loaded");
-        return MOD_STOP;
-    }
-
    hook = createEventHook(EVENT_BOT_FANTASY, do_fantasy);
    moduleAddEventHook(hook);

@@ -57,12 +51,12 @@ void AnopeFini(void)
 * @param argv Argument list
 * @return MOD_CONT or MOD_STOP
 **/
-int do_fantasy(int argc, char **argv)
+static int do_fantasy(int argc, char **argv)
 {
    User *u;
    ChannelInfo *ci;

-    if (argc < 3)
+    if (argc < 3 || !ircd->owner)
        return MOD_CONT;

    if (stricmp(argv[0], "deowner") == 0) {
@@ -1,6 +1,6 @@
 /* BotServ core fantasy functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -14,7 +14,7 @@

 #include "module.h"

-int do_fantasy(int argc, char **argv);
+static int do_fantasy(int argc, char **argv);

 /**
 * Create the hook, and tell anope about it.
@@ -51,7 +51,7 @@ void AnopeFini(void)
 * @param argv Argument list
 * @return MOD_CONT or MOD_STOP
 **/
-int do_fantasy(int argc, char **argv)
+static int do_fantasy(int argc, char **argv)
 {
    User *u;
    ChannelInfo *ci;
@@ -1,6 +1,6 @@
 /* BotServ core functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -14,7 +14,7 @@

 #include "module.h"

-int do_help(User * u);
+static int do_help(User * u);

 /**
 * Create the help command, and tell anope about it.
@@ -51,7 +51,7 @@ void AnopeFini(void)
 * @param u The user who issued the command
 * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
 **/
-int do_help(User * u)
+static int do_help(User * u)
 {
    char *cmd = strtok(NULL, "");

@@ -1,6 +1,6 @@
 /* BotServ core functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -14,9 +14,9 @@

 #include "module.h"

-int do_info(User * u);
-void send_bot_channels(User * u, BotInfo * bi);
-void myBotServHelp(User * u);
+static int do_info(User * u);
+static void send_bot_channels(User * u, BotInfo * bi);
+static void myBotServHelp(User * u);

 /**
 * Create the info command, and tell anope about it.
@@ -54,7 +54,7 @@ void AnopeFini(void)
 * Add the help response to Anopes /bs help output.
 * @param u The user who is requesting help
 **/
-void myBotServHelp(User * u)
+static void myBotServHelp(User * u)
 {
    notice_lang(s_BotServ, u, BOT_HELP_CMD_INFO);
 }
@@ -64,7 +64,7 @@ void myBotServHelp(User * u)
 * @param u The user who issued the command
 * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
 **/
-int do_info(User * u)
+static int do_info(User * u)
 {
    BotInfo *bi;
    ChannelInfo *ci;
@@ -251,7 +251,7 @@ int do_info(User * u)
    return MOD_CONT;
 }

-void send_bot_channels(User * u, BotInfo * bi)
+static void send_bot_channels(User * u, BotInfo * bi)
 {
    int i;
    ChannelInfo *ci;
@@ -1,6 +1,6 @@
 /* BotServ core functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -14,9 +14,9 @@

 #include "module.h"

-int do_kickcmd(User * u);
+static int do_kickcmd(User * u);

-void myBotServHelp(User * u);
+static void myBotServHelp(User * u);

 /**
 * Create the command, and tell anope about it.
@@ -79,7 +79,7 @@ void AnopeFini(void)
 * Add the help response to Anopes /bs help output.
 * @param u The user who is requesting help
 **/
-void myBotServHelp(User * u)
+static void myBotServHelp(User * u)
 {
    notice_lang(s_BotServ, u, BOT_HELP_CMD_KICK);
 }
@@ -89,7 +89,7 @@ void myBotServHelp(User * u)
 * @param u The user who issued the command
 * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
 **/
-int do_kickcmd(User * u)
+static int do_kickcmd(User * u)
 {
    char *chan = strtok(NULL, " ");
    char *option = strtok(NULL, " ");
@@ -1,6 +1,6 @@
 /* BotServ core functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@

 #include "module.h"

-int do_say(User * u);
-void myBotServHelp(User * u);
+static int do_say(User * u);
+static void myBotServHelp(User * u);

 /**
 * Create the command, and tell anope about it.
@@ -52,7 +52,7 @@ void AnopeFini(void)
 * Add the help response to Anopes /bs help output.
 * @param u The user who is requesting help
 **/
-void myBotServHelp(User * u)
+static void myBotServHelp(User * u)
 {
    notice_lang(s_BotServ, u, BOT_HELP_CMD_SAY);
 }
@@ -62,7 +62,7 @@ void myBotServHelp(User * u)
 * @param u The user who issued the command
 * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
 **/
-int do_say(User * u)
+static int do_say(User * u)
 {
    ChannelInfo *ci;

@@ -1,6 +1,6 @@
 /* BotServ core functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@

 #include "module.h"

-int do_set(User * u);
-void myBotServHelp(User * u);
+static int do_set(User * u);
+static void myBotServHelp(User * u);

 /**
 * Create the command, and tell anope about it.
@@ -79,7 +79,7 @@ void AnopeFini(void)
 * Add the help response to Anopes /bs help output.
 * @param u The user who is requesting help
 **/
-void myBotServHelp(User * u)
+static void myBotServHelp(User * u)
 {
    notice_lang(s_BotServ, u, BOT_HELP_CMD_SET);
 }
@@ -89,7 +89,7 @@ void myBotServHelp(User * u)
 * @param u The user who issued the command
 * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
 **/
-int do_set(User * u)
+static int do_set(User * u)
 {
    char *chan = strtok(NULL, " ");
    char *option = strtok(NULL, " ");
@@ -1,6 +1,6 @@
 /* BotServ core functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@

 #include "module.h"

-int do_unassign(User * u);
-void myBotServHelp(User * u);
+static int do_unassign(User * u);
+static void myBotServHelp(User * u);

 /**
 * Create the unassign command, and tell anope about it.
@@ -53,7 +53,7 @@ void AnopeFini(void)
 * Add the help response to Anopes /bs help output.
 * @param u The user who is requesting help
 **/
-void myBotServHelp(User * u)
+static void myBotServHelp(User * u)
 {
    notice_lang(s_BotServ, u, BOT_HELP_CMD_UNASSIGN);
 }
@@ -63,7 +63,7 @@ void myBotServHelp(User * u)
 * @param u The user who issued the command
 * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
 **/
-int do_unassign(User * u)
+static int do_unassign(User * u)
 {
    char *chan = strtok(NULL, " ");
    ChannelInfo *ci;
@@ -1,6 +1,6 @@
 /* ChanServ core functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -15,10 +15,10 @@
 #include "module.h"


-int do_access(User * u);
-int do_levels(User * u);
+static int do_access(User * u);
+static int do_levels(User * u);

-void myChanServHelp(User * u);
+static void myChanServHelp(User * u);

 /**
 * Create the command, and tell anope about it.
@@ -63,7 +63,7 @@ void AnopeFini(void)
 * Add the help response to anopes /cs help output.
 * @param u The user who is requesting help
 **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_ACCESS);
    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_LEVELS);
@@ -139,7 +139,7 @@ static int access_list_callback(User * u, int num, va_list args)
 * @param u The user who issued the command
 * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
 **/
-int do_access(User * u)
+static int do_access(User * u)
 {
    char *chan = strtok(NULL, " ");
    char *cmd = strtok(NULL, " ");
@@ -395,7 +395,7 @@ int do_access(User * u)
 }


-int do_levels(User * u)
+static int do_levels(User * u)
 {
    char *chan = strtok(NULL, " ");
    char *cmd = strtok(NULL, " ");
@@ -1,6 +1,6 @@
 /* ChanServ core functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -15,9 +15,9 @@
 #include "module.h"


-int do_akick(User * u);
-void myChanServHelp(User * u);
-int get_access_nc(NickCore *nc, ChannelInfo *ci);
+static int do_akick(User * u);
+static void myChanServHelp(User * u);
+static int get_access_nc(NickCore *nc, ChannelInfo *ci);

 /**
 * Create the command, and tell anope about it.
@@ -56,7 +56,7 @@ void AnopeFini(void)
 * Add the help response to anopes /cs help output.
 * @param u The user who is requesting help
 **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_AKICK);
 }
@@ -67,7 +67,7 @@ void myChanServHelp(User * u)
 * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
 **/
 /* `last' is set to the last index this routine was called with */
-int akick_del(User * u, AutoKick * akick)
+static int akick_del(User * u, AutoKick * akick)
 {
    if (!(akick->flags & AK_USED))
        return 0;
@@ -90,7 +90,7 @@ int akick_del(User * u, AutoKick * akick)
    return 1;
 }

-int akick_del_callback(User * u, int num, va_list args)
+static int akick_del_callback(User * u, int num, va_list args)
 {
    ChannelInfo *ci = va_arg(args, ChannelInfo *);
    int *last = va_arg(args, int *);
@@ -104,7 +104,7 @@ int akick_del_callback(User * u, int num, va_list args)
 }


-int akick_list(User * u, int index, ChannelInfo * ci, int *sent_header)
+static int akick_list(User * u, int index, ChannelInfo * ci, int *sent_header)
 {
    AutoKick *akick = &ci->akick[index];

@@ -123,7 +123,7 @@ int akick_list(User * u, int index, ChannelInfo * ci, int *sent_header)
    return 1;
 }

-int akick_list_callback(User * u, int num, va_list args)
+static int akick_list_callback(User * u, int num, va_list args)
 {
    ChannelInfo *ci = va_arg(args, ChannelInfo *);
    int *sent_header = va_arg(args, int *);
@@ -132,7 +132,7 @@ int akick_list_callback(User * u, int num, va_list args)
    return akick_list(u, num - 1, ci, sent_header);
 }

-int akick_view(User * u, int index, ChannelInfo * ci, int *sent_header)
+static int akick_view(User * u, int index, ChannelInfo * ci, int *sent_header)
 {
    AutoKick *akick = &ci->akick[index];
    char timebuf[64];
@@ -167,7 +167,7 @@ int akick_view(User * u, int index, ChannelInfo * ci, int *sent_header)
    return 1;
 }

-int akick_view_callback(User * u, int num, va_list args)
+static int akick_view_callback(User * u, int num, va_list args)
 {
    ChannelInfo *ci = va_arg(args, ChannelInfo *);
    int *sent_header = va_arg(args, int *);
@@ -178,7 +178,7 @@ int akick_view_callback(User * u, int num, va_list args)



-int do_akick(User * u)
+static int do_akick(User * u)
 {
    char *chan = strtok(NULL, " ");
    char *cmd = strtok(NULL, " ");
@@ -368,8 +368,6 @@ int do_akick(User * u)
            free(mask);

    } else if (stricmp(cmd, "STICK") == 0) {
-        NickAlias *na;
-        NickCore *nc;

        if (readonly) {
            notice_lang(s_ChanServ, u, CHAN_AKICK_DISABLED);
@@ -381,9 +379,6 @@ int do_akick(User * u)
            return MOD_CONT;
        }

-        na = findnick(mask);
-        nc = (na ? na->nc : NULL);
-
        for (akick = ci->akick, i = 0; i < ci->akickcount; akick++, i++) {
            if (!(akick->flags & AK_USED) || (akick->flags & AK_ISNICK))
                continue;
@@ -406,9 +401,6 @@ int do_akick(User * u)
        if (ci->c)
            stick_mask(ci, akick);
    } else if (stricmp(cmd, "UNSTICK") == 0) {
-        NickAlias *na;
-        NickCore *nc;
-
        if (readonly) {
            notice_lang(s_ChanServ, u, CHAN_AKICK_DISABLED);
            return MOD_CONT;
@@ -419,9 +411,6 @@ int do_akick(User * u)
            return MOD_CONT;
        }

-        na = findnick(mask);
-        nc = (na ? na->nc : NULL);
-
        for (akick = ci->akick, i = 0; i < ci->akickcount; akick++, i++) {
            if (!(akick->flags & AK_USED) || (akick->flags & AK_ISNICK))
                continue;
@@ -668,7 +657,7 @@ int do_akick(User * u)
 }


-int get_access_nc(NickCore *nc, ChannelInfo *ci)
+static int get_access_nc(NickCore *nc, ChannelInfo *ci)
 {
    ChanAccess *access;
    if (!ci || !nc)
@@ -1,6 +1,6 @@
 /* ChanServ core functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -14,9 +14,9 @@

 #include "module.h"

-int do_unban(User * u);
-int do_ban(User * u);
-void myChanServHelp(User * u);
+static int do_unban(User * u);
+static int do_ban(User * u);
+static void myChanServHelp(User * u);

 /**
 * Create the command, and tell anope about it.
@@ -57,7 +57,7 @@ void AnopeFini(void)
 * Add the help response to anopes /cs help output.
 * @param u The user who is requesting help
 **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_BAN);
    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_UNBAN);
@@ -68,7 +68,7 @@ void myChanServHelp(User * u)
 * @param u The user who issued the command
 * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
 **/
-int do_ban(User * u)
+static int do_ban(User * u)
 {
    char *chan = strtok(NULL, " ");
    char *params = strtok(NULL, " ");
@@ -202,7 +202,7 @@ int do_ban(User * u)
 * @param u The user who issued the command
 * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
 **/
-int do_unban(User * u)
+static int do_unban(User * u)
 {
    char *chan = strtok(NULL, " ");
    Channel *c;
@@ -219,7 +219,7 @@ int do_unban(User * u)
    } else if (!check_access(u, ci, CA_UNBAN)) {
        notice_lang(s_ChanServ, u, PERMISSION_DENIED);
    } else {
-        common_unban(ci, u->nick);
+        common_unban_full(ci, u->nick, true);
        notice_lang(s_ChanServ, u, CHAN_UNBANNED, chan);
    }
    return MOD_CONT;
@@ -1,6 +1,6 @@
 /* ChanServ core functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@

 #include "module.h"

-int do_clear(User * u);
-void myChanServHelp(User * u);
+static int do_clear(User * u);
+static void myChanServHelp(User * u);

 /**
 * Create the command, and tell anope about it.
@@ -54,7 +54,7 @@ void AnopeFini(void)
 * Add the help response to anopes /cs help output.
 * @param u The user who is requesting help
 **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_CLEAR);
 }
@@ -64,7 +64,7 @@ void myChanServHelp(User * u)
 * @param u The user who issued the command
 * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
 **/
-int do_clear(User * u)
+static int do_clear(User * u)
 {
    char *chan = strtok(NULL, " ");
    char *what = strtok(NULL, " ");
@@ -1,6 +1,6 @@
 /* ChanServ core functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@

 #include "module.h"

-int do_drop(User * u);
-void myChanServHelp(User * u);
+static int do_drop(User * u);
+static void myChanServHelp(User * u);

 /**
 * Create the command, and tell anope about it.
@@ -54,7 +54,7 @@ void AnopeFini(void)
 * Add the help response to anopes /cs help output.
 * @param u The user who is requesting help
 **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DROP);
 }
@@ -64,7 +64,7 @@ void myChanServHelp(User * u)
 * @param u The user who issued the command
 * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
 **/
-int do_drop(User * u)
+static int do_drop(User * u)
 {
    char *chan = strtok(NULL, " ");
    ChannelInfo *ci;
@@ -1,6 +1,6 @@
 /* ChanServ core functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@

 #include "module.h"

-int do_forbid(User * u);
-void myChanServHelp(User * u);
+static int do_forbid(User * u);
+static void myChanServHelp(User * u);

 /**
 * Create the command, and tell anope about it.
@@ -53,7 +53,7 @@ void AnopeFini(void)
 * Add the help response to anopes /cs help output.
 * @param u The user who is requesting help
 **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
    if (is_services_admin(u)) {
        notice_lang(s_ChanServ, u, CHAN_HELP_CMD_FORBID);
@@ -65,7 +65,7 @@ void myChanServHelp(User * u)
 * @param u The user who issued the command
 * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
 **/
-int do_forbid(User * u)
+static int do_forbid(User * u)
 {
    Channel *c;
    ChannelInfo *ci;
@@ -89,8 +89,10 @@ int do_forbid(User * u)
    }
    if (readonly)
        notice_lang(s_ChanServ, u, READ_ONLY_MODE);
-    if ((ci = cs_findchan(chan)) != NULL)
+    if ((ci = cs_findchan(chan)) != NULL) {
        delchan(ci);
+        send_event(EVENT_CHAN_DROP, 1, chan);
+    }
    ci = makechan(chan);
    if (ci) {
        ci->flags |= CI_VERBOTEN;
@@ -135,7 +137,7 @@ int do_forbid(User * u)

                av[0] = c->name;
                av[1] = cu->user->nick;
-                av[2] = reason ? reason : "CHAN_FORBID_REASON";
+                av[2] = reason ? reason : getstring(cu->user->na, CHAN_FORBID_REASON);
                anope_cmd_kick(s_ChanServ, av[0], av[1], av[2]);
                do_kick(s_ChanServ, 3, av);
            }
@@ -1,6 +1,6 @@
 /* ChanServ core functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@

 #include "module.h"

-int do_getkey(User * u);
-void myChanServHelp(User * u);
+static int do_getkey(User * u);
+static void myChanServHelp(User * u);

 /**
 * Create the command, and tell anope about it.
@@ -54,7 +54,7 @@ void AnopeFini(void)
 * Add the help response to anopes /cs help output.
 * @param u The user who is requesting help
 **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_GETKEY);
 }
@@ -64,7 +64,7 @@ void myChanServHelp(User * u)
 * @param u The user who issued the command
 * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
 **/
-int do_getkey(User * u)
+static int do_getkey(User * u)
 {
    char *chan = strtok(NULL, " ");
    ChannelInfo *ci;
@@ -1,6 +1,6 @@
 /* ChanServ core functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@

 #include "module.h"

-int do_getpass(User * u);
-void myChanServHelp(User * u);
+static int do_getpass(User * u);
+static void myChanServHelp(User * u);

 /**
 * Create the command, and tell anope about it.
@@ -55,7 +55,7 @@ void AnopeFini(void)
 * Add the help response to anopes /cs help output.
 * @param u The user who is requesting help
 **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
    if (is_services_admin(u)) {
        notice_lang(s_ChanServ, u, CHAN_HELP_CMD_GETPASS);
@@ -68,7 +68,7 @@ void myChanServHelp(User * u)
 * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
 **/

-int do_getpass(User * u)
+static int do_getpass(User * u)
 {
    char *chan = strtok(NULL, " ");
    char tmp_pass[PASSMAX];
@@ -1,6 +1,6 @@
 /* ChanServ core functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -14,7 +14,7 @@

 #include "module.h"

-int do_help(User * u);
+static int do_help(User * u);

 /**
 * Create the off command, and tell anope about it.
@@ -49,7 +49,7 @@ void AnopeFini(void)
 * @param u The user who issued the command
 * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
 **/
-int do_help(User * u)
+static int do_help(User * u)
 {
    char *cmd = strtok(NULL, "");

@@ -1,6 +1,6 @@
 /* ChanServ core functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@

 #include "module.h"

-int do_identify(User * u);
-void myChanServHelp(User * u);
+static int do_identify(User * u);
+static void myChanServHelp(User * u);

 /**
 * Create the command, and tell anope about it.
@@ -58,7 +58,7 @@ void AnopeFini(void)
 * Add the help response to anopes /cs help output.
 * @param u The user who is requesting help
 **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_IDENTIFY);
 }
@@ -68,7 +68,7 @@ void myChanServHelp(User * u)
 * @param u The user who issued the command
 * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
 **/
-int do_identify(User * u)
+static int do_identify(User * u)
 {
    char *chan = strtok(NULL, " ");
    char *pass = strtok(NULL, " ");
@@ -1,6 +1,6 @@
 /* ChanServ core functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@

 #include "module.h"

-int do_info(User * u);
-void myChanServHelp(User * u);
+static int do_info(User * u);
+static void myChanServHelp(User * u);

 /**
 * Create the command, and tell anope about it.
@@ -55,7 +55,7 @@ void AnopeFini(void)
 * Add the help response to anopes /cs help output.
 * @param u The user who is requesting help
 **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_INFO);
 }
@@ -65,7 +65,7 @@ void myChanServHelp(User * u)
 * @param u The user who issued the command
 * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
 **/
-int do_info(User * u)
+static int do_info(User * u)
 {
 /* SADMINS and users, who have identified for a channel, can now cause it's
 * Enstry Message and Successor to be displayed by supplying the ALL parameter.
@@ -1,6 +1,6 @@
 /* ChanServ core functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@

 #include "module.h"

-void myChanServHelp(User * u);
-int do_invite(User * u);
+static void myChanServHelp(User * u);
+static int do_invite(User * u);

 /**
 * Create the command, and tell anope about it.
@@ -54,7 +54,7 @@ void AnopeFini(void)
 * Add the help response to anopes /cs help output.
 * @param u The user who is requesting help
 **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_INVITE);
 }
@@ -64,7 +64,7 @@ void myChanServHelp(User * u)
 * @param u The user who issued the command
 * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
 **/
-int do_invite(User * u)
+static int do_invite(User * u)
 {
    char *chan = strtok(NULL, " ");
    Channel *c;
@@ -1,6 +1,6 @@
 /* ChanServ core functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@

 #include "module.h"

-int do_cs_kick(User * u);
-void myChanServHelp(User * u);
+static int do_cs_kick(User * u);
+static void myChanServHelp(User * u);

 /**
 * Create the command, and tell anope about it.
@@ -52,7 +52,7 @@ void AnopeFini(void)
 * Add the help response to anopes /cs help output.
 * @param u The user who is requesting help
 **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_KICK);
 }
@@ -62,7 +62,7 @@ void myChanServHelp(User * u)
 * @param u The user who issued the command
 * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
 **/
-int do_cs_kick(User * u)
+static int do_cs_kick(User * u)
 {
    char *chan = strtok(NULL, " ");
    char *params = strtok(NULL, " ");
@@ -1,6 +1,6 @@
 /* ChanServ core functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@

 #include "module.h"

-int do_list(User * u);
-void myChanServHelp(User * u);
+static int do_list(User * u);
+static void myChanServHelp(User * u);

 /**
 * Create the command, and tell anope about it.
@@ -56,7 +56,7 @@ void AnopeFini(void)
 * Add the help response to anopes /cs help output.
 * @param u The user who is requesting help
 **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
    if (!CSListOpersOnly || (is_oper(u))) {
        notice_lang(s_ChanServ, u, CHAN_HELP_CMD_LIST);
@@ -68,7 +68,7 @@ void myChanServHelp(User * u)
 * @param u The user who issued the command
 * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
 **/
-int do_list(User * u)
+static int do_list(User * u)
 {
    char *pattern = strtok(NULL, " ");
    int spattern_size;
@@ -1,6 +1,6 @@
 /* ChanServ core functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -14,9 +14,9 @@

 #include "module.h"

-int do_logout(User * u);
-void myChanServHelp(User * u);
-void make_unidentified(User * u, ChannelInfo * ci);
+static int do_logout(User * u);
+static void myChanServHelp(User * u);
+static void make_unidentified(User * u, ChannelInfo * ci);

 /**
 * Create the command, and tell anope about it.
@@ -56,7 +56,7 @@ void AnopeFini(void)
 * Add the help response to anopes /cs help output.
 * @param u The user who is requesting help
 **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_LOGOUT);
 }
@@ -66,7 +66,7 @@ void myChanServHelp(User * u)
 * @param u The user who issued the command
 * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
 **/
-int do_logout(User * u)
+static int do_logout(User * u)
 {
    char *chan = strtok(NULL, " ");
    char *nick = strtok(NULL, " ");
@@ -108,7 +108,7 @@ int do_logout(User * u)
    return MOD_CONT;
 }

-void make_unidentified(User * u, ChannelInfo * ci)
+static void make_unidentified(User * u, ChannelInfo * ci)
 {
    struct u_chaninfolist *uci;

@@ -1,6 +1,6 @@
 /* ChanServ core functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -14,18 +14,18 @@

 #include "module.h"

-void myChanServHelp(User * u);
-int do_util(User * u, CSModeUtil * util);
-int do_op(User * u);
-int do_deop(User * u);
-int do_voice(User * u);
-int do_devoice(User * u);
-int do_halfop(User * u);
-int do_dehalfop(User * u);
-int do_protect(User * u);
-int do_deprotect(User * u);
-int do_owner(User * u);
-int do_deowner(User * u);
+static void myChanServHelp(User * u);
+static int do_util(User * u, CSModeUtil * util);
+static int do_op(User * u);
+static int do_deop(User * u);
+static int do_voice(User * u);
+static int do_devoice(User * u);
+static int do_halfop(User * u);
+static int do_dehalfop(User * u);
+static int do_protect(User * u);
+static int do_deprotect(User * u);
+static int do_owner(User * u);
+static int do_deowner(User * u);

 /**
 * Create the command, and tell anope about it.
@@ -87,7 +87,7 @@ void AnopeFini(void)
 * Add the help response to anopes /cs help output.
 * @param u The user who is requesting help
 **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
    if (ircd->owner) {
        notice_lang(s_ChanServ, u, CHAN_HELP_CMD_OWNER);
@@ -117,35 +117,35 @@ void myChanServHelp(User * u)
 * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
 **/

-int do_op(User * u)
+static int do_op(User * u)
 {
    return do_util(u, &csmodeutils[MUT_OP]);
 }

 /*************************************************************************/

-int do_deop(User * u)
+static int do_deop(User * u)
 {
    return do_util(u, &csmodeutils[MUT_DEOP]);
 }

 /*************************************************************************/

-int do_voice(User * u)
+static int do_voice(User * u)
 {
    return do_util(u, &csmodeutils[MUT_VOICE]);
 }

 /*************************************************************************/

-int do_devoice(User * u)
+static int do_devoice(User * u)
 {
    return do_util(u, &csmodeutils[MUT_DEVOICE]);
 }

 /*************************************************************************/

-int do_halfop(User * u)
+static int do_halfop(User * u)
 {
    if (ircd->halfop) {
        return do_util(u, &csmodeutils[MUT_HALFOP]);
@@ -156,7 +156,7 @@ int do_halfop(User * u)

 /*************************************************************************/

-int do_dehalfop(User * u)
+static int do_dehalfop(User * u)
 {
    if (ircd->halfop) {
        return do_util(u, &csmodeutils[MUT_DEHALFOP]);
@@ -167,7 +167,7 @@ int do_dehalfop(User * u)

 /*************************************************************************/

-int do_protect(User * u)
+static int do_protect(User * u)
 {
    if (ircd->protect || ircd->admin) {
        return do_util(u, &csmodeutils[MUT_PROTECT]);
@@ -178,7 +178,7 @@ int do_protect(User * u)

 /*************************************************************************/

-int do_deprotect(User * u)
+static int do_deprotect(User * u)
 {
    if (ircd->protect || ircd->admin) {
        return do_util(u, &csmodeutils[MUT_DEPROTECT]);
@@ -189,7 +189,7 @@ int do_deprotect(User * u)

 /*************************************************************************/

-int do_owner(User * u)
+static int do_owner(User * u)
 {
    char *av[2];
    char *chan = strtok(NULL, " ");
@@ -245,7 +245,7 @@ int do_owner(User * u)

 /*************************************************************************/

-int do_deowner(User * u)
+static int do_deowner(User * u)
 {
    char *av[2];
    char *chan = strtok(NULL, " ");
@@ -301,7 +301,7 @@ int do_deowner(User * u)

 /* do_util: not a command, but does the job of other */

-int do_util(User * u, CSModeUtil * util)
+static int do_util(User * u, CSModeUtil * util)
 {
    char *av[2];
    char *chan = strtok(NULL, " ");
@@ -1,6 +1,6 @@
 /* ChanServ core functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@

 #include "module.h"

-int do_register(User * u);
-void myChanServHelp(User * u);
+static int do_register(User * u);
+static void myChanServHelp(User * u);

 /**
 * Create the off command, and tell anope about it.
@@ -55,7 +55,7 @@ void AnopeFini(void)
 * Add the help response to anopes /cs help output.
 * @param u The user who is requesting help
 **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_REGISTER);
 }
@@ -65,7 +65,7 @@ void myChanServHelp(User * u)
 * @param u The user who issued the command
 * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
 **/
-int do_register(User * u)
+static int do_register(User * u)
 {
    char *chan = strtok(NULL, " ");
    char *pass = strtok(NULL, " ");
@@ -1,6 +1,6 @@
 /* ChanServ core functions
 *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2014 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@

 #include "module.h"

-int do_sendpass(User * u);
-void myChanServHelp(User * u);
+static int do_sendpass(User * u);
+static void myChanServHelp(User * u);

 /**
 * Create the command, and tell anope about it.
@@ -58,9 +58,10 @@ void AnopeFini(void)
 * Add the help response to anopes /cs help output.
 * @param u The user who is requesting help
 **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
-    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_SENDPASS);
+    if (!RestrictMail || is_services_oper(u))
+        notice_lang(s_ChanServ, u, CHAN_HELP_CMD_SENDPASS);
 }

 /**
@@ -68,7 +69,7 @@ void myChanServHelp(User * u)
 * @param u The user who issued the command
 * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
 **/
-int do_sendpass(User * u)
+static int do_sendpass(User * u)
 {

    char *chan = strtok(NULL, " ");
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Adam	a1607f41b6	Add travis config exempting 1.8	2014-04-01 23:33:14 -04:00
Adam	10901dd05b	Anope 1.8.9 Release	2014-03-03 00:41:39 -05:00
Adam	01177212bd	Update NSIS scripts for Anope 1.8.9	2014-03-03 00:41:07 -05:00
Robby-	64f83b3ccf	Bump and update version.log	2014-02-10 21:35:04 +01:00
Robby-	172325ee97	listchans: Fix typo: nickname -> channel	2014-02-10 07:50:53 +01:00
Adam	969aacbf78	Update copyright to 2014. This was done with: find include/ src/ lang/ docs/ . Config -exec sed -i 's/-20.. Anope Team/-2014 Anope Team/i' {} \;	2014-01-01 20:51:08 -05:00
Adam	304e6eaabe	Bump version.log and Changes	2013-12-09 20:59:18 -05:00
Adam	564b8b8d9d	Merge pull request #30 from trystanscott/patch-1 Fix undefined symbol error on Solaris11	2013-12-09 17:57:52 -08:00
trystanscott	309807c67f	Fix undefined symbol error on Solaris11	2013-11-29 12:21:10 -07:00
Adam	5fd1485938	Internally process bounced channel modes from a deopped user. Even though we never process the modes from the deopped user, the bounced modes can't be trusted.	2013-09-29 11:42:22 -04:00
Adam	7a741b467c	Add padding to struct memo for non mysql builds to keep abi compat with mysql builds	2013-09-18 20:01:08 -04:00
Adam	d24ae1f961	Fix kick reason in cs_suspend and cs_forbid if no reason is given	2013-08-16 14:51:58 -04:00
Adam	eab5abb351	hs_request: Improve logging of new vhost requests	2013-08-16 14:21:58 -04:00
Adam	f7b1b1907c	Properly jupe servers on inspircd by using RSQUIT, waiting for the corresponding SQUIT, and then introducing the new server	2013-07-26 12:35:55 -04:00
Adam	a563c8fb2f	Fix dumb modules	2013-07-25 20:31:51 -04:00
Adam	def6a6deee	CSMaxReg cant be reloaded, so this is unnecessary	2013-07-25 20:03:06 -04:00
Adam	1a3f890613	Update version.log for the last two commits	2013-07-25 19:52:27 -04:00
mokkori	d2d89ac412	Memory: Properly initialize and free new module languages. Memory: Properly free strings in module config directive lookups. Memory: Do not leak module version and author in rare situations. Memory: Memory leak when deleting a module callback. Memory: Memory leaks with module messages. Memory: Memory leaks with module commands. Memory: Memory leaks with module event handlers. Memory: Memory leaks with module event hooks. Memory: Every module config entry of type string is leaked on config reload. Memory: Leak services root list, ulines list, host setters list, modules autoload list, modules delayed autoload list, hostserv/memoserv/helpserv/botserv/operserv/chanserv/nickserv core modules lists on config reload. Memory: Leaks with channel bans/invites/exceptions. Memory: Leak when updating already existing ignore. Memory: Invalid pointer read in slists. Memory: Leak when using /cs appendtopic. Memory: Leak on (currently impossible) config reload. Memory: Syscall param write(buf) points to uninitialised byte(s) in save_ns_dbase(). Memory: Leak if PreNickServDB is set and NSEmailReg is not. Removing a command no longer calls free() on help_param*, reversed previous changes Changes to CSMaxReg, MSMaxMemos and NewsCount are now properly reflected in help notices after config reload Small adjustments Fixed copy&paste mistake Fix findCommand() searching in the wrong command tables	2013-07-25 19:42:18 -04:00
mokkori	e090eaea65	Bug: Remove server from internal list if it exists on /os jupe on Unreal. Not doing so leads to duplicated entries which cause side-effects such as sending a global to the same server more than once.	2013-07-25 19:42:10 -04:00
Adam	1dbd7b406f	Fix fd leak in mail.c with ForkForMail enabled	2013-07-07 05:33:16 -04:00
DukePyrolator	27dde3266c	updated Hybrid protocol module to support vhosts	2013-06-21 07:42:09 +02:00
Viper	f1c3f0d820	Bug #1527 - Fixed modules being loaded regardless of the load abort signal returned by a modules AnopeInit function. (Introduced in commit. `e0c3069c`)	2013-06-05 17:28:46 +02:00
Viper	0a78656804	Fixed messy indentation using a combination of spaces and tabs.	2013-06-05 16:54:02 +02:00
Michael Wobst	e2213e3cd2	Update Hybrid protocol module for Hybrid 8.1	2013-05-25 15:41:48 -04:00
Adam	ec9931288b	Allow loading nicks with no core... just in case	2013-05-25 15:39:40 -04:00
Adam	71ec1a93dd	Bump for 1.8.9-git	2013-03-03 01:57:16 -05:00
Adam	245a25877f	Anope 1.8.8 Release	2013-03-03 00:55:11 -05:00
Adam	ae071cef75	Update language instructions in README to use git instead of svn. Add japanese language file to Windows makefile and installer.	2013-03-03 00:55:11 -05:00
Adam	57b31d43eb	Update NSIS scripts for Anope 1.8.8	2013-03-03 00:55:11 -05:00
Charles Kingsley	43152007c6	Update COPYING	2013-02-21 07:22:08 +00:00
Charles Kingsley	91ff17d10f	Update COPYING	2013-02-20 21:50:28 +00:00
Adam	357cd44bea	Also mark bots that were previously -o on UnrealIRCd as +H to hide them from the oper count in /lusers and /stats, which is closer to the old behavior.	2013-02-17 15:10:58 -05:00
DukePyrolator	46271fc348	updated Changes, version.log and .gitignore	2013-02-17 13:31:31 +01:00
Jens Voß	d8ca7c63bf	Merge pull request #10 from l/translation_ja_1.8 Japanese Translation for 1.8 branch	2013-02-17 04:20:13 -08:00
Adam	f7bac0839b	Do not allow invalid nicknames to be forbidden in ns_forbid	2013-02-17 14:08:34 +09:00
AYANOKOUZI, Ryuunosuke	862b101935	add japanese translation	2013-02-17 14:08:20 +09:00
Adam	20d40fdc75	Do not allow invalid nicknames to be forbidden in ns_forbid	2013-02-13 13:14:22 -05:00
Adam	9650a3ffa5	Bug #1474 - Fixed setting user modes on BotServ bots on Unreal3.2.10 This was caused by Unreal's revision 58c35ea52a1f	2013-01-29 05:12:52 -05:00
Adam	14a957f8a0	Update copyright to 2013. This was done with: find include/ src/ lang/ docs/ . Config -exec sed -i 's/-2012 Anope Team/-2013 Anope Team/i' {} \;	2013-01-09 04:23:25 -05:00
Viper	8fb31b6441	Updated Changes and version.log to include Hybrid support changes.	2012-12-23 23:46:32 +01:00
jan Milants	969258352a	Merge pull request #3 from Faw-kes/1.8 Added Hybrid 8.0 support. (This replaces the experimental Hybrid 7 support.)	2012-12-23 14:34:54 -08:00
Faw-kes	a6b09c1d9f	Updated README	2012-12-23 18:29:28 +01:00
Faw-kes	a9021f6284	Adding Hybrid 8.0 support since Hybrid 8.0 has some services support now. Removed experimental Hybrid 7.x support, because Hybrid 7 is now deprecated. Updated example.conf file. Protocol Module provided by the Hybrid Development Team. Special thanks to Michael.	2012-12-23 17:13:37 +01:00
DukePyrolator	fa33bb2842	Added french language support to some modules (patch provided by Coolsmile)	2012-12-17 21:09:26 +01:00
DukePyrolator	cb9ab016f5	updated the Polish language file	2012-12-16 09:43:45 +01:00
DukePyrolator	83e42f2adc	updated .gitignore	2012-12-16 09:41:52 +01:00
Adam	e0c3069c5f	Cleanup many compile warnings from make and make strict	2012-10-31 22:16:15 -04:00
Adam	3e6d838285	Use base 10 for strtol() in the config parser to prevent numbers beginning with 0 from confusing it	2012-10-31 14:31:43 -04:00
Adam	64dd3c6655	Update Windows install script for VS 2012, update Windows README, and fixed VS 2012 build	2012-10-27 07:12:39 -04:00
Adam	9486cf9ecb	Fix typo in NICK_SASET_MSG_SYNTAX	2012-10-15 03:53:11 -04:00
Adam	0106d0b6bd	Fixed some warnings caused from the last commit	2012-09-22 16:23:19 -04:00
Adam	3779ed916a	Made all module functions static to fix OSX's linker from linking modules with similar function names to each other which causes complete and total chaos.	2012-09-21 21:39:32 -04:00
Adam	3f05a42515	Do not apply akills or sxlines that are pending expiration	2012-08-07 22:16:32 -04:00
Adam	d0e5a18848	Fixed crash when InspIRCd sends user MODE changes for users that don't "exist" (probably us)	2012-07-30 02:25:46 -04:00
Adam	670e73d69d	Fixed crash with cs_enforce and registered empty permanent channels	2012-07-14 02:17:23 -04:00
Adam	07fffb0b90	Bug #1380 - Do not allow akill masks to end in @. This can be used to cause the IRCd to SQUIT us by adding invalid akills. The only known affected is Charybdis. Also fixed a crash caused by receiving a SQUIT for ourselves.	2012-02-25 15:10:52 -05:00
DukePyrolator	1d3ca36768	Fixed several grammar errors in docs/ (patch provided by Simba)	2012-02-22 07:41:58 +01:00
Adam	8559c57cd6	Updated Copyright to 2012	2012-01-02 21:10:40 -05:00
Adam	792790a4d4	Bug #1369 - Fixed os_svsnick to allow changing the case of a users' nick	2011-12-31 02:38:17 -05:00
Adam	381d95e6da	Bump for 1.8.8-git	2011-12-23 14:08:04 -05:00
Adam	74556b77c0	Anope 1.8.7 Release	2011-12-23 14:08:04 -05:00
Adam	91527cdcef	Bump installer scripts for 1.8.7 release	2011-12-23 14:08:04 -05:00
Adam	b9aa534731	Update Windows installer script for MySQL 5.5	2011-12-23 14:07:40 -05:00
Viper	658ecee817	Implemented API support for the SVSJOIN and SVSPART commands on UltimateIRCd 3.	2011-12-15 00:59:10 +01:00
DukePyrolator	fb99dc43c9	Fixed some typos in the spanish language file	2011-12-08 19:05:07 +01:00
Viper	144029fd61	Fixed ignore not matching against users' real host or IP (introduced in rev. 3049).	2011-11-20 15:22:18 +01:00
Viper	2a1cd54bc7	Use vident instead of ident in combination with the vhost for botserv kick(ban)s and nickserv access list checking.	2011-11-16 16:30:45 +01:00
Viper	0dd4a98e53	Match bans against the vident/vhost instead of real ident/vhost when available.	2011-11-16 15:57:07 +01:00
Adam	f1577975a9	Use _exit, not exit, to exit mail forks to prevent our atexit() functions from being called, and removing our pidfile	2011-09-03 03:49:45 -04:00
Adam	fa833766a0	Made os_sxline and os_akill use a stored value to curent time to prevent the off-chance of time changing while executing the function which can mess up our globops/log messages	2011-08-23 19:29:59 -04:00
Viper	783f77d367	Added event to warn modules a nickcore gets a new display nick or is about to be dropped. (This should enable modules to more easily link their data to anopes core data.)	2011-08-22 00:25:34 +02:00
unknown	dc840e9b99	Send DROP event when forbidding nicks and channels, if applicable.	2011-08-21 23:30:23 +02:00
Adam	0982becd98	Bug #1318 - #1320 - Added support for Hybrid's +S and +O channel modes, and removed support for +a	2011-08-18 17:23:14 -04:00
Adam	f83096c729	Fixed loading bs_fantasy_owner on startup when using InspIRCd 2.0	2011-08-10 21:19:42 -04:00
Adam	eb7c9d0a86	Bug #1287 - Fixed chan_set_correct_modes to not deop the first user from syncing servers	2011-08-09 17:57:35 -04:00
lethality	8007cc8a3a	Bug #1269 - Fixed install.js for Windows 7 builds.	2011-07-28 18:22:52 +01:00
Adam	30ea6365de	Fixed a potential crash in the badwords kicker, and fixed matching BW_SINGLE with BSCaseSensitive enabled	2011-07-23 05:01:44 -04:00
Adam	a11155551e	Bug #1273 - Fixed removing vhosts on InspIRCd when m_cloaking is unloaded	2011-05-30 19:48:14 -04:00
Charles Kingsley	d45222798b	Reinitialise git for post 1.8.6 development	2011-05-14 09:13:04 +01:00
Charles Kingsley	edb362eace	Anope 1.8.6 Release	2011-05-14 08:48:16 +01:00
Charles Kingsley	1e9f1b09f5	Clarified ForkForMail entry in Changes.conf - thanks Kyle!	2011-05-08 12:09:22 +01:00
Charles Kingsley	16439f52a5	Prepare NSIS scripts for future 1.8.6 release	2011-05-08 09:47:16 +01:00
Adam	45640c43d3	Removed atheme2anope database converter as its out of date	2011-05-07 13:08:55 -04:00
Adam	6ebbec79ea	Bug #1236 - Fixed crash in enc_md5 on Mac	2011-05-02 14:18:52 -04:00
Viper	096de4fb25	Bug #1263 - Fixed /ns REGISTER not getting an "unknown cmd" reply when ns_register is not loaded & ns_maxemail is loaded. This Bug cannot be structurally fixed, needs to be addressed by 3rd party module authors for similar situations. This implementation can serve as a template.	2011-04-28 22:16:18 +02:00
Viper	01946cb467	Added events for module loading/unloading and command creation/deletion. Enables modules expanding on other modules to adjust hooks if needed. - Related to bug #1263.	2011-04-28 21:00:46 +02:00
Charles Kingsley	0e0538408d	Usage update for ./listchans thanks katsklaw	2011-04-10 12:30:21 +01:00
Viper	841b3f689e	Fixed bug #1252 - The group display nick showing in HS req memos instead of the requesting alias. Also cleaned up the mess in Changes...	2011-03-24 23:43:53 +01:00
Adam	0315bd31f8	Fixed make strict	2011-03-24 17:57:27 -04:00
Adam	2539f34d3c	Forgot vidents	2011-03-21 03:06:43 -04:00
Adam	7eb437b9fe	Added support m_services.c and m_change.c from Hybrid's contrib folder	2011-03-21 02:47:46 -04:00
lethality	0e0eb38b2a	Change to users masked host instead of the real one after turning vhost off in inspircd.	2011-03-04 22:30:44 +00:00
Adam	6fca33a2ba	Updated Changes	2011-03-03 19:21:58 -05:00
Adam	66e2dce646	Fixed opping our clients on ratbox when TS6 is not used.	2011-03-03 19:21:51 -05:00
Adam	06679e487e	Do not show SENDPASS in NickServ and ChanServ help to users who can't use it	2011-03-01 19:27:03 -05:00
Adam	54acc25eb3	Rejoin our clients if kicked on TS6 IRCDs and made ratbox protocol module use account tracking	2011-02-23 18:52:13 -05:00
lethality	a4c81c72c1	Fixed bug 1248, an error in fr.l - reported by SaKa	2011-02-22 20:40:23 +00:00
Adam	2060bacdea	Fixed Mac build	2011-02-11 18:21:57 -05:00
Adam	8d1fe0a36f	Merge branch '1.8' of anope.git.sf.net:/gitroot/anope/anope into 1.8	2011-02-04 22:19:01 -05:00
Adam	165c0588d4	Fixed the wiki URLs in install.js	2011-02-04 22:15:58 -05:00
DukePyrolator	7c14f76bc8	fixed a typo in the german language file	2011-01-30 01:03:51 +01:00
DukePyrolator	a86e15afe9	Updated german language file	2011-01-29 14:13:08 +01:00
Adam	2b847c63e9	Fixed not introducing our clients with usermode +k on InspIRCd 2.0	2011-01-28 13:03:10 -05:00
lethality	11b91fdc67	Bug #1233 - Fixed some misuse of apostrophes - patch by binki	2011-01-21 00:20:25 +00:00
Adam	0dda705cdb	Bug #1227 - Fixed 'make install' recompiling src/tools	2011-01-18 23:57:21 -05:00
Adam	f4d7ae2e12	Do not allow services opers to send one person more than 32767 memos	2011-01-09 20:05:11 -05:00
Adam	826e040d41	Enable NICKIP for InspIRCd 1.2+	2011-01-08 00:27:14 -05:00
lethality	3ef227aa88	Some more copyright/typo fixes, spotted by chaz :P	2011-01-07 21:41:49 +00:00
lethality	f592417ec2	Updated Copyright to 2011	2011-01-06 02:32:32 +00:00
Adam	ed13cd11ec	Made the moduleGetData debug messages for level 2+	2010-12-28 18:01:55 -05:00
Adam	f8a0a645b0	Remove vhost requests from nicks that expire	2010-12-23 19:01:49 -05:00
Adam	12b0ff0593	Bug #1079 - Prevent /cs ban, akick, unban, etc, from matching against users real hostname and IPs in an attempt to prevent unauthorized users from gaining other users IPs via brute force attacks.	2010-12-23 16:59:56 -05:00
Adam	13688c595b	Bug #1213 - Fixed /cs enforce #channel to say SET was enforced not (null)	2010-12-15 12:10:36 -05:00
Adam	2b7dd6c2a0	Fixed some warnings found by cppcheck	2010-12-07 17:01:58 -05:00
Adam	c5fc11f5fe	Fixed bug #1202 - Made Anope aware of plexus3's channel mode +z	2010-10-31 14:01:39 -04:00
Adam	bf2f151c68	Fixed some improper english in the HOST_GROUP language strings	2010-10-14 16:18:20 -04:00
Adam	4c64c86ef4	Fixed a potential crash from accessing invalid memory after unbanning people when checking whether a host is akick stuck. Fixes /cs unban not reapplying stuck ban masks.	2010-10-06 16:20:50 -04:00
Adam	cb975f4a6c	Properly handle being unable to open the SendMailPath when forking	2010-09-29 20:10:35 -04:00
Adam	0383868a29	Fixed bug #1193 - Fixed /nickserv saset display to change the nicktracking of the users affected by it, not the user executing it	2010-09-28 18:37:14 -04:00
Adam	b92711dc15	Fixed bug #1194 - Fixed /nickserv group to use nicktracking if enabled	2010-09-28 18:23:04 -04:00
Adam	e990259d6d	Rewrote the mail forking code to use pipes, sometimes mails wouldn't work with the old method	2010-09-28 18:08:07 -04:00
Adam	5a4de87df1	Fixed configure failing on some systems which have a partial MySQL installation	2010-09-14 19:26:45 -04:00
Adam	9a488327b2	Fixed db-merger handling some hostserv collisions	2010-09-11 16:52:08 -04:00
Charles Kingsley	f302367fc4	Initialise git for 1.8-git	2010-09-11 11:16:09 +01:00