Merge lp:~quam-plures-core/quam-plures/qp5_html5_templates into lp:quam-plures

[EdB]

dunno what happened last time, but this time I can see the changes here on LP so yay merge-a-thon!

Again there is a css issue when you switch to one of the html5 templates but so what it'll get fixed fairly soon :)

http://forums.quamplures.net/viewtopic.php?f=6&t=1892

[lp:~quam-plures-core/quam-plures/qp5_html5_templates]

7660. By EdB on 2013-03-08

fixing the only flaw I found :)

7661. By EdB on 2013-03-11

needed screenshots for the new templates, fixed a css issue when using an html5 template

=== modified file 'blog2.php'
--- blog2.php	2010-12-31 12:12:03 +0000
+++ blog2.php	2013-03-11 07:27:21 +0000
@@ -1,37 +1,42 @@
 <?php
 /**
- * Stub File
- *
- * Quam Plures - {@link http://quamplures.net/}
- * Released under GNU GPL License - {@link http://quamplures.net/license.html}
- * @copyright (c) 2009 - 2011 by the Quam Plures developers - {@link http://quamplures.net/}
- * @copyright (c)2003-2009 by Francois PLANQUE - {@link http://fplanque.net/}
+ * Stub File Template
+ *
+ * This file is used to create a new stub file when a blog is created. If the value of $blog
+ * is not NNN then this file was created; only stubfile.template.php has that value of $blog.
+ *
+ * @author {@link http://wonderwinds.com/ Ed Bennett}
+ * @copyright (c) 2010 by {@link http://quamplures.net/ the Quam Plures project}
+ * @license http://www.gnu.org/licenses/gpl.txt GNU General Public License v3
  * @package templates
- * @subpackage stubfiles
  */
 
-# select which blog
+// select which blog
 $blog = 2;
 
-# force a template?
-# $template = 'custom';
-
-# retricts posts to published, hides drafts.
+// retricts posts to published, hides drafts
 $show_statuses = array();
 
-# ignore before, unix timestamp or 'now'
+// ignore before, unix timestamp or 'now'
 $timestamp_min = '';
 
-# ignore after, unix timestamp or 'now'
+// ignore after, unix timestamp or 'now'
 $timestamp_max = 'now';
 
-# change order?
+// force a template?
+# $template = 'custom';
+
+// change order?
 # $order = 'ASC';
 
 /**
- * That's it, now let Quam Plures do the rest! :)
+ * Load the configuration minimum
  */
 require_once dirname(__FILE__).'/qp_config/_config.php';
 
+/**
+ * Main initialization, with the identified $blog
+ */
 require $inc_path.'_blog_main.inc.php';
+
 ?>

=== modified file 'blog3.php'
--- blog3.php	2010-12-31 12:12:03 +0000
+++ blog3.php	2013-03-11 07:27:21 +0000
@@ -1,37 +1,42 @@
 <?php
 /**
- * Stub File
- *
- * Quam Plures - {@link http://quamplures.net/}
- * Released under GNU GPL License - {@link http://quamplures.net/license.html}
- * @copyright (c) 2009 - 2011 by the Quam Plures developers - {@link http://quamplures.net/}
- * @copyright (c)2003-2009 by Francois PLANQUE - {@link http://fplanque.net/}
+ * Stub File Template
+ *
+ * This file is used to create a new stub file when a blog is created. If the value of $blog
+ * is not NNN then this file was created; only stubfile.template.php has that value of $blog.
+ *
+ * @author {@link http://wonderwinds.com/ Ed Bennett}
+ * @copyright (c) 2010 by {@link http://quamplures.net/ the Quam Plures project}
+ * @license http://www.gnu.org/licenses/gpl.txt GNU General Public License v3
  * @package templates
- * @subpackage stubfiles
  */
 
-# select which blog
+// select which blog
 $blog = 3;
 
-# force a template?
-# $template = 'custom';
-
-# retricts posts to published, hides drafts.
+// retricts posts to published, hides drafts
 $show_statuses = array();
 
-# ignore before, unix timestamp or 'now'
+// ignore before, unix timestamp or 'now'
 $timestamp_min = '';
 
-# ignore after, unix timestamp or 'now'
+// ignore after, unix timestamp or 'now'
 $timestamp_max = 'now';
 
-# change order?
+// force a template?
+# $template = 'custom';
+
+// change order?
 # $order = 'ASC';
 
 /**
- * That's it, now let Quam Plures do the rest! :)
+ * Load the configuration minimum
  */
 require_once dirname(__FILE__).'/qp_config/_config.php';
 
+/**
+ * Main initialization, with the identified $blog
+ */
 require $inc_path.'_blog_main.inc.php';
+
 ?>

=== modified file 'blog4.php'
--- blog4.php	2010-12-31 12:12:03 +0000
+++ blog4.php	2013-03-11 07:27:21 +0000
@@ -1,37 +1,42 @@
 <?php
 /**
- * Stub File
- *
- * Quam Plures - {@link http://quamplures.net/}
- * Released under GNU GPL License - {@link http://quamplures.net/license.html}
- * @copyright (c) 2009 - 2011 by the Quam Plures developers - {@link http://quamplures.net/}
- * @copyright (c)2003-2009 by Francois PLANQUE - {@link http://fplanque.net/}
+ * Stub File Template
+ *
+ * This file is used to create a new stub file when a blog is created. If the value of $blog
+ * is not NNN then this file was created; only stubfile.template.php has that value of $blog.
+ *
+ * @author {@link http://wonderwinds.com/ Ed Bennett}
+ * @copyright (c) 2010 by {@link http://quamplures.net/ the Quam Plures project}
+ * @license http://www.gnu.org/licenses/gpl.txt GNU General Public License v3
  * @package templates
- * @subpackage stubfiles
  */
 
-# select which blog
+// select which blog
 $blog = 4;
 
-# force a template?
-# $template = 'custom';
-
-# retricts posts to published, hides drafts.
+// retricts posts to published, hides drafts
 $show_statuses = array();
 
-# ignore before, unix timestamp or 'now'
+// ignore before, unix timestamp or 'now'
 $timestamp_min = '';
 
-# ignore after, unix timestamp or 'now'
+// ignore after, unix timestamp or 'now'
 $timestamp_max = 'now';
 
-# change order?
+// force a template?
+# $template = 'custom';
+
+// change order?
 # $order = 'ASC';
 
 /**
- * That's it, now let Quam Plures do the rest! :)
+ * Load the configuration minimum
  */
 require_once dirname(__FILE__).'/qp_config/_config.php';
 
+/**
+ * Main initialization, with the identified $blog
+ */
 require $inc_path.'_blog_main.inc.php';
+
 ?>

=== modified file 'license.txt'
--- license.txt	2010-01-04 17:32:41 +0000
+++ license.txt	2013-03-11 07:27:21 +0000
@@ -1,298 +1,674 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
+ 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 licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+                            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
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
+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 make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
+  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 give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
+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.
 
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
+                       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.
 
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
+  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
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
+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 a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
---------------------------------------------------------------------------
-
- * In addition, as a special exception, the copyright holders give permission to link
- * the code of this program with the following code libraries or files and distribute
- * linked combinations including any number of these and the main code.
- * - Any blog skin, "evoSkin" or design elements licensed under any of the following
- *   Creative Commons licenses:
- *    - Attribution-Share Alike ( http://creativecommons.org/licenses/by-sa/3.0/ )
- *    - Attribution ( http://creativecommons.org/licenses/by/3.0/ )
- * - The PHP/SWF Charts library by maani.us (or with modified versions of this library
- *   that use the same license as PHP/SWF Charts library by maani.us).
- * You must obey the GNU General Public License in all respects for all of the code used
- * other than the libraries/files listed above. If you modify this file, you may extend
- * this exception to your version of the file, but you are not obligated to do so. If
- * you do not wish to do so, delete this exception statement from your version.
-
---------------------------------------------------------------------------
-
-		     END OF TERMS AND CONDITIONS
-
+  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:
+
+    <program>  Copyright (C) <year>  <name of author>
+    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>.

=== modified file 'multiblogs.php'
--- multiblogs.php	2012-07-29 20:36:41 +0000
+++ multiblogs.php	2013-03-11 07:27:21 +0000
@@ -1,28 +1,35 @@
 <?php
 /**
- * Demo file displaying multiple blogs on the same page
- *
- * Note: This is a very advanced use of Quam Plures! Most of the time, calling
- * your blog through index.php (or a stub file) with a template will be enough.
- * You should try to customize a template before trying to use this file.
- *
- * Quam Plures - {@link http://quamplures.net/}
- * Released under GNU GPL License - {@link http://quamplures.net/license.html}
- * @copyright (c) 2009 - 2011 by the Quam Plures developers - {@link http://quamplures.net/}
- * @copyright (c)2003-2009 by Francois PLANQUE - {@link http://fplanque.net/}
- *
+ * Displays multiple blogs on the same page
+ *
+ * Note: This is a very advanced situation! Most of the time, calling your blog
+ * through index.php (or a stub file) with a template will be enough. You should
+ * try to customize a template before trying to use this file.
+ * @todo (1111) this needs to pick up default blog on index and use it's
+ * template's style sheet
+ * @todo (1111) actually, this needs to containerized and moved into the
+ * qp_templates where it belongs
+ * @todo (1111) does $PageCache actually do anything worth having, or can that
+ * whole thing go away?
+ * @author {@link http://wonderwinds.com/ Ed Bennett}
+ * @author {@link http://fplanque.net/ Francois PLANQUE}
+ * @copyright (c) 2009 by {@link http://quamplures.net/ the Quam Plures project}
+ * @license http://www.gnu.org/licenses/gpl.txt GNU General Public License v3
  * @package templates
- * @subpackage oddballs
  */
 
 // select which blog you want to display here
 $blog = 1;
+
 // force it to ignore the blog's designated template
 $template = '';
+
 // restrict posts to those published, thus hiding drafts.
 $show_statuses = array();
+
 // set a limit before which posts will be ignored
 $timestamp_min = '';
+
 // set a limit after which posts will be ignored
 $timestamp_max = 'now';
 
@@ -33,14 +40,12 @@
 $redir = 'no';
 
 /**
- * Load Quam Plures configuration
+ * Load the configuration minimum
  */
 require_once dirname(__FILE__).'/qp_config/_config.php';
 
 /**
- * Initialize Quam Plures
- *
- * Loads the blog identified by $blog with other params above
+ * Main initialization, with the identified $blog
  */
 require_once $inc_path.'_blog_main.inc.php';
 
@@ -50,7 +55,6 @@
 // --------------------- PAGE LEVEL CACHING SUPPORT ---------------------
 // This is totally optional. General caching must be enabled
 // in Global settings, otherwise this will do nothing.
-load_class( '_core/model/_pagecache.class.php' );
 $PageCache = new PageCache( NULL );
 
 // Check for cached content & Start caching if needed:
@@ -210,7 +214,6 @@
 
 		// Run the query:
 		$BlogBList->query();
-
 		while( $Item = & $BlogBList->get_item() )
 		{
 			?>
@@ -248,7 +251,6 @@
 
 		// Run the query:
 		$LinkblogList->query();
-
 		while( $Item = & $LinkblogList->get_item() )
 		{
 			?>

=== removed file 'qp_config/license.txt'
--- qp_config/license.txt	2006-03-12 22:08:51 +0000
+++ qp_config/license.txt	1970-01-01 00:00:00 +0000
@@ -1,293 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
---------------------------------------------------------------------------
-
- * In addition, as a special exception, the copyright holders give permission to link
- * the code of this program with the PHP/SWF Charts library by maani.us (or with
- * modified versions of this library that use the same license as PHP/SWF Charts library
- * by maani.us), and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than the
- * PHP/SWF Charts library by maani.us. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so. If you do
- * not wish to do so, delete this exception statement from your version.
-
---------------------------------------------------------------------------
-
-		     END OF TERMS AND CONDITIONS
-

=== modified file 'qp_inc/_application.php'
--- qp_inc/_application.php	2013-03-04 20:46:54 +0000
+++ qp_inc/_application.php	2013-03-11 07:27:21 +0000
@@ -22,7 +22,7 @@
 $files_version = '1.10';
 
 // The database version, incrememented by 1 with each change in upgrade_dbase_tables()
-$app_db_version = 17;
+$app_db_version = 20;
 
 $app_version = $files_version.'.'.$app_db_version;
 

=== modified file 'qp_inc/_core/__core.init.php'
--- qp_inc/_core/__core.init.php	2013-02-28 16:40:18 +0000
+++ qp_inc/_core/__core.init.php	2013-03-11 07:27:21 +0000
@@ -72,7 +72,8 @@
 	'aspm_settings' => 'antispam/settings.ctrl.php',
 	'chapters'      => 'chapters/chapters.ctrl.php',
 	'collections'   => 'collections/collections.ctrl.php',
-	'coll_settings' => 'collections/coll_settings.ctrl.php',
+	'coll_settings' => 'collections/coll_settings.ctrl.php', // old
+	'blog_settings' => 'collections/coll_settings.ctrl.php', // new after monster
 	'comments'      => 'comments/_comments.ctrl.php',
 	'crontab'       => 'cron/cronjobs.ctrl.php',
 	'dashboard'     => 'dashboard/dashboard.ctrl.php',

=== modified file 'qp_inc/_core/_param.funcs.php'
--- qp_inc/_core/_param.funcs.php	2013-02-28 16:40:18 +0000
+++ qp_inc/_core/_param.funcs.php	2013-03-11 07:27:21 +0000
@@ -50,33 +50,39 @@
  * dirty spambots or borked index bots. Saves a lot of processor time by killing invalid requests)
  * @return mixed Final value of Variable, or false if we don't force setting and did not set
  */
-function param( $var, $type = '', $default = '', $memorize = false,
-	$override = false, $use_default = true, $strict_typing = 'allow_empty' )
+function param(
+	$var,
+	$type = '',
+	$default = '',
+	$memorize = false,
+	$override = false,
+	$use_default = true,
+	$strict_typing = 'allow_empty' )
 {
-	global $debug, $app_charset, $io_charset;
-	// NOTE: we use $GLOBALS[$var] instead of $$var, because otherwise it would conflict with param names which are used as function params ("var", "type", "default", ..)!
+	global $debug;
+	global $app_charset;
+	global $io_charset;
 
-	/*
-	 * STEP 1 : Set the variable
-	 *
-	 * Check if already set
-	 * WARNING: when PHP register globals is ON, COOKIES get priority over GET and POST with this!!!
-	 * dh> I never understood that comment.. does it refer to "variables_order" php.ini setting?
-	 * fp> I guess
-	 */
+	// STEP 1 : Set the variable
+	// Check if already set. NOTE: we use $GLOBALS[$var] instead of $$var, because
+	// otherwise it would conflict with param names which are used as function
+	// params ("var", "type", "default", ..)!
+	// WARNING: when PHP register globals is ON, COOKIES get priority over GET and
+	// POST with this!!! dh> I never understood that comment.. does it refer to
+	// "variables_order" php.ini setting? fp> I guess
 	if( ! isset( $GLOBALS[$var] ) || $override )
 	{
 		if( isset( $_POST[$var] ) )
 		{
 			$GLOBALS[$var] = remove_magic_quotes( $_POST[$var] );
 		}
-		elseif( isset($_GET[$var]) )
+		elseif( isset( $_GET[$var] ) )
 		{
-			$GLOBALS[$var] = remove_magic_quotes($_GET[$var]);
+			$GLOBALS[$var] = remove_magic_quotes( $_GET[$var] );
 		}
-		elseif( isset($_COOKIE[$var]))
+		elseif( isset( $_COOKIE[$var] ) )
 		{
-			$GLOBALS[$var] = remove_magic_quotes($_COOKIE[$var]);
+			$GLOBALS[$var] = remove_magic_quotes( $_COOKIE[$var] );
 		}
 		elseif( $default === true )
 		{
@@ -84,7 +90,7 @@
 		}
 		elseif( $use_default )
 		{
-			// We haven't set any value yet and we really want one: use default:
+			// We haven't set any value yet and we really want one: use default
 			if( $type == 'array' && $default === '' )
 			{
 				// Change default '' into array() (otherwise there would be a notice with settype() below)
@@ -94,15 +100,14 @@
 		}
 		else
 		{
-			// param not found! don't set the variable.
-			// Won't be memorized nor type-forced!
+			// param not found! don't set the variable ... won't be memorized nor type-forced!
 			return false;
 		}
 	}
 	else
 	{
 		// Variable was already set but we need to remove the auto quotes
-		$GLOBALS[$var] = remove_magic_quotes($GLOBALS[$var]);
+		$GLOBALS[$var] = remove_magic_quotes( $GLOBALS[$var] );
 	}
 
 	if( isset( $io_charset ) && ! empty( $app_charset ) )
@@ -110,130 +115,123 @@
 		$GLOBALS[$var] = convert_charset( $GLOBALS[$var], $app_charset, $io_charset );
 	}
 
-	// STEP 2: make sure the data fits the expected type
-	// type will be forced even if it was set before and not overriden
+	// STEP 2: make sure the data fits the expected type type,
+	// will be forced even if it was set before and not overriden
 	if( ! empty( $type ) && $GLOBALS[$var] !== NULL )
 	{
 		// Force the type
 		switch( $type )
 		{
 			case 'html':
-				// do nothing
-				break;
+			// do nothing
+			break;
 
 			case 'string':
-				// strip out any html
-				if( ! is_scalar($GLOBALS[$var]) )
-				{
-					// This happens if someone uses "foo[]=x" where "foo" is expected as string
-					// TODO: dh> debug_die() instead?
-					$GLOBALS[$var] = '';
-				}
-				else
-				{
-					$GLOBALS[$var] = trim( strip_tags($GLOBALS[$var]) );
-					// Make sure the string is a single line
-					// TODO: dh> this breaks e.g. multi-line widget params (e.g. "Custom TinyMCE init")
-					//           While this example works without newlines, there are probably places
-					//           where it's more important.
-					//       fp> Someone was hiding text. Can't remember exactly where.
-					//           Make a "multiline-string" where appropriate.
-					$GLOBALS[$var] = preg_replace( '¤\r|\n¤', '', $GLOBALS[$var] );
-				}
-				break;
+			// strip out any html
+			if( ! is_scalar( $GLOBALS[$var] ) )
+			{
+				// This happens if someone uses "foo[]=x" where "foo" is expected as string
+				$GLOBALS[$var] = '';
+			}
+			else
+			{
+				$GLOBALS[$var] = trim( strip_tags( $GLOBALS[$var] ) );
+				// Make sure the string is a single line. While this example works without
+				// newlines, there are probably places where it's more important.
+				// fp> Someone was hiding text. Can't remember exactly where.
+				// Make a "multiline-string" where appropriate.
+				$GLOBALS[$var] = preg_replace( '¤\r|\n¤', '', $GLOBALS[$var] );
+			}
+			break;
 
 			default:
-				if( substr( $type, 0, 1 ) == '/' )
-				{
-					// We want to match against a REGEXP
-					if( preg_match( $type, $GLOBALS[$var] ) )
-					{
-						// Okay, match
-					}
-					elseif( $strict_typing == 'allow_empty' && empty($GLOBALS[$var]) )
-					{
-						// No match but we accept empty value
-					}
-					elseif( $strict_typing )
-					{
-						// We cannot accept this MISMATCH
+			if( substr( $type, 0, 1 ) == '/' )
+			{
+				// We want to match against a REGEXP
+				if( preg_match( $type, $GLOBALS[$var] ) )
+				{
+					// Okay, match
+					if( isset( $Debuglog ) ) $Debuglog->add( 'param(-): <strong>'.$var.'</strong> matched against '.$type, 'params' );
+				}
+				elseif( $strict_typing == 'allow_empty' && empty( $GLOBALS[$var] ) )
+				{
+					// No match but we accept empty value
+					if( isset( $Debuglog ) ) $Debuglog->add( 'param(-): <strong>'.$var.'</strong> is empty: ok', 'params' );
+				}
+				elseif( $strict_typing )
+				{
+					// We cannot accept this MISMATCH
+					bad_request_die( sprintf( T_('Illegal value received for parameter &laquo;%s&raquo;!'), $var ) );
+				}
+				else
+				{
+					// Fall back to default
+					$GLOBALS[$var] = $default;
+				}
+
+				// From now on, consider this as a string: (we need this when memorizing)
+				$type = 'string';
+			}
+			elseif( $GLOBALS[$var] === '' )
+			{
+				// Special handling of empty values
+				if( $strict_typing === false && $use_default )
+				{
+					// We want to consider empty values as invalid and fall back to the default value
+					$GLOBALS[$var] = $default;
+				}
+				else
+				{
+					// We memorize the empty value as NULL. fplanque> note: there might be side effects
+					// to this, but we need this to distinguish between 0 and 'no input' Note: we do this
+					// after regexps because we may or may not want to allow empty strings in regexps
+					$GLOBALS[$var] = NULL;
+				}
+			}
+			elseif( $GLOBALS[$var] === array() )
+			{
+				if( $strict_typing === false && $use_default )
+				{
+					// We want to consider empty values as invalid and fall back to the default value
+					$GLOBALS[$var] = $default;
+				}
+			}
+			else
+			{
+				if( $strict_typing )
+				{
+					// We want to make sure the value is valid
+					$regexp = '';
+					switch( $type )
+					{
+						case 'boolean':
+						$regexp = '/^(0|1|false|true)$/i';
+						break;
+
+						case 'integer':
+						$regexp = '/^(\+|-)?[0-9]+$/';
+						break;
+
+						case 'float':
+						case 'double':
+						$regexp = '/^(\+|-)?[0-9]+(.[0-9]+)?$/';
+						break;
+						// Note: other types are not tested here
+					}
+					if( $strict_typing == 'allow_empty' && empty( $GLOBALS[$var] ) )
+					{
+						// We have an empty value and we accept it
+					}
+					elseif( ! empty( $regexp ) && ( ! is_scalar( $GLOBALS[$var] ) || ! preg_match( $regexp, $GLOBALS[$var] ) ) )
+					{
+						// Value does not match!
 						bad_request_die( sprintf( T_('Illegal value received for parameter &laquo;%s&raquo;!'), $var ) );
 					}
-					else
-					{
-						// Fall back to default
-						$GLOBALS[$var] = $default;
-					}
-
-					// From now on, consider this as a string: (we need this when memorizing)
-					$type = 'string';
-				}
-				elseif( $GLOBALS[$var] === '' )
-				{
-					// Special handling of empty values.
-					if( $strict_typing === false && $use_default )
-					{
-						// ADDED BY FP 2006-07-06
-						// We want to consider empty values as invalid and fall back to the default value:
-						$GLOBALS[$var] = $default;
-					}
-					else
-					{
-						// We memorize the empty value as NULL:
-						// fplanque> note: there might be side effects to this, but we need
-						// this to distinguish between 0 and 'no input'
-						// Note: we do this after regexps because we may or may not want to allow empty strings in regexps
-						$GLOBALS[$var] = NULL;
-					}
-				}
-				elseif( $GLOBALS[$var] === array() )
-				{
-					if( $strict_typing === false && $use_default )
-					{
-						// ADDED BY FP 2006-09-07
-						// We want to consider empty values as invalid and fall back to the default value
-						$GLOBALS[$var] = $default;
-					}
-				}
-				// TODO: dh> if a var (e.g. from POST) comes in as '' but has type "array" it does not get "converted" to array type (nor gets the default used!)
-				else
-				{
-					if( $strict_typing )
-					{
-						// We want to make sure the value is valid
-						$regexp = '';
-						switch( $type )
-						{
-							case 'boolean':
-								$regexp = '/^(0|1|false|true)$/i';
-								break;
-
-							case 'integer':
-								$regexp = '/^(\+|-)?[0-9]+$/';
-								break;
-
-							case 'float':
-							case 'double':
-								$regexp = '/^(\+|-)?[0-9]+(.[0-9]+)?$/';
-								break;
-
-							// Note: other types are not tested here
-						}
-						if( $strict_typing == 'allow_empty' && empty($GLOBALS[$var]) )
-						{
-							// We have an empty value and we accept it
-							// ok..
-						}
-						elseif( !empty( $regexp ) && ( !is_scalar($GLOBALS[$var]) || !preg_match( $regexp, $GLOBALS[$var] ) ) )
-						{
-							// Value does not match!
-							bad_request_die( sprintf( T_('Illegal value received for parameter &laquo;%s&raquo;!'), $var ) );
-						}
-					}
-
-					// Change the variable type
-					settype( $GLOBALS[$var], $type );
-				}
+				}
+
+				// Change the variable type
+				settype( $GLOBALS[$var], $type );
+			}
 		}
 	}
 
@@ -243,16 +241,16 @@
 		// Memorize this parameter
 		memorize_param( $var, $type, $default );
 	}
+
 	return $GLOBALS[$var];
 }
 
 
 /**
- * Get the param from an array param's first index instead of the value.
+ * Get the param from an array param's first index instead of the value
  *
  * E.g., for "param[value]" as a submit button you can get the value with
- *       <code>Request::param_arrayindex( 'param' )</code>.
- *
+ * <code>Request::param_arrayindex( 'param' )</code>.
  * @see param_action()
  * @param string Param name
  * @param mixed Default to use
@@ -262,9 +260,9 @@
 {
 	$array = array_keys( param( $param_name, 'array', array() ) );
 	$value = array_pop( $array );
-	if( is_string($value) )
+	if( is_string( $value ) )
 	{
-		$value = substr( strip_tags($value), 0, 50 ); // sanitize it
+		$value = substr( strip_tags( $value ), 0, 50 ); // sanitize it
 	}
 	elseif( ! empty( $value ) )
 	{
@@ -286,8 +284,9 @@
  * If we got no "action" param, we'll check for an "actionArray" param
  * ( <input type="submit" name="actionArray[real_action]" ...> ).
  * And the real $action will be found in the first key...
- * When there are multiple submit buttons, this is smarter than checking the value which is a translated string.
- * When there is an image button, this allows to work around IE not sending the value (it only sends X & Y coords of the click).
+ * When there are multiple submit buttons, this is smarter than checking the value
+ * which is a translated string. When there is an image button, this allows to work
+ * around IE not sending the value (it only sends X & Y coords of the click).
  * @param mixed Default to use.
  * @return string
  */
@@ -295,7 +294,7 @@
 {
 	$action = param( 'action', 'string', NULL, $memorize );
 
-	if( is_null($action) )
+	if( is_null( $action ) )
 	{
 		// Check $actionArray
 		$action = param_arrayindex( 'actionArray', $default );
@@ -310,13 +309,20 @@
 /**
  * Get a param from cookie
  *
- * This is just a wrapper around {@link param()} which unsets and restores GET and POST.
- * IMHO this is less hackish, at least performance wise then using a $sources param for param()
+ * This is just a wrapper around {@link param()} which unsets and restores GET and
+ * POST. IMHO this is less hackish, at least performance wise then using a $sources
+ * param for param()
  * @uses param()
  * @see param()
  */
-function param_cookie($var, $type = '', $default = '', $memorize = false,
-		$override = false, $use_default = true, $strict_typing = 'allow_empty')
+function param_cookie(
+	$var,
+	$type = '',
+	$default = '',
+	$memorize = false,
+	$override = false,
+	$use_default = true,
+	$strict_typing = 'allow_empty' )
 {
 	$save_GET = $_GET;
 	$save_POST = $_POST;
@@ -412,7 +418,6 @@
 
 /**
  * Gets a param and makes sure it's a decimal number (no float, e.g. 3.14) in a given range.
- *
  * @param string param name
  * @param integer min value
  * @param integer max value
@@ -428,7 +433,6 @@
 
 /**
  * Checks if the param is a decimal number (no float, e.g. 3.14) in a given range
- *
  * @param string param name
  * @param integer min value
  * @param integer max value
@@ -496,7 +500,6 @@
 
 /**
  * Check if the value is a file name
- *
  * @param string param name
  * @param string error message
  * @return boolean true if OK
@@ -514,7 +517,6 @@
 
 /**
  * Check if the value of a param is a regular expression (syntax).
- *
  * @param string param name
  * @param string error message
  * @param string|NULL error message for form field ($err_msg gets used if === NULL).
@@ -533,7 +535,6 @@
 
 /**
  * Sets a date parameter by converting locale date (if valid) to ISO date
- *
  * If the date is not valid, it is set to the param unchanged (unconverted).
  * @param string param name
  * @param string error message
@@ -541,7 +542,12 @@
  * @param string Default (in the format of $date_format)
  * @param string date format (php format), defaults to {@link locale_datefmt()}
  */
-function param_date( $var, $err_msg, $required, $default = '', $date_format = NULL )
+function param_date(
+	$var,
+	$err_msg,
+	$required,
+	$default = '',
+	$date_format = NULL )
 {
 	param( $var, 'string', $default );
 
@@ -559,7 +565,8 @@
 /**
  * Check if param is an ISO date
  *
- * NOTE: for tokens like e.g. "D" (abbr. weekday), T_() gets used and it uses the current locale!
+ * NOTE: for tokens like e.g. "D" (abbr. weekday), T_() gets used and it uses
+ * the current locale!
  * @param string param name
  * @param string error message
  * @param boolean Is a non-empty date required?
@@ -590,33 +597,56 @@
 		if( $m[1] == "\\\" ) return $m[2]; // escaped
 		switch( $m[2] )
 		{
-			case "d": return "([0-3]\\d)"; // day, 01-31
-			case "j": return "([1-3]?\\d)"; // day, 1-31
-			case "l": return "(".str_replace("~", "\~", implode("|", array_map("trim", array_map("T_", $GLOBALS["weekday"])))).")";
-			case "D": return "(".str_replace("~", "\~", implode("|", array_map("trim", array_map("T_", $GLOBALS["weekday_abbrev"])))).")";
+			case "d":
+			return "([0-3]\\d)"; // day, 01-31
+
+			case "j":
+			return "([1-3]?\\d)"; // day, 1-31
+
+			case "l":
+			return "(".str_replace("~", "\~", implode("|", array_map("trim", array_map("T_", $GLOBALS["weekday"])))).")";
+
+			case "D":
+			return "(".str_replace("~", "\~", implode("|", array_map("trim", array_map("T_", $GLOBALS["weekday_abbrev"])))).")";
+
 			case "e": // QP extension!
-				return "(".str_replace("~", "\~", implode("|", array_map("trim", array_map("T_", $GLOBALS["weekday_letter"])))).")";
-			case "S": return "(st|nd|rd|th)"; // english suffix for day
-
-			case "m": return "([0-1]\\d)"; // month, 01-12
-			case "n": return "(1?\\d)"; // month, 1-12
-			case "F": return "(".str_replace("~", "\~", implode("|", array_map("trim", array_map("T_", $GLOBALS["month"])))).")"; //  A full textual representation of a month, such as January or March
-			case "M": return "(".str_replace("~", "\~", implode("|", array_map("trim", array_map("T_", $GLOBALS["month_abbrev"])))).")";
-
-			case "y": return "(\\d\\d)"; // year, 00-99
-			case "Y": return "(\\d{4})"; // year, XXXX
+			return "(".str_replace("~", "\~", implode("|", array_map("trim", array_map("T_", $GLOBALS["weekday_letter"])))).")";
+
+			case "S":
+			return "(st|nd|rd|th)"; // english suffix for day
+
+			case "m":
+			return "([0-1]\\d)"; // month, 01-12
+
+			case "n":
+			return "(1?\\d)"; // month, 1-12
+
+			case "F":
+			return "(".str_replace("~", "\~", implode("|", array_map("trim", array_map("T_", $GLOBALS["month"])))).")"; //  A full textual representation of a month, such as January or March
+
+			case "M":
+			return "(".str_replace("~", "\~", implode("|", array_map("trim", array_map("T_", $GLOBALS["month_abbrev"])))).")";
+
+			case "y":
+			return "(\\d\\d)"; // year, 00-99
+
+			case "Y":
+			return "(\\d{4})"; // year, XXXX
+
 			default:
-				return $m[0];
+			return $m[0];
 		}' ), $date_format ).'$~i'; // case-insensitive?
-	// Allow additional spaces, e.g. "03  May 2007" when format is "d F Y":
+
+	// Allow additional spaces, e.g. "03  May 2007" when format is "d F Y"
 	$date_regexp = preg_replace( '~ +~', '\s+', $date_regexp );
 
 	// Check that the numbers match the date pattern
 	if( preg_match( $date_regexp, $GLOBALS[$var], $numbers ) )
 	{
-		// Date does match pattern
-		// Get all date pattern parts. We should get 3 parts!
-		preg_match_all( '/(?<!\\\\)[A-Za-z]/', $date_format, $parts ); // "(?<!\\\\)" means that the letter is not escaped with "\"
+		// Date does match pattern ... Get all date pattern parts. We should get 3 parts!
+
+		// "(?<!\\\\)" means that the letter is not escaped with "\"
+		preg_match_all( '/(?<!\\\\)[A-Za-z]/', $date_format, $parts );
 		$day = null;
 		$month = null;
 		$year = null;
@@ -627,46 +657,52 @@
 			{
 				case 'd':
 				case 'j':
-					$day = $numbers[$position+1];
-					break;
+				$day = $numbers[$position+1];
+				break;
 
 				case 'm':
 				case 'n':
-					$month = $numbers[$position+1];
-					break;
-				case 'F': // full month name
-					$month = array_search( strtolower($numbers[$position+1]), array_map('strtolower', array_map('trim', array_map('T_', $GLOBALS['month']))) );
-					break;
+				$month = $numbers[$position+1];
+				break;
+
+				// full month name
+				case 'F':
+				$month = array_search(
+					strtolower( $numbers[$position+1] ), array_map( 'strtolower', array_map(
+					'trim', array_map( 'T_', $GLOBALS['month'] ) ) ) );
+				break;
+
 				case 'M':
-					$month = array_search( strtolower($numbers[$position+1]), array_map('strtolower', array_map('trim', array_map('T_', $GLOBALS['month_abbrev']))) );
-					break;
+				$month = array_search(
+					strtolower( $numbers[$position+1] ), array_map( 'strtolower', array_map(
+					'trim', array_map( 'T_', $GLOBALS['month_abbrev'] ) ) ) );
+				break;
 
 				case 'y':
 				case 'Y':
-					$year = $numbers[$position+1];
-					if( $year < 50 )
-					{
-						$year = 2000 + $year;
-					}
-					elseif( $year < 100 )
-					{
-						$year = 1900 + $year;
-					}
-					break;
+				$year = $numbers[$position+1];
+				if( $year < 50 )
+				{
+					$year = 2000 + $year;
+				}
+				elseif( $year < 100 )
+				{
+					$year = 1900 + $year;
+				}
+				break;
 			}
 		}
 
 		if( checkdate( $month, $day, $year ) )
 		{
-			// all clean! :)  We convert the value to ISO:
+			// all clean! :)  We convert the value to ISO
 			$iso_date = substr( '0'.$year, -4 ).'-'.substr( '0'.$month, -2 ).'-'.substr( '0'.$day, -2 );
 
 			return $iso_date;
 		}
 	}
 
-	// Date did not pass all tests:
-
+	// Date did not pass all tests
 	param_error( $var, $err_msg );
 
 	return false;
@@ -676,13 +712,11 @@
 /**
  * Sets a date parameter with values from the request or to provided default,
  * And check we have a compact date (numbers only) ( used for URL filtering )
- *
  * @param string Variable to set
  * @param mixed Default value or TRUE if user input required
  * @param boolean memorize ( see {@link param()} )
  * @param string error message
  * @param boolean 'required': Is non-empty date required? Default: true.
- *
  * @return string the compact date value ( yyyymmdd )
  */
 function param_compact_date( $var, $default = '', $memorize = false, $err_msg, $required = false )
@@ -712,10 +746,11 @@
 
 
 /**
+ * Set a time parameter with the value from the request of the var argument
+ *
  * Sets a time parameter with the value from the request of the var argument
  * or of the concat of the var argument_h: var argument_mn: var argument_s ,
  * except if param is already set!
- *
  * @param string Variable to set
  * @param mixed Default value or TRUE if user input required
  * @param boolean Do we need to memorize this to regenerate the URL for this page?
@@ -741,7 +776,7 @@
 		}
 	}
 	elseif( ( $time_h = param( $var.'_h', 'integer', -1 ) ) != -1
-				&& ( $time_mn = param( $var.'_mn', 'integer', -1 ) ) != -1 )
+		&& ( $time_mn = param( $var.'_mn', 'integer', -1 ) ) != -1 )
 	{
 		// Got a time from selects
 		$time_s = param( $var.'_s', 'integer', 0 );
@@ -770,10 +805,9 @@
 /**
  * Extend a LIST parameter with an ARRAY param.
  *
- * Will be used for author/authorsel[], etc.
- * Note: cannot be used for catsel[], because catsel is NON-recursive.
+ * Will be used for author/authorsel[], etc. Note: cannot be used for catsel[]
+ * because catsel is NON-recursive.
  * @see param_compile_cat_array()
- *
  * @param string Variable to extend
  * @param string Name of array Variable to use as an extension
  * @param boolean Save non numeric prefix?  ( 1 char -- can be used as a modifier, e-g: - + * )
@@ -813,8 +847,8 @@
 		}
 	}
 
-	// Merge values:
-	if( empty($original_val) )
+	// Merge values
+	if( empty( $original_val ) )
 	{
 		$original_values_array = array();
 	}
@@ -832,8 +866,9 @@
 
 
 /**
- * Compiles the cat array from $cat (recursive + optional modifiers) and $catsel[] (non recursive)
- * and keeps those values available for future reference (category widget)
+ * Compiles the cat array from $cat (recursive + optional modifiers) and
+ * $catsel[] (non recursive) and keeps those values available for future
+ * reference (category widget)
  */
 function param_compile_cat_array( $restrict_to_blog = 0, $cat_default = NULL, $catsel_default = array() )
 {
@@ -1511,31 +1546,6 @@
 }
 
 
-
-
-
-/**
- * Sets an HTML parameter and checks for sanitized code.
- *
- * WARNING: this does *NOT* (necessarilly) make the HTML code safe.
- * It only checks on it and produces error messages.
- * It is NOT (necessarily) safe to use the output.
- *
- * @todo dh> Not implemented?!
- *
- * @param string Variable to set
- * @param mixed Default value or TRUE if user input required
- * @param boolean memorize ( see {@link param()} )
- * @param string error message
- *
- * @return string
- */
-function param_html( $var, $default = '', $memorize = false, $err_msg )
-{
-
-}
-
-
 /**
  * Checks for sanitized code.
  *
@@ -1551,7 +1561,7 @@
 {
 	global $Messages;
 
-	$altered_html = check_html_sanity( $GLOBALS[$var], 'posting', $autobr );
+	$altered_html = check_html_sanity( array( 'param_check_html' => '1' ), $GLOBALS[$var], 'posting', $autobr );
 
 	if( $altered_html === false )
 	{
@@ -1581,7 +1591,7 @@
  */
 function format_to_post( $content, $autobr = 0, $is_comment = 0, $encoding = NULL )
 {
-	$ret = check_html_sanity( $content, ( $is_comment ? 'commenting' : 'posting' ), $autobr, $encoding );
+	$ret = check_html_sanity( array( 'format_to_post' => '1' ), $content, ( $is_comment ? 'commenting' : 'posting' ), $autobr, $encoding );
 	if( $ret === false )
 	{
 		// ERROR
@@ -1618,14 +1628,22 @@
  * visible HTML? Forced to true when "commenting".
  * @return boolean|string
  */
-function check_html_sanity( $content, $context = 'posting', $autobr = false,
-							$encoding = NULL, $escape_comments = false )
+function check_html_sanity(
+	$source = array(),
+	$content,
+	$context = 'posting',
+	$autobr = false,
+	$encoding = NULL,
+	$escape_comments = false )
 {
-	global $use_balanceTags, $admin_url;
-	global $io_charset, $use_xhtmlvalidation_for_comments, $comment_allowed_tags, $comments_allow_css_tweaks;
+	global $admin_url;
+	global $balance_tags;
+	global $comments_allow_css_tweaks;
+	global $comment_allowed_tags;
+	global $current_User;
+	global $io_charset;
 	global $Messages;
-
-	global $current_User;
+	global $xhtml_validate_comments;
 
 	switch( $context )
 	{
@@ -1648,7 +1666,7 @@
 		break;
 
 		case 'commenting':
-		$xhtmlvalidation = $use_xhtmlvalidation_for_comments;
+		$xhtmlvalidation = $xhtml_validate_comments;
 		$allow_css_tweaks = $comments_allow_css_tweaks;
 		$allow_javascript = false;
 		$allow_iframes = false;
@@ -1700,7 +1718,7 @@
 
 	$content = trim( $content );
 
-	if( $use_balanceTags )
+	if( $balance_tags )
 	{
 		// Auto close open tags
 		$content = balance_tags( $content );
@@ -1709,11 +1727,11 @@
 	if( $context == 'commenting' || $escape_comments )
 	{
 		// Comments, processing instructions etc. are not allowed when commenting.
-		$content = str_replace( array(
-				// Comments, CDATA sections and various declarations.
-				// Declarations end with a single '>' which makes it hard
-				// to correctly detect their closing tags. Thus, we don't
-				// even try to do that (FIXME).
+		$content = str_replace(
+			array(
+				// Comments, CDATA sections and various declarations. Declarations end with
+				// a single '>' which makes it hard to correctly detect their closing tags.
+				// Thus, we don't even try to do that (FIXME).
 				'<!',
 				// Closing comments
 				'-->',
@@ -1721,22 +1739,80 @@
 				']]>',
 				// Processing instructions
 				'<?',
-				'?>',
-			), array(
+				'?>', ),
+			array(
 				'&lt;!',
 				'--&gt;',
 				']]&gt;',
 				'&lt;?',
-				'?&gt;',
-			), $content );
+				'?&gt;', ),
+			$content );
 	}
 
 	if( $xhtmlvalidation )
 	{
 		// We want to validate XHTML
-		load_class( 'xhtml_validator/_xhtml_validator.class.php' );
-
-		$XHTML_Validator = new XHTML_Validator( $context, $allow_css_tweaks, $allow_iframes, $allow_javascript, $allow_objects, $encoding );
+
+		// figure out what we want to validate against ($flavor)
+		$skip = false;
+		$flavor = 'xhtml';
+		$source = array_merge( array(
+				'template_type' => '', 'main_cat_ID' => 0, 'item_ID' => 0,
+			), $source );
+
+		// if we have template_type we're done
+		if( $source['template_type'] )
+		{
+			$flavor = $source['template_type'];
+			$skip = true;
+		}
+
+		// if we come from param_check_html() we're almost done
+		if( ! $skip && $source['param_check_html'] )
+		{
+			global $Blog;
+
+			// during blog creation, $Blog is NULL but template_ID has a value
+			if( is_null( $Blog ) )
+			{
+				$template_ID = $_POST['template_ID'];
+				$TemplateCache = & get_Cache( 'TemplateCache' );
+				$Template = $TemplateCache->get_by_ID( $template_ID, false );
+				$flavor = $Template->type;
+				$skip = true;
+			}
+			else
+			{
+				$flavor = $Blog->template_type;
+				$skip = true;
+			}
+		}
+
+		// okay let's get a $blog_ID value if we can
+		if( ! $skip && $source['main_cat_ID'] )
+		{
+			$blog_ID = get_catblog( $main_cat ); // @todo (0000) should not die, if cat does not exist!
+		}
+		elseif( $source['item_ID'] )
+		{
+			$ItemCache = & get_Cache( 'ItemCache' );
+			$current_Item = & $ItemCache->get_by_ID( $source['item_ID'], false );
+			$blog_ID = get_catblog( $current_Item->main_cat_ID ); // @todo (0000) should not die, if cat does not exist!
+		}
+		else
+		{
+			$blog_ID = 0;
+		}
+
+		if( ! $skip && $blog_ID != 0 )
+		{
+			// Get the appropriate blog from the cache
+			$BlogCache = & get_Cache( 'BlogCache' );
+			$Blog = & $BlogCache->get_by_ID( $blog_ID, false, false );
+			$flavor = $Blog->template_type;
+		}
+
+		$XHTML_Validator = new XHTML_Validator( $flavor, $context, $allow_css_tweaks, $allow_iframes, $allow_javascript, $allow_objects, $encoding );
 
 		if( ! $XHTML_Validator->check( $content ) )
 		{
@@ -1746,8 +1822,9 @@
 	else
 	{
 		// We do not WANT to validate XHTML, fall back to basic security checking:
-		// This is only as strong as its regexps can parse xhtml. This is significantly inferior to the XHTML checker above.
-		// The only advantage of this checker is that it can check for a little security without requiring VALID XHTML.
+		// This is only as strong as its regexps can parse xhtml. This is significantly
+		// inferior to the XHTML checker above. The only advantage of this checker is
+		// that it can check for a little security without requiring VALID XHTML.
 
 		if( $context == 'commenting' )
 		{
@@ -1757,11 +1834,10 @@
 		else if( ! $escape_comments
 				&& preg_match_all( '#(?:<!--|<!\[CDATA\[|<\?)#i', $content, $matches, PREG_OFFSET_CAPTURE ) )
 		{
-			// We are posting an item, try an el-cheapo check for unclosed
-			// comments, processing instructions etc.
-			// Declarations end with a single '>' which is hard to detect
-			// correctly, so we don't try to validate them here. In theory,
-			// this may be an issue, but apparently, it's not a big threat.
+			// We are posting an item, try an el-cheapo check for unclosed comments,
+			// processing instructions etc. Declarations end with a single '>' which
+			// is hard to detect correctly, so we don't try to validate them here. In
+			// theory this may be an issue, but apparently, it's not a big threat.
 			static $search = array(
 				'<!--' => '-->',
 				'<![CDATA[' => ']]>',
@@ -1794,15 +1870,15 @@
 			// No error yet?
 			$check = $content;
 
-			// CHECK Styling restictions:
+			// CHECK Styling restictions
 			if( ! $allow_css_tweaks
-				&& preg_match( '#\s((style|class|id)\s*=)#i', $check, $matches) )
+				&& preg_match( '#\s((style|class|id)\s*=)#i', $check, $matches ) )
 			{
 				$Messages->add( T_('Illegal CSS markup found: ').htmlspecialchars( $matches[1] ), 'error' );
 				$error = true;
 			}
 
-			// CHECK JAVASCRIPT:
+			// CHECK JAVASCRIPT
 			if( ! $allow_javascript
 				&& ( preg_match( '¤( < \s* //? \s* (script|noscript) )¤xi', $check, $matches )
 					|| preg_match( '#\s((on[a-z]+)\s*=)#i', $check, $matches )
@@ -1813,7 +1889,7 @@
 				$error = true;
 			}
 
-			// CHECK IFRAMES:
+			// CHECK IFRAMES
 			if( ! $allow_iframes
 				&& preg_match( '¤( < \s* //? \s* (frame|iframe) )¤xi', $check, $matches) )
 			{
@@ -1821,7 +1897,7 @@
 				$error = true;
 			}
 
-			// CHECK OBJECTS:
+			// CHECK OBJECTS
 			if( ! $allow_objects
 				&& preg_match( '¤( < \s* //? \s* (applet|object|param|embed) )¤xi', $check, $matches) )
 			{
@@ -1834,11 +1910,12 @@
 	if( $error )
 	{
 		if( ! empty( $current_User )
-				&& ! empty( $Group ) // This one will basically prevent this case from happening when commenting
-				&& $current_User->check_perm( 'users', 'edit', false ) )
+			&& ! empty( $Group ) // This one will basically prevent this case from happening when commenting
+			&& $current_User->check_perm( 'users', 'edit', false ) )
 		{
-			$Messages->add( sprintf( T_('(Note: To get rid of the above validation warnings, you can deactivate unwanted validation rules in your <a %s>Group settings</a>.)'),
-										'href="'.$admin_url.'?ctrl=users&amp;grp_ID='.$Group->ID.'"' ), 'error' );
+			$Messages->add(
+				sprintf( T_('(Note: To get rid of the above validation warnings, you can deactivate unwanted validation rules in your <a %s>Group settings</a>.)'),
+				'href="'.$admin_url.'?ctrl=users&amp;grp_ID='.$Group->ID.'"' ), 'error' );
 		}
 		return false;
 	}
@@ -1850,7 +1927,6 @@
 
 /**
  * Balances Tags of string using a modified stack.
- *
  * @param string HTML to be balanced
  * @return string Balanced HTML
  */

=== modified file 'qp_inc/_core/_template.funcs.php'
--- qp_inc/_core/_template.funcs.php	2013-03-04 20:46:54 +0000
+++ qp_inc/_core/_template.funcs.php	2013-03-11 07:27:21 +0000
@@ -82,7 +82,7 @@
 
 	if( $redirect_to[0] == '/' )
 	{
-		// @todo (0000): until all calls to header_redirect are cleaned up:
+		// @todo (0000) until all calls to header_redirect are cleaned up:
 		global $ReqHost;
 		$redirect_to = $ReqHost.$redirect_to;
 		// debug_die( '$redirect_to must be an absolute URL' );
@@ -202,11 +202,11 @@
  *
  * 'auto_pilot' => 'seo_title' uses the SEO title autopilot. (default: "none")
  *
- * @todo (0000): single month: Respect locales datefmt
- * @todo (0000): single post: posts do no get proper checking (wether they are in the requested
+ * @todo (0000) single month: Respect locales datefmt
+ * @todo (0000) single post: posts do no get proper checking (wether they are in the requested
  * blog or whether their permissions match user rights, thus the title sometimes gets displayed
  * even when it should not. We need to pre-query the ItemList instead!!
- * @todo (0000): make it complete with all possible params!
+ * @todo (0000) make it complete with all possible params!
  */
 function request_title( $params = array() )
 {
@@ -472,7 +472,7 @@
 		'#jqueryUI_debug#' => 'jquery.ui.all.js',
 	);
 
-	// @todo (0000): dh> I think dependencies should get handled where the files are included!
+	// @todo (0000) dh> I think dependencies should get handled where the files are included!
 	if( in_array( $js_file, array( '#jqueryUI#', '#jqueryUI_debug#' ) ) )
 	{
 		// Dependency : ensure jQuery is loaded
@@ -676,7 +676,7 @@
 
 /**
  * T-Tag: Registers all the javascripts needed by the toolbar menu
- * @todo (0000): fp> include basic.css ? -- rename to add_headlines_for* -- potential
+ * @todo (0000) fp> include basic.css ? -- rename to add_headlines_for* -- potential
  * problem with inclusion order of CSS files!! dh> would be nice to have the batch of CSS in
  * a separate file. basic.css would get included first always, then e.g. this toolbar.css.
  */
@@ -689,7 +689,7 @@
 
 	require_js( '#jquery#' );
 	require_js( 'functions.min.js' ); // for rollovers AddEvent - TODO: change to jQuery
-	require_js( 'rollovers.js' ); // @todo (0000): change to jQuery
+	require_js( 'rollovers.js' ); // @todo (0000) change to jQuery
 	// Superfish menus:
 	require_js( 'hoverintent.js' );
 	require_js( 'superfish.js' );
@@ -709,14 +709,28 @@
 /**
  * T-Tag: Outputs the collected HTML HEAD lines.
  * @see add_headline()
+ * @param string The template's type (default is 'xthml')
  * @return string
  */
-function include_headlines()
+function include_headlines( $type = 'xhtml' )
 {
 	global $headlines;
 
 	if( $headlines )
 	{
+
+		if( $type == 'html5' )
+		{
+			// http://php.net/manual/en/language.types.array.php Example 3...
+			foreach( $headlines as &$headline )
+			{
+				$headline = str_replace( "<script type=\"text/javascript\"", "<script", $headline );
+				$headline = str_replace( "<style type=\"text/css\"", "<style", $headline );
+				$headline = str_replace( "<link rel=\"stylesheet\" type=\"text/css\"", "<link rel=\"stylesheet\"", $headline );
+			}
+			unset( $headline );
+		}
+
 		echo "\n".implode( "\n", $headlines );
 		echo "\n";
 	}

=== modified file 'qp_inc/_core/model/__core.install.php'
--- qp_inc/_core/model/__core.install.php	2013-03-04 07:34:42 +0000
+++ qp_inc/_core/model/__core.install.php	2013-03-11 07:27:21 +0000
@@ -53,6 +53,7 @@
 			blog_allowblogcss TINYINT(1) NOT NULL default 1,
 			blog_allowusercss TINYINT(1) NOT NULL default 1,
 			blog_template_ID INT(10) UNSIGNED NOT NULL DEFAULT 1,
+			blog_template_type ENUM('xhtml','html5','feed','other') NOT NULL default 'xhtml',
 			blog_in_bloglist TINYINT(1) NOT NULL DEFAULT 1,
 			blog_links_blog_ID INT(11) NULL DEFAULT NULL,
 			blog_media_location ENUM( 'default', 'subdir', 'custom', 'none' ) DEFAULT 'default' NOT NULL,
@@ -420,17 +421,18 @@
 		"CREATE TABLE T_templates__template (
 			template_ID INT(10) unsigned NOT NULL auto_increment,
 			template_name VARCHAR(32) NOT NULL,
-			template_type ENUM('xhtml','feed','other') NOT NULL default 'xhtml',
+			template_type ENUM('xhtml','html5','feed','other') NOT NULL default 'xhtml',
 			template_folder VARCHAR(32) NOT NULL,
 			PRIMARY KEY template_ID (template_ID),
 			UNIQUE template_folder( template_folder ),
 			KEY template_name( template_name )
 		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 
-	'T_templates__container' => array( 'Creating table for template containers',
+	'T_templates__container' => array( 'Creating template containers table',
 		"CREATE TABLE T_templates__container (
 			sco_template_ID INT(10) unsigned NOT NULL,
 			sco_name VARCHAR(40) NOT NULL,
+			sco_order TINYINT NOT NULL default 0,
 			PRIMARY KEY ( sco_template_ID, sco_name )
 		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 

=== modified file 'qp_inc/collections/coll_settings.ctrl.php'
--- qp_inc/collections/coll_settings.ctrl.php	2011-07-20 06:26:28 +0000
+++ qp_inc/collections/coll_settings.ctrl.php	2013-03-11 07:27:21 +0000
@@ -253,8 +253,8 @@
 		break;
 
 	case 'template':
-		$AdminUI->disp_view( 'templates/views/_coll_template_settings.form.php' );
-		$AdminUI->disp_view( 'templates/views/_coll_template.view.php' );
+	$AdminUI->disp_view( 'templates/views/_template_settings.form.php' );
+	$AdminUI->disp_view( 'templates/views/_template_select.view.php' );
 		break;
 
 	case 'plugin_settings':

=== modified file 'qp_inc/collections/collections.ctrl.php'
--- qp_inc/collections/collections.ctrl.php	2012-07-21 09:43:31 +0000
+++ qp_inc/collections/collections.ctrl.php	2013-03-11 07:27:21 +0000
@@ -269,7 +269,7 @@
 		$AdminUI->displayed_sub_begin = 1;	// DIRTY HACK :/ replacing an even worse hack...
 		$AdminUI->disp_payload_begin();
 
-		$AdminUI->disp_view( 'templates/views/_coll_sel_template.view.php' );
+		$AdminUI->disp_view( 'templates/views/_template_select_create.view.php' );
 
 		$AdminUI->disp_payload_end();
 		break;

=== modified file 'qp_inc/collections/model/_blog.class.php'
--- qp_inc/collections/model/_blog.class.php	2011-03-14 23:04:42 +0000
+++ qp_inc/collections/model/_blog.class.php	2013-03-11 07:27:21 +0000
@@ -95,6 +95,11 @@
 	var $media_fullpath = '';
 	var $media_url = '';
 	var $default_cat_ID;
+	/**
+	 * This blog's template type
+	 * @var string
+	 */
+	var $template_type;
 
 	/**
 	 * Constructor
@@ -125,6 +130,7 @@
 			$this->set( 'locale', $default_locale );
 			$this->set( 'access_type', 'index.php' );
 			$this->template_ID = 1; // TODO: this is the DB default, but it will fail if template #1 does not exist
+			$this->template_type = 'xhtml';
 		}
 		else
 		{
@@ -154,6 +160,7 @@
 			$this->media_fullpath = $db_row->blog_media_fullpath;
 			$this->media_url = $db_row->blog_media_url;
 			$this->UID = $db_row->blog_UID;
+			$this->template_type = $db_row->blog_template_type;
 		}
 	}
 
@@ -1405,6 +1412,11 @@
 			$this->set_from_Request( 'template_ID' );
 		}
 
+		if( param( 'blog_template_type', 'string', NULL ) !== NULL )
+		{
+			$this->set( 'template_type', get_param( 'blog_template_type' ) );
+		}
+
 		if( param( 'what_to_show',   'string', NULL ) !== NULL )
 		{ // Show x days or x posts?:
 			$this->set_setting( 'what_to_show', get_param( 'what_to_show' ) );

=== modified file 'qp_inc/comments/views/_comment.form.php'
--- qp_inc/comments/views/_comment.form.php	2010-12-31 12:12:03 +0000
+++ qp_inc/comments/views/_comment.form.php	2013-03-11 07:27:21 +0000
@@ -2,269 +2,245 @@
 /**
  * This file implements the Comment form.
  *
- * This file is part of the Quam Plures project - {@link http://quamplures.net/}.
- * See also {@link https://launchpad.net/quam-plures}.
- *
- * @copyright (c) 2009 - 2011 by the Quam Plures developers - {@link http://quamplures.net/}
- * @copyright (c)2003-2009 by Francois PLANQUE - {@link http://fplanque.net/}.
- *
- * @license http://quamplures.net/license.html GNU General Public License (GPL)
- *
- * {@internal Below is a list of authors who have contributed to design/coding of this file: }}
- * @author fplanque: Francois PLANQUE
- *
- * @package pond
+ * @author {@link http://wonderwinds.com/ Ed Bennett}
+ * @author {@link http://fplanque.net/ Francois PLANQUE}
+ * @copyright (c) 2009 by {@link http://quamplures.net/ the Quam Plures project}
+ * @license http://www.gnu.org/licenses/gpl.txt GNU General Public License v3
+ * @package comments
  */
-if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
+if(!defined('QP_MAIN_INIT')) die('fail');
 
-/**
- * @var Blog
- */
 global $Blog;
-/**
- * @var Comment
- */
+global $comments_use_autobr;
 global $edited_Comment;
-/**
- *
- */
+global $mode;
+global $month;
 global $Plugins;
-
-global $comments_use_autobr, $mode, $month, $tab, $redirect_to;
+global $redirect_to;
+global $tab;
 
 $Form = new Form( NULL, 'comment_checkchanges', 'post' );
-
 $Form->global_icon( T_('Cancel editing!'), 'close', str_replace( '&', '&amp;', $redirect_to), T_('cancel'), 4, 1 );
-
 $Form->begin_form( 'eform' );
-
-$Form->hidden( 'ctrl', 'comments' );
+$Form->hidden_ctrl();
 $Form->hidden( 'action', 'update' );
 $Form->hidden( 'redirect_to', $redirect_to );
 $Form->hidden( 'comment_ID', $edited_Comment->ID );
 ?>
 
 <div class="clear"></div>
-
 <div class="left_col">
-
-
-	<?php
-	$Form->begin_fieldset( T_('Comment contents') );
-
-	echo '<table cellspacing="0" class="compose_layout">';
-
-	echo '<tr><td width="1%"><strong>'.T_('In response to').':</strong></td>';
-	echo '<td class="input">';
-	$comment_Item = & $edited_Comment->get_Item();
-	// display and link item title
-	$comment_Item->title( array(
-			'link_type' => 'admin_view',
-		) );
-	echo '</td></tr>';
-
-	if( ! $edited_Comment->get_author_User() )
-	{ // This is not a member comment
-		$Form->switch_layout( 'none' );
-
-		echo '<tr><td width="1%"><strong>'.T_('Author').':</strong></td>';
-		echo '<td class="input">';
-		$Form->text_input( 'newcomment_author', $edited_Comment->author, 20, '', '', array('maxlength'=>100, 'style'=>'width: 100%;') );
-		echo '</td></tr>';
-
-		echo '<tr><td width="1%"><strong>'.T_('Email').':</strong></td>';
-		echo '<td class="input">';
-		$Form->text_input( 'newcomment_author_email', $edited_Comment->author_email, 20, '', '', array('maxlength'=>100, 'style'=>'width: 100%;') );
-		echo '</td></tr>';
-
-		echo '<tr><td width="1%"><strong>'.T_('Website URL').':</strong></td>';
-		echo '<td class="input">';
-		$Form->text_input( 'newcomment_author_url', $edited_Comment->author_url, 20, '', '', array('maxlength'=>100, 'style'=>'width: 100%;') );
-		echo '</td></tr>';
-
-		$Form->switch_layout( NULL );
-	}
-	else
-	{
-		echo '<tr><td width="1%"><strong>'.T_('Author').':</strong></td>';
-		echo '<td class="input">';
-		// display comment author's name
-		$edited_Comment->author( array() );
-		echo '</td></tr>';
-	}
-
-	echo '</table>';
-	?>
+<?php
+$Form->begin_fieldset( T_('Comment contents') );
+echo '<table cellspacing="0" class="compose_layout">';
+echo '<tr><td width="1%"><strong>'.T_('In response to').':</strong></td>';
+echo '<td class="input">';
+$comment_Item = & $edited_Comment->get_Item();
+// display and link item title
+$comment_Item->title( array(
+	'link_type' => 'admin_view',
+) );
+echo '</td></tr>';
+
+if( ! $edited_Comment->get_author_User() )
+{
+	// This is not a member comment
+	$Form->switch_layout( 'none' );
+
+	echo '<tr><td width="1%"><strong>'.T_('Author').':</strong></td>';
+	echo '<td class="input">';
+	$Form->text_input( 'newcomment_author', $edited_Comment->author, 20, '', '', array('maxlength' => 100, 'style' => 'width: 100%;') );
+	echo '</td></tr>';
+
+	echo '<tr><td width="1%"><strong>'.T_('Email').':</strong></td>';
+	echo '<td class="input">';
+	$Form->text_input( 'newcomment_author_email', $edited_Comment->author_email, 20, '', '', array('maxlength' => 100, 'style' => 'width: 100%;') );
+	echo '</td></tr>';
+
+	echo '<tr><td width="1%"><strong>'.T_('Website URL').':</strong></td>';
+	echo '<td class="input">';
+	$Form->text_input( 'newcomment_author_url', $edited_Comment->author_url, 20, '', '', array('maxlength' => 100, 'style' => 'width: 100%;') );
+	echo '</td></tr>';
+
+	$Form->switch_layout( NULL );
+}
+else
+{
+	echo '<tr><td width="1%"><strong>'.T_('Author').':</strong></td>';
+	echo '<td class="input">';
+	// display comment author's name
+	$edited_Comment->author( array() );
+	echo '</td></tr>';
+}
+
+echo '</table>';
+?>
 
 <div class="edit_toolbars">
 <?php
 // spark the plugin manager
 $Plugins->trigger_event( 'AdminDisplayToolbarAbove', array(
 	'target_type' => 'Comment',
+	'template_type' => $Blog->template_type,
 ) );
 ?>
 </div>
 
-	<?php // ---------------------------- TEXTAREA -------------------------------------
-	$content = $edited_Comment->content;
-	if( $comments_use_autobr == 'always' || $comments_use_autobr == 'opt-out' )
-	{
-		$content = unautobrize($content);
-	}
+<?php // TEXTAREA
+$content = $edited_Comment->content;
+if( $comments_use_autobr == 'always' || $comments_use_autobr == 'opt-out' )
+{
+	$content = unautobrize( $content );
+}
 
-	$Form->fieldstart = '<div class="edit_area">';
-	$Form->fieldend = "</div>\n";
-	$Form->textarea( 'content', $content, 16, '', '', 40 , '' );
-	$Form->fieldstart = '<div class="tile">';
-	$Form->fieldend = '</div>';
-	?>
-	<script type="text/javascript">
-		<!--
-		// This is for toolbar plugins
-		var app_Canvas = document.getElementById('content');
-		//-->
-	</script>
+$Form->fieldstart = '<div class="edit_area">';
+$Form->fieldend = "</div>\n";
+$Form->textarea( 'content', $content, 16, '', '', 40, '' );
+$Form->fieldstart = '<div class="tile">';
+$Form->fieldend = '</div>';
+?>
+<script type="text/javascript">
+<!--
+// This is for toolbar plugins
+var app_Canvas = document.getElementById('content');
+//-->
+</script>
 
 <div class="edit_toolbars">
 <?php
 // spark the plugin manager
 $Plugins->trigger_event( 'AdminDisplayToolbarBelow', array(
 	'target_type' => 'Comment',
-) );
-?>
-</div>
-
-	<div class="edit_actions">
-	<input type="submit" value="<?php /* TRANS: This is the value of an input submit button */ echo T_('Save !'); ?>" class="SaveButton" tabindex="10" />
-	<?php
-	// ---------- DELETE ----------
-	if( $action == 'editcomment' )
-	{
-		// display a link to delete a comment
-		$edited_Comment->delete_link( array(
-			'class' => 'DeleteButton',
-		) );
-	}
-
-	// spark the plugin manager
-	$Plugins->trigger_event( 'AdminDisplayEditorButton', array(
-		'target_type' => 'Comment',
-	) );
-	?>
-	</div>
-
-	<?php
-	$Form->end_fieldset();
-
-	$Form->begin_fieldset( T_('Advanced properties') );
-
- 	$Form->switch_layout( 'linespan' );
-
-	if( $current_User->check_perm( 'edit_timestamp' ) )
-	{	// ------------------------------------ TIME STAMP -------------------------------------
-		echo '<div id="itemform_edit_timestamp">';
-		$Form->date( 'comment_issue_date', $edited_Comment->date, T_('Comment date') );
-		echo ' '; // allow wrapping!
-		$Form->time( 'comment_issue_time', $edited_Comment->date, '' );
-		echo '</div>';
-	}
-
-	// --------------------------- AUTOBR --------------------------------------
-	// fp> TODO: this should be Auto-P and handled by the Auto-P plugin
-	?>
-	<input type="checkbox" class="checkbox" name="post_autobr" value="1"
-	<?php	if( $comments_use_autobr == 'always' || $comments_use_autobr == 'opt-out' ) echo ' checked="checked"' ?>
-		id="autobr" tabindex="6" />
-	<label for="autobr"><strong><?php echo T_('Auto-BR') ?></strong></label>
-
-	<?php
-
-	$Form->switch_layout( NULL );
-
-	$Form->end_fieldset();
-
-	// ####################### PLUGIN FIELDSETS #########################
-	// spark the plugin manager
-	$Plugins->trigger_event( 'AdminDispCommentFormField', array(
-		'Form' => & $Form,
-		'Comment' => & $edited_Comment,
-	) );
-	?>
-
+	'template_type' => $Blog->template_type,
+) );
+?>
+</div>
+
+<div class="edit_actions">
+<input type="submit" value="<?php /* TRANS: This is the value of an input submit button */ echo T_('Save !'); ?>" class="SaveButton" tabindex="10" />
+<?php
+if( $action == 'editcomment' )
+{
+	// display a link to delete a comment
+	$edited_Comment->delete_link( array(
+		'class' => 'DeleteButton',
+	) );
+}
+
+// spark the plugin manager
+$Plugins->trigger_event( 'AdminDisplayEditorButton', array(
+	'target_type' => 'Comment',
+) );
+?>
+</div>
+
+<?php
+$Form->end_fieldset();
+
+$Form->begin_fieldset( T_('Advanced properties') );
+$Form->switch_layout( 'linespan' );
+
+if( $current_User->check_perm( 'edit_timestamp' ) )
+{
+	// TIME STAMP
+	echo '<div id="itemform_edit_timestamp">';
+	$Form->date( 'comment_issue_date', $edited_Comment->date, T_('Comment date') );
+	echo ' '; // allow wrapping!
+	$Form->time( 'comment_issue_time', $edited_Comment->date, '' );
+	echo '</div>';
+}
+
+// AUTOBR ... fp> TODO: this should be Auto-P and handled by the Auto-P plugin
+?>
+<input type="checkbox" class="checkbox" name="post_autobr" value="1"
+<?php if( $comments_use_autobr == 'always' || $comments_use_autobr == 'opt-out' )
+{
+	echo ' checked="checked"';
+}
+?>
+ id="autobr" tabindex="6" />
+<label for="autobr"><strong><?php echo T_('Auto-BR') ?></strong></label>
+<?php
+$Form->switch_layout( NULL );
+
+$Form->end_fieldset();
+
+// spark the plugin manager
+$Plugins->trigger_event( 'AdminDispCommentFormField', array(
+	'Form' => & $Form,
+	'Comment' => & $edited_Comment,
+) );
+?>
 </div>
 
 <div class="right_col">
-
 <div class="edit_toolbars">
 <?php
 // spark the plugin manager
 $Plugins->trigger_event( 'AdminDisplayToolbarSidebar', array(
 	'target_type' => 'Comment',
+	'template_type' => $Blog->template_type,
 ) );
 ?>
 </div>
 
 <?php
-	if( $Blog->get_setting('allow_rating') != 'never'
-		|| !empty( $edited_Comment->rating ) )
-	{	// Rating is editable
-		$Form->begin_fieldset( T_('Rating') );
-
-		// display options to rate a comment
-		$edited_Comment->rating_input( array(
-			'before' => '<p>',
-			'after' => '</p>',
-		) );
-
-		// display option to reset rating
-		$edited_Comment->rating_none_input( array(
-			'before' => '<p>',
-			'after' => '</p>',
-		) );
-
- 		$Form->end_fieldset();
-	}
-	else
-	{
-		$Form->hidden( 'comment_rating', 0 );
-	}
-
-		/*
-		$Form->begin_fieldset( T_('Properties') );
-			echo '<p>';
-			$Form->checkbox_basic_input( 'comment_featured', $edited_Comment->featured, T_('Featured') );
-			echo '</p>';
-		$Form->end_fieldset();
-		*/
-
-		$Form->begin_fieldset( T_('Visibility'), array( 'id' => 'commentform_visibility' ) );
-
-		$sharing_options[] = array( 'published', T_('Published (Public)') );
-		$sharing_options[] = array( 'draft', T_('Draft (Not published!)') );
-		$sharing_options[] = array( 'deprecated', T_('Deprecated (Not published!)') );
-		$Form->radio( 'comment_status', $edited_Comment->status, $sharing_options, '', true );
-
-		$Form->end_fieldset();
-
-		$Form->begin_fieldset( T_('Links') );
-			echo '<p>';
-			$Form->checkbox_basic_input( 'comment_nofollow', $edited_Comment->nofollow, T_('Nofollow website URL') );
-			// TODO: apply to all links  -- note: see basic antispam plugin that does this for x hours
-			echo '</p>';
-		$Form->end_fieldset();
-
-		$Form->begin_fieldset( T_('Feedback info') );
-	?>
-
-	<p><strong><?php echo T_('Type') ?>:</strong> <?php echo $edited_Comment->type; ?></p>
-	<p><strong><?php echo T_('IP address') ?>:</strong> <?php
-		// Display IP address and allow plugins to filter it, e.g. the DNSBL plugin will add a link to check the IP:
-		echo $Plugins->get_trigger_event( 'FilterIpAddress', array('format'=>'htmlbody', 'data'=>$edited_Comment->author_IP), 'data' ); ?></p>
-	<p><strong><?php echo T_('Spam Karma') ?>:</strong> <?php $edited_Comment->spam_karma(); ?></p>
-
-	<?php
-		$Form->end_fieldset();
-	?>
+if( $Blog->get_setting( 'allow_rating' ) != 'never' || ! empty( $edited_Comment->rating ) )
+{
+	// Rating is editable
+	$Form->begin_fieldset( T_('Rating') );
+
+	// display options to rate a comment
+	$edited_Comment->rating_input( array(
+		'before' => '<p>',
+		'after' => '</p>',
+	) );
+
+	// display option to reset rating
+	$edited_Comment->rating_none_input( array(
+		'before' => '<p>',
+		'after' => '</p>',
+	) );
+
+	$Form->end_fieldset();
+}
+else
+{
+	$Form->hidden( 'comment_rating', 0 );
+}
+
+/*
+$Form->begin_fieldset( T_('Properties') );
+echo '<p>';
+$Form->checkbox_basic_input( 'comment_featured', $edited_Comment->featured, T_('Featured') );
+echo '</p>';
+$Form->end_fieldset();
+*/
+
+$Form->begin_fieldset( T_('Visibility'), array( 'id' => 'commentform_visibility' ) );
+$sharing_options[] = array( 'published', T_('Published (Public)') );
+$sharing_options[] = array( 'draft', T_('Draft (Not published!)') );
+$sharing_options[] = array( 'deprecated', T_('Deprecated (Not published!)') );
+$Form->radio( 'comment_status', $edited_Comment->status, $sharing_options, '', true );
+$Form->end_fieldset();
+
+$Form->begin_fieldset( T_('Links') );
+echo '<p>';
+$Form->checkbox_basic_input( 'comment_nofollow', $edited_Comment->nofollow, T_('Nofollow website URL') );
+echo '</p>';
+$Form->end_fieldset();
+$Form->begin_fieldset( T_('Feedback info') );
+?>
+
+<p><strong><?php echo T_('Type') ?>:</strong> <?php echo $edited_Comment->type; ?></p>
+<p><strong><?php echo T_('IP address') ?>:</strong> <?php
+// Display IP address and allow plugins to filter it, e.g. the DNSBL plugin will add a link to check the IP
+echo $Plugins->get_trigger_event( 'FilterIpAddress', array('format' => 'htmlbody', 'data' => $edited_Comment->author_IP), 'data' ); ?></p>
+<p><strong><?php echo T_('Spam Karma') ?>:</strong> <?php $edited_Comment->spam_karma(); ?></p>
+
+<?php
+$Form->end_fieldset();
+?>
 </div>
 
 <div class="clear"></div>

=== modified file 'qp_inc/items/views/_item_expert.form.php'
--- qp_inc/items/views/_item_expert.form.php	2011-09-01 16:29:34 +0000
+++ qp_inc/items/views/_item_expert.form.php	2013-03-11 07:27:21 +0000
@@ -1,75 +1,66 @@
 <?php
 /**
- * This file implements the Post form.
- *
- * This file is part of the Quam Plures project - {@link http://quamplures.net/}.
- * See also {@link https://launchpad.net/quam-plures}.
- *
- * @copyright (c) 2009 - 2011 by the Quam Plures developers - {@link http://quamplures.net/}
- * @copyright (c)2003-2009 by Francois PLANQUE - {@link http://fplanque.net/}.
- *
- * @license http://quamplures.net/license.html GNU General Public License (GPL)
- *
- * {@internal Below is a list of authors who have contributed to design/coding of this file: }}
- * @author fplanque: Francois PLANQUE
- * @author fsaya: Fabrice SAYA-GASNIER / PROGIDISTRI
- * @author blueyed: Daniel HAHLER
+ * This file implements the Post form
+ *
+ * @author {@link http://wonderwinds.com/ Ed Bennett}
+ * @author {@link http://daniel.hahler.de/ Daniel HAHLER}
+ * @author {@link http://progidistri.com/ PROGIDISTRI}
+ * @author {@link http://fplanque.net/ Francois PLANQUE}
  * @author gorgeb: Bertrand GORGE / EPISTEMA
- *
- * @todo blueyed>> IMHO it's not good to use CSS class .line here (mainly white-space:nowrap),
- *                 because on a smaller screen you'll cut things off! (and not every browser
- *                 allows "marking and moving" of text then).
- *
+ * @copyright (c) 2009 by {@link http://quamplures.net/ the Quam Plures project}
+ * @license http://www.gnu.org/licenses/gpl.txt GNU General Public License v3
  * @package items
  */
-if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
+if(!defined('QP_MAIN_INIT')) die('fail');
 
-/**
- * @var User
- */
+global $admin_url;
+global $app_allow_dbase_reset;
+global $basepath;
+global $Blog;
+global $bozo_start_modified;
+global $creating;
 global $current_User;
-/**
- * @var Item
- */
 global $edited_Item;
-/**
- * @var Blog
- */
-global $Blog;
-/**
- * @var Plugins
- */
+global $install_subdir;
+global $item_content;
+global $item_tags;
+global $item_title;
+global $mode;
+global $pagenow;
 global $Plugins;
-/**
- * @var GeneralSettings
- */
+global $post_comment_status;
+global $redirect_to;
 global $Settings;
-
-global $pagenow;
-global $mode;
-global $admin_url;
-global $post_comment_status;
 global $trackback_url;
-global $item_tags;
-global $bozo_start_modified;
-global $creating;
-global $item_title;
-global $item_content;
-global $redirect_to;
+
+// security notice on dashboard
+if( is_file( $basepath.$install_subdir.'index.php' ) )
+{
+	echo '<div class="action_messages"><div class="log_error">'.T_('Your /qp_install/index.php file is still there.  That\'s not good. You need to delete that file OR delete the entire /qp_install/ folder!').'</div></div>';
+	if( $app_allow_dbase_reset )
+	{
+		echo '<div class="action_messages"><div class="log_error">'.T_('Additionally, your /qp_config/_main_config.php file allows your database to be reset ($app_allow_dbase_reset is set to \'1\').');
+		echo '<ul><li><strong>'.T_('You will not be able to use use this program until you').'</strong>';
+		echo '<ul><li>'.T_('delete the file "/qp_install/index.php" OR delete the folder "/qp_install/"').'</li>';
+		echo '<li>'.T_('OR change $app_allow_dbase_reset to 0 in your /qp_config/_main_config.php file.').'</li></ul>';
+		echo '</ul></div></div>';
+		die();
+	}
+}
 
 // Determine if we are creating or updating...
 $creating = is_create_action( $action );
 
-// ================================ START OF EDIT FORM ================================
+// ====== START OF EDIT FORM ======
 $Form = new Form( NULL, 'item_checkchanges', 'post' );
 $Form->labelstart = '<strong>';
 $Form->labelend = "</strong>\n";
 
 $params = array();
 
-if( !empty( $bozo_start_modified ) )
+if( ! empty( $bozo_start_modified ) )
 {
-	$params['bozo_start_modified'] = true;
+	$params['bozo_start_modified'] = false;
 }
 
 $Form->begin_form( '', '', $params );
@@ -90,33 +81,32 @@
 	'Form' => & $Form, 'Item' => & $edited_Item,
 ) );
 
-// ############################ POST CONTENTS #############################
-
-$Form->begin_fieldset( get_manual_link( 'post-contents' ).T_('Post contents') );
+// ====== POST CONTENTS ======
+$Form->begin_fieldset( T_('Post contents') );
 
 echo '<table cellspacing="0" class="compose_layout"><tr>';
 
 // Title input:
-$require_title = $Blog->get_setting('require_title');
+$require_title = $Blog->get_setting( 'require_title' );
 if( $require_title != 'none' )
 {
 	echo '<td width="1%"><strong>'.T_('Title').':</strong></td>';
 	echo '<td width="97%" class="input">';
 	$Form->switch_layout( 'none' );
-	$Form->text_input( 'post_title', $item_title, 20, '', '', array('maxlength'=>255, 'style'=>'width: 100%;', 'required' => $Blog->get_setting('require_title') == 'required') );
+	$Form->text_input( 'post_title', $item_title, 20, '', '', array( 'maxlength' => 255, 'style' => 'width: 100%;', 'required' => $Blog->get_setting( 'require_title' ) == 'required' ) );
 	echo '</td>';
 }
 
 // -- Language chooser
 $locale_options = locale_options( $edited_Item->get( 'locale' ), false, true );
-if ( is_array( $locale_options ) )
-{	// We've only one enabled locale.
+if( is_array( $locale_options ) )
+{ // We've only one enabled locale.
 	// Tblue> The locale name is not really needed here, but maybe we
 	//        want to display the name of the only locale?
 	$Form->hidden( 'post_locale', $locale_options[0] );
 }
 else
-{	// More than one locale => select field.
+{ // More than one locale => select field.
 	echo '<td width="1%">';
 	if( $require_title != 'none' )
 	{
@@ -129,6 +119,18 @@
 }
 echo '</tr></table>';
 
+// -- item url & type selector fields
+echo '<table cellspacing="0" class="compose_layout" style="width:100%"><tr>';
+echo '<td width="1%"><strong>'.T_('Link to url').':</strong></td>';
+echo '<td class="input">';
+$Form->text_input( 'post_url', $edited_Item->get( 'url' ), 20, '', '', array('maxlength' => 255, 'style' => 'width: 100%;') );
+echo '</td>';
+echo '<td width="1%">&nbsp;&nbsp;<strong>'.T_('Type').':</strong></td>';
+echo '<td width="1%" class="select">';
+$ItemTypeCache = & get_Cache( 'ItemTypeCache' );
+$Form->select_object( 'item_typ_ID', $edited_Item->ptyp_ID, $ItemTypeCache, '', '', false, '', 'get_option_list_unreserved_only' );
+echo '</td></tr></table>'."\n";
+
 $Form->switch_layout( NULL );
 ?>
 
@@ -137,14 +139,15 @@
 // spark the plugin manager
 $Plugins->trigger_event( 'AdminDisplayToolbarAbove', array(
 	'target_type' => 'Item',
+	'template_type' => $Blog->template_type,
 ) );
 ?>
 </div>
 
-<?php // ---------------------------- TEXTAREA -------------------------------------
+<?php // ====== TEXTAREA ======
 $Form->fieldstart = '<div class="edit_area">';
 $Form->fieldend = "</div>\n";
-$Form->textarea_input( 'content', $item_content, 16, '', array( 'cols' => 40 , 'id' => 'itemform_post_content' ) );
+$Form->textarea_input( 'content', $item_content, 16, '', array( 'cols' => 40, 'id' => 'itemform_post_content' ) );
 $Form->switch_layout( 'linespan' );
 ?>
 <script type="text/javascript">
@@ -159,12 +162,13 @@
 // spark the plugin manager
 $Plugins->trigger_event( 'AdminDisplayToolbarBelow', array(
 	'target_type' => 'Item',
+	'template_type' => $Blog->template_type,
 ) );
 ?>
 </div>
 
 <?php
-// ------------------------------- ACTIONS ----------------------------------
+// ====== ACTIONS ======
 echo '<div class="edit_actions">';
 
 // spark the plugin manager
@@ -181,7 +185,7 @@
 	if( $current_User->check_perm( 'files', 'view' ) )
 	{
 		$fm_url_params = 'mode=upload';
-		if( !empty($edited_Item->ID) )
+		if( ! empty( $edited_Item->ID ) )
 		{
 			$fm_url_params .= '&amp;fm_mode=link_item&amp;item_ID='.$edited_Item->ID;
 		}
@@ -191,21 +195,21 @@
 	}
 }
 
-// ---------- PREVIEW ----------
+// ====== PREVIEW ======
 $url = url_same_protocol( $Blog->get( 'url' ) ); // was dynurl
 $Form->button( array( 'button', '', T_('Preview'), 'PreviewButton', 'b2edit_open_preview(this.form, \''.$url.'\');' ) );
 
-// ---------- SAVE ----------
-$next_action = ($creating ? 'create' : 'update');
+// ====== SAVE ======
+$next_action = ( $creating ? 'create' : 'update' );
 $Form->submit( array( 'actionArray['.$next_action.']', /* TRANS: This is the value of an input submit button */ T_('Save'), 'SaveButton' ) );
 $Form->submit( array( 'actionArray['.$next_action.'_edit]', /* TRANS: This is the value of an input submit button */ T_('Save & edit'), 'SaveEditButton' ) );
 
-// ----- PUBLISH NOW --------
+// ====== PUBLISH NOW ======
 $publishnow_displayed = false;
 if( $edited_Item->status == 'draft'
-	&& $current_User->check_perm( 'blog_post!published', 'edit', false, $Blog->ID )	// TODO: if we actually set the primary cat to another blog, we may still get an ugly perm die
+	&& $current_User->check_perm( 'blog_post!published', 'edit', false, $Blog->ID )
 	&& $current_User->check_perm( 'edit_timestamp', 'edit', false ) )
-{	// Only allow publishing if in draft mode. Other modes are too special to run the risk of 1 click publication.
+{ // Only allow publishing if in draft mode. Other modes are too special to run the risk of 1 click publication.
 	$Form->submit( array(
 		'actionArray['.$next_action.'_publish]',
 		/* TRANS: This is the value of an input submit button */ T_('Publish NOW !'),
@@ -225,71 +229,47 @@
 	'Item' => & $edited_Item,
 ) );
 
-// ####################### ATTACHMENTS/LINKS #########################
+// ====== ATTACHMENTS/LINKS ======
 attachment_iframe( $Form, $creating, $edited_Item, $Blog );
 
-// ############################ ADVANCED #############################
+// ====== ADVANCED ======
 $Form->switch_layout( 'linespan' );
 
-$Form->begin_fieldset( get_manual_link( 'advanced-properties' ).T_('Advanced properties'), array( 'id' => 'itemform_adv_props' ) );
-
-// -- item url & type selector fields
-
-echo '<table cellspacing="0" class="compose_layout" style="width:100%">';
-echo '<tr><td class="label"><strong>'.T_('Type').'</strong></td>';
-echo '<td style="padding:0 1em; text-align:center;">:</td><td width="1%" class="select">';
-$ItemTypeCache = & get_Cache( 'ItemTypeCache' );
-$Form->select_object( 'item_typ_ID', $edited_Item->ptyp_ID, $ItemTypeCache, '', '', false, '', 'get_option_list_unreserved_only' );
-echo '</td>';
-echo '</tr>'."\n";
-
-/* old code
-echo '<tr><td class="label"><label for="item_tags"><strong>'.T_('Tags').'</strong> <span class="notes">'.T_('sep by ,').'</span></label></td>';
-echo '<td style="padding:0 1em; text-align:center;">:</td><td class="input" >';
-$Form->text_input( 'item_tags', $item_tags, 40, '', '', array('maxlength'=>255, 'style'=>'width: 100%;') );
-echo '</td><td width="1"><!-- for IE7 --></td></tr>';
-//*/
-
-echo '<tr><td class="label" style="vertical-align:top"><label for="post_excerpt"><strong>'.T_('Excerpt').'</strong>
-<span class="notes">'.T_('(for XML feeds)').'</span></label></td>';
-echo '<td style="padding:0 1em; text-align:center;vertical-align:top">:</td><td class="input" ><textarea name="post_excerpt" rows="2" cols="25" style="width:100%" id="post_excerpt">';
-$edited_Item->disp( 'excerpt', 'formvalue' );
-echo '</textarea></td><td width="1"><!-- for IE7 --></td></tr>';
-
-echo '<tr><td class="label"><strong>'.T_('Link to url').'</strong></td>';
-echo '<td style="padding:0 1em; text-align:center;">:</td><td class="input" >';
-$Form->text_input( 'post_url', $edited_Item->get( 'url' ), 20, '', '', array('maxlength'=>255, 'style'=>'width: 100%;') );
-echo '</td></tr>'."\n";
-
-
+$Form->begin_fieldset( T_('Advanced properties'), array( 'id' => 'itemform_adv_props' ) );
+
+echo '<table cellspacing="0" class="compose_layout">';
 echo '<tr><td class="label"><label for="post_urltitle" title="'.T_('&quot;slug&quot; to be used in permalinks').'"><strong>'.T_('URL title "slug"').'</strong></label></td>';
 echo '<td style="padding:0 1em; text-align:center;">:</td><td class="input" >';
-$Form->text_input( 'post_urltitle', $edited_Item->get('urltitle'), 40, '', '', array('maxlength'=>210, 'style'=>'width: 100%;') );
+$Form->text_input( 'post_urltitle', $edited_Item->get( 'urltitle' ), 40, '', '', array('maxlength' => 210, 'style' => 'width: 100%;') );
 echo '</td><td width="1"><!-- for IE7 --></td></tr>';
 
 echo '<tr><td class="label"><label for="titletag"><strong>'.T_('&lt;title&gt; tag').'</strong></label></td>';
 echo '<td style="padding:0 1em; text-align:center;">:</td><td class="input" >';
-$Form->text_input( 'titletag', $edited_Item->get('titletag'), 40, '', '', array('maxlength'=>255, 'style'=>'width: 100%;') );
+$Form->text_input( 'titletag', $edited_Item->get( 'titletag' ), 40, '', '', array('maxlength' => 255, 'style' => 'width: 100%;') );
 echo '</td><td width="1"><!-- for IE7 --></td></tr>';
 
 echo '<tr><td class="label"><label for="metadesc" title="&lt;meta name=&quot;description&quot;&gt;"><strong>'.T_('&lt;meta&gt; desc').'</strong></label></td>';
 echo '<td style="padding:0 1em; text-align:center;">:</td><td class="input" >';
-$Form->text_input( 'metadesc', $edited_Item->get('metadesc'), 40, '', '', array('maxlength'=>255, 'style'=>'width: 100%;') );
+$Form->text_input( 'metadesc', $edited_Item->get( 'metadesc' ), 40, '', '', array('maxlength' => 255, 'style' => 'width: 100%;') );
 echo '</td><td width="1"><!-- for IE7 --></td></tr>';
 
 echo '<tr><td class="label"><label for="metakeywords" title="&lt;meta name=&quot;keywords&quot;&gt;"><strong>'.T_('&lt;meta&gt; keywords').'</strong></label></td>';
 echo '<td style="padding:0 1em; text-align:center;">:</td><td class="input" >';
-$Form->text_input( 'metakeywords', $edited_Item->get('metakeywords'), 40, '', '', array('maxlength'=>255, 'style'=>'width: 100%;') );
+$Form->text_input( 'metakeywords', $edited_Item->get( 'metakeywords' ), 40, '', '', array('maxlength' => 255, 'style' => 'width: 100%;') );
 echo '</td><td width="1"><!-- for IE7 --></td></tr>';
 
+echo '<tr><td class="label" style="vertical-align:top"><label for="post_excerpt"><strong>'.T_('Excerpt').'</strong><span class="notes">'.T_('(for XML feeds)').'</span></label></td>';
+echo '<td style="padding:0 1em; text-align:center;vertical-align:top">:</td><td class="input" ><textarea name="post_excerpt" rows="2" cols="25" style="width:100%" id="post_excerpt">';
+$edited_Item->disp( 'excerpt', 'formvalue' );
+echo '</textarea></td><td width="1"><!-- for IE7 --></td></tr>';
 echo '</table>';
 
 $Form->end_fieldset();
 
-// ############################ WORKFLOW #############################
+// ====== WORKFLOW ======
 if( $Blog->get_setting( 'use_workflow' ) )
-{	// We want to use workflow properties for this blog:
-	$Form->begin_fieldset( get_manual_link( 'workflow-properties' ).T_('Workflow properties'), array( 'id' => 'itemform_workflow_props' ) );
+{ // We want to use workflow properties for this blog:
+	$Form->begin_fieldset( T_('Workflow properties'), array( 'id' => 'itemform_workflow_props' ) );
 	echo '<div id="itemform_edit_timestamp" class="edit_fieldgroup">';
 	$Form->select_object( 'item_priority', NULL, $edited_Item, T_('Priority'), '', true, '', 'priority_options' );
 	echo ' '; // allow wrapping!
@@ -298,16 +278,16 @@
 	$ItemStatusCache = & get_Cache( 'ItemStatusCache' );
 	$Form->select_options( 'item_st_ID', $ItemStatusCache->get_option_list( $edited_Item->pst_ID, true ), T_('Task status') );
 	echo ' '; // allow wrapping!
-	$Form->date( 'item_deadline', $edited_Item->get('datedeadline'), T_('Deadline') );
+	$Form->date( 'item_deadline', $edited_Item->get( 'datedeadline' ), T_('Deadline') );
 	echo '</div>';
 	$Form->end_fieldset();
 }
 
-// ####################### ADDITIONAL ACTIONS #########################
-if( isset( $Blog ) && $Blog->get('allowtrackbacks') )
+// ====== ADDITIONAL ACTIONS ======
+if( isset( $Blog ) && $Blog->get( 'allowtrackbacks' ) )
 {
-	$Form->begin_fieldset( get_manual_link( 'additional-actions' ).T_('Additional actions'), array( 'id' => 'itemform_additional_actions' ) );
-	// --------------------------- TRACKBACK --------------------------------------
+	$Form->begin_fieldset( T_('Additional actions'), array( 'id' => 'itemform_additional_actions' ) );
+	// ====== TRACKBACK ======
 	?>
 	<div id="itemform_trackbacks">
 	<label for="trackback_url"><strong><?php echo T_('Trackback URLs') ?>:</strong>
@@ -335,24 +315,29 @@
 // spark the plugin manager
 $Plugins->trigger_event( 'AdminDisplayToolbarSidebar', array(
 	'target_type' => 'Item',
+	'template_type' => $Blog->template_type,
 ) );
 ?>
 </div>
 
 <?php
-// ################### CATEGORIES ###################
+// ====== CATEGORIES ======
 cat_select( $Form );
 
 $Form->switch_layout( 'linespan' );
-
-// ################### TAGS ##################
+// ====== TAGS ======
 $Form->begin_fieldset( T_('Tags'), array( 'id' => 'itemform_tags' ) );
-$Form->textarea_input( 'item_tags', $item_tags, 4, '', array( 'note' => T_('separated by' ).' <strong>,</strong>', 'cols' => 10, 'style'=>'width: 90%;margin:0 auto;display:block;') );
-$Form->end_fieldset();
-
-// ################### PROPERTIES ###################
-$Form->begin_fieldset( T_('Properties'), array( 'id' => 'itemform_extra' ) );
-$Form->checkbox_basic_input( 'item_featured', $edited_Item->featured, '<strong>'.T_('Featured post').'</strong>' );
+$Form->textarea_input( 'item_tags', $item_tags, 4, '', array( 'note' => T_('separated by' ).' <strong>,</strong>', 'cols' => 10, 'style' => 'width: 98%;margin:0 auto;display:block;') );
+$Form->end_fieldset();
+
+// ====== VISIBILITY / SHARING ======
+$Form->begin_fieldset( T_('Visibility / Sharing'), array( 'id' => 'itemform_visibility' ) );
+visibility_select( $Form, $edited_Item->status );
+$Form->end_fieldset();
+
+// ====== ISSUE DATE ======
+$Form->switch_layout( 'linespan' );
+$Form->begin_fieldset( T_('Item issue date'), array( 'id' => 'itemform_iss_date' ) );
 if( $current_User->check_perm( 'edit_timestamp' ) )
 { // ------------------------------------ TIME STAMP -------------------------------------
 	echo '<div id="itemform_edit_timestamp" class="edit_fieldgroup">';
@@ -360,29 +345,27 @@
 	echo '</div>';
 }
 
-echo '<table>';
-echo '<tr><td><strong>'.T_('Order').':</strong></td><td>';
-$Form->text( 'item_order', $edited_Item->order, 10, '', T_('can be decimal') );
-echo '</td></tr>';
-echo '</table>';
-
-$Form->end_fieldset();
-
-// ################### VISIBILITY / SHARING ###################
-$Form->begin_fieldset( T_('Visibility / Sharing'), array( 'id' => 'itemform_visibility' ) );
-visibility_select( $Form, $edited_Item->status );
-$Form->end_fieldset();
-
-// ################### TEXT RENDERERS ###################
-$Form->begin_fieldset( get_manual_link( 'text-renderers' ).T_('Text Renderers'), array( 'id' => 'itemform_renderers' ) );
+/**
+ * commented out because I don't like this "order" thing
+ * echo '<table>';
+ * echo '<tr><td><strong>'.T_('Order').':</strong></td><td>';
+ * $Form->text( 'item_order', $edited_Item->order, 10, '', T_('can be decimal') );
+ * echo '</td></tr>';
+ * echo '</table>';
+ */
+
+$Form->end_fieldset();
+
+// ====== TEXT RENDERERS ======
+$Form->begin_fieldset( T_('Text Renderers'), array( 'id' => 'itemform_renderers' ) );
 // fp> TODO: there should be no param call here (shld be in controller)
 $edited_Item->renderer_checkboxes( param('renderers', 'array', NULL) );
 $Form->end_fieldset();
 
-// ################### COMMENT STATUS ###################
+// ====== COMMENT STATUS ======
 if( $Blog->allowcomments == 'post_by_post' )
 {
-	$Form->begin_fieldset( get_manual_link( 'comments' ).T_('Comments'), array( 'id' => 'itemform_comments' ) );
+	$Form->begin_fieldset( T_('Comments'), array( 'id' => 'itemform_comments' ) );
 	?>
 	<label title="<?php echo T_('Visitors can leave comments on this post.') ?>"><input type="radio" name="post_comment_status" value="open" class="checkbox" <?php if( $post_comment_status == 'open' ) echo 'checked="checked"'; ?> />
 	<?php echo T_('Open') ?></label><br />
@@ -398,11 +381,11 @@
 <div class="clear"></div>
 
 <?php
-// ================================== END OF EDIT FORM ==================================
+// ====== END OF EDIT FORM ======
 $Form->end_form();
 
 if( $publishnow_displayed )
-{	// fp> TODO: ideally this should not be hacked in *here*
+{ // fp> TODO: ideally this should not be hacked in *here*
 	echo_publishnowbutton_js( $next_action );
 }
 ?>
@@ -453,7 +436,7 @@
 	$closed_panels = array(
 		'itemform_createlinks',
 		'itemform_adv_props',
-		'itemform_extra',
+		'itemform_iss_date',
 		'itemform_renderers',
 		'itemform_comments',
 	);

=== removed file 'qp_inc/license.txt'
--- qp_inc/license.txt	2006-03-12 22:08:51 +0000
+++ qp_inc/license.txt	1970-01-01 00:00:00 +0000
@@ -1,293 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
---------------------------------------------------------------------------
-
- * In addition, as a special exception, the copyright holders give permission to link
- * the code of this program with the PHP/SWF Charts library by maani.us (or with
- * modified versions of this library that use the same license as PHP/SWF Charts library
- * by maani.us), and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than the
- * PHP/SWF Charts library by maani.us. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so. If you do
- * not wish to do so, delete this exception statement from your version.
-
---------------------------------------------------------------------------
-
-		     END OF TERMS AND CONDITIONS
-

=== modified file 'qp_inc/plugins/_plugin.class.php'
--- qp_inc/plugins/_plugin.class.php	2013-03-05 23:34:17 +0000
+++ qp_inc/plugins/_plugin.class.php	2013-03-11 07:27:21 +0000
@@ -4,11 +4,11 @@
  *
  * Real plugins should be derived from this class.
  *
- * @todo (1111): var $code needs to be checked for duplicity upon installation and a note thrown
+ * @todo (1111) var $code needs to be checked for duplicity upon installation and a note thrown
  * to the installing user indicating a potential conflict ... if it isn't already checked ;)
- * @todo (1111): var $group needs to be an enum with "other" as the default. There is no need
+ * @todo (1111) var $group needs to be an enum with "other" as the default. There is no need
  * for a plugin author to jack up the plugins display page with their own group name!
- * @todo (1111): var $priority needs to not apply to "install widget". Actually, it needs to not
+ * @todo (1111) var $priority needs to not apply to "install widget". Actually, it needs to not
  * apply to everything except rendering ... and it needs a rename to $render_priority
  * @author {@link http://wonderwinds.com/ Ed Bennett}
  * @author {@link http://daniel.hahler.de/ Daniel HAHLER}
@@ -435,7 +435,10 @@
 	 *   'my_param' => array(
 	 *     'label' => $this->T_('My Param'),
 	 *     'defaultvalue' => '10',
-	 *     'valid_pattern' => array( 'pattern' => '[1-9]\d+', $this->T_('The value must be >= 10.') ),
+	 *     'valid_pattern' => array(
+	 *       'pattern' => '[1-9]\d+',
+	 *       $this->T_('The value must be >= 10.')
+	 *     ),
 	 *     'note' => $this->T_('Quite cool, eh?'),
 	 *   ),
 	 *   'another_param' => array( // this one has no 'note'
@@ -2579,7 +2582,7 @@
 	 * {@link $srvc_url_sensitive} (if {@link $ReqHost} is on https). NOTE: AJAX callbacks are
 	 * required to be on the same domain/protocol, so if you're using absolute blog URLs on
 	 * different domains you must set {@link $srvc_url} dynamically, to use the same domain!
-	 * @todo (0000): dh> we might want to provide whitelisting of methods through {@link
+	 * @todo (0000) dh> we might want to provide whitelisting of methods through {@link
 	 * $Session} here and check for it in the srvc handler.
 	 * @param string Method to call. This must be listed in {@link GetSrvcMethods()}.
 	 * @param array Array of optional parameters passed to the method.

=== modified file 'qp_inc/plugins/_plugin.funcs.php'
--- qp_inc/plugins/_plugin.funcs.php	2013-02-28 16:40:18 +0000
+++ qp_inc/plugins/_plugin.funcs.php	2013-03-11 07:27:21 +0000
@@ -163,7 +163,7 @@
 		switch( $set_type )
 		{
 			case 'CollSettings':
-			$set_value = $Obj->get_blog_setting( $parname, $set_target );
+			$set_value = $Obj->get_coll_setting( $parname, $set_target );
 			$error_value = NULL;
 			break;
 

=== modified file 'qp_inc/plugins/model/_plugins.class.php'
--- qp_inc/plugins/model/_plugins.class.php	2013-02-21 11:49:06 +0000
+++ qp_inc/plugins/model/_plugins.class.php	2013-03-11 07:27:21 +0000
@@ -1,207 +1,146 @@
 <?php
 /**
- * This file implements the PluginS class.
+ * This file implements the Plugins base class
  *
  * This is where you can plug in some {@link Plugin plugins} :D
  *
- * This file is part of Quam Plures - {@link http://quamplures.net/}
- * See also {@link https://launchpad.net/quam-plures}.
- *
- * @copyright (c) 2009 - 2011 by the Quam Plures developers - {@link http://quamplures.net/}
- * @copyright (c)2003-2009 by Francois PLANQUE - {@link http://fplanque.net/}
- * Parts of this file are copyright (c)2004-2006 by Daniel HAHLER - {@link http://thequod.de/contact}.
- *
- * {@internal License choice
- * - If you have received this file as part of a package, please find the license.txt file in
- *   the same folder or the closest folder above for complete license terms.
- * - If you have received this file individually (e-g: from http://evocms.cvs.sourceforge.net/)
- *   then you must choose one of the following licenses before using the file:
- *   - GNU General Public License 2 (GPL) - http://www.opensource.org/licenses/gpl-license.php
- *   - Mozilla Public License 1.1 (MPL) - http://www.opensource.org/licenses/mozilla1.1.php
- * }}
- *
- * {@internal Open Source relicensing agreement:
- * Daniel HAHLER grants Francois PLANQUE the right to license
- * Daniel HAHLER's contributions to this file and the b2evolution project
- * under any OSI approved OSS license (http://www.opensource.org/licenses/).
- * }}
- *
- * {@internal Below is a list of authors who have contributed to design/coding of this file: }}
- * @author fplanque: Francois PLANQUE - {@link http://fplanque.net/}
- * @author blueyed: Daniel HAHLER
- *
+ * @todo (1111) vars here are missing a title - they only have an at-var tag :(
+ * @author {@link http://wonderwinds.com/ Ed Bennett}
+ * @author {@link http://daniel.hahler.de/ Daniel HAHLER}
+ * @author {@link http://fplanque.net/ Francois PLANQUE}
+ * @copyright (c) 2009 by {@link http://quamplures.net/ the Quam Plures project}
+ * @license http://www.gnu.org/licenses/gpl.txt GNU General Public License v3
  * @package plugins
  */
-if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
-
-load_class('plugins/_plugin.class.php');
-
+if(!defined('QP_MAIN_INIT')) die('fail');
 
 /**
- * Plugins Class
- *
- * This is where you can plug in some {@link Plugin plugins} :D
- *
- * @todo dh> Currently when a plugin goes into "broken" status (e.g. file not readable), it is "disabled" afterwards.
- *       This should rather remember the old status (e.g. "enabled") and make it enabled again.
- *
+ * Plugins base class
  * @package plugins
  */
 class Plugins
 {
-	/**#@+
-	 * @access private
-	 */
-
 	/**
-	 * @var array of plugin_code => Plugin
+	 * FIX THIS
+	 * @var array Array of plugin_code => Plugin
 	 */
 	var $index_code_Plugins = array();
-
 	/**
-	 * @var array of plugin_ID => Plugin
+	 * FIX THIS
+	 * @var array Array of plugin_ID => Plugin
 	 */
 	var $index_ID_Plugins = array();
-
 	/**
+	 * FIX THIS
 	 * @see Plugins::load_events()
-	 * @var array of event => plug_ID. IDs are sorted by priority.
+	 * @var array Array of event => plug_ID, IDs are sorted by priority
 	 */
 	var $index_event_IDs = array();
-
 	/**
-	 * @var array of plug_ID => DB row from T_plugins. Used to lazy-instantiate Plugins.
+	 * FIX THIS
+	 * @var array Array of plug_ID => DB row from T_plugins, used to lazy-instantiate Plugins
 	 */
 	var $index_ID_rows = array();
-
 	/**
-	 * @var array of plug_code => plug_ID. Used to lazy-instantiate by code.
+	 * FIX THIS
+	 * @var array Array of plug_code => plug_ID, used to lazy-instantiate by code
 	 */
 	var $index_code_ID = array();
-
 	/**
-	 * Cache Plugin codes by apply_rendering setting.
-	 * @var array of apply_rendering => plug_code
+	 * Cache Plugin codes by apply_rendering setting
+	 * @var array Array of apply_rendering => plug_code
 	 */
 	var $index_apply_rendering_codes = array();
-
 	/**
-	 * Path to plugins.
-	 *
-	 * The preferred method is to have a sub-directory for each plugin (named
-	 * after the plugin's classname), but they can be supplied just in this
-	 * directory.
+	 * Path to plugins
+	 * @var string The preferred method is to have a sub-directory for each plugin (named
+	 * after the plugin's classname), but they can be supplied just in this directory.
 	 */
 	var $plugins_path;
-
 	/**
-	 * Have we loaded the plugins table (T_plugins)?
-	 * @var boolean
+	 * FIX THIS
+	 * @var boolean Have we loaded the plugins table (T_plugins)?
 	 */
 	var $loaded_plugins_table = false;
-
 	/**
-	 * Current object index in {@link $sorted_IDs} array.
-	 * @var integer
+	 * FIX THIS
+	 * @var integer Current object index in {@link $sorted_IDs} array
 	 */
 	var $current_idx = -1;
-
 	/**
-	 * List of IDs, sorted. This gets used to lazy-instantiate a Plugin.
-	 *
-	 * @var array
+	 * FIX THIS
+	 * @var array List of IDs, sorted, used to lazy-instantiate a Plugin
 	 */
 	var $sorted_IDs = array();
-
 	/**
-	 * The smallest internal/auto-generated Plugin ID.
-	 * @var integer
+	 * FIX THIS
+	 * @var integer The smallest internal/auto-generated Plugin ID
 	 */
 	var $smallest_internal_ID = 0;
-
-	/**#@-*/
-
-
-	/**#@+
-	 * @access protected
-	 */
-
-	/**
-	 * SQL to use in {@link load_plugins_table()}. Gets overwritten for {@link Plugins_admin}.
-	 * @var string
-	 * @static
-	 */
-	var $sql_load_plugins_table = '
-			SELECT plug_ID, plug_priority, plug_classname, plug_code, plug_name, plug_shortdesc, plug_apply_rendering, plug_status, plug_version, plug_spam_weight
-			  FROM T_plugins
-			 WHERE plug_status = \'enabled\'
-			 ORDER BY plug_priority, plug_classname';
-
-	/**#@-*/
-
-
-	/**
+	/**
+	 * FIX THIS
+	 * @var string SQL to use in {@link load_plugins_table()}, gets overwritten for {@link Plugins_admin}
+	 */
+	var $sql_load_plugins_table = 'SELECT plug_ID, plug_priority, plug_classname, plug_code, plug_name, plug_shortdesc, plug_apply_rendering, plug_status, plug_version, plug_spam_weight
+		FROM T_plugins WHERE plug_status = \'enabled\' ORDER BY plug_priority, plug_classname';
+	/**
+	 * Plugin Errors
+	 *
 	 * Errors associated to plugins (during loading), indexed by plugin_ID and
 	 * error class ("register").
-	 *
-	 * @var array
+	 * @var array Errors associated to plugins (during loading), indexed by plugin_ID and error class ("register")
 	 */
 	var $plugin_errors = array();
 
-
 	/**
-	 * Constructor. Sets {@link $plugins_path} and load events.
+	 * Constructor
+	 *
+	 * Sets {@link $plugins_path} and load events.
 	 */
 	function Plugins()
 	{
-		global $basepath, $plugins_subdir, $Timer;
+		global $basepath;
+		global $plugins_subdir;
+		global $Timer;
 
 		// Set plugin path:
 		$this->plugins_path = $basepath.$plugins_subdir;
-
 		$Timer->resume( 'plugin_init' );
 
 		// Load events for enabled plugins:
 		$this->load_events();
-
 		$Timer->pause( 'plugin_init' );
 	}
 
 
 	/**
-	 * Get a list of available Plugin groups.
-	 *
+	 * Get a list of available Plugin groups
 	 * @return array
 	 */
 	function get_plugin_groups()
 	{
 		$result = array();
-
 		foreach( $this->sorted_IDs as $plugin_ID )
 		{
 			$Plugin = & $this->get_by_ID( $plugin_ID );
-
-			if( empty($Plugin->group) || in_array( $Plugin->group, $result ) )
+			if( empty( $Plugin->group ) || in_array( $Plugin->group, $result ) )
 			{
 				continue;
 			}
-
 			$result[] = $Plugin->group;
 		}
-
 		return $result;
 	}
 
 
 	/**
+	 * Get Plugins in group
 	 * Will return an array that contents are references to plugins that have the same group.
-	 *
 	 * @return array
 	 */
 	function get_Plugins_in_group( $group )
 	{
 		$result = array();
-
 		foreach( $this->sorted_IDs as $plugin_ID )
 		{
 			$Plugin = & $this->get_by_ID( $plugin_ID );
@@ -210,39 +149,35 @@
 				$result[] = & $Plugin;
 			}
 		}
-
 		return $result;
 	}
 
 
 	/**
-	 * Sets the status of a Plugin in DB and registers it into the internal indices when "enabled".
-	 * Otherwise it gets unregistered, but only when we're not in {@link Plugins_admin}, because we
-	 * want to keep it in then in our indices.
-	 *
-	 * {@internal
-	 * Note: this should probably always get called on the {@link $Plugins} object,
-	 *       not {@link $admin_Plugins}.
-	 * }}
-	 *
+	 * Get Plugin status
+	 *
+	 * Sets the status of a Plugin in DB and registers it into the internal indices
+	 * when "enabled". Otherwise it gets unregistered, but only when we're not in
+	 * {@link Plugins_admin}, because we want to keep it in then in our indices. Note:
+	 * this should probably always get called on the {@link $Plugins} object, not
+	 * {@link $admin_Plugins}.
 	 * @param Plugin
 	 * @param string New status ("enabled", "disabled", "needs_config", "broken")
 	 * @return boolean True on success, false on failure.
 	 */
 	function set_Plugin_status( & $Plugin, $status )
 	{
-		global $DB, $Debuglog;
+		global $DB;
 
 		if( $Plugin->status == $status
-			&& $DB->query( "SELECT plug_status FROM T_plugins WHERE plug_ID = ".$DB->quote($Plugin->ID), 'set_Plugin_status safety net' ) == $status )
+			&& $DB->query( "SELECT plug_status FROM T_plugins WHERE plug_ID = ".$DB->quote( $Plugin->ID ), 'set_Plugin_status safety net' ) == $status )
 		{
 			return true;
 		}
-
 		$DB->query( "UPDATE T_plugins SET plug_status = '".$status."' WHERE plug_ID = '".$Plugin->ID."'" );
-
 		if( $status == 'enabled' )
-		{ // Reload plugins tables, which includes the plugin in further requests
+		{
+			// Reload plugins tables, which includes the plugin in further requests
 			$this->loaded_plugins_table = false;
 			$this->load_plugins_table();
 			$this->load_events();
@@ -251,77 +186,62 @@
 		{
 			// Notify the plugin that it has been disabled:
 			$Plugin->BeforeDisable();
-
 			$this->unregister( $Plugin );
 		}
-
 		$Plugin->status = $status;
-
-		$Debuglog->add( 'Set status for plugin #'.$Plugin->ID.' to "'.$status.'"!', 'plugins' );
-
 		return true;
 	}
 
 
 	/**
-	 * Register a plugin.
-	 *
-	 * This handles the indexes, dynamically unregisters a Plugin that does not exist (anymore)
-	 * and instantiates the Plugin's (User)Settings.
-	 * 
-	 * Attention: The code of the plugin is set to NULL if it is found to be not unique!
-	 *            To get the original code, use the $orig_code parameter.
-	 *
-	 * @access protected
+	 * Register a plugin
+	 *
+	 * This handles the indexes, dynamically unregisters a Plugin that does not exist
+	 * (anymore) and instantiates the Plugin's (User)Settings. Attention: The code of
+	 * the plugin is set to NULL if it is found to be not unique! To get the original
+	 * code, use the $orig_code parameter.
 	 * @param string name of plugin class to instantiate and register
 	 * @param int ID in database (0 if not installed)
 	 * @param int Priority in database (-1 to keep default)
 	 * @param array When should rendering apply? (NULL to keep default)
 	 * @param string Path of the .php class file of the plugin.
-	 * @param boolean Must the plugin exist (classfile_path and classname)?
-	 *                This is used internally to be able to unregister a non-existing plugin.
-	 * @param NULL|string If a reference to a variable is given here, it will receive
-	 *                    the code of the plugin we are registering, even if the code
-	 *                    is found to be not unique.
+	 * @param boolean Must the plugin exist (classfile_path and classname)? This is used internally
+	 * to be able to unregister a non-existing plugin.
+	 * @param NULL|string If a reference to a variable is given here, it will receive the code
+	 * of the plugin we are registering, even if the code is found to be not unique.
 	 * @return Plugin Plugin ref to newly created plugin; string in case of error
 	 */
 	function & register( $classname, $ID = 0, $priority = -1, $apply_rendering = NULL,
-	                     $classfile_path = NULL, $must_exists = true, & $orig_code = NULL )
+		$classfile_path = NULL, $must_exists = true, & $orig_code = NULL )
 	{
-		global $Debuglog, $Messages, $Timer;
+		global $Messages;
+		global $Timer;
 
-		if( $ID && isset($this->index_ID_Plugins[$ID]) )
+		if( $ID && isset( $this->index_ID_Plugins[$ID] ) )
 		{
 			debug_die( 'Tried to register already registered Plugin (ID '.$ID.')' ); // should never happen!
 		}
-
 		$Timer->resume( 'plugins_register' );
-
-		if( empty($classfile_path) )
+		if( empty( $classfile_path ) )
 		{
 			$plugin_filename = '_'.str_replace( '_plugin', '.plugin', $classname ).'.php';
 			// Try <plug_classname>/<plug_classname>.php (subfolder) first
 			$classfile_path = $this->plugins_path.$classname.'/'.$plugin_filename;
-			/**
-			 * @todo EdB: next two lines makes folders be plugin_feature intead of feature_plugin
-			 * $plugin_foldername = 'plugin_'.str_replace( '_plugin', '', $classname );
-			 * $classfile_path = $this->plugins_path.$plugin_foldername.'/'.$plugin_filename;
-			 */
-
+			# NOTE: next two lines makes folders be plugin_feature intead of feature_plugin
+			# $plugin_foldername = 'plugin_'.str_replace( '_plugin', '', $classname );
+			# $classfile_path = $this->plugins_path.$plugin_foldername.'/'.$plugin_filename;
 			if( ! is_readable( $classfile_path ) )
-			{ // Look directly in $plugins_path
+			{
+				// Look directly in $plugins_path
 				$classfile_path = $this->plugins_path.$plugin_filename;
 			}
 		}
-
-		$Debuglog->add( 'register(): '.$classname.', ID: '.$ID.', priority: '.$priority.', classfile_path: ['.$classfile_path.']', 'plugins' );
-
 		if( ! is_readable( $classfile_path ) )
-		{ // Plugin file not found!
+		{
+			// Plugin file not found!
 			if( $must_exists )
 			{
-				$r = 'Plugin class file ['.rel_path_to_base($classfile_path).'] is not readable!';
-				$Debuglog->add( $r, array( 'plugins', 'error' ) );
+				$r = 'Plugin class file ['.rel_path_to_base( $classfile_path ).'] is not readable!';
 
 				// Get the Plugin object (must not exist)
 				$Plugin = & $this->register( $classname, $ID, $priority, $apply_rendering, $classfile_path, false );
@@ -331,7 +251,7 @@
 				// unregister:
 				if( $this->unregister( $Plugin ) )
 				{
-					$Debuglog->add( 'Unregistered plugin ['.$classname.']!', array( 'plugins', 'error' ) );
+					// debuglog-add removed
 				}
 				else
 				{
@@ -339,33 +259,29 @@
 					$Timer->pause( 'plugins_register' );
 					return $Plugin;
 				}
-
 				$Timer->pause( 'plugins_register' );
 				return $r;
 			}
 		}
-		elseif( ! class_exists($classname) ) // If there are several copies of one plugin for example..
+		elseif( ! class_exists( $classname ) ) // If there are several copies of one plugin for example..
 		{
-			$Debuglog->add( 'Loading plugin class file: '.$classname, 'plugins' );
 			require_once $classfile_path;
 		}
 
 		if( ! class_exists( $classname ) )
-		{ // the given class does not exist
+		{
+			// the given class does not exist
 			if( $must_exists )
 			{
-				$r = sprintf( 'Plugin class for &laquo;%s&raquo; in file &laquo;%s&raquo; not defined.', $classname, rel_path_to_base($classfile_path) );
-				$Debuglog->add( $r, array( 'plugins', 'error' ) );
-
-				// Get the Plugin object (must not exist)    fp> why is this recursive?
+				$r = sprintf( 'Plugin class for &laquo;%s&raquo; in file &laquo;%s&raquo; not defined.', $classname, rel_path_to_base( $classfile_path ) );
+				// Get the Plugin object (must not exist) fp> why is this recursive?
 				$Plugin = & $this->register( $classname, $ID, $priority, $apply_rendering, $classfile_path, false );
 				$this->plugin_errors[$ID]['register'] = $r;
 				$this->set_Plugin_status( $Plugin, 'broken' );
-
 				// unregister:
 				if( $this->unregister( $Plugin ) )
 				{
-					$Debuglog->add( 'Unregistered plugin ['.$classname.']!', array( 'plugins', 'error' ) );
+					// debuglog-add removed
 				}
 				else
 				{
@@ -373,24 +289,21 @@
 					$Timer->pause( 'plugins_register' );
 					return $Plugin;
 				}
-
 				$Timer->pause( 'plugins_register' );
 				return $r;
 			}
 			else
 			{
-				$Plugin = new Plugin;	// COPY !
+				$Plugin = new Plugin; // COPY !
 				$Plugin->code = NULL;
 				$Plugin->apply_rendering = 'never';
 			}
 		}
 		else
 		{
-			$Plugin = new $classname;	// COPY !
+			$Plugin = new $classname; // COPY !
 		}
-
 		$Plugin->classfile_path = $classfile_path;
-
 		// Tell him his ID :)
 		if( $ID == 0 )
 		{
@@ -399,9 +312,9 @@
 		else
 		{
 			$Plugin->ID = $ID;
-
 			if( $ID > 0 )
-			{ // Properties from T_plugins
+			{
+				// Properties from T_plugins
 				// Code
 				$Plugin->code = $this->index_ID_rows[$Plugin->ID]['plug_code'];
 				// Status
@@ -413,30 +326,33 @@
 		// Tell him his priority:
 		if( $priority > -1 ) { $Plugin->priority = $priority; }
 
-		if( isset($apply_rendering) )
+		if( isset( $apply_rendering ) )
 		{
 			$Plugin->apply_rendering = $apply_rendering;
 		}
 
-		if( empty($Plugin->name) )
+		if( empty( $Plugin->name ) )
 		{
 			$Plugin->name = $Plugin->classname;
 		}
 
 		$orig_code = $Plugin->code;
-		if( ! empty($this->index_code_ID[ $Plugin->code ]) && $this->index_code_ID[ $Plugin->code ] != $Plugin->ID )
-		{ // The plugin's default code is already in use!
+		if( ! empty( $this->index_code_ID[$Plugin->code] ) && $this->index_code_ID[$Plugin->code] != $Plugin->ID )
+		{
+			// The plugin's default code is already in use!
 			$Plugin->code = NULL;
 		}
 		else
 		{
-			$this->index_code_Plugins[ $Plugin->code ] = & $Plugin;
-			$this->index_code_ID[ $Plugin->code ] = & $Plugin->ID;
+			$this->index_code_Plugins[$Plugin->code] = & $Plugin;
+			$this->index_code_ID[$Plugin->code] = & $Plugin->ID;
 		}
-		$this->index_ID_Plugins[ $Plugin->ID ] = & $Plugin;
+		$this->index_ID_Plugins[$Plugin->ID] = & $Plugin;
 
-		if( ! in_array( $Plugin->ID, $this->sorted_IDs ) ) // TODO: check if this extra check is required..
-		{ // not in our sort index yet
+		// @todo (0000) check if this extra check is required...
+		if( ! in_array( $Plugin->ID, $this->sorted_IDs ) )
+		{
+			// not in our sort index yet
 			$this->sorted_IDs[] = & $Plugin->ID;
 		}
 
@@ -449,56 +365,56 @@
 			$tmp_params = array( 'db_row' => $this->index_ID_rows[$Plugin->ID], 'is_installed' => true );
 			if( $Plugin->PluginInit( $tmp_params ) === false && $this->unregister( $Plugin ) )
 			{
-				$Debuglog->add( 'Unregistered plugin, because PluginInit returned false.', 'plugins' );
 				$Plugin = '';
 			}
 			// Version check:
 			elseif( $Plugin->version != $this->index_ID_rows[$Plugin->ID]['plug_version'] && $must_exists )
-			{ // Version has changed since installation or last update
+			{
+				// Version has changed since installation or last update
 				$db_deltas = array();
 
 				// Tell the Plugin that we've detected a version change:
-				$tmp_params = array( 'old_version'=>$this->index_ID_rows[$Plugin->ID]['plug_version'], 'db_row'=>$this->index_ID_rows[$Plugin->ID] );
+				$tmp_params = array( 'old_version' => $this->index_ID_rows[$Plugin->ID]['plug_version'], 'db_row' => $this->index_ID_rows[$Plugin->ID] );
 
 				if( $this->call_method( $Plugin->ID, 'PluginVersionChanged', $tmp_params ) === false )
 				{
-					$Debuglog->add( 'Set plugin status to "needs_config", because PluginVersionChanged returned false.', 'plugins' );
 					$this->set_Plugin_status( $Plugin, 'needs_config' );
 					if( $this->unregister( $Plugin ) )
-					{ // only unregister the Plugin, if it's not the admin list's class:
+					{
+						// only unregister the Plugin, if it's not the admin list's class:
 						$Plugin = '';
 					}
 				}
 				else
 				{
 					// Check if there are DB deltas required (also when downgrading!), without excluding any query type:
-					load_funcs('_core/model/db/_upgrade.funcs.php');
+					load_funcs( '_core/model/db/_upgrade.funcs.php' );
 					$db_deltas = db_delta( $Plugin->GetDbLayout() );
 
-					if( empty($db_deltas) )
-					{ // No DB changes needed, update (bump or decrease) the version
+					if( empty( $db_deltas ) )
+					{
 						global $DB;
+
+						// No DB changes needed, update (bump or decrease) the version
 						$Plugins_admin = & get_Cache('Plugins_admin');
 
 						// Update version in DB:
-						$DB->query( '
-								UPDATE T_plugins
-								   SET plug_version = '.$DB->quote($Plugin->version).'
-								 WHERE plug_ID = '.$Plugin->ID );
+						$DB->query( 'UPDATE T_plugins
+							SET plug_version = '.$DB->quote( $Plugin->version ).'
+							WHERE plug_ID = '.$Plugin->ID );
 
 						// Update "plug_version" in indexes:
 						$this->index_ID_rows[$Plugin->ID]['plug_version'] = $Plugin->version;
-						if( isset($Plugins_admin->index_ID_rows[$Plugin->ID]) )
+						if( isset( $Plugins_admin->index_ID_rows[$Plugin->ID] ) )
 						{
 							$Plugins_admin->index_ID_rows[$Plugin->ID]['plug_version'] = $Plugin->version;
 						}
 
 						// Remove any prerenderered content for the Plugins renderer code:
-						if( ! empty($Plugin->code) )
+						if( ! empty( $Plugin->code ) )
 						{
-							$DB->query( '
-									DELETE FROM T_items__prerendering
-									 WHERE itpr_renderers REGEXP "^(.*\.)?'.$DB->escape($Plugin->code).'(\..*)?$"' );
+							$DB->query( 'DELETE FROM T_items__prerendering
+								WHERE itpr_renderers REGEXP "^(.*\.)?'.$DB->escape( $Plugin->code ).'(\..*)?$"' );
 						}
 
 						// Detect new events (and delete obsolete ones - in case of downgrade):
@@ -506,26 +422,22 @@
 						{
 							$this->load_events(); // re-load for the current request
 						}
-
-						$Debuglog->add( 'Version for '.$Plugin->classname.' changed from '.$this->index_ID_rows[$Plugin->ID]['plug_version'].' to '.$Plugin->version, 'plugins' );
 					}
 					else
-					{ // If there are DB schema changes needed, set the Plugin status to "needs_config"
-
-						// TODO: automatic upgrade in some cases (e.g. according to query types)?
-
+					{
+						// If there are DB schema changes needed, set the Plugin status to "needs_config"
 						$this->set_Plugin_status( $Plugin, 'needs_config' );
-						$Debuglog->add( 'Set plugin status to "needs_config", because version DB schema needs upgrade.', 'plugins' );
 
 						if( $this->unregister( $Plugin ) )
-						{ // only unregister the Plugin, if it's not the admin list's class:
+						{
+							// only unregister the Plugin, if it's not the admin list's class:
 							$Plugin = '';
 						}
 					}
 				}
 			}
 
-			if( $Plugin && isset($this->index_ID_rows[$Plugin->ID]) ) // may have been unregistered above
+			if( $Plugin && isset( $this->index_ID_rows[$Plugin->ID] ) ) // may have been unregistered above
 			{
 				if( $this->index_ID_rows[$Plugin->ID]['plug_name'] !== NULL )
 				{
@@ -538,13 +450,12 @@
 			}
 		}
 		else
-		{ // This gets called for non-installed Plugins:
+		{
+			// This gets called for non-installed Plugins:
 			// We're not instantiating UserSettings/Settings, since that needs a DB backend.
-
 			$tmp_params = array( 'db_row' => array(), 'is_installed' => false );
 			if( $Plugin->PluginInit( $tmp_params ) === false && $this->unregister( $Plugin ) )
 			{
-				$Debuglog->add( 'Unregistered plugin, because PluginInit returned false.', 'plugins' );
 				$Plugin = '';
 			}
 		}
@@ -556,22 +467,19 @@
 
 
 	/**
-	 * Un-register a plugin.
+	 * Un-register a plugin
 	 *
 	 * This does not un-install it from DB, just from the internal indexes.
-	 *
 	 * @param Plugin
 	 * @param boolean Force unregistering (ignored here, but used in Plugins_admin)
 	 * @return boolean True, if unregistered
 	 */
 	function unregister( & $Plugin, $force = false )
 	{
-		global $Debuglog;
-
 		$this->forget_events( $Plugin->ID );
 
 		// Unset apply-rendering index:
-		if( isset( $this->index_apply_rendering_codes[ $Plugin->apply_rendering ] ) )
+		if( isset( $this->index_apply_rendering_codes[$Plugin->apply_rendering] ) )
 		{
 			while( ( $key = array_search( $Plugin->code, $this->index_apply_rendering_codes[$Plugin->apply_rendering] ) ) !== false )
 			{
@@ -579,25 +487,27 @@
 			}
 		}
 
-		unset( $this->index_code_Plugins[ $Plugin->code ] );
-		unset( $this->index_ID_Plugins[ $Plugin->ID ] );
+		unset( $this->index_code_Plugins[$Plugin->code] );
+		unset( $this->index_ID_Plugins[$Plugin->ID] );
 
-		if( isset($this->index_ID_rows[ $Plugin->ID ]) )
-		{ // It has an associated DB row (load_plugins_table() was called)
-			unset($this->index_ID_rows[ $Plugin->ID ]);
+		if( isset( $this->index_ID_rows[$Plugin->ID] ) )
+		{
+			// It has an associated DB row (load_plugins_table() was called)
+			unset( $this->index_ID_rows[$Plugin->ID] );
 		}
 
 		$sort_key = array_search( $Plugin->ID, $this->sorted_IDs );
 		if( $sort_key === false )
-		{ // this may happen if a Plugin has unregistered itself
-			$Debuglog->add( 'Tried to unregister not-installed plugin (not in $sorted_IDs)!', 'plugins' );
+		{
+			// this may happen if a Plugin has unregistered itself
 			return false;
 		}
 		unset( $this->sorted_IDs[$sort_key] );
 		$this->sorted_IDs = array_values( $this->sorted_IDs );
 
 		if( $this->current_idx >= $sort_key )
-		{ // We have removed a file before or at the $sort_key'th position
+		{
+			// We have removed a file before or at the $sort_key'th position
 			$this->current_idx--;
 		}
 
@@ -606,20 +516,19 @@
 
 
 	/**
-	 * Forget the events a Plugin has registered.
+	 * Forget the events a Plugin has registered
 	 *
 	 * This gets used when {@link unregister() unregistering} a Plugin or if
 	 * {@link Plugin::PluginInit()} returned false, which means
 	 * "do not use it for subsequent events in the request".
-	 *
 	 * @param integer Plugin ID
 	 */
 	function forget_events( $plugin_ID )
 	{
 		// Forget events:
-		foreach( array_keys($this->index_event_IDs) as $l_event )
+		foreach( array_keys( $this->index_event_IDs ) as $l_event )
 		{
-			while( ($key = array_search( $plugin_ID, $this->index_event_IDs[$l_event] )) !== false )
+			while( ( $key = array_search( $plugin_ID, $this->index_event_IDs[$l_event] ) ) !== false )
 			{
 				unset( $this->index_event_IDs[$l_event][$key] );
 			}
@@ -628,49 +537,29 @@
 
 
 	/**
-	 * Init {@link Plugin::$Settings} and {@link Plugin::$UserSettings}, either by
-	 * unsetting them for PHP5's overloading or instantiating them for PHP4.
-	 *
-	 * This only gets used for installed plugins, but we're initing it for PHP 5.1,
-	 * to trigger a helpful error, when e.g. Plugin::Settings gets accessed in PluginInit().
-	 *
+	 * Init {@link Plugin::$Settings} and {@link Plugin::$UserSettings}
 	 * @param Plugin
 	 */
 	function init_settings( & $Plugin )
 	{
-		if( version_compare( PHP_VERSION, '5.1', '>=' ) )
-		{ // we use overloading for PHP5, therefor the member has to be unset:
-			// Note: this is somehow buggy at least in PHP 5.0.5, therefor we use it from 5.1 on.
-			//       see http://forums.b2evolution.net/viewtopic.php?p=49031#49031
-			unset( $Plugin->Settings );
-			unset( $Plugin->UserSettings );
-
-			// Nothing to do here, will get called through Plugin::__get() when accessed
-			return;
-		}
-
-		// PHP < 5.1: instantiate now, but only for installed plugins (needs DB).
-		if( $Plugin->ID > 0 )
-		{
-			$this->instantiate_Settings( $Plugin, 'Settings' );
-			$this->instantiate_Settings( $Plugin, 'UserSettings' );
-		}
+		unset( $Plugin->Settings );
+		unset( $Plugin->UserSettings );
+		return;
 	}
 
 
 	/**
-	 * Instantiate Settings object (class {@link PluginSettings}) for the given plugin.
+	 * Instantiate Settings object (class {@link PluginSettings}) for the given plugin
 	 *
 	 * The plugin must provide setting definitions (through {@link Plugin::GetDefaultSettings()}
 	 * OR {@link Plugin::GetDefaultUserSettings()}).
-	 *
 	 * @param Plugin
 	 * @param string settings type: "Settings" or "UserSettings"
 	 * @return boolean NULL, if no Settings
 	 */
 	function instantiate_Settings( & $Plugin, $set_type )
 	{
-		global $Debuglog, $Timer;
+		global $Timer;
 
 		$Timer->resume( 'plugins_inst_'.$set_type );
 
@@ -679,35 +568,34 @@
 		// This may happen, if Plugin(User)Settings get accessed in PluginInit (which is allowed
 		// when is_installed=true).
 		$method = 'GetDefault'.$set_type;
-		$params = array('for_editing'=>false);
+		$params = array( 'for_editing' => false );
 		$Timer->resume( $Plugin->classname.'_(#'.$Plugin->ID.')' );
 		$defaults = $Plugin->$method( $params );
 		$Timer->pause( $Plugin->classname.'_(#'.$Plugin->ID.')' );
 
-		if( empty($defaults) )
-		{	// No settings, no need to instantiate.
+		if( empty( $defaults ) )
+		{
+			// No settings, no need to instantiate.
 			$Timer->pause( 'plugins_inst_'.$set_type );
 			return NULL;
 		}
 
-		if( ! is_array($defaults) )
-		{	// invalid data
-			$Debuglog->add( $Plugin->classname.'::GetDefault'.$set_type.'() did not return array!', array('plugins', 'error') );
+		if( ! is_array( $defaults ) )
+		{
+			// invalid data
 			return NULL; // fp> correct me if I'm wrong.
 		}
 
 		if( $set_type == 'UserSettings' )
-		{	// User specific settings:
-			load_class('plugins/model/_pluginusersettings.class.php');
-
+		{
+			// User specific settings
 			$Plugin->UserSettings = new PluginUserSettings( $Plugin->ID );
 
 			$set_Obj = & $Plugin->UserSettings;
 		}
 		else
-		{	// Global settings:
-			load_class('plugins/model/_pluginsettings.class.php');
-
+		{
+			// Global settings
 			$Plugin->Settings = new PluginSettings( $Plugin->ID );
 
 			$set_Obj = & $Plugin->Settings;
@@ -716,13 +604,14 @@
 		// Register default values:
 		foreach( $defaults as $l_name => $l_meta )
 		{
-			if( isset($l_meta['layout']) )
-			{ // Skip non-value entries
+			if( isset( $l_meta['layout'] ) )
+			{
+				// Skip non-value entries
 				continue;
 			}
 
 			// Register settings as _defaults into Settings:
-			if( isset($l_meta['defaultvalue']) )
+			if( isset( $l_meta['defaultvalue'] ) )
 			{
 				$set_Obj->_defaults[$l_name] = $l_meta['defaultvalue'];
 			}
@@ -743,7 +632,7 @@
 
 
 	/**
-	 * Load plugins table and rewind iterator used by {@link get_next()}.
+	 * Load plugins table and rewind iterator used by {@link get_next()}
 	 */
 	function restart()
 	{
@@ -754,36 +643,30 @@
 
 
 	/**
-	 * Get next plugin in the list.
+	 * Get next plugin in the list
 	 *
 	 * NOTE: You'll have to call {@link restart()} or {@link load_plugins_table()}
 	 * before using it.
-	 *
 	 * @return Plugin (false if no more plugin).
 	 */
 	function & get_next()
 	{
-		global $Debuglog;
-
 		++$this->current_idx;
 
-		$Debuglog->add( 'get_next() ('.$this->current_idx.')..', 'plugins' );
-
-		if( isset($this->sorted_IDs[$this->current_idx]) )
+		if( isset( $this->sorted_IDs[$this->current_idx] ) )
 		{
 			$Plugin = & $this->get_by_ID( $this->sorted_IDs[$this->current_idx] );
 
 			if( ! $Plugin )
-			{ // recurse until we've been through whole $sorted_IDs!
+			{
+				// recurse until we've been through whole $sorted_IDs!
 				return $this->get_next();
 			}
 
-			$Debuglog->add( 'return: '.$Plugin->classname.' ('.$Plugin->ID.')', 'plugins' );
 			return $Plugin;
 		}
 		else
 		{
-			$Debuglog->add( 'return: false', 'plugins' );
 			--$this->current_idx;
 			$r = false;
 			return $r;
@@ -801,32 +684,26 @@
 
 
 	/**
-	 * Call all plugins for a given event.
-	 *
+	 * Call all plugins for a given event
 	 * @param string event name, see {@link Plugins_admin::get_supported_events()}
 	 * @param array Associative array of parameters for the Plugin
 	 * @return boolean True, if at least one plugin has been called.
 	 */
 	function trigger_event( $event, $params = array() )
 	{
-		global $Debuglog;
-
-		$Debuglog->add( 'Trigger event '.$event, 'plugins' );
-
-		if( empty($this->index_event_IDs[$event]) )
-		{ // No events registered
-			$Debuglog->add( 'No registered plugins.', 'plugins' );
+		if( empty( $this->index_event_IDs[$event] ) )
+		{
+			// No events registered
 			return false;
 		}
 
-		$Debuglog->add( 'Registered plugin IDs: '.implode( ', ', $this->index_event_IDs[$event]), 'plugins' );
-
 		foreach( $this->index_event_IDs[$event] as $l_plugin_ID )
 		{
 			$this->call_method( $l_plugin_ID, $event, $params );
 
-			if( ! empty($this->_stop_propagation) )
-			{	// A plugin has requested to stop propagation.
+			if( ! empty( $this->_stop_propagation ) )
+			{
+				// A plugin has requested to stop propagation.
 				$this->_stop_propagation = false;
 				break;
 			}
@@ -836,32 +713,25 @@
 
 
 	/**
-	 * Call all plugins for a given event, until the first one returns true.
-	 *
+	 * Call all plugins for a given event, until the first one returns true
 	 * @param string event name, see {@link Plugins_admin::get_supported_events()}
 	 * @param array Associative array of parameters for the Plugin
 	 * @return array The (modified) params array with key "plugin_ID" set to the last called plugin;
-	 *               Empty array if no Plugin returned true or no Plugin has this event registered.
+	 * Empty array if no Plugin returned true or no Plugin has this event registered.
 	 */
 	function trigger_event_first_true( $event, $params = NULL )
 	{
-		global $Debuglog;
-
-		$Debuglog->add( 'Trigger event '.$event.' (first true)', 'plugins' );
-