diff --git a/CONTRIBUTORS b/CONTRIBUTORS
new file mode 100644
index 0000000..159baba
--- /dev/null
+++ b/CONTRIBUTORS
@@ -0,0 +1 @@
+Nicolas Lassale
\ No newline at end of file
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..fcdce90
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,461 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+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 and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, 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 library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete 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 distribute a copy of this License along with the
+Library.
+
+  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 Library or any portion
+of it, thus forming a work based on the Library, 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) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+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 Library, 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 Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you 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.
+
+  If distribution of 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 satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be 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.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library 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.
+
+  9. 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 Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+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 with
+this License.
+
+  11. 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 Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library 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 Library.
+
+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.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library 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.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser 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 Library
+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 Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+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
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "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
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. 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 LIBRARY 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
+LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+
+
diff --git a/apps/todos/README b/apps/todos/README
new file mode 100644
index 0000000..d30b446
--- /dev/null
+++ b/apps/todos/README
@@ -0,0 +1,36 @@
+
+ Plume Framework Test Application
+----------------------------------
+
+This test application is a simple TODO list manager.
+
+This test application is here to expose in a simple way the
+functionalities of the Plume Framework aka "Pluf" and to propose a
+"best practice" example on the way to structure your application using
+Pluf.
+
+ Installation
+--------------
+
+1) In src/Todo/conf/ copy todo.php-dist as todo.php.  
+
+2) Edit src/Todo/conf/toto.php and set your database information
+   together with the 'tmp_folder'.
+
+3) Edit www/index.php and ensure that the variable $path_to_Pluf
+   is pointing to the folder where your Pluf.php file is.
+
+4) Point your web browser to /testapp/index.php?_px_action=/install/ it will
+   create the necessary tables to test the Todo application.
+
+5) Go to /testapp/index.php and enjoy this little todo application.
+
+ Uninstallation
+----------------
+
+1) Point your web browser to /testapp/index.php?_px_action=/uninstall/ 
+
+2) Delete the files in the 'tmp_folder'.
+
+3) Delete the /testapp/conf/testapp.php file.
+
diff --git a/apps/todos/src/Todo/Form/List.php b/apps/todos/src/Todo/Form/List.php
new file mode 100644
index 0000000..5da9724
--- /dev/null
+++ b/apps/todos/src/Todo/Form/List.php
@@ -0,0 +1,39 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2006 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * The form is used to add/edit a list.
+ */
+class Todo_Form_List extends Pluf_Form
+{
+    public function initFields($extra=array())
+    {
+        $this->fields['name'] = new Pluf_Form_Field_Varchar(
+                                      array('required' => true,
+                                            'label' => __('List name'),
+                                            'help_text' => __('For example: "Happy stuff".'),
+                                            ));
+    }
+}
+
+
diff --git a/apps/todos/src/Todo/Item.php b/apps/todos/src/Todo/Item.php
new file mode 100644
index 0000000..9d073a0
--- /dev/null
+++ b/apps/todos/src/Todo/Item.php
@@ -0,0 +1,111 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2006 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * The Todo_Item is refering to the Todo_List through a foreign key.
+ */
+class Todo_Item extends Pluf_Model
+{
+    public $_model = __CLASS__;
+
+    /**
+     * The init method is used to define your model.
+     */
+    function init()
+    {
+        /**
+         * The database table to store the model. 
+         * The table name will be prefixed with the prefix define
+         * in the global configuration.
+         */
+        $this->_a['table'] = 'todo_items';
+
+        /**
+         * The name of the model in the class definition.
+         */
+        $this->_a['model'] = 'Todo_Item';
+
+        /**
+         * The definition of the model. Each key of the associative array
+         * corresponds to a "column" and the definition of the column is
+         * given in the corresponding array.
+         */
+        $this->_a['cols'] = array(
+                             // It is mandatory to have an "id" column.
+                            'id' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Sequence',
+                                  //It is automatically added.
+                                  'blank' => true, 
+                                  ),
+                            'item' => 
+                            array(
+                                  'type' => 'Pluf_DB_Field_Varchar',
+                                  'blank' => false,
+                                  'size' => 250,
+                                  // The verbose name is all lower case
+                                  'verbose' => __('todo item'),
+                                   ),
+                            'completed' => 
+                            array(
+                                  'type' => 'Pluf_DB_Field_Boolean',
+                                  'default' => false,
+                                  'verbose' => __('completed'),
+                                  ),
+                            'list' => 
+                            array(
+                                  // Here we relate the model to a Todolist
+                                  // model. This is like saying that a Todoitem
+                                  // belongs to a given Todolist
+                                  'type' => 'Pluf_DB_Field_Foreignkey',
+                                  'blank' => false,
+                                  'model' => 'Todo_List',
+                                  'verbose' => __('in list'),
+                                  'help_text' => __('To easily manage your todo items, you are invited to organize your todo items in lists.'),
+                                  ),
+                            );
+        /**
+         * You can define the indexes.
+         * Indexes are you to sort and find elements. Here we define
+         * an index on the completed column to easily select the list
+         * of completed or not completed elements.
+         */
+        $this->_a['idx'] = array(
+                                 'completed_idx' => 
+                                 array('col' => 'completed',
+                                       'type' => 'normal'),
+                                 );
+        $this->_a['views'] = array(
+                                   'todo' => 
+                                   array(
+                                         'where' => 'completed=false',
+                                         ),
+                                   );
+    }
+
+    public function __toString()
+    {
+        return $this->item.(($this->completed) ? ' - Done' : '');
+    }
+}
+
diff --git a/apps/todos/src/Todo/List.php b/apps/todos/src/Todo/List.php
new file mode 100644
index 0000000..7b569ac
--- /dev/null
+++ b/apps/todos/src/Todo/List.php
@@ -0,0 +1,91 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2006 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * The List model. 
+ *
+ * A Todo_List is storing a list of Todo_Item(s)
+ */
+class Todo_List extends Pluf_Model
+{
+    public $_model = __CLASS__;
+
+    /**
+     * The init method is used to define your model.
+     * It is very important to call "parent::init()" at the end.
+     */
+    function init()
+    {
+        /**
+         * The database table to store the model. 
+         * The table name will be prefixed with the prefix define
+         * in the global configuration.
+         */
+        $this->_a['table'] = 'todo_lists';
+
+        /**
+         * The name of the model in the class definition.
+         */
+        $this->_a['model'] = 'Todo_List';
+
+        /**
+         * The definition of the model. Each key of the associative array
+         * corresponds to a "column" and the definition of the column is
+         * given in the corresponding array.
+         */
+        $this->_a['cols'] = array(
+                             // It is mandatory to have an "id" column.
+                            'id' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Sequence',
+                                  //It is automatically added.
+                                  'blank' => true, 
+                                  ),
+                            'name' => 
+                            array(
+                                  'type' => 'Pluf_DB_Field_Varchar',
+                                  'blank' => false,
+                                  'size' => 100,
+                                  // The verbose name is all lower case
+                                  'verbose' => __('name'),
+                                   ),
+                            );
+        /**
+         * You can define the indexes.
+         * Indexes are you to sort and find elements. Here we define
+         * an index on the completed column to easily select the list
+         * of completed or not completed elements.
+         */
+        $this->_a['idx'] = array();
+        $this->_a['views'] = array();
+    }
+
+
+    /**
+     * To nicely render the list in the option boxes.
+     */
+    function __toString()
+    {
+        return $this->name;
+    }
+}
diff --git a/apps/todos/src/Todo/Migrations/Install.php b/apps/todos/src/Todo/Migrations/Install.php
new file mode 100644
index 0000000..d9c6330
--- /dev/null
+++ b/apps/todos/src/Todo/Migrations/Install.php
@@ -0,0 +1,61 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2006 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+function Todo_Migrations_Install_setup($params='')
+{
+    // First we create instances of the two data models in the application.
+    $list = new Todo_List();
+    $item = new Todo_Item();
+    // Get a database connection
+    // As the parameters have been given in a standard way in the 
+    // configuration file we are directly accessing the default db here.
+    $db = Pluf::db();
+    // Then we create a schema builder to generate the needed tables.
+    // The first parameter given to the schema builder is the database
+    // connection. 
+    $schema = new Pluf_DB_Schema($db);
+    // Then for each model, we will create the needed tables.
+    // To be safe you should ensure that the createTables() call returns
+    // true and not an error.
+    $schema->model = $list;
+    $schema->createTables();
+    $schema->model = $item;
+    $schema->createTables();
+}
+
+function Todo_Migrations_Install_teardown($params='')
+{
+    // The uninstallation is the reverse of the installation.
+    // We create the data models the same way, but instead of calling
+    // createTables() we call dropTables()
+    // You can see that without all the comments, you do not have a
+    // lot of lines of code.
+    $list = new Todo_List();
+    $item = new Todo_Item();
+    $db = Pluf::db();
+    $schema = Pluf::factory('Pluf_DB_Schema', $db);
+    $schema->model = $list;
+    $schema->dropTables();
+    $schema->model = $item;
+    $schema->dropTables();
+}
diff --git a/apps/todos/src/Todo/Tests/TestTodo.php b/apps/todos/src/Todo/Tests/TestTodo.php
new file mode 100644
index 0000000..93ba6b5
--- /dev/null
+++ b/apps/todos/src/Todo/Tests/TestTodo.php
@@ -0,0 +1,114 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2006 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+Pluf::loadFunction('Pluf_HTTP_URL_urlForView');
+
+/**
+ * Unit testing of this small application.
+ *
+ * The first series of tests is just to test the creation/deletion of
+ * lists and items.
+ *
+ * The second series of tests is to test the views by doing queries
+ * against them.
+ *
+ * That way you can see the way one can test the "backend" and the
+ * "frontend".
+ */
+class Todo_Tests_TestTodo extends UnitTestCase 
+{
+    public $client = null;
+    public $lists = array();
+
+    public function __construct() 
+    {
+        parent::__construct('Test of the Todo application.');
+    }
+
+    /**
+     * Create a client.
+     */
+    public function setUp()
+    {
+        $this->client = new Pluf_Test_Client(Pluf::f('todo_urls'));
+    }
+
+    /**
+     * Delete the client and lists.
+     *
+     * Delete all the list which may be left. When the lists are
+     * deleted, the items in those list are automatically deleted too.
+     */
+    public function tearDown()
+    {
+        $this->client = null;
+        foreach ($this->lists as $list) {
+            $list->delete();
+        }
+    }
+
+    public function testCreateList()
+    {
+        $list = new Todo_List();
+        $list->name = 'Test list';
+        $this->assertEqual(true, $list->create());
+        $this->lists[] = $list; // to have it deleted in tearDown
+        $id = $list->id;
+        $nlist = new Todo_List($id);
+        $this->assertEqual($nlist->id, $id);
+    }
+
+    public function testCreateItem()
+    {
+        $list = new Todo_List();
+        $list->name = 'Test list';
+        $this->assertEqual(true, $list->create());
+        $this->lists[] = $list; // to have it deleted in tearDown
+        $item = new Todo_Item();
+        $item->list = $list;
+        $item->item = 'Create unit tests';
+        $this->assertEqual(true, $item->create());
+        $nlist = $item->get_list();
+        $this->assertEqual($nlist->id, $list->id);
+        $items = $list->get_todo_item_list();
+        $this->assertEqual(1, $items->count());
+        $item2 = new Todo_Item();
+        $item2->list = $list;
+        $item2->item = 'Create more unit tests';
+        $item2->create();
+        // first list has 2 items.
+        $this->assertEqual(2, $list->get_todo_item_list()->count());
+        $list2 = new Todo_List();
+        $list2->name = 'Test list 2';
+        $this->assertEqual(true, $list2->create());
+        $this->lists[] = $list2; // to have it deleted in tearDown
+        $this->assertEqual(0, $list2->get_todo_item_list()->count());
+        // Move the item in the second list.
+        $item2->list = $list2;
+        $item2->update();
+        // One item in each list.
+        $this->assertEqual(1, $list2->get_todo_item_list()->count());
+        $this->assertEqual(1, $list->get_todo_item_list()->count());
+    }
+
+}
\ No newline at end of file
diff --git a/apps/todos/src/Todo/Views.php b/apps/todos/src/Todo/Views.php
new file mode 100644
index 0000000..296af72
--- /dev/null
+++ b/apps/todos/src/Todo/Views.php
@@ -0,0 +1,379 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2006 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+// We directly load the functions we are often going to use in the
+// views. This makes the code cleaner.
+Pluf::loadFunction('Pluf_HTTP_URL_urlForView');
+Pluf::loadFunction('Pluf_Shortcuts_RenderToResponse');
+Pluf::loadFunction('Pluf_Shortcuts_GetObjectOr404');
+Pluf::loadFunction('Pluf_Shortcuts_GetFormForModel');
+
+/**
+ * The views of the Todo application.
+ *
+ * As the application is rather simple, all the views are within one class
+ * but for a complex application views will be spread over several classes.
+ * In that case the recommended structure is to have your views in:
+ * - YourApp/Views/ViewOne.php
+ * - YourApp/Views/ViewTwo.php
+ *
+ * For example, we could have broken the current views of the Todo app in:
+ * - Todo/Views.php : The install/uninstall/main views
+ * - Todo/Views/Item.php : Views related to the items
+ * - Todo/Views/Cat.php : Views related to the categories
+ *
+ * Of course you are flexible to use the structure you want, but a little
+ * ordering eases the maintenance on the long run.
+ *
+ * Each method is answering a request. The method is called by the 
+ * dispatcher if a dispatcher is used. The content of each method can
+ * also be directly put into a .php file if no dispatcher is used.
+ */
+class Todo_Views
+{
+    /**
+     * Display the main page of the application.
+     *
+     * The main page is only displaying data. So we load the categories
+     * and for each category we display the corresponding items.
+     *
+     * @param Pluf_HTTP_Request Request object
+     * @param array Matches against the regex of the dispatcher
+     * @return Pluf_HTTP_Response or can throw Exception
+     */
+    public function main($request, $match)
+    {
+        // In the main page we want a list of all the Todo lists with
+        // a link to edit each of them, a link to see the content and
+        // a link to create a new list.
+        // Get the complete list of Todo_List object
+        $lists = Pluf::factory('Todo_List')->getList();
+        // Create a context for the template
+        $context = new Pluf_Template_Context(array('page_title' => 'Home',
+                                                   'lists' => $lists)
+                                             );
+        // Load a template
+        $tmpl = new Pluf_Template('todo/index.html');
+        // Render the template and send the response to the user
+        return new Pluf_HTTP_Response($tmpl->render($context));
+    }
+
+
+    /**
+     * Display the viewItem page of the application.
+     *
+     * @param Pluf_HTTP_Request Request object
+     * @param array Matches against the regex of the dispatcher
+     * @return Pluf_HTTP_Response or can throw Exception
+     */
+    public function viewItem($request, $match)
+    {
+        // Basically the same as the viewList view but with a Todo_Item
+        $item_id = $match[1];
+        // We now are loading the corresponding item
+        $item = new Todo_Item($item_id);
+        // And check that the item has been found
+        if ($item->id != $item_id) {
+            return new Pluf_HTTP_Response_NotFound('The item has not been found.');
+        }
+        // Now we get the list in wich the item is
+        $list = $item->get_list();
+        // We have the item and the list, just display them. Instead of
+        // creating a context, then a template and then rendering it
+        // within a response object, we are going to use a shortcut
+        // function. Using shortcuts is better as you end up having a
+        // cleaner code.
+        return Pluf_Shortcuts_RenderToResponse('todo/item/view.html',
+                                               array('page_title' => 'View Item',
+                                                     'list' => $list,
+                                                     'item' => $item));
+    }
+
+    /**
+     * Display the addItem page of the application.
+     *
+     * @param Pluf_HTTP_Request Request object
+     * @param array Matches against the regex of the dispatcher
+     * @return Pluf_HTTP_Response or can throw Exception
+     */
+    public function addItem($request, $match)
+    {
+        // The workflow of the addition of an item is simple
+        // If the request of GET method a form is displayed
+        // If it is a POST method, the form is submitted and the
+        // content is proceeded to create the new item.
+        // We create a Todo_Item item as we are creating one here
+        $item = new Todo_Item();
+        $list = Pluf_Shortcuts_GetObjectOr404('Todo_List', $match[1]);
+        if ($request->method == 'POST') {
+            // We get the data submitted by the user and initialize
+            // the form with.
+            $form = Pluf_Shortcuts_GetFormForModel($item, $request->POST);
+            if ($form->isValid()) {
+                // If no errors, we can save the Todo_Item from the data
+                $item = $form->save();
+                // We redirect the user to the page of the Todo_List in which
+                // we have created the item.
+                // We redirect the user to the page of the Todo_List
+                // in which we have updated the item. We are using a
+                // shortcut to get the URL directly from the view name
+                // of interest. This allows us to not hard code the
+                // path to the view in the view itself.
+                $url = Pluf_HTTP_URL_urlForView('Todo_Views::viewList',
+                                                array($item->list));
+                return new Pluf_HTTP_Response_Redirect($url);
+            }
+        } else {
+            // As we already now the list in which we are going to add
+            // the item, we pass it as initial value. The user can
+            // change it in the select box.
+            $initial = array('list'=>$list->id);
+            $form = Pluf_Shortcuts_GetFormForModel($item, $initial);
+        }
+        // Here we are with a GET request or a POST request with errors
+        // So we create the rendering view of the form
+        // We create a new rendering view
+        return Pluf_Shortcuts_RenderToResponse('todo/item/add.html',
+                                               array('page_title' => 'Create a Todo Item',
+                                                     'list' => $list,
+                                                     'form' => $form));
+    }
+
+    /**
+     * Display the updateItem page of the application.
+     *
+     * @param Pluf_HTTP_Request Request object
+     * @param array Matches against the regex of the dispatcher
+     * @return Pluf_HTTP_Response or can throw Exception
+     */
+    public function updateItem($request, $match)
+    {
+        // Updating an item is somehow like creating an object but you
+        // need first to load it to populate the form The workflow of
+        // the update of an item is simple If the request of GET
+        // method a form is displayed If it is a POST method, the form
+        // is submitted and the content is proceeded to update item.
+        // We create a Todo_Item item as we are updating one here
+
+        // Here we are going to use another shortcut to get the item
+        // or return a 404 error page if failing.
+        $item = Pluf_Shortcuts_GetObjectOr404('Todo_Item', $match[1]);
+        $new_data = $item->getData();
+        if ($request->method == 'POST') {
+            // We get the data submitted by the user
+            $form = Pluf_Shortcuts_GetFormForModel($item, $request->POST);
+            if ($form->isValid()) {
+                // The form is valid, we save it.
+                $item = $form->save();
+                // We redirect the user to the page of the Todo_List
+                // in which we have updated the item. We are using a
+                // shortcut to get the URL directly from the view name
+                // of interest. This allows us to not hard code the
+                // path to the view in the view itself.
+                $url = Pluf_HTTP_URL_urlForView('Todo_Views::viewList',
+                                                array($item->list));
+                return new Pluf_HTTP_Response_Redirect($url);
+            }
+        } else {
+            $form = Pluf_Shortcuts_GetFormForModel($item, $item->getData());
+        }
+        // We proceed the same way by creating a context for a template
+        // and providing the results to the user.
+        return Pluf_Shortcuts_RenderToResponse('todo/item/update.html',
+                                 array('page_title' => 'Update a Todo Item',
+                                       'item' => $item,
+                                       'form' => $form));
+    }
+
+    /**
+     * Display the deleteItem page of the application.
+     *
+     * @param Pluf_HTTP_Request Request object
+     * @param array Matches against the regex of the dispatcher
+     * @return Pluf_HTTP_Response or can throw Exception
+     */
+    public function deleteItem($request, $match)
+    {
+        // A delete of an item is like an update. First you check that
+        // the item is available, then you delete it if the request is
+        // a POST request, else you provide a form to ask confirmation
+        // before deletion.
+        $item = Pluf_Shortcuts_GetObjectOr404('Todo_Item', $match[1]);
+        if ($request->method == 'POST') {
+            // Store the list id.
+            $list_id = $item->list;
+            // We can here directly delete the Todo_Item. Note that if
+            // your object is linking to other objects you need to be
+            // sure that you are taking into consideration the
+            // foreignkey and manytomany relationships.
+            $item->delete();
+            $url = Pluf_HTTP_URL_urlForView('Todo_Views::viewList',
+                                            array($list_id));
+            return new Pluf_HTTP_Response_Redirect($url);
+        }
+        // Here we are with a GET request we show a form with a
+        // confirmation button to delete the item.
+        return Pluf_Shortcuts_RenderToResponse('todo/item/delete.html',
+                                               array('page_title' => 'Delete a Todo Item',
+                                                     'item' => $item));
+    }
+
+    /**
+     * Display the listLists page of the application.
+     *
+     * @param Pluf_HTTP_Request Request object
+     * @param array Matches against the regex of the dispatcher
+     * @return Pluf_HTTP_Response or can throw Exception
+     */
+    public function listLists($request, $match)
+    {
+        // The list of lists is like the home, so we just return
+        // the same content.
+        return $this->main($request, $match);
+    }
+
+    /**
+     * Display the viewList page of the application.
+     *
+     * @param Pluf_HTTP_Request Request object
+     * @param array Matches against the regex of the dispatcher
+     * @return Pluf_HTTP_Response or can throw Exception
+     */
+    public function viewList($request, $match)
+    {
+        // We are showing the content of the list.
+        // That is, all the items in the list.
+        $list = Pluf_Shortcuts_GetObjectOr404('Todo_List', $match[1]);
+        // Now we get the items in the list
+        $items = $list->get_todo_item_list();
+        // We have the items and the list, just display them
+        // Create a context for the template
+        return Pluf_Shortcuts_RenderToResponse('todo/list/view.html',
+                                               array('page_title' => 'View List',
+                                                     'list' => $list,
+                                                     'items' => $items));
+    }
+
+    /**
+     * Display the updateList page of the application.
+     *
+     * @param Pluf_HTTP_Request Request object
+     * @param array Matches against the regex of the dispatcher
+     * @return Pluf_HTTP_Response or can throw Exception
+     */
+    public function updateList($request, $match)
+    {
+        // Take a look at updateItem() to have explanations. Here you
+        // can see that the code is quite compact without comments.
+        $list = Pluf_Shortcuts_GetObjectOr404('Todo_List', $match[1]);
+        if ($request->method == 'POST') {
+            $form = new Todo_Form_List($request->POST);
+            if ($form->isValid()) {
+                $list->setFromFormData($form->cleaned_data);
+                $list->update();
+                $url = Pluf_HTTP_URL_urlForView('Todo_Views::viewList',
+                                                array($list->id));
+                return new Pluf_HTTP_Response_Redirect($url);
+            }
+        } else {
+            $form = new Todo_Form_List($list->getData());
+        }
+        return Pluf_Shortcuts_RenderToResponse('todo/list/update.html',
+                                 array('page_title' => 'Edit a Todo List',
+                                       'list' => $list,
+                                       'form' => $form));
+    }
+
+    /**
+     * Display the deleteList page of the application.
+     *
+     * @param Pluf_HTTP_Request Request object
+     * @param array Matches against the regex of the dispatcher
+     * @return Pluf_HTTP_Response or can throw Exception
+     */
+    public function deleteList($request, $match)
+    {
+        // Here we show how a list can be delete with the associated
+        // Todo_Item.
+        $list = Pluf_Shortcuts_GetObjectOr404('Todo_List', $match[1]);
+        if ($request->method == 'POST') {
+            // We need first to delete all the Todo_Item in the list.
+            $items = $list->get_todo_item_list();
+            foreach ($items as $item) {
+                $item->delete();
+            }
+            // Then we can delete the list
+            $list->delete();
+            // You can also drop directly the list and the todo items
+            // will be automatically dropped at the same time.
+            $url = Pluf_HTTP_URL_urlForView('Todo_Views::main',
+                                            array());
+            return new Pluf_HTTP_Response_Redirect($url);
+        }
+        // Here we are with a GET request we show a form with a
+        // confirmation button to delete the list.
+        // To show the items to be deleted, we get them
+        $items = $list->get_todo_item_list();
+        return Pluf_Shortcuts_RenderToResponse('todo/list/delete.html',
+                                 array('page_title' => 'Delete a Todo List',
+                                       'list' => $list,
+                                       'items' => $items));
+    }
+
+    /**
+     * Display the addList page of the application.
+     *
+     * @param Pluf_HTTP_Request Request object
+     * @param array Matches against the regex of the dispatcher
+     * @return Pluf_HTTP_Response or can throw Exception
+     */
+    public function addList($request, $match)
+    {
+        // The workflow of the addition of an item is simple
+        // If the request of GET method a form is displayed
+        // If it is a POST method, the form is submitted and the
+        // content is proceeded to create the new list.
+        // We create a Todo_List item as we are creating one here
+        $list = new Todo_List();
+        if ($request->method == 'POST') {
+            // We create the form bounded to the data submitted.
+            $form = new Todo_Form_List($request->POST);
+            if ($form->isValid()) {            
+                // If no errors, we can save the Todo_List from the data
+                
+                $list->setFromFormData($form->cleaned_data);
+                $list->create();
+                // We redirect the user to the page of the Todo_List
+                $url = Pluf_HTTP_URL_urlForView('Todo_Views::viewList',
+                                                array($list->id));
+                return new Pluf_HTTP_Response_Redirect($url);
+            }
+        } else {
+            $form = new Todo_Form_List();
+        }
+        return Pluf_Shortcuts_RenderToResponse('todo/list/add.html',
+                                 array('page_title' => 'Add a Todo List',
+                                       'form' => $form));
+    }
+
+}
diff --git a/apps/todos/src/Todo/conf/todo.php b/apps/todos/src/Todo/conf/todo.php
new file mode 100644
index 0000000..0e5f430
--- /dev/null
+++ b/apps/todos/src/Todo/conf/todo.php
@@ -0,0 +1,79 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2006 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+$cfg = array();
+
+// Set the debug variable to true to force the recompilation of all
+// the templates each time during development
+$cfg['debug'] = true;
+
+// If your models are using models from applications outside of the
+// base objects of the framework, you need to list them here. 
+// You need to include the name of the current application.
+$cfg['installed_apps'] = array('Pluf', 'Todo');
+
+// Base URL of the application. Note that it is not something like
+// 'root_base' not to overwrite the base of another application when
+// several application are running on the same host. 
+// No / at the end.
+$cfg['todo_base'] = '/~loa/todo/index';
+
+// View file of the Todo application. They can be hardcoded in the 
+// Dispatcher, but it is often better to have them in a separated file
+// for readability.
+$cfg['todo_urls'] = dirname(__FILE__).'/urls.php';
+
+// Temporary folder where the script is writing the compiled templates,
+// cached data and other temporary resources.
+// It must be writeable by your webserver instance.
+// It is mandatory if you are using the template system.
+$cfg['tmp_folder'] = '/tmp';
+
+// The folder in which the templates of the application are located.
+$cfg['template_folders'] = array(dirname(__FILE__).'/../templates');
+
+// Default mimetype of the document your application is sending.
+// It can be overwritten for a given response if needed.
+$cfg['mimetype'] = 'text/html';
+
+$cfg['template_tags'] = array(
+                              'url' => 'Pluf_Template_Tag_Url',
+                              );
+
+// Default database configuration. The database defined here will be
+// directly accessible from Pluf::db() of course it is still possible
+// to open any other number of database connections through Pluf_DB
+$cfg['db_login'] = '';
+$cfg['db_password'] = '';
+$cfg['db_server'] = '';
+$cfg['db_database'] = $cfg['tmp_folder'].'/todo.db';
+
+// Must be shared by all the installed_apps and the core framework.
+// That way you can have several installations of the core framework.
+$cfg['db_table_prefix'] = 'pluf_testapp_'; 
+
+// Starting version 4.1 of MySQL the utf-8 support is "correct".
+// The reason of the db_version for MySQL is only for that.
+$cfg['db_version'] = '';
+$cfg['db_engine'] = 'SQLite';
+return $cfg;
diff --git a/apps/todos/src/Todo/conf/todo.php-dist b/apps/todos/src/Todo/conf/todo.php-dist
new file mode 100644
index 0000000..2cd7b84
--- /dev/null
+++ b/apps/todos/src/Todo/conf/todo.php-dist
@@ -0,0 +1,84 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2006 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+$cfg = array();
+
+// Set the debug variable to true to force the recompilation of all
+// the templates each time during development
+$cfg['debug'] = true;
+
+// If your models are using models from applications outside of the
+// base objects of the framework, you need to list them here. 
+// You need to include the name of the current application.
+$cfg['installed_apps'] = array('Todo');
+
+// Base URL of the application. Note that it is not something like
+// 'root_base' not to overwrite the base of another application when
+// several application are running on the same host.
+// If with Apache you access the index.php file with:
+//  http://localhost/path/to/index.php
+// Just put '/path/to/index.php' or '/path/to/index'
+$cfg['todo_base'] = '/path/to/index.php';
+
+// View file of the Todo application. They can be hardcoded in the 
+// Dispatcher, but it is often better to have them in a separated file
+// for readability.
+$cfg['todo_views'] = dirname(__FILE__).'/views.php';
+
+// Temporary folder where the script is writing the compiled templates,
+// cached data and other temporary resources.
+// It must be writeable by your webserver instance.
+// It is mandatory if you are using the template system.
+// You need to create this folder if needed. If you are using Windows
+// you can create a 'tmp' folder on you C: drive and put 'c:/tmp'
+// (note the forward slash / and not \)
+$cfg['tmp_folder'] = '/tmp';
+
+// The folder in which the templates of the application are located.
+$cfg['template_folders'] = array(dirname(__FILE__).'/../templates');
+
+// Default mimetype of the document your application is sending.
+// It can be overwritten for a given response if needed.
+$cfg['mimetype'] = 'text/html';
+
+$cfg['template_tags'] = array(
+                              'url' => 'Pluf_Template_Tag_Url',
+                              );
+
+// Default database configuration. The database defined here will be
+// directly accessible from Pluf::db() of course it is still possible
+// to open any other number of database connections through Pluf_DB
+$cfg['db_login'] = '';
+$cfg['db_password'] = '';
+$cfg['db_server'] = '';
+$cfg['db_database'] = $cfg['tmp_folder'].'/todo.db';
+
+// Must be shared by all the installed_apps and the core framework.
+// That way you can have several installations of the core framework.
+$cfg['db_table_prefix'] = 'pluf_testapp_'; 
+
+// Starting version 4.1 of MySQL the utf-8 support is "correct".
+// The reason of the db_version for MySQL is only for that.
+$cfg['db_version'] = '';
+$cfg['db_engine'] = 'SQLite';
+return $cfg;
diff --git a/apps/todos/src/Todo/conf/todo.test.php b/apps/todos/src/Todo/conf/todo.test.php
new file mode 100644
index 0000000..267525c
--- /dev/null
+++ b/apps/todos/src/Todo/conf/todo.test.php
@@ -0,0 +1,93 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2006 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+$cfg = array();
+
+// Set the debug variable to true to force the recompilation of all
+// the templates each time during development
+$cfg['debug'] = true;
+
+// The unit tests are using the simpletest unittesting framework, you
+// need to download it: http://simpletest.org/ and provide the path to
+// it here.
+$cfg['simple_test_path'] = '/home/loa/Vendors/simpletest';
+
+// When your application returns an error in production, the error
+// message with the error trace is automatically sent to the
+// administrators.
+$cfg['admins'] = array(
+                       array('Admin', 'admin@example.com'),
+                       );
+
+// If your models are using models from applications outside of the
+// base objects of the framework, you need to list them here. 
+// You need to include the name of the current application.
+$cfg['installed_apps'] = array('Pluf', 'Todo');
+
+// Base URL of the application. Note that it is not something like
+// 'root_base' not to overwrite the base of another application when
+// several application are running on the same host.
+// If with Apache you access the index.php file with:
+//  http://localhost/path/to/index.php
+// Just put '/path/to/index.php' or '/path/to/index'
+// For the unit tests, this is not needed.
+$cfg['todo_base'] = '/path/to/index.php';
+
+// URLs mapping of the Todo application. They can be hardcoded in the 
+// Dispatcher, but it is often better to have them in a separated file
+// for readability/maintainability.
+$cfg['todo_urls'] = dirname(__FILE__).'/urls.php';
+
+// Temporary folder where the script is writing the compiled templates,
+// cached data and other temporary resources.
+// It must be writeable by your webserver instance.
+// It is mandatory if you are using the template system.
+// You need to create this folder if needed. If you are using Windows
+// you can create a 'tmp' folder on you C: drive and put 'c:/tmp'
+// (note the forward slash / and not \)
+$cfg['tmp_folder'] = '/tmp';
+
+// The folder in which the templates of the application are located.
+$cfg['template_folders'] = array(
+                                 dirname(__FILE__).'/../templates',
+                                 );
+
+$cfg['template_tags'] = array(
+                              'url' => 'Pluf_Template_Tag_Url',
+                              );
+
+// Default database configuration. The database defined here will be
+// directly accessible from Pluf::db() of course it is still possible
+// to open any other number of database connections through Pluf_DB
+$cfg['db_login'] = '';
+$cfg['db_password'] = '';
+$cfg['db_server'] = '';
+// For testing purpose, the SQLite memory database is the best thing
+// to use.
+$cfg['db_database'] = ':memory:'; 
+
+// Must be shared by all the installed_apps and the core framework.
+// That way you can have several installations of the core framework.
+$cfg['db_table_prefix'] = 'test_'; 
+$cfg['db_engine'] = 'SQLite';
+return $cfg;
diff --git a/apps/todos/src/Todo/conf/urls.php b/apps/todos/src/Todo/conf/urls.php
new file mode 100644
index 0000000..c1904ee
--- /dev/null
+++ b/apps/todos/src/Todo/conf/urls.php
@@ -0,0 +1,98 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2006 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+$ctl = array();
+
+$ctl[] = array('regex' => '#^/$#',
+               'priority' => 4,
+               'base' => Pluf::f('todo_base'),
+               'model' => 'Todo_Views',
+               'method' => 'main');
+
+$ctl[] = array('regex' => '#^/install/$#',
+               'priority' => 4,
+               'base' => Pluf::f('todo_base'),
+               'model' => 'Todo_Views',
+               'method' => 'install');
+
+$ctl[] = array('regex' => '#^/uninstall/$#',
+               'priority' => 4,
+               'base' => Pluf::f('todo_base'),
+               'model' => 'Todo_Views',
+               'method' => 'uninstall');
+
+$ctl[] = array('regex' => '#^/item/(\d+)/$#',
+               'priority' => 4,
+               'base' => Pluf::f('todo_base'),
+               'model' => 'Todo_Views',
+               'method' => 'viewItem');
+
+$ctl[] = array('regex' => '#^/list/(\d+)/item/add/$#',
+               'priority' => 4,
+               'base' => Pluf::f('todo_base'),
+               'model' => 'Todo_Views',
+               'method' => 'addItem');
+
+$ctl[] = array('regex' => '#^/item/(\d+)/update/$#',
+               'priority' => 4,
+               'base' => Pluf::f('todo_base'),
+               'model' => 'Todo_Views',
+               'method' => 'updateItem');
+
+$ctl[] = array('regex' => '#^/item/(\d+)/delete/$#',
+               'priority' => 4,
+               'base' => Pluf::f('todo_base'),
+               'model' => 'Todo_Views',
+               'method' => 'deleteItem');
+
+$ctl[] = array('regex' => '#^/list/$#',
+               'priority' => 4,
+               'base' => Pluf::f('todo_base'),
+               'model' => 'Todo_Views',
+               'method' => 'listLists');
+
+$ctl[] = array('regex' => '#^/list/(\d+)/$#',
+               'priority' => 4,
+               'base' => Pluf::f('todo_base'),
+               'model' => 'Todo_Views',
+               'method' => 'viewList');
+
+$ctl[] = array('regex' => '#^/list/(\d+)/update/$#',
+               'priority' => 4,
+               'base' => Pluf::f('todo_base'),
+               'model' => 'Todo_Views',
+               'method' => 'updateList');
+
+$ctl[] = array('regex' => '#^/list/(\d+)/delete/$#',
+               'priority' => 4,
+               'base' => Pluf::f('todo_base'),
+               'model' => 'Todo_Views',
+               'method' => 'deleteList');
+
+$ctl[] = array('regex' => '#^/list/add/$#',
+               'priority' => 4,
+               'base' => Pluf::f('todo_base'),
+               'model' => 'Todo_Views',
+               'method' => 'addList');
+
+return $ctl;
diff --git a/apps/todos/src/Todo/relations.php b/apps/todos/src/Todo/relations.php
new file mode 100644
index 0000000..f07a454
--- /dev/null
+++ b/apps/todos/src/Todo/relations.php
@@ -0,0 +1,33 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume CMS, a website management application.
+# Copyright (C) 2001-2006 Loic d'Anterroches and contributors.
+#
+# Plume CMS is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume CMS 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * For each model having a 'foreignkey' or a 'manytomany' colum, details
+ * must be added here. These details are used to generated the methods
+ * to retrieve related models from each model.
+ */
+
+$m = array();
+$m['Todo_Item'] = array('relate_to' => array('Todo_List'));
+return $m;
+?>
\ No newline at end of file
diff --git a/apps/todos/src/Todo/templates/todo/base.html b/apps/todos/src/Todo/templates/todo/base.html
new file mode 100644
index 0000000..b5383d4
--- /dev/null
+++ b/apps/todos/src/Todo/templates/todo/base.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta name="MSSmartTagsPreventParsing" content="TRUE" />
+  <title>Todo Test Application : {$page_title}</title>
+</head>
+<body>
+
+<h1>{$page_title}</h1>
+
+
+{block body}{/block}
+
+<p><a href="{url 'Todo_Views::main'}">Home</a></p>
+
+</body>
+</html>
diff --git a/apps/todos/src/Todo/templates/todo/index.html b/apps/todos/src/Todo/templates/todo/index.html
new file mode 100644
index 0000000..6e59dae
--- /dev/null
+++ b/apps/todos/src/Todo/templates/todo/index.html
@@ -0,0 +1,16 @@
+{extends 'todo/base.html'}
+
+{block body}
+
+{if $lists}
+<ol>
+{foreach $lists as $list}
+<li><a href="{url 'Todo_Views::viewList', array($list.id)}">{$list.name}</a></li>
+{/foreach}
+</ol>
+{/if}
+
+<p><a href="{url 'Todo_Views::addList'}">Create a new list</a>.</p>
+
+
+{/block}
diff --git a/apps/todos/src/Todo/templates/todo/item/add.html b/apps/todos/src/Todo/templates/todo/item/add.html
new file mode 100644
index 0000000..c4c7c26
--- /dev/null
+++ b/apps/todos/src/Todo/templates/todo/item/add.html
@@ -0,0 +1,10 @@
+{extends 'todo/base.html'}
+
+{block body}
+<form method="POST" action="{url 'Todo_Views::addItem', array($list.id)}">
+{$form.render_p}
+<p>
+<input type="submit" value="Create the item" /> <a href="{url 'Todo_Views::viewList', array($list.id)}">Cancel</a>
+</p>
+</form>
+{/block}
diff --git a/apps/todos/src/Todo/templates/todo/item/delete.html b/apps/todos/src/Todo/templates/todo/item/delete.html
new file mode 100644
index 0000000..87fac64
--- /dev/null
+++ b/apps/todos/src/Todo/templates/todo/item/delete.html
@@ -0,0 +1,8 @@
+{extends 'todo/base.html'}
+
+{block body}
+<form method="POST" action="{url 'Todo_Views::deleteItem', array($item.id)}">
+<p>Are you sure you want to delete the todo item <em>{$item.item}</em>?</p>
+<input type="submit" value="Yes, delete it." />
+</form>
+{/block}
diff --git a/apps/todos/src/Todo/templates/todo/item/update.html b/apps/todos/src/Todo/templates/todo/item/update.html
new file mode 100644
index 0000000..c38744f
--- /dev/null
+++ b/apps/todos/src/Todo/templates/todo/item/update.html
@@ -0,0 +1,12 @@
+{extends 'todo/base.html'}
+
+{block body}
+<form method="POST" action="{url 'Todo_Views::updateItem', array($item.id)}">
+{$form.render_p}
+<p>
+<input type="submit" value="Edit this item" />
+<a href="{url 'Todo_Views::viewItem', array($item.id)}">Cancel</a> <br />
+<a href="{url 'Todo_Views::deleteItem', array($item.id)}">Delete this item</a> 
+</p>
+</form>
+{/block}
diff --git a/apps/todos/src/Todo/templates/todo/item/view.html b/apps/todos/src/Todo/templates/todo/item/view.html
new file mode 100644
index 0000000..680604d
--- /dev/null
+++ b/apps/todos/src/Todo/templates/todo/item/view.html
@@ -0,0 +1,13 @@
+{extends 'todo/base.html'}
+
+{block body}
+<h2>{$item.item}</h2>
+
+<p>Status: {if $item.completed}Done{else}Todo{/if}.</p>
+<p>List: <a href="{url 'Todo_Views::viewList', array($list.id)}">{$list.name}</a>.</p>
+
+<p><a href="{url 'Todo_Views::updateItem', array($item.id)}">Update this item</a>
+| <a href="{url 'Todo_Views::addItem', array($list.id)}">Create a new item</a>
+</p>
+
+{/block}
diff --git a/apps/todos/src/Todo/templates/todo/list/add.html b/apps/todos/src/Todo/templates/todo/list/add.html
new file mode 100644
index 0000000..e979977
--- /dev/null
+++ b/apps/todos/src/Todo/templates/todo/list/add.html
@@ -0,0 +1,10 @@
+{extends 'todo/base.html'}
+
+{block body}
+<form method="POST" action="{url 'Todo_Views::addList'}">
+{$form.render_p|unsafe}
+<p>
+<input type="submit" value="Create the list" /> <a href="{url 'Todo_Views::main'}">Cancel</a>
+</p>
+</form>
+{/block}
diff --git a/apps/todos/src/Todo/templates/todo/list/delete.html b/apps/todos/src/Todo/templates/todo/list/delete.html
new file mode 100644
index 0000000..b88a3b7
--- /dev/null
+++ b/apps/todos/src/Todo/templates/todo/list/delete.html
@@ -0,0 +1,14 @@
+{extends 'todo/base.html'}
+
+{block body}
+<form method="POST" action="{url 'Todo_Views::deleteList', array($list.id)}">
+<p>Are you sure you want to delete the todo list <em>{$list.name}</em>, with
+the following associated todo items?</p>
+<ol>
+{foreach $items as $item}
+<li>{$item.item}</li>
+{/foreach}
+</ol>
+<input type="submit" value="Yes, delete it." />
+</form>
+{/block}
diff --git a/apps/todos/src/Todo/templates/todo/list/update.html b/apps/todos/src/Todo/templates/todo/list/update.html
new file mode 100644
index 0000000..d99634b
--- /dev/null
+++ b/apps/todos/src/Todo/templates/todo/list/update.html
@@ -0,0 +1,13 @@
+{extends 'todo/base.html'}
+
+{block body}
+<form method="POST" action="{url 'Todo_Views::updateList', array($list.id)}">
+{$form.render_p}
+<p>
+<input type="submit" value="Edit this list" /> 
+<a href="{url 'Todo_Views::viewList', array($list.id)}">Cancel</a>
+<br />
+<a href="{url 'Todo_Views::deleteList', array($list.id)}">Delete this list</a>
+</p>
+</form>
+{/block}
diff --git a/apps/todos/src/Todo/templates/todo/list/view.html b/apps/todos/src/Todo/templates/todo/list/view.html
new file mode 100644
index 0000000..48105d6
--- /dev/null
+++ b/apps/todos/src/Todo/templates/todo/list/view.html
@@ -0,0 +1,17 @@
+{extends 'todo/base.html'}
+
+{block body}
+<h2>{$list.name}</h2>
+
+{if $items}
+<ol>
+{foreach $items as $item}
+<li><a href="{url 'Todo_Views::viewItem', array($item.id)}">{$item.item}</a></li>
+{/foreach}
+</ol>
+{/if}
+
+<p><a href="{url 'Todo_Views::addItem', array($list.id)}">Create a new item</a> | <a href="{url 'Todo_Views::updateList', array($list.id)}">Update the list</a></p>
+
+
+{/block}
diff --git a/apps/todos/src/Todo/templates/todo/simple.html b/apps/todos/src/Todo/templates/todo/simple.html
new file mode 100644
index 0000000..1fdfc76
--- /dev/null
+++ b/apps/todos/src/Todo/templates/todo/simple.html
@@ -0,0 +1,5 @@
+{extends 'base.html'}
+
+{block body}
+<p>{$message}</p>
+{/block}
diff --git a/apps/todos/www/index.php b/apps/todos/www/index.php
new file mode 100644
index 0000000..d363d15
--- /dev/null
+++ b/apps/todos/www/index.php
@@ -0,0 +1,42 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2006 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+// Set the include path to have Pluf in it.
+// If you have Pluf in your include path, you do not need that
+$path_to_Pluf = dirname(__FILE__).'/../../../src';
+$path_to_Todo = dirname(__FILE__).'/../src';
+set_include_path(get_include_path().PATH_SEPARATOR.$path_to_Pluf.PATH_SEPARATOR.$path_to_Todo);
+
+// Load Pluf
+require 'Pluf.php';
+// Start the framework with the todo app configuration.
+Pluf::start($path_to_Todo.'/Todo/conf/todo.php');
+// As we are using a dispatcher, we need to load the corresponding
+// view controllers. The controllers are just a mapping between the query
+// string and corresponding classes and methods.
+Pluf_Dispatcher::loadControllers(Pluf::f('todo_urls'));
+// Dispatch the call. Note that the use of a dispatcher is not
+// mandatory at all, you can create any number of .php file to dispatch
+// manually. A dispatcher enables the use of only one index.php file.
+Pluf_Dispatcher::dispatch(Pluf_HTTP_URL::getAction()); 
+
diff --git a/src/GeoIP.php b/src/GeoIP.php
new file mode 100644
index 0000000..de74f39
--- /dev/null
+++ b/src/GeoIP.php
@@ -0,0 +1,503 @@
+<?php
+
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 2 -*- */
+/* geoip.inc
+ *
+ * Copyright (C) 2007 MaxMind LLC
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/**
+ * Modified by Loic d'Anterroches to have the function names with the
+ * right case GeoIP instead of geoip. 
+ *
+ * Downloaded 2007-11-26.
+ */
+define("GEOIP_COUNTRY_BEGIN", 16776960);
+define("GEOIP_STATE_BEGIN_REV0", 16700000);
+define("GEOIP_STATE_BEGIN_REV1", 16000000);
+define("GEOIP_STANDARD", 0);
+define("GEOIP_MEMORY_CACHE", 1);
+define("GEOIP_SHARED_MEMORY", 2);
+define("STRUCTURE_INFO_MAX_SIZE", 20);
+define("DATABASE_INFO_MAX_SIZE", 100);
+define("GEOIP_COUNTRY_EDITION", 106);
+define("GEOIP_PROXY_EDITION", 8);
+define("GEOIP_ASNUM_EDITION", 9);
+define("GEOIP_NETSPEED_EDITION", 10);
+define("GEOIP_REGION_EDITION_REV0", 112);
+define("GEOIP_REGION_EDITION_REV1", 3);
+define("GEOIP_CITY_EDITION_REV0", 111);
+define("GEOIP_CITY_EDITION_REV1", 2);
+define("GEOIP_ORG_EDITION", 110);
+define("GEOIP_ISP_EDITION", 4);
+define("SEGMENT_RECORD_LENGTH", 3);
+define("STANDARD_RECORD_LENGTH", 3);
+define("ORG_RECORD_LENGTH", 4);
+define("MAX_RECORD_LENGTH", 4);
+define("MAX_ORG_RECORD_LENGTH", 300);
+define("GEOIP_SHM_KEY", 0x4f415401);
+define("US_OFFSET", 1);
+define("CANADA_OFFSET", 677);
+define("WORLD_OFFSET", 1353);
+define("FIPS_RANGE", 360);
+define("GEOIP_UNKNOWN_SPEED", 0);
+define("GEOIP_DIALUP_SPEED", 1);
+define("GEOIP_CABLEDSL_SPEED", 2);
+define("GEOIP_CORPORATE_SPEED", 3);
+
+class GeoIP {
+    var $flags;
+    var $filehandle;
+    var $memory_buffer;
+    var $databaseType;
+    var $databaseSegments;
+    var $record_length;
+    var $shmid;
+    var $GEOIP_COUNTRY_CODE_TO_NUMBER = array(
+"" => 0, "AP" => 1, "EU" => 2, "AD" => 3, "AE" => 4, "AF" => 5, 
+"AG" => 6, "AI" => 7, "AL" => 8, "AM" => 9, "AN" => 10, "AO" => 11, 
+"AQ" => 12, "AR" => 13, "AS" => 14, "AT" => 15, "AU" => 16, "AW" => 17, 
+"AZ" => 18, "BA" => 19, "BB" => 20, "BD" => 21, "BE" => 22, "BF" => 23, 
+"BG" => 24, "BH" => 25, "BI" => 26, "BJ" => 27, "BM" => 28, "BN" => 29, 
+"BO" => 30, "BR" => 31, "BS" => 32, "BT" => 33, "BV" => 34, "BW" => 35, 
+"BY" => 36, "BZ" => 37, "CA" => 38, "CC" => 39, "CD" => 40, "CF" => 41, 
+"CG" => 42, "CH" => 43, "CI" => 44, "CK" => 45, "CL" => 46, "CM" => 47, 
+"CN" => 48, "CO" => 49, "CR" => 50, "CU" => 51, "CV" => 52, "CX" => 53, 
+"CY" => 54, "CZ" => 55, "DE" => 56, "DJ" => 57, "DK" => 58, "DM" => 59, 
+"DO" => 60, "DZ" => 61, "EC" => 62, "EE" => 63, "EG" => 64, "EH" => 65, 
+"ER" => 66, "ES" => 67, "ET" => 68, "FI" => 69, "FJ" => 70, "FK" => 71, 
+"FM" => 72, "FO" => 73, "FR" => 74, "FX" => 75, "GA" => 76, "GB" => 77,
+"GD" => 78, "GE" => 79, "GF" => 80, "GH" => 81, "GI" => 82, "GL" => 83, 
+"GM" => 84, "GN" => 85, "GP" => 86, "GQ" => 87, "GR" => 88, "GS" => 89, 
+"GT" => 90, "GU" => 91, "GW" => 92, "GY" => 93, "HK" => 94, "HM" => 95, 
+"HN" => 96, "HR" => 97, "HT" => 98, "HU" => 99, "ID" => 100, "IE" => 101, 
+"IL" => 102, "IN" => 103, "IO" => 104, "IQ" => 105, "IR" => 106, "IS" => 107, 
+"IT" => 108, "JM" => 109, "JO" => 110, "JP" => 111, "KE" => 112, "KG" => 113, 
+"KH" => 114, "KI" => 115, "KM" => 116, "KN" => 117, "KP" => 118, "KR" => 119, 
+"KW" => 120, "KY" => 121, "KZ" => 122, "LA" => 123, "LB" => 124, "LC" => 125, 
+"LI" => 126, "LK" => 127, "LR" => 128, "LS" => 129, "LT" => 130, "LU" => 131, 
+"LV" => 132, "LY" => 133, "MA" => 134, "MC" => 135, "MD" => 136, "MG" => 137, 
+"MH" => 138, "MK" => 139, "ML" => 140, "MM" => 141, "MN" => 142, "MO" => 143, 
+"MP" => 144, "MQ" => 145, "MR" => 146, "MS" => 147, "MT" => 148, "MU" => 149, 
+"MV" => 150, "MW" => 151, "MX" => 152, "MY" => 153, "MZ" => 154, "NA" => 155,
+"NC" => 156, "NE" => 157, "NF" => 158, "NG" => 159, "NI" => 160, "NL" => 161, 
+"NO" => 162, "NP" => 163, "NR" => 164, "NU" => 165, "NZ" => 166, "OM" => 167, 
+"PA" => 168, "PE" => 169, "PF" => 170, "PG" => 171, "PH" => 172, "PK" => 173, 
+"PL" => 174, "PM" => 175, "PN" => 176, "PR" => 177, "PS" => 178, "PT" => 179, 
+"PW" => 180, "PY" => 181, "QA" => 182, "RE" => 183, "RO" => 184, "RU" => 185, 
+"RW" => 186, "SA" => 187, "SB" => 188, "SC" => 189, "SD" => 190, "SE" => 191, 
+"SG" => 192, "SH" => 193, "SI" => 194, "SJ" => 195, "SK" => 196, "SL" => 197, 
+"SM" => 198, "SN" => 199, "SO" => 200, "SR" => 201, "ST" => 202, "SV" => 203, 
+"SY" => 204, "SZ" => 205, "TC" => 206, "TD" => 207, "TF" => 208, "TG" => 209, 
+"TH" => 210, "TJ" => 211, "TK" => 212, "TM" => 213, "TN" => 214, "TO" => 215, 
+"TL" => 216, "TR" => 217, "TT" => 218, "TV" => 219, "TW" => 220, "TZ" => 221, 
+"UA" => 222, "UG" => 223, "UM" => 224, "US" => 225, "UY" => 226, "UZ" => 227, 
+"VA" => 228, "VC" => 229, "VE" => 230, "VG" => 231, "VI" => 232, "VN" => 233,
+"VU" => 234, "WF" => 235, "WS" => 236, "YE" => 237, "YT" => 238, "RS" => 239, 
+"ZA" => 240, "ZM" => 241, "ME" => 242, "ZW" => 243, "A1" => 244, "A2" => 245, 
+"O1" => 246, "AX" => 247, "GG" => 248, "IM" => 249, "JE" => 250
+);
+    var $GEOIP_COUNTRY_CODES = array(
+"", "AP", "EU", "AD", "AE", "AF", "AG", "AI", "AL", "AM", "AN", "AO", "AQ",
+"AR", "AS", "AT", "AU", "AW", "AZ", "BA", "BB", "BD", "BE", "BF", "BG", "BH",
+"BI", "BJ", "BM", "BN", "BO", "BR", "BS", "BT", "BV", "BW", "BY", "BZ", "CA",
+"CC", "CD", "CF", "CG", "CH", "CI", "CK", "CL", "CM", "CN", "CO", "CR", "CU",
+"CV", "CX", "CY", "CZ", "DE", "DJ", "DK", "DM", "DO", "DZ", "EC", "EE", "EG",
+"EH", "ER", "ES", "ET", "FI", "FJ", "FK", "FM", "FO", "FR", "FX", "GA", "GB",
+"GD", "GE", "GF", "GH", "GI", "GL", "GM", "GN", "GP", "GQ", "GR", "GS", "GT",
+"GU", "GW", "GY", "HK", "HM", "HN", "HR", "HT", "HU", "ID", "IE", "IL", "IN",
+"IO", "IQ", "IR", "IS", "IT", "JM", "JO", "JP", "KE", "KG", "KH", "KI", "KM",
+"KN", "KP", "KR", "KW", "KY", "KZ", "LA", "LB", "LC", "LI", "LK", "LR", "LS",
+"LT", "LU", "LV", "LY", "MA", "MC", "MD", "MG", "MH", "MK", "ML", "MM", "MN",
+"MO", "MP", "MQ", "MR", "MS", "MT", "MU", "MV", "MW", "MX", "MY", "MZ", "NA",
+"NC", "NE", "NF", "NG", "NI", "NL", "NO", "NP", "NR", "NU", "NZ", "OM", "PA",
+"PE", "PF", "PG", "PH", "PK", "PL", "PM", "PN", "PR", "PS", "PT", "PW", "PY",
+"QA", "RE", "RO", "RU", "RW", "SA", "SB", "SC", "SD", "SE", "SG", "SH", "SI",
+"SJ", "SK", "SL", "SM", "SN", "SO", "SR", "ST", "SV", "SY", "SZ", "TC", "TD",
+"TF", "TG", "TH", "TJ", "TK", "TM", "TN", "TO", "TL", "TR", "TT", "TV", "TW",
+"TZ", "UA", "UG", "UM", "US", "UY", "UZ", "VA", "VC", "VE", "VG", "VI", "VN",
+"VU", "WF", "WS", "YE", "YT", "RS", "ZA", "ZM", "ME", "ZW", "A1", "A2", "O1",
+"AX", "GG", "IM", "JE"
+);
+    var $GEOIP_COUNTRY_CODES3 = array(
+"","AP","EU","AND","ARE","AFG","ATG","AIA","ALB","ARM","ANT","AGO","AQ","ARG",
+"ASM","AUT","AUS","ABW","AZE","BIH","BRB","BGD","BEL","BFA","BGR","BHR","BDI",
+"BEN","BMU","BRN","BOL","BRA","BHS","BTN","BV","BWA","BLR","BLZ","CAN","CC",
+"COD","CAF","COG","CHE","CIV","COK","CHL","CMR","CHN","COL","CRI","CUB","CPV",
+"CX","CYP","CZE","DEU","DJI","DNK","DMA","DOM","DZA","ECU","EST","EGY","ESH",
+"ERI","ESP","ETH","FIN","FJI","FLK","FSM","FRO","FRA","FX","GAB","GBR","GRD",
+"GEO","GUF","GHA","GIB","GRL","GMB","GIN","GLP","GNQ","GRC","GS","GTM","GUM",
+"GNB","GUY","HKG","HM","HND","HRV","HTI","HUN","IDN","IRL","ISR","IND","IO",
+"IRQ","IRN","ISL","ITA","JAM","JOR","JPN","KEN","KGZ","KHM","KIR","COM","KNA",
+"PRK","KOR","KWT","CYM","KAZ","LAO","LBN","LCA","LIE","LKA","LBR","LSO","LTU",
+"LUX","LVA","LBY","MAR","MCO","MDA","MDG","MHL","MKD","MLI","MMR","MNG","MAC",
+"MNP","MTQ","MRT","MSR","MLT","MUS","MDV","MWI","MEX","MYS","MOZ","NAM","NCL",
+"NER","NFK","NGA","NIC","NLD","NOR","NPL","NRU","NIU","NZL","OMN","PAN","PER",
+"PYF","PNG","PHL","PAK","POL","SPM","PCN","PRI","PSE","PRT","PLW","PRY","QAT",
+"REU","ROU","RUS","RWA","SAU","SLB","SYC","SDN","SWE","SGP","SHN","SVN","SJM",
+"SVK","SLE","SMR","SEN","SOM","SUR","STP","SLV","SYR","SWZ","TCA","TCD","TF",
+"TGO","THA","TJK","TKL","TLS","TKM","TUN","TON","TUR","TTO","TUV","TWN","TZA",
+"UKR","UGA","UM","USA","URY","UZB","VAT","VCT","VEN","VGB","VIR","VNM","VUT",
+"WLF","WSM","YEM","YT","SRB","ZAF","ZMB","MNE","ZWE","A1","A2","O1",
+"ALA","GGY","IMN","JEY"
+    );
+    var $GEOIP_COUNTRY_NAMES = array(
+"", "Asia/Pacific Region", "Europe", "Andorra", "United Arab Emirates",
+"Afghanistan", "Antigua and Barbuda", "Anguilla", "Albania", "Armenia",
+"Netherlands Antilles", "Angola", "Antarctica", "Argentina", "American Samoa",
+"Austria", "Australia", "Aruba", "Azerbaijan", "Bosnia and Herzegovina",
+"Barbados", "Bangladesh", "Belgium", "Burkina Faso", "Bulgaria", "Bahrain",
+"Burundi", "Benin", "Bermuda", "Brunei Darussalam", "Bolivia", "Brazil",
+"Bahamas", "Bhutan", "Bouvet Island", "Botswana", "Belarus", "Belize",
+"Canada", "Cocos (Keeling) Islands", "Congo, The Democratic Republic of the",
+"Central African Republic", "Congo", "Switzerland", "Cote D'Ivoire", "Cook
+Islands", "Chile", "Cameroon", "China", "Colombia", "Costa Rica", "Cuba", "Cape
+Verde", "Christmas Island", "Cyprus", "Czech Republic", "Germany", "Djibouti",
+"Denmark", "Dominica", "Dominican Republic", "Algeria", "Ecuador", "Estonia",
+"Egypt", "Western Sahara", "Eritrea", "Spain", "Ethiopia", "Finland", "Fiji",
+"Falkland Islands (Malvinas)", "Micronesia, Federated States of", "Faroe
+Islands", "France", "France, Metropolitan", "Gabon", "United Kingdom",
+"Grenada", "Georgia", "French Guiana", "Ghana", "Gibraltar", "Greenland",
+"Gambia", "Guinea", "Guadeloupe", "Equatorial Guinea", "Greece", "South Georgia
+and the South Sandwich Islands", "Guatemala", "Guam", "Guinea-Bissau",
+"Guyana", "Hong Kong", "Heard Island and McDonald Islands", "Honduras",
+"Croatia", "Haiti", "Hungary", "Indonesia", "Ireland", "Israel", "India",
+"British Indian Ocean Territory", "Iraq", "Iran, Islamic Republic of",
+"Iceland", "Italy", "Jamaica", "Jordan", "Japan", "Kenya", "Kyrgyzstan",
+"Cambodia", "Kiribati", "Comoros", "Saint Kitts and Nevis", "Korea, Democratic
+People's Republic of", "Korea, Republic of", "Kuwait", "Cayman Islands",
+"Kazakstan", "Lao People's Democratic Republic", "Lebanon", "Saint Lucia",
+"Liechtenstein", "Sri Lanka", "Liberia", "Lesotho", "Lithuania", "Luxembourg",
+"Latvia", "Libyan Arab Jamahiriya", "Morocco", "Monaco", "Moldova, Republic
+of", "Madagascar", "Marshall Islands", "Macedonia",
+"Mali", "Myanmar", "Mongolia", "Macau", "Northern Mariana Islands",
+"Martinique", "Mauritania", "Montserrat", "Malta", "Mauritius", "Maldives",
+"Malawi", "Mexico", "Malaysia", "Mozambique", "Namibia", "New Caledonia",
+"Niger", "Norfolk Island", "Nigeria", "Nicaragua", "Netherlands", "Norway",
+"Nepal", "Nauru", "Niue", "New Zealand", "Oman", "Panama", "Peru", "French
+Polynesia", "Papua New Guinea", "Philippines", "Pakistan", "Poland", "Saint
+Pierre and Miquelon", "Pitcairn Islands", "Puerto Rico", "Palestinian Territory",
+"Portugal", "Palau", "Paraguay", "Qatar", "Reunion", "Romania",
+"Russian Federation", "Rwanda", "Saudi Arabia", "Solomon Islands",
+"Seychelles", "Sudan", "Sweden", "Singapore", "Saint Helena", "Slovenia",
+"Svalbard and Jan Mayen", "Slovakia", "Sierra Leone", "San Marino", "Senegal",
+"Somalia", "Suriname", "Sao Tome and Principe", "El Salvador", "Syrian Arab
+Republic", "Swaziland", "Turks and Caicos Islands", "Chad", "French Southern
+Territories", "Togo", "Thailand", "Tajikistan", "Tokelau", "Turkmenistan",
+"Tunisia", "Tonga", "Timor-Leste", "Turkey", "Trinidad and Tobago", "Tuvalu",
+"Taiwan", "Tanzania, United Republic of", "Ukraine",
+"Uganda", "United States Minor Outlying Islands", "United States", "Uruguay",
+"Uzbekistan", "Holy See (Vatican City State)", "Saint Vincent and the
+Grenadines", "Venezuela", "Virgin Islands, British", "Virgin Islands, U.S.",
+"Vietnam", "Vanuatu", "Wallis and Futuna", "Samoa", "Yemen", "Mayotte",
+"Serbia", "South Africa", "Zambia", "Montenegro", "Zimbabwe",
+"Anonymous Proxy","Satellite Provider","Other",
+"Aland Islands","Guernsey","Isle of Man","Jersey"
+);
+}
+function GeoIP_load_shared_mem ($file) {
+
+  $fp = fopen($file, "rb");
+  if (!$fp) {
+    print "error opening $file: $php_errormsg\n";
+    exit;
+  }
+  $s_array = fstat($fp);
+  $size = $s_array['size'];
+  if ($shmid = @shmop_open (GEOIP_SHM_KEY, "w", 0, 0)) {
+    shmop_delete ($shmid);
+    shmop_close ($shmid);
+  }
+  $shmid = shmop_open (GEOIP_SHM_KEY, "c", 0644, $size);
+  shmop_write ($shmid, fread($fp, $size), 0);
+  shmop_close ($shmid);
+}
+
+function _setup_segments($gi){
+  $gi->databaseType = GEOIP_COUNTRY_EDITION;
+  $gi->record_length = STANDARD_RECORD_LENGTH;
+  if ($gi->flags & GEOIP_SHARED_MEMORY) {
+    $offset = @shmop_size ($gi->shmid) - 3;
+    for ($i = 0; $i < STRUCTURE_INFO_MAX_SIZE; $i++) {
+        $delim = @shmop_read ($gi->shmid, $offset, 3);
+        $offset += 3;
+        if ($delim == (chr(255).chr(255).chr(255))) {
+            $gi->databaseType = ord(@shmop_read ($gi->shmid, $offset, 1));
+            $offset++;
+
+            if ($gi->databaseType == GEOIP_REGION_EDITION_REV0){
+                $gi->databaseSegments = GEOIP_STATE_BEGIN_REV0;
+            } else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1){
+                $gi->databaseSegments = GEOIP_STATE_BEGIN_REV1;
+	    } else if (($gi->databaseType == GEOIP_CITY_EDITION_REV0)||
+                     ($gi->databaseType == GEOIP_CITY_EDITION_REV1) 
+                    || ($gi->databaseType == GEOIP_ORG_EDITION)
+		    || ($gi->databaseType == GEOIP_ISP_EDITION)
+		    || ($gi->databaseType == GEOIP_ASNUM_EDITION)){
+                $gi->databaseSegments = 0;
+                $buf = @shmop_read ($gi->shmid, $offset, SEGMENT_RECORD_LENGTH);
+                for ($j = 0;$j < SEGMENT_RECORD_LENGTH;$j++){
+                    $gi->databaseSegments += (ord($buf[$j]) << ($j * 8));
+                }
+	            if (($gi->databaseType == GEOIP_ORG_EDITION)||
+			($gi->databaseType == GEOIP_ISP_EDITION)) {
+	                $gi->record_length = ORG_RECORD_LENGTH;
+                }
+            }
+            break;
+        } else {
+            $offset -= 4;
+        }
+    }
+    if (($gi->databaseType == GEOIP_COUNTRY_EDITION)||
+        ($gi->databaseType == GEOIP_PROXY_EDITION)||
+        ($gi->databaseType == GEOIP_NETSPEED_EDITION)){
+        $gi->databaseSegments = GEOIP_COUNTRY_BEGIN;
+    }
+  } else {
+    $filepos = ftell($gi->filehandle);
+    fseek($gi->filehandle, -3, SEEK_END);
+    for ($i = 0; $i < STRUCTURE_INFO_MAX_SIZE; $i++) {
+        $delim = fread($gi->filehandle,3);
+        if ($delim == (chr(255).chr(255).chr(255))){
+        $gi->databaseType = ord(fread($gi->filehandle,1));
+        if ($gi->databaseType == GEOIP_REGION_EDITION_REV0){
+            $gi->databaseSegments = GEOIP_STATE_BEGIN_REV0;
+        }
+        else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1){
+	    $gi->databaseSegments = GEOIP_STATE_BEGIN_REV1;
+                }  else if (($gi->databaseType == GEOIP_CITY_EDITION_REV0) ||
+                 ($gi->databaseType == GEOIP_CITY_EDITION_REV1) || 
+                 ($gi->databaseType == GEOIP_ORG_EDITION) || 
+		 ($gi->databaseType == GEOIP_ISP_EDITION) || 
+                 ($gi->databaseType == GEOIP_ASNUM_EDITION)){
+            $gi->databaseSegments = 0;
+            $buf = fread($gi->filehandle,SEGMENT_RECORD_LENGTH);
+            for ($j = 0;$j < SEGMENT_RECORD_LENGTH;$j++){
+            $gi->databaseSegments += (ord($buf[$j]) << ($j * 8));
+            }
+	    if ($gi->databaseType == GEOIP_ORG_EDITION ||
+		$gi->databaseType == GEOIP_ISP_EDITION) {
+	    $gi->record_length = ORG_RECORD_LENGTH;
+            }
+        }
+        break;
+        } else {
+        fseek($gi->filehandle, -4, SEEK_CUR);
+        }
+    }
+    if (($gi->databaseType == GEOIP_COUNTRY_EDITION)||
+        ($gi->databaseType == GEOIP_PROXY_EDITION)||
+        ($gi->databaseType == GEOIP_NETSPEED_EDITION)){
+         $gi->databaseSegments = GEOIP_COUNTRY_BEGIN;
+    }
+    fseek($gi->filehandle,$filepos,SEEK_SET);
+  }
+  return $gi;
+}
+
+function GeoIP_open($filename, $flags) {
+  $gi = new GeoIP;
+  $gi->flags = $flags;
+  if ($gi->flags & GEOIP_SHARED_MEMORY) {
+    $gi->shmid = @shmop_open (GEOIP_SHM_KEY, "a", 0, 0);
+    } else {
+    $gi->filehandle = fopen($filename,"rb");
+    if ($gi->flags & GEOIP_MEMORY_CACHE) {
+        $s_array = fstat($gi->filehandle);
+        $gi->memory_buffer = fread($gi->filehandle, $s_array['size']);
+    }
+  }
+
+  $gi = _setup_segments($gi);
+  return $gi;
+}
+
+function GeoIP_close($gi) {
+  if ($gi->flags & GEOIP_SHARED_MEMORY) {
+    return true;
+  }
+
+  return fclose($gi->filehandle);
+}
+
+function GeoIP_country_id_by_name($gi, $name) {
+  $addr = gethostbyname($name);
+  if (!$addr || $addr == $name) {
+    return false;
+  }
+  return GeoIP_country_id_by_addr($gi, $addr);
+}
+
+function GeoIP_country_code_by_name($gi, $name) {
+  $country_id = GeoIP_country_id_by_name($gi,$name);
+  if ($country_id !== false) {
+        return $gi->GEOIP_COUNTRY_CODES[$country_id];
+  }
+  return false;
+}
+
+function GeoIP_country_name_by_name($gi, $name) {
+  $country_id = GeoIP_country_id_by_name($gi,$name);
+  if ($country_id !== false) {
+        return $gi->GEOIP_COUNTRY_NAMES[$country_id];
+  }
+  return false;
+}
+
+function GeoIP_country_id_by_addr($gi, $addr) {
+  $ipnum = ip2long($addr);
+  return _GeoIP_seek_country($gi, $ipnum) - GEOIP_COUNTRY_BEGIN;
+}
+
+function GeoIP_country_code_by_addr($gi, $addr) {
+  if ($gi->databaseType == GEOIP_CITY_EDITION_REV1) {
+    $record = GeoIP_record_by_addr($gi,$addr);
+    return $record->country_code;
+  } else {
+    $country_id = GeoIP_country_id_by_addr($gi,$addr);
+    if ($country_id !== false) {
+      return $gi->GEOIP_COUNTRY_CODES[$country_id];
+    }
+  }
+  return false;
+}
+
+function GeoIP_country_name_by_addr($gi, $addr) {
+  if ($gi->databaseType == GEOIP_CITY_EDITION_REV1) {
+    $record = GeoIP_record_by_addr($gi,$addr);
+    return $record->country_name;
+  } else {
+    $country_id = GeoIP_country_id_by_addr($gi,$addr);
+    if ($country_id !== false) {
+      return $gi->GEOIP_COUNTRY_NAMES[$country_id];
+    }
+  }
+  return false;
+}
+
+function _GeoIP_seek_country($gi, $ipnum) {
+  $offset = 0;
+  for ($depth = 31; $depth >= 0; --$depth) {
+    if ($gi->flags & GEOIP_MEMORY_CACHE) {
+      $buf = substr($gi->memory_buffer,
+                            2 * $gi->record_length * $offset,
+                            2 * $gi->record_length);
+        } elseif ($gi->flags & GEOIP_SHARED_MEMORY) {
+      $buf = @shmop_read ($gi->shmid, 
+                            2 * $gi->record_length * $offset,
+                            2 * $gi->record_length );
+        } else {
+      fseek($gi->filehandle, 2 * $gi->record_length * $offset, SEEK_SET) == 0
+        or die("fseek failed");
+      $buf = fread($gi->filehandle, 2 * $gi->record_length);
+    }
+    $x = array(0,0);
+    for ($i = 0; $i < 2; ++$i) {
+      for ($j = 0; $j < $gi->record_length; ++$j) {
+        $x[$i] += ord($buf[$gi->record_length * $i + $j]) << ($j * 8);
+      }
+    }
+    if ($ipnum & (1 << $depth)) {
+      if ($x[1] >= $gi->databaseSegments) {
+        return $x[1];
+      }
+      $offset = $x[1];
+        } else {
+      if ($x[0] >= $gi->databaseSegments) {
+        return $x[0];
+      }
+      $offset = $x[0];
+    }
+  }
+  trigger_error("error traversing database - perhaps it is corrupt?", E_USER_ERROR);
+  return false;
+}
+
+function _get_org($gi,$ipnum){
+  $seek_org = _GeoIP_seek_country($gi,$ipnum);
+  if ($seek_org == $gi->databaseSegments) {
+    return NULL;
+  }
+  $record_pointer = $seek_org + (2 * $gi->record_length - 1) * $gi->databaseSegments;
+  if ($gi->flags & GEOIP_SHARED_MEMORY) {
+    $org_buf = @shmop_read ($gi->shmid, $record_pointer, MAX_ORG_RECORD_LENGTH);
+    } else {
+    fseek($gi->filehandle, $record_pointer, SEEK_SET);
+    $org_buf = fread($gi->filehandle,MAX_ORG_RECORD_LENGTH);
+  }
+  $org_buf = substr($org_buf, 0, strpos($org_buf, 0));
+  return $org_buf;
+}
+
+function GeoIP_org_by_addr ($gi,$addr) {
+  if ($addr == NULL) {
+    return 0;
+  }
+  $ipnum = ip2long($addr);
+  return _get_org($gi, $ipnum);
+}
+
+function _get_region($gi,$ipnum){
+  if ($gi->databaseType == GEOIP_REGION_EDITION_REV0){
+    $seek_region = _GeoIP_seek_country($gi,$ipnum) - GEOIP_STATE_BEGIN_REV0;
+    if ($seek_region >= 1000){
+      $country_code = "US";
+      $region = chr(($seek_region - 1000)/26 + 65) . chr(($seek_region - 1000)%26 + 65);
+    } else {
+            $country_code = $gi->GEOIP_COUNTRY_CODES[$seek_region];
+      $region = "";
+    }
+  return array ($country_code,$region);
+    }  else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1) {
+    $seek_region = _GeoIP_seek_country($gi,$ipnum) - GEOIP_STATE_BEGIN_REV1;
+    //print $seek_region;
+    if ($seek_region < US_OFFSET){
+      $country_code = "";
+      $region = "";  
+        } else if ($seek_region < CANADA_OFFSET) {
+      $country_code = "US";
+      $region = chr(($seek_region - US_OFFSET)/26 + 65) . chr(($seek_region - US_OFFSET)%26 + 65);
+        } else if ($seek_region < WORLD_OFFSET) {
+      $country_code = "CA";
+      $region = chr(($seek_region - CANADA_OFFSET)/26 + 65) . chr(($seek_region - CANADA_OFFSET)%26 + 65);
+    } else {
+            $country_code = $gi->GEOIP_COUNTRY_CODES[($seek_region - WORLD_OFFSET) / FIPS_RANGE];
+      $region = "";
+    }
+  return array ($country_code,$region);
+  }
+}
+
+function GeoIP_region_by_addr ($gi,$addr) {
+  if ($addr == NULL) {
+    return 0;
+  }
+  $ipnum = ip2long($addr);
+  return _get_region($gi, $ipnum);
+}
+
+function GeoIP_getdnsattributes ($l,$ip){
+  $r = new Net_DNS_Resolver();
+  $r->nameservers = array("ws1.maxmind.com");
+  $p = $r->search($l."." . $ip .".s.maxmind.com","TXT","IN");
+  $str = is_object($p->answer[0])?$p->answer[0]->string():'';
+  ereg("\"(.*)\"",$str,$regs);
+  $str = $regs[1];
+  return $str;
+}
+
diff --git a/src/Pluf.php b/src/Pluf.php
new file mode 100644
index 0000000..b625262
--- /dev/null
+++ b/src/Pluf.php
@@ -0,0 +1,359 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * The main class of the framework. From where all start.
+ *
+ * The __autoload function is automatically set.
+ */
+class Pluf
+{
+    /**
+     * Start the Plume Framework.
+     *
+     * Load the configuration files. If not configuration file is given
+     * load the dirname(__FILE__).'/conf/pluf.config.php' config file.
+     *
+     * @param string Configuration file to use
+     */
+    static function start($config)
+    {
+        $GLOBALS['_PX_starttime'] = microtime(true);
+        Pluf::loadConfig($config);
+        date_default_timezone_set(Pluf::f('time_zone', 'Europe/Berlin'));
+        mb_internal_encoding(Pluf::f('encoding', 'UTF-8'));
+        mb_regex_encoding(Pluf::f('encoding', 'UTF-8'));
+    }
+
+    /**
+     * Load the given configuration file.
+     *
+     * The configuration is saved in the $GLOBALS['_PX_config'] array.
+     * The relations between the models are loaded in $GLOBALS['_PX_models'].
+     *
+     * @param string Configuration file to load.
+     */
+    static function loadConfig($config_file)
+    {
+        if (false !== ($file=Pluf::fileExists($config_file))) {
+            $GLOBALS['_PX_config'] = require $file;
+        } else {
+            throw new Exception('Configuration file does not exist: '.$config_file);
+        }
+        // Load the relations for each installed application.
+        // Each application folder must be in the include path.
+        $GLOBALS['_PX_models'] = array(); 
+        $GLOBALS['_PX_models_init_cache'] = array();
+        foreach (Pluf::f('installed_apps', array()) as $app) {
+            $m = require $app.'/relations.php';
+            $GLOBALS['_PX_models'] = array_merge($m, $GLOBALS['_PX_models']);
+        }
+    }
+
+    /**
+     * Access a configuration variable.
+     *
+     * @param string Configuration variable
+     * @param mixed Possible default value if value is not set ('')
+     * @return mixed Configuration variable or default value if not defined.
+     */
+    static function f($cfg, $default='')
+    {
+        if (isset($GLOBALS['_PX_config'][$cfg])) {
+            return $GLOBALS['_PX_config'][$cfg];
+        }
+        return $default;
+    }
+
+    /**
+     * Access an array of configuration variables having a given
+     * prefix.
+     *
+     * @param string Prefix.
+     * @param bool Strip the prefix from the keys (false).
+     * @return array Configuration variables.
+     */
+    static function pf($pfx, $strip=false)
+    {
+        $ret = array();
+        $pfx_len = strlen($pfx);
+        foreach ($GLOBALS['_PX_config'] as $key=>$val) {
+            if (0 === strpos($key, $pfx)) {
+                if (!$strip) {
+                    $ret[$key] = $val;
+                } else {
+                    $ret[substr($key, $pfx_len)] = $val;
+                }
+            }
+        }
+        return $ret;
+    }
+
+
+    /**
+     * Returns a given object. 
+     *
+     * Loads automatically the corresponding class file if needed.
+     * If impossible to get the class $model, exception is thrown.
+     *
+     * @param string Model to load.
+     * @param mixed Extra parameters for the constructor of the model.
+     */
+    public static function factory($model, $params=null)
+    {
+        if ($params !== null) {
+            return new $model($params);
+        }
+        return new $model();
+    }
+
+    /**
+     * Load a class depending on its name.
+     *
+     * Throw an exception if not possible to load the class.
+     *
+     * @param string Class to load.
+     */
+    public static function loadClass($class)
+    {
+        if (class_exists($class, false)) {
+            return;
+        }
+        $file = str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php';
+        if (false !== ($file=Pluf::fileExists($file))) {
+            include $file;
+        }
+        if (!class_exists($class, false)) {
+            throw new Exception('Impossible to load the class: '.$class);
+        }
+    }
+
+    /**
+     * Load a function depending on its name.
+     *
+     * The implementation file of the function
+     * MyApp_Youpla_Boum_Stuff() is MyApp/Youpla/Boum.php That way it
+     * is possible to group all the related function in one file.
+     *
+     * Throw an exception if not possible to load the function.
+     *
+     * @param string Function to load.
+     */
+    public static function loadFunction($function)
+    {
+        if (function_exists($function)) {
+            return;
+        }
+        $elts = explode('_', $function);
+        array_pop($elts);
+        $file = implode(DIRECTORY_SEPARATOR, $elts) . '.php';
+        if (false !== ($file=Pluf::fileExists($file))) {
+            include $file;
+        }
+        if (!function_exists($function)) {
+            throw new Exception('Impossible to load the function: '.$function);
+        }
+    }
+
+
+    /**
+     * Hack for [[php file_exists()]] that checks the include_path.
+     * 
+     * Use this to see if a file exists anywhere in the include_path.
+     * 
+     * <code type="php">
+     * $file = 'path/to/file.php';
+     * if (Pluf::fileExists('path/to/file.php')) {
+     *     include $file;
+     * }
+     * </code>
+     *
+     * @credits Paul M. Jones <pmjones@solarphp.net>
+     *  
+     * @param string $file Check for this file in the include_path.
+     * @return mixed Full path to the file if the file exists and 
+     *         is readable in the include_path, false if not.
+     */
+    public static function fileExists($file)
+    {
+        $file = trim($file);
+        if (!$file) {
+            return false;
+        }
+        // using an absolute path for the file?
+        // dual check for Unix '/' and Windows '\',
+        // or Windows drive letter and a ':'.
+        $abs = ($file[0] == '/' || $file[0] == '\\' || $file[1] == ':');
+        if ($abs && file_exists($file)) {
+            return $file;
+        }
+        // using a relative path on the file
+        $path = explode(PATH_SEPARATOR, ini_get('include_path'));
+        foreach ($path as $dir) {
+            // strip Unix '/' and Windows '\'
+            $target = rtrim($dir, '\\/').DIRECTORY_SEPARATOR.$file;
+            if (file_exists($target)) {
+                return $target;
+            }
+        }
+        // never found it
+        return false;
+    }
+
+    /**
+     * Helper to load the default database connection.
+     *
+     * This method is just dispatching to the function define in the
+     * configuration by the 'db_get_connection' key or use the default
+     * 'Pluf_DB_getConnection'. If you want to use your own function,
+     * take a look at the Pluf_DB_getConnection function to use the
+     * same approach for your method.
+     *
+     * The extra parameters can be used to selectively connect to a
+     * given database. When the ORM is getting a connection, it is
+     * passing the current model as parameter. That way you could get
+     * different databases for different models.
+     * 
+     * @param mixed Extra parameters. 
+     * @return resource DB connection.
+     */
+    public static function &db($extra=null)
+    {
+        $func = Pluf::f('db_get_connection', 'Pluf_DB_getConnection');
+        Pluf::loadFunction($func);
+        $a = $func($extra);
+        return $a;
+    }
+}
+
+
+/**
+ * Translate a string.
+ *
+ * @param string String to be translated.
+ * @return string Translated string.
+ */
+function __($str)
+{
+    $locale = (isset($GLOBALS['_PX_current_locale'])) ? $GLOBALS['_PX_current_locale'] : 'en';
+    if (!empty($GLOBALS['_PX_locale'][$locale][$str][0])) {
+        return $GLOBALS['_PX_locale'][$locale][$str][0];
+    }
+    return $str;
+}
+
+/**
+ * Translate the plural form of a string.
+ *
+ * @param string Singular form of the string.
+ * @param string Plural form of the string.
+ * @param int Number of elements.
+ * @return string Translated string.
+ */
+function _n($sing, $plur, $n)
+{
+    $locale = (isset($GLOBALS['_PX_current_locale'])) ? $GLOBALS['_PX_current_locale'] : 'en';
+    if (isset($GLOBALS['_PX_current_locale_plural_form'])) {
+        $pform = $GLOBALS['_PX_current_locale_plural_form'];
+    } else {
+        $pform = Pluf_Translation::getPluralForm($locale);
+    }
+    $index = Pluf_Translation::$pform($n);
+    if (!empty($GLOBALS['_PX_locale'][$locale][$sing.'#'.$plur][$index])) {
+        return $GLOBALS['_PX_locale'][$locale][$sing.'#'.$plur][$index];
+    }
+    // We have no translations or default English
+    if ($n == 1) {
+        return $sing;
+    }
+    return $plur;
+}
+
+/**
+ * Autoload function.
+ *
+ * @param string Class name.
+ */
+function __autoload($class_name)
+{
+    try {
+        Pluf::loadClass($class_name);
+    } catch (Exception $e) {
+        return eval ('class '.$class_name.' {' .
+                     '  function '.$class_name.'() {' .
+                     '    throw new Exception("Class not found: '.$class_name.'");' .
+                     '  }' .
+                     '}');
+    }
+}
+
+/**
+ * Exception to catch the PHP errors.
+ *
+ * @credits errd 
+ * @see http://www.php.net/manual/en/function.set-error-handler.php
+ */
+class PlufErrorHandlerException extends Exception 
+{
+    public function setLine($line) 
+    { 
+        $this->line = $line;
+    }
+
+    public function setFile($file) 
+    {
+        $this->file = $file;
+    }
+}
+
+/**
+ * The function that is the real error handler.
+ */
+function PlufErrorHandler($code, $string, $file, $line) 
+{ 
+    if (E_STRICT == $code && 
+        0 === strpos($file, Pluf::f('pear_path','/usr/share/php/'))) {
+        return;
+    }
+    $exception = new PlufErrorHandlerException($string, $code);
+    $exception->setLine($line);
+    $exception->setFile($file);
+    throw $exception;
+}
+
+// Set the error handler only if not performing the unittests.
+if (!defined('IN_UNIT_TESTS')) {
+    set_error_handler('PlufErrorHandler', E_ALL | E_STRICT);
+}
+
+
+/**
+ * Shortcut to avoid typing again and again this htmlspecialchars call.
+ *
+ * @param string Raw string.
+ * @return string HTML escaped string.
+ */
+function Pluf_esc($string) 
+{
+    return htmlspecialchars((string)$string, ENT_COMPAT, 'UTF-8');
+}
diff --git a/src/Pluf/.htaccess b/src/Pluf/.htaccess
new file mode 100644
index 0000000..3a42882
--- /dev/null
+++ b/src/Pluf/.htaccess
@@ -0,0 +1 @@
+Deny from all
diff --git a/src/Pluf/Calendar.php b/src/Pluf/Calendar.php
new file mode 100644
index 0000000..a0a83bf
--- /dev/null
+++ b/src/Pluf/Calendar.php
@@ -0,0 +1,485 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Calendar to display a list of events in a calendar table.
+ *
+ * The calendar is independent of other elements of Pluf, you can use
+ * it standalone if you want.
+ *
+ * The principle is that you set options and feed the calendar with a
+ * list of events. Based on the options, the render() method will
+ * produce different views of the calendar.
+ */
+class Pluf_Calendar
+{
+    /**
+     * The list of events to display.
+     */
+    var $events = array();
+    var $summary = '';
+
+    /**
+     * The display options of the calendar.
+     */
+    var $opts = array();
+
+    // When updating an interval, if a col span more rows and columns,
+    // store the info for the next rows to compensate as needed.
+    var $bspans = array();
+
+    /**
+     * List of events without the events not between the start/end
+     * days.
+     */
+    var $_events = array();
+
+    /**
+     * List of time intervals in the $_events list.
+     */
+    var $_time_intervals = array();
+
+    /**
+     * Simultaneous events at a given time slot, for a given group.
+     *
+     * array('2007-03-25' => 
+     *       array(array('time' => '10:15',
+     *                   'start' => 4 , 
+     *                   'continued' => 5),
+     *             array('time' => '11:30',
+     *                   'start' => 3 , 
+     *                   'continued' => 0),
+     *             )
+     *       '2007-03-24' =>
+     *       array(array('time' => '11:30',
+     *                   'start' => 2 , 
+     *                   'continued' => 3),
+     *            )
+     *       )
+     *
+     */
+    var $_simultaneous = array();
+    var $_max_simultaneous = array();
+    var $_groups = array();
+
+    /**
+     * Render the calendar based on the options.
+     */
+    public function render()
+    {
+        if (count($this->events) == 0) {
+            return '';
+        }
+        $this->cleanEventList();
+        $this->getTimeIntervals();
+        $this->getSimultaneous();
+        $this->getMaxSimultaneous();
+        $s = '';
+        if ($this->summary) {
+            $s = 'summary="'.htmlspecialchars($this->summary).'" ';
+        }
+        $out = '<table '.$s.'cellspacing="0" class="px-calendar">'."\n";
+        $out .= $this->getHead();
+        $out .= $this->getBody();
+        $out .= '</table>'."\n";
+        return Pluf_Template_SafeString::markSafe($out);
+    }
+
+    /**
+     * Event are grouped by day per default, you can group as you
+     * want, just subclass this method. Groups are used to make
+     * columns in the table with the headings.
+     */
+    function getEventGroup($event)
+    {
+        return substr($event['start'], 0, 10);
+    }
+
+    /**
+     * Get all the available groups.
+     */
+    function getGroups()
+    {
+        if (count($this->_groups)) {
+            return $this->_groups;
+        }
+        foreach ($this->_events as $event) {
+            $group = $this->getEventGroup($event);
+            if (!in_array($group, $this->_groups)) {
+                $this->_groups[] = $group;
+            }
+        }
+        return $this->_groups;
+    }
+
+    /**
+     * Get the name of a group to print in the headers.
+     */
+    function getGroupName($group)
+    {
+        $dw = $this->daysOfWeek();
+        $days = date('w', strtotime($group));
+        return htmlspecialchars($dw[$days%7]);
+    }
+
+    /**
+     * Generate the body of the calendar.
+     */
+    function getBody()
+    {
+        $out = '<tbody>'."\n";
+        $inters = $this->getTimeIntervals();
+        $groups = $this->getGroups();
+        for ($i=0;$i<(count($inters)-1);$i++) {
+            $out .= '<tr>'."\n";
+            $out .= '  <th scope="row">'.$inters[$i].' - '.$inters[$i+1].'</th>'."\n";
+            foreach ($groups as $group) {
+                $out .= $this->getEventCell($group, $inters[$i]);
+            }
+            $out .= '</tr>'."\n";
+        }
+        $out .= '</tbody>'."\n";
+        return $out;
+    }
+
+
+    /**
+     * Get the value to print for the given cell
+     *
+     * @param string Current group
+     * @param string Current interval
+     * @return string Table cells
+     */
+    function getEventCell($group, $inter)
+    {
+        $out = '';
+        $max = $this->getMaxSimultaneous();
+        $fullspanevent = false;
+        foreach ($this->_events as $event) {
+            // Get the start time of the event
+            $e_start = substr($event['start'], 11, 5);
+            if ($e_start != $inter) {
+                // If the event does not start at the current time,
+                // skip it
+                continue;
+            }
+            if ($group != $this->getEventGroup($event)) {
+                // Check if full span even at this time interval
+                if (!empty($event['fullspan'])) {
+                    $fullspanevent = true;
+                }
+                continue;
+            }
+            // Find how many rows the event will span
+            $extra = '';
+            $content = '';
+            if (!isset($event['content'])) $event['content'] = '';
+            $row_span = $this->getEventRowSpanning($event, $this->_time_intervals);
+            if ($row_span > 1) {
+                $extra .= ' rowspan="'.$row_span.'"';
+            } 
+            if (!empty($event['fullspan'])) {
+                $colspan = 0;
+                foreach ($max as $_s) {
+                    $colspan += $_s;
+                }
+                $extra .= ' colspan="'.$colspan.'"';
+                $fullspanevent = true;
+            }
+            if (strlen($event['color']) > 0) {
+                $extra .= ' style="background-color: '.$event['color'].';"';
+            }
+            if (strlen($event['content']) > 0) {
+                $content .= $event['content'];
+            } 
+            if (strlen($event['url']) > 0) {
+                $content .= '<a href="'.$event['url'].'">'.htmlspecialchars($event['title']).'</a>';
+            } 
+            if (strlen($event['content']) == 0 and strlen($event['url']) == 0) {
+                $content .= htmlspecialchars($event['title']);
+            }
+            $out .= '  <td'.$extra.'>'.$content.'</td>'."\n";
+        }
+        if (!$fullspanevent) {
+            $sim = null;
+            foreach ($this->_simultaneous[$group] as $_sim) {
+                if ($_sim['time'] == $inter) {
+                    $sim = $_sim;
+                    break;
+                }
+            }
+            $diff = $max[$group] - ($sim['start'] + $sim['continued']);
+            for ($k=0; $k<$diff; $k++) {
+                $out .= '  <td class="empty">&nbsp;</td>'."\n";
+            }
+        }
+        return $out;
+    }
+
+    /**
+     * Get event spanning over the rows.
+     *
+     * @param array Event
+     * @param array Intervals
+     * @return int Spanning
+     */
+    function getEventRowSpanning($event, $inters)
+    {
+        $start = substr($event['start'], 11, 5);
+        $end = substr($event['end'], 11, 5);
+        $span = 1;
+        foreach ($inters as $inter) {
+            if ($inter < $end and $inter > $start) {
+                $span++;
+            }
+        }
+        return $span;
+    }
+
+    /**
+     * Generate the head of the calendar.
+     */
+    function getHead()
+    {
+        $out = '<thead>'."\n".'<tr>'."\n".'  <th>&nbsp;</th>'."\n";
+        // Print the groups.
+        $groups = $this->getGroups();
+        $max = $this->getMaxSimultaneous();
+        foreach ($groups as $group) {
+            if ($max[$group] > 1) {
+                $span = ' colspan="'.$max[$group].'"';
+            } else {
+                $span = '';
+            }
+            $out .= '  <th scope="col"'.$span.'>'.$this->getGroupName($group).'</th>'."\n";
+        }
+        $out .= '</tr>'."\n".'</thead>'."\n";
+        return $out;
+    }
+
+    /**
+     * Get the rowspan for each day.
+     */
+    function getDaySpanning()
+    {
+        list($start, $end) = $this->getStartEndDays();
+        $inters = $this->getTimeIntervals($start, $end);
+        $n = $this->getDayNumber($start, $end);
+        $inter_n = array_fill(0, count($inters), 0);
+        $day_span = array_fill(0, $n+1, $inter_n);
+        foreach ($this->events as $event) {
+            // The event must be between $start and $end
+            $e_dstart = substr($event['start'], 0, 10);
+            $e_dend = substr($event['end'], 0, 10);
+            if ($e_dend < $start or $e_dstart > $end) {
+                continue;
+            }
+            
+            $day = $this->getDayNumber($start, substr($event['end'], 0, 10));
+            $e_start = substr($event['start'], 11, 5);
+            $e_end = substr($event['end'], 11, 5);
+            $i = 0;
+            foreach ($inters as $inter) {
+                if ($inter < $e_end and $inter >= $e_start) {
+                    $day_span[$day][$i]++;
+                }
+                $i++;
+            }
+        }
+        return $day_span;
+    }
+
+    /**
+     * Get an array with the days of the week.
+     */
+    function daysOfWeek()
+    {
+        return array(
+                     __('Sunday'),
+                     __('Monday'),
+                     __('Tuesday'),
+                     __('Wednesday'),
+                     __('Thursday'),
+                     __('Friday'),
+                     __('Saturday'),
+                     );
+    }
+
+    /**
+     * Get the number of days to list.
+     *
+     * @param string Start date
+     * @param string End date
+     * @return int Number of days
+     */
+    function getDayNumber($start, $end)
+    {
+        Pluf::loadFunction('Pluf_Date_Compare');
+        $diff = Pluf_Date_Compare($start.' 00:00:00', $end.' 00:00:00');
+        return (int) $diff/86400;
+    }
+
+    /**
+     * Get the start and end dates based on the event list.
+     *
+     * @return array (start day, end day)
+     */
+    function getStartEndDays()
+    {
+        $start = '9999-12-31';
+        $end = '0000-01-01';
+        if (!isset($this->opts['start-day']) 
+            or !isset($this->opts['end-day'])) {
+            foreach ($this->events as $event) {
+                $t_start = substr($event['start'], 0, 10);
+                $t_end = substr($event['end'], 0, 10);
+                if ($t_start < $start) {
+                    $start = $t_start;
+                }
+                if ($t_end > $end) {
+                    $end = $t_end;
+                }
+            }
+        }
+        if (isset($this->opts['start-day'])) {
+            $start = $this->opts['start-day'];
+        } else {
+            $this->opts['start-day'] = $start;
+        }
+        if (isset($this->opts['end-day'])) {
+            $end = $this->opts['end-day'];
+        } else {
+            $this->opts['end-day'] = $end;
+        }
+        return array($start, $end);
+    }
+
+    /**
+     * Clean event list.
+     */
+    function cleanEventList()
+    {
+        list($start, $end) = $this->getStartEndDays();
+        $this->_events = array();
+        foreach ($this->events as $event) {
+            $e_dstart = substr($event['start'], 0, 10);
+            $e_dend = substr($event['end'], 0, 10);
+            if ($e_dend < $start or $e_dstart > $end) {
+                continue;
+            }
+            $this->_events[] = $event;
+        }
+        return true;
+    }
+
+    /**
+     * Get the time intervals. They span all the groups.
+     */
+    function getTimeIntervals($start='', $end='')
+    {
+        if (count($this->_time_intervals)) {
+            return $this->_time_intervals;
+        }
+        $intervals = array();
+        foreach ($this->_events as $event) {
+            $t = substr($event['start'], 11, 5);
+            if (!in_array($t, $intervals)) {
+                $intervals[] = $t;
+            }
+            $t = substr($event['end'], 11, 5);
+            if (!in_array($t, $intervals)) {
+                $intervals[] = $t;
+            }
+        }
+        sort($intervals);
+        $this->_time_intervals = $intervals;
+        return $intervals;
+    }
+
+    /**
+     * Get simultaneous events at the same time slot and same group.
+     */
+    function getSimultaneous()
+    {
+        foreach ($this->getGroups() as $group) {
+            $this->_simultaneous[$group] = array();
+            foreach ($this->_time_intervals as $inter) {
+                $this->_simultaneous[$group][] = array('time' => $inter,
+                                                       'start' => 0,
+                                                       'continued' => 0);
+            }
+        }
+        foreach ($this->_events as $event) {
+            $group = $this->getEventGroup($event);
+            $e_tstart = substr($event['start'], 11, 5);
+            $e_tend = substr($event['end'], 11, 5);
+            foreach ($this->_simultaneous[$group] as $index=>$inter) {
+                if ($e_tstart == $inter['time']) {
+                    $inter['start'] += 1;
+                    $this->_simultaneous[$group][$index] = $inter;
+                    continue;
+                }
+                if ($e_tstart < $inter['time'] and $e_tend > $inter['time']) {
+                    $inter['continued'] += 1;
+                    $this->_simultaneous[$group][$index] = $inter;
+                    continue;
+                }
+            }
+        }
+        return $this->_simultaneous;
+    }
+
+    /**
+     * Get maximum simultaneous events
+     */
+    function getMaxSimultaneous()
+    {
+        if (count($this->_max_simultaneous) > 0) {
+            return $this->_max_simultaneous;
+        }
+        foreach ($this->getGroups() as $group) {
+            $this->_max_simultaneous[$group] = 0;
+        }
+        foreach ($this->_simultaneous as $group=>$choices) {
+            foreach ($choices as $count) {
+                if ($this->_max_simultaneous[$group] < $count['start'] + $count['continued']) {
+                    $this->_max_simultaneous[$group] = $count['start'] + $count['continued'];
+                }
+            }
+        }
+        return $this->_max_simultaneous;
+    }
+
+
+    /**
+     * Overloading of the get method.
+     *
+     * @param string Property to get
+     */
+    function __get($prop)
+    {
+        if ($prop == 'render') return $this->render();
+        return $this->$prop;
+    }
+
+}
\ No newline at end of file
diff --git a/src/Pluf/Crypt.php b/src/Pluf/Crypt.php
new file mode 100644
index 0000000..90d7bad
--- /dev/null
+++ b/src/Pluf/Crypt.php
@@ -0,0 +1,111 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Simple encryption class.
+ *
+ * Very simple encryption class to perform simple encryption. It can
+ * be used for example when you request a valid email address to
+ * register. The validation link can contain the encrypted email.
+ *
+ * DO NOT EVER USE IT FOR REALLY IMPORTANT DATA!!!
+ *
+ * Credit Anonymous on http://www.php.net/mcrypt
+ */
+class Pluf_Crypt
+{
+    public $key = '';
+
+    /**
+     * Construct the encryption object.
+     *
+     * @param string The encryption key ('')
+     */ 
+    function __construct($key='')
+    {
+        $this->key = $key;
+    }
+
+    /**
+     * Encrypt a string with a key.
+     *
+     * If the key is not given, $this->key is used. If $this->key is
+     * empty an exception is raised.
+     *
+     * @param string String to encode
+     * @param string Encryption key ('')
+     * @return string Encoded string
+     */
+    function encrypt($string, $key='')
+    { 
+        if ($key == '') {
+            $key = $this->key;
+        }
+        if ($key == '') {
+            throw new Exception('No encryption key provided.');
+        }
+        $result = ''; 
+        $strlen = strlen($string);
+        $keylen = strlen($key);
+        for($i=0; $i<$strlen; $i++) { 
+            $char = substr($string, $i, 1); 
+            $keychar = substr($key, ($i % $keylen)-1, 1); 
+            $char = chr(ord($char)+ord($keychar));
+            $result.=$char; 
+        }
+        $result = base64_encode($result);
+        return str_replace(array('+','/','='), array('-','_','~'), $result);
+    }
+
+    /**
+     * Decrypt a string with a key.
+     *
+     * If the key is not given, $this->key is used. If $this->key is
+     * empty an exception is raised.
+     *
+     * @param string String to decode
+     * @param string Encryption key ('')
+     * @return string Decoded string
+     */
+    function decrypt($string, $key='') 
+    {
+        if ($key == '') {
+            $key = $this->key;
+        }
+        if ($key == '') {
+            throw new Exception('No encryption key provided.');
+        }
+        $result = '';
+        $string = str_replace(array('-','_','~'), array('+','/','='), $string);
+        $string = base64_decode($string);
+        $strlen = strlen($string);
+        $keylen = strlen($key);
+        for($i=0; $i<$strlen; $i++) { 
+            $char = substr($string, $i, 1);
+            $keychar = substr($key, ($i % $keylen)-1, 1);
+            $char = chr(ord($char)-ord($keychar));
+            $result.=$char;
+        }
+        return $result;
+    }
+}
diff --git a/src/Pluf/DB.php b/src/Pluf/DB.php
new file mode 100644
index 0000000..2b6398a
--- /dev/null
+++ b/src/Pluf/DB.php
@@ -0,0 +1,215 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Database class.
+ *
+ * Depending of the parameters, the database object will connect to a MySQL
+ * or SQLite database.
+ */
+class Pluf_DB
+{
+
+    /**
+     * Get a database connection.
+     */
+    static function get($engine, $server, $database, $login, $password, 
+                        $prefix, $debug=false, $version='')
+    {
+        $engine = 'Pluf_DB_'.$engine;
+        $con = new $engine($login, $password, $server, $database,
+                           $prefix, $debug, $version);
+        return $con;
+    }
+}
+
+/**
+ * Get the default DB connection.
+ *
+ * The default database connection is defined in the configuration file
+ * through the following configuration variables:
+ * - db_login : Login to connect to the database
+ * - db_password : Password to the database
+ * - db_server : Name of the server
+ * - db_database : Name of the database
+ * - db_table_prefix : Prefix for the table names
+ * - db_version : Version of the database engine
+ * - db_engine : Engine for exampe 'MySQL', 'SQLite'
+ *
+ * Once the first connection is created the following calls to Pluf::db()
+ * are getting the same connection.
+ *
+ */
+function Pluf_DB_getConnection($extra=null)
+{
+    if (isset($GLOBALS['_PX_db']) && 
+        (is_resource($GLOBALS['_PX_db']->con_id) or is_object($GLOBALS['_PX_db']->con_id))) {
+        return $GLOBALS['_PX_db'];
+    }
+    $GLOBALS['_PX_db'] = Pluf_DB::get(Pluf::f('db_engine'), 
+                                      Pluf::f('db_server'),    
+                                      Pluf::f('db_database'),
+                                      Pluf::f('db_login'), 
+                                      Pluf::f('db_password'),
+                                      Pluf::f('db_table_prefix'), 
+                                      Pluf::f('debug'),
+                                      Pluf::f('db_version'));
+    return $GLOBALS['_PX_db'];
+}
+
+/**
+ * Returns an array of default typecast and quoting for the database ORM.
+ *
+ * Foreach field type you need to provide an array with 2 functions,
+ * the from_db, the to_db.
+ *
+ * $value = from_db($value);
+ * $escaped_value = to_db($value, $dbobject); 
+ *
+ * $escaped_value is ready to be put in the SQL, that is if this is a
+ * string, the value is quoted and escaped for example with SQLite:
+ * 'my string'' is escaped' or with MySQL 'my string\' is escaped' the
+ * starting ' and ending ' are included!
+ *
+ * @return array Default typecast.
+ */
+function Pluf_DB_defaultTypecast()
+{
+    return array(
+                 'Pluf_DB_Field_Boolean' => 
+                     array('Pluf_DB_BooleanFromDb', 'Pluf_DB_BooleanToDb'),
+                 'Pluf_DB_Field_Date' => 
+                     array('Pluf_DB_IdentityFromDb', 'Pluf_DB_IdentityToDb'),
+                 'Pluf_DB_Field_Datetime' => 
+                     array('Pluf_DB_IdentityFromDb', 'Pluf_DB_IdentityToDb'),
+                 'Pluf_DB_Field_Email' => 
+                     array('Pluf_DB_IdentityFromDb', 'Pluf_DB_IdentityToDb'),
+                 'Pluf_DB_Field_File' => 
+                     array('Pluf_DB_IdentityFromDb', 'Pluf_DB_IdentityToDb'),
+                 'Pluf_DB_Field_Float' => 
+                     array('Pluf_DB_IdentityFromDb', 'Pluf_DB_IdentityToDb'),
+                 'Pluf_DB_Field_Foreignkey' => 
+                     array('Pluf_DB_IntegerFromDb', 'Pluf_DB_IntegerToDb'),
+                 'Pluf_DB_Field_Integer' => 
+                     array('Pluf_DB_IntegerFromDb', 'Pluf_DB_IntegerToDb'),
+                 'Pluf_DB_Field_Password' => 
+                     array('Pluf_DB_IdentityFromDb', 'Pluf_DB_PasswordToDb'),
+                 'Pluf_DB_Field_Sequence' => 
+                     array('Pluf_DB_IntegerFromDb', 'Pluf_DB_IntegerToDb'),
+                 'Pluf_DB_Field_Text' => 
+                     array('Pluf_DB_IdentityFromDb', 'Pluf_DB_IdentityToDb'),
+                 'Pluf_DB_Field_Varchar' => 
+                     array('Pluf_DB_IdentityFromDb', 'Pluf_DB_IdentityToDb'),
+                 'Pluf_DB_Field_Serialized' => 
+                     array('Pluf_DB_SerializedFromDb', 'Pluf_DB_SerializedToDb'),
+                 );
+}
+
+/**
+ * Identity function.
+ *
+ * @param mixed Value
+ * @return mixed Value
+ */
+function Pluf_DB_IdentityFromDb($val)
+{
+    return $val;
+}
+
+/**
+ * Identity function.
+ *
+ * @param mixed Value.
+ * @param object Database handler.
+ * @return string Ready to use for SQL.
+ */
+function Pluf_DB_IdentityToDb($val, $db)
+{
+    if (is_null($val)) {
+        return 'NULL';
+    }
+    return $db->esc($val);
+}
+
+function Pluf_DB_SerializedFromDb($val)
+{
+    if ($val) {
+        return unserialize($val);
+    }
+    return $val;
+}
+
+/**
+ * Identity function.
+ *
+ * @param mixed Value.
+ * @param object Database handler.
+ * @return string Ready to use for SQL.
+ */
+function Pluf_DB_SerializedToDb($val, $db)
+{
+    if (is_null($val)) {
+        return 'NULL';
+    }
+    return $db->esc(serialize($val));
+}
+
+function Pluf_DB_BooleanFromDb($val) {
+    if ($val) {
+        return true;
+    }
+    return false;
+}
+
+function Pluf_DB_BooleanToDb($val, $db) {
+    if (is_null($val)) {
+        return 'NULL';
+    }
+    if ($val) {
+        return $db->esc('1');
+    }
+    return $db->esc('0');
+}
+
+function Pluf_DB_IntegerFromDb($val) {
+    if (is_null($val)) return null;
+    return (int) $val;
+}
+
+function Pluf_DB_IntegerToDb($val, $db) {
+    if (is_null($val)) {
+        return 'NULL';
+    }
+    return (string)(int)$val;
+}
+
+function Pluf_DB_PasswordToDb($val, $db) {
+    $exp = explode(':', $val);
+    if (in_array($exp[0], array('sha1', 'md5', 'crc32'))) {
+        return $db->esc($val);
+    }
+    // We need to hash the value.
+    $salt = Pluf_Utils::getRandomString(5);
+    return $db->esc('sha1:'.$salt.':'.sha1($salt.$val));
+}
+
diff --git a/src/Pluf/DB/Field.php b/src/Pluf/DB/Field.php
new file mode 100644
index 0000000..4438e7b
--- /dev/null
+++ b/src/Pluf/DB/Field.php
@@ -0,0 +1,110 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Default database field.
+ */
+class Pluf_DB_Field
+{
+    /**
+     * The types are defined in the $mappings member variable of the
+     * schema class of your database engine, for example
+     * Pluf_DB_Schema_MySQL.
+     */
+    public $type = '';
+
+    /**
+     * The column name of the field.
+     */
+    public $column = '';
+
+    /**
+     * Current value of the field.
+     */
+    public $value;
+
+    /**
+     * All the extra parameters of the field.
+     */
+    public $extra = array();
+
+    /**
+     * The extra methods added to the model by the field.
+     */
+    public $methods = array();
+
+    /**
+     * Constructor.
+     *
+     * @param mixed Value ('')
+     * @param string Column name ('')
+     */
+    function __construct($value='', $column='', $extra=array())
+    {
+        $this->value = $value;
+        $this->column = $column;
+        $this->extra = array_merge($this->extra, $extra);
+    }
+
+    /**
+     * Get the form field for this field.
+     *
+     * We put this method at the field level as it allows us to easily
+     * create a new DB field and a new Form field and use them without
+     * the need to modify another place where the mapping would be
+     * performed.
+     *
+     * @param array Definition of the field.
+     * @param string Form field class.
+     */
+    function formField($def, $form_field='Pluf_Form_Field_Varchar')
+    {
+        Pluf::loadClass('Pluf_Form_BoundField'); // To get mb_ucfirst
+        $defaults = array('required' => !$def['blank'], 
+                          'label' => mb_ucfirst($def['verbose']), 
+                          'help_text' => $def['help_text']);
+        unset($def['blank'], $def['verbose'], $def['help_text']);
+        if (isset($def['default'])) {
+            $defaults['initial'] = $def['default'];
+            unset($def['default']);
+        }
+        if (isset($def['choices'])) {
+            $defaults['widget'] = 'Pluf_Form_Widget_SelectInput';
+            if (isset($def['widget_attrs'])) {
+                $def['widget_attrs']['choices'] = $def['choices'];
+            } else {
+                $def['widget_attrs'] = array('choices' => $def['choices']);
+            }
+        }
+        foreach (array_keys($def) as $key) {
+            if (!in_array($key, array('widget', 'label', 'required', 
+                                      'initial', 'choices', 'widget_attrs'))) {
+                unset($def[$key]);
+            }
+        }
+        $params = array_merge($defaults, $def);
+        return new $form_field($params);
+    }
+
+}
+
diff --git a/src/Pluf/DB/Field/Boolean.php b/src/Pluf/DB/Field/Boolean.php
new file mode 100644
index 0000000..9353b40
--- /dev/null
+++ b/src/Pluf/DB/Field/Boolean.php
@@ -0,0 +1,32 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_DB_Field_Boolean extends Pluf_DB_Field
+{
+    public $type = 'boolean';
+
+    function formField($def, $form_field='Pluf_Form_Field_Boolean')
+    {
+        return parent::formField($def, $form_field);
+    }
+}
diff --git a/src/Pluf/DB/Field/Date.php b/src/Pluf/DB/Field/Date.php
new file mode 100644
index 0000000..d3f5506
--- /dev/null
+++ b/src/Pluf/DB/Field/Date.php
@@ -0,0 +1,32 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_DB_Field_Date extends Pluf_DB_Field
+{
+    public $type = 'date';
+
+    function formField($def, $form_field='Pluf_Form_Field_Date')
+    {
+        return parent::formField($def, $form_field);
+    }
+}
diff --git a/src/Pluf/DB/Field/Datetime.php b/src/Pluf/DB/Field/Datetime.php
new file mode 100644
index 0000000..e45e07f
--- /dev/null
+++ b/src/Pluf/DB/Field/Datetime.php
@@ -0,0 +1,32 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_DB_Field_Datetime extends Pluf_DB_Field
+{
+    public $type = 'datetime';
+
+    function formField($def, $form_field='Pluf_Form_Field_Datetime')
+    {
+        return parent::formField($def, $form_field);
+    }
+}
diff --git a/src/Pluf/DB/Field/Email.php b/src/Pluf/DB/Field/Email.php
new file mode 100644
index 0000000..5896239
--- /dev/null
+++ b/src/Pluf/DB/Field/Email.php
@@ -0,0 +1,33 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_DB_Field_Email extends Pluf_DB_Field
+{
+    public $type = 'varchar';
+    public $extra = array('size' => 200);
+
+    function formField($def, $form_field='Pluf_Form_Field_Email')
+    {
+        return parent::formField($def, $form_field);
+    }
+}
diff --git a/src/Pluf/DB/Field/File.php b/src/Pluf/DB/Field/File.php
new file mode 100644
index 0000000..8974bb9
--- /dev/null
+++ b/src/Pluf/DB/Field/File.php
@@ -0,0 +1,76 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_DB_Field_File extends Pluf_DB_Field
+{
+    /**
+     * See definition in Pluf_DB_Field.
+     */
+    public $type = 'file';
+    public $column = '';
+    public $value;
+    public $extra = array();
+    public $methods = array();
+
+    /**
+     * Constructor.
+     *
+     * @param mixed Value ('')
+     * @param string Column name ('')
+     */
+    function __construct($value='', $column='', $extra=array())
+    {
+        parent::__construct($value, $column, $extra);
+        $this->methods = array(array(strtolower($column).'_url', 'Pluf_DB_Field_File_Url'),
+                               array(strtolower($column).'_path', 'Pluf_DB_Field_File_Path')
+                               );
+    }
+
+    function formField($def, $form_field='Pluf_Form_Field_File')
+    {
+        return parent::formField($def, $form_field);
+    }
+}
+
+/**
+ * Returns the url to access the file.
+ */
+function Pluf_DB_Field_File_Url($field, $method, $model, $args=null)
+{
+    if (strlen($model->$field) != 0) {
+        return Pluf::f('upload_url').'/'.$model->$field;
+    }
+    return  '';
+}
+
+/**
+ * Returns the path to access the file.
+ */
+function Pluf_DB_Field_File_Path($field, $method, $model, $args=null)
+{
+    if (strlen($model->$field) != 0) {
+        return Pluf::f('upload_path').'/'.$model->$field;
+    }
+    return '';
+}
+
diff --git a/src/Pluf/DB/Field/Float.php b/src/Pluf/DB/Field/Float.php
new file mode 100644
index 0000000..5b70b81
--- /dev/null
+++ b/src/Pluf/DB/Field/Float.php
@@ -0,0 +1,27 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_DB_Field_Float extends Pluf_DB_Field
+{
+    public $type = 'float';
+}
diff --git a/src/Pluf/DB/Field/Foreignkey.php b/src/Pluf/DB/Field/Foreignkey.php
new file mode 100644
index 0000000..0718c85
--- /dev/null
+++ b/src/Pluf/DB/Field/Foreignkey.php
@@ -0,0 +1,38 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_DB_Field_Foreignkey extends Pluf_DB_Field
+{
+    public $type = 'foreignkey';
+
+    function formField($def, $form_field='Pluf_Form_Field_Varchar')
+    {
+        $gmodel = new $def['model']();
+        $choices = array();
+        foreach ($gmodel->getList() as $item) {
+            $choices[(string) $item] = $item->id;
+        }
+        $def['choices'] = $choices;
+        return parent::formField($def, $form_field);
+    }
+}
diff --git a/src/Pluf/DB/Field/Integer.php b/src/Pluf/DB/Field/Integer.php
new file mode 100644
index 0000000..c83d43b
--- /dev/null
+++ b/src/Pluf/DB/Field/Integer.php
@@ -0,0 +1,27 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_DB_Field_Integer extends Pluf_DB_Field
+{
+    public $type = 'integer';
+}
diff --git a/src/Pluf/DB/Field/Manytomany.php b/src/Pluf/DB/Field/Manytomany.php
new file mode 100644
index 0000000..29cf24b
--- /dev/null
+++ b/src/Pluf/DB/Field/Manytomany.php
@@ -0,0 +1,42 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_DB_Field_Manytomany extends Pluf_DB_Field
+{
+    public $type = 'manytomany';
+
+    function formField($def, $form_field='Pluf_Form_Field_Varchar')
+    {
+        $method = 'get_'.$def['name'].'_list';
+        $items = $def['model_instance']->$method();
+        $choices = array();
+        foreach ($items as $item) {
+            $choices[(string) $item] = $item->id;
+        }
+        $def['choices'] = $choices;
+        if (!isset($def['widget'])) {
+            $def['widget'] = 'Pluf_Form_Widget_SelectMultipleInput';
+        }
+        return parent::formField($def, $form_field);
+    }
+}
diff --git a/src/Pluf/DB/Field/Password.php b/src/Pluf/DB/Field/Password.php
new file mode 100644
index 0000000..b327945
--- /dev/null
+++ b/src/Pluf/DB/Field/Password.php
@@ -0,0 +1,33 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_DB_Field_Password extends Pluf_DB_Field
+{
+    public $type = 'varchar';
+
+    function formField($def, $form_field='Pluf_Form_Field_Varchar')
+    {
+        $def['widget'] = 'Pluf_Form_Widget_PasswordInput';
+        return parent::formField($def, $form_field);
+    }
+}
diff --git a/src/Pluf/DB/Field/Sequence.php b/src/Pluf/DB/Field/Sequence.php
new file mode 100644
index 0000000..a156f38
--- /dev/null
+++ b/src/Pluf/DB/Field/Sequence.php
@@ -0,0 +1,36 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_DB_Field_Sequence extends Pluf_DB_Field
+{
+    public $type = 'sequence';
+
+    /**
+     * It is never possible to manually set the id of a model, this
+     * should be passed through the URL.
+     */
+    function formField($def, $form_field='')
+    {
+        return null;
+    }
+}
diff --git a/src/Pluf/DB/Field/Serialized.php b/src/Pluf/DB/Field/Serialized.php
new file mode 100644
index 0000000..4a7deb5
--- /dev/null
+++ b/src/Pluf/DB/Field/Serialized.php
@@ -0,0 +1,35 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_DB_Field_Serialized extends Pluf_DB_Field
+{
+    public $type = 'text';
+
+    function formField($def, $form_field='Pluf_Form_Field_Varchar')
+    {
+        if (!isset($def['widget'])) {
+            $def['widget'] = 'Pluf_Form_Widget_TextareaInput';
+        }
+        return parent::formField($def, $form_field);
+    }
+}
diff --git a/src/Pluf/DB/Field/Text.php b/src/Pluf/DB/Field/Text.php
new file mode 100644
index 0000000..05d30a1
--- /dev/null
+++ b/src/Pluf/DB/Field/Text.php
@@ -0,0 +1,35 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_DB_Field_Text extends Pluf_DB_Field
+{
+    public $type = 'text';
+
+    function formField($def, $form_field='Pluf_Form_Field_Varchar')
+    {
+        if (!isset($def['widget'])) {
+            $def['widget'] = 'Pluf_Form_Widget_TextareaInput';
+        }
+        return parent::formField($def, $form_field);
+    }
+}
diff --git a/src/Pluf/DB/Field/Varchar.php b/src/Pluf/DB/Field/Varchar.php
new file mode 100644
index 0000000..a6f642f
--- /dev/null
+++ b/src/Pluf/DB/Field/Varchar.php
@@ -0,0 +1,27 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_DB_Field_Varchar extends Pluf_DB_Field
+{
+    public $type = 'varchar';
+}
diff --git a/src/Pluf/DB/Introspect.php b/src/Pluf/DB/Introspect.php
new file mode 100644
index 0000000..ad1a8b6
--- /dev/null
+++ b/src/Pluf/DB/Introspect.php
@@ -0,0 +1,52 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+
+class Pluf_DB_Introspect
+{
+    protected $int = null;
+    protected $backend = '';
+    
+    public function __construct($db)
+    {
+        $this->int = Pluf::factory('Pluf_DB_Introspect_'.$db->engine, $db);
+        $this->backend = $db->engine;
+    }
+
+    /**
+     * Get the list of tables in the current database. The search
+     * automatically limit the list to the visible ones.
+     * 
+     * @param object DB connection.
+     * @return array List of tables.
+     */
+    function listTables()
+    {
+        if (!method_exists($this->int, 'listTables')) {
+            throw new Pluf_Exception_NotImplemented();
+        }
+        return $this->int->listTables();
+    }
+}
+
+
diff --git a/src/Pluf/DB/Introspect/PostgreSQL.php b/src/Pluf/DB/Introspect/PostgreSQL.php
new file mode 100644
index 0000000..ddd6c09
--- /dev/null
+++ b/src/Pluf/DB/Introspect/PostgreSQL.php
@@ -0,0 +1,56 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+
+class Pluf_DB_Introspect_PostgreSQL
+{
+    protected $db = null;
+    
+    public function __construct($db)
+    {
+        $this->db = $db;
+    }
+
+    /**
+     * Get the list of tables in the current database. The search
+     * automatically limit the list to the visible ones.
+     * 
+     * @param object DB connection.
+     * @return array List of tables.
+     */
+    function listTables()
+    {
+        $sql = 'SELECT c.relname AS name
+         FROM pg_catalog.pg_class c
+         LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace
+         WHERE c.relkind IN (\'r\', \'v\', \'\')
+             AND n.nspname NOT IN (\'pg_catalog\', \'pg_toast\')
+             AND pg_catalog.pg_table_is_visible(c.oid)';
+        $res = $this->db->select($sql);
+        $tables = array();
+        foreach ($res as $t) {
+            $tables[] = $t['name'];
+        }
+        return $tables;
+    }
+}
\ No newline at end of file
diff --git a/src/Pluf/DB/MySQL.php b/src/Pluf/DB/MySQL.php
new file mode 100644
index 0000000..4a17dc1
--- /dev/null
+++ b/src/Pluf/DB/MySQL.php
@@ -0,0 +1,172 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * MySQL connection class
+ */
+class Pluf_DB_MySQL
+{
+    public $con_id;
+    public $pfx = '';
+    private $debug = false;
+    /** The last query, set with debug(). Used when an error is returned. */
+    public $lastquery = '';
+    public $engine = 'MySQL';
+    public $type_cast = array();
+
+    function __construct($user, $pwd, $server, $dbname, $pfx='', $debug=false)
+    {
+        Pluf::loadFunction('Pluf_DB_defaultTypecast');
+        $this->type_cast = Pluf_DB_defaultTypecast();
+        $this->debug('* MYSQL CONNECT');
+        $this->con_id = @mysql_connect($server, $user, $pwd);
+        $this->debug = $debug;
+        $this->pfx = $pfx;
+        if (!$this->con_id) {
+            throw new Exception($this->getError());
+        }
+        $this->database($dbname);
+        $this->execute('SET NAMES \'utf8\'');
+    }
+
+    function database($dbname)
+    {
+        $db = @mysql_select_db($dbname);
+        $this->debug('* USE DATABASE '.$dbname);
+        if (!$db) {
+            throw new Exception($this->getError());
+        }
+        return true;
+    }
+
+    /**
+     * Get the version of the MySQL server.
+     *
+     * @return string Version string
+     */
+    function getServerInfo()
+    {
+        return mysql_get_server_info($this->con_id);
+    }
+
+    /**
+     * Log the queries. Keep track of the last query and if in debug mode
+     * keep track of all the queries in 
+     * $GLOBALS['_PX_debug_data']['sql_queries']
+     *
+     * @param string Query to keep track
+     * @return bool true
+     */
+    function debug($query)
+    {
+        $this->lastquery = $query;
+        if (!$this->debug) return true;
+        if (!isset($GLOBALS['_PX_debug_data']['sql_queries'])) 
+            $GLOBALS['_PX_debug_data']['sql_queries'] = array();
+        $GLOBALS['_PX_debug_data']['sql_queries'][] = $query;
+        return true;
+    }
+
+    function close()
+    {
+        if ($this->con_id) {
+            mysql_close($this->con_id);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    function select($query)
+    {
+        $this->debug($query);
+        $cur = mysql_query($query, $this->con_id);
+        if ($cur) {
+            $res = array();
+            while ($row = mysql_fetch_assoc($cur)) {
+                $res[] = $row;
+            }
+            mysql_free_result($cur);
+            return $res;
+        } else {
+            throw new Exception($this->getError());
+        }
+    }
+
+    function execute($query)
+    {
+        $this->debug($query);
+        $cur = mysql_query($query, $this->con_id);
+        if (!$cur) {
+            throw new Exception($this->getError());
+        } else {
+            return true;
+        }
+    }
+
+    function getLastID()
+    {
+        $this->debug('* GET LAST ID');
+        return (int) mysql_insert_id($this->con_id);
+    }
+
+    /**
+     * Returns a string ready to be used in the exception.
+     *
+     * @return string Error string
+     */
+    function getError()
+    {
+        
+        if ($this->con_id) {
+            return mysql_errno($this->con_id).' - '
+                .mysql_error($this->con_id).' - '.$this->lastquery;
+        } else {
+            return mysql_errno().' - '
+                .mysql_error().' - '.$this->lastquery;
+        }
+    }
+
+    function esc($str)
+    {
+        return '\''.mysql_real_escape_string($str, $this->con_id).'\'';
+    }
+
+    /**
+     * Quote the column name.
+     *
+     * @param string Name of the column
+     * @return string Escaped name
+     */
+    function qn($col)
+    {
+        return '`'.$col.'`';
+    }
+
+    function __toString()
+    {
+        return '<Pluf_DB_MySQL('.$this->con_id.')>';
+    }
+
+}
+
diff --git a/src/Pluf/DB/PostgreSQL.php b/src/Pluf/DB/PostgreSQL.php
new file mode 100644
index 0000000..8a48d3f
--- /dev/null
+++ b/src/Pluf/DB/PostgreSQL.php
@@ -0,0 +1,220 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * PostgreSQL connection class
+ */
+class Pluf_DB_PostgreSQL
+{
+    public $con_id;
+    public $pfx = '';
+    private $debug = false;
+    /** The last query, set with debug(). Used when an error is returned. */
+    public $lastquery = '';
+    public $engine = 'PostgreSQL';
+    public $type_cast = array();
+
+    function __construct($user, $pwd, $server, $dbname, $pfx='', $debug=false)
+    {
+        Pluf::loadFunction('Pluf_DB_defaultTypecast');
+        $this->type_cast = Pluf_DB_defaultTypecast();
+        $this->type_cast['Pluf_DB_Field_Boolean'] = array('Pluf_DB_PostgreSQL_BooleanFromDb', 'Pluf_DB_BooleanToDb');
+
+        $this->debug('* POSTGRESQL CONNECT');
+        $cstring = '';
+        if ($server) {
+            $cstring .= 'host='.$server.' ';
+        }
+        $cstring .= 'dbname='.$dbname.' user='.$user;
+        if ($pwd) {
+            $cstring .= ' password='.$pwd;
+        }
+        $this->con_id = pg_connect($cstring);
+        $this->debug = $debug;
+        $this->pfx = $pfx;
+        $this->cur = null; //Current query cursor.
+        if (!$this->con_id) {
+            throw new Exception($this->getError());
+        }
+    }
+
+
+    /**
+     * Get the version of the PostgreSQL server.
+     *
+     * Requires PostgreSQL 7.4 or later.
+     *
+     * @return string Version string
+     */
+    function getServerInfo()
+    {
+        $ver = pg_version($this->con_id);
+        return $ver['server'];
+    }
+
+    /**
+     * Log the queries. Keep track of the last query and if in debug mode
+     * keep track of all the queries in 
+     * $GLOBALS['_PX_debug_data']['sql_queries']
+     *
+     * @param string Query to keep track
+     * @return bool true
+     */
+    function debug($query)
+    {
+        $this->lastquery = $query;
+        if (!$this->debug) return true;
+        if (!isset($GLOBALS['_PX_debug_data']['sql_queries'])) 
+            $GLOBALS['_PX_debug_data']['sql_queries'] = array();
+        $GLOBALS['_PX_debug_data']['sql_queries'][] = $query;
+        return true;
+    }
+
+    function close()
+    {
+        if ($this->con_id) {
+            pg_close($this->con_id);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    function select($query)
+    {
+        $this->debug($query);
+        try {
+            $this->cur = @pg_query($this->con_id, $query);
+        } catch (Exception $e) {
+            throw new Exception($this->getError());
+        }
+        $res = array();
+        while ($row = @pg_fetch_assoc($this->cur)) {
+            $res[] = $row;
+        }
+        @pg_free_result($this->cur);
+        $this->cur = null;
+        return $res;
+    }
+
+    function execute($query)
+    {
+        $this->debug($query);
+        try {
+            $this->cur = @pg_query($this->con_id, $query);
+            $this->cur = null;
+            return true;
+        } catch (Exception $e) {
+            throw new Exception($this->getError());
+        }
+    }
+
+    function getLastID()
+    {
+        $this->debug('* GET LAST ID');
+        $res = $this->select('SELECT lastval() AS last_id');
+        return (int) $res[0]['last_id'];
+    }
+
+    /**
+     * Returns a string ready to be used in the exception.
+     *
+     * @return string Error string
+     */
+    function getError()
+    {
+        if ($this->cur) {
+            return pg_result_error($this->cur).' - '.$this->lastquery;
+        }
+        if ($this->con_id) {
+            return pg_last_error($this->con_id).' - '.$this->lastquery;
+        } else {
+            return pg_last_error().' - '.$this->lastquery;
+        }
+    }
+
+    function esc($str)
+    {
+        return '\''.pg_escape_string($this->con_id, $str).'\'';
+    }
+
+    /**
+     * Set the current search path.
+     */
+    function setSearchPath($search_path='public')
+    {
+        if (preg_match('/[^\w\s\,]/', $search_path)) {
+            throw new Exception('The search path: "'.$search_path.'" is not valid.');            
+        }
+        $this->execute('SET search_path TO '.$search_path);
+        return true;
+    }
+
+    /**
+     * Quote the column name.
+     *
+     * @param string Name of the column
+     * @return string Escaped name
+     */
+    function qn($col)
+    {
+        return '"'.$col.'"';
+    }
+
+    /**
+     * Start a transaction.
+     */
+    function begin()
+    {
+        $this->execute('BEGIN');
+    }
+
+    /**
+     * Commit a transaction.
+     */
+    function commit()
+    {
+        $this->execute('COMMIT');
+    }
+
+    /**
+     * Rollback a transaction.
+     */
+    function rollback()
+    {
+        $this->execute('ROLLBACK');
+    }
+
+    function __toString()
+    {
+        return '<Pluf_DB_PostgreSQL('.$this->con_id.')>';
+    }
+}
+
+function Pluf_DB_PostgreSQL_BooleanFromDb($val) {
+    if (!$val) {
+        return false;
+    }
+    return (strtolower(substr($val, 0, 1)) == 't');
+}
+
diff --git a/src/Pluf/DB/SQLite.php b/src/Pluf/DB/SQLite.php
new file mode 100644
index 0000000..ee20879
--- /dev/null
+++ b/src/Pluf/DB/SQLite.php
@@ -0,0 +1,169 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * SQLite connection class
+ */
+class Pluf_DB_SQLite
+{
+    public $con_id;
+    public $pfx = '';
+    private $debug = false;
+    /** The last query, set with debug(). Used when an error is returned. */
+    public $lastquery = '';
+    public $engine = 'SQLite';
+    public $type_cast = array();
+
+    function __construct($user, $pwd, $server, $dbname, $pfx='', $debug=false)
+    {
+        Pluf::loadFunction('Pluf_DB_defaultTypecast');
+        $this->type_cast = Pluf_DB_defaultTypecast();
+        $this->debug = $debug;
+        $this->pfx = $pfx;
+        $this->debug('* SQLITE OPEN');
+        // Connect and let the Exception be thrown in case of problem
+        try {
+            $this->con_id = new PDO('sqlite:'.$dbname);
+        } catch (PDOException $e) {
+            throw $e;
+        }
+    }
+
+    /**
+     * Get the version of the SQLite library.
+     *
+     * @return string Version string
+     */
+    function getServerInfo()
+    {
+        return $this->con_id->getAttribute(PDO::ATTR_SERVER_INFO);
+    }
+
+    /**
+     * Log the queries. Keep track of the last query and if in debug mode
+     * keep track of all the queries in 
+     * $GLOBALS['_PX_debug_data']['sql_queries']
+     *
+     * @param string Query to keep track
+     * @return bool true
+     */
+    function debug($query)
+    {
+        $this->lastquery = $query;
+        if (!$this->debug) return true;
+        if (!isset($GLOBALS['_PX_debug_data']['sql_queries'])) 
+            $GLOBALS['_PX_debug_data']['sql_queries'] = array();
+        $GLOBALS['_PX_debug_data']['sql_queries'][] = $query;
+        return true;
+    }
+
+    function close()
+    {
+        $this->con_id = null;
+        return true;
+    }
+
+    function select($query)
+    {
+        $this->debug($query);
+        if (false === ($cur = $this->con_id->query($query))) {
+            throw new Exception($this->getError());
+        }
+        return $cur->fetchAll(PDO::FETCH_ASSOC);
+    }
+
+    function execute($query)
+    {
+        $this->debug($query);
+        if (false === ($cur = $this->con_id->exec($query))) {
+            throw new Exception($this->getError());
+        }
+        return $cur;
+
+    }
+
+    function getLastID()
+    {
+        $this->debug('* GET LAST ID');
+        return (int) $this->con_id->lastInsertId();;
+    }
+
+    /**
+     * Returns a string ready to be used in the exception.
+     *
+     * @return string Error string
+     */
+    function getError()
+    {
+        $err = $this->con_id->errorInfo();
+        $err[] = $this->lastquery;
+        return implode(' - ', $err);
+    }
+
+    function esc($str)
+    {
+        return $this->con_id->quote($str);
+    }
+
+    /**
+     * Quote the column name.
+     *
+     * @param string Name of the column
+     * @return string Escaped name
+     */
+    function qn($col)
+    {
+        return '"'.$col.'"';
+    }
+
+    /**
+     * Start a transaction.
+     */
+    function begin()
+    {
+        $this->execute('BEGIN');
+    }
+
+    /**
+     * Commit a transaction.
+     */
+    function commit()
+    {
+        $this->execute('COMMIT');
+    }
+
+    /**
+     * Rollback a transaction.
+     */
+    function rollback()
+    {
+        $this->execute('ROLLBACK');
+    }
+
+    function __toString()
+    {
+        return '<Pluf_DB_SQLite('.$this->con_id.')>';
+    }
+
+}
+
diff --git a/src/Pluf/DB/Schema.php b/src/Pluf/DB/Schema.php
new file mode 100644
index 0000000..424c2f0
--- /dev/null
+++ b/src/Pluf/DB/Schema.php
@@ -0,0 +1,99 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Create the schema of a given Pluf_Model for a given database.
+ */
+class Pluf_DB_Schema
+{
+    /**
+     * Database connection object.
+     */
+    private $con = null;
+
+    /**
+     * Model from which the schema is generated.
+     */
+    public $model = null;
+
+    /**
+     * Schema generator object corresponding to the database.
+     */
+    public $schema = null;
+
+    function __construct($db, $model=null)
+    {
+        $this->con = $db;
+        $this->model = $model;
+        $this->schema = Pluf::factory('Pluf_DB_Schema_'.$db->engine, $db);
+    }
+
+
+    /**
+     * Get the schema generator.
+     *
+     * @return object Pluf_DB_Schema_XXXX
+     */
+    function getGenerator()
+    {
+        return $this->schema;
+    }
+
+    /**
+     * Create the tables and indexes for the current model.
+     *
+     * @return mixed True if success or database error.
+     */
+    function createTables()
+    {
+        $sql = $this->schema->getSqlCreate($this->model);
+        foreach ($sql as $k => $query) {
+            if (false === $this->con->execute($query)) {
+                throw new Exception($this->con->getError());
+            }
+        }
+        $sql = $this->schema->getSqlIndexes($this->model);
+        foreach ($sql as $k => $query) {
+            if (false === $this->con->execute($query)) {
+                throw new Exception($this->con->getError());
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Drop the tables and indexes for the current model.
+     *
+     * @return mixed True if success or database error.
+     */
+    function dropTables()
+    {
+        $sql = $this->schema->getSqlDelete($this->model);
+        foreach ($sql as $k => $query) {
+            if (false === $this->con->execute($query)) {
+                throw new Exception($this->con->getError());
+            }
+        }
+        return true;
+    }
+}
diff --git a/src/Pluf/DB/Schema/MySQL.php b/src/Pluf/DB/Schema/MySQL.php
new file mode 100644
index 0000000..13e4f0b
--- /dev/null
+++ b/src/Pluf/DB/Schema/MySQL.php
@@ -0,0 +1,210 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Generator of the schemas corresponding to a given model.
+ *
+ * This class is for MySQL, you can create a class on the same
+ * model for another database engine.
+ */
+class Pluf_DB_Schema_MySQL
+{
+    /**
+     * Mapping of the fields.
+     */
+    public $mappings = array(
+                             'varchar' => 'varchar(%s)',
+                             'sequence' => 'mediumint(9) unsigned not null auto_increment',
+                             'boolean' => 'bool not null',
+                             'date' => 'date not null',
+                             'datetime' => 'datetime not null',
+                             'file' => 'varchar(150) not null',
+                             'manytomany' => null,
+                             'foreignkey' => 'mediumint(9) unsigned not null',
+                             'text' => 'longtext not null',
+                             'html' => 'longtext not null',
+                             'time' => 'time not null',
+                             'integer' => 'integer',
+                             'email' => 'varchar(150) not null',
+                             'password' => 'varchar(150) not null',
+                             'float' => 'numeric(%s, %s)',
+                             );
+
+    public $defaults = array(
+                             'varchar' => "''",
+                             'sequence' => null,
+                             'boolean' => 1,
+                             'date' => 0,
+                             'datetime' => 0,
+                             'file' => "''",
+                             'manytomany' => null,
+                             'foreignkey' => 0,
+                             'text' => "''",
+                             'html' => "''",
+                             'time' => 0,
+                             'integer' => 0,
+                             'email' => "''",
+                             'password' => "''",
+                             'float' => 0.0,
+
+                             );
+    private $con = null;
+
+    function __construct($con)
+    {
+        $this->con = $con;
+    }
+
+
+
+    /**
+     * Get the SQL to generate the tables of the given model.
+     *
+     * @param Object Model
+     * @return array Array of SQL strings ready to execute.
+     */
+    function getSqlCreate($model)
+    {
+        $tables = array();
+        $cols = $model->_a['cols'];
+        $manytomany = array();
+        $sql = 'CREATE TABLE `'.$this->con->pfx.$model->_a['table'].'` (';
+
+        foreach ($cols as $col => $val) {
+            $field = new $val['type']();
+            if ($field->type != 'manytomany') {
+                $sql .= "\n`".$col.'` ';
+                $_tmp = $this->mappings[$field->type];
+                if ($field->type == 'varchar') {
+                    if (isset($val['size'])) {
+                        $_tmp = sprintf($this->mappings['varchar'], $val['size']);
+                    } else {
+                        $_tmp = sprintf($this->mappings['varchar'], '150');
+                    }
+                }
+                if ($field->type == 'float') {
+                    if (!isset($val['max_digits'])) {
+                        $val['max_digits'] = 32;
+                    }
+                    if (!isset($val['decimal_places'])) {
+                        $val['decimal_places'] = 8;
+                    }
+                    $_tmp = sprintf($this->mappings['float'], $val['max_digits'], $val['decimal_places']);
+                }
+                $sql .= $_tmp;
+                if (isset($val['default'])) {
+                    $sql .= ' default '.$this->con->esc($val['default']);
+                } elseif ($field->type != 'sequence') {
+                    $sql .= ' default '.$this->defaults[$field->type];
+                }
+                $sql .= ',';
+            } else {
+                $manytomany[] = $col;
+            }
+        }
+        $sql .= "\n".'primary key (`id`)';
+        $sql .= "\n".') ENGINE=MyISAM';
+        $sql .=' DEFAULT CHARSET=utf8;';
+        $tables[$this->con->pfx.$model->_a['table']] = $sql;
+        
+        //Now for the many to many
+        foreach ($manytomany as $many) {
+            $omodel = new $cols[$many]['model']();
+            $hay = array(strtolower($model->_a['model']), strtolower($omodel->_a['model']));
+            sort($hay);
+            $table = $hay[0].'_'.$hay[1].'_assoc';
+            $sql = 'CREATE TABLE `'.$this->con->pfx.$table.'` (';
+            $sql .= "\n".'`'.strtolower($model->_a['model']).'_id` '.$this->mappings['foreignkey'].' default 0,';
+            $sql .= "\n".'`'.strtolower($omodel->_a['model']).'_id` '.$this->mappings['foreignkey'].' default 0,';
+            $sql .= "\n".'primary key (`'.strtolower($model->_a['model']).'_id`, `'.strtolower($omodel->_a['model']).'_id`)';
+            $sql .= "\n".') ENGINE=MyISAM';
+            $sql .=' DEFAULT CHARSET=utf8;';
+            $tables[$this->con->pfx.$table] = $sql;
+        }
+        return $tables;
+    }
+
+    /**
+     * Get the SQL to generate the indexes of the given model.
+     *
+     * @param Object Model
+     * @return array Array of SQL strings ready to execute.
+     */
+    function getSqlIndexes($model)
+    {
+        $index = array();
+        foreach ($model->_a['idx'] as $idx => $val) {
+            if (!isset($val['col'])) {
+                $val['col'] = $idx;
+            }
+            $index[$this->con->pfx.$model->_a['table'].'_'.$idx] = 
+                sprintf('CREATE INDEX `%s` ON `%s` (`%s`);',
+                        $idx, $this->con->pfx.$model->_a['table'], $val['col']);
+        }
+        foreach ($model->_a['cols'] as $col => $val) {
+            $field = new $val['type']();
+            if ($field->type == 'foreignkey') {
+                $index[$this->con->pfx.$model->_a['table'].'_'.$col.'_foreignkey'] = 
+                    sprintf('CREATE INDEX `%s` ON `%s` (`%s`);',
+                            $col.'_foreignkey_idx', $this->con->pfx.$model->_a['table'], $col);
+            }
+            if (isset($val['unique']) and $val['unique'] == true) {
+                $index[$this->con->pfx.$model->_a['table'].'_'.$col.'_unique'] = 
+                    sprintf('CREATE UNIQUE INDEX `%s` ON `%s` (`%s`);',
+                        $col.'_unique_idx', $this->con->pfx.$model->_a['table'], $col);
+            }
+        }
+        return $index;
+    }
+
+    /**
+     * Get the SQL to drop the tables corresponding to the model.
+     *
+     * @param Object Model
+     * @return string SQL string ready to execute.
+     */
+    function getSqlDelete($model)
+    {
+        $cols = $model->_a['cols'];
+        $manytomany = array();
+        $sql = 'DROP TABLE IF EXISTS `'.$this->con->pfx.$model->_a['table'].'`';
+
+        foreach ($cols as $col => $val) {
+            $field = new $val['type']();
+            if ($field->type == 'manytomany') {
+                $manytomany[] = $col;
+            }
+        }
+        
+        //Now for the many to many
+        foreach ($manytomany as $many) {
+            $omodel = new $cols[$many]['model']();
+            $hay = array(strtolower($model->_a['model']), strtolower($omodel->_a['model']));
+            sort($hay);
+            $table = $hay[0].'_'.$hay[1].'_assoc';
+            $sql .= ', `'.$this->con->pfx.$table.'`';
+        }
+        return array($sql);
+
+    }
+}
diff --git a/src/Pluf/DB/Schema/PostgreSQL.php b/src/Pluf/DB/Schema/PostgreSQL.php
new file mode 100644
index 0000000..eedff82
--- /dev/null
+++ b/src/Pluf/DB/Schema/PostgreSQL.php
@@ -0,0 +1,210 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Generator of the schemas corresponding to a given model.
+ *
+ * This class is for PostgreSQL, you can create a class on the same
+ * model for another database engine.
+ */
+class Pluf_DB_Schema_PostgreSQL
+
+{
+    /**
+     * Mapping of the fields.
+     */
+    public $mappings = array(
+                             'varchar' => 'character varying',
+                             'sequence' => 'serial',
+                             'boolean' => 'boolean',
+                             'date' => 'date',
+                             'datetime' => 'timestamp',
+                             'file' => 'character varying',
+                             'manytomany' => null,
+                             'foreignkey' => 'integer',
+                             'text' => 'text',
+                             'html' => 'text',
+                             'time' => 'time',
+                             'integer' => 'integer',
+                             'email' => 'character varying',
+                             'password' => 'character varying',
+                             'float' => 'real',
+                             );
+
+    public $defaults = array(
+                             'varchar' => "''",
+                             'sequence' => null,
+                             'boolean' => 'FALSE',
+                             'date' => "'0001-01-01'",
+                             'datetime' => "'0001-01-01 00:00:00'",
+                             'file' => "''",
+                             'manytomany' => null,
+                             'foreignkey' => 0,
+                             'text' => "''",
+                             'html' => "''",
+                             'time' => "'00:00:00'",
+                             'integer' => 0,
+                             'email' => "''",
+                             'password' => "''",
+                             'float' => 0.0,
+
+                             );
+    private $con = null;
+
+    function __construct($con)
+    {
+        $this->con = $con;
+    }
+
+
+
+    /**
+     * Get the SQL to generate the tables of the given model.
+     *
+     * @param Object Model
+     * @return array Array of SQL strings ready to execute.
+     */
+    function getSqlCreate($model)
+    {
+        $tables = array();
+        $cols = $model->_a['cols'];
+        $manytomany = array();
+        $query = 'CREATE TABLE '.$this->con->pfx.$model->_a['table'].' (';
+        $sql_col = array();
+        $constraints = array();
+        foreach ($cols as $col => $val) {
+            $field = new $val['type']();
+            if ($field->type != 'manytomany') {
+                $sql = $this->con->qn($col).' ';
+                $sql .= $this->mappings[$field->type];
+                if (empty($val['is_null'])) {
+                    $sql .= ' NOT NULL';
+                }
+                if (isset($val['default'])) {
+                    $sql .= ' default ';
+                    $sql .= $model->_toDb($val['default'], $col);
+                } elseif ($field->type != 'sequence') {
+                    $sql .= ' default '.$this->defaults[$field->type];
+                }
+                $sql_col[] = $sql;
+            } else {
+                $manytomany[] = $col;
+            }
+            if ($field->type == 'foreignkey') {
+                // Add the foreignkey constraints
+                $referto = new $val['model']();
+                $_c = 'CONSTRAINT '.$this->con->pfx.$model->_a['table'].'_'.$col.'_fkey FOREIGN KEY ('.$this->con->qn($col).')
+      REFERENCES '.$this->con->pfx.$referto->_a['table'].' (id) MATCH SIMPLE
+      ON UPDATE NO ACTION ON DELETE NO ACTION';
+                $constraints[] = $_c;
+            }
+        }
+        $sql_col[] = 'CONSTRAINT '.$this->con->pfx.$model->_a['table'].'_pkey PRIMARY KEY (id)';
+        $sql_col = array_merge($sql_col, $constraints);
+        $query = $query."\n".implode(",\n", $sql_col)."\n".');';
+        $tables[$this->con->pfx.$model->_a['table']] = $query;
+        //Now for the many to many
+        //FIXME add index on the second column
+        foreach ($manytomany as $many) {
+            $omodel = new $cols[$many]['model']();
+            $hay = array(strtolower($model->_a['model']), strtolower($omodel->_a['model']));
+            sort($hay);
+            $table = $hay[0].'_'.$hay[1].'_assoc';
+            $sql = 'CREATE TABLE '.$this->con->pfx.$table.' (';
+            $sql .= "\n".strtolower($model->_a['model']).'_id '.$this->mappings['foreignkey'].' default 0,';
+            $sql .= "\n".strtolower($omodel->_a['model']).'_id '.$this->mappings['foreignkey'].' default 0,';
+            $sql .= "\n".'CONSTRAINT '.$this->con->pfx.$table.'_pkey PRIMARY KEY ('.strtolower($model->_a['model']).'_id, '.strtolower($omodel->_a['model']).'_id)';
+            $sql .= "\n".');';
+            $tables[$this->con->pfx.$table] = $sql;
+        }
+        return $tables;
+    }
+
+    /**
+     * Get the SQL to generate the indexes of the given model.
+     *
+     * @param Object Model
+     * @return array Array of SQL strings ready to execute.
+     */
+    function getSqlIndexes($model)
+    {
+        $index = array();
+        foreach ($model->_a['idx'] as $idx => $val) {
+            if (!isset($val['col'])) {
+                $val['col'] = $idx;
+            }
+            if ($val['type'] == 'unique') {
+                $unique = 'UNIQUE ';
+            } else {
+                $unique = '';
+            }
+            $index[$this->con->pfx.$model->_a['table'].'_'.$idx] = 
+                sprintf('CREATE '.$unique.'INDEX %s ON %s (%s);',
+                        $this->con->pfx.$model->_a['table'].'_'.$idx, 
+                        $this->con->pfx.$model->_a['table'], 
+                        $val['col']);
+        }
+        foreach ($model->_a['cols'] as $col => $val) {
+            $field = new $val['type']();
+            if (isset($val['unique']) and $val['unique'] == true) {
+                $index[$this->con->pfx.$model->_a['table'].'_'.$col.'_unique'] = 
+                    sprintf('CREATE UNIQUE INDEX %s ON %s (%s);',
+                            $this->con->pfx.$model->_a['table'].'_'.$col.'_unique_idx', 
+                            $this->con->pfx.$model->_a['table'], 
+                            $col);
+            }
+        }
+        return $index;
+    }
+
+    /**
+     * Get the SQL to drop the tables corresponding to the model.
+     *
+     * @param Object Model
+     * @return string SQL string ready to execute.
+     */
+    function getSqlDelete($model)
+    {
+        $cols = $model->_a['cols'];
+        $manytomany = array();
+        $sql = array();
+        $sql[] = 'DROP TABLE IF EXISTS '.$this->con->pfx.$model->_a['table'].' CASCADE';
+        foreach ($cols as $col => $val) {
+            $field = new $val['type']();
+            if ($field->type == 'manytomany') {
+                $manytomany[] = $col;
+            }
+        }
+        
+        //Now for the many to many
+        foreach ($manytomany as $many) {
+            $omodel = new $cols[$many]['model']();
+            $hay = array(strtolower($model->_a['model']), strtolower($omodel->_a['model']));
+            sort($hay);
+            $table = $hay[0].'_'.$hay[1].'_assoc';
+            $sql[] = 'DROP TABLE IF EXISTS '.$this->con->pfx.$table.' CASCADE';
+        }
+        return $sql;
+    }
+}
+
diff --git a/src/Pluf/DB/Schema/SQLite.php b/src/Pluf/DB/Schema/SQLite.php
new file mode 100644
index 0000000..5676992
--- /dev/null
+++ b/src/Pluf/DB/Schema/SQLite.php
@@ -0,0 +1,227 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Generator of the schemas corresponding to a given model.
+ *
+ * This class is for SQLite, you can create a class on the same
+ * model for another database engine.
+ */
+class Pluf_DB_Schema_SQLite
+
+{
+    /**
+     * Mapping of the fields.
+     */
+    public $mappings = array(
+                             'varchar' => 'varchar(%s)',
+                             'sequence' => 'integer primary key autoincrement',
+                             'boolean' => 'bool',
+                             'date' => 'date',
+                             'datetime' => 'datetime',
+                             'file' => 'varchar(150)',
+                             'manytomany' => null,
+                             'foreignkey' => 'integer',
+                             'text' => 'text',
+                             'html' => 'text',
+                             'time' => 'time',
+                             'integer' => 'integer',
+                             'email' => 'varchar(150)',
+                             'password' => 'varchar(150)',
+                             'float' => 'real',
+                             );
+
+    public $defaults = array(
+                             'varchar' => "''",
+                             'sequence' => null,
+                             'boolean' => 1,
+                             'date' => 0,
+                             'datetime' => 0,
+                             'file' => "''",
+                             'manytomany' => null,
+                             'foreignkey' => 0,
+                             'text' => "''",
+                             'html' => "''",
+                             'time' => 0,
+                             'integer' => 0,
+                             'email' => "''",
+                             'password' => "''",
+                             'float' => 0.0,
+
+                             );
+    private $con = null;
+
+    function __construct($con)
+    {
+        $this->con = $con;
+    }
+
+
+
+    /**
+     * Get the SQL to generate the tables of the given model.
+     *
+     * @param Object Model
+     * @return array Array of SQL strings ready to execute.
+     */
+    function getSqlCreate($model)
+    {
+        $tables = array();
+        $cols = $model->_a['cols'];
+        $manytomany = array();
+        $query = 'CREATE TABLE '.$this->con->pfx.$model->_a['table'].' (';
+        $sql_col = array();
+        foreach ($cols as $col => $val) {
+            $field = new $val['type']();
+            if ($field->type != 'manytomany') {
+                $sql = $this->con->qn($col).' ';
+                $_tmp = $this->mappings[$field->type];
+                if ($field->type == 'varchar') {
+                    if (isset($val['size'])) {
+                        $_tmp = sprintf($this->mappings['varchar'], $val['size']);
+                    } else {
+                        $_tmp = sprintf($this->mappings['varchar'], '150');
+                    }
+                }
+                if ($field->type == 'float') {
+                    if (!isset($val['max_digits'])) {
+                        $val['max_digits'] = 32;
+                    }
+                    if (!isset($val['decimal_places'])) {
+                        $val['decimal_places'] = 8;
+                    }
+                    $_tmp = sprintf($this->mappings['float'], $val['max_digits'], $val['decimal_places']);
+                }
+                $sql .= $_tmp;
+                if (empty($val['is_null'])) {
+                    $sql .= ' not null';
+                }
+                if (isset($val['default'])) {
+                    $sql .= ' default '.$model->_toDb($val['default'], $col);
+                } elseif ($field->type != 'sequence') {
+                    $sql .= ' default '.$this->defaults[$field->type];
+                }
+                $sql_col[] = $sql;
+            } else {
+                $manytomany[] = $col;
+            }
+        }
+        $query = $query."\n".implode(",\n", $sql_col)."\n".');';
+        $tables[$this->con->pfx.$model->_a['table']] = $query;
+        
+        //Now for the many to many
+        foreach ($manytomany as $many) {
+            $omodel = new $cols[$many]['model']();
+            $hay = array(strtolower($model->_a['model']), strtolower($omodel->_a['model']));
+            sort($hay);
+            $table = $hay[0].'_'.$hay[1].'_assoc';
+            $sql = 'CREATE TABLE '.$this->con->pfx.$table.' (';
+            $sql .= "\n".strtolower($model->_a['model']).'_id '.$this->mappings['foreignkey'].' default 0,';
+            $sql .= "\n".strtolower($omodel->_a['model']).'_id '.$this->mappings['foreignkey'].' default 0,';
+            $sql .= "\n".'primary key ('.strtolower($model->_a['model']).'_id, '.strtolower($omodel->_a['model']).'_id)';
+            $sql .= "\n".');';
+            $tables[$this->con->pfx.$table] = $sql;
+        }
+        return $tables;
+    }
+
+    /**
+     * Get the SQL to generate the indexes of the given model.
+     *
+     * @param Object Model
+     * @return array Array of SQL strings ready to execute.
+     */
+    function getSqlIndexes($model)
+    {
+        $index = array();
+        foreach ($model->_a['idx'] as $idx => $val) {
+            if (!isset($val['col'])) {
+                $val['col'] = $idx;
+            }
+            if (false !== strpos($val['col'], ',')) {
+                $out = array();
+                foreach (explode(',', $val['col']) as $col) {
+                    $out[] = $this->con->qn(trim($col));
+                }
+                $val['col'] = implode(', ', $out);
+            } else {
+                $val['col'] = $this->con->qn($val['col']);
+            }
+            $index[$this->con->pfx.$model->_a['table'].'_'.$idx] = 
+                sprintf('CREATE INDEX %s ON %s (%s);',
+                        $this->con->pfx.$model->_a['table'].'_'.$idx, 
+                        $this->con->pfx.$model->_a['table'], 
+                        $val['col']);
+        }
+        foreach ($model->_a['cols'] as $col => $val) {
+            $field = new $val['type']();
+            if ($field->type == 'foreignkey') {
+                $index[$this->con->pfx.$model->_a['table'].'_'.$col.'_foreignkey'] = 
+                    sprintf('CREATE INDEX %s ON %s (%s);',
+                            $this->con->pfx.$model->_a['table'].'_'.$col.'_foreignkey_idx', 
+                            $this->con->pfx.$model->_a['table'], 
+                            $this->con->qn($col));
+            }
+            if (isset($val['unique']) and $val['unique'] == true) {
+                $index[$this->con->pfx.$model->_a['table'].'_'.$col.'_unique'] = 
+                    sprintf('CREATE UNIQUE INDEX %s ON %s (%s);',
+                            $this->con->pfx.$model->_a['table'].'_'.$col.'_unique_idx', 
+                            $this->con->pfx.$model->_a['table'], 
+                            $this->con->qn($col));
+            }
+        }
+        return $index;
+    }
+
+    /**
+     * Get the SQL to drop the tables corresponding to the model.
+     *
+     * @param Object Model
+     * @return string SQL string ready to execute.
+     */
+    function getSqlDelete($model)
+    {
+        $cols = $model->_a['cols'];
+        $manytomany = array();
+        $sql = array();
+        $sql[] = 'DROP TABLE IF EXISTS '.$this->con->pfx.$model->_a['table'];
+        foreach ($cols as $col => $val) {
+            $field = new $val['type']();
+            if ($field->type == 'manytomany') {
+                $manytomany[] = $col;
+            }
+        }
+        
+        //Now for the many to many
+        foreach ($manytomany as $many) {
+            $omodel = new $cols[$many]['model']();
+            $hay = array(strtolower($model->_a['model']), strtolower($omodel->_a['model']));
+            sort($hay);
+            $table = $hay[0].'_'.$hay[1].'_assoc';
+            $sql[] = 'DROP TABLE IF EXISTS '.$this->con->pfx.$table;
+        }
+        return $sql;
+
+    }
+}
+
diff --git a/src/Pluf/DB/SchemaInfo.php b/src/Pluf/DB/SchemaInfo.php
new file mode 100644
index 0000000..ba81f1a
--- /dev/null
+++ b/src/Pluf/DB/SchemaInfo.php
@@ -0,0 +1,53 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_DB_SchemaInfo extends Pluf_Model
+{
+    public $_model = __CLASS__;
+
+    function init()
+    {
+        $this->_a['table'] = 'schema_info';
+        $this->_a['model'] = 'Pluf_DB_SchemaInfo';
+        $this->_a['cols'] = array(
+                             // It is mandatory to have an "id" column.
+                            'id' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Sequence',
+                                  //It is automatically added.
+                                  'blank' => true, 
+                                  ),
+                            'application' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Varchar',
+                                  'blank' => false,
+                                  'unique' => true,
+                                  ),
+                            'version' => 
+                            array(
+                                  'type' => 'Pluf_DB_Field_Integer',
+                                  'blank' => false,
+                                  ),
+                            );
+    }
+}
diff --git a/src/Pluf/Date.php b/src/Pluf/Date.php
new file mode 100644
index 0000000..7ff9004
--- /dev/null
+++ b/src/Pluf/Date.php
@@ -0,0 +1,186 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+
+class Pluf_Date
+{
+    /**
+     * Get a GM Date in the format YYYY-MM-DD HH:MM:SS and returns a
+     * string with the given format in the current timezone.
+     *
+     * @param string GMDate
+     * @param string Format to be given to strftime ('%Y-%m-%d %H:%M:%S')
+     * @return string Formated GMDate into the local time
+     */
+     public static function gmDateToString($gmdate, $format='%Y-%m-%d %H:%M:%S')
+     {
+         $time = strtotime($gmdate.'Z');
+         return strftime($format, $time);
+     }
+
+     /**
+      * Day compare.
+      *
+      * Compare if the first date is before or after the second date.
+      * Returns:
+      *    0 if the days are the same.
+      *    1 if the first date is before the second.
+      *   -1 if the first date is after the second.
+      *
+      * @param string YYYY-MM-DD date.
+      * @param string YYYY-MM-DD date (today local time).
+      * @return int
+      */
+     public static function dayCompare($date1, $date2=null)
+     {
+         $date2 = (is_null($date2)) ? date('Y-m-d') : $date2;
+         if ($date2 == $date1) return 0;
+         if ($date1 > $date2) return -1;
+         return 1;
+     }
+}
+
+/**
+ * Set of functions to manage dates.
+ */
+
+/**
+ * Compare two date and returns the number of seconds between the
+ * first and the second. If only the date is given without time, the
+ * end of the day is used (23:59:59).
+ *
+ * @param string Date to compare for ex: '2006-09-17 18:42:00'
+ * @param string Second date to compare if null use now (null)
+ * @return int Number of seconds between the two dates. Negative 
+ *             value if the second date is before the first. 
+ */
+function Pluf_Date_Compare($date1, $date2=null)
+{
+    if (strlen($date1) == 10) {
+        $date1 .= ' 23:59:59';
+    }
+    if (is_null($date2)) {
+        $date2 = time();
+    } else {
+        if (strlen($date2) == 10) {
+            $date2 .= ' 23:59:59';
+        }
+        $date2 = strtotime(str_replace('-', '/', $date2));
+    }
+    $date1 = strtotime(str_replace('-', '/', $date1));
+    return $date2 - $date1;
+}
+
+/**
+ * Display a date in the format:
+ * X days Y hours ago
+ * X hours Y minutes ago
+ * X hours Y minutes left
+ *
+ * "resolution" is year, month, day, hour, minute.
+ *
+ * If not time is given, only the day, the end of the day is
+ * used: 23:59:59.
+ *
+ * @param string Date to compare with ex: '2006-09-17 18:42:00'
+ * @param string Reference date to compare with by default now (null)
+ * @param int Maximum number of elements to show (2)
+ * @param string If no delay between the two dates display ('now')
+ * @param bool Show ago/left suffix
+ * @return string Formatted date
+ */
+function Pluf_Date_Easy($date, $ref=null, $blocks=2, $notime='now', $show=true)
+{
+    if (strlen($date) == 10) {
+        $date .= ' 23:59:59';
+    }
+    if (is_null($ref)) {
+        $ref = date('Y-m-d H:i:s'); 
+        $tref = time();
+    } else {
+        if (strlen($ref) == 10) {
+            $ref .= ' 23:59:59';
+        }
+        $tref = strtotime(str_replace('-', '/', $ref));
+    }
+    $tdate = strtotime(str_replace('-', '/', $date));
+    $past = true;
+    if ($tref < $tdate) {
+        // date in the past
+        $past = false;
+        $_tmp = $ref;
+        $ref = $date;
+        $date = $_tmp;
+    }
+    $ref = str_replace(array(' ', ':'), '-', $ref);
+    $date = str_replace(array(' ', ':'), '-', $date);
+    $refs = split('-', $ref);
+    $dates = split('-', $date);
+    // Modulo on the month is dynamically calculated after
+    $modulos = array(365, 12, 31, 24, 60, 60);
+    // day in month 
+    $month = $refs[1] - 1;
+    $modulos[2] = date('t', mktime(0, 0, 0, $month, 1, $refs[0]));
+    $diffs = array();
+    for ($i=0; $i<6; $i++) {
+        $diffs[$i] = $refs[$i] - $dates[$i];
+    }
+    $retain = 0;
+    for ($i=5; $i>-1; $i--) {
+        $diffs[$i] = $diffs[$i] - $retain;
+        $retain = 0;
+        if ($diffs[$i] < 0) {
+            $diffs[$i] = $modulos[$i] + $diffs[$i];
+            $retain = 1;
+        }
+    }
+    $val = array(__('year'), __('month'), __('day'), __('hour'),
+                 __('minute'), __('second'));
+    $vals = array(__('years'), __('months'), __('days'), __('hours'),
+                 __('minutes'), __('seconds'));
+    $res = '';
+    $total = 0;
+    for ($i=0; $i<5; $i++) {
+        if ($diffs[$i] > 0) {
+            $total++;
+            $res .= $diffs[$i].' ';
+            if ($diffs[$i] > 1) {
+                $res .= $vals[$i].' ';
+            } else {
+                $res .= $val[$i].' ';
+            }
+        }
+        if ($total >= $blocks) break;
+    }
+    if (strlen($res) == 0) {
+        return $notime;
+    }
+    if ($show) {
+        if ($past) {
+            $res .= ' '.__('ago');
+        } else {
+            $res .= ' '.__('left');
+        }
+    }
+    return $res;
+}
diff --git a/src/Pluf/Dispatcher.php b/src/Pluf/Dispatcher.php
new file mode 100644
index 0000000..b62ff61
--- /dev/null
+++ b/src/Pluf/Dispatcher.php
@@ -0,0 +1,221 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_Dispatcher
+{
+    /**
+     * The unique method to call.
+     *
+     * @param string Query string ('')
+     */
+    public static function dispatch($query='')
+    {
+		$query = preg_replace('#^(/)+#', '/', '/'.$query);
+        $req = new Pluf_HTTP_Request($query);
+        $middleware = array();
+        foreach (Pluf::f('middleware_classes', array()) as $mw) {
+            $middleware[] = new $mw();
+        }
+        $skip = false;
+        foreach ($middleware as $mw) {
+            if (method_exists($mw, 'process_request')) {
+                $response = $mw->process_request($req);
+                if ($response !== false) {
+                    // $response is a response
+                    $response->render($req->method != 'HEAD' and !defined('IN_UNIT_TESTS'));
+                    $skip = true;
+                    break;
+                }    
+            }
+        }
+        if ($skip === false) {   
+            $response = self::match($req);
+            if (!empty($req->response_vary_on)) {
+                $response->headers['Vary'] = $req->response_vary_on;
+            }
+            $middleware = array_reverse($middleware);
+            foreach ($middleware as $mw) {
+                if (method_exists($mw, 'process_response')) {
+                    $response = $mw->process_response($req, $response);
+                }    
+            }
+            $response->render($req->method != 'HEAD' and !defined('IN_UNIT_TESTS'));
+        }
+        return array($req, $response);
+    }
+
+    /**
+     * Match a query against the actions controllers.
+     *
+     * @param Pluf_HTTP_Request Request object
+     * @return Pluf_HTTP_Response Response object
+     */
+    public static function match($req)
+    {
+        // Order the controllers by priority
+        foreach ($GLOBALS['_PX_views'] as $key => $control) {
+            $priority[$key] = $control['priority'];
+        }
+        array_multisort($priority, SORT_ASC, $GLOBALS['_PX_views']);
+        foreach ($GLOBALS['_PX_views'] as $key => $ctl) {
+            $match = array();
+            if (preg_match($ctl['regex'], $req->query, $match)) {
+                try {
+                    $req->view = $ctl;
+                    $m = new $ctl['model']();
+                    if (isset($m->{$ctl['method'].'_precond'})) {
+                        // Here we have preconditions to respects. If
+                        // the "answer" is true, then ok go ahead, if
+                        // not then it a response so return it or an
+                        // exception so let it go.
+                        $preconds = $m->{$ctl['method'].'_precond'};
+                        if (!is_array($preconds)) {
+                            $preconds = array($preconds);
+                        }
+                        foreach ($preconds as $precond) {
+                            $res = call_user_func(explode('::', $precond), $req);
+                            if ($res !== true) {
+                                return $res;
+                            }
+                        } 
+                    }
+                    if (!isset($ctl['params'])) {
+                        return $m->$ctl['method']($req, $match);
+                    } else {
+                        return $m->$ctl['method']($req, $match, $ctl['params']);
+                    }
+                } catch (Pluf_HTTP_Error404 $e) {
+                    // Need to add a 404 error handler
+                    // something like Pluf::f('404_handler', 'class::method')
+                } catch (Exception $e) {
+                    if (Pluf::f('debug', false) == true) {
+                        return new Pluf_HTTP_Response_ServerErrorDebug($e);
+                    } else {
+                        return new Pluf_HTTP_Response_ServerError($e);
+                    }
+                }
+            }
+        }
+        return new Pluf_HTTP_Response_NotFound(sprintf(__('The page <em>%s</em> was not found on the server.'), htmlspecialchars($req->query)));
+    }
+
+    /**
+     * Load the controllers.
+     *
+     * @param string File including the views.
+     * @param string Possible prefix to add to the views.
+     * @return bool Success.
+     */
+    public static function loadControllers($file, $prefix='')
+    {
+        if (file_exists($file)) {
+            if ($prefix == '') {
+                $GLOBALS['_PX_views'] = include $file;
+            } else {
+                $GLOBALS['_PX_views'] = Pluf_Dispatcher::addPrefixToViewFile($prefix, $file);
+            }
+            return true;
+        }
+        return false;
+	}
+
+
+    /**
+     * Register an action controller.
+     *
+     * - The class must provide a "standalone" action method
+     * class::actionmethod($request, $match)
+     * - The priority is to order the controller matches. 
+     * 5: Default, if the controller provides some content
+     * 1: If the controller provides a control before, without providing
+     * content, note that in this case the return code must be a redirection.
+     * 8: If the controller is providing a catch all case to replace the
+     * default 404 error page.
+     *
+     * @param string Class name providing the action controller
+     * @param string The method of the plugin to be called
+     * @param string Regex to match on the query string
+     * @param int Priority (5)
+     * @return void
+     */
+    public static function registerController($model, $method, $regex, $priority=5)
+    {
+        if (!isset($GLOBALS['_PX_views'])) {
+            $GLOBALS['_PX_views'] = array();
+        }
+        $GLOBALS['_PX_views'][] = array('model' => $model,
+                                        'regex' => $regex,
+                                        'priority' => $priority,
+                                        'method' => $method);
+    }
+
+    /**
+     * Add the controllers of an application with a given prefix.
+     *
+     * Suppose you have a new app you want to use within another
+     * existing application, you may need to change the base URL not
+     * to conflict with the existing one. For example you want to have
+     * domain.com/forum-a/ and domain.com/forum-b/ to use 2 forums at
+     * the same time. 
+     *
+     * This method do that, it takes a typical "view" file and rewrite
+     * the regex to append the prefix. Note that you should use the
+     * 'url' tag in the template and use Pluf_HTTP_URL_reverse in the
+     * views to not hardcode the urls or this will not work.
+     *
+     * @param string Prefix, for example '/alternate'.
+     * @param string File with the views.
+     * @return array Prefixed views.
+     */
+    static public function addPrefixToViewFile($prefix, $file)
+    {
+        if (file_exists($file)) {
+            $views = include $file;
+        } else {
+            throw new Exception('View file not found: '.$file);
+        }
+        return Pluf_Dispatcher::addPrefixToViews($prefix, $views);
+    }
+
+    /**
+     * Add a prefix to an array of views. 
+     *
+     * You can use it for example to not hardcode that in your CMS the
+     * blog is located as /blog but is configured in the configuration
+     * of the CMS, that way in French this could be /carnet.
+     *
+     * @param string Prefix, for example '/alternate'.
+     * @param array Array of the views.
+     * @return array Prefixed views.
+     */
+    static public function addPrefixToViews($prefix, $views)
+    {
+        $res = array();
+        foreach ($views as $view) {
+            $view['regex'] = '#^'.$prefix.substr($view['regex'], 2);
+            $res[] = $view;
+        }
+        return $res;
+    }
+}
+
diff --git a/src/Pluf/Encoder.php b/src/Pluf/Encoder.php
new file mode 100644
index 0000000..17b1bc5
--- /dev/null
+++ b/src/Pluf/Encoder.php
@@ -0,0 +1,186 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Validators are functions used to validate user/program input.
+ *
+ * A validator signature is:
+ * my_validator($field_data, $params=array())
+ * with $params an associative array of parameters.
+ *
+ * 
+ * A validator must fail on an empty string by raising an
+ * Pluf_Form_Invalid Exception or return the data in the right format
+ * (string, bool, whatever).
+ *
+ * FIXME: Escape the strings when bad strings are sent in the error message.
+ */
+class Pluf_Encoder
+{
+    /**
+     * Store the complete form data if validation is coming from a form.
+     */
+    protected $form = array();
+
+    /**
+     * Set the form data.
+     *
+     * @param &array Reference to the form data
+     */
+    function setFormData(&$form)
+    {
+        $this->form = $form;
+    }
+
+    /**
+     * Check if could be empty or not.
+     */
+    function checkEmpty($data, $form=array(), $p=array())
+    {
+        if (strlen($data) == 0 
+            and isset($p['blank']) and false == $p['blank']) {
+            throw new Pluf_Form_Invalid(__('The value must not be empty.'));
+        }
+        return true;
+    }
+
+
+    /**
+     * Validate an url. 
+     * Only the structure is checked, no check of availability of the
+     * url is performed. It is a really basic validation.
+     */
+    static function url($url, $form=array(), $p=array())
+    {
+        $ip = '(25[0-5]|2[0-4]\d|[0-1]?\d?\d)(\.'
+            .'(25[0-5]|2[0-4]\d|[0-1]?\d?\d)){3}';
+        $dom = '([a-z0-9\.\-]+)';
+        if (preg_match('!^(http|https|ftp|gopher)\://('.$ip.'|'.$dom.')!i', $url)) {
+            return $url;
+        } else {
+            throw new Pluf_Form_Invalid(sprintf(__('The URL <em>%s</em> is not valid.'), htmlspecialchars($url)));
+        }
+    }
+
+    static function varchar($string, $form=array(), $p=array())
+    {
+        if (isset($p['size']) && strlen($string) > $p['size']) {
+            throw new Pluf_Form_Invalid(sprintf(__('The value should not be more than <em>%s</em> characters long.'), $p['size']));
+        }
+        return $string;
+    }
+
+    static function password($string, $form=array(), $p=array())
+    {
+        if (strlen($string) < 6) {
+            throw new Pluf_Form_Invalid(sprintf(__('The password must be at least <em>%s</em> characters long.'), '6'));
+        }
+        return $string;
+    }
+
+    static function email($string, $form=array(), $p=array())
+    {
+        if (preg_match('/^[A-Z0-9._%-][+A-Z0-9._%-]*@(?:[A-Z0-9-]+\.)+[A-Z]{2,4}$/i', $string)) {
+            return $string;
+        } else {
+            throw new Pluf_Form_Invalid(sprintf(__('The email address "%s" is not valid.'),
+                                      $string));
+        }
+    }
+
+    static function text($string, $form=array(), $p=array())
+    {
+        return Pluf_Encoder::varchar($string, $form, $p);
+    }
+
+
+    static function sequence($id, $form=array(), $p=array())
+    {
+        return Pluf_Encoder::integer($id, $p);
+    }
+
+    static function boolean($bool, $form=array(), $p=array())
+    {
+        if (in_array($bool, array('on', 'y', '1', 1, true))) {
+            return true;
+        }
+        return false;
+    }
+
+    static function foreignkey($id, $form=array(), $p=array())
+    {
+        return Pluf_Encoder::integer($id, $p);
+    }
+
+    static function integer($int, $form=array(), $p=array())
+    {
+        if (!preg_match('/[0-9]+/', $int)) {
+            throw new Pluf_Form_Invalid(__('The value must be an integer.'));
+        }
+        return (int) $int;
+    }
+
+    static function datetime($datetime, $form=array(), $p=array())
+    {
+        if (false === ($stamp = strtotime($datetime))) {
+            throw new Pluf_Form_Invalid(sprintf(__('The date and time <em>%s</em> are not valid.'), htmlspecialchars($datetime)));
+        }
+        //convert to GMT
+        return gmdate('Y-m-d H:i:s', $stamp);
+    }
+    
+    static function date($date, $form=array(), $p=array())
+    {
+        $ymd = explode('-', $date);
+        if (count($ymd) != 3  or strlen($ymd[0]) != 4 
+            or false === checkdate($ymd[1], $ymd[2], $ymd[0])) {
+            throw new Pluf_Form_Invalid(sprintf(__('The date <em>%s</em> is not valid.'), htmlspecialchars($date)));
+        }
+        return $date;
+    }
+
+    static function manytomany($vals, $form=array(), $p=array())
+    {
+        $res = array();
+        foreach ($vals as $val) {
+            $res[] = Pluf_Encoder::integer($val);
+        }
+        return $res;
+    }
+
+    static function float($val, $form=array(), $p=array())
+    {
+        return (float) $val;
+    }
+
+    /*
+                             'file' => "''",
+                             'manytomany' => null,
+                             'foreignkey' => 0,
+                             'text' => "''",
+                             'html' => "''",
+                             'time' => 0,
+                             'integer' => 0,
+                             );
+    */
+}
diff --git a/src/Pluf/Error.php b/src/Pluf/Error.php
new file mode 100644
index 0000000..db723bc
--- /dev/null
+++ b/src/Pluf/Error.php
@@ -0,0 +1,117 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume CMS, a website management application.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume CMS is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume CMS 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+
+/**
+ * Error handling class.
+ *
+ * @credits Basis idea from Olivier Meunier
+ */
+class Pluf_Error
+{
+    private $error = array(); /**< Current errors. */
+
+
+    /**
+     * Reset the errors
+     */
+    function resetError()
+    {
+        $this->error = array();
+    }
+
+    /**
+     * Set an error.
+     *
+     * By convention the number is 4xx if the error is coming from
+     * the user or 5xx if coming from the system (database error for ex.)
+     *
+     * @param string Error message
+     * @param int Error number (0)
+     */
+    function setError($msg, $no=0)
+    {
+        $this->error[] = array($no,$msg);
+    }
+
+    
+    /**
+     * Returns the errors.
+     *
+     * @param bool Errors as HTML list (false)
+     * @param bool Show numbers (true)
+     * @return mixed array of errors, HTML list, or false if no errors
+     */
+    function error($html=false, $with_nb=true)
+    {
+        if (count($this->error) > 0) {
+            if (!$html) {
+                return $this->error;
+            } else {
+                $res = '<ul>'."\n";
+                foreach($this->error as $v) {
+                    $res .= '<li>'.
+                        (($with_nb) ? 
+                         '<span class="errno">'.$v[0].'</span> - ' : 
+                         '').
+                        '<span class="errmsg">'.$v[1].'</span></li>'."\n";
+                }
+                return $res."</ul>\n";
+            }
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Helper function to set the error from the DB.
+     *
+     * @param string Error message from the DB
+     */
+    function setDbError($db_error_msg)
+    {
+        $this->setError(__('DB error:').' '.$db_error_msg, 500);
+    }
+
+    /**
+     * Bulk set errors.
+     *
+     * Used when you went to recopy the errors of one object into
+     * another. You can call that way:
+     * $object->bulkSetErrors($otherobject->error());
+     *
+     * @param array List of errors
+     * @return bool Success
+     */
+    function bulkSetError($errors)
+    {
+        if (!is_array($errors)) {
+            return false;
+        }
+        foreach ($errors as $e) {
+            $this->setError($e[1], $e[0]);
+        }
+        return true;
+    }
+
+}
diff --git a/src/Pluf/Exception.php b/src/Pluf/Exception.php
new file mode 100644
index 0000000..22d1082
--- /dev/null
+++ b/src/Pluf/Exception.php
@@ -0,0 +1,26 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_Exception extends Exception
+{
+}
\ No newline at end of file
diff --git a/src/Pluf/Exception/NotImplemented.php b/src/Pluf/Exception/NotImplemented.php
new file mode 100644
index 0000000..df1ec3f
--- /dev/null
+++ b/src/Pluf/Exception/NotImplemented.php
@@ -0,0 +1,26 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_Exception_NotImplemented extends Pluf_Exception
+{
+}
\ No newline at end of file
diff --git a/src/Pluf/Form.php b/src/Pluf/Form.php
new file mode 100644
index 0000000..0572359
--- /dev/null
+++ b/src/Pluf/Form.php
@@ -0,0 +1,375 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Form validation class. 
+ *
+ * This class is used to generate a form. You basically build it the
+ * same way you build a model.
+ *
+ * The form handling is heavily inspired by the Django form handling.
+ *
+ */
+class Pluf_Form implements Iterator
+{
+    /**
+     * The fields of the form. 
+     *
+     * They are the fully populated Pluf_Form_Field_* of the form. You
+     * define them in the initFields method.
+     */
+    public $fields = array();
+
+    /**
+     * Prefix for the names of the fields.
+     */
+    public $prefix = '';
+    public $id_fields = 'id_%s';
+    public $data = array();
+    public $cleaned_data = array();
+    public $errors = array();
+    public $is_bound = false;
+    public $f = null;
+    public $label_suffix = ':';
+
+    protected $is_valid = null;
+
+    function __construct($data=null, $extra=array(), $label_suffix=null)
+    {
+        if ($data !== null) {
+            $this->data = $data;
+            $this->is_bound = true;
+        }
+        if ($label_suffix !== null) $this->label_suffix = $label_suffix;
+
+        $this->initFields($extra);
+        $this->f = new Pluf_Form_FieldProxy($this);
+    }
+
+    function initFields($extra=array())
+    {
+        throw new Exception('Definition of the fields not implemented.');
+    }
+
+    /**
+     * Add the prefix to the form names.
+     *
+     * @param string Field name.
+     * @return string Field name or field name with form prefix.
+     */
+    function addPrefix($field_name)
+    {
+        if ('' !== $this->prefix) {
+            return $this->prefix.'-'.$field_name;
+        }
+        return $field_name;
+    }
+
+    /**
+     * Check if the form is valid.
+     *
+     * It is also encoding the data in the form to be then saved.  It
+     * is very simple as it leaves the work to the field. It means
+     * that you can easily extend this form class to have a more
+     * complex validation procedure like checking if a field is equals
+     * to another in the form (like for password confirmation) etc.
+     *
+     * @param array Associative array of the request
+     * @return array Array of errors
+     */
+    function isValid()
+    {
+        if ($this->is_valid !== null) {
+            return $this->is_valid;
+        }
+        $this->cleaned_data = array();
+        $this->errors = array();
+        $form_methods = get_class_methods($this);
+        foreach ($this->fields as $name=>$field) {
+            $value = $field->widget->valueFromFormData($this->addPrefix($name),
+                                                       $this->data); 
+            try {
+                $value = $field->clean($value);
+                $this->cleaned_data[$name] = $value;
+                if (in_array('clean_'.$name, $form_methods)) {
+                    $m = 'clean_'.$name;
+                    $value = $this->$m();
+                    $this->cleaned_data[$name] = $value;
+                }                        
+            } catch (Pluf_Form_Invalid $e) {
+                if (!isset($this->errors[$name])) $this->errors[$name] = array();
+                $this->errors[$name][] = $e->getMessage();
+                if (isset($this->cleaned_data[$name])) {
+                    unset($this->cleaned_data[$name]);
+                }
+            }
+        }
+        if (empty($this->errors)) {
+            try {
+                $this->cleaned_data = $this->clean();
+            } catch (Pluf_Form_Invalid $e) {
+                if (!isset($this->errors['__all__'])) $this->errors['__all__'] = array();
+                $this->errors['__all__'][] = $e->getMessage();
+            }
+        }
+        if (empty($this->errors)) {
+            $this->is_valid = true;
+            return true;
+        } 
+        // as some errors, we do not have cleaned data available.
+        $this->cleaned_data = array();
+        $this->is_valid = false;
+        return false;
+    }
+
+    /**
+     * Form wide cleaning function. That way you can check that if an
+     * input is given, then another one somewhere is also given,
+     * etc. If the cleaning is not ok, your method must throw a
+     * Pluf_Form_Invalid exception.
+     *
+     * @return array Cleaned data.
+     */
+    public function clean()
+    {
+        return $this->cleaned_data;
+    }
+
+    /**
+     * Get initial data for a given field.
+     *
+     * @param string Field name.
+     * @return string Initial data or '' of not defined.
+     */
+    public function initial($name)
+    {
+        if (isset($this->fields[$name])) {
+            return $this->fields[$name]->initial;
+        }
+        return '';
+    }
+
+    /**
+     * Get the top errors.
+     */
+    public function render_top_errors()
+    {
+        $top_errors = (isset($this->errors['__all__'])) ? $this->errors['__all__'] : array();
+        array_walk($top_errors, 'Pluf_Form_htmlspecialcharsArray');
+        return new Pluf_Template_SafeString(Pluf_Form_renderErrorsAsHTML($top_errors), true);
+    }
+
+    /**
+     * Get the top errors.
+     */
+    public function get_top_errors()
+    {
+        return (isset($this->errors['__all__'])) ? $this->errors['__all__'] : array();
+    }
+
+    /**
+     * Helper function to render the form.
+     *
+     * See render_p() for a usage example.
+     *
+     * @credit Django Project (http://www.djangoproject.com/)
+     * @param string Normal row.
+     * @param string Error row.
+     * @param string Row ender.
+     * @param string Help text HTML.
+     * @param bool Should we display errors on a separate row.
+     * @return string HTML of the form.
+     */
+    protected function htmlOutput($normal_row, $error_row, $row_ender, 
+                                  $help_text_html, $errors_on_separate_row)
+    {
+        $top_errors = (isset($this->errors['__all__'])) ? $this->errors['__all__'] : array();
+        array_walk($top_errors, 'Pluf_Form_htmlspecialcharsArray');
+        $output = array();
+        $hidden_fields = array();
+        foreach ($this->fields as $name=>$field) {
+            $bf = new Pluf_Form_BoundField($this, $field, $name);
+            $bf_errors = $bf->errors;
+            array_walk($bf_errors, 'Pluf_Form_htmlspecialcharsArray');
+            if ($field->widget->is_hidden) {
+                foreach ($bf_errors as $_e) {
+                    $top_errors[] = sprintf(__('(Hidden field %1$s) %2$s'),
+                                            $name, $_e);
+                }
+                $hidden_fields[] = $bf; // Not rendered
+            } else {
+                if ($errors_on_separate_row and count($bf_errors)) {
+                    $output[] = sprintf($error_row, Pluf_Form_renderErrorsAsHTML($bf_errors));
+                }
+                if (strlen($bf->label) > 0) {
+                    $label = htmlspecialchars($bf->label, ENT_COMPAT, 'UTF-8');
+                    if ($this->label_suffix) {
+                        if (!in_array(mb_substr($label, -1, 1), 
+                                      array(':','?','.','!'))) {
+                            $label .= $this->label_suffix;
+                        }
+                    }
+                    $label = $bf->labelTag($label);
+                } else {
+                    $label = '';
+                }
+                if ($bf->help_text) {
+                    // $bf->help_text can contains HTML and is not
+                    // escaped.
+                    $help_text = sprintf($help_text_html, $bf->help_text);
+                } else {
+                    $help_text = '';
+                }
+                $errors = '';
+                if (!$errors_on_separate_row and count($bf_errors)) {
+                    $errors = Pluf_Form_renderErrorsAsHTML($bf_errors);
+                }
+                $output[] = sprintf($normal_row, $errors, $label, 
+                                    $bf->render_w(), $help_text);
+            }
+        }
+        if (count($top_errors)) {
+            $errors = sprintf($error_row, 
+                              Pluf_Form_renderErrorsAsHTML($top_errors));
+            array_unshift($output, $errors);
+        }
+        if (count($hidden_fields)) {
+            $_tmp = '';
+            foreach ($hidden_fields as $hd) {
+                $_tmp .= $hd->render_w();
+            }
+            if (count($output)) {
+                $last_row = array_pop($output);
+                $last_row = substr($last_row, 0, -strlen($row_ender)).$_tmp
+                    .$row_ender;
+                $output[] = $last_row;
+            } else {
+                $output[] = $_tmp;
+            }
+
+        }
+        return new Pluf_Template_SafeString(implode("\n", $output), true);
+    }
+
+    /**
+     * Render the form as a list of paragraphs.
+     */
+    public function render_p()
+    {
+        return $this->htmlOutput('<p>%1$s%2$s %3$s%4$s</p>', '%s', '</p>', 
+                                 ' %s', true);
+    }
+
+    /**
+     * Render the form as a list without the <ul></ul>.
+     */
+    public function render_ul()
+    {
+        return $this->htmlOutput('<li>%1$s%2$s %3$s%4$s</li>', '<li>%s</li>', 
+                                 '</li>', ' %s', false);
+    }
+
+    /**
+     * Render the form as a list without the <ul></ul>.
+     */
+    public function render_table()
+    {
+        return $this->htmlOutput('<tr><th>%2$s</th><td>%1$s%3$s%4$s</td></tr>',
+                                 '<tr><td colspan="2">%s</td></tr>', 
+                                 '</td></tr>', '<br /><span class="helptext">%s</span>', false);
+    }
+
+    /**
+     * Overloading of the get method.
+     *
+     * The overloading is to be able to use property call in the
+     * templates.
+     */
+    function __get($prop)
+    {
+        if (!in_array($prop, array('render_p', 'render_ul', 'render_table', 'render_top_errors', 'get_top_errors'))) {
+            return $this->$prop;
+        }
+        return $this->$prop();
+    }
+
+    /**
+     * Get a given field by key.
+     */
+    public function field($key)
+    {
+        return new Pluf_Form_BoundField($this, $this->fields[$key], $key);
+
+    }
+
+    /**
+     * Iterator method to iterate over the fields.
+     *
+     * Get the current item.
+     */
+ 	public function current()
+    {
+        $field = current($this->fields);
+        $name = key($this->fields);
+        return new Pluf_Form_BoundField($this, $field, $name);
+    }
+
+ 	public function key()
+    {
+        return key($this->fields);
+    }
+
+ 	public function next()
+    {
+        next($this->fields);
+    }
+
+ 	public function rewind()
+    {
+        reset($this->fields);
+    }
+
+ 	public function valid()
+    {
+        // We know that the boolean false will not be stored as a
+        // field, so we can test against false to check if valid or
+        // not.
+        return (false !== current($this->fields));
+    }
+
+}
+
+
+function Pluf_Form_htmlspecialcharsArray(&$item, $key)
+{
+    $item = htmlspecialchars($item, ENT_COMPAT, 'UTF-8');
+}
+
+function Pluf_Form_renderErrorsAsHTML($errors)
+{
+    $tmp = array();
+    foreach ($errors as $err) {
+        $tmp[] = '<li>'.$err.'</li>';
+    }
+    return '<ul class="errorlist">'.implode("\n", $tmp).'</ul>';
+}
diff --git a/src/Pluf/Form/BoundField.php b/src/Pluf/Form/BoundField.php
new file mode 100644
index 0000000..29fcb97
--- /dev/null
+++ b/src/Pluf/Form/BoundField.php
@@ -0,0 +1,156 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * A class to store field, widget and data.
+ *
+ * Used when rendering a form.
+ */
+class Pluf_Form_BoundField
+{
+    public $form = null;
+    public $field = null;
+    public $name = null;
+    public $html_name = null;
+    public $label = null;
+    public $help_text = null;
+    public $errors = array();
+
+    public function __construct($form, $field, $name)
+    {
+        $this->form = $form;
+        $this->field = $field;
+        $this->name = $name;
+        $this->html_name = $this->form->addPrefix($name);
+        if ($this->field->label == '') {
+            $this->label = mb_ereg_replace('/\_/', '/ /', mb_ucfirst($name));
+        } else {
+            $this->label = $this->field->label;
+        }
+        $this->help_text = ($this->field->help_text) ? $this->field->help_text : '';
+        if (isset($this->form->errors[$name])) {
+            $this->errors = $this->form->errors[$name];
+        }
+    }
+
+    public function render_w($widget=null, $attrs=array())
+    {
+        if ($widget === null) {
+            $widget = $this->field->widget;
+        }
+        $id = $this->autoId();
+        if ($id and !array_key_exists('id', $attrs) 
+            and !array_key_exists('id', $widget->attrs)) {
+            $attrs['id'] = $id;
+        }
+        if (!$this->form->is_bound) {
+            $data = $this->form->initial($this->name);
+        } else {
+            $data = $this->field->widget->valueFromFormData($this->html_name, $this->form->data);
+        }
+        return $widget->render($this->html_name, $data, $attrs);
+    }
+
+    /**
+     * Returns the HTML of the label tag.  Wraps the given contents in
+     * a <label>, if the field has an ID attribute. Does not
+     * HTML-escape the contents. If contents aren't given, uses the
+     * field's HTML-escaped label. If attrs are given, they're used as
+     * HTML attributes on the <label> tag.
+     *
+     * @param string Content of the label, will not be escaped (null).
+     * @param array Extra attributes.
+     * @return string HTML of the label.
+     */
+    public function labelTag($contents=null, $attrs=array())
+    {
+        $contents = ($contents) ? $contents : htmlspecialchars($this->label);
+        $widget = $this->field->widget;
+        $id = (isset($widget->attrs['id'])) ? $widget->attrs['id'] : $this->autoId();
+        $_tmp = array();
+        foreach ($attrs as $attr=>$val) {
+            $_tmp[] = $attr.'="'.$val.'"';
+        }
+        if (count($_tmp)) {
+            $attrs = ' '.implode(' ', $_tmp);
+        } else {
+            $attrs = '';
+        } 
+        return new Pluf_Template_SafeString(sprintf('<label for="%s"%s>%s</label>',
+                                                    $widget->idForLabel($id), $attrs, $contents), true);
+    }
+
+
+    /**
+     * Calculates and returns the ID attribute for this BoundField, if
+     * the associated Form has specified auto_id. Returns an empty
+     * string otherwise.
+     *
+     * @return string Id or empty string if no auto id defined.
+     */
+    public function autoId()
+    {
+        $id_fields = $this->form->id_fields;
+        if (false !== strpos($id_fields, '%s')) {
+            return sprintf($id_fields, $this->html_name);
+        } elseif ($id_fields) {
+            return $this->html_name;
+        }
+        return '';
+    }
+
+    /**
+     * Return HTML to display the errors.
+     */
+    public function fieldErrors()
+    {
+        Pluf::loadFunction('Pluf_Form_renderErrorsAsHTML');
+        return new Pluf_Template_SafeString(Pluf_Form_renderErrorsAsHTML($this->errors), true);
+    }
+
+    /**
+     * Overloading of the property access.
+     */
+    public function __get($prop)
+    {
+        if (!in_array($prop, array('labelTag', 'fieldErrors', 'render_w'))) {
+            return $this->$prop;
+        }
+        return $this->$prop();
+    }
+
+
+    /**
+     * Render as string.
+     */
+    public function __toString()
+    {
+        return (string)$this->render_w();
+    }
+}
+
+if (!function_exists('mb_ucfirst')) {
+    function mb_ucfirst($str) {
+        return mb_strtoupper(mb_substr($str, 0, 1)).mb_substr($str, 1);
+    }
+}
diff --git a/src/Pluf/Form/Field.php b/src/Pluf/Form/Field.php
new file mode 100644
index 0000000..268be40
--- /dev/null
+++ b/src/Pluf/Form/Field.php
@@ -0,0 +1,132 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Default form field.
+ *
+ * A form field is providing a defined set of methods and properties
+ * to be used in the rendering of the fields in forms, in the
+ * conversion of the data from the user input to a form usable by the
+ * models.
+ */
+class Pluf_Form_Field
+{
+    /**
+     * Store the name of the class.
+     */
+    public $class = 'Pluf_Form_Field';
+
+    /**
+     * Widget. The way to "present" the field to the user.
+     */
+    public $widget = 'Pluf_Form_Widget_TextInput';
+    public $label = ''; /**< The label of the field. */
+    public $required = false; /**< Allowed to be blank. */
+    public $help_text = ''; /**< Help text for the field. */
+    public $initial = ''; /**< Default value when empty. */
+    public $choices = null; /**< Predefined choices for the field. */
+
+    /*
+     * Following member variables are more for internal cooking.
+     */
+    public $hidden_widget = 'Pluf_Form_Widget_HiddenInput';
+    public $value = ''; /**< Current value of the field. */
+    protected $empty_values = array('', null, array());
+
+    /**
+     * Constructor.
+     *
+     * Example:
+     * $field = new Your_Field(array('required'=>true, 
+     *                               'widget'=>'Pluf_Form_Widget_TextInput',
+     *                               'initial'=>'your name here',
+     *                               'label'=>__('Your name'),
+     *                               'help_text'=>__('You are?'));
+     *
+     * @param array Params of the field.
+     */
+    function __construct($params=array())
+    {
+        // We basically take the parameters, for each one we grab the
+        // corresponding member variable and populate the $default
+        // array with. Then we merge with the values given in the
+        // parameters and update the member variables.
+        // This allows to pass extra parameters likes 'min_size'
+        // etc. and update the member variables accordingly. This is
+        // practical when you extend this class with your own class.
+        $default = array();
+        foreach ($params as $key=>$in) {
+            if ($key !== 'widget_attrs')
+                $default[$key] = $this->$key; // Here on purpose it
+                                              // will fail if a
+                                              // parameter not needed
+                                              // for this field is
+                                              // passed.
+        }
+        $m = array_merge($default, $params);
+        foreach ($params as $key=>$in) {
+            if ($key !== 'widget_attrs')
+                $this->$key = $m[$key];
+        }
+        // Set the widget to be an instance and not the string name.
+        $widget_name = $this->widget;
+        if (isset($params['widget_attrs'])) {
+            $attrs = $params['widget_attrs'];
+        } else {
+            $attrs = array();
+        }
+        $widget = new $widget_name($attrs);
+        $attrs = $this->widgetAttrs($widget);
+        if (count($attrs)) {
+            $widget->attrs = array_merge($widget->attrs, $attrs);
+        }
+        $this->widget = $widget;
+    }
+
+    /**
+     * Validate some possible input for the field.
+     *
+     * @param mixed Value to clean.
+     * @return mixed Cleaned data or throw a Pluf_Form_Invalid exception.
+     */
+    function clean($value)
+    {
+        if ($this->required and in_array($value, $this->empty_values)) {
+            throw new Pluf_Form_Invalid(__('This field is required.'));
+        }
+        return $value;
+    }
+
+    /**
+     * Returns the HTML attributes to add to the field.
+     *
+     * @param object Widget
+     * @return array HTML attributes.
+     */
+    public function widgetAttrs($widget)
+    {
+        return array();
+    }
+
+}
+
diff --git a/src/Pluf/Form/Field/Boolean.php b/src/Pluf/Form/Field/Boolean.php
new file mode 100644
index 0000000..b026e12
--- /dev/null
+++ b/src/Pluf/Form/Field/Boolean.php
@@ -0,0 +1,36 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_Form_Field_Boolean extends Pluf_Form_Field
+{
+    public $widget = 'Pluf_Form_Widget_CheckboxInput';
+
+    public function clean($value)
+    {
+        //parent::clean($value);
+        if (in_array($value, array('on', 'y', '1', 1, true))) {
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/src/Pluf/Form/Field/Date.php b/src/Pluf/Form/Field/Date.php
new file mode 100644
index 0000000..0cde5d8
--- /dev/null
+++ b/src/Pluf/Form/Field/Date.php
@@ -0,0 +1,48 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_Form_Field_Date extends Pluf_Form_Field
+{
+    public $widget = 'Pluf_Form_Widget_TextInput';
+    public $input_formats = array(
+       '%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y', // 2006-10-25, 10/25/2006, 10/25/06
+       '%b %d %Y', '%b %d, %Y',      // 'Oct 25 2006', 'Oct 25, 2006'
+       '%d %b %Y', '%d %b, %Y',      // '25 Oct 2006', '25 Oct, 2006'
+       '%B %d %Y', '%B %d, %Y',      // 'October 25 2006', 'October 25, 2006'
+       '%d %B %Y', '%d %B, %Y',      // '25 October 2006', '25 October, 2006'
+                                  );
+
+    public function clean($value)
+    {
+        parent::clean($value);
+        foreach ($this->input_formats as $format) {
+            if (false !== ($date = strptime($value, $format))) {
+                $day = str_pad($date['tm_mday'], 2, '0', STR_PAD_LEFT);
+                $month = str_pad($date['tm_mon']+1, 2, '0', STR_PAD_LEFT);
+                $year = str_pad($date['tm_year']+1900, 4, '0', STR_PAD_LEFT);
+                return $year.'-'.$month.'-'.$day;
+            }
+        }
+        throw new Pluf_Form_Invalid(__('Enter a valid date.'));
+    }
+}
diff --git a/src/Pluf/Form/Field/Datetime.php b/src/Pluf/Form/Field/Datetime.php
new file mode 100644
index 0000000..c4ac239
--- /dev/null
+++ b/src/Pluf/Form/Field/Datetime.php
@@ -0,0 +1,63 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_Form_Field_Datetime extends Pluf_Form_Field
+{
+    public $widget = 'Pluf_Form_Widget_DatetimeInput';
+    public $input_formats = array(
+             '%Y-%m-%d %H:%M:%S',     // '2006-10-25 14:30:59'
+             '%Y-%m-%d %H:%M',        // '2006-10-25 14:30'
+             '%Y-%m-%d',              // '2006-10-25'
+             '%m/%d/%Y %H:%M:%S',     // '10/25/2006 14:30:59'
+             '%m/%d/%Y %H:%M',        // '10/25/2006 14:30'
+             '%m/%d/%Y',              // '10/25/2006'
+             '%m/%d/%y %H:%M:%S',     // '10/25/06 14:30:59'
+             '%m/%d/%y %H:%M',        // '10/25/06 14:30'
+             '%m/%d/%y',              // '10/25/06'
+                                  );
+
+    public function clean($value)
+    {
+        parent::clean($value);
+        $out = null;
+        foreach ($this->input_formats as $format) {
+            if (false !== ($date = strptime($value, $format))) {
+                $day = str_pad($date['tm_mday'], 2, '0', STR_PAD_LEFT);
+                $month = str_pad($date['tm_mon']+1, 2, '0', STR_PAD_LEFT);
+                $year = str_pad($date['tm_year']+1900, 4, '0', STR_PAD_LEFT);
+                $h = str_pad($date['tm_hour'], 2, '0', STR_PAD_LEFT);
+                $m = str_pad($date['tm_min'], 2, '0', STR_PAD_LEFT);
+                $s = $date['tm_sec'];
+                if ($s > 59) $s=59;
+                $s = str_pad($s, 2, '0', STR_PAD_LEFT);
+                $out = $year.'-'.$month.'-'.$day.' '.$h.':'.$m.':'.$s;
+                break;
+            }
+        }
+        if ($out !== null) {
+            // We internally use GMT, so we convert it to a GMT date.
+            return gmdate('Y-m-d H:i:s', strtotime($out));
+        }
+        throw new Pluf_Form_Invalid(__('Enter a valid date/time.'));
+    }
+}
diff --git a/src/Pluf/Form/Field/Email.php b/src/Pluf/Form/Field/Email.php
new file mode 100644
index 0000000..b90b02c
--- /dev/null
+++ b/src/Pluf/Form/Field/Email.php
@@ -0,0 +1,39 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_Form_Field_Email extends Pluf_Form_Field
+{
+    public $widget = 'Pluf_Form_Widget_TextInput';
+
+    public function clean($value)
+    {
+        parent::clean($value);
+        if (in_array($value, $this->empty_values)) {
+            $value = '';
+        }
+        if (!Pluf_Utils::isValidEmail($value)) {
+            throw new Pluf_Form_Invalid(__('Enter a valid email address.'));
+        }
+        return $value;
+    }
+}
diff --git a/src/Pluf/Form/Field/File.php b/src/Pluf/Form/Field/File.php
new file mode 100644
index 0000000..1cccc3c
--- /dev/null
+++ b/src/Pluf/Form/Field/File.php
@@ -0,0 +1,123 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_Form_Field_File extends Pluf_Form_Field
+{
+    public $widget = 'Pluf_Form_Widget_FileInput';
+    public $move_function = 'Pluf_Form_Field_moveToUploadFolder';
+    public $max_size = 2097152; // 2MB
+    public $move_function_params = array();
+
+    /**
+     * Validate some possible input for the field.
+     *
+     * @param mixed Input
+     * @return string Path to the file relative to 'upload_path'
+     */
+    function clean($value)
+    {
+        parent::clean($value);
+        $errors = array();
+        $no_files = false;
+        switch ($value['error']) {
+        case UPLOAD_ERR_OK:
+            break;
+        case UPLOAD_ERR_INI_SIZE:
+        case UPLOAD_ERR_FORM_SIZE:
+            throw new Pluf_Form_Invalid(__('The uploaded file is too large. Reduce the size of the file and send it again.'));
+            break;
+        case UPLOAD_ERR_PARTIAL:
+            throw new Pluf_Form_Invalid(__('The upload did not complete. Please try to send the file again.'));
+            break;
+        case UPLOAD_ERR_NO_FILE:
+            throw new Pluf_Form_Invalid(__('No files were uploaded. Please try to send the file again.'));
+            break;
+        case UPLOAD_ERR_NO_TMP_DIR:
+        case UPLOAD_ERR_CANT_WRITE:
+            throw new Pluf_Form_Invalid(__('The server has no temporary folder correctly configured to store the uploaded file.'));
+            break;
+        case UPLOAD_ERR_EXTENSION:
+            throw new Pluf_Form_Invalid(__('The uploaded file has been stopped by an extension.'));
+            break;
+        default:
+            throw new Pluf_Form_Invalid(__('An error occured when upload the file. Please try to send the file again.'));
+        }
+        if ($value['size'] > $this->max_size) {
+            throw new Pluf_Form_Invalid(sprintf(__('The uploaded file is to big (%1$s). Reduce the size to less than %2$s and try again.'), 
+                                        Pluf_Utils::prettySize($value['size']),
+                                        Pluf_Utils::prettySize($this->max_size)));
+        }
+        // copy the file to the final destination and updated $value
+        // with the final path name. 'final_name' is relative to
+        // Pluf::f('upload_path')
+        Pluf::loadFunction($this->move_function);
+        // Should throw a Pluf_Form_Invalid exception if error or the
+        // value to be stored in the database.
+        return call_user_func($this->move_function, $value, 
+                              $this->move_function_params);
+    }
+}
+
+/**
+ * Default move function. The file name is sanitized.
+ *
+ * In the extra parameters, 2 can be used so that this function is
+ * matching most of the needs:
+ *
+ *  * 'upload_path': The path in which the uploaded file will be
+ *                   stored.  
+ *  * 'upload_path_create': If set to true, try to create the
+ *                          upload path if not existing.
+ *
+ *  * 'upload_overwrite': Set it to true if you want to allow overwritting.
+ *
+ * If you combine those options, you can dynamically generate the path
+ * name in your form (for example date base) and let this upload
+ * function create it on demand.
+ * 
+ * @param array Upload value of the form.
+ * @param array Extra parameters. If upload_path key is set, use it. (array())
+ * @return string Name relative to the upload path.
+ */
+function Pluf_Form_Field_moveToUploadFolder($value, $params=array())
+{
+    $name = Pluf_Utils::cleanFileName($value['name']);
+    $upload_path = Pluf::f('upload_path', '/tmp');
+    if (isset($params['upload_path'])) {
+        $upload_path = $params['upload_path'];
+    }
+    if (isset($params['upload_path_create']) and !is_dir($upload_path)) {
+        if (false == @mkdir($upload_path, 0777, true)) {
+            throw new Pluf_Form_Invalid(__('An error occured when creating the upload path. Please try to send the file again.'));
+        }
+    }
+    $dest = $upload_path.'/'.$name;
+    if ((!isset($params['upload_overwrite']) or $params['upload_overwrite'] == false) and file_exists($dest)) {
+        throw new Pluf_Form_Invalid(sprintf(__('A file with the name "%s" has already been uploaded.'), $name));
+    }
+    if (!@move_uploaded_file($value['tmp_name'], $dest)) {
+        throw new Pluf_Form_Invalid(__('An error occured when uploading the file. Please try to send the file again.'));
+    } 
+    @chmod($dest, 0666);
+    return $name;
+}
diff --git a/src/Pluf/Form/Field/Float.php b/src/Pluf/Form/Field/Float.php
new file mode 100644
index 0000000..0b4acb1
--- /dev/null
+++ b/src/Pluf/Form/Field/Float.php
@@ -0,0 +1,49 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_Form_Field_Float extends Pluf_Form_Field
+{
+    public $widget = 'Pluf_Form_Widget_TextInput';
+    public $max_value = null;
+    public $min_value = null;
+
+    public function clean($value)
+    {
+        parent::clean($value);
+        if (in_array($value, $this->empty_values)) {
+            $value = '';
+        }
+        $_value = $value;
+        $value = (float) $value;
+        if ((string) $value !== (string) $_value) {
+            throw new Pluf_Form_Invalid(__('Enter a number.'));
+        }
+        if ($this->max_value !== null and $this->max_value < $value) {
+            throw new Pluf_Form_Invalid(sprintf(__('Ensure this value is less than or equal to %s.'), $this->max_value));
+        }
+        if ($this->min_value !== null and $this->min_value > $value) {
+            throw new Pluf_Form_Invalid(sprintf(__('Ensure this value is greater than or equal to %s.'), $this->min_value));
+        }
+        return $value;
+    }
+}
diff --git a/src/Pluf/Form/Field/Integer.php b/src/Pluf/Form/Field/Integer.php
new file mode 100644
index 0000000..058fdf1
--- /dev/null
+++ b/src/Pluf/Form/Field/Integer.php
@@ -0,0 +1,66 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_Form_Field_Integer extends Pluf_Form_Field
+{
+    public $widget = 'Pluf_Form_Widget_TextInput';
+    public $max = null;
+    public $min = null;
+
+    public function clean($value)
+    {
+        parent::clean($value);
+        if (in_array($value, $this->empty_values)) {
+            $value = '';
+        }
+        if (is_array($value)) {
+            reset($value);
+            while (list($i, $val) = each($value)) {
+                if (!preg_match('/[0-9]+/', $val)) {
+                    throw new Pluf_Form_Invalid(__('The value must be an integer.'));
+                }
+                $this->checkMinMax($val);
+                $value[$i] = (int) $val;
+            }
+            reset($value);
+            return $value;
+        } else {
+            if (!preg_match('/[0-9]+/', $value)) {
+                throw new Pluf_Form_Invalid(__('The value must be an integer.'));
+            }
+            $this->checkMinMax($value);
+        }
+        return (int) $value;
+    }
+
+    protected function checkMinMax($value)
+    {
+        if ($this->max !== null and $value > $this->max) {
+            throw new Pluf_Form_Invalid(sprintf(__('Ensure that this value is not greater than %1$d.'), $this->max));
+        }
+        if ($this->min !== null and $value < $this->min) {
+            throw new Pluf_Form_Invalid(sprintf(__('Ensure that this value is not lower than %1$d.'), $this->min));
+        }
+    }
+}
+
diff --git a/src/Pluf/Form/Field/Url.php b/src/Pluf/Form/Field/Url.php
new file mode 100644
index 0000000..fb61028
--- /dev/null
+++ b/src/Pluf/Form/Field/Url.php
@@ -0,0 +1,39 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_Form_Field_Url extends Pluf_Form_Field
+{
+    public $widget = 'Pluf_Form_Widget_TextInput';
+
+    public function clean($value)
+    {
+        parent::clean($value);
+        if (in_array($value, $this->empty_values)) {
+            return '';
+        }
+        if (!Pluf_Utils::isValidUrl($value)) {
+            throw new Pluf_Form_Invalid(__('Enter a valid address.'));
+        }
+        return $value;
+    }
+}
diff --git a/src/Pluf/Form/Field/Varchar.php b/src/Pluf/Form/Field/Varchar.php
new file mode 100644
index 0000000..aa088da
--- /dev/null
+++ b/src/Pluf/Form/Field/Varchar.php
@@ -0,0 +1,57 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_Form_Field_Varchar extends Pluf_Form_Field
+{
+    public $widget = 'Pluf_Form_Widget_TextInput';
+    public $max_length = null;
+    public $min_length = null;
+
+    public function clean($value)
+    {
+        parent::clean($value);
+        if (in_array($value, $this->empty_values)) {
+            $value = '';
+        }
+        $value_length = mb_strlen($value);
+        if ($this->max_length !== null and $value_length > $this->max_length) {
+            throw new Pluf_Form_Invalid(sprintf(__('Ensure this value has at most %1$d characters (it has %2$d).'), $this->max_length, $value_length));
+        }
+        if ($this->min_length !== null and $value_length < $this->min_length) {
+            throw new Pluf_Form_Invalid(sprintf(__('Ensure this value has at least %1$d characters (it has %2$d).'), $this->min_length, $value_length));
+        }
+        return $value;
+    }
+
+    public function widgetAttrs($widget)
+    {
+        if ($this->max_length !== null and 
+            in_array(get_class($widget), 
+                     array('Pluf_Form_Widget_TextInput', 
+                           'Pluf_Form_Widget_PasswordInput'))) {
+            return array('maxlength'=>$this->max_length);
+        }
+        return array();
+    }
+}
+
diff --git a/src/Pluf/Form/FieldProxy.php b/src/Pluf/Form/FieldProxy.php
new file mode 100644
index 0000000..a41e979
--- /dev/null
+++ b/src/Pluf/Form/FieldProxy.php
@@ -0,0 +1,48 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Field proxy to access a form field through {$form.f.fieldname} in a
+ * template.
+ */
+
+class Pluf_Form_FieldProxy
+{
+    protected $form = null;
+
+    public function __construct(&$form)
+    {
+        $this->form = $form;
+    }
+
+    /**
+     * No control are performed. If you access a non existing field it
+     * will simply throw an error.
+     */
+    public function __get($field)
+    {
+        return new Pluf_Form_BoundField($this->form,
+                                        $this->form->fields[$field],
+                                        $field);
+    }
+}
diff --git a/src/Pluf/Form/Invalid.php b/src/Pluf/Form/Invalid.php
new file mode 100644
index 0000000..a72fead
--- /dev/null
+++ b/src/Pluf/Form/Invalid.php
@@ -0,0 +1,26 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_Form_Invalid extends Exception
+{
+}
diff --git a/src/Pluf/Form/Model.php b/src/Pluf/Form/Model.php
new file mode 100644
index 0000000..9b15961
--- /dev/null
+++ b/src/Pluf/Form/Model.php
@@ -0,0 +1,84 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Dynamic form validation class. 
+ *
+ * This class is used to generate a form for a given model.
+ */
+class Pluf_Form_Model extends Pluf_Form
+{
+    /**
+     * The model for which the form applies.
+     */
+    public $model = null;
+
+    function initFields($extra=array())
+    {
+        $this->model = $extra['model'];
+        if (isset($extra['fields'])) {
+            // Only display a subset of the fields
+            $cols = array();
+            foreach ($extra['fields'] as $field) {
+                $cols[$field] = $this->model->_a['cols'][$field];
+            }
+        } else {
+            $cols = $this->model->_a['cols'];
+        }
+        foreach ($cols as $name=>$def) {
+            $db_field = new $def['type']('', $name);
+            $defaults = array('blank' => true, 'verbose' => $name, 'help_text' => '', 'editable' => true);
+            $def = array_merge($defaults, $def);
+            if ($def['editable']) {
+                // The 'model_instance' and 'name' are used by the
+                // ManyToMany field.
+                $def['model_instance'] = $this->model;
+                $def['name'] = $name;
+                if (null !== ($form_field=$db_field->formField($def))) {
+                    $this->fields[$name] = $form_field;
+                }
+            }
+        }
+    }
+
+    /**
+     * Save the model in the database.
+     *
+     * @param bool Commit in the database or not. If not, the object
+     *             is returned but not saved in the database.
+     * @return Object Model with data set from the form.
+     */
+    function save($commit=true)
+    {
+        if ($this->isValid()) {
+            $this->model->setFromFormData($this->cleaned_data);
+            if ($commit && $this->model->id) {
+                $this->model->update();
+            } elseif ($commit) {
+                $this->model->create();
+            }
+            return $this->model;
+        }
+        throw new Exception(__('Cannot save the model from an invalid form.'));
+    }
+}
diff --git a/src/Pluf/Form/Widget.php b/src/Pluf/Form/Widget.php
new file mode 100644
index 0000000..3d281fe
--- /dev/null
+++ b/src/Pluf/Form/Widget.php
@@ -0,0 +1,116 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Base class to display a form field.
+ *
+ */
+class Pluf_Form_Widget
+{
+    public $is_hidden = false; /**< Is an hidden field? */
+    public $needs_multipart_form = false; /**< Do we need multipart? */
+    public $input_type = ''; /**< Input type of the field. */
+    public $attrs = array(); /**< HTML attributes for the widget. */
+
+    public function __construct($attrs=array())
+    {
+        $this->attrs = $attrs;
+    }
+
+    /**
+     * Renders the HTML of the input.
+     *
+     * @param string Name of the field.
+     * @param mixed Value for the field, can be a non valid value.
+     * @param array Extra attributes to add to the input form (array())
+     * @return string The HTML string of the input.
+     */
+    public function render($name, $value, $extra_attrs=array())
+    {
+        throw new Exception('Not Implemented.');
+    }
+
+    /**
+     * Build the list of attributes for the form.
+     * It should be called this way:
+     * $this->buildAttrs(array('name'=>$name, 'type'=>$this->input_type),
+     *                   $extra_attrs);
+     *
+     * @param array Contains the name and type attributes.
+     * @param array Extra attributes, like 'class' for example.
+     * @return array The attributes for the field.
+     */
+    protected function buildAttrs($attrs, $extra_attrs=array())
+    {
+        return array_merge($this->attrs, $attrs, $extra_attrs);
+    }
+
+    /**
+     * A widget can split itself in multiple input form. For example
+     * you can have a datetime value in your model and you use 2
+     * inputs one for the date and one for the time to input the
+     * value. So the widget must know how to get back the values from
+     * the submitted form.
+     *
+     * @param string Name of the form.
+     * @param array Submitted form data.
+     * @return mixed Value or null if not defined.
+     */
+    public function valueFromFormData($name, $data)
+    {
+        if (isset($data[$name])) {
+            return $data[$name];
+        }
+        return null;
+    }
+
+    /**
+     * Returns the HTML ID attribute of this Widget for use by a
+     * <label>, given the ID of the field. Returns None if no ID is
+     * available.
+     *
+     * This hook is necessary because some widgets have multiple HTML
+     * elements and, thus, multiple IDs. In that case, this method
+     * should return an ID value that corresponds to the first ID in
+     * the widget's tags.
+     */
+    public function idForLabel($id)
+    {
+        return $id;
+    }
+}
+
+/**
+ * Convert an array in a string ready to use for HTML attributes.
+ *
+ * As all the widget will extend the Pluf_Form_Widget class, it means
+ * that this function is available directly in the extended class.
+ */
+function Pluf_Form_Widget_Attrs($attrs)
+{
+    $_tmp = array();
+    foreach ($attrs as $attr=>$val) {
+        $_tmp[] = $attr.'="'.$val.'"';
+    }
+    return ' '.implode(' ', $_tmp);
+}
\ No newline at end of file
diff --git a/src/Pluf/Form/Widget/CheckboxInput.php b/src/Pluf/Form/Widget/CheckboxInput.php
new file mode 100644
index 0000000..f0792e0
--- /dev/null
+++ b/src/Pluf/Form/Widget/CheckboxInput.php
@@ -0,0 +1,67 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Simple checkbox.
+ */
+class Pluf_Form_Widget_CheckboxInput extends Pluf_Form_Widget_Input
+{
+    public $input_type = 'checkbox';
+
+    /**
+     * Renders the HTML of the input.
+     *
+     * @param string Name of the field.
+     * @param mixed Value for the field, can be a non valid value.
+     * @param array Extra attributes to add to the input form (array())
+     * @return string The HTML string of the input.
+     */
+    public function render($name, $value, $extra_attrs=array())
+    {
+        if ((bool)$value) {
+            // We consider that if a value can be boolean casted to
+            // true, then we check the box.
+            $extra_attrs['checked'] = 'checked';
+        }
+        // We force the value to '', the "real" value is passed
+        // through the extra_attrs. This is because a checkbox can
+        // have a value and also the checked/unchecked state.
+        return parent::render($name, '', $extra_attrs);
+    }
+
+    /**
+     * A non checked checkbox is simply not returned in the form array.
+     *
+     * @param string Name of the form.
+     * @param array Submitted form data.
+     * @return mixed Value or null if not defined.
+     */
+    public function valueFromFormData($name, $data)
+    {
+        if (!isset($data[$name]) 
+            or false === $data[$name] or (string)$data[$name] === '0') {
+            return false;
+        }
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/src/Pluf/Form/Widget/DatetimeInput.php b/src/Pluf/Form/Widget/DatetimeInput.php
new file mode 100644
index 0000000..d359d8f
--- /dev/null
+++ b/src/Pluf/Form/Widget/DatetimeInput.php
@@ -0,0 +1,50 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Simple input of type datetime.
+ */
+class Pluf_Form_Widget_DatetimeInput extends Pluf_Form_Widget_Input
+{
+    public $input_type = 'text';
+    public $format = 'Y-m-d H:i'; // '2006-10-25 14:30' by default do
+                                  // not show the seconds.
+
+    /**
+     * Renders the HTML of the input.
+     *
+     * @param string Name of the field.
+     * @param mixed Value for the field, can be a non valid value.
+     * @param array Extra attributes to add to the input form (array())
+     * @return string The HTML string of the input.
+     */
+    public function render($name, $value, $extra_attrs=array())
+    {
+        // Internally we use GMT, so we convert back to the current
+        // timezone.
+        if (strlen($value) > 0) {
+            $value = date($this->format, strtotime($value.' GMT'));
+        }
+        return parent::render($name, $value, $extra_attrs);
+    }
+}
\ No newline at end of file
diff --git a/src/Pluf/Form/Widget/FileInput.php b/src/Pluf/Form/Widget/FileInput.php
new file mode 100644
index 0000000..9ea5acd
--- /dev/null
+++ b/src/Pluf/Form/Widget/FileInput.php
@@ -0,0 +1,38 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Simple input of type file.
+ */
+class Pluf_Form_Widget_FileInput extends Pluf_Form_Widget_Input
+{
+    public $input_type = 'file';
+    public $needs_multipart_form = true;
+
+    public function render($name, $value, $extra_attrs=array())
+    {
+        $value = '';
+        return parent::render($name, $value, $extra_attrs);
+    }
+
+}
\ No newline at end of file
diff --git a/src/Pluf/Form/Widget/HiddenInput.php b/src/Pluf/Form/Widget/HiddenInput.php
new file mode 100644
index 0000000..6c360e6
--- /dev/null
+++ b/src/Pluf/Form/Widget/HiddenInput.php
@@ -0,0 +1,31 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Simple input of type text.
+ */
+class Pluf_Form_Widget_HiddenInput extends Pluf_Form_Widget_Input
+{
+    public $input_type = 'hidden';
+    public $is_hidden = true;
+}
\ No newline at end of file
diff --git a/src/Pluf/Form/Widget/Input.php b/src/Pluf/Form/Widget/Input.php
new file mode 100644
index 0000000..6070bdd
--- /dev/null
+++ b/src/Pluf/Form/Widget/Input.php
@@ -0,0 +1,49 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Base class for all the input widgets. (Except radio and checkbox).
+ */
+class Pluf_Form_Widget_Input extends Pluf_Form_Widget
+{
+    /**
+     * Renders the HTML of the input.
+     *
+     * @param string Name of the field.
+     * @param mixed Value for the field, can be a non valid value.
+     * @param array Extra attributes to add to the input form (array())
+     * @return string The HTML string of the input.
+     */
+    public function render($name, $value, $extra_attrs=array())
+    {
+        if ($value === null) $value = '';
+        $final_attrs = $this->buildAttrs(array('name' => $name, 
+                                               'type' => $this->input_type),
+                                         $extra_attrs);
+        if ($value !== '') {
+            $value = htmlspecialchars($value, ENT_COMPAT, 'UTF-8');
+            $final_attrs['value'] = $value;
+        }
+        return new Pluf_Template_SafeString('<input'.Pluf_Form_Widget_Attrs($final_attrs).' />', true);
+    }
+}
\ No newline at end of file
diff --git a/src/Pluf/Form/Widget/PasswordInput.php b/src/Pluf/Form/Widget/PasswordInput.php
new file mode 100644
index 0000000..3ea12d0
--- /dev/null
+++ b/src/Pluf/Form/Widget/PasswordInput.php
@@ -0,0 +1,46 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Simple input of type text.
+ */
+class Pluf_Form_Widget_PasswordInput extends Pluf_Form_Widget_Input
+{
+    public $input_type = 'password';
+    public $render_value = true;
+
+    public function __construct($attrs=array())
+    {
+        $this->render_value = (isset($attrs['render_value'])) ? $attrs['render_value'] : $this->render_value;
+        unset($attrs['render_value']);
+        parent::__construct($attrs);
+    }
+
+    public function render($name, $value, $extra_attrs=array())
+    {
+        if ($this->render_value === false) {
+            $value = '';
+        }
+        return parent::render($name, $value, $extra_attrs);
+    }
+}
\ No newline at end of file
diff --git a/src/Pluf/Form/Widget/SelectInput.php b/src/Pluf/Form/Widget/SelectInput.php
new file mode 100644
index 0000000..71be75b
--- /dev/null
+++ b/src/Pluf/Form/Widget/SelectInput.php
@@ -0,0 +1,68 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Simple checkbox.
+ */
+class Pluf_Form_Widget_SelectInput extends Pluf_Form_Widget
+{
+    public $choices = array();
+
+    public function __construct($attrs=array())
+    {
+        $this->choices = $attrs['choices'];
+        unset($attrs['choices']);
+        parent::__construct($attrs);
+    }
+
+    /**
+     * Renders the HTML of the input.
+     *
+     * @param string Name of the field.
+     * @param mixed Value for the field, can be a non valid value.
+     * @param array Extra attributes to add to the input form (array())
+     * @param array Extra choices (array())
+     * @return string The HTML string of the input.
+     */
+    public function render($name, $value, $extra_attrs=array(), 
+                           $choices=array())
+    {
+        $output = array();
+        if ($value === null) {
+            $value = '';
+        }
+        $final_attrs = $this->buildAttrs(array('name' => $name), $extra_attrs);
+        $output[] = '<select'.Pluf_Form_Widget_Attrs($final_attrs).'>';
+        $choices = $this->choices + $choices;
+        foreach ($choices as $option_label=>$option_value) {
+            $selected = ($option_value == $value) ? ' selected="selected"':'';
+            $output[] = sprintf('<option value="%s"%s>%s</option>',
+                                htmlspecialchars($option_value, ENT_COMPAT, 'UTF-8'),
+                                $selected, 
+                                htmlspecialchars($option_label, ENT_COMPAT, 'UTF-8'));
+
+        }
+        $output[] = '</select>';
+        return new Pluf_Template_SafeString(implode("\n", $output), true);
+    }
+}
\ No newline at end of file
diff --git a/src/Pluf/Form/Widget/SelectMultipleInput.php b/src/Pluf/Form/Widget/SelectMultipleInput.php
new file mode 100644
index 0000000..ae83801
--- /dev/null
+++ b/src/Pluf/Form/Widget/SelectMultipleInput.php
@@ -0,0 +1,79 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Simple checkbox.
+ */
+class Pluf_Form_Widget_SelectMultipleInput extends Pluf_Form_Widget
+{
+    public $choices = array();
+
+    public function __construct($attrs=array())
+    {
+        $this->choices = $attrs['choices'];
+        unset($attrs['choices']);
+        parent::__construct($attrs);
+    }
+
+    /**
+     * Renders the HTML of the input.
+     *
+     * @param string Name of the field.
+     * @param array Value for the field, can be a non valid value.
+     * @param array Extra attributes to add to the input form (array())
+     * @param array Extra choices (array())
+     * @return string The HTML string of the input.
+     */
+    public function render($name, $value, $extra_attrs=array(), 
+                           $choices=array())
+    {
+        $output = array();
+        if ($value === null) {
+            $value = array();
+        }
+        $final_attrs = $this->buildAttrs(array('name' => $name.'[]'), 
+                                         $extra_attrs);
+        $output[] = '<select multiple="multiple"'
+            .Pluf_Form_Widget_Attrs($final_attrs).'>';
+        $choices = array_merge($this->choices, $choices);
+        foreach ($choices as $option_label=>$option_value) {
+            $selected = (in_array($option_value, $value)) ? ' selected="selected"':'';
+            $output[] = sprintf('<option value="%s"%s>%s</option>',
+                                htmlspecialchars($option_value, ENT_COMPAT, 'UTF-8'),
+                                $selected, 
+                                htmlspecialchars($option_label, ENT_COMPAT, 'UTF-8'));
+
+        }
+        $output[] = '</select>';
+        return new Pluf_Template_SafeString(implode("\n", $output), true);
+    }
+
+    public function valueFromFormData($name, $data)
+    {
+        if (isset($data[$name]) and is_array($data[$name])) {
+            return $data[$name];
+        }
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/src/Pluf/Form/Widget/SelectMultipleInput/Checkbox.php b/src/Pluf/Form/Widget/SelectMultipleInput/Checkbox.php
new file mode 100644
index 0000000..db522cb
--- /dev/null
+++ b/src/Pluf/Form/Widget/SelectMultipleInput/Checkbox.php
@@ -0,0 +1,74 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Simple checkbox.
+ */
+class Pluf_Form_Widget_SelectMultipleInput_Checkbox extends Pluf_Form_Widget_SelectMultipleInput
+{
+    /**
+     * Renders the HTML of the input.
+     *
+     * @param string Name of the field.
+     * @param array Value for the field, can be a non valid value.
+     * @param array Extra attributes to add to the input form (array())
+     * @param array Extra choices (array())
+     * @return string The HTML string of the input.
+     */
+    public function render($name, $value, $extra_attrs=array(), 
+                           $choices=array())
+    {
+        $output = array();
+        if ($value === null or $value == '') {
+            $value = array();
+        }
+        $final_attrs = $this->buildAttrs($extra_attrs);
+        $output[] = '<ul>';
+        $choices = array_merge($this->choices, $choices);
+        $i=0;
+        $base_id = $final_attrs['id'];
+        foreach ($choices as $option_label=>$option_value) {
+
+            $final_attrs['id'] = $base_id.'_'.$i;
+            $final_attrs['value'] = htmlspecialchars($option_value, ENT_COMPAT, 'UTF-8');
+            $checkbox = new Pluf_Form_Widget_CheckboxInput($final_attrs);
+            $rendered = $checkbox->render($name.'[]', in_array($option_value, $value));
+            
+            $output[] = sprintf('<li><label>%s %s</label></li>', $rendered,
+                                htmlspecialchars($option_label, ENT_COMPAT, 'UTF-8'));
+            $i++;
+        }
+        $output[] = '</ul>';
+        return new Pluf_Template_SafeString(implode("\n", $output), true);
+    }
+
+    public function idForLabel($id)
+    {
+        if ($id) {
+            $id += '_0';
+        }
+        return $id;
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/Pluf/Form/Widget/TextInput.php b/src/Pluf/Form/Widget/TextInput.php
new file mode 100644
index 0000000..90995f5
--- /dev/null
+++ b/src/Pluf/Form/Widget/TextInput.php
@@ -0,0 +1,30 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Simple input of type text.
+ */
+class Pluf_Form_Widget_TextInput extends Pluf_Form_Widget_Input
+{
+    public $input_type = 'text';
+}
\ No newline at end of file
diff --git a/src/Pluf/Form/Widget/TextareaInput.php b/src/Pluf/Form/Widget/TextareaInput.php
new file mode 100644
index 0000000..03bd1e0
--- /dev/null
+++ b/src/Pluf/Form/Widget/TextareaInput.php
@@ -0,0 +1,55 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Textarea.
+ */
+class Pluf_Form_Widget_TextareaInput extends Pluf_Form_Widget
+{
+
+    public function __construct($attrs=array())
+    {
+        $this->attrs = array_merge(array('cols' => '40', 'rows' => '10'), 
+                                   $attrs);
+    }
+
+    /**
+     * Renders the HTML of the input.
+     *
+     * @param string Name of the field.
+     * @param mixed Value for the field, can be a non valid value.
+     * @param array Extra attributes to add to the input form (array())
+     * @return string The HTML string of the input.
+     */
+    public function render($name, $value, $extra_attrs=array())
+    {
+        if ($value === null) $value = '';
+        $final_attrs = $this->buildAttrs(array('name' => $name),
+                                         $extra_attrs);
+        return new Pluf_Template_SafeString(
+                       sprintf('<textarea%s>%s</textarea>',
+                               Pluf_Form_Widget_Attrs($final_attrs),
+                               htmlspecialchars($value, ENT_COMPAT, 'UTF-8')),
+                       true);
+    }
+}
\ No newline at end of file
diff --git a/src/Pluf/Form/Widget/TinyMCEInput.php b/src/Pluf/Form/Widget/TinyMCEInput.php
new file mode 100644
index 0000000..51a0ddf
--- /dev/null
+++ b/src/Pluf/Form/Widget/TinyMCEInput.php
@@ -0,0 +1,98 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Textarea with TinyMCE addition.
+ */
+class Pluf_Form_Widget_TinyMCEInput extends Pluf_Form_Widget
+{
+    public $tiny_mceurl = '/media/js/editor/tiny_mce.js';
+    public $mode = 'textareas';
+    public $theme = 'simple';
+    public $include_tinymce = true;
+
+    public function __construct($attrs=array())
+    {
+        $defaults = array('cols' => '70', 
+                          'rows' => '20');
+        $config = array('tinymce_url', 'mode', 'theme', 'include_tinymce');
+        foreach ($config as $cfg) {
+            if (isset($attrs[$cfg])) {
+                $this->$cfg = $attrs[$cfg];
+                unset($attrs[$cfg]);
+            }
+        }
+        $this->attrs = array_merge($defaults, $attrs);
+    }
+
+    /**
+     * Renders the HTML of the input.
+     *
+     * @param string Name of the field.
+     * @param mixed Value for the field, can be a non valid value.
+     * @param array Extra attributes to add to the input form (array())
+     * @return string The HTML string of the input.
+     */
+    public function render($name, $value, $extra_attrs=array())
+    {
+        if ($value === null) $value = '';
+        $extra_config = '';
+        if (isset($this->attrs['editor_config'])) {
+            $_ec = $this->attrs['editor_config'];
+            unset($this->attrs['editor_config']);
+            $_st = array();
+            foreach ($_ec as $key=>$val) {
+                if (is_bool($val)) {
+                    if ($val) {
+                        $_st[] = $key.' : true';
+                    } else {
+                        $_st[] = $key.' : false';
+                    }
+                } else {
+                    $_st[] = $key.' : "'.$val.'"';
+                }
+            }
+            if ($_st) {
+                $extra_config = ",\n".implode(",\n", $_st);
+            }
+        }
+        $final_attrs = $this->buildAttrs(array('name' => $name),
+                                         $extra_attrs);
+        // The special include for tinyMCE
+        $out = '';
+        if ($this->include_tinymce) {
+            $out .= '<script language="javascript" type="text/javascript" src="'.$this->tinymce_url.'"></script>'."\n";
+        }
+        $out .='<script language="javascript" type="text/javascript">
+	tinyMCE.init({
+		mode : "'.$this->mode.'",
+		theme : "'.$this->theme.'"'.$extra_config.'
+	});
+</script>';
+        return new Pluf_Template_SafeString(
+                       $out.sprintf('<textarea%s>%s</textarea>',
+                               Pluf_Form_Widget_Attrs($final_attrs),
+                               htmlspecialchars($value, ENT_COMPAT, 'UTF-8')),
+                       true);
+    }
+}
\ No newline at end of file
diff --git a/src/Pluf/Group.php b/src/Pluf/Group.php
new file mode 100644
index 0000000..65c3731
--- /dev/null
+++ b/src/Pluf/Group.php
@@ -0,0 +1,81 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_Group extends Pluf_Model
+{
+    public $_model = 'Pluf_Group';
+
+    function init()
+    {
+        $this->_a['verbose'] = __('group');
+        $this->_a['table'] = 'groups';
+        $this->_a['model'] = 'Pluf_Group';
+        $this->_a['cols'] = array(
+                             // It is mandatory to have an "id" column.
+                            'id' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Sequence',
+                                  //It is automatically added.
+                                  'blank' => true, 
+                                  ),
+                            'name' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Varchar',
+                                  'blank' => false,
+                                  'size' => 50,
+                                  'verbose' => __('name'),
+                                  ),
+                            'description' => 
+                            array(
+                                  'type' => 'Pluf_DB_Field_Varchar',
+                                  'blank' => false,
+                                  'size' => 250,
+                                  'verbose' => __('description'),
+                                  ),
+                            'permissions' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Manytomany', 
+                                  'blank' => true,
+                                  'model' => 'Pluf_Permission',
+                                  ),
+                            );
+    }
+
+    function __toString()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Predelete to drop the row level permissions.
+     */
+    function preDelete()
+    {
+        if (Pluf::f('pluf_use_rowpermission', false)) {
+            $_rpt = Pluf::factory('Pluf_RowPermission')->getSqlTable();
+            $sql = new Pluf_SQL('owner_class=%s AND owner_id=%s',
+                                array($this->_a['model'], $this->_data['id']));
+            $this->_con->execute('DELETE FROM '.$_rpt.' WHERE '.$sql->gen());
+        }
+    }
+}
diff --git a/src/Pluf/HTTP.php b/src/Pluf/HTTP.php
new file mode 100644
index 0000000..2a4d6f5
--- /dev/null
+++ b/src/Pluf/HTTP.php
@@ -0,0 +1,91 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Base HTTP tools.
+ */
+class Pluf_HTTP
+{
+
+    /**
+     * Break magic_quotes
+     *
+     * @credit Olivier Meunier
+     */
+    function removeTheMagic()
+    {
+        if (get_magic_quotes_gpc()) {
+            if (!empty($_GET)) {
+                array_walk($_GET, 'Pluf_HTTP_magicStrip');
+            }
+            if (!empty($_POST)) {
+                array_walk($_POST, 'Pluf_HTTP_magicStrip');
+            }
+            if (!empty($_REQUEST)) {
+                array_walk($_REQUEST, 'Pluf_HTTP_magicStrip');
+            }
+            if (!empty($_COOKIE)) {
+                array_walk($_COOKIE, 'Pluf_HTTP_magicStrip');
+            }
+        }
+        if (function_exists('ini_set')) {
+            @ini_set('session.use_cookies', '1');
+            @ini_set('session.use_only_cookies', '1');
+            @ini_set('session.use_trans_sid', '0');
+            @ini_set('url_rewriter.tags', '');
+        }
+    }
+}
+
+
+/**
+ * Break magic_quotes
+ *
+ * @credit Olivier Meunier
+ */
+function Pluf_HTTP_magicStrip(&$k, $key)
+{
+    $k = Pluf_HTTP_handleMagicQuotes($k);
+}
+
+/**
+ * Break magic_quotes
+ *
+ * @credit Olivier Meunier
+ */
+function Pluf_HTTP_handleMagicQuotes(&$value)
+{
+    if (is_array($value)) {
+        $result = array();
+        foreach ($value as $k => $v) {
+            if (is_array($v)) {
+                $result[$k] = Pluf_HTTP_handleMagicQuotes($v);
+            } else {
+                $result[$k] = stripslashes($v);
+            }
+        }
+        return $result;
+    } else {
+        return stripslashes($value);
+    }
+}
diff --git a/src/Pluf/HTTP/Error404.php b/src/Pluf/HTTP/Error404.php
new file mode 100644
index 0000000..d9e1621
--- /dev/null
+++ b/src/Pluf/HTTP/Error404.php
@@ -0,0 +1,26 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_HTTP_Error404 extends Exception
+{
+}
diff --git a/src/Pluf/HTTP/Error500.php b/src/Pluf/HTTP/Error500.php
new file mode 100644
index 0000000..16e6404
--- /dev/null
+++ b/src/Pluf/HTTP/Error500.php
@@ -0,0 +1,26 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_HTTP_Error500 extends Exception
+{
+}
diff --git a/src/Pluf/HTTP/Request.php b/src/Pluf/HTTP/Request.php
new file mode 100644
index 0000000..be5de1e
--- /dev/null
+++ b/src/Pluf/HTTP/Request.php
@@ -0,0 +1,60 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * The request object. 
+ *
+ * It is given as first arguments to the view as first argument.
+ */
+class Pluf_HTTP_Request
+{
+    public $POST = array();
+    public $GET = array();
+    public $REQUEST = array();
+    public $COOKIE = array();
+    public $FILES = array();
+    public $query = '';
+    public $method = '';
+    public $uri = '';
+    public $view = '';
+    public $remote_addr = '';
+    public $http_host = '';
+    public $SERVER = array();
+
+    function __construct($query)
+    {
+        $http = new Pluf_HTTP();
+        $http->removeTheMagic();
+        $this->POST =& $_POST;
+        $this->GET =& $_GET;
+        $this->REQUEST =& $_REQUEST;
+        $this->COOKIE =& $_COOKIE;
+        $this->FILES =& $_FILES;
+        $this->query = $query;
+        $this->method = $_SERVER['REQUEST_METHOD'];
+        $this->uri = $_SERVER['REQUEST_URI'];
+        $this->remote_addr = $_SERVER['REMOTE_ADDR'];
+        $this->http_host = $_SERVER['HTTP_HOST'];
+        $this->SERVER =& $_SERVER;
+    }
+}
diff --git a/src/Pluf/HTTP/Response.php b/src/Pluf/HTTP/Response.php
new file mode 100644
index 0000000..850703c
--- /dev/null
+++ b/src/Pluf/HTTP/Response.php
@@ -0,0 +1,173 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Response object to be constructed by the views.
+ *
+ * When constructing a view, the response object must be populated and
+ * returned. The response is then displayed to the visitor. 
+ * The interest of using a response object is that we can run a post
+ * filter action on the response. For example you can run a filter that
+ * is checking that all the output is valid HTML and write a logfile if
+ * this is not the case.
+ */
+class Pluf_HTTP_Response
+{
+    /**
+     * Content of the response.
+     */
+    public $content = '';
+
+    /**
+     * Array of the headers to add.
+     *
+     * For example $this->headers['Content-Type'] = 'text/html; charset=utf-8';
+     */
+    public $headers = array();
+
+    /**
+     * Status code of the answer.
+     */
+    public $status_code = 200;
+
+    /**
+     * Cookies to send.
+     *
+     * $this->cookies['my_cookie'] = 'content of the cookie';
+     */
+    public $cookies = array();
+
+    /**
+     * Status code list.
+     *
+     * @see http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
+     */
+    public $status_code_list = array(
+                                     '100' => 'CONTINUE',
+                                     '101' => 'SWITCHING PROTOCOLS',
+                                     '200' => 'OK',
+                                     '201' => 'CREATED',
+                                     '202' => 'ACCEPTED',
+                                     '203' => 'NON-AUTHORITATIVE INFORMATION',
+                                     '204' => 'NO CONTENT',
+                                     '205' => 'RESET CONTENT',
+                                     '206' => 'PARTIAL CONTENT',
+                                     '300' => 'MULTIPLE CHOICES',
+                                     '301' => 'MOVED PERMANENTLY',
+                                     '302' => 'FOUND',
+                                     '303' => 'SEE OTHER',
+                                     '304' => 'NOT MODIFIED',
+                                     '305' => 'USE PROXY',
+                                     '306' => 'RESERVED',
+                                     '307' => 'TEMPORARY REDIRECT',
+                                     '400' => 'BAD REQUEST',
+                                     '401' => 'UNAUTHORIZED',
+                                     '402' => 'PAYMENT REQUIRED',
+                                     '403' => 'FORBIDDEN',
+                                     '404' => 'NOT FOUND',
+                                     '405' => 'METHOD NOT ALLOWED',
+                                     '406' => 'NOT ACCEPTABLE',
+                                     '407' => 'PROXY AUTHENTICATION REQUIRED',
+                                     '408' => 'REQUEST TIMEOUT',
+                                     '409' => 'CONFLICT',
+                                     '410' => 'GONE',
+                                     '411' => 'LENGTH REQUIRED',
+                                     '412' => 'PRECONDITION FAILED',
+                                     '413' => 'REQUEST ENTITY TOO LARGE',
+                                     '414' => 'REQUEST-URI TOO LONG',
+                                     '415' => 'UNSUPPORTED MEDIA TYPE',
+                                     '416' => 'REQUESTED RANGE NOT SATISFIABLE',
+                                     '417' => 'EXPECTATION FAILED',
+                                     '500' => 'INTERNAL SERVER ERROR',
+                                     '501' => 'NOT IMPLEMENTED',
+                                     '502' => 'BAD GATEWAY',
+                                     '503' => 'SERVICE UNAVAILABLE',
+                                     '504' => 'GATEWAY TIMEOUT',
+                                     '505' => 'HTTP VERSION NOT SUPPORTED'
+                                     );
+
+ 
+    /**
+     * Constructor of the response.
+     *
+     * @param string Content of the response ('')
+     * @param string MimeType of the response (null) if not given will
+     * default to the one given in the configuration 'mimetype'
+     */
+    function __construct($content='', $mimetype=null)
+    {
+        if (is_null($mimetype)) {
+            $mimetype = Pluf::f('mimetype', 'text/html').'; charset=utf-8';
+        }
+        $this->content = $content;
+        $this->headers['Content-Type'] = $mimetype;
+        $this->headers['X-Powered-By'] = 'Pluf - http://pluf.org/';
+        $this->status_code = 200;
+        $this->cookies = array();
+    }
+
+    /**
+     * Render a response object.
+     */
+    function render($output_body=true)
+    {
+        if ($this->status_code >= 200 
+            && $this->status_code != 204 
+            && $this->status_code != 304) {
+            $this->headers['Content-Length'] = strlen($this->content);
+        }
+        $this->outputHeaders();
+        if ($output_body) {
+            echo $this->content;
+        }
+    }
+
+    /**
+     * Output headers.
+     */
+    function outputHeaders()
+    {
+        if (!defined('IN_UNIT_TESTS')) {
+            header('HTTP/1.0 '.$this->status_code.' '
+                   .$this->status_code_list[$this->status_code],
+                   true, $this->status_code);
+            foreach ($this->headers as $header => $ch) {
+                header($header.': '.$ch);
+            }
+            foreach ($this->cookies as $cookie => $data) {
+                // name, data, expiration, path, domain, secure, http only
+                setcookie($cookie, $data, 
+                          time()+31536000, 
+                          Pluf::f('cookie_path', '/'), 
+                          Pluf::f('cookie_domain', null), 
+                          Pluf::f('cookie_secure', false), 
+                          Pluf::f('cookie_httponly', true)); 
+            }
+        } else {
+            $_COOKIE = array();
+            foreach ($this->cookies as $cookie => $data) {
+                $_COOKIE[$cookie] = $data;
+            }
+        }
+    }
+}
diff --git a/src/Pluf/HTTP/Response/CommandPassThru.php b/src/Pluf/HTTP/Response/CommandPassThru.php
new file mode 100644
index 0000000..03fc2c1
--- /dev/null
+++ b/src/Pluf/HTTP/Response/CommandPassThru.php
@@ -0,0 +1,54 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Special response object to output the return value of a command.
+ *
+ * You need to use escapeshellarg() and escapeshellcmd() to provide a
+ * "clean" command. The Content-Length will not be set as it is not
+ * possible to predict it.
+ */
+class Pluf_HTTP_Response_CommandPassThru extends Pluf_HTTP_Response
+{
+    /**
+     * The command argument must be a safe string!
+     *
+     * @param string Command to run.
+     * @param string Mimetype (null)
+     */
+    function __construct($command, $mimetype=null)
+    {
+        parent::__construct($command, $mimetype);
+    }
+
+    /**
+     * Render a response object.
+     */
+    function render($output_body=true)
+    {
+        $this->outputHeaders();
+        if ($output_body) {
+            passthru($this->content);
+        }
+    }
+}
diff --git a/src/Pluf/HTTP/Response/File.php b/src/Pluf/HTTP/Response/File.php
new file mode 100644
index 0000000..cb436a9
--- /dev/null
+++ b/src/Pluf/HTTP/Response/File.php
@@ -0,0 +1,50 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_HTTP_Response_File extends Pluf_HTTP_Response
+{
+    public $delete_file = false;
+
+    function __construct($filepath, $mimetype=null, $delete_file=false)
+    {
+        parent::__construct($filepath, $mimetype);
+        $this->delete_file = $delete_file;
+    }
+
+    /**
+     * Render a response object.
+     */
+    function render($output_body=true)
+    {
+        $this->headers['Content-Length'] = (string)filesize($this->content);
+        $this->outputHeaders();
+        if ($output_body) {
+            $fp = fopen($this->content, 'rb');
+            fpassthru($fp);
+            fclose($fp);
+        }
+        if ($this->delete_file) {
+            @unlink($this->content);
+        }
+    }
+}
diff --git a/src/Pluf/HTTP/Response/Forbidden.php b/src/Pluf/HTTP/Response/Forbidden.php
new file mode 100644
index 0000000..739cf20
--- /dev/null
+++ b/src/Pluf/HTTP/Response/Forbidden.php
@@ -0,0 +1,42 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_HTTP_Response_Forbidden extends Pluf_HTTP_Response
+{
+    function __construct($request)
+    {
+        $content = '';
+        try {
+            $context = new Pluf_Template_Context(array('query' => $request->query));
+            $tmpl = new Pluf_Template('403.html');
+            $content = $tmpl->render($context);
+            $mimetype = null;
+        } catch (Exception $e) {
+            $mimetype = 'text/plain';
+            $content = 'You are not authorized to view this page. You do not have permission'."\n"
+                .'to view the requested directory or page using the credentials supplied.'."\n\n".'403 - Forbidden';
+        }
+        parent::__construct($content, $mimetype);
+        $this->status_code = 403;
+    }
+}
\ No newline at end of file
diff --git a/src/Pluf/HTTP/Response/NotFound.php b/src/Pluf/HTTP/Response/NotFound.php
new file mode 100644
index 0000000..92bef8c
--- /dev/null
+++ b/src/Pluf/HTTP/Response/NotFound.php
@@ -0,0 +1,31 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_HTTP_Response_NotFound extends Pluf_HTTP_Response
+{
+    function __construct($content, $mimetype=null)
+    {
+        parent::__construct($content, $mimetype);
+        $this->status_code = 404;
+    }
+}
diff --git a/src/Pluf/HTTP/Response/Redirect.php b/src/Pluf/HTTP/Response/Redirect.php
new file mode 100644
index 0000000..b892e77
--- /dev/null
+++ b/src/Pluf/HTTP/Response/Redirect.php
@@ -0,0 +1,33 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_HTTP_Response_Redirect extends Pluf_HTTP_Response
+{
+    function __construct($url)
+    {
+        $content = sprintf(__('<a href="%s">Please, click here to be redirected</a>.'), $url);
+        parent::__construct($content);
+        $this->headers['Location'] = $url;
+        $this->status_code = 302;
+    }
+}
diff --git a/src/Pluf/HTTP/Response/RedirectToLogin.php b/src/Pluf/HTTP/Response/RedirectToLogin.php
new file mode 100644
index 0000000..606a976
--- /dev/null
+++ b/src/Pluf/HTTP/Response/RedirectToLogin.php
@@ -0,0 +1,61 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Can be used as a response to return when a user must be logged to
+ * access a page.
+ */
+class Pluf_HTTP_Response_RedirectToLogin extends Pluf_HTTP_Response
+{
+    /**
+     * The $request object is used to know what the post login
+     * redirect url should be.
+     *
+     * If the action url of the login page is not set, it will try to
+     * get the url from the login view from the 'login_view'
+     * configuration key.
+     *
+     * @param Pluf_HTTP_Request The request object of the current page.
+     * @param string The full url of the login page (null)
+     */
+    function __construct($request, $loginurl=null)
+    {
+        if ($loginurl !== null) {
+            $murl = new Pluf_HTTP_URL(Pluf::f('url_format'));
+            $url = $murl->generate($loginurl, array('_redirect_after' => $request->uri), false);
+            $encoded = $murl->generate($loginurl, array('_redirect_after' => $request->uri));
+        } else {
+            Pluf::loadFunction('Pluf_HTTP_URL_urlForView');
+            $url = Pluf_HTTP_URL_urlForView(Pluf::f('login_view', 'login_view'),
+                   array(), 
+                   array('_redirect_after' => $request->uri), false);
+            $encoded = Pluf_HTTP_URL_urlForView(Pluf::f('login_view', 'login_view'), 
+                   array(), 
+                   array('_redirect_after' => $request->uri));
+        }
+        $content = sprintf(__('<a href="%s">Please, click here to be redirected</a>.'), $encoded);
+        parent::__construct($content);
+        $this->headers['Location'] = $url;
+        $this->status_code = 302;
+    }
+}
diff --git a/src/Pluf/HTTP/Response/ServerError.php b/src/Pluf/HTTP/Response/ServerError.php
new file mode 100644
index 0000000..628bce0
--- /dev/null
+++ b/src/Pluf/HTTP/Response/ServerError.php
@@ -0,0 +1,184 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_HTTP_Response_ServerError extends Pluf_HTTP_Response
+{
+    function __construct($exception, $mimetype=null)
+    {
+        $content = '';
+        $admins = Pluf::f('admins', array());
+        if (count($admins) > 0) {
+            // Get a nice stack trace and send it by emails.
+            $stack = Pluf_HTTP_Response_ServerError_Pretty($exception);
+            $subject = $exception->getMessage();
+            $subject = substr(strip_tags(nl2br($subject)), 0, 50).'...';
+            foreach ($admins as $admin) {
+                $email = new Pluf_Mail($admin[1], $admin[1], $subject);
+                $email->addTextMessage($stack);
+                $email->sendMail();
+            }
+        }
+        try {
+            $context = new Pluf_Template_Context(array('message' => $exception->getMessage()));
+            $tmpl = new Pluf_Template('500.html');
+            $content = $tmpl->render($context);
+            $mimetype = null;
+        } catch (Exception $e) {
+            $mimetype = 'text/plain';
+            $content = 'The server encountered an unexpected condition which prevented it from fulfilling your request.'."\n\n"
+                .'An email has been sent to the administrators, we will correct this error as soon as possible. Thank you for your comprehension.'
+                ."\n\n".'500 - Internal Server Error';
+        }
+        parent::__construct($content, $mimetype);
+        $this->status_code = 500;
+    }
+}
+
+function Pluf_HTTP_Response_ServerError_Pretty($e) 
+{
+    $sub = create_function('$f','$loc="";if(isset($f["class"])){
+        $loc.=$f["class"].$f["type"];}
+        if(isset($f["function"])){$loc.=$f["function"];}
+        return $loc;');
+    $parms = create_function('$f','$params=array();if(isset($f["function"])){
+        try{if(isset($f["class"])){
+        $r=new ReflectionMethod($f["class"]."::".$f["function"]);}
+        else{$r=new ReflectionFunction($f["function"]);}
+        return $r->getParameters();}catch(Exception $e){}}
+        return $params;');
+    $src2lines = create_function('$file','$src=nl2br(highlight_file($file,TRUE));
+        return explode("<br />",$src);');
+    $clean = create_function('$line','return html_entity_decode(trim(strip_tags($line)));');
+    $desc = get_class($e)." making ".$_SERVER['REQUEST_METHOD']." request to ".$_SERVER['REQUEST_URI'];
+    $out = $desc."\n";
+    if ($e->getCode()) { 
+        $out .= $e->getCode(). ' : '; 
+    }
+    $out .= $e->getMessage()."\n\n";
+    $out .= 'PHP: '.$e->getFile().', line '.$e->getLine()."\n";
+    $out .= 'URI: '.$_SERVER['REQUEST_METHOD'].' '.$_SERVER['REQUEST_URI']."\n\n";
+    $out .= '** Stacktrace **'."\n\n";
+    $frames = $e->getTrace(); 
+    foreach ($frames as $frame_id=>$frame) { 
+        if (!isset($frame['file'])) {
+            $frame['file'] = 'No File';
+            $frame['line'] = '0';
+        }
+        $out .= '* '.$sub($frame).'
+        ['.$frame['file'].', line '.$frame['line'].'] *'."\n";
+        /*
+        if (count($frame['args']) > 0) {
+            $params = $parms($frame);
+            $out .= '* Args *'."\n";
+            foreach ($frame['args'] as $k => $v) {
+                $name = isset($params[$k]) ? '$'.$params[$k]->name : '?';
+                $out .= 'Arg:   '.$k."\n";
+                $out .= 'Name:  '.$name."\n";
+                $out .= 'Value: '.print_r($v,true)."\n";
+            }
+            $out .= "\n";
+        } 
+        */
+        if (is_readable($frame['file']) ) { 
+            $out .= '* Src *'."\n";
+            $lines = $src2lines($frame['file']);
+            $start = $frame['line'] < 5 ?
+                0 : $frame['line'] -5; $end = $start + 10;
+            $out2 = '';
+            $i = 0;
+            foreach ( $lines as $k => $line ) {
+                if ( $k > $end ) { break; }
+                $line = trim(strip_tags($line));
+                if ( $k < $start && isset($frames[$frame_id+1]["function"])
+                     && preg_match('/function( )*'.preg_quote($frames[$frame_id+1]["function"]).'/',
+                                   $line) ) {
+                    $start = $k;
+                }
+                if ( $k >= $start ) {
+                    if ( $k != $frame['line'] ) {
+                        $out2 .= ($start+$i).': '.$clean($line)."\n"; 
+                    } else {
+                        $out2 .= '>> '.($start+$i).': '.$clean($line)."\n"; 
+                    }
+                    $i++;
+                }
+            }
+            $out .= $out2;
+        } else { 
+            $out .= 'No src available.';
+        } 
+        $out .= "\n";
+    } 
+    $out .= "\n\n\n\n";
+    $out .= '** Request **'."\n\n";
+
+    if ( function_exists('apache_request_headers') ) {
+        $out .= '* Request (raw) *'."\n\n";
+        $req_headers = apache_request_headers();
+        $out .= 'HEADERS'."\n";
+        if ( count($req_headers) > 0 ) {
+            foreach ($req_headers as $req_h_name => $req_h_val) {
+                $out .= $req_h_name.': '.$req_h_val."\n";
+            }
+            $out .= "\n";
+        } else { 
+            $out .= 'No headers.'."\n";
+        } 
+        $req_body = file_get_contents('php://input');
+        if ( strlen( $req_body ) > 0 ) {
+            $out .= 'Body'."\n";
+            $out .= $req_body."\n";
+        } 
+    } 
+    $out .= "\n".'* Request (parsed) *'."\n\n";
+    $superglobals = array('$_GET','$_POST','$_COOKIE','$_SERVER','$_ENV');
+    foreach ( $superglobals as $sglobal ) {
+        $sfn = create_function('','return '.$sglobal.';');
+        $out .= $sglobal."\n";
+        if ( count($sfn()) > 0 ) {
+            foreach ( $sfn() as $k => $v ) {
+                $out .= 'Variable: '.$k."\n";
+                $out .= 'Value:    '.print_r($v,TRUE)."\n";
+            }
+            $out .= "\n";
+        } else { 
+            $out .= 'No data'."\n\n";
+        } 
+    } 
+    if ( function_exists('headers_list') ) { 
+        $out .= "\n\n\n\n";
+        $out .= '** Response **'."\n\n";
+        $out .= '* Headers *'."\n\n";
+        $resp_headers = headers_list();
+        if (count($resp_headers) > 0) {
+            foreach ( $resp_headers as $resp_h ) {
+                $out .= $resp_h."\n";
+            }
+            $out .= "\n";
+        } else {
+            $out .= 'No headers.'."\n";
+        } 
+    } 
+    return $out;
+}
+
diff --git a/src/Pluf/HTTP/Response/ServerErrorDebug.php b/src/Pluf/HTTP/Response/ServerErrorDebug.php
new file mode 100644
index 0000000..f25e03a
--- /dev/null
+++ b/src/Pluf/HTTP/Response/ServerErrorDebug.php
@@ -0,0 +1,376 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_HTTP_Response_ServerErrorDebug extends Pluf_HTTP_Response
+{
+    /**
+     * Debug version of a server error.
+     *
+     * @param Exception The exception being raised.
+     * @param string Mime type
+     */
+    function __construct($e, $mimetype=null)
+    {
+        $this->status_code = 500;
+        $this->content = Pluf_HTTP_Response_ServerErrorDebug_Pretty($e);
+    }
+}
+
+/**
+ * @credits http://www.sitepoint.com/blogs/2006/04/04/pretty-blue-screen/
+ */
+function Pluf_HTTP_Response_ServerErrorDebug_Pretty($e) 
+{
+    $o = create_function('$in','return htmlspecialchars($in);');
+    $sub = create_function('$f','$loc="";if(isset($f["class"])){
+        $loc.=$f["class"].$f["type"];}
+        if(isset($f["function"])){$loc.=$f["function"];}
+        if(!empty($loc)){$loc=htmlspecialchars($loc);
+        $loc="<strong>$loc</strong>";}return $loc;');
+    $parms = create_function('$f','$params=array();if(isset($f["function"])){
+        try{if(isset($f["class"])){
+        $r=new ReflectionMethod($f["class"]."::".$f["function"]);}
+        else{$r=new ReflectionFunction($f["function"]);}
+        return $r->getParameters();}catch(Exception $e){}}
+        return $params;');
+    $src2lines = create_function('$file','$src=nl2br(highlight_file($file,TRUE));
+        return explode("<br />",$src);');
+    $clean = create_function('$line','return trim(strip_tags($line));');
+    $desc = get_class($e)." making ".$_SERVER['REQUEST_METHOD']." request to ".
+        $_SERVER['REQUEST_URI'];
+    $out = '
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+  "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+  <meta name="robots" content="NONE,NOARCHIVE" />
+     <title>'.$o($desc).'</title>
+  <style type="text/css">
+    html * { padding:0; margin:0; }
+    body * { padding:10px 20px; }
+    body * * { padding:0; }
+    body { font:small sans-serif; background: #70DBFF; }
+    body>div { border-bottom:1px solid #ddd; }
+    h1 { font-weight:normal; }
+    h2 { margin-bottom:.8em; }
+    h2 span { font-size:80%; color:#666; font-weight:normal; }
+    h2 a { text-decoration:none; }
+    h3 { margin:1em 0 .5em 0; }
+    h4 { margin:0.5em 0 .5em 0; font-weight: normal; font-style: italic; }
+    table { 
+        border:1px solid #ccc; border-collapse: collapse; background:white; }
+    tbody td, tbody th { vertical-align:top; padding:2px 3px; }
+    thead th { 
+        padding:1px 6px 1px 3px; background:#70FF94; text-align:left; 
+        font-weight:bold; font-size:11px; border:1px solid #ddd; }
+    tbody th { text-align:right; color:#666; padding-right:.5em; }
+    table.vars { margin:5px 0 2px 40px; }
+    table.vars td, table.req td { font-family:monospace; }
+    table td { background: #70FFDB; }
+    table td.code { width:95%;}
+    table td.code div { overflow:hidden; }
+    table.source th { color:#666; }
+    table.source td { 
+        font-family:monospace; white-space:pre; border-bottom:1px solid #eee; }
+    ul.traceback { list-style-type:none; }
+    ul.traceback li.frame { margin-bottom:1em; }
+    div.context { margin:5px 0 2px 40px; background-color:#70FFDB; }
+    div.context ol { 
+        padding-left:30px; margin:0 10px; list-style-position: inside; }
+    div.context ol li { 
+        font-family:monospace; white-space:pre; color:#666; cursor:pointer; }
+    div.context li.current-line { color:black; background-color:#70FF94; }
+    div.commands { margin-left: 40px; }
+    div.commands a { color:black; text-decoration:none; }
+    p.headers { background: #70FFDB; font-family:monospace; }
+    #summary { background: #00B8F5; }
+    #summary h2 { font-weight: normal; color: #666; }
+    #traceback { background:#eee; }
+    #request { background:#f6f6f6; }
+    #response { background:#eee; }
+    #summary table { border:none; background:#00B8F5; }
+    #summary td  { background:#00B8F5; }
+    .switch { text-decoration: none; }
+    .whitemsg { background:white; color:black;}
+  </style>
+  <script type="text/javascript">
+  //<!--
+    function getElementsByClassName(oElm, strTagName, strClassName){
+        // Written by Jonathan Snook, http://www.snook.ca/jon; 
+        // Add-ons by Robert Nyman, http://www.robertnyman.com
+        var arrElements = (strTagName == "*" && document.all)? document.all :
+        oElm.getElementsByTagName(strTagName);
+        var arrReturnElements = new Array();
+        strClassName = strClassName.replace(/\-/g, "\\-");
+        var oRegExp = new RegExp("(^|\\s)" + strClassName + "(\\s|$)");
+        var oElement;
+        for(var i=0; i<arrElements.length; i++){
+            oElement = arrElements[i];
+            if(oRegExp.test(oElement.className)){
+                arrReturnElements.push(oElement);
+            }
+        }
+        return (arrReturnElements)
+    }
+    function hideAll(elems) {
+      for (var e = 0; e < elems.length; e++) {
+        elems[e].style.display = \'none\';
+      }
+    }
+    function toggle() {
+      for (var i = 0; i < arguments.length; i++) {
+        var e = document.getElementById(arguments[i]);
+        if (e) {
+          e.style.display = e.style.display == \'none\' ? \'block\' : \'none\';
+        }
+      }
+      return false;
+    }
+    function varToggle(link, id, prefix) {
+      toggle(prefix + id);
+      var s = link.getElementsByTagName(\'span\')[0];
+      var uarr = String.fromCharCode(0x25b6);
+      var darr = String.fromCharCode(0x25bc);
+      s.innerHTML = s.innerHTML == uarr ? darr : uarr;
+      return false;
+    }
+    function sectionToggle(span, section) {
+      toggle(section);
+      var span = document.getElementById(span);
+      var uarr = String.fromCharCode(0x25b6);
+      var darr = String.fromCharCode(0x25bc);
+      span.innerHTML = span.innerHTML == uarr ? darr : uarr;
+      return false;
+    }
+    
+    window.onload = function() {
+      hideAll(getElementsByClassName(document, \'table\', \'vars\'));
+      hideAll(getElementsByClassName(document, \'div\', \'context\'));
+      hideAll(getElementsByClassName(document, \'ul\', \'traceback\'));
+      hideAll(getElementsByClassName(document, \'div\', \'section\'));
+    }
+    //-->
+  </script>
+</head>
+<body>
+
+<div id="summary">
+  <h1>'.$o($desc).'</h1>
+  <h2>';
+    if ($e->getCode()) { 
+        $out .= $o($e->getCode()). ' : '; 
+    }
+    $out .= ' '.$o($e->getMessage()).'</h2>
+  <table>
+    <tr>
+      <th>PHP</th>
+      <td>'.$o($e->getFile()).', line '.$o($e->getLine()).'</td>
+    </tr>
+    <tr>
+      <th>URI</th>
+      <td>'.$o($_SERVER['REQUEST_METHOD'].' '.
+        $_SERVER['REQUEST_URI']).'</td>
+    </tr>
+  </table>
+</div>
+
+<div id="traceback">
+  <h2>Stacktrace
+    <a href=\'#\' onclick="return sectionToggle(\'tb_switch\',\'tb_list\')">
+    <span id="tb_switch">â–¶</span></a></h2>
+  <ul id="tb_list" class="traceback">';
+    $frames = $e->getTrace(); 
+    foreach ($frames as $frame_id=>$frame) { 
+        if (!isset($frame['file'])) {
+            $frame['file'] = 'No File';
+            $frame['line'] = '0';
+        }
+        $out .= '<li class="frame">'.$sub($frame).'
+        ['.$o($frame['file']).', line '.$o($frame['line']).']';
+        if (isset($frame['args']) && count($frame['args']) > 0) {
+            $params = $parms($frame);
+            $out .= '
+          <div class="commands">
+              <a href=\'#\' onclick="return varToggle(this, \''.
+              $o($frame_id).'\',\'v\')"><span>â–¶</span> Args</a>
+          </div>
+          <table class="vars" id="v'.$o($frame_id).'">
+            <thead>
+              <tr>
+                <th>Arg</th>
+                <th>Name</th>
+                <th>Value</th>
+              </tr>
+            </thead>
+            <tbody>';
+            foreach ($frame['args'] as $k => $v) {
+                $name = isset($params[$k]) ? '$'.$params[$k]->name : '?';
+                $out .= '
+                <tr>
+                  <td>'.$o($k).'</td>
+                  <td>'.$o($name).'</td>
+                  <td class="code">
+                    <div>'.highlight_string(print_r($v,true), true).'</div>
+                  </td>
+                </tr>';
+            }
+            $out .= '</tbody></table>';
+        } 
+        if (is_readable($frame['file']) ) { 
+            $out .= '
+        <div class="commands">
+            <a href=\'#\' onclick="return varToggle(this, \''
+                .$o($frame_id).'\',\'c\')"><span>â–¶</span> Src</a>
+        </div>
+        <div class="context" id="c'.$o($frame_id).'">';
+            $lines = $src2lines($frame['file']);
+            $start = $frame['line'] < 5 ?
+                0 : $frame['line'] -5; $end = $start + 10;
+            $out2 = '';
+            foreach ( $lines as $k => $line ) {
+                if ( $k > $end ) { break; }
+                $line = trim(strip_tags($line));
+                if ( $k < $start && isset($frames[$frame_id+1]["function"])
+                     && preg_match('/function( )*'.preg_quote($frames[$frame_id+1]["function"]).'/',
+                                   $line) ) {
+                    $start = $k;
+                }
+                if ( $k >= $start ) {
+                    if ( $k != $frame['line'] ) {
+                $out2 .= '<li><code>'.$clean($line).'</code></li>'."\n"; }
+              else {
+                $out2 .= '<li class="current-line"><code>'.
+                  $clean($line).'</code></li>'."\n"; }
+            }
+          }
+            $out .= "<ol start=\"$start\">\n".$out2. "</ol>\n";
+            $out .= '</div>';
+        } else { 
+            $out .= '<div class="commands">No src available</div>';
+        } 
+        $out .= '</li>';
+    } 
+    $out .= '
+  </ul>
+  
+</div>
+
+<div id="request">
+  <h2>Request
+    <a href=\'#\' onclick="return sectionToggle(\'req_switch\',\'req_list\')">
+    <span id="req_switch">â–¶</span></a></h2>
+  <div id="req_list" class="section">';
+    if ( function_exists('apache_request_headers') ) {
+        $out .= '<h3>Request <span>(raw)</span></h3>';
+        $req_headers = apache_request_headers();
+        $out .= '<h4>HEADERS</h4>';
+        if ( count($req_headers) > 0 ) {
+            $out .= '<p class="headers">';
+            foreach ($req_headers as $req_h_name => $req_h_val) {
+                $out .= $o($req_h_name.': '.$req_h_val);
+                $out .=  '<br>';
+            }
+            $out .= '</p>';
+        } else { 
+            $out .= '<p>No headers.</p>';
+        } 
+        $req_body = file_get_contents('php://input');
+        if ( strlen( $req_body ) > 0 ) {
+            $out .='
+      <h4>Body</h4>
+      <p class="req" style="padding-bottom: 2em"><code>
+       '.$o($req_body).'
+      </code></p>';
+        } 
+    } 
+    $out .= '
+    <h3>Request <span>(parsed)</span></h3>';
+    $superglobals = array('$_GET','$_POST','$_COOKIE','$_SERVER','$_ENV');
+    foreach ( $superglobals as $sglobal ) {
+        $sfn = create_function('','return '.$sglobal.';');
+        $out .= '<h4>'.$sglobal.'</h4>';
+        if ( count($sfn()) > 0 ) {
+            $out .= '
+      <table class="req">
+        <thead>
+          <tr>
+            <th>Variable</th>
+            <th>Value</th>
+          </tr>
+        </thead>
+        <tbody>';
+            foreach ( $sfn() as $k => $v ) {
+                $out .= '<tr>
+              <td>'.$o($k).'</td>
+              <td class="code">
+                <div>'.$o(print_r($v,TRUE)).'</div>
+                </td>
+            </tr>';
+            }
+            $out .= '
+        </tbody>
+      </table>';
+        } else { 
+            $out .= '
+      <p class="whitemsg">No data</p>';
+        } 
+    } 
+    $out .= '
+      
+  </div>
+</div>';
+    if ( function_exists('headers_list') ) { 
+        $out .= '
+<div id="response">
+
+  <h2>Response
+    <a href=\'#\' onclick="return sectionToggle(\'resp_switch\',\'resp_list\')">
+    <span id="resp_switch">â–¶</span></a></h2>
+  
+  <div id="resp_list" class="section">
+
+    <h3>Headers</h3>';
+        $resp_headers = headers_list();
+        if (count($resp_headers) > 0) {
+            $out .= '
+    <p class="headers">';
+            foreach ( $resp_headers as $resp_h ) {
+                $out .= $o($resp_h);
+                $out .= '<br>';
+            }
+            $out .= '    </p>';
+        } else {
+            $out .= '
+      <p>No headers.</p>';
+        } 
+        $out .= '
+</div>';
+    } 
+    $out .= '
+</body>
+</html>
+';
+    return $out;
+}
+
diff --git a/src/Pluf/HTTP/URL.php b/src/Pluf/HTTP/URL.php
new file mode 100644
index 0000000..3cff74e
--- /dev/null
+++ b/src/Pluf/HTTP/URL.php
@@ -0,0 +1,176 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Generate a ready to use URL to be used in location/redirect or forms.
+ *
+ * When redirecting a user, depending of the format of the url with
+ * mod_rewrite or not, the parameters must all go in the GET or
+ * everything but the action. This class provide a convinient way to
+ * generate those url and parse the results for the dispatcher.
+ */
+class Pluf_HTTP_URL
+{
+    /**
+     * Generate the URL.
+     *
+     * The & is encoded as &amp; in the url.
+     *
+     * @param string Action url
+     * @param array Associative array of the parameters (array())
+     * @param bool Encode the & in the url (true)
+     * @return string Ready to use URL.
+     */
+    public static function generate($action, $params=array(), $encode=true)
+    {
+        if ($encode) {
+            $amp = '&amp;';
+        } else {
+            $amp = '&';
+        }
+        $url = $action;
+        if (count($params) > 0) {
+            $url .= '?';
+            $params_list = array();
+            foreach ($params as $key=>$value) {
+                $params_list[] = urlencode($key).'='.urlencode($value);
+            }
+            $url .= implode($amp, $params_list);
+        }
+        return $url;
+    }
+
+    /**
+     * Get the action of the request.
+     *
+     * Depending of the format, the action is either the path_info,
+     * the query string or the _px_action parameter.
+     *
+     * @return string Action
+     */
+    public static function getAction()
+    {
+        if (isset($_SERVER['ORIG_PATH_INFO'])) {
+            return $_SERVER['ORIG_PATH_INFO'];
+        }
+        if (isset($_SERVER['PATH_INFO'])) {
+            return $_SERVER['PATH_INFO'];
+        }
+        return '/';
+    }
+}
+
+/**
+ * Provide the full URL (without domain) to a view.
+ *
+ * @param string View.
+ * @param array Parameters for the view (array()).
+ * @param array Extra GET parameters for the view (array()).
+ * @param bool Should the URL be encoded (true).
+ * @return string URL.
+ */
+function Pluf_HTTP_URL_urlForView($view, $params=array(), 
+                                  $get_params=array(), $encoded=true)
+{
+    $action = Pluf_HTTP_URL_reverse($view, $params);
+    if (!is_array($get_params)) {
+        throw new Exception('Bad call to urlForView.');
+    }
+    return Pluf_HTTP_URL::generate($action, $get_params, $encoded);
+}
+
+/**
+ * Reverse an URL.
+ *
+ * @param string View in the form 'class::method' or string of the name.
+ * @param array Possible parameters for the view (array()).
+ * @return string URL.
+ */
+function Pluf_HTTP_URL_reverse($view, $params=array())
+{
+    $regex = null;
+    $model = '';
+    $method = '';
+    if (false !== strpos($view, '::')) {
+        list($model, $method) = split('::', $view);
+    }
+    foreach ($GLOBALS['_PX_views'] as $dview) {
+        if (
+            (isset($dview['name']) && $dview['name'] == $view)
+            or
+            ($dview['model'] == $model && $dview['method'] == $method)
+            ) {
+            $regex = $dview['regex'];
+            break;
+        }
+    }
+    if ($regex === null) {
+        throw new Exception(sprintf('Error, the view: %s has not been found.', $view));
+    }
+    $url = Pluf_HTTP_URL_buildReverseUrl($regex, $params);
+    if (isset($dview['base']) and !defined('IN_UNIT_TESTS')) {
+        $url = $dview['base'].$url;
+    }
+    return $url;
+}
+
+/**
+ * Build the reverse URL without the path base.
+ *
+ * Credits to Django, again...
+ *
+ * @param string Regex for the URL.
+ * @param array Parameters
+ * @return string URL filled with the parameters.
+ */
+function Pluf_HTTP_URL_buildReverseUrl($url_regex, $params=array())
+{
+    $url_regex = str_replace('\\.', '.', $url_regex);
+    $url_regex = str_replace('\\-', '-', $url_regex);
+    $url = $url_regex;
+    $groups = '#\(([^)]+)\)#';
+    $matches = array();
+    preg_match_all($groups, $url_regex, $matches);
+    reset($params);
+    if (count($matches[0]) && count($matches[0]) == count($params)) {
+        // Test the params against the pattern
+        foreach ($matches[0] as $pattern) {
+            $in = current($params);
+            if (0 === preg_match('#'.$pattern.'#', $in)) {
+                throw new Exception('Error, param: '.$in.' is not matching the pattern: '.$pattern);
+            }
+            next($params);
+        }
+        $func = create_function('$matches', 
+                                'static $p = '.var_export($params, true).'; '.
+                                '$a = current($p); '.
+                                'next($p); '.
+                                'return $a;');
+        $url = preg_replace_callback($groups, $func, $url_regex);
+    }
+    $url = substr(substr($url, 2), 0, -2);
+    if (substr($url, -1) !== '$') {
+        return $url;
+    }
+    return substr($url, 0, -1);
+}
diff --git a/src/Pluf/Image.php b/src/Pluf/Image.php
new file mode 100644
index 0000000..8f8ec22
--- /dev/null
+++ b/src/Pluf/Image.php
@@ -0,0 +1,104 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Image object to wrap some simple convertion operations.
+ *
+ * Complex operations should be performed with the gd functions directly.
+ *
+ */
+class Pluf_Image
+{
+    protected $dir = ''; /**< Path to the thumbnail folder. */
+    protected $filename = ''; /**< Filename of the last created thumbnail. */
+    public $source = ''; /**< Full path to the source file. */
+
+    /**
+     * Init the image class. 
+     */
+    public function __construct($source)
+    {
+        $this->source = $source;
+    }
+
+    /**
+     * Convert the image as a png file.
+     *
+     * @param string Output file.
+     */
+    public function asPng($output)
+    {
+        $this->saveAs($output, 'png');
+    }
+
+    /**
+     * Convert the image as a given type.
+     *
+     * Types are 'gif', 'jpg' or 'png'
+     *
+     * @param string Output file.
+     * @param string Type.
+     */
+    public function saveAs($output, $type='png')
+    {
+        $types = array('gif' => '1',
+                       'jpg' => '2',
+                       'png' => '3');
+        $output_func = array('gif' => 'imagegif',
+                             'jpg' => 'imagejpeg',
+                             'png' => 'imagepng');
+        if (!file_exists($this->source)) {
+            throw new Exception(sprintf('Image source "%s" unavailable.',
+                                        $this->source));
+        }
+        if (($size = @getimagesize($this->source)) === false) {
+            throw new Exception(sprintf('Image source "%s" is not an image.',
+                                        $this->source));
+        }
+        $source_type = $size[2];
+        if ($source_type == $types[$type]) {
+            // Simply the source to the output.
+            if (false === @copy($this->source, $output)) {
+                throw new Exception(sprintf('Failed to copy %s to %s.',
+                                            $this->source, $output));
+
+            }
+            return;
+        }
+        if ($source_type == '1') {
+            $function = 'imagecreatefromgif';
+        } elseif ($source_type == '2') {
+            $function = 'imagecreatefromjpeg';
+        } elseif ($source_type == '3') {
+            $function = 'imagecreatefrompng';
+        } else {
+            throw new Exception('The source image is not of a recognized type.');
+        }
+        if (($img = @$function($this->source)) == false) {
+            throw new Exception('Cannot read the source image.');
+        }
+        if (!@$output_func[$type]($img, $output)) {
+            throw new Exception('Cannot write the output image.');
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Pluf/Image/Thumbnail.php b/src/Pluf/Image/Thumbnail.php
new file mode 100644
index 0000000..cec741c
--- /dev/null
+++ b/src/Pluf/Image/Thumbnail.php
@@ -0,0 +1,260 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Generate the thumbnail of an image.
+ *
+ * Sample usage.
+ *
+ * $thumbnail = new Pluf_Image_Thumbnail($thumbnail_folder, $source_image);
+ * if (!$thumbnail->exists()) {
+ *     $thumbnail_filename = $thumbnail->generate();
+ * }
+ *
+ */
+class Pluf_Image_Thumbnail
+{
+    protected $dir = ''; /**< Path to the thumbnail folder. */
+    protected $filename = ''; /**< Filename of the last created thumbnail. */
+    public $source = ''; /**< Full path to the source file. */
+    public $size = array(120, 120); /** Max width and heigth of the thumb. */
+
+    /**
+     * Init the thumbnail class. 
+     */
+    public function __construct($dir, $source='')
+    {
+        $this->dir = $dir;
+        $this->source = $source;
+    }
+
+    /**
+     * Get the name of a thumbnail from the image name, the image
+     * name can include a path this is just a md5() operation.
+     * If the height and the width are given, the info is used to
+     * generate the name, else not.
+     *
+     * @param array Optional size.
+     * @return string Filename of the thumbnail.
+     */
+    public function getName($size=null)
+    {
+        $name = md5($this->source);
+        if ($size === null) {
+            $size = $this->size;
+        }
+        return $name.'-'.$size[0].'-'.$size[1].'.png';
+    }
+ 
+    /**
+     * Get the full path to the thumbnail.
+     */
+    function getPath()
+    {
+        return $this->dir.'/'.$this->getName();
+    }
+
+    /**
+     * Check if the thumbnail exists.
+     */
+    function exists()
+    {
+        return file_exists($this->getPath());
+    }
+
+    /**
+     * Get the size of the last created thumbnail
+     * return the same results as the builtin getimagesize PHP function.
+     */
+    function getSize() 
+    {
+        if (file_exists($this->getPath())) {
+            return getimagesize($this->getPath());
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Create thumbnail of an image, proportions are kept.
+     *
+     * @return mixed Filename or false.
+     */
+    function generate()
+    {
+        if (!file_exists($this->source)) {
+            return false;
+        }
+    
+        if (($size = @getimagesize($this->source)) === false) {
+            return false;
+        }
+        list($w, $h) = $this->size;
+        $type = $size[2];
+        $H = $size[1];
+        $W = $size[0];
+    
+        if ($type == '1') {
+            $function = 'imagecreatefromgif';
+        } elseif ($type == '2') {
+            $function = 'imagecreatefromjpeg';
+        } elseif ($type == '3') {
+            $function = 'imagecreatefrompng';
+        } else {
+            return false;
+        }
+        if (!function_exists($function)) {
+            return false;
+        }
+        if (($img = @$function($this->source)) == false) {
+            return false;
+        }
+        // get the zoom factors and the thumbnail height and width
+        $rB = $H/$W;
+        $rS = $h/$w;
+        if (($H > $h) && ($W > $w)) {
+            if ($rB > $rS) {
+                $height = $h;
+                $width  = $height/$rB;
+            } else {
+                $width = $w;
+                $height = $width*$rB; 
+            }
+        } elseif ($H > $h) {
+            $height = $h;
+            $width  = $height/$rB;
+        } elseif ($W > $w) {
+            $width = $w;
+            $height = $width*$rB; 
+        } else {
+            $height = $H;
+            $width  = $W;
+        } 
+        $zx = $W/$width;
+        $zy = $H/$height;
+
+        if (Pluf_Image_Thumbnail::gd_version() >= 2) {
+            if (($img2=imagecreatetruecolor(round($width),round($height)))===false) {
+                return false;
+            }
+        } else {
+            if (($img2=ImageCreate(round($width),round($height)))===false) {
+                return false;
+            }   
+        }
+        $this->resampleBicubic($img2,$img,0,0,0,0,$width,$height,$zx,$zy);
+        if (@imagepng($img2,$this->getPath(),9) === false) {
+            return false;
+        }
+        imagedestroy($img2);
+        if (@file_exists($this->getPath())) {
+            return $this->getPath();
+        } else {
+            return false;
+        }
+    }
+    
+    /**
+     * Get the current GD version. Need the output buffering functions.
+     */
+    public static function gd_version() 
+    {
+        static $gd_version_number = null;
+        if ($gd_version_number === null) {
+            // Use output buffering to get results from phpinfo()
+            // without disturbing the page we're in.  Output
+            // buffering is "stackable" so we don't even have to
+            // worry about previous or encompassing buffering.
+            ob_start();
+            phpinfo(8);
+            $module_info = ob_get_contents();
+            ob_end_clean();
+            if (preg_match("/\bgd\s+version\b[^\d\n\r]+?([\d\.]+)/i",
+                           $module_info,$matches)) {
+                $gd_version_number = $matches[1];
+            } else {
+                $gd_version_number = '0';
+            }
+        }
+        return $gd_version_number;
+
+    }
+
+    /* ========================================================================
+     *   Private functions, should not be called from outside of the class.
+     * ========================================================================
+     */
+
+    /**
+     * Resample the image 
+     * http://www.php.net/manual/en/function.imagecopyresized.php
+     */
+    protected function resampleBicubic(&$dst, &$src, $dstx, $dsty, $srcx, 
+                                       $srcy, $w, $h, $zoomX, $zoomY='')
+    {
+        if (!$zoomY) {
+            $zoomY = $zoomX;
+        }
+        $palsize = ImageColorsTotal($src);
+        for ($i = 0; $i<$palsize; $i++) {
+            $colors = ImageColorsForIndex($src, $i);
+            ImageColorAllocate($dst, $colors['red'], $colors['green'], 
+                               $colors['blue']);
+        }
+        $zoomX2 = (int)($zoomX/2);
+        $zoomY2 = (int)($zoomY/2);
+        $dstX = imagesx($dst);
+        $dstY = imagesy($dst);
+        $srcX = imagesx($src);
+        $srcY = imagesy($src);
+    
+        for ($j=0; $j<($h-$dsty); $j++) {
+            $sY = (int)($j*$zoomY) + $srcy;
+            $y13 = $sY+$zoomY2;
+            $dY = $j+$dsty;
+        
+            if (($sY >= $srcY) or ($dY >= $dstY) or ($y13 >= $srcY)) {
+                break 1;
+            }
+            for ($i=0; $i<($w-$dstx); $i++) {
+                $sX = (int)($i*$zoomX)+$srcx;
+                $x34 = $sX+$zoomX2;
+                $dX = $i+$dstx;
+                if (($sX >= $srcX) or ($dX >= $dstX) or ($x34 >= $srcX)) {
+                    break 1;
+                }
+                $c1 = ImageColorsForIndex($src, ImageColorAt($src, $sX, $y13));
+                $c2 = ImageColorsForIndex($src, ImageColorAt($src, $sX, $sY));
+                $c3 = ImageColorsForIndex($src, ImageColorAt($src, $x34, $y13));
+                $c4 = ImageColorsForIndex($src, ImageColorAt($src, $x34, $sY));
+        
+                $r = ($c1['red']+$c2['red']+$c3['red']+$c4['red'])/4;
+                $g = ($c1['green']+$c2['green']+$c3['green']+$c4['green'])/4;
+                $b = ($c1['blue']+$c2['blue']+$c3['blue']+$c4['blue'])/4;
+        
+                ImageSetPixel($dst, $dX, $dY, ImageColorClosest($dst, $r, 
+                                                                $g, $b));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Pluf/L10n.php b/src/Pluf/L10n.php
new file mode 100644
index 0000000..51edb70
--- /dev/null
+++ b/src/Pluf/L10n.php
@@ -0,0 +1,386 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Localization class.
+ *
+ * The localization of the code is performed using the __() function call.
+ * This function is directly available in the Pluf.php file.
+ *
+ * The Pluf_L10n class is used to load the localization strings in memory
+ * in the $GLOBALS['_PX_locale'] array. All the strings are stored in utf-8
+ * as all the applications created with the Plume Framework must use the utf-8
+ * encoding.
+ * The Pluf locale files are in the Pluf/locale/ folder.
+ *
+ * The locale files can be optimized and an optimized version of the files
+ * stored in the Pluf temp folder. The temp folder is defined in the global
+ * configuration as 'tmp_folder'. 
+ *
+ * 2 letter ISO codes from http://www.oasis-open.org/cover/iso639a.html
+ */
+class Pluf_L10n
+{
+    /**
+     * Folder in which the locale file are available.
+     */
+    public $locale_folder = '';
+
+    /** 
+     * Constructor.
+     *
+     * See loadDomain(). If no folder is provided, the default Pluf/locale
+     * folder is used to load the locales from.
+     *
+     * @param string Locale folder without trailing slash ('')
+     * @param string Language ('en')
+     * @param string Domain ('pluf')
+     */
+    function __construct($folder='', $lang='en', $domain='pluf')
+    {
+        if ('' == $folder) {
+            $this->locale_folder = dirname(__FILE__).'/locale';
+        }
+        $this->loadDomain($lang, $domain);
+    }
+    
+    /**
+     * Load a domain file.
+     * A domain file is a .lang file in the main locale folder of plume.
+     *
+     * @param string Language ('en')
+     * @param string Domain, without the .lang ('pluf')
+     * @return bool Success
+     */
+    function loadDomain($lang='en', $domain='pluf')
+    {
+        if ('en' == $lang) {
+            return true;
+        }
+        return $this->loadFile($this->locale_folder.$lang.'/'.$domain.'.lang');
+    }
+
+    /**
+     * Load a locale file
+     *
+     * @param string Complete path to the locale file
+     * @return bool Success
+     */
+    function loadFile($file)
+    {
+        if (!empty($GLOBALS['_PX_locale_files'][$file])) {
+            return true;
+        }
+        if (!file_exists($file)) {
+            return false;
+        }
+        if (!isset($GLOBALS['_PX_locale'])) {
+            $GLOBALS['_PX_locale'] = array();
+        }
+        // Load optimized file if available
+        if ('' != Pluf::f('tmp_folder')) {
+            $phpfile = Pluf::f('tmp_folder').'/Pluf_L10n-'
+                .str_replace(DIRECTORY_SEPARATOR, '_', substr($file, 0, -5))
+                .'.php';
+            if (file_exists($phpfile) 
+                && (@filemtime($file) < @filemtime($phpfile))) {
+                $l = include $phpfile;
+                $GLOBALS['_PX_locale'] = array_merge($GLOBALS['_PX_locale'], $l);
+                $GLOBALS['_PX_locale_files'][$file] = 'optimized';
+                return true;
+            }
+        }
+        $lines = file($file);
+        $count = count($lines);
+        for ($i=1; $i<$count; $i++) {
+            $tmp = (!empty($lines[$i+1])) ? trim($lines[$i+1]) : '';
+            if (!empty($tmp) && ';' == substr($lines[$i],0,1)) {
+                $GLOBALS['_PX_locale'][trim(substr($lines[$i],1))] = $tmp;
+                $i++;
+            }
+        }
+        $GLOBALS['_PX_locale_files'][$file] = true;
+        return true;
+    }
+    
+    /**
+     * Optimize a locale. Convert the .lang in a .php file 
+     * ready to be included. The optimized file is encoded 
+     * with the current encoding.
+     *
+     * @param string Locale file to optimize
+     * @return bool Success
+     */
+    function optimizeLocale($file)
+    {
+        if (!file_exists($file)) {
+            return false;
+        }
+        $phpfile = Pluf::f('tmp_folder').'/Pluf_L10n-'
+            .str_replace(DIRECTORY_SEPARATOR, '_', substr($file, 0, -5))
+            .'.php';
+        $lines = file($file);
+        if (false === ($fp = @fopen($phpfile,'w'))) {
+            return false;
+        }
+        fputs($fp, '<?php '."\n".'/* automatically generated file from: '
+              .$file.'  */'."\n\n");
+        fputs($fp, '$l = array();'."\n");
+        $count = count($lines);
+        for ($i=1; $i<$count; $i++) {
+            $tmp = (!empty($lines[$i+1])) ? trim($lines[$i+1]) : '';
+            if (!empty($tmp) && ';' == substr($lines[$i],0,1)) {
+                $string = '$l[\''
+                    .str_replace("'", "\\'", trim(substr($lines[$i],1)))
+                    .'\'] = \''.str_replace("'", "\\'", $tmp).'\';'."\n";
+                fputs($fp, $string);
+                $i++;
+            }
+        }
+        fputs($fp, 'return $l;'."\n");
+        fputs($fp, "\n".'?>');
+        @fclose($fp);
+        @chmod($phpfile, 0777);
+        return true;
+    }
+
+    /**
+     * Get the available locales for a domain.
+     *
+     * @param string Domain ('')
+     * @return array List of 2 letter iso codes
+     */
+    function getAvailableLocales($domain='')
+    {
+        $rootdir = $this->locale_folder.'/';
+        $locales = array();
+        $locales[] = 'en'; //English is always available
+        $current_dir = opendir($rootdir);
+        if (!empty($domain)) {
+            $domain .= '.lang';
+        }
+        while($entryname = readdir($current_dir)) {
+            if (is_dir($rootdir.$entryname.'/') 
+                and ($entryname != '.' and $entryname!='..') 
+                and (2 == strlen($entryname))
+                ) {
+                $entryname = strtolower($entryname);
+                if (empty($domain)) {
+                    $locales[] = $entryname;
+                } elseif (is_file($rootdir.$entryname.'/'.$domain)) {
+                    $locales[] = $entryname;
+                }
+            }
+        }
+        closedir($current_dir);
+        sort($locales);
+        reset($locales);
+        return $locales;
+    }
+
+    /**
+     * Return the "best" accepted language from the list of available 
+     * languages.
+     *
+     * Use $_SERVER['HTTP_ACCEPT_LANGUAGE'] if the accepted language is empty
+     *
+     * @param array Available languages in the system
+     * @param string String of comma separated accepted languages ('')
+     * @return string Language 2 letter iso code, default is 'en'
+     */
+    function getAcceptedLanguage($available, $accepted ='')
+    {
+        if (empty($accepted)) {
+            if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+                $accepted = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
+            } else {
+                return 'en';
+            }
+        }
+        $acceptedlist = explode(',', $accepted);
+        foreach ($acceptedlist as $lang) {
+            //for the fr-FR en-US cases
+            $lang = strtolower(substr($lang, 0, 2)); 
+            if (in_array($lang, $available)) {
+                return $lang;
+            }
+        }
+        //no match found, English
+        return 'en';
+    }
+
+    /**
+     * Returns iso codes.
+     *
+     * @param bool Is the language the key in the array (false)
+     * @return array The key is either the language or the iso code
+     */
+    function getIsoCodes($lang=false)
+    {
+        $res = array('aa' => 'Afar',
+                     'ab' => 'Abkhazian',
+                     'af' => 'Afrikaans',
+                     'am' => 'Amharic',
+                     'ar' => 'Arabic',
+                     'as' => 'Assamese',
+                     'ay' => 'Aymara',
+                     'az' => 'Azerbaijani',
+                     'ba' => 'Bashkir',
+                     'be' => 'Byelorussian',
+                     'bg' => 'Bulgarian',
+                     'bh' => 'Bihari',
+                     'bi' => 'Bislama',
+                     'bn' => 'Bengali',
+                     'bo' => 'Tibetan',
+                     'br' => 'Breton',
+                     'ca' => 'Catalan',
+                     'co' => 'Corsican',
+                     'cs' => 'Czech',
+                     'cy' => 'Welsh',
+                     'da' => 'Danish',
+                     'de' => 'German',
+                     'dz' => 'Bhutani',
+                     'el' => 'Greek',
+                     'en' => 'English',
+                     'eo' => 'Esperanto',
+                     'es' => 'Spanish',
+                     'et' => 'Estonian',
+                     'eu' => 'Basque',
+                     'fa' => 'Persian',
+                     'fi' => 'Finnish',
+                     'fj' => 'Fiji',
+                     'fo' => 'Faroese',
+                     'fr' => 'French',
+                     'fy' => 'Frisian',
+                     'ga' => 'Irish',
+                     'gd' => 'Scots gaelic',
+                     'gl' => 'Galician',
+                     'gn' => 'Guarani',
+                     'gu' => 'Gujarati',
+                     'ha' => 'Hausa',
+                     'he' => 'Hebrew',
+                     'hi' => 'Hindi',
+                     'hr' => 'Croatian',
+                     'hu' => 'Hungarian',
+                     'hy' => 'Armenian',
+                     'ia' => 'Interlingua',
+                     'ie' => 'Interlingue',
+                     'ik' => 'Inupiak',
+                     'id' => 'Indonesian',
+                     'is' => 'Icelandic',
+                     'it' => 'Italian',
+                     'iu' => 'Inuktitut',
+                     'ja' => 'Japanese',
+                     'jv' => 'Javanese',
+                     'ka' => 'Georgian',
+                     'kk' => 'Kazakh',
+                     'kl' => 'Greenlandic',
+                     'km' => 'Cambodian',
+                     'kn' => 'Kannada',
+                     'ko' => 'Korean',
+                     'ks' => 'Kashmiri',
+                     'ku' => 'Kurdish',
+                     'ky' => 'Kirghiz',
+                     'la' => 'Latin',
+                     'ln' => 'Lingala',
+                     'lo' => 'Laothian',
+                     'lt' => 'Lithuanian',
+                     'lv' => 'Latvian;lettish',
+                     'mg' => 'Malagasy',
+                     'mi' => 'Maori',
+                     'mk' => 'Macedonian',
+                     'ml' => 'Malayalam',
+                     'mn' => 'Mongolian',
+                     'mo' => 'Moldavian',
+                     'mr' => 'Marathi',
+                     'ms' => 'Malay',
+                     'mt' => 'Maltese',
+                     'my' => 'Burmese',
+                     'na' => 'Nauru',
+                     'ne' => 'Nepali',
+                     'nl' => 'Dutch',
+                     'no' => 'Norwegian',
+                     'oc' => 'Occitan',
+                     'om' => 'Afan (oromo)',
+                     'or' => 'Oriya',
+                     'pa' => 'Punjabi',
+                     'pl' => 'Polish',
+                     'ps' => 'Pashto;pushto',
+                     'pt' => 'Portuguese',
+                     'qu' => 'Quechua',
+                     'rm' => 'Rhaeto-romance',
+                     'rn' => 'Kurundi',
+                     'ro' => 'Romanian',
+                     'ru' => 'Russian',
+                     'rw' => 'Kinyarwanda',
+                     'sa' => 'Sanskrit',
+                     'sd' => 'Sindhi',
+                     'sg' => 'Sangho',
+                     'sh' => 'Serbo-croatian',
+                     'si' => 'Singhalese',
+                     'sk' => 'Slovak',
+                     'sl' => 'Slovenian',
+                     'sm' => 'Samoan',
+                     'sn' => 'Shona',
+                     'so' => 'Somali',
+                     'sq' => 'Albanian',
+                     'sr' => 'Serbian',
+                     'ss' => 'Siswati',
+                     'st' => 'Sesotho',
+                     'su' => 'Sundanese',
+                     'sv' => 'Swedish',
+                     'sw' => 'Swahili',
+                     'ta' => 'Tamil',
+                     'te' => 'Telugu',
+                     'tg' => 'Tajik',
+                     'th' => 'Thai',
+                     'ti' => 'Tigrinya',
+                     'tk' => 'Turkmen',
+                     'tl' => 'Tagalog',
+                     'tn' => 'Setswana',
+                     'to' => 'Tonga',
+                     'tr' => 'Turkish',
+                     'ts' => 'Tsonga',
+                     'tt' => 'Tatar',
+                     'tw' => 'Twi',
+                     'ug' => 'Uigur',
+                     'uk' => 'Ukrainian',
+                     'ur' => 'Urdu',
+                     'uz' => 'Uzbek',
+                     'vi' => 'Vietnamese',
+                     'vo' => 'Volapuk',
+                     'wo' => 'Wolof',
+                     'xh' => 'Xhosa',
+                     'yi' => 'Yiddish',
+                     'yo' => 'Yoruba',
+                     'za' => 'Zhuang',
+                     'zh' => 'Chinese',
+                     'zu' => 'Zulu');
+        if ($lang) {
+            $res = array_flip($res);
+            ksort($res); //order by lang
+        }
+        return $res;
+    }
+
+}
diff --git a/src/Pluf/Mail.php b/src/Pluf/Mail.php
new file mode 100644
index 0000000..551f72c
--- /dev/null
+++ b/src/Pluf/Mail.php
@@ -0,0 +1,198 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Generate and send multipart emails.
+ *
+ * This class is just a small wrapper around the PEAR packages Mail
+ * and Mail/mime.
+ *
+ * Class to easily generate multipart emails. It supports embedded
+ * images within the email. It can be used to send a text with 
+ * possible attachments. 
+ *
+ * The encoding of the message is utf-8 by default.
+ *
+ * Usage example:
+ * <code>
+ * $email = new Pluf_Mail('from_email@example.com', 'to_email@example.com', 
+ *                        'Subject of the message');
+ * $img_id = $email->addAttachment('/var/www/html/img/pic.jpg', 'image/jpg');
+ * $email->addTextMessage('Hello world!');
+ * $email->addHtmlMessage('<html><body>Hello world!</body></html>');
+ * $email->sendMail(); 
+ * </code>
+ *
+ * The configuration parameters are the one for Mail::factory with the
+ * 'mail_' prefix not to conflict with the other parameters.
+ *
+ * @see http://pear.php.net/manual/en/package.mail.mail.factory.php
+ *
+ * 'mail_backend' - 'mail', 'smtp' or 'sendmail' (default 'mail').
+ *
+ * List of parameter for the backends:
+ *
+ *  mail backend
+ * --------------
+ *
+ * If safe mode is disabled, an array with all the 'mail_*' parameters
+ * excluding 'mail_backend' will be passed as the fifth argument to
+ * the PHP mail() function. The elements will be joined as a
+ * space-delimited string.
+ *
+ *  sendmail backend
+ * ------------------
+ *
+ * 'mail_sendmail_path' - The location of the sendmail program on the
+ *                        filesystem. Default is /usr/bin/sendmail
+ * 'sendmail_args' - Additional parameters to pass to the
+ *                   sendmail. Default is -i
+ *
+ *  smtp backend
+ * --------------
+ *
+ * 'mail_host' - The server to connect. Default is localhost
+ * 'mail_port' - The port to connect. Default is 25
+ * 'mail_auth' - Whether or not to use SMTP authentication. Default is
+ *               FALSE
+ *
+ * 'mail_username' - The username to use for SMTP authentication.
+ * 'mail_password' - The password to use for SMTP authentication.
+ * 'mail_localhost' - The value to give when sending EHLO or
+ *                    HELO. Default is localhost
+ * 'mail_timeout' - The SMTP connection timeout. Default is NULL (no
+ *                  timeout)
+ * 'mail_verp' - Whether to use VERP or not. Default is FALSE
+ * 'mail_debug' - Whether to enable SMTP debug mode or not. Default is
+ *                FALSE
+ * 'mail_persist' - Indicates whether or not the SMTP connection
+ *                  should persist over multiple calls to the send() 
+ *                  method.
+ *
+ * If you are doing some testing, you should use the smtp backend 
+ * together with fakemail: http://www.lastcraft.com/fakemail.php
+ */
+class Pluf_Mail
+{
+    public $headers = array();
+    public $message;
+    public $encoding = 'utf-8';
+    public $to_address = '';
+
+    /**
+     * Construct the base email.
+     *
+     * @param string The email of the sender.
+     * @param string The destination email.
+     * @param string The subject of the message.
+     * @param string Encoding of the message ('UTF-8')
+     * @param string End of line type ("\n")
+     */
+    function __construct($src, $dest, $subject, $encoding='UTF-8', $crlf="\n")
+    {
+        // Note that the Pluf autoloader will correctly load this PEAR
+        // object.
+        $this->message = new Mail_mime($crlf); 
+        $this->message->_build_params['html_charset'] = $encoding;
+        $this->message->_build_params['text_charset'] = $encoding;
+        $this->message->_build_params['head_charset'] = $encoding;        
+        
+        $this->to_address = $dest;
+        $this->headers = array('From' => $src,
+                               'To' => $dest,
+                               'Subject' => $subject);
+    }
+
+    /**
+     * Add the base plain text message to the email.
+     *
+     * @param string The message
+     */
+    function addTextMessage($msg)
+    {
+        $this->message->setTXTBody($msg);
+    }
+
+    /**
+     * Set the return path for the email.
+     *
+     * @param string Email
+     */
+    function setReturnPath($email)
+    {
+        $this->headers['Return-Path'] = $email;
+    }
+
+    /**
+     * Add headers to an email.
+     *
+     * @param array Array of headers
+     */
+    function addHeaders($hdrs)
+    {
+        $this->headers = array_merge($this->headers, $hdrs);
+    }
+
+    /**
+     * Add the alternate HTML message to the email.
+     *
+     * @param string The HTML message
+     */
+    function addHtmlMessage($msg)
+    {
+        $this->message->setHTMLBody($msg);
+    }
+
+    /**
+     * Add an attachment to the message.
+     *
+     * The file to attach must be available on disk and you need to
+     * provide the mimetype of the attachment manually.
+     *
+     * @param string Path to the file to be added.
+     * @param string Mimetype of the file to be added ('text/plain').
+     * @return bool True.
+     */
+    function addAttachment($file, $ctype='text/plain')
+    {
+        $this->message->addAttachment($file, $ctype);
+    }
+
+    /**
+     * Effectively sends the email.
+     */
+    function sendMail()
+    {
+        $body = $this->message->get();
+        $hdrs = $this->message->headers($this->headers);
+
+        $params = Pluf::pf('mail_', true); // strip the prefix 'mail_'
+        unset($params['backend']);
+        $gmail = new Mail();
+        $mail = $gmail->factory(Pluf::f('mail_backend', 'mail'),
+                                $params);
+        if (Pluf::f('send_emails', true)) {
+            $mail->send($this->to_address, $hdrs, $body);
+        }
+    }
+}
diff --git a/src/Pluf/Mail/Batch.php b/src/Pluf/Mail/Batch.php
new file mode 100644
index 0000000..843aab4
--- /dev/null
+++ b/src/Pluf/Mail/Batch.php
@@ -0,0 +1,233 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Generate and send multipart emails in batch mode.
+ *
+ * This class is just a small wrapper around the PEAR packages Mail
+ * and Mail/mime. 
+ *
+ * Class to easily generate multipart emails. It supports embedded
+ * images within the email. It can be used to send a text with 
+ * possible attachments. 
+ *
+ * The encoding of the message is utf-8 by default.
+ *
+ * Usage example:
+ * <code>
+ * $email = new Pluf_Mail_Batch('from_email@example.com');
+ * foreach($emails as $m) {
+ *     $email->setSubject($m['subject']);
+ *     $email->setTo($m['to']);
+ *     $img_id = $email->addAttachment('/var/www/html/img/pic.jpg', 'image/jpg');
+ *     $email->addTextMessage($m['content']);
+ *     $email->sendMail(); 
+ * }
+ * $email->close();
+ * </code>
+ *
+ * The configuration parameters are the one for Mail::factory with the
+ * 'mail_' prefix not to conflict with the other parameters.
+ *
+ * @see http://pear.php.net/manual/en/package.mail.mail.factory.php
+ *
+ * 'mail_backend' - 'mail', 'smtp' or 'sendmail' (default 'mail').
+ *
+ * List of parameter for the backends:
+ *
+ *  mail backend
+ * --------------
+ *
+ * If safe mode is disabled, an array with all the 'mail_*' parameters
+ * excluding 'mail_backend' will be passed as the fifth argument to
+ * the PHP mail() function. The elements will be joined as a
+ * space-delimited string.
+ *
+ *  sendmail backend
+ * ------------------
+ *
+ * 'mail_sendmail_path' - The location of the sendmail program on the
+ *                        filesystem. Default is /usr/bin/sendmail
+ * 'sendmail_args' - Additional parameters to pass to the
+ *                   sendmail. Default is -i
+ *
+ *  smtp backend
+ * --------------
+ *
+ * 'mail_host' - The server to connect. Default is localhost
+ * 'mail_port' - The port to connect. Default is 25
+ * 'mail_auth' - Whether or not to use SMTP authentication. Default is
+ *               FALSE
+ *
+ * 'mail_username' - The username to use for SMTP authentication.
+ * 'mail_password' - The password to use for SMTP authentication.
+ * 'mail_localhost' - The value to give when sending EHLO or
+ *                    HELO. Default is localhost
+ * 'mail_timeout' - The SMTP connection timeout. Default is NULL (no
+ *                  timeout)
+ * 'mail_verp' - Whether to use VERP or not. Default is FALSE
+ * 'mail_debug' - Whether to enable SMTP debug mode or not. Default is
+ *                FALSE
+ * 'mail_persist' - Will automatically be set to true.
+ *
+ * If you are doing some testing, you should use the smtp backend 
+ * together with fakemail: http://www.lastcraft.com/fakemail.php
+ */
+class Pluf_Mail_Batch
+{
+    public $headers = array();
+    public $message;
+    public $encoding = 'utf-8';
+    public $crlf = "\n";
+    public $from = '';
+    protected $backend = null;
+
+    /**
+     * Construct the base email.
+     *
+     * @param string The email of the sender.
+     * @param string Encoding of the message ('UTF-8')
+     * @param string End of line type ("\n")
+     */
+    function __construct($src, $encoding='UTF-8', $crlf="\n")
+    {
+        // Note that the Pluf autoloader will correctly load this PEAR
+        // object.
+        $this->message = new Mail_mime($crlf); 
+        $this->message->_build_params['html_charset'] = $encoding;
+        $this->message->_build_params['text_charset'] = $encoding;
+        $this->message->_build_params['head_charset'] = $encoding;        
+        $this->headers = array('From' => $src);
+        $this->encoding = $encoding;
+        $this->crlf = $crlf;
+        $this->from = $src;
+    }
+
+    /**
+     * Set the subject of the email.
+     *
+     * @param string Subject
+     */
+    function setSubject($subject)
+    {
+        $this->headers['Subject'] = $subject;
+    }
+
+    /**
+     * Set the recipient of the email.
+     *
+     * @param string Recipient email
+     */
+    function setTo($email)
+    {
+        $this->headers['To'] = $email;
+    }
+
+    /**
+     * Add the base plain text message to the email.
+     *
+     * @param string The message
+     */
+    function addTextMessage($msg)
+    {
+        $this->message->setTXTBody($msg);
+    }
+
+    /**
+     * Set the return path for the email.
+     *
+     * @param string Email
+     */
+    function setReturnPath($email)
+    {
+        $this->headers['Return-Path'] = $email;
+    }
+
+    /**
+     * Add headers to an email.
+     *
+     * @param array Array of headers
+     */
+    function addHeaders($hdrs)
+    {
+        $this->headers = array_merge($this->headers, $hdrs);
+    }
+
+    /**
+     * Add the alternate HTML message to the email.
+     *
+     * @param string The HTML message
+     */
+    function addHtmlMessage($msg)
+    {
+        $this->message->setHTMLBody($msg);
+    }
+
+    /**
+     * Add an attachment to the message.
+     *
+     * The file to attach must be available on disk and you need to
+     * provide the mimetype of the attachment manually.
+     *
+     * @param string Path to the file to be added.
+     * @param string Mimetype of the file to be added ('text/plain').
+     * @return bool True.
+     */
+    function addAttachment($file, $ctype='text/plain')
+    {
+        $this->message->addAttachment($file, $ctype);
+    }
+
+    /**
+     * Effectively sends the email.
+     */
+    function sendMail()
+    {
+        if ($this->backend === null) {
+            $params = Pluf::pf('mail_', true); // strip the prefix 'mail_'
+            unset($params['backend']);
+            $gmail = new Mail();
+            if (Pluf::f('mail_backend') == 'smtp') {
+                $params['persist'] = true;
+            }
+            $this->backend = $gmail->factory(Pluf::f('mail_backend', 'mail'), 
+                                             $params);
+        }
+        $body = $this->message->get();
+        $hdrs = $this->message->headers($this->headers);
+        if (Pluf::f('send_emails', true)) {
+            $this->backend->send($this->headers['To'], $hdrs, $body);
+        }
+        $this->message = new Mail_mime($this->crlf); 
+        $this->message->_build_params['html_charset'] = $this->encoding;
+        $this->message->_build_params['text_charset'] = $this->encoding;
+        $this->message->_build_params['head_charset'] = $this->encoding;        
+        $this->headers = array('From' => $this->from);
+    }
+
+    function close()
+    {
+        unset($this->backend);
+        $this->backend = null;
+    }
+}
diff --git a/src/Pluf/Message.php b/src/Pluf/Message.php
new file mode 100644
index 0000000..a63214d
--- /dev/null
+++ b/src/Pluf/Message.php
@@ -0,0 +1,59 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_Message extends Pluf_Model
+{
+    public $_model = 'Pluf_Message';
+
+    function init()
+    {
+        $this->_a['table'] = 'messages';
+        $this->_a['model'] = 'Pluf_Message';
+        $this->_a['cols'] = array(
+                             // It is mandatory to have an "id" column.
+                            'id' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Sequence',
+                                  //It is automatically added.
+                                  'blank' => true, 
+                                  ),
+                            'user' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Foreignkey',
+                                  'model' => 'Pluf_User',
+                                  'blank' => false,
+                                  'verbose' => __('user'),
+                                  ),
+                            'message' => 
+                            array(
+                                  'type' => 'Pluf_DB_Field_Text',
+                                  'blank' => false,
+                                  ),
+                            );
+    }
+
+    function __toString()
+    {
+        return $this->message;
+    }
+}
diff --git a/src/Pluf/Middleware/Debug.php b/src/Pluf/Middleware/Debug.php
new file mode 100644
index 0000000..7487a46
--- /dev/null
+++ b/src/Pluf/Middleware/Debug.php
@@ -0,0 +1,132 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Debug middleware.
+ *
+ * Simply display small debug information at the end of the page. It
+ * requires the xdebug extension.
+ */
+class Pluf_Middleware_Debug
+{
+    /**
+     * Process the response of a view.
+     *
+     * If the status code and content type are allowed, add the debug
+     * information. Debug must be set to true in the config file to
+     * active it.
+     *
+     * @param Pluf_HTTP_Request The request
+     * @param Pluf_HTTP_Response The response
+     * @return Pluf_HTTP_Response The response
+     */
+    function process_response($request, $response)
+    {
+        if (!Pluf::f('debug', false)) {
+            return $response;
+        }
+        if (!in_array($response->status_code, 
+                     array(200, 201, 202, 203, 204, 205, 206, 404, 501))) {
+            return $response;
+        }
+        $ok = false;
+        $cts = array('text/html', 'text/html', 'application/xhtml+xml');
+        foreach ($cts as $ct) {
+            if (false !== strripos($response->headers['Content-Type'], $ct)) {
+                $ok = true;
+                break;
+            }
+        }
+        if ($ok == false) {
+            return $response;
+        }
+        $js = '<script type="text/javascript">
+// <!--
+    function pxDebugGetElementsByClassName(oElm, strTagName, strClassName){
+        // Written by Jonathan Snook, http://www.snook.ca/jon; 
+        // Add-ons by Robert Nyman, http://www.robertnyman.com
+        var arrElements = (strTagName == "*" && document.all)? document.all :
+        oElm.getElementsByTagName(strTagName);
+        var arrReturnElements = new Array();
+        strClassName = strClassName.replace(/\-/g, "\\-");
+        var oRegExp = new RegExp("(^|\\s)" + strClassName + "(\\s|$)");
+        var oElement;
+        for(var i=0; i<arrElements.length; i++){
+            oElement = arrElements[i];
+            if(oRegExp.test(oElement.className)){
+                arrReturnElements.push(oElement);
+            }
+        }
+        return (arrReturnElements)
+    }
+    function pxDebugHideAll(elems) {
+      for (var e = 0; e < elems.length; e++) {
+        elems[e].style.display = \'none\';
+      }
+    }
+    function pxDebugToggle() {
+      for (var i = 0; i < arguments.length; i++) {
+        var e = document.getElementById(arguments[i]);
+        if (e) {
+          e.style.display = e.style.display == \'none\' ? \'block\' : \'none\';
+        }
+      }
+      return false;
+    } 
+// -->
+  </script>';
+        $text = '<pre style="text-align: left;">';
+        $text .= 'Peak mem: '.(int)(xdebug_peak_memory_usage()/1024).'kB'."\n";
+        $text .= 'Exec time: '.sprintf('%.5f', (microtime(true) - $GLOBALS['_PX_starttime'])).'s'."\n";
+        $included_files = get_included_files();
+        sort($included_files);
+        $text .= '<a href=\'#\' onclick="return pxDebugToggle(\'debug-included-files\')">';
+        $text .= 'Included files #: '.count($included_files);
+        $text .= '</a></pre>'."\n";
+        $text .= $js.'<div id="debug-included-files" class="debug-queries"><pre style="text-align: left;">';
+        foreach ($included_files as $filename) {
+            $text .= htmlspecialchars($filename)."\n";
+        }
+        $text .= '</pre></div>';
+        if (isset($GLOBALS['_PX_debug_data']['sql_queries'])) {
+            $text .= '<pre style="text-align: left;">';            
+            $text .= '<a href=\'#\' onclick="return pxDebugToggle(\'debug-queries\')">';
+            $text .= 'DB query #: '.count($GLOBALS['_PX_debug_data']['sql_queries']);
+            $text .= '</a>'."\n\n";
+            $text .= '</pre>';
+            $text .= '<div id="debug-queries" class="debug-queries"><pre style="text-align: left;">';
+            foreach ($GLOBALS['_PX_debug_data']['sql_queries'] as $q) {
+                $text .= htmlspecialchars($q)."\n";
+            }
+            $text .= '</pre></div>';
+        } else {
+            $text .= '</pre>';
+        }
+        $text .= '<script type="text/javascript">
+      pxDebugHideAll(pxDebugGetElementsByClassName(document, \'div\', \'debug-queries\'));
+            </script>';
+
+        $response->content = str_replace('</body>', $text.'</body>', $response->content);
+        return $response;
+    }
+}
diff --git a/src/Pluf/Middleware/GoogleAnalytics.php b/src/Pluf/Middleware/GoogleAnalytics.php
new file mode 100644
index 0000000..4801c22
--- /dev/null
+++ b/src/Pluf/Middleware/GoogleAnalytics.php
@@ -0,0 +1,72 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * GoogleAnalytics middleware.
+ *
+ * Add the googleanalytics tracking code to the pages.
+ */
+class Pluf_Middleware_GoogleAnalytics
+{
+    /**
+     * Process the response of a view.
+     *
+     * If the status code and content type are allowed, add the
+     * tracking code.
+     *
+     * @param Pluf_HTTP_Request The request
+     * @param Pluf_HTTP_Response The response
+     * @return Pluf_HTTP_Response The response
+     */
+    function process_response($request, $response)
+    {
+        if (!Pluf::f('google_analytics_id', false)) {
+            return $response;
+        }
+        if (!in_array($response->status_code, 
+                     array(200, 201, 202, 203, 204, 205, 206, 404, 501))) {
+            return $response;
+        }
+        $ok = false;
+        $cts = array('text/html', 'text/html', 'application/xhtml+xml');
+        foreach ($cts as $ct) {
+            if (false !== strripos($response->headers['Content-Type'], $ct)) {
+                $ok = true;
+                break;
+            }
+        }
+        if ($ok == false) {
+            return $response;
+        }
+        $js = '<script type="text/javascript">
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+document.write(unescape("%3Cscript src=\'" + gaJsHost + "google-analytics.com/ga.js\' type=\'text/javascript\'%3E%3C/script%3E"));
+</script>
+<script type="text/javascript">
+var pageTracker = _gat._getTracker("'.Pluf::f('google_analytics_id').'");
+pageTracker._trackPageview();
+</script>';
+        $response->content = str_replace('</body>', $js.'</body>', $response->content);
+        return $response;
+    }
+}
diff --git a/src/Pluf/Middleware/Maintenance.php b/src/Pluf/Middleware/Maintenance.php
new file mode 100644
index 0000000..8535802
--- /dev/null
+++ b/src/Pluf/Middleware/Maintenance.php
@@ -0,0 +1,57 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Maintenance middleware.
+ *
+ * If a file MAINTENANCE exists in the temp folder then a maintenance
+ * page is shown. If available, a template maintenance.html is used,
+ * else a simple plain text 'Server in maintenance, please retry
+ * later...' is shown.
+ *
+ * This middleware should be
+ *
+ * Only the actions starting with Pluf::f('maintenance_root') are not
+ * interrupted, that way you can access a special url to perform
+ * upgrade.
+ *
+ */
+class Pluf_Middleware_Maintenance
+{
+
+    /**
+     * Process the request.
+     *
+     * @param Pluf_HTTP_Request The request
+     * @return bool false
+     */
+    function process_request(&$request)
+    {
+        if (0 !== strpos($request->query, Pluf::f('maintenance_root')) && file_exists(Pluf::f('tmp_folder').'/MAINTENANCE')) {
+            $res = new Pluf_HTTP_Response('Server in maintenance'."\n\n".'We are upgrading the system to make it better for you, please try again later...', 'text/plain');
+            $res->status_code = 503;
+            return $res;
+        }
+        return false;
+    }
+}
diff --git a/src/Pluf/Middleware/Session.php b/src/Pluf/Middleware/Session.php
new file mode 100644
index 0000000..8636b41
--- /dev/null
+++ b/src/Pluf/Middleware/Session.php
@@ -0,0 +1,191 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Session middleware.
+ *
+ * Allow a session object in the request and the automatic
+ * login/logout of a user if a standard authentication against the
+ * Pluf_User model is performed.
+ */
+class Pluf_Middleware_Session
+{
+
+    /**
+     * Process the request.
+     *
+     * When processing the request, if a session is found with
+     * Pluf_User creditentials the corresponding user is loaded into
+     * $request->user.
+     *
+     * FIXME: We should logout everybody when the session table is emptied.
+     *
+     * @param Pluf_HTTP_Request The request
+     * @return bool false
+     */
+    function process_request(&$request)
+    {
+        $session = new Pluf_Session();
+        $user = new Pluf_User();
+        if (!isset($request->COOKIE[$session->cookie_name])) {
+            // No session is defined. We set an empty user and empty
+            // session.
+            $request->user = $user;
+            $request->session = $session;
+            if (isset($request->COOKIE[$request->session->test_cookie_name])) {
+                $request->session->test_cookie = $request->COOKIE[$request->session->test_cookie_name];
+            }
+            return false;
+        }
+        try {
+            $data = $this->_decodeData($request->COOKIE[$session->cookie_name]);
+        } catch (Exception $e) {
+            $request->user = $user;
+            $request->session = $session;
+            if (isset($request->COOKIE[$request->session->test_cookie_name])) {
+                $request->session->test_cookie = $request->COOKIE[$request->session->test_cookie_name];
+            }
+            return false;
+        }
+        if (isset($data[$user->session_key])) {
+            // We can get the corresponding user
+            $found_user = new Pluf_User($data[$user->session_key]);
+            if ($found_user->id == $data[$user->session_key]) {
+                // User found!
+                $request->user = $found_user;
+                // If the last login is from 12h or more, set it to
+                // now.
+                Pluf::loadFunction('Pluf_Date_Compare');
+                if (43200 < Pluf_Date_Compare($request->user->last_login)) {
+                    $request->user->last_login = gmdate('Y-m-d H:i:s');
+                    $request->user->update();
+                }
+            } else {
+                $request->user = $user;
+            }
+        } else {
+            $request->user = $user;
+        }
+        if (isset($data['Pluf_Session_key'])) {
+            $sql = new Pluf_SQL('session_key=%s' ,$data['Pluf_Session_key']);
+            $found_session = Pluf::factory('Pluf_Session')->getList(array('filter' => $sql->gen()));
+            if (isset($found_session[0])) {
+                $request->session = $found_session[0];
+            } else {
+                $request->session = $session;
+            }
+        } else {
+            $request->session = $session;
+        }
+        if (isset($request->COOKIE[$request->session->test_cookie_name])) {
+            $request->session->test_cookie = $request->COOKIE[$request->session->test_cookie_name];
+        }
+        return false;
+    }
+
+    /**
+     * Process the response of a view.
+     *
+     * If the session has been modified save it into the database.
+     * Add the session cookie to the response.
+     *
+     * @param Pluf_HTTP_Request The request
+     * @param Pluf_HTTP_Response The response
+     * @return Pluf_HTTP_Response The response
+     */
+    function process_response($request, $response)
+    {
+        if ($request->session->touched) {
+            if ($request->session->id > 0) {
+                $request->session->update();
+            } else {
+                $request->session->create();
+            }
+            $data = array();
+            if ($request->user->id > 0) {
+                $data[$request->user->session_key] = $request->user->id;
+            }
+            $data['Pluf_Session_key'] = $request->session->session_key;
+            $response->cookies[$request->session->cookie_name] = $this->_encodeData($data);
+        }
+        if ($request->session->set_test_cookie != null) {
+            $response->cookies[$request->session->test_cookie_name] = $request->session->test_cookie_value;
+        }
+        return $response;
+    }
+    
+    /**
+     * Encode the cookie data and create a check with the secret key.
+     *
+     * @param mixed Data to encode
+     * @return string Encoded data ready for the cookie
+     */
+    function _encodeData($data)
+    {
+        if ('' == ($key = Pluf::f('secret_key'))) {
+            throw new Exception('Security error: "secret_key" is not set in the configuration file.');
+        }
+        $data = serialize($data);
+        return base64_encode($data).md5(base64_encode($data).$key);
+    }
+
+    /**
+     * Decode the data and check that the data have not been tampered.
+     *
+     * If the data have been tampered an exception is raised.
+     *
+     * @param string Encoded data
+     * @return mixed Decoded data
+     */
+    function _decodeData($encoded_data)
+    {
+        $check = substr($encoded_data, -32);
+        $base64_data = substr($encoded_data, 0, strlen($encoded_data)-32);
+        if (md5($base64_data.Pluf::f('secret_key')) != $check) {
+            throw new Exception('The session data may have been tampered.');
+        }
+        return unserialize(base64_decode($base64_data));
+    }
+
+    public static function processContext($signal, &$params)
+    {
+        $params['context'] = array_merge($params['context'],
+                                         Pluf_Middleware_Session_ContextPreProcessor($params['request']));
+    }
+}
+
+/**
+ * Context preprocessor.
+ *
+ * Set the $user key.
+ *
+ * @param Pluf_HTTP_Request Request object
+ * @return array Array to merge with the context
+ */
+function Pluf_Middleware_Session_ContextPreProcessor($request)
+{
+    return array('user' => $request->user);
+}
+
+Pluf_Signal::connect('Pluf_Template_Context_Request::construct',
+                     array('Pluf_Middleware_Session', 'processContext'));
\ No newline at end of file
diff --git a/src/Pluf/Middleware/Tidy.php b/src/Pluf/Middleware/Tidy.php
new file mode 100644
index 0000000..3bb86ba
--- /dev/null
+++ b/src/Pluf/Middleware/Tidy.php
@@ -0,0 +1,86 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Tidy middleware.
+ *
+ * Check if a response contains HTML errors. It writes a general log
+ * in the 'tmp_folder' with a view of the details of the errors in
+ * separate files. It relies on the availability of tidy on the system
+ * path.
+ *
+ * It checks only the pages with following status code: 200, 201, 202,
+ * 203, 204, 205, 206, 404, 501. And the following content type:
+ * text/html, text/html, application/xhtml+xml.
+ *
+ * @see http://tidy.sourceforge.net/
+ */
+class Pluf_Middleware_Tidy
+{
+    /**
+     * Process the response of a view.
+     *
+     * If the status code and content type are allowed, perform the check.
+     *
+     * @param Pluf_HTTP_Request The request
+     * @param Pluf_HTTP_Response The response
+     * @return Pluf_HTTP_Response The response
+     */
+    function process_response($request, $response)
+    {
+        if (!in_array($response->status_code, 
+                     array(200, 201, 202, 203, 204, 205, 206, 404, 501))) {
+            return $response;
+        }
+        $ok = false;
+        $cts = array('text/html', 'text/html', 'application/xhtml+xml');
+        foreach ($cts as $ct) {
+            if (false !== strripos($response->headers['Content-Type'], $ct)) {
+                $ok = true;
+                break;
+            }
+        }
+        if ($ok == false) {
+            return $response;
+        }
+        $content = escapeshellarg($response->content);
+        $res = array();
+        $rval = 0;
+        exec('(echo '.$content.'| tidy -e -utf8 -q 3>&2 2>&1 1>&3) ', $res, $rval);
+        if (empty($res)) {
+            return $response;
+        }
+        $only_char_encoding_issue = Pluf::f('tidy_skip_encoding_errors', true);
+        foreach ($res as $line) {
+            if (false === strpos($line, 'invalid character code')) {
+                $only_char_encoding_issue = false;
+                break;
+            }
+        }
+        if ($only_char_encoding_issue == true) {
+            return $response;
+        }
+        $response->content = str_replace('</body>', '<pre style="text-align: left;">'.htmlspecialchars(join("\n", $res)).'</pre></body>', $response->content);
+        return $response;
+    }
+}
diff --git a/src/Pluf/Middleware/Translation.php b/src/Pluf/Middleware/Translation.php
new file mode 100644
index 0000000..63438ad
--- /dev/null
+++ b/src/Pluf/Middleware/Translation.php
@@ -0,0 +1,93 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Translation middleware.
+ *
+ * Load the translation of the website based on the useragent.
+ */
+class Pluf_Middleware_Translation
+{
+
+    /**
+     * Process the request.
+     *
+     * @param Pluf_HTTP_Request The request
+     * @return bool false
+     */
+    function process_request(&$request)
+    {
+        // Find which language to use. By priority:
+        // A session value with 'pluf_language'
+        // A cookie with 'pluf_language'
+        // The browser information.
+        $lang = false;
+        if (!empty($request->session)) {
+            $lang = $request->session->getData('pluf_language', false);
+            if ($lang and !in_array($lang, Pluf::f('languages', array('en')))) {
+                $lang = false;
+            }
+        }
+        if ($lang === false and !empty($request->COOKIES[Pluf::f('lang_cookie', 'pluf_language')])) {
+            $lang = $request->COOKIES[Pluf::f('lang_cookie', 'pluf_language')];
+            if ($lang and !in_array($lang, Pluf::f('languages', array('en')))) {
+                $lang = false;
+            }
+        }
+        if ($lang === false) {
+            // will default to 'en'
+            $lang = Pluf_Translation::getAcceptedLanguage(Pluf::f('languages', array('en')));
+        }
+        $GLOBALS['_PX_current_locale'] = $lang;
+        $GLOBALS['_PX_locale'] = array();
+        $GLOBALS['_PX_locale'][$lang] = array();
+        foreach (Pluf::f('installed_apps') as $app) {
+            $pofile = Pluf::fileExists($app.'/locale/'.$lang.'/'.strtolower($app).'.po');
+            $GLOBALS['_PX_locale'][$lang] += Pluf_Translation::readPoFile($pofile);
+        }
+        $request->language_code = $lang;
+        return false;
+    }
+
+    /**
+     * Process the response of a view.
+     *
+     * @param Pluf_HTTP_Request The request
+     * @param Pluf_HTTP_Response The response
+     * @return Pluf_HTTP_Response The response
+     */
+    function process_response($request, $response)
+    {
+        $vary_h = array();
+        if (!empty($response->headers['Vary'])) {
+            $vary_h = preg_split('/\s*,\s*/', $response->headers['Vary'],
+                                 -1, PREG_SPLIT_NO_EMPTY);
+        }
+        if (!in_array('accept-language', $vary_h)) {
+            $vary_h[] = 'accept-language';
+        }
+        $response->headers['Vary'] = implode(', ', $vary_h);
+        $response->headers['Content-Language'] = $request->language_code;
+        return $response;
+    }
+}
\ No newline at end of file
diff --git a/src/Pluf/Migration.php b/src/Pluf/Migration.php
new file mode 100644
index 0000000..06dcbe7
--- /dev/null
+++ b/src/Pluf/Migration.php
@@ -0,0 +1,319 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * A class to manage the migration of the code from one version to
+ * another, upward or downward.
+ *
+ * You can directly use the migrate.php script.
+ *
+ * Simple example usage:
+ *
+ * $m = new Pluf_Migration('MyApp');
+ * $m->migrate();
+ *
+ * // Install the application MyApp
+ * $m = new Pluf_Migration('MyApp');
+ * $m->install();
+ * // Uninstall the application MyApp
+ * $m->unInstall();
+ *
+ * $m = new Pluf_Migration();
+ * $m->migrate(); // migrate all the installed app to the newest version.
+ *
+ * $m = new Pluf_Migration();
+ * $m->migrate(3); // migrate (upgrade or downgrade) to version 3
+ *
+ */
+class Pluf_Migration
+{
+    protected $app = ''; /**< Application beeing migrated. */
+    public $apps = array(); /**< Applications which are going to be migrated. */
+    public $to_version = null; /**< Target version for the migration. */
+    public $dry_run = false; /**< Set to true to not act. */
+    public $display = false; /**< Display on the console what is done. */
+
+    /**
+     * Create a new migration.
+     *
+     * @param mixed Application or array of applications to migrate.
+     */
+    public function __construct($app=null)
+    {
+        if (!is_null($app)) {
+            if (is_array($app)) {
+                $this->apps = $app;
+            } else {
+                $this->apps = array($app);
+            }
+        } else {
+            $this->apps = Pluf::f('installed_apps');
+        }
+    }
+
+
+    /**
+     * Install the application.
+     *
+     * Basically run the base install function for each application
+     * and then set the version to the latest migration.
+     */
+    public function install()
+    {
+        foreach ($this->apps as $app) {
+            $this->installApp($app);
+        }
+        return true;
+    }
+
+    /**
+     * Uninstall the application.
+     */
+    public function unInstall()
+    {
+        $apps = array_reverse($this->apps);
+        foreach ($apps as $app) {
+            $this->installApp($app, true);
+        }
+    }
+
+
+    /**
+     * Run the migration.
+     *
+     */
+    public function migrate($to_version=null)
+    {
+        $this->to_version = $to_version;
+        foreach ($this->apps as $app) {
+            $this->app = $app;
+            $migrations = $this->findMigrations();
+            // The run will throw an exception in case of error.
+            $this->runMigrations($migrations); 
+        }
+        return true;
+    }
+
+    /**
+     * Un/Install the given application.
+     *
+     * @param string Application to install.
+     * @param bool Uninstall (false)
+     */
+    public function installApp($app, $uninstall=false)
+    {
+        if ($uninstall) {
+            $func = $app.'_Migrations_Install_teardown';
+        } else {
+            $func = $app.'_Migrations_Install_setup';
+        }
+        $ret = true;
+        Pluf::loadFunction($func);
+        if ($this->display) {
+            echo($func."\n");
+        }
+        if (!$this->dry_run) {
+            $ret = $func(); // Run the install/uninstall
+            if (!$uninstall) {
+                // 
+                $this->app = $app;
+                $migrations = $this->findMigrations();
+                if (count($migrations) > 0) {
+                    $to_version = max(array_keys($migrations));
+                } else {
+                    $to_version = 0;
+                }
+                $this->setAppVersion($app, $to_version);
+            } else {
+                if ($app != 'Pluf') {
+                    // If Pluf we do not have the schema info table
+                    // anymore
+                    $this->delAppInfo($app);
+                }
+            }
+        }
+        return $ret;
+    }
+
+
+    /**
+     * Find the migrations for the current app.
+     *
+     * @return array Migrations names indexed by order.
+     */
+    public function findMigrations()
+    {
+        $migrations = array();
+        if (false !== ($mdir = Pluf::fileExists($this->app.'/Migrations'))) {
+            $dir = new DirectoryIterator($mdir);
+            foreach($dir as $file) {
+                $matches = array();
+                if (!$file->isDot() && !$file->isDir()
+                    && preg_match('#^(\d+)#', $file->getFilename(), $matches)) {
+                    $info = pathinfo($file->getFilename());
+                    $migrations[(int)$matches[1]] = $info['filename'];
+                }
+            }
+        }
+        return $migrations;
+    }
+
+    /**
+     * Run the migrations.
+     *
+     * From an array of possible migrations, it will first get the
+     * current version of the app and then based on $this->to_version
+     * will run the migrations in the right order or do nothing if
+     * nothing to be done.
+     *
+     * @param array Possible migrations.
+     */
+    public function runMigrations($migrations)
+    {
+        if (empty($migrations)) {
+            return;
+        }
+        $current = $this->getAppVersion($this->app);
+        if ($this->to_version === null) {
+            $to_version = max(array_keys($migrations));
+        } else {
+            $to_version = $this->to_version;
+        }
+        if ($to_version == $current) {
+            return; // Nothing to do
+        }
+        $the_way = 'up'; // Tribute to Pat Metheny
+        if ($to_version > $current) {
+            // upgrade
+            $min = $current + 1;
+            $max = $to_version;
+        } else {
+            // downgrade
+            $the_way = 'do';
+            $max = $current;
+            $min = $to_version + 1;
+        }
+        // Filter the migrations
+        $to_run = array();
+        foreach ($migrations as $order=>$name) {
+            if ($order < $min or $order > $max) {
+                continue;
+            }
+            if ($the_way == 'up') {
+                $to_run[] = array($order, $name);
+            } else {
+                array_unshift($to_run, array($order, $name));
+            }
+        }
+        asort($to_run);
+        // Run the migrations
+        foreach ($to_run as $migration) {
+            $this->runMigration($migration, $the_way);
+        }
+    }
+
+    /**
+     * Run the given migration.
+     */
+    public function runMigration($migration, $the_way='up')
+    {
+        $target_version = ($the_way == 'up') ? $migration[0] : $migration[0]-1;
+        if ($this->display) {
+            echo($migration[0].' '.$migration[1].' '.$the_way."\n");
+        }
+        if (!$this->dry_run) {
+            if ($the_way == 'up') {
+                $func = $this->app.'_Migrations_'.$migration[1].'_up';
+            } else {
+                $func = $this->app.'_Migrations_'.$migration[1].'_down';
+            }
+            Pluf::loadFunction($func);
+            $func(); // Real migration run
+            $this->setAppVersion($this->app, $target_version);
+        } 
+    }
+
+    /**
+     * Set the application version.
+     *
+     * @param string Application
+     * @param int Version
+     * @return true
+     */
+    public function setAppVersion($app, $version)
+    {
+        $gschema = new Pluf_DB_SchemaInfo();
+        $sql = new Pluf_SQL('application=%s', $app);
+        $appinfo = $gschema->getList(array('filter' => $sql->gen()));
+        if ($appinfo->count() == 1) {
+            $appinfo[0]->version = $version;
+            $appinfo[0]->update();
+        } else {
+            $schema = new Pluf_DB_SchemaInfo();
+            $schema->application = $app;
+            $schema->version = $version;
+            $schema->create();
+        }
+        return true;
+    }
+
+    /**
+     * Remove the application information.
+     *
+     * @param string Application
+     * @return true
+     */
+    public function delAppInfo($app)
+    {
+        $gschema = new Pluf_DB_SchemaInfo();
+        $sql = new Pluf_SQL('application=%s', $app);
+        $appinfo = $gschema->getList(array('filter' => $sql->gen()));
+        if ($appinfo->count() == 1) {
+            $appinfo[0]->delete();
+        }
+        return true;
+    }
+
+    
+
+    /**
+     * Get the current version of the app.
+     *
+     * @param string Application.
+     * @return int Version.
+     */
+    public function getAppVersion($app)
+    {
+        try {
+            $db =& Pluf::db();
+            $res = $db->select('SELECT version FROM '.$db->pfx.'schema_info WHERE application='.$db->esc($app));
+            return (int) $res[0]['version'];
+        } catch (Exception $e) {
+            // We should not be here, only in the case of nothing
+            // installed. I am not sure if this is a good way to
+            // handle this border case anyway. Maybe better to have an
+            // 'install' method to run all the migrations in order.
+            return 0;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Pluf/Migrations/1Setup.php b/src/Pluf/Migrations/1Setup.php
new file mode 100644
index 0000000..3c0f51a
--- /dev/null
+++ b/src/Pluf/Migrations/1Setup.php
@@ -0,0 +1,38 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Setup of the Plume Framework.
+ *
+ * It creates all the tables for the framework models.
+ */
+
+function Pluf_Migrations_1Setup_up($params=null)
+{
+    // Do nothing as now in the Install.php file.
+}
+
+function Pluf_Migrations_1Setup_down($params=null)
+{
+    // Do nothing as now in the Install.php file.
+}
\ No newline at end of file
diff --git a/src/Pluf/Migrations/2RowPermission.php b/src/Pluf/Migrations/2RowPermission.php
new file mode 100644
index 0000000..4f9123d
--- /dev/null
+++ b/src/Pluf/Migrations/2RowPermission.php
@@ -0,0 +1,56 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Add the row permission system.
+ */
+
+function Pluf_Migrations_2RowPermission_up($params=null)
+{
+    $db = Pluf::db();
+    $db->begin(); // Start a transaction
+    try {
+        $schema = new Pluf_DB_Schema($db);
+        $schema->model = new Pluf_RowPermission();
+        $schema->createTables();
+    } catch (Exception $e) {
+        $db->rollback();
+        throw $e;
+    }
+    $db->commit(); 
+}
+
+function Pluf_Migrations_2RowPermission_down($params=null)
+{
+    $db = Pluf::db();
+    $db->begin(); // Start a transaction
+    try {
+        $schema = new Pluf_DB_Schema($db);
+        $schema->model = new Pluf_RowPermission();
+        $schema->dropTables();
+    } catch (Exception $e) {
+        $db->rollback();
+        throw $e;
+    }
+    $db->commit(); 
+}
\ No newline at end of file
diff --git a/src/Pluf/Migrations/3SearchEngine.php b/src/Pluf/Migrations/3SearchEngine.php
new file mode 100644
index 0000000..4a0bd60
--- /dev/null
+++ b/src/Pluf/Migrations/3SearchEngine.php
@@ -0,0 +1,60 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Add the search engine.
+ */
+
+function Pluf_Migrations_3SearchEngine_up($params=null)
+{
+    $db = Pluf::db();
+    $db->begin(); // Start a transaction
+    try {
+        $schema = new Pluf_DB_Schema($db);
+        foreach (array('Pluf_Search_Word', 'Pluf_Search_Occ') as $model) {
+            $schema->model = new $model();
+            $schema->createTables();
+        }
+    } catch (Exception $e) {
+        $db->rollback();
+        throw $e;
+    }
+    $db->commit(); 
+}
+
+function Pluf_Migrations_3SearchEngine_down($params=null)
+{
+    $db = Pluf::db();
+    $db->begin(); // Start a transaction
+    try {
+        $schema = new Pluf_DB_Schema($db);
+        foreach (array('Pluf_Search_Occ', 'Pluf_Search_Word') as $model) {
+            $schema->model = new $model();
+            $schema->dropTables();
+        }
+    } catch (Exception $e) {
+        $db->rollback();
+        throw $e;
+    }
+    $db->commit(); 
+}
\ No newline at end of file
diff --git a/src/Pluf/Migrations/4QueueStats.php b/src/Pluf/Migrations/4QueueStats.php
new file mode 100644
index 0000000..c8cc8d8
--- /dev/null
+++ b/src/Pluf/Migrations/4QueueStats.php
@@ -0,0 +1,60 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Add the search engine.
+ */
+
+function Pluf_Migrations_4QueueStats_up($params=null)
+{
+    $db = Pluf::db();
+    $db->begin(); // Start a transaction
+    try {
+        $schema = new Pluf_DB_Schema($db);
+        foreach (array('Pluf_Search_Stats', 'Pluf_Queue') as $model) {
+            $schema->model = new $model();
+            $schema->createTables();
+        }
+    } catch (Exception $e) {
+        $db->rollback();
+        throw $e;
+    }
+    $db->commit(); 
+}
+
+function Pluf_Migrations_4QueueStats_down($params=null)
+{
+    $db = Pluf::db();
+    $db->begin(); // Start a transaction
+    try {
+        $schema = new Pluf_DB_Schema($db);
+        foreach (array('Pluf_Queue', 'Pluf_Search_Stats') as $model) {
+            $schema->model = new $model();
+            $schema->dropTables();
+        }
+    } catch (Exception $e) {
+        $db->rollback();
+        throw $e;
+    }
+    $db->commit(); 
+}
\ No newline at end of file
diff --git a/src/Pluf/Migrations/Install.php b/src/Pluf/Migrations/Install.php
new file mode 100644
index 0000000..1482f97
--- /dev/null
+++ b/src/Pluf/Migrations/Install.php
@@ -0,0 +1,72 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Setup of the Plume Framework.
+ *
+ * It creates all the tables for the framework models.
+ */
+
+function Pluf_Migrations_Install_setup($params=null)
+{
+    $models = array('Pluf_DB_SchemaInfo',
+                    'Pluf_Session',
+                    'Pluf_User',
+                    'Pluf_Group',
+                    'Pluf_Message',
+                    'Pluf_Permission',
+                    'Pluf_RowPermission',
+                    'Pluf_Search_Word',
+                    'Pluf_Search_Occ', 
+                    'Pluf_Search_Stats', 
+                    'Pluf_Queue',
+                    );
+    $db = Pluf::db();
+    $schema = new Pluf_DB_Schema($db);
+    foreach ($models as $model) {
+        $schema->model = new $model();
+        $schema->createTables();
+    }
+}
+
+function Pluf_Migrations_Install_teardown($params=null)
+{
+    $models = array('Pluf_Queue',
+                    'Pluf_Search_Stats', 
+                    'Pluf_Search_Occ', 
+                    'Pluf_Search_Word',
+                    'Pluf_RowPermission',
+                    'Pluf_Permission',
+                    'Pluf_Message',
+                    'Pluf_Group',
+                    'Pluf_User',
+                    'Pluf_Session',
+                    'Pluf_DB_SchemaInfo',
+                    );
+    $db = Pluf::db();
+    $schema = new Pluf_DB_Schema($db);
+    foreach ($models as $model) {
+        $schema->model = new $model();
+        $schema->dropTables();
+    }
+}
\ No newline at end of file
diff --git a/src/Pluf/Model.php b/src/Pluf/Model.php
new file mode 100644
index 0000000..9802ece
--- /dev/null
+++ b/src/Pluf/Model.php
@@ -0,0 +1,960 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+
+/**
+ * Sort of Active Record Class
+ *
+ */
+class Pluf_Model
+{
+    public $_model = __CLASS__; //set it to your model name
+
+    /** Database connection. */
+    public $_con = null;
+
+    /** 
+     * Store the attributes of the model. To minimize pollution of the
+     * property space, all the attributes are stored in this array.
+     *
+     * Description of the keys:
+     * 'table': The table in which the model is stored.
+     * 'model': The name of the model.
+     * 'cols': The definition of the columns.
+     * 'idx': The definition of the indexes.
+     * 'views': The definition of the views.
+     * 'verbose': The verbose name of the model.
+     */
+    public $_a = array('table' => 'model',
+                       'model' => 'Pluf_Model',
+                       'cols' => array(),
+                       'idx' => array(),
+                       'views' => array(),
+                       );
+
+    /** Storage of the data.
+     *
+     * The object data are stored in an associative array. Each key
+     * corresponds to a column and stores a Pluf_DB_Field_* variable.
+     */
+    protected $_data = array(); 
+
+    /**
+     * Storage cached data for methods_get
+     */
+    protected $_cache = array(); // We should use a global cache.
+    
+    /** List of the foreign keys.
+     *
+     * Set by the init() method from the definition of the columns.
+     */
+    protected $_fk = array();
+
+    /** 
+     * Methods available, this array is dynamically populated by init
+     * method.
+     */ 
+    protected $_m = array('list' => array(), // get_*_list methods
+                          'many' => array(), // many to many
+                          'get' => array(), // foreign keys
+                          'extra' => array(), // added by some fields
+                          );
+
+    function __construct($pk=null, $values=array())
+    {
+        $this->_init();
+        if ((int) $pk > 0) {
+            $this->get($pk); //Should not have a side effect
+        }
+    }
+
+
+    function init()
+    {
+        // Define it yourself.
+    }
+
+    /**
+     * Define the list of methods for the model from the available
+     * model relationship.
+     */
+    function _init()
+    {
+        $this->_getConnection();
+        if (isset($GLOBALS['_PX_models_init_cache'][$this->_model])) {
+            $this->_cache = $GLOBALS['_PX_models_init_cache'][$this->_model]['cache'];
+            $this->_m = $GLOBALS['_PX_models_init_cache'][$this->_model]['m'];
+            $this->_a = $GLOBALS['_PX_models_init_cache'][$this->_model]['a'];
+            $this->_fk = $GLOBALS['_PX_models_init_cache'][$this->_model]['fk'];
+            $this->_data = $GLOBALS['_PX_models_init_cache'][$this->_model]['data'];
+            return;
+        }
+        $this->init();
+        foreach ($this->_a['cols'] as $col=>$val) {
+            $field = new $val['type']('', $col);
+            if ($field->type == 'foreignkey') {
+                $this->_m['get']['get_'.strtolower($col)] = array($val['model'], $col);
+                $this->_cache['fk'][$col] = 'foreignkey';
+            }
+            if ($field->type == 'manytomany') {
+                $this->_m['list']['get_'.strtolower($col).'_list'] = $val['model'];
+                $this->_m['many'][$val['model']] = 'manytomany';
+            }
+            foreach ($field->methods as $method) {
+                $this->_m['extra'][$method[0]] = array(strtolower($col), $method[1]);
+            }
+            if (array_key_exists('default', $val)) {
+                $this->_data[$col] = $val['default'];
+            } else {
+                $this->_data[$col] = '';
+            }
+        }
+        foreach ($GLOBALS['_PX_models'] as $model=>$val) {
+            if (isset($val['relate_to'])) {
+                foreach ($val['relate_to'] as $related) {
+                    if ($this->_a['model'] == $related) {
+                        // The current model is related to $model
+                        // through one or more foreign key. We load
+                        // the $model to check on which fields the
+                        // foreign keys are set, as it is possible in
+                        // one model to have several foreign keys to
+                        // the same other model.
+                        if ($model != $this->_a['model']) {
+                            $_m = new $model();
+                            $_fkeys = $_m->getForeignKeysToModel($this->_a['model']);
+                        } else {
+                            $_fkeys = $this->getForeignKeysToModel($this->_a['model']);
+                        }
+                        foreach ($_fkeys as $_fkey=>$_fkeyval) {
+                            //For each foreign key, we add the
+                            //get_xx_list method that can have a
+                            //custom name through the relate_name
+                            //value.
+                            if (isset($_fkeyval['relate_name'])) {
+                                $mname = $_fkeyval['relate_name'];
+                            } else {
+                                $mname = strtolower($model);
+                            }
+                            $this->_m['list']['get_'.$mname.'_list'] = array($model, $_fkey);
+                        }
+                        break;
+                    }
+                }
+            }
+            if (isset($val['relate_to_many']) && 
+                in_array($this->_a['model'], $val['relate_to_many'])) {
+                $this->_m['list']['get_'.strtolower($model).'_list'] = $model;
+                $this->_m['many'][$model] = 'manytomany';
+            }
+        }
+        $GLOBALS['_PX_models_init_cache'][$this->_model] = array();
+        $GLOBALS['_PX_models_init_cache'][$this->_model]['cache'] = $this->_cache;
+        $GLOBALS['_PX_models_init_cache'][$this->_model]['m'] = $this->_m;
+        $GLOBALS['_PX_models_init_cache'][$this->_model]['a'] = $this->_a;
+        $GLOBALS['_PX_models_init_cache'][$this->_model]['fk'] = $this->_fk;
+        $GLOBALS['_PX_models_init_cache'][$this->_model]['data'] = $this->_data;
+    }
+
+    /**
+     * Get the foreign keys relating to a given model.
+     *
+     * @param string Model
+     * @return array Foreign keys
+     */
+    function getForeignKeysToModel($model)
+    {
+        $keys = array();
+        foreach ($this->_a['cols'] as $col=>$val) {
+            $field = new $val['type']();
+            if ($field->type == 'foreignkey' and $val['model'] == $model) {
+                $keys[$col] = $val;
+            }
+        }
+        return $keys;
+    }
+
+    /**
+     * Get the raw data of the object.
+     *
+     * @return array Associative array of the data.
+     */
+    function getData()
+    {
+        return $this->_data;
+    }
+
+    /**
+     * Set the association of a model to another in many to many.
+     *
+     * @param object Object to associate to the current object
+     */
+    function setAssoc($model)
+    {
+        if (!$this->delAssoc($model)) {
+            return false;
+        }
+        $hay = array(strtolower($model->_a['model']), strtolower($this->_a['model']));
+        sort($hay);
+        $table = $hay[0].'_'.$hay[1].'_assoc';
+        $req = 'INSERT INTO '.$this->_con->pfx.$table."\n";
+        $req .= '('.$this->_con->qn(strtolower($this->_a['model']).'_id').', '
+            .$this->_con->qn(strtolower($model->_a['model']).'_id').') VALUES '."\n";
+        $req .= '('.$this->_toDb($this->_data['id'], 'id').', ';
+        $req .= $this->_toDb($model->id, 'id').')';
+        $this->_con->execute($req);
+        return true;
+    }
+
+    /**
+     * Set the association of a model to another in many to many.
+     *
+     * @param object Object to associate to the current object
+     */
+    function delAssoc($model)
+    {
+
+        //check if ok to make the association
+        //current model has a many to many key with $model
+        //$model has a many to many key with current model
+        if (!isset($this->_m['many'][$model->_a['model']])
+            or strlen($this->_data['id']) == 0
+            or strlen($model->id) == 0) {
+            return false;
+        }
+        $hay = array(strtolower($model->_a['model']), strtolower($this->_a['model']));
+        sort($hay);
+        $table = $hay[0].'_'.$hay[1].'_assoc';
+        $req = 'DELETE FROM '.$this->_con->pfx.$table.' WHERE'."\n";
+        $req .= $this->_con->qn(strtolower($this->_a['model']).'_id').' = '.$this->_toDb($this->_data['id'], 'id');
+        $req .= ' AND '.$this->_con->qn(strtolower($model->_a['model']).'_id').' = '.$this->_toDb($model->id, 'id');
+        $this->_con->execute($req);
+        return true;
+    }
+
+    /**
+     * Bulk association of models to the current one.
+     *
+     * @param string Model name
+     * @param array Ids of Model name
+     * @return bool Success
+     */
+    function batchAssoc($model_name, $ids)
+    {
+        $currents = $this->getRelated($model_name);
+        foreach ($currents as $cur) {
+            $this->delAssoc($cur);
+        }
+        foreach ($ids as $id) {
+            $m = new $model_name($id);
+            if ($m->id == $id) {
+                $this->setAssoc($m);
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Get a database connection.
+     */
+    function _getConnection()
+    {
+        $this->_con = &Pluf::db($this);
+    }
+
+    /**
+     * Get the table of the model.
+     *
+     * Avoid doing the concatenation of the prefix and the table
+     * manually.
+     */
+    function getSqlTable()
+    {
+        return $this->_con->pfx.$this->_a['table'];
+    }
+
+    /**
+     * Overloading of the get method.
+     *
+     * @param string Property to get
+     */
+    function __get($prop)
+    {
+        if (array_key_exists($prop, $this->_data)) return $this->_data[$prop];
+        else try {
+            return $this->__call($prop, array());
+        } catch (Exception $e) {
+            throw new Exception(sprintf('Cannot get property "%s".', $prop));
+        }
+    }
+
+    /**
+     * Overloading of the set method.
+     *
+     * @param string Property to set
+     * @param mixed Value to set
+     */
+    function __set($prop, $val)
+    {
+        if (!is_null($val) and isset($this->_cache['fk'][$prop])) $this->_data[$prop] = $val->id;
+        else $this->_data[$prop] = $val;
+    }
+
+    /**
+     * Overloading of the method call.
+     *
+     * @param string Method
+     * @param array Arguments
+     */
+    function __call($method, $args)
+    {
+        // The foreign keys of the current object.
+        if (isset($this->_m['get'][$method])) {
+            if (isset($this->_cache[$method])) {
+                return $this->_cache[$method];
+            } else {
+                $this->_cache[$method] = Pluf::factory($this->_m['get'][$method][0], $this->_data[$this->_m['get'][$method][1]]);
+                if ($this->_cache[$method]->id == '') $this->_cache[$method] = null;
+                return $this->_cache[$method];
+            }
+        }
+        // Many to many or foreign keys on the other objects.
+        if (isset($this->_m['list'][$method])) {
+            if (is_array($this->_m['list'][$method])) {
+                $model = $this->_m['list'][$method][0];
+            } else {
+                $model = $this->_m['list'][$method];
+            }
+            $args = array_merge(array($model, $method), $args);
+            return call_user_func_array(array($this, 'getRelated'), $args);
+        }
+        // Extra methods added by fields
+        if (isset($this->_m['extra'][$method])) {
+            $args = array_merge(array($this->_m['extra'][$method][0], $method, $this), $args);
+            Pluf::loadFunction($this->_m['extra'][$method][1]);
+            return call_user_func_array($this->_m['extra'][$method][1], $args);
+        }
+        throw new Exception(sprintf('Method "%s" not available.', $method));
+    }
+
+    /**
+     * Get a given item.
+     *
+     * @param int Id of the item.
+     * @return mixed Item or false if not found.
+     */
+    function get($id)
+    {
+        $req = 'SELECT * FROM '.$this->getSqlTable().' WHERE id='.$this->_toDb($id, 'id');
+        if (false === ($rs = $this->_con->select($req))) {
+            throw new Exception($this->_con->getError());
+        }
+        if (count($rs) == 0) {
+            return false;
+        }
+        foreach ($this->_a['cols'] as $col => $val) {
+            $field = new $val['type']();
+            if ($field->type != 'manytomany' && array_key_exists($col, $rs[0])) {
+                $this->_data[$col] = $this->_fromDb($rs[0][$col], $col);
+            }
+        }
+        $this->restore();
+        return $this;
+    }
+
+    /**
+     * Get a list of items.
+     *
+     * The filter should be used only for simple filtering. If you want
+     * a complex query, you should create a new view.
+     * Both filter and order accept an array or a string in case of multiple
+     * parameters:
+     * Filter:
+     *    array('col1=toto', 'col2=titi') will be used in a AND query
+     *    or simply 'col1=toto'
+     * Order:
+     *    array('col1 ASC', 'col2 DESC') or 'col1 ASC'
+     * 
+     * This is modelled on the DB_Table pear module interface.
+     *
+     * @param array Associative array with the possible following
+     *              keys:
+     *    'view': The view to use
+     *  'filter': The where clause to use
+     *   'order': The ordering of the result set
+     *   'start': The number of skipped rows in the result set
+     *      'nb': The number of items to get in the result set
+     *   'count': Run a count query and not a select if set to true
+     * @return ArrayObject of items or through an exception if
+     * database failure
+     */
+    function getList($p=array()) 
+    {
+        $default = array('view' => null, 
+                         'filter' => null, 
+                         'order' => null, 
+                         'start' => null, 
+                         'select' => null,
+                         'nb' => null, 
+                         'count' => false);
+        $p = array_merge($default, $p);
+        if (!is_null($p['view']) && !isset($this->_a['views'][$p['view']])) {
+            throw new Exception(sprintf(__('The view "%s" is not defined.'), $p['view']));
+        }
+        $query = array(
+                       'select' => $this->getSelect(),
+                       'from' => $this->_a['table'],
+                       'join' => '',
+                       'where' => '',
+                       'group' => '',
+                       'having' => '',
+                       'order' => '',
+                       'limit' => '',
+                       'props' => array(),
+                       );
+        if (!is_null($p['view'])) {
+            $query = array_merge($query, $this->_a['views'][$p['view']]);
+        }
+        if (!is_null($p['select'])) {
+            $query['select'] = $p['select'];
+        }
+        if (!is_null($p['filter'])) {
+            if (is_array($p['filter'])) {
+                $p['filter'] = implode(' AND ', $p['filter']);
+            }
+            if (strlen($query['where']) > 0) {
+                $query['where'] .= ' AND ';
+            }
+            $query['where'] .= ' ('.$p['filter'].') ';
+        }
+        if (!is_null($p['order'])) {
+            if (is_array($p['order'])) {
+                $p['order'] = implode(', ', $p['order']);
+            }
+            if (strlen($query['order']) > 0 and strlen($p['order']) > 0) {
+                $query['order'] .= ', ';
+            }
+            $query['order'] .= $p['order'];
+        }
+        if (!is_null($p['start']) && is_null($p['nb'])) {
+            $p['nb'] = 10000000;
+        }
+        if (!is_null($p['start'])) {
+            if ($p['start'] != 0) {
+                $p['start'] = (int) $p['start'];
+            }
+            $p['nb'] = (int) $p['nb'];
+            $query['limit'] = 'LIMIT '.$p['nb'].' OFFSET '.$p['start'];
+        }
+        if (!is_null($p['nb']) && is_null($p['start'])) {
+            $p['nb'] = (int) $p['nb'];
+            $query['limit'] = 'LIMIT '.$p['nb'];
+        }
+        if ($p['count'] == true) {
+            if (isset($query['select_count'])) {
+                $query['select'] = $query['select_count'];
+            } else {
+                $query['select'] = 'COUNT(*) as nb_items';
+            }
+            $query['order'] = '';
+            $query['limit'] = '';
+        }
+        $req = 'SELECT '.$query['select'].' FROM '
+            .$this->_con->pfx.$query['from'].' '.$query['join'];
+        if (strlen($query['where'])) {
+            $req .= "\n".'WHERE '.$query['where'];
+        }
+        if (strlen($query['group'])) {
+            $req .= "\n".'GROUP BY '.$query['group'];
+        }
+        if (strlen($query['having'])) {
+            $req .= "\n".'HAVING '.$query['having'];
+        }
+        if (strlen($query['order'])) {
+            $req .= "\n".'ORDER BY '.$query['order'];
+        }
+        if (strlen($query['limit'])) {
+            $req .= "\n".$query['limit'];
+        }
+        if (false === ($rs=$this->_con->select($req))) {
+            throw new Exception($this->_con->getError());
+        }
+        if (count($rs) == 0) {
+            return new ArrayObject();
+        } 
+        if ($p['count'] == true) {
+            return $rs;
+        }
+        $res = new ArrayObject();
+        foreach ($rs as $row) {
+            $this->_reset();
+            foreach ($this->_a['cols'] as $col => $val) {
+                if (isset($row[$col])) $this->_data[$col] = $this->_fromDb($row[$col], $col);
+            }
+            // FIXME: The associated properties need to be converted too.
+            foreach ($query['props'] as $prop => $key) {
+                if (isset($row[$prop])) $this->_data[$key] = $row[$prop];
+            }
+            $this->restore();
+            $res[] = clone($this);
+        }
+        return $res;
+    }
+
+    /**
+     * Get the number of items.
+     *
+     * @see getList() for definition of the keys
+     *
+     * @param array with associative keys 'view' and 'filter'
+     * @return int The number of items
+     */
+    function getCount($p=array())
+    {
+        $p['count'] = true;
+        $count = $this->getList($p);
+        if (empty($count) or count($count) == 0) { 
+            return 0; 
+        } else {
+            return (int) $count[0]['nb_items'];
+        }
+    }
+
+    /**
+     * Get a list of related items.
+     *
+     * See the getList() method for usage of the view and filters.
+     *
+     * @param string Class of the related items
+     * @param string Method call in a many to many related
+     * @param array Parameters, see getList() for the definition of
+     *              the keys
+     * @return array Array of items
+     */
+    function getRelated($model, $method=null, $p=array())
+    {
+        $default = array('view' => null, 
+                         'filter' => null, 
+                         'order' => null, 
+                         'start' => null, 
+                         'nb' => null, 
+                         'count' => false);
+        $p = array_merge($default, $p);
+        if ('' == $this->_data['id']) {
+            return new ArrayObject();
+        }
+        $m = new $model();
+        if (isset($this->_m['list'][$method]) 
+            and is_array($this->_m['list'][$method])) {
+            $foreignkey = $this->_m['list'][$method][1];
+            if (strlen($foreignkey) == 0) {
+                throw new Exception(sprintf(__('No matching foreign key found in model: %s for model %s'), $model, $this->_a['model']));
+            }
+            if (!is_null($p['filter'])) {
+                if (is_array($p['filter'])) {
+                    $p['filter'] = implode(' AND ', $p['filter']);
+                }
+                $p['filter'] .=  ' AND ';
+            } else {
+                $p['filter'] = '';
+            }
+            $p['filter'] .= $this->_con->qn($foreignkey).'='.$this->_toDb($this->_data['id'], 'id');
+        } else {
+            // Many to many: We generate a special view that is making
+            // the join
+            $hay = array(strtolower(Pluf::factory($model)->_a['model']), 
+                         strtolower($this->_a['model']));
+            sort($hay);
+            $table = $hay[0].'_'.$hay[1].'_assoc';
+            if (isset($m->_a['views'][$p['view']])) {
+                $m->_a['views'][$p['view'].'__manytomany__'] = $m->_a['views'][$p['view']];
+                if (!isset($m->_a['views'][$p['view'].'__manytomany__']['join'])) {
+                    $m->_a['views'][$p['view'].'__manytomany__']['join'] = '';
+                }
+                if (!isset($m->_a['views'][$p['view'].'__manytomany__']['where'])) {
+                    $m->_a['views'][$p['view'].'__manytomany__']['where'] = '';
+                }
+            } else {
+                $m->_a['views']['__manytomany__'] = array('join' => '',
+                                                     'where' => '');
+                $p['view'] = '';
+            }
+            $m->_a['views'][$p['view'].'__manytomany__']['join'] .= 
+                ' LEFT JOIN '.$this->_con->pfx.$table.' ON '
+                .$this->_con->qn(strtolower($m->_a['model']).'_id').' = '.$this->_con->pfx.$m->_a['table'].'.id';
+
+            $m->_a['views'][$p['view'].'__manytomany__']['where'] = $this->_con->qn(strtolower($this->_a['model']).'_id').'='.$this->_data['id'];
+            $p['view'] = $p['view'].'__manytomany__';
+        }
+        return $m->getList($p);
+    }
+
+    /**
+     * Generate the SQL select from the columns
+     */
+    function getSelect()
+    {
+        if (isset($this->_cache['getSelect'])) return $this->_cache['getSelect'];
+        $select = array();
+        $table = $this->getSqlTable();
+        foreach ($this->_a['cols'] as $col=>$val) {
+            if ($val['type'] != 'Pluf_DB_Field_Manytomany') {
+                $select[] = $table.'.'.$this->_con->qn($col).' AS '.$this->_con->qn($col); 
+            }
+        }
+        $this->_cache['getSelect'] = implode(', ', $select);
+        return $this->_cache['getSelect'];
+    }
+
+    /**
+     * Update the model into the database.
+     *
+     * If no where clause is provided, the index definition is used to
+     * find the sequence. These are used to limit the update
+     * to the current model.
+     *
+     * @param string Where clause to update specific items. ('')
+     * @return bool Success
+     */
+    function update($where='')
+    {
+        $this->preSave();
+        $req = 'UPDATE '.$this->getSqlTable().' SET'."\n";
+        $fields = array();
+        $assoc = array();
+        foreach ($this->_a['cols'] as $col=>$val) {
+            $field = new $val['type']();
+            if ($col == 'id') {
+                continue;
+            } elseif ($field->type == 'manytomany') {
+                if (is_array($this->$col)) {
+                    $assoc[$val['model']] = $this->$col;
+                }
+                continue;
+            }
+            $fields[] = $this->_con->qn($col).' = '.$this->_toDb($this->$col, $col);
+        }
+        $req .= implode(','."\n", $fields);
+        if (strlen($where) > 0) {
+            $req .= ' WHERE '.$where;
+        } else {
+            $req .= ' WHERE id = '.$this->_toDb($this->_data['id'], 'id');
+        }
+        $this->_con->execute($req);
+        if (false === $this->get($this->_data['id'])) {
+            return false;
+        }
+        foreach ($assoc as $model=>$ids) {
+            $this->batchAssoc($model, $ids);
+        }
+        $this->postSave();
+        return true;
+    }
+
+    /**
+     * Create the model into the database.
+     * 
+     * @return bool Success
+     */
+    function create($force_id=false)
+    {
+        $this->preSave(true);
+        $req = 'INSERT INTO '.$this->getSqlTable()."\n";
+        $icols = array();
+        $ivals = array();
+        $assoc = array();
+        foreach ($this->_a['cols'] as $col=>$val) {
+            $field = new $val['type']();
+            if ($col == 'id' and !$force_id) {
+                continue;
+            } elseif ($field->type == 'manytomany') {
+                // If is a defined array, we need to associate.
+                if (is_array($this->$col)) {
+                    $assoc[$val['model']] = $this->$col;
+                }
+                continue;
+            }
+            $icols[] = $this->_con->qn($col);
+            $ivals[] = $this->_toDb($this->$col, $col);
+        }
+        $req .= '('.implode(', ', $icols).') VALUES ';
+        $req .= '('.implode(','."\n", $ivals).')';
+        $this->_con->execute($req);
+        if (false === ($id=$this->_con->getLastID())) {
+            throw new Exception($this->_con->getError());
+        }
+        $this->_data['id'] = $id;
+        foreach ($assoc as $model=>$ids) {
+            $this->batchAssoc($model, $ids);
+        }
+        $this->postSave(true);
+        return true;
+    }
+
+    /**
+     * Get models affected by delete.
+     *
+     * @return array Models deleted if deleting current model.
+     */
+    function getDeleteSideEffect()
+    {
+        $affected = array();
+        foreach ($this->_m['list'] as $method=>$details) {
+            if (is_array($details)) {
+                // foreignkey
+                $related = $this->$method();
+                $affected = array_merge($affected, (array) $related);
+                foreach ($related as $rel) {
+                    if ($details[0] == $this->_a['model']
+                        and $rel->id == $this->_data['id']) {
+                        continue; // $rel == $this
+                    }
+                    $affected = array_merge($affected, (array) $rel->getDeleteSideEffect());
+                }
+            }
+        }
+        return Pluf_Model_RemoveDuplicates($affected);
+    }
+
+    /**
+     * Delete the current model from the database.
+     *
+     * If another model link to the current model through a foreign
+     * key, find it and delete it. If this model is linked to other
+     * through a many to many, delete the association.
+     *
+     * FIXME: No real test of circular references. It can break.
+     */
+    function delete()
+    {
+        if (false === $this->get($this->_data['id'])) {
+            return false;
+        }
+        $this->preDelete();
+        // Drop the row level permissions if we are using them
+        if (Pluf::f('pluf_use_rowpermission', false)) {
+            $_rpt = Pluf::factory('Pluf_RowPermission')->getSqlTable();
+            $sql = new Pluf_SQL('model_class=%s AND model_id=%s',
+                                array($this->_a['model'], $this->_data['id']));
+            $this->_con->execute('DELETE FROM '.$_rpt.' WHERE '.$sql->gen());
+        }
+        // Find the models linking to the current one through a foreign key.
+        foreach ($this->_m['list'] as $method=>$details) {
+            if (is_array($details)) {
+                // foreignkey
+                $related = $this->$method();
+                foreach ($related as $rel) {
+                    if ($details[0] == $this->_a['model']
+                        and $rel->id == $this->_data['id']) {
+                        continue; // $rel == $this
+                    }
+                    // We do not really control if it can be deleted
+                    // as we can find many times the same to delete.
+                    $rel->delete();
+                }
+            } else {
+                // manytomany
+                $related = $this->$method();
+                foreach ($related as $rel) {
+                    $this->delAssoc($rel);
+                }
+            }
+        }
+        $req = 'DELETE FROM '.$this->getSqlTable().' WHERE id = '.$this->_toDb($this->_data['id'], 'id');
+        $this->_con->execute($req);
+        $this->_reset();
+        return true;
+    }
+
+    /**
+     * Reset the fields to default values.
+     */
+    function _reset()
+    {
+        foreach ($this->_a['cols'] as $col => $val) {
+            if (isset($val['default'])) {
+                $this->_data[$col] = $val['default'];
+            } elseif (isset($val['is_null'])) {
+                $this->_data[$col] = null;
+            } else {
+                 $this->_data[$col] = '';
+            }
+        }
+    }
+
+
+    /**
+     * Represents the model in auto generated lists.
+     * 
+     * You need to overwrite this method to have a nice display of
+     * your objects in the select boxes, logs.
+     */
+    function __toString()
+    {
+        return $this->_a['model'].'('.$this->_data['id'].')';
+    }
+
+
+    /**
+     * Hook run just after loading a model from the database.
+     *
+     * Just overwrite it into your model to perform custom actions.
+     */
+    function restore()
+    {
+    }
+
+    /**
+     * Hook run just before saving a model in the database.
+     *
+     * Just overwrite it into your model to perform custom actions.
+     *
+     * @param bool Create.
+     */
+    function preSave($create=false)
+    {
+    }
+
+    function postSave($create=false)
+    {
+    }
+
+    /**
+     * Hook run just before deleting a model from the database.
+     *
+     * Just overwrite it into your model to perform custom actions.
+     */
+    function preDelete()
+    {
+    }
+
+    /**
+     * Set the values from form data.
+     */
+    function setFromFormData($cleaned_values)
+    {
+        foreach ($cleaned_values as $key=>$val) {
+            $this->_data[$key] = $val;
+        }
+    }
+
+    /**
+     * Set a view.
+     *
+     * @param string Name of the view.
+     * @param array Definition of the view.
+     */
+    function setView($view, $def)
+    {
+        $this->_a['views'][$view] = $def;
+    }
+
+    /**
+     * Prepare the value to be put in the DB.
+     *
+     * @param mixed Value.
+     * @param string Column name.
+     * @return string SQL ready string.
+     */
+    function _toDb($val, $col)
+    {
+        $m = $this->_con->type_cast[$this->_a['cols'][$col]['type']][1];
+        return $m($val, $this->_con);
+    }
+
+    /**
+     * Get the value from the DB.
+     *
+     * @param mixed Value.
+     * @param string Column name.
+     * @return mixed Value.
+     */
+    function _fromDb($val, $col)
+    {
+        $m = $this->_con->type_cast[$this->_a['cols'][$col]['type']][0];
+        return $m($val);
+    }
+
+    /**
+     * Display value.
+     *
+     * When you have a list of choices for a field and you want to get
+     * the display value of the current stored value.
+     *
+     * @param string Field to display the value.
+     * @return mixed Display value, if not available default to the value.
+     */
+    function displayVal($col)
+    {
+        if (!isset($this->_a['cols'][$col]['choices'])) {
+            return $this->_data[$col]; // will on purposed failed if not set
+        }
+        $val = array_search($this->_data[$col], $this->_a['cols'][$col]['choices']);
+        if ($val !== false) {
+            return $val;
+        }
+        return $this->_data[$col];
+    }
+}
+
+
+/**
+ * Check if a model is already in an array of models.
+ *
+ * It is not possible to override the == function in PHP to directly
+ * use in_array.
+ *
+ * @param Pluf_Model The model to test
+ * @param Array The models
+ * @return bool
+ */
+function Pluf_Model_InArray($model, $array) 
+{
+    if ($model->id == '') {
+        return false;
+    }
+    foreach ($array as $modelin) {
+        if ($modelin->_a['model'] == $model->_a['model']
+            and $modelin->id == $model->id) {
+            return true;
+        }
+    }
+    return false;
+}
+
+/**
+ * Return a list of unique models.
+ *
+ * @param array Models with duplicates
+ * @return array Models with duplicates.
+ */
+function Pluf_Model_RemoveDuplicates($array)
+{
+    $res = array();
+    foreach ($array as $model) {
+        if (!Pluf_Model_InArray($model, $res)) {
+            $res[] = $model;
+        }
+    }
+    return $res;
+}
+
diff --git a/src/Pluf/Paginator.php b/src/Pluf/Paginator.php
new file mode 100644
index 0000000..797d291
--- /dev/null
+++ b/src/Pluf/Paginator.php
@@ -0,0 +1,647 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+Pluf::loadFunction('Pluf_HTTP_URL_urlForView');
+
+/**
+ * Paginator to display a list of model items.
+ *
+ * The paginator has several methods to render the complete table in
+ * one call or to give more freedom to the end user in the table by
+ * doing it item by item.
+ *
+ * An example of usage is as follow:
+ *
+ * <code>
+ * $model = new Pluf_Permission();
+ * $pag = new Pluf_Paginator($model);
+ * // Set the action to the page listing the permissions
+ * $pag->action = '/permission/'; 
+ * // Get the paginator parameters from the request
+ * $pag->setFromRequest($request);
+ * print $pag->render();
+ * </code>
+ *
+ * This example shows the fast way. That means that the items will be
+ * shown according to the default values of the paginator or with the
+ * details given in the admin definition of the model.
+ */
+class Pluf_Paginator
+{
+    /**
+     * The model being paginated.
+     */
+    protected $model;
+
+    /**
+     * The items being paginated. If no model is given when creating
+     * the paginator, it will use the items to list them.
+     */
+    public $items = null;
+
+    /**
+     * Extra property/value for the items.
+     *
+     * This can be practical if you want some values for the edit
+     * action which are not available in the model data.
+     */
+    public $item_extra_props = array();
+
+    /**
+     * The fields being shown.
+     *
+     * If no fields are given, the __toString representation of the
+     * item will be used to show the item.
+     *
+     * If an item in the list_display is an array the format is the
+     * following:
+     * array('field', 'Custom_Function_ToApply', 'custom header name')
+     *
+     * The signature of the the Custom_Function_ToApply is:
+     * string = Custom_Function_ToApply('field', $item);
+     *
+     * By using for example 'id' as field with a custom header name
+     * you can create new columns in the table.
+     */
+    protected $list_display = array();
+
+    /**
+     * The fields being searched.
+     */
+    protected $search_fields = array();
+
+    /**
+     * The where clause from the search.
+     */
+    protected $where_clause = null;
+
+    /**
+     * The forced where clause on top of the search.
+     */
+    public $forced_where = null;
+
+    /**
+     * View of the model to be used.
+     */
+    public $model_view = null;
+
+    /**
+     * Maximum number of items per page.
+     */
+    public $items_per_page = 50;
+
+    /**
+     * Current page.
+     */
+    public $current_page = 1;
+
+    /**
+     * Number of pages.
+     */
+    public $page_number = 1;
+
+    /**
+     * Search string.
+     */
+    public $search_string = '';
+
+    /**
+     * Text to display when no results are found.
+     */
+    public $no_results_text = 'No items found';
+
+    /**
+     * Which fields of the model can be used to sort the dataset. To
+     * be useable these fields must be in the $list_display so that
+     * the sort links can be shown for the user to click on them and
+     * sort the list.
+     */
+    public $sort_fields = array();
+
+    /**
+     * Current sort order. An array with first value the field and
+     * second the order of the sort.
+     */
+    public $sort_order = array();
+
+    /**
+     * Keys where the sort is reversed. Let say, you have a column
+     * using a timestamp but displaying the information as an age. If
+     * you sort "ASC" you espect to get the youngest first, but as the
+     * timestamp is used, you get the oldest. But the key here and the
+     * sort will be reverted.
+     */
+    public $sort_reverse_order = array();
+    
+    /**
+     * Edit action.
+     *
+     */
+    public $edit_action  = '';
+
+    /**
+     * Action for search/next/previous.
+     */
+    public $action = '';
+
+    /**
+     * Id/class of the generated table.
+     */
+    public $id = '';
+    public $class = '';
+
+    /**
+     * Extra parameters for the modification function call.
+     */
+    public $extra = null;
+
+    /**
+     * Summary for the table.
+     */
+    public $summary = '';
+
+    /**
+     * Total number of items. 
+     *
+     * Available only after the rendering of the paginator.
+     */
+    public $nb_items = 0;
+    /**
+     * Construct the paginator for a model.
+     *
+     * @param object Model to paginate (null).
+     * @param array List of the headers to show (array()).
+     * @param array List of the fields to search (array()).
+     */
+    function __construct($model=null, $list_display=array(), 
+                         $search_fields=array())
+    {
+        $this->model = $model;
+        $this->configure($list_display, $search_fields);
+    }
+
+    /**
+     * Configure the paginator.
+     *
+     * @param array List of the headers to show.
+     * @param array List of the fields to search (array())
+     * @param array List of the fields to sort the data set (array())
+     */
+    function configure($list_display, $search_fields=array(), $sort_fields=array())
+    {
+        if (is_array($list_display)) {
+            $this->list_display = array();
+            foreach ($list_display as $key=>$col) {
+                if (!is_array($col) && !is_null($this->model) && isset($this->model->_a['cols'][$col]['verbose'])) {
+                    $this->list_display[$col] = $this->model->_a['cols'][$col]['verbose'];
+                } elseif (!is_array($col)) {
+                    if (is_numeric($key)) {
+                        $this->list_display[$col] = $col;
+                    } else {
+                        $this->list_display[$key] = $col;
+                    }
+                } else {
+                    if (count($col) == 2 
+                        && !is_null($this->model)
+                        && isset($this->model->_a['cols'][$col[0]]['verbose'])) {
+                        $col[2] = $this->model->_a['cols'][$col[0]]['verbose'];
+                    } elseif (count($col) == 2 ) {
+                        $col[2] = $col[0];
+                    }
+                    $this->list_display[] = $col;
+                }
+            }
+        }
+        if (is_array($search_fields)) {
+            $this->search_fields = $search_fields;
+        }
+        if (is_array($sort_fields)) {
+            $this->sort_fields = $sort_fields;
+        }
+    }
+
+    /**
+     * Set the parameters from the request.
+     *
+     * Possible parameters are:
+     * _px_q : Query string to search.
+     * _px_p : Current page.
+     * _px_sk : Sort key.
+     * _px_so : Sort order.
+     *
+     * @param Pluf_HTTP_Request The request
+     */
+    function setFromRequest($request)
+    {
+        if (isset($request->REQUEST['_px_q'])) {
+            $this->search_string = $request->REQUEST['_px_q'];
+        }
+        if (isset($request->REQUEST['_px_p'])) {
+            $this->current_page = (int) $request->REQUEST['_px_p'];
+        }
+        if (isset($request->REQUEST['_px_sk']) 
+            and in_array($request->REQUEST['_px_sk'], $this->sort_fields)) {
+            $this->sort_order[0] = $request->REQUEST['_px_sk'];
+            $this->sort_order[1] = 'ASC';
+            if (isset($request->REQUEST['_px_so']) 
+                and ($request->REQUEST['_px_so'] == 'd')) {
+                $this->sort_order[1] = 'DESC';
+            }
+        }
+    }
+        
+
+    /**
+     * Render the complete table.
+     *
+     * When an id is provided, the generated table receive this id.
+     *
+     * @param string Table id ('')
+     */
+    function render($id='')
+    {
+        $this->id = $id;
+        $_sum = '';
+        if (strlen($this->summary)) {
+            $_sum = ' summary="'.htmlspecialchars($this->summary).'"';
+        }
+        $out = '<table'.$_sum.(($this->class) ? ' class="'.$this->class.'"' : '').(($this->id) ? ' id="'.$this->id.'">' : '>')."\n";
+        $out .= '<thead>'."\n";
+        $out .= $this->searchField();
+        $out .= $this->colHeaders();
+        $out .= '</thead>'."\n";
+        // Opt: Generate the footer of the table with the next/previous links
+        $out .= $this->footer();
+        // Generate the body of the table with the items
+        $out .= $this->body();
+        $out .= '</table>'."\n";
+        return new Pluf_Template_SafeString($out, true);
+    }
+
+    /**
+     * Generate the footer of the table.
+     */
+    function footer()
+    {
+        // depending on the search string, the result set can be
+        // limited. So we need first to count the total number of
+        // corresponding items. Then get a slice of them in the
+        // generation of the body.
+        if (!is_null($this->model)) {
+            $nb_items = $this->model->getCount(array('view' => $this->model_view,  'filter' => $this->filter()));
+        } else {
+            $nb_items = $this->items->count();
+        }
+        $this->nb_items = $nb_items;
+        if ($nb_items <= $this->items_per_page) {
+            return '';
+        }
+        $this->page_number = ceil($nb_items / $this->items_per_page);
+        if ($this->current_page > $this->page_number) {
+            $this->current_page = 1;
+        }
+        $params = array();
+        if (!empty($this->search_fields)) {
+            $params['_px_q'] = $this->search_string;
+            $params['_px_p'] = $this->current_page;
+        }
+        if (!empty($this->sort_order)) {
+            $params['_px_sk'] = $this->sort_order[0];
+            $params['_px_so'] = ($this->sort_order[1] == 'ASC') ? 'a' : 'd';
+        }
+        $out = '<tfoot><tr><th colspan="'.count($this->list_display).'">'."\n";
+        if ($this->current_page != 1) {
+            $params['_px_p'] = $this->current_page - 1;
+            $url = $this->getUrl($params);
+            $out .= '<a href="'.$url.'">'.__('Prev').'</a> ';
+        }
+        for ($i=1; $i<=$this->page_number; $i++) {
+            $params['_px_p'] = $i;
+            $class = ($i == $this->current_page) ? ' class="px-current-page"' : '';
+            $url = $this->getUrl($params);
+            $out .= '<a'.$class.' href="'.$url.'">'.$i.'</a> ';
+        }
+        if ($this->current_page != $this->page_number) {
+            $params['_px_p'] = $this->current_page + 1;
+            $url = $this->getUrl($params);
+            $out .= '<a href="'.$url.'">'.__('Next').'</a> ';
+        }
+        $out .= '</th></tr></tfoot>'."\n";
+        return $out;
+    }
+
+    /**
+     * Generate the body of the list.
+     */
+    function body()
+    {
+        $st = ($this->current_page-1) * $this->items_per_page;
+        if (count($this->sort_order) != 2) {
+            $order = null;
+        } else {
+            $s = $this->sort_order[1];
+            if (in_array($this->sort_order[0], $this->sort_reverse_order)) {
+                $s = ($s == 'ASC') ? 'DESC' : 'ASC';
+            }
+            $order = $this->sort_order[0].' '.$s;
+        }
+        if (!is_null($this->model)) {
+            $items = $this->model->getList(array('view' => $this->model_view, 
+                                                 'filter' => $this->filter(), 
+                                                 'order' => $order, 
+                                                 'start' => $st, 
+                                                 'nb' => $this->items_per_page));
+        } else {
+            $items = $this->items;
+        }
+        $out = '';
+        $total = $items->count();
+        $count = 1;
+        foreach ($items as $item) {
+            $item->_paginator_count = $count;
+            $item->_paginator_total_page = $total;
+            foreach ($this->item_extra_props as $key=>$val) {
+                $item->$key = $val;
+            }
+            $out .= $this->bodyLine($item);
+            $count++;
+        }
+        if (strlen($out) == 0) {
+            $out = '<tr><td colspan="'
+                .count($this->list_display).'">'.$this->no_results_text
+                .'</td></tr>'."\n";
+        }
+        return '<tbody>'.$out.'</tbody>'."\n";
+    }
+    
+    /**
+     * Generate a standard "line" of the body
+     */
+    function bodyLine($item)
+    {
+        $out = '<tr>';
+        if (!empty($this->list_display)) {
+            $i = 0;
+            foreach ($this->list_display as $key=>$col) {
+                $text = '';
+                if (!is_array($col)) {
+                    $text = Pluf_esc($item->$key);
+                } else {
+                    if (is_null($this->extra)) {
+                        $text = $col[1]($col[0], $item);
+                    } else {
+                        $text = $col[1]($col[0], $item, $this->extra);
+                    }
+                }
+                if ($i == 0) {
+                    $text = $this->getEditAction($text, $item);
+                }
+                $out.='<td>'.$text.'</td>';
+                $i++;
+            }
+        } else {
+            $out.='<td>'.$this->getEditAction(Pluf_esc($item), $item).'</td>';
+        }
+        $out .= '</tr>'."\n";
+        return $out;
+    }
+
+    /**
+     * Get the edit action.
+     *
+     * @param string Text to put in the action. 
+     *               No escaping of the text is performed.
+     * @param object Model for the action.
+     * @return string Ready to use string.
+     */
+    function getEditAction($text, $item)
+    {
+        $edit_action = $this->edit_action;
+        if (!empty($edit_action)) {
+            if (!is_array($edit_action)) {
+                $params = array($edit_action, $item->id);
+            } else {
+                $params = array(array_shift($edit_action));
+                foreach ($edit_action as $field) {
+                    $params[] = $item->$field;
+                }
+            }
+            $view = array_shift($params);
+            $url = Pluf_HTTP_URL_urlForView($view, $params);
+            return  '<a href="'.$url.'">'.$text.'</a>';
+        } else {
+            return $text;
+        }
+    }
+
+    /**
+     * Generate the where clause.
+     *
+     * @return string The ready to use where clause.
+     */
+    function filter()
+    {
+        if (strlen($this->where_clause) > 0) {
+            return $this->where_clause;
+        }
+        if (!is_null($this->forced_where) 
+            or (strlen($this->search_string) > 0
+                && !empty($this->search_fields))) {
+            $lastsql = new Pluf_SQL();
+            $keywords = $lastsql->keywords($this->search_string);
+            foreach ($keywords as $key) {
+                $sql = new Pluf_SQL();
+                foreach ($this->search_fields as $field) {
+                    $sqlor = new Pluf_SQL();
+                    $sqlor->Q($field.' LIKE %s', '%'.$key.'%');
+                    $sql->SOr($sqlor);
+                }
+                $lastsql->SAnd($sql);
+            }
+            if (!is_null($this->forced_where)) {
+                $lastsql->SAnd($this->forced_where);
+            }
+            $this->where_clause = $lastsql->gen();
+            if (strlen($this->where_clause) == 0) 
+                $this->where_clause = null;
+        }            
+        return $this->where_clause;
+    }
+
+    /**
+     * Generate the column headers for the table.
+     */
+    function colHeaders()
+    {
+        if (empty($this->list_display)) {
+            return '<tr><th>'.__('Name').'</th></tr>'."\n";
+        } else {
+            $out = '<tr>';
+            foreach ($this->list_display as $key=>$col) {
+                if (is_array($col)) {
+                    $field = $col[0];
+                    $name = $col[2];
+                    Pluf::loadFunction($col[1]);
+                } else {
+                    $name = $col;
+                    $field = $key;
+                }
+                $out .= '<th><span class="px-header-title">'.Pluf_esc(ucfirst($name)).'</span>'.$this->headerSortLinks($field).'</th>';
+            }
+            $out .= '</tr>'."\n";
+            return $out;
+        }
+    }
+
+    /**
+     * Generate the little text on the header to allow sorting if
+     * available.
+     *
+     * @param string Name of the field
+     * @return string HTML fragment with the links to 
+     *                sort ASC/DESC on this field.
+     */
+    function headerSortLinks($field)
+    {
+        if (!in_array($field, $this->sort_fields)) {
+            return '';
+        }
+        $params = array();
+        if (!empty($this->search_fields)) {
+            $params['_px_q'] = $this->search_string;
+        }
+        $params['_px_sk'] = $field;
+        $out = '<span class="px-sort">'.__('Sort').' %s/%s</span>';
+        $params['_px_so'] = 'a';
+        $url = $this->getUrl($params);
+        $asc = '<a href="'.$url.'" >'.__('asc').'</a>';
+        $params['_px_so'] = 'd';
+        $url = $this->getUrl($params);
+        $desc = '<a href="'.$url.'" >'.__('desc').'</a>';
+        return sprintf($out, $asc, $desc);
+    }
+
+    /**
+     * Get the search field XHTML.
+     */
+    function searchField()
+    {
+        if (empty($this->search_fields)) {
+            return '';
+        }
+        $url = $this->getUrl();
+        return '<tr><th class="px-table-search" colspan="'
+            .count($this->list_display).'">'
+            .'<form method="get" action="'.$url.'">'
+            .'<label for="px-q">'.__('Filter the list:').'</label> '
+            .'<input type="text" name="_px_q" id="px-q" size="30"'
+            .' value="'.htmlspecialchars($this->search_string).'" />'
+            .'<input type="submit" name="submit" value="'.__('Filter').'" />'
+            .'</form></th></tr>'."\n";
+
+    }
+
+    /**
+     * Using $this->action and the $get_params array, generate the URL
+     * with the data.
+     *
+     * @param array Get parameters (array()).
+     * @param bool Encoded to be put in href="" (true).
+     * @return string Url.
+     */
+    function getUrl($get_params=array(), $encoded=true)
+    {
+        // Default values
+        $params = array();
+        $by_name = false;
+        $view = '';
+        if (is_array($this->action)) {
+            $view = $this->action[0];
+            if (isset($this->action[1])) {
+                $params = $this->action[1];
+            }
+        } else {
+            $view = $this->action;
+        }
+        return Pluf_HTTP_URL_urlForView($view, $params, $get_params, $encoded);
+    }
+
+    /**
+     * Overloading of the get method.
+     *
+     * @param string Property to get
+     */
+    function __get($prop)
+    {
+        if ($prop == 'render') return $this->render();
+        return $this->$prop;
+    }
+
+}
+
+/**
+ * Returns the string representation of an item.
+ *
+ * @param string Field (not used)
+ * @param Object Item
+ * @return string Representation of the item
+ */
+function Pluf_Paginator_ToString($field, $item)
+{
+    return Pluf_esc($item);
+}
+
+/**
+ * Returns the item referenced as foreign key as a string.
+ */
+function Pluf_Paginator_FkToString($field, $item)
+{
+    $method = 'get_'.$field;
+    $fk = $item->$method();
+    return Pluf_esc($fk);
+}
+
+function Pluf_Paginator_DateYMDHMS($field, $item)
+{
+    Pluf::loadFunction('Pluf_Template_dateFormat');
+    return Pluf_Template_dateFormat($item->$field, '%Y-%m-%d %H:%M:%S');
+}
+
+function Pluf_Paginator_DateYMD($field, $item)
+{
+    Pluf::loadFunction('Pluf_Template_dateFormat');
+    return Pluf_Template_dateFormat($item->$field, '%Y-%m-%d');
+}
+
+function Pluf_Paginator_DisplayVal($field, $item)
+{
+    return $item->displayVal($field);
+}
+
+function Pluf_Paginator_DateAgo($field, $item)
+{
+    Pluf::loadFunction('Pluf_Date_Easy');
+    Pluf::loadFunction('Pluf_Template_dateFormat');
+    $date = Pluf_Template_dateFormat($item->$field, '%Y-%m-%d %H:%M:%S');
+    return Pluf_Date_Easy($date, null, 2, __('now'));
+}
\ No newline at end of file
diff --git a/src/Pluf/Permission.php b/src/Pluf/Permission.php
new file mode 100644
index 0000000..2b1e900
--- /dev/null
+++ b/src/Pluf/Permission.php
@@ -0,0 +1,118 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_Permission extends Pluf_Model
+{
+    public $_model = 'Pluf_Permission';
+
+    function init()
+    {
+        $this->_a['verbose'] = __('permission');
+        $this->_a['table'] = 'permissions';
+        $this->_a['model'] = 'Pluf_Permission';
+        $this->_a['cols'] = array(
+                             // It is mandatory to have an "id" column.
+                            'id' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Sequence',
+                                  //It is automatically added.
+                                  'blank' => true, 
+                                  ),
+                            'name' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Varchar',
+                                  'blank' => false,
+                                  'size' => 50,
+                                  'verbose' => __('name'),
+                                  ),
+                            'code_name' => 
+                            array(
+                                  'type' => 'Pluf_DB_Field_Varchar',
+                                  'blank' => false,
+                                  'size' => 100,
+                                  'verbose' => __('code name'),
+                                  'help_text' => __('The code name must be unique for each application. Standard permissions to manage a model in the interface are "Model_Name-create", "Model_Name-update", "Model_Name-list" and "Model_Name-delete".'),
+                                  ),
+                            'description' => 
+                            array(
+                                  'type' => 'Pluf_DB_Field_Varchar',
+                                  'blank' => false,
+                                  'size' => 250,
+                                  'verbose' => __('description'),
+                                  ),
+                            'application' => 
+                            array(
+                                  'type' => 'Pluf_DB_Field_Varchar',
+                                  'size' => 150,
+                                  'blank' => false,
+                                  'verbose' => __('application'),
+                                  'help_text' => __('The application using this permission, for example "YourApp", "CMS" or "SView".'),
+                                   ),
+                            );
+        $this->_a['idx'] = array(                           
+                            'code_name_idx' =>
+                            array(
+                                  'type' => 'normal',
+                                  'col' => 'code_name',
+                                  ),
+                            'application_idx' =>
+                            array(
+                                  'type' => 'normal',
+                                  'col' => 'application',
+                                  ),
+                            );
+        $t_asso = $this->_con->pfx.'pluf_group_pluf_permission_assoc';
+        $t_perm = $this->_con->pfx.'permissions';
+        $this->_a['views'] = array(
+                              'join_group' => 
+                              array(
+                                    'join' => 'LEFT JOIN '.$t_asso
+                                    .' ON '.$t_perm.'.id=pluf_permission_id',
+                                    ),
+                              );
+    }
+
+    function __toString()
+    {
+        return $this->name.' ('.$this->application.'.'.$this->code_name.')';
+    }
+
+    /**
+     * Get the matching permission object from the permission string.
+     *
+     * @param string Permission string, for example 'Pluf_User.create'.
+     * @return false|Pluf_Permission The matching permission or false.
+     */
+    public static function getFromString($perm)
+    {
+        list($app, $code) = explode('.', trim($perm));
+        $sql = new Pluf_SQL('code_name=%s AND application=%s',
+                            array($code, $app));
+        $perms = Pluf::factory('Pluf_Permission')->getList(array('filter'=>$sql->gen()));
+        if ($perms->count() != 1) {
+            return false;
+        }
+        return $perms[0];
+    }
+}
+
diff --git a/src/Pluf/Precondition.php b/src/Pluf/Precondition.php
new file mode 100644
index 0000000..2ea5915
--- /dev/null
+++ b/src/Pluf/Precondition.php
@@ -0,0 +1,104 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Ready to use preconditions to test if the user is logged in, etc.
+ */
+class Pluf_Precondition
+{
+    /**
+     * Check if the user is logged in.
+     *
+     * Returns a redirection to the login page, but if not active
+     * returns a forbidden error.
+     *
+     * @param Pluf_HTTP_Request
+     * @return mixed
+     */
+    static public function loginRequired($request)
+    {
+        if (!isset($request->user) or $request->user->isAnonymous()) {
+            return new Pluf_HTTP_Response_RedirectToLogin($request);
+        }
+        if (!$request->user->active) {
+            return new Pluf_HTTP_Response_Forbidden($request);
+        }
+        return true;
+    }
+
+    /**
+     * Check if the user is admin or staff.
+     *
+     * @param Pluf_HTTP_Request
+     * @return mixed
+     */
+    static public function staffRequired($request)
+    {
+        $res = Pluf_Precondition::loginRequired($request);
+        if (true !== $res) {
+            return $res;
+        }
+        if ($request->user->administrator or $request->user->staff) {
+            return true;
+        }
+        return new Pluf_HTTP_Response_Forbidden($request);
+    }
+
+    /**
+     * Check if the user is administrator..
+     *
+     * @param Pluf_HTTP_Request
+     * @return mixed
+     */
+    static public function adminRequired($request)
+    {
+        $res = Pluf_Precondition::loginRequired($request);
+        if (true !== $res) {
+            return $res;
+        }
+        if ($request->user->administrator) {
+            return true;
+        }
+        return new Pluf_HTTP_Response_Forbidden($request);
+    }
+
+    /**
+     * Check if the user has a given permission..
+     *
+     * @param Pluf_HTTP_Request
+     * @param string Permission
+     * @return mixed
+     */
+    static public function hasPerm($request, $permission)
+    {
+        $res = Pluf_Precondition::loginRequired($request);
+        if (true !== $res) {
+            return $res;
+        }
+        if ($request->user->hasPerm($permission)) {
+            return true;
+        }
+        return new Pluf_HTTP_Response_Forbidden($request);
+    }
+
+}
\ No newline at end of file
diff --git a/src/Pluf/Queue.php b/src/Pluf/Queue.php
new file mode 100644
index 0000000..d6d24a8
--- /dev/null
+++ b/src/Pluf/Queue.php
@@ -0,0 +1,124 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Simple queue system to delay the processing of tasks.
+ *
+ * What you do is that you push in the queue an object and what was
+ * done on the object. Then later one, a simple script will go through
+ * the queue and will check if something has to be done for the given
+ * object.
+ *
+ * For example, you have articles with for each articles a list of
+ * authors. You want to index the article with also the name of the
+ * authors. So it means that you need to update the index when an
+ * author is changed and when an article is changed. But you do not
+ * want to do the indexing of all the articles of an author when you
+ * update the author information (if this take 0.5s per article, with
+ * 100 articles, you would have to wait nearly 1 minute!).
+ *
+ * So when you update an author you push in the queue: "author x has
+ * been updated". Then you have a script that will go in the queue,
+ * find that the author has been updated and index each of his
+ * articles.
+ */
+class Pluf_Queue extends Pluf_Model
+{
+    public $_model = __CLASS__;
+
+    function init()
+    {
+        $this->_a['verbose'] = __('message queue');
+        $this->_a['table'] = 'pluf_queue';
+        $this->_a['model'] = __CLASS__;
+        $this->_a['cols'] = array(
+                             // It is mandatory to have an "id" column.
+                            'id' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Sequence',
+                                  //It is automatically added.
+                                  'blank' => true, 
+                                  ),
+                            'model_class' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Varchar',
+                                  'blank' => false,
+                                  'size' => 150,
+                                  'verbose' => __('model class'),
+                                  ),
+                            'model_id' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Integer',
+                                  'blank' => false,
+                                  'verbose' => __('model id'),
+                                  ),
+                            'action' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Varchar',
+                                  'blank' => false,
+                                  'size' => 150,
+                                  'verbose' => __('action'),
+                                  ),
+                            'lock' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Integer',
+                                  'blank' => false,
+                                  'verbose' => __('lock status'),
+                                  'default' => 0,
+                                  'choices' => array(
+                                                     __('Free') => 0,
+                                                     __('In progress') => 1,
+                                                     __('Completed') => 2,
+                                                     ),
+                                  ),
+                            'creation_dtime' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Datetime',
+                                  'blank' => true,
+                                  'verbose' => __('created at'),
+                                  ),
+                            'modif_dtime' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Datetime',
+                                  'blank' => true,
+                                  'verbose' => __('modified at'),
+                                  ),
+                            );
+        $this->_a['idx'] = array(                           
+                            'lock_idx' =>
+                            array(
+                                  'type' => 'normal',
+                                  'col' => 'lock',
+                                  ),
+                            );
+    }
+
+    function preSave($create=false)
+    {
+        if ($this->id == '') {
+            $this->creation_dtime = gmdate('Y-m-d H:i:s');
+        }
+        $this->modif_dtime = gmdate('Y-m-d H:i:s');
+    }
+}
+
diff --git a/src/Pluf/Queue/Processor.php b/src/Pluf/Queue/Processor.php
new file mode 100644
index 0000000..ac5e858
--- /dev/null
+++ b/src/Pluf/Queue/Processor.php
@@ -0,0 +1,93 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Class to process a Pluf_Queue.
+ *
+ * This class is very simple as basically this is just a signal
+ * handler. It goes throught the queue, get a free item, lock it,
+ * process it by sending a signal then mark it as done.
+ * 
+ */
+class Pluf_Queue_Processor
+{
+    /**
+     * Get an item to process.
+     *
+     * @return mixed False if no item to proceed.
+     */
+    public static function getItem()
+    {
+        $item = false;
+        $db = Pluf::db();
+        $db->begin();
+        // In a transaction to not process the same item at
+        // the same time from to processes.
+        $gqueue = new Pluf_Queue();
+        $items = $gqueue->getList(array('filter' => $db->qn('lock').'=0',
+                                         'order' => 'creation_dtime ASC'));
+        if ($items->count() > 0) {
+            $item = $items[0];
+            $item->lock = 1;
+            $item->update();
+        }
+        $db->commit();
+        if ($item === false) return false;
+        // try to get the corresponding object
+        $obj = Pluf::factory($item->model_class, $item->model_id);
+        if ($obj->id != $item->model_id) $obj = null;
+        return array('queue' => $item, 'item' => $obj);
+    }
+
+    public static function process()
+    {
+        while (false !== ($q = self::getItem())) {
+            /**
+             * [signal]
+             *
+             * Pluf_Queue_Processor::process
+             *
+             * [sender]
+             *
+             * Pluf_Queue_Processor
+             *
+             * [description]
+             *
+             * This signal allows an application to perform an action on a
+             * queue item. The item is set to null if none existing.
+             *
+             * You must not modify the 'queue' object.
+             *
+             * [parameters]
+             *
+             * array('item' => $item, 'queue' => $queue);
+             *
+             *
+             */
+            Pluf_Signal::send('Pluf_Queue_Processor::process', 
+                              'Pluf_Queue_Process', $q);
+            $q['queue']->lock = 2;
+            $q['queue']->update();            
+        }
+    }
+}
diff --git a/src/Pluf/RowPermission.php b/src/Pluf/RowPermission.php
new file mode 100644
index 0000000..c126b05
--- /dev/null
+++ b/src/Pluf/RowPermission.php
@@ -0,0 +1,145 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_RowPermission extends Pluf_Model
+{
+    public $_model = 'Pluf_RowPermission';
+
+    function init()
+    {
+        $this->_a['table'] = 'rowpermissions';
+        $this->_a['model'] = 'Pluf_RowPermission';
+        $this->_a['cols'] = array(
+                             // It is mandatory to have an "id" column.
+                            'id' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Sequence',
+                                  //It is automatically added.
+                                  'blank' => true, 
+                                  ),
+                            'model_id' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Integer',
+                                  'blank' => false,
+                                  'verbose' => __('model ID'),
+                                  ),
+                            'model_class' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Varchar',
+                                  'blank' => false,
+                                  'size' => 50,
+                                  'verbose' => __('model class'),
+                                  ),
+                            'owner_id' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Integer',
+                                  'blank' => false,
+                                  'verbose' => __('owner ID'),
+                                  ),
+                            'owner_class' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Varchar',
+                                  'blank' => false,
+                                  'size' => 50,
+                                  'verbose' => __('owner class'),
+                                  'help_text' => __('For example Pluf_User or Pluf_Group.'),
+                                  ),
+                            'negative' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Boolean',
+                                  'blank' => false,
+                                  'default' => false,
+                                  'verbose' => __('do not have the permission'),
+                                  ),
+                            'permission' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Foreignkey',
+                                  'model' => 'Pluf_Permission',
+                                  'blank' => false,
+                                  'verbose' => __('permission'),
+                                  ),
+                            );
+        $this->_a['idx'] = array(                           
+                            'permission_combo_idx' =>
+                            array(
+                                  'type' => 'unique',
+                                  'col' => 'model_id, model_class, owner_id, owner_class, permission',
+                                  ),
+                            );
+        $t_perm = $this->_con->pfx.'permissions';
+        $this->_a['views'] = array(
+                              'join_permission' => 
+                              array(
+                                    'select' => $this->getSelect().', '
+                                    .$t_perm.'.code_name AS code_name, '
+                                    .$t_perm.'.application AS application ',
+                                    'join' => 'LEFT JOIN '.$t_perm
+                                    .' ON '.$t_perm.'.id=permission',
+                                    'props' => array('code_name' => 'code_name',
+                                                     'application' => 'application'),
+                                    ),
+                              );
+
+    }
+
+    public static function add($owner, $object, $perm, $negative=false)
+    {
+        if (!is_object($perm)) {
+            // Find matching permission
+            $found = Pluf_Permission::getFromString($perm);
+            if (false === $found) {
+                throw new Exception(sprintf('The permission %s does not exist.', $perm));
+            }
+            $perm = $found;
+        }
+        Pluf_RowPermission::remove($owner, $object, $perm);
+        $nperm = new Pluf_RowPermission();
+        $nperm->owner_id = $owner->id;
+        $nperm->owner_class = $owner->_a['model'];
+        $nperm->model_id = $object->id;
+        $nperm->model_class = $object->_a['model'];
+        $nperm->permission = $perm;
+        $nperm->negative = $negative;
+        $nperm->create();
+        return true;
+    }
+
+    public static function remove($owner, $object, $perm)
+    {
+        if (!is_object($perm)) {
+            $found = Pluf_Permission::getFromString($perm);
+            if (false === $found) {
+                throw new Exception(sprintf('The permission %s does not exist.', $perm));
+            }
+            $perm = $found;
+        }
+        $growp = new Pluf_RowPermission();
+        $sql = new Pluf_SQL('owner_id=%s AND owner_class=%s AND model_id=%s AND model_class=%s AND permission=%s',
+                            array($owner->id, $owner->_a['model'], $object->id, $object->_a['model'], $perm->id));
+        $perms = $growp->getList(array('filter' => $sql->gen()));
+        foreach ($perms as $p) {
+            $p->delete();
+        }
+        return true;
+    }
+}
diff --git a/src/Pluf/SQL.php b/src/Pluf/SQL.php
new file mode 100644
index 0000000..733aaab
--- /dev/null
+++ b/src/Pluf/SQL.php
@@ -0,0 +1,138 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Generate the WHERE SQL clause in an easy and SQL proof way.
+ */
+class Pluf_SQL
+{
+
+    protected $db;
+    protected $where = '';
+    public $ands = array();
+
+    /**
+     * Construct the constructor with a default condition.
+     */
+    function __construct($base='', $args=array())
+    {
+        $this->db = Pluf::db();
+        if (strlen($base) > 0) {
+            $this->Q($base, $args);
+        }
+    }
+
+    /**
+     * Returns the where clause.
+     *
+     * @return string Where clause without the WHERE
+     */
+    function gen()
+    {
+        return implode(' AND ', $this->ands);
+    }
+
+    /**
+     * Add a condition.
+     *
+     * @param string String to 'interpolate'
+     * @param mixed String or array of parameters (array())
+     */
+    function Q($base, $args=array()) 
+    {
+        $escaped = array();
+        if (!is_array($args)) {
+            $args = array($args);
+        }
+        foreach ($args as $arg) {
+            $escaped[] = $this->db->esc($arg);
+        }
+        $this->ands[] = vsprintf($base, $escaped);
+        return $this;
+    }
+
+    /**
+     * Add another SQL as a AND.
+     *
+     * @param Pluf_SQL Other object to add to the current.
+     */
+    function SAnd($sql)
+    {
+        return $this->SDef($sql);
+    }
+
+    /**
+     * Add another SQL as a OR
+     *
+     * @param Pluf_SQL Other object to add to the current.
+     */
+    function SOr($sql)
+    {
+        return $this->SDef($sql, 'OR');
+    }
+
+    /**
+     * Add another SQL to the current
+     *
+     * @param Pluf_SQL Other object to add to the current.
+     * @param string Type of addition
+     */
+    function SDef($sql, $k='AND')
+    {
+        if (empty($this->ands)) {
+            $this->ands = $sql->ands;
+        } else {
+            $othersql = $sql->gen();
+            $current = $this->gen();
+            if (strlen($othersql)) {
+                $this->ands = array();
+                $this->ands[] = '('.$current.') '.$k.' ('.$othersql.')';
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * Get keywords.
+     *
+     * Considering a query string, explode the query string in
+     * keywords given a defined delimiter.
+     *
+     * @param string Query string
+     * @param string delimiter (' ')
+     * @return array Array of keywords
+     */
+    function keywords($string, $del=' ')
+    {
+        $keys = array();
+        $args = explode($del, $string);
+        foreach ($args as $arg) {
+            $arg = trim($arg);
+            if (strlen($arg) > 0) {
+                $keys[] = $arg;
+            }
+        }
+        return $keys;
+    }
+}
+
diff --git a/src/Pluf/Search.php b/src/Pluf/Search.php
new file mode 100644
index 0000000..2d1e973
--- /dev/null
+++ b/src/Pluf/Search.php
@@ -0,0 +1,211 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Class implementing a small search engine.
+ *
+ * Ideal for a small website with up to 100,000 documents. 
+ */
+class Pluf_Search
+{
+    /**
+     * Search.
+     *
+     * Returns an array of array with model_class, model_id and
+     * score. The list is already sorted by score descending.
+     *
+     * You can then filter the list as you wish with another set of
+     * weights.
+     *
+     * @param string Query string.
+     * @return array Results.
+     */
+    public static function search($query, $stemmer='Pluf_Text_Stemmer_Porter')
+    {
+        $query = Pluf_Text::cleanString(html_entity_decode($query, ENT_QUOTES, 'UTF-8'));
+        $words = Pluf_Text::tokenize($query);
+        if ($stemmer != null) {
+            $words = self::stem($words, $stemmer);
+        }
+        $words_flat = array();
+        foreach ($words as $word=>$c) {
+            $words_flat[] = $word;
+        }
+        $word_ids = self::getWordIds($words_flat);
+        if (in_array(null, $word_ids)) {
+            return array();
+        }
+        return self::searchDocuments($word_ids);
+    }
+
+    /**
+     * Stem the words with the given stemmer.
+     */
+    public static function stem($words, $stemmer)
+    {
+        $nwords = array();
+        foreach ($words as $word => $occ) {
+            $word = call_user_func(array($stemmer, 'stem'), $word);
+            if (isset($nwords[$word])) {
+                $nwords[$word] += $occ;
+            } else {
+                $nwords[$word] = $occ;
+            }
+        }
+        return $nwords;
+    }
+
+    /**
+     * Search documents.
+     *
+     * Only the total of the ponderated occurences is used to sort the
+     * results.
+     *
+     * @param array Ids.
+     * @return array Sorted by score, returns model_class, model_id and score.
+     */
+    public static function searchDocuments($wids)
+    {
+        $db =& Pluf::db();
+        $gocc = new Pluf_Search_Occ();
+        $where = array();
+        foreach ($wids as $id) {
+            $where[] = $db->qn('word').'='.(int)$id;
+        }
+        $select = 'SELECT model_class, model_id, SUM(pondocc) AS score FROM '.$gocc->getSqlTable().' WHERE '.implode(' OR ', $where).' GROUP BY model_class, model_id HAVING COUNT(*)='.count($wids).' ORDER BY score DESC';
+        return $db->select($select);
+    }
+
+    /**
+     * Get the id of each word.
+     *
+     * @param array Words
+     * @return array Ids, null if no matching word.
+     */
+    public static function getWordIds($words)
+    {
+        $ids = array();
+        $gword = new Pluf_Search_Word();
+        foreach ($words as $word) {
+            $sql = new Pluf_SQL('word=%s', array($word));
+            $l = $gword->getList(array('filter' => $sql->gen()));
+            if ($l->count() > 0) {
+                $ids[] = $l[0]->id;
+            } else {
+                $ids[] = null;
+            }
+        }
+        return $ids;
+    }
+
+    /**
+     * Index a document.
+     *
+     * The document must provide a method _toIndex() returning the
+     * document as a string for indexation. The string must be clean
+     * and will simply be tokenized by Pluf_Text::tokenize().
+     *
+     * So a recommended way to clean it at the end is to remove all
+     * the HTML tags and then run the following on it:
+     *
+     *  return Pluf_Text::cleanString(html_entity_decode($string,
+     *                                ENT_QUOTES, 'UTF-8'));
+     *
+     * Indexing is resource intensive so it is recommanded to run the
+     * indexing in an asynchronous way. When you save a resource to be
+     * indexed, just write a log "need to index resource x" and then
+     * you can every few minutes index the resources. Nobody care if
+     * your index is not perfectly fresh, but your end users care if
+     * it takes 0.6s to get back the page instead of 0.1s.
+     *
+     * Take 500 average documents, index them while counting the total
+     * time it takes to index. Divide by 500 and if the result is more
+     * than 0.1s, use a log/queue.
+     *
+     * FIXME: Concurrency problem if you index at the same time the same doc.
+     *
+     * @param Pluf_Model Document to index.
+     * @param Stemmer used. ('Pluf_Text_Stemmer_Porter')
+     * @return array Statistics.
+     */
+    public static function index($doc, $stemmer='Pluf_Text_Stemmer_Porter')
+    {
+        $words = Pluf_Text::tokenize($doc->_toIndex());
+        if ($stemmer != null) {
+            $words = self::stem($words, $stemmer);
+        }
+        // Get the total number of words.
+        $total = 0.0;
+        $words_flat = array();
+        foreach ($words as $word => $occ) {
+            $total += (float) $occ;
+            $words_flat[] = $word;
+        }
+        // Drop the last indexation.
+        $gocc = new Pluf_Search_Occ();
+        $sql = new Pluf_SQL('DELETE FROM '.$gocc->getSqlTable().' WHERE model_class=%s AND model_id=%s', array($doc->_model, $doc->id));
+        $db =& Pluf::db();
+        $db->execute($sql->gen());
+        // Get the ids for each word.
+        $ids = self::getWordIds($words_flat);
+        // Insert a new word for the missing words and add the occ.
+        $n = count($ids);
+        $new_words = 0;
+        $done = array();
+        for ($i=0;$i<$n;$i++) {
+            if ($ids[$i] === null) {
+                $word = new Pluf_Search_Word();
+                $word->word = $words_flat[$i];
+                $word->create();
+                $ids[$i] = $word->id;
+                $new_words++;
+            }
+            if (isset($done[$ids[$i]])) {
+                continue;
+            }
+            $done[$ids[$i]] = true;
+            $occ = new Pluf_Search_Occ();
+            $occ->word = new Pluf_Search_Word($ids[$i]);
+            $occ->model_class = $doc->_model;
+            $occ->model_id = $doc->id;
+            $occ->occ = $words[$words_flat[$i]];
+            $occ->pondocc = $words[$words_flat[$i]]/$total;
+            $occ->create();
+        }
+        // update the stats
+        $sql = new Pluf_SQL('model_class=%s AND model_id=%s',
+                            array($doc->_model, $doc->id));
+        $last_index = Pluf::factory('Pluf_Search_Stats')->getList(array('filter' => $sql->gen()));
+        if ($last_index->count() == 0) {
+            $stats = new Pluf_Search_Stats();
+            $stats->model_class = $doc->_model;
+            $stats->model_id = $doc->id;
+            $stats->indexations = 1;
+            $stats->create();
+        } else {
+            $last_index[0]->indexations += 1;
+            $last_index[0]->update();
+        }
+        return array('total' => $total, 'new' => $new_words, 'unique'=>$n);
+    }
+}
\ No newline at end of file
diff --git a/src/Pluf/Search/Occ.php b/src/Pluf/Search/Occ.php
new file mode 100644
index 0000000..e933b02
--- /dev/null
+++ b/src/Pluf/Search/Occ.php
@@ -0,0 +1,92 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Storage of the occurence of the words.
+ */
+class Pluf_Search_Occ extends Pluf_Model
+{
+    public $_model = 'Pluf_Search_Occ';
+
+    function init()
+    {
+        $this->_a['verbose'] = __('occurence');
+        $this->_a['table'] = 'pluf_search_occs';
+        $this->_a['model'] = 'Pluf_Search_Occ';
+        $this->_a['cols'] = array(
+                             // It is mandatory to have an "id" column.
+                            'id' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Sequence',
+                                  //It is automatically added.
+                                  'blank' => true, 
+                                  ),
+                            'word' => 
+                            array(
+                                  'type' => 'Pluf_DB_Field_Foreignkey',
+                                  'model' => 'Pluf_Search_Word',
+                                  'blank' => false,
+                                  'verbose' => __('word'),
+                                   ),
+                            'model_class' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Varchar',
+                                  'blank' => false,
+                                  'size' => 150,
+                                  'verbose' => __('model class'),
+                                  ),
+                            'model_id' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Integer',
+                                  'blank' => false,
+                                  'verbose' => __('model id'),
+                                  ),
+                            'occ' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Integer',
+                                  'blank' => false,
+                                  'verbose' => __('occurences'),
+                                  ),
+                            'pondocc' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Float',
+                                  'blank' => false,
+                                  'verbose' => __('ponderated occurence'),
+                                  ),
+                            );
+        $this->_a['idx'] = array(                           
+                            'model_class_id_combo_word_idx' =>
+                            array(
+                                  'type' => 'unique',
+                                  'col' => 'model_class, model_id, word',
+                                  ),
+                            );
+
+    }
+
+    function __toString()
+    {
+        return $this->word;
+    }
+}
+
diff --git a/src/Pluf/Search/ResultSet.php b/src/Pluf/Search/ResultSet.php
new file mode 100644
index 0000000..54977ad
--- /dev/null
+++ b/src/Pluf/Search/ResultSet.php
@@ -0,0 +1,76 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * ResultSet class to iterate over a search result.
+ *
+ */
+class Pluf_Search_ResultSet implements Iterator
+{
+    protected $results = array();
+
+    public function __construct($search_res)
+    {
+        $this->results = $search_res;
+        reset($this->results);
+    }
+
+    /**
+     * Get the current item.
+     */
+ 	public function current()
+    {
+        $i = current($this->results);
+        $doc = Pluf::factory($i['model_class'], $i['model_id']);
+        $doc->_searchScore = $i['score'];
+        return $doc;
+    }
+
+ 	public function key()
+    {
+        return key($this->results);
+    }
+
+ 	public function next()
+    {
+        next($this->results);
+    }
+
+ 	public function rewind()
+    {
+        reset($this->results);
+    }
+
+ 	public function valid()
+    {
+        // We know that the boolean false will not be stored as a
+        // field, so we can test against false to check if valid or
+        // not.
+        return (false !== current($this->results));
+    }
+
+ 	public function count()
+    {
+        return count($this->results);
+    }
+}
\ No newline at end of file
diff --git a/src/Pluf/Search/Stats.php b/src/Pluf/Search/Stats.php
new file mode 100644
index 0000000..75f12ae
--- /dev/null
+++ b/src/Pluf/Search/Stats.php
@@ -0,0 +1,97 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Keep track of when a document has been last indexed and the number
+ * of indexations.
+ */
+class Pluf_Search_Stats extends Pluf_Model
+{
+    public $_model = __CLASS__;
+
+    function init()
+    {
+        $this->_a['verbose'] = __('search stats');
+        $this->_a['table'] = 'pluf_search_stats';
+        $this->_a['model'] = __CLASS__;
+        $this->_a['cols'] = array(
+                             // It is mandatory to have an "id" column.
+                            'id' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Sequence',
+                                  //It is automatically added.
+                                  'blank' => true, 
+                                  ),
+                            'model_class' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Varchar',
+                                  'blank' => false,
+                                  'size' => 150,
+                                  'verbose' => __('model class'),
+                                  ),
+                            'model_id' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Integer',
+                                  'blank' => false,
+                                  'verbose' => __('model id'),
+                                  ),
+                            'indexations' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Integer',
+                                  'blank' => false,
+                                  'verbose' => __('number of indexations'),
+                                  'default' => 0,
+                                  ),
+                            'creation_dtime' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Datetime',
+                                  'blank' => true,
+                                  'verbose' => __('created at'),
+                                  ),
+                            'modif_dtime' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Datetime',
+                                  'blank' => true,
+                                  'verbose' => __('modified at'),
+                                  ),
+                            );
+        $this->_a['idx'] = array(                           
+                            'model_class_id_combo_idx' =>
+                            array(
+                                  'type' => 'unique',
+                                  'col' => 'model_class, model_id',
+                                  ),
+                            );
+
+    }
+
+    function preSave($create=false)
+    {
+        if ($this->id == '') {
+            $this->creation_dtime = gmdate('Y-m-d H:i:s');
+        }
+        $this->modif_dtime = gmdate('Y-m-d H:i:s');
+    }
+
+}
+
diff --git a/src/Pluf/Search/Word.php b/src/Pluf/Search/Word.php
new file mode 100644
index 0000000..fd796a2
--- /dev/null
+++ b/src/Pluf/Search/Word.php
@@ -0,0 +1,61 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Storage of the words.
+ */
+class Pluf_Search_Word extends Pluf_Model
+{
+    public $_model = 'Pluf_Search_Word';
+
+    function init()
+    {
+        $this->_a['verbose'] = __('word');
+        $this->_a['table'] = 'pluf_search_words';
+        $this->_a['model'] = 'Pluf_Search_Word';
+        $this->_a['cols'] = array(
+                             // It is mandatory to have an "id" column.
+                            'id' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Sequence',
+                                  //It is automatically added.
+                                  'blank' => true, 
+                                  ),
+                            'word' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Varchar',
+                                  'blank' => false,
+                                  'unique' => true,
+                                  'size' => 150,
+                                  'verbose' => __('word'),
+                                  ),
+                            );
+        $this->_a['views'] = array();
+    }
+
+    function __toString()
+    {
+        return $this->word;
+    }
+}
+
diff --git a/src/Pluf/Session.php b/src/Pluf/Session.php
new file mode 100644
index 0000000..d2e5385
--- /dev/null
+++ b/src/Pluf/Session.php
@@ -0,0 +1,165 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_Session extends Pluf_Model
+{
+    public $_model = 'Pluf_Session';
+    public $data = array();
+    public $cookie_name = 'sessionid';
+    public $touched = false;
+    public $test_cookie_name = 'testcookie';
+    public $test_cookie_value = 'worked';
+    public $set_test_cookie = false;
+    public $test_cookie = null;
+
+    function init()
+    {
+        $this->cookie_name = Pluf::f('session_cookie_id', 'sessionid');
+        $this->_a['table'] = 'sessions';
+        $this->_a['model'] = 'Pluf_Session';
+        $this->_a['cols'] = array(
+                             // It is mandatory to have an "id" column.
+                            'id' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Sequence',
+                                  //It is automatically added.
+                                  'blank' => true, 
+                                  ),
+                            'session_key' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Varchar',
+                                  'blank' => false,
+                                  'size' => 100,
+                                  ),
+                            'session_data' => 
+                            array(
+                                  'type' => 'Pluf_DB_Field_Text',
+                                  'blank' => false,
+                                  ),
+                            'expire' => 
+                            array(
+                                  'type' => 'Pluf_DB_Field_Datetime',
+                                  'blank' => false,
+                                  ),
+                            );
+        $this->_a['idx'] = array(                           
+                            'session_key_idx' =>
+                            array(
+                                  'type' => 'unique',
+                                  'col' => 'session_key'
+                                  ),
+                            );
+        $this->_admin = array();
+        $this->_a['views'] = array();
+    }
+
+    /**
+     * Set some data in the session object.
+     *
+     * @param string Key
+     * @param mixed Value (null), if null, it is removing the value 
+     *              from the session
+     */
+    function setData($key, $value=null)
+    {
+        if (is_null($value)) {
+            unset($this->data[$key]);
+        } else {
+            $this->data[$key] = $value;
+        }
+        $this->touched = true;
+    }
+
+    function getData($key=null, $default='')
+    {
+        if (is_null($key)) {
+            return parent::getData();
+        }
+        if (isset($this->data[$key])) {
+            return $this->data[$key];
+        } else {
+            return $default;
+        }
+    }
+
+    function clear()
+    {
+        $this->data = array();
+        $this->touched = true;
+    }
+        
+    
+    /**
+     * Generate a new session key.
+     */
+    function getNewSessionKey()
+    {
+        while (1) {
+            $key = md5(microtime().rand(0, 123456789).rand(0, 123456789)
+                       .Pluf::f('secret_key'));
+            $sess = $this->getList(array('filter' => 'session_key=\''.$key.'\''));
+            if (count($sess) == 0) {
+                break;
+            }
+        }
+        return $key;
+    }
+
+    /**
+     * Presave/create function to encode data into session_data.
+     */
+    function preSave($create=false)
+    {
+        $this->session_data = serialize($this->data);
+        if ($this->session_key == '') {
+            $this->session_key = $this->getNewSessionKey();
+        }
+        $this->expire = gmdate('Y-m-d H:i:s', time()+31536000);
+    }
+
+    /**
+     * Restore function to decode the session_data into $this->data.
+     */
+    function restore()
+    {
+        $this->data = unserialize($this->session_data);
+    }
+
+    /**
+     * Create a test cookie.
+     */
+    public function createTestCookie()
+    {
+        $this->set_test_cookie = true;
+    }
+
+    public function getTestCookie()
+    {
+        return ($this->test_cookie == $this->test_cookie_value);
+    }
+
+    public function deleteTestCookie()
+    {
+        $this->set_test_cookie = false;
+    }
+}
diff --git a/src/Pluf/Shortcuts.php b/src/Pluf/Shortcuts.php
new file mode 100644
index 0000000..98cac8b
--- /dev/null
+++ b/src/Pluf/Shortcuts.php
@@ -0,0 +1,84 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Shortcut methods to perform some operations.
+ *
+ * Modelled on the django.shortcuts.
+ */
+
+/**
+ * Get an object by id or raise a 404 error.
+ *
+ * @param string Model
+ * @param int Id of the model to get
+ * @return Object The found object.
+ */
+function Pluf_Shortcuts_GetObjectOr404($object, $id)
+{
+    $item = new $object($id);
+    if ((int)$id > 0 && $item->id == $id) {
+        return $item;
+    }
+    throw new Pluf_HTTP_Error404();
+}
+
+/**
+ * Render a template file and an array as a reponse.
+ *
+ * If a none null request object is given, the context used will
+ * automatically be a Pluf_Template_Context_Request context and thus
+ * the context will be populated using the
+ * 'template_context_processors' functions.
+ *
+ * @param string Template file name
+ * @param array Associative array for the context
+ * @param Pluf_HTTP_Request Request object (null)
+ * @return Pluf_HTTP_Response The response with the rendered template
+ */
+function Pluf_Shortcuts_RenderToResponse($tplfile, $params, $request=null)
+{
+    $tmpl = new Pluf_Template($tplfile);
+    if (is_null($request)) {
+        $context = new Pluf_Template_Context($params);
+    } else {
+        $context = new Pluf_Template_Context_Request($request, $params);
+    }
+    return new Pluf_HTTP_Response($tmpl->render($context));
+}
+
+
+/**
+ * Get a given form from a model.
+ *
+ * @param Object The model.
+ * @param array Data to bound the form (null)
+ * @param array Extra parameters (array())
+ * @param string Label suffix (null)
+ * @return Object Form for this model.
+ */
+function Pluf_Shortcuts_GetFormForModel($model, $data=null, $extra=array(), $label_suffix=null)
+{
+    $extra['model'] = $model;
+    return new Pluf_Form_Model($data, $extra, $label_suffix);
+}
diff --git a/src/Pluf/Signal.php b/src/Pluf/Signal.php
new file mode 100644
index 0000000..22e7a8f
--- /dev/null
+++ b/src/Pluf/Signal.php
@@ -0,0 +1,68 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Signal system.
+ */
+class Pluf_Signal
+{
+
+    /**
+     * Send a signal.
+     *
+     * @param string Signal to be sent.
+     * @param string Sender.
+     * @param array Parameters
+     * @return void
+     */
+    public static function send($signal, $sender, &$params=array())
+    {
+        if (!empty($GLOBALS['_PX_signal'][$signal])) {
+            foreach ($GLOBALS['_PX_signal'][$signal] as $key=>$val) {
+                if ($val[2] === null or $sender == $val[2]) {
+                    call_user_func(array($val[0], $val[1]), $signal, &$params);
+                }
+            }
+        }
+    }
+
+
+    /**
+     * Connect to a signal.
+     *
+     * @param string Name of the signal.
+     * @param array array('class', 'method') handling the signal.
+     * @param string Optional sender filtering.
+     */
+    public static function connect($signal, $who, $sender=null)
+    {
+        if (!isset($GLOBALS['_PX_signal'])) {
+            $GLOBALS['_PX_signal'] = array();
+        }
+        if (!isset($GLOBALS['_PX_signal'][$signal])) {
+            $GLOBALS['_PX_signal'][$signal] = array();
+        }
+        $GLOBALS['_PX_signal'][$signal][] = array($who[0], $who[1], $sender);
+    }
+}
+
diff --git a/src/Pluf/Template.php b/src/Pluf/Template.php
new file mode 100644
index 0000000..08d3334
--- /dev/null
+++ b/src/Pluf/Template.php
@@ -0,0 +1,288 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Render a template file.
+ */
+class Pluf_Template
+{
+    public $tpl = '';
+    public $folders = array();
+    public $cache = '';
+    public $compiled_template = '';
+    public $template_content = '';
+    public $context = null;
+
+    /**
+     * Constructor.
+     *
+     * If the folder name is not provided, it will default to
+     * Pluf::f('template_folders')
+     * If the cache folder name is not provided, it will default to
+     * Pluf::f('tmp_folder')
+     *
+     * @param string Template name.
+     * @param string Template folder paths (null)
+     * @param string Cache folder name (null)
+     */
+    function __construct($template, $folders=null, $cache=null)
+    {
+        $this->tpl = $template;
+        if (is_null($folders)) {
+            $this->folders = Pluf::f('template_folders');
+        } else {
+            $this->folders = $folders;
+        }
+        if (is_null($cache)) {
+            $this->cache = Pluf::f('tmp_folder');
+        } else {
+            $this->cache = $cache;
+        }
+        if (defined('IN_UNIT_TESTS')) {
+            if (!isset($GLOBALS['_PX_tests_templates'])) {
+                $GLOBALS['_PX_tests_templates'] = array();
+            } 
+        }
+    }
+
+    /**
+     * Render the template with the given context and return the content.
+     *
+     * @param Object Context.
+     */
+    function render($c=null)
+    {
+        if (defined('IN_UNIT_TESTS')) {
+            $GLOBALS['_PX_tests_templates'][] = $this;
+        }
+        $this->compiled_template = $this->getCompiledTemplateName();
+        if (!file_exists($this->compiled_template) or Pluf::f('debug')) {
+            $compiler = new Pluf_Template_Compiler($this->tpl, $this->folders);
+            $this->template_content = $compiler->getCompiledTemplate();
+            $this->write();
+        }
+        if (is_null($c)) {
+            $c = new Pluf_Template_Context();
+        }
+        $this->context = $c;
+        ob_start();
+        $t = $c;
+        try {
+            include $this->compiled_template;
+        } catch (Exception $e) {
+            ob_clean();
+            throw $e;
+        }
+        $a = ob_get_contents();
+        ob_end_clean();
+        return $a;
+    }
+
+    /**
+     * Get the full name of the compiled template.
+     *
+     * Ends with .phps to prevent execution from outside if the cache folder
+     * is not secured but to still have the syntax higlightings by the tools
+     * for debugging.
+     *
+     * @return string Full path to the compiled template
+     */
+    function getCompiledTemplateName()
+    {
+        // The compiled template not only depends on the file but also
+        // on the possible folders in which it can be found.
+        $_tmp = var_export($this->folders, true);
+        return $this->cache.'/Pluf_Template-'.md5($_tmp.$this->tpl).'.phps';
+    }
+
+    /**
+     * Write the compiled template in the cache folder.
+     * Throw an exception if it cannot write it.
+     *
+     * @return bool Success in writing
+     */
+    function write() 
+    {
+        // mode "a" to not truncate before getting the lock
+        $fp = @fopen($this->compiled_template, 'a'); 
+        if ($fp !== false) {
+            // Exclusive lock on writing
+            flock($fp, LOCK_EX); 
+            // We have the unique pointeur, we truncate
+            ftruncate($fp, 0); 
+            // Go back to the start of the file like a +w
+            rewind($fp); 
+            fwrite($fp, $this->template_content, strlen($this->template_content));
+            // Lock released, read access is possible
+            flock($fp, LOCK_UN);  
+            fclose($fp);
+            @chmod($this->compiled_template, 0777);
+            return true;
+        } else {
+            throw new Exception(sprintf(__('Cannot write the compiled template: %s'), $this->compiled_template));
+        }
+        return false;
+    }
+
+    public static function markSafe($string)
+    {
+        return new Pluf_Template_SafeString($string, true);
+    }
+}
+
+/**
+ * Set a string to be safe for display.
+ *
+ * @param string String to be safe for display.
+ * @return string Pluf_Template_SafeString 
+ */
+function Pluf_Template_unsafe($string)
+{
+    return new Pluf_Template_SafeString($string, true);
+}
+
+/**
+ * Special htmlspecialchars that can handle the objects.
+ *
+ * @param string String proceeded by htmlspecialchars
+ * @return string String like if htmlspecialchars was not applied
+ */
+function Pluf_Template_htmlspecialchars($string)
+{
+    return htmlspecialchars((string)$string, ENT_COMPAT, 'UTF-8');
+}
+
+/**
+ * Modifier plugin: Convert the date from GMT to local and format it.
+ *
+ * This is used as all the datetime are stored in GMT in the database.
+ *
+ * @param string $date input date string considered GMT
+ * @param string $format strftime format for output ('%b %e, %Y')
+ * @return string date in localtime
+ */
+function Pluf_Template_dateFormat($date, $format='%b %e, %Y') 
+{
+    if (substr(PHP_OS,0,3) == 'WIN') {
+        $_win_from = array ('%e',  '%T',	   '%D');
+        $_win_to   = array ('%#d', '%H:%M:%S', '%m/%d/%y');
+        $format	= str_replace($_win_from, $_win_to, $format);
+    }
+    $date = date('Y-m-d H:i:s', strtotime($date.' GMT'));
+    return strftime($format, strtotime($date));
+}
+
+/**
+ * Modifier plugin: Format a unix time.
+ *
+ * Warning: date format is directly to be used, not consideration of
+ * GMT or local time.
+ *
+ * @param int $time  input date string considered GMT
+ * @param string $format strftime format for output ('Y-m-d H:i:s')
+ * @return string formated time
+ */
+function Pluf_Template_timeFormat($time, $format='Y-m-d H:i:s') 
+{
+    return date($format, $time);
+}
+
+
+/**
+ * Special echo function that checks if the string to output is safe
+ * or not, if not it is escaped.
+ *
+ * @param mixed Input
+ * @return string Safe to display in HTML.
+ */
+function Pluf_Template_safeEcho($mixed, $echo=true)
+{
+    if (!is_object($mixed) or 'Pluf_Template_SafeString' !== get_class($mixed)) {
+        if ($echo) {
+            echo htmlspecialchars((string) $mixed, ENT_COMPAT, 'UTF-8');
+        } else {
+            return htmlspecialchars((string) $mixed, ENT_COMPAT, 'UTF-8');
+        }
+    } else {
+        if ($echo) {
+            echo $mixed->value;
+        } else {
+            return $mixed->value;
+        }
+    }
+}
+
+/**
+ * New line to <br /> returning a safe string.
+ *
+ * @param mixed Input
+ * @return string Safe to display in HTML.
+ */
+function Pluf_Template_nl2br($mixed)
+{
+    if (!is_object($mixed) or 'Pluf_Template_SafeString' !== get_class($mixed)) {
+        return Pluf_Template::markSafe(nl2br(htmlspecialchars((string) $mixed, ENT_COMPAT, 'UTF-8')));
+    } else {
+        return Pluf_Template::markSafe(nl2br($mixed->value));
+    }
+}
+
+/**
+ * Var export returning a safe string.
+ *
+ * @param mixed Input
+ * @return string Safe to display in HTML.
+ */
+function Pluf_Template_varExport($mixed)
+{
+    return Pluf_Template_unsafe('<pre>'.Pluf_esc(var_export($mixed, true)).'</pre>');
+}
+
+
+/**
+ * Display the date in a "6 days, 23 hours ago" style.
+ */
+function Pluf_Template_dateAgo($date, $f='withal')
+{
+    Pluf::loadFunction('Pluf_Date_Easy');
+    $date = Pluf_Template_dateFormat($date, '%Y-%m-%d %H:%M:%S');
+    if ($f == 'withal') {
+        return Pluf_Date_Easy($date, null, 2, __('now'));
+    } else {
+        return Pluf_Date_Easy($date, null, 2, __('now'), false);
+    }
+}
+
+/**
+ * Display the time in a "6 days, 23 hours ago" style.
+ */
+function Pluf_Template_timeAgo($date, $f="withal")
+{
+    Pluf::loadFunction('Pluf_Date_Easy');
+    $date = Pluf_Template_timeFormat($date);
+    if ($f == 'withal') {
+        return Pluf_Date_Easy($date, null, 2, __('now'));
+    } else {
+        return Pluf_Date_Easy($date, null, 2, __('now'), false);
+    }
+}
\ No newline at end of file
diff --git a/src/Pluf/Template/Compiler.php b/src/Pluf/Template/Compiler.php
new file mode 100644
index 0000000..0901a47
--- /dev/null
+++ b/src/Pluf/Template/Compiler.php
@@ -0,0 +1,645 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Class to compile a template file into the corresponding PHP script
+ * to be run by the Template class.
+ *
+ * Compiler dataflow
+ * 
+ * The important elements of the compiler are the include extends
+ * block and superblock directives. They cannot be handled in a linear
+ * way like the rest of the elements, they are more like nodes.
+ *
+ * 
+ * @credit Copyright (C) 2006 Laurent Jouanneau.
+ */
+class Pluf_Template_Compiler
+{
+    
+    /** 
+     * Store the literal blocks. 
+     **/
+    protected $_literals;
+    
+    /** 
+     * Variables. 
+     */
+    protected $_vartype = array(T_CHARACTER, T_CONSTANT_ENCAPSED_STRING, 
+                                T_DNUMBER, T_ENCAPSED_AND_WHITESPACE, 
+                                T_LNUMBER, T_OBJECT_OPERATOR, T_STRING, 
+                                T_WHITESPACE, T_ARRAY, T_CLASS);
+
+    /** 
+     * Assignation operators. 
+     */
+    protected $_assignOp = array(T_AND_EQUAL, T_DIV_EQUAL, T_MINUS_EQUAL, 
+                                 T_MOD_EQUAL, T_MUL_EQUAL, T_OR_EQUAL, 
+                                 T_PLUS_EQUAL, T_PLUS_EQUAL, T_SL_EQUAL, 
+                                 T_SR_EQUAL, T_XOR_EQUAL);
+
+    /** 
+     * Operators. 
+     */
+    protected  $_op = array(T_BOOLEAN_AND, T_BOOLEAN_OR, T_EMPTY, T_INC, 
+                            T_ISSET, T_IS_EQUAL, T_IS_GREATER_OR_EQUAL, 
+                            T_IS_IDENTICAL, T_IS_NOT_EQUAL, T_IS_NOT_IDENTICAL,
+                            T_IS_SMALLER_OR_EQUAL, T_LOGICAL_AND, T_LOGICAL_OR,
+                            T_LOGICAL_XOR, T_SR, T_SL, T_DOUBLE_ARROW);
+
+    /**
+     * Authorized elements in variables.
+     */
+    protected $_allowedInVar;
+
+    /**
+     * Authorized elements in expression.
+     */
+    protected $_allowedInExpr;
+
+    /**
+     * Authorized elements in assignation.
+     */
+    protected $_allowedAssign;
+
+    /**
+     * Output filters.
+     */
+    protected $_modifier = array('upper' => 'strtoupper', 
+                                 'lower' => 'strtolower',
+                                 'count' => 'count',
+                                 'md5' => 'md5',
+                                 'escxml' => 'htmlspecialchars', 
+                                 'escape' => 'Pluf_Template_htmlspecialchars',
+                                 'strip_tags' => 'strip_tags', 
+                                 'escurl' => 'rawurlencode',
+                                 'capitalize' => 'ucwords',
+                                 // Not var_export because of recursive issues.
+                                 'debug' => 'print_r', 
+                                 'dump' => 'Pluf_Template_varExport', 
+                                 'fulldebug' => 'var_export',
+                                 'count' => 'count',
+                                 'nl2br' => 'Pluf_Template_nl2br',
+                                 'trim' => 'trim',
+                                 'unsafe' => 'Pluf_Template_unsafe',
+                                 'safe' => 'Pluf_Template_unsafe',
+                                 'date' => 'Pluf_Template_dateFormat',
+                                 'time' => 'Pluf_Template_timeFormat',
+                                 'dateago' => 'Pluf_Template_dateAgo',
+                                 'timeago' => 'Pluf_Template_timeAgo',
+                                 );
+
+    /**
+     * After the compilation is completed, this contains the list of
+     * modifiers used in the template. The GetCompiledTemplate method
+     * will add a series of Pluf::loadFunction at the top to preload
+     * these modifiers.
+     */
+    public $_usedModifiers = array();
+
+    /**
+     * Default allowed extra tags/functions. 
+     *
+     * These default tags are merged with the 'template_tags' defined
+     * in the configuration of the application.
+     */
+    protected $_allowedTags = array(
+                                    'url' => 'Pluf_Template_Tag_Url',
+                                    'aurl' => 'Pluf_Template_Tag_Rurl',
+                                    'media' => 'Pluf_Template_Tag_MediaUrl',
+                                    'amedia' => 'Pluf_Template_Tag_RmediaUrl',
+                                    'getmsgs' => 'Pluf_Template_Tag_Messages',
+                                    );
+    /**
+     * During compilation, all the tags are created once so to query
+     * their interface easily.
+     */
+    protected $_extraTags = array();
+
+    /**
+     * The block stack to see if the blocks are correctly closed.
+     */
+    protected $_blockStack = array();
+
+    /**
+     * Special stack for the translation handling in blocktrans.
+     */
+    protected $_transStack = array();
+    protected $_transPlural = false;
+
+    /**
+     * Current template source file.
+     */
+    protected $_sourceFile;
+
+    /**
+     * Current tag.
+     */
+    protected $_currentTag;
+
+    /**
+     * Template folders.
+     */
+    public $templateFolders = array();
+
+    /**
+     * Template content. It can be set directly from a string.
+     */
+    public $templateContent = '';
+
+    /**
+     * The extend blocks.
+     */
+    public $_extendBlocks = array();
+
+    /**
+     * The extended template.
+     */
+    public $_extendedTemplate = '';
+
+    /**
+     * Construct the compiler.
+     *
+     * @param string Basename of the template file.
+     * @param array Base folders in which the templates files 
+     *              should be found. (array())
+     * @param bool Load directly the template content. (true)
+     */
+    function __construct($template_file, $folders=array(), $load=true)
+    {
+        $allowedtags = Pluf::f('template_tags', array());
+        $this->_allowedTags = array_merge($allowedtags, $this->_allowedTags);
+        $modifiers = Pluf::f('template_modifiers', array());
+        $this->_modifier = array_merge($modifiers, $this->_modifier);
+
+        foreach ($this->_allowedTags as $name=>$model) {
+            $this->_extraTags[$name] = new $model();
+        }
+        $this->_sourceFile = $template_file;
+        $this->_allowedInVar = array_merge($this->_vartype, $this->_op);
+        $this->_allowedInExpr = array_merge($this->_vartype, $this->_op);
+        $this->_allowedAssign = array_merge($this->_vartype, $this->_assignOp, 
+                                            $this->_op);
+        $this->templateFolders = $folders;
+        if ($load) {
+            $this->loadTemplateFile($template_file);
+        }
+    }
+
+    /**
+     * Compile the template into a PHP code.
+     *
+     * @return string PHP code of the compiled template.
+     */
+    function compile() 
+    {
+        $this->compileBlocks();
+        $tplcontent = $this->templateContent;
+        // Remove the template comments
+        $tplcontent = preg_replace('!{\*(.*?)\*}!s', '', $tplcontent);
+        // Remove PHP code
+        $tplcontent = preg_replace('!<\?php(.*?)\?>!s', '', $tplcontent);
+        // Catch the litteral blocks and put them in the
+        // $this->_literals stack
+        preg_match_all('!{literal}(.*?){/literal}!s', $tplcontent, $_match);
+        $this->_literals = $_match[1];
+        $tplcontent = preg_replace("!{literal}(.*?){/literal}!s", '{literal}', $tplcontent);
+        // Core regex to parse the template
+        $result = preg_replace_callback('/{((.).*?)}/s', 
+                                        array($this, '_callback'), 
+                                        $tplcontent);
+        if (count($this->_blockStack)) {
+            trigger_error(sprintf(__('End tag of a block missing: %s'), end($this->_blockStack)), E_USER_ERROR);
+        }
+        return $result;
+    }
+
+    /**
+     * Get a cleaned compile template.
+     *
+     */
+    function getCompiledTemplate()
+    {
+        $result = $this->compile();
+        if (count($this->_usedModifiers)) {
+            $code = array();
+            foreach ($this->_usedModifiers as $modifier) {
+                $code[] = 'Pluf::loadFunction(\''.$modifier.'\'); ';
+            }
+            $result = '<?php '.implode("\n", $code).'?>'.$result;
+        }
+        // Clean the output
+        $result = str_replace(array('?><?php', '<?php ?>', '<?php  ?>'), '', $result);  
+        // To avoid the triming of the \n after a php closing tag.
+        $result = str_replace("?>\n", "?>\n\n", $result);
+        return $result;
+    }
+
+    /**
+     * Parse the extend blocks.
+     *
+     * If the current template extends another, it finds the extended
+     * template and grabs the defined blocks and compile them.
+     */
+    function compileBlocks()
+    {
+        $tplcontent = $this->templateContent;
+        $this->_extendedTemplate = '';
+        // Match extends on the first line of the template
+        if (preg_match("!{extends\s['\"](.*?)['\"]}!", $tplcontent, $_match)) {
+            $this->_extendedTemplate = $_match[1];
+        }
+        // Get the blocks in the current template
+        $cnt = preg_match_all("!{block\s(\S+?)}(.*?){/block}!s", $tplcontent, $_match);
+        // Compile the blocks
+        for ($i=0; $i<$cnt; $i++) {
+            if (!isset($this->_extendBlocks[$_match[1][$i]]) 
+                or false !== strpos($this->_extendBlocks[$_match[1][$i]], '~~{~~superblock~~}~~')) {
+                $compiler = clone($this);
+                $compiler->templateContent = $_match[2][$i];
+                $_tmp = $compiler->compile();
+                $this->updateModifierStack($compiler);
+                if (!isset($this->_extendBlocks[$_match[1][$i]])) {
+                    $this->_extendBlocks[$_match[1][$i]] = $_tmp;
+                } else {
+                    $this->_extendBlocks[$_match[1][$i]] = str_replace('~~{~~superblock~~}~~', $_tmp, $this->_extendBlocks[$_match[1][$i]]);
+                }
+            }
+        }
+        if (strlen($this->_extendedTemplate) > 0) {
+            // The template of interest is now the extended template
+            // as we are not in a base template
+            $this->loadTemplateFile($this->_extendedTemplate);
+            $this->_sourceFile = $this->_extendedTemplate;
+            $this->compileBlocks(); //It will recurse to the base template.
+        } else {
+            // Replace the current blocks by a place holder
+            if ($cnt) {
+                $this->templateContent = preg_replace("!{block\s(\S+?)}(.*?){/block}!s", "{block $1}", $tplcontent, -1); 
+            }
+        }
+    }
+
+    /**
+     * Load a template file.
+     *
+     * The path to the file to load is relative and the file is found
+     * in one of the $templateFolders array of folders.
+     *
+     * @param string Relative path of the file to load.
+     */
+    function loadTemplateFile($file)
+    {
+        // FIXME: Very small security check, could be better.
+        if (strpos($file, '..') !== false) {
+            throw new Exception(sprintf(__('Template file contains invalid characters: %s'), $file));
+        }
+        foreach ($this->templateFolders as $folder) {
+            if (file_exists($folder.'/'.$file)) {
+                $this->templateContent = file_get_contents($folder.'/'.$file);
+                return;
+            }
+        }
+        // File not found in all the folders.
+        throw new Exception(sprintf(__('Template file not found: %s'), $file));
+    }
+
+    function _callback($matches) 
+    {
+        list(,$tag, $firstcar) = $matches;
+        if (!preg_match('/^\$|[\'"]|[a-zA-Z\/]$/', $firstcar)) {
+            trigger_error(sprintf(__('Invalid tag syntax: %s'), $tag), E_USER_ERROR);
+            return '';
+        }
+        $this->_currentTag = $tag;
+        if (in_array($firstcar, array('$', '\'', '"'))) {
+            if ('blocktrans' !== end($this->_blockStack)) {
+                return '<?php Pluf_Template_safeEcho('.$this->_parseVariable($tag).'); ?>';
+            } else {
+                $tok = explode('|', $tag);
+                $this->_transStack[substr($tok[0], 1)] = $this->_parseVariable($tag);
+                return '%%'.substr($tok[0], 1).'%%';
+            }
+        } else {
+            if (!preg_match('/^(\/?[a-zA-Z0-9_]+)(?:(?:\s+(.*))|(?:\((.*)\)))?$/', $tag, $m)) {
+                trigger_error(sprintf(__('Invalid function syntax: %s'), $tag), E_USER_ERROR);
+                return '';
+            }
+            if (count($m) == 4){
+                $m[2] = $m[3];
+            }
+            if (!isset($m[2])) $m[2] = '';
+            if($m[1] == 'ldelim') return '{';
+            if($m[1] == 'rdelim') return '}';
+            if ($m[1] != 'include') {
+                return '<?php '.$this->_parseFunction($m[1], $m[2]).'?>';
+            } else {
+                return $this->_parseFunction($m[1], $m[2]);
+            }
+        }
+    }
+
+    function _parseVariable($expr)
+    {
+        $tok = explode('|', $expr);
+        $res = $this->_parseFinal(array_shift($tok), $this->_allowedInVar);
+        foreach ($tok as $modifier) {
+            if (!preg_match('/^(\w+)(?:\:(.*))?$/', $modifier, $m)) {
+                trigger_error(sprintf(__('Invalid modifier syntax: (%s) %s'), $this->_currentTag, $modifier), E_USER_ERROR);
+                return '';
+            }
+            $targs = array($res);
+            if(isset($m[2])){
+                $res = $this->_modifier[$m[1]].'('.$res.','.$m[2].')';
+            }
+            else if (isset($this->_modifier[$m[1]])) {
+                $res = $this->_modifier[$m[1]].'('.$res.')';
+            } else {
+                trigger_error(sprintf(__('Unknown modifier: (%s) %s'), $this->_currentTag, $m[1]), E_USER_ERROR);
+                return '';
+            }
+            if (!in_array($this->_modifier[$m[1]], $this->_usedModifiers)) {
+                $this->_usedModifiers[] = $this->_modifier[$m[1]];
+            }
+        }
+        return $res;
+    }
+
+    function _parseFunction($name, $args)
+    {
+        switch ($name) {
+        case 'if':
+            $res = 'if ('.$this->_parseFinal($args, $this->_allowedInExpr).'): ';
+            array_push($this->_blockStack, 'if');
+            break;
+        case 'else':
+            if (end($this->_blockStack) != 'if') {
+                trigger_error(sprintf(__('End tag of a block missing: %s'), end($this->_blockStack)), E_USER_ERROR);
+            }
+            $res = 'else: ';
+            break;
+        case 'elseif':
+            if (end($this->_blockStack) != 'if') {
+                trigger_error(sprintf(__('End tag of a block missing: %s'), end($this->_blockStack)), E_USER_ERROR);
+            }
+            $res = 'elseif('.$this->_parseFinal($args, $this->_allowedInExpr).'):';
+            break;
+        case 'foreach':
+            $res = 'foreach ('.$this->_parseFinal($args, array_merge(array(T_AS, T_DOUBLE_ARROW, T_STRING, T_OBJECT_OPERATOR, $this->_allowedAssign, '[', ']')), array(';','!')).'): ';
+            array_push($this->_blockStack, 'foreach');
+            break;
+        case 'while':
+            $res = 'while('.$this->_parseFinal($args,$this->_allowedInExpr).'):';
+            array_push($this->_blockStack, 'while');
+            break;
+        case '/foreach':
+        case '/if':
+        case '/while':
+            $short = substr($name,1);
+            if(end($this->_blockStack) != $short){
+                trigger_error(sprintf(__('End tag of a block missing: %s'), end($this->_blockStack)), E_USER_ERROR);
+            }
+            array_pop($this->_blockStack);
+            $res = 'end'.$short.'; ';
+            break;
+        case 'assign':
+            $res = $this->_parseFinal($args, $this->_allowedAssign).'; ';
+            break;
+        case 'literal':
+            if(count($this->_literals)){
+                $res = '?>'.array_shift($this->_literals).'<?php ';
+            }else{
+                trigger_error(__('End tag of a block missing: literal'), E_USER_ERROR);
+            }
+            break;
+        case '/literal':
+            trigger_error(__('Start tag of a block missing: literal'), E_USER_ERROR);
+            break;
+        case 'block':
+            $res = '?>'.$this->_extendBlocks[$args].'<?php ';
+            break;
+        case 'superblock':
+            $res = '?>~~{~~superblock~~}~~<?php ';
+            break;
+        case 'trans':
+            $argfct = $this->_parseFinal($args, $this->_allowedAssign); 
+            $res = 'echo(__('.$argfct.'));';
+            break;
+        case 'blocktrans':
+            array_push($this->_blockStack, 'blocktrans');
+            $res = '';
+            $this->_transStack = array();
+            if ($args) {
+                $this->_transPlural = true;
+                $_args = $this->_parseFinal($args, $this->_allowedAssign,
+                                             array(';', '[', ']'), true);
+                $res .= '$_b_t_c='.trim(array_shift($_args)).'; '; 
+            }
+            $res .= 'ob_start(); ';
+            break;
+        case '/blocktrans':
+            $short = substr($name,1);
+            if(end($this->_blockStack) != $short){
+                trigger_error(sprintf(__('End tag of a block missing: %s'), end($this->_blockStack)), E_USER_ERROR);
+            }
+            $res = '';
+            if ($this->_transPlural) {
+                $res .= '$_b_t_p=ob_get_contents(); ob_end_clean(); echo(';
+                $res .= 'Pluf_Translation::sprintf(_n($_b_t_s, $_b_t_p, $_b_t_c), array(';
+                $_tmp = array();
+                foreach ($this->_transStack as $key=>$_trans) {
+                    $_tmp[] = '\''.addslashes($key).'\' => Pluf_Template_safeEcho('.$_trans.', false)';
+                }
+                $res .= implode(', ', $_tmp);
+                unset($_trans, $_tmp);
+                $res .= ')));';
+                $this->_transStack = array();
+            } else {
+                $res .= '$_b_t_s=ob_get_contents(); ob_end_clean(); ';
+                if (count($this->_transStack) == 0) {
+                    $res .= 'echo(__($_b_t_s)); ';
+                } else {
+                    $res .= 'echo(Pluf_Translation::sprintf(__($_b_t_s), array(';
+                    $_tmp = array();
+                    foreach ($this->_transStack as $key=>$_trans) {
+                        $_tmp[] = '\''.addslashes($key).'\' => Pluf_Template_safeEcho('.$_trans.', false)';
+                    }
+                    $res .= implode(', ', $_tmp);
+                    unset($_trans, $_tmp);
+                    $res .= '))); ';
+                    $this->_transStack = array();
+                }
+            }
+            $this->_transPlural = false;
+            array_pop($this->_blockStack);
+            break;
+        case 'plural':
+            $res = '$_b_t_s=ob_get_contents(); ob_end_clean(); ob_start(); ';
+            break;
+        case 'include':
+            // XXX fixme: Will need some security check, when online editing.
+            $argfct = preg_replace('!^[\'"](.*)[\'"]$!', '$1', $args);
+            $_comp = new Pluf_Template_Compiler($argfct, $this->templateFolders);
+            $res = $_comp->compile();
+            $this->updateModifierStack($_comp);
+            break;
+        default:
+            $_end = false;
+            $oname = $name;
+            if (substr($name, 0, 1) == '/') {
+                $_end = true;
+                $name = substr($name, 1);
+            }
+            // Here we should allow custom blocks.
+            
+            // Here we start the template tag calls at the template tag
+            // {tag ...} is not a block, so it must be a function.
+            if (!isset($this->_allowedTags[$name])) {
+                trigger_error(sprintf(__('The function tag "%s" is not allowed.'), $name), E_USER_ERROR);
+            }
+            $argfct = $this->_parseFinal($args, $this->_allowedAssign);
+            // $argfct is a string that can be copy/pasted in the PHP code
+            // but we need the array of args.
+            $res = '';
+            if (isset($this->_extraTags[$name])) {
+                if (false == $_end) {
+                    if (method_exists($this->_extraTags[$name], 'start')) {
+                        $res .= '$_extra_tag = Pluf::factory(\''.$this->_allowedTags[$name].'\', $t); $_extra_tag->start('.$argfct.'); ';
+                    }
+                    if (method_exists($this->_extraTags[$name], 'genStart')) {
+                        $res .= $this->_extraTags[$name]->genStart();
+                    }
+                } else {
+                    if (method_exists($this->_extraTags[$name], 'end')) {
+                        $res .= '$_extra_tag = Pluf::factory(\''.$this->_allowedTags[$name].'\', $t); $_extra_tag->end('.$argfct.'); ';
+                    }
+                    if (method_exists($this->_extraTags[$name], 'genEnd')) {
+                        $res .= $this->_extraTags[$name]->genEnd();
+                    }
+                }
+            }
+            if ($res == '') {
+                trigger_error(sprintf(__('The function tag "{%s ...}" is not supported.'), $oname), E_USER_ERROR);
+            }
+        }
+        return $res;
+    }
+
+    /*
+
+    -------
+    if:        op, autre, var
+    foreach:   T_AS, T_DOUBLE_ARROW, T_VARIABLE, @locale@
+    for:       autre, fin_instruction
+    while:     op, autre, var
+    assign:    T_VARIABLE puis assign puis autre, ponctuation, T_STRING
+    echo:      T_VARIABLE/@locale@ puis autre + ponctuation
+    modificateur: serie de autre séparé par une virgule
+
+    tous : T_VARIABLE, @locale@
+
+    */
+
+    function _parseFinal($string, $allowed=array(), 
+                         $exceptchar=array(';'), $getAsArray=false)
+    {
+        $tokens = token_get_all('<?php '.$string.'?>');
+        $result = '';
+        $first = true;
+        $inDot = false;
+        $firstok = array_shift($tokens);
+        $afterAs = false;
+        $f_key = '';
+        $f_val = '';
+        $results = array();
+
+        // il y a un bug, parfois le premier token n'est pas T_OPEN_TAG...
+        if ($firstok == '<' && $tokens[0] == '?' && is_array($tokens[1])
+            && $tokens[1][0] == T_STRING && $tokens[1][1] == 'php') {
+            array_shift($tokens);
+            array_shift($tokens);
+        }
+        foreach ($tokens as $tok) {
+            if (is_array($tok)) {
+                list($type, $str) = $tok;
+                $first = false;
+                if($type == T_CLOSE_TAG){
+                    continue;
+                }
+                if ($type == T_AS) {
+                    $afterAs = true;
+                }
+                if ($type == T_STRING && $inDot) {
+                    $result .= $str;
+                } elseif ($type == T_VARIABLE) {
+                    $result .= '$t->_vars[\''.substr($str, 1).'\']';
+                } elseif ($type == T_WHITESPACE || in_array($type, $allowed)) {
+                    $result .= $str;
+                } else {
+                    trigger_error(sprintf(__('Invalid syntax: (%s) %s.'), $this->_currentTag, $str.' tokens'.var_export($tokens, true)), E_USER_ERROR);
+                    return '';
+                }
+            } else {
+                if (in_array($tok, $exceptchar)) {
+                    trigger_error(sprintf(__('Invalid character: (%s) %s.'), $this->_currentTag, $tok), E_USER_ERROR);
+                } elseif ($tok == '.') {
+                    $inDot = true;
+                    $result .= '->';
+                } elseif ($tok == '~') {
+                    $result .= '.';
+                } elseif ($tok =='[') {
+                    $result.=$tok;
+                } elseif ($tok ==']') {
+                    $result.=$tok;
+                } elseif ($getAsArray && $tok == ',') {
+                    $results[]=$result;
+                    $result='';
+                } else {
+                    $result .= $tok;
+                }
+                $first = false;
+            }
+        }
+        if (!$getAsArray) {
+            return $result;
+        } else {
+            if ($result != '') {
+                $results[] = $result;
+            }
+            return $results;
+        }
+    }
+
+    /**
+     * Update the current stack of modifiers from another compiler.
+     */
+    protected function updateModifierStack($compiler)
+    {
+        foreach ($compiler->_usedModifiers as $_um) {
+            if (!in_array($_um, $this->_usedModifiers)) {
+                $this->_usedModifiers[] = $_um;
+            }
+        }
+    }
+}
+
diff --git a/src/Pluf/Template/Context.php b/src/Pluf/Template/Context.php
new file mode 100644
index 0000000..a5371f4
--- /dev/null
+++ b/src/Pluf/Template/Context.php
@@ -0,0 +1,48 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Class storing the data that are then used in the template.
+ */
+class Pluf_Template_Context 
+{
+    public $_vars;
+
+    function __construct($vars=array())
+    {
+        $this->_vars = new Pluf_Template_ContextVars($vars);
+    }
+
+    function get($var)
+    {
+        if (isset($this->_vars[$var])) {
+            return $this->_vars[$var];
+        }
+        return '';
+    }
+
+    function set($var, $value)
+    {
+        $this->_vars[$var] = $value;
+    }
+}
diff --git a/src/Pluf/Template/Context/Request.php b/src/Pluf/Template/Context/Request.php
new file mode 100644
index 0000000..4721ccc
--- /dev/null
+++ b/src/Pluf/Template/Context/Request.php
@@ -0,0 +1,65 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Class storing the data that are then used in the template.
+ *
+ * This class automatically set the 'request' key with the current
+ * request and use and add more keys based on the processors.
+ */
+class Pluf_Template_Context_Request extends Pluf_Template_Context
+{
+    function __construct($request, $vars=array())
+    {
+        $vars = array_merge(array('request' => $request), $vars);
+        foreach (Pluf::f('template_context_processors', array()) as $proc) {
+            Pluf::loadFunction($proc);
+            $vars = array_merge($proc($request), $vars); 
+        }
+        $params = array('request' => $request,
+                        'context' => $vars);
+        /**
+         * [signal]
+         *
+         * Pluf_Template_Context_Request::construct
+         *
+         * [sender]
+         *
+         * Pluf_Template_Context_Request
+         *
+         * [description]
+         *
+         * This signal allows an application to dynamically modify the
+         * context array.
+         *
+         * [parameters]
+         *
+         * array('request' => $request,
+         *       'context' => array());
+         *
+         */
+        Pluf_Signal::send('Pluf_Template_Context_Request::construct', 
+                          'Pluf_Template_Context_Request', $params);
+        $this->_vars = new Pluf_Template_ContextVars($params['context']);
+    }
+}
diff --git a/src/Pluf/Template/ContextVars.php b/src/Pluf/Template/ContextVars.php
new file mode 100644
index 0000000..29dc6f4
--- /dev/null
+++ b/src/Pluf/Template/ContextVars.php
@@ -0,0 +1,50 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Special array where the keyed indexes can be accessed as properties.
+ */
+class Pluf_Template_ContextVars extends ArrayObject
+{
+    function offsetGet($prop)
+    {
+        if (!$this->offsetExists($prop)) {
+            return '';
+        }
+        return parent::offsetGet($prop);
+    }
+
+    function __get($prop)
+    {
+        if (isset($this->$prop)) {
+            return $this->$prop;
+        } else {
+            return $this->offsetGet($prop);
+        }
+    }
+
+    function __toString()
+    {
+        return var_export($this, true);
+    }
+}
diff --git a/src/Pluf/Template/SafeString.php b/src/Pluf/Template/SafeString.php
new file mode 100644
index 0000000..df4fcac
--- /dev/null
+++ b/src/Pluf/Template/SafeString.php
@@ -0,0 +1,49 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * A string already escaped to display in a template.
+ */
+class Pluf_Template_SafeString
+{
+    public $value = '';
+
+    function __construct($mixed, $safe=false)
+    {
+        if (is_object($mixed) and 'Pluf_Template_SafeString' == get_class($mixed)) {
+            $this->value = $mixed->value;
+        } else {
+            $this->value = ($safe) ? $mixed : htmlspecialchars($mixed, ENT_COMPAT, 'UTF-8');
+        }
+    }
+
+    function __toString()
+    {
+        return $this->value;
+    }
+
+    public static function markSafe($string)
+    {
+        return new Pluf_Template_SafeString($string, true);
+    }
+}
\ No newline at end of file
diff --git a/src/Pluf/Template/Tag.php b/src/Pluf/Template/Tag.php
new file mode 100644
index 0000000..eb544b1
--- /dev/null
+++ b/src/Pluf/Template/Tag.php
@@ -0,0 +1,37 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_Template_Tag
+{
+    protected $context;
+    
+    /**
+     * Constructor.
+     *
+     * @param Context Context object (null)
+     */
+    function __construct($context=null)
+    {
+        $this->context = $context;
+    }
+}
diff --git a/src/Pluf/Template/Tag/Cfg.php b/src/Pluf/Template/Tag/Cfg.php
new file mode 100644
index 0000000..63b7de8
--- /dev/null
+++ b/src/Pluf/Template/Tag/Cfg.php
@@ -0,0 +1,51 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Display a configuration variable.
+ *
+ * It filter to prevent some configuration variables to be displayed.
+ *
+ */
+class Pluf_Template_Tag_Cfg extends Pluf_Template_Tag
+{
+    /**
+     * Display the configuration variable.
+     * 
+     * @param string Configuration variable.
+     * @param mixed Default value to return display ('').
+     * @param bool Display the value (true).
+     * @param string Prefix to set to the variable if not displayed ('cfg_').
+     */
+    function start($cfg, $default='', $display=true, $prefix='cfg_')
+    {
+        if ($cfg != 'secret_key'
+            or 0 !== strpos($cfg, 'db_')) {
+            if ($display) {
+                echo Pluf::f($cfg, $default);
+            } else {
+                $this->context->set($prefix.$cfg, Pluf::f($cfg, $default));
+            }
+        }
+    }
+}
diff --git a/src/Pluf/Template/Tag/MediaUrl.php b/src/Pluf/Template/Tag/MediaUrl.php
new file mode 100644
index 0000000..41acaf1
--- /dev/null
+++ b/src/Pluf/Template/Tag/MediaUrl.php
@@ -0,0 +1,41 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_Template_Tag_MediaUrl extends Pluf_Template_Tag
+{
+    function start($file='')
+    {
+        echo Pluf_Template_Tag_MediaUrl::url($file);
+    }
+
+    public static function url($file='')
+    {
+        if ($file !== '' && Pluf::f('last_update_file', false) &&
+            false !== ($last_update = Pluf::fileExists(Pluf::f('last_update_file')))
+            ) {
+            $file = $file.'?'.substr(md5(filemtime($last_update)), 0, 5);
+        }
+        return Pluf::f('url_media', Pluf::f('app_base').'/media').$file;
+    }
+}
+
diff --git a/src/Pluf/Template/Tag/Messages.php b/src/Pluf/Template/Tag/Messages.php
new file mode 100644
index 0000000..f524163
--- /dev/null
+++ b/src/Pluf/Template/Tag/Messages.php
@@ -0,0 +1,42 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Display the messages for the current user.
+ */
+class Pluf_Template_Tag_Messages extends Pluf_Template_Tag
+{
+    function start($user)
+    {
+        if (is_object($user) && !$user->isAnonymous()) {
+            $messages = $user->getAndDeleteMessages();
+            if (count($messages) > 0) {
+                echo '<div class="user-messages">'."\n".'<ul>'."\n";
+                foreach ($messages as $m) {
+                    echo '<li>'.$m.'</li>';
+                }
+                echo '</ul></div>';
+            }
+        }
+    }
+}
diff --git a/src/Pluf/Template/Tag/Mytag.php b/src/Pluf/Template/Tag/Mytag.php
new file mode 100644
index 0000000..98ffec9
--- /dev/null
+++ b/src/Pluf/Template/Tag/Mytag.php
@@ -0,0 +1,89 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Custom tag example.
+ */
+class Pluf_Template_Tag_Mytag extends Pluf_Template_Tag
+{
+    /**
+     * Perform some operations at the opening of the
+     * tag {mytag 'param1', 'param2'}.
+     *
+     * You can access the template context through 
+     * $this->context
+     */
+    function start($param1, $param2)
+    {
+        echo 'start of tag mytag:<br />';
+        echo '$this->context[mytag]: '
+            .$this->context->get('mytag').'<br />';
+    }
+ 
+    /**
+     * Generate some valid PHP code to be put in the template.
+     *
+     * The code generated by this function is included in the
+     * template just after the call to $this->start() if the start()
+     * method is implemented.
+     *
+     * You cannot access the template context but you can write
+     * code that is modifying it through $t
+     */
+    function genStart()
+    {
+        return '$t->set(\'mytag\', \'hello world!\');';
+    }
+ 
+    /**
+     * Perform some operations at the closing of the
+     * tag {/mytag 'param1'}.
+     *
+     * You can access the template context through 
+     * $this->context
+     */
+    function end($param1)
+    {
+        echo 'end of tag mytag:<br />';
+        echo '$this->context[mytag]: '
+            .$this->context->get('mytag').'<br />';
+    }
+
+    /**
+     * Generate some valid PHP code to be put in the template.
+     *
+     * The code generated by this function is included in the
+     * template just after the call to $this->end() if the end()
+     * method is implemented.
+     *
+     * You cannot access the template context but you can write
+     * code that is modifying it through $t
+     */
+
+    function genEnd()
+    {
+        // Cleaning :)
+        return '$t->set(\'mytag\', \'\');';
+    }
+
+}
diff --git a/src/Pluf/Template/Tag/RmediaUrl.php b/src/Pluf/Template/Tag/RmediaUrl.php
new file mode 100644
index 0000000..43d2dff
--- /dev/null
+++ b/src/Pluf/Template/Tag/RmediaUrl.php
@@ -0,0 +1,18 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of ConfOrganizer, a conference manager application.
+# Copyright (C) 2006 Loic d'Anterroches.
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_Template_Tag_RmediaUrl extends Pluf_Template_Tag
+{
+    function start($var, $file='')
+    {
+        $this->context->set($var,
+                            Pluf_Template_Tag_MediaUrl::url($file));
+    }
+}
+
diff --git a/src/Pluf/Template/Tag/Rurl.php b/src/Pluf/Template/Tag/Rurl.php
new file mode 100644
index 0000000..e441c19
--- /dev/null
+++ b/src/Pluf/Template/Tag/Rurl.php
@@ -0,0 +1,36 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+Pluf::loadFunction('Pluf_HTTP_URL_urlForView');
+
+/**
+ * Assign the url to a template variable.
+ */
+class Pluf_Template_Tag_Rurl extends Pluf_Template_Tag
+{
+    function start($var, $view, $params=array(), $get_params=array())
+    {
+        $this->context->set($var,
+                            Pluf_HTTP_URL_urlForView($view, $params, $get_params));
+    }
+}
diff --git a/src/Pluf/Template/Tag/Url.php b/src/Pluf/Template/Tag/Url.php
new file mode 100644
index 0000000..46b9511
--- /dev/null
+++ b/src/Pluf/Template/Tag/Url.php
@@ -0,0 +1,32 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+Pluf::loadFunction('Pluf_HTTP_URL_urlForView');
+
+class Pluf_Template_Tag_Url extends Pluf_Template_Tag
+{
+    function start($view, $params=array(), $get_params=array())
+    {
+        echo Pluf_HTTP_URL_urlForView($view, $params, $get_params);
+    }
+}
diff --git a/src/Pluf/Test/Client.php b/src/Pluf/Test/Client.php
new file mode 100644
index 0000000..8bd6aee
--- /dev/null
+++ b/src/Pluf/Test/Client.php
@@ -0,0 +1,137 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Emulates a client to call your views during unit testing.
+ * 
+ * Usage:
+ * <code>
+ * $client = new Pluf_Test_Client('./path/to/app-views.php');
+ * $response = $client->get('/the/page/', array('var'=>'toto'));
+ * $response is now the Pluf_HTTP_Response
+ * </code>
+ *
+ */
+class Pluf_Test_Client
+{
+    public $views = '';
+    public $dispatcher = '';
+    public $cookies = array();
+
+    public function __construct($views)
+    {
+        $this->views = $views;
+        $this->dispatcher = new Pluf_Dispatcher();
+        $this->dispatcher->loadControllers($this->views);
+        $this->clean(false);
+    }
+
+    protected function clean($keepcookies=true)
+    {
+        $_REQUEST = array();
+        if (!$keepcookies) {
+            $_COOKIE = array();
+            $this->cookies = array();
+        }
+        $_SERVER = array();
+        $_GET = array();
+        $_POST = array();
+        $_FILES = array();
+        $_SERVER['REQUEST_METHOD'] = '';
+        $_SERVER['REQUEST_URI'] = '';
+        $_SERVER['REMOTE_ADDR'] = '127.0.0.1';
+        $_SERVER['HTTP_HOST'] = 'localhost';
+    }
+
+    protected function dispatch($page)
+    {
+        $GLOBALS['_PX_tests_templates'] = array();
+        $_SERVER['REQUEST_URI'] = $page;
+        foreach ($this->cookies as $cookie => $data) {
+            $_COOKIE[$cookie] = $data;
+        }
+        ob_implicit_flush(False);
+        list($request, $response) = $this->dispatcher->dispatch($page);
+        ob_start();
+        $response->render();
+        $content = ob_get_contents(); 
+        ob_end_clean();
+        $response->content = $content;
+        $response->request = $request;
+        if (isset($GLOBALS['_PX_tests_templates'])) {
+            if (count($GLOBALS['_PX_tests_templates']) == 1) {
+                $response->template = $GLOBALS['_PX_tests_templates'][0];
+            } else {
+                $response->template = $GLOBALS['_PX_tests_templates'];
+            }
+        }
+        foreach ($response->cookies as $cookie => $data) {
+            $_COOKIE[$cookie] = $data;
+            $this->cookies[$cookie] = $data;
+        }
+        return $response;
+    }
+
+    public function get($page, $params=array()) 
+    {
+        $this->clean();
+        $_GET = $params;
+        $_REQUEST = $params;
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+        $response = $this->dispatch($page);
+        $code = $response->status_code;
+        if ($code == 302) {
+            list($page, $params) = $this->parseRedirect($response->headers['Location']);
+            $response = $this->get($page, $params);
+        }
+        return $response;
+    }
+
+
+    public function post($page, $params=array(), $files=array()) 
+    {
+        $this->clean();
+        $_POST = $params;
+        $_REQUEST = $params;
+        $_FILES = $files; //FIXME need to match the correct array structure
+        $_SERVER['REQUEST_METHOD'] = 'POST';
+        $response = $this->dispatch($page);
+        if ($response->status_code == 302) {
+            list($page, $params) = $this->parseRedirect($response->headers['Location']);
+            return $this->get($page, $params);
+        }
+        return $response;
+    }
+
+    public function parseRedirect($location)
+    {
+        $page = parse_url($location, PHP_URL_PATH);
+        $query = parse_url($location, PHP_URL_QUERY);
+        $params = array();
+        if (strlen($query)) {
+            parse_str($query, $params);
+        }
+        return array($page, $params);
+    }
+}
+
diff --git a/src/Pluf/Test/Fixture.php b/src/Pluf/Test/Fixture.php
new file mode 100644
index 0000000..209bbcc
--- /dev/null
+++ b/src/Pluf/Test/Fixture.php
@@ -0,0 +1,101 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+
+/**
+ * The fixture class is used to prepopulate your database with data.
+ *
+ * Load a fixture file in the database:
+ * array = Pluf_Test_Fixture::load('fixturefile.json');
+ *
+ * Dump the data of a model as a fixture string:
+ * $json = Pluf_Test_Fixture::dump('YourApp_Model'); // the full table
+ * $json = Pluf_Test_Fixture::dump($model); // one given model
+ *
+ */
+class Pluf_Test_Fixture
+{
+    public static function loadFile($file)
+    {
+        if (false === ($ffile=Pluf::fileExists($file))) {
+            throw new Exception(sprintf(__('Fixture file not found: %s.'), $file));
+        }
+        $json = file_get_contents($ffile);
+        return self::load($json);
+    }
+
+
+    public static function load($json)
+    {
+        $created = array();
+        $data = json_decode($json, true);
+        foreach ($data as $model) {
+            if ((int)$model['pk'] > 0) {
+                $item = new $model['model']($model['pk']);
+                if ($item->id == $model['pk']) {
+                    throw new Exception(sprintf(__('Cannot load existing model <%1$s(%2$s)>.'), $model['model'], $model['pk']));
+                }
+            }
+            $m = new $model['model']();
+            $m->setFromFormData($model['fields']);
+            $m->create(true); // we force the id
+            $created[] = array($model['model'], $model['pk']);
+        }
+        return $created;
+    }
+
+    public static function dump($model)
+    {
+        if (is_object($model)) {
+            return json_encode(array(self::prepare($model)));
+        }
+        $out = array();
+        foreach (Pluf::factory($model)->getList() as $item) {
+            $out[] = self::prepare($item);
+        }
+        return json_encode($out);
+    }
+
+    /**
+     * Return an array, ready to be serialized as json.
+     */
+    public static function prepare($model)
+    {
+        $out = array('model' =>  $model->_a['model'],
+                     'pk' => $model->id,
+                     'fields' => array());
+        foreach ($model->_a['cols'] as $col=>$val) {
+            $field = new $val['type']();
+            if ($field->type != 'manytomany') {
+                $out['fields'][$col] = $model->$col;
+            } else {
+                $func = 'get_'.$col.'_list';
+                $out['fields'][$col] = array();
+                foreach ($model->$func() as $item) {
+                    $out['fields'][$col][] = $item->id;
+                }
+            }
+        }
+        return $out;
+    }
+}
\ No newline at end of file
diff --git a/src/Pluf/Tests/Fixture/LoadDump.php b/src/Pluf/Tests/Fixture/LoadDump.php
new file mode 100644
index 0000000..b0cfe92
--- /dev/null
+++ b/src/Pluf/Tests/Fixture/LoadDump.php
@@ -0,0 +1,71 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_Tests_Fixture_LoadDump extends UnitTestCase {
+ 
+    function __construct() 
+    {
+        parent::__construct('Test fixture load/dump.');
+    }
+
+    function setUp()
+    {
+        $db = Pluf::db();
+        $schema = Pluf::factory('Pluf_DB_Schema', $db);
+        $m = new Pluf_Permission();
+        $schema->model = $m;
+        $schema->dropTables();
+        $schema->createTables();
+    }
+
+    function tearDown()
+    {
+        $db = Pluf::db();
+        $schema = Pluf::factory('Pluf_DB_Schema', $db);
+        $m = new Pluf_Permission();
+        $schema->model = $m;
+        $schema->dropTables();
+    }
+
+
+    function testDump()
+    {
+        $p = new Pluf_Permission();
+        $p->name = 'test permission';
+        $p->code_name = 'test';
+        $p->description = 'Simple test permission.';
+        $p->application = 'Pluf';
+        $p->create();
+        $json = Pluf_Test_Fixture::dump('Pluf_Permission');
+        $this->assertEqual('[{"model":"Pluf_Permission","pk":1,"fields":{"id":1,"name":"test permission","code_name":"test","description":"Simple test permission.","application":"Pluf"}}]',
+                            $json);
+    }
+
+    function testLoad()
+    {
+        $created = Pluf_Test_Fixture::load('[{"model":"Pluf_Permission","pk":1,"fields":{"id":1,"name":"test permission","code_name":"test","description":"Simple test permission.","application":"Pluf"}}]');
+        $this->assertEqual(array(array('Pluf_Permission', '1')), $created);
+        $p = new Pluf_Permission(1);
+        $this->assertEqual(1, $p->id);        
+    }
+}
\ No newline at end of file
diff --git a/src/Pluf/Tests/TemplateCompiler/BlockTrans.php b/src/Pluf/Tests/TemplateCompiler/BlockTrans.php
new file mode 100644
index 0000000..54f099d
--- /dev/null
+++ b/src/Pluf/Tests/TemplateCompiler/BlockTrans.php
@@ -0,0 +1,39 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_Tests_TemplateCompiler_BlockTrans extends UnitTestCase {
+ 
+    function __construct() 
+    {
+        parent::__construct('Test the compilation of a template.');
+    }
+
+    function testCompileSimpleBlock()
+    {
+        $block = '<li>{blocktrans}This email <em>{$email}</em> is already registered. If you forgot your password, you can recover it easily.{/blocktrans}</li>';
+        $compiler = new Pluf_Template_Compiler('dummy', array(), false);
+        $compiler->templateContent = $block;
+        $this->assertEqual('<li><?php ob_start(); ?>This email <em>%%email%%</em> is already registered. If you forgot your password, you can recover it easily.<?php $_b_t_s=ob_get_contents(); ob_end_clean(); echo(Pluf_Translation::sprintf(__($_b_t_s), array(\'email\' => Pluf_Template_safeEcho($t->_vars[\'email\'], false)))); ?></li>',
+                           $compiler->getCompiledTemplate());
+    }
+}
\ No newline at end of file
diff --git a/src/Pluf/Tests/Text/Lang.php b/src/Pluf/Tests/Text/Lang.php
new file mode 100644
index 0000000..4722cc8
--- /dev/null
+++ b/src/Pluf/Tests/Text/Lang.php
@@ -0,0 +1,46 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_Tests_Text_Lang extends UnitTestCase {
+ 
+    function __construct() 
+    {
+        parent::__construct('Test the language detection.');
+    }
+
+    function testNGrams()
+    {
+        $n = Pluf_Text_Lang::docNgrams('test the language detection with a simple string this file is part of plume framework a simple php application framework');
+        $this->assertEqual(count($n), 128);
+    }
+
+    function testNGramsDist()
+    {
+        $n1 = Pluf_Text_Lang::docNgrams('test the language detection with a simple string this file is part of plume framework a simple php application framework');
+        $n2 = Pluf_Text_Lang::docNgrams('teste la detection de la langue avec une simple chaine ce fichier fait partie de plume framework un framework simple de developpement d applications en php');
+        $n3 = Pluf_Text_Lang::docNgrams('test the this file is part of plume framework a simple php application framework language detection with a simple string');
+        $this->assertEqual(0, Pluf_Text_Lang::ngramDistance($n1, $n3));
+        $this->assertEqual(Pluf_Text_Lang::ngramDistance($n1, $n2),
+                           Pluf_Text_Lang::ngramDistance($n3, $n2));
+    }
+}
\ No newline at end of file
diff --git a/src/Pluf/Text.php b/src/Pluf/Text.php
new file mode 100644
index 0000000..1551a59
--- /dev/null
+++ b/src/Pluf/Text.php
@@ -0,0 +1,218 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Utility class to clean/manipulate strings. 
+ */
+
+class Pluf_Text
+{
+    /**
+     * Given a string, cleaned from the not interesting characters,
+     * returns an array with the words as index and the number of
+     * times it was in the text as the value.
+     *
+     * @credits Tokenizer of DokuWiki to handle Thai and CJK words.
+     *          http://www.splitbrain.org/projects/dokuwiki
+     *
+     * @param string Cleaned, lowercased and utf-8 encoded string.
+     * @param bool Remove the accents (True)
+     * @return array Word and number of occurences.
+     */
+    public static function tokenize($string, $remove_accents=True)
+    {
+        if ($remove_accents) {
+            $string = self::removeAccents($string);
+        }
+        $asian1 = '[\x{0E00}-\x{0E7F}]'; // Thai
+        $asian2 = '['.
+                   '\x{2E80}-\x{3040}'.  // CJK -> Hangul
+                   '\x{309D}-\x{30A0}'.
+                   '\x{30FD}-\x{31EF}\x{3200}-\x{D7AF}'.
+                   '\x{F900}-\x{FAFF}'.  // CJK Compatibility Ideographs
+                   '\x{FE30}-\x{FE4F}'.  // CJK Compatibility Forms
+                   ']';
+        $asian3 = '['. // Hiragana/Katakana (can be two characters)
+                   '\x{3042}\x{3044}\x{3046}\x{3048}'.
+                   '\x{304A}-\x{3062}\x{3064}-\x{3082}'.
+                   '\x{3084}\x{3086}\x{3088}-\x{308D}'.
+                   '\x{308F}-\x{3094}'.
+                   '\x{30A2}\x{30A4}\x{30A6}\x{30A8}'.
+                   '\x{30AA}-\x{30C2}\x{30C4}-\x{30E2}'.
+                   '\x{30E4}\x{30E6}\x{30E8}-\x{30ED}'.
+                   '\x{30EF}-\x{30F4}\x{30F7}-\x{30FA}'.
+                   ']['.
+                   '\x{3041}\x{3043}\x{3045}\x{3047}\x{3049}'.
+                   '\x{3063}\x{3083}\x{3085}\x{3087}\x{308E}\x{3095}-\x{309C}'.
+                   '\x{30A1}\x{30A3}\x{30A5}\x{30A7}\x{30A9}'.
+                   '\x{30C3}\x{30E3}\x{30E5}\x{30E7}\x{30EE}\x{30F5}\x{30F6}\x{30FB}\x{30FC}'.
+                   '\x{31F0}-\x{31FF}'.
+                   ']?';
+        $asian = '(?:'.$asian1.'|'.$asian2.'|'.$asian3.')';
+        $words = array();
+        // handle asian chars as single words.
+        $asia = @preg_replace('/('.$asian.')/u',' \1 ',$string);
+        if (!is_null($asia)) {
+            //will not be called if regexp failure
+            $string = $asia;
+        }
+        $arr = preg_split('/\s+/', $string, -1, PREG_SPLIT_NO_EMPTY);
+        foreach ($arr as $w) {
+            $w = trim($w);
+            if (isset($words[$w])) {
+                $words[$w]++;
+            } else {
+                $words[$w] = 1;
+            }
+        }
+        return $words;
+    }
+
+    /**
+     * Clean a string from the HTML and the unnecessary
+     * punctuation. Convert the string to lowercase.
+     *
+     * @info Require mbstring extension.
+     *
+     * @param string String.
+     * @return string Cleaned lowercase string.
+     */
+    public static function cleanString($string)
+    {
+        $string = html_entity_decode($string, ENT_QUOTES, 'utf-8');
+        $string = str_replace('<?php', '', $string);
+        $string = strip_tags($string);
+        $string = strtr($string, "\r\n\t", '   ');
+        $string = strtr($string, 
+                        '.<>,;:(){}[]\\|*@!?^_=/\'~`%$#',
+                        '                            ');
+        return mb_strtolower($string, 'UTF-8');
+    }
+
+    /**
+     * Remove the accentuated characters.
+     *
+     * Requires a string in lowercase, the removal is not perfect but
+     * is better than nothing.
+     *
+     * @param string Lowercased string in utf-8.
+     * @return string String with some of the accents removed.
+     */
+    public static function removeAccents($string)
+    {
+        $map = array(
+                     'Ă '=>'a', 'Ă´'=>'o', 'Ä�'=>'d', 'ḟ'=>'f', 'Ă«'=>'e',
+                     'Å¡'=>'s', 'Æ¡'=>'o', 'ĂŸ'=>'ss', 'ă'=>'a', 'Å™'=>'r', 
+                     'ț'=>'t', 'ň'=>'n', '�'=>'a', 'ķ'=>'k', '�'=>'s', 
+                     'ỳ'=>'y', 'ņ'=>'n', 'ĺ'=>'l', 'ħ'=>'h', 'ṗ'=>'p', 
+                     'Ă³'=>'o', 'Ăº'=>'u', 'Ä›'=>'e', 'Ă©'=>'e', 'ç'=>'c',
+                     'áº�'=>'w', 'Ä‹'=>'c', 'õ'=>'o', 'ṡ'=>'s', 'ø'=>'o', 
+                     'ģ'=>'g', 'ŧ'=>'t', 'ș'=>'s', 'ė'=>'e', 'ĉ'=>'c',
+                     'Å›'=>'s', 'Ă®'=>'i', 'ű'=>'u', 'ć'=>'c', 'Ä™'=>'e', 
+                     'ŵ'=>'w', 'ṫ'=>'t', 'Å«'=>'u', 'Ä�'=>'c', 'ö'=>'oe', 
+                     'è'=>'e', 'Å·'=>'y', 'Ä…'=>'a', 'Å‚'=>'l', 'ų'=>'u', 
+                     'ů'=>'u', 'ş'=>'s', 'ğ'=>'g', 'ļ'=>'l', 'ƒ'=>'f', 
+                     'ž'=>'z', 'ẃ'=>'w', 'ḃ'=>'b', 'Ă¥'=>'a', 'ì'=>'i', 
+                     'Ă¯'=>'i', 'ḋ'=>'d', 'Å¥'=>'t', 'Å—'=>'r', 'ä'=>'ae', 
+                     'Ă­'=>'i', 'Å•'=>'r', 'Ăª'=>'e', 'Ă¼'=>'ue', 'Ă²'=>'o',
+                     'Ä“'=>'e', 'ñ'=>'n', 'Å„'=>'n', 'Ä¥'=>'h', 'Ä�'=>'g', 
+                     'Ä‘'=>'d', 'ĵ'=>'j', 'Ă¿'=>'y', 'Å©'=>'u', 'Å­'=>'u', 
+                     'Æ°'=>'u', 'Å£'=>'t', 'Ă½'=>'y', 'Å‘'=>'o', 'Ă¢'=>'a', 
+                     'ľ'=>'l', 'ẅ'=>'w', 'ż'=>'z', 'Ä«'=>'i', 'Ă£'=>'a', 
+                     'Ä¡'=>'g', 'á¹�'=>'m', 'Å�'=>'o', 'Ä©'=>'i', 'Ă¹'=>'u', 
+                     'į'=>'i', 'ź'=>'z', 'Ă¡'=>'a', 'Ă»'=>'u', 'Ă¾'=>'th', 
+                     'ð'=>'dh', 'æ'=>'ae', 'µ'=>'u', 'ĕ'=>'e',
+                     );
+        return strtr($string, $map);
+    }
+
+    /**
+     * Convert a string to a list of characters.
+     *
+     * @param string utf-8 encoded string.
+     * @return array Characters.
+     */
+    public static function stringToChars($string)
+    {
+        $chars = array();
+        $strlen = mb_strlen($string, 'UTF-8');
+        for ($i=0;$i<$strlen;$i++) {
+            $chars[] = mb_substr($string,$i, 1, 'UTF-8');
+        }
+        return $chars;
+    }
+
+    /**
+     * Prevent a string to be all uppercase. 
+     *
+     * If more than 50% of the words in the string are uppercases and
+     * if the string contains more than one word, the string is
+     * converted using the mb_convert_case.
+     *
+     * @see http://www.php.net/mb_convert_case
+     *
+     * @param string String to test.
+     * @param int Mode to convert the string (MB_CASE_TITLE)
+     * @return string Cleaned string.
+     */
+    public static function preventUpperCase($string, $mode=MB_CASE_TITLE)
+    {
+        $elts = mb_split(' ', $string);
+        $n_elts = count($elts);
+        if ($n_elts > 1) {
+            $tot = 0;
+            foreach ($elts as $elt) {
+                if ($elt == '') {
+                    $n_elts--;
+                    continue;
+                }
+                if ($elt == mb_strtoupper($elt, 'UTF-8')) {
+                    $tot++;
+                }
+            }
+            if ( (float) $tot / (float) $n_elts >= 0.5) {
+                return mb_convert_case(mb_strtolower($string, 'UTF-8'), 
+                                       $mode, 'UTF-8');
+            }
+        }
+        return $string;
+    }
+
+    /**
+     * Simple uppercase prevention.
+     *
+     * Contrary to self::preventUpperCase, this method will also
+     * prevent a single word to be uppercase.
+     *
+     * @param string String possibly in uppercase.
+     * @param int Mode to convert the string (MB_CASE_TITLE)
+     * @return string Mode cased if all uppercase in input.
+     */
+    public static function simplePreventUpperCase($string, $mode=MB_CASE_TITLE)
+    {
+        if ($string == mb_strtoupper($string)) {
+            return mb_convert_case(mb_strtolower($string), $mode, 'UTF-8');
+        }
+        return $string;
+    }
+}
diff --git a/src/Pluf/Text/HTML/Filter.php b/src/Pluf/Text/HTML/Filter.php
new file mode 100644
index 0000000..e934015
--- /dev/null
+++ b/src/Pluf/Text/HTML/Filter.php
@@ -0,0 +1,374 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * A PHP HTML filtering library
+ *
+ * lib_filter.php,v 1.15 2006/09/28 22:44:31 cal
+ *
+ * http://iamcal.com/publish/articles/php/processing_html/
+ * http://iamcal.com/publish/articles/php/processing_html_part_2/
+ *
+ * By Cal Henderson <cal@iamcal.com> 
+ *
+ * This code is licensed under a Creative Commons
+ * Attribution-ShareAlike 2.5 License
+ * http://creativecommons.org/licenses/by-sa/2.5/
+ *
+ * Thanks to Jang Kim for adding support for single quoted attributes.
+ *
+ * TODO: Add HTML check from: 
+ *  http://simonwillison.net/2003/Feb/23/safeHtmlChecker/
+ */
+class Pluf_Text_HTML_Filter 
+{
+    public $tag_counts = array();
+
+    /**
+     * tags and attributes that are allowed
+     */
+    public $allowed = array(
+                            'a' => array('href', 'target'),
+                            'b' => array(),
+                            'img' => array('src', 'width', 'height', 'alt'),
+                            );
+
+    /**
+     * tags which should always be self-closing (e.g. "<img />")
+     */
+    public $no_close = array(
+                             'img',
+                             );
+
+    /**
+     * tags which must always have seperate opening and closing tags
+     * (e.g. "<b></b>")
+     */
+    public $always_close = array(
+                                 'a',
+                                 'b',
+                                 );
+
+    /**
+     * attributes which should be checked for valid protocols
+     */
+    public $protocol_attributes = array(
+                                        'src',
+                                        'href',
+                                        );
+
+    /**
+     * protocols which are allowed
+     */
+    public $allowed_protocols = array(
+                                      'http',
+                                      'ftp',
+                                      'mailto',
+                                      );
+
+    /**
+     * tags which should be removed if they contain no content
+     * (e.g. "<b></b>" or "<b />")
+     */
+    public $remove_blanks = array(
+                                  'a',
+                                  'b',
+                                  );
+
+    /**
+     * should we remove comments?
+     */
+    public $strip_comments = 1;
+
+    /**
+     * should we try and make a b tag out of "b>"
+     */
+    public $always_make_tags = 0;
+
+    /**
+     * entity control options
+     */
+    public $allow_numbered_entities = 1;
+
+    public $allowed_entities = array(
+                                     'amp',
+                                     'gt',
+                                     'lt',
+                                     'quot',
+                                     );
+
+
+    function go($data)
+    {
+        $this->tag_counts = array();
+        $data = $this->escape_comments($data);
+        $data = $this->balance_html($data);
+        $data = $this->check_tags($data);
+        $data = $this->process_remove_blanks($data);
+        $data = $this->validate_entities($data);
+        return $data;
+    }
+
+    function escape_comments($data)
+    {
+        $data = preg_replace("/<!--(.*?)-->/se", "'<!--'.HtmlSpecialChars(\$this->StripSingle('\\1')).'-->'", $data);
+        return $data;
+    }
+
+    function balance_html($data)
+    {
+        if ($this->always_make_tags) {
+            // try and form html
+            $data = preg_replace("/>>+/", ">", $data);
+            $data = preg_replace("/<<+/", "<", $data);
+            $data = preg_replace("/^>/", "", $data);
+            $data = preg_replace("/<([^>]*?)(?=<|$)/", "<$1>", $data);
+            $data = preg_replace("/(^|>)([^<]*?)(?=>)/", "$1<$2", $data);
+        } else {
+            // escape stray brackets
+            $data = preg_replace("/<([^>]*?)(?=<|$)/", "&lt;$1", $data);
+            $data = preg_replace("/(^|>)([^<]*?)(?=>)/", "$1$2&gt;<", $data);
+            // the last regexp causes '<>' entities to appear
+            // (we need to do a lookahead assertion so that the last bracket can
+            // be used in the next pass of the regexp)
+            $data = str_replace('<>', '', $data);
+        }
+        //echo "::".HtmlSpecialChars($data)."<br />\n";
+        return $data;
+    }
+
+    function check_tags($data)
+    {
+        $data = preg_replace("/<(.*?)>/se", "\$this->process_tag(\$this->StripSingle('\\1'))",	$data);
+        foreach (array_keys($this->tag_counts) as $tag) {
+            for ($i=0; $i<$this->tag_counts[$tag]; $i++) {
+                $data .= "</$tag>";
+            }
+        }
+        return $data;
+    }
+
+
+
+    function process_tag($data)
+    {
+        // ending tags
+        if (preg_match("/^\/([a-z0-9]+)/si", $data, $matches)) {
+            $name = StrToLower($matches[1]);
+            if (in_array($name, array_keys($this->allowed))) {
+                if (!in_array($name, $this->no_close)) {
+                    if (isset($this->tag_counts[$name]) and $this->tag_counts[$name]) {
+                        $this->tag_counts[$name]--;
+                        return '</'.$name.'>';
+                    }
+                }
+            } else {
+                return '';
+            }
+        }
+        // starting tags
+        if (preg_match("/^([a-z0-9]+)(.*?)(\/?)$/si", $data, $matches)) {
+            $name = StrToLower($matches[1]);
+            $body = $matches[2];
+            $ending = $matches[3];
+            if (in_array($name, array_keys($this->allowed))) {
+                $params = "";
+                preg_match_all("/([a-z0-9]+)=([\"'])(.*?)\\2/si", $body, $matches_2, PREG_SET_ORDER);		// <foo a="b" />
+                preg_match_all("/([a-z0-9]+)(=)([^\"\s']+)/si", $body, $matches_1, PREG_SET_ORDER);		// <foo a=b />
+                preg_match_all("/([a-z0-9]+)=([\"'])([^\"']*?)\s*$/si", $body, $matches_3, PREG_SET_ORDER);	// <foo a="b />
+                $matches = array_merge($matches_1, $matches_2, $matches_3);
+                foreach ($matches as $match) {
+                    $pname = StrToLower($match[1]);
+                    if (in_array($pname, $this->allowed[$name])) {
+                        $value = $match[3];
+                        if (in_array($pname, $this->protocol_attributes)) {
+                            $value = $this->process_param_protocol($value);
+                        }
+                        $params .= " $pname=\"$value\"";
+                    }
+                }
+                if (in_array($name, $this->no_close)) {
+                    $ending = ' /';
+                }
+                if (in_array($name, $this->always_close)) {
+                    $ending = '';
+                }
+                if (!$ending) {
+                    if (isset($this->tag_counts[$name])) {
+                        $this->tag_counts[$name]++;
+                    } else {
+                        $this->tag_counts[$name] = 1;
+                    }
+                }
+                if ($ending) {
+                    $ending = ' /';
+                }
+                return '<'.$name.$params.$ending.'>';
+            } else {
+                return '';
+            }
+        }
+        // comments
+        if (preg_match("/^!--(.*)--$/si", $data)) {
+            if ($this->strip_comments) {
+                return '';
+            } else {
+                return '<'.$data.'>';
+            }
+        }
+        // garbage, ignore it
+        return '';
+    }
+
+    function process_param_protocol($data)
+    {
+        $data = $this->decode_entities($data);
+        if (preg_match("/^([^:]+)\:/si", $data, $matches)) {
+            if (!in_array($matches[1], $this->allowed_protocols)) {
+                $data = '#'.substr($data, strlen($matches[1])+1);
+            }
+        }
+        return $data;
+    }
+
+    function process_remove_blanks($data) 
+    {
+        foreach($this->remove_blanks as $tag) {
+            $data = preg_replace("/<{$tag}(\s[^>]*)?><\\/{$tag}>/", '', $data);
+            $data = preg_replace("/<{$tag}(\s[^>]*)?\\/>/", '', $data);
+        }
+        return $data;
+    }
+
+    function fix_case($data)
+    {
+        $data_notags = Strip_Tags($data);
+        $data_notags = preg_replace('/[^a-zA-Z]/', '', $data_notags);
+        if (strlen($data_notags)<5) {
+            return $data;
+        }
+        if (preg_match('/[a-z]/', $data_notags)) {
+            return $data;
+        }
+        return preg_replace(
+                            "/(>|^)([^<]+?)(<|$)/se",
+                            "\$this->StripSingle('\\1').".
+                            "\$this->fix_case_inner(\$this->StripSingle('\\2')).".
+                            "\$this->StripSingle('\\3')",
+                            $data
+                            );
+    }
+
+    function fix_case_inner($data)
+    {
+        $data = StrToLower($data);
+        $data = preg_replace(
+                             '/(^|[^\w\s\';,\\-])(\s*)([a-z])/e',
+                             "\$this->StripSingle('\\1\\2').StrToUpper(\$this->StripSingle('\\3'))",
+                             $data
+                             );
+        return $data;
+    }
+
+    function validate_entities($data)
+    {
+        // validate entities throughout the string
+        $data = preg_replace(
+                             '!&([^&;]*)(?=(;|&|$))!e',
+                             "\$this->check_entity(\$this->StripSingle('\\1'), \$this->StripSingle('\\2'))",
+                             $data
+                             );
+        // validate quotes outside of tags 
+        $data = preg_replace(
+                             "/(>|^)([^<]+?)(<|$)/se",
+                             "\$this->StripSingle('\\1').".
+                             "str_replace('\"', '&quot;', \$this->StripSingle('\\2')).".
+                             "\$this->StripSingle('\\3')",
+                             $data
+                             );
+        return $data;
+    }
+
+    function check_entity($preamble, $term)
+    {
+        if ($term != ';') {
+            return '&amp;'.$preamble;
+        }
+        if ($this->is_valid_entity($preamble)) {
+            return '&'.$preamble;
+        }
+        return '&amp;'.$preamble;
+    }
+
+    function is_valid_entity($entity)
+    {
+        if (preg_match('!^#([0-9]+)$!i', $entity, $m)) {
+            if ($m[1] > 127) {
+                return 1;
+            }
+            return $this->allow_numbered_entities;
+        }
+        if (in_array($entity, $this->allowed_entities)){
+            return 1;
+        }
+        return 0;
+    }
+
+    // within attributes, we want to convert all hex/dec/url escape
+    // sequences into their raw characters so that we can check we
+    // don't get stray quotes/brackets inside strings
+    function decode_entities($data)
+    {
+        $data = preg_replace_callback('!(&)#(\d+);?!', array($this, 'decode_dec_entity'), $data);
+        $data = preg_replace_callback('!(&)#x([0-9a-f]+);?!i', array($this, 'decode_hex_entity'), $data);
+        $data = preg_replace_callback('!(%)([0-9a-f]{2});?!i', array($this, 'decode_hex_entity'), $data);
+        $data = $this->validate_entities($data);
+        return $data;
+    }
+
+    function decode_hex_entity($m)
+    {
+        return $this->decode_num_entity($m[1], hexdec($m[2]));
+    }
+
+    function decode_dec_entity($m)
+    {
+        return $this->decode_num_entity($m[1], intval($m[2]));
+    }
+
+    function decode_num_entity($orig_type, $d)
+    {
+        if ($d < 0) { $d = 32; } // space
+        // don't mess with huigh chars
+        if ($d > 127) {
+            if ($orig_type == '%') { return '%'.dechex($d); }
+            if ($orig_type == '&') { return "&#$d;"; }
+        }
+        return HtmlSpecialChars(chr($d));
+    }
+
+    function StripSingle($data)
+    {
+        return str_replace(array('\\"', "\\0"), array('"', chr(0)), $data);
+    }
+}
diff --git a/src/Pluf/Text/LaTeX/Equation.php b/src/Pluf/Text/LaTeX/Equation.php
new file mode 100644
index 0000000..db99b0d
--- /dev/null
+++ b/src/Pluf/Text/LaTeX/Equation.php
@@ -0,0 +1,328 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Given a shunk of a latex equation code, render it and return a
+ * corresponding image file.
+ *
+ * Based on code by:
+ * Benjamin Zeiss
+ *  Copyright (C) 2003 Benjamin Zeiss <zeiss@math.uni-goettingen.de>
+ *  http://www.mayer.dial.pipex.com/tex.htm
+ * Kjell Magne Fauske
+ *  http://www.fauskes.net/nb/htmleqII/
+ *
+ * Example usage:
+ *
+ * $latex = new Pluf_Text_Latex_Equation();
+ * if (true === $latex->render('e = mc^2')) {
+ *     $png_file = $latex->output_file;
+ *     $png_full_path = $latex->output_path;
+ * } else {
+ *     $error = $latex->error_code;
+ *     $msg = $latex->error_msg;
+ * }
+ *
+ * Note that the class is not using exception to return the errors,
+ * that way you can easily grab the error and depending on the error
+ * code/message generate a special .png file to display.
+ */
+
+class Pluf_Text_Latex_Equation 
+{
+    public $tmp_dir = '/tmp'; 
+    public $output_dir = '/tmp';
+    public $encoding = 'utf-8';
+    public $fragment = '';
+    public $latex_path = '/usr/bin/latex';
+    public $dvipng_path = '/usr/bin/dvipng';
+    public $resolution = '120';
+    public $bg_color = 'ffffff';
+    public $debug = false;
+
+    /**
+     * Black listing of tags.
+     *
+     * this most certainly needs to be extended. in the long term it
+     * is planned to use a positive list for more security. this is
+     * hopefully enough for now. i'd be glad to receive more bad tags
+     * !
+     */
+    public $tags_blacklist = array(
+      'include', 'def', 'command', 'loop', 'repeat', 'open', 'toks', 'output',
+      'input', 'catcode', 'name', '^^', '\\every', '\\errhelp',
+      '\\errorstopmode', '\\scrollmode', '\\nonstopmode', '\\batchmode',
+      '\\read', '\\write', 'csname', '\\newhelp', '\\uppercase', '\\lowercase',
+      '\\relax', '\\aftergroup', '\\afterassignment', '\\expandafter',
+      '\\noexpand', '\\special');
+    public $error_code = 0;
+    public $error_msg = '';
+
+    /*
+    var $_latex_path = "/usr/local/bin/latex";
+    var $_dvips_path = "/usr/local/bin/dvips";
+    var $_convert_path = "/usr/local/bin/convert";
+    var $_identify_path="/usr/local/bin/identify";
+    var $_formula_density = 100;   // originally 110
+    var $_xsize_limit = 700;
+    var $_ysize_limit = 1000;
+    var $_string_length_limit = 1000;
+    var $_font_size = 10;
+    var $_latexclass = "article"; //install extarticle class if you wish to have smaller font sizes
+    var $_tmp_filename;
+    var $_image_format = "png"; //change to png if you prefer
+                                         );
+    var $_errorcode = 0;
+    var $_errorextra = '';
+    */
+
+
+    /**
+     * Initializes the class
+     *
+     * @param string Output directory (null)
+     * @param string Temp directory (null)
+     */
+    public function __construct($output_dir=null, $tmp_dir=null) 
+    {
+        if (!is_null($output_dir)) {
+            $this->output_dir = $output_dir;
+        }
+        if (!is_null($tmp_dir)) {
+            $this->tmp_dir = $tmp_dir;
+        }
+    }
+
+
+    /**
+     * Tries to match the LaTeX Formula given as argument against the
+     * formula cache. If the picture has not been rendered before, it'll
+     * try to render the formula and drop it in the picture cache directory.
+     *
+     * @param string formula in LaTeX format
+     * @returns the webserver based URL to a picture which contains the
+     * requested LaTeX formula. If anything fails, the resultvalue is false.
+     */
+    function getFormulaURL($latex_formula) {
+        // circumvent certain security functions of web-software which
+        // is pretty pointless right here
+        $latex_formula = preg_replace("/&gt;/i", ">", $latex_formula);
+        $latex_formula = preg_replace("/&lt;/i", "<", $latex_formula);
+
+        $formula_hash = md5($latex_formula.$this->_font_size);
+
+        $filename = $formula_hash.".".$this->_image_format;
+        $full_path_filename = $this->getPicturePath()."/".$filename;
+
+        if (is_file($full_path_filename)) 
+                { 
+           return $this->getPicturePathHTTPD()."/".$filename;
+        } 
+                else {
+            // security filter: reject too long formulas
+            if (strlen($latex_formula) > $this->_string_length_limit) {  
+                $this->_errorcode = 1;
+                return false;
+            }
+
+            // security filter: try to match against LaTeX-Tags Blacklist
+            for ($i=0;$i<sizeof($this->_latex_tags_blacklist);$i++) { 
+                if (stristr($latex_formula,$this->_latex_tags_blacklist[$i])) {  
+                    $this->_errorcode = 2;
+                    return false;
+                }
+            }
+
+            // security checks assume correct formula, let's render it
+            if ($this->renderLatex($latex_formula)) { 
+                return $this->getPicturePathHTTPD()."/".$filename;
+            } else { 
+                // uncomment if required
+                //$this->_errorcode = 3;
+                return false;
+            }
+        }
+    }
+
+    /**
+     * Get the Latex preamble. 
+     *
+     * You can overwrite this function if you want. 
+     *
+     * @return string Latex preamble.
+     */
+    function getPreamble()
+    {
+        return '\documentclass{article}'."\n"
+            .'\usepackage{amsmath}'."\n"
+            .'\usepackage{amsthm}'."\n"
+            .'\usepackage{amssymb}'."\n"
+            .'\usepackage{bm}'."\n"
+            .'% \newcommand{\mx}[1]{\mathbf{\bm{#1}}} % Matrix command'."\n"
+            .'% \newcommand{\vc}[1]{\mathbf{\bm{#1}}} % Vector command'."\n" 
+            .'% \newcommand{\T}{\text{T}}                % Transpose'."\n"
+            .'\pagestyle{empty}'."\n"
+            .'\begin{document}'."\n";
+    }
+
+    /**
+     * Renders a LaTeX formula by the using the following method:
+     *  - write the formula into a wrapped tex-file in a temporary directory
+     *    and change to it
+     *  - Create a DVI file using latex (tetex)
+     *  - Convert DVI file to png or gif using dvipng
+     *  - Save the resulting image to the picture cache directory using an
+     *    md5 hash as filename. Already rendered formulas can be found directly
+     *    this way.
+     *
+     * @param string LaTeX formula
+     * @param bool Render an inline formulat (false)
+     * @return true if the picture has been successfully saved to the picture
+     *          cache directory
+     */
+    function render($latex_formula, $inline=false) 
+    {
+        $this->output_file = '';
+        $this->output_path = '';
+        $this->error_code = 0;
+        $this->error_msg = '';
+        $output_file = $this->getOutputFile($latex_formula, $inline);
+        if (file_exists($this->output_dir.'/'.$output_file)) {
+            $this->output_file = $output_file;
+            $this->output_path = $this->output_dir.'/'.$output_file;
+            return true;
+        }
+        if (!$this->isCleanLatex($latex_formula)) {
+            // error code and message set by the method
+            return false;
+        }
+        if ($inline) {
+            $body = sprintf("$%s$ \n \\newpage \n", $latex_formula);
+        } else {
+            $body = sprintf("\\[\n%s \n\\] \n \\newpage \n", $latex_formula);
+        }
+        $latex_document = $this->getPreamble().$body;
+        $latex_document .= '\end{document}';
+
+        $current_dir = getcwd();
+        chdir($this->tmp_dir);
+
+        // create temporary latex file
+        $tmp_filename = md5($latex_formula.rand());
+        $fp = fopen($this->tmp_dir.'/'.$tmp_filename.'.tex', 'a+');
+        fputs($fp, $latex_document);
+        fclose($fp);
+
+        // create temporary dvi file
+        $command = $this->latex_path.' --interaction=nonstopmode '.$tmp_filename.'.tex';
+        exec($command);
+        if (!is_file($tmp_filename.'.dvi')) {
+            $this->clean($tmp_filename);
+            chdir($current_dir);
+            $this->error_code = 4; 
+            $this->error_msg = __('Unable to generate the dvi file.');
+            return false; 
+        }
+        // convert dvi file to png using dvipng
+        $bg = 'rgb ';
+        $_r = sprintf('%01.2f', hexdec(substr($this->bg_color, 0, 2))/255);
+        $_g = sprintf('%01.2f', hexdec(substr($this->bg_color, 2, 2))/255);
+        $_b = sprintf('%01.2f', hexdec(substr($this->bg_color, 4, 2))/255);
+
+        $command = $this->dvipng_path.' -q -T tight -D '.$this->resolution.' -z 9 -pp -1 -bg "rgb '.$_r.' '.$_g.' '.$_b.'" -bg transparent '
+            .'-o %s.png %s.dvi';
+        $command = sprintf($command, $tmp_filename, $tmp_filename);
+        exec($command);
+        if (!is_file($tmp_filename.'.png')) {
+            $this->clean($tmp_filename);
+            chdir($current_dir);
+            $this->error_code = 5; 
+            $this->error_msg = __('Unable to generate the png file.');
+            return false; 
+        }
+        $output_file = $this->getOutputFile($latex_formula, $inline);
+        $output_path = $this->output_dir.'/'.$output_file;
+        if (false == rename($tmp_filename.'.png', $output_path) 
+            or !is_file($output_path)) {
+            $this->clean($tmp_filename);
+            chdir($current_dir);
+            $this->error_code = 6; 
+            $this->error_msg = __('Unable to move the png file.');
+            return false; 
+        }
+        $this->clean($tmp_filename);
+        $this->output_file = $output_file;
+        $this->output_path = $output_path;
+        chdir($current_dir);
+        return true;
+    }
+
+    /**
+     * Cleans the temporary directory
+     */
+    public function clean($tmp_filename) 
+    {
+        if ($this->debug) return;
+        $current_dir = getcwd();
+        chdir($this->tmp_dir);
+        $exts = array('tex', 'aux', 'log', 'dvi', 'png');
+        foreach ($exts as $ext) {
+            if (file_exists($tmp_filename.'.'.$ext)) {
+                @unlink($tmp_filename.'.'.$ext);
+            }
+        }
+        chdir($current_dir);
+    }
+
+    /**
+     * Check if the latex code is clean.
+     *
+     * @param string Latex code.
+     * @return bool Is Clean.
+     */
+    public function isCleanLatex($latex)
+    {
+        foreach ($this->tags_blacklist as $tag) {
+            if (false !== stristr($latex, $tag)) {
+                $this->error_code = 2;
+                $this->error_msg = sprintf(__('The LaTeX tag "%s" is not acceptable.'), $tag);
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Get the output file based on the latex fragment.
+     *
+     * @param string Latex.
+     * @param bool Is the equation an inline equation (false).
+     * @param string Output file with extension without directory.
+     */
+    public function getOutputFile($latex, $inline=false)
+    {
+        $inline = ($inline) ? 'inline' : 'normal';
+        return md5($this->bg_color.'###'.$inline.'###'.$this->resolution.'###'.$latex).'.png';
+    }
+
+}
diff --git a/src/Pluf/Text/LaTeX/Texvc.php b/src/Pluf/Text/LaTeX/Texvc.php
new file mode 100644
index 0000000..dd10e79
--- /dev/null
+++ b/src/Pluf/Text/LaTeX/Texvc.php
@@ -0,0 +1,90 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Very simple interface to the texvc program.
+ *
+ */
+class Pluf_Text_LaTeX_Texvc
+{
+    public $tmp_dir = '/tmp'; 
+    public $output_dir = '/tmp';
+    public $texvc_path = '/usr/bin/texvc';
+    public $encoding = 'utf-8';
+    public $fragment = '';
+
+    /**
+     * Constructor.
+     *
+     * @param string Latex fragment.
+     * @param array Configuration variables.
+     */
+    public function __construct($latex, $cfg=array())
+    {
+        foreach ($cfg as $key=>$val) {
+            $this->$key = $val;
+        }
+        $this->fragment = $latex;
+    }
+
+    /**
+     * @param string Return type 'md5', ('file')
+     * @return file Path to the generated png file.
+     */
+	public function render($return='file') 
+    {
+        $cmd = sprintf('%s %s %s %s %s',
+                       $this->texvc_path, // texvc binary
+                       escapeshellarg($this->tmp_dir), 
+                       escapeshellarg($this->output_dir),
+                       escapeshellarg($this->fragment),
+                       escapeshellarg($this->encoding));
+        $out = exec($cmd);
+        if (strlen($out) == 0) {
+            throw new Exception('Unknown error in the LaTeX rendering.');
+        }
+        $code = substr($out, 0, 1);
+        if (false !== strpos('SEF-', $code)) {
+            $error = '';
+            switch ($code) {
+            case 'S':
+                $error = 'syntax error'; break;
+            case 'E':
+                $error = 'lexing error'; break;
+            case '-':
+                $error = 'other error'; break;
+            case 'F':
+                $error = 'unknown function: '.substr($out, 1); break;
+            }
+            throw new Exception('Error in the LaTeX rendering: '.$error);
+        }
+        $md5 = md5($this->fragment);
+        if (!file_exists($this->output_dir.'/'.$md5.'.png')) {
+            throw new Exception(sprintf('Error: Output file not written (%s).', $md5.'.png'));
+        }
+        if ($return == 'file') {
+            return $this->output_dir.'/'.$md5.'.png';
+        } 
+        return $md5;
+	}
+}
diff --git a/src/Pluf/Text/Lang.php b/src/Pluf/Text/Lang.php
new file mode 100644
index 0000000..5d2ecd5
--- /dev/null
+++ b/src/Pluf/Text/Lang.php
@@ -0,0 +1,162 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Detect the language of a text.
+ *
+ * <code>
+ * list($lang, $confid) = Pluf_Text_Lang::detect($string);
+ * </code>
+ */
+class Pluf_Text_Lang
+{
+    /**
+     * Given a string, returns the language.
+     *
+     * Algorithm by Cavnar et al. 94.
+     *
+     * @param string
+     * @param bool Is the string clean (false)
+     * @return array Language, Confidence
+     */
+    public static function detect($string, $is_clean=false)
+    {
+        if (!$is_clean) {
+            $string = Pluf_Text::cleanString($string);
+        }
+        
+    }
+
+    /**
+     * Returns the sorted n-grams of a document.
+     *
+     * FIXME: We should detect the proportion of thai/chinese/japanese
+     * characters and switch to unigram instead of n-grams if the
+     * proportion is greater than 50%.
+     *
+     * @param string The clean document.
+     * @param int Maximum size of the n grams (3)
+     * @return array N-Grams
+     */
+    public static function docNgrams($string, $n=3)
+    {
+        // do not remove the accents 
+        $words = Pluf_Text::tokenize($string, false); 
+        $ngrams = array();
+        for ($i=2;$i<=$n;$i++) {
+            foreach ($words as $word=>$occ) {
+                foreach (self::makeNgrams($word, $i) as $ngram) {
+                    $ngrams[] = array($ngram, $occ);
+                }
+            }
+        }
+        $out = array();
+        foreach ($ngrams as $ngram) {
+            if (!isset($out[$ngram[0]])) {
+                $out[$ngram[0]] = $ngram[1];
+            } else {
+                $out[$ngram[0]] += $ngram[1];
+            }
+        }
+        // split the ngrams by occurence.
+        $ngrams = array();
+        foreach ($out as $ngram=>$occ) {
+            if (isset($ngrams[$occ])) {
+                $ngrams[$occ][] = $ngram;
+            } else {
+                $ngrams[$occ] = array($ngram);
+            }
+        }
+        krsort($ngrams);
+        $res = array();
+        foreach ($ngrams as $occ=>$list) {
+            sort($list);
+            foreach ($list as $ngram) {
+                $res[] = $ngram;
+            }
+        }
+        return $res;
+    }
+
+    /**
+     * Returns the n-grams of rank n of the word.
+     *
+     * @param string Word.
+     * @return array N-grams
+     */
+    public static function makeNgrams($word, $n=3)
+    {
+        $chars = array('_');
+        $chars = $chars + Pluf_Text::stringToChars($word);
+        $chars[] = '_';
+        $l = count($chars);
+        $ngrams = array();
+        for ($i=0;$i<$l+1-$n;$i++) {
+            $ngrams[$i] = array();
+        }
+        $n_ngrams = $l+1-$n;
+        for ($i=0;$i<$l;$i++) {
+            for ($j=0;$j<$n;$j++) {
+                if (isset($ngrams[$i-$j])) {
+                    $ngrams[$i-$j][] = $chars[$i];
+                }
+            }
+        }
+        $out = array();
+        foreach ($ngrams as $ngram) {
+            $t = implode('', $ngram);
+            if ($t != '__') {
+                $out[] = $t;
+            }
+        }
+        return $out;
+    }
+
+    /**
+     * Return the distance between two document ngrams.
+     *
+     * @param array n-gram
+     * @param array n-gram
+     * @return integer distance
+     */
+    public static function ngramDistance($n1, $n2)
+    {
+        $res = 0;
+        $n_n1 = count($n1);
+        $n_n2 = count($n2);
+        if ($n_n1 > $n_n2) {
+            list($n_n1, $n_n2) = array($n_n2, $n_n1);
+            list($n1, $n2) = array($n2, $n1);
+        }
+        for ($i=0;$i<$n_n1;$i++) {
+            if (false !== ($index = array_search($n1[$i], $n2))) {
+                $offset = abs($index - $i);
+                $res += ($offset > 3) ? 3 : $offset;
+            } else {
+                $res += 3;
+            }
+        }
+        $res += ($n_n2 - $n_n1) * 3;
+        return $res;
+    }
+}
\ No newline at end of file
diff --git a/src/Pluf/Text/MarkDown.License.txt b/src/Pluf/Text/MarkDown.License.txt
new file mode 100644
index 0000000..3f0c1b1
--- /dev/null
+++ b/src/Pluf/Text/MarkDown.License.txt
@@ -0,0 +1,36 @@
+PHP Markdown & Extra
+Copyright (c) 2004-2007 Michel Fortin  
+<http://www.michelf.com/>  
+All rights reserved.
+
+Based on Markdown  
+Copyright (c) 2003-2006 John Gruber   
+<http://daringfireball.net/>   
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+
+* Neither the name "Markdown" nor the names of its contributors may
+  be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+This software is provided by the copyright holders and contributors "as
+is" and any express or implied warranties, including, but not limited
+to, the implied warranties of merchantability and fitness for a
+particular purpose are disclaimed. In no event shall the copyright owner
+or contributors be liable for any direct, indirect, incidental, special,
+exemplary, or consequential damages (including, but not limited to,
+procurement of substitute goods or services; loss of use, data, or
+profits; or business interruption) however caused and on any theory of
+liability, whether in contract, strict liability, or tort (including
+negligence or otherwise) arising in any way out of the use of this
+software, even if advised of the possibility of such damage.
diff --git a/src/Pluf/Text/MarkDown.php b/src/Pluf/Text/MarkDown.php
new file mode 100644
index 0000000..0477193
--- /dev/null
+++ b/src/Pluf/Text/MarkDown.php
@@ -0,0 +1,2667 @@
+<?php
+#
+# Markdown Extra  -  A text-to-HTML conversion tool for web writers
+#
+# PHP Markdown & Extra
+# Copyright (c) 2004-2008 Michel Fortin  
+# <http://www.michelf.com/projects/php-markdown/>
+#
+# Original Markdown
+# Copyright (c) 2004-2006 John Gruber  
+# <http://daringfireball.net/projects/markdown/>
+#
+
+
+define( 'MARKDOWN_VERSION',  "1.0.1l" ); # Sun 11 May 2008
+define( 'MARKDOWNEXTRA_VERSION',  "1.2.1" ); # Tue 27 May 2008
+
+
+#
+# Global default settings:
+#
+
+# Change to ">" for HTML output
+@define( 'MARKDOWN_EMPTY_ELEMENT_SUFFIX',  " />");
+
+# Define the width of a tab for code blocks.
+@define( 'MARKDOWN_TAB_WIDTH',     4 );
+
+# Optional title attribute for footnote links and backlinks.
+@define( 'MARKDOWN_FN_LINK_TITLE',         "" );
+@define( 'MARKDOWN_FN_BACKLINK_TITLE',     "" );
+
+# Optional class attribute for footnote links and backlinks.
+@define( 'MARKDOWN_FN_LINK_CLASS',         "" );
+@define( 'MARKDOWN_FN_BACKLINK_CLASS',     "" );
+
+
+
+### Standard Function Interface ###
+
+@define( 'MARKDOWN_PARSER_CLASS',  'MarkdownExtra_Parser' );
+
+function Markdown($text) {
+#
+# Initialize the parser and return the result of its transform method.
+#
+	# Setup static parser variable.
+	static $parser;
+	if (!isset($parser)) {
+		$parser_class = MARKDOWN_PARSER_CLASS;
+		$parser = new $parser_class;
+	}
+
+	# Transform text using parser.
+	return $parser->transform($text);
+}
+
+function Pluf_Text_MarkDown_parse($text) {
+#
+# Initialize the parser and return the result of its transform method.
+#
+	# Setup static parser variable.
+	static $parser;
+	if (!isset($parser)) {
+		$parser_class = MARKDOWN_PARSER_CLASS;
+		$parser = new $parser_class;
+	}
+
+	# Transform text using parser.
+	return $parser->transform($text);
+}
+
+
+
+#
+# Markdown Parser Class
+#
+
+class Markdown_Parser {
+
+	# Regex to match balanced [brackets].
+	# Needed to insert a maximum bracked depth while converting to PHP.
+	var $nested_brackets_depth = 6;
+	var $nested_brackets;
+	
+	var $nested_url_parenthesis_depth = 4;
+	var $nested_url_parenthesis;
+
+	# Table of hash values for escaped characters:
+	var $escape_chars = '\`*_{}[]()>#+-.!';
+	
+	# Regular expression to catch extra attributes.
+	var $attr_regex;
+
+	# Change to ">" for HTML output.
+	var $empty_element_suffix = MARKDOWN_EMPTY_ELEMENT_SUFFIX;
+	var $tab_width = MARKDOWN_TAB_WIDTH;
+	
+	# Change to `true` to disallow markup or entities.
+	var $no_markup = false;
+	var $no_entities = false;
+	
+	# Predefined urls and titles for reference links and images.
+	var $predef_urls = array();
+	var $predef_titles = array();
+
+
+	function Markdown_Parser() {
+	#
+	# Constructor function. Initialize appropriate member variables.
+	#
+		$this->_initDetab();
+	
+		$this->nested_brackets = 
+			str_repeat('(?>[^\[\]]+|\[', $this->nested_brackets_depth).
+			str_repeat('\])*', $this->nested_brackets_depth);
+	
+		$this->nested_url_parenthesis = 
+			str_repeat('(?>[^()\s]+|\(', $this->nested_url_parenthesis_depth).
+			str_repeat('(?>\)))*', $this->nested_url_parenthesis_depth);
+		
+		# Sort document, block, and span gamut in ascendent priority order.
+		asort($this->document_gamut);
+		asort($this->block_gamut);
+		asort($this->span_gamut);
+	}
+
+
+	# Internal hashes used during transformation.
+	var $urls = array();
+	var $titles = array();
+	var $html_hashes = array();
+	
+	# Status flag to avoid invalid nesting.
+	var $in_anchor = false;
+	
+	
+	function setup() {
+	#
+	# Called before the transformation process starts to setup parser 
+	# states.
+	#
+		# Clear global hashes.
+		$this->urls = $this->predef_urls;
+		$this->titles = $this->predef_titles;
+		$this->html_hashes = array();
+		
+		$in_anchor = false;
+	}
+	
+	function teardown() {
+	#
+	# Called after the transformation process to clear any variable 
+	# which may be taking up memory unnecessarly.
+	#
+		$this->urls = array();
+		$this->titles = array();
+		$this->html_hashes = array();
+	}
+
+
+	function transform($text) {
+	#
+	# Main function. Performs some preprocessing on the input text
+	# and pass it through the document gamut.
+	#
+		$this->setup();
+	
+		# Remove UTF-8 BOM, if present.
+		$text = preg_replace('{^\xEF\xBB\xBF}', '', $text);
+
+		# Standardize line endings:
+		#   DOS to Unix and Mac to Unix
+		$text = preg_replace('{\r\n?}', "\n", $text);
+
+		# Make sure $text ends with a couple of newlines:
+		$text .= "\n\n";
+
+		# Convert all tabs to spaces.
+		$text = $this->detab($text);
+
+		# Turn block-level HTML blocks into hash entries
+		$text = $this->hashHTMLBlocks($text);
+
+		# Strip any lines consisting only of spaces and tabs.
+		# This makes subsequent regexen easier to write, because we can
+		# match consecutive blank lines with /\n+/ instead of something
+		# contorted like /[ ]*\n+/ .
+		$text = preg_replace('/^[ ]+$/m', '', $text);
+
+		# Run document gamut methods.
+		foreach ($this->document_gamut as $method => $priority) {
+			$text = $this->$method($text);
+		}
+		
+		$this->teardown();
+
+		return $text . "\n";
+	}
+	
+	var $document_gamut = array(
+		# Strip link definitions, store in hashes.
+		"stripLinkDefinitions" => 20,
+		
+		"runBasicBlockGamut"   => 30,
+		);
+
+
+	function stripLinkDefinitions($text) {
+	#
+	# Strips link definitions from text, stores the URLs and titles in
+	# hash references.
+	#
+		$less_than_tab = $this->tab_width - 1;
+
+		# Link defs are in the form: ^[id]: url "optional title"
+		$text = preg_replace_callback('{
+							^[ ]{0,'.$less_than_tab.'}\[(.+)\][ ]?:	# id = $1
+							  [ ]*
+							  \n?				# maybe *one* newline
+							  [ ]*
+							<?(\S+?)>?			# url = $2
+							  [ ]*
+							  \n?				# maybe one newline
+							  [ ]*
+							(?:
+								(?<=\s)			# lookbehind for whitespace
+								["(]
+								(.*?)			# title = $3
+								[")]
+								[ ]*
+							)?	# title is optional
+							(?:\n+|\Z)
+			}xm',
+			array(&$this, '_stripLinkDefinitions_callback'),
+			$text);
+		return $text;
+	}
+	function _stripLinkDefinitions_callback($matches) {
+		$link_id = strtolower($matches[1]);
+		$this->urls[$link_id] = $this->encodeAttribute($matches[2]);
+		if (isset($matches[3]))
+			$this->titles[$link_id] = $this->encodeAttribute($matches[3]);
+		return ''; # String that will replace the block
+	}
+
+
+	function hashHTMLBlocks($text) {
+		if ($this->no_markup)  return $text;
+
+		$less_than_tab = $this->tab_width - 1;
+
+		# Hashify HTML blocks:
+		# We only want to do this for block-level HTML tags, such as headers,
+		# lists, and tables. That's because we still want to wrap <p>s around
+		# "paragraphs" that are wrapped in non-block-level tags, such as anchors,
+		# phrase emphasis, and spans. The list of tags we're looking for is
+		# hard-coded:
+		#
+		# *  List "a" is made of tags which can be both inline or block-level.
+		#    These will be treated block-level when the start tag is alone on 
+		#    its line, otherwise they're not matched here and will be taken as 
+		#    inline later.
+		# *  List "b" is made of tags which are always block-level;
+		#
+		$block_tags_a = 'ins|del';
+		$block_tags_b = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|'.
+						'script|noscript|form|fieldset|iframe|math';
+
+		# Regular expression for the content of a block tag.
+		$nested_tags_level = 4;
+		$attr = '
+			(?>				# optional tag attributes
+			  \s			# starts with whitespace
+			  (?>
+				[^>"/]+		# text outside quotes
+			  |
+				/+(?!>)		# slash not followed by ">"
+			  |
+				"[^"]*"		# text inside double quotes (tolerate ">")
+			  |
+				\'[^\']*\'	# text inside single quotes (tolerate ">")
+			  )*
+			)?	
+			';
+		$content =
+			str_repeat('
+				(?>
+				  [^<]+			# content without tag
+				|
+				  <\2			# nested opening tag
+					'.$attr.'	# attributes
+					(?>
+					  />
+					|
+					  >', $nested_tags_level).	# end of opening tag
+					  '.*?'.					# last level nested tag content
+			str_repeat('
+					  </\2\s*>	# closing nested tag
+					)
+				  |				
+					<(?!/\2\s*>	# other tags with a different name
+				  )
+				)*',
+				$nested_tags_level);
+		$content2 = str_replace('\2', '\3', $content);
+
+		# First, look for nested blocks, e.g.:
+		# 	<div>
+		# 		<div>
+		# 		tags for inner block must be indented.
+		# 		</div>
+		# 	</div>
+		#
+		# The outermost tags must start at the left margin for this to match, and
+		# the inner nested divs must be indented.
+		# We need to do this before the next, more liberal match, because the next
+		# match will start at the first `<div>` and stop at the first `</div>`.
+		$text = preg_replace_callback('{(?>
+			(?>
+				(?<=\n\n)		# Starting after a blank line
+				|				# or
+				\A\n?			# the beginning of the doc
+			)
+			(						# save in $1
+
+			  # Match from `\n<tag>` to `</tag>\n`, handling nested tags 
+			  # in between.
+					
+						[ ]{0,'.$less_than_tab.'}
+						<('.$block_tags_b.')# start tag = $2
+						'.$attr.'>			# attributes followed by > and \n
+						'.$content.'		# content, support nesting
+						</\2>				# the matching end tag
+						[ ]*				# trailing spaces/tabs
+						(?=\n+|\Z)	# followed by a newline or end of document
+
+			| # Special version for tags of group a.
+
+						[ ]{0,'.$less_than_tab.'}
+						<('.$block_tags_a.')# start tag = $3
+						'.$attr.'>[ ]*\n	# attributes followed by >
+						'.$content2.'		# content, support nesting
+						</\3>				# the matching end tag
+						[ ]*				# trailing spaces/tabs
+						(?=\n+|\Z)	# followed by a newline or end of document
+					
+			| # Special case just for <hr />. It was easier to make a special 
+			  # case than to make the other regex more complicated.
+			
+						[ ]{0,'.$less_than_tab.'}
+						<(hr)				# start tag = $2
+						'.$attr.'			# attributes
+						/?>					# the matching end tag
+						[ ]*
+						(?=\n{2,}|\Z)		# followed by a blank line or end of document
+			
+			| # Special case for standalone HTML comments:
+			
+					[ ]{0,'.$less_than_tab.'}
+					(?s:
+						<!-- .*? -->
+					)
+					[ ]*
+					(?=\n{2,}|\Z)		# followed by a blank line or end of document
+			
+			| # PHP and ASP-style processor instructions (<? and <%)
+			
+					[ ]{0,'.$less_than_tab.'}
+					(?s:
+						<([?%])			# $2
+						.*?
+						\2>
+					)
+					[ ]*
+					(?=\n{2,}|\Z)		# followed by a blank line or end of document
+					
+			)
+			)}Sxmi',
+			array(&$this, '_hashHTMLBlocks_callback'),
+			$text);
+
+		return $text;
+	}
+	function _hashHTMLBlocks_callback($matches) {
+		$text = $matches[1];
+		$key  = $this->hashBlock($text);
+		return "\n\n$key\n\n";
+	}
+	
+	
+	function hashPart($text, $boundary = 'X') {
+	#
+	# Called whenever a tag must be hashed when a function insert an atomic 
+	# element in the text stream. Passing $text to through this function gives
+	# a unique text-token which will be reverted back when calling unhash.
+	#
+	# The $boundary argument specify what character should be used to surround
+	# the token. By convension, "B" is used for block elements that needs not
+	# to be wrapped into paragraph tags at the end, ":" is used for elements
+	# that are word separators and "X" is used in the general case.
+	#
+		# Swap back any tag hash found in $text so we do not have to `unhash`
+		# multiple times at the end.
+		$text = $this->unhash($text);
+		
+		# Then hash the block.
+		static $i = 0;
+		$key = "$boundary\x1A" . ++$i . $boundary;
+		$this->html_hashes[$key] = $text;
+		return $key; # String that will replace the tag.
+	}
+
+
+	function hashBlock($text) {
+	#
+	# Shortcut function for hashPart with block-level boundaries.
+	#
+		return $this->hashPart($text, 'B');
+	}
+
+
+	var $block_gamut = array(
+	#
+	# These are all the transformations that form block-level
+	# tags like paragraphs, headers, and list items.
+	#
+		"doHeaders"         => 10,
+		"doHorizontalRules" => 20,
+		
+		"doLists"           => 40,
+		"doCodeBlocks"      => 50,
+		"doBlockQuotes"     => 60,
+		);
+
+	function runBlockGamut($text) {
+	#
+	# Run block gamut tranformations.
+	#
+		# We need to escape raw HTML in Markdown source before doing anything 
+		# else. This need to be done for each block, and not only at the 
+		# begining in the Markdown function since hashed blocks can be part of
+		# list items and could have been indented. Indented blocks would have 
+		# been seen as a code block in a previous pass of hashHTMLBlocks.
+		$text = $this->hashHTMLBlocks($text);
+		
+		return $this->runBasicBlockGamut($text);
+	}
+	
+	function runBasicBlockGamut($text) {
+	#
+	# Run block gamut tranformations, without hashing HTML blocks. This is 
+	# useful when HTML blocks are known to be already hashed, like in the first
+	# whole-document pass.
+	#
+		foreach ($this->block_gamut as $method => $priority) {
+			$text = $this->$method($text);
+		}
+		
+		# Finally form paragraph and restore hashed blocks.
+		$text = $this->formParagraphs($text);
+
+		return $text;
+	}
+	
+	
+	function doHorizontalRules($text) {
+		# Do Horizontal Rules:
+		return preg_replace(
+			'{
+				^[ ]{0,3}	# Leading space
+				([-*_])		# $1: First marker
+				(?>			# Repeated marker group
+					[ ]{0,2}	# Zero, one, or two spaces.
+					\1			# Marker character
+				){2,}		# Group repeated at least twice
+				[ ]*		# Tailing spaces
+				$			# End of line.
+			}mx',
+			"\n".$this->hashBlock("<hr$this->empty_element_suffix")."\n", 
+			$text);
+	}
+
+
+	var $span_gamut = array(
+	#
+	# These are all the transformations that occur *within* block-level
+	# tags like paragraphs, headers, and list items.
+	#
+		# Process character escapes, code spans, and inline HTML
+		# in one shot.
+		"parseSpan"           => -30,
+
+		# Process anchor and image tags. Images must come first,
+		# because ![foo][f] looks like an anchor.
+		"doImages"            =>  10,
+		"doAnchors"           =>  20,
+		
+		# Make links out of things like `<http://example.com/>`
+		# Must come after doAnchors, because you can use < and >
+		# delimiters in inline links like [this](<url>).
+		"doAutoLinks"         =>  30,
+		"encodeAmpsAndAngles" =>  40,
+
+		"doItalicsAndBold"    =>  50,
+		"doHardBreaks"        =>  60,
+		);
+
+	function runSpanGamut($text) {
+	#
+	# Run span gamut tranformations.
+	#
+		foreach ($this->span_gamut as $method => $priority) {
+			$text = $this->$method($text);
+		}
+
+		return $text;
+	}
+	
+	
+	function doHardBreaks($text) {
+		# Do hard breaks:
+		return preg_replace_callback('/ {2,}\n/', 
+			array(&$this, '_doHardBreaks_callback'), $text);
+	}
+	function _doHardBreaks_callback($matches) {
+		return $this->hashPart("<br$this->empty_element_suffix\n");
+	}
+
+
+	function doAnchors($text) {
+	#
+	# Turn Markdown link shortcuts into XHTML <a> tags.
+	#
+		if ($this->in_anchor) return $text;
+		$this->in_anchor = true;
+		
+		#
+		# First, handle reference-style links: [link text] [id]
+		#
+		$text = preg_replace_callback('{
+			(					# wrap whole match in $1
+			  \[
+				('.$this->nested_brackets.')	# link text = $2
+			  \]
+
+			  [ ]?				# one optional space
+			  (?:\n[ ]*)?		# one optional newline followed by spaces
+
+			  \[
+				(.*?)		# id = $3
+			  \]
+			)
+			}xs',
+			array(&$this, '_doAnchors_reference_callback'), $text);
+
+		#
+		# Next, inline-style links: [link text](url "optional title")
+		#
+		$text = preg_replace_callback('{
+			(				# wrap whole match in $1
+			  \[
+				('.$this->nested_brackets.')	# link text = $2
+			  \]
+			  \(			# literal paren
+				[ ]*
+				(?:
+					<(\S*)>	# href = $3
+				|
+					('.$this->nested_url_parenthesis.')	# href = $4
+				)
+				[ ]*
+				(			# $5
+				  ([\'"])	# quote char = $6
+				  (.*?)		# Title = $7
+				  \6		# matching quote
+				  [ ]*	# ignore any spaces/tabs between closing quote and )
+				)?			# title is optional
+			  \)
+			)
+			}xs',
+			array(&$this, '_DoAnchors_inline_callback'), $text);
+
+		#
+		# Last, handle reference-style shortcuts: [link text]
+		# These must come last in case you've also got [link test][1]
+		# or [link test](/foo)
+		#
+//		$text = preg_replace_callback('{
+//			(					# wrap whole match in $1
+//			  \[
+//				([^\[\]]+)		# link text = $2; can\'t contain [ or ]
+//			  \]
+//			)
+//			}xs',
+//			array(&$this, '_doAnchors_reference_callback'), $text);
+
+		$this->in_anchor = false;
+		return $text;
+	}
+	function _doAnchors_reference_callback($matches) {
+		$whole_match =  $matches[1];
+		$link_text   =  $matches[2];
+		$link_id     =& $matches[3];
+
+		if ($link_id == "") {
+			# for shortcut links like [this][] or [this].
+			$link_id = $link_text;
+		}
+		
+		# lower-case and turn embedded newlines into spaces
+		$link_id = strtolower($link_id);
+		$link_id = preg_replace('{[ ]?\n}', ' ', $link_id);
+
+		if (isset($this->urls[$link_id])) {
+			$url = $this->urls[$link_id];
+			$url = $this->encodeAttribute($url);
+			
+			$result = "<a href=\"$url\"";
+			if ( isset( $this->titles[$link_id] ) ) {
+				$title = $this->titles[$link_id];
+				$title = $this->encodeAttribute($title);
+				$result .=  " title=\"$title\"";
+			}
+		
+			$link_text = $this->runSpanGamut($link_text);
+			$result .= ">$link_text</a>";
+			$result = $this->hashPart($result);
+		}
+		else {
+			$result = $whole_match;
+		}
+		return $result;
+	}
+	function _doAnchors_inline_callback($matches) {
+		$whole_match	=  $matches[1];
+		$link_text		=  $this->runSpanGamut($matches[2]);
+		$url			=  $matches[3] == '' ? $matches[4] : $matches[3];
+		$title			=& $matches[7];
+
+		$url = $this->encodeAttribute($url);
+
+		$result = "<a href=\"$url\"";
+		if (isset($title)) {
+			$title = $this->encodeAttribute($title);
+			$result .=  " title=\"$title\"";
+		}
+		
+		$link_text = $this->runSpanGamut($link_text);
+		$result .= ">$link_text</a>";
+
+		return $this->hashPart($result);
+	}
+
+
+	function doImages($text) {
+	#
+	# Turn Markdown image shortcuts into <img> tags.
+	#
+		#
+		# First, handle reference-style labeled images: ![alt text][id]
+		#
+		$text = preg_replace_callback('{
+			(				# wrap whole match in $1
+			  !\[
+				('.$this->nested_brackets.')		# alt text = $2
+			  \]
+
+			  [ ]?				# one optional space
+			  (?:\n[ ]*)?		# one optional newline followed by spaces
+
+			  \[
+				(.*?)		# id = $3
+			  \]
+
+			)
+			}xs', 
+			array(&$this, '_doImages_reference_callback'), $text);
+
+		#
+		# Next, handle inline images:  ![alt text](url "optional title")
+		# Don't forget: encode * and _
+		#
+		$text = preg_replace_callback('{
+			(				# wrap whole match in $1
+			  !\[
+				('.$this->nested_brackets.')		# alt text = $2
+			  \]
+			  \s?			# One optional whitespace character
+			  \(			# literal paren
+				[ ]*
+				(?:
+					<(\S*)>	# src url = $3
+				|
+					('.$this->nested_url_parenthesis.')	# src url = $4
+				)
+				[ ]*
+				(			# $5
+				  ([\'"])	# quote char = $6
+				  (.*?)		# title = $7
+				  \6		# matching quote
+				  [ ]*
+				)?			# title is optional
+			  \)
+			)
+			}xs',
+			array(&$this, '_doImages_inline_callback'), $text);
+
+		return $text;
+	}
+	function _doImages_reference_callback($matches) {
+		$whole_match = $matches[1];
+		$alt_text    = $matches[2];
+		$link_id     = strtolower($matches[3]);
+
+		if ($link_id == "") {
+			$link_id = strtolower($alt_text); # for shortcut links like ![this][].
+		}
+
+		$alt_text = $this->encodeAttribute($alt_text);
+		if (isset($this->urls[$link_id])) {
+			$url = $this->urls[$link_id];
+			$result = "<img src=\"$url\" alt=\"$alt_text\"";
+			if (isset($this->titles[$link_id])) {
+				$title = $this->titles[$link_id];
+				$result .=  " title=\"$title\"";
+			}
+			$result .= $this->empty_element_suffix;
+			$result = $this->hashPart($result);
+		}
+		else {
+			# If there's no such link ID, leave intact:
+			$result = $whole_match;
+		}
+
+		return $result;
+	}
+	function _doImages_inline_callback($matches) {
+		$whole_match	= $matches[1];
+		$alt_text		= $matches[2];
+		$url			= $matches[3] == '' ? $matches[4] : $matches[3];
+		$title			=& $matches[7];
+
+		$alt_text = $this->encodeAttribute($alt_text);
+		$url = $this->encodeAttribute($url);
+		$result = "<img src=\"$url\" alt=\"$alt_text\"";
+		if (isset($title)) {
+			$title = $this->encodeAttribute($title);
+			$result .=  " title=\"$title\""; # $title already quoted
+		}
+		$result .= $this->empty_element_suffix;
+
+		return $this->hashPart($result);
+	}
+
+
+	function doHeaders($text) {
+		# Setext-style headers:
+		#	  Header 1
+		#	  ========
+		#  
+		#	  Header 2
+		#	  --------
+		#
+		$text = preg_replace_callback('{ ^(.+?)[ ]*\n(=+|-+)[ ]*\n+ }mx',
+			array(&$this, '_doHeaders_callback_setext'), $text);
+
+		# atx-style headers:
+		#	# Header 1
+		#	## Header 2
+		#	## Header 2 with closing hashes ##
+		#	...
+		#	###### Header 6
+		#
+		$text = preg_replace_callback('{
+				^(\#{1,6})	# $1 = string of #\'s
+				[ ]*
+				(.+?)		# $2 = Header text
+				[ ]*
+				\#*			# optional closing #\'s (not counted)
+				\n+
+			}xm',
+			array(&$this, '_doHeaders_callback_atx'), $text);
+
+		return $text;
+	}
+	function _doHeaders_callback_setext($matches) {
+		$level = $matches[2]{0} == '=' ? 1 : 2;
+		$block = "<h$level>".$this->runSpanGamut($matches[1])."</h$level>";
+		return "\n" . $this->hashBlock($block) . "\n\n";
+	}
+	function _doHeaders_callback_atx($matches) {
+		$level = strlen($matches[1]);
+		$block = "<h$level>".$this->runSpanGamut($matches[2])."</h$level>";
+		return "\n" . $this->hashBlock($block) . "\n\n";
+	}
+
+
+	function doLists($text) {
+	#
+	# Form HTML ordered (numbered) and unordered (bulleted) lists.
+	#
+		$less_than_tab = $this->tab_width - 1;
+
+		# Re-usable patterns to match list item bullets and number markers:
+		$marker_ul  = '[*+-]';
+		$marker_ol  = '\d+[.]';
+		$marker_any = "(?:$marker_ul|$marker_ol)";
+
+		$markers = array($marker_ul, $marker_ol);
+
+		foreach ($markers as $marker) {
+			# Re-usable pattern to match any entirel ul or ol list:
+			$whole_list = '
+				(								# $1 = whole list
+				  (								# $2
+					[ ]{0,'.$less_than_tab.'}
+					('.$marker.')				# $3 = first list item marker
+					[ ]+
+				  )
+				  (?s:.+?)
+				  (								# $4
+					  \z
+					|
+					  \n{2,}
+					  (?=\S)
+					  (?!						# Negative lookahead for another list item marker
+						[ ]*
+						'.$marker.'[ ]+
+					  )
+				  )
+				)
+			'; // mx
+			
+			# We use a different prefix before nested lists than top-level lists.
+			# See extended comment in _ProcessListItems().
+		
+			if ($this->list_level) {
+				$text = preg_replace_callback('{
+						^
+						'.$whole_list.'
+					}mx',
+					array(&$this, '_doLists_callback'), $text);
+			}
+			else {
+				$text = preg_replace_callback('{
+						(?:(?<=\n)\n|\A\n?) # Must eat the newline
+						'.$whole_list.'
+					}mx',
+					array(&$this, '_doLists_callback'), $text);
+			}
+		}
+
+		return $text;
+	}
+	function _doLists_callback($matches) {
+		# Re-usable patterns to match list item bullets and number markers:
+		$marker_ul  = '[*+-]';
+		$marker_ol  = '\d+[.]';
+		$marker_any = "(?:$marker_ul|$marker_ol)";
+		
+		$list = $matches[1];
+		$list_type = preg_match("/$marker_ul/", $matches[3]) ? "ul" : "ol";
+		
+		$marker_any = ( $list_type == "ul" ? $marker_ul : $marker_ol );
+		
+		$list .= "\n";
+		$result = $this->processListItems($list, $marker_any);
+		
+		$result = $this->hashBlock("<$list_type>\n" . $result . "</$list_type>");
+		return "\n". $result ."\n\n";
+	}
+
+	var $list_level = 0;
+
+	function processListItems($list_str, $marker_any) {
+	#
+	#	Process the contents of a single ordered or unordered list, splitting it
+	#	into individual list items.
+	#
+		# The $this->list_level global keeps track of when we're inside a list.
+		# Each time we enter a list, we increment it; when we leave a list,
+		# we decrement. If it's zero, we're not in a list anymore.
+		#
+		# We do this because when we're not inside a list, we want to treat
+		# something like this:
+		#
+		#		I recommend upgrading to version
+		#		8. Oops, now this line is treated
+		#		as a sub-list.
+		#
+		# As a single paragraph, despite the fact that the second line starts
+		# with a digit-period-space sequence.
+		#
+		# Whereas when we're inside a list (or sub-list), that line will be
+		# treated as the start of a sub-list. What a kludge, huh? This is
+		# an aspect of Markdown's syntax that's hard to parse perfectly
+		# without resorting to mind-reading. Perhaps the solution is to
+		# change the syntax rules such that sub-lists must start with a
+		# starting cardinal number; e.g. "1." or "a.".
+		
+		$this->list_level++;
+
+		# trim trailing blank lines:
+		$list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str);
+
+		$list_str = preg_replace_callback('{
+			(\n)?							# leading line = $1
+			(^[ ]*)						# leading whitespace = $2
+			('.$marker_any.' [ ]+)		# list marker and space = $3
+			((?s:.+?))						# list item text   = $4
+			(?:(\n+(?=\n))|\n)				# tailing blank line = $5
+			(?= \n* (\z | \2 ('.$marker_any.') [ ]+))
+			}xm',
+			array(&$this, '_processListItems_callback'), $list_str);
+
+		$this->list_level--;
+		return $list_str;
+	}
+	function _processListItems_callback($matches) {
+		$item = $matches[4];
+		$leading_line =& $matches[1];
+		$leading_space =& $matches[2];
+		$marker_space = $matches[3];
+		$tailing_blank_line =& $matches[5];
+
+		if ($leading_line || $tailing_blank_line || 
+			preg_match('/\n{2,}/', $item))
+		{
+			# Replace marker with the appropriate whitespace indentation
+			$item = $leading_space . str_repeat(' ', strlen($marker_space)) . $item;
+			$item = $this->runBlockGamut($this->outdent($item)."\n");
+		}
+		else {
+			# Recursion for sub-lists:
+			$item = $this->doLists($this->outdent($item));
+			$item = preg_replace('/\n+$/', '', $item);
+			$item = $this->runSpanGamut($item);
+		}
+
+		return "<li>" . $item . "</li>\n";
+	}
+
+
+	function doCodeBlocks($text) {
+	#
+	#	Process Markdown `<pre><code>` blocks.
+	#
+		$text = preg_replace_callback('{
+				(?:\n\n|\A\n?)
+				(	            # $1 = the code block -- one or more lines, starting with a space/tab
+				  (?>
+					[ ]{'.$this->tab_width.'}  # Lines must start with a tab or a tab-width of spaces
+					.*\n+
+				  )+
+				)
+				((?=^[ ]{0,'.$this->tab_width.'}\S)|\Z)	# Lookahead for non-space at line-start, or end of doc
+			}xm',
+			array(&$this, '_doCodeBlocks_callback'), $text);
+
+		return $text;
+	}
+	function _doCodeBlocks_callback($matches) {
+		$codeblock = $matches[1];
+
+		$codeblock = $this->outdent($codeblock);
+		$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
+
+		# trim leading newlines and trailing newlines
+		$codeblock = preg_replace('/\A\n+|\n+\z/', '', $codeblock);
+
+		$codeblock = "<pre><code>$codeblock\n</code></pre>";
+		return "\n\n".$this->hashBlock($codeblock)."\n\n";
+	}
+
+
+	function makeCodeSpan($code) {
+	#
+	# Create a code span markup for $code. Called from handleSpanToken.
+	#
+		$code = htmlspecialchars(trim($code), ENT_NOQUOTES);
+		return $this->hashPart("<code>$code</code>");
+	}
+
+
+	function doItalicsAndBold($text) {
+		# <strong> must go first:
+		$text = preg_replace_callback('{
+				(						# $1: Marker
+					(?<!\*\*) \* |		#     (not preceded by two chars of
+					(?<!__)   _			#      the same marker)
+				)
+				\1
+				(?=\S) 					# Not followed by whitespace 
+				(?!\1\1)				#   or two others marker chars.
+				(						# $2: Content
+					(?>
+						[^*_]+?			# Anthing not em markers.
+					|
+										# Balence any regular emphasis inside.
+						\1 (?=\S) .+? (?<=\S) \1
+					|
+						.				# Allow unbalenced * and _.
+					)+?
+				)
+				(?<=\S) \1\1			# End mark not preceded by whitespace.
+			}sx',
+			array(&$this, '_doItalicAndBold_strong_callback'), $text);
+		# Then <em>:
+		$text = preg_replace_callback(
+			'{ ( (?<!\*)\* | (?<!_)_ ) (?=\S) (?! \1) (.+?) (?<=\S)(?<!\s(?=\1).) \1 }sx',
+			array(&$this, '_doItalicAndBold_em_callback'), $text);
+
+		return $text;
+	}
+	function _doItalicAndBold_em_callback($matches) {
+		$text = $matches[2];
+		$text = $this->runSpanGamut($text);
+		return $this->hashPart("<em>$text</em>");
+	}
+	function _doItalicAndBold_strong_callback($matches) {
+		$text = $matches[2];
+		$text = $this->runSpanGamut($text);
+		return $this->hashPart("<strong>$text</strong>");
+	}
+
+
+	function doBlockQuotes($text) {
+		$text = preg_replace_callback('/
+			  (								# Wrap whole match in $1
+				(?>
+				  ^[ ]*>[ ]?			# ">" at the start of a line
+					.+\n					# rest of the first line
+				  (.+\n)*					# subsequent consecutive lines
+				  \n*						# blanks
+				)+
+			  )
+			/xm',
+			array(&$this, '_doBlockQuotes_callback'), $text);
+
+		return $text;
+	}
+	function _doBlockQuotes_callback($matches) {
+		$bq = $matches[1];
+		# trim one level of quoting - trim whitespace-only lines
+		$bq = preg_replace('/^[ ]*>[ ]?|^[ ]+$/m', '', $bq);
+		$bq = $this->runBlockGamut($bq);		# recurse
+
+		$bq = preg_replace('/^/m', "  ", $bq);
+		# These leading spaces cause problem with <pre> content, 
+		# so we need to fix that:
+		$bq = preg_replace_callback('{(\s*<pre>.+?</pre>)}sx', 
+			array(&$this, '_DoBlockQuotes_callback2'), $bq);
+
+		return "\n". $this->hashBlock("<blockquote>\n$bq\n</blockquote>")."\n\n";
+	}
+	function _doBlockQuotes_callback2($matches) {
+		$pre = $matches[1];
+		$pre = preg_replace('/^  /m', '', $pre);
+		return $pre;
+	}
+
+
+	function formParagraphs($text) {
+	#
+	#	Params:
+	#		$text - string to process with html <p> tags
+	#
+		# Strip leading and trailing lines:
+		$text = preg_replace('/\A\n+|\n+\z/', '', $text);
+
+		$grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
+
+		#
+		# Wrap <p> tags and unhashify HTML blocks
+		#
+		foreach ($grafs as $key => $value) {
+			if (!preg_match('/^B\x1A[0-9]+B$/', $value)) {
+				# Is a paragraph.
+				$value = $this->runSpanGamut($value);
+				$value = preg_replace('/^([ ]*)/', "<p>", $value);
+				$value .= "</p>";
+				$grafs[$key] = $this->unhash($value);
+			}
+			else {
+				# Is a block.
+				# Modify elements of @grafs in-place...
+				$graf = $value;
+				$block = $this->html_hashes[$graf];
+				$graf = $block;
+//				if (preg_match('{
+//					\A
+//					(							# $1 = <div> tag
+//					  <div  \s+
+//					  [^>]*
+//					  \b
+//					  markdown\s*=\s*  ([\'"])	#	$2 = attr quote char
+//					  1
+//					  \2
+//					  [^>]*
+//					  >
+//					)
+//					(							# $3 = contents
+//					.*
+//					)
+//					(</div>)					# $4 = closing tag
+//					\z
+//					}xs', $block, $matches))
+//				{
+//					list(, $div_open, , $div_content, $div_close) = $matches;
+//
+//					# We can't call Markdown(), because that resets the hash;
+//					# that initialization code should be pulled into its own sub, though.
+//					$div_content = $this->hashHTMLBlocks($div_content);
+//					
+//					# Run document gamut methods on the content.
+//					foreach ($this->document_gamut as $method => $priority) {
+//						$div_content = $this->$method($div_content);
+//					}
+//
+//					$div_open = preg_replace(
+//						'{\smarkdown\s*=\s*([\'"]).+?\1}', '', $div_open);
+//
+//					$graf = $div_open . "\n" . $div_content . "\n" . $div_close;
+//				}
+				$grafs[$key] = $graf;
+			}
+		}
+
+		return implode("\n\n", $grafs);
+	}
+
+
+	function encodeAttribute($text) {
+	#
+	# Encode text for a double-quoted HTML attribute.
+	#
+		$text = $this->encodeAmpsAndAngles($text);
+		$text = str_replace('"', '&quot;', $text);
+		return $text;
+	}
+	
+	
+	function encodeAmpsAndAngles($text) {
+	# Smart processing for ampersands and angle brackets that need to be encoded.
+		if ($this->no_entities) {
+			$text = str_replace('&', '&amp;', $text);
+			$text = str_replace('<', '&lt;', $text);
+			return $text;
+		}
+
+		# Ampersand-encoding based entirely on Nat Irons's Amputator MT plugin:
+		#   http://bumppo.net/projects/amputator/
+		$text = preg_replace('/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/', 
+							 '&amp;', $text);;
+
+		# Encode naked <'s
+		$text = preg_replace('{<(?![a-z/?\$!%])}i', '&lt;', $text);
+
+		return $text;
+	}
+
+
+	function doAutoLinks($text) {
+		$text = preg_replace_callback('{<((https?|ftp|dict):[^\'">\s]+)>}i', 
+			array(&$this, '_doAutoLinks_url_callback'), $text);
+
+		# Email addresses: <address@domain.foo>
+		$text = preg_replace_callback('{
+			<
+			(?:mailto:)?
+			(
+				[-.\w\x80-\xFF]+
+				\@
+				[-a-z0-9\x80-\xFF]+(\.[-a-z0-9\x80-\xFF]+)*\.[a-z]+
+			)
+			>
+			}xi',
+			array(&$this, '_doAutoLinks_email_callback'), $text);
+
+		return $text;
+	}
+	function _doAutoLinks_url_callback($matches) {
+		$url = $this->encodeAttribute($matches[1]);
+		$link = "<a href=\"$url\">$url</a>";
+		return $this->hashPart($link);
+	}
+	function _doAutoLinks_email_callback($matches) {
+		$address = $matches[1];
+		$link = $this->encodeEmailAddress($address);
+		return $this->hashPart($link);
+	}
+
+
+	function encodeEmailAddress($addr) {
+	#
+	#	Input: an email address, e.g. "foo@example.com"
+	#
+	#	Output: the email address as a mailto link, with each character
+	#		of the address encoded as either a decimal or hex entity, in
+	#		the hopes of foiling most address harvesting spam bots. E.g.:
+	#
+	#	  <p><a href="&#109;&#x61;&#105;&#x6c;&#116;&#x6f;&#58;&#x66;o&#111;
+	#        &#x40;&#101;&#x78;&#97;&#x6d;&#112;&#x6c;&#101;&#46;&#x63;&#111;
+	#        &#x6d;">&#x66;o&#111;&#x40;&#101;&#x78;&#97;&#x6d;&#112;&#x6c;
+	#        &#101;&#46;&#x63;&#111;&#x6d;</a></p>
+	#
+	#	Based by a filter by Matthew Wickline, posted to BBEdit-Talk.
+	#   With some optimizations by Milian Wolff.
+	#
+		$addr = "mailto:" . $addr;
+		$chars = preg_split('/(?<!^)(?!$)/', $addr);
+		$seed = (int)abs(crc32($addr) / strlen($addr)); # Deterministic seed.
+		
+		foreach ($chars as $key => $char) {
+			$ord = ord($char);
+			# Ignore non-ascii chars.
+			if ($ord < 128) {
+				$r = ($seed * (1 + $key)) % 100; # Pseudo-random function.
+				# roughly 10% raw, 45% hex, 45% dec
+				# '@' *must* be encoded. I insist.
+				if ($r > 90 && $char != '@') /* do nothing */;
+				else if ($r < 45) $chars[$key] = '&#x'.dechex($ord).';';
+				else              $chars[$key] = '&#'.$ord.';';
+			}
+		}
+		
+		$addr = implode('', $chars);
+		$text = implode('', array_slice($chars, 7)); # text without `mailto:`
+		$addr = "<a href=\"$addr\">$text</a>";
+
+		return $addr;
+	}
+
+
+	function parseSpan($str) {
+	#
+	# Take the string $str and parse it into tokens, hashing embeded HTML,
+	# escaped characters and handling code spans.
+	#
+		$output = '';
+		
+		$regex = '{
+				(
+					\\\\['.preg_quote($this->escape_chars).']
+				|
+					(?<![`\\\\])
+					`+						# code span marker
+			'.( $this->no_markup ? '' : '
+				|
+					<!--    .*?     -->		# comment
+				|
+					<\?.*?\?> | <%.*?%>		# processing instruction
+				|
+					<[/!$]?[-a-zA-Z0-9:]+	# regular tags
+					(?>
+						\s
+						(?>[^"\'>]+|"[^"]*"|\'[^\']*\')*
+					)?
+					>
+			').'
+				)
+				}xs';
+
+		while (1) {
+			#
+			# Each loop iteration seach for either the next tag, the next 
+			# openning code span marker, or the next escaped character. 
+			# Each token is then passed to handleSpanToken.
+			#
+			$parts = preg_split($regex, $str, 2, PREG_SPLIT_DELIM_CAPTURE);
+			
+			# Create token from text preceding tag.
+			if ($parts[0] != "") {
+				$output .= $parts[0];
+			}
+			
+			# Check if we reach the end.
+			if (isset($parts[1])) {
+				$output .= $this->handleSpanToken($parts[1], $parts[2]);
+				$str = $parts[2];
+			}
+			else {
+				break;
+			}
+		}
+		
+		return $output;
+	}
+	
+	
+	function handleSpanToken($token, &$str) {
+	#
+	# Handle $token provided by parseSpan by determining its nature and 
+	# returning the corresponding value that should replace it.
+	#
+		switch ($token{0}) {
+			case "\\":
+				return $this->hashPart("&#". ord($token{1}). ";");
+			case "`":
+				# Search for end marker in remaining text.
+				if (preg_match('/^(.*?[^`])'.$token.'(?!`)(.*)$/sm', 
+					$str, $matches))
+				{
+					$str = $matches[2];
+					$codespan = $this->makeCodeSpan($matches[1]);
+					return $this->hashPart($codespan);
+				}
+				return $token; // return as text since no ending marker found.
+			default:
+				return $this->hashPart($token);
+		}
+	}
+
+
+	function outdent($text) {
+	#
+	# Remove one level of line-leading tabs or spaces
+	#
+		return preg_replace('/^(\t|[ ]{1,'.$this->tab_width.'})/m', '', $text);
+	}
+
+
+	# String length function for detab. `_initDetab` will create a function to 
+	# hanlde UTF-8 if the default function does not exist.
+	var $utf8_strlen = 'mb_strlen';
+	
+	function detab($text) {
+	#
+	# Replace tabs with the appropriate amount of space.
+	#
+		# For each line we separate the line in blocks delemited by
+		# tab characters. Then we reconstruct every line by adding the 
+		# appropriate number of space between each blocks.
+		
+		$text = preg_replace_callback('/^.*\t.*$/m',
+			array(&$this, '_detab_callback'), $text);
+
+		return $text;
+	}
+	function _detab_callback($matches) {
+		$line = $matches[0];
+		$strlen = $this->utf8_strlen; # strlen function for UTF-8.
+		
+		# Split in blocks.
+		$blocks = explode("\t", $line);
+		# Add each blocks to the line.
+		$line = $blocks[0];
+		unset($blocks[0]); # Do not add first block twice.
+		foreach ($blocks as $block) {
+			# Calculate amount of space, insert spaces, insert block.
+			$amount = $this->tab_width - 
+				$strlen($line, 'UTF-8') % $this->tab_width;
+			$line .= str_repeat(" ", $amount) . $block;
+		}
+		return $line;
+	}
+	function _initDetab() {
+	#
+	# Check for the availability of the function in the `utf8_strlen` property
+	# (initially `mb_strlen`). If the function is not available, create a 
+	# function that will loosely count the number of UTF-8 characters with a
+	# regular expression.
+	#
+		if (function_exists($this->utf8_strlen)) return;
+		$this->utf8_strlen = create_function('$text', 'return preg_match_all(
+			"/[\\\\x00-\\\\xBF]|[\\\\xC0-\\\\xFF][\\\\x80-\\\\xBF]*/", 
+			$text, $m);');
+	}
+
+
+	function unhash($text) {
+	#
+	# Swap back in all the tags hashed by _HashHTMLBlocks.
+	#
+		return preg_replace_callback('/(.)\x1A[0-9]+\1/', 
+			array(&$this, '_unhash_callback'), $text);
+	}
+	function _unhash_callback($matches) {
+		return $this->html_hashes[$matches[0]];
+	}
+
+}
+
+
+#
+# Markdown Extra Parser Class
+#
+
+class MarkdownExtra_Parser extends Markdown_Parser {
+
+	# Prefix for footnote ids.
+	var $fn_id_prefix = "";
+	
+	# Optional title attribute for footnote links and backlinks.
+	var $fn_link_title = MARKDOWN_FN_LINK_TITLE;
+	var $fn_backlink_title = MARKDOWN_FN_BACKLINK_TITLE;
+	
+	# Optional class attribute for footnote links and backlinks.
+	var $fn_link_class = MARKDOWN_FN_LINK_CLASS;
+	var $fn_backlink_class = MARKDOWN_FN_BACKLINK_CLASS;
+	
+	# Predefined abbreviations.
+	var $predef_abbr = array();
+
+
+	function MarkdownExtra_Parser() {
+	#
+	# Constructor function. Initialize the parser object.
+	#
+		# Add extra escapable characters before parent constructor 
+		# initialize the table.
+		$this->escape_chars .= ':|';
+		
+		# Insert extra document, block, and span transformations. 
+		# Parent constructor will do the sorting.
+		$this->document_gamut += array(
+			"stripFootnotes"     => 15,
+			"stripAbbreviations" => 25,
+			"appendFootnotes"    => 50,
+			);
+		$this->block_gamut += array(
+			"doFencedCodeBlocks" => 5,
+			"doTables"           => 15,
+			"doDefLists"         => 45,
+			);
+		$this->span_gamut += array(
+			"doFootnotes"        => 5,
+			"doAbbreviations"    => 70,
+			);
+		
+		parent::Markdown_Parser();
+	}
+	
+	
+	# Extra hashes used during extra transformations.
+	var $footnotes = array();
+	var $footnotes_ordered = array();
+	var $abbr_desciptions = array();
+	var $abbr_matches = array();
+	
+	# Give the current footnote number.
+	var $footnote_counter = 1;
+	
+	
+	function setup() {
+	#
+	# Setting up Extra-specific variables.
+	#
+		parent::setup();
+		
+		$this->footnotes = array();
+		$this->footnotes_ordered = array();
+		$this->abbr_desciptions = array();
+		$this->abbr_matches = array();
+		$this->footnote_counter = 1;
+		
+		foreach ($this->predef_abbr as $abbr_word => $abbr_desc) {
+			$this->abbr_matches[] = preg_quote($abbr_word);
+			$this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
+		}
+	}
+	
+	function teardown() {
+	#
+	# Clearing Extra-specific variables.
+	#
+		$this->footnotes = array();
+		$this->footnotes_ordered = array();
+		$this->abbr_desciptions = array();
+		$this->abbr_matches = array();
+		
+		parent::teardown();
+	}
+	
+	
+	### HTML Block Parser ###
+	
+	# Tags that are always treated as block tags:
+	var $block_tags = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|form|fieldset|iframe|hr|legend';
+	
+	# Tags treated as block tags only if the opening tag is alone on it's line:
+	var $context_block_tags = 'script|noscript|math|ins|del';
+	
+	# Tags where markdown="1" default to span mode:
+	var $contain_span_tags = 'p|h[1-6]|li|dd|dt|td|th|legend|address';
+	
+	# Tags which must not have their contents modified, no matter where 
+	# they appear:
+	var $clean_tags = 'script|math';
+	
+	# Tags that do not need to be closed.
+	var $auto_close_tags = 'hr|img';
+	
+
+	function hashHTMLBlocks($text) {
+	#
+	# Hashify HTML Blocks and "clean tags".
+	#
+	# We only want to do this for block-level HTML tags, such as headers,
+	# lists, and tables. That's because we still want to wrap <p>s around
+	# "paragraphs" that are wrapped in non-block-level tags, such as anchors,
+	# phrase emphasis, and spans. The list of tags we're looking for is
+	# hard-coded.
+	#
+	# This works by calling _HashHTMLBlocks_InMarkdown, which then calls
+	# _HashHTMLBlocks_InHTML when it encounter block tags. When the markdown="1" 
+	# attribute is found whitin a tag, _HashHTMLBlocks_InHTML calls back
+	#  _HashHTMLBlocks_InMarkdown to handle the Markdown syntax within the tag.
+	# These two functions are calling each other. It's recursive!
+	#
+		#
+		# Call the HTML-in-Markdown hasher.
+		#
+		list($text, ) = $this->_hashHTMLBlocks_inMarkdown($text);
+		
+		return $text;
+	}
+	function _hashHTMLBlocks_inMarkdown($text, $indent = 0, 
+										$enclosing_tag = '', $span = false)
+	{
+	#
+	# Parse markdown text, calling _HashHTMLBlocks_InHTML for block tags.
+	#
+	# *   $indent is the number of space to be ignored when checking for code 
+	#     blocks. This is important because if we don't take the indent into 
+	#     account, something like this (which looks right) won't work as expected:
+	#
+	#     <div>
+	#         <div markdown="1">
+	#         Hello World.  <-- Is this a Markdown code block or text?
+	#         </div>  <-- Is this a Markdown code block or a real tag?
+	#     <div>
+	#
+	#     If you don't like this, just don't indent the tag on which
+	#     you apply the markdown="1" attribute.
+	#
+	# *   If $enclosing_tag is not empty, stops at the first unmatched closing 
+	#     tag with that name. Nested tags supported.
+	#
+	# *   If $span is true, text inside must treated as span. So any double 
+	#     newline will be replaced by a single newline so that it does not create 
+	#     paragraphs.
+	#
+	# Returns an array of that form: ( processed text , remaining text )
+	#
+		if ($text === '') return array('', '');
+
+		# Regex to check for the presense of newlines around a block tag.
+		$newline_match_before = '/(?:^\n?|\n\n)*$/';
+		$newline_match_after = 
+			'{
+				^						# Start of text following the tag.
+				(?>[ ]*<!--.*?-->)?		# Optional comment.
+				[ ]*\n					# Must be followed by newline.
+			}xs';
+		
+		# Regex to match any tag.
+		$block_tag_match =
+			'{
+				(					# $2: Capture hole tag.
+					</?					# Any opening or closing tag.
+						(?>				# Tag name.
+							'.$this->block_tags.'			|
+							'.$this->context_block_tags.'	|
+							'.$this->clean_tags.'        	|
+							(?!\s)'.$enclosing_tag.'
+						)
+						(?:
+							(?=[\s"\'/])		# Allowed characters after tag name.
+							(?>
+								".*?"		|	# Double quotes (can contain `>`)
+								\'.*?\'   	|	# Single quotes (can contain `>`)
+								.+?				# Anything but quotes and `>`.
+							)*?
+						)?
+					>					# End of tag.
+				|
+					<!--    .*?     -->	# HTML Comment
+				|
+					<\?.*?\?> | <%.*?%>	# Processing instruction
+				|
+					<!\[CDATA\[.*?\]\]>	# CData Block
+				|
+					# Code span marker
+					`+
+				'. ( !$span ? ' # If not in span.
+				|
+					# Indented code block
+					(?> ^[ ]*\n? | \n[ ]*\n )
+					[ ]{'.($indent+4).'}[^\n]* \n
+					(?>
+						(?: [ ]{'.($indent+4).'}[^\n]* | [ ]* ) \n
+					)*
+				|
+					# Fenced code block marker
+					(?> ^ | \n )
+					[ ]{'.($indent).'}~~~+[ ]*\n
+				' : '' ). ' # End (if not is span).
+				)
+			}xs';
+
+		
+		$depth = 0;		# Current depth inside the tag tree.
+		$parsed = "";	# Parsed text that will be returned.
+
+		#
+		# Loop through every tag until we find the closing tag of the parent
+		# or loop until reaching the end of text if no parent tag specified.
+		#
+		do {
+			#
+			# Split the text using the first $tag_match pattern found.
+			# Text before  pattern will be first in the array, text after
+			# pattern will be at the end, and between will be any catches made 
+			# by the pattern.
+			#
+			$parts = preg_split($block_tag_match, $text, 2, 
+								PREG_SPLIT_DELIM_CAPTURE);
+			
+			# If in Markdown span mode, add a empty-string span-level hash 
+			# after each newline to prevent triggering any block element.
+			if ($span) {
+				$void = $this->hashPart("", ':');
+				$newline = "$void\n";
+				$parts[0] = $void . str_replace("\n", $newline, $parts[0]) . $void;
+			}
+			
+			$parsed .= $parts[0]; # Text before current tag.
+			
+			# If end of $text has been reached. Stop loop.
+			if (count($parts) < 3) {
+				$text = "";
+				break;
+			}
+			
+			$tag  = $parts[1]; # Tag to handle.
+			$text = $parts[2]; # Remaining text after current tag.
+			
+			#
+			# Check for: Code span marker
+			#
+			if ($tag{0} == "`") {
+				# Find corresponding end marker.
+				if (preg_match('{^(?>.+?|\n(?!\n))*?(?<!`)'.$tag.'(?!`)}', 
+					$text, $matches))
+				{
+					# End marker found: pass text unchanged until marker.
+					$parsed .= $tag . $matches[0];
+					$text = substr($text, strlen($matches[0]));
+				}
+				else {
+					# Unmatched marker: just skip it.
+					$parsed .= $tag;
+				}
+			}
+			#
+			# Check for: Indented code block or fenced code block marker.
+			#
+			else if ($tag{0} == "\n" || $tag{0} == "~") {
+				if ($tag{1} == "\n" || $tag{1} == " ") {
+					# Indented code block: pass it unchanged, will be handled 
+					# later.
+					$parsed .= $tag;
+				}
+				else {
+					# Fenced code block marker: find matching end marker.
+					if (preg_match('{^(?>.*\n)+?'.trim($tag).' *\n}', $text, 
+						$matches)) 
+					{
+						# End marker found: pass text unchanged until marker.
+						$parsed .= $tag . $matches[0];
+						$text = substr($text, strlen($matches[0]));
+					}
+					else {
+						# No end marker: just skip it.
+						$parsed .= $tag;
+					}
+				}
+			}
+			#
+			# Check for: Opening Block level tag or
+			#            Opening Content Block tag (like ins and del) 
+			#               used as a block tag (tag is alone on it's line).
+			#
+			else if (preg_match("{^<(?:$this->block_tags)\b}", $tag) ||
+				(	preg_match("{^<(?:$this->context_block_tags)\b}", $tag) &&
+					preg_match($newline_match_before, $parsed) &&
+					preg_match($newline_match_after, $text)	)
+				)
+			{
+				# Need to parse tag and following text using the HTML parser.
+				list($block_text, $text) = 
+					$this->_hashHTMLBlocks_inHTML($tag . $text, "hashBlock", true);
+				
+				# Make sure it stays outside of any paragraph by adding newlines.
+				$parsed .= "\n\n$block_text\n\n";
+			}
+			#
+			# Check for: Clean tag (like script, math)
+			#            HTML Comments, processing instructions.
+			#
+			else if (preg_match("{^<(?:$this->clean_tags)\b}", $tag) ||
+				$tag{1} == '!' || $tag{1} == '?')
+			{
+				# Need to parse tag and following text using the HTML parser.
+				# (don't check for markdown attribute)
+				list($block_text, $text) = 
+					$this->_hashHTMLBlocks_inHTML($tag . $text, "hashClean", false);
+				
+				$parsed .= $block_text;
+			}
+			#
+			# Check for: Tag with same name as enclosing tag.
+			#
+			else if ($enclosing_tag !== '' &&
+				# Same name as enclosing tag.
+				preg_match("{^</?(?:$enclosing_tag)\b}", $tag))
+			{
+				#
+				# Increase/decrease nested tag count.
+				#
+				if ($tag{1} == '/')						$depth--;
+				else if ($tag{strlen($tag)-2} != '/')	$depth++;
+
+				if ($depth < 0) {
+					#
+					# Going out of parent element. Clean up and break so we
+					# return to the calling function.
+					#
+					$text = $tag . $text;
+					break;
+				}
+				
+				$parsed .= $tag;
+			}
+			else {
+				$parsed .= $tag;
+			}
+		} while ($depth >= 0);
+		
+		return array($parsed, $text);
+	}
+	function _hashHTMLBlocks_inHTML($text, $hash_method, $md_attr) {
+	#
+	# Parse HTML, calling _HashHTMLBlocks_InMarkdown for block tags.
+	#
+	# *   Calls $hash_method to convert any blocks.
+	# *   Stops when the first opening tag closes.
+	# *   $md_attr indicate if the use of the `markdown="1"` attribute is allowed.
+	#     (it is not inside clean tags)
+	#
+	# Returns an array of that form: ( processed text , remaining text )
+	#
+		if ($text === '') return array('', '');
+		
+		# Regex to match `markdown` attribute inside of a tag.
+		$markdown_attr_match = '
+			{
+				\s*			# Eat whitespace before the `markdown` attribute
+				markdown
+				\s*=\s*
+				(?>
+					(["\'])		# $1: quote delimiter		
+					(.*?)		# $2: attribute value
+					\1			# matching delimiter	
+				|
+					([^\s>]*)	# $3: unquoted attribute value
+				)
+				()				# $4: make $3 always defined (avoid warnings)
+			}xs';
+		
+		# Regex to match any tag.
+		$tag_match = '{
+				(					# $2: Capture hole tag.
+					</?					# Any opening or closing tag.
+						[\w:$]+			# Tag name.
+						(?:
+							(?=[\s"\'/])		# Allowed characters after tag name.
+							(?>
+								".*?"		|	# Double quotes (can contain `>`)
+								\'.*?\'   	|	# Single quotes (can contain `>`)
+								.+?				# Anything but quotes and `>`.
+							)*?
+						)?
+					>					# End of tag.
+				|
+					<!--    .*?     -->	# HTML Comment
+				|
+					<\?.*?\?> | <%.*?%>	# Processing instruction
+				|
+					<!\[CDATA\[.*?\]\]>	# CData Block
+				)
+			}xs';
+		
+		$original_text = $text;		# Save original text in case of faliure.
+		
+		$depth		= 0;	# Current depth inside the tag tree.
+		$block_text	= "";	# Temporary text holder for current text.
+		$parsed		= "";	# Parsed text that will be returned.
+
+		#
+		# Get the name of the starting tag.
+		#
+		if (preg_match("/^<([\w:$]*)\b/", $text, $matches))
+			$base_tag_name = $matches[1];
+
+		#
+		# Loop through every tag until we find the corresponding closing tag.
+		#
+		do {
+			#
+			# Split the text using the first $tag_match pattern found.
+			# Text before  pattern will be first in the array, text after
+			# pattern will be at the end, and between will be any catches made 
+			# by the pattern.
+			#
+			$parts = preg_split($tag_match, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
+			
+			if (count($parts) < 3) {
+				#
+				# End of $text reached with unbalenced tag(s).
+				# In that case, we return original text unchanged and pass the
+				# first character as filtered to prevent an infinite loop in the 
+				# parent function.
+				#
+				return array($original_text{0}, substr($original_text, 1));
+			}
+			
+			$block_text .= $parts[0]; # Text before current tag.
+			$tag         = $parts[1]; # Tag to handle.
+			$text        = $parts[2]; # Remaining text after current tag.
+			
+			#
+			# Check for: Auto-close tag (like <hr/>)
+			#			 Comments and Processing Instructions.
+			#
+			if (preg_match("{^</?(?:$this->auto_close_tags)\b}", $tag) ||
+				$tag{1} == '!' || $tag{1} == '?')
+			{
+				# Just add the tag to the block as if it was text.
+				$block_text .= $tag;
+			}
+			else {
+				#
+				# Increase/decrease nested tag count. Only do so if
+				# the tag's name match base tag's.
+				#
+				if (preg_match("{^</?$base_tag_name\b}", $tag)) {
+					if ($tag{1} == '/')						$depth--;
+					else if ($tag{strlen($tag)-2} != '/')	$depth++;
+				}
+				
+				#
+				# Check for `markdown="1"` attribute and handle it.
+				#
+				if ($md_attr && 
+					preg_match($markdown_attr_match, $tag, $attr_m) &&
+					preg_match('/^1|block|span$/', $attr_m[2] . $attr_m[3]))
+				{
+					# Remove `markdown` attribute from opening tag.
+					$tag = preg_replace($markdown_attr_match, '', $tag);
+					
+					# Check if text inside this tag must be parsed in span mode.
+					$this->mode = $attr_m[2] . $attr_m[3];
+					$span_mode = $this->mode == 'span' || $this->mode != 'block' &&
+						preg_match("{^<(?:$this->contain_span_tags)\b}", $tag);
+					
+					# Calculate indent before tag.
+					if (preg_match('/(?:^|\n)( *?)(?! ).*?$/', $block_text, $matches)) {
+						$strlen = $this->utf8_strlen;
+						$indent = $strlen($matches[1], 'UTF-8');
+					} else {
+						$indent = 0;
+					}
+					
+					# End preceding block with this tag.
+					$block_text .= $tag;
+					$parsed .= $this->$hash_method($block_text);
+					
+					# Get enclosing tag name for the ParseMarkdown function.
+					preg_match('/^<([\w:$]*)\b/', $tag, $matches);
+					$tag_name = $matches[1];
+					
+					# Parse the content using the HTML-in-Markdown parser.
+					list ($block_text, $text)
+						= $this->_hashHTMLBlocks_inMarkdown($text, $indent, 
+														$tag_name, $span_mode);
+					
+					# Outdent markdown text.
+					if ($indent > 0) {
+						$block_text = preg_replace("/^[ ]{1,$indent}/m", "", 
+													$block_text);
+					}
+					
+					# Append tag content to parsed text.
+					if (!$span_mode)	$parsed .= "\n\n$block_text\n\n";
+					else				$parsed .= "$block_text";
+					
+					# Start over a new block.
+					$block_text = "";
+				}
+				else $block_text .= $tag;
+			}
+			
+		} while ($depth > 0);
+		
+		#
+		# Hash last block text that wasn't processed inside the loop.
+		#
+		$parsed .= $this->$hash_method($block_text);
+		
+		return array($parsed, $text);
+	}
+
+
+	function hashClean($text) {
+	#
+	# Called whenever a tag must be hashed when a function insert a "clean" tag
+	# in $text, it pass through this function and is automaticaly escaped, 
+	# blocking invalid nested overlap.
+	#
+		return $this->hashPart($text, 'C');
+	}
+
+
+	function doHeaders($text) {
+	#
+	# Redefined to add id attribute support.
+	#
+		# Setext-style headers:
+		#	  Header 1  {#header1}
+		#	  ========
+		#  
+		#	  Header 2  {#header2}
+		#	  --------
+		#
+		$text = preg_replace_callback(
+			'{
+				(^.+?)								# $1: Header text
+				(?:[ ]+\{\#([-_:a-zA-Z0-9]+)\})?	# $2: Id attribute
+				[ ]*\n(=+|-+)[ ]*\n+				# $3: Header footer
+			}mx',
+			array(&$this, '_doHeaders_callback_setext'), $text);
+
+		# atx-style headers:
+		#	# Header 1        {#header1}
+		#	## Header 2       {#header2}
+		#	## Header 2 with closing hashes ##  {#header3}
+		#	...
+		#	###### Header 6   {#header2}
+		#
+		$text = preg_replace_callback('{
+				^(\#{1,6})	# $1 = string of #\'s
+				[ ]*
+				(.+?)		# $2 = Header text
+				[ ]*
+				\#*			# optional closing #\'s (not counted)
+				(?:[ ]+\{\#([-_:a-zA-Z0-9]+)\})? # id attribute
+				[ ]*
+				\n+
+			}xm',
+			array(&$this, '_doHeaders_callback_atx'), $text);
+
+		return $text;
+	}
+	function _doHeaders_attr($attr) {
+		if (empty($attr))  return "";
+		return " id=\"$attr\"";
+	}
+	function _doHeaders_callback_setext($matches) {
+		$level = $matches[3]{0} == '=' ? 1 : 2;
+		$attr  = $this->_doHeaders_attr($id =& $matches[2]);
+		$block = "<h$level$attr>".$this->runSpanGamut($matches[1])."</h$level>";
+		return "\n" . $this->hashBlock($block) . "\n\n";
+	}
+	function _doHeaders_callback_atx($matches) {
+		$level = strlen($matches[1]);
+		$attr  = $this->_doHeaders_attr($id =& $matches[3]);
+		$block = "<h$level$attr>".$this->runSpanGamut($matches[2])."</h$level>";
+		return "\n" . $this->hashBlock($block) . "\n\n";
+	}
+
+
+	function doTables($text) {
+	#
+	# Form HTML tables.
+	#
+		$less_than_tab = $this->tab_width - 1;
+		#
+		# Find tables with leading pipe.
+		#
+		#	| Header 1 | Header 2
+		#	| -------- | --------
+		#	| Cell 1   | Cell 2
+		#	| Cell 3   | Cell 4
+		#
+		$text = preg_replace_callback('
+			{
+				^							# Start of a line
+				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
+				[|]							# Optional leading pipe (present)
+				(.+) \n						# $1: Header row (at least one pipe)
+				
+				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
+				[|] ([ ]*[-:]+[-| :]*) \n	# $2: Header underline
+				
+				(							# $3: Cells
+					(?>
+						[ ]*				# Allowed whitespace.
+						[|] .* \n			# Row content.
+					)*
+				)
+				(?=\n|\Z)					# Stop at final double newline.
+			}xm',
+			array(&$this, '_doTable_leadingPipe_callback'), $text);
+		
+		#
+		# Find tables without leading pipe.
+		#
+		#	Header 1 | Header 2
+		#	-------- | --------
+		#	Cell 1   | Cell 2
+		#	Cell 3   | Cell 4
+		#
+		$text = preg_replace_callback('
+			{
+				^							# Start of a line
+				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
+				(\S.*[|].*) \n				# $1: Header row (at least one pipe)
+				
+				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
+				([-:]+[ ]*[|][-| :]*) \n	# $2: Header underline
+				
+				(							# $3: Cells
+					(?>
+						.* [|] .* \n		# Row content
+					)*
+				)
+				(?=\n|\Z)					# Stop at final double newline.
+			}xm',
+			array(&$this, '_DoTable_callback'), $text);
+
+		return $text;
+	}
+	function _doTable_leadingPipe_callback($matches) {
+		$head		= $matches[1];
+		$underline	= $matches[2];
+		$content	= $matches[3];
+		
+		# Remove leading pipe for each row.
+		$content	= preg_replace('/^ *[|]/m', '', $content);
+		
+		return $this->_doTable_callback(array($matches[0], $head, $underline, $content));
+	}
+	function _doTable_callback($matches) {
+		$head		= $matches[1];
+		$underline	= $matches[2];
+		$content	= $matches[3];
+
+		# Remove any tailing pipes for each line.
+		$head		= preg_replace('/[|] *$/m', '', $head);
+		$underline	= preg_replace('/[|] *$/m', '', $underline);
+		$content	= preg_replace('/[|] *$/m', '', $content);
+		
+		# Reading alignement from header underline.
+		$separators	= preg_split('/ *[|] */', $underline);
+		foreach ($separators as $n => $s) {
+			if (preg_match('/^ *-+: *$/', $s))		$attr[$n] = ' align="right"';
+			else if (preg_match('/^ *:-+: *$/', $s))$attr[$n] = ' align="center"';
+			else if (preg_match('/^ *:-+ *$/', $s))	$attr[$n] = ' align="left"';
+			else									$attr[$n] = '';
+		}
+		
+		# Parsing span elements, including code spans, character escapes, 
+		# and inline HTML tags, so that pipes inside those gets ignored.
+		$head		= $this->parseSpan($head);
+		$headers	= preg_split('/ *[|] */', $head);
+		$col_count	= count($headers);
+		
+		# Write column headers.
+		$text = "<table>\n";
+		$text .= "<thead>\n";
+		$text .= "<tr>\n";
+		foreach ($headers as $n => $header)
+			$text .= "  <th$attr[$n]>".$this->runSpanGamut(trim($header))."</th>\n";
+		$text .= "</tr>\n";
+		$text .= "</thead>\n";
+		
+		# Split content by row.
+		$rows = explode("\n", trim($content, "\n"));
+		
+		$text .= "<tbody>\n";
+		foreach ($rows as $row) {
+			# Parsing span elements, including code spans, character escapes, 
+			# and inline HTML tags, so that pipes inside those gets ignored.
+			$row = $this->parseSpan($row);
+			
+			# Split row by cell.
+			$row_cells = preg_split('/ *[|] */', $row, $col_count);
+			$row_cells = array_pad($row_cells, $col_count, '');
+			
+			$text .= "<tr>\n";
+			foreach ($row_cells as $n => $cell)
+				$text .= "  <td$attr[$n]>".$this->runSpanGamut(trim($cell))."</td>\n";
+			$text .= "</tr>\n";
+		}
+		$text .= "</tbody>\n";
+		$text .= "</table>";
+		
+		return $this->hashBlock($text) . "\n";
+	}
+
+	
+	function doDefLists($text) {
+	#
+	# Form HTML definition lists.
+	#
+		$less_than_tab = $this->tab_width - 1;
+
+		# Re-usable pattern to match any entire dl list:
+		$whole_list = '(?>
+			(								# $1 = whole list
+			  (								# $2
+				[ ]{0,'.$less_than_tab.'}
+				((?>.*\S.*\n)+)				# $3 = defined term
+				\n?
+				[ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
+			  )
+			  (?s:.+?)
+			  (								# $4
+				  \z
+				|
+				  \n{2,}
+				  (?=\S)
+				  (?!						# Negative lookahead for another term
+					[ ]{0,'.$less_than_tab.'}
+					(?: \S.*\n )+?			# defined term
+					\n?
+					[ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
+				  )
+				  (?!						# Negative lookahead for another definition
+					[ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
+				  )
+			  )
+			)
+		)'; // mx
+
+		$text = preg_replace_callback('{
+				(?>\A\n?|(?<=\n\n))
+				'.$whole_list.'
+			}mx',
+			array(&$this, '_doDefLists_callback'), $text);
+
+		return $text;
+	}
+	function _doDefLists_callback($matches) {
+		# Re-usable patterns to match list item bullets and number markers:
+		$list = $matches[1];
+		
+		# Turn double returns into triple returns, so that we can make a
+		# paragraph for the last item in a list, if necessary:
+		$result = trim($this->processDefListItems($list));
+		$result = "<dl>\n" . $result . "\n</dl>";
+		return $this->hashBlock($result) . "\n\n";
+	}
+
+
+	function processDefListItems($list_str) {
+	#
+	#	Process the contents of a single definition list, splitting it
+	#	into individual term and definition list items.
+	#
+		$less_than_tab = $this->tab_width - 1;
+		
+		# trim trailing blank lines:
+		$list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str);
+
+		# Process definition terms.
+		$list_str = preg_replace_callback('{
+			(?>\A\n?|\n\n+)					# leading line
+			(								# definition terms = $1
+				[ ]{0,'.$less_than_tab.'}	# leading whitespace
+				(?![:][ ]|[ ])				# negative lookahead for a definition 
+											#   mark (colon) or more whitespace.
+				(?> \S.* \n)+?				# actual term (not whitespace).	
+			)			
+			(?=\n?[ ]{0,3}:[ ])				# lookahead for following line feed 
+											#   with a definition mark.
+			}xm',
+			array(&$this, '_processDefListItems_callback_dt'), $list_str);
+
+		# Process actual definitions.
+		$list_str = preg_replace_callback('{
+			\n(\n+)?						# leading line = $1
+			(								# marker space = $2
+				[ ]{0,'.$less_than_tab.'}	# whitespace before colon
+				[:][ ]+						# definition mark (colon)
+			)
+			((?s:.+?))						# definition text = $3
+			(?= \n+ 						# stop at next definition mark,
+				(?:							# next term or end of text
+					[ ]{0,'.$less_than_tab.'} [:][ ]	|
+					<dt> | \z
+				)						
+			)					
+			}xm',
+			array(&$this, '_processDefListItems_callback_dd'), $list_str);
+
+		return $list_str;
+	}
+	function _processDefListItems_callback_dt($matches) {
+		$terms = explode("\n", trim($matches[1]));
+		$text = '';
+		foreach ($terms as $term) {
+			$term = $this->runSpanGamut(trim($term));
+			$text .= "\n<dt>" . $term . "</dt>";
+		}
+		return $text . "\n";
+	}
+	function _processDefListItems_callback_dd($matches) {
+		$leading_line	= $matches[1];
+		$marker_space	= $matches[2];
+		$def			= $matches[3];
+
+		if ($leading_line || preg_match('/\n{2,}/', $def)) {
+			# Replace marker with the appropriate whitespace indentation
+			$def = str_repeat(' ', strlen($marker_space)) . $def;
+			$def = $this->runBlockGamut($this->outdent($def . "\n\n"));
+			$def = "\n". $def ."\n";
+		}
+		else {
+			$def = rtrim($def);
+			$def = $this->runSpanGamut($this->outdent($def));
+		}
+
+		return "\n<dd>" . $def . "</dd>\n";
+	}
+
+
+	function doFencedCodeBlocks($text) {
+	#
+	# Adding the fenced code block syntax to regular Markdown:
+	#
+	# ~~~
+	# Code block
+	# ~~~
+	#
+		$less_than_tab = $this->tab_width;
+		
+		$text = preg_replace_callback('{
+				(?:\n|\A)
+				# 1: Opening marker
+				(
+					~{3,} # Marker: three tilde or more.
+				)
+				[ ]* \n # Whitespace and newline following marker.
+				
+				# 2: Content
+				(
+					(?>
+						(?!\1 [ ]* \n)	# Not a closing marker.
+						.*\n+
+					)+
+				)
+				
+				# Closing marker.
+				\1 [ ]* \n
+			}xm',
+			array(&$this, '_doFencedCodeBlocks_callback'), $text);
+
+		return $text;
+	}
+	function _doFencedCodeBlocks_callback($matches) {
+		$codeblock = $matches[2];
+		$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
+		$codeblock = preg_replace_callback('/^\n+/',
+			array(&$this, '_doFencedCodeBlocks_newlines'), $codeblock);
+		$codeblock = "<pre><code>$codeblock</code></pre>";
+		return "\n\n".$this->hashBlock($codeblock)."\n\n";
+	}
+	function _doFencedCodeBlocks_newlines($matches) {
+		return str_repeat("<br$this->empty_element_suffix", 
+			strlen($matches[0]));
+	}
+
+
+	function doItalicsAndBold($text) {
+	#
+	# Redefined to change emphasis by underscore behaviour so that it does not 
+	# work in the middle of a word.
+	#
+		# <strong> must go first:
+		$text = preg_replace_callback(array(
+			'{
+				(						# $1: Marker
+					(?<![a-zA-Z0-9])	# Not preceded by alphanum
+					(?<!__)				#	or by two marker chars.
+					__
+				)
+				(?=\S) 					# Not followed by whitespace 
+				(?!__)					#   or two others marker chars.
+				(						# $2: Content
+					(?>
+						[^_]+?			# Anthing not em markers.
+					|
+										# Balence any regular _ emphasis inside.
+						(?<![a-zA-Z0-9]) _ (?=\S) (.+?) 
+						(?<=\S) _ (?![a-zA-Z0-9])
+					|
+						_+				# Allow unbalenced as last resort.
+					)+?
+				)
+				(?<=\S) __				# End mark not preceded by whitespace.
+				(?![a-zA-Z0-9])			# Not followed by alphanum
+				(?!__)					#   or two others marker chars.
+			}sx',
+			'{
+				( (?<!\*\*) \*\* )		# $1: Marker (not preceded by two *)
+				(?=\S) 					# Not followed by whitespace 
+				(?!\1)					#   or two others marker chars.
+				(						# $2: Content
+					(?>
+						[^*]+?			# Anthing not em markers.
+					|
+										# Balence any regular * emphasis inside.
+						\* (?=\S) (.+?) (?<=\S) \*
+					|
+						\*				# Allow unbalenced as last resort.
+					)+?
+				)
+				(?<=\S) \*\*			# End mark not preceded by whitespace.
+			}sx',
+			),
+			array(&$this, '_doItalicAndBold_strong_callback'), $text);
+		# Then <em>:
+		$text = preg_replace_callback(array(
+			'{ ( (?<![a-zA-Z0-9])(?<!_)_ ) (?=\S) (?! \1) (.+?) (?<=\S) \1(?![a-zA-Z0-9]) }sx',
+			'{ ( (?<!\*)\* ) (?=\S) (?! \1) (.+?) (?<=\S)(?<!\s\*) \1 }sx',
+			),
+			array(&$this, '_doItalicAndBold_em_callback'), $text);
+
+		return $text;
+	}
+
+
+	function formParagraphs($text) {
+	#
+	#	Params:
+	#		$text - string to process with html <p> tags
+	#
+		# Strip leading and trailing lines:
+		$text = preg_replace('/\A\n+|\n+\z/', '', $text);
+		
+		$grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
+
+		#
+		# Wrap <p> tags and unhashify HTML blocks
+		#
+		foreach ($grafs as $key => $value) {
+			$value = trim($this->runSpanGamut($value));
+			
+			# Check if this should be enclosed in a paragraph.
+			# Clean tag hashes & block tag hashes are left alone.
+			$is_p = !preg_match('/^B\x1A[0-9]+B|^C\x1A[0-9]+C$/', $value);
+			
+			if ($is_p) {
+				$value = "<p>$value</p>";
+			}
+			$grafs[$key] = $value;
+		}
+		
+		# Join grafs in one text, then unhash HTML tags. 
+		$text = implode("\n\n", $grafs);
+		
+		# Finish by removing any tag hashes still present in $text.
+		$text = $this->unhash($text);
+		
+		return $text;
+	}
+	
+	
+	### Footnotes
+	
+	function stripFootnotes($text) {
+	#
+	# Strips link definitions from text, stores the URLs and titles in
+	# hash references.
+	#
+		$less_than_tab = $this->tab_width - 1;
+
+		# Link defs are in the form: [^id]: url "optional title"
+		$text = preg_replace_callback('{
+			^[ ]{0,'.$less_than_tab.'}\[\^(.+?)\][ ]?:	# note_id = $1
+			  [ ]*
+			  \n?					# maybe *one* newline
+			(						# text = $2 (no blank lines allowed)
+				(?:					
+					.+				# actual text
+				|
+					\n				# newlines but 
+					(?!\[\^.+?\]:\s)# negative lookahead for footnote marker.
+					(?!\n+[ ]{0,3}\S)# ensure line is not blank and followed 
+									# by non-indented content
+				)*
+			)		
+			}xm',
+			array(&$this, '_stripFootnotes_callback'),
+			$text);
+		return $text;
+	}
+	function _stripFootnotes_callback($matches) {
+		$note_id = $this->fn_id_prefix . $matches[1];
+		$this->footnotes[$note_id] = $this->outdent($matches[2]);
+		return ''; # String that will replace the block
+	}
+
+
+	function doFootnotes($text) {
+	#
+	# Replace footnote references in $text [^id] with a special text-token 
+	# which will be replaced by the actual footnote marker in appendFootnotes.
+	#
+		if (!$this->in_anchor) {
+			$text = preg_replace('{\[\^(.+?)\]}', "F\x1Afn:\\1\x1A:", $text);
+		}
+		return $text;
+	}
+
+	
+	function appendFootnotes($text) {
+	#
+	# Append footnote list to text.
+	#
+		$text = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}', 
+			array(&$this, '_appendFootnotes_callback'), $text);
+	
+		if (!empty($this->footnotes_ordered)) {
+			$text .= "\n\n";
+			$text .= "<div class=\"footnotes\">\n";
+			$text .= "<hr". MARKDOWN_EMPTY_ELEMENT_SUFFIX ."\n";
+			$text .= "<ol>\n\n";
+			
+			$attr = " rev=\"footnote\"";
+			if ($this->fn_backlink_class != "") {
+				$class = $this->fn_backlink_class;
+				$class = $this->encodeAttribute($class);
+				$attr .= " class=\"$class\"";
+			}
+			if ($this->fn_backlink_title != "") {
+				$title = $this->fn_backlink_title;
+				$title = $this->encodeAttribute($title);
+				$attr .= " title=\"$title\"";
+			}
+			$num = 0;
+			
+			while (!empty($this->footnotes_ordered)) {
+				$footnote = reset($this->footnotes_ordered);
+				$note_id = key($this->footnotes_ordered);
+				unset($this->footnotes_ordered[$note_id]);
+				
+				$footnote .= "\n"; # Need to append newline before parsing.
+				$footnote = $this->runBlockGamut("$footnote\n");				
+				$footnote = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}', 
+					array(&$this, '_appendFootnotes_callback'), $footnote);
+				
+				$attr2 = str_replace("%%", ++$num, $attr);
+				
+				# Add backlink to last paragraph; create new paragraph if needed.
+				$backlink = "<a href=\"#fnref:$note_id\"$attr2>&#8617;</a>";
+				if (preg_match('{</p>$}', $footnote)) {
+					$footnote = substr($footnote, 0, -4) . "&#160;$backlink</p>";
+				} else {
+					$footnote .= "\n\n<p>$backlink</p>";
+				}
+				
+				$text .= "<li id=\"fn:$note_id\">\n";
+				$text .= $footnote . "\n";
+				$text .= "</li>\n\n";
+			}
+			
+			$text .= "</ol>\n";
+			$text .= "</div>";
+		}
+		return $text;
+	}
+	function _appendFootnotes_callback($matches) {
+		$node_id = $this->fn_id_prefix . $matches[1];
+		
+		# Create footnote marker only if it has a corresponding footnote *and*
+		# the footnote hasn't been used by another marker.
+		if (isset($this->footnotes[$node_id])) {
+			# Transfert footnote content to the ordered list.
+			$this->footnotes_ordered[$node_id] = $this->footnotes[$node_id];
+			unset($this->footnotes[$node_id]);
+			
+			$num = $this->footnote_counter++;
+			$attr = " rel=\"footnote\"";
+			if ($this->fn_link_class != "") {
+				$class = $this->fn_link_class;
+				$class = $this->encodeAttribute($class);
+				$attr .= " class=\"$class\"";
+			}
+			if ($this->fn_link_title != "") {
+				$title = $this->fn_link_title;
+				$title = $this->encodeAttribute($title);
+				$attr .= " title=\"$title\"";
+			}
+			$attr = str_replace("%%", $num, $attr);
+			
+			return
+				"<sup id=\"fnref:$node_id\">".
+				"<a href=\"#fn:$node_id\"$attr>$num</a>".
+				"</sup>";
+		}
+		
+		return "[^".$matches[1]."]";
+	}
+		
+	
+	### Abbreviations ###
+	
+	function stripAbbreviations($text) {
+	#
+	# Strips abbreviations from text, stores titles in hash references.
+	#
+		$less_than_tab = $this->tab_width - 1;
+
+		# Link defs are in the form: [id]*: url "optional title"
+		$text = preg_replace_callback('{
+			^[ ]{0,'.$less_than_tab.'}\*\[(.+?)\][ ]?:	# abbr_id = $1
+			(.*)					# text = $2 (no blank lines allowed)	
+			}xm',
+			array(&$this, '_stripAbbreviations_callback'),
+			$text);
+		return $text;
+	}
+	function _stripAbbreviations_callback($matches) {
+		$abbr_word = $matches[1];
+		$abbr_desc = $matches[2];
+		$this->abbr_matches[] = preg_quote($abbr_word);
+		$this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
+		return ''; # String that will replace the block
+	}
+	
+	
+	function doAbbreviations($text) {
+	#
+	# Find defined abbreviations in text and wrap them in <abbr> elements.
+	#
+		if ($this->abbr_matches) {
+			// cannot use the /x modifier because abbr_matches may 
+			// contain spaces:
+			$text = preg_replace_callback('{'.
+				'(?<![\w\x1A])'.
+				'(?:'. implode('|', $this->abbr_matches) .')'.
+				'(?![\w\x1A])'.
+				'}', 
+				array(&$this, '_doAbbreviations_callback'), $text);
+		}
+		return $text;
+	}
+	function _doAbbreviations_callback($matches) {
+		$abbr = $matches[0];
+		if (isset($this->abbr_desciptions[$abbr])) {
+			$desc = $this->abbr_desciptions[$abbr];
+			if (empty($desc)) {
+				return $this->hashPart("<abbr>$abbr</abbr>");
+			} else {
+				$desc = htmlspecialchars($desc, ENT_NOQUOTES);
+				return $this->hashPart("<abbr title=\"$desc\">$abbr</abbr>");
+			}
+		} else {
+			return $matches[0];
+		}
+	}
+
+}
+
+
+/*
+
+PHP Markdown Extra
+==================
+
+Description
+-----------
+
+This is a PHP port of the original Markdown formatter written in Perl 
+by John Gruber. This special "Extra" version of PHP Markdown features 
+further enhancements to the syntax for making additional constructs 
+such as tables and definition list.
+
+Markdown is a text-to-HTML filter; it translates an easy-to-read /
+easy-to-write structured text format into HTML. Markdown's text format
+is most similar to that of plain text email, and supports features such
+as headers, *emphasis*, code blocks, blockquotes, and links.
+
+Markdown's syntax is designed not as a generic markup language, but
+specifically to serve as a front-end to (X)HTML. You can use span-level
+HTML tags anywhere in a Markdown document, and you can use block level
+HTML tags (like <div> and <table> as well).
+
+For more information about Markdown's syntax, see:
+
+<http://daringfireball.net/projects/markdown/>
+
+
+Bugs
+----
+
+To file bug reports please send email to:
+
+<michel.fortin@michelf.com>
+
+Please include with your report: (1) the example input; (2) the output you
+expected; (3) the output Markdown actually produced.
+
+
+Version History
+--------------- 
+
+See the readme file for detailed release notes for this version.
+
+
+Copyright and License
+---------------------
+
+PHP Markdown & Extra
+Copyright (c) 2004-2008 Michel Fortin  
+<http://www.michelf.com/>  
+All rights reserved.
+
+Based on Markdown  
+Copyright (c) 2003-2006 John Gruber   
+<http://daringfireball.net/>   
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+*	Redistributions of source code must retain the above copyright notice,
+	this list of conditions and the following disclaimer.
+
+*	Redistributions in binary form must reproduce the above copyright
+	notice, this list of conditions and the following disclaimer in the
+	documentation and/or other materials provided with the distribution.
+
+*	Neither the name "Markdown" nor the names of its contributors may
+	be used to endorse or promote products derived from this software
+	without specific prior written permission.
+
+This software is provided by the copyright holders and contributors "as
+is" and any express or implied warranties, including, but not limited
+to, the implied warranties of merchantability and fitness for a
+particular purpose are disclaimed. In no event shall the copyright owner
+or contributors be liable for any direct, indirect, incidental, special,
+exemplary, or consequential damages (including, but not limited to,
+procurement of substitute goods or services; loss of use, data, or
+profits; or business interruption) however caused and on any theory of
+liability, whether in contract, strict liability, or tort (including
+negligence or otherwise) arising in any way out of the use of this
+software, even if advised of the possibility of such damage.
+
+*/
+?>
\ No newline at end of file
diff --git a/src/Pluf/Text/Stemmer/Porter.php b/src/Pluf/Text/Stemmer/Porter.php
new file mode 100644
index 0000000..4d0c64a
--- /dev/null
+++ b/src/Pluf/Text/Stemmer/Porter.php
@@ -0,0 +1,433 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Copyright (c) 2005 Richard Heyes (http://www.phpguru.org/)
+ *
+ * All rights reserved.
+ *
+ * This script is free software.
+ *  
+ * Downloaded from: http://tartarus.org/~martin/PorterStemmer/php.txt
+ * Modified to be multibyte compatible.
+ */
+
+/**
+ * PHP5 Implementation of the Porter Stemmer algorithm. Certain elements
+ * were borrowed from the (broken) implementation by Jon Abernathy.
+ *
+ * Usage:
+ *
+ *  $stem = Pluf_Text_Stemmer_Porter::stem($word);
+ *
+ * How easy is that?
+ */
+
+class Pluf_Text_Stemmer_Porter
+{
+    /**
+     * Regex for matching a consonant
+     * @var string
+     */
+    private static $regex_consonant = '(?:[bcdfghjklmnpqrstvwxz]|(?<=[aeiou])y|^y)';
+
+
+    /**
+     * Regex for matching a vowel
+     * @var string
+     */
+    private static $regex_vowel = '(?:[aeiou]|(?<![aeiou])y)';
+
+
+    /**
+     * Stems a word. Simple huh?
+     *
+     * @param  string $word Word to stem
+     * @return string       Stemmed word
+     */
+    public static function stem($word)
+    {
+        if (strlen($word) <= 2) {
+            return $word;
+        }
+
+        $word = self::step1ab($word);
+        $word = self::step1c($word);
+        $word = self::step2($word);
+        $word = self::step3($word);
+        $word = self::step4($word);
+        $word = self::step5($word);
+
+        return $word;
+    }
+
+
+    /**
+     * Step 1
+     */
+    private static function step1ab($word)
+    {
+        // Part a
+        if (substr($word, -1) == 's') {
+
+            self::replace($word, 'sses', 'ss')
+                OR self::replace($word, 'ies', 'i')
+                OR self::replace($word, 'ss', 'ss')
+                OR self::replace($word, 's', '');
+        }
+
+        // Part b
+        if (substr($word, -2, 1) != 'e' OR !self::replace($word, 'eed', 'ee', 0)) { // First rule
+            $v = self::$regex_vowel;
+
+            // ing and ed
+            if (   preg_match("#$v+#", substr($word, 0, -3)) && self::replace($word, 'ing', '')
+                   OR preg_match("#$v+#", substr($word, 0, -2)) && self::replace($word, 'ed', '')) { // Note use of && and OR, for precedence reasons
+
+                // If one of above two test successful
+                if (    !self::replace($word, 'at', 'ate')
+                        AND !self::replace($word, 'bl', 'ble')
+                        AND !self::replace($word, 'iz', 'ize')) {
+
+                    // Double consonant ending
+                    if (    self::doubleConsonant($word)
+                            AND substr($word, -2) != 'll'
+                            AND substr($word, -2) != 'ss'
+                            AND substr($word, -2) != 'zz') {
+
+                        $word = substr($word, 0, -1);
+
+                    } else if (self::m($word) == 1 AND self::cvc($word)) {
+                        $word .= 'e';
+                    }
+                }
+            }
+        }
+        return $word;
+    }
+
+
+    /**
+     * Step 1c
+     *
+     * @param string $word Word to stem
+     */
+    private static function step1c($word)
+    {
+        $v = self::$regex_vowel;
+
+        if (substr($word, -1) == 'y' && preg_match("#$v+#", substr($word, 0, -1))) {
+            self::replace($word, 'y', 'i');
+        }
+
+        return $word;
+    }
+
+
+    /**
+     * Step 2
+     *
+     * @param string $word Word to stem
+     */
+    private static function step2($word)
+    {
+        switch (substr($word, -2, 1)) {
+        case 'a':
+            self::replace($word, 'ational', 'ate', 0)
+                OR self::replace($word, 'tional', 'tion', 0);
+            break;
+
+        case 'c':
+            self::replace($word, 'enci', 'ence', 0)
+                OR self::replace($word, 'anci', 'ance', 0);
+            break;
+
+        case 'e':
+            self::replace($word, 'izer', 'ize', 0);
+            break;
+
+        case 'g':
+            self::replace($word, 'logi', 'log', 0);
+            break;
+
+        case 'l':
+            self::replace($word, 'entli', 'ent', 0)
+                OR self::replace($word, 'ousli', 'ous', 0)
+                OR self::replace($word, 'alli', 'al', 0)
+                OR self::replace($word, 'bli', 'ble', 0)
+                OR self::replace($word, 'eli', 'e', 0);
+            break;
+
+        case 'o':
+            self::replace($word, 'ization', 'ize', 0)
+                OR self::replace($word, 'ation', 'ate', 0)
+                OR self::replace($word, 'ator', 'ate', 0);
+            break;
+
+        case 's':
+            self::replace($word, 'iveness', 'ive', 0)
+                OR self::replace($word, 'fulness', 'ful', 0)
+                OR self::replace($word, 'ousness', 'ous', 0)
+                OR self::replace($word, 'alism', 'al', 0);
+            break;
+
+        case 't':
+            self::replace($word, 'biliti', 'ble', 0)
+                OR self::replace($word, 'aliti', 'al', 0)
+                OR self::replace($word, 'iviti', 'ive', 0);
+            break;
+        }
+
+        return $word;
+    }
+
+
+    /**
+     * Step 3
+     *
+     * @param string $word String to stem
+     */
+    private static function step3($word)
+    {
+        switch (substr($word, -2, 1)) {
+        case 'a':
+            self::replace($word, 'ical', 'ic', 0);
+            break;
+
+        case 's':
+            self::replace($word, 'ness', '', 0);
+            break;
+
+        case 't':
+            self::replace($word, 'icate', 'ic', 0)
+                OR self::replace($word, 'iciti', 'ic', 0);
+            break;
+
+        case 'u':
+            self::replace($word, 'ful', '', 0);
+            break;
+
+        case 'v':
+            self::replace($word, 'ative', '', 0);
+            break;
+
+        case 'z':
+            self::replace($word, 'alize', 'al', 0);
+            break;
+        }
+
+        return $word;
+    }
+
+
+    /**
+     * Step 4
+     *
+     * @param string $word Word to stem
+     */
+    private static function step4($word)
+    {
+        switch (substr($word, -2, 1)) {
+        case 'a':
+            self::replace($word, 'al', '', 1);
+            break;
+
+        case 'c':
+            self::replace($word, 'ance', '', 1)
+                OR self::replace($word, 'ence', '', 1);
+            break;
+
+        case 'e':
+            self::replace($word, 'er', '', 1);
+            break;
+
+        case 'i':
+            self::replace($word, 'ic', '', 1);
+            break;
+
+        case 'l':
+            self::replace($word, 'able', '', 1)
+                OR self::replace($word, 'ible', '', 1);
+            break;
+
+        case 'n':
+            self::replace($word, 'ant', '', 1)
+                OR self::replace($word, 'ement', '', 1)
+                OR self::replace($word, 'ment', '', 1)
+                OR self::replace($word, 'ent', '', 1);
+            break;
+
+        case 'o':
+            if (substr($word, -4) == 'tion' OR substr($word, -4) == 'sion') {
+                self::replace($word, 'ion', '', 1);
+            } else {
+                self::replace($word, 'ou', '', 1);
+            }
+            break;
+
+        case 's':
+            self::replace($word, 'ism', '', 1);
+            break;
+
+        case 't':
+            self::replace($word, 'ate', '', 1)
+                OR self::replace($word, 'iti', '', 1);
+            break;
+
+        case 'u':
+            self::replace($word, 'ous', '', 1);
+            break;
+
+        case 'v':
+            self::replace($word, 'ive', '', 1);
+            break;
+
+        case 'z':
+            self::replace($word, 'ize', '', 1);
+            break;
+        }
+
+        return $word;
+    }
+
+
+    /**
+     * Step 5
+     *
+     * @param string $word Word to stem
+     */
+    private static function step5($word)
+    {
+        // Part a
+        if (substr($word, -1) == 'e') {
+            if (self::m(substr($word, 0, -1)) > 1) {
+                self::replace($word, 'e', '');
+
+            } else if (self::m(substr($word, 0, -1)) == 1) {
+
+                if (!self::cvc(substr($word, 0, -1))) {
+                    self::replace($word, 'e', '');
+                }
+            }
+        }
+
+        // Part b
+        if (self::m($word) > 1 AND self::doubleConsonant($word) AND substr($word, -1) == 'l') {
+            $word = substr($word, 0, -1);
+        }
+
+        return $word;
+    }
+
+
+    /**
+     * Replaces the first string with the second, at the end of the string. If third
+     * arg is given, then the preceding string must match that m count at least.
+     *
+     * @param  string $str   String to check
+     * @param  string $check Ending to check for
+     * @param  string $repl  Replacement string
+     * @param  int    $m     Optional minimum number of m() to meet
+     * @return bool          Whether the $check string was at the end
+     *                       of the $str string. True does not necessarily mean
+     *                       that it was replaced.
+     */
+    private static function replace(&$str, $check, $repl, $m = null)
+    {
+        $len = 0 - strlen($check);
+
+        if (substr($str, $len) == $check) {
+            $substr = substr($str, 0, $len);
+            if (is_null($m) OR self::m($substr) > $m) {
+                $str = $substr . $repl;
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+
+    /**
+     * What, you mean it's not obvious from the name?
+     *
+     * m() measures the number of consonant sequences in $str. if c is
+     * a consonant sequence and v a vowel sequence, and <..> indicates arbitrary
+     * presence,
+     *
+     * <c><v>       gives 0
+     * <c>vc<v>     gives 1
+     * <c>vcvc<v>   gives 2
+     * <c>vcvcvc<v> gives 3
+     *
+     * @param  string $str The string to return the m count for
+     * @return int         The m count
+     */
+    private static function m($str)
+    {
+        $c = self::$regex_consonant;
+        $v = self::$regex_vowel;
+
+        $str = preg_replace("#^$c+#", '', $str);
+        $str = preg_replace("#$v+$#", '', $str);
+
+        preg_match_all("#($v+$c+)#", $str, $matches);
+
+        return count($matches[1]);
+    }
+
+
+    /**
+     * Returns true/false as to whether the given string contains two
+     * of the same consonant next to each other at the end of the string.
+     *
+     * @param  string $str String to check
+     * @return bool        Result
+     */
+    private static function doubleConsonant($str)
+    {
+        $c = self::$regex_consonant;
+
+        return preg_match("#$c{2}$#", $str, $matches) AND $matches[0]{0} == $matches[0]{1};
+    }
+
+
+    /**
+     * Checks for ending CVC sequence where second C is not W, X or Y
+     *
+     * @param  string $str String to check
+     * @return bool        Result
+     */
+    private static function cvc($str)
+    {
+        $c = self::$regex_consonant;
+        $v = self::$regex_vowel;
+        return     preg_match("#($c$v$c)$#", $str, $matches)
+            AND strlen($matches[1]) == 3
+            AND $matches[1]{2} != 'w'
+            AND $matches[1]{2} != 'x'
+            AND $matches[1]{2} != 'y';
+    }
+}
+
diff --git a/src/Pluf/Text/UTF8.php b/src/Pluf/Text/UTF8.php
new file mode 100644
index 0000000..e7ff6dd
--- /dev/null
+++ b/src/Pluf/Text/UTF8.php
@@ -0,0 +1,596 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * UTF8 helper functions
+ *
+ * Original file coming from DokuWiki. Updated as we consider that the
+ * multibytes functions are always available and wrapped in a class.
+ *
+ * @license    LGPL (http://www.gnu.org/copyleft/lesser.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ */
+
+
+class Pluf_Text_UTF8
+{
+    /**
+     * URL-Encode a filename/URL to allow unicodecharacters
+     *
+     * Slashes are not encoded
+     *
+     * When the second parameter is true the string will
+     * be encoded only if non ASCII characters are detected -
+     * This makes it safe to run it multiple times on the
+     * same string (default is true)
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     * @see    urlencode
+     */
+    public static function filename($file, $safe=true)
+    {
+        if ($safe && preg_match('#^[a-zA-Z0-9/_\-.%]+$#', $file)) {
+            return $file;
+        }
+        return str_replace('%2F', '/', urlencode($file));
+    }
+
+    /**
+     * Checks if a string contains 7bit ASCII only
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    public static function is_ascii($str) 
+    {
+        $n = strlen($str);
+        for ($i=0; $i<$n; $i++) {
+            if (ord($str{$i}) >127) return false;
+        }
+        return true;
+    }
+
+    /**
+     * Strips all highbyte chars
+     *
+     * Returns a pure ASCII7 string
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    public static function strip($str) 
+    {
+        $ascii = '';
+        $n = strlen($str);
+        for ($i=0; $i<$n; $i++) {
+            if (ord($str{$i}) < 128) {
+                $ascii .= $str{$i};
+            }
+        }
+        return $ascii;
+    }
+
+    /**
+     * Tries to detect if a string is in Unicode encoding
+     *
+     * @author <bmorel@ssi.fr>
+     * @link   http://www.php.net/manual/en/function.utf8-encode.php
+     */
+    public static function check($str) 
+    {
+        $k = strlen($str);
+        for ($i=0; $i<$k; $i++) {
+            $b = ord($str[$i]);
+            if ($b < 0x80) continue; // 0bbbbbbb
+            elseif (($b & 0xE0) == 0xC0) $n = 1; // 110bbbbb
+            elseif (($b & 0xF0) == 0xE0) $n = 2; // 1110bbbb
+            elseif (($b & 0xF8) == 0xF0) $n = 3; // 11110bbb
+            elseif (($b & 0xFC) == 0xF8) $n = 4; // 111110bb
+            elseif (($b & 0xFE) == 0xFC) $n = 5; // 1111110b
+            else return false; // Does not match any model
+            for ($j=0; $j<$n; $j++) { // n bytes matching 10bbbbbb follow ?
+                if ((++$i == $k) || ((ord($str[$i]) & 0xC0) != 0x80)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+
+
+    /**
+     * Replace accented UTF-8 characters by unaccented ASCII-7 equivalents.
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    public static function deaccent($string)
+    {
+        return strtr($string, self::accents());
+    }
+
+    /**
+     * Romanize a non-latin string
+     *
+     * FIXME
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    public static function romanize($string)
+    {
+        if (self::is_ascii($string)) return $string;
+        return strtr($string, self::romanization());
+    }
+
+    /**
+     * Removes special characters (nonalphanumeric) from a UTF-8 string
+     *
+     * This function adds the controlchars 0x00 to 0x19 to the array of
+     * stripped chars (they are not included in $UTF8_SPECIAL_CHARS)
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     * @param  string $string     The UTF8 string to strip of special chars
+     * @param  string $repl       Replace special with this string
+     * @param  string $additional Additional chars to strip (used in regexp char class)
+     */
+    function stripspecials($string, $repl='', $additional='')
+    {
+        static $specials = null;
+        if (is_null($specials)) {
+            $specials = preg_quote(self::special_chars(), '/');
+        }
+        return preg_replace('/['.$additional.'\x00-\x19'.$specials.']/u',$repl,$string);
+    }
+
+
+    /**
+     * UTF-8 lookup table for lower case accented letters
+     *
+     * This lookuptable defines replacements for accented characters from the ASCII-7
+     * range. This are lower case letters only.
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     * @see    utf8_deaccent()
+     */
+    public static function accents()
+    {
+        return array(
+                     'Ă ' => 'a', 'Ă´' => 'o', 'Ä�' => 'd', 'ḟ' => 'f', 
+                     'Ă«' => 'e', 'Å¡' => 's', 'Æ¡' => 'o', 'ĂŸ' => 'ss', 
+                     'ă' => 'a', 'ř' => 'r', 'ț' => 't', 'ň' => 'n', 
+                     '�' => 'a', 'ķ' => 'k', '�' => 's', 'ỳ' => 'y', 
+                     'ņ' => 'n', 'ĺ' => 'l', 'ħ' => 'h', 'ṗ' => 'p', 
+                     'Ă³' => 'o', 'Ăº' => 'u', 'Ä›' => 'e', 'Ă©' => 'e', 
+                     'ç' => 'c', 'áº�' => 'w', 'Ä‹' => 'c', 'õ' => 'o',
+                     'ṡ' => 's', 'ø' => 'o', 'Ä£' => 'g', 'ŧ' => 't', 
+                     'ș' => 's', 'ė' => 'e', 'ĉ' => 'c', 'ś' => 's', 
+                     'Ă®' => 'i', 'ű' => 'u', 'ć' => 'c', 'Ä™' => 'e', 
+                     'ŵ' => 'w', 'ṫ' => 't', 'ū' => 'u', '�' => 'c', 
+                     'ö' => 'oe', 'è' => 'e', 'Å·' => 'y', 'Ä…' => 'a', 
+                     'ł' => 'l', 'ų' => 'u', 'ů' => 'u', 'ş' => 's', 
+                     'ğ' => 'g', 'ļ' => 'l', 'ƒ' => 'f', 'ž' => 'z',
+                     'ẃ' => 'w', 'ḃ' => 'b', 'Ă¥' => 'a', 'ì' => 'i', 
+                     'Ă¯' => 'i', 'ḋ' => 'd', 'Å¥' => 't', 'Å—' => 'r', 
+                     'ä' => 'ae', 'Ă­' => 'i', 'Å•' => 'r', 'Ăª' => 'e', 
+                     'Ă¼' => 'ue', 'Ă²' => 'o', 'Ä“' => 'e', 'ñ' => 'n', 
+                     'ń' => 'n', 'ĥ' => 'h', '�' => 'g', 'đ' => 'd', 
+                     'ĵ' => 'j', 'Ă¿' => 'y', 'Å©' => 'u', 'Å­' => 'u', 
+                     'Æ°' => 'u', 'Å£' => 't', 'Ă½' => 'y', 'Å‘' => 'o',
+                     'Ă¢' => 'a', 'ľ' => 'l', 'ẅ' => 'w', 'ż' => 'z', 
+                     'Ä«' => 'i', 'Ă£' => 'a', 'Ä¡' => 'g', 'á¹�' => 'm', 
+                     'Å�' => 'o', 'Ä©' => 'i', 'Ă¹' => 'u', 'į' => 'i', 
+                     'ź' => 'z', 'Ă¡' => 'a', 'Ă»' => 'u', 'Ă¾' => 'th', 
+                     'ð' => 'dh', 'æ' => 'ae', 'µ' => 'u', 'ĕ' => 'e',
+                     'À' => 'A', 'Ô' => 'O', '�' => 'D', '�' => 'F', 
+                     'Ă‹' => 'E', 'Å ' => 'S', 'Æ ' => 'O', 'Ä‚' => 'A', 
+                     'Ř' => 'R', '�' => 'T', 'Ň' => 'N', 'Ā' => 'A', 
+                     'Ķ' => 'K', 'Ŝ' => 'S', 'Ỳ' => 'Y', 'Ņ' => 'N', 
+                     'Ĺ' => 'L', 'Ħ' => 'H', 'á¹–' => 'P', 'Ă“' => 'O',
+                     '�' => 'U', '�' => 'E', 'É' => 'E', 'Ç' => 'C', 
+                     'Ẁ' => 'W', 'Ä�' => 'C', 'Ă•' => 'O', 'á¹ ' => 'S', 
+                     'Ă˜' => 'O', 'Ä¢' => 'G', 'Ŧ' => 'T', 'Ș' => 'S', 
+                     'Ä–' => 'E', 'Ĉ' => 'C', 'Å�' => 'S', 'Ă�' => 'I', 
+                     'Ű' => 'U', 'Ć' => 'C', 'Ę' => 'E', 'Ŵ' => 'W', 
+                     'Ṫ' => 'T', 'Ū' => 'U', 'ÄŒ' => 'C', 'Ă–' => 'Oe', 
+                     'Ăˆ' => 'E', 'Ŷ' => 'Y', 'Ä„' => 'A', 'Å�' => 'L',
+                     'Ų' => 'U', 'Ů' => 'U', '�' => 'S', '�' => 'G', 
+                     'Ļ' => 'L', 'Ƒ' => 'F', 'Ž' => 'Z', 'Ẃ' => 'W', 
+                     'Ḃ' => 'B', 'Ă…' => 'A', 'ĂŒ' => 'I', 'Ă�' => 'I', 
+                     'á¸�' => 'D', 'Ť' => 'T', 'Å–' => 'R', 'Ă„' => 'Ae', 
+                     'Ă�' => 'I', 'Å”' => 'R', 'Ă�' => 'E', 'Ăœ' => 'Ue', 
+                     'Ă’' => 'O', 'Ä’' => 'E', 'Ă‘' => 'N', 'Ń' => 'N', 
+                     'Ĥ' => 'H', 'Ĝ' => 'G', '�' => 'D', 'Ĵ' => 'J',
+                     'Ÿ' => 'Y', 'Ũ' => 'U', 'Ŭ' => 'U', 'Ư' => 'U', 
+                     'Å¢' => 'T', 'Ă�' => 'Y', 'Å�' => 'O', 'Ă‚' => 'A', 
+                     'Ľ' => 'L', 'Ẅ' => 'W', 'Ż' => 'Z', 'Ī' => 'I', 
+                     'Ăƒ' => 'A', 'Ä ' => 'G', 'á¹€' => 'M', 'ÅŒ' => 'O', 
+                     'Ĩ' => 'I', 'Ă™' => 'U', 'Ä®' => 'I', 'Ź' => 'Z', 
+                     '�' => 'A', 'Û' => 'U', '�' => 'Th', '�' => 'Dh', 
+                     'Æ' => 'Ae', 'Ĕ' => 'E',
+                     );
+    }
+
+    public static function special_chars()
+    {
+        return "\x1A".' !"#$%&\'()+,/;<=>?@[\]^`{|}~€�‚ƒ„…†‡ˆ‰�‹Œ����‘’“”•�'.
+        '�—˜™�›œ��Ÿ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½�'.
+        'ï¿½Â¿Ă—Ă·Ë‡Ë˜Ë™Ë�˛˜Ë�̀€̀�̀ƒ̀‰̀£Î„΅·βφϑϒϕϖְֱֲֳִֵֶַָֹֻּֽ־ֿ�'.
+        '��ׂ׃׳״،؛؟ـًٌ����ّْ٪฿‌���–—―‗‘’�“��'.
+        '��†‡•…‰′″‹›�₧₪₫€№℘™Ωℵ�↑→↓↔↕↵'.
+        '�⇑⇒⇓⇔∀∂∃∅∆∇∈∉∋�∑−∕∗∙���∠∧∨�'.
+        '�∪∫∴∼≅≈≠≡≤≥��������⋅�⌠⌡〈〉⑩─�'.
+        '��┌�└┘├┤┬┴┼�║╒╓╔╕╖╗╘╙�╛╜��╟╠'.
+        '╡╢╣╤╥╦╧╨╩╪╫╬▀▄█▌�░▒▓■▲▼◆���'.
+        '�★�☛�♠♣♥♦�✂✃✄✆✇✈✉✌����✑✒✓✔✕�'.
+        '��✗✘✙�✛✜��✟✠✡✢✣✤✥✦✧✩✪✫✬✭✮✯✰✱'.
+        '✲✳✴✵✶✷✸✹✺✻✼✽✾✿�������������'.
+        '����������������������������'.
+        '����������������������������'.
+        '��������'.
+        '　ă€�ă€‚ă€ƒă€ˆă€‰ă€�ă€‹ă€Œă€�ă€�ă€�ă€�ă€‘ă€’ă€”ă€•ă€–ă€—ă€˜ă€™ă€�〛〶'.
+        '�����'.
+        '�ﹼﹽ'.
+        '�＂＃＄％＆＇（）�＋，����；＜��？＠［＼］＾｀｛｜��'.
+        '｟｠｡｢｣､･￠￡￢￣￤￥￦￨￩￪￫￬￭￮';
+    }
+
+    /**
+     * Romanization lookup table
+     *
+     * This lookup tables provides a way to transform strings written
+     * in a language different from the ones based upon latin letters
+     * into plain ASCII.
+     *
+     * Please note: this is not a scientific transliteration table. It
+     * only works oneway from nonlatin to ASCII and it works by simple
+     * character replacement only. Specialities of each language are
+     * not supported.
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     * @author Vitaly Blokhin <vitinfo@vitn.com>
+     * @link   http://www.uconv.com/translit.htm
+     * @author Bisqwit <bisqwit@iki.fi>
+     * @link   http://kanjidict.stc.cx/hiragana.php?src=2
+     * @link   http://www.translatum.gr/converter/greek-transliteration.htm
+     * @link   http://en.wikipedia.org/wiki/Royal_Thai_General_System_of_Transcription
+     * @link   http://www.btranslations.com/resources/romanization/korean.asp
+     * @author Arthit Suriyawongkul <arthit@gmail.com>
+     * @author Denis Scheither <amorphis@uni-bremen.de>
+     */
+    public static function romanization()
+    {
+        return array(
+       //russian cyrillic
+       'Đ°'=>'a','Đ�'=>'A','б'=>'b','Đ‘'=>'B','Đ²'=>'v','Đ’'=>'V','Đ³'=>'g','Đ“'=>'G',
+       'Đ´'=>'d','Đ”'=>'D','е'=>'e','Đ•'=>'E','Ñ‘'=>'jo','Đ�'=>'Jo','ж'=>'zh','Đ–'=>'Zh',
+       'Đ·'=>'z','Đ—'=>'Z','и'=>'i','Đ˜'=>'I','Đ¹'=>'j','Đ™'=>'J','Đº'=>'k','Đ�'=>'K',
+       'Đ»'=>'l','Đ›'=>'L','Đ¼'=>'m','Đœ'=>'M','Đ½'=>'n','Đ�'=>'N','Đ¾'=>'o','Đ�'=>'O',
+       'Đ¿'=>'p','ĐŸ'=>'P','Ñ€'=>'r','Đ '=>'R','Ñ�'=>'s','Đ¡'=>'S','Ñ‚'=>'t','Đ¢'=>'T',
+       'у'=>'u','Đ£'=>'U','Ñ„'=>'f','Ф'=>'F','Ñ…'=>'x','Đ¥'=>'X','ц'=>'c','Ц'=>'C',
+       'ч'=>'ch','Ч'=>'Ch','ш'=>'sh','Ш'=>'Sh','щ'=>'sch','Đ©'=>'Sch','Ñ�'=>'',
+       'Đª'=>'','Ñ‹'=>'y','Đ«'=>'Y','ÑŒ'=>'','Ь'=>'','Ñ�'=>'eh','Đ­'=>'Eh','Ñ�'=>'ju',
+       'Đ®'=>'Ju','Ñ�'=>'ja','Đ¯'=>'Ja',
+       // Ukrainian cyrillic
+       '̉�'=>'Gh','̉‘'=>'gh','Đ„'=>'Je','Ñ”'=>'je','І'=>'I','Ñ–'=>'i','Ї'=>'Ji','Ñ—'=>'ji',
+       // Georgian
+       '�'=>'a','ბ'=>'b','გ'=>'g','დ'=>'d','ე'=>'e','ვ'=>'v','ზ'=>'z','თ'=>'th',
+       'ი'=>'i','კ'=>'p','�'=>'l','მ'=>'m','ნ'=>'n','�'=>'o','�'=>'p','ჟ'=>'zh',
+       'რ'=>'r','ს'=>'s','ტ'=>'t','უ'=>'u','ფ'=>'ph','ქ'=>'kh','ღ'=>'gh','ყ'=>'q',
+       'შ'=>'sh','ჩ'=>'ch','ც'=>'c','ძ'=>'dh','წ'=>'w','ჭ'=>'j','ხ'=>'x','ჯ'=>'jh',
+       'ჰ'=>'xh',
+       //Sanskrit
+       'अ'=>'a','आ'=>'ah','इ'=>'i','ई'=>'ih','उ'=>'u','�'=>'uh','ऋ'=>'ry',
+       'ॠ'=>'ryh','ऌ'=>'ly','ॡ'=>'lyh','�'=>'e','�'=>'ay','ओ'=>'o','औ'=>'aw',
+       'अं'=>'amh','अः'=>'aq','क'=>'k','ख'=>'kh','ग'=>'g','घ'=>'gh','ङ'=>'nh',
+       '�'=>'c','छ'=>'ch','ज'=>'j','�'=>'jh','�'=>'ny','ट'=>'tq','ठ'=>'tqh',
+       'ड'=>'dq','ढ'=>'dqh','ण'=>'nq','त'=>'t','थ'=>'th','द'=>'d','ध'=>'dh',
+       'न'=>'n','प'=>'p','फ'=>'ph','ब'=>'b','भ'=>'bh','म'=>'m','य'=>'z','र'=>'r',
+       'ल'=>'l','व'=>'v','श'=>'sh','ष'=>'sqh','स'=>'s','ह'=>'x',
+       //Hebrew
+       '�'=>'a', 'ב'=>'b','ג'=>'g','ד'=>'d','ה'=>'h','ו'=>'v','ז'=>'z','ח'=>'kh','ט'=>'th',
+       'י'=>'y','�'=>'h','כ'=>'k','ל'=>'l','�'=>'m','�'=>'m','ן'=>'n','נ'=>'n',
+       'ס'=>'s','ע'=>'ah','ף'=>'f','פ'=>'p','ץ'=>'c','צ'=>'c','ק'=>'q','ר'=>'r',
+       'ש'=>'sh','ת'=>'t',
+       //Arabic
+       'ا'=>'a','ب'=>'b','ت'=>'t','ث'=>'th','ج'=>'g','ح'=>'xh','خ'=>'x','د'=>'d',
+       'ذ'=>'dh','ر'=>'r','ز'=>'z','س'=>'s','ش'=>'sh','ص'=>'s\'','ض'=>'d\'',
+       'ط'=>'t\'','ظ'=>'z\'','ع'=>'y','غ'=>'gh','�'=>'f','ق'=>'q','ك'=>'k',
+       'Ù„'=>'l','Ù…'=>'m','Ù†'=>'n','Ù‡'=>'x\'','Ùˆ'=>'u','Ù�'=>'i',
+       // Japanese hiragana
+       // 3 character syllables, ă�£ doubles the consonant after
+       'ă�£ă�¡ă‚ƒ'=>'ccha','ă�£ă�¡ă�‡'=>'cche','ă�£ă�¡ă‚‡'=>'ccho','ă�£ă�¡ă‚…'=>'cchu',
+       'ă�£ă�³ă‚ƒ'=>'bya','ă�£ă�³ă�‡'=>'bye','ă�£ă�³ă�ƒ'=>'byi','ă�£ă�³ă‚‡'=>'byo','ă�£ă�³ă‚…'=>'byu',
+       'ă�£ă�¡ă‚ƒ'=>'cha','ă�£ă�¡ă�‡'=>'che','ă�£ă�¡'=>'chi','ă�£ă�¡ă‚‡'=>'cho','ă�£ă�¡ă‚…'=>'chu',
+       'ă�£ă�²ă‚ƒ'=>'hya','ă�£ă�²ă�‡'=>'hye','ă�£ă�²ă�ƒ'=>'hyi','ă�£ă�²ă‚‡'=>'hyo','ă�£ă�²ă‚…'=>'hyu',
+       'ă�£ă��ă‚ƒ'=>'kya','ă�£ă��ă�‡'=>'kye','ă�£ă��ă�ƒ'=>'kyi','ă�£ă��ょ'=>'kyo','ă�£ă��ă‚…'=>'kyu',
+       'ă�£ă��ă‚ƒ'=>'gya','ă�£ă��ă�‡'=>'gye','ă�£ă��ă�ƒ'=>'gyi','ă�£ă��ょ'=>'gyo','ă�£ă��ă‚…'=>'gyu',
+       'ă�£ă�¿ă‚ƒ'=>'mya','ă�£ă�¿ă�‡'=>'mye','ă�£ă�¿ă�ƒ'=>'myi','ă�£ă�¿ă‚‡'=>'myo','ă�£ă�¿ă‚…'=>'myu',
+       'ă�£ă�«ă‚ƒ'=>'nya','ă�£ă�«ă�‡'=>'nye','ă�£ă�«ă�ƒ'=>'nyi','ă�£ă�«ă‚‡'=>'nyo','ă�£ă�«ă‚…'=>'nyu',
+       'ă�£ă‚�ă‚ƒ'=>'rya','ă�£ă‚�ă�‡'=>'rye','ă�£ă‚�ă�ƒ'=>'ryi','ă�£ă‚�ょ'=>'ryo','ă�£ă‚�ă‚…'=>'ryu',
+       'ă�£ă�—ă‚ƒ'=>'sha','ă�£ă�—ă�‡'=>'she','ă�£ă�—'=>'shi','ă�£ă�—ょ'=>'sho','ă�£ă�—ă‚…'=>'shu',
+       // 2 character syllables - normal
+       'ă�µă��'=>'fa','ă�µă�‡'=>'fe','ă�µă�ƒ'=>'fi','ă�µă�‰'=>'fo','ă�µ'=>'fu',
+       'ăƒ´ă��'=>'va','ăƒ´ă�‡'=>'ve','ăƒ´ă�ƒ'=>'vi','ăƒ´ă�‰'=>'vo','ăƒ´'=>'vu',
+       'ă�³ă‚ƒ'=>'bya','ă�³ă�‡'=>'bye','ă�³ă�ƒ'=>'byi','ă�³ă‚‡'=>'byo','ă�³ă‚…'=>'byu',
+       'ă�¡ă‚ƒ'=>'cha','ă�¡ă�‡'=>'che','ă�¡'=>'chi','ă�¡ă‚‡'=>'cho','ă�¡ă‚…'=>'chu',
+       'ă�²ă‚ƒ'=>'hya','ă�²ă�‡'=>'hye','ă�²ă�ƒ'=>'hyi','ă�²ă‚‡'=>'hyo','ă�²ă‚…'=>'hyu',
+       'ă��ă‚ƒ'=>'kya','ă��ă�‡'=>'kye','ă��ă�ƒ'=>'kyi','ă��ょ'=>'kyo','ă��ă‚…'=>'kyu',
+       'ă��ă‚ƒ'=>'gya','ă��ă�‡'=>'gye','ă��ă�ƒ'=>'gyi','ă��ょ'=>'gyo','ă��ă‚…'=>'gyu',
+       'ă�¿ă‚ƒ'=>'mya','ă�¿ă�‡'=>'mye','ă�¿ă�ƒ'=>'myi','ă�¿ă‚‡'=>'myo','ă�¿ă‚…'=>'myu',
+       'ă�«ă‚ƒ'=>'nya','ă�«ă�‡'=>'nye','ă�«ă�ƒ'=>'nyi','ă�«ă‚‡'=>'nyo','ă�«ă‚…'=>'nyu',
+       'ă‚�ă‚ƒ'=>'rya','ă‚�ă�‡'=>'rye','ă‚�ă�ƒ'=>'ryi','ă‚�ょ'=>'ryo','ă‚�ă‚…'=>'ryu',
+       'ă�—ă‚ƒ'=>'sha','ă�—ă�‡'=>'she','ă�—'=>'shi','ă�—ょ'=>'sho','ă�—ă‚…'=>'shu',
+       'ă�˜ă‚ƒ'=>'ja','ă�˜ă�‡'=>'je','ă�˜'=>'ji','ă�˜ă‚‡'=>'jo','ă�˜ă‚…'=>'ju',
+
+       // 2 character syllables, ă�£ doubles the consonant after
+       'ă�£ă�°'=>'bba','ă�£ă�¹'=>'bbe','ă�£ă�³'=>'bbi','ă�£ă�¼'=>'bbo','ă�£ă�¶'=>'bbu',
+       'ă�£ă�±'=>'ppa','ă�£ă�º'=>'ppe','ă�£ă�´'=>'ppi','ă�£ă�½'=>'ppo','ă�£ă�·'=>'ppu',
+       'ă�£ă�Ÿ'=>'tta','ă�£ă�¦'=>'tte','ă�£ă�¡'=>'cchi','ă�£ă�¨'=>'tto','ă�£ă�¤'=>'ttsu',
+       'ă�£ă� '=>'dda','ă�£ă�§'=>'dde','ă�£ă�¢'=>'ddi','ă�£ă�©'=>'ddo','ă�£ă�¥'=>'ddu',
+       'ă�£ă�Œ'=>'gga','ă�£ă�’'=>'gge','ă�£ă��'=>'ggi','ă�£ă�”'=>'ggo','ă�£ă��'=>'ggu',
+       'ă�£ă�‹'=>'kka','ă�£ă�‘'=>'kke','ă�£ă��'=>'kki','ă�£ă�“'=>'kko','ă�£ă��'=>'kku',
+       'ă�£ă�¾'=>'mma','ă�£ă‚�'=>'mme','ă�£ă�¿'=>'mmi','ă�£ă‚‚'=>'mmo','ă�£ă‚€'=>'mmu',
+       'ă�£ă�ª'=>'nna','ă�£ă�­'=>'nne','ă�£ă�«'=>'nni','ă�£ă�®'=>'nno','ă�£ă�¬'=>'nnu',
+       'ă�£ă‚‰'=>'rra','ă�£ă‚Œ'=>'rre','ă�£ă‚�'=>'rri','ă�£ă‚�'=>'rro','ă�£ă‚‹'=>'rru',
+       'ă�£ă�•'=>'ssa','ă�£ă�›'=>'sse','ă�£ă�—'=>'sshi','ă�£ă��'=>'sso','ă�£ă�™'=>'ssu',
+       'ă�£ă�–'=>'zza','ă�£ă�œ'=>'zze','ă�£ă�˜'=>'zzi','ă�£ă��'=>'zzo','ă�£ă��'=>'zzu',
+  
+       // 1 character syllabels
+       'ă�‚'=>'a','ă�ˆ'=>'e','ă�„'=>'i','ă��'=>'o','ă�†'=>'u','ă‚“'=>'n',
+       'ă�¯'=>'ha','ă�¸'=>'he','ă�²'=>'hi','ă�»'=>'ho','ă�µ'=>'hu',
+       'ă�°'=>'ba','ă�¹'=>'be','ă�³'=>'bi','ă�¼'=>'bo','ă�¶'=>'bu',
+       'ă�±'=>'pa','ă�º'=>'pe','ă�´'=>'pi','ă�½'=>'po','ă�·'=>'pu',
+       'ă�Ÿ'=>'ta','ă�¦'=>'te','ă�¡'=>'ti','ă�¨'=>'to','ă�¤'=>'tu',
+       'ă� '=>'da','ă�§'=>'de','ă�¢'=>'di','ă�©'=>'do','ă�¥'=>'du',
+       'ă�Œ'=>'ga','ă�’'=>'ge','ă��'=>'gi','ă�”'=>'go','ă��'=>'gu',
+       '�'=>'ka','�'=>'ke','�'=>'ki','�'=>'ko','�'=>'ku',
+       'ă�¾'=>'ma','ă‚�'=>'me','ă�¿'=>'mi','ă‚‚'=>'mo','ă‚€'=>'mu',
+       'ă�ª'=>'na','ă�­'=>'ne','ă�«'=>'ni','ă�®'=>'no','ă�¬'=>'nu',
+       'ら'=>'ra','ă‚Œ'=>'re','ă‚�'=>'ri','ă‚�'=>'ro','ă‚‹'=>'ru',
+       '�'=>'sa','�'=>'se','�'=>'shi','�'=>'so','�'=>'su',
+       'ă‚�'=>'wa','ă�†ă�‡'=>'we','ă�†ă�ƒ'=>'wi','ă‚’'=>'wo',
+       'ă�–'=>'za','ă�œ'=>'ze','ă�˜'=>'zi','ă��'=>'zo','ă��'=>'zu',
+       'ă‚„'=>'ya','ă�„ă�‡'=>'ye','ă‚ˆ'=>'yo','ゆ'=>'yu',
+
+       // never seen one of those, but better save than sorry
+       'ă�§ă‚ƒ'=>'dha','ă�§ă�‡'=>'dhe','ă�§ă�ƒ'=>'dhi','ă�§ă‚‡'=>'dho','ă�§ă‚…'=>'dhu',
+       'ă�©ă��'=>'dwa','ă�©ă�‡'=>'dwe','ă�©ă�ƒ'=>'dwi','ă�©ă�‰'=>'dwo','ă�©ă�…'=>'dwu',
+       'ă�¢ă‚ƒ'=>'dya','ă�¢ă�‡'=>'dye','ă�¢ă�ƒ'=>'dyi','ă�¢ă‚‡'=>'dyo','ă�¢ă‚…'=>'dyu',
+       'ă�µă��'=>'fwa','ă�µă�‡'=>'fwe','ă�µă�ƒ'=>'fwi','ă�µă�‰'=>'fwo','ă�µă�…'=>'fwu',
+       'ă�µă‚ƒ'=>'fya','ă�µă�‡'=>'fye','ă�µă�ƒ'=>'fyi','ă�µă‚‡'=>'fyo','ă�µă‚…'=>'fyu',
+       'ă�´ă‚ƒ'=>'pya','ă�´ă�‡'=>'pye','ă�´ă�ƒ'=>'pyi','ă�´ă‚‡'=>'pyo','ă�´ă‚…'=>'pyu',
+       'ă�™ă��'=>'swa','ă�™ă�‡'=>'swe','ă�™ă�ƒ'=>'swi','ă�™ă�‰'=>'swo','ă�™ă�…'=>'swu',
+       'ă�¦ă‚ƒ'=>'tha','ă�¦ă�‡'=>'the','ă�¦ă�ƒ'=>'thi','ă�¦ă‚‡'=>'tho','ă�¦ă‚…'=>'thu',
+       'ă�¤ă‚ƒ'=>'tsa','ă�¤ă�‡'=>'tse','ă�¤ă�ƒ'=>'tsi','ă�¤ă‚‡'=>'tso','ă�¤'=>'tsu',
+       'ă�¨ă��'=>'twa','ă�¨ă�‡'=>'twe','ă�¨ă�ƒ'=>'twi','ă�¨ă�‰'=>'two','ă�¨ă�…'=>'twu',
+       'ăƒ´ă‚ƒ'=>'vya','ăƒ´ă�‡'=>'vye','ăƒ´ă�ƒ'=>'vyi','ăƒ´ă‚‡'=>'vyo','ăƒ´ă‚…'=>'vyu',
+       'ă�†ă��'=>'wha','ă�†ă�‡'=>'whe','ă�†ă�ƒ'=>'whi','ă�†ă�‰'=>'who','ă�†ă�…'=>'whu',
+       'ゑ'=>'wye','�'=>'wyi',
+       'ă�˜ă‚ƒ'=>'zha','ă�˜ă�‡'=>'zhe','ă�˜ă�ƒ'=>'zhi','ă�˜ă‚‡'=>'zho','ă�˜ă‚…'=>'zhu',
+       'ă�˜ă‚ƒ'=>'zya','ă�˜ă�‡'=>'zye','ă�˜ă�ƒ'=>'zyi','ă�˜ă‚‡'=>'zyo','ă�˜ă‚…'=>'zyu',
+
+       //  convert what's left (probably only kicks in when something's missing above
+       'ă��'=>'a','ă�‡'=>'e','ă�ƒ'=>'i','ă�‰'=>'o','ă�…'=>'u',
+       'ă‚ƒ'=>'ya','ょ'=>'yo','ă‚…'=>'yu',
+
+       // 'spare' characters from other romanization systems
+       // 'ă� '=>'da','ă�§'=>'de','ă�¢'=>'di','ă�©'=>'do','ă�¥'=>'du',
+       // 'ら'=>'la','ă‚Œ'=>'le','ă‚�'=>'li','ă‚�'=>'lo','ă‚‹'=>'lu',
+       // '�'=>'sa','�'=>'se','�'=>'si','�'=>'so','�'=>'su',
+       // 'ă�¡ă‚ƒ'=>'cya','ă�¡ă�‡'=>'cye','ă�¡ă�ƒ'=>'cyi','ă�¡ă‚‡'=>'cyo','ă�¡ă‚…'=>'cyu',
+       //'ă�˜ă‚ƒ'=>'jya','ă�˜ă�‡'=>'jye','ă�˜ă�ƒ'=>'jyi','ă�˜ă‚‡'=>'jyo','ă�˜ă‚…'=>'jyu',
+       //'ă‚�ă‚ƒ'=>'lya','ă‚�ă�‡'=>'lye','ă‚�ă�ƒ'=>'lyi','ă‚�ょ'=>'lyo','ă‚�ă‚…'=>'lyu',
+       //'ă�—ă‚ƒ'=>'sya','ă�—ă�‡'=>'sye','ă�—ă�ƒ'=>'syi','ă�—ょ'=>'syo','ă�—ă‚…'=>'syu',
+       //'ă�¡ă‚ƒ'=>'tya','ă�¡ă�‡'=>'tye','ă�¡ă�ƒ'=>'tyi','ă�¡ă‚‡'=>'tyo','ă�¡ă‚…'=>'tyu',
+       //'ă�—'=>'ci',,ă�„'=>'yi','ă�¢'=>'dzi',
+       //'ă�£ă�˜ă‚ƒ'=>'jja','ă�£ă�˜ă�‡'=>'jje','ă�£ă�˜'=>'jji','ă�£ă�˜ă‚‡'=>'jjo','ă�£ă�˜ă‚…'=>'jju',
+
+
+       // Japanese katakana
+
+       // 4 character syllables: ăƒƒ doubles the consonant after, ăƒ¼ doubles the vowel before (usualy written with macron, but we don't want that in our URLs)
+       'ăƒƒăƒ“ăƒ£ăƒ¼'=>'bbyaa','ăƒƒăƒ“ă‚§ăƒ¼'=>'bbyee','ăƒƒăƒ“ă‚£ăƒ¼'=>'bbyii','ăƒƒăƒ“ăƒ§ăƒ¼'=>'bbyoo','ăƒƒăƒ“ăƒ¥ăƒ¼'=>'bbyuu',
+       'ăƒƒăƒ”ăƒ£ăƒ¼'=>'ppyaa','ăƒƒăƒ”ă‚§ăƒ¼'=>'ppyee','ăƒƒăƒ”ă‚£ăƒ¼'=>'ppyii','ăƒƒăƒ”ăƒ§ăƒ¼'=>'ppyoo','ăƒƒăƒ”ăƒ¥ăƒ¼'=>'ppyuu',
+       'ăƒƒă‚­ăƒ£ăƒ¼'=>'kkyaa','ăƒƒă‚­ă‚§ăƒ¼'=>'kkyee','ăƒƒă‚­ă‚£ăƒ¼'=>'kkyii','ăƒƒă‚­ăƒ§ăƒ¼'=>'kkyoo','ăƒƒă‚­ăƒ¥ăƒ¼'=>'kkyuu',
+       'ăƒƒă‚®ăƒ£ăƒ¼'=>'ggyaa','ăƒƒă‚®ă‚§ăƒ¼'=>'ggyee','ăƒƒă‚®ă‚£ăƒ¼'=>'ggyii','ăƒƒă‚®ăƒ§ăƒ¼'=>'ggyoo','ăƒƒă‚®ăƒ¥ăƒ¼'=>'ggyuu',
+       'ăƒƒăƒŸăƒ£ăƒ¼'=>'mmyaa','ăƒƒăƒŸă‚§ăƒ¼'=>'mmyee','ăƒƒăƒŸă‚£ăƒ¼'=>'mmyii','ăƒƒăƒŸăƒ§ăƒ¼'=>'mmyoo','ăƒƒăƒŸăƒ¥ăƒ¼'=>'mmyuu',
+       'ăƒƒăƒ‹ăƒ£ăƒ¼'=>'nnyaa','ăƒƒăƒ‹ă‚§ăƒ¼'=>'nnyee','ăƒƒăƒ‹ă‚£ăƒ¼'=>'nnyii','ăƒƒăƒ‹ăƒ§ăƒ¼'=>'nnyoo','ăƒƒăƒ‹ăƒ¥ăƒ¼'=>'nnyuu',
+       'ăƒƒăƒªăƒ£ăƒ¼'=>'rryaa','ăƒƒăƒªă‚§ăƒ¼'=>'rryee','ăƒƒăƒªă‚£ăƒ¼'=>'rryii','ăƒƒăƒªăƒ§ăƒ¼'=>'rryoo','ăƒƒăƒªăƒ¥ăƒ¼'=>'rryuu',
+       'ăƒƒă‚·ăƒ£ăƒ¼'=>'sshaa','ăƒƒă‚·ă‚§ăƒ¼'=>'sshee','ăƒƒă‚·ăƒ¼'=>'sshii','ăƒƒă‚·ăƒ§ăƒ¼'=>'sshoo','ăƒƒă‚·ăƒ¥ăƒ¼'=>'sshuu',
+       'ăƒƒăƒ�ăƒ£ăƒ¼'=>'cchaa','ăƒƒăƒ�ă‚§ăƒ¼'=>'cchee','ăƒƒăƒ�ăƒ¼'=>'cchii','ăƒƒăƒ�ăƒ§ăƒ¼'=>'cchoo','ăƒƒăƒ�ăƒ¥ăƒ¼'=>'cchuu',
+
+       // 3 character syllables - doubled vowels
+       'ăƒ•ă‚¡ăƒ¼'=>'faa','ăƒ•ă‚§ăƒ¼'=>'fee','ăƒ•ă‚£ăƒ¼'=>'fii','ăƒ•ă‚©ăƒ¼'=>'foo',
+       'ăƒ•ăƒ£ăƒ¼'=>'fyaa','ăƒ•ă‚§ăƒ¼'=>'fyee','ăƒ•ă‚£ăƒ¼'=>'fyii','ăƒ•ăƒ§ăƒ¼'=>'fyoo','ăƒ•ăƒ¥ăƒ¼'=>'fyuu',
+       'ăƒ’ăƒ£ăƒ¼'=>'hyaa','ăƒ’ă‚§ăƒ¼'=>'hyee','ăƒ’ă‚£ăƒ¼'=>'hyii','ăƒ’ăƒ§ăƒ¼'=>'hyoo','ăƒ’ăƒ¥ăƒ¼'=>'hyuu',
+       'ăƒ“ăƒ£ăƒ¼'=>'byaa','ăƒ“ă‚§ăƒ¼'=>'byee','ăƒ“ă‚£ăƒ¼'=>'byii','ăƒ“ăƒ§ăƒ¼'=>'byoo','ăƒ“ăƒ¥ăƒ¼'=>'byuu',
+       'ăƒ”ăƒ£ăƒ¼'=>'pyaa','ăƒ”ă‚§ăƒ¼'=>'pyee','ăƒ”ă‚£ăƒ¼'=>'pyii','ăƒ”ăƒ§ăƒ¼'=>'pyoo','ăƒ”ăƒ¥ăƒ¼'=>'pyuu',
+       'ă‚­ăƒ£ăƒ¼'=>'kyaa','ă‚­ă‚§ăƒ¼'=>'kyee','ă‚­ă‚£ăƒ¼'=>'kyii','ă‚­ăƒ§ăƒ¼'=>'kyoo','ă‚­ăƒ¥ăƒ¼'=>'kyuu',
+       'ă‚®ăƒ£ăƒ¼'=>'gyaa','ă‚®ă‚§ăƒ¼'=>'gyee','ă‚®ă‚£ăƒ¼'=>'gyii','ă‚®ăƒ§ăƒ¼'=>'gyoo','ă‚®ăƒ¥ăƒ¼'=>'gyuu',
+       'ăƒŸăƒ£ăƒ¼'=>'myaa','ăƒŸă‚§ăƒ¼'=>'myee','ăƒŸă‚£ăƒ¼'=>'myii','ăƒŸăƒ§ăƒ¼'=>'myoo','ăƒŸăƒ¥ăƒ¼'=>'myuu',
+       'ăƒ‹ăƒ£ăƒ¼'=>'nyaa','ăƒ‹ă‚§ăƒ¼'=>'nyee','ăƒ‹ă‚£ăƒ¼'=>'nyii','ăƒ‹ăƒ§ăƒ¼'=>'nyoo','ăƒ‹ăƒ¥ăƒ¼'=>'nyuu',
+       'ăƒªăƒ£ăƒ¼'=>'ryaa','ăƒªă‚§ăƒ¼'=>'ryee','ăƒªă‚£ăƒ¼'=>'ryii','ăƒªăƒ§ăƒ¼'=>'ryoo','ăƒªăƒ¥ăƒ¼'=>'ryuu',
+       'ă‚·ăƒ£ăƒ¼'=>'shaa','ă‚·ă‚§ăƒ¼'=>'shee','ă‚·ăƒ¼'=>'shii','ă‚·ăƒ§ăƒ¼'=>'shoo','ă‚·ăƒ¥ăƒ¼'=>'shuu',
+       'ă‚¸ăƒ£ăƒ¼'=>'jaa','ă‚¸ă‚§ăƒ¼'=>'jee','ă‚¸ăƒ¼'=>'jii','ă‚¸ăƒ§ăƒ¼'=>'joo','ă‚¸ăƒ¥ăƒ¼'=>'juu',
+       'ă‚¹ă‚¡ăƒ¼'=>'swaa','ă‚¹ă‚§ăƒ¼'=>'swee','ă‚¹ă‚£ăƒ¼'=>'swii','ă‚¹ă‚©ăƒ¼'=>'swoo','ă‚¹ă‚¥ăƒ¼'=>'swuu',
+       'ăƒ‡ă‚¡ăƒ¼'=>'daa','ăƒ‡ă‚§ăƒ¼'=>'dee','ăƒ‡ă‚£ăƒ¼'=>'dii','ăƒ‡ă‚©ăƒ¼'=>'doo','ăƒ‡ă‚¥ăƒ¼'=>'duu',
+       'ăƒ�ăƒ£ăƒ¼'=>'chaa','ăƒ�ă‚§ăƒ¼'=>'chee','ăƒ�ăƒ¼'=>'chii','ăƒ�ăƒ§ăƒ¼'=>'choo','ăƒ�ăƒ¥ăƒ¼'=>'chuu',
+       'ăƒ‚ăƒ£ăƒ¼'=>'dyaa','ăƒ‚ă‚§ăƒ¼'=>'dyee','ăƒ‚ă‚£ăƒ¼'=>'dyii','ăƒ‚ăƒ§ăƒ¼'=>'dyoo','ăƒ‚ăƒ¥ăƒ¼'=>'dyuu',
+       'ăƒ„ăƒ£ăƒ¼'=>'tsaa','ăƒ„ă‚§ăƒ¼'=>'tsee','ăƒ„ă‚£ăƒ¼'=>'tsii','ăƒ„ăƒ§ăƒ¼'=>'tsoo','ăƒ„ăƒ¼'=>'tsuu',
+       'ăƒˆă‚¡ăƒ¼'=>'twaa','ăƒˆă‚§ăƒ¼'=>'twee','ăƒˆă‚£ăƒ¼'=>'twii','ăƒˆă‚©ăƒ¼'=>'twoo','ăƒˆă‚¥ăƒ¼'=>'twuu',
+       'ăƒ‰ă‚¡ăƒ¼'=>'dwaa','ăƒ‰ă‚§ăƒ¼'=>'dwee','ăƒ‰ă‚£ăƒ¼'=>'dwii','ăƒ‰ă‚©ăƒ¼'=>'dwoo','ăƒ‰ă‚¥ăƒ¼'=>'dwuu',
+       'ă‚¦ă‚¡ăƒ¼'=>'whaa','ă‚¦ă‚§ăƒ¼'=>'whee','ă‚¦ă‚£ăƒ¼'=>'whii','ă‚¦ă‚©ăƒ¼'=>'whoo','ă‚¦ă‚¥ăƒ¼'=>'whuu',
+       'ăƒ´ăƒ£ăƒ¼'=>'vyaa','ăƒ´ă‚§ăƒ¼'=>'vyee','ăƒ´ă‚£ăƒ¼'=>'vyii','ăƒ´ăƒ§ăƒ¼'=>'vyoo','ăƒ´ăƒ¥ăƒ¼'=>'vyuu',
+       'ăƒ´ă‚¡ăƒ¼'=>'vaa','ăƒ´ă‚§ăƒ¼'=>'vee','ăƒ´ă‚£ăƒ¼'=>'vii','ăƒ´ă‚©ăƒ¼'=>'voo','ăƒ´ăƒ¼'=>'vuu',
+       'ă‚¦ă‚§ăƒ¼'=>'wee','ă‚¦ă‚£ăƒ¼'=>'wii',
+       'ă‚¤ă‚§ăƒ¼'=>'yee',
+
+       // 3 character syllables - doubled consonants
+       'ăƒƒăƒ“ăƒ£'=>'bbya','ăƒƒăƒ“ă‚§'=>'bbye','ăƒƒăƒ“ă‚£'=>'bbyi','ăƒƒăƒ“ăƒ§'=>'bbyo','ăƒƒăƒ“ăƒ¥'=>'bbyu',
+       'ăƒƒăƒ”ăƒ£'=>'ppya','ăƒƒăƒ”ă‚§'=>'ppye','ăƒƒăƒ”ă‚£'=>'ppyi','ăƒƒăƒ”ăƒ§'=>'ppyo','ăƒƒăƒ”ăƒ¥'=>'ppyu',
+       'ăƒƒă‚­ăƒ£'=>'kkya','ăƒƒă‚­ă‚§'=>'kkye','ăƒƒă‚­ă‚£'=>'kkyi','ăƒƒă‚­ăƒ§'=>'kkyo','ăƒƒă‚­ăƒ¥'=>'kkyu',
+       'ăƒƒă‚®ăƒ£'=>'ggya','ăƒƒă‚®ă‚§'=>'ggye','ăƒƒă‚®ă‚£'=>'ggyi','ăƒƒă‚®ăƒ§'=>'ggyo','ăƒƒă‚®ăƒ¥'=>'ggyu',
+       'ăƒƒăƒŸăƒ£'=>'mmya','ăƒƒăƒŸă‚§'=>'mmye','ăƒƒăƒŸă‚£'=>'mmyi','ăƒƒăƒŸăƒ§'=>'mmyo','ăƒƒăƒŸăƒ¥'=>'mmyu',
+       'ăƒƒăƒ‹ăƒ£'=>'nnya','ăƒƒăƒ‹ă‚§'=>'nnye','ăƒƒăƒ‹ă‚£'=>'nnyi','ăƒƒăƒ‹ăƒ§'=>'nnyo','ăƒƒăƒ‹ăƒ¥'=>'nnyu',
+       'ăƒƒăƒªăƒ£'=>'rrya','ăƒƒăƒªă‚§'=>'rrye','ăƒƒăƒªă‚£'=>'rryi','ăƒƒăƒªăƒ§'=>'rryo','ăƒƒăƒªăƒ¥'=>'rryu',
+       'ăƒƒă‚·ăƒ£'=>'ssha','ăƒƒă‚·ă‚§'=>'sshe','ăƒƒă‚·'=>'sshi','ăƒƒă‚·ăƒ§'=>'ssho','ăƒƒă‚·ăƒ¥'=>'sshu',
+       'ăƒƒăƒ�ăƒ£'=>'ccha','ăƒƒăƒ�ェ'=>'cche','ăƒƒăƒ�'=>'cchi','ăƒƒăƒ�ăƒ§'=>'ccho','ăƒƒăƒ�ăƒ¥'=>'cchu',
+
+       // 3 character syllables - doubled vowel and consonants
+       'ăƒƒăƒ�ăƒ¼'=>'bbaa','ăƒƒăƒ™ăƒ¼'=>'bbee','ăƒƒăƒ“ăƒ¼'=>'bbii','ăƒƒăƒœăƒ¼'=>'bboo','ăƒƒăƒ–ăƒ¼'=>'bbuu',
+       'ăƒƒăƒ‘ăƒ¼'=>'ppaa','ăƒƒăƒ�ăƒ¼'=>'ppee','ăƒƒăƒ”ăƒ¼'=>'ppii','ăƒƒăƒ�ăƒ¼'=>'ppoo','ăƒƒăƒ—ăƒ¼'=>'ppuu',
+       'ăƒƒă‚±ăƒ¼'=>'kkee','ăƒƒă‚­ăƒ¼'=>'kkii','ăƒƒă‚³ăƒ¼'=>'kkoo','ăƒƒă‚¯ăƒ¼'=>'kkuu','ăƒƒă‚«ăƒ¼'=>'kkaa',
+       'ăƒƒă‚¬ăƒ¼'=>'ggaa','ăƒƒă‚²ăƒ¼'=>'ggee','ăƒƒă‚®ăƒ¼'=>'ggii','ăƒƒă‚´ăƒ¼'=>'ggoo','ăƒƒă‚°ăƒ¼'=>'gguu',
+       'ăƒƒăƒ�ăƒ¼'=>'maa','ăƒƒăƒ¡ăƒ¼'=>'mee','ăƒƒăƒŸăƒ¼'=>'mii','ăƒƒăƒ¢ăƒ¼'=>'moo','ăƒƒăƒ ăƒ¼'=>'muu',
+       'ăƒƒăƒ�ăƒ¼'=>'nnaa','ăƒƒăƒ�ăƒ¼'=>'nnee','ăƒƒăƒ‹ăƒ¼'=>'nnii','ăƒƒăƒ�ăƒ¼'=>'nnoo','ăƒƒăƒŒăƒ¼'=>'nnuu',
+       'ăƒƒăƒ©ăƒ¼'=>'rraa','ăƒƒăƒ¬ăƒ¼'=>'rree','ăƒƒăƒªăƒ¼'=>'rrii','ăƒƒăƒ­ăƒ¼'=>'rroo','ăƒƒăƒ«ăƒ¼'=>'rruu',
+       'ăƒƒă‚µăƒ¼'=>'ssaa','ăƒƒă‚»ăƒ¼'=>'ssee','ăƒƒă‚·ăƒ¼'=>'sshii','ăƒƒă‚½ăƒ¼'=>'ssoo','ăƒƒă‚¹ăƒ¼'=>'ssuu',
+       'ăƒƒă‚¶ăƒ¼'=>'zzaa','ăƒƒă‚¼ăƒ¼'=>'zzee','ăƒƒă‚¸ăƒ¼'=>'zzii','ăƒƒă‚¾ăƒ¼'=>'zzoo','ăƒƒă‚ºăƒ¼'=>'zzuu',
+       'ăƒƒă‚¿ăƒ¼'=>'ttaa','ăƒƒăƒ†ăƒ¼'=>'ttee','ăƒƒăƒ�ăƒ¼'=>'chii','ăƒƒăƒˆăƒ¼'=>'ttoo','ăƒƒăƒ„ăƒ¼'=>'ttssuu',
+       'ăƒƒăƒ€ăƒ¼'=>'ddaa','ăƒƒăƒ‡ăƒ¼'=>'ddee','ăƒƒăƒ‚ăƒ¼'=>'ddii','ăƒƒăƒ‰ăƒ¼'=>'ddoo','ăƒƒăƒ…ăƒ¼'=>'dduu',
+
+       // 2 character syllables - normal
+       'ăƒ•ă‚¡'=>'fa','ăƒ•ă‚§'=>'fe','ăƒ•ă‚£'=>'fi','ăƒ•ă‚©'=>'fo',
+       'ăƒ•ăƒ£'=>'fya','ăƒ•ă‚§'=>'fye','ăƒ•ă‚£'=>'fyi','ăƒ•ăƒ§'=>'fyo','ăƒ•ăƒ¥'=>'fyu',
+       'ăƒ’ăƒ£'=>'hya','ăƒ’ă‚§'=>'hye','ăƒ’ă‚£'=>'hyi','ăƒ’ăƒ§'=>'hyo','ăƒ’ăƒ¥'=>'hyu',
+       'ăƒ“ăƒ£'=>'bya','ăƒ“ă‚§'=>'bye','ăƒ“ă‚£'=>'byi','ăƒ“ăƒ§'=>'byo','ăƒ“ăƒ¥'=>'byu',
+       'ăƒ”ăƒ£'=>'pya','ăƒ”ă‚§'=>'pye','ăƒ”ă‚£'=>'pyi','ăƒ”ăƒ§'=>'pyo','ăƒ”ăƒ¥'=>'pyu',
+       'ă‚­ăƒ£'=>'kya','キェ'=>'kye','ă‚­ă‚£'=>'kyi','ă‚­ăƒ§'=>'kyo','ă‚­ăƒ¥'=>'kyu',
+       'ă‚®ăƒ£'=>'gya','ギェ'=>'gye','ă‚®ă‚£'=>'gyi','ă‚®ăƒ§'=>'gyo','ă‚®ăƒ¥'=>'gyu',
+       'ăƒŸăƒ£'=>'mya','ăƒŸă‚§'=>'mye','ăƒŸă‚£'=>'myi','ăƒŸăƒ§'=>'myo','ăƒŸăƒ¥'=>'myu',
+       'ăƒ‹ăƒ£'=>'nya','ăƒ‹ă‚§'=>'nye','ăƒ‹ă‚£'=>'nyi','ăƒ‹ăƒ§'=>'nyo','ăƒ‹ăƒ¥'=>'nyu',
+       'ăƒªăƒ£'=>'rya','ăƒªă‚§'=>'rye','ăƒªă‚£'=>'ryi','ăƒªăƒ§'=>'ryo','ăƒªăƒ¥'=>'ryu',
+       'ă‚·ăƒ£'=>'sha','シェ'=>'she','ă‚·'=>'shi','ă‚·ăƒ§'=>'sho','ă‚·ăƒ¥'=>'shu',
+       'ă‚¸ăƒ£'=>'ja','ジェ'=>'je','ジ'=>'ji','ă‚¸ăƒ§'=>'jo','ă‚¸ăƒ¥'=>'ju',
+       'ă‚¹ă‚¡'=>'swa','ă‚¹ă‚§'=>'swe','ă‚¹ă‚£'=>'swi','ă‚¹ă‚©'=>'swo','ă‚¹ă‚¥'=>'swu',
+       'ăƒ‡ă‚¡'=>'da','ăƒ‡ă‚§'=>'de','ăƒ‡ă‚£'=>'di','ăƒ‡ă‚©'=>'do','ăƒ‡ă‚¥'=>'du',
+       'ăƒ�ăƒ£'=>'cha','ăƒ�ェ'=>'che','ăƒ�'=>'chi','ăƒ�ăƒ§'=>'cho','ăƒ�ăƒ¥'=>'chu',
+       'ăƒ‚ăƒ£'=>'dya','ăƒ‚ă‚§'=>'dye','ăƒ‚ă‚£'=>'dyi','ăƒ‚ăƒ§'=>'dyo','ăƒ‚ăƒ¥'=>'dyu',
+       'ăƒ„ăƒ£'=>'tsa','ăƒ„ă‚§'=>'tse','ăƒ„ă‚£'=>'tsi','ăƒ„ăƒ§'=>'tso','ăƒ„'=>'tsu',
+       'ăƒˆă‚¡'=>'twa','ăƒˆă‚§'=>'twe','ăƒˆă‚£'=>'twi','ăƒˆă‚©'=>'two','ăƒˆă‚¥'=>'twu',
+       'ăƒ‰ă‚¡'=>'dwa','ăƒ‰ă‚§'=>'dwe','ăƒ‰ă‚£'=>'dwi','ăƒ‰ă‚©'=>'dwo','ăƒ‰ă‚¥'=>'dwu',
+       'ă‚¦ă‚¡'=>'wha','ウェ'=>'whe','ă‚¦ă‚£'=>'whi','ウォ'=>'who','ă‚¦ă‚¥'=>'whu',
+       'ăƒ´ăƒ£'=>'vya','ăƒ´ă‚§'=>'vye','ăƒ´ă‚£'=>'vyi','ăƒ´ăƒ§'=>'vyo','ăƒ´ăƒ¥'=>'vyu',
+       'ăƒ´ă‚¡'=>'va','ăƒ´ă‚§'=>'ve','ăƒ´ă‚£'=>'vi','ăƒ´ă‚©'=>'vo','ăƒ´'=>'vu',
+       'ウェ'=>'we','ă‚¦ă‚£'=>'wi',
+       'イェ'=>'ye',
+
+       // 2 character syllables - doubled vocal
+       'ă‚¢ăƒ¼'=>'aa','ă‚¨ăƒ¼'=>'ee','ă‚¤ăƒ¼'=>'ii','ă‚ªăƒ¼'=>'oo','ă‚¦ăƒ¼'=>'uu',
+       'ăƒ€ăƒ¼'=>'daa','ăƒ‡ăƒ¼'=>'dee','ăƒ‚ăƒ¼'=>'dii','ăƒ‰ăƒ¼'=>'doo','ăƒ…ăƒ¼'=>'duu',
+       'ăƒ�ăƒ¼'=>'haa','ăƒ˜ăƒ¼'=>'hee','ăƒ’ăƒ¼'=>'hii','ăƒ›ăƒ¼'=>'hoo','ăƒ•ăƒ¼'=>'fuu',
+       'ăƒ�ăƒ¼'=>'baa','ăƒ™ăƒ¼'=>'bee','ăƒ“ăƒ¼'=>'bii','ăƒœăƒ¼'=>'boo','ăƒ–ăƒ¼'=>'buu',
+       'ăƒ‘ăƒ¼'=>'paa','ăƒ�ăƒ¼'=>'pee','ăƒ”ăƒ¼'=>'pii','ăƒ�ăƒ¼'=>'poo','ăƒ—ăƒ¼'=>'puu',
+       'ă‚±ăƒ¼'=>'kee','ă‚­ăƒ¼'=>'kii','ă‚³ăƒ¼'=>'koo','ă‚¯ăƒ¼'=>'kuu','ă‚«ăƒ¼'=>'kaa',
+       'ă‚¬ăƒ¼'=>'gaa','ă‚²ăƒ¼'=>'gee','ă‚®ăƒ¼'=>'gii','ă‚´ăƒ¼'=>'goo','ă‚°ăƒ¼'=>'guu',
+       'ăƒ�ăƒ¼'=>'maa','ăƒ¡ăƒ¼'=>'mee','ăƒŸăƒ¼'=>'mii','ăƒ¢ăƒ¼'=>'moo','ăƒ ăƒ¼'=>'muu',
+       'ăƒ�ăƒ¼'=>'naa','ăƒ�ăƒ¼'=>'nee','ăƒ‹ăƒ¼'=>'nii','ăƒ�ăƒ¼'=>'noo','ăƒŒăƒ¼'=>'nuu',
+       'ăƒ©ăƒ¼'=>'raa','ăƒ¬ăƒ¼'=>'ree','ăƒªăƒ¼'=>'rii','ăƒ­ăƒ¼'=>'roo','ăƒ«ăƒ¼'=>'ruu',
+       'ă‚µăƒ¼'=>'saa','ă‚»ăƒ¼'=>'see','ă‚·ăƒ¼'=>'shii','ă‚½ăƒ¼'=>'soo','ă‚¹ăƒ¼'=>'suu',
+       'ă‚¶ăƒ¼'=>'zaa','ă‚¼ăƒ¼'=>'zee','ă‚¸ăƒ¼'=>'zii','ă‚¾ăƒ¼'=>'zoo','ă‚ºăƒ¼'=>'zuu',
+       'ă‚¿ăƒ¼'=>'taa','ăƒ†ăƒ¼'=>'tee','ăƒ�ăƒ¼'=>'chii','ăƒˆăƒ¼'=>'too','ăƒ„ăƒ¼'=>'tsuu',
+       'ăƒ¯ăƒ¼'=>'waa','ăƒ²ăƒ¼'=>'woo',
+       'ăƒ¤ăƒ¼'=>'yaa','ăƒ¨ăƒ¼'=>'yoo','ăƒ¦ăƒ¼'=>'yuu',
+       'ăƒ±ăƒ¼'=>'wyee','ăƒ°ăƒ¼'=>'wyii',
+       'ăƒµăƒ¼'=>'kaa','ăƒ¶ăƒ¼'=>'kee',
+
+       // 2 character syllables - doubled consonants
+       'ăƒƒăƒ�'=>'bba','ăƒƒăƒ™'=>'bbe','ăƒƒăƒ“'=>'bbi','ăƒƒăƒœ'=>'bbo','ăƒƒăƒ–'=>'bbu',
+       'ăƒƒăƒ‘'=>'ppa','ăƒƒăƒ�'=>'ppe','ăƒƒăƒ”'=>'ppi','ăƒƒăƒ�'=>'ppo','ăƒƒăƒ—'=>'ppu',
+       'ăƒƒă‚±'=>'kke','ăƒƒă‚­'=>'kki','ăƒƒă‚³'=>'kko','ăƒƒă‚¯'=>'kku','ăƒƒă‚«'=>'kka',
+       'ăƒƒă‚¬'=>'gga','ăƒƒă‚²'=>'gge','ăƒƒă‚®'=>'ggi','ăƒƒă‚´'=>'ggo','ăƒƒă‚°'=>'ggu',
+       'ăƒƒăƒ�'=>'ma','ăƒƒăƒ¡'=>'me','ăƒƒăƒŸ'=>'mi','ăƒƒăƒ¢'=>'mo','ăƒƒăƒ '=>'mu',
+       'ăƒƒăƒ�'=>'nna','ăƒƒăƒ�'=>'nne','ăƒƒăƒ‹'=>'nni','ăƒƒăƒ�'=>'nno','ăƒƒăƒŒ'=>'nnu',
+       'ăƒƒăƒ©'=>'rra','ăƒƒăƒ¬'=>'rre','ăƒƒăƒª'=>'rri','ăƒƒăƒ­'=>'rro','ăƒƒăƒ«'=>'rru',
+       'ăƒƒă‚µ'=>'ssa','ăƒƒă‚»'=>'sse','ăƒƒă‚·'=>'sshi','ăƒƒă‚½'=>'sso','ăƒƒă‚¹'=>'ssu',
+       'ăƒƒă‚¶'=>'zza','ăƒƒă‚¼'=>'zze','ăƒƒă‚¸'=>'zzi','ăƒƒă‚¾'=>'zzo','ăƒƒă‚º'=>'zzu',
+       'ăƒƒă‚¿'=>'tta','ăƒƒăƒ†'=>'tte','ăƒƒăƒ�'=>'chi','ăƒƒăƒˆ'=>'tto','ăƒƒăƒ„'=>'ttssu',
+       'ăƒƒăƒ€'=>'dda','ăƒƒăƒ‡'=>'dde','ăƒƒăƒ‚'=>'ddi','ăƒƒăƒ‰'=>'ddo','ăƒƒăƒ…'=>'ddu',
+
+       // 1 character syllables
+       'ă‚¢'=>'a','エ'=>'e','イ'=>'i','ă‚ª'=>'o','ウ'=>'u','ăƒ³'=>'n',
+       'ăƒ�'=>'ha','ăƒ˜'=>'he','ăƒ’'=>'hi','ăƒ›'=>'ho','ăƒ•'=>'fu',
+       'ăƒ�'=>'ba','ăƒ™'=>'be','ăƒ“'=>'bi','ăƒœ'=>'bo','ăƒ–'=>'bu',
+       'ăƒ‘'=>'pa','ăƒ�'=>'pe','ăƒ”'=>'pi','ăƒ�'=>'po','ăƒ—'=>'pu',
+       'ケ'=>'ke','ă‚­'=>'ki','ă‚³'=>'ko','ă‚¯'=>'ku','ă‚«'=>'ka',
+       'ガ'=>'ga','ă‚²'=>'ge','ă‚®'=>'gi','ă‚´'=>'go','ă‚°'=>'gu',
+       'ăƒ�'=>'ma','ăƒ¡'=>'me','ăƒŸ'=>'mi','ăƒ¢'=>'mo','ăƒ '=>'mu',
+       'ăƒ�'=>'na','ăƒ�'=>'ne','ăƒ‹'=>'ni','ăƒ�'=>'no','ăƒŒ'=>'nu',
+       'ăƒ©'=>'ra','ăƒ¬'=>'re','ăƒª'=>'ri','ăƒ­'=>'ro','ăƒ«'=>'ru',
+       'サ'=>'sa','ă‚»'=>'se','ă‚·'=>'shi','ă‚½'=>'so','ă‚¹'=>'su',
+       'ザ'=>'za','ă‚¼'=>'ze','ジ'=>'zi','ă‚¾'=>'zo','ă‚º'=>'zu',
+       'ă‚¿'=>'ta','ăƒ†'=>'te','ăƒ�'=>'chi','ăƒˆ'=>'to','ăƒ„'=>'tsu',
+       'ăƒ€'=>'da','ăƒ‡'=>'de','ăƒ‚'=>'di','ăƒ‰'=>'do','ăƒ…'=>'du',
+       'ăƒ¯'=>'wa','ăƒ²'=>'wo',
+       'ăƒ¤'=>'ya','ăƒ¨'=>'yo','ăƒ¦'=>'yu',
+       'ăƒ±'=>'wye','ăƒ°'=>'wyi',
+       'ăƒµ'=>'ka','ăƒ¶'=>'ke',
+
+       //  convert what's left (probably only kicks in when something's missing above
+       'ă‚¡'=>'a','ェ'=>'e','ă‚£'=>'i','ă‚©'=>'o','ă‚¥'=>'u',
+       'ăƒ£'=>'ya','ăƒ§'=>'yo','ăƒ¥'=>'yu',
+
+       // 'ăƒ©'=>'la','ăƒ¬'=>'le','ăƒª'=>'li','ăƒ­'=>'lo','ăƒ«'=>'lu',
+       // 'ăƒ�ăƒ£'=>'cya','ăƒ�ェ'=>'cye','ăƒ�ă‚£'=>'cyi','ăƒ�ăƒ§'=>'cyo','ăƒ�ăƒ¥'=>'cyu',
+       //'ăƒ‡ăƒ£'=>'dha','ăƒ‡ă‚§'=>'dhe','ăƒ‡ă‚£'=>'dhi','ăƒ‡ăƒ§'=>'dho','ăƒ‡ăƒ¥'=>'dhu',
+       // 'ăƒªăƒ£'=>'lya','ăƒªă‚§'=>'lye','ăƒªă‚£'=>'lyi','ăƒªăƒ§'=>'lyo','ăƒªăƒ¥'=>'lyu',
+       // 'ăƒ†ăƒ£'=>'tha','ăƒ†ă‚§'=>'the','ăƒ†ă‚£'=>'thi','ăƒ†ăƒ§'=>'tho','ăƒ†ăƒ¥'=>'thu',
+       //'ăƒ•ă‚¡'=>'fwa','ăƒ•ă‚§'=>'fwe','ăƒ•ă‚£'=>'fwi','ăƒ•ă‚©'=>'fwo','ăƒ•ă‚¥'=>'fwu',
+       //'ăƒ�ăƒ£'=>'tya','ăƒ�ェ'=>'tye','ăƒ�ă‚£'=>'tyi','ăƒ�ăƒ§'=>'tyo','ăƒ�ăƒ¥'=>'tyu',
+       // 'ă‚¸ăƒ£'=>'jya','ジェ'=>'jye','ă‚¸ă‚£'=>'jyi','ă‚¸ăƒ§'=>'jyo','ă‚¸ăƒ¥'=>'jyu',
+       // 'ă‚¸ăƒ£'=>'zha','ジェ'=>'zhe','ă‚¸ă‚£'=>'zhi','ă‚¸ăƒ§'=>'zho','ă‚¸ăƒ¥'=>'zhu',
+       //'ă‚¸ăƒ£'=>'zya','ジェ'=>'zye','ă‚¸ă‚£'=>'zyi','ă‚¸ăƒ§'=>'zyo','ă‚¸ăƒ¥'=>'zyu',
+       //'ă‚·ăƒ£'=>'sya','シェ'=>'sye','ă‚·ă‚£'=>'syi','ă‚·ăƒ§'=>'syo','ă‚·ăƒ¥'=>'syu',
+       //'ă‚·'=>'ci','ăƒ•'=>'hu',ă‚·'=>'si','ăƒ�'=>'ti','ăƒ„'=>'tu','イ'=>'yi','ăƒ‚'=>'dzi',
+
+       // "Greeklish"
+       'Γ'=>'G','Δ'=>'E','Θ'=>'Th','Λ'=>'L','�'=>'X','Π'=>'P','Σ'=>'S','Φ'=>'F','Ψ'=>'Ps',
+       'γ'=>'g','δ'=>'e','θ'=>'th','λ'=>'l','ξ'=>'x','π'=>'p','σ'=>'s','φ'=>'f','ψ'=>'ps',
+
+       // Thai
+       '�'=>'k','ข'=>'kh','ฃ'=>'kh','ค'=>'kh','ฅ'=>'kh','ฆ'=>'kh','ง'=>'ng','จ'=>'ch',
+       'ฉ'=>'ch','�'=>'ch','ซ'=>'s','ฌ'=>'ch','�'=>'y','�'=>'d','�'=>'t','�'=>'th',
+       'ฑ'=>'d','ฒ'=>'th','ณ'=>'n','ด'=>'d','ต'=>'t','ถ'=>'th','ท'=>'th','ธ'=>'th',
+       'น'=>'n','�'=>'b','ป'=>'p','ผ'=>'ph','�'=>'f','�'=>'ph','ฟ'=>'f','ภ'=>'ph',
+       'ม'=>'m','ย'=>'y','ร'=>'r','ฤ'=>'rue','ฤๅ'=>'rue','ล'=>'l','ฦ'=>'lue',
+       'ฦๅ'=>'lue','ว'=>'w','ศ'=>'s','ษ'=>'s','ส'=>'s','ห'=>'h','ฬ'=>'l','ฮ'=>'h',
+       'ะ'=>'a','ั'=>'a','รร'=>'a','า'=>'a','ๅ'=>'a','ำ'=>'am','�า'=>'am',
+       'ิ'=>'i','ี'=>'i','ึ'=>'ue','ี'=>'ue','ุ'=>'u','ู'=>'u',
+       'เ'=>'e','�'=>'ae','โ'=>'o','อ'=>'o',
+       'ียะ'=>'ia','ีย'=>'ia','ือะ'=>'uea','ือ'=>'uea','ัวะ'=>'ua','ัว'=>'ua',
+       'ใ'=>'ai','ไ'=>'ai','ัย'=>'ai','าย'=>'ai','าว'=>'ao',
+       'ุย'=>'ui','อย'=>'oi','ือย'=>'ueai','วย'=>'uai',
+       'ิว'=>'io','็ว'=>'eo','ียว'=>'iao',
+       '่'=>'','้'=>'','�'=>'','๋'=>'','็'=>'',
+       '์'=>'','�'=>'','�'=>'','ฺ'=>'',
+       'ๆ'=>'2','�'=>'o','ฯ'=>'-','�'=>'-','๛'=>'-', 
+       '�'=>'0','๑'=>'1','๒'=>'2','๓'=>'3','๔'=>'4',
+       '๕'=>'5','๖'=>'6','๗'=>'7','๘'=>'8','๙'=>'9',
+
+       // Korean
+       'ㄱ'=>'k','ă…‹'=>'kh','ă„²'=>'kk','ă„·'=>'t','ă…Œ'=>'th','ㄸ'=>'tt','ă…‚'=>'p',
+       'ă…�'=>'ph','ă…ƒ'=>'pp','ă…ˆ'=>'c','ă…�'=>'ch','ă…‰'=>'cc','ă……'=>'s','ă…†'=>'ss',
+       'ă…�'=>'h','ă…‡'=>'ng','ă„´'=>'n','ă„¹'=>'l','ă…�'=>'m', 'ă…�'=>'a','ă…“'=>'e','ă…—'=>'o',
+       'ă…œ'=>'wu','ă…¡'=>'u','ă…£'=>'i','ă…�'=>'ay','ă…”'=>'ey','ă…�'=>'oy','ă…˜'=>'wa','ă…�'=>'we',
+       'ă…Ÿ'=>'wi','ă…™'=>'way','ă…�'=>'wey','ă…¢'=>'uy','ă…‘'=>'ya','ă…•'=>'ye','ă…›'=>'oy',
+       'ă… '=>'yu','ă…’'=>'yay','ă…–'=>'yey',
+                               );
+    }
+}
\ No newline at end of file
diff --git a/src/Pluf/Text/Wiki/Block/Blockquote.php b/src/Pluf/Text/Wiki/Block/Blockquote.php
new file mode 100644
index 0000000..5611daa
--- /dev/null
+++ b/src/Pluf/Text/Wiki/Block/Blockquote.php
@@ -0,0 +1,76 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/*
+ * Based on Wiki Renderer copyright (C) 2003-2004 Laurent Jouanneau
+ * http://ljouanneau.com/softs/wikirenderer/
+ */
+
+/**
+ * traite les signes de type blockquote
+ */
+class Pluf_Text_Wiki_Block_Blockquote extends Pluf_Text_Wiki_BlockRenderer
+{
+    public $_previousTag;
+    public $_firstTagLen;
+    public $_firstLine;
+
+    function __construct($wr) {
+        parent::__construct($wr);
+        $this->type   = 'bq';
+        $this->regexp = "/^(\>+)(.*)/";
+    }
+
+    function open() {
+        $this->_previousTag = $this->_detectMatch[1];
+        $this->_firstTagLen = strlen($this->_previousTag);
+        $this->_firstLine = true;
+        return str_repeat('<blockquote>',$this->_firstTagLen).'<p>';
+   }
+
+    function close() {
+        return '</p>'.str_repeat('</blockquote>',strlen($this->_previousTag));
+    }
+
+    function getRenderedLine() {
+
+        $d=strlen($this->_previousTag) - strlen($this->_detectMatch[1]);
+        $str='';
+
+        if( $d > 0 ){ // on remonte d'un cran dans la hierarchie...
+            $str='</p>'.str_repeat('</blockquote>',$d).'<p>';
+            $this->_previousTag=$this->_detectMatch[1];
+        }
+        elseif( $d < 0 ) { // un niveau de plus
+            $this->_previousTag=$this->_detectMatch[1];
+            $str='</p>'.str_repeat('<blockquote>',-$d).'<p>';
+        }
+        else {
+            if($this->_firstLine)
+                $this->_firstLine=false;
+            else
+                $str='<br />';
+        }
+        return $str.$this->_renderInlineTag($this->_detectMatch[2]);
+    }
+}
\ No newline at end of file
diff --git a/src/Pluf/Text/Wiki/Block/Definition.php b/src/Pluf/Text/Wiki/Block/Definition.php
new file mode 100644
index 0000000..cf6063a
--- /dev/null
+++ b/src/Pluf/Text/Wiki/Block/Definition.php
@@ -0,0 +1,49 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/*
+ * Based on Wiki Renderer copyright (C) 2003-2004 Laurent Jouanneau
+ * http://ljouanneau.com/softs/wikirenderer/
+ */
+
+/**
+ * traite les signes de type définitions
+ */
+class Pluf_Text_Wiki_Block_Definition extends Pluf_Text_Wiki_BlockRenderer
+{
+    function __construct($wr) 
+    {
+        parent::__construct($wr);
+        $this->type      = 'dfn';
+        $this->regexp    = "/^;(.*) : (.*)/i";
+        $this->_openTag  = '<dl>';
+        $this->_closeTag ='</dl>';
+    }
+
+    function getRenderedLine() 
+    {
+        $dt=$this->_renderInlineTag($this->_detectMatch[1]);
+        $dd=$this->_renderInlineTag($this->_detectMatch[2]);
+        return "<dt>$dt</dt>\n<dd>$dd</dd>\n";
+    }
+}
diff --git a/src/Pluf/Text/Wiki/Block/Hr.php b/src/Pluf/Text/Wiki/Block/Hr.php
new file mode 100644
index 0000000..d18abf8
--- /dev/null
+++ b/src/Pluf/Text/Wiki/Block/Hr.php
@@ -0,0 +1,47 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/*
+ * Based on Wiki Renderer copyright (C) 2003-2004 Laurent Jouanneau
+ * http://ljouanneau.com/softs/wikirenderer/
+ */
+
+/**
+ * traite les signes de type hr
+ */
+class Pluf_Text_Wiki_Block_Hr extends Pluf_Text_Wiki_BlockRenderer
+{
+    function __construct($wr) 
+    {
+        parent::__construct($wr);
+        $this->type      = 'hr';
+        $this->regexp    = '/^={4,} *$/';
+        $this->_closeNow = true;
+    }
+
+    function getRenderedLine()
+    {
+       return '<hr />';
+    }
+
+}
diff --git a/src/Pluf/Text/Wiki/Block/List.php b/src/Pluf/Text/Wiki/Block/List.php
new file mode 100644
index 0000000..65c4029
--- /dev/null
+++ b/src/Pluf/Text/Wiki/Block/List.php
@@ -0,0 +1,95 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/*
+ * Based on Wiki Renderer copyright (C) 2003-2004 Laurent Jouanneau
+ * http://ljouanneau.com/softs/wikirenderer/
+ */
+
+/**
+ * traite les signes de type list
+ */
+class Pluf_Text_Wiki_Block_List extends Pluf_Text_Wiki_BlockRenderer
+{
+    public $_previousTag;
+    public $_firstItem;
+    public $_firstTagLen;
+
+    function __construct($wr) 
+    {
+        parent::__construct($wr);
+        $this->type   = 'list';
+        $this->regexp = "/^([\*#-]+)(.*)/";
+    }
+
+    function open() 
+    {
+        $this->_previousTag = $this->_detectMatch[1];
+        $this->_firstTagLen = strlen($this->_previousTag);
+        $this->_firstItem=true;
+
+        if(substr($this->_previousTag,-1,1) == '#')
+            return "<ol>\n";
+        else
+            return "<ul>\n";
+    }
+
+    function close()
+    {
+        $t=$this->_previousTag;
+        $str='';
+
+        for($i=strlen($t); $i >= $this->_firstTagLen; $i--) {
+            $str.=($t{$i-1}== '#'?"</li></ol>\n":"</li></ul>\n");
+        }
+        return $str;
+    }
+
+    function getRenderedLine()
+    {
+        $t=$this->_previousTag;
+        $d=strlen($t) - strlen($this->_detectMatch[1]);
+        $str='';
+
+        if( $d > 0 ){ // on remonte d'un ou plusieurs cran dans la hierarchie...
+            $l=strlen($this->_detectMatch[1]);
+            for($i=strlen($t); $i>$l; $i--){
+                $str.=($t{$i-1}== '#'?"</li></ol>\n":"</li></ul>\n");
+            }
+            $str.="</li>\n<li>";
+            $this->_previousTag=substr($this->_previousTag,0,-$d); // pour Ăªtre sur...
+
+        }
+        elseif( $d < 0 ) { // un niveau de plus
+            $c=substr($this->_detectMatch[1],-1,1);
+            $this->_previousTag.=$c;
+            $str=($c == '#'?"<ol>\n<li>":"<ul>\n<li>");
+        }
+        else {
+            $str=($this->_firstItem ? '<li>':'</li><li>');
+        }
+        $this->_firstItem=false;
+        return $str.$this->_renderInlineTag($this->_detectMatch[2]);
+    }
+
+}
diff --git a/src/Pluf/Text/Wiki/Block/P.php b/src/Pluf/Text/Wiki/Block/P.php
new file mode 100644
index 0000000..d763d77
--- /dev/null
+++ b/src/Pluf/Text/Wiki/Block/P.php
@@ -0,0 +1,42 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/*
+ * Based on Wiki Renderer copyright (C) 2003-2004 Laurent Jouanneau
+ * http://ljouanneau.com/softs/wikirenderer/
+ */
+
+/**
+ * traite les signes de type paragraphe
+ */
+class Pluf_Text_Wiki_Block_P extends Pluf_Text_Wiki_BlockRenderer
+{
+    function __construct($wr) 
+    {
+        parent::__construct($wr);
+        $this->type      = 'p';
+        $this->regexp    = "/(.*)/";
+        $this->_openTag  = '<p>';
+        $this->_closeTag ='</p>';
+    }
+}
diff --git a/src/Pluf/Text/Wiki/Block/Pre.php b/src/Pluf/Text/Wiki/Block/Pre.php
new file mode 100644
index 0000000..c32460a
--- /dev/null
+++ b/src/Pluf/Text/Wiki/Block/Pre.php
@@ -0,0 +1,48 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/*
+ * Based on Wiki Renderer copyright (C) 2003-2004 Laurent Jouanneau
+ * http://ljouanneau.com/softs/wikirenderer/
+ */
+
+/**
+ * traite les signes de type pre
+ */
+class Pluf_Text_Wiki_Block_Pre extends Pluf_Text_Wiki_BlockRenderer
+{
+    function __construct($wr) 
+    {
+        parent::__construct($wr);
+        $this->type      = 'pre';
+        $this->regexp    = "/^ (.*)/";
+        $this->_openTag  = '<pre>';
+        $this->_closeTag ='</pre>';
+    }
+
+    function getRenderedLine() 
+    {
+        return $this->_renderInlineTag($this->_detectMatch[1]);
+    }
+
+}
diff --git a/src/Pluf/Text/Wiki/Block/Table.php b/src/Pluf/Text/Wiki/Block/Table.php
new file mode 100644
index 0000000..5744202
--- /dev/null
+++ b/src/Pluf/Text/Wiki/Block/Table.php
@@ -0,0 +1,68 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/*
+ * Based on Wiki Renderer copyright (C) 2003-2004 Laurent Jouanneau
+ * http://ljouanneau.com/softs/wikirenderer/
+ */
+
+/**
+ * traite les signes de type table
+ */
+class Pluf_Text_Wiki_Block_Table extends Pluf_Text_Wiki_BlockRenderer
+{
+    public $_colcount = 0;
+
+    function __construct($wr) 
+    {
+        parent::__construct($wr);
+        $this->type      = 'table';
+        $this->regexp    = "/^\| ?(.*)/";
+        $this->_openTag  = '<table border="1">';
+        $this->_closeTag = '</table>';
+    }
+
+    function open() 
+    {
+        $this->_colcount=0;
+        return $this->_openTag;
+    }
+
+    function getRenderedLine() 
+    {
+        $result=explode(' | ',trim($this->_detectMatch[1]));
+        $str='';
+        $t='';
+        if((count($result) != $this->_colcount) && ($this->_colcount!=0))
+            $t='</table><table border="1">';
+            $this->_colcount=count($result);
+
+        for($i=0; $i < $this->_colcount; $i++) {
+            $str.='<td>'. $this->_renderInlineTag($result[$i]).'</td>';
+        }
+        $str=$t.'<tr>'.$str.'</tr>';
+
+        return $str;
+    }
+
+}
diff --git a/src/Pluf/Text/Wiki/Block/Title.php b/src/Pluf/Text/Wiki/Block/Title.php
new file mode 100644
index 0000000..7383588
--- /dev/null
+++ b/src/Pluf/Text/Wiki/Block/Title.php
@@ -0,0 +1,56 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/*
+ * Based on Wiki Renderer copyright (C) 2003-2004 Laurent Jouanneau
+ * http://ljouanneau.com/softs/wikirenderer/
+ */
+
+/**
+ * traite les signes de type titre
+ */
+class Pluf_Text_Wiki_Block_Title extends Pluf_Text_Wiki_BlockRenderer
+{
+    public $_minlevel = 1;
+    public $_order = false;
+
+    function __construct($wr)
+    {
+        parent::__construct($wr);
+        $this->type      = 'title';
+        $this->regexp    = "/^(\!{1,3})(.*)/";
+        $this->_closeNow  = true;
+        $cfg = $wr->getConfig();
+        $this->_minlevel = $cfg->minHeaderLevel;
+        $this->_order    = $cfg->headerOrder;
+    }
+
+    function getRenderedLine() 
+    {
+        if($this->_order)
+            $hx= $this->_minlevel + strlen($this->_detectMatch[1])-1;
+        else
+            $hx= $this->_minlevel + 3-strlen($this->_detectMatch[1]);
+        return '<h'.$hx.'>'.$this->_renderInlineTag($this->_detectMatch[2]).'</h'.$hx.'>';
+    }
+}
diff --git a/src/Pluf/Text/Wiki/BlockRenderer.php b/src/Pluf/Text/Wiki/BlockRenderer.php
new file mode 100644
index 0000000..b152850
--- /dev/null
+++ b/src/Pluf/Text/Wiki/BlockRenderer.php
@@ -0,0 +1,198 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/*
+ * Based on Wiki Renderer copyright (C) 2003-2004 Laurent Jouanneau
+ * http://ljouanneau.com/softs/wikirenderer/
+ */
+
+
+
+/**
+ * classe de base pour la transformation des Ă©lements de type bloc
+ * @abstract
+ */
+class Pluf_Text_Wiki_BlockRenderer
+{
+
+    /**
+     * @var string code identifiant le type de bloc
+     * @access protected
+     */
+    public $type='';
+
+    /**
+     * @var string  chaine contenant le tag XHTML d'ouverture du bloc
+     * @access protected
+     */
+    public $_openTag='';
+
+    /**
+     * @var string  chaine contenant le tag XHTML de fermeture du bloc
+     * @access protected
+     */
+    public $_closeTag='';
+
+    /**
+     * @var boolean indique si le bloc doit Ăªtre immediatement fermĂ© aprĂ©s dĂ©tection
+     * @access protected
+     */
+    public $_closeNow=false;
+
+    /**
+     * @var WikiRenderer      référence à la classe principale
+     * @access protected
+     */
+    public $engine=null;
+
+    /**
+     * @var array liste des élements trouvés par l'expression régulière regexp
+     * @access protected
+     */
+    public $_detectMatch=null;
+
+    /**
+     * @var string expression régulière permettant de reconnaitre le bloc
+     * @access protected
+     */
+    public $regexp='';
+
+    /**
+     * constructeur à surcharger pour définir les valeurs des différentes proprietés
+     * @param WikiRender $wr l'objet moteur wiki
+     */
+
+    function __construct($wr) {
+        $this->engine = $wr;
+    }
+
+    /**
+     * renvoi une chaine correspondant Ă  l'ouverture du bloc
+     * @return string
+     * @access public
+     */
+
+    function open() {
+        return $this->_openTag;
+    }
+
+    /**
+     * renvoi une chaine correspondant Ă  la fermeture du bloc
+     * @return string
+     * @access public
+     */
+
+    function close() {
+        return $this->_closeTag;
+    }
+
+    /**
+     * indique si le bloc doit etre immédiatement fermé
+     * @return string
+     * @access public
+     */
+
+    function closeNow() {
+        return $this->_closeNow;
+    }
+
+    /**
+     * test si la chaine correspond au debut ou au contenu d'un bloc
+     * @param string $string
+     * @return boolean true: appartient au bloc
+     * @access public
+     */
+
+    function detect($string) {
+        return preg_match($this->regexp, $string, $this->_detectMatch);
+    }
+
+    /**
+     * renvoi la ligne, traitée pour le bloc. A surcharger éventuellement.
+     * @return string
+     * @access public
+     */
+
+    function getRenderedLine() {
+        return $this->_renderInlineTag($this->_detectMatch[1]);
+    }
+
+    /**
+     * renvoi le type du bloc en cours de traitement
+     * @return string
+     * @access public
+     */
+
+    function getType() {
+        return $this->type;
+    }
+
+    /**
+     * définit la liste des élements trouvés par l'expression régulière regexp
+     * @return array
+     * @access public
+     */
+
+    function setMatch($match) {
+        $this->_detectMatch = $match;
+    }
+
+    /**
+     * renvoi la liste des élements trouvés par l'expression régulière regexp
+     * @return array
+     * @access public
+     */
+
+    function getMatch() {
+        return $this->_detectMatch;
+    }
+
+    /**
+     * traite le rendu des signes de type inline (qui se trouvent necessairement dans des blocs
+     * @param   string  $string une chaine contenant une ou plusieurs balises wiki
+     * @return  string  la chaine transformée en XHTML
+     * @access protected
+     * @see WikiRendererInline
+     */
+
+    function _renderInlineTag($string) {
+        $parser = $this->engine->getInlineParser();
+        return $parser->parse($string);
+    }
+
+    /**
+     * détection d'attributs de bloc (ex:  >°°attr1|attr2|attr3°° la citation )
+     * @todo Ă  terminer pour une version ulterieure
+     * @access protected
+     */
+
+    function _checkAttributes(&$string) {
+        $bat=$this->engine->config->blocAttributeTag;
+        if(preg_match("/^$bat(.*)$bat(.*)$/",$string,$result)) {
+            $string=$result[2];
+            return explode($this->engine->config->inlineTagSeparator,$result[1]);
+        } else
+            return false;
+    }
+
+}
diff --git a/src/Pluf/Text/Wiki/Configuration.php b/src/Pluf/Text/Wiki/Configuration.php
new file mode 100644
index 0000000..e375f81
--- /dev/null
+++ b/src/Pluf/Text/Wiki/Configuration.php
@@ -0,0 +1,178 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/*
+ * Based on Wiki Renderer copyright (C) 2003-2004 Laurent Jouanneau
+ * http://ljouanneau.com/softs/wikirenderer/
+ */
+
+/**
+ * Default Wiki Renderer configuration.
+ */
+class Pluf_Text_Wiki_Configuration
+{
+    /**
+     * @var array   liste des tags inline
+     */
+    public $inlinetags = array(
+         'strong' => array('__','__',      
+                           null,null),
+         'em'     => array('\'\'','\'\'',  
+                           null,null),
+         'code'   => array('@@','@@',      
+                           null,null),
+         'q'      => array('^^','^^',      
+                           array('lang','cite'), null),
+         'cite'   => array('{{','}}',      
+                           array('title'), null),
+         'acronym'=> array('??','??',      
+                           array('title'), null),
+         'link'   => array('[',']',        
+                           array('href','hreflang','title'), 
+                           'Pluf_Text_Wiki_Configuration_buildlink'),
+         'image'  => array('((','))',      
+                           array('src','alt','align','longdesc'),
+                           'Pluf_Text_Wiki_Configuration_buildimage'),
+         'anchor' => array('~~','~~',      
+                           array('name'),
+                           'Pluf_Text_Wiki_Configuration_buildanchor')
+         );
+
+    /**
+     * liste des balises de type bloc autorisées.  Attention, ordre
+     * important (p en dernier, car c'est le bloc par defaut..)
+     */
+
+    public $bloctags = array(
+        'Pluf_Text_Wiki_Block_Title' => true,
+        'Pluf_Text_Wiki_Block_List' => true,
+        'Pluf_Text_Wiki_Block_Pre' => true,
+        'Pluf_Text_Wiki_Block_Hr' => true,
+        'Pluf_Text_Wiki_Block_Blockquote' => true,
+        'Pluf_Text_Wiki_Block_Definition' => true,
+        'Pluf_Text_Wiki_Block_Table' => true,
+        'Pluf_Text_Wiki_Block_P' => true
+    );
+
+
+    public $simpletags = array('%%%'=>'<br />', ':-)'=>'<img src="laugh.png" alt=":-)" />');
+
+    /**
+     * @var   integer   niveau minimum pour les balises titres
+     */
+
+    public $minHeaderLevel=3;
+
+
+    /**
+     * indique le sens dans lequel il faut interpreter le nombre de
+     * signe de titre
+     *
+     * true -> ! = titre , !! = sous titre, !!! = sous-sous-titre
+     * false-> !!! = titre , !! = sous titre, ! = sous-sous-titre
+     */
+
+    public $headerOrder=false;
+    public $escapeSpecialChars=true;
+    public $inlineTagSeparator='|';
+    public $blocAttributeTag='°°';
+
+    public $checkWikiWord = false;
+    public $checkWikiWordFunction = null;
+
+}
+
+// ===================================== 
+// fonctions de générateur de
+// code HTML spécifiques à certaines balises inlines
+/**
+ * Generate a link.
+ *
+ * If the configuration variable 'wiki_create_action' is set to true and
+ * the URL starts with '/' and does not contains a dot '.' an action is
+ * created out of it, with 'app_base' as the base url.
+ */
+function Pluf_Text_Wiki_Configuration_buildlink($contents, $attr)
+{
+    $cnt = count($contents);
+    $attribut = '';
+    if ($cnt == 0) return '[]';
+    if ($cnt == 1) {
+        $contents[1] = $contents[0];
+        if (strlen($contents[0]) > 40) {
+            $contents[0] = substr($contents[0], 0, 40).'(..)';
+        }
+        $cnt = 2;
+    }
+    if ($cnt > count($attr)) {
+        $cnt = count($attr)+1;
+    }
+    if (strpos($contents[1], 'javascript:') !== false) {
+        // for security reason
+        $contents[1] = '#';
+    }
+    if ('/' == $contents[1]{0} and false === strpos($contents[1], '.')) {
+        if (true === Pluf::f('wiki_create_action')) {
+            $murl = new Pluf_HTTP_URL();
+            $contents[1] = Pluf::f('app_base').$murl->generate($contents[1]);
+        }
+    }
+    for ($i=1; $i<$cnt; $i++) {
+        $attribut .= ' '.$attr[$i-1].'="'.$contents[$i].'"';
+    }
+    return '<a'.$attribut.'>'.$contents[0].'</a>';
+}
+
+function Pluf_Text_Wiki_Configuration_buildanchor($contents, $attr)
+{
+   return '<a name="'.$contents[0].'"></a>';
+}
+
+function Pluf_Text_Wiki_Configuration_builddummie($contents, $attr)
+{
+   return (isset($contents[0])?$contents[0]:'');
+}
+
+function Pluf_Text_Wiki_Configuration_buildimage($contents, $attr)
+{
+   $cnt=count($contents);
+   $attribut='';
+   if($cnt > 4) $cnt=4;
+   switch($cnt){
+      case 4:
+         $attribut.=' longdesc="'.$contents[3].'"';
+      case 3:
+         if($contents[2]=='l' ||$contents[2]=='L' || $contents[2]=='g' || $contents[2]=='G')
+            $attribut.=' style="float:left;"';
+         elseif($contents[2]=='r' ||$contents[2]=='R' || $contents[2]=='d' || $contents[2]=='D')
+            $attribut.=' style="float:right;"';
+      case 2:
+         $attribut.=' alt="'.$contents[1].'"';
+      case 1:
+      default:
+         $attribut.=' src="'.$contents[0].'"';
+         if($cnt == 1) $attribut.=' alt=""';
+   }
+   return '<img'.$attribut.' />';
+
+}
diff --git a/src/Pluf/Text/Wiki/InlineParser.php b/src/Pluf/Text/Wiki/InlineParser.php
new file mode 100644
index 0000000..132f2b6
--- /dev/null
+++ b/src/Pluf/Text/Wiki/InlineParser.php
@@ -0,0 +1,207 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/*
+ * Based on Wiki Renderer copyright (C) 2003-2004 Laurent Jouanneau
+ * http://ljouanneau.com/softs/wikirenderer/
+ */
+
+/**
+ * Moteur permettant de transformer les tags wiki inline 
+ * d'une chaine en Ă©quivalent HTML
+ */
+class Pluf_Text_Wiki_InlineParser {
+
+    public $resultline = '';
+    public $error = false;
+    public $listTag = array();
+    public $str = array();
+    public $splitPattern = '';
+    public $checkWikiWord = false;
+    public $checkWikiWordFunction = null;
+    public $simpletags = null;
+    public $_separator;
+    public $escapeHtml = true;
+    public $end = 0;
+
+    /**
+     * constructeur
+     * @param array $inlinetags liste des tags permis
+     * @param string caractère séparateur des différents composants 
+     *               d'un tag wiki
+     */
+
+    function __construct($inlinetags, $simpletags, $separator='|',
+                         $checkWikiWord=false, $funcCheckWikiWord=null,
+                         $escapeHtml=true)
+    {
+        foreach ($inlinetags as $name=>$prop){
+            $this->listTag[$prop[0]] = new Pluf_Text_Wiki_Tag($name, $prop);
+
+            $this->splitPattern.=preg_replace ( '/([^\w\s\d])/', '\\\\\\1',$prop[0]).')|(';
+            if ($prop[1] != $prop[0])
+                $this->splitPattern.=preg_replace ( '/([^\w\s\d])/', '\\\\\\1',$prop[1]).')|(';
+        }
+        foreach ($simpletags as $tag=>$html){
+            $this->splitPattern.=preg_replace ( '/([^\w\s\d])/', '\\\\\\1',$tag).')|(';
+        }
+
+        $this->simpletags = $simpletags;
+        $this->_separator = $separator;
+        $this->checkWikiWord = $checkWikiWord;
+        $this->checkWikiWordFunction = $funcCheckWikiWord;
+        $this->escapeHtml = $escapeHtml;
+    }
+
+    /**
+     * fonction principale du parser.
+     * @param   string   $line avec des eventuels tag wiki
+     * @return  string   chaine $line avec les tags wiki transformé en HTML
+     */
+    function parse($line) {
+        $this->error = false;
+
+        $this->str = preg_split('/('.$this->splitPattern.'\\'.$this->_separator.')|(\\\\)/',$line, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+        $this->end = count($this->str);
+        if ($this->end > 1) {
+            $firsttag = new Pluf_Text_Wiki_Tag('dummie',array('','', null,'Pluf_Text_Wiki_Configuration_builddummie'));
+            $pos=-1;
+            return $this->_parse($firsttag, $pos);
+        }
+        else {
+            if ($this->escapeHtml) {
+                if ($this->checkWikiWord && $this->checkWikiWordFunction !== null)
+                    return  $this->_doCheckWikiWord(htmlspecialchars($line));
+                else
+                    return htmlspecialchars($line);
+            }
+            else {
+                if ($this->checkWikiWord && $this->checkWikiWordFunction !== null)
+                    return  $this->_doCheckWikiWord($line);
+                else
+                    return $line;
+            }
+
+        }
+    }
+
+    /**
+     * coeur du parseur. Appelé récursivement
+     */
+
+    function _parse($tag, &$posstart) {
+
+        $checkNextTag = true;
+        $checkBeginTag = true;
+
+        // on parcours la chaine,  morceau aprés morceau
+        for($i=$posstart+1; $i < $this->end; $i++) {
+
+            $t=&$this->str[$i];
+            // a t-on un antislash ?
+            if ($t=='\\'){
+                if ($checkNextTag){
+                    $t=''; // oui -> on l'efface et on ignore le tag (on continue)
+                    $checkNextTag = false;
+                }
+                else {
+                    $tag->addContent('\\',false);
+                }
+
+                // est-ce un séparateur ?
+            }
+            elseif ($t == $this->_separator) {
+                if ($tag->isDummy() || !$checkNextTag)
+                    $tag->addContent($this->_separator,false);
+                elseif ($tag->useSeparator()) {
+                    $checkBeginTag = false;
+                    $tag->addSeparator();
+                }
+                else {
+                    $tag->addContent($this->_separator,false);
+                }
+                // a-t-on une balise de fin du tag ?
+            }
+            elseif ($checkNextTag && $tag->getEndTag() == $t && !$tag->isDummy()) {
+                $posstart = $i;
+                return $tag->getHtmlContent();
+
+                // a-t-on une balise de debut de tag quelconque ?
+            }
+            elseif ($checkBeginTag && $checkNextTag && isset($this->listTag[$t]) ) {
+
+                $content  =  $this->_parse(clone($this->listTag[$t]),$i); // clone indispensable sinon plantage !!!
+                if ($content)
+                    $tag->addContent($content,false);
+                else {
+                    if ($tag->getNumberSeparator() == 0 && $this->checkWikiWord && $this->checkWikiWordFunction !== null) {
+                        if ($this->escapeHtml)
+                            $tag->addContent($this->_doCheckWikiWord(htmlspecialchars($t)),false);
+                        else
+                            $tag->addContent($this->_doCheckWikiWord($t),false);
+                    }
+                    else
+                        $tag->addContent($t,$this->escapeHtml);
+                }
+
+                // a-t-on un saut de ligne forcé ?
+            }
+            elseif ($checkNextTag && $checkBeginTag && isset($this->simpletags[$t])) {
+                $tag->addContent($this->simpletags[$t],false);
+            }
+            else {
+                if ($tag->getNumberSeparator() == 0 && $this->checkWikiWord && $this->checkWikiWordFunction !== null) {
+                    if ($this->escapeHtml)
+                        $tag->addContent($this->_doCheckWikiWord(htmlspecialchars($t)),false);
+                    else
+                        $tag->addContent($this->_doCheckWikiWord($t),false);
+                }
+                else
+                    $tag->addContent($t,$this->escapeHtml);
+                $checkNextTag = true;
+            }
+        }
+        if (!$tag->isDummy()) {
+            //--- on n'a pas trouvé le tag de fin
+            // on met en erreur
+            $this->error = true;
+            return false;
+        }
+        else
+            return $tag->getHtmlContent();
+    }
+
+    function _doCheckWikiWord($string) {
+        if (preg_match_all("/(?<=\b)[A-Z][a-z]+[A-Z0-9]\w*/", $string, $matches)){
+            $fct = $this->checkWikiWordFunction;
+            $match = array_unique($matches[0]); // il faut avoir une liste sans doublon, Ă  cause du str_replace plus loin...
+            $string = str_replace($match, $fct($match), $string);
+        }
+        return $string;
+    }
+
+    function getError() {
+        return $this->error;
+    }
+
+}
diff --git a/src/Pluf/Text/Wiki/Renderer.php b/src/Pluf/Text/Wiki/Renderer.php
new file mode 100644
index 0000000..9492f7e
--- /dev/null
+++ b/src/Pluf/Text/Wiki/Renderer.php
@@ -0,0 +1,235 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/*
+ * Based on Wiki Renderer copyright (C) 2003-2004 Laurent Jouanneau
+ * http://ljouanneau.com/softs/wikirenderer/
+ */
+
+
+
+/**
+ * Rendering engine. 
+ *
+ * Main class to convert a wiki text into XHTML.
+ *
+ * Usage:
+ * <code>
+ * $ctr = Pluf::factory('Pluf_Text_Wiki_Renderer');
+ * $xhtml_text = $ctr->render($wiki_text);
+ * </code>
+ */
+
+class Pluf_Text_Wiki_Renderer {
+
+    /**
+     * HTML version of analysed text.
+     */
+    private $_newtext;
+
+    private $_isBlocOpen=false;
+
+    /**
+     * Current opened block element.
+     */
+    private $_currentBloc;
+
+    /**
+     * List of available blocks.
+     */
+    private $_blocList=array();
+
+    /**
+     * List of parameters for the engine.
+     */
+    public $params=array();
+
+    /**
+     * Inline parser for the Wiki Inline tags.
+     */
+    public $inlineParser=null;
+
+    /**
+     * List of lines with wiki errors.
+     */
+    public $errors;
+
+    /**
+     * Config object to customized the renderer.
+     */
+    public $config=null;
+
+    /**
+     * Constructor of the renderer.
+     *
+     * Create the needed objects for the rendering.
+     *
+     * @param Configuration Custom configuration object (null)
+     */
+    function __construct($config=null) 
+    {
+        if (is_null($config)) {
+            $this->config = new Pluf_Text_Wiki_Configuration();
+        } else {
+            $this->config = $config;
+        }
+        // Gost block
+        $this->_currentBloc = new Pluf_Text_Wiki_BlockRenderer($this); 
+        $this->inlineParser = new Pluf_Text_Wiki_InlineParser(
+                                      $this->config->inlinetags,
+                                      $this->config->simpletags,
+                                      $this->config->inlineTagSeparator,
+                                      $this->config->checkWikiWord,
+                                      $this->config->checkWikiWordFunction,
+                                      $this->config->escapeSpecialChars
+                                      );
+
+        foreach ($this->config->bloctags as $name=>$ok) {
+            if ($ok) {
+                $this->_blocList[] = new $name($this);
+            }
+        }
+    }
+
+    /**
+     * Main method to convert the wiki text into XHTML.
+     *
+     * @param string Text to be converted.
+     * @return string Converted text into XHTML.
+     */
+    function render($text) 
+    {
+        // Split on \r (mac), \n (unix) or \r\n (windows)
+        $lignes = preg_split("/\015\012|\015|\012/", $text);
+        $this->_newtext = array();
+        $this->_isBlocOpen = false;
+        $this->errors = false;
+        $this->_currentBloc = new Pluf_Text_Wiki_BlockRenderer($this);
+        // Go through all the lines.
+        foreach ($lignes as $num=>$ligne) {
+            if ($ligne == '') { // pas de trim à cause des pre
+                // ligne vide
+                $this->_closeBloc();
+            } else {
+                // detection de debut de bloc (liste, tableau, hr, titre)
+                foreach ($this->_blocList as $bloc) {
+                    if ($bloc->detect($ligne)) {
+                        break;
+                    }
+                }
+                // c'est le debut d'un bloc (ou ligne d'un bloc en cours)
+                if ($bloc->getType() != $this->_currentBloc->getType()) {
+                    // on ferme le precedent si c'etait un different
+                    $this->_closeBloc(); 
+                    $this->_currentBloc = $bloc;
+                    if($this->_openBloc()) {
+                        $this->_newtext[] = $this->_currentBloc->getRenderedLine();
+                    } else {
+                        $this->_newtext[] = $this->_currentBloc->getRenderedLine();
+                        $this->_newtext[] = $this->_currentBloc->close();
+                        $this->_isBlocOpen = false;
+                        $this->_currentBloc = new Pluf_Text_Wiki_BlockRenderer($this);
+                    }
+                } else {
+                    $this->_currentBloc->setMatch($bloc->getMatch());
+                    $this->_newtext[] = $this->_currentBloc->getRenderedLine();
+                }
+                if($this->inlineParser->getError()) {
+                    $this->errors[$num+1] = $ligne;
+                }
+            }
+        }
+        $this->_closeBloc();
+        return implode("\n", $this->_newtext);
+    }
+
+    /**
+     * Returns configuration object.
+     *
+     * @return WikiRendererConfig
+     */
+    function getConfig() 
+    {
+        return $this->config;
+    }
+
+    /**
+     * Retourne l'objet inlineParser (WikiInlineParser) utilisé dans le moteur
+     * @access public
+     * @see WikiInlineParser
+     * @return WikiInlineParser
+     */
+    function getInlineParser() 
+    {
+        return $this->inlineParser;
+    }
+
+    /**
+     * renvoi la liste des erreurs detectées par le moteur
+     * @access public
+     * @return array
+     */
+    function getErrors() 
+    {
+        return $this->errors;
+    }
+
+    /**
+     * renvoi la version de wikirenderer
+     * @access public
+     * @return string   version
+     */
+    function getVersion()
+    {
+        return '2.1';
+    }
+
+    /**
+     * ferme un bloc
+     * @access private
+     */
+    function _closeBloc() 
+    {
+        if ($this->_isBlocOpen) {
+            $this->_isBlocOpen = false;
+            $this->_newtext[] = $this->_currentBloc->close();
+            $this->_currentBloc = new Pluf_Text_Wiki_BlockRenderer($this);
+        }
+    }
+
+    /**
+     * ouvre un bloc et le referme eventuellement suivant sa nature
+     * @return boolean  indique si le bloc reste ouvert ou pas
+     * @access private
+     */
+    function _openBloc() 
+    {
+        if (!$this->_isBlocOpen) {
+            $this->_newtext[] = $this->_currentBloc->open();
+            $this->_isBlocOpen = true;
+            return !$this->_currentBloc->closeNow();
+        } else {
+            return true;
+        }
+    }
+}
diff --git a/src/Pluf/Text/Wiki/Tag.php b/src/Pluf/Text/Wiki/Tag.php
new file mode 100644
index 0000000..c06c8a6
--- /dev/null
+++ b/src/Pluf/Text/Wiki/Tag.php
@@ -0,0 +1,131 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/*
+ * Based on Wiki Renderer copyright (C) 2003-2004 Laurent Jouanneau
+ * http://ljouanneau.com/softs/wikirenderer/
+ */
+
+
+/**
+ * Implémente les propriétés d'un tag inline wiki et 
+ * le fonctionnement pour la génération
+ * du code html correspondant
+ */
+
+class Pluf_Text_Wiki_Tag {
+
+    public $name;
+    public $beginTag;
+    public $endTag;
+    public $useSeparator = true;
+    public $attribute = array();
+    public $builderFunction = null;
+    public $contents = array();
+    public $separatorCount = 0;
+    public $isDummy = false;
+
+    function __construct($name, $properties)
+    {
+        $this->name = $name;
+        $this->beginTag = $properties[0];
+        $this->endTag = $properties[1];
+        if ($this->name == 'dummie')
+            $this->isDummy = true;
+
+        if (is_null($properties[2])) {
+            $this->attribute = array();
+            $this->useSeparator = false;
+        }
+        else {
+            $this->attribute = $properties[2];
+            $this->useSeparator = (count($this->attribute)>0);
+        }
+        $this->builderFunction = $properties[3];
+    }
+
+    function addContent($string, $escape=true)
+    {
+        if (!isset($this->contents[$this->separatorCount]))
+            $this->contents[$this->separatorCount] = '';
+
+        if ($escape) {
+            $this->contents[$this->separatorCount] .= htmlspecialchars($string);
+        } else {
+            $this->contents[$this->separatorCount] .= $string;
+        }
+    }
+
+    function addSeparator() 
+    {
+        $this->separatorCount++;
+    }
+
+    function getBeginTag() 
+    {
+        return $this->beginTag;
+    }
+
+    function getEndTag() 
+    {
+        return $this->endTag;
+    }
+
+    function getNumberSeparator() 
+    {
+        return $this->separatorCount;
+    }
+
+    function useSeparator() 
+    {
+        return $this->useSeparator;
+    }
+
+    function isDummy() 
+    {
+        return $this->isDummy;
+    }
+
+    function getHtmlContent() 
+    {
+        if (is_null($this->builderFunction)) {
+            $attr = '';
+            if ($this->useSeparator) {
+                $cntattr = count($this->attribute);
+                $count = ($this->separatorCount > $cntattr?$cntattr:$this->separatorCount);
+                for ($i=1; $i<=$count; $i++) {
+                    $attr .= ' '.$this->attribute[$i-1].'="'.$this->contents[$i].'"';
+                }
+            }
+            if (isset($this->contents[0]))
+                return '<'.$this->name.$attr.'>'.$this->contents[0].'</'.$this->name.'>';
+            else
+                return '<'.$this->name.$attr.' />';
+        }
+        else {
+            $fct = $this->builderFunction;
+            return $fct($this->contents, $this->attribute);
+        }
+    }
+
+}
diff --git a/src/Pluf/Translation.php b/src/Pluf/Translation.php
new file mode 100644
index 0000000..0354ecd
--- /dev/null
+++ b/src/Pluf/Translation.php
@@ -0,0 +1,264 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Translation utility. 
+ *
+ * This class provides utilities to load and cache translation
+ * strings. The functions using the values are directly available when
+ * loading Pluf. They are __ and _n for simple translations and for
+ * plural dependent translations respectively.
+ *
+ * Based on benchmarking by
+ * http://mel.melaxis.com/devblog/2006/04/10/benchmarking-php- \
+ * localization-is-gettext-fast-enough/ the string id system is really
+ * fast, so here the system is using a .ini file approach with a
+ * string id cache.
+ *
+ * Why reimplementing a gettext system when one is already available?
+ * It is because the PHP gettext extension requires the corresponding
+ * locale to be installed system wide to load the corresponding
+ * translations. If your host has no locales outside English
+ * installed, you can only provide English to your users. Which is not
+ * really nice.
+ *
+ */
+class Pluf_Translation
+{
+
+    public static $plural_forms = array(
+                         'fr' => 'singular0and1',
+                         'en' => 'pluralnot1', // This is the default.
+                                        );
+
+    /**
+     * Get the plural form for a given locale.
+     */
+    public static function getPluralForm($locale)
+    {
+        if (isset(self::$plural_forms[$locale])) {
+            return self::$plural_forms[$locale];
+        }
+        if (isset(self::$plural_forms[substr($locale, 0, 2)])) {
+            return self::$plural_forms[substr($locale, 0, 2)];
+        }
+        return '2pluralnot1';
+    }
+
+    /**
+     * Return the "best" accepted language from the list of available
+     * languages.
+     *
+     * Use $_SERVER['HTTP_ACCEPT_LANGUAGE'] if the accepted language
+     * list is empty. The list must be something like:
+     *      'da, en-gb;q=0.8, en;q=0.7'
+     *
+     * @param array Available languages in the system
+     * @param string String of comma separated accepted languages ('')
+     * @return string Language 2 or 5 letter iso code, default is 'en'
+     */
+    public static function getAcceptedLanguage($available, $accepted ='')
+    {
+        if (empty($accepted)) {
+            if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+                $accepted = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
+            } else {
+                return 'en';
+            }
+        }
+        $acceptedlist = explode(',', $accepted);
+        foreach ($acceptedlist as $lang) {
+            $lang = explode(';', $lang);
+            $lang = trim($lang[0]);
+            if (in_array($lang, $available)) {
+                return $lang;
+            }
+            // for the xx-XX cases we may have only the "main" language
+            // form like xx is available
+            $lang = substr($lang, 0, 2);
+            if (in_array($lang, $available)) {
+                return $lang;
+            }
+        }
+        return 'en'; 
+    }
+
+    /**
+     * Given a key indexed array, do replacement using the %%key%% in
+     * the string.
+     */
+    public static function sprintf($string, $words=array())
+    {
+        foreach ($words as $key=>$word) {
+            $string = mb_ereg_replace('%%'.$key.'%%', $word, $string, 'm');
+        }
+        return $string;
+    }
+
+    /**
+     * French, Brazilian Portuguese
+     */
+    public static function singular0and1($n)
+    {
+        return (int) ($n>1);
+    }
+
+    public static function pluralnot1($n)
+    {
+        return (int) ($n!=1);
+    }
+
+    /**
+     * Read a .po file.
+     *
+     * Based on the work by Matthias Bauer with some little cosmetic fixes.
+     *
+     * @source http://wordpress-soc-2007.googlecode.com/svn/trunk/moeffju/php-msgfmt/msgfmt-functions.php
+     * @copyright 2007 Matthias Bauer
+     * @author Matthias Bauer
+     * @license http://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License 2.1
+     * @license http://opensource.org/licenses/apache2.0.php Apache License 2.0
+     */
+    public static function readPoFile($file)
+    {
+        // read .po file
+        $fc= file_get_contents($file);
+        // normalize newlines
+        $fc= str_replace(array("\r\n", "\r"), array("\n", "\n"), $fc);
+
+        // results array
+        $hash= array ();
+        // temporary array
+        $temp= array ();
+        // state
+        $state= null;
+        $fuzzy= false;
+
+        // iterate over lines
+        foreach (explode("\n", $fc) as $line) {
+            $line= trim($line);
+            if ($line === '')
+                continue;
+            if (false === strpos($line, ' ')) {
+                $key = $line;
+                $data = '';
+            } else { 
+                list ($key, $data)= explode(' ', $line, 2);
+            }
+            switch ($key) {
+            case '#,' : // flag...
+                $fuzzy= in_array('fuzzy', preg_split('/,\s*/', $data));
+            case '#' : // translator-comments
+            case '#.' : // extracted-comments
+            case '#:' : // reference...
+            case '#|' : // msgid previous-untranslated-string
+                // start a new entry
+                if (sizeof($temp) && array_key_exists('msgid', $temp) && array_key_exists('msgstr', $temp)) {
+                    if (!$fuzzy)
+                        $hash[]= $temp;
+                    $temp= array ();
+                    $state= null;
+                    $fuzzy= false;
+                }
+                break;
+            case 'msgctxt' :
+                // context
+            case 'msgid' :
+                // untranslated-string
+            case 'msgid_plural' :
+                // untranslated-string-plural
+                $state= $key;
+                $temp[$state]= $data;
+                break;
+            case 'msgstr' :
+                // translated-string
+                $state= 'msgstr';
+                $temp[$state][]= $data;
+                break;
+            default :
+                if (strpos($key, 'msgstr[') !== False) {
+                    // translated-string-case-n
+                    $state= 'msgstr';
+                    $temp[$state][]= $data;
+                } else {
+                    // continued lines
+                    switch ($state) {
+                    case 'msgctxt' :
+                    case 'msgid' :
+                    case 'msgid_plural' :
+                        $temp[$state] .= "\n" . $line;
+                        break;
+                    case 'msgstr' :
+                        $temp[$state][sizeof($temp[$state]) - 1] .= "\n" . $line;
+                        break;
+                    default :
+                        // parse error
+                        return False;
+                    }
+                }
+                break;
+            }
+        }
+
+        // add final entry
+        if ($state == 'msgstr')
+            $hash[]= $temp;
+
+        // Cleanup data, merge multiline entries, reindex hash for ksort
+        $temp= $hash;
+        $hash= array ();
+        foreach ($temp as $entry) {
+            foreach ($entry as &$v) {
+                $v = Pluf_Translation_poCleanHelper($v);
+                if ($v === False) {
+                    // parse error
+                    return False;
+                }
+            }
+            if (isset($entry['msgid_plural'])) {
+                $hash[$entry['msgid'].'#'.$entry['msgid_plural']]= $entry['msgstr'];
+            } else {
+                $hash[$entry['msgid']]= $entry['msgstr'];
+            }
+        }
+
+        return $hash;
+    }
+}
+
+
+function Pluf_Translation_poCleanHelper($x) 
+{
+	if (is_array($x)) {
+		foreach ($x as $k => $v) {
+			$x[$k]= Pluf_Translation_poCleanHelper($v);
+		}
+	} else {
+		if ($x[0] == '"')
+			$x= substr($x, 1, -1);
+		$x= str_replace("\"\n\"", '', $x);
+		$x= str_replace('$', '\\$', $x);
+		$x= @eval("return \"$x\";");
+	}
+	return $x;
+}
diff --git a/src/Pluf/Translation/Generator.php b/src/Pluf/Translation/Generator.php
new file mode 100644
index 0000000..f736237
--- /dev/null
+++ b/src/Pluf/Translation/Generator.php
@@ -0,0 +1,179 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Extract all the strings from the template folders and create
+ * 'template'.php files with the strings to be translated.
+ */
+class Pluf_Translation_Generator
+{
+	public $outputdir = '';
+
+
+    /**
+     * Recursive listing of the content of a folder.
+     *
+     * @credits http://php.net/dir
+     *
+     * @param string Path to browse
+     * @param int How deep to browse (-1=unlimited)
+     * @param string Mode "FULL"|"DIRS"|"FILES" ('FULL')
+     * @param sring Pattern to exclude some files ('')
+     * @param int Must not be defined (0)
+     * @return array List of files
+     */
+    public static function list_dir($path, $maxdepth=-1, $mode='FULL', $exclude='', $d=0)
+    {
+        if (substr($path, strlen($path)-1) != '/') { 
+            $path .= '/'; 
+        }     
+        $dirlist = array();
+        if ($mode != 'FILES') { 
+            $dirlist[] = $path; 
+        }
+        if ($handle = opendir($path)) {
+            while (false !== ($file = readdir($handle))) {
+                if ($file != '.' && $file != '..' 
+                    && ($exclude == '' or !preg_match($exclude, $file))) {
+                    $file = $path.$file;
+                    if (!is_dir($file)) { 
+                        if ($mode != 'DIRS') { 
+                            $dirlist[] = $file; 
+                        } 
+                    } elseif ($d >=0 && ($d < $maxdepth || $maxdepth < 0)) {
+                        $result = self::list_dir($file.'/', $maxdepth, $mode, 
+                                           $exclude, $d+1);
+                        $dirlist = array_merge($dirlist, $result);
+                    }
+                }
+            }
+            closedir($handle);
+        }
+        if ($d == 0) { 
+            natcasesort($dirlist); 
+        }
+        return $dirlist;
+    }
+
+
+    /**
+     * Recursive make of a directory.
+     *
+     * @credits http://php.net/mkdir
+     *
+     * @param string Directory to make
+     * @param octal Chmod of the directory (0777)
+     * @return bool Success
+     */
+    public static function rmkdir($dir, $mode=0777)
+    {
+        if (is_dir($dir) || @mkdir($dir, $mode)) return true;
+        if (!self::rmkdir(dirname($dir), $mode)) return false;
+        return @mkdir($dir, $mode);
+    }
+
+
+    public static function is_pathrelative($dir)
+    {
+        if (strtoupper(substr(PHP_OS,0,3) == 'WIN')) {
+            return (preg_match('/^\w+:/', $dir) <= 0);
+        } else {
+            return (preg_match('/^\//', $dir) <= 0);
+        }
+    }
+
+    public static function unifypath($path)
+    {
+        if (strtoupper(substr(PHP_OS,0,3) == 'WIN')) {
+            return str_replace('\\', DIRECTORY_SEPARATOR, $path);
+        }
+        return $path;
+    }
+
+
+    public static function real_path($path)
+    {
+        $_path = self::unifypath($path);
+        if (self::is_pathrelative($path)) {
+            $_curdir = self::unifypath(realpath('.'));
+            $_path = $_curdir.$_path;
+        }
+        $_startPoint = '';
+        if (strtoupper(substr(PHP_OS,0,3) == 'WIN')) {
+            list($_startPoint, $_path) = explode(':', $_path, 2);
+            $_startPoint .= ':';
+        }
+        // From now processing is the same for WIndows and Unix, 
+        // and hopefully for others.
+        $_realparts = array();
+        $_parts = explode(DIRECTORY_SEPARATOR, $_path);
+        for ($i=0; $i<count($_parts); $i++) {
+            if (strlen($_parts[$i]) == 0 || $_parts[$i] == '.') {
+                continue;
+            }
+            if ($_parts[$i] == '..') {
+                if (count($_realparts) > 0) {
+                    array_pop($_realparts);
+                }
+            } else {
+                array_push($_realparts, $_parts[$i]);
+            }
+        }
+        return $_startPoint.DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR, $_realparts);
+    }
+
+
+    /**
+     * Generate the files.
+     */
+    public function generate($outputdir)
+    {
+        $dest_files = array();
+        foreach (Pluf::f('template_folders') as $folder) {
+            $src_files = self::list_dir($folder, -1, 'FULL');
+            foreach ($src_files as $file) {
+                // Build an associative array where the key is the
+                // source file and the value is the destination file.
+                $dest_files[$file] = str_replace($folder, $outputdir, $file);
+            }
+        }
+        foreach ($dest_files as $src=>$dest) {
+            if (is_dir($src)) {
+                self::rmkdir($dest);
+                @chmod($dest, 0775);
+                print 'Create folder: '.$dest."\n";
+                continue;
+            }
+            self::rmkdir(dirname($dest));
+            print 'Parse to: '.$dest.'.php';
+            $compiler = new Pluf_Translation_TemplateExtractor(self::real_path($src), array(''), true);
+            $content = $compiler->compile();
+            $file = fopen($dest.'.php', 'wb');
+            fwrite($file, $content);
+            fclose($file);
+            @chmod($dest.'.php', 0664);
+            print ' - Ok'."\n";
+            continue;
+        }
+    }
+}
diff --git a/src/Pluf/Translation/TemplateExtractor.php b/src/Pluf/Translation/TemplateExtractor.php
new file mode 100644
index 0000000..7ac1dac
--- /dev/null
+++ b/src/Pluf/Translation/TemplateExtractor.php
@@ -0,0 +1,417 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Class to extract the translation strings from the template.
+ * 
+ * Based on Pluf_Template_Compiler with code:
+ *   Copyright (C) 2006 Laurent Jouanneau.
+ */
+class Pluf_Translation_TemplateExtractor
+{
+    
+    /** 
+     * Store the literal blocks. 
+     **/
+    protected $_literals;
+    
+    /** 
+     * Variables. 
+     */
+    protected $_vartype = array(T_CHARACTER, T_CONSTANT_ENCAPSED_STRING, 
+                                T_DNUMBER, T_ENCAPSED_AND_WHITESPACE, 
+                                T_LNUMBER, T_OBJECT_OPERATOR, T_STRING, 
+                                T_WHITESPACE, T_ARRAY);
+
+    /** 
+     * Assignation operators. 
+     */
+    protected $_assignOp = array(T_AND_EQUAL, T_DIV_EQUAL, T_MINUS_EQUAL, 
+                                 T_MOD_EQUAL, T_MUL_EQUAL, T_OR_EQUAL, 
+                                 T_PLUS_EQUAL, T_PLUS_EQUAL, T_SL_EQUAL, 
+                                 T_SR_EQUAL, T_XOR_EQUAL);
+
+    /** 
+     * Operators. 
+     */
+    protected  $_op = array(T_BOOLEAN_AND, T_BOOLEAN_OR, T_EMPTY, T_INC, 
+                            T_ISSET, T_IS_EQUAL, T_IS_GREATER_OR_EQUAL, 
+                            T_IS_IDENTICAL, T_IS_NOT_EQUAL, T_IS_NOT_IDENTICAL,
+                            T_IS_SMALLER_OR_EQUAL, T_LOGICAL_AND, T_LOGICAL_OR,
+                            T_LOGICAL_XOR, T_SR, T_SL, T_DOUBLE_ARROW);
+
+    /**
+     * Authorized elements in variables.
+     */
+    protected $_allowedInVar;
+
+    /**
+     * Authorized elements in expression.
+     */
+    protected $_allowedInExpr;
+
+    /**
+     * Authorized elements in assignation.
+     */
+    protected $_allowedAssign;
+
+    /**
+     * Output filters.
+     */
+    protected $_modifier = array('upper' => 'strtoupper', 
+                                 'lower' => 'strtolower',
+                                 'escxml' => 'htmlspecialchars', 
+                                 'escape' => 'Pluf_Template_htmlspecialchars',
+                                 'strip_tags' => 'strip_tags', 
+                                 'escurl' => 'rawurlencode',
+                                 'capitalize' => 'ucwords',
+                                 // Not var_export because of recursive issues.
+                                 'debug' => 'print_r', 
+                                 'fulldebug' => 'var_export',
+                                 'count' => 'count',
+                                 'nl2br' => 'nl2br',
+                                 'trim' => 'trim',
+                                 'unsafe' => 'Pluf_Template_unsafe',
+                                 'safe' => 'Pluf_Template_unsafe',
+                                 'date' => 'Pluf_Template_dateFormat',
+                                 'time' => 'Pluf_Template_timeFormat',
+                                 );
+
+    /**
+     * After the compilation is completed, this contains the list of
+     * modifiers used in the template. The GetCompiledTemplate method
+     * will add a series of Pluf::loadFunction at the top to preload
+     * these modifiers.
+     */
+    public $_usedModifiers = array();
+
+    /**
+     * Default allowed extra tags/functions. 
+     *
+     * These default tags are merged with the 'template_tags' defined
+     * in the configuration of the application.
+     */
+    protected $_allowedTags = array(
+                                    'url' => 'Pluf_Template_Tag_Url',
+                                    );
+    /**
+     * During compilation, all the tags are created once so to query
+     * their interface easily.
+     */
+    protected $_extraTags = array();
+
+    /**
+     * The block stack to see if the blocks are correctly closed.
+     */
+    protected $_blockStack = array();
+
+    /**
+     * Special stack for the translation handling in blocktrans.
+     */
+    protected $_transStack = array();
+    protected $_transPlural = false;
+
+    /**
+     * Current template source file.
+     */
+    protected $_sourceFile;
+
+    /**
+     * Current tag.
+     */
+    protected $_currentTag;
+
+    /**
+     * Template folders.
+     */
+    public $templateFolders = array();
+
+    /**
+     * Template content. It can be set directly from a string.
+     */
+    public $templateContent = '';
+
+    /**
+     * Construct the compiler.
+     *
+     * @param string Basename of the template file.
+     * @param array Base folders in which the templates files 
+     *              should be found. (array())
+     * @param bool Load directly the template content. (true)
+     */
+    function __construct($template_file, $folders=array(), $load=true)
+    {
+        $allowedtags = Pluf::f('template_tags', array());
+        $this->_allowedTags = array_merge($allowedtags, $this->_allowedTags);
+        $modifiers = Pluf::f('template_modifiers', array());
+        $this->_modifier = array_merge($modifiers, $this->_modifier);
+
+        foreach ($this->_allowedTags as $name=>$model) {
+            $this->_extraTags[$name] = new $model();
+        }
+        $this->_sourceFile = $template_file;
+        $this->_allowedInVar = array_merge($this->_vartype, $this->_op);
+        $this->_allowedInExpr = array_merge($this->_vartype, $this->_op);
+        $this->_allowedAssign = array_merge($this->_vartype, $this->_assignOp, 
+                                            $this->_op);
+        $this->templateFolders = $folders;
+        if ($load) {
+            $this->loadTemplateFile($template_file);
+        }
+    }
+
+    /**
+     * Get blocktrans.
+     */
+    function getBlockTrans()
+    {
+        $tplcontent = $this->templateContent;
+        $tplcontent = preg_replace('!{\*(.*?)\*}!s', '', $tplcontent);
+        $match = array();
+        preg_match_all('!{blocktrans(.*?){/blocktrans}!s', $tplcontent, $match);
+        $res = array();
+        foreach ($match[1] as $m) {
+            $res[] = '{blocktrans'.$m.'{/blocktrans}';
+        }
+        return $res;
+    }
+
+    /**
+     * Get simple trans call.
+     */
+    function getSimpleTrans()
+    {
+        $tplcontent = $this->templateContent;
+        $tplcontent = preg_replace('!{\*(.*?)\*}!s', '', $tplcontent);
+        $match = array();
+        preg_match_all('!{trans(.*?)}!s', $tplcontent, $match);
+        $res = array();
+        foreach ($match[1] as $m) {
+            $res[] = '{trans'.$m.'}';
+        }
+        return $res;
+    }
+
+    /**
+     * Compile the template into a file ready to parse with xgettext.
+     *
+     * @return string PHP code of the compiled template.
+     */
+    function compile() 
+    {
+        $result = '';
+        $blocktrans = $this->getBlockTrans();
+        // Parse the blocktrans
+        foreach ($blocktrans as $block) {
+            $match = array();
+            if (preg_match('!{blocktrans(.*?)}(.*?){plural}(.*?){/blocktrans}!s', $block, $match)) {
+                $sing = $match[2];
+                $plural = $match[3];
+                $sing = preg_replace_callback('/{((.).*?)}/s', 
+                                               array($this, '_callbackInTransBlock'), 
+                                               $sing);
+                $plural = preg_replace_callback('/{((.).*?)}/s', 
+                                               array($this, '_callbackInTransBlock'), 
+                                               $plural);
+                $result .= '_n(\''.addcslashes($sing, "'").'\', \''.addcslashes($plural, "'").'\', $n);'."\n";
+            } elseif (preg_match('!{blocktrans}(.*?){/blocktrans}!s', $block, $match)) {
+                $sing = preg_replace_callback('/{((.).*?)}/s', 
+                                               array($this, '_callbackInTransBlock'), 
+                                               $match[1]);
+                $result .= '__(\''.addcslashes($sing, "'").'\');'."\n";
+            }
+        }
+
+        $simpletrans = $this->getSimpleTrans();
+        foreach ($simpletrans as $content) {
+            $result .= preg_replace_callback('/{((.).*?)}/s', 
+                                             array($this, '_callback'), 
+                                             $content);
+        }
+        return '<?php # This is not a valid php code. It is just for gettext use'."\n\n".$result.' ?>';
+    }
+
+
+    /**
+     * Load a template file.
+     *
+     * The path to the file to load is relative and the file is found
+     * in one of the $templateFolders array of folders.
+     *
+     * @param string Relative path of the file to load.
+     */
+    function loadTemplateFile($file)
+    {
+        // FIXME: Very small security check, could be better.
+        if (strpos($file, '..') !== false) {
+            throw new Exception(sprintf(__('Template file contains invalid characters: %s'), $file));
+        }
+        foreach ($this->templateFolders as $folder) {
+            if (file_exists($folder.'/'.$file)) {
+                $this->templateContent = file_get_contents($folder.'/'.$file);
+                return;
+            }
+        }
+        // File not found in all the folders.
+        throw new Exception(sprintf(__('Template file not found: %s'), $file));
+    }
+
+    function _callback($matches) 
+    {
+        list(,$tag, $firstcar) = $matches;
+        if ($firstcar != 't') {
+            trigger_error(sprintf(__('Invalid tag in translation extractor: %s'), $tag), E_USER_ERROR);
+            return '';
+        }
+        $this->_currentTag = $tag;
+        if (!preg_match('/^(\/?[a-zA-Z0-9_]+)(?:(?:\s+(.*))|(?:\((.*)\)))?$/', $tag, $m)) {
+            trigger_error(sprintf(__('Invalid function syntax: %s'), $tag), E_USER_ERROR);
+            return '';
+        }
+        if (count($m) == 4){
+            $m[2] = $m[3];
+        }
+        if (!isset($m[2])) $m[2] = '';
+        if ($m[1] == 'trans') {
+            return $this->_parseFunction($m[1], $m[2]);
+        } 
+        return '';
+    }
+
+    function _callbackInTransBlock($matches) 
+    {
+        list(,$tag, $firstcar) = $matches;
+        if (!preg_match('/^\$|[\'"]|[a-zA-Z\/]$/', $firstcar)) {
+            trigger_error(sprintf(__('Invalid tag syntax: %s'), $tag), E_USER_ERROR);
+            return '';
+        }
+        $this->_currentTag = $tag;
+        if ($firstcar == '$') {
+            $tok = explode('|', $tag);
+            $this->_transStack[substr($tok[0], 1)] = $this->_parseVariable($tag);
+            return '%%'.substr($tok[0], 1).'%%';
+        }
+        return '';
+    }
+
+    function _parseVariable($expr)
+    {
+        $tok = explode('|', $expr);
+        $res = $this->_parseFinal(array_shift($tok), $this->_allowedInVar);
+        // We do not take into account the modifiers.
+        return $res;
+    }
+
+    function _parseFunction($name, $args)
+    {
+        switch ($name) {
+        case 'trans':
+            $argfct = $this->_parseFinal($args, $this->_allowedAssign); 
+            $res = '__('.$argfct.');'."\n";
+            break;
+        default:
+            $res = '';
+            break;
+        }
+        return $res;
+    }
+
+    /*
+
+    -------
+    if:        op, autre, var
+    foreach:   T_AS, T_DOUBLE_ARROW, T_VARIABLE, @locale@
+    for:       autre, fin_instruction
+    while:     op, autre, var
+    assign:    T_VARIABLE puis assign puis autre, ponctuation, T_STRING
+    echo:      T_VARIABLE/@locale@ puis autre + ponctuation
+    modificateur: serie de autre séparé par une virgule
+
+    tous : T_VARIABLE, @locale@
+
+    */
+
+    function _parseFinal($string, $allowed=array(), 
+                         $exceptchar=array(';'))
+    {
+        $tokens = token_get_all('<?php '.$string.'?>');
+        $result = '';
+        $first = true;
+        $inDot = false;
+        $firstok = array_shift($tokens);
+        $afterAs = false;
+        $f_key = '';
+        $f_val = '';
+        $results = array();
+
+        // il y a un bug, parfois le premier token n'est pas T_OPEN_TAG...
+        if ($firstok == '<' && $tokens[0] == '?' && is_array($tokens[1])
+            && $tokens[1][0] == T_STRING && $tokens[1][1] == 'php') {
+            array_shift($tokens);
+            array_shift($tokens);
+        }
+        foreach ($tokens as $tok) {
+            if (is_array($tok)) {
+                list($type, $str) = $tok;
+                $first = false;
+                if($type == T_CLOSE_TAG){
+                    continue;
+                }
+                if ($type == T_AS) {
+                    $afterAs = true;
+                }
+                if ($type == T_STRING && $inDot) {
+                    $result .= $str;
+                } elseif ($type == T_VARIABLE) {
+                    $result .= '$t->_vars[\''.substr($str, 1).'\']';
+                } elseif ($type == T_WHITESPACE || in_array($type, $allowed)) {
+                    $result .= $str;
+                } else {
+                    trigger_error(sprintf(__('Invalid syntax: (%s) %s.'), $this->_currentTag, $str), E_USER_ERROR);
+                    return '';
+                }
+            } else {
+                if (in_array($tok, $exceptchar)) {
+                    trigger_error(sprintf(__('Invalid character: (%s) %s.'), $this->_currentTag, $tok), E_USER_ERROR);
+                } elseif ($tok == '.') {
+                    $inDot = true;
+                    $result .= '->';
+                } elseif ($tok == '~') {
+                    $result .= '.';
+                } elseif ($tok =='[') {
+                    $result.=$tok;
+                } elseif ($tok ==']') {
+                    $result.=$tok;
+                } elseif ($getAsArray && $tok == ',') {
+                    $results[]=$result;
+                    $result='';
+                } else {
+                    $result .= $tok;
+                }
+                $first = false;
+            }
+        }
+        return $result;
+    }
+}
+
diff --git a/src/Pluf/User.php b/src/Pluf/User.php
new file mode 100644
index 0000000..ff1cb08
--- /dev/null
+++ b/src/Pluf/User.php
@@ -0,0 +1,380 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class Pluf_User extends Pluf_Model
+{
+    public $_model = 'Pluf_User';
+
+    /** 
+     * If the session contains this key with a numeric id in. The
+     * corresponding user is loaded.
+     */
+    public $session_key = '_PX_Pluf_User_auth';
+
+    /**
+     * Cache of the permissions.
+     */
+    public $_cache_perms = null;
+
+    function init()
+    {
+        $this->_a['verbose'] = __('user');
+        $this->_a['table'] = 'users';
+        $this->_a['model'] = 'Pluf_User';
+        $this->_a['cols'] = array(
+                             // It is mandatory to have an "id" column.
+                            'id' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Sequence',
+                                  //It is automatically added.
+                                  'blank' => true, 
+                                  ),
+                            'login' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Varchar',
+                                  'blank' => false,
+                                  'unique' => true,
+                                  'size' => 50,
+                                  'verbose' => __('login'),
+                                  ),
+                            'first_name' => 
+                            array(
+                                  'type' => 'Pluf_DB_Field_Varchar',
+                                  'blank' => true,
+                                  'size' => 100,
+                                  'verbose' => __('first name'),
+                                  ),
+                            'last_name' => 
+                            array(
+                                  'type' => 'Pluf_DB_Field_Varchar',
+                                  'blank' => false,
+                                  'size' => 100,
+                                  'verbose' => __('last name'),
+                                  ),
+                            'email' => 
+                            array(
+                                  'type' => 'Pluf_DB_Field_Email',
+                                  'blank' => false,
+                                  'verbose' => __('email'),
+                                   ),
+                            'password' => 
+                            array(
+                                  'type' => 'Pluf_DB_Field_Password',
+                                  'blank' => false,
+                                  'verbose' => __('password'),
+                                  'size' => 150,
+                                  'help_text' => __('Format: [algo]:[salt]:[hash]')
+                                  ),
+                            'groups' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Manytomany', 
+                                  'blank' => true,
+                                  'model' => 'Pluf_Group',
+                                  ),
+                            'permissions' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Manytomany', 
+                                  'blank' => true,
+                                  'model' => 'Pluf_Permission',
+                                  ),
+                            'administrator' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Boolean',
+                                  'default' => false,
+                                  'blank' => true,
+                                  'verbose' => __('administrator'),
+                                  ),
+                            'staff' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Boolean',
+                                  'default' => false,
+                                  'blank' => true,
+                                  'verbose' => __('staff'),
+                                  ),
+                            'active' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Boolean',
+                                  'default' => false,
+                                  'blank' => true,
+                                  'verbose' => __('active'),
+                                  ),
+                            'date_joined' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Datetime',
+                                  'blank' => true,
+                                  'verbose' => __('date joined'),
+                                  ),
+                            'last_login' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Datetime',
+                                  'blank' => true,
+                                  'verbose' => __('last login'),
+                                  ),
+                            );
+        $this->_a['idx'] = array(                           
+                            'login_idx' =>
+                            array(
+                                  'col' => 'login',
+                                  'type' => 'unique',
+                                  ),
+                            );
+        $this->_a['views'] = array();
+    }
+
+    /**
+     * String representation of the user.
+     */
+    function __toString()
+    {
+        $repr = $this->last_name;
+        if (strlen($this->first_name) > 0) {
+            $repr = $this->first_name.' '.$repr;
+        }
+        return $repr;
+    }
+
+    /**
+     * Predelete to drop the row level permissions.
+     */
+    function preDelete()
+    {
+        if (Pluf::f('pluf_use_rowpermission', false)) {
+            $_rpt = Pluf::factory('Pluf_RowPermission')->getSqlTable();
+            $sql = new Pluf_SQL('owner_class=%s AND owner_id=%s',
+                                array($this->_a['model'], $this->_data['id']));
+            $this->_con->execute('DELETE FROM '.$_rpt.' WHERE '.$sql->gen());
+        }
+    }
+
+    /**
+     * Set the password of a user.
+     *
+     * You need to manually save the user to store the password in the 
+     * database. The algorithm supported is md5 at the moment.
+     *
+     * @param string New password
+     * @return bool Success
+     */
+    function setPassword($password)
+    {
+        $salt = Pluf_Utils::getRandomString(5);
+        $this->password = 'sha1:'.$salt.':'.sha1($salt.$password);
+        return true;
+    }
+
+    /**
+     * Check if the password of a user matches with the one in the database.
+     *
+     * @param string Password
+     * @return bool True if success
+     */
+    function checkPassword($password)
+    {
+        if ($this->password == '') {
+            return false;
+        }
+        list($algo, $salt, $hash) = split(':', $this->password);
+        if ($hash == $algo($salt.$password)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Check if the login creditentials are valid.
+     *
+     * @param string Login
+     * @param string Password
+     * @return mixed False or matching user
+     */
+    function checkCreditentials($login, $password)
+    {
+        $where = 'login = '.$this->_toDb($login, 'login');
+        $users = $this->getList(array('filter' => $where));
+        if ($users === false or count($users) !== 1) {
+            return false;
+        }
+        if ($users[0]->active and $users[0]->checkPassword($password)) {
+            return $users[0];
+        }
+        return false;
+    }
+
+    /**
+     * Set the last_login and date_joined before creating.
+     *
+     */
+    function preSave($create=false)
+    {
+        if (!($this->id > 0)) {
+            $this->last_login = gmdate('Y-m-d H:i:s');
+            $this->date_joined = gmdate('Y-m-d H:i:s');
+        }
+    }
+
+    /**
+     * Check if a user is anonymous.
+     *
+     * @return bool True if the user is anonymous.
+     */
+    function isAnonymous()
+    {
+        return (0 === (int) $this->id);
+    }
+
+    /**
+     * Get all the permissions of a user.
+     *
+     * @param bool Force the reload of the list of permissions (false)
+     * @return array List of permissions
+     */
+    function getAllPermissions($force=false)
+    {
+        if ($force==false and !is_null($this->_cache_perms)) {
+            return $this->_cache_perms;
+        }
+        $this->_cache_perms = array();
+        $perms = (array) $this->get_permissions_list();
+        $groups = $this->get_groups_list();
+        $ids = array();
+        foreach ($groups as $group) {
+            $ids[] = $group->id;
+        }
+        if (count($ids) > 0) {
+            $gperm = new Pluf_Permission();
+            $perms = array_merge($perms, (array) $gperm->getList(array('filter' => 'pluf_group_id IN ('.join(', ', $ids).')',
+                                                                       'view' => 'join_group')));
+        }
+        foreach ($perms as $perm) {
+            if (!in_array($perm->application.'.'.$perm->code_name, $this->_cache_perms)) {
+                $this->_cache_perms[] = $perm->application.'.'.$perm->code_name;
+            }
+        }
+        if (Pluf::f('pluf_use_rowpermission', false)) {
+            $growp = new Pluf_RowPermission();
+            $sql = new Pluf_SQL('owner_id=%s AND owner_class=%s',
+                                array($this->id, 'Pluf_User'));
+            if (count($ids) > 0) {
+                $sql2 = new Pluf_SQL('owner_id IN ('.join(', ', $ids).') AND owner_class=%s',
+                                     array('Pluf_Group'));
+                $sql->SOr($sql2);
+            }
+            $perms = $growp->getList(array('filter' => $sql->gen(),
+                                           'view' => 'join_permission'));
+            foreach ($perms as $perm) {
+                $perm_string = $perm->application.'.'.$perm->code_name.'#'.$perm->model_class.'('.$perm->model_id.')';
+                if ($perm->negative) {
+                    $perm_string = '!'.$perm_string;
+                }
+                if (!in_array($perm_string, $this->_cache_perms)) {
+                    $this->_cache_perms[] = $perm_string;
+                }
+            }
+        }
+        return $this->_cache_perms;
+    }
+
+    /**
+     * Check if a user as a permission.
+     *
+     * @param string Permission
+     * @param Object Object for row level permission (null)
+     * @return bool True if the user has the permission.
+     */
+    function hasPerm($perm, $obj=null)
+    {
+        if (!$this->active)
+            return false;
+        if ($this->administrator)
+            return true;
+        $perms = $this->getAllPermissions();
+        if (!is_null($obj)) {
+            $perm_row = $perm.'#'.$obj->_a['model'].'('.$obj->id.')';
+            if (in_array('!'.$perm_row, $perms)) 
+                return false;
+            if (in_array($perm_row, $perms)) 
+                return true;
+        }
+        if (in_array($perm, $perms)) 
+            return true;
+        return false;
+    }
+
+    /**
+     * Check if a user one or more application permission.
+     *
+     * @return bool True if the user has some.
+     */
+    function hasAppPerms($app)
+    {
+        if ($this->administrator)
+            return true;
+        foreach ($this->getAllPermissions() as $perm) {
+            if (0 === strpos($perm, $app.'.')) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Set a message.
+     *
+     * The user must not be anonymous.
+     *
+     * @param string Message
+     * @return bool Success
+     */
+    function setMessage($message)
+    {
+        if ($this->isAnonymous()) {
+            return false;
+        }
+        $m = new Pluf_Message();
+        $m->user = $this;
+        $m->message = $message;
+        return $m->create();
+    }
+
+    /**
+     * Get messages and delete them.
+     *
+     * The user must not be anonymous.
+     *
+     * @return mixed False if anonymous, else ArrayObject
+     */
+    function getAndDeleteMessages()
+    {
+        if ($this->isAnonymous()) {
+            return false;
+        }
+        $messages = new ArrayObject();
+        $ms = $this->get_pluf_message_list();
+        foreach ($ms as $m) {
+            $messages[] = $m->message;
+            $m->delete();
+        }
+        return $messages;
+    }
+}
diff --git a/src/Pluf/Utils.php b/src/Pluf/Utils.php
new file mode 100644
index 0000000..256acb9
--- /dev/null
+++ b/src/Pluf/Utils.php
@@ -0,0 +1,251 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * This file contains several utility classes. 
+ * These classes have only static methods.
+ */
+
+class Pluf_Utils
+{
+    /**
+     * Produces a random string.
+     *
+     * @param int Length of the random string to be generated.
+     * @return string Random string
+     */
+    static function getRandomString($len=35)
+    {
+        $string = '';
+        $chars = '0123456789abcdefghijklmnopqrstuvwxyz'
+            .'ABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%&*()+=-_}{[]><?/'; 
+        $lchars = strlen($chars);
+        $i = 0; 
+        while ($i<$len) { 
+            $string .= substr($chars, mt_rand(0, $lchars-1), 1);
+            $i++;
+        }
+        return $string;
+    }
+
+    /**
+     * Produces a random password.
+     *
+     * The random password generator avoid characters that can be
+     * confused like 0,O,o,1,l,I.
+     *
+     * @param int Length of the password (8)
+     * @return string Password
+     */
+    static function getPassword($len=8)
+    {
+        $string = '';
+        $chars = '23456789abcdefghijkmnpqrstuvwxyz'
+            .'ABCDEFGHJKLMNPQRSTUVWXYZ'; 
+        $lchars = strlen($chars);
+        $i = 0; 
+        while ($i<$len) { 
+            $string .= substr($chars, mt_rand(0, $lchars-1), 1);
+            $i++;
+        }
+        return $string;
+    }
+
+    /**
+     * Clean the name of a file to only have alphanumeric characters.
+     *
+     * @param string Name
+     * @return string Clean name
+     */
+    static function cleanFileName($name)
+    {
+        $name = mb_strtolower($name, 'UTF-8');
+        return mb_ereg_replace("/\015\012|\015|\012|\s|[^A-Za-z0-9\.\-\_]/", '_', $name);
+    }
+
+    static function prettySize($size)
+    {
+        $mb = 1024*1024;
+        if ($size > $mb) {
+            $mysize = sprintf('%01.2f', $size/$mb).' '. __('MB');
+        } elseif ($size >= 1024) {
+            $mysize = sprintf('%01.2f', $size/1024).' '.__('kB');
+        } else {
+            $mysize = sprintf('%d', $size).' '.__('bytes');
+        }
+        return $mysize;
+    }
+
+    /**
+     * RFC(2)822 Email Parser
+     *
+     * By Cal Henderson <cal@iamcal.com> 
+     * This code is licensed under a Creative Commons
+     * Attribution-ShareAlike 2.5 License
+     * http://creativecommons.org/licenses/by-sa/2.5/
+     * Revision 5 - http://www.iamcal.com/publish/articles/php/parsing_email/
+     *
+     * Comments were stripped, check the source for the way this
+     * parser is built. It is a very interesting reading.
+     *
+     * @param string Email
+     * @return bool Is email
+     */
+    static function isValidEmail($email)
+    {
+        $email = trim($email);
+        $n = split(' ', $email);
+        if (count($n) > 1) {
+            return false;
+        }
+        $no_ws_ctl = "[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x7f]";
+        $alpha = "[\\x41-\\x5a\\x61-\\x7a]";
+        $digit = "[\\x30-\\x39]";
+        $cr = "\\x0d";
+        $lf = "\\x0a";
+        $crlf = "($cr$lf)";
+        $obs_char = "[\\x00-\\x09\\x0b\\x0c\\x0e-\\x7f]";
+        $obs_text = "($lf*$cr*($obs_char$lf*$cr*)*)";
+        $text = "([\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f]|$obs_text)";
+        $obs_qp = "(\\x5c[\\x00-\\x7f])";
+        $quoted_pair = "(\\x5c$text|$obs_qp)";
+        $wsp = "[\\x20\\x09]";
+        $obs_fws = "($wsp+($crlf$wsp+)*)";
+        $fws = "((($wsp*$crlf)?$wsp+)|$obs_fws)";
+        $ctext = "($no_ws_ctl|[\\x21-\\x27\\x2A-\\x5b\\x5d-\\x7e])";
+        $ccontent = "($ctext|$quoted_pair)";
+        $comment = "(\\x28($fws?$ccontent)*$fws?\\x29)";
+        $cfws = "(($fws?$comment)*($fws?$comment|$fws))";
+        $cfws = "$fws*";
+        $atext = "($alpha|$digit|[\\x21\\x23-\\x27\\x2a\\x2b\\x2d\\x2f\\x3d\\x3f\\x5e\\x5f\\x60\\x7b-\\x7e])";
+        $atom = "($cfws?$atext+$cfws?)";
+        $qtext = "($no_ws_ctl|[\\x21\\x23-\\x5b\\x5d-\\x7e])";
+        $qcontent = "($qtext|$quoted_pair)";
+        $quoted_string = "($cfws?\\x22($fws?$qcontent)*$fws?\\x22$cfws?)";
+        $word = "($atom|$quoted_string)";
+        $obs_local_part = "($word(\\x2e$word)*)";
+        $obs_domain = "($atom(\\x2e$atom)*)";
+        $dot_atom_text = "($atext+(\\x2e$atext+)*)";
+        $dot_atom = "($cfws?$dot_atom_text$cfws?)";
+        $dtext = "($no_ws_ctl|[\\x21-\\x5a\\x5e-\\x7e])";
+        $dcontent = "($dtext|$quoted_pair)";
+        $domain_literal = "($cfws?\\x5b($fws?$dcontent)*$fws?\\x5d$cfws?)";
+        $local_part = "($dot_atom|$quoted_string|$obs_local_part)";
+        $domain = "($dot_atom|$domain_literal|$obs_domain)";
+        $addr_spec = "($local_part\\x40$domain)";
+
+        $done = 0;
+        while(!$done){
+            $new = preg_replace("!$comment!", '', $email);
+            if (strlen($new) == strlen($email)){
+                $done = 1;
+            }
+            $email = $new;
+        }
+        return preg_match("!^$addr_spec$!", $email) ? true : false;
+    }
+
+    /**
+     * Validate an url. 
+     * Only the structure is checked, no check of availability of the
+     * url is performed. It is a really basic validation.
+     */
+    static function isValidUrl($url)
+    {
+        $ip = '(25[0-5]|2[0-4]\d|[0-1]?\d?\d)(\.'
+            .'(25[0-5]|2[0-4]\d|[0-1]?\d?\d)){3}';
+        $dom = '([a-z0-9\.\-]+)';
+        return (preg_match('!^(http|https|ftp|gopher)\://('.$ip.'|'.$dom.')!i', $url)) ? true : false;
+    }
+
+
+    /**
+     * Convert a whatever separated list of items and returns an array
+     * of them.
+     *
+     * @param string Items.
+     * @param string Separator (',')
+     * @return array Items.
+     */
+    static function itemsToArray($items, $sep=',')
+    {
+        $_t = explode($sep, $items);
+        $res = array();
+        foreach ($_t as $item) {
+            $item = trim($item);
+            if (strlen($item) > 0) {
+                $res[] = $item;
+            }
+        }
+        return $res;
+    }
+
+    /**
+     * Run an external program capturing both stdout and stderr.
+     *
+     * @credits dk at brightbyte dot de
+     * @source http://www.php.net/manual/en/function.shell-exec.php
+     * @see proc_open
+     *
+     * @param string Command to run (will be passed to proc_open)
+     * @param &int Return code of the command
+     * @return mixed false in case of error or output string
+     */
+    public static function runExternal($cmd, &$code) 
+    {
+        $descriptorspec = array(
+               // stdin is a pipe that the child will read from
+               0 => array('pipe', 'r'),  
+               // stdout is a pipe that the child will write to
+               1 => array('pipe', 'w'), 
+               // stderr is a file to write to
+               2 => array('pipe', 'w'));
+        $pipes= array();
+        $process = proc_open($cmd, $descriptorspec, $pipes);
+        $output= '';
+        if (!is_resource($process)) return false;
+        fclose($pipes[0]); //close child's input imidiately
+        stream_set_blocking($pipes[1], false);
+        stream_set_blocking($pipes[2], false);
+        $todo = array($pipes[1], $pipes[2]);
+        while (true) {
+            $read = array();
+            if(!feof($pipes[1])) $read[] = $pipes[1];
+            if(!feof($pipes[2])) $read[] = $pipes[2];
+            if (!$read) break;
+            $write = $ex = array();
+            $ready= stream_select($read, $write, $ex, 2);
+            if ($ready === false) {
+                break; // should never happen - something died
+            }
+            foreach ($read as $r) {
+                $s = fread($r,1024);
+                $output .= $s;
+            }
+        }
+        fclose($pipes[1]);
+        fclose($pipes[2]);
+        $code = proc_close($process);
+        return $output;
+    }
+}
diff --git a/src/Pluf/Views.php b/src/Pluf/Views.php
new file mode 100644
index 0000000..edb860e
--- /dev/null
+++ b/src/Pluf/Views.php
@@ -0,0 +1,335 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+Pluf::loadFunction('Pluf_HTTP_URL_urlForView');
+Pluf::loadFunction('Pluf_Shortcuts_GetFormForModel');
+Pluf::loadFunction('Pluf_Shortcuts_GetObjectOr404');
+Pluf::loadFunction('Pluf_Shortcuts_RenderToResponse');
+
+/**
+ * Some basic views that can be reused by other views.
+ *
+ * Most of them are not supposed to be called directly via the
+ * dispatcher as they take extra parameters for basic customization.
+ */
+class Pluf_Views
+{
+    /**
+     * Log the user in.
+     *
+     * The login form is provided by the login_form.html template.
+     * The '_redirect_after' hidden value is used to redirect the user
+     * after successfull login. If the view is called with
+     * _redirect_after set in the query as a GET variable it will be
+     * available as $_redirect_after in the template.
+     *
+     * @param Request Request object
+     * @param array Match
+     * @param string Default redirect URL after login ('/')
+     * @param array Extra context values (array()).
+     * @param string Login form template ('login_form.html')
+     * @return Response object
+     */
+    function login($request, $match, $success_url='/', $extra_context=array(),
+                   $template='login_form.html')
+    {
+        if (!empty($request->REQUEST['_redirect_after'])) {
+            $success_url = $request->REQUEST['_redirect_after'];
+        }
+        $error = '';
+        if ($request->method == 'POST') {
+            $users = new Pluf_User();
+            if (false === ($user = $users->checkCreditentials($request->POST['login'], $request->POST['password']))) {
+                $error = __('The login or the password is not valid. The login and the password are case sensitive.');
+            } else {
+                if (!$request->session->getTestCookie()) {
+                    $error = __('You need to enable the cookies in your browser to access this website.');
+                } else {
+                    $request->user = $user;
+                    $request->session->clear();
+                    $request->session->setData('login_time', gmdate('Y-m-d H:i:s'));
+                    $user->last_login = gmdate('Y-m-d H:i:s');
+                    $user->update();
+                    $request->session->deleteTestCookie();
+                    return new Pluf_HTTP_Response_Redirect($success_url);
+                }
+            }
+        }
+        // Show the login form
+        $request->session->createTestCookie();
+        $context = new Pluf_Template_Context_Request($request,
+                           array_merge(array(
+                           'page_title' => __('Sign In'),
+                           '_redirect_after' => $success_url,
+                           'error' => $error), $extra_context));
+        $tmpl = new Pluf_Template($template);
+        return new Pluf_HTTP_Response($tmpl->render($context));
+    }
+
+    /**
+     * Logout the user.
+     *
+     * The success url is either an absolute url starting with
+     * http(s):// or considered as an action.
+     *
+     * @param Request Request object
+     * @param array Match
+     * @param string Default redirect URL after login '/'
+     * @return Response object
+     */
+    function logout($request, $match, $success_url='/')
+    {
+        $request->user = new Pluf_User();
+        $request->session->clear();
+        $request->session->setData('logout_time', gmdate('Y-m-d H:i:s'));
+        if (0 !== strpos($success_url, 'http')) {
+            $murl = new Pluf_HTTP_URL();
+            $success_url = Pluf::f('app_base').$murl->generate($success_url);
+        }
+        return new Pluf_HTTP_Response_Redirect($success_url);
+    }
+
+
+    /**
+     * Create an object (Part of the CRUD series).
+     *
+     * The minimal extra parameter is the model class name. The list
+     * of extra parameters is:
+     *
+     * 'model' - Class name string, required.
+     * 
+     * 'extra_context' - Array of key/values to be added to the
+     *                   context (array())
+     * 
+     * 'extra_form' - Array of key/values to be added to the
+     *                   form generation (array())
+     *
+     * 'login_required' - Do we require login (false)
+     *
+     * 'template' - Template to use ('"model class"_create_form.html')
+     *
+     * 'post_save_redirect' - View to redirect after saving (use
+     *                        getAbsoluteUrl() method of the mode)
+     *
+     * 'post_save_redirect_keys' - Which keys of the model to pass to
+     *                             the view (array('id'))
+     *
+     * @param Pluf_HTTP_Request Request object
+     * @param array Match
+     * @param array Extra parameters
+     * @return Pluf_HTTP_Response Response object (can be a redirect)
+     */
+    public function createObject($request, $match, $p)
+    {
+        $default = array(
+                         'extra_context' => array(),
+                         'extra_form' => array(),
+                         'login_required' => false,
+                         );
+        $p = array_merge($default, $p);
+        if (isset($p['login_required']) && true == $p['login_required']) {
+            if ($request->user->isAnonymous()) {
+                return new Pluf_HTTP_Response_RedirectToLogin($request);
+            }
+        }
+        if (!isset($p['model'])) {
+            throw new Exception('The model class was not provided in the parameters.');
+        }
+        // Set the default
+        $model = $p['model'];
+        $context = (isset($p['extra_context'])) ? $p['extra_context'] : array();
+        $template = (isset($p['template'])) ? $p['template'] : strtolower($model).'_create_form.html';
+        $post_save_keys = (isset($p['post_save_redirect_keys'])) ? $p['post_save_redirect_keys'] : array('id');
+
+
+        $object = new $model();
+        if ($request->method == 'POST') {
+            $form = Pluf_Shortcuts_GetFormForModel($object, $request->POST, $p['extra_form']);
+            if ($form->isValid()) {
+                $object = $form->save();
+                if (isset($p['post_save_redirect'])) {
+                    $url = Pluf_HTTP_URL_urlForView($p['post_save_redirect'],
+                                                    $post_save_keys);
+                } elseif (in_array('getAbsoluteUrl', 
+                                   get_class_methods($object))) {
+                    $url = $object->getAbsoluteUrl();
+                } else {
+                    throw new Exception('No URL to redirect to from generic create view.');
+                }
+                if (!$request->user->isAnonymous()) {
+                    $request->user->setMessage(sprintf(__('The %s was created successfully.'), $object->_a['verbose']));
+                }
+                return new Pluf_HTTP_Response_Redirect($url);
+            }
+        } else {
+            $form = Pluf_Shortcuts_GetFormForModel($object, null, $p['extra_form']);
+        }
+        return Pluf_Shortcuts_RenderToResponse($template,
+                                               array_merge($context,
+                                                           array('form' => $form)),
+                                               $request);
+    }
+
+    /**
+     * Update an object (Part of the CRUD series).
+     *
+     * The minimal extra parameter is the model class name. The list
+     * of extra parameters is:
+     *
+     * 'model' - Class name string, required.
+     * 
+     * 'model_id' - Id of of the current model to update
+     * 
+     * 'extra_context' - Array of key/values to be added to the
+     *                   context (array())
+     * 
+     * 'extra_form' - Array of key/values to be added to the
+     *                   form generation (array())
+     *
+     * 'login_required' - Do we require login (false)
+     *
+     * 'template' - Template to use ('"model class"_update_form.html')
+     *
+     * 'post_save_redirect' - View to redirect after saving (use
+     *                        getAbsoluteUrl() method of the mode)
+     *
+     * 'post_save_redirect_keys' - Which keys of the model to pass to
+     *                             the view (array('id'))
+     *
+     * @param Pluf_HTTP_Request Request object
+     * @param array Match
+     * @param array Extra parameters
+     * @return Pluf_HTTP_Response Response object (can be a redirect)
+     */
+    public function updateObject($request, $match, $p)
+    {
+        if (isset($p['login_required']) && true == $p['login_required']) {
+            if ($request->user->isAnonymous()) {
+                return new Pluf_HTTP_Response_RedirectToLogin($request);
+            }
+        }
+        if (!isset($p['model'])) {
+            throw new Exception('The model class was not provided in the parameters.');
+        }
+        // Set the default
+        $model = $p['model'];
+        $model_id = $p['model_id'];
+        $context = (isset($p['extra_context'])) ? $p['extra_context'] : array();
+        $template = (isset($p['template'])) ? $p['template'] : strtolower($model).'_update_form.html';
+        $post_save_keys = (isset($p['post_save_redirect_keys'])) ? $p['post_save_redirect_keys'] : array('id');
+
+        $object = Pluf_Shortcuts_GetObjectOr404($model, $model_id);
+        if ($request->method == 'POST') {
+            $form = Pluf_Shortcuts_GetFormForModel($object, $request->POST, $p['extra_form']);
+            if ($form->isValid()) {
+                $object = $form->save();
+                if (isset($p['post_save_redirect'])) {
+                    $url = Pluf_HTTP_URL_urlForView($p['post_save_redirect'],
+                                                    $post_save_keys);
+                } elseif (in_array('getAbsoluteUrl', 
+                                   get_class_methods($object))) {
+                    $url = $object->getAbsoluteUrl();
+                } else {
+                    throw new Exception('No URL to redirect to from generic create view.');
+                }
+                if (!$request->user->isAnonymous()) {
+                    $request->user->setMessage(sprintf(__('The %s was created successfully.'), $object->_a['verbose']));
+                }
+                return new Pluf_HTTP_Response_Redirect($url);
+            }
+        } else {
+            $form = Pluf_Shortcuts_GetFormForModel($object, $object->getData(), $p['extra_form']);
+        }
+        return Pluf_Shortcuts_RenderToResponse($template,
+                                               array_merge($context,
+                                                           array('form' => $form,
+                                                                 'object' => $object)),
+                                               $request);
+    }
+
+
+    /**
+     * Delete an object (Part of the CRUD series).
+     *
+     * The minimal extra parameter is the model class name. The list
+     * of extra parameters is:
+     *
+     * 'model' - Class name string, required.
+     *
+     * 'post_delete_redirect' - View to redirect after saving, required.
+     *
+     * 'id' - Index in the match to fin the id of the object to delete (1)
+     * 
+     * 'login_required' - Do we require login (false)
+     *
+     * 'template' - Template to use ('"model class"_confirm_delete.html')
+     *
+     * 'post_delete_redirect_keys' - Which keys of the model to pass to
+     *                             the view (array())
+     *
+     * 'extra_context' - Array of key/values to be added to the
+     *                   context (array())
+     * 
+     * @param Pluf_HTTP_Request Request object
+     * @param array Match
+     * @param array Extra parameters
+     * @return Pluf_HTTP_Response Response object (can be a redirect)
+     */
+    public function deleteObject($request, $match, $p)
+    {
+        if (isset($p['login_required']) && true == $p['login_required']) {
+            if ($request->user->isAnonymous()) {
+                return new Pluf_HTTP_Response_RedirectToLogin($request);
+            }
+        }
+        if (!isset($p['model'])) {
+            throw new Exception('The model class was not provided in the parameters.');
+        }
+        // Set the default
+        $id = (isset($p['id'])) ? $match[$p['id']] : $match[1];
+        $model = $p['model'];
+        $context = (isset($p['extra_context'])) ? $p['extra_context'] : array();
+        $template = (isset($p['template'])) ? $p['template'] : strtolower($model).'_confirm_delete.html';
+        $post_save_keys = (isset($p['post_save_redirect_keys'])) ? $p['post_save_redirect_keys'] : array();
+
+        $object = Pluf_Shortcuts_GetObjectOr404($model, $id);
+        if ($request->method == 'POST') {
+            $object->delete();
+            if (isset($p['post_save_redirect'])) {
+                $url = Pluf_HTTP_URL_urlForView($p['post_save_redirect'],
+                                                $post_save_keys);
+            } else {
+                throw new Exception('No URL to redirect to from generic delete view.');
+            }
+            if (!$request->user->isAnonymous()) {
+                $request->user->setMessage(sprintf(__('The %s was deleted successfully.'), $object->_a['verbose']));
+            }
+            return new Pluf_HTTP_Response_Redirect($url);
+        } 
+        return Pluf_Shortcuts_RenderToResponse($template, 
+                                               array_merge($context,
+                                                           array('object' => $object)),
+                                               $request);
+    }
+
+}
\ No newline at end of file
diff --git a/src/Pluf/conf/pluf.test.php b/src/Pluf/conf/pluf.test.php
new file mode 100644
index 0000000..87a7ad1
--- /dev/null
+++ b/src/Pluf/conf/pluf.test.php
@@ -0,0 +1,76 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+
+$cfg = array();
+$cfg['test'] = false;
+$cfg['timezone'] = 'Europe/Berlin';
+// Set the debug variable to true to force the recompilation of all
+// the templates each time during development
+$cfg['debug'] = true;
+$cfg['installed_apps'] = array('Pluf');
+// Temporary folder where the script is writing the compiled templates,
+// cached data and other temporary resources.
+// It must be writeable by your webserver instance.
+// It is mandatory if you are using the template system.
+$cfg['tmp_folder'] = '/tmp';
+
+// The folder in which the templates of the application are located.
+$cfg['templates_folder'] = array(dirname(__FILE__).'/../templates');
+
+$cfg['pluf_use_rowpermission'] = true;
+
+// Default mimetype of the document your application is sending.
+// It can be overwritten for a given response if needed.
+$cfg['mimetype'] = 'text/html';
+
+// Some views for testing.
+$cfg['app_views'] = dirname(__FILE__).'/../app-views.php';
+
+// Default database configuration. The database defined here will be
+// directly accessible from Pluf::db() of course it is still possible
+// to open any other number of database connections through Pluf_DB
+$cfg['db_login'] = 'testpluf';
+$cfg['db_password'] = 'testpluf';
+$cfg['db_server'] = 'localhost';
+$cfg['db_database'] = $cfg['tmp_folder'].'/pluf.tmp.sqlite.db';
+
+$cfg['app_base'] = '/testapp';
+$cfg['url_format'] = 'simple';
+
+$cfg['template_tags'] = array(
+                              'mytag' => 'Pluf_Template_Tag_Mytag',
+                              );
+
+// Must be shared by all the installed_apps and the core framework.
+// That way you can have several installations of the core framework.
+$cfg['db_table_prefix'] = 'pluf_unit_tests_'; 
+
+// Starting version 4.1 of MySQL the utf-8 support is "correct".
+// The reason of the db_version for MySQL is only for that.
+$cfg['db_version'] = '5.0';
+$cfg['db_engine'] = 'SQLite';
+
+$cfg['simple_test_path'] = '/home/loa/Vendors/simpletest';
+return $cfg;
+
diff --git a/src/Pluf/locale/fr/pluf.po b/src/Pluf/locale/fr/pluf.po
new file mode 100644
index 0000000..0ef3a78
--- /dev/null
+++ b/src/Pluf/locale/fr/pluf.po
@@ -0,0 +1,539 @@
+# French translations of Pluf.
+# Copyright (C) 2008 LoĂ¯c d'Anterroches and contributors
+# This file is distributed under the same license as the Pluf package.
+# LoĂ¯c d'Anterroches <titoo@users.sourceforge.net>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Pluf\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-05-07 11:50+0200\n"
+"PO-Revision-Date: 2008-05-08 13:29+0100\n"
+"Last-Translator: LoĂ¯c d'Anterroches <titoo@users.sourceforge.net>\n"
+"Language-Team: French <pluf-users@googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n>1;\n"
+"X-Poedit-Language: French\n"
+"X-Poedit-Country: France\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-Basepath: ../../../\n"
+
+#: Pluf/papp.php:29
+msgid "Authentication"
+msgstr "Authentification"
+
+#: Pluf/Template.php:132
+#, php-format
+msgid "Cannot write the compiled template: %s"
+msgstr "Ne peut pas écrire le gabarit compilé: %s"
+
+#: Pluf/Encoder.php:62
+msgid "The value must not be empty."
+msgstr "La valeur ne doit pas Ăªtre vide."
+
+#: Pluf/Encoder.php:81
+#, php-format
+msgid "The URL <em>%s</em> is not valid."
+msgstr "L'URL <em>%s</em> n'est pas valide."
+
+#: Pluf/Encoder.php:88
+#, php-format
+msgid "The value should not be more than <em>%s</em> characters long."
+msgstr "La valeur ne doit pas faire plus de <em>%s</em> caractères."
+
+#: Pluf/Encoder.php:96
+#, php-format
+msgid "The password must be at least <em>%s</em> characters long."
+msgstr "Le password doit avoir au minimum <em>%s</em> caractères."
+
+#: Pluf/Encoder.php:106
+#, php-format
+msgid "The email address \"%s\" is not valid."
+msgstr "L'adresse email \"%s\" n'est pas valid."
+
+#: Pluf/Encoder.php:138
+#: Pluf/Form/Field/Integer.php:40
+#: Pluf/Form/Field/Integer.php:49
+msgid "The value must be an integer."
+msgstr "La valeur doit Ăªtre un nombre entier."
+
+#: Pluf/Encoder.php:146
+#, php-format
+msgid "The date and time <em>%s</em> are not valid."
+msgstr "Le jour et l'heure <em>%s</em> ne sont pas valides."
+
+#: Pluf/Encoder.php:157
+#, php-format
+msgid "The date <em>%s</em> is not valid."
+msgstr "La date <em>%s</em> n'est pas valide."
+
+#: Pluf/Group.php:28
+msgid "group"
+msgstr "groupe"
+
+#: Pluf/Group.php:44
+#: Pluf/Permission.php:44
+msgid "name"
+msgstr "nom"
+
+#: Pluf/Group.php:51
+#: Pluf/Permission.php:59
+msgid "description"
+msgstr "description"
+
+#: Pluf/Template/Compiler.php:223
+#: Pluf/Template/Compiler.php:388
+#: Pluf/Template/Compiler.php:394
+#: Pluf/Template/Compiler.php:411
+#: Pluf/Template/Compiler.php:454
+#, php-format
+msgid "End tag of a block missing: %s"
+msgstr "Fin du marqueur de bloc manquant: %s"
+
+#: Pluf/Template/Compiler.php:306
+#: Pluf/Translation/TemplateExtractor.php:267
+#, php-format
+msgid "Template file contains invalid characters: %s"
+msgstr "Le chemin du gabarit contient des caractères invalides: %s"
+
+#: Pluf/Template/Compiler.php:315
+#: Pluf/Translation/TemplateExtractor.php:276
+#, php-format
+msgid "Template file not found: %s"
+msgstr "Fichier gabarit %s introuvable."
+
+#: Pluf/Template/Compiler.php:322
+#: Pluf/Translation/TemplateExtractor.php:305
+#, php-format
+msgid "Invalid tag syntax: %s"
+msgstr "Syntaxe du marqueur invalide : %s"
+
+#: Pluf/Template/Compiler.php:336
+#: Pluf/Translation/TemplateExtractor.php:288
+#, php-format
+msgid "Invalid function syntax: %s"
+msgstr "Syntaxe de fonction invalide : %s"
+
+#: Pluf/Template/Compiler.php:359
+#, php-format
+msgid "Invalid modifier syntax: (%s) %s"
+msgstr "Syntaxe de modificateur invalide : %s"
+
+#: Pluf/Template/Compiler.php:369
+#, php-format
+msgid "Unknown modifier: (%s) %s"
+msgstr "Modificateur inconnu: (%s) %s"
+
+#: Pluf/Template/Compiler.php:423
+msgid "End tag of a block missing: literal"
+msgstr "Fin du marqueur de bloc manquant: literal"
+
+#: Pluf/Template/Compiler.php:427
+msgid "Start tag of a block missing: literal"
+msgstr "DĂ©but du marqueur de bloc manquant: literal"
+
+#: Pluf/Template/Compiler.php:509
+#, php-format
+msgid "The function tag \"%s\" is not allowed."
+msgstr ""
+
+#: Pluf/Template/Compiler.php:531
+#, php-format
+msgid "The function tag \"{%s ...}\" is not supported."
+msgstr ""
+
+#: Pluf/Template/Compiler.php:588
+#: Pluf/Translation/TemplateExtractor.php:390
+#, php-format
+msgid "Invalid syntax: (%s) %s."
+msgstr "Syntaxe invalide : (%s) %s."
+
+#: Pluf/Template/Compiler.php:593
+#: Pluf/Translation/TemplateExtractor.php:395
+#, php-format
+msgid "Invalid character: (%s) %s."
+msgstr "Caractère invalide : (%s) %s."
+
+#: Pluf/Error.php:93
+msgid "DB error:"
+msgstr "Erreur de la base de données :"
+
+#: Pluf/HTTP/Response/RedirectToLogin.php:56
+#: Pluf/HTTP/Response/Redirect.php:28
+#, php-format
+msgid "<a href=\"%s\">Please, click here to be redirected</a>."
+msgstr "<a href=\"%s\">S'il vous plaĂ®t, cliquez ici pour Ăªtre redirigĂ©</a>."
+
+#: Pluf/Date.php:135
+msgid "year"
+msgstr "année"
+
+#: Pluf/Date.php:135
+msgid "month"
+msgstr "mois"
+
+#: Pluf/Date.php:135
+msgid "day"
+msgstr "jour"
+
+#: Pluf/Date.php:135
+msgid "hour"
+msgstr "heure"
+
+#: Pluf/Date.php:136
+msgid "minute"
+msgstr "minute"
+
+#: Pluf/Date.php:136
+msgid "second"
+msgstr "seconde"
+
+#: Pluf/Date.php:137
+msgid "years"
+msgstr "années"
+
+#: Pluf/Date.php:137
+msgid "months"
+msgstr "mois"
+
+#: Pluf/Date.php:137
+msgid "days"
+msgstr "jours"
+
+#: Pluf/Date.php:137
+msgid "hours"
+msgstr "heures"
+
+#: Pluf/Date.php:138
+msgid "minutes"
+msgstr "minutes"
+
+#: Pluf/Date.php:138
+msgid "seconds"
+msgstr "secondes"
+
+#: Pluf/Date.php:157
+msgid "ago"
+msgstr ""
+
+#: Pluf/Date.php:159
+msgid "left"
+msgstr "restant"
+
+#: Pluf/Model.php:410
+#, php-format
+msgid "The view \"%s\" is not defined."
+msgstr "La vue \"%s\" n'est pas définie."
+
+#: Pluf/Model.php:566
+#, php-format
+msgid "No matching foreign key found in model: %s for model %s"
+msgstr "Aucune clef étrangère trouvé dans le modèle %s pour le modèle %s"
+
+#: Pluf/Translation/TemplateExtractor.php:283
+#, php-format
+msgid "Invalid tag in translation extractor: %s"
+msgstr "Marqueur invalide dans l'extraction des traductions: %s"
+
+#: Pluf/Form.php:214
+#, php-format
+msgid "(Hidden field %1$s) %2$s"
+msgstr "(Champ caché %1$s) %2$s"
+
+#: Pluf/Form/Model.php:82
+msgid "Cannot save the model from an invalid form."
+msgstr "Ne peut pas sauvegarder le modèle depuis un formulaire non valide."
+
+#: Pluf/Form/Field/Url.php:35
+msgid "Enter a valid address."
+msgstr "Entrez une adresse valide."
+
+#: Pluf/Form/Field/Float.php:39
+msgid "Enter a number."
+msgstr "Entrez un nombre."
+
+#: Pluf/Form/Field/Float.php:42
+#, php-format
+msgid "Ensure this value is less than or equal to %s."
+msgstr "Assurez-vous que la valeur est inférieure ou égale à %s. "
+
+#: Pluf/Form/Field/Float.php:45
+#, php-format
+msgid "Ensure this value is greater than or equal to %s."
+msgstr "Assurez-vous que la valeur est supérieure ou égale à %s."
+
+#: Pluf/Form/Field/Datetime.php:61
+msgid "Enter a valid date/time."
+msgstr "Entrez une date/heure valide."
+
+#: Pluf/Form/Field/Integer.php:59
+#, php-format
+msgid "Ensure that this value is not greater than %1$d."
+msgstr "Assurez-vous que la valeur ne soit pas supérieure à %1$d."
+
+#: Pluf/Form/Field/Integer.php:62
+#, php-format
+msgid "Ensure that this value is not lower than %1$d."
+msgstr "Assurez-vous que la valeur ne soit pas inférieure à %1$d."
+
+#: Pluf/Form/Field/Date.php:46
+msgid "Enter a valid date."
+msgstr "Entrez une date valide."
+
+#: Pluf/Form/Field/File.php:47
+msgid "The uploaded file is too large. Reduce the size of the file and send it again."
+msgstr "Le fichier transmis est trop gros. RĂ©duisez la taille du fichier et transmettez le une nouvelle fois."
+
+#: Pluf/Form/Field/File.php:50
+msgid "The upload did not complete. Please try to send the file again."
+msgstr "L'envoi du fichier ne s'est pas achevé. Essayez de l'envoyer une nouvelle fois."
+
+#: Pluf/Form/Field/File.php:53
+msgid "No files were uploaded. Please try to send the file again."
+msgstr "Aucun fichier n'a été transmis. Essayez d'envoyer le fichier une nouvelle fois."
+
+#: Pluf/Form/Field/File.php:57
+msgid "The server has no temporary folder correctly configured to store the uploaded file."
+msgstr "Le serveur n'a pas de répertoire temporaire correctement configuré pour stocker les fichiers transmis."
+
+#: Pluf/Form/Field/File.php:60
+msgid "The uploaded file has been stopped by an extension."
+msgstr "Le fichier transmis a été bloqué par une extension."
+
+#: Pluf/Form/Field/File.php:63
+#: Pluf/Form/Field/File.php:97
+msgid "An error occured when upload the file. Please try to send the file again."
+msgstr "Une erreur est survenu pendant la transmission du fichier. Essayez de transmettre le fichier de nouveau."
+
+#: Pluf/Form/Field/File.php:66
+#, php-format
+msgid "The uploaded file is to big (%1$s). Reduce the size to less than %2$s and try again."
+msgstr "Le fichier transmis est trop gros (%1$s). Essayez d'obtenir une taille inférieure à %2$s et essayez de nouveau."
+
+#: Pluf/Form/Field/Email.php:35
+msgid "Enter a valid email address."
+msgstr "Entrez une adresse email valide."
+
+#: Pluf/Form/Field/Varchar.php:38
+#, php-format
+msgid "Ensure this value has at most %1$d characters (it has %2$d)."
+msgstr "Assurez-vous que la valeur ait au maximum %1$d caractères (elle en contient %2$d)."
+
+#: Pluf/Form/Field/Varchar.php:41
+#, php-format
+msgid "Ensure this value has at least %1$d characters (it has %2$d)."
+msgstr "Assurez-vous que la valeur ait au minimum %1$d caractères (elle en contient %2$d)."
+
+#: Pluf/Form/Field.php:115
+msgid "This field is required."
+msgstr "Ce champ est Ă  fournir."
+
+#: Pluf/Calendar.php:318
+msgid "Sunday"
+msgstr "dimanche"
+
+#: Pluf/Calendar.php:319
+msgid "Monday"
+msgstr "lundi"
+
+#: Pluf/Calendar.php:320
+msgid "Tuesday"
+msgstr "mardi"
+
+#: Pluf/Calendar.php:321
+msgid "Wednesday"
+msgstr "mercredi"
+
+#: Pluf/Calendar.php:322
+msgid "Thursday"
+msgstr "jeudi"
+
+#: Pluf/Calendar.php:323
+msgid "Friday"
+msgstr "vendredi"
+
+#: Pluf/Calendar.php:324
+msgid "Saturday"
+msgstr "samedi"
+
+#: Pluf/RowPermission.php:42
+msgid "model ID"
+msgstr "ID du modèle"
+
+#: Pluf/RowPermission.php:49
+msgid "model class"
+msgstr "Class du modèle"
+
+#: Pluf/RowPermission.php:55
+msgid "owner ID"
+msgstr "ID du propriétaire"
+
+#: Pluf/RowPermission.php:62
+msgid "owner class"
+msgstr "Class du propriètaire"
+
+#: Pluf/RowPermission.php:63
+msgid "For example Pluf_User or Pluf_Group."
+msgstr "Par exemple Pluf_User ou Pluf_Group."
+
+#: Pluf/RowPermission.php:70
+msgid "do not have the permission"
+msgstr "n'a pas la permission"
+
+#: Pluf/RowPermission.php:77
+#: Pluf/Permission.php:28
+msgid "permission"
+msgstr "permission"
+
+#: Pluf/User.php:39
+#: Pluf/Message.php:43
+msgid "user"
+msgstr "utilisateur"
+
+#: Pluf/User.php:56
+msgid "login"
+msgstr "identifiant"
+
+#: Pluf/User.php:63
+msgid "first name"
+msgstr "prénom"
+
+#: Pluf/User.php:70
+msgid "last name"
+msgstr "nom de famille"
+
+#: Pluf/User.php:76
+msgid "email"
+msgstr "email"
+
+#: Pluf/User.php:82
+msgid "password"
+msgstr "mot de passe"
+
+#: Pluf/User.php:84
+msgid "Format: [algo]:[salt]:[hash]"
+msgstr "Format : [algo]:[salt]:[hash]"
+
+#: Pluf/User.php:103
+msgid "administrator"
+msgstr "administrateur"
+
+#: Pluf/User.php:110
+msgid "staff"
+msgstr "staff"
+
+#: Pluf/User.php:117
+msgid "active"
+msgstr "actif"
+
+#: Pluf/User.php:123
+msgid "date joined"
+msgstr "date d'inscription"
+
+#: Pluf/User.php:129
+msgid "last login"
+msgstr "dernière connexion"
+
+#: Pluf/Paginator.php:326
+msgid "Prev"
+msgstr "Préc"
+
+#: Pluf/Paginator.php:337
+msgid "Next"
+msgstr "Suivant"
+
+#: Pluf/Paginator.php:494
+msgid "Name"
+msgstr "Nom"
+
+#: Pluf/Paginator.php:531
+msgid "Sort"
+msgstr "Ordre"
+
+#: Pluf/Paginator.php:534
+msgid "asc"
+msgstr "asc"
+
+#: Pluf/Paginator.php:537
+msgid "desc"
+msgstr "desc"
+
+#: Pluf/Paginator.php:553
+msgid "Filter the list:"
+msgstr "Filtrer la liste :"
+
+#: Pluf/Paginator.php:556
+msgid "Filter"
+msgstr "Filtre"
+
+#: Pluf/Text/LaTeX/Equation.php:243
+msgid "Unable to generate the dvi file."
+msgstr "Impossible de générer le fichier dvi."
+
+#: Pluf/Text/LaTeX/Equation.php:260
+msgid "Unable to generate the png file."
+msgstr "Impossible de générer le fichier png."
+
+#: Pluf/Text/LaTeX/Equation.php:270
+msgid "Unable to move the png file."
+msgstr "Impossible de déplacer le fichier png."
+
+#: Pluf/Text/LaTeX/Equation.php:308
+#, php-format
+msgid "The LaTeX tag \"%s\" is not acceptable."
+msgstr "Le marqueur LaTeX \"%s\" n'est pas autorisé."
+
+#: Pluf/Permission.php:51
+msgid "code name"
+msgstr "nom de code"
+
+#: Pluf/Permission.php:52
+msgid "The code name must be unique for each application. Standard permissions to manage a model in the interface are \"Model_Name.create\", \"Model_Name.update\", \"Model_Name.list\" and \"Model_Name.delete\"."
+msgstr ""
+
+#: Pluf/Permission.php:66
+msgid "application"
+msgstr "application"
+
+#: Pluf/Permission.php:67
+msgid "The application using this permission, for example \"YourApp\", \"CMS\" or \"SView\"."
+msgstr ""
+
+#: Pluf/Utils.php:90
+msgid "MB"
+msgstr "Mo"
+
+#: Pluf/Utils.php:92
+msgid "KB"
+msgstr "Ko"
+
+#: Pluf/Utils.php:94
+msgid "bytes"
+msgstr "octets"
+
+#: Pluf/Views.php:60
+msgid "The login or the password is not valid. The login and the password are case sensitive."
+msgstr "L'identifiant ou le mot de passe n'est pas valide. Les majuscules/minuscules doivent Ăªtre respectĂ©es."
+
+#: Pluf/Views.php:73
+msgid "Sign In"
+msgstr "Se connecter"
+
+#: Pluf/Views.php:165
+#: Pluf/Views.php:241
+#, php-format
+msgid "The %s was created successfully."
+msgstr "Le %s a été crée avec succès."
+
+#: Pluf/Views.php:310
+#, php-format
+msgid "The %s was deleted successfully."
+msgstr "Le %s a été supprimé avec succès."
+
+#: Pluf/Dispatcher.php:114
+#, php-format
+msgid "The page <em>%s</em> was not found on the server."
+msgstr "La page <em>%s</em> n'a pas été trouvée sur le serveur."
+
diff --git a/src/Pluf/relations.php b/src/Pluf/relations.php
new file mode 100644
index 0000000..ca17aa6
--- /dev/null
+++ b/src/Pluf/relations.php
@@ -0,0 +1,36 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume CMS, a website management application.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume CMS is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume CMS 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * For each model having a 'foreignkey' or a 'manytomany' colum, details
+ * must be added here. These details are used to generated the methods
+ * to retrieve related models from each model.
+ */
+
+$m = array();
+$m['Pluf_User'] = array('relate_to_many' => array('Pluf_Group', 'Pluf_Permission'));
+$m['Pluf_Group'] = array('relate_to_many' => array('Pluf_Permission'));
+$m['Pluf_Message']  = array('relate_to' => array('Pluf_User'), );
+$m['Pluf_RowPermission']  = array('relate_to' => array('Pluf_Permission'), );
+$m['Pluf_Search_Occ']  = array('relate_to' => array('Pluf_Search_Word'), );
+return $m;
diff --git a/src/TAGS b/src/TAGS
new file mode 100644
index 0000000..58e7a53
--- /dev/null
+++ b/src/TAGS
@@ -0,0 +1,1082 @@
+
+Pluf.php,202
+class Pluf29,1139
+function __(257,8292
+function _n(275,8779
+function __autoload(301,9534
+class PlufErrorHandlerException 320,10037
+function PlufErrorHandler(336,10305
+function Pluf_esc(361,11013
+
+testrunner.php,192
+function usage(28,1066
+function e(37,1498
+function getTestDirs(41,1537
+function getTestFiles(54,1812
+define('IN_UNIT_TESTS'IN_UNIT_TESTS
90,2849
+define('SIMPLE_TEST'SIMPLE_TEST
110,3541
+
+GeoIP.php,2477
+define("GEOIP_COUNTRY_BEGIN"GEOIP_COUNTRY_BEGIN
29,1023
+define("GEOIP_STATE_BEGIN_REV0"GEOIP_STATE_BEGIN_REV0
30,1064
+define("GEOIP_STATE_BEGIN_REV1"GEOIP_STATE_BEGIN_REV1
31,1108
+define("GEOIP_STANDARD"GEOIP_STANDARD
32,1152
+define("GEOIP_MEMORY_CACHE"GEOIP_MEMORY_CACHE
33,1181
+define("GEOIP_SHARED_MEMORY"GEOIP_SHARED_MEMORY
34,1214
+define("STRUCTURE_INFO_MAX_SIZE"STRUCTURE_INFO_MAX_SIZE
35,1248
+define("DATABASE_INFO_MAX_SIZE"DATABASE_INFO_MAX_SIZE
36,1287
+define("GEOIP_COUNTRY_EDITION"GEOIP_COUNTRY_EDITION
37,1326
+define("GEOIP_PROXY_EDITION"GEOIP_PROXY_EDITION
38,1364
+define("GEOIP_ASNUM_EDITION"GEOIP_ASNUM_EDITION
39,1398
+define("GEOIP_NETSPEED_EDITION"GEOIP_NETSPEED_EDITION
40,1432
+define("GEOIP_REGION_EDITION_REV0"GEOIP_REGION_EDITION_REV0
41,1470
+define("GEOIP_REGION_EDITION_REV1"GEOIP_REGION_EDITION_REV1
42,1512
+define("GEOIP_CITY_EDITION_REV0"GEOIP_CITY_EDITION_REV0
43,1552
+define("GEOIP_CITY_EDITION_REV1"GEOIP_CITY_EDITION_REV1
44,1592
+define("GEOIP_ORG_EDITION"GEOIP_ORG_EDITION
45,1630
+define("GEOIP_ISP_EDITION"GEOIP_ISP_EDITION
46,1664
+define("SEGMENT_RECORD_LENGTH"SEGMENT_RECORD_LENGTH
47,1696
+define("STANDARD_RECORD_LENGTH"STANDARD_RECORD_LENGTH
48,1732
+define("ORG_RECORD_LENGTH"ORG_RECORD_LENGTH
49,1769
+define("MAX_RECORD_LENGTH"MAX_RECORD_LENGTH
50,1801
+define("MAX_ORG_RECORD_LENGTH"MAX_ORG_RECORD_LENGTH
51,1833
+define("GEOIP_SHM_KEY"GEOIP_SHM_KEY
52,1871
+define("US_OFFSET"US_OFFSET
53,1908
+define("CANADA_OFFSET"CANADA_OFFSET
54,1932
+define("WORLD_OFFSET"WORLD_OFFSET
55,1962
+define("FIPS_RANGE"FIPS_RANGE
56,1992
+define("GEOIP_UNKNOWN_SPEED"GEOIP_UNKNOWN_SPEED
57,2019
+define("GEOIP_DIALUP_SPEED"GEOIP_DIALUP_SPEED
58,2053
+define("GEOIP_CABLEDSL_SPEED"GEOIP_CABLEDSL_SPEED
59,2086
+define("GEOIP_CORPORATE_SPEED"GEOIP_CORPORATE_SPEED
60,2121
+class GeoIP 62,2158
+function GeoIP_load_shared_mem 212,12404
+function _setup_segments(230,12849
+function GeoIP_open(313,16346
+function GeoIP_close(330,16801
+function GeoIP_country_id_by_name(338,16930
+function GeoIP_country_code_by_name(346,17116
+function GeoIP_country_name_by_name(354,17327
+function GeoIP_country_id_by_addr(362,17538
+function GeoIP_country_code_by_addr(367,17681
+function GeoIP_country_name_by_addr(380,18046
+function _GeoIP_seek_country(393,18411
+function _get_org(431,19666
+function GeoIP_org_by_addr 447,20228
+function _get_region(455,20372
+function GeoIP_region_by_addr 486,21632
+function GeoIP_getdnsattributes 494,21782
+
+Pluf/Queue/Processor.php,35
+class Pluf_Queue_Processor32,1256
+
+Pluf/Image.php,25
+class Pluf_Image30,1168
+
+Pluf/Template.php,387
+class Pluf_Template27,1056
+    function __construct(48,1631
+    function render(73,2350
+    function getCompiledTemplateName(110,3517
+    function write(124,3995
+function Pluf_Template_unsafe(155,5003
+function Pluf_Template_htmlspecialchars(166,5291
+function Pluf_Template_dateFormat(180,5725
+function Pluf_Template_timeFormat(201,6416
+function Pluf_Template_safeEcho(214,6698
+
+Pluf/DB/Model.php,28
+class Pluf_DB_Model27,1098
+
+Pluf/DB/Schema.php,166
+class Pluf_DB_Schema27,1094
+    function __construct(44,1392
+    function getGenerator(57,1679
+    function createTables(67,1889
+    function dropTables(89,2571
+
+Pluf/DB/Introspect/PostgreSQL.php,77
+class Pluf_DB_Introspect_PostgreSQL25,1022
+    function listTables(41,1386
+
+Pluf/DB/Introspect.php,66
+class Pluf_DB_Introspect25,1022
+    function listTables(43,1494
+
+Pluf/DB/Schema/SQLite.php,178
+class Pluf_DB_Schema_SQLite30,1194
+    function __construct(74,2922
+    function getSqlCreate(87,3167
+    function getSqlIndexes(154,6049
+    function getSqlDelete(202,8087
+
+Pluf/DB/Schema/PostgreSQL.php,182
+class Pluf_DB_Schema_PostgreSQL30,1198
+    function __construct(74,2980
+    function getSqlCreate(87,3225
+    function getSqlIndexes(149,6068
+    function getSqlDelete(186,7462
+
+Pluf/DB/Schema/MySQL.php,177
+class Pluf_DB_Schema_MySQL30,1193
+    function __construct(73,3054
+    function getSqlCreate(86,3299
+    function getSqlIndexes(153,6162
+    function getSqlDelete(186,7528
+
+Pluf/DB/SQLite.php,457
+class Pluf_DB_SQLite27,1056
+    function __construct(37,1319
+    function getServerInfo(57,1931
+    function debug(70,2293
+    function close(80,2620
+    function select(86,2705
+    function execute(95,2950
+    function getLastID(105,3168
+    function getError(116,3409
+    function esc(123,3561
+    function qn(134,3768
+    function begin(142,3876
+    function commit(150,3988
+    function rollback(158,4104
+    function __toString(163,4177
+
+Pluf/DB/PostgreSQL.php,552
+class Pluf_DB_PostgreSQL27,1060
+    function __construct(37,1331
+    function getServerInfo(69,2330
+    function debug(83,2698
+    function close(93,3025
+    function select(103,3203
+    function execute(120,3641
+    function getLastID(132,3937
+    function getError(144,4227
+    function esc(156,4558
+    function setSearchPath(164,4710
+    function qn(179,5145
+    function begin(187,5253
+    function commit(195,5365
+    function rollback(203,5481
+    function __toString(208,5554
+function Pluf_DB_PostgreSQL_BooleanFromDb(214,5653
+
+Pluf/DB/BaseModel.php,29
+class Pluf_BaseModel28,1140
+
+Pluf/DB/SchemaInfo.php,61
+class Pluf_DB_SchemaInfo 24,1021
+    function init(28,1100
+
+Pluf/DB/Field/Float.php,35
+class Pluf_DB_Field_Float 24,1021
+
+Pluf/DB/Field/Datetime.php,70
+class Pluf_DB_Field_Datetime 24,1021
+    function formField(28,1106
+
+Pluf/DB/Field/Integer.php,37
+class Pluf_DB_Field_Integer 24,1021
+
+Pluf/DB/Field/Date.php,66
+class Pluf_DB_Field_Date 24,1021
+    function formField(28,1098
+
+Pluf/DB/Field/Manytomany.php,72
+class Pluf_DB_Field_Manytomany 24,1021
+    function formField(28,1110
+
+Pluf/DB/Field/File.php,183
+class Pluf_DB_Field_File 24,1021
+    function __construct(41,1370
+    function formField(49,1720
+function Pluf_DB_Field_File_Url(58,1900
+function Pluf_DB_Field_File_Path(69,2140
+
+Pluf/DB/Field/Email.php,67
+class Pluf_DB_Field_Email 24,1021
+    function formField(29,1144
+
+Pluf/DB/Field/Serialized.php,72
+class Pluf_DB_Field_Serialized 24,1021
+    function formField(28,1104
+
+Pluf/DB/Field/Foreignkey.php,72
+class Pluf_DB_Field_Foreignkey 24,1021
+    function formField(28,1110
+
+Pluf/DB/Field/Varchar.php,37
+class Pluf_DB_Field_Varchar 24,1021
+
+Pluf/DB/Field/Boolean.php,69
+class Pluf_DB_Field_Boolean 24,1021
+    function formField(28,1104
+
+Pluf/DB/Field/Sequence.php,70
+class Pluf_DB_Field_Sequence 24,1021
+    function formField(32,1231
+
+Pluf/DB/Field/Text.php,66
+class Pluf_DB_Field_Text 24,1021
+    function formField(28,1098
+
+Pluf/DB/Field/Password.php,70
+class Pluf_DB_Field_Password 24,1021
+    function formField(28,1105
+
+Pluf/DB/Field.php,94
+class Pluf_DB_Field27,1056
+    function __construct(62,1733
+    function formField(80,2315
+
+Pluf/DB/MySQL.php,398
+class Pluf_DB_MySQL27,1055
+    function __construct(37,1316
+    function database(52,1850
+    function getServerInfo(67,2191
+    function debug(80,2539
+    function close(90,2866
+    function select(100,3047
+    function execute(116,3456
+    function getLastID(127,3704
+    function getError(138,3945
+    function esc(150,4261
+    function qn(161,4497
+    function __toString(166,4561
+
+Pluf/Migration.php,29
+class Pluf_Migration48,1626
+
+Pluf/Encoder.php,94
+class Pluf_Encoder38,1468
+    function setFormData(50,1707
+    function checkEmpty(58,1837
+
+Pluf/Group.php,118
+class Pluf_Group 24,1021
+    function init(28,1095
+    function __toString(64,2682
+    function preDelete(72,2817
+
+Pluf/Template/Context.php,123
+class Pluf_Template_Context 27,1091
+    function __construct(31,1142
+    function get(36,1256
+    function set(44,1401
+
+Pluf/Template/SafeString.php,106
+class Pluf_Template_SafeString27,1083
+    function __construct(31,1141
+    function __toString(40,1447
+
+Pluf/Template/ContextVars.php,134
+class Pluf_Template_ContextVars 27,1101
+    function offsetGet(29,1155
+    function __get(37,1315
+    function __toString(46,1493
+
+Pluf/Template/Tag.php,66
+class Pluf_Template_Tag24,1021
+    function __construct(33,1163
+
+Pluf/Template/Context/Request.php,79
+class Pluf_Template_Context_Request 30,1223
+    function __construct(32,1291
+
+Pluf/Template/Compiler.php,372
+class Pluf_Template_Compiler37,1420
+    function __construct(183,6162
+    function compile(209,7215
+    function getCompiledTemplate(236,8316
+    function compileBlocks(259,9145
+    function loadTemplateFile(306,11240
+    function _callback(322,11866
+    function _parseVariable(357,13281
+    function _parseFunction(383,14345
+    function _parseFinal(558,21876
+
+Pluf/Template/Tag/Url.php,65
+class Pluf_Template_Tag_Url 26,1070
+    function start(28,1126
+
+Pluf/Template/Tag/RmediaUrl.php,69
+class Pluf_Template_Tag_RmediaUrl 10,263
+    function start(12,325
+
+Pluf/Template/Tag/Cfg.php,65
+class Pluf_Template_Tag_Cfg 30,1142
+    function start(40,1491
+
+Pluf/Template/Tag/Messages.php,70
+class Pluf_Template_Tag_Messages 27,1075
+    function start(29,1136
+
+Pluf/Template/Tag/Mytag.php,153
+class Pluf_Template_Tag_Mytag 27,1052
+    function start(36,1299
+    function genStart(53,1845
+    function end(65,2119
+    function genEnd(83,2648
+
+Pluf/Template/Tag/MediaUrl.php,70
+class Pluf_Template_Tag_MediaUrl 24,1021
+    function start(26,1082
+
+Pluf/Template/Tag/Rurl.php,66
+class Pluf_Template_Tag_Rurl 29,1120
+    function start(31,1177
+
+Pluf/Error.php,186
+class Pluf_Error30,1082
+    function resetError(38,1197
+    function setError(52,1530
+    function error(65,1832
+    function setDbError(91,2594
+    function bulkSetError(106,2987
+
+Pluf/Search.php,26
+class Pluf_Search29,1137
+
+Pluf/Crypt.php,119
+class Pluf_Crypt33,1312
+    function __construct(42,1463
+    function encrypt(57,1825
+    function decrypt(88,2775
+
+Pluf/HTTP/URL.php,161
+class Pluf_HTTP_URL32,1370
+function Pluf_HTTP_URL_urlForView(92,2968
+function Pluf_HTTP_URL_reverse(109,3505
+function Pluf_HTTP_URL_buildReverseUrl(146,4525
+
+Pluf/HTTP/Request.php,66
+class Pluf_HTTP_Request29,1121
+    function __construct(44,1475
+
+Pluf/HTTP/Response/Forbidden.php,78
+class Pluf_HTTP_Response_Forbidden 24,1021
+    function __construct(26,1085
+
+Pluf/HTTP/Response/RedirectToLogin.php,84
+class Pluf_HTTP_Response_RedirectToLogin 28,1116
+    function __construct(41,1598
+
+Pluf/HTTP/Response/ServerErrorDebug.php,323
+class Pluf_HTTP_Response_ServerErrorDebug 24,1021
+    function __construct(32,1238
+function Pluf_HTTP_Response_ServerErrorDebug_Pretty(42,1487
+    function getElementsByClassName(119,5068
+    function hideAll(136,5840
+    function toggle(141,5974
+    function varToggle(150,6245
+    function sectionToggle(158,6542
+
+Pluf/HTTP/Response/File.php,102
+class Pluf_HTTP_Response_File 24,1021
+    function __construct(28,1114
+    function render(37,1342
+
+Pluf/HTTP/Response/NotFound.php,77
+class Pluf_HTTP_Response_NotFound 24,1021
+    function __construct(26,1084
+
+Pluf/HTTP/Response/ServerError.php,136
+class Pluf_HTTP_Response_ServerError 24,1021
+    function __construct(26,1087
+function Pluf_HTTP_Response_ServerError_Pretty(57,2469
+
+Pluf/HTTP/Response/Redirect.php,77
+class Pluf_HTTP_Response_Redirect 24,1021
+    function __construct(26,1084
+
+Pluf/HTTP/Error500.php,34
+class Pluf_HTTP_Error500 24,1021
+
+Pluf/HTTP/Response.php,135
+class Pluf_HTTP_Response34,1453
+    function __construct(117,5044
+    function render(132,5503
+    function outputHeaders(148,5904
+
+Pluf/HTTP/Error404.php,34
+class Pluf_HTTP_Error404 24,1021
+
+Pluf/Image/Thumbnail.php,156
+class Pluf_Image_Thumbnail35,1260
+    function getPath(72,2360
+    function exists(80,2498
+    function getSize(89,2718
+    function generate(103,3026
+
+Pluf/Migrations/1Setup.php,90
+function Pluf_Migrations_1Setup_up(30,1121
+function Pluf_Migrations_1Setup_down(35,1225
+
+Pluf/Migrations/Install.php,99
+function Pluf_Migrations_Install_setup(30,1121
+function Pluf_Migrations_Install_teardown(52,1793
+
+Pluf/Migrations/2RowPermission.php,106
+function Pluf_Migrations_2RowPermission_up(28,1064
+function Pluf_Migrations_2RowPermission_down(43,1424
+
+Pluf/Migrations/3SearchEngine.php,104
+function Pluf_Migrations_3SearchEngine_up(28,1056
+function Pluf_Migrations_3SearchEngine_down(45,1496
+
+Pluf/Migrations/4QueueStats.php,100
+function Pluf_Migrations_4QueueStats_up(28,1056
+function Pluf_Migrations_4QueueStats_down(45,1490
+
+Pluf/Date.php,94
+class Pluf_Date25,1022
+function Pluf_Date_Compare(77,2659
+function Pluf_Date_Easy(111,3616
+
+Pluf/Queue.php,84
+class Pluf_Queue 45,1995
+    function init(49,2066
+    function preSave(116,5259
+
+Pluf/Session.php,246
+class Pluf_Session 24,1021
+    function init(35,1351
+    function setData(83,3325
+    function getData(93,3545
+    function clear(105,3814
+    function getNewSessionKey(115,3974
+    function preSave(131,4429
+    function restore(143,4778
+
+Pluf/Model.php,1207
+class Pluf_Model29,1064
+    function __construct(83,2806
+    function init(92,2996
+    function _init(101,3170
+    function getForeignKeysToModel(184,7229
+    function getData(201,7675
+    function setAssoc(211,7892
+    function delAssoc(233,8716
+    function batchAssoc(261,9796
+    function _getConnection(279,10223
+    function getSqlTable(290,10446
+    function __get(300,10636
+    function __set(316,11075
+    function __call(328,11360
+    function get(365,12920
+    function getList(410,14597
+    function getCount(531,18972
+    function getRelated(553,19607
+    function getSelect(613,22368
+    function update(637,23215
+    function create(677,24444
+    function getDeleteSideEffect(717,25781
+    function delete(746,26865
+    function _reset(790,28597
+    function __toString(810,29152
+    function restore(821,29407
+    function preSave(830,29594
+    function postSave(834,29630
+    function preDelete(843,29822
+    function setFromFormData(850,29914
+    function setView(863,30197
+    function _toDb(875,30456
+    function _fromDb(888,30757
+    function displayVal(903,31202
+function Pluf_Model_InArray(927,31814
+function Pluf_Model_RemoveDuplicates(947,32243
+
+Pluf/HTTP.php,146
+class Pluf_HTTP27,1049
+    function removeTheMagic(35,1148
+function Pluf_HTTP_magicStrip(66,1998
+function Pluf_HTTP_handleMagicQuotes(76,2146
+
+Pluf/Translation/Generator.php,41
+class Pluf_Translation_Generator28,1152
+
+Pluf/Translation/TemplateExtractor.php,423
+class Pluf_Translation_TemplateExtractor30,1185
+    function __construct(162,5469
+    function getBlockTrans(186,6436
+    function getSimpleTrans(202,6894
+    function compile(220,7423
+    function loadTemplateFile(263,9351
+    function _callback(279,9977
+    function _callbackInTransBlock(301,10710
+    function _parseVariable(317,11262
+    function _parseFunction(325,11497
+    function _parseFinal(354,12233
+
+Pluf/Tests/Fixture/LoadDump.php,198
+class Pluf_Tests_Fixture_LoadDump 24,1021
+    function __construct(26,1080
+    function setUp(31,1177
+    function tearDown(41,1422
+    function testDump(51,1638
+    function testLoad(64,2176
+
+Pluf/Tests/Text/Lang.php,140
+class Pluf_Tests_Text_Lang 24,1021
+    function __construct(26,1073
+    function testNGrams(31,1175
+    function testNGramsDist(37,1422
+
+Pluf/Tests/TemplateCompiler/BlockTrans.php,133
+class Pluf_Tests_TemplateCompiler_BlockTrans 24,1021
+    function __construct(26,1091
+    function testCompileSimpleBlock(31,1200
+
+Pluf/Precondition.php,32
+class Pluf_Precondition27,1098
+
+Pluf/Form.php,286
+class Pluf_Form 33,1235
+    function __construct(57,1804
+    function initFields(69,2160
+    function addPrefix(80,2449
+    function isValid(100,3118
+    function __get(306,10476
+function Pluf_Form_htmlspecialcharsArray(361,11615
+function Pluf_Form_renderErrorsAsHTML(366,11733
+
+Pluf/Form/Invalid.php,33
+class Pluf_Form_Invalid 24,1021
+
+Pluf/Form/Model.php,91
+class Pluf_Form_Model 29,1127
+    function initFields(36,1257
+    function save(71,2577
+
+Pluf/Form/Widget.php,73
+class Pluf_Form_Widget28,1071
+function Pluf_Form_Widget_Attrs(109,3713
+
+Pluf/Form/BoundField.php,69
+class Pluf_Form_BoundField29,1107
+    function mb_ucfirst(153,4996
+
+Pluf/Form/FieldProxy.php,35
+class Pluf_Form_FieldProxy29,1114
+
+Pluf/Form/Field/Url.php,35
+class Pluf_Form_Field_Url 24,1021
+
+Pluf/Form/Field/Float.php,37
+class Pluf_Form_Field_Float 24,1021
+
+Pluf/Form/Field/Datetime.php,40
+class Pluf_Form_Field_Datetime 24,1021
+
+Pluf/Form/Field/Integer.php,39
+class Pluf_Form_Field_Integer 24,1021
+
+Pluf/Form/Field/Date.php,36
+class Pluf_Form_Field_Date 24,1021
+
+Pluf/Form/Field/File.php,117
+class Pluf_Form_Field_File 24,1021
+    function clean(37,1440
+function Pluf_Form_Field_moveToUploadFolder(88,3770
+
+Pluf/Form/Field/Email.php,37
+class Pluf_Form_Field_Email 24,1021
+
+Pluf/Form/Field/Varchar.php,39
+class Pluf_Form_Field_Varchar 24,1021
+
+Pluf/Form/Field/Boolean.php,39
+class Pluf_Form_Field_Boolean 24,1021
+
+Pluf/Form/Widget/CheckboxInput.php,46
+class Pluf_Form_Widget_CheckboxInput 27,1049
+
+Pluf/Form/Widget/TinyMCEInput.php,45
+class Pluf_Form_Widget_TinyMCEInput 27,1064
+
+Pluf/Form/Widget/FileInput.php,42
+class Pluf_Form_Widget_FileInput 27,1059
+
+Pluf/Form/Widget/TextareaInput.php,46
+class Pluf_Form_Widget_TextareaInput 27,1042
+
+Pluf/Form/Widget/SelectMultipleInput.php,52
+class Pluf_Form_Widget_SelectMultipleInput 27,1049
+
+Pluf/Form/Widget/PasswordInput.php,46
+class Pluf_Form_Widget_PasswordInput 27,1059
+
+Pluf/Form/Widget/HiddenInput.php,44
+class Pluf_Form_Widget_HiddenInput 27,1059
+
+Pluf/Form/Widget/TextInput.php,42
+class Pluf_Form_Widget_TextInput 27,1059
+
+Pluf/Form/Widget/SelectMultipleInput/Checkbox.php,61
+class Pluf_Form_Widget_SelectMultipleInput_Checkbox 27,1049
+
+Pluf/Form/Widget/SelectInput.php,44
+class Pluf_Form_Widget_SelectInput 27,1049
+
+Pluf/Form/Widget/Input.php,38
+class Pluf_Form_Widget_Input 27,1099
+
+Pluf/Form/Widget/DatetimeInput.php,46
+class Pluf_Form_Widget_DatetimeInput 27,1063
+
+Pluf/Form/Field.php,93
+class Pluf_Form_Field32,1267
+    function __construct(68,2509
+    function clean(112,4316
+
+Pluf/l10n.php,281
+class Pluf_l10n42,1757
+    function __construct(59,2189
+    function loadDomain(75,2661
+    function loadFile(89,3001
+    function optimizeLocale(134,4585
+    function getAvailableLocales(173,5890
+    function getAcceptedLanguage(211,7209
+    function getIsoCodes(238,8033
+
+Pluf/Middleware/Debug.php,200
+class Pluf_Middleware_Debug30,1156
+    function process_response(43,1548
+    function pxDebugGetElementsByClassName(65,2251
+    function pxDebugHideAll(82,3030
+    function pxDebugToggle(87,3171
+
+Pluf/Middleware/Tidy.php,74
+class Pluf_Middleware_Tidy38,1495
+    function process_response(49,1805
+
+Pluf/Middleware/Session.php,249
+class Pluf_Middleware_Session31,1214
+    function process_request(46,1613
+    function process_response(116,4456
+    function _encodeData(143,5454
+    function _decodeData(160,5997
+function Pluf_Middleware_Session_ContextPreProcessor(185,6776
+
+Pluf/Middleware/Translation.php,119
+class Pluf_Middleware_Translation29,1122
+    function process_request(38,1280
+    function process_response(79,2910
+
+Pluf/Middleware/Maintenance.php,80
+class Pluf_Middleware_Maintenance39,1471
+    function process_request(48,1629
+
+Pluf/SQL.php,220
+class Pluf_SQL27,1092
+    function __construct(37,1260
+    function gen(50,1543
+    function Q(61,1773
+    function SAnd(79,2207
+    function SOr(89,2391
+    function SDef(100,2625
+    function keywords(125,3297
+
+Pluf/Calendar.php,617
+class Pluf_Calendar34,1376
+    function getEventGroup(113,3553
+    function getGroups(121,3701
+    function getGroupName(138,4140
+    function getBody(148,4373
+    function getEventCell(173,5091
+    function getEventRowSpanning(246,7739
+    function getHead(262,8135
+    function getDaySpanning(283,8764
+    function daysOfWeek(315,9893
+    function getDayNumber(335,10389
+    function getStartEndDays(347,10723
+    function cleanEventList(380,11699
+    function getTimeIntervals(398,12222
+    function getSimultaneous(422,12935
+    function getMaxSimultaneous(455,14216
+    function __get(479,14954
+
+Pluf/RowPermission.php,61
+class Pluf_RowPermission 24,1021
+    function init(28,1111
+
+Pluf/Translation.php,81
+class Pluf_Translation46,1916
+function Pluf_Translation_poCleanHelper(250,8424
+
+Pluf/Text.php,24
+class Pluf_Text28,1077
+
+Pluf/User.php,488
+class Pluf_User 24,1021
+    function init(39,1345
+    function __toString(147,6418
+    function preDelete(159,6685
+    function setPassword(178,7347
+    function checkPassword(191,7698
+    function checkCreditentials(211,8187
+    function preSave(228,8678
+    function isAnonymous(241,8978
+    function getAllPermissions(252,9235
+    function hasPerm(305,11487
+    function hasAppPerms(329,12176
+    function setMessage(349,12607
+    function getAndDeleteMessages(367,13010
+
+Pluf/Exception.php,30
+class Pluf_Exception 24,1021
+
+Pluf/Mail/Batch.php,373
+class Pluf_Mail_Batch96,3584
+    function __construct(112,3974
+    function setSubject(131,4627
+    function setTo(141,4819
+    function addTextMessage(151,5007
+    function setReturnPath(161,5188
+    function addHeaders(171,5376
+    function addHtmlMessage(181,5594
+    function addAttachment(196,6026
+    function sendMail(204,6200
+    function close(228,7233
+
+Pluf/Paginator.php,723
+class Pluf_Paginator49,1830
+    function __construct(186,4947
+    function configure(200,5392
+    function setFromRequest(244,7042
+    function render(271,7932
+    function footer(294,8705
+    function body(346,10781
+    function bodyLine(386,12216
+    function getEditAction(423,13386
+    function filter(452,14297
+    function colHeaders(484,15422
+    function headerSortLinks(514,16370
+    function searchField(537,17096
+    function getUrl(562,17970
+    function __get(584,18556
+function Pluf_Paginator_ToString(599,18843
+function Pluf_Paginator_FkToString(607,18991
+function Pluf_Paginator_DateYMDHMS(614,19129
+function Pluf_Paginator_DateYMD(620,19309
+function Pluf_Paginator_DisplayVal(626,19477
+
+Pluf/Message.php,88
+class Pluf_Message 24,1021
+    function init(28,1099
+    function __toString(55,2232
+
+Pluf/DB.php,472
+class Pluf_DB30,1150
+function Pluf_DB_getConnection(63,2149
+function Pluf_DB_defaultTypecast(96,3447
+function Pluf_DB_IdentityFromDb(134,5194
+function Pluf_DB_IdentityToDb(146,5385
+function Pluf_DB_SerializedFromDb(154,5512
+function Pluf_DB_SerializedToDb(169,5761
+function Pluf_DB_BooleanFromDb(177,5901
+function Pluf_DB_BooleanToDb(184,6004
+function Pluf_DB_IntegerFromDb(194,6181
+function Pluf_DB_IntegerToDb(199,6282
+function Pluf_DB_PasswordToDb(206,6411
+
+Pluf/Text/HTML/Filter.php,688
+class Pluf_Text_HTML_Filter 40,1496
+    function go(118,3621
+    function escape_comments(129,3951
+    function balance_html(135,4140
+    function check_tags(157,5107
+    function process_tag(170,5455
+    function process_param_protocol(240,8249
+    function process_remove_blanks(251,8593
+    function fix_case(260,8881
+    function fix_case_inner(279,9544
+    function validate_entities(290,9913
+    function check_entity(309,10703
+    function is_valid_entity(320,10963
+    function decode_entities(337,11499
+    function decode_hex_entity(346,11929
+    function decode_dec_entity(351,12040
+    function decode_num_entity(356,12151
+    function StripSingle(367,12485
+
+Pluf/Text/LaTeX/Equation.php,142
+class Pluf_Text_Latex_Equation 51,1824
+    function getFormulaURL(126,4427
+    function getPreamble(174,6143
+    function render(203,7361
+
+Pluf/Text/LaTeX/Texvc.php,36
+class Pluf_Text_LaTeX_Texvc28,1079
+
+Pluf/Text/Wiki/Tag.php,347
+class Pluf_Text_Wiki_Tag 36,1281
+    function __construct(48,1565
+    function addContent(67,2121
+    function addSeparator(79,2493
+    function getBeginTag(84,2568
+    function getEndTag(89,2641
+    function getNumberSeparator(94,2710
+    function useSeparator(99,2796
+    function isDummy(104,2874
+    function getHtmlContent(109,2942
+
+Pluf/Text/Wiki/Block/Pre.php,112
+class Pluf_Text_Wiki_Block_Pre 32,1183
+    function __construct(34,1253
+    function getRenderedLine(43,1476
+
+Pluf/Text/Wiki/Block/Hr.php,111
+class Pluf_Text_Wiki_Block_Hr 32,1182
+    function __construct(34,1251
+    function getRenderedLine(42,1437
+
+Pluf/Text/Wiki/Block/Definition.php,119
+class Pluf_Text_Wiki_Block_Definition 32,1192
+    function __construct(34,1269
+    function getRenderedLine(43,1498
+
+Pluf/Text/Wiki/Block/P.php,72
+class Pluf_Text_Wiki_Block_P 32,1190
+    function __construct(34,1258
+
+Pluf/Text/Wiki/Block/Title.php,114
+class Pluf_Text_Wiki_Block_Title 32,1185
+    function __construct(37,1313
+    function getRenderedLine(48,1635
+
+Pluf/Text/Wiki/Block/List.php,168
+class Pluf_Text_Wiki_Block_List 32,1184
+    function __construct(38,1332
+    function open(45,1486
+    function close(57,1789
+    function getRenderedLine(68,2032
+
+Pluf/Text/Wiki/Block/Table.php,141
+class Pluf_Text_Wiki_Block_Table 32,1185
+    function __construct(36,1285
+    function open(45,1529
+    function getRenderedLine(51,1623
+
+Pluf/Text/Wiki/Block/Blockquote.php,174
+class Pluf_Text_Wiki_Block_Blockquote 32,1190
+    function __construct(38,1344
+    function open(44,1487
+    function close(51,1731
+    function getRenderedLine(55,1840
+
+Pluf/Text/Wiki/BlockRenderer.php,409
+class Pluf_Text_Wiki_BlockRenderer35,1233
+    function __construct(85,2407
+    function open(95,2598
+    function close(105,2783
+    function closeNow(115,2965
+    function detect(126,3216
+    function getRenderedLine(136,3464
+    function getType(146,3682
+    function setMatch(156,3886
+    function getMatch(166,4105
+    function _renderInlineTag(178,4482
+    function _checkAttributes(189,4802
+
+Pluf/Text/Wiki/Configuration.php,280
+class Pluf_Text_Wiki_Configuration32,1190
+function Pluf_Text_Wiki_Configuration_buildlink(115,3965
+function Pluf_Text_Wiki_Configuration_buildanchor(146,4916
+function Pluf_Text_Wiki_Configuration_builddummie(151,5034
+function Pluf_Text_Wiki_Configuration_buildimage(156,5156
+
+Pluf/Text/Wiki/Renderer.php,309
+class Pluf_Text_Wiki_Renderer 43,1356
+    function __construct(89,2193
+    function render(120,3355
+    function getConfig(171,5464
+    function getInlineParser(182,5711
+    function getErrors(192,5910
+    function getVersion(202,6090
+    function _closeBloc(211,6211
+    function _openBloc(225,6642
+
+Pluf/Text/Wiki/InlineParser.php,207
+class Pluf_Text_Wiki_InlineParser 33,1244
+    function __construct(54,1809
+    function parse(81,2928
+    function _parse(112,4025
+    function _doCheckWikiWord(194,7233
+    function getError(203,7639
+
+Pluf/Text/Stemmer/Porter.php,39
+class Pluf_Text_Stemmer_Porter46,1511
+
+Pluf/Text/Lang.php,29
+class Pluf_Text_Lang31,1146
+
+Pluf/Text/MarkDown.php,3580
+function Markdown(43,1055
+function Pluf_Text_MarkDown_parse(58,1377
+class Markdown_Parser 79,1746
+	function Markdown_Parser(108,2531
+	function setup(138,3334
+	function teardown(151,3602
+	function transform(162,3833
+	function stripLinkDefinitions(209,5025
+	function _stripLinkDefinitions_callback(239,5777
+	function hashHTMLBlocks(248,6078
+	function _hashHTMLBlocks_callback(385,10098
+	function hashPart(392,10235
+	function hashBlock(415,11118
+	function runBlockGamut(436,11555
+	function runBasicBlockGamut(450,12075
+	function doHorizontalRules(467,12509
+	function runSpanGamut(509,13684
+	function doHardBreaks(521,13874
+	function _doHardBreaks_callback(526,14026
+	function doAnchors(531,14138
+	function _doAnchors_reference_callback(601,15751
+	function _doAnchors_inline_callback(635,16654
+	function doImages(656,17175
+	function _doImages_reference_callback(711,18349
+	function _doImages_inline_callback(738,19094
+	function doHeaders(757,19639
+	function _doHeaders_callback_setext(787,20272
+	function _doHeaders_callback_atx(792,20487
+	function doLists(799,20691
+	function _doLists_callback(856,22017
+	function processListItems(876,22603
+	function _processListItems_callback(920,24225
+	function doCodeBlocks(945,24943
+	function _doCodeBlocks_callback(963,25468
+	function makeCodeSpan(977,25869
+	function doItalicsAndBold(986,26084
+	function _doItalicAndBold_em_callback(1016,26975
+	function _doItalicAndBold_strong_callback(1021,27134
+	function doBlockQuotes(1028,27307
+	function _doBlockQuotes_callback(1043,27678
+	function _doBlockQuotes_callback2(1057,28225
+	function formParagraphs(1064,28357
+	function encodeAttribute(1134,30168
+	function encodeAmpsAndAngles(1144,30373
+	function doAutoLinks(1164,30943
+	function _doAutoLinks_url_callback(1183,31385
+	function _doAutoLinks_email_callback(1188,31554
+	function encodeEmailAddress(1195,31715
+	function parseSpan(1236,33141
+	function handleSpanToken(1292,34298
+	function outdent(1316,34962
+	function detab(1328,35293
+	function _detab_callback(1341,35674
+	function _initDetab(1358,36206
+	function unhash(1372,36691
+	function _unhash_callback(1379,36881
+class MarkdownExtra_Parser 1390,37005
+	function MarkdownExtra_Parser(1407,37502
+	function setup(1446,38471
+	function teardown(1464,38911
+	function hashHTMLBlocks(1496,39785
+	function _hashHTMLBlocks_inMarkdown(1519,40660
+	function _hashHTMLBlocks_inHTML(1744,47301
+	function hashClean(1917,52472
+	function doHeaders(1927,52736
+	function _doHeaders_attr(1967,53682
+	function _doHeaders_callback_setext(1971,53778
+	function _doHeaders_callback_atx(1977,54053
+	function doTables(1985,54317
+	function _doTable_leadingPipe_callback(2046,55778
+	function _doTable_callback(2056,56093
+	function doDefLists(2115,58028
+	function _doDefLists_callback(2157,58999
+	function processDefListItems(2169,59409
+	function _processDefListItems_callback_dt(2212,60807
+	function _processDefListItems_callback_dd(2221,61066
+	function doFencedCodeBlocks(2241,61612
+	function _doFencedCodeBlocks_callback(2274,62206
+	function _doFencedCodeBlocks_newlines(2282,62563
+	function doItalicsAndBold(2288,62699
+	function formParagraphs(2347,64405
+	function stripFootnotes(2385,65300
+	function _stripFootnotes_callback(2412,66048
+	function doFootnotes(2419,66258
+	function appendFootnotes(2431,66566
+	function _appendFootnotes_callback(2487,68303
+	function stripAbbreviations(2523,69338
+	function _stripAbbreviations_callback(2538,69787
+	function doAbbreviations(2547,70059
+	function _doAbbreviations_callback(2563,70501
+
+Pluf/Test/Client.php,31
+class Pluf_Test_Client35,1298
+
+Pluf/Test/Fixture.php,32
+class Pluf_Test_Fixture36,1387
+
+Pluf/Search/Stats.php,90
+class Pluf_Search_Stats 28,1118
+    function init(32,1196
+    function preSave(88,3771
+
+Pluf/Search/ResultSet.php,37
+class Pluf_Search_ResultSet 28,1084
+
+Pluf/Search/Occ.php,91
+class Pluf_Search_Occ 27,1071
+    function init(31,1155
+    function __toString(87,3733
+
+Pluf/Search/Word.php,92
+class Pluf_Search_Word 27,1054
+    function init(31,1140
+    function __toString(56,2175
+
+Pluf/Permission.php,91
+class Pluf_Permission 24,1021
+    function init(28,1105
+    function __toString(95,4507
+
+Pluf/Shortcuts.php,147
+function Pluf_Shortcuts_GetObjectOr404(37,1270
+function Pluf_Shortcuts_RenderToResponse(59,1960
+function Pluf_Shortcuts_GetFormForModel(80,2556
+
+Pluf/Utils.php,25
+class Pluf_Utils29,1121
+
+Pluf/Views.php,82
+class Pluf_Views35,1430
+    function login(52,2029
+    function logout(98,4064
+
+Pluf/Signal.php,26
+class Pluf_Signal27,1047
+
+Pluf/Mail.php,275
+class Pluf_Mail95,3679
+    function __construct(111,4106
+    function addTextMessage(131,4846
+    function setReturnPath(141,5027
+    function addHeaders(151,5215
+    function addHtmlMessage(161,5433
+    function addAttachment(176,5865
+    function sendMail(184,6039
+
+Pluf/Exception/NotImplemented.php,45
+class Pluf_Exception_NotImplemented 24,1021
+
+Pluf/Dispatcher.php,30
+class Pluf_Dispatcher24,1021
+
+migrate.php,48
+function debug(41,1342
+function usage(49,1438
+
+packager.php,71
+class DirectoryTreeIterator 24,1021
+    function __construct(26,1085
+
+extracttemplates.php,48
+function usage(30,1072
+function debug(36,1219
+
+Pluf/relations.php,0
+
+Pluf/conf/pluf.test.php,0
+
+Pluf/papp.php,0
diff --git a/src/extracttemplates.php b/src/extracttemplates.php
new file mode 100644
index 0000000..310accf
--- /dev/null
+++ b/src/extracttemplates.php
@@ -0,0 +1,53 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Migration script.
+ */
+set_include_path(get_include_path().PATH_SEPARATOR.dirname(__FILE__));
+require 'Pluf.php';
+
+function usage()
+{
+    echo 'Usage examples:'."\n"
+        .' Extract all:      extracttemplates.php path/to/config.php path/to/outpudir'."\n";
+
+}
+function debug($what)
+{
+    global $debug;
+    if ($debug) {
+        echo($what."\n");
+    }
+}
+
+if ($argc !== 3) {
+    usage();
+    die();
+}
+$conf = $argv[1];
+$outputdir = $argv[2];
+Pluf::start($conf);
+$generator = new Pluf_Translation_Generator();
+$generator->generate($outputdir);
+echo 'Done', "\n";
\ No newline at end of file
diff --git a/src/makepot.sh b/src/makepot.sh
new file mode 100755
index 0000000..90f4e99
--- /dev/null
+++ b/src/makepot.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+# 
+# Create the pot file for Pluf.
+#
+xgettext -o pluf.pot -p ./Pluf/locale --force-po --from-code=UTF-8 --keyword --keyword=__ --keyword=_n:1,2 -L PHP *.php
+sleep 5
+find Pluf/ -iname "*.php" -exec xgettext  -o pluf.pot -p ./Pluf/locale --from-code=UTF-8 -j --keyword --keyword=__ --keyword=_n:1,2 -L PHP {} \;
diff --git a/src/migrate.php b/src/migrate.php
new file mode 100644
index 0000000..bda39ff
--- /dev/null
+++ b/src/migrate.php
@@ -0,0 +1,212 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Migration script.
+ */
+
+set_include_path(get_include_path().PATH_SEPARATOR.dirname(__FILE__));
+require 'Pluf.php';
+require 'Console/Getopt.php';
+
+global $debug;
+$debug = false; // Yes a dirty global variable.
+$search_path = null;
+
+$cg = new Console_Getopt();
+$shortoptions = 'aixuc:v:d';
+$longoptions = array('app=', 'version=', 'conf=', 'search-path=');
+
+$args = $cg->readPHPArgv(); 
+
+function debug($what)
+{
+    global $debug;
+    if ($debug) {
+        echo($what."\n");
+    }
+}
+
+function usage()
+{
+    echo 'Usage examples:'."\n"
+        .' Upgrade all:      migrate.php --conf=path/to/config.php -a'."\n"
+        .' All to version 3: migrate.php --conf=path/to/config.php -a -v3'."\n"
+        .' Upgrade MyApp:    migrate.php --conf=path/to/config.php --app=MyApp'."\n"
+        .''."\n"
+        .'Options:'."\n"
+        .' c, --conf:     Path to the configuration file.'."\n"
+        .' a:             Upgrade all the installed applications.'."\n"
+        .' v, --version:  Upgrade/Downgrade to the given version.'."\n"
+        .' --app:         Application to upgrade/downgrade.'."\n"
+        .' u:             Dry run, do nothing.'."\n"
+        .' --search-path: Set the DB search path before the run.'."\n"
+        .' d:             Display debug information.'."\n"
+        .' i:             Install the application(s).'."\n"
+        .' x:             Uninstall the application(s).'."\n"
+        .''."\n"
+        .'Note: The command line parser of PEAR is not very robust'."\n"
+        .'      if you have an unexpected error about an offset not'."\n"
+        .'      set. Please report a bug. Thanks!'."\n";
+
+}
+
+try {
+    $ret = $cg->getopt($args, $shortoptions, $longoptions);
+} catch (Exception $e) {
+    echo('Error in getopt command line: '.$e->getMessage()."\n"); 
+    usage();
+    die();
+}
+
+// Note that PEAR is not PHP 5 compatible, so the need to create $p.
+$p = new PEAR();
+if ($p->isError($ret)) {
+    echo('Error in command line: '.$ret->getMessage()."\n"); 
+    usage();
+    die();
+}
+
+// Parse the options.
+$what = array(
+              'all' => false,
+              'app' => '',
+              'conf' => '',
+              'version' => null,
+              'dry_run' => false,
+              'un-install' => false,
+              'install' => false,
+              );
+
+$opts = $ret[0];
+if (sizeof($opts) > 0) {
+    foreach ($opts as $o) {
+        switch ($o[0]) {
+        case 'a':
+            $what['all'] = true;
+            break;
+        case 'v':
+        case '--version':
+            $what['version'] = $o[1];
+            break;
+        case 'c':
+        case '--conf':
+            $what['conf'] = $o[1];
+            break;
+        case '--app':
+            $what['app'] = $o[1];
+            break;
+        case 'd':
+            $debug = true;
+            break;
+        case '--search-path':
+            $search_path = trim($o[1]);
+            break;
+        case 'u':
+            $what['dry_run'] = true;
+            break;
+        case 'x':
+            $what['un-install'] = true;
+            break;
+        case 'i':
+            $what['install'] = true;
+            break;
+        }
+    }
+} else {
+    echo 'Error: Missing what to do.'."\n";
+    usage();
+    die();
+}
+
+// control the arguments.
+if (('' == $what['conf'] or !file_exists($what['conf']))
+    or ($what['all'] == false and $what['app'] == '')) {
+    echo 'Error: Missing what to do or config file.'."\n";
+    usage();
+    die();
+}
+if ($what['all'] and $what['version'] !== null) {
+    echo 'Error: -a and -v --version cannot be used together.'."\n";
+    echo '       Run the migration to a given version indenpendtly'."\n";
+    echo '       for each application.'."\n";
+    usage();
+    die();
+}
+Pluf::start($what['conf']);
+if (PHP_SAPI != 'cli' and Pluf::f('migrate_allow_web', false)) {
+    echo('Error: This script can only be run from the command line.'."\n");
+    exit();
+}
+
+if ($what['un-install']) {
+    $apps = array();
+    if ($what['all']) {
+        $apps = Pluf::f('installed_apps');
+    } else {
+        $apps = array($what['app']);
+    }
+    echo 'Applications to uninstall: '.implode(', ', $apps)."\n";
+    echo 'Please confirm that you want to uninstall by typing "yes": ';
+    $line = trim(fgets(STDIN)); // reads one line from STDIN
+    if ($line != 'yes') {
+        echo 'Abort...'."\n";
+        die();
+    }
+}
+
+if (!is_null($search_path)) {
+    $db =& Pluf::db();
+    $db->setSearchPath($search_path);
+    debug('Set search path to: '.$search_path);
+}
+$app = null; // Migrate all the applications.
+$app_disp = 'all the apps';
+$v_disp = 'latest';
+if (!is_null($what['version'])) {
+    $v_disp = $what['version'];
+}
+if ($what['app']) {
+    $app = trim($what['app']);
+    $app_disp = $app;
+}
+$m = new Pluf_Migration($app);
+if ($debug) {
+    $m->display = true;
+}
+$m->dry_run = $what['dry_run'];
+try {
+    if ($what['install']) {
+        debug('Install '.$app_disp);
+        $m->install();
+    } elseif ($what['un-install']) {
+        debug('Uninstall '.$app_disp);
+        $m->unInstall();
+    } else {
+        debug('Migrate '.$app.' to version '.$what['version']);
+        $m->migrate($what['version']);
+    }
+} catch (Exception $e) {
+    echo 'Error: '.$e->getMessage()."\n";
+    die();
+}
\ No newline at end of file
diff --git a/src/packager.ignore b/src/packager.ignore
new file mode 100644
index 0000000..dbb6657
--- /dev/null
+++ b/src/packager.ignore
@@ -0,0 +1,5 @@
+Pluf.pkg.php
+Sparkline.php
+Sparkline/
+migrate.php
+packager.php
diff --git a/src/packager.php b/src/packager.php
new file mode 100644
index 0000000..5cfe73e
--- /dev/null
+++ b/src/packager.php
@@ -0,0 +1,92 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+class DirectoryTreeIterator extends RecursiveIteratorIterator
+{
+    function __construct($path)
+    {
+        parent::__construct(
+           new RecursiveDirectoryIterator($path, RecursiveDirectoryIterator::KEY_AS_FILENAME), 
+           parent::SELF_FIRST);
+    }
+}
+
+$patterns = array();
+if (file_exists('./packager.ignore')) {
+    $patterns = file('./packager.ignore', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+    echo('Excluding patterns:'."\n");
+    foreach ($patterns as $p) {
+        echo(' '.$p."\n");
+    }
+}
+
+$output = array();
+$size = 0;
+if ($argc != 3) {
+    $output_file = 'Pluf.pkg.php';
+} else {
+    $output_file = $argv[2];
+}
+unlink($output_file);
+foreach(new DirectoryTreeIterator($argv[1]) as $file) {
+    $skip = false;
+    foreach ($patterns as $p) {
+        if (false !== strpos($file->getPathname(), $p)) {
+            $skip = true;
+            break;
+        }
+    }
+    if ($skip) continue;
+    if ($file->isDir()) {
+        echo 'Get files in: '.$file->getPathname()."\n";
+    } else {
+        $pathinfo = pathinfo($file->getPathname());
+        if ($pathinfo['extension'] == 'php') {
+            $files[] = $file->getPathname();
+            $size += $file->getSize();
+        }
+    }
+}
+sort($files);
+foreach ($files as $file) {
+    echo '.';
+    $return = 0;
+    $tmp_out = array();
+    exec('php -w '.escapeshellarg($file), $tmp_out, $return);
+    if ($return != 0) {
+        die('error');
+    }
+    if ($tmp_out[0] == '<?php') {
+        array_shift($tmp_out);
+    }
+    $end = end($tmp_out);
+    if (substr($end, -2) == '?>') {
+        echo('>> '.$file."\n");
+    }
+    $output = array_merge($output, $tmp_out);
+}
+echo "\n";
+echo 'Compiled files: '.count($files)."\n";
+file_put_contents($output_file, '<?php '.implode("\n", $output).' ?>');
+echo('Final size: '.(int)(100*filesize($output_file)/$size).'%'."\n");
+?>
\ No newline at end of file
diff --git a/src/testrunner.php b/src/testrunner.php
new file mode 100644
index 0000000..281ba36
--- /dev/null
+++ b/src/testrunner.php
@@ -0,0 +1,136 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * testrunner for your application.
+ */
+set_include_path(get_include_path().PATH_SEPARATOR.dirname(__FILE__));
+function usage($script)
+{
+    echo($script.' YourApp [path/to/config/file.php]'."\n");
+    echo(' If no config file given, will use the following:'."\n");
+    echo(' YourApp/conf/yourapp.test.php'."\n");
+    echo(' If you are using SQLite, we recommend the ":memory:" database.'."\n");
+    echo(' [installed apps]/Migrations/Install.php will be used to setup/teardown'."\n");
+    echo(' the database before/after the run.'."\n");
+}
+function e($m) 
+{
+    echo($m."\n");
+}
+function getTestDirs($dir='./')
+{
+    $file = new DirectoryIterator($dir);
+    $res = array();
+    while ($file->valid()) {
+        if ($file->isDir() && !$file->isDot()) {
+            $res[] = $file->getPathName();
+        }
+        $file->next();
+    }
+    return $res;
+}
+
+function getTestFiles($dir='')
+{
+    $file = new DirectoryIterator($dir);
+    $res = array();
+    while ($file->valid()) {
+        if ($file->isFile() && substr($file->getPathName(), -4) == '.php') {
+            $class = str_replace(DIRECTORY_SEPARATOR, '_', substr($file->getPathName(), 0, -4));
+            $res[] = array($file->getPathName(), $class);
+        }
+        $file->next();
+    }
+    return $res;
+}
+if (PHP_SAPI == 'cli') {
+    // Get the application and then the configuration file
+    if ($argc < 2) {
+        usage($argv[0]);
+        exit(1);
+    }
+    $app = $argv[1];
+    if ($argc >= 3) {
+        $config = $argv[2];
+    } else {
+        $config = $app.'/conf/'.strtolower($app).'.test.php';
+    }
+} else {
+    echo('Error: This script can only be run from the command line.'."\n");
+    exit(1);
+}
+echo(sprintf('Application: %s ', $app));
+if (!file_exists($config)) {
+    echo(sprintf("\n".'Error, the config file does not exists: %s'."\n", $config));
+    exit(1);
+} else {
+    echo(sprintf('(%s)'."\n", $config));
+}
+define('IN_UNIT_TESTS', true);
+require 'Pluf.php';
+Pluf::start($config);
+
+$simple_test = Pluf::f('simple_test_path', false);
+if (false == $simple_test) {
+    e('Error, the path to the simple test framework is not defined.');
+    e('Download simple test from:');
+    e('   http://simpletest.sourceforge.net/');
+    e('Extract the archive on your system and set the "simple_test_path"');
+    e('configuration variable in your configuration file.');
+    e('For example: $cfg[\'simple_test_path\'] = \'/home/you/simpletest\'; ');
+    exit(1);
+}
+$testfolder = $app.'/Tests/';
+if (!file_exists($testfolder)) {
+    e(sprintf('The test folder does not exists: %s.', $app.'/Tests/'));
+    exit(1);
+}
+
+define('SIMPLE_TEST', $simple_test.'/');
+require_once(SIMPLE_TEST.'unit_tester.php');
+require_once(SIMPLE_TEST.'reporter.php');
+
+$files = getTestFiles($testfolder);
+$dirs = getTestDirs($testfolder);
+foreach ($dirs as $dir) {
+    foreach (getTestFiles($dir) as $test) {
+        $files[] = $test;
+    }
+}
+$test = &new GroupTest(sprintf('All tests for application %s.', $app));
+foreach ($files as $t) {
+    $test->addTestCase(new $t[1]());
+}
+$reporter = new TextReporter(); 
+$mig = new Pluf_Migration(null);
+$mig->display = false;
+$mig->install();
+// If available, load an initialisation file.
+if (file_exists($app.'/Tests/init.json')) {
+    $created = Pluf_Test_Fixture::loadFile($app.'/Tests/init.json');
+} else {
+    $created = array();
+}
+$test->run($reporter);
+$mig->unInstall();
\ No newline at end of file
diff --git a/tests/Pluf/PlufMethodStartTest.php b/tests/Pluf/PlufMethodStartTest.php
new file mode 100644
index 0000000..3fadee5
--- /dev/null
+++ b/tests/Pluf/PlufMethodStartTest.php
@@ -0,0 +1,48 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+error_reporting(E_ALL | E_STRICT);
+
+$path = dirname(__FILE__).'/../../src/';
+set_include_path(get_include_path().PATH_SEPARATOR.$path);
+
+require_once 'PHPUnit/Framework/TestCase.php';
+require_once 'PHPUnit/Framework/IncompleteTestError.php';
+
+require_once 'Pluf.php';
+
+class PlufMethodStartTest extends PHPUnit_Framework_TestCase {
+    
+    protected function setUp()
+    {
+    }
+
+    public function testStart()
+    {
+        Pluf::start(dirname(__FILE__).'/../conf/pluf.config.php');
+        $this->assertEquals(true, isset($GLOBALS['_PX_config']));
+        $this->assertEquals(false, $GLOBALS['_PX_config']['test']);
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/tests/Pluf/PlufTest.php b/tests/Pluf/PlufTest.php
new file mode 100644
index 0000000..82ff113
--- /dev/null
+++ b/tests/Pluf/PlufTest.php
@@ -0,0 +1,72 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+error_reporting(E_ALL | E_STRICT);
+
+$path = dirname(__FILE__).'/../../src/';
+set_include_path(get_include_path().PATH_SEPARATOR.$path);
+
+require_once 'PHPUnit/Framework/TestCase.php';
+require_once 'PHPUnit/Framework/IncompleteTestError.php';
+
+require_once 'Pluf.php';
+
+class PlufTest extends PHPUnit_Framework_TestCase {
+    
+    protected function setUp()
+    {
+        Pluf::start(dirname(__FILE__).'/../conf/pluf.config.php');
+    }
+
+    public function testF()
+    {
+        $this->assertEquals(Pluf::f('test'), false);
+    }
+
+    public function testFactory()
+    {
+        $pluf = Pluf::factory('Pluf');
+        $this->assertEquals(get_class($pluf), 'Pluf');
+    }
+
+    public function testFileExists()
+    {
+        $this->assertEquals(true, Pluf::fileExists('Pluf.php'));
+        $this->assertEquals(true, Pluf::fileExists('PEAR.php'));
+        $this->assertEquals(false, Pluf::fileExists('Pluf-dummy.php'));
+    }
+
+    public function testLoadClass()
+    {
+        Pluf::loadClass('Pluf_Model');
+        $this->assertEquals(true, class_exists('Pluf_Model'));
+    }
+
+    public function testLoadFunction()
+    {
+        Pluf::loadFunction('Pluf_HTTP_handleMagicQuotes');
+        $this->assertEquals(true, function_exists('Pluf_HTTP_handleMagicQuotes'));
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/tests/Pluf_Calendar/PlufCalendarTest.php b/tests/Pluf_Calendar/PlufCalendarTest.php
new file mode 100644
index 0000000..4795a53
--- /dev/null
+++ b/tests/Pluf_Calendar/PlufCalendarTest.php
@@ -0,0 +1,324 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+error_reporting(E_ALL | E_STRICT);
+
+$path = dirname(__FILE__).'/../../src/';
+set_include_path(get_include_path().PATH_SEPARATOR.$path);
+
+require_once 'PHPUnit/Framework/TestCase.php';
+require_once 'PHPUnit/Framework/IncompleteTestError.php';
+
+require_once 'Pluf.php';
+
+class PlufCalendarTest extends PHPUnit_Framework_TestCase {
+    
+    public $events = array(
+                           array('start' => '2007-02-06 08:00:00',
+                                 'end'   => '2007-02-06 09:15:00',
+                                 'title' => 'Dummy event 1',
+                                 'url'   => '',
+                                 'color' => '', ),
+                           array('start' => '2007-02-07 08:00:00',
+                                 'end'   => '2007-02-07 09:15:00',
+                                 'title' => 'Dummy event 2',
+                                 'url'   => '',
+                                 'color' => '', ),
+                           array('start' => '2007-02-08 12:00:00',
+                                 'end'   => '2007-02-08 13:15:00',
+                                 'title' => 'Dummy event 3',
+                                 'url'   => '',
+                                 'color' => '', ),
+                           array('start' => '2007-02-09 08:30:00',
+                                 'end'   => '2007-02-09 09:25:00',
+                                 'title' => 'Dummy event 4',
+                                 'url'   => '',
+                                 'color' => '', ),
+                           array('start' => '2007-02-10 11:00:00',
+                                 'end'   => '2007-02-10 11:45:00',
+                                 'title' => 'Dummy event 5',
+                                 'url'   => '',
+                                 'color' => '', ),
+                           );
+    public $events2 = array(
+                           array('start' => '2007-02-06 08:30:00',
+                                 'end'   => '2007-02-06 09:25:00',
+                                 'title' => 'Dummy event 1',
+                                 'url'   => '',
+                                 'color' => '', ),
+                           array('start' => '2007-02-07 08:00:00',
+                                 'end'   => '2007-02-07 09:15:00',
+                                 'title' => 'Dummy event 2',
+                                 'url'   => '',
+                                 'color' => '', ),
+                           array('start' => '2007-02-08 12:00:00',
+                                 'end'   => '2007-02-08 13:15:00',
+                                 'title' => 'Dummy event 3',
+                                 'url'   => '',
+                                 'color' => '', ),
+                           array('start' => '2007-02-09 08:30:00',
+                                 'end'   => '2007-02-09 09:25:00',
+                                 'title' => 'Dummy event 4',
+                                 'url'   => '',
+                                 'color' => '', ),
+                           array('start' => '2007-02-10 11:00:00',
+                                 'end'   => '2007-02-10 11:45:00',
+                                 'title' => 'Dummy event 5',
+                                 'url'   => '',
+                                 'color' => '', ),
+                           array('start' => '2007-02-06 08:00:00',
+                                 'end'   => '2007-02-06 11:00:00',
+                                 'title' => 'Dummy event 6',
+                                 'url'   => '',
+                                 'color' => '', ),
+                           array('start' => '2007-02-06 12:00:00',
+                                 'end'   => '2007-02-06 13:15:00',
+                                 'title' => 'Dummy event 7',
+                                 'url'   => '',
+                                 'color' => '', ),
+                           array('start' => '2007-02-06 09:25:00',
+                                 'end'   => '2007-02-06 11:45:00',
+                                 'title' => 'Dummy event 8',
+                                 'url'   => '',
+                                 'color' => '', ),
+                           );
+    public $events3 = array(
+                            array('start' => '2007-09-17 15:30:00', 
+                                  'end' => '2007-09-17 16:30:00', 
+                                  'title' => 'Green organic synthesis routes', 
+                                  'url' => '', 
+                                  'color' => '', ),
+                            array('start' => '2007-09-17 17:30:00', 
+                                  'end' => '2007-09-17 19:30:00', 
+                                  'title' => 'Test poster cases with thermo', 
+                                  'url' => '', 
+                                  'color' => '', ), 
+                            array('start' => '2007-09-17 17:00:00', 
+                                  'end' => '2007-09-17 19:30:00', 
+                                  'title' => 'Environmental engineering & management', 
+                                  'url' => '', 
+                                  'color' => '', ), 
+                            array('start' => '2007-09-17 15:30:00', 
+                                  'end' => '2007-09-17 19:30:00', 
+                                  'title' => 'Chemical Reaction Engineering', 
+                                  'url' => '', 
+                                  'color' => '', ), 
+                            );
+
+    protected function setUp()
+    {
+        Pluf::start(dirname(__FILE__).'/../conf/pluf.config.php');
+    }
+
+    public function testCalendar()
+    {
+        $calendar = new Pluf_Calendar();
+        $calendar->events = $this->events;
+        $calendar->opts['start-day'] = '2007-02-06';
+        $calendar->opts['end-day'] = '2007-02-10';
+        $res = file_get_contents(dirname(__FILE__).'/simplecalendar1.html');
+        $this->assertEquals($res, $calendar->render());
+    }
+
+    public function testCalendar4()
+    {
+        $calendar = new Pluf_Calendar();
+        $calendar->events = $this->events3;
+        $res = file_get_contents(dirname(__FILE__).'/simplecalendar4.html');
+        $this->assertEquals($res, $calendar->render());
+    }
+
+    public function testCalendar5()
+    {
+        $calendar = new Pluf_Calendar();
+        $calendar->events = array(array('start' => '2007-09-17 15:30:00', 
+                                        'end' => '2007-09-17 16:30:00', 
+                                        'title' => 'Green organic synthesis routes', 
+                                        'url' => '', 
+                                        'color' => '', ),
+                                  array('start' => '2007-09-17 17:30:00', 
+                                        'end' => '2007-09-17 19:30:00', 
+                                        'title' => 'Test poster cases with thermo', 
+                                        'url' => '', 
+                                        'color' => '', ), 
+                                  array('start' => '2007-09-17 17:00:00', 
+                                        'end' => '2007-09-17 19:30:00', 
+                                        'title' => 'Environmental engineering & management', 
+                                        'url' => '', 
+                                        'color' => '', ),
+                                  array('start' => '2007-09-17 15:30:00', 
+                                        'end' => '2007-09-17 19:30:00', 
+                                        'title' => 'Chemical Reaction Engineering', 
+                                        'url' => '', 
+                                        'color' => '', ),
+                                  array('start' => '2007-09-17 12:30:00', 
+                                        'end' => '2007-09-17 19:30:00', 
+                                        'title' => 'TRansport', 
+                                        'url' => '', 'color' => '', ), 
+                                  array('start' => '2007-09-17 15:30:00', 
+                                        'end' => '2007-09-17 17:00:00', 
+                                        'title' => 'Distillation, absorption and extraction', 
+                                        'url' => '', 
+                                        'color' => '', ), 
+                                  array('start' => '2007-09-17 12:30:00', 
+                                        'end' => '2007-09-17 16:00:00', 
+                                        'title' => 'Membranes and membrane science', 
+                                        'url' => '', 
+                                        'color' => '', ),
+                                  array('start' => '2007-09-17 12:30:00', 
+                                        'end' => '2007-09-17 16:00:00', 
+                                        'title' => 'Polymer science & engineering', 
+                                        'url' => '', 
+                                        'color' => '', ));
+
+        $res = file_get_contents(dirname(__FILE__).'/simplecalendar5.html');
+        $this->assertEquals($res, $calendar->render());
+    }
+
+    public function testCalendar6()
+    {
+        $calendar = new Pluf_Calendar();
+        $calendar->events = array (
+                                   0 => 
+                                   array (
+                                          'start' => '2007-09-17 12:30:00',
+                                          'end' => '2007-09-17 19:30:00',
+                                          'title' => 'TRansport',
+                                          'url' => '',
+                                          'color' => '',
+                                          ),
+                                   1 => 
+                                   array (
+                                          'start' => '2007-09-17 12:30:00',
+                                          'end' => '2007-09-17 16:00:00',
+                                          'title' => 'Membranes and membrane science',
+                                          'url' => '',
+                                          'color' => '',
+                                          ),
+                                   2 => 
+                                   array (
+                                          'start' => '2007-09-17 12:30:00',
+                                          'end' => '2007-09-17 16:00:00',
+                                          'title' => 'Polymer science & engineering',
+                                          'url' => '',
+                                          'color' => '',
+                                          ),
+                                   3 => 
+                                   array (
+                                          'start' => '2007-09-17 15:30:00',
+                                          'end' => '2007-09-17 16:30:00',
+                                          'title' => 'Green organic synthesis routes',
+                                          'url' => '',
+                                          'color' => '',
+                                          ),
+                                   4 => 
+                                   array (
+                                          'start' => '2007-09-17 15:30:00',
+                                          'end' => '2007-09-17 19:30:00',
+                                          'title' => 'Chemical Reaction Engineering',
+                                          'url' => '',
+                                          'color' => '',
+                                          ),
+                                   5 => 
+                                   array (
+                                          'start' => '2007-09-17 15:30:00',
+                                          'end' => '2007-09-17 17:00:00',
+                                          'title' => 'Distillation, absorption and extraction',
+                                          'url' => '',
+                                          'color' => '',
+                                          ),
+                                   6 => 
+                                   array (
+                                          'start' => '2007-09-17 17:00:00',
+                                          'end' => '2007-09-17 19:30:00',
+                                          'title' => 'Environmental engineering & management',
+                                          'url' => '',
+                                          'color' => '',
+                                          ),
+                                   7 => 
+                                   array (
+                                          'start' => '2007-09-17 17:30:00',
+                                          'end' => '2007-09-17 19:30:00',
+                                          'title' => 'Test poster cases with thermo',
+                                          'url' => '',
+                                          'color' => '',
+                                          ),
+                                   8 => 
+                                   array (
+                                          'start' => '2007-09-17 17:30:00',
+                                          'end' => '2007-09-17 19:30:00',
+                                          'title' => 'Crystallization',
+                                          'url' => '',
+                                          'color' => '',
+                                          ),
+                                   ) ;
+        $res = file_get_contents(dirname(__FILE__).'/simplecalendar6.html');
+        $this->assertEquals($res, $calendar->render());
+    }
+
+
+    public function testCalendar2()
+    {
+        $calendar = new Pluf_Calendar();
+        $calendar->events = $this->events2;
+        $calendar->opts['start-day'] = '2007-02-06';
+        $calendar->opts['end-day'] = '2007-02-10';
+        $res = file_get_contents(dirname(__FILE__).'/simplecalendar2.html');
+        $this->assertEquals($res, $calendar->render());
+    }
+
+    public function testGetStartEndDays()
+    {
+        $calendar = new Pluf_Calendar();
+        $calendar->events = $this->events;
+        $this->assertEquals(array('2007-02-06', '2007-02-10'),
+                            $calendar->getStartEndDays());
+    }
+
+    public function testGetIntervals()
+    {
+        $calendar = new Pluf_Calendar();
+        $calendar->events = $this->events;
+        $calendar->cleanEventList();
+        $this->assertEquals(array('08:00', '08:30', '09:15', '09:25',
+                                  '11:00', '11:45', '12:00', '13:15'),
+                            $calendar->getTimeIntervals());
+    }
+
+    public function testGetEventRowSpanning()
+    {
+        $calendar = new Pluf_Calendar();
+        $calendar->events = $this->events;
+        $calendar->cleanEventList();
+        $inters = $calendar->getTimeIntervals();
+        $this->assertEquals(2, $calendar->getEventRowSpanning($this->events[0], $inters));
+        $this->assertEquals(2, $calendar->getEventRowSpanning($this->events[1], $inters));
+        $this->assertEquals(1, $calendar->getEventRowSpanning($this->events[2], $inters));
+        $this->assertEquals(2, $calendar->getEventRowSpanning($this->events[3], $inters));
+        $this->assertEquals(1, $calendar->getEventRowSpanning($this->events[4], $inters));
+    }
+
+
+}
+
+?>
\ No newline at end of file
diff --git a/tests/Pluf_Calendar/bigevents.php b/tests/Pluf_Calendar/bigevents.php
new file mode 100644
index 0000000..7b89582
--- /dev/null
+++ b/tests/Pluf_Calendar/bigevents.php
@@ -0,0 +1,1269 @@
+<?php
+
+return array (
+  0 => 
+  array (
+    'start' => '2007-09-17 13:00:00',
+    'end' => '2007-09-17 14:30:00',
+    'title' => 'Teaching Chemical Product Design & Engineering (T6-3)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F106%2Fedit%2F',
+    'color' => '',
+  ),
+  1 => 
+  array (
+    'start' => '2007-09-17 13:15:00',
+    'end' => '2007-09-17 14:30:00',
+    'title' => 'Modelling of Ionic Liquid Systems (T1-1)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F1%2Fedit%2F',
+    'color' => '',
+  ),
+  2 => 
+  array (
+    'start' => '2007-09-17 13:15:00',
+    'end' => '2007-09-17 14:30:00',
+    'title' => 'Chemical Reaction Engineering: Kinetics & Modelling (T2-2a)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F22%2Fedit%2F',
+    'color' => '',
+  ),
+  3 => 
+  array (
+    'start' => '2007-09-17 13:15:00',
+    'end' => '2007-09-17 14:30:00',
+    'title' => 'Distillation, Absorption & Extraction - I (T2-10a)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F28%2Fedit%2F',
+    'color' => '',
+  ),
+  4 => 
+  array (
+    'start' => '2007-09-17 13:15:00',
+    'end' => '2007-09-17 14:30:00',
+    'title' => 'Filtration - I (T2-11a)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F36%2Fedit%2F',
+    'color' => '',
+  ),
+  5 => 
+  array (
+    'start' => '2007-09-17 13:15:00',
+    'end' => '2007-09-17 14:30:00',
+    'title' => 'Multifase Flows - I (T2-5a)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F45%2Fedit%2F',
+    'color' => '',
+  ),
+  6 => 
+  array (
+    'start' => '2007-09-17 13:15:00',
+    'end' => '2007-09-17 14:30:00',
+    'title' => 'Thermodynamics: Hydrocarbons & Petrochemicals (T2-1a)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F60%2Fedit%2F',
+    'color' => '',
+  ),
+  7 => 
+  array (
+    'start' => '2007-09-17 13:15:00',
+    'end' => '2007-09-17 14:30:00',
+    'title' => 'Process Simulation & Optimization - I (T4-9a)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F87%2Fedit%2F',
+    'color' => '',
+  ),
+  8 => 
+  array (
+    'start' => '2007-09-17 13:15:00',
+    'end' => '2007-09-17 14:30:00',
+    'title' => 'Process Synthesis & Design - I (T4-1a)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F92%2Fedit%2F',
+    'color' => '',
+  ),
+  9 => 
+  array (
+    'start' => '2007-09-17 13:15:00',
+    'end' => '2007-09-17 14:30:00',
+    'title' => 'Chemical Engineering Education - New Directions (T6-1)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F103%2Fedit%2F',
+    'color' => '',
+  ),
+  10 => 
+  array (
+    'start' => '2007-09-17 15:30:00',
+    'end' => '2007-09-17 17:00:00',
+    'title' => 'Environmental Engineering & Management (T1-3P)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F3%2Fedit%2F',
+    'color' => '',
+  ),
+  11 => 
+  array (
+    'start' => '2007-09-17 15:30:00',
+    'end' => '2007-09-17 17:00:00',
+    'title' => 'Sustainable & Clean technologies - I: Extraction-Remediation (T1-4P)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F4%2Fedit%2F',
+    'color' => '',
+  ),
+  12 => 
+  array (
+    'start' => '2007-09-17 15:30:00',
+    'end' => '2007-09-17 17:00:00',
+    'title' => 'SCF as Solvent Substitutes (T1-8P)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F5%2Fedit%2F',
+    'color' => '',
+  ),
+  13 => 
+  array (
+    'start' => '2007-09-17 15:30:00',
+    'end' => '2007-09-17 17:00:00',
+    'title' => 'Sustainable & Clean technologies - II: Energy Production (T1-5P)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F6%2Fedit%2F',
+    'color' => '',
+  ),
+  14 => 
+  array (
+    'start' => '2007-09-17 15:30:00',
+    'end' => '2007-09-17 17:00:00',
+    'title' => 'Sustainable & Clean Technologies - III: Combustion & Emission (T1-6P)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F9%2Fedit%2F',
+    'color' => '',
+  ),
+  15 => 
+  array (
+    'start' => '2007-09-17 15:30:00',
+    'end' => '2007-09-17 17:00:00',
+    'title' => 'Modelling, Design & Analysis of Processes with Ionic Liquids (T1-1P)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F10%2Fedit%2F',
+    'color' => '',
+  ),
+  16 => 
+  array (
+    'start' => '2007-09-17 15:30:00',
+    'end' => '2007-09-17 17:00:00',
+    'title' => 'Particulate Systems (T2-3P)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F49%2Fedit%2F',
+    'color' => '',
+  ),
+  17 => 
+  array (
+    'start' => '2007-09-17 15:30:00',
+    'end' => '2007-09-17 17:00:00',
+    'title' => 'Thermodynamics (T2-1P)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F56%2Fedit%2F',
+    'color' => '',
+  ),
+  18 => 
+  array (
+    'start' => '2007-09-17 15:30:00',
+    'end' => '2007-09-17 17:00:00',
+    'title' => 'Transport Phenomena in Porous/Granular Media (T2-7P)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F61%2Fedit%2F',
+    'color' => '',
+  ),
+  19 => 
+  array (
+    'start' => '2007-09-17 15:30:00',
+    'end' => '2007-09-17 17:00:00',
+    'title' => 'Chemical Engineering Education -Poster Session (T6-P)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F104%2Fedit%2F',
+    'color' => '',
+  ),
+  20 => 
+  array (
+    'start' => '2007-09-17 17:00:00',
+    'end' => '2007-09-17 19:00:00',
+    'title' => 'SCF as Solvent Substitutes (T1-8)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F14%2Fedit%2F',
+    'color' => '',
+  ),
+  21 => 
+  array (
+    'start' => '2007-09-17 17:00:00',
+    'end' => '2007-09-17 19:00:00',
+    'title' => 'Chemical Reaction Engineering: Advanced Concepts (T2-2b)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F23%2Fedit%2F',
+    'color' => '',
+  ),
+  22 => 
+  array (
+    'start' => '2007-09-17 17:00:00',
+    'end' => '2007-09-17 19:00:00',
+    'title' => 'Distillation, Absorption & Extraction - III (T2-10b)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F30%2Fedit%2F',
+    'color' => '',
+  ),
+  23 => 
+  array (
+    'start' => '2007-09-17 17:00:00',
+    'end' => '2007-09-17 19:00:00',
+    'title' => 'Multifase Flows - II (T2-5b)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F46%2Fedit%2F',
+    'color' => '',
+  ),
+  24 => 
+  array (
+    'start' => '2007-09-17 17:00:00',
+    'end' => '2007-09-17 19:00:00',
+    'title' => 'Particulate Systems (T2-3)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F48%2Fedit%2F',
+    'color' => '',
+  ),
+  25 => 
+  array (
+    'start' => '2007-09-17 17:00:00',
+    'end' => '2007-09-17 19:00:00',
+    'title' => 'Thermodynamics: Applications of Equations of State (T2-1b)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F57%2Fedit%2F',
+    'color' => '',
+  ),
+  26 => 
+  array (
+    'start' => '2007-09-17 17:00:00',
+    'end' => '2007-09-17 19:00:00',
+    'title' => 'Software Architecture, Standards & Interfaces (T4-7)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F95%2Fedit%2F',
+    'color' => '',
+  ),
+  27 => 
+  array (
+    'start' => '2007-09-17 17:00:00',
+    'end' => '2007-09-17 19:00:00',
+    'title' => 'Teaching Methods, Techniques & Modules (T6-2)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F105%2Fedit%2F',
+    'color' => '',
+  ),
+  28 => 
+  array (
+    'start' => '2007-09-17 17:00:00',
+    'end' => '2007-09-17 19:00:00',
+    'title' => 'Invited Session on MultiScale Modelling (S-1)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F107%2Fedit%2F',
+    'color' => '',
+  ),
+  29 => 
+  array (
+    'start' => '2007-09-18 10:45:00',
+    'end' => '2007-09-18 12:30:00',
+    'title' => 'Selection & Use of Organic Solvents (T1-7)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F8%2Fedit%2F',
+    'color' => '',
+  ),
+  30 => 
+  array (
+    'start' => '2007-09-18 10:45:00',
+    'end' => '2007-09-18 12:30:00',
+    'title' => 'Distillation, Absorption & Extraction - II (T2-10c)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F29%2Fedit%2F',
+    'color' => '',
+  ),
+  31 => 
+  array (
+    'start' => '2007-09-18 10:45:00',
+    'end' => '2007-09-18 12:30:00',
+    'title' => 'Filtration - II (T2-11b)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F35%2Fedit%2F',
+    'color' => '',
+  ),
+  32 => 
+  array (
+    'start' => '2007-09-18 10:45:00',
+    'end' => '2007-09-18 12:30:00',
+    'title' => 'Multifase Flows - III (T2-5c)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F47%2Fedit%2F',
+    'color' => '',
+  ),
+  33 => 
+  array (
+    'start' => '2007-09-18 10:45:00',
+    'end' => '2007-09-18 12:30:00',
+    'title' => 'Thermodynamics: Developments with SAFT EOS (T2-1c)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F58%2Fedit%2F',
+    'color' => '',
+  ),
+  34 => 
+  array (
+    'start' => '2007-09-18 10:45:00',
+    'end' => '2007-09-18 12:30:00',
+    'title' => 'Analysis of Energy-Environmental Issues (T3-3a)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F65%2Fedit%2F',
+    'color' => '',
+  ),
+  35 => 
+  array (
+    'start' => '2007-09-18 10:45:00',
+    'end' => '2007-09-18 12:30:00',
+    'title' => 'CFD & Chemical Engineering- I (T3-4a)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F69%2Fedit%2F',
+    'color' => '',
+  ),
+  36 => 
+  array (
+    'start' => '2007-09-18 10:45:00',
+    'end' => '2007-09-18 12:30:00',
+    'title' => 'Nanotechnology & Nanomanufacturing (T3-1)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F75%2Fedit%2F',
+    'color' => '',
+  ),
+  37 => 
+  array (
+    'start' => '2007-09-18 10:45:00',
+    'end' => '2007-09-18 12:30:00',
+    'title' => 'Multiscale Modeling (T3-5)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F79%2Fedit%2F',
+    'color' => '',
+  ),
+  38 => 
+  array (
+    'start' => '2007-09-18 10:45:00',
+    'end' => '2007-09-18 12:30:00',
+    'title' => 'Process Simulation & Optimization - II (T4-9b)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F88%2Fedit%2F',
+    'color' => '',
+  ),
+  39 => 
+  array (
+    'start' => '2007-09-18 11:05:00',
+    'end' => '2007-09-18 11:20:00',
+    'title' => 'The Future of European Chemical Engineering Education in a Globalized World - Opening',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F74%2Fedit%2F',
+    'color' => '',
+  ),
+  40 => 
+  array (
+    'start' => '2007-09-18 11:20:00',
+    'end' => '2007-09-18 12:10:00',
+    'title' => 'The Future of European Chemical Engineering Education in a Globalized World - Keynote',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F154%2Fedit%2F',
+    'color' => '',
+  ),
+  41 => 
+  array (
+    'start' => '2007-09-18 12:10:00',
+    'end' => '2007-09-18 12:35:00',
+    'title' => 'The Future of European Chemical Engineering Education in a Globalized World - I',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F155%2Fedit%2F',
+    'color' => '',
+  ),
+  42 => 
+  array (
+    'start' => '2007-09-18 13:00:00',
+    'end' => '2007-09-18 14:30:00',
+    'title' => 'Sustainable & Clean Technologies - III: Combustion & Emission (T1-6)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F7%2Fedit%2F',
+    'color' => '',
+  ),
+  43 => 
+  array (
+    'start' => '2007-09-18 13:00:00',
+    'end' => '2007-09-18 14:30:00',
+    'title' => 'Electrochemical Engineering (T2-14a)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F31%2Fedit%2F',
+    'color' => '',
+  ),
+  44 => 
+  array (
+    'start' => '2007-09-18 13:00:00',
+    'end' => '2007-09-18 14:30:00',
+    'title' => 'Polymer Science & Engineering - I (T2-12a)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F51%2Fedit%2F',
+    'color' => '',
+  ),
+  45 => 
+  array (
+    'start' => '2007-09-18 13:00:00',
+    'end' => '2007-09-18 14:30:00',
+    'title' => 'Thermodyanmics: Molecular Simulation & Related Approaches (T2-1d)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F55%2Fedit%2F',
+    'color' => '',
+  ),
+  46 => 
+  array (
+    'start' => '2007-09-18 13:00:00',
+    'end' => '2007-09-18 14:30:00',
+    'title' => 'Transport Phenomena in Porous/Granular Media - I (T2-7a)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F63%2Fedit%2F',
+    'color' => '',
+  ),
+  47 => 
+  array (
+    'start' => '2007-09-18 13:00:00',
+    'end' => '2007-09-18 14:30:00',
+    'title' => 'Controlled Release of the Active Ingredient: Mechanisms, Devices & Analysis (T3-2)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F71%2Fedit%2F',
+    'color' => '',
+  ),
+  48 => 
+  array (
+    'start' => '2007-09-18 13:00:00',
+    'end' => '2007-09-18 14:30:00',
+    'title' => 'Nanotechnology: Model based development (T3-6)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F77%2Fedit%2F',
+    'color' => '',
+  ),
+  49 => 
+  array (
+    'start' => '2007-09-18 13:00:00',
+    'end' => '2007-09-18 14:30:00',
+    'title' => 'Novel Separation Techniques (T3-8)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F78%2Fedit%2F',
+    'color' => '',
+  ),
+  50 => 
+  array (
+    'start' => '2007-09-18 13:00:00',
+    'end' => '2007-09-18 14:30:00',
+    'title' => 'The Future of European Chemical Engineering Education in a Globalized World - II',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F156%2Fedit%2F',
+    'color' => '',
+  ),
+  51 => 
+  array (
+    'start' => '2007-09-18 15:30:00',
+    'end' => '2007-09-18 17:00:00',
+    'title' => 'Chemical Reaction Engineering (T2-2P)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F21%2Fedit%2F',
+    'color' => '',
+  ),
+  52 => 
+  array (
+    'start' => '2007-09-18 15:30:00',
+    'end' => '2007-09-18 17:00:00',
+    'title' => 'Distillation, Absorption & Extraction (T2-10P)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F27%2Fedit%2F',
+    'color' => '',
+  ),
+  53 => 
+  array (
+    'start' => '2007-09-18 15:30:00',
+    'end' => '2007-09-18 17:00:00',
+    'title' => 'Filtration (T2-11P)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F34%2Fedit%2F',
+    'color' => '',
+  ),
+  54 => 
+  array (
+    'start' => '2007-09-18 15:30:00',
+    'end' => '2007-09-18 17:00:00',
+    'title' => 'Membranes and Membrane Science (T2-8P)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F41%2Fedit%2F',
+    'color' => '',
+  ),
+  55 => 
+  array (
+    'start' => '2007-09-18 15:30:00',
+    'end' => '2007-09-18 17:00:00',
+    'title' => 'Multifase Flows (T2-5P)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F44%2Fedit%2F',
+    'color' => '',
+  ),
+  56 => 
+  array (
+    'start' => '2007-09-18 15:30:00',
+    'end' => '2007-09-18 17:00:00',
+    'title' => 'Polymer Science & Engineering (T2-12P)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F50%2Fedit%2F',
+    'color' => '',
+  ),
+  57 => 
+  array (
+    'start' => '2007-09-18 15:30:00',
+    'end' => '2007-09-18 17:00:00',
+    'title' => 'Analysis of Energy-Environmental Issues (T3-3P)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F67%2Fedit%2F',
+    'color' => '',
+  ),
+  58 => 
+  array (
+    'start' => '2007-09-18 15:30:00',
+    'end' => '2007-09-18 17:00:00',
+    'title' => 'CFD & Mutliscale Modelling in Chemical Engineering (T3-4P)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F68%2Fedit%2F',
+    'color' => '',
+  ),
+  59 => 
+  array (
+    'start' => '2007-09-18 15:30:00',
+    'end' => '2007-09-18 17:00:00',
+    'title' => 'Controlled Release of the Active Ingredient: Mechanisms, Devices & Analysis (T3-2P)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F72%2Fedit%2F',
+    'color' => '',
+  ),
+  60 => 
+  array (
+    'start' => '2007-09-18 15:30:00',
+    'end' => '2007-09-18 17:00:00',
+    'title' => 'Nanotechnology & Nanomanufacturing (T3-1P)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F76%2Fedit%2F',
+    'color' => '',
+  ),
+  61 => 
+  array (
+    'start' => '2007-09-18 15:30:00',
+    'end' => '2007-09-18 17:00:00',
+    'title' => 'Advances in Computational & Numerical Methods (T4-4P)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F81%2Fedit%2F',
+    'color' => '',
+  ),
+  62 => 
+  array (
+    'start' => '2007-09-18 15:30:00',
+    'end' => '2007-09-18 17:00:00',
+    'title' => 'Process Control (T4-4P)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F84%2Fedit%2F',
+    'color' => '',
+  ),
+  63 => 
+  array (
+    'start' => '2007-09-18 15:30:00',
+    'end' => '2007-09-18 19:00:00',
+    'title' => 'Process Synthesis & Design (T4-1P)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F91%2Fedit%2F',
+    'color' => '',
+  ),
+  64 => 
+  array (
+    'start' => '2007-09-18 16:00:00',
+    'end' => '2007-09-18 17:15:00',
+    'title' => 'The Future of European Chemical Engineering Education in a Globalized World - III',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F157%2Fedit%2F',
+    'color' => '',
+  ),
+  65 => 
+  array (
+    'start' => '2007-09-18 17:00:00',
+    'end' => '2007-09-18 19:00:00',
+    'title' => 'Green Organic Synthesis Routes (T1-2)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F2%2Fedit%2F',
+    'color' => '',
+  ),
+  66 => 
+  array (
+    'start' => '2007-09-18 17:00:00',
+    'end' => '2007-09-18 19:00:00',
+    'title' => 'Environmental Engineering & Management (T1-3)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F11%2Fedit%2F',
+    'color' => '',
+  ),
+  67 => 
+  array (
+    'start' => '2007-09-18 17:00:00',
+    'end' => '2007-09-18 19:00:00',
+    'title' => 'Chemical Reaction Engineering: Practical Applications (T2-2c)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F24%2Fedit%2F',
+    'color' => '',
+  ),
+  68 => 
+  array (
+    'start' => '2007-09-18 17:00:00',
+    'end' => '2007-09-18 19:00:00',
+    'title' => 'Membranes and Membrane Science - I (T2-8a)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F42%2Fedit%2F',
+    'color' => '',
+  ),
+  69 => 
+  array (
+    'start' => '2007-09-18 17:00:00',
+    'end' => '2007-09-18 19:00:00',
+    'title' => 'Polymer Science & Engineering - II (T2-12b)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F52%2Fedit%2F',
+    'color' => '',
+  ),
+  70 => 
+  array (
+    'start' => '2007-09-18 17:00:00',
+    'end' => '2007-09-18 19:00:00',
+    'title' => 'Thermodynamics: General (T2-1e)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F59%2Fedit%2F',
+    'color' => '',
+  ),
+  71 => 
+  array (
+    'start' => '2007-09-18 17:00:00',
+    'end' => '2007-09-18 19:00:00',
+    'title' => 'Transport Phenomena in Porous/Granular Media - II (T2-7b)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F62%2Fedit%2F',
+    'color' => '',
+  ),
+  72 => 
+  array (
+    'start' => '2007-09-18 17:00:00',
+    'end' => '2007-09-18 19:00:00',
+    'title' => 'Analysis of Energy-Environmental Issues (T3-3b)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F66%2Fedit%2F',
+    'color' => '',
+  ),
+  73 => 
+  array (
+    'start' => '2007-09-18 17:00:00',
+    'end' => '2007-09-18 19:00:00',
+    'title' => 'CFD & Chemical Engineering- II (T3-4b)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F70%2Fedit%2F',
+    'color' => '',
+  ),
+  74 => 
+  array (
+    'start' => '2007-09-18 17:00:00',
+    'end' => '2007-09-18 19:00:00',
+    'title' => 'Advances in Computational & Numerical Methods (T4-4)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F80%2Fedit%2F',
+    'color' => '',
+  ),
+  75 => 
+  array (
+    'start' => '2007-09-18 17:00:00',
+    'end' => '2007-09-18 19:00:00',
+    'title' => 'Process Control (T4-8)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F83%2Fedit%2F',
+    'color' => '',
+  ),
+  76 => 
+  array (
+    'start' => '2007-09-18 17:00:00',
+    'end' => '2007-09-18 19:00:00',
+    'title' => 'Process Synthesis & Design - II (T4-1b)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F93%2Fedit%2F',
+    'color' => '',
+  ),
+  77 => 
+  array (
+    'start' => '2007-09-18 17:00:00',
+    'end' => '2007-09-18 19:00:00',
+    'title' => 'Invited Session on Energy Issues (S-2a)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F108%2Fedit%2F',
+    'color' => '',
+  ),
+  78 => 
+  array (
+    'start' => '2007-09-18 17:45:00',
+    'end' => '2007-09-18 19:30:00',
+    'title' => 'The Future of European Chemical Engineering Education in a Globalized World - IV',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F158%2Fedit%2F',
+    'color' => '',
+  ),
+  79 => 
+  array (
+    'start' => '2007-09-19 11:35:00',
+    'end' => '2007-09-19 12:30:00',
+    'title' => 'EPIC-1: Keynote Lecture 1',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F121%2Fedit%2F',
+    'color' => '',
+  ),
+  80 => 
+  array (
+    'start' => '2007-09-19 13:00:00',
+    'end' => '2007-09-19 14:30:00',
+    'title' => 'Sustainable & Clean Technologies - I:Extraction-Remediation (T1-4b)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F13%2Fedit%2F',
+    'color' => '',
+  ),
+  81 => 
+  array (
+    'start' => '2007-09-19 13:00:00',
+    'end' => '2007-09-19 14:30:00',
+    'title' => 'Sustainable & Clean Technologies - II: Energy Production (T1-5b)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F16%2Fedit%2F',
+    'color' => '',
+  ),
+  82 => 
+  array (
+    'start' => '2007-09-19 13:00:00',
+    'end' => '2007-09-19 14:30:00',
+    'title' => 'Electrochemical Engineering (T2-14b)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F32%2Fedit%2F',
+    'color' => '',
+  ),
+  83 => 
+  array (
+    'start' => '2007-09-19 13:00:00',
+    'end' => '2007-09-19 14:30:00',
+    'title' => 'Transport Phenomena in Porous/Granular Media - III (T2-7c)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F64%2Fedit%2F',
+    'color' => '',
+  ),
+  84 => 
+  array (
+    'start' => '2007-09-19 13:00:00',
+    'end' => '2007-09-19 14:30:00',
+    'title' => 'Process Analytical Technology - PAT (T4-6)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F82%2Fedit%2F',
+    'color' => '',
+  ),
+  85 => 
+  array (
+    'start' => '2007-09-19 13:00:00',
+    'end' => '2007-09-19 14:30:00',
+    'title' => 'Process Simulation & Optimization - III (T4-9c)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F89%2Fedit%2F',
+    'color' => '',
+  ),
+  86 => 
+  array (
+    'start' => '2007-09-19 13:00:00',
+    'end' => '2007-09-19 14:30:00',
+    'title' => 'Biochemical Engineering (T5-1)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F99%2Fedit%2F',
+    'color' => '',
+  ),
+  87 => 
+  array (
+    'start' => '2007-09-19 13:00:00',
+    'end' => '2007-09-19 14:30:00',
+    'title' => 'EPIC-1: Intensified Hydrodynamics & Structured Environments (IHSE-1)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F110%2Fedit%2F',
+    'color' => '',
+  ),
+  88 => 
+  array (
+    'start' => '2007-09-19 13:00:00',
+    'end' => '2007-09-19 14:30:00',
+    'title' => 'EPIC-1: Alternative Energy Forms & Transfer Mechanisms (AE)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F111%2Fedit%2F',
+    'color' => '',
+  ),
+  89 => 
+  array (
+    'start' => '2007-09-19 13:00:00',
+    'end' => '2007-09-19 13:30:00',
+    'title' => 'CPD&E Keynote Lecture 1',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F129%2Fedit%2F',
+    'color' => '',
+  ),
+  90 => 
+  array (
+    'start' => '2007-09-19 13:30:00',
+    'end' => '2007-09-19 14:45:00',
+    'title' => 'Chemical Product Design & Engineering - I (CPD&E - 1)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F124%2Fedit%2F',
+    'color' => '',
+  ),
+  91 => 
+  array (
+    'start' => '2007-09-19 15:30:00',
+    'end' => '2007-09-19 17:00:00',
+    'title' => 'Catalysis (T2-13P)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F17%2Fedit%2F',
+    'color' => '',
+  ),
+  92 => 
+  array (
+    'start' => '2007-09-19 15:30:00',
+    'end' => '2007-09-19 17:00:00',
+    'title' => 'Crystallization (T2-9P)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F26%2Fedit%2F',
+    'color' => '',
+  ),
+  93 => 
+  array (
+    'start' => '2007-09-19 15:30:00',
+    'end' => '2007-09-19 17:00:00',
+    'title' => 'Electrochemical Engineering (T2-14P)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F33%2Fedit%2F',
+    'color' => '',
+  ),
+  94 => 
+  array (
+    'start' => '2007-09-19 15:30:00',
+    'end' => '2007-09-19 17:00:00',
+    'title' => 'Process Operation, Monitoring & Analysis (T4-2P)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F86%2Fedit%2F',
+    'color' => '',
+  ),
+  95 => 
+  array (
+    'start' => '2007-09-19 15:30:00',
+    'end' => '2007-09-19 17:00:00',
+    'title' => 'Process Simulation and Optimization (T4-4P)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F90%2Fedit%2F',
+    'color' => '',
+  ),
+  96 => 
+  array (
+    'start' => '2007-09-19 15:30:00',
+    'end' => '2007-09-19 17:00:00',
+    'title' => 'Integration of Life Sciences & Engineering - Poster (T5-P)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F102%2Fedit%2F',
+    'color' => '',
+  ),
+  97 => 
+  array (
+    'start' => '2007-09-19 15:30:00',
+    'end' => '2007-09-19 17:00:00',
+    'title' => 'EPIC-1 Poster Session (EPIC - Poster) - P1',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F120%2Fedit%2F',
+    'color' => '',
+  ),
+  98 => 
+  array (
+    'start' => '2007-09-19 15:30:00',
+    'end' => '2007-09-19 17:00:00',
+    'title' => 'Innovations in Food Technology - Poster Session (LMC/Food - P1)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F131%2Fedit%2F',
+    'color' => '',
+  ),
+  99 => 
+  array (
+    'start' => '2007-09-19 17:00:00',
+    'end' => '2007-09-19 19:00:00',
+    'title' => 'Sustainable & Clean Technologies - I: Extraction-Remediation (T1-4a)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F12%2Fedit%2F',
+    'color' => '',
+  ),
+  100 => 
+  array (
+    'start' => '2007-09-19 17:00:00',
+    'end' => '2007-09-19 19:00:00',
+    'title' => 'Sustainable & Clean Technologies - II: Energy Production (T1-5a)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F15%2Fedit%2F',
+    'color' => '',
+  ),
+  101 => 
+  array (
+    'start' => '2007-09-19 17:00:00',
+    'end' => '2007-09-19 19:00:00',
+    'title' => 'Crystallization (T2-9)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F25%2Fedit%2F',
+    'color' => '',
+  ),
+  102 => 
+  array (
+    'start' => '2007-09-19 17:00:00',
+    'end' => '2007-09-20 19:00:00',
+    'title' => 'Interfacial & Colloidal Phenomena - I (T2-6a)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F38%2Fedit%2F',
+    'color' => '',
+  ),
+  103 => 
+  array (
+    'start' => '2007-09-19 17:00:00',
+    'end' => '2007-09-19 19:00:00',
+    'title' => 'Membranes and Membrane Science - II (T2-8b)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F43%2Fedit%2F',
+    'color' => '',
+  ),
+  104 => 
+  array (
+    'start' => '2007-09-19 17:00:00',
+    'end' => '2007-09-19 19:00:00',
+    'title' => 'Process Operation, Monitoring & Analysis (T4-2)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F85%2Fedit%2F',
+    'color' => '',
+  ),
+  105 => 
+  array (
+    'start' => '2007-09-19 17:00:00',
+    'end' => '2007-09-19 19:30:00',
+    'title' => 'Invited Session on Biotechnology: Honoring Prof. John Villadsen (S-3)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F109%2Fedit%2F',
+    'color' => '',
+  ),
+  106 => 
+  array (
+    'start' => '2007-09-19 17:00:00',
+    'end' => '2007-09-19 19:00:00',
+    'title' => 'EPIC-1: Intensified Hydrodynamics & Structured Environments (IHSE-2)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F112%2Fedit%2F',
+    'color' => '',
+  ),
+  107 => 
+  array (
+    'start' => '2007-09-19 17:00:00',
+    'end' => '2007-09-19 19:00:00',
+    'title' => 'EPIC-1: Intensified Plants & Process Integration (IPPI)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F113%2Fedit%2F',
+    'color' => '',
+  ),
+  108 => 
+  array (
+    'start' => '2007-09-19 17:00:00',
+    'end' => '2007-09-19 19:00:00',
+    'title' => 'Chemical Product Design & Engineering - II (CPD&E - 2)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F125%2Fedit%2F',
+    'color' => '',
+  ),
+  109 => 
+  array (
+    'start' => '2007-09-19 17:00:00',
+    'end' => '2007-09-19 17:20:00',
+    'title' => 'Meals - Convenience, Gastronomy & Quality (Food-1open)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F133%2Fedit%2F',
+    'color' => '',
+  ),
+  110 => 
+  array (
+    'start' => '2007-09-19 17:00:00',
+    'end' => '2007-09-19 17:20:00',
+    'title' => 'White BioTech & Related Processes (Food-2open)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F136%2Fedit%2F',
+    'color' => '',
+  ),
+  111 => 
+  array (
+    'start' => '2007-09-19 17:00:00',
+    'end' => '2007-09-19 17:20:00',
+    'title' => 'Flexible Production, PAT & Modelling (Food-3open)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F139%2Fedit%2F',
+    'color' => '',
+  ),
+  112 => 
+  array (
+    'start' => '2007-09-19 17:20:00',
+    'end' => '2007-09-19 19:05:00',
+    'title' => 'Meals - Convenience, Gastronomy & Quality (Food-1a)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F134%2Fedit%2F',
+    'color' => '',
+  ),
+  113 => 
+  array (
+    'start' => '2007-09-19 17:20:00',
+    'end' => '2007-09-19 19:05:00',
+    'title' => 'Flexible Production, PAT & Modelling (Food-3a)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F140%2Fedit%2F',
+    'color' => '',
+  ),
+  114 => 
+  array (
+    'start' => '2007-09-19 19:05:00',
+    'end' => '2007-09-19 19:30:00',
+    'title' => 'Meals - Convenience, Gastronomy & Quality (Food-1b)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F135%2Fedit%2F',
+    'color' => '',
+  ),
+  115 => 
+  array (
+    'start' => '2007-09-19 19:05:00',
+    'end' => '2007-09-19 19:30:00',
+    'title' => 'White BioTech & Related Processes (Food-2b)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F138%2Fedit%2F',
+    'color' => '',
+  ),
+  116 => 
+  array (
+    'start' => '2007-09-19 19:05:00',
+    'end' => '2007-09-19 19:35:00',
+    'title' => 'Flexible Production, PAT & Modelling (Food-3b)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F141%2Fedit%2F',
+    'color' => '',
+  ),
+  117 => 
+  array (
+    'start' => '2007-09-20 10:45:00',
+    'end' => '2007-09-20 12:30:00',
+    'title' => 'Catalysis - I (T2-13a)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F19%2Fedit%2F',
+    'color' => '',
+  ),
+  118 => 
+  array (
+    'start' => '2007-09-20 10:45:00',
+    'end' => '2007-09-20 12:30:00',
+    'title' => 'Interfacial & Colloidal Phenomena - II (T2-6b)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F39%2Fedit%2F',
+    'color' => '',
+  ),
+  119 => 
+  array (
+    'start' => '2007-09-20 10:45:00',
+    'end' => '2007-09-20 12:30:00',
+    'title' => 'Tools Integration - CAPE Methods & Tools (T4-10)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F97%2Fedit%2F',
+    'color' => '',
+  ),
+  120 => 
+  array (
+    'start' => '2007-09-20 10:45:00',
+    'end' => '2007-09-20 11:30:00',
+    'title' => 'EPIC-1: Keynote Lecture 2',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F122%2Fedit%2F',
+    'color' => '',
+  ),
+  121 => 
+  array (
+    'start' => '2007-09-20 10:45:00',
+    'end' => '2007-09-20 11:15:00',
+    'title' => 'CPD&E Keynote Lectue 2',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F130%2Fedit%2F',
+    'color' => '',
+  ),
+  122 => 
+  array (
+    'start' => '2007-09-20 11:00:00',
+    'end' => '2007-09-20 11:20:00',
+    'title' => 'Process & Product Innovation (Food-4open)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F142%2Fedit%2F',
+    'color' => '',
+  ),
+  123 => 
+  array (
+    'start' => '2007-09-20 11:00:00',
+    'end' => '2007-09-20 11:20:00',
+    'title' => 'Hygiene, Hygienic Design & Unit Operations (Food-5open)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F146%2Fedit%2F',
+    'color' => '',
+  ),
+  124 => 
+  array (
+    'start' => '2007-09-20 11:00:00',
+    'end' => '2007-09-20 11:20:00',
+    'title' => 'Modern Analysis: Chemical & Multivariate Analysis (Food-6open)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F150%2Fedit%2F',
+    'color' => '',
+  ),
+  125 => 
+  array (
+    'start' => '2007-09-20 11:15:00',
+    'end' => '2007-09-20 12:30:00',
+    'title' => 'Chemical Product Design & Engineering - III (CPD&E - 3)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F126%2Fedit%2F',
+    'color' => '',
+  ),
+  126 => 
+  array (
+    'start' => '2007-09-20 11:20:00',
+    'end' => '2007-09-20 12:05:00',
+    'title' => 'Process & Product Innovation (Food-4a)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F143%2Fedit%2F',
+    'color' => '',
+  ),
+  127 => 
+  array (
+    'start' => '2007-09-20 11:20:00',
+    'end' => '2007-09-20 12:05:00',
+    'title' => 'Hygiene, Hygienic Design & Unit Operations (Food-5a)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F147%2Fedit%2F',
+    'color' => '',
+  ),
+  128 => 
+  array (
+    'start' => '2007-09-20 11:20:00',
+    'end' => '2007-09-20 12:05:00',
+    'title' => 'Modern Analysis: Chemical & Multivariate Analysis (Food-6a)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F151%2Fedit%2F',
+    'color' => '',
+  ),
+  129 => 
+  array (
+    'start' => '2007-09-20 11:30:00',
+    'end' => '2007-09-20 12:30:00',
+    'title' => 'EPIC-1: Intensified Hydrodynamics & Structured Environments (IHSE-3)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F114%2Fedit%2F',
+    'color' => '',
+  ),
+  130 => 
+  array (
+    'start' => '2007-09-20 11:30:00',
+    'end' => '2007-09-20 12:30:00',
+    'title' => 'EPIC-1: Multifunctionality (MF-1)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F115%2Fedit%2F',
+    'color' => '',
+  ),
+  131 => 
+  array (
+    'start' => '2007-09-20 12:05:00',
+    'end' => '2007-09-20 12:30:00',
+    'title' => 'Process & Product Innovation (Food-4b)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F144%2Fedit%2F',
+    'color' => '',
+  ),
+  132 => 
+  array (
+    'start' => '2007-09-20 12:05:00',
+    'end' => '2007-09-20 12:30:00',
+    'title' => 'Hygiene, Hygienic Design & Unit Operations (Food-5b)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F149%2Fedit%2F',
+    'color' => '',
+  ),
+  133 => 
+  array (
+    'start' => '2007-09-20 12:05:00',
+    'end' => '2007-09-20 12:30:00',
+    'title' => 'Modern Analysis: Chemical & Multivariate Analysis (Food-6b)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F153%2Fedit%2F',
+    'color' => '',
+  ),
+  134 => 
+  array (
+    'start' => '2007-09-20 13:00:00',
+    'end' => '2007-09-20 14:30:00',
+    'title' => 'Catalysis - I (T2-13b)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F18%2Fedit%2F',
+    'color' => '',
+  ),
+  135 => 
+  array (
+    'start' => '2007-09-20 13:00:00',
+    'end' => '2007-09-20 14:30:00',
+    'title' => 'Interfacial & Colloidal Phenomena - III (T2-6c)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F40%2Fedit%2F',
+    'color' => '',
+  ),
+  136 => 
+  array (
+    'start' => '2007-09-20 13:00:00',
+    'end' => '2007-09-20 14:30:00',
+    'title' => 'Safety & Risk Management Systems (T4-5)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F94%2Fedit%2F',
+    'color' => '',
+  ),
+  137 => 
+  array (
+    'start' => '2007-09-20 13:00:00',
+    'end' => '2007-09-20 14:30:00',
+    'title' => 'Supply Chain Management & Business Decision Support (T4-3)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F96%2Fedit%2F',
+    'color' => '',
+  ),
+  138 => 
+  array (
+    'start' => '2007-09-20 13:00:00',
+    'end' => '2007-09-20 14:30:00',
+    'title' => 'Design, Analysis & Control of Fermentation Processes (T5-2)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F100%2Fedit%2F',
+    'color' => '',
+  ),
+  139 => 
+  array (
+    'start' => '2007-09-20 13:00:00',
+    'end' => '2007-09-20 14:30:00',
+    'title' => 'EPIC-1: Intensified Hydrodynamics & Structured Environments (IHSE-4)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F116%2Fedit%2F',
+    'color' => '',
+  ),
+  140 => 
+  array (
+    'start' => '2007-09-20 13:00:00',
+    'end' => '2007-09-20 14:30:00',
+    'title' => 'EPIC-1: Multifunctionality (MF-2)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F117%2Fedit%2F',
+    'color' => '',
+  ),
+  141 => 
+  array (
+    'start' => '2007-09-20 13:00:00',
+    'end' => '2007-09-20 14:30:00',
+    'title' => 'Chemical Product Design & Development - IV (CPD&E - 4)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F127%2Fedit%2F',
+    'color' => '',
+  ),
+  142 => 
+  array (
+    'start' => '2007-09-20 13:00:00',
+    'end' => '2007-09-20 14:00:00',
+    'title' => 'Process & Product Innovation (Food-4a) continued',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F145%2Fedit%2F',
+    'color' => '',
+  ),
+  143 => 
+  array (
+    'start' => '2007-09-20 13:00:00',
+    'end' => '2007-08-31 14:30:00',
+    'title' => 'Hygiene, Hygienic Design & Unit Operations (Food-5a) Continued',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F148%2Fedit%2F',
+    'color' => '',
+  ),
+  144 => 
+  array (
+    'start' => '2007-09-20 13:00:00',
+    'end' => '2007-09-20 14:30:00',
+    'title' => 'Modern Analysis: Chemical & Multivariate Analysis (Food-6a) Continued',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F152%2Fedit%2F',
+    'color' => '',
+  ),
+  145 => 
+  array (
+    'start' => '2007-09-20 15:30:00',
+    'end' => '2007-09-20 16:40:00',
+    'title' => 'Interfacial & Colloidal Phenomena (T2-6P)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F37%2Fedit%2F',
+    'color' => '',
+  ),
+  146 => 
+  array (
+    'start' => '2007-09-20 15:30:00',
+    'end' => '2007-09-20 16:40:00',
+    'title' => 'Rheology (T2-4P)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F54%2Fedit%2F',
+    'color' => '',
+  ),
+  147 => 
+  array (
+    'start' => '2007-09-20 15:30:00',
+    'end' => '2007-09-20 16:40:00',
+    'title' => 'Tools Integration - CAPE Methods & Tools (T4-10P)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F98%2Fedit%2F',
+    'color' => '',
+  ),
+  148 => 
+  array (
+    'start' => '2007-09-20 15:30:00',
+    'end' => '2007-09-20 16:40:00',
+    'title' => 'EPIC-1: Poster Session (EPIC - Poster) - P2',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F123%2Fedit%2F',
+    'color' => '',
+  ),
+  149 => 
+  array (
+    'start' => '2007-09-20 15:30:00',
+    'end' => '2007-09-20 16:40:00',
+    'title' => 'Innovations in Food Technology - Poster Session (Food - P2)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F132%2Fedit%2F',
+    'color' => '',
+  ),
+  150 => 
+  array (
+    'start' => '2007-09-20 16:40:00',
+    'end' => '2007-09-20 18:40:00',
+    'title' => 'Catalysis - III (T2-13c)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F20%2Fedit%2F',
+    'color' => '',
+  ),
+  151 => 
+  array (
+    'start' => '2007-09-20 16:40:00',
+    'end' => '2007-09-20 18:40:00',
+    'title' => 'Rheology (T2-4)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F53%2Fedit%2F',
+    'color' => '',
+  ),
+  152 => 
+  array (
+    'start' => '2007-09-20 16:40:00',
+    'end' => '2007-09-20 18:40:00',
+    'title' => 'Integrated Methodologies for Process Development (T3-7)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F73%2Fedit%2F',
+    'color' => '',
+  ),
+  153 => 
+  array (
+    'start' => '2007-09-20 16:40:00',
+    'end' => '2007-09-20 18:40:00',
+    'title' => 'Bio-transformation in the Laboratory and in Large Scale Production (T5-3)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F101%2Fedit%2F',
+    'color' => '',
+  ),
+  154 => 
+  array (
+    'start' => '2007-09-20 16:40:00',
+    'end' => '2007-09-20 18:40:00',
+    'title' => 'EPIC-1: New Concepts (NC)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F118%2Fedit%2F',
+    'color' => '',
+  ),
+  155 => 
+  array (
+    'start' => '2007-09-20 16:40:00',
+    'end' => '2007-09-20 18:40:00',
+    'title' => 'EPIC-1: Multifunctionality (MF-3)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F119%2Fedit%2F',
+    'color' => '',
+  ),
+  156 => 
+  array (
+    'start' => '2007-09-20 16:40:00',
+    'end' => '2007-09-20 18:40:00',
+    'title' => 'Chemical Product Design & Development - V (CPD&E - 5)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F128%2Fedit%2F',
+    'color' => '',
+  ),
+  157 => 
+  array (
+    'start' => '2007-12-28 16:20:00',
+    'end' => '2007-12-28 18:05:00',
+    'title' => 'White BioTech & Related Processes (Food-2a)',
+    'url' => '/~loa/cm/?_px_action=%2Fsession%2F137%2Fedit%2F',
+    'color' => '',
+  ),
+              );
+?>
\ No newline at end of file
diff --git a/tests/Pluf_Calendar/simplecalendar1.html b/tests/Pluf_Calendar/simplecalendar1.html
new file mode 100644
index 0000000..accfe06
--- /dev/null
+++ b/tests/Pluf_Calendar/simplecalendar1.html
@@ -0,0 +1,67 @@
+<table cellspacing="0" class="px-calendar">
+<thead>
+<tr>
+  <th>&nbsp;</th>
+  <th scope="col">Tuesday</th>
+  <th scope="col">Wednesday</th>
+  <th scope="col">Thursday</th>
+  <th scope="col">Friday</th>
+  <th scope="col">Saturday</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+  <th scope="row">08:00 - 08:30</th>
+  <td rowspan="2">Dummy event 1</td>
+  <td rowspan="2">Dummy event 2</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+</tr>
+<tr>
+  <th scope="row">08:30 - 09:15</th>
+  <td class="empty">&nbsp;</td>
+  <td rowspan="2">Dummy event 4</td>
+  <td class="empty">&nbsp;</td>
+</tr>
+<tr>
+  <th scope="row">09:15 - 09:25</th>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+</tr>
+<tr>
+  <th scope="row">09:25 - 11:00</th>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+</tr>
+<tr>
+  <th scope="row">11:00 - 11:45</th>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td>Dummy event 5</td>
+</tr>
+<tr>
+  <th scope="row">11:45 - 12:00</th>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+</tr>
+<tr>
+  <th scope="row">12:00 - 13:15</th>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td>Dummy event 3</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+</tr>
+</tbody>
+</table>
diff --git a/tests/Pluf_Calendar/simplecalendar2.html b/tests/Pluf_Calendar/simplecalendar2.html
new file mode 100644
index 0000000..c350f18
--- /dev/null
+++ b/tests/Pluf_Calendar/simplecalendar2.html
@@ -0,0 +1,70 @@
+<table cellspacing="0" class="px-calendar">
+<thead>
+<tr>
+  <th>&nbsp;</th>
+  <th scope="col" colspan="2">Tuesday</th>
+  <th scope="col">Wednesday</th>
+  <th scope="col">Thursday</th>
+  <th scope="col">Friday</th>
+  <th scope="col">Saturday</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+  <th scope="row">08:00 - 08:30</th>
+  <td rowspan="4">Dummy event 6</td>
+  <td class="empty">&nbsp;</td>
+  <td rowspan="2">Dummy event 2</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+</tr>
+<tr>
+  <th scope="row">08:30 - 09:15</th>
+  <td rowspan="2">Dummy event 1</td>
+  <td class="empty">&nbsp;</td>
+  <td rowspan="2">Dummy event 4</td>
+  <td class="empty">&nbsp;</td>
+</tr>
+<tr>
+  <th scope="row">09:15 - 09:25</th>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+</tr>
+<tr>
+  <th scope="row">09:25 - 11:00</th>
+  <td rowspan="2">Dummy event 8</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+</tr>
+<tr>
+  <th scope="row">11:00 - 11:45</th>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td>Dummy event 5</td>
+</tr>
+<tr>
+  <th scope="row">11:45 - 12:00</th>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+</tr>
+<tr>
+  <th scope="row">12:00 - 13:15</th>
+  <td>Dummy event 7</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td>Dummy event 3</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+</tr>
+</tbody>
+</table>
diff --git a/tests/Pluf_Calendar/simplecalendar3.html b/tests/Pluf_Calendar/simplecalendar3.html
new file mode 100644
index 0000000..c520913
--- /dev/null
+++ b/tests/Pluf_Calendar/simplecalendar3.html
@@ -0,0 +1,68 @@
+<table cellspacing="0" class="px-calendar">
+<thead>
+<tr>
+  <th>&nbsp;</th>
+  <th scope="col" colspan="2">Tuesday</th>
+  <th scope="col">Wednesday</th>
+  <th scope="col">Thursday</th>
+  <th scope="col">Friday</th>
+  <th scope="col">Saturday</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+  <th scope="row">08:00 - 08:30</th>
+  <td rowspan="4">Dummy event 6</td>
+  <td class="empty">&nbsp;</td>
+  <td rowspan="2">Dummy event 2</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+</tr>
+<tr>
+  <th scope="row">08:30 - 09:15</th>
+  <td rowspan="2">Dummy event 1</td>
+  <td class="empty">&nbsp;</td>
+  <td rowspan="2">Dummy event 4</td>
+  <td class="empty">&nbsp;</td>
+</tr>
+<tr>
+  <th scope="row">09:15 - 09:25</th>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+</tr>
+<tr>
+  <th scope="row">09:25 - 11:00</th>
+  <td rowspan="2">Dummy event 8</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+</tr>
+<tr>
+  <th scope="row">11:00 - 11:45</th>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td>Dummy event 5</td>
+</tr>
+<tr>
+  <th scope="row">11:45 - 12:00</th>
+  <td colspan="2">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+</tr>
+<tr>
+  <th scope="row">12:00 - 13:15</th>
+  <td colspan="2">Dummy event 7</td>
+  <td class="empty">&nbsp;</td>
+  <td>Dummy event 3</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+</tr>
+</tbody>
+</table>
diff --git a/tests/Pluf_Calendar/simplecalendar4.html b/tests/Pluf_Calendar/simplecalendar4.html
new file mode 100644
index 0000000..9e63624
--- /dev/null
+++ b/tests/Pluf_Calendar/simplecalendar4.html
@@ -0,0 +1,30 @@
+<table cellspacing="0" class="px-calendar">
+<thead>
+<tr>
+  <th>&nbsp;</th>
+  <th scope="col" colspan="3">Monday</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+  <th scope="row">15:30 - 16:30</th>
+  <td>Green organic synthesis routes</td>
+  <td rowspan="4">Chemical Reaction Engineering</td>
+  <td class="empty">&nbsp;</td>
+</tr>
+<tr>
+  <th scope="row">16:30 - 17:00</th>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+</tr>
+<tr>
+  <th scope="row">17:00 - 17:30</th>
+  <td rowspan="2">Environmental engineering &amp; management</td>
+  <td class="empty">&nbsp;</td>
+</tr>
+<tr>
+  <th scope="row">17:30 - 19:30</th>
+  <td>Test poster cases with thermo</td>
+</tr>
+</tbody>
+</table>
diff --git a/tests/Pluf_Calendar/simplecalendar5.html b/tests/Pluf_Calendar/simplecalendar5.html
new file mode 100644
index 0000000..14b80cf
--- /dev/null
+++ b/tests/Pluf_Calendar/simplecalendar5.html
@@ -0,0 +1,49 @@
+<table cellspacing="0" class="px-calendar">
+<thead>
+<tr>
+  <th>&nbsp;</th>
+  <th scope="col" colspan="6">Monday</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+  <th scope="row">12:30 - 15:30</th>
+  <td rowspan="6">TRansport</td>
+  <td rowspan="2">Membranes and membrane science</td>
+  <td rowspan="2">Polymer science &amp; engineering</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+</tr>
+<tr>
+  <th scope="row">15:30 - 16:00</th>
+  <td rowspan="2">Green organic synthesis routes</td>
+  <td rowspan="5">Chemical Reaction Engineering</td>
+  <td rowspan="3">Distillation, absorption and extraction</td>
+</tr>
+<tr>
+  <th scope="row">16:00 - 16:30</th>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+</tr>
+<tr>
+  <th scope="row">16:30 - 17:00</th>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+</tr>
+<tr>
+  <th scope="row">17:00 - 17:30</th>
+  <td rowspan="2">Environmental engineering &amp; management</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+</tr>
+<tr>
+  <th scope="row">17:30 - 19:30</th>
+  <td>Test poster cases with thermo</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+</tr>
+</tbody>
+</table>
diff --git a/tests/Pluf_Calendar/simplecalendar6.html b/tests/Pluf_Calendar/simplecalendar6.html
new file mode 100644
index 0000000..474440d
--- /dev/null
+++ b/tests/Pluf_Calendar/simplecalendar6.html
@@ -0,0 +1,49 @@
+<table cellspacing="0" class="px-calendar">
+<thead>
+<tr>
+  <th>&nbsp;</th>
+  <th scope="col" colspan="6">Monday</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+  <th scope="row">12:30 - 15:30</th>
+  <td rowspan="6">TRansport</td>
+  <td rowspan="2">Membranes and membrane science</td>
+  <td rowspan="2">Polymer science &amp; engineering</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+</tr>
+<tr>
+  <th scope="row">15:30 - 16:00</th>
+  <td rowspan="2">Green organic synthesis routes</td>
+  <td rowspan="5">Chemical Reaction Engineering</td>
+  <td rowspan="3">Distillation, absorption and extraction</td>
+</tr>
+<tr>
+  <th scope="row">16:00 - 16:30</th>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+</tr>
+<tr>
+  <th scope="row">16:30 - 17:00</th>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+</tr>
+<tr>
+  <th scope="row">17:00 - 17:30</th>
+  <td rowspan="2">Environmental engineering &amp; management</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+  <td class="empty">&nbsp;</td>
+</tr>
+<tr>
+  <th scope="row">17:30 - 19:30</th>
+  <td>Test poster cases with thermo</td>
+  <td>Crystallization</td>
+  <td class="empty">&nbsp;</td>
+</tr>
+</tbody>
+</table>
diff --git a/tests/Pluf_Crypt/PlufCryptTest.php b/tests/Pluf_Crypt/PlufCryptTest.php
new file mode 100644
index 0000000..e8d3237
--- /dev/null
+++ b/tests/Pluf_Crypt/PlufCryptTest.php
@@ -0,0 +1,50 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+error_reporting(E_ALL | E_STRICT);
+
+$path = dirname(__FILE__).'/../../src/';
+set_include_path(get_include_path().PATH_SEPARATOR.$path);
+
+require_once 'PHPUnit/Framework/TestCase.php';
+require_once 'PHPUnit/Framework/IncompleteTestError.php';
+
+require_once 'Pluf.php';
+
+class PlufCryptTest extends PHPUnit_Framework_TestCase {
+    
+    protected function setUp()
+    {
+        Pluf::start(dirname(__FILE__).'/../conf/pluf.config.php');
+    }
+
+    public function testEncrypt()
+    {
+        $crypt = Pluf::factory('Pluf_Crypt', 'mykeyasdkjhsdkfjsdhfksjdh');
+        $a = $crypt->encrypt('Thisisalongemail.name@longemailcompany.domain.com');
+        $this->assertEquals($crypt->decrypt($a), 'Thisisalongemail.name@longemailcompany.domain.com');
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/tests/Pluf_DB/PlufDBTest.php b/tests/Pluf_DB/PlufDBTest.php
new file mode 100644
index 0000000..57b8e99
--- /dev/null
+++ b/tests/Pluf_DB/PlufDBTest.php
@@ -0,0 +1,67 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+error_reporting(E_ALL | E_STRICT);
+
+$path = dirname(__FILE__).'/../../src/';
+set_include_path(get_include_path().PATH_SEPARATOR.$path);
+
+require_once 'PHPUnit/Framework/TestCase.php';
+require_once 'PHPUnit/Framework/IncompleteTestError.php';
+
+require_once 'Pluf.php';
+
+class PlufDBTest extends PHPUnit_Framework_TestCase {
+
+    public $db;    
+
+    protected function setUp()
+    {
+        Pluf::start(dirname(__FILE__).'/../conf/pluf.config.php');
+        $this->db = &Pluf::db();
+
+    }
+
+    public function testEscapeInteger()
+    {
+        $tests = array('123', 123, 123.32, 'qwe\\qwe', '\'');
+        $res = array('123', '123', '123', '0', '0');
+        foreach ($tests as $test) {
+            $ok = current($res);
+            $this->assertEquals($ok, Pluf_DB_IntegerToDb($test, $this->db));
+            next($res);
+        }
+    }
+
+    public function testEscapeBoolean()
+    {
+        $tests = array('123', 123, 123.32, 'qwe\\qwe', '\'', false, '0');
+        $res = array("'1'", "'1'", "'1'", "'1'", "'1'", "'0'", "'0'");
+        foreach ($tests as $test) {
+            $ok = current($res);
+            $this->assertEquals($ok, Pluf_DB_BooleanToDb($test, $this->db));
+            next($res);
+        }
+    }
+}
+
diff --git a/tests/Pluf_DB_Schema/PlufDBSchemaSQLiteTest.php b/tests/Pluf_DB_Schema/PlufDBSchemaSQLiteTest.php
new file mode 100644
index 0000000..9fde275
--- /dev/null
+++ b/tests/Pluf_DB_Schema/PlufDBSchemaSQLiteTest.php
@@ -0,0 +1,120 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume CMS, a website management application.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume CMS is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Plume CMS is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+error_reporting(E_ALL | E_STRICT);
+
+$path = dirname(__FILE__).'/../../src/';
+set_include_path(get_include_path().PATH_SEPARATOR.$path);
+
+require_once 'PHPUnit/Framework/TestCase.php';
+require_once 'PHPUnit/Framework/IncompleteTestError.php';
+
+require_once 'Pluf.php';
+
+include_once dirname(__FILE__).'/../Pluf_Model/TestModels.php';
+
+class PlufDBSchemaSQLiteTest extends PHPUnit_Framework_TestCase 
+{
+
+    public $db = null;
+
+    protected function setUp()
+    {
+        Pluf::start(dirname(__FILE__).'/../conf/pluf.config.php');
+        $this->db = Pluf::db();
+        if ($this->db->engine != 'SQLite') {
+            $this->markTestSkipped('Only to be run with the SQLite DB engine');
+        }
+    }
+
+    protected function tearDown()
+    {
+        $this->db->close();
+        unset($this->db);
+    }
+
+    public function testGenerateSchema3()
+    {
+        $model = new TestModel();
+        $schema = Pluf::factory('Pluf_DB_Schema', $this->db);
+        $schema->model = $model;
+        $gen = $schema->getGenerator();
+        $sql = $gen->getSqlCreate($model);
+        $create = "CREATE TABLE pluf_unit_tests_testmodel (
+id integer primary key autoincrement,
+title varchar(100) default '',
+description text not null default ''
+);";
+        $this->assertEquals($create, $sql['pluf_unit_tests_testmodel']);
+    }
+
+    public function testDeleteSchemaTestModel()
+    {
+        $model = new TestModel();
+        $schema = Pluf::factory('Pluf_DB_Schema', $this->db);
+        $schema->model = $model;
+        $gen = $schema->getGenerator();
+        $del = $gen->getSqlDelete($model);
+        $this->assertEquals('DROP TABLE IF EXISTS pluf_unit_tests_testmodel', $del[0]);
+    }
+
+
+    public function testGenerateSchema()
+    {
+        $model = new TestModel();
+        $schema = Pluf::factory('Pluf_DB_Schema', $this->db);
+        $schema->model = $model;
+        $gen = $schema->getGenerator();
+        $this->assertEquals(true, $schema->dropTables());
+        $sql = $gen->getSqlCreate($model);
+        foreach ($sql as $k => $query) {
+            $this->db->execute($query);
+        }
+        $sql = $gen->getSqlIndexes($model);
+        foreach ($sql as $k => $query) {
+            $this->db->execute($query);
+        }
+        $model->title = 'my title';
+        $model->description = 'A small desc.';
+        $this->assertEquals(true, $model->create());
+        $this->assertEquals(1, (int) $model->id);
+        $del = $gen->getSqlDelete($model);
+        foreach ($del as $sql) {
+            $this->db->execute($sql);
+        }
+    }
+
+    public function testGenerateSchema2()
+    {
+        $model = new TestModel();
+        $schema = Pluf::factory('Pluf_DB_Schema', $this->db);
+        $schema->model = $model;
+        $this->assertEquals(true, $schema->dropTables());
+        $this->assertEquals(true, $schema->createTables());
+        $model->title = 'my title';
+        $model->description = 'A small desc.';
+        $this->assertEquals(true, $model->create());
+        $this->assertEquals(1, (int) $model->id);
+        $this->assertEquals(true, $schema->dropTables());
+    }
+}
diff --git a/tests/Pluf_Dispatcher/PlufDispatcherTest.php b/tests/Pluf_Dispatcher/PlufDispatcherTest.php
new file mode 100644
index 0000000..6051a57
--- /dev/null
+++ b/tests/Pluf_Dispatcher/PlufDispatcherTest.php
@@ -0,0 +1,52 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+error_reporting(E_ALL | E_STRICT);
+
+$path = dirname(__FILE__).'/../../src/';
+set_include_path(get_include_path().PATH_SEPARATOR.$path);
+
+require_once 'PHPUnit/Framework/TestCase.php';
+require_once 'PHPUnit/Framework/IncompleteTestError.php';
+
+require_once 'Pluf.php';
+
+class PlufDispatcherTest extends PHPUnit_Framework_TestCase {
+    
+    protected function setUp()
+    {
+        Pluf::start(dirname(__FILE__).'/../conf/pluf.config.php');
+    }
+
+    public function testAddPrefixedViews()
+    {
+        $res = Pluf_Dispatcher::addPrefixToViewFile('/alternate', 
+                                                    Pluf::f('app_views'));
+        $this->assertEquals('#^/alternate/$#', $res[0]['regex']);
+        $this->assertEquals('Todo_Views', $res[0]['model']);
+        $this->assertEquals('#^/alternate/install/$#', $res[1]['regex']);
+    }
+
+
+}
+
diff --git a/tests/Pluf_Encoder/PlufEncoderTest.php b/tests/Pluf_Encoder/PlufEncoderTest.php
new file mode 100644
index 0000000..bfd132c
--- /dev/null
+++ b/tests/Pluf_Encoder/PlufEncoderTest.php
@@ -0,0 +1,125 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+error_reporting(E_ALL | E_STRICT);
+
+$path = dirname(__FILE__).'/../../src/';
+set_include_path(get_include_path().PATH_SEPARATOR.$path);
+
+require_once 'PHPUnit/Framework/TestCase.php';
+require_once 'PHPUnit/Framework/IncompleteTestError.php';
+
+require_once 'Pluf.php';
+
+class PlufEncoderTest extends PHPUnit_Framework_TestCase {
+    
+    protected function setUp()
+    {
+        Pluf::start(dirname(__FILE__).'/../conf/pluf.config.php');
+    }
+
+    protected function tearDown()
+    {
+        putenv('PHP_TZ='.Pluf::f('timezone')); 
+    }
+
+    public function testEncoder()
+    {
+        $p = array();
+        $form = array();
+        $enc = Pluf::factory('Pluf_Encoder');
+        $this->assertEquals(true, $enc->checkEmpty('', $form, $p));
+        $p['blank'] = false;
+        // ------------- url -------------------------------
+        $good = array(
+                      'http://www.example.com/lkjasd',
+                      'https://wwwcom/lkjasd',
+                      'https://www-com/lkjasd',
+                      'http://123.345.234.12/lkjasd'
+                      );
+        $bad = array(
+                     'www.com'
+                     );
+        foreach ($good as $url) {
+            $this->assertEquals($url, $enc->url($url, $form, $p));
+        }
+        foreach ($bad as $url) {
+            try {
+                $enc->url($url, $form, $p);
+                $this->assertEquals(false, $url);
+            } catch (Pluf_Form_Invalid $e) {
+                $this->assertEquals(true, true);
+            }
+        }
+        // ------------- date -------------------------------
+        $good = array(
+                      '1995-12-04',
+                      '1995-12-1',
+                      '1000-2-2',
+                      '9999-12-31'
+                      );
+        $bad = array(
+                     '23-12-2',
+                     '1996-2-31',
+                     '2006.05.12',
+                     );
+        foreach ($good as $date) {
+            $this->assertEquals($date, $enc->date($date, $form, $p));
+        }
+        foreach ($bad as $date) {
+            try {
+                $enc->date($date, $form, $p);
+                $this->assertEquals(false, $date);
+            } catch (Pluf_Form_Invalid $e) {
+                $this->assertEquals(true, true);
+            }
+        }
+
+    }
+
+    public function testTimeShift()
+    {
+        $enc = Pluf::factory('Pluf_Encoder');
+        $p = array('blank' => false);
+        $form = array();
+        // When passing a datetime (not a date and not a time)
+        // from the browser, the datetime must be converted 
+        // into GMT time.
+        $tests = array();
+        $tests[] = array('Europe/Berlin', 
+                         '2006-03-16 01:15:35', '2006-03-16 00:15:35');
+        $tests[] = array('America/New_York', 
+                         '2006-03-16 01:15:35', '2006-03-16 06:15:35');
+        $tests[] = array('America/Los_Angeles', 
+                         '2006-03-16 01:15:35', '2006-03-16 09:15:35');
+        foreach ($tests as $test) {
+            putenv('TZ='.$test[0]);
+            date_default_timezone_set($test[0]);
+            $this->assertEquals($test[2], $enc->datetime($test[1], $form, $p));
+            $this->assertEquals($test[1], date('Y-m-d H:i:s', strtotime($test[2].' GMT')));
+        }
+
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/tests/Pluf_Form/PlufFormTest.php b/tests/Pluf_Form/PlufFormTest.php
new file mode 100644
index 0000000..fa81215
--- /dev/null
+++ b/tests/Pluf_Form/PlufFormTest.php
@@ -0,0 +1,94 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+error_reporting(E_ALL | E_STRICT);
+
+$path = dirname(__FILE__).'/../../src/';
+set_include_path(get_include_path().PATH_SEPARATOR.$path);
+
+require_once 'PHPUnit/Framework/TestCase.php';
+require_once 'PHPUnit/Framework/IncompleteTestError.php';
+
+require_once 'Pluf.php';
+require_once dirname(__FILE__).'/TestFormModel.php';
+
+
+class PlufFormTest extends PHPUnit_Framework_TestCase {
+    
+    protected function setUp()
+    {
+        $this->markTestSkipped('Need to rewrite the form handling.');
+        Pluf::start(dirname(__FILE__).'/../conf/pluf.config.php');
+        $db = Pluf::db();
+        $schema = Pluf::factory('Pluf_DB_Schema', $db);
+        $m1 = new TestFormModel();
+        $schema->model = $m1;
+        $schema->dropTables();
+        $schema->createTables();
+    }
+
+    protected function tearDown()
+    {
+        $db = Pluf::db();
+        $schema = Pluf::factory('Pluf_DB_Schema', $db);
+        $m1 = new TestFormModel();
+        $schema->model = $m1;
+        $schema->dropTables();
+    }
+
+    public function testFormRenderByField()
+    {
+        $m1 = new TestFormModel();
+        $form = new Pluf_Form_Create();
+        $form->defineFromModel($m1);
+        $errors = array();
+        $m1->description = 'My description';
+        $m1->title = 'What a title?';
+        $m1->create();
+        $new_data = $m1->getData();
+        $form_view = new Pluf_Form_Render($form, $new_data, $errors);
+        $this->assertEquals('<label class="px-form-required" for="title">Title of the item:</label>',
+                            $form_view->fields['title']->label);
+        $this->assertEquals('<label for="description">Description:</label>',
+                            $form_view->fields['description']->label);
+    }
+
+    public function testFormValidate()
+    {
+        $m1 = new TestFormModel();
+        $form = new Pluf_Form_Update();
+        $form->defineFromModel($m1);
+        $errors = array();
+        $m1->description = 'My description';
+        $m1->title = 'What a title?';
+        $m1->id = 'qwe';
+        $new_data = $m1->getData();
+        $errors = $form->getValidationErrors($new_data);
+        $this->assertEquals(true, isset($errors['id']));
+        $this->assertEquals(1, count($errors));
+    }
+
+
+}
+
+?>
\ No newline at end of file
diff --git a/tests/Pluf_Form/TestFormModel.php b/tests/Pluf_Form/TestFormModel.php
new file mode 100644
index 0000000..2361668
--- /dev/null
+++ b/tests/Pluf_Form/TestFormModel.php
@@ -0,0 +1,71 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume CMS, a website management application.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume CMS is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Plume CMS is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+Pluf::loadClass('Pluf_Model');
+
+class TestFormModel extends Pluf_Model
+{
+    function init()
+    {
+        $this->_a['table'] = 'testformmodels';
+        $this->_a['model'] = 'TestFormModel';
+        $this->_a['cols'] = array(
+                             'id' =>
+                             array(
+                                   'type' => 'Pluf_DB_Field_Sequence',
+                                   'blank' => true,//It is automatically added.
+                                  ),
+                            'title' => 
+                            array(
+                                  'type' => 'Pluf_DB_Field_Varchar',
+                                  'blank' => false,
+                                  'size' => 100,
+                                  'verbose' => 'Title of the item',
+                                  ),
+                            'description' => 
+                            array(
+                                  'type' => 'Pluf_DB_Field_Text',
+                                  'blank' => true,
+                                  'help_text' => 'This is a small description',
+                                  ),
+                            );
+        $this->_admin = array(
+                              'list_display' => array('id', 
+                                                      array('title', 'TestFormModel_ConvertTitle'), 
+                                                      array('title', 'TestFormModel_ConvertTitle', 'My Title')),
+                              'search_fields' => array('title', 'description'),
+                              );
+        parent::init();
+    }
+
+
+
+}
+
+
+function TestFormModel_ConvertTitle($field, $item)
+{
+    return '"'.$item->$field.'"';
+}
+
+?>
\ No newline at end of file
diff --git a/tests/Pluf_Form_Field/PlufFormFieldTest.php b/tests/Pluf_Form_Field/PlufFormFieldTest.php
new file mode 100644
index 0000000..c68c161
--- /dev/null
+++ b/tests/Pluf_Form_Field/PlufFormFieldTest.php
@@ -0,0 +1,107 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+error_reporting(E_ALL | E_STRICT);
+
+$path = dirname(__FILE__).'/../../src/';
+set_include_path(get_include_path().PATH_SEPARATOR.$path);
+
+require_once 'PHPUnit/Framework/TestCase.php';
+require_once 'PHPUnit/Framework/IncompleteTestError.php';
+
+require_once 'Pluf.php';
+
+class PlufFormFieldTest extends PHPUnit_Framework_TestCase {
+    
+    protected function setUp()
+    {
+        Pluf::start(dirname(__FILE__).'/../conf/pluf.config.php');
+    }
+
+    public function testPlufFormFieldFloat()
+    {
+        $field = new Pluf_Form_Field_Float();
+        $valids = array(1234.12,
+                        123.0,
+                        123e+32);
+        $invalids = array('12,34.12',
+                        '12+3.0',
+                        '123es+32');
+        foreach ($valids as $valid) {
+            $this->assertEquals($valid, $field->clean($valid));
+        }
+        foreach ($invalids as $invalid) {
+            try {
+                $field->clean($invalid);
+                $this->fail('An expected Exception has not been raised. Not a valid float: '.$invalid);
+            } catch (Pluf_Form_Invalid $expected) {
+                continue;
+            }
+        }
+        return;
+    }
+
+    public function testPlufFormFieldEmail()
+    {
+        $field = new Pluf_Form_Field_Email();
+        $valids = array(
+                        'cal@iamcalx.com',
+                        'cal+henderson@iamcalx.com',
+                        '"cal henderson"@iamcalx.com',
+                        'cal@iamcalx',
+                        'cal@[hello.com]',
+                        'cal@[hello world.com]',
+                        'cal@[hello\\ world.com]',
+                        'abcdefghijklmnopqrstuvwxyz@abcdefghijklmnopqrstuvwxyz',
+                        '"woo yay"@example.com',
+                        '"woo@yay"@example.com',
+                        '"woo.yay"@example.com',
+                        '"woo\\"yay"@test.com',
+                        'toto+yop@gmail.com',
+                        'webstaff@redcross.org',
+                        );
+        $invalids = array(
+                        'cal henderson@iamcalx.com',
+                        'cal@iamcalx com',
+                        'cal@hello world.com',
+                        'cal@[hello].com',
+                        'cal@[hello world].com',
+                        'cal@[hello\\ world].com',
+                        'woo\\ yay@example.com',
+                        'woo\\@yay@example.com',
+                        'woo\\.yay@example.com',
+                          );
+        foreach ($valids as $valid) {
+            $this->assertEquals($valid, $field->clean($valid));
+        }
+        foreach ($invalids as $invalid) {
+            try {
+                $field->clean($invalid);
+                $this->fail('An expected Exception has not been raised. Not a valid email: '.$invalid);
+            } catch (Pluf_Form_Invalid $expected) {
+                continue;
+            }
+        }
+        return;
+    }
+}
diff --git a/tests/Pluf_Gettext/PlufGettextTest.php b/tests/Pluf_Gettext/PlufGettextTest.php
new file mode 100644
index 0000000..2fd3f71
--- /dev/null
+++ b/tests/Pluf_Gettext/PlufGettextTest.php
@@ -0,0 +1,66 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+error_reporting(E_ALL | E_STRICT);
+
+$path = dirname(__FILE__).'/../../src/';
+set_include_path(get_include_path().PATH_SEPARATOR.$path);
+
+require_once 'PHPUnit/Framework/TestCase.php';
+require_once 'PHPUnit/Framework/IncompleteTestError.php';
+
+require_once 'Pluf.php';
+
+class PlufGettextTest extends PHPUnit_Framework_TestCase {
+    
+    protected function setUp()
+    {
+        Pluf::start(dirname(__FILE__).'/../conf/pluf.config.php');
+        if (!isset($GLOBALS['_PX_locale'])) $GLOBALS['_PX_locale'] = null;
+        $this->tmp = $GLOBALS['_PX_locale'];
+    }
+
+    protected function tearDown()
+    {
+        $GLOBALS['_PX_locale'] = $this->tmp;
+    }
+    public function testParseFile()
+    {
+        $trans = Pluf_Gettext::parseLangFile(dirname(__FILE__).'/sample1.lang');
+        $this->assertEquals('Les fonctions de tampon d\'affichage ne sont pas disponibles.',
+                            $trans['The output buffering functions are not available.']);
+    }
+
+    public function testParseFilePlurals()
+    {
+        $trans = Pluf_Gettext::parseLangFile(dirname(__FILE__).'/sample-plurals.lang');
+        $this->assertEquals('Plume CMS Installation 2',
+                            $trans['~~PLURALS~~']['PLUME CMS InstallationPlume CMS Installations'][2]);
+        $GLOBALS['_PX_locale'] = $trans;
+        $this->assertEquals('Plume CMS Installation 2', _n('PLUME CMS Installation', 'Plume CMS Installations', 2));
+        $this->assertEquals('Plume CMS Installation 2', _n('PLUME CMS Installation', 'Plume CMS Installations', 100));
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/tests/Pluf_Gettext/sample-plurals.lang b/tests/Pluf_Gettext/sample-plurals.lang
new file mode 100644
index 0000000..7426ebe
--- /dev/null
+++ b/tests/Pluf_Gettext/sample-plurals.lang
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# (C) 2004-2006 CĂ©dric Arrabie, LoĂ¯c d'Anterroches
+;Welcome on the PLUME CMS installation
+Bienvenue sur l'assistant d'installation de PLUME CMS
+
+;A possible previous installation of PLUME CMS is detected. You are invited to <a href="%s">upgrade your installation</a>.
+Une éventuelle installation de PLUME CMS a été détectée. Nous vous invitons à <a href="%s">mettre à jour votre installation</a>.
+
+;Language:
+Langue&nbsp;:
+
+;Next
+Suivant
+
+;PLUME CMS Installation
+p;Plume CMS Installations
+0;Plume CMS Installation 0
+1;Plume CMS Installation 1
+2;Plume CMS Installation 2
+
+;%s%% of the installation completed
+%s%% de l'installation effectué
+
+;The installed PHP version is: %s.
+La version de PHP que vous utilisez est&nbsp;: %s.
+
diff --git a/tests/Pluf_Gettext/sample1.lang b/tests/Pluf_Gettext/sample1.lang
new file mode 100644
index 0000000..a23e1ab
--- /dev/null
+++ b/tests/Pluf_Gettext/sample1.lang
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+# (C) 2004-2006 CĂ©dric Arrabie, LoĂ¯c d'Anterroches
+;Welcome on the PLUME CMS installation
+Bienvenue sur l'assistant d'installation de PLUME CMS
+
+;A possible previous installation of PLUME CMS is detected. You are invited to <a href="%s">upgrade your installation</a>.
+Une éventuelle installation de PLUME CMS a été détectée. Nous vous invitons à <a href="%s">mettre à jour votre installation</a>.
+
+;Language:
+Langue&nbsp;:
+
+;Next
+Suivant
+
+;PLUME CMS Installation
+Installation de PLUME CMS
+
+;%s%% of the installation completed
+%s%% de l'installation effectué
+
+;The installed PHP version is: %s.
+La version de PHP que vous utilisez est&nbsp;: %s.
+
+;The installed PHP version is: %s. PHP 4.1 or higher is required.
+La version de PHP que vous utilisez est&nbsp;: %s. PHP 4.1 ou supérieur est requis.
+
+;The MySQL module is available.
+Le module MySQL est disponible.
+
+;The MySQL module is not available.
+Le module MySQL n'est pas disponible.
+
+;The output buffering functions are available.
+Les fonctions de tampon d'affichage sont disponibles.
+
+;The output buffering functions are not available.
+Les fonctions de tampon d'affichage ne sont pas disponibles.
+
+;The GD library is available.
+La librairie GD est disponible.
+
+;The GD library is not available. Thumbnails will not be created automatically.
+La librairie GD n'est pas disponible. Les vignettes ne seront pas créées automatiquement.
+
+;The XML module is available.
+Le module XML est disponible.
+
+;The XML module is not available.
+Le module XML n'est pas disponible.
+
diff --git a/tests/Pluf_HTTP_URL/PlufHTTPURLTest.php b/tests/Pluf_HTTP_URL/PlufHTTPURLTest.php
new file mode 100644
index 0000000..a2429bc
--- /dev/null
+++ b/tests/Pluf_HTTP_URL/PlufHTTPURLTest.php
@@ -0,0 +1,144 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+error_reporting(E_ALL | E_STRICT);
+
+$path = dirname(__FILE__).'/../../src/';
+set_include_path(get_include_path().PATH_SEPARATOR.$path);
+
+require_once 'PHPUnit/Framework/TestCase.php';
+require_once 'PHPUnit/Framework/IncompleteTestError.php';
+
+require_once 'Pluf.php';
+
+class PlufHTTPURLTest extends PHPUnit_Framework_TestCase {
+    
+    protected function setUp()
+    {
+        Pluf::start(dirname(__FILE__).'/../conf/pluf.config.php');
+        Pluf::loadFunction('Pluf_HTTP_URL_buildReverseUrl');
+        Pluf::loadFunction('Pluf_HTTP_URL_reverse');
+        $d = new Pluf_Dispatcher();
+        $d->loadControllers(Pluf::f('app_views'));
+    }
+
+    public function testGenerateSimple()
+    {
+        $murl = Pluf::factory('Pluf_HTTP_URL', 'simple');
+        $url = $murl->generate('/toto/titi/', array(
+                                                    'param1' => 'value%*one',
+                                                    'param2' => 'value&two',
+                                                    ), false);
+        $this->assertEquals('?_px_action=%2Ftoto%2Ftiti%2F&param1=value%'
+                            .'25%2Aone&param2=value%26two', $url);
+    }
+
+    public function testGenerateSimpleEncoded()
+    {
+        $murl = new Pluf_HTTP_URL('simple');
+        $url = $murl->generate('/toto/titi/', array(
+                                                    'param1' => 'value%*one',
+                                                    'param2' => 'value&two',
+                                                    ));
+        $this->assertEquals('?_px_action=%2Ftoto%2Ftiti%2F&amp;param1=value%'
+                            .'25%2Aone&amp;param2=value%26two', $url);
+    }
+
+    public function testGenerateModRewrite()
+    {
+        $murl = Pluf::factory('Pluf_HTTP_URL', 'mod_rewrite');
+        $url = $murl->generate('/toto/titi/', array(
+                                                    'param1' => 'value%*one',
+                                                    'param2' => 'value&two',
+                                                    ), false);
+        $this->assertEquals('/toto/titi/?param1=value%'
+                            .'25%2Aone&param2=value%26two', $url);
+    }
+
+    public function testGetActionModRewrite()
+    {
+        $_SERVER['QUERY_STRING'] = '/toto/titi/';
+        $murl = Pluf::factory('Pluf_HTTP_URL', 'mod_rewrite');
+        $this->assertEquals('/toto/titi/', $murl->getAction());
+
+    }
+
+    public function testGetActionSimple()
+    {
+        $_GET['_px_action'] = '/toto/titi/';
+        $murl = Pluf::factory('Pluf_HTTP_URL', 'simple');
+        $this->assertEquals('/toto/titi/', $murl->getAction());
+
+    }
+
+    public function testReverseSimpleUrl()
+    {
+        $url = Pluf_HTTP_URL_buildReverseUrl('#^/toto/$#');
+        $this->assertEquals('/toto/', $url);
+    }
+
+    public function testReverseSimpleArgUrl()
+    {
+        $url = Pluf_HTTP_URL_buildReverseUrl('#^/toto/(\d+)/$#', array(23));
+        $this->assertEquals('/toto/23/', $url);
+    }
+
+    public function testReverseMultipleArgUrl()
+    {
+        $url = Pluf_HTTP_URL_buildReverseUrl('#^/toto/(\d+)/asd/(.*)/$#', array(23, 'titi'));
+        $this->assertEquals('/toto/23/asd/titi/', $url);
+    }
+
+    public function testComplexReverseMultipleArgUrl()
+    {
+        $url = Pluf_HTTP_URL_buildReverseUrl('#^/toto/([A-Z]{2})/asd/(.*)/$#', array('AB', 'titi'));
+        $this->assertEquals('/toto/AB/asd/titi/', $url);
+    }
+
+    public function testReverseWithBackSlashes()
+    {
+        $url = Pluf_HTTP_URL_buildReverseUrl('#^/toto/(.*)\.txt$#', array('AB'));
+        $this->assertEquals('/toto/AB.txt', $url);
+    }
+
+    public function testReverseMultipleArgUrlFailure()
+    {
+        $url_regex = '#^/toto/(\s+)/asd/(.*)/$#';
+        $params =  array('23', 'titi');
+        try {
+            $url = Pluf_HTTP_URL_buildReverseUrl($url_regex, $params);
+        } catch (Exception $e) {
+            return;
+        }
+        $this->fail('An exception as not been raised, regex:'.$url_regex.' should not match params: '.var_export($params, true));
+    }
+
+    public function testReverseUrlFromView()
+    {
+        $url = Pluf_HTTP_URL_reverse('Todo_Views::updateItem', array('32'));
+        $this->assertEquals('/item/32/update/', $url);
+    }
+
+
+}
+
diff --git a/tests/Pluf_Mail/PlufMailTest.php b/tests/Pluf_Mail/PlufMailTest.php
new file mode 100644
index 0000000..724ee4e
--- /dev/null
+++ b/tests/Pluf_Mail/PlufMailTest.php
@@ -0,0 +1,51 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+error_reporting(E_ALL | E_STRICT);
+
+$path = dirname(__FILE__).'/../../src/';
+set_include_path(get_include_path().PATH_SEPARATOR.$path);
+
+require_once 'PHPUnit/Framework/TestCase.php';
+require_once 'PHPUnit/Framework/IncompleteTestError.php';
+
+require_once 'Pluf.php';
+
+class PlufMailTest extends PHPUnit_Framework_TestCase {
+    
+    protected function setUp()
+    {
+        Pluf::start(dirname(__FILE__).'/../conf/pluf.config.php');
+    }
+
+    protected function tearDown()
+    {
+    }
+
+    public function testGenerateEmail()
+    {
+        $this->markTestSkipped('It implies PEAR testing and PHPUnit does not work well with PEAR.');
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/tests/Pluf_Mail/check_on.png b/tests/Pluf_Mail/check_on.png
new file mode 100644
index 0000000..079d930
Binary files /dev/null and b/tests/Pluf_Mail/check_on.png differ
diff --git a/tests/Pluf_Mail/encodedbody1.txt b/tests/Pluf_Mail/encodedbody1.txt
new file mode 100644
index 0000000..eedfeb9
--- /dev/null
+++ b/tests/Pluf_Mail/encodedbody1.txt
@@ -0,0 +1,32 @@
+This is a multipart message in MIME format.
+--123456789
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+This is my simple message.
+--123456789
+Content-Type: image/png;
+ name="check_on.png"
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment;
+ filename="check_on.png"
+
+iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAMAAABhq6zVAAAAA3NCSVQICAjb4U/gAAAB
+OFBMVEX////0+fHz+fDy+O/y+e/g79je79bd7tTc7dTa7NHZ7M/NzszMzMyz1qLGycTF
+yMTBwsCzyaewx6SiwJSiv5OCvGaBu2R+u1+RsIKQroF8t2B4tlh0tFNttklstUdttUhp
+tEOLooBos0Jms0CLoIBmskBksj5or0RnrkNjsTxfrzdcrjRZrC9ZrDBYqy5dpzdYqTBW
+qyxRqCZRqCVapDVQpyVPpyNVoy9WpC9NpiBMpR9OpCNVny9Uni9JpBxUny9HohpGohhS
+nS1FoBhAnxBAnxFAnRI9ngxHlyA9mg9LkyY4mwdKkSY6lwwzmQA0kQYzjwVGhiYyjQRF
+giYuiAEthwEuhwFDfCZCeiYsgwArggArgQAqfgAqfQApfAApewApegAoeQAndgAmcwAm
+cQAlcAAkbAAkawDxIN8wAAAAaHRSTlP///////////////8A////////////////////
+////////////////////////////////////////////////////////////////////
+/////////////////////////////////8v/12AAAAAJcEhZcwAACxIAAAsSAdLdfvwA
+AAAWdEVYdENyZWF0aW9uIFRpbWUAMDUvMDIvMDN/5VH2AAAAIXRFWHRTb2Z0d2FyZQBN
+YWNyb21lZGlhIEZpcmV3b3JrcyA0LjDqJid1AAAAm0lEQVR4nBXNVRaCUBRA0atiP7u7
+W7C7sLsTWWCB8x+Cz799vg4ghMzeQilhwQCktYfTVLFB5/Q4bL5Ittrtt+Y9BCZ/kOyO
+p7Rat3OCJxULLDcjDchmC6DiCin5d5thoJhRglQORJ3hOEg2KyoAIn/i33uwDicOkNQu
+vCCEAJXXW3fn/hLFK/4YBocz+/x8b0YcCLlW7OMYxfgBwOkZATwRuKgAAAAASUVORK5C
+YII=
+
+--123456789-- 
+
diff --git a/tests/Pluf_Migration/PlufMigrationTest.php b/tests/Pluf_Migration/PlufMigrationTest.php
new file mode 100644
index 0000000..3c7271b
--- /dev/null
+++ b/tests/Pluf_Migration/PlufMigrationTest.php
@@ -0,0 +1,64 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+error_reporting(E_ALL | E_STRICT);
+
+$path = dirname(__FILE__).'/../../src/';
+set_include_path(get_include_path().PATH_SEPARATOR.$path);
+
+require_once 'PHPUnit/Framework/TestCase.php';
+require_once 'PHPUnit/Framework/IncompleteTestError.php';
+
+require_once 'Pluf.php';
+
+class PlufMigrationTest extends PHPUnit_Framework_TestCase {
+    
+    protected function setUp()
+    {
+        Pluf::start(dirname(__FILE__).'/../conf/pluf.config.php');
+    }
+
+    public function testMigrate()
+    {
+        $m = new Pluf_Migration();
+        $m->dry_run = false;
+        $this->assertEquals(true, $m->migrate());
+        $this->assertEquals(true, $m->migrate(0));
+    }
+
+    public function testMigrateDown()
+    {
+        $m = new Pluf_Migration();
+        $m->dry_run = true;
+        $this->assertEquals(true, $m->migrate(0));
+    }
+
+    public function testMigrateUp()
+    {
+        $m = new Pluf_Migration();
+        $m->dry_run = true;
+        $this->assertEquals(true, $m->migrate(5));
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/tests/Pluf_Model/PlufModelTest.php b/tests/Pluf_Model/PlufModelTest.php
new file mode 100644
index 0000000..a342c32
--- /dev/null
+++ b/tests/Pluf_Model/PlufModelTest.php
@@ -0,0 +1,376 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume CMS, a website management application.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume CMS is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Plume CMS is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+error_reporting(E_ALL | E_STRICT);
+$path = dirname(__FILE__).'/../../src/';
+set_include_path(get_include_path().PATH_SEPARATOR.$path);
+require_once 'PHPUnit/Framework/TestCase.php';
+require_once 'PHPUnit/Framework/IncompleteTestError.php';
+
+require_once 'Pluf.php';
+
+include_once dirname(__FILE__).'/TestModels.php'; 
+
+class PlufModelTest extends PHPUnit_Framework_TestCase 
+{
+
+    protected function setUp()
+    {
+        Pluf::start(dirname(__FILE__).'/../conf/pluf.config.php');
+        $m = require dirname(__FILE__).'/relations.php';
+        $GLOBALS['_PX_models'] = array_merge($m, $GLOBALS['_PX_models']);
+        $GLOBALS['_PX_config']['pluf_use_rowpermission'] = false;
+        $db = Pluf::db();
+        $schema = Pluf::factory('Pluf_DB_Schema', $db);
+        $m1 = new TestModel();
+        $m2 = new RelatedToTestModel();
+        $m3 = new RelatedToTestModel2();
+        $m4 = new TestModelRecurse();
+        $schema->model = $m1;
+        $schema->dropTables();
+        $schema->createTables();
+        $schema->model = $m2;
+        $schema->dropTables();
+        $schema->createTables();
+        $schema->model = $m3;
+        $schema->dropTables();
+        $schema->createTables();
+        $schema->model = $m4;
+        $schema->dropTables();
+        $schema->createTables();
+
+    }
+
+    protected function tearDown()
+    {
+        $db = Pluf::db();
+        $schema = Pluf::factory('Pluf_DB_Schema', $db);
+        $m1 = new TestModel();
+        $schema->model = $m1;
+        $schema->dropTables();
+        $m2 = new RelatedToTestModel();
+        $schema->model = $m2;
+        $schema->dropTables();
+        $m3 = new RelatedToTestModel2();
+        $schema->model = $m3;
+        $schema->dropTables();
+        $m4 = new TestModelRecurse();
+        $schema->model = $m4;
+        $schema->dropTables();
+    }
+
+    public function testSetModelField()
+    {
+        $model = new TestModel();
+        $model->title =  'myvalue';
+        $this->assertEquals('myvalue', $model->title);
+    }
+
+    public function testTestModelRecurse()
+    {
+        $model = new TestModelRecurse();
+        $model->title =  'myvalue';
+        $this->assertEquals('myvalue', $model->title);
+        $model->create();
+        $model2 = new TestModelRecurse();
+        $model2->title =  'child';
+        $model2->parentid = $model;
+        $this->assertEquals(true, $model2->create());
+        $a = $model->get_children_list();
+        $this->assertEquals($a[0]->title, 'child');
+    }
+
+    public function testCreateTestModel()
+    {
+        $model = new TestModel();
+        $model->title = 'my title';
+        $model->description = 'A small desc.';
+        $this->assertEquals(true, $model->create());
+        $this->assertEquals(1, (int) $model->id);
+    }
+
+    public function testGetTestModel()
+    {
+        $model = new TestModel();
+        $model->title = 'my title';
+        $model->description = 'A small desc.';
+        $model->create();
+        $m = new TestModel(1);
+        $this->assertEquals('my title', $m->title);
+    }
+
+    public function testUpdateTestModel()
+    {
+        $model = new TestModel();
+        $model->title =  'my title';
+        $model->description = 'A small desc.';
+        $model->create();
+        $model = new TestModel(1);
+        $model->description = 'A small desc 2.';        
+        $this->assertEquals(true, $model->update());
+        $this->assertEquals('A small desc 2.', $model->description);
+    }
+
+    public function testDeleteTestModel()
+    {
+        $model = new TestModel();
+        $model->title = 'my title';
+        $model->description = 'A small desc.';
+        $model->create();
+        $this->assertEquals(1, $model->id);
+        $this->assertEquals(true, $model->delete());
+        $this->assertEquals('', $model->id);
+        $this->assertEquals('', $model->title);
+        $model = new TestModel();
+        $this->assertEquals(false, $model->get(1));
+    }
+
+    public function testGetListTestModel()
+    {
+        for ($i=0; $i<10; $i++) {
+            $model = new TestModel();
+            $model->title = 'title '.$i;
+            $model->description = 'A small desc '.$i;
+            $model->create();
+        }
+        $model->title = 'update to have 11 records and 10 head';
+        $model->update();
+        $m = new TestModel();
+        $models = $m->getList();
+        $this->assertEquals(10, count($models));
+        $this->assertEquals('title 0', $models[0]->title);
+        $this->assertEquals('title 5', $models[5]->title);
+    }
+
+    public function testGetCountModel()
+    {
+        for ($i=0; $i<10; $i++) {
+            $model = new TestModel();
+            $model->title = 'title '.$i;
+            $model->description = 'A small desc '.$i;
+            $model->create();
+        }
+        $model->title = 'update to have 11 records and 10 head';
+        $model->update();
+        $m = new TestModel();
+        $this->assertEquals(10, $m->getCount());
+    }
+
+
+    public function testRelatedTestModel()
+    {
+        $model = new TestModel();
+        $model->title = 'title';
+        $model->description = 'A small desc ';
+        $this->assertEquals(true, $model->create());
+        $m = new RelatedToTestModel();
+        $m->testmodel = $model;
+        $m->dummy = 'stupid values';
+        $this->assertEquals(true, $m->create());
+        $rel = $model->get_relatedtotestmodel_list();
+        $this->assertEquals('stupid values', $rel[0]->dummy);
+        $mod = $m->get_testmodel();
+        $this->assertEquals('title', $mod->title);
+    }
+
+    public function testLimitRelatedTestModel()
+    {
+        $model = new TestModel();
+        $model->title = 'title';
+        $model->description = 'A small desc ';
+        $this->assertEquals(true, $model->create());
+        $m = new RelatedToTestModel();
+        $m->testmodel = $model;
+        $m->dummy = 'stupid values';
+        $this->assertEquals(true, $m->create());
+        $m = new RelatedToTestModel();
+        $m->testmodel = $model;
+        $m->dummy = 'stupid values 2';
+        $this->assertEquals(true, $m->create());
+        $m = new RelatedToTestModel();
+        $m->testmodel = $model;
+        $m->dummy = 'stupid values 3';
+        $this->assertEquals(true, $m->create());        
+        $rel = $model->get_relatedtotestmodel_list(array('filter' => "dummy='stupid values 2'"));
+        $this->assertEquals('stupid values 2', $rel[0]->dummy);
+        $this->assertEquals(1, count($rel));
+        $rel = $model->get_relatedtotestmodel_list();
+        $this->assertEquals(3, count($rel));
+    }
+
+    /**
+     * Test if the delete() call on a model is deleting the model
+     * related through a foreignkey.
+     */
+    public function testDeleteRelatedModels()
+    {
+        $model = new TestModel();
+        $model->title = 'title';
+        $model->description = 'A small desc ';
+        $model->create();
+        $m1 = new RelatedToTestModel();
+        $m1->testmodel = $model;
+        $m1->dummy = 'stupid values';
+        $m1->create();
+        $m2 = new RelatedToTestModel();
+        $m2->testmodel = $model;
+        $m2->dummy = 'stupid values';
+        $m2->create();
+        $m3 = new RelatedToTestModel();
+        $m3->testmodel = $model;
+        $m3->dummy = 'stupid values';
+        $m3->create();
+        $rel = $model->get_relatedtotestmodel_list();
+        $this->assertEquals(3, count($rel));
+        $this->assertEquals(0, count($m2->getDeleteSideEffect()));
+        $m2->delete();
+        $rel = $model->get_relatedtotestmodel_list();
+        $this->assertEquals(2, count($rel));
+        $this->assertEquals(2, count($model->getDeleteSideEffect()));
+        $model->delete();
+        $mr = new RelatedToTestModel();
+        $rel = $mr->getList();
+        $this->assertEquals(0, count($rel));
+    }
+
+    public function testManyRelatedTestModel()
+    {
+        $tm1 = new TestModel();
+        $tm1->title = 'title tm1';
+        $tm1->description = 'A small desc tm1';
+        $tm1->create();
+        $tm2 = new TestModel();
+        $tm2->title = 'title tm2';
+        $tm2->description = 'A small desc tm2';
+        $tm2->create();
+        $tm3 = new TestModel();
+        $tm3->title = 'title tm3';
+        $tm3->description = 'A small desc tm3';
+        $tm3->create();
+
+        $rm1 = new RelatedToTestModel2();
+        $rm1->testmodel_1 = $tm1;
+        $rm1->testmodel_2 = $tm2;
+        $rm1->dummy = 'stupid values rm1';
+        $rm1->create();
+        $rm2 = new RelatedToTestModel2();
+        $rm2->testmodel_1 = $tm1;
+        $rm2->testmodel_2 = $tm2;
+        $rm2->dummy = 'stupid values rm2';
+        $rm2->create();
+        $rm3 = new RelatedToTestModel2();
+        $rm3->testmodel_1 = $tm1;
+        $rm3->testmodel_2 = $tm3;
+        $rm3->dummy = 'stupid values rm3';
+        $rm3->create();
+
+        $rel = $tm1->get_first_rttm_list();
+        $this->assertEquals(3, count($rel));
+        $this->assertEquals('stupid values rm1', $rel[0]->dummy);
+        $rel = $tm2->get_first_rttm_list();
+        $this->assertEquals(0, count($rel));
+        $rel = $tm2->get_second_rttm_list();
+        $this->assertEquals(2, count($rel));
+        $this->assertEquals('stupid values rm2', $rel[1]->dummy);
+        $rel = $tm3->get_second_rttm_list();
+        $this->assertEquals(1, count($rel));
+        $this->assertEquals('stupid values rm3', $rel[0]->dummy);
+        $tm1bis = $rm2->get_testmodel_1();
+        $this->assertEquals('title tm1', $tm1bis->title);
+    }
+
+    public function testRelatedToNotCreatedTestModel()
+    {
+        $db = Pluf::db();
+        $schema = Pluf::factory('Pluf_DB_Schema', $db);
+        $m2 = new ManyToManyTwo();
+        $schema->model = $m2;
+        $this->assertEquals(true, $schema->dropTables());
+        $this->assertEquals(true, $schema->createTables());
+        $m2->two = 'two is the best';
+        $rel = $m2->get_manytomanyone_list(); 
+        $this->assertNotEquals(false, $rel);
+        $this->assertEquals(0, count($rel));
+        $this->assertEquals(true, $schema->dropTables());
+    }
+
+    /**
+     * Create the tables and test if association is working.
+     */
+    public function testManyToManyModels()
+    {
+        $db = Pluf::db();
+        $schema = Pluf::factory('Pluf_DB_Schema', $db);
+        $m1 = new ManyToManyOne();
+        $schema->model = $m1;
+        $this->assertEquals(true, $schema->dropTables());
+        $this->assertEquals(true, $schema->createTables());
+        $m1->one = 'one is the best';
+        $this->assertEquals(true, $m1->create());
+        $this->assertEquals(1, $m1->id);
+        $m2 = new ManyToManyTwo();
+        $schema->model = $m2;
+        $this->assertEquals(true, $schema->dropTables());
+        $this->assertEquals(true, $schema->createTables());
+        $m2->two = 'two is the best';
+        $this->assertEquals(true, $m2->create());
+        $m1->setAssoc($m2);
+        $m3 = new ManyToManyTwo();
+        $m3->two = 'two bis is the best';
+        $this->assertEquals(true, $m3->create());
+        $m1->setAssoc($m3);
+        $rel = $m1->get_two_list();
+        $this->assertEquals(2, count($rel));
+        $this->assertEquals('two is the best', $rel[0]->two);
+        $this->assertEquals('two bis is the best', $rel[1]->two);
+        //Has the many to many relationship is set on ManyToManyOne
+        //ManyToManyTwo is accessing the other model through the 
+        //get_nameofthemodelclass_list syntax
+        $rel = $m2->get_manytomanyone_list(); 
+        $this->assertEquals(1, count($rel));
+        $this->assertEquals('one is the best', $rel[0]->one);
+        $m1->delAssoc($m3);
+        $rel = $m1->get_two_list();
+        $this->assertEquals(1, count($rel));
+    }
+
+    public function testExceptionOnProperty()
+    {
+        $model = new TestModel();
+        $model->title = 'title';
+        $model->description = 'A small desc ';
+        $this->assertEquals(true, $model->create());
+        try {
+            $rel = $model->should_fail;
+            // next line should not be called
+            $this->assertEquals(true, false); 
+        } catch (Exception $e) {
+            $this->assertEquals('Cannot get property "should_fail".', 
+                                $e->getMessage());
+        }
+    }
+
+
+}
+
+?>
\ No newline at end of file
diff --git a/tests/Pluf_Model/TestModels.php b/tests/Pluf_Model/TestModels.php
new file mode 100644
index 0000000..7e0afdd
--- /dev/null
+++ b/tests/Pluf_Model/TestModels.php
@@ -0,0 +1,241 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume CMS, a website management application.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume CMS is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Plume CMS is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+Pluf::loadClass('Pluf_Model');
+
+class TestModel extends Pluf_Model
+{
+    function init()
+    {
+        $this->_a['table'] = 'testmodel';
+        $this->_a['model'] = 'TestModel';
+        $this->_a['cols'] = array(
+                             'id' =>
+                             array(
+                                   'type' => 'Pluf_DB_Field_Sequence',
+                                   'blank' => true,//It is automatically added.
+                                  ),
+                            'title' => 
+                            array(
+                                  'type' => 'Pluf_DB_Field_Varchar',
+                                  'blank' => false,
+                                  'size' => 100,
+                                  ),
+                            'description' => 
+                            array(
+                                  'type' => 'Pluf_DB_Field_Text',
+                                  'blank' => true,
+                                  ),
+                            );
+        $this->_a['idx'] = array(
+                           'title' =>
+                           array(
+                                 'type' => 'normal'
+                                 ),
+                           );
+
+        $this->_a['views'] = array(
+                             'simple' => 
+                             array(
+                                   'select' => 'testmodel_id, title, description',
+                                   ),
+                             '__unique__' =>
+                             array(
+                                   'select' => 'testmodel_id',
+                                   )
+                             );
+        parent::init();
+    }    
+
+}
+
+class TestModelRecurse extends Pluf_Model
+{
+    function init()
+    {
+        $this->_a['table'] = 'testmodelrecurse';
+        $this->_a['model'] = 'TestModelRecurse';
+        $this->_a['cols'] = array(
+                             'id' =>
+                             array(
+                                   'type' => 'Pluf_DB_Field_Sequence',
+                                   'blank' => true,//It is automatically added.
+                                  ),
+                            'title' => 
+                            array(
+                                  'type' => 'Pluf_DB_Field_Varchar',
+                                  'blank' => false,
+                                  'size' => 100,
+                                  ),
+                            'parentid' => 
+                            array(
+                                  'type' => 'Pluf_DB_Field_Foreignkey',
+                                  'blank' => true,
+                                  'model' => 'TestModelRecurse',
+                                  'relate_name'=> 'children',
+                                  ),
+                            );
+        $this->_a['idx'] = array();
+        $this->_a['views'] = array();
+        parent::init();
+    }    
+
+}
+
+
+class RelatedToTestModel2 extends Pluf_Model
+{
+    function init()
+    {
+        $this->_a['table'] = 'relatedtotestmodel2';
+        $this->_a['model'] = 'RelatedToTestModel2';
+        $this->_a['cols'] = array(
+                             'id' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Sequence',
+                                  'blank' => true, //It is automatically added.
+                                  ),
+                            'testmodel_1' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Foreignkey',
+                                  'blank' => false,
+                                  'model' => 'TestModel',
+                                  'relate_name' => 'first_rttm',
+                                  ),
+                             'testmodel_2' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Foreignkey',
+                                  'blank' => false,
+                                  'model' => 'TestModel',
+                                  'relate_name' => 'second_rttm',
+                                  ),
+                            'dummy' => 
+                            array(
+                                  'type' => 'Pluf_DB_Field_Varchar',
+                                  'blank' => false,
+                                  'size' => 100,
+                                  ),
+                            );
+        parent::init();
+    }    
+}
+
+
+class RelatedToTestModel extends Pluf_Model
+{
+    function init()
+    {
+        $this->_a['table'] = 'relatedtotestmodel';
+        $this->_a['model'] = 'RelatedToTestModel';
+        $this->_a['cols'] = array(
+                             'id' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Sequence',
+                                  'blank' => true, //It is automatically added.
+                                  ),
+                            'testmodel' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Foreignkey',
+                                  'blank' => false,
+                                  'model' => 'TestModel',
+                                  ),
+                            'dummy' => 
+                            array(
+                                  'type' => 'Pluf_DB_Field_Varchar',
+                                  'blank' => false,
+                                  'size' => 100,
+                                  ),
+                            );
+        $this->_a['idx'] = array(
+                            'testmodel_id' =>
+                            array(
+                                  'type' => 'normal',
+                                  'col' => 'testmodel',
+                                  ),
+                            );
+        $this->_a['views'] = array();
+        parent::init();
+    }    
+    
+}
+
+class ManyToManyOne extends Pluf_Model
+{
+    function init()
+    {
+        $this->_a['table'] = 'manytomanyone';
+        $this->_a['model'] = 'ManyToManyOne';
+        $this->_a['cols'] = array(
+                             'id' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Sequence',
+                                  'blank' => true, //It is automatically added.
+                                  ),
+                            'two' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Manytomany',
+                                  'blank' => true,
+                                  'model' => 'ManyToManyTwo',
+                                  ),
+                            'one' => 
+                            array(
+                                  'type' => 'Pluf_DB_Field_Varchar',
+                                  'blank' => false,
+                                  'size' => 100,
+                                  ),
+                            );
+        $this->_a['idx'] = array();
+        $this->_a['views'] = array();
+        /*                              'simple' => 
+                              array(
+                                    'join' => 'JOIN unit_tests_manytomanyone_manytwomanytwo_assoc ON ',
+                                    ),
+                              );
+        */
+    }    
+    
+}
+
+class ManyToManyTwo extends Pluf_Model
+{
+    function init()
+    {
+        $this->_a['table'] = 'manytomanytwo';
+        $this->_a['model'] = 'ManyToManyTwo';
+        $this->_a['cols'] = array(
+                             'id' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Sequence',
+                                  'blank' => true, //It is automatically added.
+                                  ),
+                            'two' => 
+                            array(
+                                  'type' => 'Pluf_DB_Field_Varchar',
+                                  'blank' => false,
+                                  'size' => 100,
+                                  ),
+                            );
+        $this->_a['idx'] = array();
+        $this->_a['views'] = array();
+    }    
+}
diff --git a/tests/Pluf_Model/relations.php b/tests/Pluf_Model/relations.php
new file mode 100644
index 0000000..e75dd63
--- /dev/null
+++ b/tests/Pluf_Model/relations.php
@@ -0,0 +1,33 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume CMS, a website management application.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume CMS is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Plume CMS is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+$m = array();
+$m['RelatedToTestModel'] = array('relate_to' => array('TestModel'),);
+$m['RelatedToTestModel2'] = array('relate_to' => array('TestModel'),);
+$m['TestModelRecurse'] = array('relate_to' => array('TestModelRecurse'),);
+$m['ManyToManyOne'] = array('relate_to_many' => array('ManyToManyTwo'),);
+return $m;
+
+
+
+?>
\ No newline at end of file
diff --git a/tests/Pluf_Paginator/PlufPaginatorTest.php b/tests/Pluf_Paginator/PlufPaginatorTest.php
new file mode 100644
index 0000000..a5bb237
--- /dev/null
+++ b/tests/Pluf_Paginator/PlufPaginatorTest.php
@@ -0,0 +1,76 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+error_reporting(E_ALL | E_STRICT);
+
+$path = dirname(__FILE__).'/../../src/';
+set_include_path(get_include_path().PATH_SEPARATOR.$path);
+
+require_once 'PHPUnit/Framework/TestCase.php';
+require_once 'PHPUnit/Framework/IncompleteTestError.php';
+
+require_once 'Pluf.php';
+require_once dirname(__FILE__).'/../Pluf_Form/TestFormModel.php';
+
+
+class PlufPaginatorTest extends PHPUnit_Framework_TestCase {
+    
+    protected function setUp()
+    {
+        Pluf::start(dirname(__FILE__).'/../conf/pluf.config.php');
+        $db = Pluf::db();
+        $schema = Pluf::factory('Pluf_DB_Schema', $db);
+        $m1 = new TestFormModel();
+        $schema->model = $m1;
+        $schema->dropTables();
+        $schema->createTables();
+        for ($i=1; $i<11; $i++) {
+            $m = new TestFormModel();
+            $m->title = 'My title '.$i;
+            $m->description = 'My description '.$i;
+            $m->create();
+        }
+    }
+
+    protected function tearDown()
+    {
+        $db = Pluf::db();
+        $schema = Pluf::factory('Pluf_DB_Schema', $db);
+        $m1 = new TestFormModel();
+        $schema->model = $m1;
+        $schema->dropTables();
+    }
+
+    public function testSimplePaginate()
+    {
+        $model = new TestFormModel();
+        $pag = Pluf::factory('Pluf_Paginator', $model);
+        $pag->action = '/permission/'; 
+        $pag->items_per_page = 5;
+        $render = file_get_contents(dirname(__FILE__).'/rendersimplepaginate.html');
+        $this->assertEquals($render, $pag->render());
+        $this->assertEquals($pag->page_number, 2);
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/tests/Pluf_Paginator/rendersimplepaginate.html b/tests/Pluf_Paginator/rendersimplepaginate.html
new file mode 100644
index 0000000..f5fb3da
--- /dev/null
+++ b/tests/Pluf_Paginator/rendersimplepaginate.html
@@ -0,0 +1,14 @@
+<table>
+<thead>
+<tr><th class="px-table-search" colspan="3"><form method="get" action="/testapp?_px_action=%2Fpermission%2F"><input type="hidden" name="_px_action" value="/permission/" /><label for="px-q">Search for:</label><input type="text" name="_px_q" id="px-q" size="30" value="" /><input type="submit" name="submit" value="Search" /></form></th></tr>
+<tr><th>Id</th><th>Title of the item</th><th>My Title</th></tr>
+</thead>
+<tfoot><tr><th colspan="3">
+<a class="px-current-page" href="/testapp?_px_action=%2Fpermission%2F&amp;_px_q=&amp;_px_p=1">1</a> <a href="/testapp?_px_action=%2Fpermission%2F&amp;_px_q=&amp;_px_p=2">2</a> <a href="/testapp?_px_action=%2Fpermission%2F&amp;_px_q=&amp;_px_p=2">Next</a> </th></tr></tfoot>
+<tbody><tr><td>1</td><td>"My title 1"</td><td>"My title 1"</td></tr>
+<tr><td>2</td><td>"My title 2"</td><td>"My title 2"</td></tr>
+<tr><td>3</td><td>"My title 3"</td><td>"My title 3"</td></tr>
+<tr><td>4</td><td>"My title 4"</td><td>"My title 4"</td></tr>
+<tr><td>5</td><td>"My title 5"</td><td>"My title 5"</td></tr>
+</tbody>
+</table>
diff --git a/tests/Pluf_SQL/PlufSQLTest.php b/tests/Pluf_SQL/PlufSQLTest.php
new file mode 100644
index 0000000..e7510a5
--- /dev/null
+++ b/tests/Pluf_SQL/PlufSQLTest.php
@@ -0,0 +1,114 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+error_reporting(E_ALL | E_STRICT);
+
+$path = dirname(__FILE__).'/../../src/';
+set_include_path(get_include_path().PATH_SEPARATOR.$path);
+
+require_once 'PHPUnit/Framework/TestCase.php';
+require_once 'PHPUnit/Framework/IncompleteTestError.php';
+
+require_once 'Pluf.php';
+
+class PlufSQLTest extends PHPUnit_Framework_TestCase {
+    
+    protected function setUp()
+    {
+        Pluf::start(dirname(__FILE__).'/../conf/pluf.config.php');
+        $this->db = Pluf::db();
+    }
+
+    protected function tearDown()
+    {
+    }
+
+    public function testSimpleSQLAnd()
+    {
+        $sql = Pluf::factory('Pluf_SQL');
+        $sql->Q('blablo=%s', 'bli');
+        $this->assertEquals('blablo=\'bli\'', $sql->gen());
+    }
+
+    public function testSQLAndOr()
+    {
+        $sql1 = Pluf::factory('Pluf_SQL');
+        $sql1->Q('title=%s', 'my title');
+        $sql2 = Pluf::factory('Pluf_SQL');
+        $sql2->Q('description=%s', '%par example');
+        $sql3 = Pluf::factory('Pluf_SQL');
+        $sql3->Q('status=%s', '1');
+        $sql4 = Pluf::factory('Pluf_SQL');
+        $sql4->Q('keywords=%s', "tag'gi`ng");
+        $sql1->SAnd($sql2);
+        $sql3->SAnd($sql4);
+        $sql1->SOr($sql3);
+        if ($this->db->engine == 'SQLite') {
+            $res = "((title='my title') AND (description='%par example'))";
+            $res .= " OR ((status='1') AND (keywords='tag''gi`ng'))";
+        } else {
+            $res = "((title='my title') AND (description='%par example'))";
+            $res .= " OR ((status='1') AND (keywords='tag\'gi`ng'))";
+        }
+        $this->assertEquals($res, $sql1->gen());
+    }
+
+    public function testChainSQLAndOr()
+    {
+        $sql1 = new Pluf_SQL('title=%s', 'my title');
+        $sql2 = Pluf::factory('Pluf_SQL');
+        $sql1->Q('description=%s', '%par example')->Q('keywords=%s', "tag'gi`ng");
+        $sql3 = Pluf::factory('Pluf_SQL');
+        $sql3->Q('status=%s', '1');
+        $sql1->SOr($sql3);
+        if ($this->db->engine == 'SQLite') {
+            $res = "(title='my title' AND description='%par example' AND keywords='tag''gi`ng')";
+            $res .= " OR (status='1')";
+        } else {
+            $res = "(title='my title' AND description='%par example' AND keywords='tag\''gi`ng')";
+            $res .= " OR (status='1')";
+        }
+        $this->assertEquals($res, $sql1->gen());
+    }
+
+    public function testORSQLKeywords()
+    {
+        $query = 'key1 key2   key3';
+        $fields = array('title', 'description');
+        $lastsql = Pluf::factory('Pluf_SQL');
+        $keywords = $lastsql->keywords($query);
+        foreach ($keywords as $key) {
+            $sql = Pluf::factory('Pluf_SQL');
+            foreach ($fields as $field) {
+                $sqlor = Pluf::factory('Pluf_SQL');
+                $sqlor->Q($field.' LIKE %s', '%'.$key.'%');
+                $sql->SOr($sqlor);
+            }
+            $lastsql->SAnd($sql);
+        }
+        $res = "(((title LIKE '%key1%') OR (description LIKE '%key1%')) AND ((title LIKE '%key2%') OR (description LIKE '%key2%'))) AND ((title LIKE '%key3%') OR (description LIKE '%key3%'))";
+        $this->assertEquals($res, $lastsql->gen());
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/tests/Pluf_Template/PlufTemplateTest.php b/tests/Pluf_Template/PlufTemplateTest.php
new file mode 100644
index 0000000..34f20b2
--- /dev/null
+++ b/tests/Pluf_Template/PlufTemplateTest.php
@@ -0,0 +1,60 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+error_reporting(E_ALL | E_STRICT);
+
+$path = dirname(__FILE__).'/../../src/';
+set_include_path(get_include_path().PATH_SEPARATOR.$path);
+
+require_once 'PHPUnit/Framework/TestCase.php';
+require_once 'PHPUnit/Framework/IncompleteTestError.php';
+
+require_once 'Pluf.php';
+
+class PlufTemplateTest extends PHPUnit_Framework_TestCase {
+    
+    protected function setUp()
+    {
+        Pluf::start(dirname(__FILE__).'/../conf/pluf.config.php');
+    }
+
+    public function testRender()
+    {
+        $folders =  array(
+                          dirname(__FILE__).'/../Pluf_Template_Compiler/tpl1',
+                          dirname(__FILE__).'/../Pluf_Template_Compiler/tpl2',
+                          );
+        $tmpl = new Pluf_Template('tpl-extends.html', $folders);
+        $this->assertEquals("This is the base template
+
+Hello blockname
+
+toto 
+
+Template base \"Bye bye block2\" here:Bye bye block2", $tmpl->render());
+    }
+
+
+}
+
+?>
\ No newline at end of file
diff --git a/tests/Pluf_Template/tpl-test1.html b/tests/Pluf_Template/tpl-test1.html
new file mode 100644
index 0000000..1bdb4c5
--- /dev/null
+++ b/tests/Pluf_Template/tpl-test1.html
@@ -0,0 +1 @@
+{$toto}
diff --git a/tests/Pluf_Template_Compiler/PlufTemplateCompilerBlockTransTest.php b/tests/Pluf_Template_Compiler/PlufTemplateCompilerBlockTransTest.php
new file mode 100644
index 0000000..18b73be
--- /dev/null
+++ b/tests/Pluf_Template_Compiler/PlufTemplateCompilerBlockTransTest.php
@@ -0,0 +1,74 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+error_reporting(E_ALL | E_STRICT);
+
+$path = dirname(__FILE__).'/../../src/';
+set_include_path(get_include_path().PATH_SEPARATOR.$path);
+
+require_once 'PHPUnit/Framework/TestCase.php';
+require_once 'PHPUnit/Framework/IncompleteTestError.php';
+
+require_once 'Pluf.php';
+
+class PlufTemplateCompilerBlockTransTest extends PHPUnit_Framework_TestCase {
+    
+    protected function setUp()
+    {
+        Pluf::start(dirname(__FILE__).'/../conf/pluf.config.php');
+    }
+
+    public function testCompile()
+    {
+        return '';
+        $compiler = new Pluf_Template_Compiler('dummy', array(), false);
+        $compiler->templateContent = '{blocktrans $count, $toto}We have one {$toto} element.{plural}We have {$counter} {$toto} elements.{/blocktrans}';
+        $this->assertEquals('<?php $_b_t_c=$t->_vars[\'count\']; ob_start(); ?>We have one %2$s element.<?php $_b_t_s=ob_get_contents(); ob_end_clean(); ob_start(); ?>We have %1$d %2$s elements.<?php $_b_t_p=ob_get_contents(); ob_end_clean(); echo(sprintf(_n($_b_t_s, $_b_t_p, $_b_t_c), $_b_t_c, Pluf_Template_safeEcho($t->_vars[\'toto\'], false))); ?>',
+                            $compiler->getCompiledTemplate());
+
+    }
+
+    public function testExtract()
+    {
+        $compiler = new Pluf_Translation_TemplateExtractor('dummy', array(), false);
+        $compiler->templateContent = 'not in block {blocktrans $count, $toto}We have one {$toto} {$titi|nl2br} element.{plural}We have {$counter} {$toto} elements.{/blocktrans} not in block {trans \'toto\'} not in block {blocktrans}simple'."\n".' block{/blocktrans} sad {trans "youpla"}';
+        //print $compiler->compile();
+    }
+
+    public function testCompileComplex()
+    {
+        $compiler = new Pluf_Template_Compiler('dummy', array(), false);
+        $compiler->templateContent = '
+    <h1>{trans "Pluf internationalization"}</h1>
+    {assign $n_methods = $methods.count()}
+    <p>{blocktrans $n_methods}To translate your code, use the following method:{plural}To translate your code, use one of the {$n_methods} methods:{/blocktrans}</p>
+    <ul>
+    {foreach $methods as $method}
+       <li>{blocktrans}Name: {$method.name}, Description: {$method.description}.{/blocktrans}</li>
+    {/foreach}
+    </ul>
+    </html>';
+        //echo $compiler->getCompiledTemplate();
+    }
+
+}
\ No newline at end of file
diff --git a/tests/Pluf_Template_Compiler/PlufTemplateCompilerMethodCompile2Test.php b/tests/Pluf_Template_Compiler/PlufTemplateCompilerMethodCompile2Test.php
new file mode 100644
index 0000000..54cb0af
--- /dev/null
+++ b/tests/Pluf_Template_Compiler/PlufTemplateCompilerMethodCompile2Test.php
@@ -0,0 +1,62 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+error_reporting(E_ALL | E_STRICT);
+
+$path = dirname(__FILE__).'/../../src/';
+set_include_path(get_include_path().PATH_SEPARATOR.$path);
+
+require_once 'PHPUnit/Framework/TestCase.php';
+require_once 'PHPUnit/Framework/IncompleteTestError.php';
+
+require_once 'Pluf.php';
+
+class PlufTemplateCompilerMethodCompile2Test extends PHPUnit_Framework_TestCase {
+    
+    protected function setUp()
+    {
+        Pluf::start(dirname(__FILE__).'/../conf/pluf.config.php');
+    }
+
+    public function testCompile()
+    {
+        $compiler = new Pluf_Template_Compiler('tpl-extends.html', array(dirname(__FILE__)));
+        $compiled = file_get_contents(dirname(__FILE__).'/tpl-extends.compiled.html');
+        $this->assertEquals($compiled, $compiler->getCompiledTemplate()."\n");
+    }
+
+    public function testCompileMultiFolders()
+    {
+        $folders =  array(
+                          dirname(__FILE__).'/tpl1',
+                          dirname(__FILE__).'/tpl2',
+                          );
+        $compiler = new Pluf_Template_Compiler('tpl-extends.html', $folders);
+        $compiled = file_get_contents(dirname(__FILE__).'/tpl-extends.compiled.html');
+        $this->assertEquals($compiled, $compiler->getCompiledTemplate()."\n");
+    }
+
+
+}
+
+?>
\ No newline at end of file
diff --git a/tests/Pluf_Template_Compiler/PlufTemplateCompilerMethodCompileTest.php b/tests/Pluf_Template_Compiler/PlufTemplateCompilerMethodCompileTest.php
new file mode 100644
index 0000000..a15b38e
--- /dev/null
+++ b/tests/Pluf_Template_Compiler/PlufTemplateCompilerMethodCompileTest.php
@@ -0,0 +1,141 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+error_reporting(E_ALL | E_STRICT);
+
+$path = dirname(__FILE__).'/../../src/';
+set_include_path(get_include_path().PATH_SEPARATOR.$path);
+
+require_once 'PHPUnit/Framework/TestCase.php';
+require_once 'PHPUnit/Framework/IncompleteTestError.php';
+
+require_once 'Pluf.php';
+
+class PlufTemplateCompilerMethodCompileTest extends PHPUnit_Framework_TestCase {
+    
+    protected function setUp()
+    {
+        Pluf::start(dirname(__FILE__).'/../conf/pluf.config.php');
+    }
+
+    public function testCompile()
+    {
+        $compiler = new Pluf_Template_Compiler('tpl-test1.html', array(dirname(__FILE__)));
+        $this->assertEquals('<?php Pluf_Template_safeEcho($t->_vars[\'toto\']); ?>'."\n\n", 
+                            $compiler->getCompiledTemplate());
+    }
+
+    public function testCompile2()
+    {
+        $compiler = new Pluf_Template_Compiler('tpl-test2.html', array(dirname(__FILE__)));
+        $this->assertEquals('<?php Pluf_Template_safeEcho($t->_vars[\'toto\']); ?>'."\n\n", 
+                            $compiler->getCompiledTemplate());
+    }
+
+    public function testCompile3()
+    {
+        $compiler = new Pluf_Template_Compiler('tpl-test3.html', array(dirname(__FILE__)));
+        $res = file_get_contents(dirname(__FILE__).'/tpl-test3.compiled.html');
+        $this->assertEquals($res, $compiler->getCompiledTemplate());
+    }
+
+    public function testCompile5()
+    {
+        $compiler = new Pluf_Template_Compiler('tpl-test5.html', array(dirname(__FILE__)));
+        $this->assertEquals("<?php \$t->_vars['string3'] = \$t->_vars['string2'].\$t->_vars['string1']; ?>", $compiler->getCompiledTemplate());
+    }
+
+    public function testCompileString()
+    {
+        $compiler = new Pluf_Template_Compiler('tpl-teststring.html', array(dirname(__FILE__)));
+        $this->assertEquals('<?php Pluf_Template_safeEcho("this is a string"); ?>'."\n\n", $compiler->getCompiledTemplate());
+    }
+
+    public function testCompileStringModifier()
+    {
+        $compiler = new Pluf_Template_Compiler('tpl-teststring-modifier.html', array(dirname(__FILE__)));
+        $this->assertEquals('<?php Pluf::loadFunction(\'Pluf_Template_unsafe\');  Pluf_Template_safeEcho(Pluf_Template_unsafe("this is a string")); ?>'."\n\n", $compiler->getCompiledTemplate());
+    }
+
+    public function testCompileRemoveComments()
+    {
+        $compiler = new Pluf_Template_Compiler('dummy', array(), false);
+        $compiler->templateContent = 'you {* this is a comment *} boum';
+        $this->assertEquals('you  boum', $compiler->getCompiledTemplate());
+    }
+
+    public function testCompileRemovePhpCode()
+    {
+        $compiler = new Pluf_Template_Compiler('dummy', array(), false);
+        $compiler->templateContent = 'you <?php exit(); '."\n\n".' ?> boum';
+        $this->assertEquals('you  boum', $compiler->getCompiledTemplate());
+    }
+
+    public function testCompileSimpleBlockTrans()
+    {
+        $compiler = new Pluf_Template_Compiler('dummy', array(), false);
+        $compiler->templateContent = '{blocktrans}Youpla boum {$toto} is here.{/blocktrans}';
+        $this->assertEquals('<?php ob_start(); ?>Youpla boum %1$s is here.<?php $_b_t_s=ob_get_contents(); ob_end_clean(); echo(sprintf(__($_b_t_s), Pluf_Template_safeEcho($t->_vars[\'toto\'], false))); ?>',
+                            $compiler->getCompiledTemplate());
+    }
+
+    public function testCompileSimpleBlockTransPlural()
+    {
+        $compiler = new Pluf_Template_Compiler('dummy', array(), false);
+        $compiler->templateContent = '{blocktrans $count, $toto}Youpla boum {$toto} is here.{plural}Youpla boum {$counter} {$toto} are here.{/blocktrans}';
+        $this->assertEquals('<?php $_b_t_c=$t->_vars[\'count\']; ob_start(); ?>Youpla boum %2$s is here.<?php $_b_t_s=ob_get_contents(); ob_end_clean(); ob_start(); ?>Youpla boum %1$d %2$s are here.<?php $_b_t_p=ob_get_contents(); ob_end_clean(); echo(sprintf(_n($_b_t_s, $_b_t_p, $_b_t_c), $_b_t_c, Pluf_Template_safeEcho($t->_vars[\'toto\'], false))); ?>',
+                            $compiler->getCompiledTemplate());
+    }
+
+    public function testCompileSimpleBlockTransPluralMoreArgs()
+    {
+        $compiler = new Pluf_Template_Compiler('dummy', array(), false);
+        $compiler->templateContent = '{blocktrans $count, $toto, $titi, $tata}Youpla boum {$toto} {$tata} is here.{plural}Youpla boum {$counter} {$toto} are here.{/blocktrans}';
+        $this->assertEquals('<?php $_b_t_c=$t->_vars[\'count\']; ob_start(); ?>Youpla boum %2$s %4$s is here.<?php $_b_t_s=ob_get_contents(); ob_end_clean(); ob_start(); ?>Youpla boum %1$d %2$s are here.<?php $_b_t_p=ob_get_contents(); ob_end_clean(); echo(sprintf(_n($_b_t_s, $_b_t_p, $_b_t_c), $_b_t_c, Pluf_Template_safeEcho($t->_vars[\'toto\'], false), Pluf_Template_safeEcho($t->_vars[\'titi\'], false), Pluf_Template_safeEcho($t->_vars[\'tata\'], false))); ?>',
+                            $compiler->getCompiledTemplate());
+    }
+
+    public function testCompileSimpleAssignInLoop()
+    {
+        $compiler = new Pluf_Template_Compiler('dummy', array(), false);
+        $compiler->templateContent = '{assign $counter = 1}
+{foreach $lines as $line}
+{$counter}
+{assign $counter = $counter+1}
+{/foreach}';
+        $this->assertEquals('<?php $t->_vars[\'counter\'] = 1; ?>
+
+<?php foreach ($t->_vars[\'lines\'] as $t->_vars[\'line\']): ?>
+
+<?php Pluf_Template_safeEcho($t->_vars[\'counter\']); ?>
+
+<?php $t->_vars[\'counter\'] = $t->_vars[\'counter\']+1; ?>
+
+<?php endforeach; ?>',
+                            $compiler->getCompiledTemplate());
+    }
+
+
+
+}
+
diff --git a/tests/Pluf_Template_Compiler/tpl-base.html b/tests/Pluf_Template_Compiler/tpl-base.html
new file mode 100644
index 0000000..8404fe5
--- /dev/null
+++ b/tests/Pluf_Template_Compiler/tpl-base.html
@@ -0,0 +1,5 @@
+This is the base template
+
+{block blockname}Hello blockname{/block}
+
+{block block2}Bye bye block2{/block}
\ No newline at end of file
diff --git a/tests/Pluf_Template_Compiler/tpl-extends.compiled.html b/tests/Pluf_Template_Compiler/tpl-extends.compiled.html
new file mode 100644
index 0000000..a85fcb3
--- /dev/null
+++ b/tests/Pluf_Template_Compiler/tpl-extends.compiled.html
@@ -0,0 +1,8 @@
+This is the base template
+
+Hello blockname
+
+toto <?php if ($t->_vars['titi']): ?> toto 2 <?php endif; ?>
+
+
+Template base "Bye bye block2" here:Bye bye block2
diff --git a/tests/Pluf_Template_Compiler/tpl-extends.html b/tests/Pluf_Template_Compiler/tpl-extends.html
new file mode 100644
index 0000000..59228f3
--- /dev/null
+++ b/tests/Pluf_Template_Compiler/tpl-extends.html
@@ -0,0 +1,6 @@
+{extends 'tpl-base.html'}
+{block blockname3}toto{/block}
+
+{block block2}toto {if $titi} toto 2 {/if}
+
+Template base "Bye bye block2" here:{superblock}{/block}
\ No newline at end of file
diff --git a/tests/Pluf_Template_Compiler/tpl-test1.html b/tests/Pluf_Template_Compiler/tpl-test1.html
new file mode 100644
index 0000000..1bdb4c5
--- /dev/null
+++ b/tests/Pluf_Template_Compiler/tpl-test1.html
@@ -0,0 +1 @@
+{$toto}
diff --git a/tests/Pluf_Template_Compiler/tpl-test2.html b/tests/Pluf_Template_Compiler/tpl-test2.html
new file mode 100644
index 0000000..0bc5e7e
--- /dev/null
+++ b/tests/Pluf_Template_Compiler/tpl-test2.html
@@ -0,0 +1 @@
+{include 'tpl-test1.html'}
\ No newline at end of file
diff --git a/tests/Pluf_Template_Compiler/tpl-test3.compiled.html b/tests/Pluf_Template_Compiler/tpl-test3.compiled.html
new file mode 100644
index 0000000..bb9339e
--- /dev/null
+++ b/tests/Pluf_Template_Compiler/tpl-test3.compiled.html
@@ -0,0 +1,5 @@
+<?php $_extra_tag = Pluf::factory('Pluf_Template_Tag_Url', $t); $_extra_tag->start('/action/'.$t->_vars['toto'].'/'); ?>
+
+<?php $_extra_tag = Pluf::factory('Pluf_Template_Tag_Mytag', $t); $_extra_tag->start('sdfsd', 'sdfsdf'); $t->set('mytag', 'hello world!');?>
+
+<?php $_extra_tag = Pluf::factory('Pluf_Template_Tag_Mytag', $t); $_extra_tag->end('param 1'); $t->set('mytag', '');?>
\ No newline at end of file
diff --git a/tests/Pluf_Template_Compiler/tpl-test3.html b/tests/Pluf_Template_Compiler/tpl-test3.html
new file mode 100644
index 0000000..1db046c
--- /dev/null
+++ b/tests/Pluf_Template_Compiler/tpl-test3.html
@@ -0,0 +1,3 @@
+{url '/action/'~$toto~'/'}
+{mytag 'sdfsd', 'sdfsdf'}
+{/mytag 'param 1'}
\ No newline at end of file
diff --git a/tests/Pluf_Template_Compiler/tpl-test4.html b/tests/Pluf_Template_Compiler/tpl-test4.html
new file mode 100644
index 0000000..eb7fbf5
--- /dev/null
+++ b/tests/Pluf_Template_Compiler/tpl-test4.html
@@ -0,0 +1,3 @@
+{foreach $items as $item}
+{$item}
+{/foreach}
\ No newline at end of file
diff --git a/tests/Pluf_Template_Compiler/tpl-test5.html b/tests/Pluf_Template_Compiler/tpl-test5.html
new file mode 100644
index 0000000..d677d9f
--- /dev/null
+++ b/tests/Pluf_Template_Compiler/tpl-test5.html
@@ -0,0 +1 @@
+{assign $string3 = $string2~$string1}
\ No newline at end of file
diff --git a/tests/Pluf_Template_Compiler/tpl-teststring-modifier.html b/tests/Pluf_Template_Compiler/tpl-teststring-modifier.html
new file mode 100644
index 0000000..04d832c
--- /dev/null
+++ b/tests/Pluf_Template_Compiler/tpl-teststring-modifier.html
@@ -0,0 +1 @@
+{"this is a string"|unsafe}
diff --git a/tests/Pluf_Template_Compiler/tpl-teststring.html b/tests/Pluf_Template_Compiler/tpl-teststring.html
new file mode 100644
index 0000000..b91d843
--- /dev/null
+++ b/tests/Pluf_Template_Compiler/tpl-teststring.html
@@ -0,0 +1 @@
+{"this is a string"}
diff --git a/tests/Pluf_Template_Compiler/tpl1/tpl-extends.html b/tests/Pluf_Template_Compiler/tpl1/tpl-extends.html
new file mode 100644
index 0000000..d561e93
--- /dev/null
+++ b/tests/Pluf_Template_Compiler/tpl1/tpl-extends.html
@@ -0,0 +1,6 @@
+{extends 'tpl-base.html'}
+{block blockname3}toto{/block}
+
+{block block2}toto {if $titi} toto 2 {/if}
+
+Template base "Bye bye block2" here:{superblock}{/block}
diff --git a/tests/Pluf_Template_Compiler/tpl2/tpl-base.html b/tests/Pluf_Template_Compiler/tpl2/tpl-base.html
new file mode 100644
index 0000000..8404fe5
--- /dev/null
+++ b/tests/Pluf_Template_Compiler/tpl2/tpl-base.html
@@ -0,0 +1,5 @@
+This is the base template
+
+{block blockname}Hello blockname{/block}
+
+{block block2}Bye bye block2{/block}
\ No newline at end of file
diff --git a/tests/Pluf_Text_HTML_Filter/PlufTextHTMLFilter.php b/tests/Pluf_Text_HTML_Filter/PlufTextHTMLFilter.php
new file mode 100644
index 0000000..12440ef
--- /dev/null
+++ b/tests/Pluf_Text_HTML_Filter/PlufTextHTMLFilter.php
@@ -0,0 +1,306 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+error_reporting(E_ALL | E_STRICT);
+
+$path = dirname(__FILE__).'/../../src/';
+set_include_path(get_include_path().PATH_SEPARATOR.$path);
+
+require_once 'PHPUnit/Framework/TestCase.php';
+require_once 'PHPUnit/Framework/IncompleteTestError.php';
+
+require_once 'Pluf.php';
+
+/**
+ * Based on the tests provided with the Pluf_Text_HTML_Filter original
+ * library.
+ */
+class PlufTextHTMLFilter extends PHPUnit_Framework_TestCase {
+    public $filter = '';
+    
+    protected function setUp()
+    {
+        Pluf::start(dirname(__FILE__).'/../conf/pluf.config.php');
+        $this->filter = new Pluf_Text_HTML_Filter();
+    }
+
+    protected function tearDown()
+    {
+    }
+
+    public function testRunBatchOfTests()
+    {
+        // basics
+        $this->filter_harness("","");
+        $this->filter_harness("hello","hello");
+
+        // balancing tags
+        $this->filter_harness("<b>hello","<b>hello</b>");
+        $this->filter_harness("hello<b>","hello");
+        $this->filter_harness("hello<b>world","hello<b>world</b>");
+        $this->filter_harness("hello</b>","hello");
+        $this->filter_harness("hello<b/>","hello");
+        $this->filter_harness("hello<b/>world","hello<b>world</b>");
+        $this->filter_harness("<b><b><b>hello","<b><b><b>hello</b></b></b>");
+        $this->filter_harness("</b><b>","");
+
+        // end slashes
+        $this->filter_harness('<img>','<img />');
+        $this->filter_harness('<img/>','<img />');
+        $this->filter_harness('<b/></b>','');
+
+        // balancing angle brakets
+
+        $this->filter->always_make_tags = 1;
+        $this->filter_harness('<img src="foo"','<img src="foo" />');
+        $this->filter_harness('b>','');
+        $this->filter_harness('b>hello','<b>hello</b>');
+        $this->filter_harness('<img src="foo"/','<img src="foo" />');
+        $this->filter_harness('>','');
+        $this->filter_harness('hello<b','hello');
+        $this->filter_harness('b>foo','<b>foo</b>');
+        $this->filter_harness('><b','');
+        $this->filter_harness('b><','');
+        $this->filter_harness('><b>','');
+        $this->filter_harness('foo bar>','');
+        $this->filter_harness('foo>bar>baz','baz');
+        $this->filter_harness('foo>bar','bar');
+        $this->filter_harness('foo>bar>','');
+        $this->filter_harness('>foo>bar','bar');
+        $this->filter_harness('>foo>bar>','');
+
+        $this->filter->always_make_tags = 0;
+        $this->filter_harness('<img src="foo"','&lt;img src=&quot;foo&quot;');
+        $this->filter_harness('b>','b&gt;');
+        $this->filter_harness('b>hello','b&gt;hello');
+        $this->filter_harness('<img src="foo"/','&lt;img src=&quot;foo&quot;/');
+        $this->filter_harness('>','&gt;');
+        $this->filter_harness('hello<b','hello&lt;b');
+        $this->filter_harness('b>foo','b&gt;foo');
+        $this->filter_harness('><b','&gt;&lt;b');
+        $this->filter_harness('b><','b&gt;&lt;');
+        $this->filter_harness('><b>','&gt;');
+        $this->filter_harness('foo bar>','foo bar&gt;');
+        $this->filter_harness('foo>bar>baz','foo&gt;bar&gt;baz');
+        $this->filter_harness('foo>bar','foo&gt;bar');
+        $this->filter_harness('foo>bar>','foo&gt;bar&gt;');
+        $this->filter_harness('>foo>bar','&gt;foo&gt;bar');
+        $this->filter_harness('>foo>bar>','&gt;foo&gt;bar&gt;');
+
+
+        // attributes
+        $this->filter_harness('<img src=foo>','<img src="foo" />');
+        $this->filter_harness('<img asrc=foo>','<img />');
+        $this->filter_harness('<img src=test test>','<img src="test" />');
+
+        // non-allowed tags
+        $this->filter_harness('<script>','');
+        $this->filter_harness('<script/>','');
+        $this->filter_harness('</script>','');
+        $this->filter_harness('<script woo=yay>','');
+        $this->filter_harness('<script woo="yay">','');
+        $this->filter_harness('<script woo="yay>','');
+
+        $this->filter->always_make_tags = 1;
+        $this->filter_harness('<script','');
+        $this->filter_harness('<script woo="yay<b>','');
+        $this->filter_harness('<script woo="yay<b>hello','<b>hello</b>');
+        $this->filter_harness('<script<script>>','');
+        $this->filter_harness('<<script>script<script>>','script');
+        $this->filter_harness('<<script><script>>','');
+        $this->filter_harness('<<script>script>>','');
+        $this->filter_harness('<<script<script>>','');
+
+        $this->filter->always_make_tags = 0;
+        $this->filter_harness('<script','&lt;script');
+        $this->filter_harness('<script woo="yay<b>','&lt;script woo=&quot;yay');
+        $this->filter_harness('<script woo="yay<b>hello','&lt;script woo=&quot;yay<b>hello</b>');
+        $this->filter_harness('<script<script>>','&lt;script&gt;');
+        $this->filter_harness('<<script>script<script>>','&lt;script&gt;');
+        $this->filter_harness('<<script><script>>','&lt;&gt;');
+        $this->filter_harness('<<script>script>>','&lt;script&gt;&gt;');
+        $this->filter_harness('<<script<script>>','&lt;&lt;script&gt;');
+
+
+        // bad protocols
+        $this->filter_harness('<a href="http://foo">bar</a>', '<a href="http://foo">bar</a>');
+        $this->filter_harness('<a href="ftp://foo">bar</a>', '<a href="ftp://foo">bar</a>');
+        $this->filter_harness('<a href="mailto:foo">bar</a>', '<a href="mailto:foo">bar</a>');
+        $this->filter_harness('<a href="javascript:foo">bar</a>', '<a href="#foo">bar</a>');
+        $this->filter_harness('<a href="java script:foo">bar</a>', '<a href="#foo">bar</a>');
+        $this->filter_harness('<a href="java'."\t".'script:foo">bar</a>', '<a href="#foo">bar</a>');
+        $this->filter_harness('<a href="java'."\n".'script:foo">bar</a>', '<a href="#foo">bar</a>');
+        $this->filter_harness('<a href="java'."\r".'script:foo">bar</a>', '<a href="#foo">bar</a>');
+        $this->filter_harness('<a href="java'.chr(1).'script:foo">bar</a>', '<a href="#foo">bar</a>');
+        $this->filter_harness('<a href="java'.chr(0).'script:foo">bar</a>', '<a href="#foo">bar</a>');
+        $this->filter_harness('<a href="jscript:foo">bar</a>', '<a href="#foo">bar</a>');
+        $this->filter_harness('<a href="vbscript:foo">bar</a>', '<a href="#foo">bar</a>');
+        $this->filter_harness('<a href="view-source:foo">bar</a>', '<a href="#foo">bar</a>');
+        $this->filter_harness('<a href="  javascript:foo">bar</a>', '<a href="#foo">bar</a>');
+        $this->filter_harness('<a href="jAvAsCrIpT:foo">bar</a>', '<a href="#foo">bar</a>');
+
+        // bad protocols with entities (semicolons)
+        $this->filter_harness('<a href="&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;&#112;&#116;&#58;foo">bar</a>', '<a href="#foo">bar</a>');
+        $this->filter_harness('<a href="&#0000106;&#0000097;&#0000118;&#0000097;&#0000115;&#0000099;&#0000114;&#0000105;&#0000112;&#0000116;&#0000058;foo">bar</a>', '<a href="#foo">bar</a>');
+        $this->filter_harness('<a href="&#x6A;&#x61;&#x76;&#x61;&#x73;&#x63;&#x72;&#x69;&#x70;&#x74;&#x3A;foo">bar</a>', '<a href="#foo">bar</a>');
+
+        // bad protocols with entities (no semicolons)
+        $this->filter_harness('<a href="&#106&#97&#118&#97&#115&#99&#114&#105&#112&#116&#58;foo">bar</a>', '<a href="#foo">bar</a>');
+        $this->filter_harness('<a href="&#0000106&#0000097&#0000118&#0000097&#0000115&#0000099&#0000114&#0000105&#0000112&#0000116&#0000058foo">bar</a>', '<a href="#foo">bar</a>');
+        $this->filter_harness('<a href="&#x6A&#x61&#x76&#x61&#x73&#x63&#x72&#x69&#x70&#x74&#x3A;foo">bar</a>', '<a href="#foo">bar</a>');
+
+        // self-closing tags
+        $this->filter_harness('<img src="a">', '<img src="a" />');
+        $this->filter_harness('<img src="a">foo</img>', '<img src="a" />foo');
+        $this->filter_harness('</img>', '');
+
+        // typos
+        $this->filter_harness('<b>test<b/>', '<b>test</b>');
+        $this->filter_harness('<b/>test<b/>', '<b>test</b>');
+        $this->filter_harness('<b/>test', '<b>test</b>');
+
+        // case conversion
+        $this->case_harness('hello world', 'hello world');
+        $this->case_harness('Hello world', 'Hello world');
+        $this->case_harness('Hello World', 'Hello World');
+        $this->case_harness('HELLO World', 'HELLO World');
+        $this->case_harness('HELLO WORLD', 'Hello world');
+        $this->case_harness('<b>HELLO WORLD', '<b>Hello world');
+        $this->case_harness('<B>HELLO WORLD', '<B>Hello world');
+        $this->case_harness('HELLO. WORLD', 'Hello. World');
+        $this->case_harness('HELLO<b> WORLD', 'Hello<b> World');
+        $this->case_harness("DOESN'T", "Doesn't");
+        $this->case_harness("COMMA, TEST", 'Comma, test');
+        $this->case_harness("SEMICOLON; TEST", 'Semicolon; test');
+        $this->case_harness("DASH - TEST", 'Dash - test');
+
+        // comments
+        $this->filter->strip_comments = 0;
+        $this->filter_harness('hello <!-- foo --> world', 'hello <!-- foo --> world');
+        $this->filter_harness('hello <!-- <foo --> world', 'hello <!-- &lt;foo --> world');
+        $this->filter_harness('hello <!-- foo> --> world', 'hello <!-- foo&gt; --> world');
+        $this->filter_harness('hello <!-- <foo> --> world', 'hello <!-- &lt;foo&gt; --> world');
+
+        $this->filter->strip_comments = 1;
+        $this->filter_harness('hello <!-- foo --> world', 'hello  world');
+        $this->filter_harness('hello <!-- <foo --> world', 'hello  world');
+        $this->filter_harness('hello <!-- foo> --> world', 'hello  world');
+        $this->filter_harness('hello <!-- <foo> --> world', 'hello  world');
+
+        // br - shouldn't get caught by the empty 'b' tag remover
+        $this->filter->allowed['br'] = array();
+        $this->filter->no_close[] = 'br';
+        $this->filter_harness('foo<br>bar', 'foo<br />bar');
+        $this->filter_harness('foo<br />bar', 'foo<br />bar');
+
+        // stray quotes
+        $this->filter_harness('foo"bar', 'foo&quot;bar');
+        $this->filter_harness('foo"', 'foo&quot;');
+        $this->filter_harness('"bar', '&quot;bar');
+        $this->filter_harness('<a href="foo"bar">baz</a>', '<a href="foo">baz</a>');
+        $this->filter_harness('<a href=foo"bar>baz</a>', '<a href="foo">baz</a>');
+
+        // correct entities should not be touched
+        $this->filter_harness('foo&amp;bar', 'foo&amp;bar');
+        $this->filter_harness('foo&quot;bar', 'foo&quot;bar');
+        $this->filter_harness('foo&lt;bar', 'foo&lt;bar');
+        $this->filter_harness('foo&gt;bar', 'foo&gt;bar');
+
+        // bare ampersands should be fixed up
+        $this->filter_harness('foo&bar', 'foo&amp;bar');
+        $this->filter_harness('foo&', 'foo&amp;');
+
+        // numbered entities
+        $this->filter->allow_numbered_entities = 1;
+        $this->filter_harness('foo&#123;bar', 'foo&#123;bar');
+        $this->filter_harness('&#123;bar', '&#123;bar');
+        $this->filter_harness('foo&#123;', 'foo&#123;');
+
+        $this->filter->allow_numbered_entities = 0;
+        $this->filter_harness('foo&#123;bar', 'foo&amp;#123;bar');
+        $this->filter_harness('&#123;bar', '&amp;#123;bar');
+        $this->filter_harness('foo&#123;', 'foo&amp;#123;');
+
+        // other entities
+        $this->filter_harness('foo&bar;baz', 'foo&amp;bar;baz');	
+        $this->filter->allowed_entities[] = 'bar';
+        $this->filter_harness('foo&bar;baz', 'foo&bar;baz');
+
+        // entity decoder - '<'
+        $entities = explode(' ', "%3c %3C &#60 &#0000060 &#60; &#0000060; &#x3c &#x000003c &#x3c; &#x000003c; &#X3c &#X000003c &#X3c; &#X000003c; &#x3C &#x000003C &#x3C; &#x000003C; &#X3C &#X000003C &#X3C; &#X000003C;");
+        foreach($entities as $entity){
+            $this->entity_harness($entity, '&lt;');
+        }
+
+        $this->entity_harness('%3c&#256;&#x100;', '&lt;&#256;&#256;');
+        $this->entity_harness('%3c&#250;&#xFA;', '&lt;&#250;&#250;');
+        $this->entity_harness('%3c%40%aa;', '&lt;@%aa');
+
+
+        // character checks
+        $this->filter_harness('\\', '\\');
+        $this->filter_harness('/', '/');
+        $this->filter_harness("'", "'");
+        $this->filter_harness('a'.chr(0).'b', 'a'.chr(0).'b');
+        $this->filter_harness('\\/\'!@#', '\\/\'!@#');
+        $this->filter_harness('$foo', '$foo');
+
+        // this test doesn't contain &"<> since they get changed
+        $all_chars = ' !#$%\'()*+,-./0123456789:;=?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+        $this->filter_harness($all_chars, $all_chars);
+
+        // single quoted entities
+        $this->filter_harness("<img src=foo.jpg />", '<img src="foo.jpg" />');
+        $this->filter_harness("<img src='foo.jpg' />", '<img src="foo.jpg" />');
+        $this->filter_harness("<img src=\"foo.jpg\" />", '<img src="foo.jpg" />');
+
+        // unbalanced quoted entities
+        $this->filter_harness("<img src=\"foo.jpg />", '<img src="foo.jpg" />');
+        $this->filter_harness("<img src='foo.jpg />", '<img src="foo.jpg" />');
+        $this->filter_harness("<img src=foo.jpg\" />", '<img src="foo.jpg" />');
+        $this->filter_harness("<img src=foo.jpg' />", '<img src="foo.jpg" />');
+
+        // url escape sequences
+        $this->filter_harness('<a href="woo.htm%22%20bar=%22#">foo</a>', '<a href="woo.htm&quot; bar=&quot;#">foo</a>');
+        $this->filter_harness('<a href="woo.htm%22%3E%3C/a%3E%3Cscript%3E%3C/script%3E%3Ca%20href=%22#">foo</a>', '<a href="woo.htm&quot;&gt;&lt;/a&gt;&lt;script&gt;&lt;/script&gt;&lt;a href=&quot;#">foo</a>');
+        $this->filter_harness('<a href="woo.htm%aa">foo</a>', '<a href="woo.htm%aa">foo</a>');
+
+
+    }
+
+    function filter_harness($in, $out){
+        $got = $this->filter->go($in);
+        $this->assertEquals($out, $got);
+    }
+    
+    function case_harness($in, $out){
+        $got = $this->filter->fix_case($in);
+        $this->assertEquals($out, $got);
+    }
+
+    function entity_harness($in, $out){
+        $got = $this->filter->decode_entities($in);
+        $this->assertEquals($out, $got);
+    }
+}
+?>
\ No newline at end of file
diff --git a/tests/Pluf_Text_LaTeX/LatexEquationTest.php b/tests/Pluf_Text_LaTeX/LatexEquationTest.php
new file mode 100644
index 0000000..52227ff
--- /dev/null
+++ b/tests/Pluf_Text_LaTeX/LatexEquationTest.php
@@ -0,0 +1,75 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+error_reporting(E_ALL | E_STRICT);
+putenv('TZ=UTC');
+
+
+require_once 'PHPUnit/Framework/TestCase.php';
+
+$path_to_Pluf = dirname(__FILE__).'/../../src/';
+set_include_path(get_include_path().PATH_SEPARATOR.$path_to_Pluf);
+
+require_once 'Pluf.php';
+
+
+class LatexEquationTest extends PHPUnit_Framework_TestCase 
+{
+    public $output = '/tmp/latex';
+
+    protected function setUp()
+    {
+        Pluf::start(dirname(__FILE__).'/../conf/pluf.config.php');
+        @mkdir($this->output);
+    }
+
+    protected function tearDown()
+    {
+        @rmdir($this->output);
+    }
+
+    public function testSimpleOutput()
+    {
+        $math = new Pluf_Text_LaTeX_Equation($this->output);
+        $math->bg_color = 'cc0000';
+        $this->assertEquals(true, $math->render('E = mc^2 - x_2 + \frac{x_2}{1}'));
+        @unlink($math->output_path);
+        $this->assertEquals('/tmp/latex/5c88d3a35a859f05a020a544717297b6.png',
+                            $math->output_path);
+        $this->assertEquals(true, $math->render('x \\implies y'));
+        $file = $math->output_path;
+        @unlink($file);
+        $this->assertEquals('/tmp/latex/a2b69ed6f661f926606289959937f9ee.png',
+                            $file);
+        $this->assertEquals(true, $math->render('\frac{m_0}{\sqrt{1-\frac{v^2}{c^2}}}'));
+        $file = $math->output_path;
+        @unlink($file);
+        $this->assertEquals('/tmp/latex/3a511bb54f63afb2e4c44afa02e4b662.png',
+                            $file);
+        $this->assertEquals(true, $math->render('G_{ab}^{(1)} = -\frac{1}{2}\partial^c\partial_c \bar{\gamma}_{ab} + \partial^c\partial_{(b}\bar{\gamma}_{a)c} -\frac{1}{2}\eta_{ab}\partial^c\partial^d\bar{\gamma}_{cd} = 8\pi T_{ab}'));
+        $file = $math->output_path;
+        @unlink($file);
+        $this->assertEquals('/tmp/latex/92a8360d59b243991ff4a3f509c6f3e5.png',
+                            $file);
+    }
+}
\ No newline at end of file
diff --git a/tests/Pluf_Text_LaTeX_Texvc/LatexOutputTest.php b/tests/Pluf_Text_LaTeX_Texvc/LatexOutputTest.php
new file mode 100644
index 0000000..ee7047f
--- /dev/null
+++ b/tests/Pluf_Text_LaTeX_Texvc/LatexOutputTest.php
@@ -0,0 +1,74 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+error_reporting(E_ALL | E_STRICT);
+putenv('TZ=UTC');
+
+
+require_once 'PHPUnit/Framework/TestCase.php';
+
+$path_to_Pluf = dirname(__FILE__).'/../../src/';
+set_include_path(get_include_path().PATH_SEPARATOR.$path_to_Pluf);
+
+require_once 'Pluf.php';
+
+
+class LatexOutputTest extends PHPUnit_Framework_TestCase 
+{
+    public $output = '/tmp/latex';
+
+    protected function setUp()
+    {
+        Pluf::start(dirname(__FILE__).'/../conf/pluf.config.php');
+        @mkdir($this->output);
+    }
+
+    protected function tearDown()
+    {
+        @rmdir($this->output);
+    }
+
+    public function testSimpleOutput()
+    {
+        $math = new Pluf_Text_LaTeX_Texvc('x_2', array('output_dir'=>$this->output));
+        $file = $math->render();
+        @unlink($file);
+        $this->assertEquals('/tmp/latex/8f43fce8dbdf3c4f8d0ac91f0de1d43d.png',
+                            $file);
+        $math->fragment = 'x \\implies y';
+        $file = $math->render();
+        @unlink($file);
+        $this->assertEquals('/tmp/latex/cacfa4f67dd97bc8e402f36f13b0c265.png',
+                            $file);
+        $math->fragment = '\frac{m_0}{\sqrt{1-\frac{v^2}{c^2}}}';
+        $file = $math->render();
+        @unlink($file);
+        $this->assertEquals('/tmp/latex/9e5f1ea82d57fe3c3eb2c324489b773b.png',
+                            $file);
+        $math->fragment = 'G_{ab}^{(1)} = -\frac{1}{2}\partial^c\partial_c \bar{\gamma}_{ab} + \partial^c\partial_{(b}\bar{\gamma}_{a)c} -\frac{1}{2}\eta_{ab}\partial^c\partial^d\bar{\gamma}_{cd} = 8\pi T_{ab}';
+        $file = $math->render();
+        @unlink($file);
+        $this->assertEquals('/tmp/latex/1686bec7fd692f30da80145b77041f2b.png',
+                            $file);
+    }
+}
\ No newline at end of file
diff --git a/tests/Pluf_Text_Wiki/PlufTextWikiTest.php b/tests/Pluf_Text_Wiki/PlufTextWikiTest.php
new file mode 100644
index 0000000..44b7dc7
--- /dev/null
+++ b/tests/Pluf_Text_Wiki/PlufTextWikiTest.php
@@ -0,0 +1,91 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+error_reporting(E_ALL | E_STRICT);
+putenv('TZ=UTC');
+
+
+require_once 'PHPUnit/Framework/TestCase.php';
+
+$path_to_Pluf = dirname(__FILE__).'/../../src/';
+set_include_path(get_include_path().PATH_SEPARATOR.$path_to_Pluf);
+
+require_once 'Pluf.php';
+
+
+class PlufTextWikiTest extends PHPUnit_Framework_TestCase {
+
+    protected function setUp()
+    {
+        Pluf::start(dirname(__FILE__).'/../conf/pluf.config.php');
+    }
+
+    protected function tearDown()
+    {
+    }
+
+    public function testSimpleRender()
+    {
+        $renderer = Pluf::factory('Pluf_Text_Wiki_Renderer');
+        $this->assertEquals("\n".'<h4>Title</h4>'."\n", 
+                            $renderer->render('!!Title')
+                            );
+    }
+
+    public function testFullRender()
+    {
+        $renderer = Pluf::factory('Pluf_Text_Wiki_Renderer');
+        $string = file_get_contents(dirname(__FILE__).'/wikisample.txt');
+        $render = file_get_contents(dirname(__FILE__).'/wikisample.render.txt');
+        $this->assertEquals($render, $renderer->render($string));
+    }
+
+    public function testRenderActionUrl()
+    {
+        $GLOBALS['_PX_config']['wiki_create_action'] = true;
+        $GLOBALS['_PX_config']['app_base'] = '/testapp/';
+        $GLOBALS['_PX_config']['url_format'] = 'simple';
+        $string = '[Hello|/link/to]';
+        $string2 = '[/link/to]';
+        $string3 = '[http://example.com]';
+        $string4 = '[Hello|/link/to/file.ext]';
+        $renderer = new Pluf_Text_Wiki_Renderer();
+        $this->assertEquals("<p>\n".'<a href="/testapp/?_px_action='.urlencode('/link/to').'">Hello</a>'."\n</p>",
+                            $renderer->render($string));
+        $this->assertEquals("<p>\n".'<a href="/testapp/?_px_action='.urlencode('/link/to').'">/link/to</a>'."\n</p>",
+                            $renderer->render($string2));
+        $this->assertEquals("<p>\n".'<a href="http://example.com">http://example.com</a>'."\n</p>",
+                            $renderer->render($string3));
+        $this->assertEquals("<p>\n".'<a href="/link/to/file.ext">Hello</a>'."\n</p>",
+                            $renderer->render($string4));
+        $GLOBALS['_PX_config']['wiki_create_action'] = false;
+        $this->assertEquals("<p>\n".'<a href="/link/to">Hello</a>'."\n</p>",
+                            $renderer->render($string));
+        $this->assertEquals("<p>\n".'<a href="/link/to">/link/to</a>'."\n</p>",
+                            $renderer->render($string2));
+        $this->assertEquals("<p>\n".'<a href="http://example.com">http://example.com</a>'."\n</p>",
+                            $renderer->render($string3));
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/tests/Pluf_Text_Wiki/wikisample.render.txt b/tests/Pluf_Text_Wiki/wikisample.render.txt
new file mode 100644
index 0000000..80be7de
--- /dev/null
+++ b/tests/Pluf_Text_Wiki/wikisample.render.txt
@@ -0,0 +1,82 @@
+
+<h3> titre</h3>
+
+
+<h4> sous-titre</h4>
+
+
+<h5> sous-sous-titre</h5>
+
+<p>
+Lorem <strong>ipsum dolor</strong> sit amet, <em>consectetuer adipiscing</em> elit. Ut scelerisque. Ut iaculis ultrices nulla. Cras viverra diam nec justo.
+</p>
+<ul>
+
+<li> Phasellus non eros sit amet sem tristique laoreet. 
+<ol>
+<li> Nam mi wisi, pellentesque dictum, 
+</li><li> tristique in, tristique quis, erat. 
+<ol>
+<li> In in erat ut urna vulputate vestibulum. Aenean justo. 
+</li><li> In quis nisl. 
+</li></ol>
+</li></ol>
+</li>
+<li> Morbi justo libero, pharetra a, 
+</li><li> malesuada eget, lacinia in, ligula.
+</li></ul>
+
+<p>
+Mauris <a href="http://example.com" hreflang="fr" title="at neque">sit amet massa</a> pretium dapibus.
+</p>
+<table border="1">
+<tr><td>Nulla metus felis</td><td>tristique non</td></tr>
+<tr><td>1</td><td>2</td></tr>
+<tr><td>5</td><td>7</td></tr>
+</table>
+<p>
+cursus et, <code>vulputate in</code>, eros. 
+</p>
+<pre>
+Phasellus <acronym title="semper neque">placerat</acronym>.
+In hac habitasse platea dictumst. 
+</pre>
+<p>
+Fusce sagittis, mi eu elementum lobortis, augue enim tristique ante, sed varius urna mauris sed erat.
+</p>
+
+<hr />
+
+<p>
+Praesent pellentesque, <q lang=" consectetuer imperdiet">augue at</q>, mi metus <cite>dignissim arcu</cite>, sed sodales quam risus eu neque. 
+</p>
+<p>
+Pellentesque euismod. 
+</p>
+<blockquote><p>
+ Curabitur mi. Aenean vitae lectus vel turpis feugiat egestas. 
+<br /> Quisque diam. Maecenas tincidunt tortor sed neque. 
+</p></blockquote>
+<p>
+Mauris nibh. Vivamus tempus est in urna. 
+</p>
+<dl>
+<dt>Curabitur et arcu</dt>
+<dd>non odio gravida varius. Vivamus fringilla, neque ac suscipit vehicula, libero metus laoreet libero, in gravida purus nunc quis orci. </dd>
+
+<dt>Duis</dt>
+<dd>non mi non lacus tincidunt iaculis. </dd>
+
+<dt>Aliquam tempor</dt>
+<dd>metus in cursus dapibus, purus ipsum consequat quam, et vehicula libero velit sit amet felis. Sed id leo. </dd>
+
+</dl>
+<p>
+Vivamus orci leo, dictum et, &lt;b&gt;scelerisque sed&lt;/b&gt;, &lt;i&gt;pretium et&lt;/i&gt;, dolor. Aenean pharetra felis pellentesque dui. Donec neque. Duis tristique. Pellentesque at eros
+</p>
+<p>
+Lorem ipsum | dolor | sit\ amet 
+</p>
+<p>
+Pater [noster qui|est|in] <code>caelis</code>... 
+</p>
\ No newline at end of file
diff --git a/tests/Pluf_Text_Wiki/wikisample.txt b/tests/Pluf_Text_Wiki/wikisample.txt
new file mode 100644
index 0000000..8c7f400
--- /dev/null
+++ b/tests/Pluf_Text_Wiki/wikisample.txt
@@ -0,0 +1,43 @@
+!!! titre
+!! sous-titre
+! sous-sous-titre
+
+Lorem __ipsum dolor__ sit amet, ''consectetuer adipiscing'' elit. Ut scelerisque. Ut iaculis ultrices nulla. Cras viverra diam nec justo.
+
+* Phasellus non eros sit amet sem tristique laoreet. 
+*# Nam mi wisi, pellentesque dictum, 
+*# tristique in, tristique quis, erat. 
+*## In in erat ut urna vulputate vestibulum. Aenean justo. 
+*## In quis nisl. 
+* Morbi justo libero, pharetra a, 
+* malesuada eget, lacinia in, ligula.
+
+Mauris [sit amet massa|http://example.com|fr|at neque] pretium dapibus.
+
+| Nulla metus felis | tristique non
+| 1 | 2
+| 5 | 7
+
+cursus et, @@vulputate in@@, eros. 
+ Phasellus ??placerat|semper neque??.
+ In hac habitasse platea dictumst. 
+
+Fusce sagittis, mi eu elementum lobortis, augue enim tristique ante, sed varius urna mauris sed erat.
+====
+Praesent pellentesque, ^^augue at| consectetuer imperdiet^^, mi metus {{dignissim arcu}}, sed sodales quam risus eu neque. 
+
+Pellentesque euismod. 
+> Curabitur mi. Aenean vitae lectus vel turpis feugiat egestas. 
+> Quisque diam. Maecenas tincidunt tortor sed neque. 
+
+Mauris nibh. Vivamus tempus est in urna. 
+
+;Curabitur et arcu : non odio gravida varius. Vivamus fringilla, neque ac suscipit vehicula, libero metus laoreet libero, in gravida purus nunc quis orci. 
+;Duis : non mi non lacus tincidunt iaculis. 
+;Aliquam tempor : metus in cursus dapibus, purus ipsum consequat quam, et vehicula libero velit sit amet felis. Sed id leo. 
+
+Vivamus orci leo, dictum et, <b>scelerisque sed</b>, <i>pretium et</i>, dolor. Aenean pharetra felis pellentesque dui. Donec neque. Duis tristique. Pellentesque at eros
+
+Lorem ipsum | dolor \| sit\\ amet 
+
+Pater \[noster qui|est|in] @@caelis@@... 
\ No newline at end of file
diff --git a/tests/Pluf_User/PlufUserTest.php b/tests/Pluf_User/PlufUserTest.php
new file mode 100644
index 0000000..82016e9
--- /dev/null
+++ b/tests/Pluf_User/PlufUserTest.php
@@ -0,0 +1,235 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+error_reporting(E_ALL | E_STRICT);
+
+$path = dirname(__FILE__).'/../../src/';
+set_include_path(get_include_path().PATH_SEPARATOR.$path);
+
+require_once 'PHPUnit/Framework/TestCase.php';
+require_once 'PHPUnit/Framework/IncompleteTestError.php';
+
+require_once 'Pluf.php';
+
+class PlufUserTest extends PHPUnit_Framework_TestCase {
+    
+    protected function setUp()
+    {
+        Pluf::start(dirname(__FILE__).'/../conf/pluf.config.php');
+        $db = Pluf::db();
+        $schema = Pluf::factory('Pluf_DB_Schema', $db);
+        $models = array('Pluf_Group', 'Pluf_User', 'Pluf_Permission',
+                        'Pluf_Message', 'Pluf_RowPermission');
+        foreach ($models as $model) {
+            $schema->model = Pluf::factory($model);
+            $schema->dropTables();
+            if (true !== ($res = $schema->createTables())) {
+                throw new Exception($res);
+            }
+        }
+        $perms = array();
+        for ($i=1; $i<=10; $i++) {
+            $perm = new Pluf_Permission();
+            $perm->application = 'DummyModel';
+            $perm->code_name = 'code-'.$i;
+            $perm->name = 'code-'.$i;
+            $perm->description = 'code-'.$i;
+            $perm->create();
+            $perms[] = clone($perm);
+        }
+        $groups = array();
+        for ($i=1; $i<=10; $i++) {
+            $group = new Pluf_Group();
+            $group->name = 'Group '.$i;
+            $group->description = 'Group '.$i;
+            $group->create();
+            $groups[] = clone($group);
+        }
+        $groups[0]->setAssoc($perms[0]);
+        $groups[0]->setAssoc($perms[1]);
+        $groups[0]->setAssoc($perms[2]);
+        $groups[0]->setAssoc($perms[3]);
+        $groups[1]->setAssoc($perms[0]); //again perm "1"
+        $groups[0]->setAssoc($perms[4]);
+        $groups[0]->setAssoc($perms[5]);
+        $user = new Pluf_User();
+        $user->login = 'test';
+        $user->first_name = 'test';
+        $user->last_name = 'test';
+        $user->email = 'toto@example.com';
+        $user->setPassword('test');
+        $user->active = true;
+        if (true !== $user->create()) {
+            throw new Exception();
+        }
+        $user->setAssoc($groups[0]);
+        $user->setAssoc($groups[1]);
+        $user->setAssoc($perms[7]);
+        $user->setAssoc($perms[8]);
+    }
+
+    protected function tearDown()
+    {
+        $db = Pluf::db();
+        $schema = Pluf::factory('Pluf_DB_Schema', $db);
+        $models = array('Pluf_Group', 'Pluf_User', 'Pluf_Permission', 'Pluf_RowPermission', 'Pluf_Message');
+        foreach ($models as $model) {
+            $schema->model = Pluf::factory($model);
+            $schema->dropTables();
+        }
+
+    }
+
+    public function testGetMessages()
+    {
+        $user = new Pluf_User(1);
+        $mess = $user->get_pluf_message_list();
+        $this->assertEquals(0, $mess->count());
+    }
+
+    public function testUniqueLogin()
+    {
+        $user = new Pluf_User();
+        $user->login = 'test';
+        $user->first_name = 'test';
+        $user->last_name = 'test';
+        $user->email = 'toto@example.com';
+        $user->setPassword('test');
+        $user->active = true;
+        // Test user already exists
+        try {
+            $user->create();
+        } catch (Exception $e) {
+            return;
+        }
+        $this->fail();
+    }
+
+    public function testValidationUnique()
+    {
+        $this->markTestSkipped('Need to rewrite the form handling first.');
+        // Test user already exists
+        $user = new Pluf_User();
+        $user->login = 'test';
+        $user->first_name = 'test';
+        $user->last_name = 'test';
+        $user->email = 'toto@example.com';
+        $user->setPassword('test');
+        $user->active = true;
+        $form = new Pluf_Form_Create();
+        $form->defineFromModel($user);
+        $new_data = $user->getData();
+        $errors = $form->getValidationErrors($new_data);
+        $this->assertEquals(1, count($errors));
+    }
+
+    public function testGetPermissions()
+    {
+        $user = new Pluf_User(1);
+        $a = $user->getAllPermissions();
+        $this->assertEquals(8, count($a));
+    }
+
+    public function testHasPermission()
+    {
+        $user = new Pluf_User(1);
+        $this->assertEquals(true, $user->hasPerm('DummyModel.code-5'));
+        $this->assertEquals(false, $user->hasPerm('DummyModel.code-7'));
+        $user->administrator = true;
+        $this->assertEquals(true, $user->hasPerm('DummyModel.code-7'));
+        $user->active = false;
+        $this->assertEquals(false, $user->hasPerm('DummyModel.code-5'));
+    }
+
+    public function testHasAppPermissions()
+    {
+        $user = new Pluf_User(1);
+        $this->assertEquals(true, $user->hasAppPerms('DummyModel'));
+        $this->assertEquals(false, $user->hasPerm('DummyModel2'));
+        $user->administrator = true;
+        $this->assertEquals(true, $user->hasPerm('DummyModel2'));
+    }
+
+    public function testRowPermission()
+    {
+        $user = new Pluf_User(1);
+        $group = new Pluf_Group();
+        $group->name = 'testRowPermission';
+        $group->description = 'testRowPermission';
+        $group->create();
+        for ($i=1;$i<=5;$i++) {
+            $mess = new Pluf_Message();
+            $mess->user = $user;
+            $mess->message = 'Dummy object to test against: '.$i;
+            $mess->create();
+        }
+        $perm = new Pluf_Permission();
+        $perm->application = 'Pluf_RowPermission';
+        $perm->code_name = 'test1';
+        $perm->name = 'test1';
+        $perm->description = 'test1';
+        $perm->create();
+        // Permission through group
+        $mess = new Pluf_Message(1);
+        Pluf_RowPermission::add($group, $mess, $perm);
+        $this->assertEquals(false,
+                            $user->hasPerm('Pluf_RowPermission.test1', $mess));
+        $user->setAssoc($group);
+        $user->getAllPermissions(true); //reset the cache
+        $this->assertEquals(true,
+                            $user->hasPerm('Pluf_RowPermission.test1', $mess));
+        $user->delAssoc($group);
+        $user->getAllPermissions(true); //reset the cache
+        $this->assertEquals(false,
+                            $user->hasPerm('Pluf_RowPermission.test1', $mess));
+        $user->setAssoc($group);
+        $user->getAllPermissions(true); //reset the cache
+        $this->assertEquals(true,
+                            $user->hasPerm('Pluf_RowPermission.test1', $mess));
+        Pluf_RowPermission::remove($group, $mess, $perm);
+        $user->getAllPermissions(true); //reset the cache
+        $this->assertEquals(false,
+                            $user->hasPerm('Pluf_RowPermission.test1', $mess));
+        // Permission through direct user
+        Pluf_RowPermission::add($user, $mess, $perm);
+        $user->getAllPermissions(true); //reset the cache
+        $this->assertEquals(true,
+                            $user->hasPerm('Pluf_RowPermission.test1', $mess));
+        Pluf_RowPermission::remove($user, $mess, $perm);
+        $user->getAllPermissions(true); //reset the cache
+        $this->assertEquals(false,
+                            $user->hasPerm('Pluf_RowPermission.test1', $mess));
+        // Using string for the permission.
+        Pluf_RowPermission::add($user, $mess, 'Pluf_RowPermission.test1');
+        $user->getAllPermissions(true); //reset the cache
+        $this->assertEquals(true,
+                            $user->hasPerm('Pluf_RowPermission.test1', $mess));
+        Pluf_RowPermission::remove($user, $mess, 'Pluf_RowPermission.test1');
+        $user->getAllPermissions(true); //reset the cache
+        $this->assertEquals(false,
+                            $user->hasPerm('Pluf_RowPermission.test1', $mess));
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/tests/Pluf_Utils/PlufUtilsTest.php b/tests/Pluf_Utils/PlufUtilsTest.php
new file mode 100644
index 0000000..567fe33
--- /dev/null
+++ b/tests/Pluf_Utils/PlufUtilsTest.php
@@ -0,0 +1,90 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+error_reporting(E_ALL | E_STRICT);
+
+$path = dirname(__FILE__).'/../../src/';
+set_include_path(get_include_path().PATH_SEPARATOR.$path);
+
+require_once 'PHPUnit/Framework/TestCase.php';
+require_once 'PHPUnit/Framework/IncompleteTestError.php';
+
+require_once 'Pluf.php';
+
+class PlufUtilsTest extends PHPUnit_Framework_TestCase {
+    
+    protected function setUp()
+    {
+        Pluf::start(dirname(__FILE__).'/../conf/pluf.config.php');
+    }
+
+    public function testCleanName()
+    {
+        $files = array(
+                       array('normal', 'normal'),
+                       array('nor mal', 'nor_mal'),
+                       array('nor mal.zip', 'nor_mal.zip'),
+                       array('néor mal.zip', 'n__or_mal.zip'), //Double byte effect
+                       );
+        foreach ($files as $file) {
+            $this->assertEquals($file[1], Pluf_Utils::cleanFileName($file[0]));
+        }
+    }
+
+    public function testValidEmail()
+    {
+        $emails = array(
+                        array('test1@example.com', true),
+                        array('test1@example.com-qwe.', false),
+                        array('cal@iamcalx.com', true),
+                        array('cal+henderson@iamcalx.com', true),
+                        array('cal henderson@iamcalx.com', false),
+                        array('"cal henderson"@iamcalx.com', true),
+                        array('cal@iamcalx', true),
+                        array('cal@iamcalx com', false),
+                        array('cal@hello world.com', false),
+                        array('cal@[hello].com', false),
+                        array('cal@[hello world].com', false),
+                        array('cal@[hello\\ world].com', false),
+                        array('cal@[hello.com]', true),
+                        array('cal@[hello world.com]', true),
+                        array('cal@[hello\\ world.com]', true),
+                        array('abcdefghijklmnopqrstuvwxyz@abcdefghijklmnopqrstuvwxyz', true),
+                        array('woo\\ yay@example.com', false),
+                        array('woo\\@yay@example.com', false),
+                        array('woo\\.yay@example.com', false),
+                        array('"woo yay"@example.com', true),
+                        array('"woo@yay"@example.com', true),
+                        array('"woo.yay"@example.com', true),
+                        array('"woo\\"yay"@test.com', true),
+                        array('webstaff@redcross.org', true),
+                        array('user@???', true),
+                        array('user.@domain.com', false),
+                        );
+        foreach ($emails as $email) {
+            $this->assertEquals($email[1], Pluf_Utils::isValidEmail($email[0]), $email[0]);
+        }
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/tests/conf/pluf.config.php b/tests/conf/pluf.config.php
new file mode 100644
index 0000000..93188ae
--- /dev/null
+++ b/tests/conf/pluf.config.php
@@ -0,0 +1,75 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+
+$cfg = array();
+$cfg['test'] = false;
+$cfg['timezone'] = 'Europe/Berlin';
+// Set the debug variable to true to force the recompilation of all
+// the templates each time during development
+$cfg['debug'] = true;
+$cfg['installed_apps'] = array('Pluf');
+// Temporary folder where the script is writing the compiled templates,
+// cached data and other temporary resources.
+// It must be writeable by your webserver instance.
+// It is mandatory if you are using the template system.
+$cfg['tmp_folder'] = dirname(__FILE__).'/../tmp';
+
+// The folder in which the templates of the application are located.
+$cfg['templates_folder'] = array(dirname(__FILE__).'/../templates');
+
+$cfg['pluf_use_rowpermission'] = true;
+
+// Default mimetype of the document your application is sending.
+// It can be overwritten for a given response if needed.
+$cfg['mimetype'] = 'text/html';
+
+// Some views for testing.
+$cfg['app_views'] = dirname(__FILE__).'/views.php';
+
+// Default database configuration. The database defined here will be
+// directly accessible from Pluf::db() of course it is still possible
+// to open any other number of database connections through Pluf_DB
+$cfg['db_login'] = 'testpluf';
+$cfg['db_password'] = 'testpluf';
+$cfg['db_server'] = 'localhost';
+$cfg['db_database'] = dirname(__FILE__).'/../tmp/tmp.sqlite.db';
+
+$cfg['app_base'] = '/testapp';
+$cfg['url_format'] = 'simple';
+
+$cfg['template_tags'] = array(
+                              'mytag' => 'Pluf_Template_Tag_Mytag',
+                              );
+
+// Must be shared by all the installed_apps and the core framework.
+// That way you can have several installations of the core framework.
+$cfg['db_table_prefix'] = 'pluf_unit_tests_'; 
+
+// Starting version 4.1 of MySQL the utf-8 support is "correct".
+// The reason of the db_version for MySQL is only for that.
+$cfg['db_version'] = '5.0';
+$cfg['db_engine'] = 'SQLite';
+
+return $cfg;
+
diff --git a/tests/conf/pluf.config.php-dist b/tests/conf/pluf.config.php-dist
new file mode 100644
index 0000000..08f1dab
--- /dev/null
+++ b/tests/conf/pluf.config.php-dist
@@ -0,0 +1,73 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+
+$cfg = array();
+$cfg['test'] = false;
+$cfg['timezone'] = 'Europe/Berlin';
+// Set the debug variable to true to force the recompilation of all
+// the templates each time during development
+$cfg['debug'] = true;
+
+// Temporary folder where the script is writing the compiled templates,
+// cached data and other temporary resources.
+// It must be writeable by your webserver instance.
+// It is mandatory if you are using the template system.
+$cfg['tmp_folder'] = '/tmp';
+
+// The folder in which the templates of the application are located.
+$cfg['templates_folder'] = array(dirname(__FILE__).'/../templates');
+
+// Default mimetype of the document your application is sending.
+// It can be overwritten for a given response if needed.
+$cfg['mimetype'] = 'text/html';
+
+// Some views for testing.
+$cfg['app_views'] = dirname(__FILE__).'/views.php';
+
+// Default database configuration. The database defined here will be
+// directly accessible from Pluf::db() of course it is still possible
+// to open any other number of database connections through Pluf_DB
+$cfg['db_login'] = ''; # not used with SQLite
+$cfg['db_password'] = ''; # not used with SQLite
+$cfg['db_server'] = ''; # not used with SQLite
+$cfg['db_database'] = '/tmp/pluf-test.sqlite.db';
+// Must be shared by all the installed_apps and the core framework.
+// That way you can have several installations of the core framework.
+$cfg['db_table_prefix'] = 'pluf_unit_tests_'; 
+
+// Starting version 4.1 of MySQL the utf-8 support is "correct".
+// The reason of the db_version for MySQL is only for that.
+$cfg['db_version'] = '';
+$cfg['db_engine'] = 'SQLite';
+
+$cfg['app_base'] = '/testapp';
+$cfg['url_format'] = 'simple';
+
+$cfg['template_tags'] = array(
+                              'mytag' => 'Pluf_Template_Tag_Mytag',
+                              );
+
+
+return $cfg;
+
diff --git a/tests/conf/views.php b/tests/conf/views.php
new file mode 100644
index 0000000..ee12211
--- /dev/null
+++ b/tests/conf/views.php
@@ -0,0 +1,86 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2006 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+$ctl = array();
+
+$ctl[] = array('regex' => '#^/$#',
+               'priority' => 4,
+               'model' => 'Todo_Views',
+               'method' => 'main');
+
+$ctl[] = array('regex' => '#^/install/$#',
+               'priority' => 4,
+               'model' => 'Todo_Views',
+               'method' => 'install');
+
+$ctl[] = array('regex' => '#^/uninstall/$#',
+               'priority' => 4,
+               'model' => 'Todo_Views',
+               'method' => 'uninstall');
+
+$ctl[] = array('regex' => '#^/item/(\d+)/$#',
+               'priority' => 4,
+               'model' => 'Todo_Views',
+               'method' => 'viewItem');
+
+$ctl[] = array('regex' => '#^/list/(\d+)/item/add/$#',
+               'priority' => 4,
+               'model' => 'Todo_Views',
+               'method' => 'addItem');
+
+$ctl[] = array('regex' => '#^/item/(\d+)/update/$#',
+               'priority' => 4,
+               'model' => 'Todo_Views',
+               'method' => 'updateItem');
+
+$ctl[] = array('regex' => '#^/item/(\d+)/delete/$#',
+               'priority' => 4,
+               'model' => 'Todo_Views',
+               'method' => 'deleteItem');
+
+$ctl[] = array('regex' => '#^/list/$#',
+               'priority' => 4,
+               'model' => 'Todo_Views',
+               'method' => 'listLists');
+
+$ctl[] = array('regex' => '#^/list/(\d+)/$#',
+               'priority' => 4,
+               'model' => 'Todo_Views',
+               'method' => 'viewList');
+
+$ctl[] = array('regex' => '#^/list/(\d+)/update/$#',
+               'priority' => 4,
+               'model' => 'Todo_Views',
+               'method' => 'updateList');
+
+$ctl[] = array('regex' => '#^/list/(\d+)/delete/$#',
+               'priority' => 4,
+               'model' => 'Todo_Views',
+               'method' => 'deleteList');
+
+$ctl[] = array('regex' => '#^/list/add/$#',
+               'priority' => 4,
+               'model' => 'Todo_Views',
+               'method' => 'addList');
+
+return $ctl;
diff --git a/tests/runAllTests.php b/tests/runAllTests.php
new file mode 100644
index 0000000..056a4f2
--- /dev/null
+++ b/tests/runAllTests.php
@@ -0,0 +1,104 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of Plume Framework, a simple PHP Application Framework.
+# Copyright (C) 2001-2007 Loic d'Anterroches and contributors.
+#
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Plume Framework 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+
+/**
+ * Run all the unit tests of the Plume Framework.
+ */
+
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Framework_AllTests::main');
+}
+
+if (!defined('PHPUnit_INSIDE_OWN_TESTSUITE')) {
+    define('PHPUnit_INSIDE_OWN_TESTSUITE', TRUE);
+}
+
+require_once 'PHPUnit/Framework.php';
+require_once 'PHPUnit/TextUI/TestRunner.php';
+require_once 'PHPUnit/Framework/TestCase.php';
+ 
+#require_once 'Framework/AllTests.php';
+
+#require_once 'PHPUnit/Framework/TestSuite.php';
+#require_once 'PHPUnit/TextUI/TestRunner.php';
+#require_once 'PHPUnit/Util/Filter.php';
+
+error_reporting(E_ALL | E_STRICT);
+putenv('TZ=UTC');
+
+function getTestDirs($dir='./')
+{
+    $file = new DirectoryIterator($dir);
+    $res = array();
+    while ($file->valid()) {
+        if ($file->isDir() && !$file->isDot()) {
+            $res[] = $file->getPathName();
+        }
+        $file->next();
+    }
+    return $res;
+}
+
+function getTestFiles($dir='')
+{
+    $file = new DirectoryIterator($dir);
+    $res = array();
+    while ($file->valid()) {
+        if ($file->isFile() && substr($file->getPathName(), -8) == 'Test.php') {
+            $res[] = $file->getPathName();
+        }
+        $file->next();
+    }
+    return $res;
+}
+
+
+class Framework_AllTests
+{
+    public static function main()
+    {
+        PHPUnit_TextUI_TestRunner::run(self::suite());
+    }
+
+    public static function suite()
+    {
+        $suite = new PHPUnit_Framework_TestSuite('Plume_Framework_Test');
+        $dirs = getTestDirs();
+        foreach ($dirs as $dir) {
+            $testfiles = getTestFiles($dir);
+            foreach ($testfiles as $test) {
+                $suite->addTestFile(substr($test, 2));
+            }
+        }
+        return $suite;
+    }
+}
+
+if (PHPUnit_MAIN_METHOD == 'Framework_AllTests::main') {
+    Framework_AllTests::main();
+}
+
+
+//print $tests." tests performed.\n";
+?>
\ No newline at end of file