oddmuse-curl.el: oddmuse-read-wiki with completion

Changing all the double quotes to single quotes before processing was a
bad idea.

LICENSE

@@ -0,0 +1,675 @@
+GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  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
+them 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 prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  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.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey 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;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If 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 convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU 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 that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  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.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+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.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  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
+state 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) {year}  {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 3 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.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    {project}  Copyright (C) {year}  {fullname}
+    This program 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, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU 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 Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+

Makefile

@@ -2,7 +2,7 @@
 # Make sure the CVS keywords for the sed command on the next line are not expanded.
 
 VERSION_NO=$(shell git describe --tags)
-TRANSLATIONS=$(wildcard modules/translations/[a-z]*-utf8.pl$)
+TRANSLATIONS=$(wildcard modules/translations/[a-z]*.pl$)
 MODULES=$(wildcard modules/*.pl)
 BUILD=build/wiki.pl $(foreach file, $(notdir $(MODULES)) $(notdir $(TRANSLATIONS)), build/$(file))
 
@@ -16,12 +16,21 @@ prepare: build $(BUILD)
 build:
 	mkdir -p build
 
+clean:
+	rm -rf build
+
 build/wiki.pl: wiki.pl
 	perl -lne "s/(\\\$$q->a\({-href=>'http:\/\/www.oddmuse.org\/'}, 'Oddmuse'\))/\\\$$q->a({-href=>'http:\/\/git.savannah.gnu.org\/cgit\/oddmuse.git\/tag\/?id=$(VERSION_NO)'}, 'wiki.pl') . ' ($(VERSION_NO)), see ' . \$$1/; print" < $< > $@
 
 build/%-utf8.pl: modules/translations/%-utf8.pl
 	perl -lne "s/(AddModuleDescription\('[^']+', '[^']+')\)/\$$1, 'translations\/', '$(VERSION_NO)')/; print" < $< > $@
 
+build/national-%.pl: modules/translations/national-%.pl
+	perl -lne "s/(AddModuleDescription\('[^']+', '[^']+')\)/\$$1, 'translations\/', '$(VERSION_NO)')/; print" < $< > $@
+
+build/month-names-%.pl: modules/translations/month-names-%.pl
+	perl -lne "s/(AddModuleDescription\('[^']+', '[^']+')\)/\$$1, 'translations\/', '$(VERSION_NO)')/; print" < $< > $@
+
 # from: http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/namespaces.pl
 #   to: http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/namespaces.pl?id=2.1-11-gd4f1e27
 
@@ -34,6 +43,9 @@ translations: $(TRANSLATIONS)
 	  perl oddtrans -l $$f wiki.pl $(MODULES) > $$f-new && mv $$f-new $$f; \
 	done
 
+test:
+	prove t
+
 # UNTESTED/OBSOLETE: these targets have not been tested in a long time
 # and are potentially obsolete.
 VERSION=oddmuse-$(VERSION_NO)
@@ -148,9 +160,6 @@ install:
 	@echo This only installs the deb file, not the script itself.
 	dpkg -i oddmuse*.deb
 
-test:
-	prove t
-
 package-upload: debian-$(VERSION).tar.gz debian-$(VERSION).tar.gz.sig
 	curl -T "{debian-$(VERSION).tar.gz,debian-$(VERSION).tar.gz.sig}" \
 	ftp://savannah.gnu.org/incoming/savannah/oddmuse/

contrib/OddMuseWiki.spec

@@ -1,18 +1,18 @@
-Name: OddMuseWiki
+Name: Oddmuse
 Version: 2007.12.31
 Release: 1suse
 Group: Applications/Productivity
-License: /opt/OddMuseWiki/doc/COPYING
+License: /opt/oddmuse/doc/COPYING
 Summary: Simple user-editted website (wiki)
 
 Distribution: any perl+webserver+cgi distro
 Vendor: Alex Schröder
 Packager: Dr. Robert J. Meier <grandfather@sourceforge.org>
-URL: http://www.oddmusewiki.org/
+URL: http://www.oddmuse.org/
 
 BuildRoot: /var/tmp/rpm-oddmusewiki-root
 BuildArch: noarch
-Prefix: /opt/OddMuseWiki
+Prefix: /opt/oddmuse
 Prefix: /srv/www/wiki
 Prefix: /srv/www/cgi-bin
 Prefix: /etc/httpd/conf.d
@@ -30,7 +30,7 @@ AutoProv: no
 
 
 %description
-OddMuseWiki is a program to run a wiki.
+Oddmuse is a program to run a wiki.
 A wiki can be used for communication in a team or for documentation,
 when things have to be quick and easy: Content Management for everybody.
 
@@ -42,7 +42,7 @@ or describe internal processes.
 For many free software projects wikis have taken an important role
 somewhere between manual, FAQ, IRC, and mailing lists.
 
-OddMuseWiki is very easy to install: Simple installation, compact code,
+Oddmuse is very easy to install: Simple installation, compact code,
 and easy extensibility were the most important design factors.
 
 Features
@@ -90,19 +90,19 @@ if [ "$RPM_DUMPENV" != "" ] ; then env | sort > /tmp/rpm-build.log; fi
 if [ "$RPM_DUMPENV" != "" ] ; then env | sort > /tmp/rpm-install.log; fi
 
 rm -rf "$RPM_BUILD_ROOT"
-mkdir -p "$RPM_BUILD_ROOT"/opt/OddMuseWiki/cgi-bin
-mkdir -p "$RPM_BUILD_ROOT"/opt/OddMuseWiki/doc
-mkdir -p "$RPM_BUILD_ROOT"/opt/OddMuseWiki/etc
-mkdir -p "$RPM_BUILD_ROOT"/opt/OddMuseWiki/libperl
+mkdir -p "$RPM_BUILD_ROOT"/opt/oddmuse/cgi-bin
+mkdir -p "$RPM_BUILD_ROOT"/opt/oddmuse/doc
+mkdir -p "$RPM_BUILD_ROOT"/opt/oddmuse/etc
+mkdir -p "$RPM_BUILD_ROOT"/opt/oddmuse/libperl
 mkdir -p "$RPM_BUILD_ROOT"/srv/www/cgi-bin
 mkdir -p "$RPM_BUILD_ROOT"/srv/www/wiki
 mkdir -p "$RPM_BUILD_ROOT"/etc/httpd/conf.d
 
-install cgi-bin/wiki.pl "$RPM_BUILD_ROOT"/opt/OddMuseWiki/cgi-bin
+install cgi-bin/wiki.pl "$RPM_BUILD_ROOT"/opt/oddmuse/cgi-bin
 install cgi-bin/wiki.pl "$RPM_BUILD_ROOT"/srv/www/cgi-bin
-install doc/COPYING "$RPM_BUILD_ROOT"/opt/OddMuseWiki/doc
-install etc/oddmusewiki.conf "$RPM_BUILD_ROOT"/opt/OddMuseWiki/etc
-install libperl/current libperl/*.pl "$RPM_BUILD_ROOT"/opt/OddMuseWiki/libperl
+install doc/COPYING "$RPM_BUILD_ROOT"/opt/oddmuse/doc
+install etc/oddmusewiki.conf "$RPM_BUILD_ROOT"/opt/oddmuse/etc
+install libperl/current libperl/*.pl "$RPM_BUILD_ROOT"/opt/oddmuse/libperl
 cp -r wiki "$RPM_BUILD_ROOT"/srv/www
 
 
@@ -133,7 +133,7 @@ if [ "$RPM_DUMPENV" != "" ] ; then env | sort > /tmp/rpm-post.log; fi
 #   it cannot be symlinked into a public access site at rpmbuild -bb time.
 if [ \( -d "$RPM_INSTALL_PREFIX2" -a -w "$RPM_INSTALL_PREFIX2" \) -o -w "$RPM_INSTALL_PREFIX2"/wiki.pl ]; then
   cat "$RPM_INSTALL_PREFIX0"/cgi-bin/wiki.pl |
-  perl -pe 's:/opt/OddMuseWiki:'"$RPM_INSTALL_PREFIX0"':;' |
+  perl -pe 's:/opt/oddmuse:'"$RPM_INSTALL_PREFIX0"':;' |
   perl -pe 's:/srv/www/wiki:'"$RPM_INSTALL_PREFIX1"':;' |
   cat > "$RPM_INSTALL_PREFIX2"/wiki.pl
 fi
@@ -160,8 +160,8 @@ if [ "$RPM_DUMPENV" != "" ] ; then env | sort > /tmp/rpm-postun.log; fi
 # The doc, config, attr and many other macros are well documented in RPM-HOWTO
 %defattr(0444,root,root)
 %license
-%attr(0555,root,root) /opt/OddMuseWiki
-%config /opt/OddMuseWiki/etc/oddmusewiki.conf
+%attr(0555,root,root) /opt/oddmuse
+%config /opt/oddmuse/etc/oddmusewiki.conf
 %attr(0777,root,root) /srv/www/wiki
 %attr(0555,root,root) /srv/www/cgi-bin/wiki.pl
 

contrib/README.md

@@ -0,0 +1,8 @@
+Code for Special Circumstances
+==============================
+
+The files in this directory serve a particular purpose which might be
+of interest to others. These are not generic scripts (there is a
+separate directory for those). These are CGI scripts that post to a
+Campaign Wiki, that allow you to edit wikis using Emacs, that copy
+data from a particular site and post them to the Emacs Wiki.

contrib/add-link.pl

@@ -1,315 +0,0 @@
-#! /usr/bin/perl
-
-# Copyright (C) 2011–2015  Alex Schroeder <alex@gnu.org>
-
-# 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 3 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.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program. If not, see <http://www.gnu.org/licenses/>.
-
-package OddMuse;
-
-use LWP::UserAgent;
-use HTML::TreeBuilder;
-use JSON::PP;
-use utf8;
-
-# load Oddmuse core
-$RunCGI = 0;
-do "wiki.pl";
-
-# globals depending on the name of the script
-my ($self, $name, $wiki);
-if ($0 eq '/home/alex/campaignwiki.org/add-link.pl') {
-  $self = "https://campaignwiki.org/add-link";
-  $name = "OSR Links to Wisdom";
-  $wiki = 'LinksToWisdom';
-} elsif ($0 eq '/home/alex/campaignwiki.org/add-adventure.pl') {
-  $self = "https://campaignwiki.org/add-adventure";
-  $name = "OSR Links to Adventures";
-  $wiki = 'Adventures';
-} else {
-  ReportError('Cannot determine wiki!', '500 INTERNAL SERVER ERROR');
-}
-
-# derived variables
-my $site = "https://campaignwiki.org/wiki/$wiki";
-# my $site = "http://localhost/wiki.pl";
-my $home = "$site/$HomePage";
-# http://www.emacswiki.org/pics/star.png
-my $stardata = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAAFVBMVEUAAHkAAACzdRTapx3twwD/9qb////1YCa0AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCanBgAAAAHdElNRQfXAQYCJAu+WhwbAAAAKnRFWHRDb21tZW50AGJ5IFJhZG9taXIgJ1RoZSBTaGVlcCcgRG9waWVybGFza2kVfTXbAAAAYElEQVQI12NgQAKMMIaYAFTAzRDKCHOEMETCnEFyjIJhYS6OggwMoqGhaS7GRgIMjC6uYc5GikA5YRcXIyWwotBgJUWw7lAXsAyDaIihMlhK1FFA0AjEEAESQgJQu4EYAPAPC2XcokgQAAAAAElFTkSuQmCC';
-
-main();
-
-sub toc {
-  # start with the homepage
-  my @values;
-  my %labels;
-  for my $id (GetPageContent($HomePage) =~ /\* \[\[(.*?)\]\]/g) {
-    push @values, $id;
-    for my $item (GetPageContent(FreeToNormal($id)) =~ /(\*+ [^][\n]*)$/mg) {
-      my $value = $item;
-      my $label = $item;
-      $value =~ s/\* *//g;
-      push @values, $value;
-      $label =~ s/\* */ /g; # EM SPACE
-      $labels{$value} = $label;
-    }
-  }
-  return \@values, \%labels;
-}
-
-sub top {
-  # start with the homepage
-  my %blog;
-  my $n;
-  for my $id (GetPageContent($HomePage) =~ /\* \[\[(.*?)\]\]/g) {
-    for my $item (GetPageContent(FreeToNormal($id)) =~ /^\*+\s+\[(https?:\/\/[^\/\n\t ]+)/mg) {
-      $n++;
-      # handle blogspot domain munging
-      $item =~ s/blogspot(\.[a-z]+)+/blogspot.com/;
-      $blog{$item}++;
-    }
-  }
-  print $q->p("Total links counted: $n.");
-  my @list = sort { $blog{$b} <=> $blog{$a} } keys %blog;
-  # my $max = scalar @list;
-  # $max = 20 if $max > 20;
-  # @list = @list[0 .. $max -1];
-  @list = map {
-    my $domain = substr($_, index($_, '://') + 3);
-    my $term = quotemeta($domain);
-    # handle blogspot domain munging
-    $term =~ s/blogspot\\\.com/blogspot(\\.[a-z]+)+/;
-    $term = QuoteHtml($term);
-    $q->a({-href => $_}, $domain)
-	. " (" . $q->a({-href => "$self/match/$term"}, $blog{$_}) . ")";
-  } @list;
-  return \@list;
-}
-
-sub match {
-  my $term = shift;
-  # start with the homepage
-  my @list;
-  my $title;
-  for my $id (GetPageContent($HomePage) =~ /\* \[\[(.*?)\]\]/g) {
-    for my $line (split /\n/, GetPageContent(FreeToNormal($id))) {
-      if ($line =~ /^\*+\s+([^][\n]*)$/) {
-	$title = $1;
-      } elsif ($line =~ /$term/o) {
-	if ($line =~ /^\*+\s+\[(https?:\S+)\s+([^]]+)\]/) {
-	  push (@list, $q->a({-href => $1}, $2) . " (" . $title . ")");
-	}
-      }
-    }
-  }
-  return \@list;
-}
-
-sub html_toc {
-  my ($values, $labels) = toc();
-  return $q->radio_group(-name =>'toc',
-			 -values => $values,
-			 -labels => $labels,
-			 -linebreak=>'true');
-}
-
-sub default {
-  print $q->p("Add a link to the " . $q->a({-href=>$home}, $name) . ".");
-  print $q->start_multipart_form(-method=>'get', -class=>'submit');
-  print $q->p($q->label({-for=>'url'}, T('URL:')) . ' '
-	      . $q->textfield(-name=>'url', -id=>'url', -size=>80));
-  print $q->p({-style=>'font-size: 10pt'},
-	      "(Drag this bookmarklet to your bookmarks bar for easy access:",
-	      $q->a({-href=>q{javascript:location='}
-		   . $q->url()
-		   . qq{?url='+encodeURIComponent(window.location.href)}},
-		    "Submit $name") . ".)");
-  print html_toc();
-  print $q->submit('go', 'Add!');
-  print $q->end_form();
-}
-
-sub confirm {
-  my ($url, $name, $toc) = @_;
-  print $q->p("Please confirm that you want to add "
-	      . GetUrl($url, $name)
-	      . " to the section “$toc”.");
-  print $q->start_form(-method=>'get');
-  print $q->p($q->label({-for=>'name', -style=>'display: inline-block; width: 15em'},
-			T('Use a different link name:')) . ' '
-	      . $q->textfield(-style=>'display: inline-block; width:50ex',
-			      -name=>'name', -id=>'name', -size=>50, -default=>$name)
-	      . $q->br()
-	      . $q->label({-for=>'summary', -style=>'display: inline-block; width:15em'},
-			  T('An optional short summary:')) . ' '
-	      . $q->textfield(-style=>'display: inline-block; width:50ex',
-			      -name=>'summary', -id=>'summary', -size=>50)
-	      . $q->br()
-	      . $q->label({-for=>'username', -style=>'display: inline-block; width:15em'},
-			  T('Your name for the log file:')) . ' '
-	      . $q->textfield(-style=>'display: inline-block; width:50ex',
-			      -name=>'username', -id=>'username', -size=>50));
-  my $star = $q->img({-src=>$stardata, -class=>'smiley', -alt=>'☆'});
-  print '<p>Optionally: Do you want to rate it?<br />';
-  my $i = 0;
-  foreach my $label ($q->span({-style=>'display: inline-block; width:3em'}, $star)
-		     . 'I might use this for my campaign',
-		     $q->span({-style=>'display: inline-block; width:3em'}, $star x 2)
-		     . 'I have used this in a campaign and it worked as intended',
-		     $q->span({-style=>'display: inline-block; width:3em'}, $star x 3)
-		     . 'I have used this in a campaign and it was ' . $q->em('great')) {
-    $i++;
-    print qq{<label><input type="radio" name="stars" value="$i" $checked/>$label</label><br />};
-  }
-  print '</p>';
-  print $q->hidden('url', $url);
-  print $q->hidden('toc', $toc);
-  print $q->hidden('confirm', 1);
-  print $q->submit('go', 'Continue');
-  print $q->end_form();
-}
-
-# returns unquoted html
-sub get_name {
-  my $url = shift;
-  my $tree = HTML::TreeBuilder->new_from_content(GetRaw($url));
-  my $h = $tree->look_down('_tag', 'title');
-  $h = $tree->look_down('_tag', 'h1') unless $h;
-  $h = $h->as_text if $h;
-  return $h;
-}
-
-sub post_addition {
-  my ($url, $name, $toc, $summary) = @_;
-  my $id = FreeToNormal($name);
-  my $display = $name;
-  utf8::decode($display); # we're dealing with user input
-  utf8::decode($summary); # we're dealing with user input
-  print $q->p("Adding ", GetUrl($url, $display), " to “$toc”.");
-  # start with the homepage
-  my @pages = GetPageContent($HomePage) =~ /\* \[\[(.*?)\]\]/g;
-  for my $id (@pages) {
-    return post($id, undef, $name, $summary, $url, GetParam('stars', '')) if $id eq $toc;
-    my $data = GetPageContent(FreeToNormal($id));
-    while ($data =~ /(\*+ ([^][\n]*))$/mg) {
-      return post($id, $1, $name, $summary, $url, GetParam('stars', '')) if $2 eq $toc;
-    }
-  }
-  print $q->p("Whoops. I was unable to find “$toc” in the wiki. Sorry!");
-}
-
-sub post {
-  my ($id, $toc, $name, $summary, $url, $stars) = @_;
-  my $data = GetPageContent(FreeToNormal($id));
-  my $re = quotemeta($url);
-  if ($data =~ /$re\s+(.*?)\]/) {
-    my $display = $1;
-    print $q->p($q->strong("Oops, we seem to have a problem!"));
-    print $q->p(GetPageLink(NormalToFree($id)),
-		" already links to the URL you submitted:",
-	        GetUrl($url, $display));
-    return;
-  }
-  $stars = ' ' . (':star:' x $stars) if $stars;
-  $summary = ': ' . $summary if $summary;
-  if ($toc) {
-    $toc =~ /^(\*+)/;
-    my $depth = "*$1"; # one more!
-    my $regexp = quotemeta($toc);
-    $data =~ s/$regexp/$toc\n$depth \[$url $name\]$summary$stars/;
-  } else {
-    $data = "* [$url $name]$summary$stars\n" . $data;
-  }
-  my $ua = LWP::UserAgent->new;
-  my %params = (text => $data,
-  		title => $id,
-  		summary => $name,
-  		username => GetParam('username'),
-  		pwd => GetParam('pwd'));
-  # spam fighting modules
-  $params{$QuestionaskerSecretKey} = 1 if $QuestionaskerSecretKey;
-  $params{$HoneyPotOk} = time if $HoneyPotOk;
-  my $response = $ua->post($site, \%params);
-  if ($response->is_error) {
-    print $q->p("The submission failed!");
-    print $response->content;
-  } else {
-    print $q->p("See for yourself: ", GetPageLink($id));
-  }
-}
-
-sub print_end_of_page {
-    print $q->p('Questions? Send mail to Alex Schroeder <'
-		. $q->a({-href=>'mailto:kensanata@gmail.com'},
-			'kensanata@gmail.com') . '>');
-    print $q->end_div();
-    PrintFooter();
-}
-
-sub main {
-  $ConfigFile = "$DataDir/config"; # read the global config file
-  $DataDir = "$DataDir/$wiki";     # but link to the local pages
-  Init();                          # read config file (no modules!)
-  $ScriptName = $site;             # undo setting in the config file
-  $FullUrl = $site;                #
-  binmode(STDOUT,':utf8');
-  $q->charset('utf8');
-  if ($q->path_info eq '/source') {
-    seek DATA, 0, 0;
-    print "Content-type: text/plain; charset=UTF-8\r\n\r\n", <DATA>;
-  } elsif ($q->path_info eq '/structure') {
-    my ($values, $labels) = toc();
-    my @indented = map {
-      ($labels->{$_} || $_) =~ /^( *)/;
-      [$_, length($1)]
-    } @$values;
-    print "Content-type: application/json; charset=UTF-8\r\n\r\n";
-    binmode(STDOUT,':raw'); # because of encode_json
-    print JSON::PP::encode_json(\@indented);
-  } elsif ($q->path_info eq '/toc') {
-    my ($values, $labels) = toc();
-    print "Content-type: application/json; charset=UTF-8\r\n\r\n";
-    binmode(STDOUT,':raw'); # because of encode_json
-    print JSON::PP::encode_json($values);
-  } elsif ($q->path_info eq '/top') {
-    print GetHeader('', 'Top Blogs');
-    print $q->start_div({-class=>'content top'});
-    print $q->ol($q->li(top()));
-    print_end_of_page();
-  } elsif ($q->path_info =~ '^/match/(.*)') {
-    my $term = $1;
-    print GetHeader('', "Entries Matching '$term'");
-    print $q->start_div({-class=>'content match'});
-    print $q->ol($q->li(match($term)));
-    print_end_of_page();
-  } else {
-    push(@UserGotoBarPages, 'Help');
-    $UserGotoBar = $q->a({-href=>$q->url . '/source'}, 'Source');
-    print GetHeader('', 'Submit a new link');
-    print $q->start_div({-class=>'content index'});
-    my $url = GetParam('url');
-    my $name = UnquoteHtml(GetParam('name', get_name($url)));
-    my $toc = GetParam('toc');
-    my $confirm = GetParam('confirm');
-    my $summary = GetParam('summary');
-    if (not $url or not $toc) {
-      default();
-    } elsif (not $confirm) {
-      confirm($url, $name, $toc);
-    } else {
-      post_addition($url, $name, $toc, $summary);
-    }
-    print_end_of_page();
-  }
-}
-
-__DATA__

contrib/campaignwiki/add-link.pl

@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 
-# Copyright (C) 2011–2014  Alex Schroeder <alex@gnu.org>
+# Copyright (C) 2011–2015  Alex Schroeder <alex@gnu.org>
 
 # 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
@@ -25,11 +25,22 @@ use utf8;
 $RunCGI = 0;
 do "wiki.pl";
 
-# globals
-my $self = "http://campaignwiki.org/add-link";
-my $name = "OSR Links to Wisdom";
-my $wiki = 'LinksToWisdom';
-my $site = "http://campaignwiki.org/wiki/$wiki";
+# globals depending on the name of the script
+my ($self, $name, $wiki);
+if ($0 eq '/home/alex/campaignwiki.org/add-link.pl') {
+  $self = "https://campaignwiki.org/add-link";
+  $name = "OSR Links to Wisdom";
+  $wiki = 'LinksToWisdom';
+} elsif ($0 eq '/home/alex/campaignwiki.org/add-adventure.pl') {
+  $self = "https://campaignwiki.org/add-adventure";
+  $name = "OSR Links to Adventures";
+  $wiki = 'Adventures';
+} else {
+  ReportError('Cannot determine wiki!', '500 INTERNAL SERVER ERROR');
+}
+
+# derived variables
+my $site = "https://campaignwiki.org/wiki/$wiki";
 # my $site = "http://localhost/wiki.pl";
 my $home = "$site/$HomePage";
 # http://www.emacswiki.org/pics/star.png
@@ -37,6 +48,13 @@ my $stardata = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3e
 
 main();
 
+sub canonical {
+  my $url = shift;
+  # handle blogspot domain munging
+  $url =~ s/blogspot(\.[a-z]+)+/blogspot.com/;
+  return $url;
+}
+
 sub toc {
   # start with the homepage
   my @values;
@@ -62,9 +80,7 @@ sub top {
   for my $id (GetPageContent($HomePage) =~ /\* \[\[(.*?)\]\]/g) {
     for my $item (GetPageContent(FreeToNormal($id)) =~ /^\*+\s+\[(https?:\/\/[^\/\n\t ]+)/mg) {
       $n++;
-      # handle blogspot domain munging
-      $item =~ s/blogspot(\.[a-z]+)+/blogspot.com/;
-      $blog{$item}++;
+      $blog{canonical($item)}++;
     }
   }
   print $q->p("Total links counted: $n.");
@@ -127,6 +143,32 @@ sub default {
   print $q->end_form();
 }
 
+sub links {
+  # start with the homepage
+  my @links; # [["url", "title", "page id"], ...]
+  for my $id (GetPageContent($HomePage) =~ /\* \[\[(.*?)\]\]/g) {
+    for my $item (GetPageContent(FreeToNormal($id)) =~ /^\*+\s+\[(https?:\/\/.*?)\]/mg) {
+      my ($url, $title) = split(/\s+/, $item, 2);
+      push(@links, [$url, $title, $id]);
+    }
+  }
+  return @links;
+}
+
+sub is_duplicate {
+  my $url = shift;
+  for my $link (links()) {
+    if ($link->[0] eq $url) {
+      print $q->p($q->strong("Oops, we seem to have a problem!"));
+      print $q->p(GetPageLink(NormalToFree($link->[2])),
+                  " already links to the URL you submitted:",
+	        GetUrl($link->[0], $link->[1]));
+      return 1;
+    }      
+  }
+  return 0;
+}
+
 sub confirm {
   my ($url, $name, $toc) = @_;
   print $q->p("Please confirm that you want to add "
@@ -230,8 +272,7 @@ sub post {
   my $response = $ua->post($site, \%params);
   if ($response->is_error) {
     print $q->p("The submission failed!");
-    print $q->pre($response->status_line . "\n"
-  		  . $response->content);
+    print $response->content;
   } else {
     print $q->p("See for yourself: ", GetPageLink($id));
   }
@@ -286,13 +327,15 @@ sub main {
     $UserGotoBar = $q->a({-href=>$q->url . '/source'}, 'Source');
     print GetHeader('', 'Submit a new link');
     print $q->start_div({-class=>'content index'});
-    my $url = GetParam('url');
+    my $url = canonical(GetParam('url'));
     my $name = UnquoteHtml(GetParam('name', get_name($url)));
     my $toc = GetParam('toc');
     my $confirm = GetParam('confirm');
     my $summary = GetParam('summary');
-    if (not $url or not $toc) {
+    if (not $url) {
       default();
+    } elsif (not $toc) {
+      default() if not is_duplicate($url);
     } elsif (not $confirm) {
       confirm($url, $name, $toc);
     } else {

contrib/oddmuse-curl.el

@@ -1,6 +1,6 @@
 ;;; oddmuse-curl.el -- edit pages on an Oddmuse wiki using curl
 ;; 
-;; Copyright (C) 2006–2014  Alex Schroeder <alex@gnu.org>
+;; Copyright (C) 2006–2015  Alex Schroeder <alex@gnu.org>
 ;;           (C) 2007  rubikitch <rubikitch@ruby-lang.org>
 ;; 
 ;; Latest version:
@@ -233,10 +233,10 @@ calling `oddmuse-post' on an ordinary file that's not in Oddmuse
 Mode."
   (when (or (not oddmuse-wiki) arg)
     (set (make-local-variable 'oddmuse-wiki)
-         (completing-read "Wiki: " oddmuse-wikis nil t)))
+         (oddmuse-read-wiki)))
   (when (not oddmuse-page-name)
     (set (make-local-variable 'oddmuse-page-name)
-         (read-from-minibuffer "Pagename: " (buffer-name)))))
+         (oddmuse-read-pagename oddmuse-wiki t (buffer-name)))))
 
 (defvar oddmuse-minor nil
   "Is this edit a minor change?")
@@ -304,6 +304,9 @@ Example:
 	      (url-hexify-string pagename))
     (error nil)))
 
+(defvar oddmuse-pagename-history nil
+  "History of Oddmuse pages edited.")
+
 (defun oddmuse-read-pagename (wiki &optional require default)
   "Read a pagename of WIKI with completion.
 Optional arguments REQUIRE and DEFAULT are passed on to `completing-read'.
@@ -313,7 +316,45 @@ Typically you would use t and a `oddmuse-page-name', if that makes sense."
 			 (concat "Pagename [" default "]: ")
 		       "Pagename: ")
 		     (oddmuse-make-completion-table wiki)
-		     nil require nil nil default)))
+		     nil require nil
+                     'oddmuse-pagename-history default)))
+
+(defvar oddmuse-wiki-history nil
+  "History of Oddmuse Wikis edited.
+This is a list referring to `oddmuse-wikis'.")
+
+(defun oddmuse-read-wiki (&optional require default)
+  "Read wiki name with completion.
+Optional arguments REQUIRE and DEFAULT are passed on to `completing-read'.
+Typically you would use t and the current wiki, `oddmuse-wiki'.
+
+If you want to use the current wiki unless the function was
+called with C-u. This is what you want for functions that end
+users call and that you might want to run on a different wiki
+such as searching.
+
+\(let* ((wiki (or (and (not current-prefix-arg) oddmuse-wiki)
+		 (oddmuse-read-wiki))))
+        ...)
+ ...)
+
+If you want to ask only when there is no current wiki:
+
+\(let* ((wiki (or oddmuse-wiki (oddmuse-read-wiki)))
+        ...)
+ ...)
+
+If you want to ask for a wiki and provide the current one as
+default:
+
+\(oddmuse-read-wiki t oddmuse-wiki)"
+  (let ((completion-ignore-case t))
+    (completing-read (if default
+			 (concat "Wiki [" default "]: ")
+		       "Wiki: ")
+		     oddmuse-wikis
+                     nil require nil
+                     'oddmuse-wiki-history default)))
 
 (defun oddmuse-pagename (&optional arg)
   "Return the wiki and pagename the user wants to edit or follow.
@@ -327,7 +368,7 @@ Use this function when following links in regular wiki buffers,
 in Recent Changes, History Buffers, and also in text files and
 the like."
   (let* ((wiki (or (and (not arg) oddmuse-wiki)
-		  (completing-read "Wiki: " oddmuse-wikis nil t)))
+                   (oddmuse-read-wiki)))
 	 (pagename (or (and arg (oddmuse-read-pagename wiki))
 		       (oddmuse-pagename-at-point)
 		       (oddmuse-read-pagename wiki nil (word-at-point)))))
@@ -464,8 +505,8 @@ code on stdout, so usually we want to provide either 302 or 200
 as EXPECTED-CODE.
 
 In addition to that, we check the HTML in the buffer for
-indications of an error. If we find any, that willget reported as
-well."
+indications of an error. If we find any, that will get reported
+as well."
   (let* ((max-mini-window-height 1)
 	 (wiki (or wiki oddmuse-wiki))
 	 (pagename (or pagename oddmuse-page-name))
@@ -508,7 +549,7 @@ If available, return precomputed one."
 This command is used to reflect new pages to `oddmuse-pages-hash'."
   (interactive)
   (let* ((wiki (or wiki-arg
-                   (completing-read "Wiki: " oddmuse-wikis nil t oddmuse-wiki)))
+                   (oddmuse-read-wiki t oddmuse-wiki)))
          (url (cadr (assoc wiki oddmuse-wikis)))
          (command (oddmuse-format-command oddmuse-get-index-command))
          table)
@@ -797,23 +838,36 @@ Requires all the variables to be bound for
 (defun oddmuse-edit (wiki pagename)
   "Edit a page on a wiki.
 WIKI is the name of the wiki as defined in `oddmuse-wikis',
-PAGENAME is the pagename of the page you want to edit.
-Use a prefix argument to force a reload of the page."
+PAGENAME is the pagename of the page you want to edit. If the
+page is already in a buffer, pop to that buffer instead of
+loading the page Use a prefix argument to force a reload of the
+page."
   (interactive (oddmuse-pagename))
   (make-directory (concat oddmuse-directory "/" wiki) t)
   (let ((name (concat wiki ":" pagename)))
     (if (and (get-buffer name)
              (not current-prefix-arg))
         (pop-to-buffer (get-buffer name))
-      (set-buffer (find-file-noselect (concat oddmuse-directory "/" wiki "/" pagename)))
-      (erase-buffer)
+      ;; insert page content from the wiki
+      (set-buffer (get-buffer-create name))
+      (erase-buffer); in case of current-prefix-arg
       (oddmuse-run "Loading" oddmuse-get-command wiki pagename)
       (oddmuse-revision-put wiki pagename (oddmuse-get-latest-revision wiki pagename))
-      ;; fix it for VC in the new buffer because this is not a vc-checkout
+      ;; fix mode-line for VC in the new buffer because this is not a vc-checkout
+      (setq buffer-file-name (concat oddmuse-directory "/" wiki "/" pagename))
       (vc-mode-line buffer-file-name 'oddmuse)
       (pop-to-buffer (current-buffer))
-      (oddmuse-mode)
-      (write-file (buffer-file-name)))))
+      ;; check for a diff (this ends with display-buffer) and bury the
+      ;; buffer if there are no hunks
+      (when (file-exists-p buffer-file-name)
+        (diff-buffer-with-file)
+        (with-current-buffer (get-buffer "*Diff*")
+          (unless (next-property-change (point-min))
+            (kill-buffer))))
+      ;; this also changes the buffer name
+      (basic-save-buffer)
+      ;; this makes sure that the buffer name is set correctly
+      (oddmuse-mode))))
 
 (defalias 'oddmuse-go 'oddmuse-edit)
 
@@ -823,8 +877,8 @@ Use a prefix argument to force a reload of the page."
 WIKI is the name of the wiki as defined in `oddmuse-wikis'.
 The pagename begins with the current date."
   (interactive 
-   (list (or oddmuse-wiki
-	     (completing-read "Wiki: " oddmuse-wikis nil t oddmuse-wiki))
+   (list (or (and (not current-prefix-arg) oddmuse-wiki)
+             (oddmuse-read-wiki))
 	 (replace-regexp-in-string
 	  " +" "_"
 	  (read-from-minibuffer "Pagename: "
@@ -911,7 +965,7 @@ wiki (ie. it must use Perl syntax).
 Use a prefix argument to search a different wiki."
   (interactive "sSearch term: ")
   (let* ((wiki (or (and (not current-prefix-arg) oddmuse-wiki)
-		   (completing-read "Wiki: " oddmuse-wikis nil t)))
+		   (oddmuse-read-wiki)))
 	 (name (concat "*" wiki ": search for '" regexp "'*")))
     (if (and (get-buffer name)
              (not current-prefix-arg))
@@ -932,7 +986,7 @@ wiki (ie. it must use Perl syntax).
 Use a prefix argument to search a different wiki."
   (interactive "sPages matching: ")
   (let* ((wiki (or (and (not current-prefix-arg) oddmuse-wiki)
-		   (completing-read "Wiki: " oddmuse-wikis nil t)))
+		   (oddmuse-read-wiki)))
 	 (name (concat "*" wiki ": matches for '" regexp "'*")))
     (if (and (get-buffer name)
              (not current-prefix-arg))
@@ -945,15 +999,16 @@ Use a prefix argument to search a different wiki."
 	(dolist (line lines)
 	  (insert "[[" (replace-regexp-in-string "_" " " line) "]]\n")))
       (oddmuse-mode)
-      (set (make-local-variable 'oddmuse-wiki) wiki))))
+      (set (make-local-variable 'oddmuse-wiki) wiki)
+      (display-buffer (current-buffer)))))
 
 ;;;###autoload
 (defun oddmuse-rc (&optional include-minor-edits)
   "Show Recent Changes.
 With universal argument, reload."
   (interactive "P")
-  (let* ((wiki (or oddmuse-wiki
-		   (completing-read "Wiki: " oddmuse-wikis nil t)))
+  (let* ((wiki (or (and (not current-prefix-arg) oddmuse-wiki)
+                   (oddmuse-read-wiki)))
 	 (name (concat "*" wiki ": recent changes*")))
     (if (and (get-buffer name) (not current-prefix-arg))
         (pop-to-buffer (get-buffer name))

css/alex-2015.css

@@ -0,0 +1,642 @@
+/* This file is in the public domain. */
+
+/* @import url(https://fonts.googleapis.com/css?family=Noticia+Text:400,400italic,700italic,700&subset=latin,latin-ext); */
+
+/* vietnamese */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Noticia Text'), local('NoticiaText-Regular)'), url('/fonts/NoticiaText-Regular.woff') format('woff');
+  unicode-range: U+0102-0103, U+1EA0-1EF1, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Noticia Text'), local('NoticiaText-Regular)'), url('/fonts/NoticiaText-Regular.woff') format('woff');
+  unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Noticia Text'), local('NoticiaText-Regular)'), url('/fonts/NoticiaText-Regular.woff') format('woff');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
+}
+/* vietnamese */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Noticia Text Bold'), local('NoticiaText-Bold)'), url('/fonts/NoticiaText-Bold.woff') format('woff');
+  unicode-range: U+0102-0103, U+1EA0-1EF1, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Noticia Text Bold'), local('NoticiaText-Bold)'), url('/fonts/NoticiaText-Bold.woff') format('woff');
+  unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Noticia Text Bold'), local('NoticiaText-Bold)'), url('/fonts/NoticiaText-Bold.woff') format('woff');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
+}
+/* vietnamese */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: italic;
+  font-weight: 400;
+  src: local('Noticia Text Italic'), local('NoticiaText-Italic)'), url('/fonts/NoticiaText-Italic.woff') format('woff');
+  unicode-range: U+0102-0103, U+1EA0-1EF1, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: italic;
+  font-weight: 400;
+  src: local('Noticia Text Italic'), local('NoticiaText-Italic)'), url('/fonts/NoticiaText-Italic.woff') format('woff');
+  unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: italic;
+  font-weight: 400;
+  src: local('Noticia Text Italic'), local('NoticiaText-Italic)'), url('/fonts/NoticiaText-Italic.woff') format('woff');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
+}
+/* vietnamese */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: italic;
+  font-weight: 700;
+  src: local('Noticia Text Bold Italic'), local('NoticiaText-BoldItalic)'), url('/fonts/NoticiaText-BoldItalic.woff') format('woff');
+  unicode-range: U+0102-0103, U+1EA0-1EF1, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: italic;
+  font-weight: 700;
+  src: local('Noticia Text Bold Italic'), local('NoticiaText-BoldItalic)'), url('/fonts/NoticiaText-BoldItalic.woff') format('woff');
+  unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: italic;
+  font-weight: 700;
+  src: local('Noticia Text Bold Italic'), local('NoticiaText-BoldItalic)'), url('/fonts/NoticiaText-BoldItalic.woff') format('woff');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
+}
+@font-face {
+  font-family: 'Symbola';
+  src: local('Symbola'), url('/fonts/Symbola.woff') format('woff') url('/fonts/Symbola.ttf') format('truetype');
+}
+
+body, rss {
+    font-family: "Noticia Text", Symbola, serif;
+    font-style: normal;
+    font-size: 14pt;
+    margin: 1em 3em;
+    padding:0;
+}
+
+@media print {
+    body {
+	font-size: 12pt;
+	color: #000;
+	background-color: #fff;
+    }
+    
+    /* hide all the crap */
+    div.diff, div.diff+hr, div.refer, div.near, div.definition, div.sister,
+    div.cal, div.footer, span.specialdays, span.gotobar, a.edit, a.number span,
+    div.rc form, form.tiny, p.comment, p#plus1, div.g-plusone, div.content a.feed {
+	display:none;
+    }
+    div.content a.book,
+    div.content a.movie {
+	text-decoration: none;
+    }
+    a cite {
+	font-style: italic;
+    }
+    img[alt="RSS"] { display: none }
+    a.rss { font-size: 8pt }
+}
+
+/* headings: we can use larger sizes if we use a lighter color.
+   we cannot inherit the font-family because header and footer use a narrow font. */
+
+h1, h2, h3, title {
+    font-family: inherit;
+    font-weight: normal;
+}
+h1, channel title {
+    font-size: 32pt;
+    margin: 1em 0 0.5em 0;
+    padding: 0.4em 0;
+}
+h2 {
+    font-size: 18pt;
+    margin: 2em 0 0 0;
+    padding: 0;
+}
+h3 {
+    font-size: inherit;
+    font-weight: bold;
+    padding: 0;
+    margin: 1em 0 0 0;
+    clear: both;
+}
+
+/* headers in the journal are smaller */
+
+div.journal h1, item title {
+    font-size: inherit;
+    padding: 0;
+    clear: both;
+    border-bottom: 1px solid #000;
+}
+div.journal h2 {
+    font-family: inherit;
+    font-size: inherit;
+}
+div.journal h3 {
+    font-family: inherit;
+    font-size: inherit;
+    font-weight: inherit;
+    font-style: italic;
+}
+div.journal hr {
+    visibility: hidden;
+}
+p.more {
+    margin-top: 3em;
+}
+/* Links in headings appear on journal pages. */
+
+h1 a, h2 a, h3 a {
+    color:inherit;
+    text-decoration:none;
+    font-weight: normal;
+} 
+h1 a:visited, h2 a:visited, h3 a:visited {
+    color: inherit;
+}
+
+/* for download buttons and the like */
+
+.button {
+    display: inline-block;
+    font-size: 120%;
+    cursor: pointer;
+    padding: 0.4em 0.6em;
+    text-shadow: 0px -1px 0px #ccc;
+    background-color: #cfa;
+    border: 1px solid #9d8;
+    border-radius: 5px;
+    box-shadow: 0px 1px 3px white inset, 0px 1px 3px black;
+}
+
+.button .icon {
+    color: #363;
+    text-shadow: 0px -1px 1px white, 0px 1px 3px #666;
+}
+
+.button a {
+    text-decoration: none;
+    font-weight: normal;
+}
+
+/* links */
+
+a.pencil {
+    padding-left: 1ex;
+    text-decoration: none;
+    color: inherit;
+    visibility: hidden;
+    transition: visibility 0s 1s, opacity 1s linear;
+    opacity: 0;
+}
+*:hover > a.pencil {
+    visibility: visible;
+    transition: opacity .5s linear;
+    opacity: 1;
+}
+@media print {
+    a.pencil {
+	display: none;
+    }
+}
+
+a.number {
+    text-decoration: none;
+}
+
+/* stop floating content from flowing over the footer */
+
+hr {
+    clear: both;
+}
+
+/* the distance between links in the navigation bars */
+
+span.bar a {
+    margin-right: 1ex;
+}
+
+a img {
+    border: none;
+}
+
+/* search box in the top bar */
+
+.header form, .header p {
+    display: inline;
+    white-space: nowrap;
+}
+label[for="searchlang"], #searchlang, .header input[type="submit"] {
+    /* don't use display: none! http://stackoverflow.com/questions/5665203/getting-iphone-go-button-to-submit-form */
+    visibility: hidden; position: absolute;
+}
+/* wrap on the iphone */
+@media media only screen and (max-device-width: 480px) {
+}
+
+.header input {
+    width: 10ex;
+}
+
+/* other form fields */
+
+input[type="text"] {
+    padding: 0;
+    font-size: 80%;
+    line-height: 125%;
+}
+
+/* code */
+
+textarea, pre, code, tt {
+    font-family: "Andale Mono", Monaco, "Courier New", Courier, monospace, "Symbola";
+    font-size: 80%;
+}
+
+pre {
+    overflow:hidden;
+    white-space: pre-wrap;      /* CSS 3 */
+    white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
+    white-space: -pre-wrap;     /* Opera 4-6 */
+    white-space: -o-pre-wrap;   /* Opera 7 */
+    word-wrap: break-word;      /* Internet Explorer 5.5+ */
+}
+
+/* styling for divs that will be invisible when printing
+   when printing. */
+
+div.header, div.footer, div.near, div.definition, p.comment, a.tag {
+    
+    font-size: 14pt;
+}
+@media print {
+    div.header, div.footer, div.near, div.definition, p.comment, a.tag {
+	font-size: 8pt;
+    }
+}
+
+div.footer form.search {
+    display: none;
+}
+div.rc li + li {
+    margin-top: 1em;
+}
+div.rc li strong, table.history strong, strong.description {
+    font-family: inherit;
+    font-weight: inherit;
+}
+div.diff {
+    padding-left: 5%;
+    padding-right: 5%;
+    font-size: 12pt;
+    color: #000;
+
+}
+div.old {
+    background-color: #ffffaf;
+}
+div.new {
+    background-color: #cfffcf;
+}
+
+div.refer {
+    padding-left: 5%;
+    padding-right: 5%;
+    font-size: 12pt;
+}
+
+div.message {
+    background-color:#fee;
+    color:#000;
+}
+
+img.xml {
+    border:none;
+    padding:1px;
+}
+a.small img {
+    max-width:300px;
+}
+a.large img {
+    max-width:600px;
+}
+div.sister {
+    margin-right:1ex;
+    background-color:inherit;
+}
+div.sister p {
+    margin-top:0;
+}
+div.sister hr {
+    display:none;
+}
+div.sister img {
+    border:none;
+}
+
+div.near, div.definition {
+    background-color:#efe;
+}
+
+div.sidebar {
+    float:right;
+    border:1px dotted #000;
+    padding:0 1em;
+}
+div.sidebar ul {
+    padding-left:1em;
+}
+
+/* replacements, features */
+
+ins {
+    color: #b33;
+    text-decoration: none;
+}
+acronym, abbr {
+    letter-spacing:0.1em;
+    font-variant:small-caps;
+}
+
+/* Interlink prefix not shown */
+a .site, a .separator {
+        display: none;
+}
+a cite { font:inherit; }
+/* browser borkage */
+textarea[name="text"] { width:97%; height:80%; }
+textarea[name="summary"] { width:97%; height:3em; }
+/* comments */
+textarea[name="aftertext"] { width:97%; height:10em; }
+div.commentshown {
+    font-size: 12pt;
+    padding: 2em 0;
+}
+div.commenthidden {
+    display:none;
+}
+div.commentshown {
+    display:block;
+}
+p.comment {
+    margin-bottom: 0;
+}
+div.comment {
+    font-size: 14pt;
+}
+div.comment h2 {
+    margin-top: 5em;
+}
+/* comment pages with username, homepage, and email subscription */
+.comment form span { display: block; }
+.comment form span label { display: inline-block; width: 10em; }
+/* IE sucks */
+.comment input#username,
+.comment input#homepage,
+.comment input#mail { width: 20em; }
+
+/* cal */
+div.month { padding:0; margin:0 2ex; }
+body > div.month {
+    float:right;
+    background-color: inherit;
+    border:solid thin;
+    padding:0 1ex;
+}
+.year > .month {
+    float:left;
+}
+.footer {
+    clear:both;
+}
+.month .title a.local {
+    background-color: inherit;
+}
+.month a.local {
+    background-color: #ddf;
+}
+.month a.today {
+    background-color: #fdd;
+}
+.month a {
+    color:inherit;
+    font-weight:inherit;
+    text-decoration: none;
+    background-color: #eee;
+}
+/* history tables and other tables */
+table.history {
+    border: none;
+}
+td.history {
+    border: none;
+}
+
+table.user {
+    border: none;
+    border-top: 1px solid #ccc;
+    border-bottom: 1px solid #ccc;
+    padding: 1em;
+    margin: 1em 2em;
+}
+table.user tr td, table.user tr th {
+    border: none;
+    padding: 0.2em 0.5em;
+    vertical-align: top;
+}
+table.arab tr th {
+    font-weight:normal;
+    text-align:left;
+    vertical-align:top;
+}
+table.arab, table.arab tr th, table.arab tr td {
+    border:none;
+}
+th.nobreak {
+    white-space:nowrap;
+}
+table.full { width:99%; margin-left:1px; }
+table.j td, table.j th, table tr td.j, table tr th.j, .j { text-align:justify; }
+table.l td, table.l th, table tr td.l, table tr th.l, .l { text-align:left; }
+table.r td, table.r th, table tr td.r, table tr th.r, .r { text-align:right; }
+table.c td, table.c th, table tr td.c, table tr th.c, .c { text-align:center; }
+table.t td { vertical-align: top; }
+td.half { width:50%; }
+td.third { width:33%; }
+
+form table td { padding:5px; }
+
+/* lists */
+dd { padding-bottom:0.5ex; }
+dl.inside dt { float:left; }
+/* search */
+div.search span.result { font-size:larger; }
+div.search span.info { font-size:smaller; font-style:italic; }
+div.search p.result { display:none; }
+
+img.logo {
+    float: right;
+    margin: 0 0 0 1ex;
+    padding: 0;
+    border: 1px solid #000;
+    opacity: 0.3;
+    background-color:#ffe;
+}
+
+/* images */
+
+div.content a.feed img, div.journal a.feed img,
+div.content a img.smiley, div.journal a img.smiley, img.smiley,
+div.content a.inline img, div.journal a.inline img,
+div.content li a.image img, div.journal li a.image img { 
+    margin: 0; padding: 0; border: none;
+}
+div.image a img {
+    margin-bottom: 0;
+}
+div.image span.caption {
+    margin: 0 1em;
+}
+
+img {
+    max-width: 100%;
+}
+
+.left { float:left; margin-right: 1em; }
+.right { float:right; margin-left: 1em; }
+.half a img { height: 50%; width: 50%; }
+div.left .left, div.right .right {
+    float:none;
+}
+.center { text-align:center; }
+table.aside {
+    float:right;
+    width:40%;
+    margin-left: 1em;
+    padding: 1ex;
+    border: 1px dotted #666;
+}
+table.aside td {
+    text-align:left;
+}
+div.sidebar {
+    float:right; width: 250px;
+    text-align: right;
+    border: none;
+    margin: 1ex;
+}
+
+.bigsidebar {
+    float:right;
+    width: 500px;
+    border: none;
+    margin-left: 1ex;
+    font-size: 80%;
+}
+
+dl.irc dt { width:20ex; float:left; text-align:right; clear:left; }
+dl.irc dt span.time { float:left; }
+dl.irc dd { margin-left:22ex; }
+
+/* portrait */
+
+div.footer, div.comment, hr { clear: both; }
+.portrait { float: left; font-size: small; margin-right: 1em; }
+.portrait a { color: #999; }
+
+div.left { float:left; margin:1em; padding: 0.5em; }
+div.left p { display:table-cell; }
+div.left p + p { display:table-caption; caption-side:bottom; }
+
+p.table a { float:left; width:20ex; }
+p.table + p { clear:both; }
+
+/* no bleeding
+@media screen {
+    div.content, div.rc {
+	overflow:hidden;
+    }
+} */
+
+/* rss */
+
+channel * { display: block; }
+
+channel title {
+    margin-top: 30pt;
+}
+copyright {
+    font-size: 14pt;
+    margin-top: 1em;
+}
+channel > link:before {
+    font-size: 18pt;
+    display: block;
+    margin: 1em;
+    padding: 0.5em;
+    content: "This is an RSS feed, designed to be read in a feed reader.";
+    color: red;
+    border: 1px solid red;
+}
+link, license {
+    font-size: 11pt;
+    margin-bottom: 9pt;
+}
+username:before { content: "Last edited by "; }
+username:after { content: "."; }
+generator:before { content: "Feed generated by "; }
+generator:after { content: "."; }
+channel description {
+    font-weight: bold;
+}
+item description {
+    font-style: italic;
+    font-weight: normal;
+    margin-bottom: 1em;
+}
+docs, language,
+pubDate, lastBuildDate, ttl, guid, category, comments,
+docs, image title, image link,
+status, version, diff, history, importance {
+    display: none;
+}

css/light.css

@@ -238,29 +238,8 @@ a:active {
 	img[smiley] { line-height: inherit; }
 }
 
-/* edit paragraphs */
-a.pencil {
-    padding-left: 1ex;
-    text-decoration: none;
-    color: inherit;
-    visible: hidden;
-    transition: visibility 0s 1s, opacity 1s linear;
-    opacity: 0;
-}
-*:hover > a.pencil {
-    visible: visible;
-    transition: opacity .5s linear;
-    opacity: 1;
-}
-@media print {
-    a.pencil {
-	display: none;
-    }
-}
-table a.pencil {
-    position: absolute;
-    right: inherit;
-}
+/* edit paragraphs: no more */
+a.pencil { display: none; }
 
 /* table of contents */
 .toc {
@@ -310,6 +289,8 @@ img.logo {
 	border: 1px solid black;
 }
 
+.hexmap a img { background: #fff; border: none; }
+
 /* fancy bold underline */
 em.underline { font-weight: bold; }
 

css/minimal.css

@@ -0,0 +1,88 @@
+body { background-color:#FFF; color:#000; margin:1em 2em; }
+@media only screen and (max-device-width: 480px) {
+    body { font-size: 300%; }
+}
+textarea { width:100%; }
+a:link { color:#00F; }
+a:visited { color:#A0A; }
+a:active { color:#F00; }
+a.alias { text-decoration:none; border-bottom: thin dashed; }
+a.near:link { color:#093; }
+a.near:visited { color:#550; }
+img.logo { float: right; clear: right; border-style:none; }
+div.diff { padding-left:5%; padding-right:5%; }
+div.old { background-color:#FFFFAF; }
+div.new { background-color:#CFFFCF; }
+div.message { background-color:#FEE; }
+div.journal h1 { font-size:large; }
+table.history { border-style:none; }
+td.history { border-style:none; }
+span.result { font-size:larger; }
+span.info { font-size:smaller; font-style:italic; }
+div.rss { background-color:#EEF; }
+div.search { background-color:#F1F5FF }
+div.sister { float:left; margin-right:1ex; background-color:#FFF; }
+div.sister p { margin-top:0; }
+div.sister img { border:none; }
+div.near, div.definition { background-color:#EFE; }
+div.near p, div.definition p { margin-top:0; }
+form.comment span { display: block; }
+@media print {
+    body { font:12pt sans-serif; }
+    a, a:link, a:visited { color:#000; text-decoration:none; font-style:oblique; }
+    h1 a, h2 a, h3 a, h4 a { font-style:normal; }
+    a.edit, div.footer, form, span.gotobar, a.number span { display:none; }
+    a[class="url number"]:after, a[class="inter number"]:after { content:"[" attr(href) "]"; }
+    a[class="local number"]:after { content:"[" attr(title) "]"; }
+    img[smiley] { line-height: inherit; }
+}
+/* calendar */
+div.month { margin:0; padding:0; font-size:x-small; float:right; }
+div.content div.month { float:none; }
+div.footer { clear:both; }
+div.year div.month { float:left; font-size:medium; padding:1ex; }
+div.month pre { margin:0; padding:0 0 0 1ex; background-color:#ffe; }
+div.month a { text-decoration:none; color:inherit; }
+div.month span.title a { background-color:inherit; }
+div.month a.exact { background-color:#eef; }
+div.month a.collection { background-color:#ccf; }
+div.month a.today { background-color:#fcc; }
+div.month a[class~="today"][class~="exact"] { background-color:#fcf; }
+div.month a[class~="today"][class~="collection"] { background-color:#faf; }
+@media print {
+    div.month { display: none; }
+    div.year div.month { display: block; }
+    div.year div.month a { display: inline; }
+}
+/* crumbs */
+span.crumbs { font-size: smaller; }
+/* dynamic comments */
+div.commenthidden { display:none; }
+div.commentshown { display:block; background-color:#ffc; padding:1ex; }
+/* irc */
+dl.irc dt { width:12ex; float:left; text-align:right; }
+dl.irc dd { margin-left:15ex; }
+/* page trail */
+@media print { span.trail { display: none; }}
+/* portrait support */
+img.portrait { float: left; clear: left; margin: 1ex; border:#999 1px solid; }
+div.footer, div.comment, hr { clear: both; }
+div.portrait { float: left; clear: left; font-size: xx-small; margin-right: 1em; }
+div.portrait img.portrait { float: none; margin: 0; }
+div.portrait a { text-decoration: none; color: #999; }
+div.color { clear: both; }
+div.one { background-color: #ddd; }
+/* referrer tracking */
+div.refer { padding-left:5%; padding-right:5%; font-size:smaller; }
+@media print { div.refer { display:none; }}
+/* usemod, tables, long tables */
+table.user { border-style:solid; border-width:thin; }
+table.user td, table.user th { border-style:solid; border-width:thin; padding:5px; }
+table.user th { font-weight:bold; }
+table.user td.r { text-align:right; }
+table.user td.l { text-align:left; }
+table.user td.c { text-align:center; }
+table.user td.j { text-align:justify; }
+table.user td.mark { background-color:yellow; }
+/* sidebar */
+div.sidebar { float: left; margin-right: 2em; margin-bottom: 3em; }

css/oddmuse.css

@@ -58,8 +58,12 @@ div.left .left, div.right .right {
 span.author {
     color: #501;
 }
+span.bar a:first-child {
+    margin-left:-0.5ex;
+}
 span.bar a {
-	padding-right:1ex;
+    padding-right:0.5ex;
+    padding-left:-0.5ex;
 }
 body {
     background:#fff;

css/wiki.css

@@ -1,88 +1,263 @@
-body { background-color:#FFF; color:#000; margin:1em 2em; }
-@media only screen and (max-device-width: 480px) {
-    body { font-size: 300%; }
+/* This is the default CSS file for Oddmuse wikis. It is dedicated to
+   the public domain. You can copy, modify, distribute and use the
+   work, even for commercial purposes, all without asking permission.
+   https://creativecommons.org/publicdomain/zero/1.0/ */
+
+body {
+    background: #fff;
+    padding: 2% 5%;
+    margin: 0;
+    font-family: "Palatino Linotype", "Book Antiqua", Palatino, serif;
+    font-size: 15pt;
 }
-textarea { width:100%; }
-a:link { color:#00F; }
-a:visited { color:#A0A; }
-a:active { color:#F00; }
-a.alias { text-decoration:none; border-bottom: thin dashed; }
-a.near:link { color:#093; }
-a.near:visited { color:#550; }
-img.logo { float: right; clear: right; border-style:none; }
-div.diff { padding-left:5%; padding-right:5%; }
-div.old { background-color:#FFFFAF; }
-div.new { background-color:#CFFFCF; }
-div.message { background-color:#FEE; }
-div.journal h1 { font-size:large; }
-table.history { border-style:none; }
-td.history { border-style:none; }
-span.result { font-size:larger; }
-span.info { font-size:smaller; font-style:italic; }
-div.rss { background-color:#EEF; }
-div.search { background-color:#F1F5FF }
-div.sister { float:left; margin-right:1ex; background-color:#FFF; }
-div.sister p { margin-top:0; }
-div.sister img { border:none; }
-div.near, div.definition { background-color:#EFE; }
-div.near p, div.definition p { margin-top:0; }
-form.comment span { display: block; }
-@media print {
-    body { font:12pt sans-serif; }
-    a, a:link, a:visited { color:#000; text-decoration:none; font-style:oblique; }
-    h1 a, h2 a, h3 a, h4 a { font-style:normal; }
-    a.edit, div.footer, form, span.gotobar, a.number span { display:none; }
-    a[class="url number"]:after, a[class="inter number"]:after { content:"[" attr(href) "]"; }
-    a[class="local number"]:after { content:"[" attr(title) "]"; }
-    img[smiley] { line-height: inherit; }
+
+div.header h1 {
+    margin-top: 2ex;
 }
-/* calendar */
-div.month { margin:0; padding:0; font-size:x-small; float:right; }
-div.content div.month { float:none; }
-div.footer { clear:both; }
-div.year div.month { float:left; font-size:medium; padding:1ex; }
-div.month pre { margin:0; padding:0 0 0 1ex; background-color:#ffe; }
-div.month a { text-decoration:none; color:inherit; }
-div.month span.title a { background-color:inherit; }
-div.month a.exact { background-color:#eef; }
-div.month a.collection { background-color:#ccf; }
-div.month a.today { background-color:#fcc; }
-div.month a[class~="today"][class~="exact"] { background-color:#fcf; }
-div.month a[class~="today"][class~="collection"] { background-color:#faf; }
-@media print {
-    div.month { display: none; }
-    div.year div.month { display: block; }
-    div.year div.month a { display: inline; }
+
+a {
+    text-decoration: none;
+    color: #a00;
+}
+
+a:visited {
+    color: #d88;
+}
+
+div.header h1 a:hover, h1 a:hover, h2 a:hover, h3 a:hover, h4 a:hover,
+a:hover, span.caption a.image:hover {
+     background: #fee;
+}
+
+img.logo {
+    float: right;
+    clear: right;
+    border-style: none;
+    background-color: #fff;
+}
+
+img {
+    padding: 0.5em;
+    margin: 0 1em;
+    max-width: 95%;
+}
+
+a.image:hover {
+    background: inherit;
+}
+
+a.image:hover img {
+    background: #fee;
+}
+
+/* a.definition soll aussehen wie h2 */
+h2, p a.definition {
+    display: block;
+    clear: both;
+}
+
+/* Such Link im h1 soll nicht auffallen. */
+h1, h2, h3, h4, h1 a, h1 a:visited, p a.definition {
+    color: #666;
+    font-size: 30pt;
+    font-weight: normal;
+    margin: 4ex 0 1ex 0;
+    padding: 0;
+    border-bottom: 1px solid #000;
+}
+
+h3, h4 {
+    font-size: inherit;
+}
+
+div.diff {
+    padding: 1em 3em;
+}
+div.old {
+    background-color: #FFFFAF;
+}
+div.new {
+    background-color: #CFFFCF;
+}
+div.old p, div.new p {
+    padding: 0.5em 0;
+}
+div.refer { padding-left: 5%; padding-right: 5%; font-size: smaller; }
+div[class="content refer"] p { margin-top: 2em; }
+div.content div.refer hr { display: none; }
+div.content div.refer { padding: 0; font-size: medium; }
+div.content div.refer p { margin: 0; }
+div.refer a { display: block; }
+table.history { border-style: none; }
+td.history { border-style: none; }
+
+table.user {
+    border-style: none;
+    margin-left: 3em;
+}
+table.user tr td {
+    border-style: none;
+    padding: 0.5ex 1ex;
+}
+
+dt {
+    font-weight: bold;
+}
+dd {
+    margin-bottom: 1ex;
+}
+
+textarea {
+    width: 100%;
+    height: 80%;
+    font-size: 12pt;
+}
+textarea#summary { height: 3em; }
+input {
+    font-size: 12pt;
+}
+div.image span.caption {
+    margin: 0 1em;
+}
+li img, img.smiley, .noborder img {
+    border: none;
+    padding: 0;
+    margin: 0;
+    background: #fff;
+    color: #000;
+}
+/* Google +1 */
+a#plus1 img {
+    background-color: #fff;
+    padding: 0;
+    margin: 0;
+    border: none;
+}
+
+div.header img, div.footer img { border: 0; padding: 0; margin: 0; }
+/* No goto bar at the bottom. */
+.footer .gotobar, .footer .edit br { display: none; }
+
+.left { float: left; }
+.right { float: right; }
+div.left .left, div.right .right {
+    float: none;
+}
+.center { text-align: center; }
+
+span.author {
+    color: #501;
+}
+
+span.bar a:first-child {
+    margin-left: -0.5ex;
+}
+
+span.bar a {
+    padding-right: 0.5ex;
+    padding-left: 0.5ex;
+}
+
+.rc .author {
+    color: #655;
+}
+
+.rc strong {
+    font-weight: normal;
+    color: inherit;
+}
+
+.rc li {
+    position: relative;
+    padding: 1ex 0;
+}
+
+hr {
+    border: none;
+    color: black;
+    background-color: #000;
+    height: 2px;
+    margin-top: 2ex;
+}
+
+div.footer hr {
+    height: 4px;
+    margin: 2em 0 1ex 0;
+    clear: both;
+}
+
+div.content > div.comment {
+    border-top: none;
+    padding-top: none;
+    border-left: 1ex solid #bbb;
+    padding-left: 1ex;
+}
+
+div.wrapper > div.comment {
+    border-top: 2px solid #000;
+    padding-top: 2em;
+}
+
+pre {
+    padding: 0.5em;
+    margin-left: 1em;
+    margin-right: 2em;
+    white-space: pre;
+    overflow: hidden;
+    white-space: pre-wrap;      /* CSS 3 */
+    white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
+    white-space: -pre-wrap;     /* Opera 4-6 */
+    white-space: -o-pre-wrap;   /* Opera 7 */
+    word-wrap: break-word;      /* Internet Explorer 5.5+ */
+}
+
+tt, pre, code {
+    font-size: 80%;
+};
+
+@font-face {
+  font-family: 'Gentium Basic';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Gentium Basic Bold'), local('GentiumBasic-Bold'), url(/fonts/GenBasB.woff) format('woff');
+}
+
+@font-face {
+  font-family: 'Gentium Basic';
+  font-style: italic;
+  font-weight: 400;
+  src: local('Gentium Basic Italic'), local('GentiumBasic-Italic'), url(/fonts/GenBasI.woff) format('woff');
+}
+
+@font-face {
+  font-family: 'Gentium Basic';
+  font-style: italic;
+  font-weight: 700;
+  src: local('Gentium Basic Bold Italic'), local('GentiumBasic-BoldItalic'), url(/fonts/GenBasBI.woff) format('woff');
+}
+
+@font-face {
+  font-family: 'Gentium Basic';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Gentium Basic'), local('GentiumBasic'), url(/fonts/GenBasR.woff) format('woff');
+}
+
+@font-face {
+  font-family: 'Gentium Plus';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Gentium Plus'), local('GentiumPlus'), url(/fonts/GentiumPlus-R.woff) format('woff');
+}
+
+@font-face {
+  font-family: 'Gentium Plus';
+  font-style: italic;
+  font-weight: 400;
+  src: local('Gentium Plus Italic'), local('GentiumPlus-Italic'), url(/fonts/GentiumPlus-I.woff) format('woff');
+}
+
+@font-face {
+  font-family: 'Symbola';
+  src: local('Symbola'), url('/fonts/Symbola.woff') format('woff') url('/fonts/Symbola.ttf') format('truetype');
 }
-/* crumbs */
-span.crumbs { font-size: smaller; }
-/* dynamic comments */
-div.commenthidden { display:none; }
-div.commentshown { display:block; background-color:#ffc; padding:1ex; }
-/* irc */
-dl.irc dt { width:12ex; float:left; text-align:right; }
-dl.irc dd { margin-left:15ex; }
-/* page trail */
-@media print { span.trail { display: none; }}
-/* portrait support */
-img.portrait { float: left; clear: left; margin: 1ex; border:#999 1px solid; }
-div.footer, div.comment, hr { clear: both; }
-div.portrait { float: left; clear: left; font-size: xx-small; margin-right: 1em; }
-div.portrait img.portrait { float: none; margin: 0; }
-div.portrait a { text-decoration: none; color: #999; }
-div.color { clear: both; }
-div.one { background-color: #ddd; }
-/* referrer tracking */
-div.refer { padding-left:5%; padding-right:5%; font-size:smaller; }
-@media print { div.refer { display:none; }}
-/* usemod, tables, long tables */
-table.user { border-style:solid; border-width:thin; }
-table.user td, table.user th { border-style:solid; border-width:thin; padding:5px; }
-table.user th { font-weight:bold; }
-table.user td.r { text-align:right; }
-table.user td.l { text-align:left; }
-table.user td.c { text-align:center; }
-table.user td.j { text-align:justify; }
-table.user td.mark { background-color:yellow; }
-/* sidebar */
-div.sidebar { float: left; margin-right: 2em; margin-bottom: 3em; }

info-ref

@@ -1,202 +0,0 @@
-#!/usr/bin/perl
-# Copyright (C) 2005  Alex Schroeder <alex@emacswiki.org>
-#
-# 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.
-#
-# 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.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
-
-use strict;
-use warnings;
-use CGI;
-use LWP::UserAgent;
-use XML::LibXML;
-use URI;
-
-my @indexes = qw(
-  http://www.gnu.org/software/emacs/manual/html_node/Command-Index.html
-  http://www.gnu.org/software/emacs/manual/html_node/Variable-Index.html
-  http://www.gnu.org/software/emacs/manual/html_node/Concept-Index.html
-  http://www.gnu.org/software/emacs/elisp-manual/html_node/elisp_728.html
-  http://www.gnu.org/software/emacs/elisp-manual/html_node/elisp_729.html
-  http://www.gnu.org/software/emacs/elisp-manual/html_node/elisp_730.html
-  http://www.gnu.org/software/emacs/elisp-manual/html_node/elisp_731.html
-  http://www.gnu.org/software/emacs/elisp-manual/html_node/elisp_732.html
-  http://www.gnu.org/software/emacs/elisp-manual/html_node/elisp_733.html
-  http://www.gnu.org/software/emacs/elisp-manual/html_node/elisp_734.html
-  http://www.gnu.org/software/emacs/elisp-manual/html_node/elisp_735.html
-  http://www.gnu.org/software/emacs/elisp-manual/html_node/elisp_736.html
-  http://www.gnu.org/software/emacs/elisp-manual/html_node/elisp_737.html
-  http://www.gnu.org/software/emacs/elisp-manual/html_node/elisp_738.html
-  http://www.gnu.org/software/emacs/elisp-manual/html_node/elisp_739.html
-  http://www.gnu.org/software/emacs/elisp-manual/html_node/elisp_740.html
-  http://www.gnu.org/software/emacs/elisp-manual/html_node/elisp_741.html
-  http://www.gnu.org/software/emacs/elisp-manual/html_node/elisp_742.html
-  http://www.gnu.org/software/emacs/elisp-manual/html_node/elisp_743.html
-  http://www.gnu.org/software/emacs/elisp-manual/html_node/elisp_744.html
-);
-
-my $db = '/org/org.emacswiki/htdocs/emacs/info-ref.dat';
-
-my $nl = "\n";
-my $fs = "\023";
-my $gs = "\024";
-my $rs = "\025";
-
-my $q = new CGI;
-ProcessRequest();
-
-sub ProcessRequest {
-  if ($q->param('init')) {
-    Initialize();
-  } elsif ($q->param('find')) {
-    Find($q->param('find'));
-  } else {
-    ShowForm();
-  }
-}
-
-sub ShowForm {
-  print $q->header, $q->start_html,
-    $q->start_form, "Index entry: ", $q->textfield('find'), $q->submit, $q->end_form,
-    $q->p('$Id: info-ref,v 1.6 2005/08/31 14:01:17 as Exp $'),
-    $q->end_html;
-}
-
-sub Find {
-  my $str = shift;
-  my %map = ();
-  my $data = ReadFileOrDie($db);
-  foreach my $line (split(/$nl/, $data)) {
-    my ($key, $rest) = split(/$fs/, $line);
-    $map{$key} = ();
-    foreach my $a (split(/$gs/, $rest)) {
-      my ($link, $label) = split(/$rs/, $a);
-      $map{$key}{$link} = $label;
-    }
-  }
-  my @links = keys %{$map{$str}};
-  if ($#links < 0) {
-    ReportError("No matches found for '$str'", '404 Not Found');
-  } elsif ($#links == 0) {
-    print $q->redirect($links[0]);
-  } else {
-    my @list = map { $q->a({-href=>$_}, $map{$str}{$_}) } @links;
-    print $q->header, $q->h1($str), $q->ol($q->li(\@list));
-  }
-}
-
-sub Initialize {
-  my %map = ();
-  print $q->header, $q->start_html;
-  foreach my $url (@indexes) {
-    print $q->p($url);;
-    # determine base URI
-    my $base = URI->new($url);
-    # fetch and parse data
-    my $data = GetRaw($url);
-    # some markup fixes for the elisp manual
-    $data =~ s/&([<"])/&amp;$1/g;
-    $data =~ s/<([<"])/&lt;$1/g;
-    $data =~ s/="fn_"">/="fn_&quot;">/;
-    $data =~ s/<!DOCTYPE.*?>//;
-    $data =~ s'</?font.*?>''gi;
-    $data =~ s'</table><br></P>'</table><br>';
-    my $parser = XML::LibXML->new();
-    my $doc;
-    eval { $doc = $parser->parse_html_string($data); };
-    print $q->p($@) if $@;
-    next if $@;
-    # emacs manual
-    my @nodelist = $doc->findnodes('/html/body/ul/li');
-    foreach my $node (@nodelist) {
-      my $text = $node->textContent;
-      my ($key) = split(/: /, $text);
-      my $a = $node->findnodes('descendant::a')->[0];
-      my $label = $a->textContent;
-      my $link = $a->getAttribute('href');
-      my $l = URI->new_abs($link, $base);
-      # print "$key -> $label $l\n";
-      $map{$key} = () unless $map{$key};
-      $map{$key}{$l->canonical} = $label;
-    }
-    # elisp manual
-    @nodelist = $doc->findnodes('descendant::table[position()=3]/descendant::tr');
-    foreach my $node (@nodelist) {
-      my ($item, $section) = $node->findnodes('td/a');
-      next unless $item and $section;
-      my $key = $item->textContent;
-      my $label = $section->textContent;
-      my $link = $item->getAttribute('href');
-      my $l = URI->new_abs($link, $base);
-      # print "$key -> $label $l\n";
-      $map{$key} = () unless $map{$key};
-      $map{$key}{$l->canonical} = $label;
-    }
-  }
-  my $data = join($nl, map {
-    my $key = $_;
-    $key . $fs . join($gs, map {
-      my $link = $_;
-      join($rs, $link, $map{$key}{$link});
-    } keys %{$map{$_}})
-  } keys %map);
-  WriteStringToFile($db, $data);
-  print $q->p('Database initialized'), $q->end_html;
-}
-
-sub GetRaw {
-  my $uri = shift;
-  return unless eval { require LWP::UserAgent; };
-  my $ua = LWP::UserAgent->new;
-  my $response = $ua->get($uri);
-  return $response->content;
-}
-
-sub ReadFile {
-  my ($filename) = @_;
-  my ($data);
-  local $/ = undef;   # Read complete files
-  if (open(IN, "<$filename")) {
-    $data=<IN>;
-    close IN;
-    return (1, $data);
-  }
-  return (0, '');
-}
-
-sub ReadFileOrDie {
-  my ($filename) = @_;
-  my ($status, $data);
-  ($status, $data) = ReadFile($filename);
-  if (!$status) {
-    ReportError("Cannot open $filename: $!", '500 Internal Server Error');
-  }
-  return $data;
-}
-
-sub WriteStringToFile {
-  my ($file, $string) = @_;
-  open(OUT, ">$file")
-    or ReportError("Cannot write $file: $!", '500 Internal Server Error');
-  print OUT  $string;
-  close(OUT);
-}
-
-sub ReportError { # fatal!
-  my ($errmsg, $status, $log) = @_;
-  print $q->header(-status => $status);
-  print $q->start_html, $q->h2($errmsg), $q->end_html;
-  exit (1);
-}

modules/aawrapperdiv.pl

@@ -16,27 +16,27 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
+use strict;
+
 AddModuleDescription('aawrapperdiv.pl', 'WrapperDiv Module');
 
+our ($q);
 
-*OldGetHeader = *GetHeader;
-*GetHeader = *WrapperGetHeader;
+*OldGetHeader = \&GetHeader;
+*GetHeader = \&WrapperGetHeader;
 
 sub WrapperGetHeader {
-	my ($id, $title, $oldId, $nocache, $status) = @_;
-	my $result = OldGetHeader ($id, $title, $oldId, $nocache, $status);
-	$result .= $q->start_div({-class=>'wrapper'});
+  my ($id, $title, $oldId, $nocache, $status) = @_;
+  my $result = OldGetHeader ($id, $title, $oldId, $nocache, $status);
+  $result .= $q->start_div({-class=>'wrapper'});
 }
 
-*OldPrintFooter = *PrintFooter;
-*PrintFooter = *WrapperPrintFooter;
+*OldPrintFooter = \&PrintFooter;
+*PrintFooter = \&WrapperPrintFooter;
 
 sub WrapperPrintFooter {
-	my ($id, $rev, $comment) = @_;
-	print $q->start_div({-class=>'wrapper close'});
-	print $q->end_div(), $q->end_div();
-	OldPrintFooter($id, $rev, $comment);
+  my ($id, $rev, $comment) = @_;
+  print $q->start_div({-class=>'wrapper close'});
+  print $q->end_div(), $q->end_div();
+  OldPrintFooter($id, $rev, $comment);
 }
-
-
-

modules/accesskeys.pl

@@ -13,10 +13,12 @@
 # You should have received a copy of the GNU General Public License along with
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
-package OddMuse;
+use strict;
 
 AddModuleDescription('accesskeys.pl', 'Links With AccessKeys Extension');
 
+our (@MyRules, $FreeLinkPattern);
+
 push(@MyRules, \&LinksWithAccessKeys);
 sub LinksWithAccessKeys {
   if (m/\G(\[\[$FreeLinkPattern\{(.)\}\]\])/cog) {
@@ -32,5 +34,5 @@ sub LinksWithAccessKeys {
     }
     return ''; # this is a dirty rule that depends the definition of other pages
   }
-  return undef; # the rule didn't match
+  return; # the rule didn't match
 }

modules/admin.pl

@@ -16,6 +16,10 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
+use strict;
+
+our ($q, %Page, %Action, $IndexFile, $PageDir, $KeepDir, @MyAdminCode, $RefererDir);
+
 AddModuleDescription('admin.pl', 'Admin Power Extension');
 
 $Action{delete} = \&AdminPowerDelete;

modules/adsense.pl

@@ -14,20 +14,23 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+use strict;
+
 AddModuleDescription('adsense.pl', 'AdSense Module');
 
-use vars qw($AdSensePageName $AdSensePlace);
+our (@MyInitVariables, @MyFooters);
+our ($AdSensePageName, $AdSensePlace);
 
 push (@MyInitVariables, \&AdSenseInit);
 
 sub AdSenseInit {
   $AdSensePageName = "AdSense" unless $AdSensePageName;
-  $AdSensePlace = "top" unless $AdSensePlace;	   
+  $AdSensePlace = "top" unless $AdSensePlace;
   if ($AdSensePlace eq 'bottom') {  # Process adsense after all modules have been loaded
     push (@MyFooters, \&GetAdSense);
   } elsif ($AdSensePlace eq 'top')  {
-   *AdSenseOldGetHtmlHeader = *GetHtmlHeader;
-   *GetHtmlHeader = *AdSenseNewGetHtmlHeader;
+   *AdSenseOldGetHtmlHeader = \&GetHtmlHeader;
+   *GetHtmlHeader = \&AdSenseNewGetHtmlHeader;
   }
 }
 
@@ -40,4 +43,3 @@ sub AdSenseNewGetHtmlHeader {
 sub GetAdSense {
   return GetPageContent($AdSensePageName) if GetParam('action', 'browse') eq 'browse';
 }
-

modules/advanced-uploads.pl

@@ -12,14 +12,15 @@
 # You should have received a copy of the GNU General Public License along with
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
-package OddMuse;
+use strict;
 
 AddModuleDescription('advanced-uploads.pl', 'Advanced File Upload Extension');
 
+our ($q, $HtmlHeaders);
 $HtmlHeaders .= '<script type="text/javascript" src="/js/uploader.js"></script>';
 
-*AdvancedUploadsOldGetTextArea = *GetTextArea;
-*GetTextArea = *AdvancedUploadsNewGetTextArea;
+*AdvancedUploadsOldGetTextArea = \&GetTextArea;
+*GetTextArea = \&AdvancedUploadsNewGetTextArea;
 
 sub AdvancedUploadsNewGetTextArea {
   my ($name, $text, $rows) = @_;

modules/age.pl

@@ -16,9 +16,12 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
+use strict;
+
 AddModuleDescription('age.pl', 'Age Indication Extension');
 
-use vars qw(%AgeEffect $AgeParameter);
+our (%Page, $Now, $ScriptName);
+our (%AgeEffect, $AgeParameter);
 
 # map page age to theme
 %AgeEffect = (60*60*24 => 'day',
@@ -31,8 +34,8 @@ use vars qw(%AgeEffect $AgeParameter);
 # if using creationdate.pl.
 $AgeParameter = 'ts';
 
-*OldAgeGetHeader = *GetHeader;
-*GetHeader = *NewAgeGetHeader;
+*OldAgeGetHeader = \&GetHeader;
+*GetHeader = \&NewAgeGetHeader;
 
 sub NewAgeGetHeader {
   my $header = OldAgeGetHeader(@_);
@@ -46,7 +49,7 @@ sub NewAgeGetHeader {
     }
   }
   return $header unless $theme;
-  $oldtheme = GetParam('theme', $ScriptName);
+  my $oldtheme = GetParam('theme', $ScriptName);
   $header =~ s/class="$oldtheme"/class="$theme"/; # touch as little as possible
   return $header;
 }

modules/aggregate.pl

@@ -16,8 +16,12 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
+use strict;
+
 AddModuleDescription('aggregate.pl', 'Front Page Extension');
 
+our ($q, $bol, %Action, %Page, $OpenPageName, $UseDiff, $UsePathInfo, $RssStyleSheet, $RssLicense, $RssRights, $RssImageUrl, $CommentsPrefix, $SiteName, $ScriptName, $HomePage, $SiteDescription, @MyRules, $LastUpdate, $InterWikiMoniker);
+
 push(@MyRules, \&AggregateRule);
 
 sub AggregateRule {
@@ -61,7 +65,7 @@ sub AggregateRule {
     ($_, pos) = ($old_, $oldpos); # restore \G (assignment order matters!)
     return '';
   }
-  return undef;
+  return;
 }
 
 $Action{aggregate} = \&DoAggregate;
@@ -139,12 +143,7 @@ sub DoAggregate {
       my $minor = $data{minor};
       my $revision = $data{revision};
       my $cluster = GetCluster($page);
-      my $description;
-      {
-	local *STDOUT;
-	open(STDOUT, '>', \$description) or die "Can't open memory file: $!";
-	ApplyRules(QuoteHtml($page), 1, 0, undef, 'p');
-      }
+      my $description = ToString sub { ApplyRules(QuoteHtml($page), 1, 0, undef, 'p') };
       $description .= $q->p(GetPageLink($id, T('Learn more...')))
 	if length($page) < $size;
       $rss .= "\n<item>\n";

modules/all.pl

@@ -16,11 +16,15 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
+use strict;
+
 AddModuleDescription('all.pl', 'All Action');
 
+our ($q, %Action, $HomePage, $UrlProtocols);
+
 $Action{all} = \&DoPrintAllPages;
 
-my $Monolithic = 0;
+our $Monolithic = 0;
 
 sub DoPrintAllPages {
   return  if (!UserIsAdminOrError());
@@ -32,8 +36,8 @@ sub DoPrintAllPages {
   PrintFooter();
 }
 
-*OldAllScriptLink = *ScriptLink;
-*ScriptLink = *NewAllScriptLink;
+*OldAllScriptLink = \&ScriptLink;
+*ScriptLink = \&NewAllScriptLink;
 
 sub NewAllScriptLink {
   my ($action, $text, $class, $name, $title, $accesskey, $nofollow) = @_;
@@ -41,6 +45,7 @@ sub NewAllScriptLink {
       and $action !~ /^($UrlProtocols)\%3a/
       and $action !~ /^\%2f/
       and $action !~ /=/) {
+    my %params;
     $params{-href} = '#' . $action;
     $params{'-class'} = $class  if $class;
     $params{'-name'} = $name  if $name;

modules/anchors.pl

@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2009  Alex Schroeder <alex@gnu.org>
+# Copyright (C) 2004–2015  Alex Schroeder <alex@gnu.org>
 #
 # 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
@@ -12,8 +12,11 @@
 # You should have received a copy of the GNU General Public License along with
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
+use strict;
+
 AddModuleDescription('anchors.pl', 'Local Anchor Extension');
 
+our ($q, %Page, $FootnoteNumber, $FreeLinkPattern, @MyRules, $BracketWiki);
 push(@MyRules, \&AnchorsRule);
 
 sub AnchorsRule {
@@ -35,8 +38,10 @@ sub AnchorsRule {
     if (!$text && $bracket) {
       $text = BracketLink(++$FootnoteNumber); # s/_/ /g happens further down!
       $class .= ' number';
-      $title = $id; # override title
-      $title =~ s/_/ /g if $free;
+      # Since we're displaying a number such as [1], the title attribute should tell us where this will go.
+      $title = "$2 ($3)";
+      # The user might have writen [[[FooBar#one two]]] or [[[FooBar#one_two]]]
+      $title =~ s/_/ /g;
     }
     $text = $id unless $text;
     $text =~ s/_/ /g;
@@ -44,5 +49,19 @@ sub AnchorsRule {
   } elsif (m/\G\[\:$FreeLinkPattern\]/gc) {
     return $q->a({-name=>FreeToNormal($1), -class=>'anchor'}, '');
   }
-  return undef;
+  return;
+}
+
+*OldAnchorsBrowsePage=\&BrowsePage;
+*BrowsePage=\&NewAnchorsBrowsePage;
+
+sub NewAnchorsBrowsePage {
+  my ($id) = @_;
+  OpenPage($id);
+  if (not GetParam('revision', '')
+      and not GetParam('oldid', '')
+      and $Page{text} =~ /^\#REDIRECT\s+\[\[$FreeLinkPattern\#$FreeLinkPattern\]\]/) {
+    return ReBrowsePage(FreeToNormal($1 . '#' . $2), $id);
+  }
+  return OldAnchorsBrowsePage(@_);
 }

modules/antispam.pl

@@ -16,9 +16,12 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
+use strict;
+
 AddModuleDescription('antispam.pl', 'Antispam Module');
 
-use vars qw($DoMaskEmail $CreateMailtoLinks); 
+our (@MyRules);
+our ($DoMaskEmail, $CreateMailtoLinks, $EmailRegExp);
 
 $DoMaskEmail = 1;		# Mask all email, not just those in []'s
 $CreateMailtoLinks = 1;		# Create mailto's for all addresses
@@ -27,33 +30,33 @@ $EmailRegExp = '[\w\.\-]+@([\w\-]+\.)+[\w]+';
 
 
 push(@MyRules, \&MaskEmailRule);
-    
+
 sub MaskEmailRule {
 	# Allow [email@foo.bar Email Me] links
 	if (m/\G\[($EmailRegExp(\s\w+)*\s*)\]/igc) {
-		$chunk = $1;
+		my $chunk = $1;
 		$chunk =~ s/($EmailRegExp)//i;
-		$email = $1;
+		my $email = $1;
 		$chunk =~ s/^\s*//;
 		$chunk =~ s/\s*$//;
-		
-		$masked="";
-		@decimal = unpack('C*', $email);
-		foreach $i (@decimal) {
-			$masked.="&#".$i.";";
+
+		my $masked = '';
+		my @decimal = unpack('C*', $email);
+		for (@decimal) {
+			$masked .= '&#' . $_ . ';';
 		}
 		$email = $masked;
 		$chunk = $email if $chunk eq "";
-		return "<a href=\"mailto:" . $email . "\">$chunk</a>";
+		return "<a href=\"mailto:$email\">$chunk</a>";
 	}
-	
+
 	if (m/\G($EmailRegExp)/igc) {
-		$email=$1;
+		my $email = $1;
 		if ($DoMaskEmail) {
-			$masked="";
-			@decimal = unpack('C*', $email);
-			foreach $i (@decimal) {
-				$masked.="&#".$i.";";
+			my $masked="";
+			my @decimal = unpack('C*', $email);
+			for (@decimal) {
+				$masked .= '&#' . $_ . ';';
 			}
 			$email = $masked;
 		}
@@ -62,5 +65,5 @@ sub MaskEmailRule {
 		}
 		return $email;
 	}
-	return undef;
+	return;
 }

modules/archive.pl

@@ -16,10 +16,14 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
+use strict;
+
 AddModuleDescription('archive.pl', 'Archive Extension');
 
-*OldArchiveGetHeader = *GetHeader;
-*GetHeader = *NewArchiveGetHeader;
+our ($q);
+
+*OldArchiveGetHeader = \&GetHeader;
+*GetHeader = \&NewArchiveGetHeader;
 
 # this assumes that *all* calls to GetHeader will print!
 sub NewArchiveGetHeader {
@@ -32,7 +36,7 @@ sub NewArchiveGetHeader {
   print $q->div({-class=>'archive'},
 		$q->p($q->span(T('Archive:')),
 		      map {
-			$key = $_;
+			my $key = $_;
 			my ($year, $month) = split(/-/, $key);
 			if (defined(&month_name)) {
 			  ScriptLink('action=collect;match=' . UrlEncode("^$year-$month"),

modules/askpage.pl

@@ -13,11 +13,14 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+use strict;
+
 AddModuleDescription('askpage.pl', 'Ask Page Extension');
 
 use Fcntl qw(:DEFAULT :flock);
 
-use vars qw($AskPage $QuestionPage $NewQuestion);
+our ($DataDir, $NewComment);
+our ($AskPage, $QuestionPage, $NewQuestion);
 # Don't forget to set your $CommentsPattern to include both $AskPage and $QuestionPage
 $AskPage = 'Ask';
 $QuestionPage = 'Question_';
@@ -35,8 +38,8 @@ sub IncrementInFile {
   return $num;
 }
 
-*OldAskPageDoPost=*DoPost;
-*DoPost=*NewAskPageDoPost;
+*OldAskPageDoPost=\&DoPost;
+*DoPost=\&NewAskPageDoPost;
 sub NewAskPageDoPost {
   my $id = FreeToNormal(shift);
   if ($id eq $AskPage and not GetParam('text', undef)) { # comment, not a regular edit
@@ -47,16 +50,16 @@ sub NewAskPageDoPost {
   OldAskPageDoPost($id, @_); # keep original functionality for regular edits
 }
 
-*OldAskPageGetCommentForm=*GetCommentForm;
-*GetCommentForm=*NewAskPageGetCommentForm;
+*OldAskPageGetCommentForm=\&GetCommentForm;
+*GetCommentForm=\&NewAskPageGetCommentForm;
 sub NewAskPageGetCommentForm {
   my ($id, $rev, $comment) = @_;
   $NewComment = $NewQuestion if $id eq $AskPage;
   OldAskPageGetCommentForm(@_);
 }
 
-*OldAskPageJournalSort=*JournalSort;
-*JournalSort=NewAskPageJournalSort;
+*OldAskPageJournalSort=\&JournalSort;
+*JournalSort=\&NewAskPageJournalSort;
 sub NewAskPageJournalSort {
   return OldAskPageJournalSort() unless $a =~ m/^$QuestionPage\d+$/ and $b =~ m/^$QuestionPage\d+$/;
   ($b =~ m/$QuestionPage(\d+)/)[0] <=> ($a =~ m/$QuestionPage(\d+)/)[0];

modules/atom.pl

@@ -13,12 +13,16 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
+use strict;
+
 use XML::Atom::Entry;
 use XML::Atom::Link;
 use XML::Atom::Person;
 
 AddModuleDescription('atom.pl', 'Atom Extension');
 
+our ($q, %Page, %Action, $CommentsPrefix, $ScriptName, $SiteName, $MaxPost, $UseDiff, $NewText, $DeletedPage, @MyInitVariables, @MyMacros, $FS, $BannedContent, $RssStyleSheet, $RssRights, $RssLicense, $RssImageUrl, $RssExclude, $RCName, @UploadTypes, $UploadAllowed, $UsePathInfo, $SiteDescription, $LastUpdate, $InterWikiMoniker);
+
 push(@MyInitVariables, \&AtomInit);
 
 sub AtomInit {
@@ -98,6 +102,14 @@ sub GetRcAtom {
 		(ref $RssLicense eq 'ARRAY' ? @$RssLicense : $RssLicense));
   $feed .= AtomTag('wiki:interwiki', $InterWikiMoniker) if $InterWikiMoniker;
   $feed .= AtomTag('logo', $RssImageUrl) if $RssImageUrl;
+  my %excluded = ();
+  if (GetParam("exclude", 1)) {
+    foreach (split(/\n/, GetPageContent($RssExclude))) {
+      if (/^ ([^ ]+)[ \t]*$/) { # only read lines with one word after one space
+	$excluded{$1} = 1;
+      }
+    }
+  }
   # Now call GetRc with some blocks of code as parameters:
   ProcessRcLines(sub {}, sub {
       my ($pagename, $timestamp, $host, $username, $summary, $minor, $revision, $languages, $cluster) = @_;
@@ -111,7 +123,7 @@ sub GetRcAtom {
         . (GetParam('all', $cluster)
     	? QuoteHtml($ScriptName) . "?" . GetPageParameters('browse', $pagename, $revision, $cluster)
     	: $url . UrlEncode($pagename)) . qq{"/>\n};
-      $feed .= AtomLink("$ScriptName/atom/wiki/$id");
+      $feed .= AtomLink("$ScriptName/atom/wiki/$pagename");
       $feed .= AtomTag('summary', QuoteHtml($summary));
       $feed .= qq{<content type="xhtml">\n<div xmlns="http://www.w3.org/1999/xhtml">\n}
         . PageHtml($pagename, 50*1024,$q->div(T('This page is too big to send over RSS.')))

modules/autolock.pl

@@ -1,4 +1,6 @@
 #!/usr/bin/env perl
+use strict;
+
 # ====================[ autolock.pl                        ]====================
 
 =head1 NAME
@@ -23,10 +25,10 @@ autolock is easily installable: move this file into the B<wiki/modules/>
 directory of your Oddmuse Wiki.
 
 =cut
-package OddMuse;
-
 AddModuleDescription('autolock.pl', 'Autolock Extension');
 
+our (@MyInitVariables, $CommentsPrefix, $EditAllowed, $NoEditFile, %LockOnCreation);
+
 # ....................{ CONFIGURATION                      }....................
 
 =head1 CONFIGURATION
@@ -35,9 +37,9 @@ autolock is easily configurable: set these variables in the B<wiki/config.pl>
 file for your Oddmuse Wiki.
 
 =cut
-use vars qw($AutoLockPagesMatching
-            $AutoLockCommentsPagesMatching
-            $AutoLockSeverity
+our ($AutoLockPagesMatching,
+            $AutoLockCommentsPagesMatching,
+            $AutoLockSeverity,
             $AutoLockUserCanEditEditorFix);
 
 =head2 $AutoLockPagesMatching
@@ -133,13 +135,13 @@ sub AutoLockInit {
   }
 
   if ($AutoLockUserCanEditEditorFix) {
-    *UserCanEditAutoLockOld = *UserCanEditAutoLockFix;
+    *UserCanEditAutoLockOld = \&UserCanEditAutoLockFix;
   }
 }
 
 # ....................{ REDEFINITIONS                      }....................
-*UserCanEditAutoLockOld = *UserCanEdit;
-*UserCanEdit =            *UserCanEditAutoLock;
+*UserCanEditAutoLockOld = \&UserCanEdit;
+*UserCanEdit =            \&UserCanEditAutoLock;
 
 sub UserCanEditAutoLock {
   my ($page_name, $is_editing, $is_comment) = @_;

modules/backlinkage.pl

@@ -19,9 +19,14 @@
 # Grab MLDBM at http://search.cpan.org/dist/MLDBM/lib/MLDBM.pm
 # ie: http://search.cpan.org/CPAN/authors/id/C/CH/CHAMAS/MLDBM-2.01.tar.gz
 
+use strict;
+
+use Fcntl;
 use MLDBM qw( DB_File Storable );
 AddModuleDescription('backlinkage.pl', 'Inline Backlinks');
 
+our ($q, %Action, %Page, @MyAdminCode, $DataDir, $LinkPattern);
+
 my $debug=1;             # Set Text Output Verbosity when compiling
 my $backfile = $DataDir . '/backlinks.db';  # Where data lives
 
@@ -54,9 +59,9 @@ sub BuildBacklinkDatabase {
             $hash->{'link' . $backlinkcount} = $link;
         }
         log2("$backlinkcount Links found in $name\n") if $backlinkcount;
-        $backhash{$name} = $hash;       # Store Hash data in HoH    
-    } 
-  
+        $backhash{$name} = $hash;       # Store Hash data in HoH
+    }
+
     if ($debug >= 3) {
         log4("Printing dump of USABLE Data we stored, sorted and neat\n");
         for my $source (sort keys %backhash) {
@@ -84,7 +89,7 @@ sub BacklinkProcess {
         if ($exists) {
             push (@backlinks,$resolved) unless (($seen{$resolved}++) or ($resolved eq $name));
         }
-    } 
+    }
     return @backlinks;
 }
 
@@ -92,14 +97,14 @@ sub BacklinkProcess {
 sub GetBackLink {
     my (@backlinks, @unpopped, @alldone);
     my $id = $_[0];
-    
-    use vars qw($BacklinkBanned);
+
+    our ($BacklinkBanned);
     $BacklinkBanned = "HomePage|ScratchPad" if !$BacklinkBanned;
-    tie my %backhash, 'MLDBM', $backfile, O_CREAT|O_RDWR, 0644 or die "Cannot open file $backfile $!\n";
+    tie my %backhash, 'MLDBM', $backfile, O_CREAT|O_RDWR, oct(644) or die "Cannot open file $backfile $!\n";
 
     # Search database for matches
-    while ( ($source, $hashes) = each %backhash ) {
-        while ( ($key, $value) = each %$hashes ) {
+    while ( my ($source, $hashes) = each %backhash ) {
+        while ( my ($key, $value) = each %$hashes ) {
             if ($id =~ /$value/) {
                 push (@backlinks, $source);
             }
@@ -114,11 +119,11 @@ sub GetBackLink {
                 push(@unpopped, ScriptLink(UrlEncode($resolved), $resolved, $class . ' backlink', undef, T('Internal Page: ' . $resolved)));
             }
     }
-    
+
     my $arraycount = @unpopped;
     return if !$arraycount; # Dont bother with the rest if empty results
-   
-    # Pop and Push data to make it look good (no trailing commas) 
+
+    # Pop and Push data to make it look good (no trailing commas)
     my $temp = pop(@unpopped);
     foreach my $backlink (@unpopped) {
             push(@alldone, $backlink . ", ");

modules/backlinks.pl

@@ -1,19 +1,23 @@
 # Copyright (C) 2008  Weakish Jiang <weakish@gmail.com>
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as 
+# it under the terms of the GNU General Public License version 2 as
 # published by the Free Software Foundation.
 #
 # You can get a copy of GPL version 2 at
 # http://www.gnu.org/licenses/gpl-2.0.html
 #
-# For user doc, see: 
+# For user doc, see:
 # http://www.oddmuse.org/cgi-bin/oddmuse/Backlinks_Extension
 
+use strict;
+
 AddModuleDescription('backlinks.pl', 'Backlinks Extension');
 
-*OldGetSearchLink = *GetSearchLink;
-*GetSearchLink = *NewGetSearchLink;
+our ($q, %Action, %Page, $OpenPageName);
+
+*OldGetSearchLink = \&GetSearchLink;
+*GetSearchLink = \&NewGetSearchLink;
 sub NewGetSearchLink {
   my ($text, $class, $name, $title) = @_;
   my $id = UrlEncode(QuoteRegexp($text));
@@ -30,7 +34,7 @@ my $id = shift;
 my $search = GetParam('search', '');
 my $taglabel = $search;
    $taglabel =~ s/\\\[\\\[//;
-   $taglabel =~ s/\\\]\\\]//; 
+   $taglabel =~ s/\\\]\\\]//;
   ReportError(T('The search parameter is missing.')) unless $search;
   print GetHeader('', Ts('Pages link to %s', $taglabel), '');
   local (%Page, $OpenPageName);
@@ -46,6 +50,6 @@ my $taglabel = $search;
     }
     @found = map { $q->li(GetPageLink($_)) } @found;
     print $q->start_div({-class=>'search list'}),
-      $q->ul(@found), $q->end_div;  
+      $q->ul(@found), $q->end_div;
   PrintFooter();
-}  
+}

modules/balanced-page-directories.pl

@@ -1,175 +0,0 @@
-# Copyright (C) 2014  Alex Schroeder <alex@gnu.org>
-# Copyright (C) 2014  Aki Goto <tyatsumi@gmail.com>
-#
-# 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 3 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.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program. If not, see <http://www.gnu.org/licenses/>.
-
-=head1 Balanced Page Directories
-
-B<WARNING: This module is deprecated.> Oddmuse no longer disperses
-page data files into 27 directories based on the first character of
-the page name. The directories used to be "A" to "Z", and "other". If
-you uses your wiki as a blog, all the pages starting with a date ended
-up in "other". If your page names started with letters other than "A"
-to "Z", all the pages ended up in "other". If you were using comment
-pages, all your comment pages ended in "C". This module was intended
-to create more subdirectories and spread them more evenly. This is no
-longer necessary, as the typical filesystem's performance no longer
-degrades with tens of thousands of files in a directory. I'm assuming
-most Oddmuse hosts to use some form of GNU/Linux with ext3 or ext4
-with dir_index option.
-
-The remaining info for this module is all deprecated.
-
-=over
-
-The ext2 inode specification allows for over 100 trillion files to
-reside in a single directory, however because of the current
-linked-list directory implementation, only about 10-15 thousand files
-can realistically be stored in a single directory. – L<haversian-ga on
-09 Dec 2002 22:56
-PST|http://answers.google.com/answers/threadview?id=122241>
-
-=back
-
-CAUTION: When this extension is installed, your data structure I<must>
-change. Make sure you have a backup of your data directory somewhere.
-
-=head2 Finding the right directory
-
-On the command line, finding the right subdirectory can be a problem.
-Here's how to use md5sum. Note that the -n option to echo prevents the
-trailing newline. Its inclusion would change the checksum.
-
-    echo -n HomePage | md5sum | cut -c 1-2
-    c1
-    echo -n ホームページ | md5sum | cut -c 1-2
-    10
-
-=head2 $BalancedPageDirectoriesSize
-
-If you have more than 2560000 pages (w00t!) you might want to set
-$BalancedPageDirectoriesSize to 3. This will give you 16× more
-directories, which should let you have 40960000 pages. Also, please
-let us know about your wiki. :)
-
-=head2 Migration
-
-Once you install the code, reload any page. This should trigger
-migration. No output is produced during migration. Migration is
-triggered whenever a page file isn't found but a page is found at the
-default old location. If, for example, $PageDir/c1/HomePage.pg doesn't
-exist but $PageDir/h/HomePage.pg does, and the wiki can be locked, the
-wiki is locked and migration is started.
-
-=cut
-
-AddModuleDescription('balanced-page-directories.pl', 'Balanced Page Directories Extension');
-
-use Digest::MD5 qw(md5_hex);
-use File::Find qw(finddepth);
-use vars qw($BalancedPageDirectoriesSize);
-
-$BalancedPageDirectoriesSize = 2;
-
-*OldBalancedPageDirectoriesGetPageDirectory = *GetPageDirectory;
-*GetPageDirectory = *NewBalancedPageDirectoriesGetPageDirectory;
-
-sub NewBalancedPageDirectoriesGetPageDirectory {
-  my $id = shift;
-  utf8::encode($id);
-  return substr(md5_hex($id), 0, $BalancedPageDirectoriesSize);
-}
-
-*OldBalancedPageDirectoriesOpenPage = *OpenPage;
-*OpenPage = *NewBalancedPageDirectoriesOpenPage;
-
-sub NewBalancedPageDirectoriesOpenPage {
-  my $id = shift;
-  if (! -f GetPageFile($id)) {
-    BalancedPageDirectoriesMigrate($id);
-  }
-  return OldBalancedPageDirectoriesOpenPage($id, @_);
-}
-
-sub BalancedPageDirectoriesMigrate {
-  my $id = shift;
-
-  # This code is called if the page file does not exist. Perhaps we
-  # need to migrate? Check if the old page file exists. If it does
-  # not, there is no point in migration.
-  *GetPageDirectory = *OldBalancedPageDirectoriesGetPageDirectory;
-  if (not -f GetPageFile($id)) {
-    *GetPageDirectory = *NewBalancedPageDirectoriesGetPageDirectory;
-    return;
-  }
-
-  # Make sure we can change the data structure now.
-  RequestLockOrError();
-
-  # Now we know that we need to migrate. The list of pages is scanned
-  # using globbing.
-  SetParam('refresh', 1);
-
-  for $id (AllPagesList()) {
-
-    *GetPageDirectory = *OldBalancedPageDirectoriesGetPageDirectory;
-    my $page_from = GetPageFile($id);
-    my $keep_from = GetKeepDir($id);
-    my $lock_from = GetLockedPageFile($id);
-    my $joiner_from = $JoinerDir . '/' . GetPageDirectory($username) if $JoinerDir;
-    my $joiner_email_from = $JoinerEmailDir . '/' . GetPageDirectory($username) if $JoinerEmailDir;
-    my $referrer_from = $RefererDir . '/' . GetPageDirectory($id) if $RefererDir;
-    *GetPageDirectory = *NewBalancedPageDirectoriesGetPageDirectory;
-    my $page_to = GetPageFile($id);
-    my $keep_to = GetKeepDir($id);
-    my $lock_to = GetLockedPageFile($id);
-    my $joiner_to = $JoinerDir . '/' . GetPageDirectory($username) if $JoinerDir;
-    my $joiner_email_to = $JoinerEmailDir . '/' . GetPageDirectory($username) if $JoinerEmailDir;
-    my $referrer_to = $RefererDir . '/' . GetPageDirectory($id) if $RefererDir;
-
-    # no clobbering
-    if (! -f $page_to) {
-      CreatePageDir($PageDir, $id);
-      rename $page_from, $page_to || ReportError("Cannot rename $page_from");
-    }
-    if (-f $lock_from and ! -f $lock_to) {
-      rename $lock_from, $lock_to || ReportError("Cannot rename $lock_from");
-    }
-    if (-d $keep_from and ! -d $keep_to) {
-      CreateKeepDir($KeepDir, $id);
-      rename $keep_from, $keep_to || ReportError("Cannot rename $keep_from");
-    }
-    if ($joiner_from and -d $joiner_from and ! -d $joiner_to) {
-      CreatePageDir($JoinerDir, $id);
-      rename $joiner_from, $joiner_to || ReportError("Cannot rename $joiner_from");
-    }
-    if ($joiner_email_from and -d $joiner_email_from and ! -d $joiner_email_to) {
-      CreatePageDir($JoinerEmailDir, $id);
-      rename $joiner_email_from, $joiner_email_to || ReportError("Cannot rename $joiner_email_from");
-    }
-    if ($referrer_from and -d $referrer_from and ! -d $referrer_to) {
-      CreateRefererDir($RefererDir, $id);
-      rename $referrer_from, $referrer_to || ReportError("Cannot rename $referrer_from");
-    }
-  }
-
-  # Delete empty subdirectories. Actually, attempt to delete all the
-  # directories, depth first. It will simply fail for the non-empty
-  # directories. http://www.perlmonks.org/?node_id=520791
-  for my $parent ($PageDir, $KeepDir, $JoinerDir, $JoinerEmailDir, $RefererDir) {
-    next unless $parent;
-    finddepth(sub { rmdir $_ if -d }, $parent);
-  }
-
-  ReleaseLock();
-}

modules/ban-contributors.pl

@@ -24,6 +24,8 @@ allowing you to ban him or her immediately. If you click the button,
 the IP or hostname will be added to the C<BannedHosts> page for you.
 
 =cut
+use strict;
+our ($q, $Now, %Page, $OpenPageName, %Action, $UrlPattern, $BannedContent, $BannedHosts, @MyAdminCode);
 
 AddModuleDescription('ban-contributors.pl', 'Ban Contributors Extension');
 
@@ -112,8 +114,8 @@ that will be added to BannedHosts.
 
 =cut
 
-*OldBanContributorsWriteRcLog = *WriteRcLog;
-*WriteRcLog = *NewBanContributorsWriteRcLog;
+*OldBanContributorsWriteRcLog = \&WriteRcLog;
+*WriteRcLog = \&NewBanContributorsWriteRcLog;
 
 sub NewBanContributorsWriteRcLog {
   my ($tag, $id, $to) = @_;

modules/ban-quick-editors.pl

@@ -15,10 +15,14 @@
 # This file must load before logbannedcontent.pl such that quick
 # editors will be logged.
 
+use strict;
+
 AddModuleDescription('ban-quick-editors.pl', 'Banning Quick Editors');
 
-*BanQuickOldUserIsBanned = *UserIsBanned;
-*UserIsBanned = *BanQuickNewUserIsBanned;
+our ($Now, %RecentVisitors, $SurgeProtection);
+
+*BanQuickOldUserIsBanned = \&UserIsBanned;
+*UserIsBanned = \&BanQuickNewUserIsBanned;
 
 sub BanQuickNewUserIsBanned {
   my $rule = BanQuickOldUserIsBanned(@_);

modules/banned-regexps.pl

@@ -12,7 +12,7 @@
 # You should have received a copy of the GNU General Public License along with
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
-package OddMuse;
+use strict;
 
 AddModuleDescription('banned-regexps.pl', 'Banning Regular Expressions');
 
@@ -42,7 +42,8 @@ This extension works with logbannedcontent.pl.
 
 =cut
 
-use vars qw($BannedRegexps);
+our (%AdminPages, %LockOnCreation, @MyInitVariables, %PlainTextPages, $BannedContent, $BannedFile);
+our ($BannedRegexps);
 
 $BannedRegexps = 'BannedRegexps';
 
@@ -52,11 +53,8 @@ push(@MyInitVariables, sub {
        $PlainTextPages{$BannedRegexps} = 1;
      });
 
-*RegexpOldBannedContent = *BannedContent;
-*BannedContent = *RegexpNewBannedContent;
-
-# the above also changes the mapping for the variable!
-$BannedContent = $RegexpOldBannedContent;
+*RegexpOldBannedContent = \&BannedContent;
+*BannedContent = \&RegexpNewBannedContent;
 
 sub RegexpNewBannedContent {
   my $str = shift;

modules/bbcode.pl

@@ -12,13 +12,15 @@
 # You should have received a copy of the GNU General Public License along with
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
+use strict;
+
 AddModuleDescription('bbcode.pl', 'bbCode Extension');
 
+our ($q, @HtmlStack, @MyRules, %RuleOrder, $UrlProtocols, $FullUrlPattern);
 push(@MyRules, \&bbCodeRule);
-
 $RuleOrder{\&bbCodeRule} = 100; # must come after PortraitSupportRule
 
-use vars qw($bbBlock);
+our ($bbBlock);
 my %bbTitle = qw(h1 1 h2 1 h3 1 h4 1 h5 1 h6 1);
 
 # This code does not allow the nesting of block elements such as quote
@@ -100,7 +102,7 @@ sub bbCodeRule {
   elsif (/\G(\[\/([a-z][a-z1-6]*)\])/cgi) {
     my $bbcode = $1;
     my $tag = lc($2);
-    %translate = qw{b b i i u em color em size em font span url a
+    my %translate = qw{b b i i u em color em size em font span url a
 		    quote blockquote h1 h1 h2 h2 h3 h3 h4 h4 h5 h5
 		    h6 h6 center div left div right div list ul
 		    s del strike del sub sub sup sup highlight strong
@@ -132,5 +134,5 @@ sub bbCodeRule {
   elsif (/\G:(?:sad|frown):/cg) {
     return '&#x1F61F;'; }
   # no match
-  return undef;
+  return;
 }

modules/beautify.pl

@@ -1,50 +0,0 @@
-# Copyright (C) 2004  Xavier Maillard
-# Copyright (C) 2004  Alex Schroeder <alex@emacswiki.org>
-#
-# 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.
-#
-# 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.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
-
-AddModuleDescription('beautify.pl', 'Source Code Beautification Extension');
-
-use Beautifier::Core;
-use Output::HTML;
-
-push(@MyRules, \&BeautificationRule);
-
-sub BeautificationRule {
-  if ($bol and m/\G&lt;source\s+([a-zA-Z0-9]+)\s*&gt;\n?(.*?\n)&lt;\/source&gt;[ \t]*\n?/cgs) {
-    my $old_ = $_;
-    my $oldpos = pos;
-    my $lang = $1;
-    my $source= $2;
-    my $result = $source;
-    eval { $result = Beautify($lang, $source); };
-    $result = $@ if $@;
-    $_ = $old_;
-    pos = $oldpos;
-    return CloseHtmlEnvironments() . $q->div({-class=>'beauty'}, $result) . AddHtmlEnvironment('p');
-  }
-  return undef;
-}
-
-sub Beautify {
-  my ($lang, $source) = @_;
-  eval "use HFile::HFile_$lang";
-  my $Hfile = eval "new HFile::HFile_$lang";
-  return $q->strong(Ts('Cannot highlight the language %s.', $lang)) . "\n\n" . $source if $@;
-  my $highlighter = new Beautifier::Core($Hfile, new Output::HTML);
-  return $highlighter->highlight_text(UnquoteHtml($source));
-}

modules/big-brother.pl

@@ -13,11 +13,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package OddMuse;
+use strict;
 
 AddModuleDescription('big-brother.pl', 'Big Brother Extension');
 
-use vars qw($VisitorTime @BigBrotherSecretParameters);
+our ($q, $Now, %Action, $SurgeProtectionViews, $SurgeProtectionTime, @MyAdminCode, $RCName, $VisitorFile, $FS);
+our ($VisitorTime, @BigBrotherSecretParameters);
 
 my $US  = "\x1f";
 
@@ -52,7 +53,7 @@ sub AddRecentVisitor {
   my $action = GetParam('action', 'browse');
   my $id = GetId(); # script/p/q -> q
   my %params = map { $_ => 1 } $q->param;
-  for $bad (@BigBrotherSecretParameters) {
+  for my $bad (@BigBrotherSecretParameters) {
     delete $params{$bad};
   }
   my $url = ScriptUrl(join(';', "action=$action;id=" . UrlEncode($id),

modules/blockquote.pl

@@ -16,8 +16,12 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
+use strict;
+
 AddModuleDescription('blockquote.pl', 'Comments on Text Formatting Rules');
 
+our ($bol, @MyRules);
+
 push(@MyRules, \&BlockQuoteRule);
 
 sub BlockQuoteRule {
@@ -31,5 +35,5 @@ sub BlockQuoteRule {
       . AddHtmlEnvironment('blockquote')
       . AddHtmlEnvironment('p');
   }
-  return undef;
+  return;
 }

modules/cal3.pl

@@ -1,89 +0,0 @@
-# Copyright (C) 2004  Alex Schroeder <alex@emacswiki.org>
-#               2004  Tilmann Holst <spam@tholst.de>
-#
-# 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.
-#
-# 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.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
-
-# You may need to set $calcmd below.
-# Without the cal program (shipped with almost every unix) this extension
-# is useless. This extension will not work under Windows/IIS unless cal
-# is installed.
-
-AddModuleDescription('cal3.pl', 'Cal3 Extension');
-
-*OldCalendarGetHeader = *GetHeader;
-*GetHeader = *NewCalendarGetHeader;
-
-sub NewCalendarGetHeader {
-  my ($csec, $cmin, $chour, $cmday, $cmon, $cyear) = gmtime();
-  $cyear += 1900;
-  $cmon += 1;
-
-  my qw($cal $prevmon $prevyear $nextmon $nextyear);
-  
-  # check if previous month is in previous year
-  if ($cmon == 1){
-    $prevmon = "12";
-    $prevyear = ($cyear - 1);
-  } else {
-    $prevmon = ($cmon - 1);
-    $prevyear = $cyear;
-  }
-  # check if next month is in next year
-  if ($cmon == "12") {
-    $nextmon = "1";
-    $nextyear = ($cyear + 1);
-  } else {
-  $nextmon = ($cmon + 1);
-  $nextyear = $cyear;
-  }
-  my $header = OldCalendarGetHeader(@_);
-
-  # commenting out the last line of this paragraph makes cal3 a cal2
-  # extension.
-  $cal = Cal($nextmon,$nextyear);
-  $cal .= Cal($cmon,$cyear);
-  $cal .= Cal($prevmon,$prevyear);
-
-  $header =~ s/<div class="header">/$cal<div class="header">/;
-  return $header;
-}
-
-sub Cal {
-  my ($month,$year) = @_;
-  # set $calcmd to an appropriate value
-  my $calcmd = 'cal'; # week starts with sunday
-  # my $calcmd = 'cal -m'; # week starts with monday
-  # my $calcmd = 'export LC_ALL=de_DE.UTF-8;/insert/path/here/cal -m'; # example with different path to cal and different locale
-  my $cal = `$calcmd $month $year`;
-  return unless $cal;
-  my ($sec, $min, $hour, $mday, $mon, $myyear) = gmtime($Now);
-  $cal =~ s|\b( ?\d?\d)\b|{
-    my $day = $1;
-    my $date = sprintf("%d-%02d-%02d", $year, $month, $day);
-    my $class;
-    if ($month == ($mon + 1)) {
-      $class = ($day == $mday) ? 'today'
-             : ($IndexHash{$date} ? 'exists' : 'wanted');
-    } else {
-      $class = ($IndexHash{$date} ? 'exists' : 'wanted');
-    }	      
-    "<a class=\"$class\" href=\"$ScriptName/$date\">$day</a>";
-    }|ge;
-  return "<div class=\"cal\"><pre>$cal</pre></div>";
-}
-
-

modules/calendar.pl

@@ -17,16 +17,19 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
+use strict;
+
 AddModuleDescription('calendar.pl', 'Calendar Extension');
 
-use vars qw($CalendarOnEveryPage $CalAsTable $CalStartMonday);
+our ($q, %Page, %Action, $Now, $OpenPageName, $CollectingJournal, $FreeLinkPattern, @MyRules);
+our ($CalendarOnEveryPage, $CalAsTable, $CalStartMonday);
 
 $CalendarOnEveryPage = 0;   # 1=on every page is a month-div situated in the header, use css to control
 $CalAsTable = 0;            # 0=every month-div is "free", 1=every month-div is caught in a table, use css to control
 $CalStartMonday = 0;        # 0=week starts with Su, 1=week starts with Mo
 
-*OldCalendarGetHeader = *GetHeader;
-*GetHeader = *NewCalendarGetHeader;
+*OldCalendarGetHeader = \&GetHeader;
+*GetHeader = \&NewCalendarGetHeader;
 
 sub NewCalendarGetHeader {
   my $header = OldCalendarGetHeader(@_);
@@ -51,7 +54,7 @@ sub Cal {
   }
   my @pages = AllPagesList();
   my $cal = draw_month($mon, $year);
-  $cal =~ s{( {1,2}\d{1,2})\b}{{
+  $cal =~ s{ ( ?\d{1,2})\b}{{
     my $day = $1;
     my $date = sprintf("%d-%02d-%02d", $year, $mon, $day);
     my $re = "^$date";
@@ -61,13 +64,13 @@ sub Cal {
     my $class = '';
     $class .= ' today' if $day == $mday_now and $mon == $mon_now and $year == $year_now;
     my @matches = grep(/$re/, @pages);
-    my $link;
+    my $link = ' ';
     if (@matches == 0) { # not using GetEditLink because of $class
-      $link = ScriptLink('action=edit;id=' . UrlEncode($page), $day, 'edit' . $class);
+      $link .= ScriptLink('action=edit;id=' . UrlEncode($page), $day, 'edit' . $class);
     } elsif (@matches == 1) { # not using GetPageLink because of $class
-      $link = ScriptLink($matches[0], $day, 'local exact' . $class);
+      $link .= ScriptLink($matches[0], $day, 'local exact' . $class);
     } else {
-      $link = ScriptLink('action=collect;match=' . UrlEncode($re), $day,  'local collection' . $class);
+      $link .= ScriptLink('action=collect;match=' . UrlEncode($re), $day,  'local collection' . $class);
     }
     $link;
   }}ge;
@@ -144,26 +147,26 @@ sub CalendarRule {
     pos = $oldpos;
     return AddHtmlEnvironment('p');
   }
-  return undef;
+  return;
 }
 
 sub PrintYearCalendar {
   my $year = shift;
-  print $q->p({-class=>nav},
+  print $q->p({-class=>'nav'},
 	      ScriptLink('action=calendar;year=' . ($year-1), T('Previous')),
 	      '|',
 	      ScriptLink('action=calendar;year=' . ($year+1), T('Next')));
   if ($CalAsTable) {
       print '<table><tr>';
-      for $mon ((1..12)) {
+      for my $mon (1..12) {
         print '<td>'.Cal($year, $mon, 1).'</td>';
-        if (($mon==3) or ($mon==6) or ($mon==9)) {
+        if ($mon == 3 or $mon == 6 or $mon == 9) {
             print '</tr><tr>';
         }
       }
       print '</tr></table>';
   } else {
-      for $mon ((1..12)) {
+      for my $mon (1..12) {
         print Cal($year, $mon, 1);
       }
   }
@@ -234,7 +237,7 @@ sub draw_month {
 }
 
 # formula of Zeller (Julius Christian Johannes Zeller * 1822, + 1899) for countig the day of week
-# only works for all years greater then 0 and can handle 1582 the year Pope Gregor has changed the 
+# only works for all years greater then 0 and can handle 1582 the year Pope Gregor has changed the
 # calculation of times from the Julian calendar to the Gregorian calendar
 sub zeller {
     my $t = shift;

modules/canonical.pl

@@ -16,12 +16,14 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
+use strict;
+
 AddModuleDescription('canonical.pl', 'Canonical Names');
 
 use utf8;
 
-*OldCanonicalResolveId = *ResolveId;
-*ResolveId = *NewCanonicalResolveId;
+*OldCanonicalResolveId = \&ResolveId;
+*ResolveId = \&NewCanonicalResolveId;
 
 my %CanonicalName = ();
 

modules/checkbox.pl

@@ -16,8 +16,12 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
+use strict;
+
 AddModuleDescription('checkbox.pl', 'Checklist Extension');
 
+our ($q, $bol, @HtmlStack, %Action, %Page, $OpenPageName, @MyRules);
+
 # [[ : To do]]
 # [[X: Done]]
 # [[save: Save]]
@@ -53,7 +57,7 @@ sub CheckBoxRule {
       return $1;
     }
   }
-  return undef;
+  return;
 }
 
 $Action{checkbox} = \&DoCheckBox;

modules/clustermap.pl

@@ -16,9 +16,14 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
+use strict;
+
 AddModuleDescription('clustermap.pl', 'ClusterMap Module');
 
-use vars qw($ClusterMapPage $ClusterMapTOC $FilterUnclusteredRegExp @ClusterMapAdminPages);
+our ($q, %Action, %Page, $OpenPageName, @MyRules, @MyAdminCode, $HomePage, $DeletedPage, $RCName, $InterMap, $BannedContent, $BannedHosts, %AdminPages, $RssExclude, @AdminPages, $NearMap);
+our ($ClusterMapPage, %ClusterMap, $ClusterMapTOC, $FilterUnclusteredRegExp, @ClusterMapAdminPages, $PrintTOCAnchor);
+
+my %Unclustered = ();
 
 $ClusterMapPage = "Site_Map" unless defined $ClusterMapPage;
 
@@ -32,16 +37,16 @@ $FilterUnclusteredRegExp = '\d\d\d\d-\d\d-\d\d|\d* *Comments on .*'
 # They are also added to the Important Pages list on the administration page
 @ClusterMapAdminPages = ( $HomePage, $DeletedPage, $BannedContent,
 	$BannedHosts, $InterMap, $NearMap, $RCName, $RssExclude)
-	
-	unless defined @ClusterMapAdminPages;
-	
+
+	unless @ClusterMapAdminPages;
+
 $ClusterMapTOC = 1 unless defined $ClusterMapTOC;
 $PrintTOCAnchor = 0;
 
 %ClusterMap = ();
 
-*OldPrintRcHtml = *PrintRcHtml;
-*PrintRcHtml = *ClusterMapPrintRcHtml;
+*OldPrintRcHtml = \&PrintRcHtml;
+*PrintRcHtml = \&ClusterMapPrintRcHtml;
 
 push(@MyAdminCode, \&ClusterMapAdminRule);
 
@@ -59,7 +64,7 @@ sub ClusterMapRule {
 	if (/\G^([\n\r]*\<\s*clustermap\s*\>\s*)$/mgc) {
 		Dirty($1);
 		my $oldpos = pos;
-		$oldstr = $_;
+		my $oldstr = $_;
 		CreateClusterMap();
 		print "</p>";		# Needed to clean up, but could cause problems
 							# if <clustermap> isn't put into a new paragraph
@@ -69,8 +74,7 @@ sub ClusterMapRule {
 		$_ = $oldstr;
 		return '';
 	}
-	
-	return undef;
+	return;
 }
 
 
@@ -79,7 +83,7 @@ sub DoClusterMap {
 	# For each cluster, get list of all pages in that cluster
 	# Create map, using body of cluster pages, followed by titles of pages
 	#	within that cluster
-	
+
 	print GetHeader('',$ClusterMapPage,'');
 
 	CreateClusterMap();
@@ -94,21 +98,20 @@ sub DoClusterMap {
 		print '</ol></div>';
 		$PrintTOCAnchor = 1;
 	}
-	print '<div class="content">';	
-	PrintClusterMap(); 
-	
+	print '<div class="content">';
+	PrintClusterMap();
+
 	print '</div>';
 	PrintFooter();
 }
 
 sub DoUnclustered {
-	
 	print GetHeader('','Pages without a Cluster','');
 	print '<div class="content">';
-	
+
 	CreateClusterMap();
 	PrintUnclusteredMap();
-	
+
 	print '</div>';
 	PrintFooter();
 }
@@ -122,7 +125,7 @@ sub PrintClusterMap {
 		$free =~ s/_/ /g;
 
 		OpenPage($cluster);
-		
+
 		if ( FreeToNormal(GetCluster($Page{text})) eq $cluster ) {
 			# Don't display the page name twice if the cluster page is also
 			# a member of the cluster
@@ -137,7 +140,7 @@ sub PrintClusterMap {
 			print $q->h1(GetPageOrEditLink($free, $free));
 		}
 		PrintWikiToHTML($Page{text}, 0);
-		
+
 		print "<ul>";
 		foreach my $page (sort keys %{$ClusterMap{$cluster}}) {
 			my $title = $page;
@@ -150,28 +153,28 @@ sub PrintClusterMap {
 
 sub CreateClusterMap {
 	my @pages = AllPagesList();
-	
+
 	local %Page;
 	local $OpenPageName='';
-	
+
 	foreach my $page ( @pages) {
 		OpenPage($page);
 		my $cluster = FreeToNormal(GetCluster($Page{text}));
-		
+
 		next if ($cluster eq $DeletedPage);		# Don't map Deleted Pages
-		
+
 		next if (TextIsFile($Page{text}));		# Don't map files
-		
+
 		if ($cluster eq "") {					# Grab Unclustered Pages
 			$Unclustered{$page} = 1;
 			next;
 		}
-		
+
 		if ($cluster ne FreeToNormal($page)) {				# Create Cluster Map
 			$ClusterMap{$cluster}{$page} = 1;
 		}
 	}
-	
+
 	# Strip out Admin Pages
 	foreach my $page (@AdminPages) {
 		delete($Unclustered{$page});
@@ -180,27 +183,26 @@ sub CreateClusterMap {
 
 sub ClusterMapPrintRcHtml {
 	my ( @options ) = @_;
-	my $page = "";
-	my $cluster = GetParam(rcclusteronly);
-	
+	my $cluster = GetParam('rcclusteronly');
+
 	if ($cluster ne "") {
 		CreateClusterMap();
 		print "Pages in this cluster:";
 		print "<ul>";
-		foreach $page (sort keys %{$ClusterMap{$cluster}}) {
+		foreach my $page (sort keys %{$ClusterMap{$cluster}}) {
 			my $title = $page;
 			$title =~ s/_/ /g;
 			print "<li>" . ScriptLink($page, $title, 'local') . "</li>";
 		}
 		print "</ul>";
 	}
-	
+
 	OldPrintRcHtml(@options);
 }
 
 sub PrintUnclusteredMap {
 		print "<ul>";
-		foreach $page (sort keys %Unclustered) {
+		foreach my $page (sort keys %Unclustered) {
 			my $title = $page;
 			$title =~ s/_/ /g;
 			if ($title !~ /^($FilterUnclusteredRegExp)$/) {
@@ -208,18 +210,17 @@ sub PrintUnclusteredMap {
 			}
 		}
 		print "</ul>";
-
 }
 
 sub ClusterMapAdminRule {
-	($id, $menuref, *restref) = @_;
-	
+	my ($id, $menuref) = @_;
+
 	push(@$menuref, ScriptLink('action=clustermap', T('Clustermap'), 'clustermap'));
 	push(@$menuref, ScriptLink('action=unclustered', T('Pages without a Cluster'), 'unclustered'));
 }
 
-*OldBrowseResolvedPage = *BrowseResolvedPage;
-*BrowseResolvedPage = *ClusterMapBrowseResolvedPage;
+*OldBrowseResolvedPage = \&BrowseResolvedPage;
+*BrowseResolvedPage = \&ClusterMapBrowseResolvedPage;
 
 sub ClusterMapBrowseResolvedPage {
 	my $title = shift;
@@ -228,7 +229,7 @@ sub ClusterMapBrowseResolvedPage {
 	if ($id eq $ClusterMapPage) {
 		CreateClusterMap();
 		print GetHeader('',$title,'');
-		print '<div class="content">';	
+		print '<div class="content">';
 		if ($ClusterMapTOC) {
 			my $TOCCount = 0;
 			print '<div class="toc"><h2>Categories</h2><ol>';
@@ -241,15 +242,15 @@ sub ClusterMapBrowseResolvedPage {
 			$PrintTOCAnchor = 1;
 		}
 		PrintClusterMap();
-		print '</div>';	
+		print '</div>';
 		PrintFooter();
 	} else {
 		OldBrowseResolvedPage($id);
 	}
 }
 
-*OldPrintWikiToHTML = *PrintWikiToHTML;
-*PrintWikiToHTML = *ClusterMapPrintWikiToHTML;
+*OldPrintWikiToHTML = \&PrintWikiToHTML;
+*PrintWikiToHTML = \&ClusterMapPrintWikiToHTML;
 
 sub ClusterMapPrintWikiToHTML {
 	my ($pageText, $savecache, $revision, $islocked) = @_;
@@ -260,7 +261,7 @@ sub ClusterMapPrintWikiToHTML {
 		&& ($pageText =~ /^\s*$/s)){
 		SetParam('rcclusteronly',0);
 		CreateClusterMap();
-		print '<div class="content">';	
+		print '<div class="content">';
 		if ($ClusterMapTOC) {
 			my $TOCCount = 0;
 			print '<div class="toc"><h2>Contents</h2><ol>';
@@ -272,7 +273,7 @@ sub ClusterMapPrintWikiToHTML {
 			$PrintTOCAnchor = 1;
 		}
 		PrintClusterMap();
-		print '</div>';	
+		print '</div>';
 	}
 	OldPrintWikiToHTML(@_);
 }

modules/comment-div-wrapper.pl

@@ -13,10 +13,11 @@
 # You should have received a copy of the GNU General Public License along with
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
-package OddMuse;
+use strict;
 
 AddModuleDescription('comment-div-wrapper.pl', 'Comment Div Wrapper Extension');
 
+our ($q, $bol, $OpenPageName, @MyRules, %RuleOrder, $CommentsPrefix, $CommentsPattern, $FS);
 my $CommentDiv = 0;
 push(@MyRules, \&CommentDivWrapper);
 $RuleOrder{\&CommentDivWrapper} = -50;
@@ -36,12 +37,12 @@ sub CommentDivWrapper {
       return $html;
     }
   }
-  return undef;
+  return;
 }
 
 # close final div
-*OldCommentDivApplyRules = *ApplyRules;
-*ApplyRules = *NewCommentDivApplyRules;
+*OldCommentDivApplyRules = \&ApplyRules;
+*ApplyRules = \&NewCommentDivApplyRules;
 
 sub NewCommentDivApplyRules {
   my ($blocks, $flags) = OldCommentDivApplyRules(@_);

modules/commentcount.pl

@@ -16,10 +16,14 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
+use strict;
+
 AddModuleDescription('commentcount.pl', 'Comment Count Extension');
 
-*OldCommentcountAddComment = *AddComment;
-*AddComment = *NewCommentcountAddComment;
+our ($CommentsPrefix);
+
+*OldCommentcountAddComment = \&AddComment;
+*AddComment = \&NewCommentcountAddComment;
 
 sub NewCommentcountAddComment {
   my ($old, $comment) = @_;
@@ -39,12 +43,12 @@ sub NewCommentcountAddComment {
   return $new;
 }
 
-*OldCommentcountScriptLink = *ScriptLink;
-*ScriptLink = *NewCommentcountScriptLink;
+*OldCommentcountScriptLink = \&ScriptLink;
+*ScriptLink = \&NewCommentcountScriptLink;
 
 sub NewCommentcountScriptLink {
   my ($action, $text, @rest) = @_;
-  if ($CommentsPrefix && $action =~ /^$CommentsPrefix(.*)/) {
+  if ($CommentsPrefix && $action =~ /^$CommentsPrefix(.*)/) { # TODO use $CommentsPattern ?
     # Add the number of comments here
     my $id = $action;
     $id =~ s/%([0-9a-f][0-9a-f])/chr(hex($1))/ge; # undo urlencode

modules/compilation.pl

@@ -16,8 +16,12 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
+use strict;
+
 AddModuleDescription('compilation.pl', 'Compilation Extension');
 
+our ($q, $bol, %Action, %Page, $OpenPageName, $CollectingJournal, @MyRules);
+
 $Action{compilation} = \&DoCompilation;
 
 sub DoCompilation {
@@ -67,5 +71,5 @@ sub CompilationRule {
     pos = $oldpos;		# restore \G after call to ApplyRules
     return AddHtmlEnvironment('p');
   }
-  return undef;
+  return;
 }

modules/config.pl

@@ -1,104 +0,0 @@
-# Copyright (C) 2006  Alex Schroeder <alex@emacswiki.org>
-#
-# 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.
-#
-# 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.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
-
-AddModuleDescription('config.pl', 'Plans');
-
-$Action{config} = \&DoConfig;
-$Action{clone} = \&DoClone;
-
-sub DoConfig {
-  print GetHttpHeader('text/plain') . qq{# Wiki Config
-# Source Wiki: $SiteName <$ScriptName>
-# } . TimeToText($Now) . qq{
-\$AdminPass = "";
-\$EditPass = "";
-};
-  my $source = GetRaw('http://www.emacswiki.org/scripts/current');
-  foreach my $var qw($HomePage $MaxPost $StyleSheet $StyleSheetPage $NotFoundPg
-		     $NewText $NewComment $EditAllowed $BannedHosts
-		     $BannedCanRead $BannedContent $WikiLinks $FreeLinks
-		     $BracketText $BracketWiki $NetworkFile $AllNetworkFiles
-		     $PermanentAnchors $InterMap $NearMap $RssInterwikiTranslate
-		     $SurgeProtection $SurgeProtectionTime $SurgeProtectionViews
-		     $DeletedPage $RCName @RcDays $RcDefault $KeepDays
-		     $KeepMajor $SummaryHours $SummaryDefaultLength $ShowEdits
-		     $RecentTop $RecentLink $PageCluster
-		     $InterWikiMoniker $SiteDescription $RssImageUrl $RssRights
-		     $RssExclude $RssCacheHours $RssStyleSheet $UploadAllowed
-		     @UploadTypes $EmbedWiki $FooterNote $EditNote $TopLinkBar
-		     @UserGotoBarPages $UserGotoBar $ValidatorLink
-		     $CommentsPrefix $HtmlHeaders $IndentLimit $LanguageLimit
-		     $JournalLimit $SisterSiteLogoUrl %SpecialDays %Smilies
-		     %Languages) {
-    my $default = undef;
-    my $re = quotemeta($var);
-    if ($source =~ m!\n$re\s*=\s*(\d+(\s*[*+-/]\s*\d+)*|'[^']*'|"[^"]*"|\(.*?\)|qw\(.*?\))\s*;!) {
-      $default = $1;
-    }
-    $type = substr($var, 0, 1);
-    if ($type eq '$') {
-      my $val = eval($var);
-      print "$var = " . ConfigStr($val) . "; # default: $default\n"
-	if $val ne eval($default);
-    } elsif ($type eq '@') {
-      my @list = eval($var);
-      my @default = eval($default);
-      print "$var = (", join(', ', map { ConfigStr($_) } @list)
-	. "); # default: $default\n"
-	unless ConfigListEqual(\@list, \@default);
-    } elsif ($type eq '%') {
-      my %hash = eval($var);
-      my @default = eval($default);
-      print "$var = (", join(', ', map { ConfigStr($_)
-					   . ' => ' . ConfigStr($hash{$_})}
-			     keys %hash) . "); # default: $default\n"
-	unless ConfigHashEqual(\%hash, \%default);;
-    }
-  }
-  print "# Done!\n";
-}
-
-sub ConfigStr {
-  $_ = shift;
-  if (m/^\d+$/) {
-    $_;
-  } elsif (m/'/) {
-    "q{$_}";
-  } else {
-    "'$_'";
-  }
-}
-
-sub ConfigListEqual {
-  my ($a, $b) = @_;
-  return 0 if @$a != @$b;
-  for ($i = 0; $i < @$a; $i++) {
-    return 0 unless @$a[$i] eq @$b[$i];
-  }
-  return 1;
-}
-
-sub ConfigHashEqual {
-  my ($a, $b) = @_;
-  return 0 unless ConfigListEqual([keys %$a], [keys %$b]);
-  foreach my $key (keys %$a) {
-    next if $$a{$key} eq $$b{$key};
-    return 0;
-  }
-  return 1;
-}

modules/context.pl

@@ -13,8 +13,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+use strict;
+
 AddModuleDescription('context.pl', 'Calendar Extension');
 
+our ($q, @Debugging, $UserGotoBar, @MyInitVariables);
 push (@MyInitVariables, \&ContextMenuItem);
 
 sub ContextMenuItem {

modules/creationdate.pl

@@ -16,17 +16,21 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 #
-# This module stores additional information about a page when it is 
+# This module stores additional information about a page when it is
 # first created:
 #		created = the date the page is FIRST saved
 #		originalAuthor = the username that first created a page
 #
 # Of course, you can customize this to store more information
 
+use strict;
+
 AddModuleDescription('creationdate.pl', 'CreationDate Module');
 
-*CreationDateOldOpenPage = *OpenPage;
-*OpenPage = CreationDateOpenPage;
+our (%Page, $Now);
+
+*CreationDateOldOpenPage = \&OpenPage;
+*OpenPage = \&CreationDateOpenPage;
 
 sub CreationDateOpenPage{
 	CreationDateOldOpenPage(@_);

modules/creole.pl

@@ -1,4 +1,6 @@
 #!/usr/bin/env perl
+use strict;
+
 # ====================[ creole.pl                          ]====================
 
 =head1 NAME
@@ -12,10 +14,10 @@ creole is easily installable; move this file into the B<wiki/modules/>
 directory for your Oddmuse Wiki.
 
 =cut
-package OddMuse;
-
 AddModuleDescription('creole.pl', 'Creole Markup Extension');
 
+our ($q, $bol, %InterSite, $FullUrlPattern, $FreeLinkPattern, $FreeInterLinkPattern, $InterSitePattern, @MyRules, %RuleOrder, @MyInitVariables, @HtmlStack, @HtmlAttrStack);
+
 # ....................{ CONFIGURATION                      }....................
 
 =head1 CONFIGURATION
@@ -24,9 +26,9 @@ creole is easily configurable; set these variables in the B<wiki/config.pl>
 file for your Oddmuse Wiki.
 
 =cut
-use vars qw($CreoleLineBreaks
-            $CreoleTildeAlternative
-            $CreoleTableCellsContainBlockLevelElements
+our ($CreoleLineBreaks,
+            $CreoleTildeAlternative,
+            $CreoleTableCellsContainBlockLevelElements,
             $CreoleDashStyleUnorderedLists);
 
 =head2 $CreoleLineBreaks
@@ -421,7 +423,7 @@ sub CreoleRule {
     return OpenHtmlEnvironment('table', 1, 'user').AddHtmlEnvironment('tr');
   }
 
-  return undef;
+  return;
 }
 
 sub CreoleHeadingRule {
@@ -454,7 +456,7 @@ sub CreoleHeadingRule {
     return $header_html;
   }
 
-  return undef;
+  return;
 }
 
 sub CreoleListAndNewLineRule {
@@ -463,7 +465,7 @@ sub CreoleListAndNewLineRule {
   # # numbered list
   # * bullet list (nestable; needs space when nested to disambiguate from bold)
   if (($bol             and m/\G[ \t]*([#*])[ \t]*/cg) or
-      ($is_in_list_item and m/\G[ \t]*\n+[ \t]*(#+)[ \t]*/cg) or 
+      ($is_in_list_item and m/\G[ \t]*\n+[ \t]*(#+)[ \t]*/cg) or
       ($is_in_list_item and m/\G[ \t]*\n+[ \t]*(\*+)[ \t]+/cg)) {
     # Note: the first line of this return statement is --not-- equivalent to:
     # "return CloseHtmlEnvironmentUntil('li')", as that line does not permit
@@ -492,7 +494,7 @@ sub CreoleListAndNewLineRule {
     return $q->br();
   }
 
-  return undef;
+  return;
 }
 
 # ....................{ HTML                               }....................
@@ -559,8 +561,8 @@ sub GetCreoleLinkHtml {
 }
 
 # ....................{ FUNCTIONS                          }....................
-*RunMyRulesCreoleOld = *RunMyRules;
-*RunMyRules =          *RunMyRulesCreole;
+*RunMyRulesCreoleOld = \&RunMyRules;
+*RunMyRules =          \&RunMyRulesCreole;
 
 =head2 RunMyRulesCreole
 
@@ -590,11 +592,14 @@ C<CreoleRule>. This function ensures, among other safeties, that the
 C<CreoleRule> function is not recursed into more than once.
 
 =cut
+
+our $CreoleRuleRecursing; # must have a variable to localize below
+
 sub CreoleRuleRecursive {
   my     $markup = shift;
   return $markup if $CreoleRuleRecursing;  # avoid infinite loops
-              local $CreoleRuleRecursing = 1;
-              local $bol = 0;  # prevent block level element handling
+  local $CreoleRuleRecursing = 1; # use local for the mod_perl case
+  local $bol = 0;  # prevent block level element handling
 
   # Preserve global variables.
   my ($oldpos, $old_) = (pos, $_);

modules/creoleaddition.pl

@@ -1,4 +1,6 @@
 #!/usr/bin/env perl
+use strict;
+
 # ====================[ creoleaddition.pl                  ]====================
 
 =head1 NAME
@@ -20,10 +22,9 @@ creoleaddition is simply installable; simply:
 =back
 
 =cut
-package OddMuse;
-
 AddModuleDescription('creoleaddition.pl', 'Creole Addition Markup Extension');
 
+our ($bol, @MyRules, %RuleOrder);
 # ....................{ CONFIGURATION                      }....................
 
 =head1 CONFIGURATION
@@ -34,13 +35,12 @@ B<wiki/config.pl> file for your Oddmuse Wiki.
 =cut
 # Since these rules are not official now, users can turn off some of
 # them.
-use vars qw($CreoleAdditionSupSub
-            $CreoleAdditionDefList
-            $CreoleAdditionIndentedParagraphs
-            $CreoleAdditionQuote
-            $CreoleAdditionMonospace
-            $CreoleAdditionSmallCaps $CreoleAdditionIsInSmallCaps
-          );
+our ($CreoleAdditionSupSub,
+            $CreoleAdditionDefList,
+            $CreoleAdditionIndentedParagraphs,
+            $CreoleAdditionQuote,
+            $CreoleAdditionMonospace,
+            $CreoleAdditionSmallCaps, $CreoleAdditionIsInSmallCaps);
 
 =head2 $CreoleAdditionSupSub
 
@@ -112,9 +112,9 @@ sub CreoleAdditionRule {
   elsif ($CreoleAdditionDefList && $bol && m/\G\s*\;[ \t]*(?=(.+(\n)(\s)*\:))/cg
     or InElement('dd') && m/\G\s*\n(\s)*\;[ \t]*(?=(.+\n(\s)*\:))/cg) {
         return CloseHtmlEnvironmentUntil('dd') . OpenHtmlEnvironment('dl', 1)
-        . AddHtmlEnvironment('dt'); }# `:' needs special treatment, later 
+        . AddHtmlEnvironment('dt'); }# `:' needs special treatment, later
     elsif (InElement('dt') and m/\G\s*\n(\s)*\:[ \t]*(?=(.+(\n)(\s)*\:)*)/cg) {
-        return CloseHtmlEnvironment() . AddHtmlEnvironment('dd');} 
+        return CloseHtmlEnvironment() . AddHtmlEnvironment('dd');}
     elsif (InElement('dd') and m/\G\s*\n(\s)*\:[ \t]*(?=(.+(\n)(\s)*\:)*)/cg) {
     return  CloseHtmlEnvironment() . AddHtmlEnvironment('dd');}
   # """block quotes"""
@@ -137,7 +137,7 @@ sub CreoleAdditionRule {
     return AddOrCloseHtmlEnvironment('span', 'style="font-variant: small-caps"');
   }
 
-  return undef;
+  return;
 }
 
 =head1 COPYRIGHT AND LICENSE

modules/crossbar.pl

@@ -1,4 +1,6 @@
 #!/usr/bin/env perl
+use strict;
+
 # ====================[ crossbar.pl                         ]====================
 
 =head1 NAME
@@ -35,9 +37,11 @@ directory for your Oddmuse Wiki.
 =cut
 AddModuleDescription('crossbar.pl', 'Crossbar Extension');
 
+our ($q, $bol, $OpenPageName, @HtmlStack, @MyInitVariables, @MyRules, %AdminPages, $DeletedPage, $SidebarName, $TocIsApplyingAutomaticRules);
+
 # ....................{ CONFIGURATION                      }....................
-use vars qw($CrossbarPageName
-            $CrossbarDivIsOutsideContentDiv
+our ($CrossbarPageName,
+            $CrossbarDivIsOutsideContentDiv,
             $CrossbarSubstitutionPattern);
 
 =head1 CONFIGURATION
@@ -108,15 +112,15 @@ sub CrossbarInit {
   # If pulling the crossbar div outside the content div, we redefine the
   # default PrintPageContent() function to do this.
   if ($CrossbarDivIsOutsideContentDiv) {
-    *PrintPageContentCrossbarOld = *PrintPageContent;
-    *PrintPageContent            = *PrintPageContentCrossbar;
+    *PrintPageContentCrossbarOld = \&PrintPageContent;
+    *PrintPageContent            = \&PrintPageContentCrossbar;
   }
 
   # If this user is an authenticated administrator, forcefully clear the page
   # cache whenever saving the crossbar page.
   if (UserIsAdmin()) {
-    *SaveCrossbarOld = *Save;
-    *Save            = *SaveCrossbar;
+    *SaveCrossbarOld = \&Save;
+    *Save            = \&SaveCrossbar;
   }
 
   # If the Table of Contents module is also installed, we must prevent handling
@@ -128,14 +132,14 @@ sub CrossbarInit {
   # headers would add those headers to the Table of Contents for //every// page.
   # (Trust us on this one...)
   if (defined &RunMyRulesToc) {
-    *RunMyRulesCrossbarOld = *RunMyRules;
-    *RunMyRules            = *RunMyRulesCrossbar;
+    *RunMyRulesCrossbarOld = \&RunMyRules;
+    *RunMyRules            = \&RunMyRulesCrossbar;
   }
 }
 
 # ....................{ MARKUP =before                     }....................
-*OldCrossbarApplyRules = *ApplyRules;
-*ApplyRules = *NewCrossbarApplyRules;
+*OldCrossbarApplyRules = \&ApplyRules;
+*ApplyRules = \&NewCrossbarApplyRules;
 
 sub NewCrossbarApplyRules {
   my $text = shift;
@@ -174,7 +178,7 @@ sub CrossbarRule {
     }
   }
 
-  return undef;
+  return;
 }
 
 =head2 RunMyRulesCrossbar
@@ -223,8 +227,8 @@ sub PrintPageContentCrossbar {
 }
 
 # ....................{ EDITING                            }....................
-*GetEditFormCrossbarOld = *GetEditForm;
-*GetEditForm            = *GetEditFormCrossbar;
+*GetEditFormCrossbarOld = \&GetEditForm;
+*GetEditForm            = \&GetEditFormCrossbar;
 
 sub GetEditFormCrossbar {
   my ($page_name) = @_;
@@ -259,17 +263,17 @@ sub SaveCrossbar {
     # Prevent the RequestLockOrError() and ReleaseLock() functions from doing
     # anything while in the DoClearCache() method, since the default Save()
     # function already obtains the lock. (We can't obtain it twice!)
-    *RequestLockOrErrorCrossbarOld = *RequestLockOrError;
-    *RequestLockOrError            = *RequestLockOrErrorCrossbarNoop;
-    *ReleaseLockCrossbarOld = *ReleaseLock;
-    *ReleaseLock            = *ReleaseLockCrossbarNoop;
+    *RequestLockOrErrorCrossbarOld = \&RequestLockOrError;
+    *RequestLockOrError            = \&RequestLockOrErrorCrossbarNoop;
+    *ReleaseLockCrossbarOld = \&ReleaseLock;
+    *ReleaseLock            = \&ReleaseLockCrossbarNoop;
 
     # Clear the page cache, now. Go! (Note: this prints a heap of HTML.)
     DoClearCache();
 
     # Restore locking functionality.
-    *RequestLockOrError = *RequestLockOrErrorCrossbarOld;
-    *ReleaseLock =        *ReleaseLockCrossbarOld;
+    *RequestLockOrError = \&RequestLockOrErrorCrossbarOld;
+    *ReleaseLock =        \&ReleaseLockCrossbarOld;
   }
 }
 

modules/crumbs.pl

@@ -16,8 +16,12 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
+use strict;
+
 AddModuleDescription('crumbs.pl', 'List Parent Pages Extension');
 
+our ($q, %RuleOrder, @MyRules, $LinkPattern, $FreeLinks, $FreeLinkPattern, $WikiLinks);
+
 push(@MyRules, \&CrumbsRule);
 $RuleOrder{\&CrumbsRule} = -10; # run before default rules!
 
@@ -44,5 +48,5 @@ sub CrumbsRule {
     pos = $oldpos; # set after $_ is set!
     return $result; # clean rule, will be cached!
   }
-  return undef;
+  return;
 }

modules/css-install.pl

@@ -1,3 +1,5 @@
+use strict;
+
 =head1 NAME
 
 css-install - an Oddmuse module that allows users to change the site CSS
@@ -25,9 +27,8 @@ C<@CssList> contains a list of all the recommended CSS URLs.
 
 =cut
 
-package OddMuse;
-
-use vars qw(@CssList);
+our ($q, %Action, @MyAdminCode, $StyleSheet, $StyleSheetPage);
+our (@CssList);
 
 # List of Oddmuse CSS URLs
 

modules/csv.pl

@@ -16,8 +16,12 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
+use strict;
+
 AddModuleDescription('csv.pl', 'Comments on Long Table Markup Extension');
 
+our ($bol, @MyRules);
+
 push(@MyRules, \&CsvRule);
 
 my $RowCount;
@@ -40,5 +44,5 @@ sub CsvRule {
     return "</td><td>";
   }
   # an empty line will end the table automatically; no closing tag is required
-  return undef;
+  return;
 }

modules/dates.pl

@@ -13,8 +13,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+use strict;
+
 AddModuleDescription('dates.pl', 'Dates Extension');
 
+our ($q, %Action, @MyAdminCode);
 push(@MyAdminCode, \&DatesMenu);
 
 sub DatesMenu {
@@ -39,8 +42,8 @@ sub DoDates {
 my %date_collection;
 my $date_page;
 
-*OldDatesSearchString = *SearchString;
-*SearchString = *NewDatesSearchString;
+*OldDatesSearchString = \&SearchString;
+*SearchString = \&NewDatesSearchString;
 
 sub NewDatesSearchString {
   $date_page = $_[1]; # save the page text!

modules/debug.pl

@@ -1,33 +0,0 @@
-#! /usr/bin/perl
-# Copyright (C) 2009  Alex Schroeder <alex@gnu.org>
-
-# 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 3 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.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program. If not, see <http://www.gnu.org/licenses/>.
-
-package OddMuse;
-
-AddModuleDescription('debug.pl');
-
-@Debugging = (\&DebugInterLinks);
-
-sub DebugInterLinks {
-  print $q->h2(T('Inter links:')) . $q->p(join(', ', sort keys %InterSite))
-    if %InterSite;
-}
-
-*OldPrintFooter = *PrintFooter;
-*PrintFooter = *NewPrintFooter;
-
-sub NewPrintFooter {
-  OldPrintFooter(@_);
-  print "Debug Info: $DebugInfo";
-}

modules/delete-all.pl

@@ -12,14 +12,17 @@
 # You should have received a copy of the GNU General Public License along with
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
+use strict;
+
 AddModuleDescription('delete-all.pl');
 
-use vars qw($DeletedAge);
+our (%Page, $Now, $OpenPageName, %LockOnCreation);
+our ($DeleteAge);
 
 $DeleteAge = 172800; # 2*24*60*60
 
-*OldDelPageDeletable = *PageDeletable;
-*PageDeletable = *NewDelPageDeletable;
+*OldDelPageDeletable = \&PageDeletable;
+*PageDeletable = \&NewDelPageDeletable;
 
 # All pages will be deleted after two days of inactivity!
 sub NewDelPageDeletable {

modules/despam.pl

@@ -16,6 +16,10 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
+use strict;
+
+our ($q, $Now, %IndexHash, %Action, %Page, $OpenPageName, $FS, $BannedContent, $RcFile, $RcDefault, @MyAdminCode, $FullUrlPattern, $DeletedPage, $StrangeBannedContent);
+
 AddModuleDescription('despam.pl', 'Despam Extension');
 
 push(@MyAdminCode, \&DespamMenu);
@@ -127,7 +131,7 @@ sub DespamPage {
   my $rule = shift;
   # from DoHistory()
   my @revisions = sort {$b <=> $a} map { m|/([0-9]+).kp$|; $1; } GetKeepFiles($OpenPageName);
-  foreach my $revision (@revisions) { # remember the last revision checked
+  foreach my $revision (@revisions) {
     my ($text, $rev) = GetTextRevision($revision, 1); # quiet
     if (not $rev) {
       print ': ' . Ts('Cannot find revision %s.', $revision);
@@ -144,6 +148,6 @@ sub DespamPage {
     print ': ' . $summary;
     Save($OpenPageName, $DeletedPage, $summary) unless GetParam('debug', 0);
   } else {
-    print ': ' . T('Cannot find unspammed revision.'. $revision);
+    print ': ' . T('Cannot find unspammed revision.');
   }
 }

modules/diff.pl

@@ -13,16 +13,17 @@
 # You should have received a copy of the GNU General Public License along with
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
-package OddMuse;
+use strict;
 
 AddModuleDescription('diff.pl', 'Diff Action Extension');
 
+our ($q, %Action, @IndexList, @MyRules, $TempDir);
 push(@MyRules, \&DiffActionRule);
 $Action{pagediff} = \&DoDiffAction;
 
 sub DiffActionRule {
   return PrintDiffActionChooser($3) if (m/\G(&lt;diff( (.*))&gt;)/cgi);
-  return undef; # the rule didn't match
+  return; # the rule didn't match
 }
 
 sub DoDiffAction {

modules/div-foo.pl

@@ -12,20 +12,22 @@
 # You should have received a copy of the GNU General Public License along with
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
-package OddMuse;
+use strict;
 
 AddModuleDescription('div-foo.pl', 'Div Foo Extension');
 
-use vars qw($DivFooPrefix);
+our (@MyRules);
+our ($DivFooPrefix);
+
 $DivFooPrefix = 'foo_';
 
 push(@MyRules, \&DivFooRule);
 
 sub DivFooRule {
-  if (m/\G \&lt; ([a-z-_][a-z-_ ]+[a-z-_]) \&gt; \s*\n /cgx) {
+  if (m/\G \&lt; ([a-z_-][a-z0-9 _-]+[a-z0-9_-]) \&gt; \s*\n /cgx) {
     return CloseHtmlEnvironment('p') . AddHtmlEnvironment('div', 'class="' . join(' ', map {"$DivFooPrefix$_"} split /\s+/, $1) . '"');
   }
-  if (m/\G \&lt; ([a-z-_][a-z-_ ]+[a-z-_]) (\?(.*?(?=\&gt;)))? \&gt; /cgx) {
+  if (m/\G \&lt; ([a-z_-][a-z0-9 _-]+[a-z0-9_-]) (\?(.*?(?=\&gt;)))? \&gt; /cgx) {
     my $title = $3 ? ' title="' . QuoteHtml($3) . '"' : '';
     return AddHtmlEnvironment('span', 'class="' . join(' ', map {"$DivFooPrefix$_"} split /\s+/, $1) . '"' . $title);
   }
@@ -35,5 +37,5 @@ sub DivFooRule {
   if (m/\G \&lt; \/ \&gt; /cgx) {
     return CloseHtmlEnvironment('span');
   }
-  return undef;
+  return;
 }

modules/dojo.pl

@@ -13,9 +13,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
+use strict;
+
 AddModuleDescription('dojo.pl', 'Using Dojo Instead Of Wiki Markup');
 
-use vars qw(@DojoPlugins $DojoTheme);
+our ($q, $HtmlHeaders, @MyRules, @MyInitVariables, %CookieParameters);
+our (@DojoPlugins, $DojoTheme);
 
 $DojoTheme = 'tundra';
 
@@ -31,7 +34,7 @@ sub WysiwygRule {
       or substr($1,4,6) eq 'script';
     return UnquoteHtml($1);
   }
-  return undef;
+  return;
 }
 
 # Add the dojo script to edit pages.
@@ -61,8 +64,8 @@ sub WysiwygScript {
   SetParam('theme', $DojoTheme);
 }
 
-*OldWysiwygGetTextArea = *GetTextArea;
-*GetTextArea = *NewWysiwygGetTextArea;
+*OldWysiwygGetTextArea = \&GetTextArea;
+*GetTextArea = \&NewWysiwygGetTextArea;
 
 sub NewWysiwygGetTextArea {
   my ($name, $text, $rows) = @_;
@@ -82,8 +85,8 @@ sub NewWysiwygGetTextArea {
   }
 }
 
-*OldWysiwygImproveDiff = *ImproveDiff;
-*ImproveDiff = *NewWysiwygImproveDiff;
+*OldWysiwygImproveDiff = \&ImproveDiff;
+*ImproveDiff = \&NewWysiwygImproveDiff;
 
 sub NewWysiwygImproveDiff {
   my $old = OldWysiwygImproveDiff(@_);

modules/doubleclick.pl

@@ -21,10 +21,14 @@
 # edit a page by double-clicking on it. The user must have
 # JavaScript enabled for this to work.
 
+use strict;
+
 AddModuleDescription('doubleclick.pl', 'Doubleclick Extension');
 
-*OldDoubleclickGetHeader = *GetHeader;
-*GetHeader = NewDoubleclickGetHeader;
+our ($ScriptName);
+
+*OldDoubleclickGetHeader = \&GetHeader;
+*GetHeader = \&NewDoubleclickGetHeader;
 
 sub NewDoubleclickGetHeader {
     my $id = shift;

modules/download.pl

@@ -16,8 +16,11 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
+use strict;
+
 AddModuleDescription('download.pl', 'Download Extension');
 
+our (@MyRules, $FreeLinkPattern);
 push( @MyRules, \&DownloadSupportRule );
 
 # [[download:page name]]
@@ -30,5 +33,5 @@ sub DownloadSupportRule {
     print GetDownloadLink($2, undef, undef, $3);
     return '';
   }
-  return undef;
+  return;
 }

modules/drafts.pl

@@ -12,10 +12,14 @@
 # You should have received a copy of the GNU General Public License along with
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
-use File::Glob ':glob';
-use vars qw($DraftDir);
+use strict;
 
-AddModuleDescription('drafts.pl');
+use File::Glob ':glob';
+our ($DraftDir);
+
+AddModuleDescription('drafts.pl', 'Draft Extension');
+
+our ($q, $Message, $Now, %Action, $DataDir, @MyInitVariables, @MyMaintenance, $FooterNote);
 
 $DraftDir = $DataDir."/draft"; # directory for drafts
 
@@ -54,8 +58,8 @@ sub DoDraft {
 
 # add preview button to edit page (but not to GetCommentForm!)
 
-*DraftOldGetEditForm = *GetEditForm;
-*GetEditForm = *DraftNewGetEditForm;
+*DraftOldGetEditForm = \&GetEditForm;
+*GetEditForm = \&DraftNewGetEditForm;
 
 sub DraftNewGetEditForm {
   my $html = DraftOldGetEditForm(@_);
@@ -71,9 +75,10 @@ push(@MyMaintenance, \&DraftCleanup);
 
 sub DraftFiles {
   return map {
-    $_ = substr($_, length($DraftDir) + 1);
-    utf8::decode($_);
-    $_;
+    my $x = $_;
+    $x = substr($x, length($DraftDir) + 1);
+    utf8::decode($x);
+    $x;
   } bsd_glob("$DraftDir/*"), bsd_glob("$DraftDir/.*");
 }
 

modules/duckduckgo-search.pl

@@ -12,9 +12,12 @@
 # You should have received a copy of the GNU General Public License along with
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
+use strict;
+
 AddModuleDescription('duckduckgo-search.pl', 'Use DuckDuckGo For Searches');
 
-use vars qw($DuckDuckGoSearchDomain);
+our ($q, %Action, $ScriptName, @MyInitVariables);
+our ($DuckDuckGoSearchDomain);
 
 $DuckDuckGoSearchDomain = undef;
 

modules/dynamic-comments.pl

@@ -12,8 +12,12 @@
 # You should have received a copy of the GNU General Public License along with
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
+use strict;
+
 AddModuleDescription('dynamic-comments.pl', 'Dynamic Comments Extension');
 
+our ($q, $CollectingJournal, $CommentsPrefix, @MyInitVariables, $HtmlHeaders);
+
 push(@MyInitVariables, \&DynamicCommentsAddScript);
 
 sub DynamicCommentsAddScript {
@@ -34,8 +38,8 @@ function togglecomments (id) {
 
 my $num = 0;
 
-*DynamicCommentsOldGetPageLink = *GetPageLink;
-*GetPageLink = *DynamicCommentsNewGetPageLink;
+*DynamicCommentsOldGetPageLink = \&GetPageLink;
+*GetPageLink = \&DynamicCommentsNewGetPageLink;
 
 sub DynamicCommentsNewGetPageLink {
   my ($id, @rest) = @_;

modules/dynlogo.pl

@@ -27,9 +27,11 @@
 #  $LogoUrl = GetDynLogoUrl();
 #
 
+use strict;
+
 AddModuleDescription('dynlogo.pl', 'Dynamic Logo');
 
-use vars qw($DynLogoDirectory $DynLogoDefault %DynLogoMap);
+our ($DynLogoDirectory, $DynLogoDefault, %DynLogoMap);
 
 # Directory to search for images.
 $DynLogoDirectory = '/pic/dynlogo';
@@ -45,7 +47,7 @@ $DynLogoDefault = 'logo.png';
 sub GetDynLogoUrl {
   my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday) = localtime(time);
   my $today = sprintf("%d-%02d-%02d", $year + 1900, $mon + 1, $mday);
-  foreach $k(keys(%DynLogoMap)) {
+  foreach my $k (keys(%DynLogoMap)) {
     if ($today=~m/$k/) {
       return $DynLogoDirectory."/".$DynLogoMap{$k};
     }

modules/edit-assist.pl

@@ -14,8 +14,11 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
+use strict;
 
-AddModuleDescription('edit-assist.pl');
+AddModuleDescription('edit-assist.pl', 'Edit Assist Extension');
+
+our ($q, $HtmlHeaders, @MyInitVariables);
 
 push (@MyInitVariables,
       sub {
@@ -65,7 +68,7 @@ function mwInsertEditButton(parent, item) {
 		insertTags(item.tagOpen, item.tagClose, item.sampleText);
 		return false;
 	};
-	
+
 	parent.appendChild(image);
 	return true;
 }
@@ -83,13 +86,13 @@ function mwSetupToolbar() {
 
 	var textbox = document.getElementById('text');
 	if (!textbox) { return false; }
-	
+
 	// Don't generate buttons for browsers which don't fully
 	// support it.
 	if (!document.selection && textbox.selectionStart === null) {
 		return false;
 	}
-	
+
 	for (var i in mwEditButtons) {
 		mwInsertEditButton(toolbar, mwEditButtons[i]);
 	}
@@ -170,7 +173,7 @@ function insertTags(tagOpen, tagClose, sampleText) {
 	}
 }
 
- 
+
 addButton('/images/button_bold.png','Bold text','**','**','Bold text');
 addButton('/images/button_italic.png','Italic text','//','//','Italic text');
 
@@ -178,7 +181,7 @@ addButton('/images/button_link.png','Internal link','[[',']]','Link title');
 addButton('/images/button_extlink.png','External link (remember http:// prefix)','[',']','http://www.example.com link title');
 
 addButton('/images/button_headline.png','Level 2 headline','\\n== ',' ==\\n','Headline text');
- 
+
 addButton('/images/button_image.png','Embedded image','[[image:',']]','Example.jpg');
 
 addButton('/images/button_nowiki.png','Ignore wiki formatting','{{{','}}}','Insert non-formatted text here');

modules/edit-cluster.pl

@@ -1,6 +1,25 @@
-AddModuleDescription('edit-cluster.pl');
+# Copyright (C) 2005–2015  Alex Schroeder <alex@gnu.org>
+# Copyright (C) 2014–2015  Aleks-Daniel Jakimenko <alex.jakimenko@gmail.com>
+#
+# 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 3 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.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program. If not, see <http://www.gnu.org/licenses/>.
 
-$EditCluster = 'EditCluster';
+use strict;
+
+AddModuleDescription('edit-cluster.pl', 'Edit Cluster Extension');
+
+our ($q, $FS, $RcDefault, @RcDays, $RecentTop, $LastUpdate);
+
+our $EditCluster = 'EditCluster';
 
 sub GetRc {
   my $printDailyTear = shift;
@@ -62,7 +81,7 @@ sub GetRc {
     } elsif (%wanted_clusters) {
       my $show = 1;
       foreach my $cluster (keys %cluster) { # assuming "fr,CopyEdit"
-	foreach $member (split(/,/, $cluster)) { # eg. "fr"
+	foreach my $member (split(/,/, $cluster)) { # eg. "fr"
 	  if ($cluster{$cluster}) {
 	    $show = 1;
 	    last;
@@ -81,8 +100,8 @@ sub GetRc {
   }
 }
 
-*EditClusterOldRcHeader = *RcHeader;
-*RcHeader = *EditClusterNewRcHeader;
+*EditClusterOldRcHeader = \&RcHeader;
+*RcHeader = \&EditClusterNewRcHeader;
 
 sub EditClusterNewRcHeader {
   if (GetParam('from', 0)) {
@@ -130,9 +149,9 @@ sub EditClusterNewRcHeader {
   $form .= $q->input({-type=>'hidden', -name=>'action', -value=>'rc'});
   $form .= $q->input({-type=>'hidden', -name=>'all', -value=>1}) if $all;
   $form .= $q->input({-type=>'hidden', -name=>'days', -value=>$days}) if $days != $RcDefault;
-  $form .= $q->input({-type=>'hidden', -name=>'rcfilteronly', -value=>$rcfilteronly}) if $rcfilteronly;
-  $form .= $q->input({-type=>'hidden', -name=>'rcuseronly', -value=>$rcuseronly}) if $rcuseronly;
-  $form .= $q->input({-type=>'hidden', -name=>'rchostonly', -value=>$rchostonly}) if $rchostonly;
+  $form .= $q->input({-type=>'hidden', -name=>'rcfilteronly', -value=>$filterOnly}) if $filterOnly;
+  $form .= $q->input({-type=>'hidden', -name=>'rcuseronly', -value=>$userOnly}) if $userOnly;
+  $form .= $q->input({-type=>'hidden', -name=>'rchostonly', -value=>$hostOnly}) if $hostOnly;
   $form .= $q->input({-type=>'hidden', -name=>'match', -value=>$match}) if $match;
   $form .= $q->input({-type=>'hidden', -name=>'lang', -value=>$lang}) if $lang;
   print $form, ' ', $q->submit(T('Go!')), $q->end_form();

modules/edit-paragraphs.pl

@@ -12,9 +12,11 @@
 # You should have received a copy of the GNU General Public License along with
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
-package OddMuse;
+use strict;
 
-AddModuleDescription('edit-paragraph.pl', 'Edit Paragraphs Extension');
+AddModuleDescription('edit-paragraphs.pl', 'Edit Paragraphs Extension');
+
+our ($q, $OpenPageName, $Fragment, %Page, %Action, @MyRules, $LastUpdate);
 
 # edit icon
 # http://publicdomainvectors.org/en/free-clipart/Pencil-vector-icon/9221.html
@@ -47,7 +49,7 @@ sub DoEditParagraph {
     } else {
       $text = $Page{text};
     }
-    
+
     my $done;
     if ($around) {
       # The tricky part is that the numbers refer to the HTML quoted text. What a pain.
@@ -102,8 +104,8 @@ sub DoEditParagraph {
 
 my @EditParagraphs = ();
 
-*EditParagraphOldPrintWikiToHTML = *PrintWikiToHTML;
-*PrintWikiToHTML = *EditParagraphNewPrintWikiToHTML;
+*EditParagraphOldPrintWikiToHTML = \&PrintWikiToHTML;
+*PrintWikiToHTML = \&EditParagraphNewPrintWikiToHTML;
 
 sub EditParagraphNewPrintWikiToHTML {
   my ($text, $is_saving_cache, $revision, $is_locked) = @_;
@@ -113,6 +115,7 @@ sub EditParagraphNewPrintWikiToHTML {
     my ($start, $end) = (0, 0);
     # This grouping with zero-width positive look-ahead assertion makes sure that this chunk of text does not include
     # markup need for the next chunk of text.
+    my $regexp;
     if (grep { $_ eq \&CreoleRule } @MyRules) {
       $regexp = "\n+(\n|(?=[*#-=|]))";
     } else {
@@ -135,16 +138,16 @@ sub EditParagraphNewPrintWikiToHTML {
 
 # Whenever an important element is closed, we try to add a link.
 
-*EditParagraphOldCloseHtmlEnvironments = *CloseHtmlEnvironments;
-*CloseHtmlEnvironments = *EditParagraphNewCloseHtmlEnvironments;
+*EditParagraphOldCloseHtmlEnvironments = \&CloseHtmlEnvironments;
+*CloseHtmlEnvironments = \&EditParagraphNewCloseHtmlEnvironments;
 
 sub EditParagraphNewCloseHtmlEnvironments {
   EditParagraph();
   return EditParagraphOldCloseHtmlEnvironments(@_);
 }
 
-*EditParagraphOldCloseHtmlEnvironmentUntil = *CloseHtmlEnvironmentUntil;
-*CloseHtmlEnvironmentUntil = *EditParagraphNewCloseHtmlEnvironmentUntil;
+*EditParagraphOldCloseHtmlEnvironmentUntil = \&CloseHtmlEnvironmentUntil;
+*CloseHtmlEnvironmentUntil = \&EditParagraphNewCloseHtmlEnvironmentUntil;
 
 sub EditParagraphNewCloseHtmlEnvironmentUntil {
   my $tag = $_[0];
@@ -184,7 +187,7 @@ sub EditParagraph {
     # <table><tr><td>...</td></tr></table><p><a ...>&#x270E;</a></p>
     # What we want, I guess, is this:
     # <table><tr><td>...<a ...>&#x270E;</a></td></tr></table></p>
-    
+
     $pos = $pos || length(QuoteHtml($Page{text})); # make sure we have an around value
     my $title = UrlEncode($OpenPageName);
     my $paragraph = UrlEncode(UnquoteHtml($text));

modules/emailquote.pl

@@ -1,21 +1,24 @@
 # Copyright (C) 2008  Weakish Jiang <weakish@gmail.com>
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as 
+# it under the terms of the GNU General Public License version 2 as
 # published by the Free Software Foundation.
 #
 # You can get a copy of GPL version 2 at
 # http://www.gnu.org/licenses/gpl-2.0.html
 #
-# For user doc, see: 
+# For user doc, see:
 # http://www.oddmuse.org/cgi-bin/oddmuse/Email_Quote_Extension
 
+use strict;
+
 AddModuleDescription('emailquote.pl', 'Email Quote Extension');
 
+our ($q, $bol, @MyRules);
+
 push(@MyRules, \&EmailQuoteRule);
 
-sub EmailQuoteRule 
-{
+sub EmailQuoteRule {
     #  > on a line of its own should work
     if ($bol && m/\G(\s*\n)*((\&gt;))+\n/cog) {
         return $q->p();
@@ -25,11 +28,9 @@ sub EmailQuoteRule
     # > in last letter.
     elsif ($bol && m/\G(\s*\n)*((\&gt;)+)[ \t]/cog
            or InElement('dd') && m/\G(\s*\n)+((\&gt;)+)[ \t]/cog) {
-        $leng = length($2) / 4;
+        my $leng = length($2) / 4;
         return CloseHtmlEnvironmentUntil('dd') . OpenHtmlEnvironment('dl',$leng, 'quote')
         . $q->dt() . AddHtmlEnvironment('dd');
     }
-    return undef;
-}	
-   
-
+    return;
+}

modules/emoji.pl

@@ -12,8 +12,12 @@
 # You should have received a copy of the GNU General Public License along with
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
+use strict;
+
 AddModuleDescription('emoji.pl', 'Smilies');
 
+our (%RuleOrder, @MyRules);
+
 push(@MyRules, \&EmojiRule);
 # this must come before tex.pl because of \o/ turning into ø/
 $RuleOrder{\&EmojiRule} = 150;
@@ -62,5 +66,5 @@ sub EmojiRule {
     # ✊  270A RAISED FIST
     return '&#x270A;';
   }
-  return undef;
+  return;
 }

modules/enclosure.pl

@@ -13,9 +13,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+use strict;
+
 AddModuleDescription('enclosure.pl', 'Podcasting');
 
-use vars qw(@Enclosures);
+our (%Page, %IndexHash, @MyRules, $FreeLinkPattern);
+our (@Enclosures);
 
 push(@MyRules, \&EnclosureRule);
 
@@ -34,19 +37,19 @@ sub EnclosureRule {
     $Page{enclosures} = join(' ', keys %enclosures);
     return GetDownloadLink($id, undef, undef, $3);
   }
-  return undef;
+  return;
 }
 
-* OldEnclosurePrintWikiToHTML = *PrintWikiToHTML;
-* PrintWikiToHTML = *NewEnclosurePrintWikiToHTML;
+*OldEnclosurePrintWikiToHTML = \&PrintWikiToHTML;
+*PrintWikiToHTML = \&NewEnclosurePrintWikiToHTML;
 
 sub NewEnclosurePrintWikiToHTML {
   $Page{enclosures} = '';
   return OldEnclosurePrintWikiToHTML(@_);
 }
 
-* OldEnclosureRssItem = *RssItem;
-* RssItem = *NewEnclosureRssItem;
+*OldEnclosureRssItem = \&RssItem;
+*RssItem = \&NewEnclosureRssItem;
 
 sub NewEnclosureRssItem {
   my $id = shift;

modules/faq.pl

@@ -20,11 +20,16 @@
 # This module creates a list of all questions on the page, e.g.
 # for a faq. It does so by recognizing all lines that begin with
 # a Q: as a question.
-# Additionally, lines starting with Q: and A: are rendered using 
+# Additionally, lines starting with Q: and A: are rendered using
 # the css classes div.question and div.answer.
 
+use strict;
+
 AddModuleDescription('faq.pl', 'FAQ Extension');
 
+our ($q, $bol, @MyRules);
+our ($FaqHeaderText, $FaqQuestionText, $FaqAnswerText);
+
 $FaqHeaderText = "Questions on this page:" unless $FaqHeaderText;
 $FaqQuestionText = "Question: " unless $FaqQuestionText;
 $FaqAnswerText = "Answer: " unless $FaqAnswerText;
@@ -39,11 +44,11 @@ sub FaqRule {
     return CloseHtmlEnvironments()
       . AddHtmlEnvironment('div', "class='answer'") . $FaqAnswerText;
   }
-  return undef;
+  return;
 }
 
-*OldFaqGetHeader = *GetHeader;
-*GetHeader = *NewFaqGetHeader;
+*OldFaqGetHeader = \&GetHeader;
+*GetHeader = \&NewFaqGetHeader;
 
 sub NewFaqGetHeader {
   my ($id) = @_;
@@ -54,7 +59,7 @@ sub NewFaqGetHeader {
 }
 
 sub FaqHeadings {
-  $page = GetPageContent(shift);
+  my $page = GetPageContent(shift);
   # ignore all the stuff that gets processed anyway by usemod.pl and
   # creole.pl -- if we're not going to hook into ordinary parsing like
   # toc.pl does, this will always be incomplete.
@@ -64,7 +69,7 @@ sub FaqHeadings {
   $page =~ s/\{\{\{[ \t]*\n(.*?)\n\}\}\}[ \t]*(\n|$)//gs;
 
   my $Headings = '';
-  foreach $line (grep(/^Q:[ \t]*(.*?)$/, split(/\n/, $page))) {
+  foreach my $line (grep(/^Q:[ \t]*(.*?)$/, split(/\n/, $page))) {
     next unless $line =~ /^Q:[ \t]*(.*?)$/;
     next unless $1;
     my $link = 'FAQ_' . UrlEncode($1);

modules/fckeditor.pl

@@ -16,9 +16,12 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA,
 
+use strict;
+
 AddModuleDescription('fckeditor.pl', 'Using FCKeditor In Addition To Wiki Markup');
 
-use vars qw($FCKeditorHeight);
+our ($q, @MyRules, @MyInitVariables, $HtmlHeaders);
+our ($FCKeditorHeight);
 
 $FCKeditorHeight = 400; # Pixel
 
@@ -30,7 +33,7 @@ sub WysiwygRule {
       or substr($1,4,6) eq 'script';
     return UnquoteHtml($1);
   }
-  return undef;
+  return;
 }
 
 push (@MyInitVariables, \&WysiwygScript);
@@ -55,8 +58,8 @@ input[name="Preview"] { display: none; }
   }
 }
 
-*OldFckImproveDiff = *ImproveDiff;
-*ImproveDiff = *NewFckImproveDiff;
+*OldFckImproveDiff = \&ImproveDiff;
+*ImproveDiff = \&NewFckImproveDiff;
 
 sub NewFckImproveDiff {
   my $old = OldFckImproveDiff(@_);

modules/fieldlist.pl

@@ -1,21 +1,25 @@
 # Copyright (C) 2008  Weakish Jiang <weakish@gmail.com>
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as 
+# it under the terms of the GNU General Public License version 2 as
 # published by the Free Software Foundation.
 #
 # You can get a copy of GPL version 2 at
 # http://www.gnu.org/licenses/gpl-2.0.html
 #
-# For user doc, see: 
+# For user doc, see:
 # http://www.oddmuse.org/cgi-bin/oddmuse/Field_List_Extension
 
+use strict;
+
 AddModuleDescription('fieldlist.pl', 'Field List Extension');
 
+our ($bol, @MyRules);
+
 push(@MyRules, \&FieldListRules);
 
 sub FieldListRules {
-   # :fieldname: fieldbody 
+   # :fieldname: fieldbody
   if ($bol && m/\G\s*\:(?=(((\S.*\S)|\S)\:))/cg
 	 or InElement('dd') && m/\G\s*\n(\s)*\:(?=(((\S.*\S)|\S)\:))/cg) {
     return CloseHtmlEnvironmentUntil('dd') . OpenHtmlEnvironment('dl', 1, 'fieldlist')
@@ -23,5 +27,5 @@ sub FieldListRules {
   } elsif (InElement('dt') and m/\G\:[ \t]*(?=((\S)+))/cg) {
     return CloseHtmlEnvironment() . AddHtmlEnvironment('dd');
   }
-    return undef;
-}	
+    return;
+}

modules/find.pl

@@ -13,8 +13,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
+use strict;
+
 AddModuleDescription('find.pl', 'Find Extension');
 
+our ($q, $Now, %Action);
 $Action{find} = \&DoFind;
 
 sub DoFind {

modules/fix-encoding.pl

@@ -13,8 +13,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
+use strict;
+
 AddModuleDescription('fix-encoding.pl', 'Fix Encoding');
 
+our (%Action, %Page, @MyAdminCode);
+
 $Action{'fix-encoding'} = \&FixEncoding;
 
 sub FixEncoding {

modules/flashbox.pl

@@ -1,4 +1,6 @@
 #!/usr/bin/env perl
+use strict;
+
 # ====================[ flashbox.pl                        ]====================
 
 =head1 NAME
@@ -13,10 +15,10 @@ flashbox is easily installable: move this file into the B<wiki/modules/>
 directory of your Oddmuse Wiki.
 
 =cut
-package OddMuse;
-
 AddModuleDescription('flashbox.pl', 'Flashbox Extension');
 
+our ($bol, @MyRules, %RuleOrder);
+
 # ....................{ CONFIGURATION                      }....................
 
 =head1 CONFIGURATION
@@ -25,7 +27,7 @@ flashbox is easily configurable: set these variables in the B<wiki/config.pl>
 file for your Oddmuse Wiki.
 
 =cut
-use vars qw($FlashboxWidth
+our ($FlashboxWidth,
             $FlashboxHeight);
 
 =head2 $FlashboxWidth
@@ -120,7 +122,7 @@ sub FlashboxRule {
     return FlashboxHtml('youtube',
                         "http://www.youtube.com/v/${1}");
   }
-  return undef;
+  return;
 }
 
 sub FlashboxHtml {

modules/flickrgallery.pl

@@ -9,20 +9,23 @@
 # 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.
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
+use strict;
+
 AddModuleDescription('flickrgallery.pl', 'FlickrGallery Module');
 
 # NOTE: This API key for Flickr is NOT to be used in any other products
 # INCLUDING derivative works.  The rest of the code can be used as licensed
-$FlickrAPIKey = "a8d5ba0d878e08847ccc8b150e52a859";
+my $FlickrAPIKey = "a8d5ba0d878e08847ccc8b150e52a859";
 
-use vars qw($FlickrBaseUrl $FlickrHeaderTemplate $FlickrFooterTemplate $FlickrImageTemplate $FlickrExtension $FlickrLabel);
+our (%RuleOrder, @MyRules, @MyMarkdownRules);
+our ($FlickrBaseUrl, $FlickrHeaderTemplate, $FlickrFooterTemplate, $FlickrImageTemplate, $FlickrExtension, $FlickrLabel);
 
 use LWP;
 
@@ -39,7 +42,7 @@ $FlickrImageTemplate = '<div class="image"><a href="$imageurl" title="$title"><i
 $FlickrLabel = "Square" unless defined $FlickrLabel;
 $FlickrLabel = ucfirst($FlickrLabel);
 
-%FlickrExtensions = (
+my %FlickrExtensions = (
 	'Square' => '_s',
 	'Thumbnail' => '_t',
 	'Small' => '_m',
@@ -51,7 +54,7 @@ $FlickrExtension = $FlickrExtensions{$FlickrLabel};
 
 # Square|Thumbnail|Small|Medium|Original
 
-$size = "Square|Thumbnail|Small|medium|Original";
+my $size = "Square|Thumbnail|Small|medium|Original";
 
 push (@MyRules, \&FlickrGalleryRule);
 
@@ -65,11 +68,11 @@ sub FlickrGalleryRule {
 	if (/\G^([\n\r]*\&lt;\s*FlickrSet:\s*(\d+)\s*\&gt;\s*)$/mgci) {
 		my $oldpos = pos;
 		my $oldstr = $_;
-		
+
 		print FlickrGallery($2);
-		
+
 		pos = $oldpos;
-		
+
 		$oldstr =~ s/\&lt;\s*FlickrSet:\s*(\d+)\s*\&gt;//is;
 		$_ = $oldstr;
 		return '';
@@ -78,23 +81,23 @@ sub FlickrGalleryRule {
 	if (/\G^([\n\r]*\&lt;\s*FlickrPhoto:\s*(\d+)\s*([a-z0-9]*?)\s*($size)?\s*\&gt;\s*)$/mgci) {
 		my $oldpos = pos;
 		my $oldstr = $_;
-		
+
 		print GetFlickrPhoto($2,$3,$4);
-		
+
 		pos = $oldpos;
-		
+
 		$oldstr =~ s/\&lt;\s*FlickrPhoto:\s*(\d+)\s*([a-z0-9]*?)\s*($size)?\s*\&gt;//is;
 		$_ = $oldstr;
 		return '';
 	}
-	
-	return undef;
+
+	return;
 }
 
 sub MarkdownFlickrGalleryRule {
 	# for Markdown only
 	my $text = shift;
-	
+
 	$text =~ s{
 		^&lt;FlickrSet:\s*(\d+)\s*\>
 	}{
@@ -106,7 +109,7 @@ sub MarkdownFlickrGalleryRule {
 	}{
 		GetFlickrPhoto($1,$2,$3);
 	}xmgei;
-	
+
 	return $text
 }
 
@@ -116,9 +119,9 @@ sub FlickrGallery {
 	my $ua = LWP::UserAgent->new;
 #	$ua->timeout(10);
 	my $result = "";
-	
+
 	# Get Title and description
-	my $url = $FlickrBaseUrl . "?method=flickr.photosets.getInfo&api_key=" . 
+	my $url = $FlickrBaseUrl . "?method=flickr.photosets.getInfo&api_key=" .
 		$FlickrAPIKey . "&photoset_id=" . $id;
 #	my $response = $ua->get($url);
 	my $response = $ua->request(HTTP::Request->new(GET=>$url));
@@ -128,19 +131,19 @@ sub FlickrGallery {
 
 	$response->content =~ /\<description\>(.*?)\<\/description\>/;
 	my $description = $1;
-		
+
 	$result = $FlickrHeaderTemplate;
 
 	$result =~ s/(\$[a-zA-Z\d]+)/"defined $1 ? $1 : ''"/gee;
-	
+
 	# Get list of photos and process them
-	$url = $FlickrBaseUrl . "?method=flickr.photosets.getPhotos&api_key=" . 
+	$url = $FlickrBaseUrl . "?method=flickr.photosets.getPhotos&api_key=" .
 		$FlickrAPIKey . "&photoset_id=" . $id;
 #	$response = $ua->get($url);
 	$response = $ua->request(HTTP::Request->new(GET=>$url));
 
 	my $xml = $response->content;
-	
+
 	while (
 		$xml =~ m/\<photo\s+id=\"(\d+)\"\s+secret=\"(.+?)\"\s+server=\"(\d+)\"/g
 	) {
@@ -148,24 +151,24 @@ sub FlickrGallery {
 	}
 
 	my $footer = $FlickrFooterTemplate;
-	
+
 	$footer =~ s/(\$[a-zA-Z\d]+)/"defined $1 ? $1 : ''"/gee;
 	$result .= $footer;
-	
+
 	return $result;
 }
 
 sub FlickrPhoto {
 	my ($id, $secret, $server) = @_;
-	
+
 	my $ua = LWP::UserAgent->new;
 #	$ua->timeout(10);
-	$url = $FlickrBaseUrl . "?method=flickr.photos.getInfo&api_key=" . 
+	my $url = $FlickrBaseUrl . "?method=flickr.photos.getInfo&api_key=" .
 		$FlickrAPIKey . "&photo_id=" . $id . "&secret=" . $secret;
 
 #	my $response = $ua->get($url);
 	my $response = $ua->request(HTTP::Request->new(GET=>$url));
-	
+
 	$response->content =~ /\<title\>(.*?)\<\/title\>/;
 	my $title = $1;
 	my $cleanTitle = $title;
@@ -176,7 +179,7 @@ sub FlickrPhoto {
 	$response->content =~ /\<url type="photopage"\>(.*?)\<\/url\>/;
 	my $imageurl = $1;
 
-	$url = $FlickrBaseUrl . "?method=flickr.photos.getSizes&api_key=" . 
+	$url = $FlickrBaseUrl . "?method=flickr.photos.getSizes&api_key=" .
 		$FlickrAPIKey . "&photo_id=" . $id;
 
 #	$response = $ua->get($url);
@@ -195,23 +198,23 @@ sub FlickrPhoto {
 
 sub GetFlickrPhoto{
 	my ($id, $secret, $size) = @_;
-	
+
 	local $FlickrLabel = ucfirst($size) if ($size);
 	local $FlickrExtension = $FlickrExtensions{$FlickrLabel};
-	
+
 	my $ua = LWP::UserAgent->new;
 #	$ua->timeout(10);
-	$url = $FlickrBaseUrl . "?method=flickr.photos.getInfo&api_key=" . 
+	my $url = $FlickrBaseUrl . "?method=flickr.photos.getInfo&api_key=" .
 		$FlickrAPIKey . "&photo_id=" . $id;
-	
+
 	$url .= "&secret=" . $secret if ($secret);
 
 #	my $response = $ua->get($url);
 	my $response = $ua->request(HTTP::Request->new(GET=>$url));
-	
+
 	$response->content =~  m/\<photo\s+id=\"(\d+)\"\s+secret=\"(.+?)\"\s+server=\"(\d+)\"/g;
 	$secret = $2;
-	$server = $3;	
+	my $server = $3;
 
 	return FlickrPhoto($id,$secret,$server);
 }

modules/footnotes.pl

@@ -1,4 +1,6 @@
 #!/usr/bin/env perl
+use strict;
+
 # ====================[ footnotes.pl                       ]====================
 
 =head1 NAME
@@ -11,10 +13,9 @@ footnotes is easily installable; move this file into the B<wiki/modules/>
 directory for your Oddmuse Wiki.
 
 =cut
-package OddMuse;
-
 AddModuleDescription('footnotes.pl', 'Footnotes Extension');
 
+our ($q, $bol, @MyRules, @MyInitVariables);
 # ....................{ CONFIGURATION                      }....................
 
 =head1 CONFIGURATION
@@ -23,9 +24,9 @@ footnotes is easily configurable; set these variables in the B<wiki/config.pl>
 file for your Oddmuse Wiki.
 
 =cut
-use vars qw($FootnotePattern
-            $FootnotesPattern
-            $FootnotesHeaderText
+our ($FootnotePattern,
+            $FootnotesPattern,
+            $FootnotesHeaderText,
 
             @FootnoteList);
 
@@ -176,7 +177,7 @@ C<$FootnoteNumber> is the number for another footnote. This module assigns each
 footnote definition a unique number, beginning at "1". Thus, this markup allows
 you to reference one footnote definition in multiple places throughout a page.
 As example, you might write:
-    
+
   History suggests that societal decline does not result from a single cause,
   but rather the confluence of several interwoven causes.((Diamond, Jared. 2005.
   **Collapse: How Societies Choose to Fail or Succeed.** %%Viking, New York.%%))
@@ -190,7 +191,7 @@ As example, you might write:
 
 The final footnote, above, is a reference to the first footnote definition
 rather than a new footnote definition.
-  
+
 =head3 REFERENCING A RANGE OF OTHER FOOTNOTES
 
 footnotes also handles marking resembling:
@@ -219,7 +220,7 @@ definitions in multiple places throughout a page. As example, you might write:
 The final footnotes, above, are a reference to the first two footnote
 definitions followed by a reference to the fourth footnote definition. This
 module visually renders this disjoint list like: "1-2, 4".
-  
+
 =head3 CREATING THE SET OF FOOTNOTES
 
 footnotes also handles markup resembling:
@@ -244,7 +245,7 @@ sub FootnotesRule {
     my $is_adjacent_footnote = defined $3;
 
     # A number range (e.g., "2-5") of references to other footnotes.
-    if ($footnote_text =~ m/^(\d+)-(\d+)$/co) {
+    if ($footnote_text =~ m/^(\d+)-(\d+)$/o) {
       my ($footnote_number_first, $footnote_number_last) = ($1, $2);
       # '&#x2013;', below, is the HTML entity for a Unicode en-dash.
       print $q->a({-href=> '#footnotes' .$footnote_number_first,
@@ -257,7 +258,7 @@ sub FootnotesRule {
                   }, $footnote_number_last.($is_adjacent_footnote ? ', ' : ''));
     }
     # A number (e.g., "5") implying reference to another footnote.
-    elsif ($footnote_text =~ m/^(\d+)$/co) {
+    elsif ($footnote_text =~ m/^(\d+)$/o) {
       my $footnote_number = $1;
       print $q->a({-href=> '#footnotes' .$footnote_number,
                    -title=> 'Footnote #'.$footnote_number,
@@ -295,12 +296,12 @@ sub FootnotesRule {
     return '';
   }
 
-  return undef;
+  return;
 }
 
 # ....................{ HTML OUTPUT                        }....................
-*PrintFooterFootnotesOld = *PrintFooter;
-*PrintFooter =             *PrintFooterFootnotes;
+*PrintFooterFootnotesOld = \&PrintFooter;
+*PrintFooter =             \&PrintFooterFootnotes;
 
 =head2 PrintFooterFootnotes
 
@@ -321,7 +322,7 @@ sub PrintFooterFootnotes {
 Prints the list of footnotes.
 
 =cut
-sub PrintFootnotes() {
+sub PrintFootnotes {
   print
      $q->start_div({-class=> 'footnotes'})
     .$q->h2(T($FootnotesHeaderText));

modules/form_timeout.pl

@@ -18,7 +18,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AddModuleDescription('form_timeout.pl');
+use strict;
+
+AddModuleDescription('form_timeout.pl', 'Form Timeout Extension');
 
 =head1 DESCRIPTION
 
@@ -39,7 +41,8 @@ Default = 60 * 30 (30 minutes).
 
 =cut
 
-use vars qw($FormTimeoutSalt $FormTimeoutTimeout);
+our ($q, $Now, @MyInitVariables);
+our ($FormTimeoutSalt, $FormTimeoutTimeout);
 use Digest::MD5 qw(md5_hex);
 
 $FormTimeoutSalt = undef;
@@ -81,8 +84,8 @@ sub FormTimeoutCheck {
   return 1;
 }
 
-*OldFormTimeoutGetFormStart = *GetFormStart;
-*GetFormStart = *NewFormTimeoutGetFormStart;
+*OldFormTimeoutGetFormStart = \&GetFormStart;
+*GetFormStart = \&NewFormTimeoutGetFormStart;
 
 sub NewFormTimeoutGetFormStart {
   my ($ignore, $method, $class) = @_;
@@ -93,8 +96,8 @@ sub NewFormTimeoutGetFormStart {
   return $form;
 }
 
-*OldFormTimeoutDoEdit = *DoEdit;
-*DoEdit = *NewFormTimeoutDoEdit;
+*OldFormTimeoutDoEdit = \&DoEdit;
+*DoEdit = \&NewFormTimeoutDoEdit;
 
 sub NewFormTimeoutDoEdit {
   my ($id, $newText, $preview) = @_;

modules/forms.pl

@@ -1,8 +1,12 @@
 #!/usr/bin/env perl
+use strict;
+
 # ====================[ forms.pl                           ]====================
 
 AddModuleDescription('forms.pl', 'Form Extension');
 
+our ($q, $OpenPageName, @MyRules, $CrossbarPageName);
+
 # ....................{ MARKUP                             }....................
 push(@MyRules, \&FormsRule);
 
@@ -25,7 +29,7 @@ sub FormsRule {
       return UnquoteHtml($1);
     }
   }
-  return undef;
+  return;
 }
 
 =head1 COPYRIGHT AND LICENSE

modules/fractions.pl

@@ -13,8 +13,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
+use strict;
+
 AddModuleDescription('fractions.pl', 'Fractions');
 
+our (@MyRules);
+
 push(@MyRules, \&FractionsRule);
 
 # usage: ^1/32
@@ -56,5 +60,5 @@ sub FractionsRule {
       return $html;
     }
   }
-  return undef;
+  return;
 }

modules/gd_security_image.pl

@@ -22,7 +22,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AddModuleDescription('gd_security_image.pl');
+use strict;
+
+AddModuleDescription('gd_security_image.pl', 'GD Security Image Extension');
+
+our ($q, $Now, %Action, $FullUrl, $LinkPattern, $FreeLinks, $FreeLinkPattern, $WikiLinks, $DataDir, $ModuleDir, @MyInitVariables, %CookieParameters, %InvisibleCookieParameters);
 
 =head1 DESCRIPTION
 
@@ -95,13 +99,13 @@ re-answer CAPTCHA.
 
 =cut
 
-use vars qw($GdSecurityImageFont $GdSecurityImageRememberAnswer
-  $GdSecurityImageDuration $GdSecurityImageRequiredList
-  %GdSecurityImageProtectedForms $GdSecurityImageDataDir
-  $GdSecurityImageWidth $GdSecurityImageHeight
-  $GdSecurityImagePtsize $GdSecurityImageScramble $GdSecurityImageChars
+our ($GdSecurityImageFont, $GdSecurityImageRememberAnswer,
+  $GdSecurityImageDuration, $GdSecurityImageRequiredList,
+  %GdSecurityImageProtectedForms, $GdSecurityImageDataDir,
+  $GdSecurityImageWidth, $GdSecurityImageHeight,
+  $GdSecurityImagePtsize, $GdSecurityImageScramble, $GdSecurityImageChars,
   $GdSecurityImageAA);
-use vars qw($GdSecurityImageDir $GdSecurityImageId $GdSecurityImagePngToAA);
+our ($GdSecurityImageDir, $GdSecurityImageId, $GdSecurityImagePngToAA);
 
 use Digest::MD5;
 use File::Glob ':glob';
@@ -184,10 +188,10 @@ sub GdSecurityImageIsValidId {
 sub GdSecurityImageReadImageFile {
   my $file = shift;
   utf8::encode($file); # filenames are bytes!
-  if (open(IN, '<:raw', $file)) {
+  if (open(my $IN, '<:raw', $file)) {
     local $/ = undef;   # Read complete files
-    my $data=<IN>;
-    close IN;
+    my $data=<$IN>;
+    close $IN;
     return (1, $data);
   }
   return (0, '');
@@ -296,8 +300,8 @@ sub GdSecurityImageGetHtml {
   return $form;
 }
 
-*OldGdSecurityImageDoPost = *DoPost;
-*DoPost = *NewGdSecurityImageDoPost;
+*OldGdSecurityImageDoPost = \&DoPost;
+*DoPost = \&NewGdSecurityImageDoPost;
 
 sub NewGdSecurityImageDoPost {
   my(@params) = @_;
@@ -320,22 +324,22 @@ sub NewGdSecurityImageDoPost {
   return (OldGdSecurityImageDoPost(@params));
 }
 
-*OldGdSecurityImageGetEditForm = *GetEditForm;
-*GetEditForm = *NewGdSecurityImageGetEditForm;
+*OldGdSecurityImageGetEditForm = \&GetEditForm;
+*GetEditForm = \&NewGdSecurityImageGetEditForm;
 
 sub NewGdSecurityImageGetEditForm {
-  return GdSecurityImageAddTo(OldGdSecurityImageGetEditForm(@_));
+  return GdSecurityImageAddTo(OldGdSecurityImageGetEditForm(@_), $_[1]);
 }
 
-*OldGdSecurityImageGetCommentForm = *GetCommentForm;
-*GetCommentForm = *NewGdSecurityImageGetCommentForm;
+*OldGdSecurityImageGetCommentForm = \&GetCommentForm;
+*GetCommentForm = \&NewGdSecurityImageGetCommentForm;
 
 sub NewGdSecurityImageGetCommentForm {
   return GdSecurityImageAddTo(OldGdSecurityImageGetCommentForm(@_));
 }
 
 sub GdSecurityImageAddTo {
-  my $form = shift;
+  my ($form, $upload) = @_;
   if (not $upload
       and not GdSecurityImageException(GetId())
       and not UserIsEditor()) {
@@ -373,7 +377,7 @@ sub GdSecurityImageInitVariables {
   %GdSecurityImageProtectedForms = ('comment' => 1,
                               'edit upload' => 1,
                               'edit text' => 1,)
-    unless defined %GdSecurityImageProtectedForms;
+    unless %GdSecurityImageProtectedForms;
 
   $GdSecurityImageDataDir = $DataDir unless defined $GdSecurityImageDataDir;
 

modules/git-another.pl

@@ -13,13 +13,15 @@
 # You should have received a copy of the GNU General Public License along with
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
-package OddMuse;
+use strict;
 
 AddModuleDescription('git-another.pl', 'Another Git Extension');
 
 use Cwd;
 use Capture::Tiny ':all';
-use vars qw($GitBinary $GitMail);
+
+our (%Page, $DataDir, $FootnoteNumber);
+our ($GitBinary, $GitMail);
 
 $GitBinary = 'git';
 $GitMail = 'unknown@oddmuse.org';
@@ -45,7 +47,7 @@ sub GitInitRepository {
 
 sub RenderHtmlCacheWithoutPrinting { # requires an open page
   $FootnoteNumber = 0;
-  my $blocks, $flags;
+  my ($blocks, $flags);
   capture {
     ($blocks, $flags) = ApplyRules(QuoteHtml($Page{text}), 1, 1, $Page{revision}, 'p');
   };
@@ -56,8 +58,8 @@ sub RenderHtmlCacheWithoutPrinting { # requires an open page
   }
 }
 
-*GitOldSave = *Save;
-*Save = *GitNewSave;
+*GitOldSave = \&Save;
+*Save = \&GitNewSave;
 
 sub GitNewSave {
   GitInitRepository();

modules/git.pl

@@ -12,6 +12,8 @@
 # You should have received a copy of the GNU General Public License along with
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
+use strict;
+
 =head1 NAME
 
 git - An Oddmuse module to save all changes made into a git repository.
@@ -23,8 +25,6 @@ subdirectory for your data directory (C<$DataDir>).
 
 =cut
 
-package OddMuse;
-
 =head1 CONFIGURATION
 
 Set these variables in the B<config> file within your data directory.
@@ -63,9 +63,10 @@ If $GitDebug is set, this variable holds STDOUT of the git command.
 
 use Cwd;
 use File::Temp ();
-use vars qw($GitBinary $GitRepo $GitMail $GitPageFile $GitDebug $GitResult);
 
 AddModuleDescription('git.pl', 'Git Extension');
+our ($q, %Page, %Action, %IndexHash, @IndexList, @MyInitVariables, @MyMaintenance, $DataDir);
+our ($GitBinary, $GitRepo, $GitMail, $GitPageFile, $GitDebug, $GitResult);
 
 $GitBinary = 'git';
 $GitMail = 'unknown@oddmuse.org';
@@ -80,6 +81,7 @@ sub GitRun {
 
   chdir($GitRepo);
   if ($GitDebug) {
+    # TODO use ToString here
     # capture the output of the git comand in a temporary file
     my $fh = File::Temp->new();
     open(my $oldout, ">&STDOUT") or die "Can't dup STDOUT: $!";
@@ -89,10 +91,10 @@ sub GitRun {
     # read the temporary file with the output
     close($fh);
     open(STDOUT, ">&", $oldout) or die "Can't dup \$oldout: $!";
-    open(F, '<', $fh) or die "Can't open temp file for reading: $!";
+    open(my $F, '<', $fh) or die "Can't open temp file for reading: $!";
     local $/ = undef; # Read complete files
-    $GitResult = <F>;
-    close(F);
+    $GitResult = <$F>;
+    close($F);
   } else {
     $exitStatus = system($GitBinary, @_);
   }
@@ -122,8 +124,8 @@ sub GitInitRepository {
   GitRun(qw(commit --quiet -m), 'initial import', "--author=Oddmuse <$GitMail>");
 }
 
-*GitOldSave = *Save;
-*Save = *GitNewSave;
+*GitOldSave = \&Save;
+*Save = \&GitNewSave;
 
 sub GitNewSave {
 
@@ -151,8 +153,8 @@ sub GitNewSave {
 	 "--author=$author <$GitMail>", '--', $id);
 }
 
-*GitOldDeletePage = *DeletePage;
-*DeletePage = *GitNewDeletePage;
+*GitOldDeletePage = \&DeletePage;
+*DeletePage = \&GitNewDeletePage;
 
 sub GitNewDeletePage {
   my $error = GitOldDeletePage(@_);

modules/google-custom-search.pl

@@ -16,7 +16,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-use vars qw($GoogleCustomSearchEngine);
+use strict;
+
+our ($q);
+our ($GoogleCustomSearchEngine);
 
 $GoogleCustomSearchEngine = 'http://www.google.com/cse?cx=004774160799092323420:6-ff2s0o6yi&q=';
 
@@ -26,8 +29,8 @@ AddModuleDescription('google-custom-search.pl');
 sub GetSearchForm {}
 
 # No more searching of titles
-*OldGoogleCustomGetSearchLink = *GetSearchLink;
-*GetSearchLink = *NewGoogleCustomGetSearchLink;
+*OldGoogleCustomGetSearchLink = \&GetSearchLink;
+*GetSearchLink = \&NewGoogleCustomGetSearchLink;
 
 sub NewGoogleCustomGetSearchLink {
   my ($text, $class, $name, $title) = @_;
@@ -45,8 +48,8 @@ sub NewGoogleCustomGetSearchLink {
   return $q->a(\%params, $text);
 }
 
-*OldGoogleCustomGetHeader = *GetHeader;
-*GetHeader = *NewGoogleCustomGetHeader;
+*OldGoogleCustomGetHeader = \&GetHeader;
+*GetHeader = \&NewGoogleCustomGetHeader;
 
 sub NewGoogleCustomGetHeader {
   my $html = OldGoogleCustomGetHeader(@_);

modules/google-plus-one.pl

@@ -0,0 +1,86 @@
+# Copyright (C) 2011–2015  Alex Schroeder <alex@gnu.org>
+#
+# 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 3 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.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program. If not, see <http://www.gnu.org/licenses/>.
+
+use strict;
+# use warnings;
+use v5.10;
+
+package OddMuse;
+
+AddModuleDescription('google-plus-one.pl', 'Google Plus One Module');
+
+our ($q, @MyAdminCode, %Action);
+
+my $data_uri = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEwAAAAYCAMAAABnVuv4AAAAhFBMVEUAAAD////MzMz5+fkWau+zs7Pg4OD39/fh4eHu7u7z8/Pk5OTm5ubX19fx8fHj4+N+fn5jY2Ojo6N/f3/r7Ov29vbq6ero6Oj19fUVau0XafC3zO3q6ulKie2dve89ge1yoexkmeyNsepZk+/T3u4weu4jcu7E1Ox9p+rExMTX4vLi6PBsAh6oAAAAAXRSTlMAQObYZgAAAWtJREFUOMvFldluwjAQRU24LgHTpAsEgglL2Nv//7/OeGLLqlTXD5V6HM/c2NJRMJGilClSGCW8DbwEXgPvA+QqRylKI66kLNiKUZri72X6OQOdKxtn8E+yCTMOjQdBhbvEbNkkA5EBoJKULdc0ltHksv447ZaM7JJMNO1PstLZ9Gw2W9PgSxJXe4V1QZZIxiIGI4AbWs5hso1lFY0BwLXzEcBnWK8qJ9uIDKxlMbjyKnex6SoCcO2CKy7xupxZG57GKSBBbsSmp56btYC1t+l5v9vhNI0QmZyZVC+DPKa4IlkHR8f5gD4hQyzb0AhntvAcuo5U3YHzvrWLCJZFmlZ+pp/Rv9k022a75do0ABWKHCTJ9e0923Bmn6ij92xOrAaA1YpvLPZzCrJO+yxLE2Rm7rnfpfc4UjV+x2TLzEBtAvURvYnIl9UDJU8qcsmSL9myMoNs2VMGWtVZHxT9+N310ErVRYpaCToD9QXtvTL0OWiBLQAAAABJRU5ErkJggg==';
+
+# Two step Google +1 button to protect your privacy: show this at the bottom
+# of every form.
+
+*MyOldGetCommentForm=*GetCommentForm;
+*GetCommentForm=*MyNewGetCommentForm;
+
+sub MyNewGetCommentForm {
+  return MyOldGetCommentForm(@_) . qq{
+<script type="text/javascript">
+function loadScript(jssource,thelink) {
+   var jsnode = document.createElement('script');
+   jsnode.setAttribute('type','text/javascript');
+   jsnode.setAttribute('src',jssource);
+   document.getElementsByTagName('head')[0].appendChild(jsnode);
+   document.getElementById(thelink).innerHTML = "";
+ }
+ var plus1source = "https://apis.google.com/js/plusone.js";
+</script>
+<a id="plus1" href="javascript:loadScript(plus1source,'plus1')">
+  <img src="$data_uri" alt="Show Google +1" />
+</a>
+<!-- <g:plusone></g:plusone> -->
+<div class="g-plusone" id="my_plusone"></div>
+<script type="text/javascript">
+  document.getElementById("my_plusone").setAttribute("data-size", "medium");
+  document.getElementById("my_plusone").setAttribute("data-href", document.location.href);
+</script>
+};
+}
+
+# Google +1 list                                                                                         
+
+push(@MyAdminCode, sub {
+       my ($id, $menuref, $restref) = @_;
+       push(@$menuref, ScriptLink('action=plusone',
+                                  T('Google +1 Buttons'),
+                                  'plusone'));
+     });
+
+$Action{plusone} = \&DoPlusOne;
+
+sub DoPlusOne {
+  print GetHeader('', T('All Pages +1'), ''),
+    $q->start_div({-class=>'content plusone'});
+  print $q->p(T("This page lists the twenty last diary entries and their +1 buttons."));
+  my @pages;
+  foreach my $id (AllPagesList()) {
+    push(@pages, $id) if $id =~ /^\d\d\d\d-\d\d-\d\d/;
+  }
+  splice(@pages, 0, $#pages - 19); # last 20 items                                                       
+  print "<ul>";
+  foreach my $id (@pages) {
+    my $url = ScriptUrl(UrlEncode($id));
+    print $q->li(GetPageLink($id),
+                qq{ <g:plusone href="$url"></g:plusone>});
+  }
+  print "</ul>";
+  print $q->end_div();
+  PrintFooter();
+}

modules/google-search.pl

@@ -16,9 +16,12 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
+use strict;
+
 AddModuleDescription('google-search.pl', 'Use Google For Searches');
 
-use vars qw($GoogleSearchDomain $GoogleSearchExclusive);
+our ($q, %Action, $ScriptName, @MyInitVariables);
+our ($GoogleSearchDomain, $GoogleSearchExclusive);
 
 $GoogleSearchDomain = undef;
 $GoogleSearchExclusive = 1;
@@ -46,7 +49,7 @@ sub GoogleSearchInit {
       and not GetParam('old', 0)) {
     SetParam('action', 'search');
   }
-  *SearchTitleAndBody = *GoogleSearchDoNothing if $GoogleSearchExclusive;
+  *SearchTitleAndBody = \&GoogleSearchDoNothing if $GoogleSearchExclusive;
 }
 
 # disable all other searches

modules/gotobar.pl

@@ -12,9 +12,13 @@
 # You should have received a copy of the GNU General Public License along with
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
+use strict;
+
+our (%Page, %IndexHash, %AdminPages, $HomePage, $RCName, @MyInitVariables, $LinkPattern, $FreeLinkPattern, $FullUrlPattern, $InterLinkPattern, $UserGotoBar, @UserGotoBarPages);
+
 AddModuleDescription('gotobar.pl', 'Gotobar Extension');
 
-use vars qw($GotobarName);
+our ($GotobarName);
 
 # Include this page on every page:
 

modules/gravatar.pl

@@ -12,10 +12,14 @@
 # You should have received a copy of the GNU General Public License along with
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
+use strict;
+
 AddModuleDescription('gravatar.pl', 'Gravatar');
 
 use Digest::MD5 qw(md5_hex);
 
+our ($q, $bol, %CookieParameters, $FullUrlPattern, @MyRules, @MyInitVariables);
+
 # Same as in mail.pl
 $CookieParameters{mail} = '';
 
@@ -38,11 +42,11 @@ sub GravatarRule {
 		    $q->br(),
 		    GetPageLink($name));
   }
-  return undef;
+  return;
 }
 
-*GravatarOldGetCommentForm = *GetCommentForm;
-*GetCommentForm = *GravatarNewGetCommentForm;
+*GravatarOldGetCommentForm = \&GetCommentForm;
+*GetCommentForm = \&GravatarNewGetCommentForm;
 
 sub GravatarNewGetCommentForm {
   my $html = GravatarOldGetCommentForm(@_);
@@ -51,8 +55,7 @@ sub GravatarNewGetCommentForm {
   my $addition = $q->span({-class=>'mail'},
 			  $q->label({-for=>'mail'}, T('Email: '))
 			  . ' ' . $q->textfield(-name=>'mail', -id=>'mail',
-						-default=>GetParam('mail', ''))
-			  . $addition);
+						-default=>GetParam('mail', '')));
   $html =~ s!(name="homepage".*?)</p>!$1 $addition</p>!i;
   return $html;
 }
@@ -76,8 +79,8 @@ sub AddGravatar {
   }
 }
 
-*GravatarOldGetSummary = *GetSummary;
-*GetSummary = *GravatarNewGetSummary;
+*GravatarOldGetSummary = \&GetSummary;
+*GetSummary = \&GravatarNewGetSummary;
 
 sub GravatarNewGetSummary {
   my $summary = GravatarOldGetSummary(@_);

modules/grep.pl

@@ -16,8 +16,12 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
+use strict;
+
 AddModuleDescription('grep.pl');
 
+our ($q, @MyRules);
+
 push(@MyRules, \&GrepRule);
 
 sub GrepRule {
@@ -32,7 +36,7 @@ sub GrepRule {
     pos = $oldpos; # restore \G after searching
     return '';
   }
-  return undef;
+  return;
 }
 
 sub PrintGrep {

modules/header-and-footer-templates.pl

@@ -16,9 +16,12 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
+use strict;
+
 AddModuleDescription('header-and-footer-templates.pl', 'Comments on HTML Templates');
 
-use vars qw($HtmlTemplateDir);
+our ($q, $Now, $Message, $DataDir, %SpecialDays);
+our ($HtmlTemplateDir);
 use HTML::Template;
 
 $HtmlTemplateDir   = "$DataDir/templates";
@@ -27,7 +30,7 @@ sub HtmlTemplateLanguage {
   my $requested_language = $q->http('Accept-language');
   my @languages = split(/ *, */, $requested_language);
   my %Lang = ();
-  foreach $_ (@languages) {
+  foreach (@languages) {
     my $qual = 1;
     $qual = $1 if (/q=([0-9.]+)/);
     $Lang{$qual} = $1 if (/^([-a-z]+)/);
@@ -52,7 +55,7 @@ sub GetSpecialDays {
   }
 }
 
-*GetHeader = *HeaderTemplate;
+*GetHeader = \&HeaderTemplate;
 
 sub HeaderTemplate {
   my ($id, $title, $oldId, $nocache, $status) = @_;
@@ -71,7 +74,7 @@ sub HeaderTemplate {
     . $template->output;
 }
 
-*PrintFooter = *PrintFooterTemplate;
+*PrintFooter = \&PrintFooterTemplate;
 
 sub PrintFooterTemplate {
   my ($id, $rev, $comment) = @_;

modules/headers.pl

@@ -16,11 +16,15 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
+use strict;
+
 AddModuleDescription('headers.pl', 'Header Markup Extension');
 
+our ($q, $bol, %RuleOrder, @MyRules, $PortraitSupportColor, $PortraitSupportColorDiv);
+
 # After toc.pl but before usemod.pl
 push(@MyRules, \&HeadersRule);
-$RuleOrder{ \&HeadersRule } = 95;
+$RuleOrder{\&HeadersRule} = 95;
 
 # The trickiest part is the first rule.  It finds titles like the following:
 #
@@ -52,5 +56,5 @@ sub HeadersRule {
     $PortraitSupportColor = 0;
     return $html . AddHtmlEnvironment('p');
   }
-  return undef;
+  return;
 }

modules/headlines.pl

@@ -17,10 +17,13 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
-use vars qw($HeadlineNumber);
+use strict;
 
 AddModuleDescription('headlines.pl', 'Headlines Extension');
 
+our (@MyRules);
+our ($HeadlineNumber);
+
 push(@MyRules, \&HeadlinesRule);
 
 # Include this page on every page:
@@ -35,7 +38,7 @@ sub HeadlinesRule {
     HeadlinesPrint();
     return AddHtmlEnvironment('p');
   }
-  return undef;
+  return;
 }
 
 sub HeadlinesPrint {