Tagging release 0.9.3

2010-03-15 07:59:17 +00:00
1082 changed files with 46540 additions and 79655 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +0,0 @@
-templates/*
-logs/*
-install/update.log
-.buildpath
-.project
-.settings/
-*.diff
-*~
-.well-known
-.idea
-*.iml
--- a/561
+++ b/561
@@ -1,280 +1,281 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 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.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                          675 Mass Ave, Cambridge, MA 02139, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
--- a/README.md
+++ b/README.md
@@ -1,74 +0,0 @@
-# Froxlor
-
-The server administration software for your needs.
-Developed by experienced server administrators, this panel simplifies the effort of managing your hosting platform.
-
-## Installation
-
-### Fast install
-1. Ensure that your webserver serves /var/www
-2. Extract froxlor into /var/www
-3. Point your browser to http://[ip-of-webserver]/froxlor
-4. Follow the installer
-5. Login as administrator
-6. Adjust "Server > Settings" according to your needs
-7. Choose your distribution under "Server > Configuration"
-8. Follow the steps for your services
-9. Have fun!
-
-### Detailed installation
-http://redmine.froxlor.org/projects/froxlor/wiki/Installationtarball
-
-## Help
-
-You may find help in the following places:
-
-### IRC
-
-froxlor may be found on freenode.net, channel #froxlor:
-irc://chat.freenode.net/froxlor
-
-### Forum
-
-The community is located on http://forum.froxlor.org
-
-### Wiki
-
-More documentation may be found in the froxlor - wiki:
-http://redmine.froxlor.org/projects/froxlor/wiki
-
-## License
-
-May be found in COPYING
-
-## Downloads
-
-### Tarball
-http://files.froxlor.org/releases/froxlor-latest.tar.gz [MD5](http://files.froxlor.org/releases/froxlor-latest.tar.gz.md5) [SHA1](http://files.froxlor.org/releases/froxlor-latest.tar.gz.sha1)
-
-### Debian repository
-
-[HowTo](http://redmine.froxlor.org/projects/froxlor/wiki/Installationdebian)
-
-/etc/apt/sources.list.d/froxlor.list
-> deb http://debian.froxlor.org {wheezy|jessie} main
-
-### Gentoo repository
-
-[HowTo](http://redmine.froxlor.org/projects/froxlor/wiki/Installationgentoo)
-
-http://files.froxlor.org/gentoo/repositories.xml
-
-## Let's Encrypt support
-
-This version of Froxlor contains a test implementation of support for [Let's Encrypt](https://letsencrypt.org). This is (as Let's Encrypt is in itself)
-still a beta version and may break your system. The way it currently works is by creating a (sub-)domain with the default system - certificate,
-after which the Let's Encrypt cronjob orders the certificate for this (sub-)domain and inserts the certificates in the database. With the next run
-of the default cronjob, the certificates will be updated on the disk and the webserver reloaded.
-
-This has 2 known side-effects at the moment:
-* The basic ip/port combinations don't work with the Froxlor - integration of Let's Encrypt, since it needs a certificate for the very first creation
-* After creating a domain, it will have the default certificate for a short time (by default 5 minutes until the cronjob runs the next time)
-
-It may be possible to fix these issues, but they are not a priority at the moment
-
--- a/actions/admin/settings/000.version.php
+++ b/actions/admin/settings/000.version.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Settings
- *
+ * @version    $Id$
 */

 return array(
--- a/actions/admin/settings/100.panel.php
+++ b/actions/admin/settings/100.panel.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Language
- *
+ * @version    $Id$
 */

 return array(
@@ -32,32 +32,6 @@ return array(
 					'option_options_method' => 'getLanguages',
 					'save_method' => 'storeSettingField',
 					),
-				'panel_default_theme' => array(
-					'label' => array('title' => $lng['panel']['theme'], 'description' => $lng['serversettings']['default_theme']),
-					'settinggroup' => 'panel',
-					'varname' => 'default_theme',
-					'type' => 'option',
-					'default' => 'Froxlor',
-					'option_mode' => 'one',
-					'option_options_method' => 'getThemes',
-					'save_method' => 'storeSettingDefaultTheme',
-					),
-				'panel_allow_theme_change_customer' => array(
-					'label' => $lng['serversettings']['panel_allow_theme_change_customer'],
-					'settinggroup' => 'panel',
-					'varname' => 'allow_theme_change_customer',
-					'type' => 'bool',
-					'default' => true,
-					'save_method' => 'storeSettingField',
-					),
-				'panel_allow_theme_change_admin' => array(
-					'label' => $lng['serversettings']['panel_allow_theme_change_admin'],
-					'settinggroup' => 'panel',
-					'varname' => 'allow_theme_change_admin',
-					'type' => 'bool',
-					'default' => true,
-					'save_method' => 'storeSettingField'
-					),
 				'panel_natsorting' => array(
 					'label' => $lng['serversettings']['natsorting'],
 					'settinggroup' => 'panel',
@@ -90,7 +64,7 @@ return array(
 					'type' => 'option',
 					'default' => 'Manual',
 					'option_mode' => 'one',
-					'option_options' => array('Manual' => $lng['serversettings']['manual'], 'Dropdown' => $lng['serversettings']['dropdown']),
+					'option_options' => array('Manual' => 'Manual', 'Dropdown' => 'Dropdown'),
 					'save_method' => 'storeSettingField',
 					),
 				'panel_adminmail' => array(
@@ -103,24 +77,6 @@ return array(
 					'default' => '',
 					'save_method' => 'storeSettingField',
 					),
-				'panel_adminmail_defname' => array(
-					'label' => $lng['serversettings']['adminmail_defname'],
-					'settinggroup' => 'panel',
-					'varname' => 'adminmail_defname',
-					'type' => 'string',
-					'default' => 'Froxlor Administrator',
-					'save_method' => 'storeSettingField',
-					),
-				'panel_adminmail_return' => array(
-					'label' => $lng['serversettings']['adminmail_return'],
-					'settinggroup' => 'panel',
-					'varname' => 'adminmail_return',
-					'type' => 'string',
-					'string_type' => 'mail',
-					'string_emptyallowed' => true,
-					'default' => '',
-					'save_method' => 'storeSettingField',
-					),
 				'panel_decimal_places' => array(
 					'label' => $lng['serversettings']['decimal_places'],
 					'settinggroup' => 'panel',
@@ -177,29 +133,11 @@ return array(
 					'default' => false,
 					'save_method' => 'storeSettingField',
 					),
-				'admin_show_news_feed' => array(
-					'label' => $lng['admin']['show_news_feed'],
+				'admin_froxlor_graphic' => array(
+					'label' => $lng['admin']['froxlor_graphic'],
 					'settinggroup' => 'admin',
-					'varname' => 'show_news_feed',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					),
-				'customer_show_news_feed' => array(
-					'label' => $lng['admin']['customer_show_news_feed'],
-					'settinggroup' => 'customer',
-					'varname' => 'show_news_feed',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					),
-				'customer_news_feed_url' => array(
-					'label' => $lng['admin']['customer_news_feed_url'],
-					'settinggroup' => 'customer',
-					'varname' => 'news_feed_url',
+					'varname' => 'froxlor_graphic',
 					'type' => 'string',
-					'string_type' => 'url',
-					'string_emptyallowed' => true,
 					'default' => '',
 					'save_method' => 'storeSettingField',
 					),
@@ -219,14 +157,6 @@ return array(
 					'default' => false,
 					'save_method' => 'storeSettingField',
 					),
-				'panel_phpconfigs_hidestdsubdomain' => array(
-					'label' => $lng['serversettings']['panel_phpconfigs_hidestdsubdomain'],
-					'settinggroup' => 'panel',
-					'varname' => 'phpconfigs_hidestdsubdomain',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					),
 				),
 			),
 		),
--- a/actions/admin/settings/110.accounts.php
+++ b/actions/admin/settings/110.accounts.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Settings
- *
+ * @version    $Id$
 */

 return array(
@@ -38,14 +38,6 @@ return array(
 					'default' => false,
 					'save_method' => 'storeSettingField',
 					),
-				'login_domain_login' => array(
-					'label' => $lng['serversettings']['login_domain_login'],
-					'settinggroup' => 'login',
-					'varname' => 'domain_login',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					),
 				'login_maxloginattempts' => array(
 					'label' => $lng['serversettings']['maxloginattempts'],
 					'settinggroup' => 'login',
@@ -62,63 +54,6 @@ return array(
 					'default' => 900,
 					'save_method' => 'storeSettingField',
 					),
-				'panel_password_min_length' => array(
-					'label' => $lng['serversettings']['panel_password_min_length'],
-					'settinggroup' => 'panel',
-					'varname' => 'password_min_length',
-					'type' => 'int',
-					'default' => 0,
-					'save_method' => 'storeSettingField',
-					),
-				'panel_password_alpha_lower' => array(
-					'label' => $lng['serversettings']['panel_password_alpha_lower'],
-					'settinggroup' => 'panel',
-					'varname' => 'password_alpha_lower',
-					'type' => 'bool',
-					'default' => true,
-					'save_method' => 'storeSettingField',
-					),
-				'panel_password_alpha_upper' => array(
-					'label' => $lng['serversettings']['panel_password_alpha_upper'],
-					'settinggroup' => 'panel',
-					'varname' => 'password_alpha_upper',
-					'type' => 'bool',
-					'default' => true,
-					'save_method' => 'storeSettingField',
-					),
-				'panel_password_numeric' => array(
-					'label' => $lng['serversettings']['panel_password_numeric'],
-					'settinggroup' => 'panel',
-					'varname' => 'password_numeric',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					),
-				'panel_password_special_char_required' => array(
-					'label' => $lng['serversettings']['panel_password_special_char_required'],
-					'settinggroup' => 'panel',
-					'varname' => 'password_special_char_required',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					),
-				'panel_password_special_char' => array(
-					'label' => $lng['serversettings']['panel_password_special_char'],
-					'settinggroup' => 'panel',
-					'varname' => 'password_special_char',
-					'type' => 'string',
-					'default' => '!?<>§$%+#=@',
-					'save_method' => 'storeSettingField',
-					),
-				'panel_password_regex' => array(
-					'label' => $lng['serversettings']['panel_password_regex'],
-					'settinggroup' => 'panel',
-					'varname' => 'password_regex',
-					'type' => 'string',
-					'default' => '',
-					/* 'plausibility_check_method' => 'checkValidRegEx', */
-					'save_method' => 'storeSettingField',
-					),
 				'customer_accountprefix' => array(
 					'label' => $lng['serversettings']['accountprefix'],
 					'settinggroup' => 'customer',
@@ -190,4 +125,4 @@ return array(
 		),
 	);

-?>
+?>
--- a/actions/admin/settings/120.system.php
+++ b/actions/admin/settings/120.system.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Settings
- *
+ * @version    $Id$
 */

 return array(
@@ -27,18 +27,8 @@ return array(
 					'settinggroup' => 'system',
 					'varname' => 'documentroot_prefix',
 					'type' => 'string',
-					'string_type' => 'dir',
 					'default' => '/var/customers/webs/',
 					'save_method' => 'storeSettingField',
-					'plausibility_check_method' => 'checkPathConflicts'
-					),
-				'system_documentroot_use_default_value' => array(
-					'label' => $lng['serversettings']['documentroot_use_default_value'],
-					'settinggroup' => 'system',
-					'varname' => 'documentroot_use_default_value',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
 					),
 				'system_ipaddress' => array(
 					'label' => $lng['serversettings']['ipaddress'],
@@ -55,7 +45,7 @@ return array(
 					'settinggroup' => 'system',
 					'varname' => 'defaultip',
 					'type' => 'option',
-					'option_mode' => 'multiple',
+					'option_mode' => 'one',
 					'option_options_method' => 'getIpPortCombinations',
 					'default' => '',
 					'save_method' => 'storeSettingDefaultIp',
@@ -67,31 +57,6 @@ return array(
 					'type' => 'string',
 					'default' => '',
 					'save_method' => 'storeSettingHostname',
-					'plausibility_check_method' => 'checkHostname',
-					),
-				'system_froxlordirectlyviahostname' => array(
-					'label' => $lng['serversettings']['froxlordirectlyviahostname'],
-					'settinggroup' => 'system',
-					'varname' => 'froxlordirectlyviahostname',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					),
-				'system_validatedomain' => array(
-					'label' => $lng['serversettings']['validate_domain'],
-					'settinggroup' => 'system',
-					'varname' => 'validate_domain',
-					'type' => 'bool',
-					'default' => true,
-					'save_method' => 'storeSettingField',
-					),
-				'system_stdsubdomain' => array(
-					'label' => $lng['serversettings']['stdsubdomainhost'],
-					'settinggroup' => 'system',
-					'varname' => 'stdsubdomain',
-					'type' => 'string',
-					'default' => '',
-					'save_method' => 'storeSettingHostname',
 					),
 				'system_mysql_access_host' => array(
 					'label' => $lng['serversettings']['mysql_access_host'],
@@ -102,6 +67,15 @@ return array(
 					'plausibility_check_method' => 'checkMysqlAccessHost',
 					'save_method' => 'storeSettingMysqlAccessHost',
 					),
+				'system_realtime_port' => array(
+					'label' => $lng['serversettings']['system_realtime_port'],
+					'settinggroup' => 'system',
+					'varname' => 'realtime_port',
+					'type' => (function_exists('socket_create') ? 'int' : 'hidden'),
+					'int_max' => 65535,
+					'default' => 0,
+					'save_method' => 'storeSettingField',
+					),
 				'system_index_file_extension' => array(
 					'label' => $lng['serversettings']['index_file_extension'],
 					'settinggroup' => 'system',
@@ -111,14 +85,6 @@ return array(
 					'default' => 'html',
 					'save_method' => 'storeSettingField',
 					),
-				'system_store_index_file_subs' => array(
-					'label' => $lng['serversettings']['system_store_index_file_subs'],
-					'settinggroup' => 'system',
-					'varname' => 'store_index_file_subs',
-					'type' => 'bool',
-					'default' => true,
-					'save_method' => 'storeSettingField',
-					),
 				'system_httpuser' => array(
 					'settinggroup' => 'system',
 					'varname' => 'httpuser',
@@ -131,36 +97,17 @@ return array(
 					'type' => 'hidden',
 					'default' => 'www-data',
 					),
-				'system_report_enable' => array(
-					'label' => $lng['serversettings']['report']['report'],
+				'system_debug_cron' => array(
+					'label' => $lng['serversettings']['cron']['debug'],
 					'settinggroup' => 'system',
-					'varname' => 'report_enable',
+					'varname' => 'debug_cron',
 					'type' => 'bool',
-					'default' => true,
-					'cronmodule' => 'froxlor/reports',
+					'default' => false,
 					'save_method' => 'storeSettingField',
-					),
-				'system_report_webmax' => array(
-					'label' => $lng['serversettings']['report']['webmax'],
-					'settinggroup' => 'system',
-					'varname' => 'report_webmax',
-					'type' => 'int',
-					'int_min' => 1,
-					'int_max' => 150,
-					'default' => 90,
-					'save_method' => 'storeSettingField',
-					),
-				'system_report_trafficmax' => array(
-					'label' => $lng['serversettings']['report']['trafficmax'],
-					'settinggroup' => 'system',
-					'varname' => 'report_trafficmax',
-					'type' => 'int',
-					'int_min' => 1,
-					'int_max' => 150,
-					'default' => 90,
-					'save_method' => 'storeSettingField',
-					),
+					),					
 				),
 			),
 		),
 	);
+
+?>
--- a/actions/admin/settings/125.cronjob.php
+++ b/actions/admin/settings/125.cronjob.php
@@ -1,67 +0,0 @@
-<?php
-
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2014 the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright  (c) the authors
- * @author     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Settings
- *
- */
-
-return array(
-	'groups' => array(
-		'crond' => array(
-			'title' => $lng['admin']['cronsettings'],
-			'fields' => array(
-				'system_cronconfig' => array(
-					'label' => $lng['serversettings']['system_cronconfig'],
-					'settinggroup' => 'system',
-					'varname' => 'cronconfig',
-					'type' => 'string',
-					'string_type' => 'file',
-					'default' => '/etc/cron.d/froxlor',
-					'save_method' => 'storeSettingField',
-					),
-				'system_croncmdline' => array(
-					'label' => $lng['serversettings']['system_croncmdline'],
-					'settinggroup' => 'system',
-					'varname' => 'croncmdline',
-					'type' => 'string',
-					'default' => '/usr/bin/nice -n 5 /usr/bin/php -q',
-					'save_method' => 'storeSettingField',
-					),
-				'system_crondreload' => array(
-					'label' => $lng['serversettings']['system_crondreload'],
-					'settinggroup' => 'system',
-					'varname' => 'crondreload',
-					'type' => 'string',
-					'default' => '/etc/init.d/cron reload',
-					'save_method' => 'storeSettingField',
-					),
-				'system_cron_allowautoupdate' => array(
-					'label' => $lng['serversettings']['system_cron_allowautoupdate'],
-					'settinggroup' => 'system',
-					'varname' => 'cron_allowautoupdate',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					),
-				'system_debug_cron' => array(
-					'label' => $lng['serversettings']['cron']['debug'],
-					'settinggroup' => 'system',
-					'varname' => 'debug_cron',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					)
-			)
-		)
-	)
-);
--- a/actions/admin/settings/130.webserver.php
+++ b/actions/admin/settings/130.webserver.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Settings
- *
+ * @version    $Id$
 */

 return array(
@@ -27,46 +27,9 @@ return array(
 					'settinggroup' => 'system',
 					'varname' => 'webserver',
 					'type' => 'option',
-					'default' => 'apache2',
+					'default' => 'Apache2',
 					'option_mode' => 'one',
-					'option_options' => array('apache2' => 'Apache 2', 'lighttpd' => 'ligHTTPd', 'nginx' => 'Nginx'),
-					'save_method' => 'storeSettingField',
-					'plausibility_check_method' => 'checkPhpInterfaceSetting',
-					'overview_option' => true
-					),
-				'system_apache_24' => array(
-					'label' => $lng['serversettings']['apache_24'],
-					'settinggroup' => 'system',
-					'varname' => 'apache24',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('apache2')
-					),
-			    'system_apache_itksupport' => array(
-			        'label' => $lng['serversettings']['apache_itksupport'],
-			        'settinggroup' => 'system',
-			        'varname' => 'apacheitksupport',
-			        'type' => 'bool',
-			        'default' => false,
-			        'save_method' => 'storeSettingField',
-			        'visible' => (Settings::Get('system.mod_fcgid') == 0 && Settings::Get('phpfpm.enabled') == 0),
-			        'websrv_avail' => array('apache2')
-			    ),
-				'system_httpuser' => array(
-					'label' => $lng['admin']['webserver_user'],
-					'settinggroup' => 'system',
-					'varname' => 'httpuser',
-					'type' => 'string',
-					'default' => 'www-data',
-					'save_method' => 'storeSettingWebserverFcgidFpmUser',
-					),
-				'system_httpgroup' => array(
-					'label' => $lng['admin']['webserver_group'],
-					'settinggroup' => 'system',
-					'varname' => 'httpgroup',
-					'type' => 'string',
-					'default' => 'www-data',
+					'option_options' => array('apache2' => 'Apache 2', 'lighttpd' => 'ligHTTPd'),
 					'save_method' => 'storeSettingField',
 					),
 				'system_apacheconf_vhost' => array(
@@ -92,10 +55,26 @@ return array(
 					'settinggroup' => 'system',
 					'varname' => 'apacheconf_htpasswddir',
 					'type' => 'string',
-					'string_type' => 'confdir',
+					'string_type' => 'dir',
 					'default' => '/etc/apache2/htpasswd/',
 					'save_method' => 'storeSettingField',
 					),
+				'system_apachereload_command' => array(
+					'label' => $lng['serversettings']['apachereload_command'],
+					'settinggroup' => 'system',
+					'varname' => 'apachereload_command',
+					'type' => 'string',
+					'default' => '/etc/init.d/apache2 reload',
+					'save_method' => 'storeSettingField',
+					),
+				'system_mod_log_sql' => array(
+					'label' => $lng['serversettings']['mod_log_sql'],
+					'settinggroup' => 'system',
+					'varname' => 'mod_log_sql',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					),
 				'system_logfiles_directory' => array(
 					'label' => $lng['serversettings']['logfiles_directory'],
 					'settinggroup' => 'system',
@@ -105,15 +84,6 @@ return array(
 					'default' => '/var/customers/logs/',
 					'save_method' => 'storeSettingField',
 					),
-				'system_customersslpath' => array(
-					'label' => $lng['serversettings']['customerssl_directory'],
-					'settinggroup' => 'system',
-					'varname' => 'customer_ssl_path',
-					'type' => 'string',
-					'string_type' => 'confdir',
-					'default' => '/etc/ssl/froxlor-custom/',
-					'save_method' => 'storeSettingField',
-					),
 				'system_phpappendopenbasedir' => array(
 					'label' => $lng['serversettings']['phpappendopenbasedir'],
 					'settinggroup' => 'system',
@@ -141,106 +111,60 @@ return array(
 					'default' => '',
 					'save_method' => 'storeSettingField',
 					),
-				'system_apachereload_command' => array(
-					'label' => $lng['serversettings']['apachereload_command'],
+				),
+			),
+		'ssl' => array(
+			'title' => $lng['admin']['sslsettings'],
+			'fields' => array(
+				'system_ssl_enabled' => array(
+					'label' => $lng['serversettings']['ssl']['use_ssl'],
 					'settinggroup' => 'system',
-					'varname' => 'apachereload_command',
-					'type' => 'string',
-					'default' => '/etc/init.d/apache2 reload',
+					'varname' => 'use_ssl',
+					'type' => 'bool',
+					'default' => false,
 					'save_method' => 'storeSettingField',
 					),
-				'system_phpreload_command' => array(
-					'label' => $lng['serversettings']['phpreload_command'],
+				'system_ssl_cert_file' => array(
+					'label' => $lng['serversettings']['ssl']['ssl_cert_file'],
 					'settinggroup' => 'system',
-					'varname' => 'phpreload_command',
-					'type' => 'string',
-					'default' => '',
-					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('nginx')
-					),
-				'system_nginx_php_backend' => array(
-					'label' => $lng['serversettings']['nginx_php_backend'],
-					'settinggroup' => 'system',
-					'varname' => 'nginx_php_backend',
-					'type' => 'string',
-					'default' => '127.0.0.1:8888',
-					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('nginx')
-					),
-				'nginx_fastcgiparams' => array(
-					'label' => $lng['serversettings']['nginx_fastcgiparams'],
-					'settinggroup' => 'nginx',
-					'varname' => 'fastcgiparams',
+					'varname' => 'ssl_cert_file',
 					'type' => 'string',
 					'string_type' => 'file',
-					'default' => '/etc/nginx/fastcgi_params',
-					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('nginx')
-					),
-				'defaultwebsrverrhandler_enabled' => array(
-					'label' => $lng['serversettings']['defaultwebsrverrhandler_enabled'],
-					'settinggroup' => 'defaultwebsrverrhandler',
-					'varname' => 'enabled',
-					'type' => 'bool',
-					'default' => false,
+					'string_emptyallowed' => true,
+					'default' => '/etc/apache2/apache2.pem',
 					'save_method' => 'storeSettingField',
 					),
-				'defaultwebsrverrhandler_err401' => array(
-					'label' => $lng['serversettings']['defaultwebsrverrhandler_err401'],
-					'settinggroup' => 'defaultwebsrverrhandler',
-					'varname' => 'err401',
+				'system_ssl_key_file' => array(
+					'label' => $lng['serversettings']['ssl']['ssl_key_file'],
+					'settinggroup' => 'system',
+					'varname' => 'ssl_key_file',
 					'type' => 'string',
-					'default' => '',
+					'string_type' => 'file',
+					'string_emptyallowed' => true,
+					'default' => '/etc/apache2/apache2.key',
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('apache2', 'nginx')
 					),
-				'defaultwebsrverrhandler_err403' => array(
-					'label' => $lng['serversettings']['defaultwebsrverrhandler_err403'],
-					'settinggroup' => 'defaultwebsrverrhandler',
-					'varname' => 'err403',
-					'type' => 'string',
-					'default' => '',
-					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('apache2', 'nginx')
-					),
-				'defaultwebsrverrhandler_err404' => array(
-					'label' => $lng['serversettings']['defaultwebsrverrhandler_err404'],
-					'settinggroup' => 'defaultwebsrverrhandler',
-					'varname' => 'err404',
+				'system_ssl_ca_file' => array(
+					'label' => $lng['serversettings']['ssl']['ssl_ca_file'],
+					'settinggroup' => 'system',
+					'varname' => 'ssl_ca_file',
 					'type' => 'string',
+					'string_type' => 'file',
+					'string_emptyallowed' => true,
 					'default' => '',
 					'save_method' => 'storeSettingField',
 					),
-				'defaultwebsrverrhandler_err500' => array(
-					'label' => $lng['serversettings']['defaultwebsrverrhandler_err500'],
-					'settinggroup' => 'defaultwebsrverrhandler',
-					'varname' => 'err500',
-					'type' => 'string',
+				'system_ssl_openssl_cnf' => array(
+					'label' => $lng['serversettings']['ssl']['openssl_cnf'],
+					'settinggroup' => 'system',
+					'varname' => 'openssl_cnf',
+					'type' => 'text',
 					'default' => '',
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('apache2', 'nginx')
 					),
-				'customredirect_enabled' => array(
-					'label' => $lng['serversettings']['customredirect_enabled'],
-					'settinggroup' => 'customredirect',
-					'varname' => 'enabled',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('apache2', 'lighttpd')
-					),
-				'customredirect_default' => array(
-					'label' => $lng['serversettings']['customredirect_default'],
-					'settinggroup' => 'customredirect',
-					'varname' => 'default',
-					'type' => 'option',
-					'default' => '1',
-					'option_mode' => 'one',
-					'option_options_method' => 'getRedirectCodes',
-					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('apache2', 'lighttpd')
-					)
-				)
-			)
-		)
+				),
+			),
+		),
 	);
+
+?>
--- a/actions/admin/settings/131.ssl.php
+++ b/actions/admin/settings/131.ssl.php
@@ -1,149 +0,0 @@
-<?php
-
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2003-2009 the SysCP Team (see authors).
- * Copyright (c) 2010 the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright  (c) the authors
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
- * @author     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Settings
- *
- */
-
-return array(
-	'groups' => array(
-			'ssl' => array(
-					'title' => $lng['admin']['sslsettings'],
-					'fields' => array(
-							'system_ssl_enabled' => array(
-									'label' => $lng['serversettings']['ssl']['use_ssl'],
-									'settinggroup' => 'system',
-									'varname' => 'use_ssl',
-									'type' => 'bool',
-									'default' => false,
-									'save_method' => 'storeSettingField',
-									'overview_option' => true
-							),
-							'system_ssl_cipher_list' => array(
-									'label' => $lng['serversettings']['ssl']['ssl_cipher_list'],
-									'settinggroup' => 'system',
-									'varname' => 'ssl_cipher_list',
-									'type' => 'string',
-									'string_emptyallowed' => false,
-									'default' => 'ECDH+AESGCM:ECDH+AES256:!aNULL:!MD5:!DSS:!DH:!AES128',
-									'save_method' => 'storeSettingField',
-							),
-							'system_ssl_cert_file' => array(
-									'label' => $lng['serversettings']['ssl']['ssl_cert_file'],
-									'settinggroup' => 'system',
-									'varname' => 'ssl_cert_file',
-									'type' => 'string',
-									'string_type' => 'file',
-									'string_emptyallowed' => true,
-									'default' => '/etc/apache2/apache2.pem',
-									'save_method' => 'storeSettingField',
-							),
-							'system_ssl_key_file' => array(
-									'label' => $lng['serversettings']['ssl']['ssl_key_file'],
-									'settinggroup' => 'system',
-									'varname' => 'ssl_key_file',
-									'type' => 'string',
-									'string_type' => 'file',
-									'string_emptyallowed' => true,
-									'default' => '/etc/apache2/apache2.key',
-									'save_method' => 'storeSettingField',
-							),
-							'system_ssl_cert_chainfile' => array(
-									'label' => $lng['admin']['ipsandports']['ssl_cert_chainfile'],
-									'settinggroup' => 'system',
-									'varname' => 'ssl_cert_chainfile',
-									'type' => 'string',
-									'string_type' => 'file',
-									'string_emptyallowed' => true,
-									'default' => '',
-									'save_method' => 'storeSettingField',
-							),
-							'system_ssl_ca_file' => array(
-									'label' => $lng['serversettings']['ssl']['ssl_ca_file'],
-									'settinggroup' => 'system',
-									'varname' => 'ssl_ca_file',
-									'type' => 'string',
-									'string_type' => 'file',
-									'string_emptyallowed' => true,
-									'default' => '',
-									'save_method' => 'storeSettingField',
-							),
-							'system_leenabled' => array(
-							        'label' => $lng['serversettings']['leenabled'],
-							        'settinggroup' => 'system',
-							        'varname' => 'leenabled',
-							        'type' => 'bool',
-							        'default' => false,
-							        'cronmodule' => 'froxlor/letsencrypt',
-							        'save_method' => 'storeSettingField'
-							),
-							'system_letsencryptca' => array(
-									'label' => $lng['serversettings']['letsencryptca'],
-									'settinggroup' => 'system',
-									'varname' => 'letsencryptca',
-									'type' => 'option',
-									'default' => 'testing',
-									'option_mode' => 'one',
-									'option_options' => array('testing' => 'https://acme-staging.api.letsencrypt.org (Test)', 'production' => 'https://acme-v01.api.letsencrypt.org (Live)'),
-									'save_method' => 'storeSettingField',
-							),
-							'system_letsencryptcountrycode' => array(
-									'label' => $lng['serversettings']['letsencryptcountrycode'],
-									'settinggroup' => 'system',
-									'varname' => 'letsencryptcountrycode',
-									'type' => 'string',
-									'string_emptyallowed' => false,
-									'default' => 'DE',
-									'save_method' => 'storeSettingField',
-							),
-							'system_letsencryptstate' => array(
-									'label' => $lng['serversettings']['letsencryptstate'],
-									'settinggroup' => 'system',
-									'varname' => 'letsencryptstate',
-									'type' => 'string',
-									'string_emptyallowed' => false,
-									'default' => 'Germany',
-									'save_method' => 'storeSettingField',
-							),
-							'system_letsencryptchallengepath' => array(
-									'label' => $lng['serversettings']['letsencryptchallengepath'],
-									'settinggroup' => 'system',
-									'varname' => 'letsencryptchallengepath',
-									'type' => 'string',
-									'string_emptyallowed' => false,
-									'default' => FROXLOR_INSTALL_DIR,
-									'save_method' => 'storeSettingField',
-							),
-							'system_letsencryptkeysize' => array(
-									'label' => $lng['serversettings']['letsencryptkeysize'],
-									'settinggroup' => 'system',
-									'varname' => 'letsencryptkeysize',
-									'type' => 'int',
-									'int_min' => 2048,
-									'default' => 4096,
-									'save_method' => 'storeSettingField',
-							),
-							'system_letsencryptreuseold' => array(
-									'label' => $lng['serversettings']['letsencryptreuseold'],
-									'settinggroup' => 'system',
-									'varname' => 'letsencryptreuseold',
-									'type' => 'bool',
-									'default' => false,
-									'save_method' => 'storeSettingField',
-							),
-					)
-			)
-		)
-	);
--- a/actions/admin/settings/135.fcgid.php
+++ b/actions/admin/settings/135.fcgid.php
@@ -1,151 +0,0 @@
-<?php
-
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2010 the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright  (c) the authors
- * @author     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Settings
- *
- */
-
-return array(
-	'groups' => array(
-		'fcgid' => array(
-			'title' => $lng['admin']['fcgid_settings'],
-			'websrv_avail' => array('apache2', 'lighttpd'),
-			'fields' => array(
-				'system_mod_fcgid_enabled' => array(
-					'label' => $lng['serversettings']['mod_fcgid'],
-					'settinggroup' => 'system',
-					'varname' => 'mod_fcgid',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					'plausibility_check_method' => 'checkFcgidPhpFpm',
-					'overview_option' => true
-					),
-				'system_mod_fcgid_configdir' => array(
-					'label' => $lng['serversettings']['mod_fcgid']['configdir'],
-					'settinggroup' => 'system',
-					'varname' => 'mod_fcgid_configdir',
-					'type' => 'string',
-					'string_type' => 'confdir',
-					'default' => '/var/www/php-fcgi-scripts/',
-					'plausibility_check_method' => 'checkPathConflicts',
-					'save_method' => 'storeSettingField',
-					),
-				'system_mod_fcgid_tmpdir' => array(
-					'label' => $lng['serversettings']['mod_fcgid']['tmpdir'],
-					'settinggroup' => 'system',
-					'varname' => 'mod_fcgid_tmpdir',
-					'type' => 'string',
-					'string_type' => 'dir',
-					'default' => '/var/customers/tmp/',
-					'save_method' => 'storeSettingField',
-					),
-				'system_mod_fcgid_peardir' => array(
-					'label' => $lng['serversettings']['mod_fcgid']['peardir'],
-					'settinggroup' => 'system',
-					'varname' => 'mod_fcgid_peardir',
-					'type' => 'string',
-					'string_type' => 'dir',
-					'string_delimiter' => ':',
-					'string_emptyallowed' => true,
-					'default' => '/usr/share/php/:/usr/share/php5/',
-					'save_method' => 'storeSettingField',
-					),
-				'system_mod_fcgid_wrapper' => array(
-					'label' => $lng['serversettings']['mod_fcgid']['wrapper'],
-					'settinggroup' => 'system',
-					'varname' => 'mod_fcgid_wrapper',
-					'type' => 'option',
-					'option_options' => array(0 => 'ScriptAlias', 1=> 'FcgidWrapper'),
-					'default' => 1,
-					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('apache2')
-					),
-				'system_mod_fcgid_starter' => array(
-					'label' => $lng['serversettings']['mod_fcgid']['starter'],
-					'settinggroup' => 'system',
-					'varname' => 'mod_fcgid_starter',
-					'type' => 'int',
-					'default' => 0,
-					'save_method' => 'storeSettingField',
-					),
-				'system_mod_fcgid_maxrequests' => array(
-					'label' => $lng['serversettings']['mod_fcgid']['maxrequests'],
-					'settinggroup' => 'system',
-					'varname' => 'mod_fcgid_maxrequests',
-					'type' => 'int',
-					'default' => 250,
-					'save_method' => 'storeSettingField',
-					),
-				'system_mod_fcgid_defaultini' => array(
-					'label' => $lng['serversettings']['mod_fcgid']['defaultini'],
-					'settinggroup' => 'system',
-					'varname' => 'mod_fcgid_defaultini',
-					'type' => 'option',
-					'default' => '1',
-					'option_mode' => 'one',
-					'option_options_method' => 'getPhpConfigs',
-					'save_method' => 'storeSettingField',
-					),
-				'system_mod_fcgid_enabled_ownvhost' => array(
-					'label' => $lng['serversettings']['mod_fcgid_ownvhost'],
-					'settinggroup' => 'system',
-					'varname' => 'mod_fcgid_ownvhost',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('apache2')
-					),
-				'system_mod_fcgid_httpuser' => array(
-					'label' => $lng['admin']['mod_fcgid_user'],
-					'settinggroup' => 'system',
-					'varname' => 'mod_fcgid_httpuser',
-					'type' => 'string',
-					'default' => 'froxlorlocal',
-					'save_method' => 'storeSettingWebserverFcgidFpmUser',
-					'websrv_avail' => array('apache2')
-					),
-				'system_mod_fcgid_httpgroup' => array(
-					'label' => $lng['admin']['mod_fcgid_group'],
-					'settinggroup' => 'system',
-					'varname' => 'mod_fcgid_httpgroup',
-					'type' => 'string',
-					'default' => 'froxlorlocal',
-					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('apache2')
-					),
-				'system_mod_fcgid_defaultini_ownvhost' => array(
-					'label' => $lng['serversettings']['mod_fcgid']['defaultini_ownvhost'],
-					'settinggroup' => 'system',
-					'varname' => 'mod_fcgid_defaultini_ownvhost',
-					'type' => 'option',
-					'default' => '2',
-					'option_mode' => 'one',
-					'option_options_method' => 'getPhpConfigs',
-					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('apache2')
-					),
-				'system_mod_fcgid_idle_timeout' => array(
-					'label' => $lng['serversettings']['mod_fcgid']['idle_timeout'],
-					'settinggroup' => 'system',
-					'varname' => 'mod_fcgid_idle_timeout',
-					'type' => 'int',
-					'default' => 30,
-					'save_method' => 'storeSettingField'
-					),
-				)
-			)
-		)
-	);
-
-?>
--- a/actions/admin/settings/136.phpfpm.php
+++ b/actions/admin/settings/136.phpfpm.php
@@ -1,200 +0,0 @@
-<?php
-
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2010 the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright  (c) the authors
- * @author     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Settings
- *
- */
-
-return array(
-	'groups' => array(
-		'phpfpm' => array(
-			'title' => $lng['admin']['phpfpm_settings'],
-			'fields' => array(
-				'system_phpfpm_enabled' => array(
-					'label' => $lng['serversettings']['phpfpm'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'enabled',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					'plausibility_check_method' => 'checkFcgidPhpFpm',
-					'overview_option' => true
-					),
-				'system_phpfpm_enabled_ownvhost' => array(
-					'label' => $lng['phpfpm']['ownvhost'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'enabled_ownvhost',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField'
-					),
-				'system_phpfpm_httpuser' => array(
-					'label' => $lng['phpfpm']['vhost_httpuser'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'vhost_httpuser',
-					'type' => 'string',
-					'default' => 'froxlorlocal',
-					'save_method' => 'storeSettingWebserverFcgidFpmUser'
-					),
-				'system_phpfpm_httpgroup' => array(
-					'label' => $lng['phpfpm']['vhost_httpgroup'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'vhost_httpgroup',
-					'type' => 'string',
-					'default' => 'froxlorlocal',
-					'save_method' => 'storeSettingField'
-					),
-				'system_phpfpm_defaultini' => array(
-					'label' => $lng['serversettings']['mod_fcgid']['defaultini'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'defaultini',
-					'type' => 'option',
-					'default' => '1',
-					'option_mode' => 'one',
-					'option_options_method' => 'getPhpConfigs',
-					'save_method' => 'storeSettingField'
-					),
-				'system_phpfpm_defaultini_ownvhost' => array(
-					'label' => $lng['serversettings']['mod_fcgid']['defaultini_ownvhost'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'vhost_defaultini',
-					'type' => 'option',
-					'default' => '2',
-					'option_mode' => 'one',
-					'option_options_method' => 'getPhpConfigs',
-					'save_method' => 'storeSettingField'
-					),
-				'system_phpfpm_configdir' => array(
-					'label' => $lng['serversettings']['phpfpm_settings']['configdir'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'configdir',
-					'type' => 'string',
-					'string_type' => 'confdir',
-					'default' => '/etc/php-fpm.d/',
-					'save_method' => 'storeSettingField'
-					),
-				'system_phpfpm_aliasconfigdir' => array(
-					'label' => $lng['serversettings']['phpfpm_settings']['aliasconfigdir'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'aliasconfigdir',
-					'type' => 'string',
-					'string_type' => 'confdir',
-					'default' => '/var/www/php-fpm/',
-					'save_method' => 'storeSettingField'
-					),
-				'system_phpfpm_tmpdir' => array(
-					'label' => $lng['serversettings']['mod_fcgid']['tmpdir'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'tmpdir',
-					'type' => 'string',
-					'string_type' => 'dir',
-					'default' => '/var/customers/tmp/',
-					'save_method' => 'storeSettingField'
-					),
-				'system_phpfpm_peardir' => array(
-					'label' => $lng['serversettings']['mod_fcgid']['peardir'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'peardir',
-					'type' => 'string',
-					'string_type' => 'dir',
-					'default' => '/usr/share/php/:/usr/share/php5/',
-					'save_method' => 'storeSettingField'
-					),
-				'system_phpfpm_fastcgi_ipcdir' => array(
-					'label' => $lng['serversettings']['phpfpm_settings']['ipcdir'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'fastcgi_ipcdir',
-					'type' => 'string',
-					'string_type' => 'dir',
-					'default' => '/var/lib/apache2/fastcgi/',
-					'save_method' => 'storeSettingField'
-					),
-				'system_phpfpm_reload' => array(
-					'label' => $lng['serversettings']['phpfpm_settings']['reload'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'reload',
-					'type' => 'string',
-					'default' => '/etc/init.d/php-fpm restart',
-					'save_method' => 'storeSettingField'
-					),
-				'system_phpfpm_pm' => array(
-					'label' => $lng['serversettings']['phpfpm_settings']['pm'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'pm',
-					'type' => 'option',
-					'default' => 'static',
-					'option_mode' => 'one',
-					'option_options' => array('static' => 'static', 'dynamic' => 'dynamic', 'ondemand' => 'ondemand'),
-					'save_method' => 'storeSettingField'
-					),
-				'system_phpfpm_max_children' => array(
-					'label' => $lng['serversettings']['phpfpm_settings']['max_children'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'max_children',
-					'type' => 'int',
-					'default' => 1,
-					'save_method' => 'storeSettingField'
-					),
-				'system_phpfpm_start_servers' => array(
-					'label' => $lng['serversettings']['phpfpm_settings']['start_servers'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'start_servers',
-					'type' => 'int',
-					'default' => 20,
-					'save_method' => 'storeSettingField'
-					),
-				'system_phpfpm_min_spare_servers' => array(
-					'label' => $lng['serversettings']['phpfpm_settings']['min_spare_servers'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'min_spare_servers',
-					'type' => 'int',
-					'default' => 5,
-					'save_method' => 'storeSettingField'
-					),
-				'system_phpfpm_max_spare_servers' => array(
-					'label' => $lng['serversettings']['phpfpm_settings']['max_spare_servers'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'max_spare_servers',
-					'type' => 'int',
-					'default' => 35,
-					'save_method' => 'storeSettingField'
-					),
-				'system_phpfpm_max_requests' => array(
-					'label' => $lng['serversettings']['phpfpm_settings']['max_requests'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'max_requests',
-					'type' => 'int',
-					'default' => 0,
-					'save_method' => 'storeSettingField'
-					),
-				'system_phpfpm_idle_timeout' => array(
-					'label' => $lng['serversettings']['phpfpm_settings']['idle_timeout'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'idle_timeout',
-					'type' => 'int',
-					'default' => 30,
-					'save_method' => 'storeSettingField'
-					),
-				'system_phpfpm_use_mod_proxy' => array(
-					'label' => $lng['phpfpm']['use_mod_proxy'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'use_mod_proxy',
-					'type' => 'bool',
-					'default' => false,
-					'visible' => Settings::Get('system.apache24'),
-					'save_method' => 'storeSettingField'
-					),
-				),
-			),
-		),
-	);
--- a/actions/admin/settings/137.perl.php
+++ b/actions/admin/settings/137.perl.php
@@ -1,65 +0,0 @@
-<?php
-
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2010 the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright  (c) the authors
- * @author     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Settings
- *
- */
-
-return array(
-	'groups' => array(
-		'perl' => array(
-			'title' => $lng['admin']['perl_settings'],
-			'fields' => array(
-				'perl_path' => array(
-					'label' => $lng['serversettings']['perl_path'],
-					'settinggroup' => 'system',
-					'varname' => 'perl_path',
-					'type' => 'string',
-					'default' => '/usr/bin/perl',
-					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('lighttpd')
-					),	
-				'system_perl_suexecworkaround' => array(
-					'label' => $lng['serversettings']['perl']['suexecworkaround'],
-					'settinggroup' => 'perl',
-					'varname' => 'suexecworkaround',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('apache2')
-					),
-				'system_perl_suexeccgipath' => array(
-					'label' => $lng['serversettings']['perl']['suexeccgipath'],
-					'settinggroup' => 'perl',
-					'varname' => 'suexecpath',
-					'type' => 'string',
-					'string_type' => 'dir',
-					'default' => '/var/www/cgi-bin/',
-					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('apache2')
-					),
-				'perl_server' => array(
-					'label' => $lng['serversettings']['perl_server'],
-					'settinggroup' => 'serversettings',
-					'varname' => 'perl_server',
-					'type' => 'string',
-					'default' => 'unix:/var/run/nginx/cgiwrap-dispatch.sock',
-					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('nginx')
-					),
-				),
-			),
-		),
-	);
-
-?>
--- a/actions/admin/settings/140.statistics.php
+++ b/actions/admin/settings/140.statistics.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Settings
- *
+ * @version    $Id$
 */

 return array(
@@ -40,45 +40,45 @@ return array(
 					'default' => false,
 					'save_method' => 'storeSettingField',
 					),
+				'system_awstats_domain_file' => array(
+					'label' => $lng['serversettings']['awstats_domain_file'],
+					'settinggroup' => 'system',
+					'varname' => 'awstats_domain_file',
+					'type' => 'string',
+					'string_type' => 'dir',
+					'default' => '/etc/awstats/',
+					'save_method' => 'storeSettingField',
+					),
+				'system_awstats_model_file' => array(
+					'label' => $lng['serversettings']['awstats_model_file'],
+					'settinggroup' => 'system',
+					'varname' => 'awstats_model_file',
+					'type' => 'string',
+					'string_type' => 'file',
+					'default' => '/etc/awstats/awstats.model.conf.syscp',
+					'save_method' => 'storeSettingField',
+					),
 				'system_awstats_path' => array(
 					'label' => $lng['serversettings']['awstats_path'],
 					'settinggroup' => 'system',
 					'varname' => 'awstats_path',
 					'type' => 'string',
 					'string_type' => 'dir',
-					'default' => '/usr/bin/',
+					'default' => '/usr/share/awstats/VERSION/webroot/cgi-bin/',
 					'save_method' => 'storeSettingField',
 					),
-				'system_awstats_awstatspath' => array(
-					'label' => $lng['serversettings']['awstats_awstatspath'],
+				'system_awstats_updateall_command' => array(
+					'label' => $lng['serversettings']['awstats_updateall_command'],
 					'settinggroup' => 'system',
-					'varname' => 'awstats_awstatspath',
+					'varname' => 'awstats_updateall_command',
 					'type' => 'string',
-					'string_type' => 'dir',
-					'default' => '/usr/bin/',
+					'string_type' => 'file',
+					'default' => '/usr/bin/awstats_updateall.pl',
 					'save_method' => 'storeSettingField',
 					),
-				'system_awstats_conf' => array(
-					'label' => $lng['serversettings']['awstats_conf'],
-					'settinggroup' => 'system',
-					'varname' => 'awstats_conf',
-					'type' => 'string',
-					'string_type' => 'dir',
-					'default' => '/etc/awstats/',
-					'save_method' => 'storeSettingField',
-					),
-				'system_awstats_icons' => array(
-					'label' => $lng['serversettings']['awstats_icons'],
-					'settinggroup' => 'system',
-					'varname' => 'awstats_icons',
-					'type' => 'string',
-					'string_type' => 'dir',
-					'default' => '/usr/share/awstats/icon/',
-					'save_method' => 'storeSettingField',
-					)
-				)
-			)
-		)
+				),
+			),
+		),
 	);

 ?>
--- a/actions/admin/settings/150.mail.php
+++ b/actions/admin/settings/150.mail.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Settings
- *
+ * @version    $Id$
 */

 return array(
@@ -51,16 +51,6 @@ return array(
 					'default' => '/var/customers/mail/',
 					'save_method' => 'storeSettingField',
 					),
-				'system_vmail_maildirname' => array(
-					'label' => $lng['serversettings']['vmail_maildirname'],
-					'settinggroup' => 'system',
-					'varname' => 'vmail_maildirname',
-					'type' => 'string',
-					'string_type' => 'dir',
-					'default' => 'Maildir',
-					'string_emptyallowed' => true,
-					'save_method' => 'storeSettingField',
-					),
 				'panel_sendalternativemail' => array(
 					'label' => $lng['serversettings']['sendalternativemail'],
 					'settinggroup' => 'panel',
@@ -85,65 +75,24 @@ return array(
 					'default' => 100,
 					'save_method' => 'storeSettingField',
 					),
-				'system_catchall_enabled' => array(
-					'label' => $lng['serversettings']['catchall_enabled'],
-					'settinggroup' => 'catchall',
-					'varname' => 'catchall_enabled',
+				'systen_autoresponder_enabled' => array(
+					'label' => $lng['serversettings']['autoresponder_active'],
+					'settinggroup' => 'autoresponder',
+					'varname' => 'autoresponder_active',
 					'type' => 'bool',
-					'default' => true,
-					'save_method' => 'storeSettingResetCatchall',
-					),
-				'system_mailtraffic_enabled' => array(
-					'label' => $lng['serversettings']['mailtraffic_enabled'],
-					'settinggroup' => 'system',
-					'varname' => 'mailtraffic_enabled',
-					'type' => 'bool',
-					'default' => true,
+					'default' => false,
+					'cronmodule' => 'froxlor/autoresponder',
 					'save_method' => 'storeSettingField',
 					),
-				'system_mdaserver' => array(
-					'label' => $lng['serversettings']['mdaserver'],
-					'settinggroup' => 'system',
-					'varname' => 'mdaserver',
-					'type' => 'option',
-					'option_mode' => 'one',
-					'default' => 'dovecot',
-					'option_options' => array('courier' => 'Courier', 'dovecot' => 'Dovecot'),
-					'save_method' => 'storeSettingField',
-					),
-				'system_mdalog' => array(
-					'label' => $lng['serversettings']['mdalog'],
-					'settinggroup' => 'system',
-					'varname' => 'mdalog',
-					'type' => 'string',
-					'string_type' => 'file',
-					'default' => '/var/log/mail.log',
-					'string_emptyallowed' => true,
-					'save_method' => 'storeSettingField',
-					),
-				'system_mtaserver' => array(
-					'label' => $lng['serversettings']['mtaserver'],
-					'settinggroup' => 'system',
-					'varname' => 'mtaserver',
-					'type' => 'option',
-					'option_mode' => 'one',
-					'default' => 'postfix',
-					'option_options' => array('exim4' => 'Exim4', 'postfix' => 'Postfix'),
-					'save_method' => 'storeSettingField',
-					),
-				'system_mtalog' => array(
-					'label' => $lng['serversettings']['mtalog'],
-					'settinggroup' => 'system',
-					'varname' => 'mtalog',
-					'type' => 'string',
-					'string_type' => 'file',
-					'default' => '/var/log/mail.log',
-					'string_emptyallowed' => true,
-					'save_method' => 'storeSettingField',
+				'systen_last_autoresponder_run' => array(
+					'settinggroup' => 'autoresponder',
+					'varname' => 'last_autoresponder_run',
+					'type' => 'hidden',
+					'default' => 0,
 					),
 				),
 			),
 		),
 	);

-?>
+?>
--- a/actions/admin/settings/160.nameserver.php
+++ b/actions/admin/settings/160.nameserver.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Settings
- *
+ * @version    $Id$
 */

 return array(
@@ -22,15 +22,6 @@ return array(
 		'nameserver' => array(
 			'title' => $lng['admin']['nameserversettings'],
 			'fields' => array(
-				'nameserver_enable' => array(
-					'label' => $lng['serversettings']['bindenable'],
-					'settinggroup' => 'system',
-					'varname' => 'bind_enable',
-					'type' => 'bool',
-					'default' => true,
-					'save_method' => 'storeSettingField',
-					'overview_option' => true
-					),
 				'system_bindconf_directory' => array(
 					'label' => $lng['serversettings']['bindconf_directory'],
 					'settinggroup' => 'system',
@@ -68,43 +59,6 @@ return array(
 					'default' => '',
 					'save_method' => 'storeSettingField',
 					),
-				'system_axfrservers' => array(
-					'label' => $lng['serversettings']['axfrservers'],
-					'settinggroup' => 'system',
-					'varname' => 'axfrservers',
-					'type' => 'string',
-					'string_type' => 'validate_ip_incl_private',
-					'string_delimiter' => ',',
-					'string_emptyallowed' => true,
-					'default' => '',
-					'save_method' => 'storeSettingField',
-				),
-				'system_dns_createhostnameentry' => array(
-					'label' => $lng['serversettings']['dns_createhostnameentry'],
-					'settinggroup' => 'system',
-					'varname' => 'dns_createhostnameentry',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField'
-				),
-				'system_dns_createmailentry' => array(
-					'label' => $lng['serversettings']['mail_also_with_mxservers'],
-					'settinggroup' => 'system',
-					'varname' => 'dns_createmailentry',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField'
-					),
-				'system_defaultttl' => array(
-					'label' => $lng['serversettings']['defaultttl'],
-					'settinggroup' => 'system',
-					'varname' => 'defaultttl',
-					'type' => 'int',
-					'default' => 604800, /* 1 week */
-					'int_min' => 3600, /* 1 hour */
-					'int_max' => 2147483647, /* integer max */
-					'save_method' => 'storeSettingField',
-					),
 				),
 			),
 		),
--- a/actions/admin/settings/170.logger.php
+++ b/actions/admin/settings/170.logger.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Settings
- *
+ * @version    $Id$
 */

 return array(
@@ -29,7 +29,6 @@ return array(
 					'type' => 'bool',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'overview_option' => true
 					),
 				'logger_severity' => array(
 					'label' => $lng['serversettings']['logger']['severity'],
@@ -65,14 +64,8 @@ return array(
 					'label' => $lng['serversettings']['logger']['logcron'],
 					'settinggroup' => 'logger',
 					'varname' => 'log_cron',
-					'type' => 'option',
-					'default' => 0,
-					'option_mode' => 'one',
-					'option_options' => array(
-							0 => $lng['serversettings']['logger']['logcronoption']['never'],
-							1 => $lng['serversettings']['logger']['logcronoption']['once'],
-							2 => $lng['serversettings']['logger']['logcronoption']['always']
-						),
+					'type' => 'bool',
+					'default' => false,
 					'save_method' => 'storeSettingField',
 					),
 				),
@@ -80,4 +73,4 @@ return array(
 		)
 	);

-?>
+?>
--- a/actions/admin/settings/180.dkim.php
+++ b/actions/admin/settings/180.dkim.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Settings
- *
+ * @version    $Id$
 */

 return array(
@@ -28,15 +28,13 @@ return array(
 					'varname' => 'use_dkim',
 					'type' => 'bool',
 					'default' => false,
-					'save_method' => 'storeSettingFieldInsertBindTask',
-					'overview_option' => true
+					'save_method' => 'storeSettingField',
 					),
 				'dkim_prefix' => array(
 					'label' => $lng['dkim']['dkim_prefix'],
 					'settinggroup' => 'dkim',
 					'varname' => 'dkim_prefix',
 					'type' => 'string',
-					'string_type' => 'dir',
 					'default' => '/etc/postfix/dkim/',
 					'save_method' => 'storeSettingField',
 					),
@@ -58,66 +56,6 @@ return array(
 					'default' => 'dkim-keys.conf',
 					'save_method' => 'storeSettingField',
 					),
-				'dkim_algorithm' => array(
-					'label' => $lng['dkim']['dkim_algorithm'],
-					'settinggroup' => 'dkim',
-					'varname' => 'dkim_algorithm',
-					'type' => 'option',
-					'default' => 'all',
-					'option_mode' => 'multiple',
-					'option_options' => array('all' => 'All', 'sha1' => 'SHA1', 'sha256' => 'SHA256'),
-					'save_method' => 'storeSettingFieldInsertBindTask',
-					),
-				'dkim_servicetype' => array(
-					'label' => $lng['dkim']['dkim_servicetype'],
-					'settinggroup' => 'dkim',
-					'varname' => 'dkim_servicetype',
-					'type' => 'option',
-					'default' => '0',
-					'option_mode' => 'one',
-					'option_options' => array('0' => 'All', '1' => 'E-Mail'),
-					'save_method' => 'storeSettingFieldInsertBindTask',
-					),
-				'dkim_keylength' => array(
-					'label' => array(
-						'title' => $lng['dkim']['dkim_keylength']['title'],
-						'description' => sprintf($lng['dkim']['dkim_keylength']['description'], Settings::Get('dkim.dkim_prefix'))
-					),
-					'settinggroup' => 'dkim',
-					'varname' => 'dkim_keylength',
-					'type' => 'option',
-					'default' => '1024',
-					'option_mode' => 'one',
-					'option_options' => array('1024' => '1024 Bit', '2048' => '2048 Bit'),
-					'save_method' => 'storeSettingFieldInsertBindTask',
-					),
-				'dkim_notes' => array(
-					'label' => $lng['dkim']['dkim_notes'],
-					'settinggroup' => 'dkim',
-					'varname' => 'dkim_notes',
-					'type' => 'string',
-					'string_regexp' => '/^[a-z0-9\._]+$/i',
-					'default' => '',
-					'save_method' => 'storeSettingFieldInsertBindTask',
-					),
-				'dkim_add_adsp' => array(
-					'label' => $lng['dkim']['dkim_add_adsp'],
-					'settinggroup' => 'dkim',
-					'varname' => 'dkim_add_adsp',
-					'type' => 'bool',
-					'default' => true,
-					'save_method' => 'storeSettingFieldInsertBindTask',
-					),
-				'dkim_add_adsppolicy' => array(
-					'label' => $lng['dkim']['dkim_add_adsppolicy'],
-					'settinggroup' => 'dkim',
-					'varname' => 'dkim_add_adsppolicy',
-					'type' => 'option',
-					'default' => '1',
-					'option_mode' => 'one',
-					'option_options' => array('0' => 'Unknown', '1' => 'All', '2' => 'Discardable'),
-					'save_method' => 'storeSettingFieldInsertBindTask',
-					),
 				'dkimrestart_command' => array(
 					'label' => $lng['dkim']['dkimrestart_command'],
 					'settinggroup' => 'dkim',
@@ -131,4 +69,4 @@ return array(
 		),
 	);

-?>
+?>
--- a/actions/admin/settings/185.spf.php
+++ b/actions/admin/settings/185.spf.php
@@ -12,7 +12,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Settings
- *
+ * @version    $Id$
 */

 return array(
@@ -26,8 +26,7 @@ return array(
 					'varname' => 'use_spf',
 					'type' => 'bool',
 					'default' => false,
-					'save_method' => 'storeSettingField',
-					'overview_option' => true
+					'save_method' => 'storeSettingField'
 					),
 				'spf_entry' => array(
 					'label' => $lng['spf']['spf_entry'],
--- a/actions/admin/settings/190.ticket.php
+++ b/actions/admin/settings/190.ticket.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Settings
- *
+ * @version    $Id$
 */

 return array(
@@ -30,7 +30,6 @@ return array(
 					'default' => false,
 					'cronmodule' => 'froxlor/ticket',
 					'save_method' => 'storeSettingField',
-					'overview_option' => true
 					),
 				'ticket_noreply_email' => array(
 					'label' => $lng['serversettings']['ticket']['noreply_email'],
@@ -58,7 +57,6 @@ return array(
 					'option_mode' => 'one',
 					'option_options' => array(0 => html_entity_decode($lng['admin']['tickets']['daily']), 1 => html_entity_decode($lng['admin']['tickets']['weekly']), 2 => html_entity_decode($lng['admin']['tickets']['monthly']), 3 => html_entity_decode($lng['admin']['tickets']['yearly'])),
 					'save_method' => 'storeSettingField',
-					'plausibility_check_method' => 'setCycleOfCronjob',
 					),
 				'ticket_concurrently_open' => array(
 					'label' => $lng['serversettings']['ticket']['concurrentlyopen'],
@@ -126,19 +124,9 @@ return array(
 					'type' => 'hidden',
 					'default' => '',
 					),
-				'ticket_default_priority' => array(
-					'label' => $lng['serversettings']['ticket']['default_priority'],
-					'settinggroup' => 'ticket',
-					'varname' => 'default_priority',
-					'type' => 'option',
-					'default' => 2,
-					'option_mode' => 'one',
-					'option_options' => array(1 => $lng['ticket']['high'], 2 => $lng['ticket']['normal'], 3 => $lng['ticket']['low']),
-					'save_method' => 'storeSettingField', 
-					),
 				),
 			),
 		)
 	);

-?>
+?>
--- a/actions/admin/settings/200.aps.php
+++ b/actions/admin/settings/200.aps.php
@@ -0,0 +1,101 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2003-2009 the SysCP Team (see authors).
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Settings
+ * @version    $Id$
+ */
+
+return array(
+	'groups' => array(
+		'aps' => array(
+			'title' => $lng['admin']['aps'],
+			'fields' => array(
+				'aps_enable' => array(
+					'label' => $lng['aps']['activate_aps'],
+					'settinggroup' => 'aps',
+					'varname' => 'aps_active',
+					'type' => 'bool',
+					'default' => false,
+					'cronmodule' => 'froxlor/aps',
+					'save_method' => 'storeSettingField',
+					),
+				'aps_items_per_page' => array(
+					'label' => $lng['aps']['packages_per_page'],
+					'settinggroup' => 'aps',
+					'varname' => 'items_per_page',
+					'type' => 'int',
+					'default' => 20,
+					'save_method' => 'storeSettingField',
+					),
+				'aps_upload_fields' => array(
+					'label' => $lng['aps']['upload_fields'],
+					'settinggroup' => 'aps',
+					'varname' => 'upload_fields',
+					'type' => 'int',
+					'default' => 5,
+					'save_method' => 'storeSettingField',
+					),
+				'aps_exceptions' => array(
+					'label' => $lng['aps']['exceptions'],
+					'type' => 'label',
+					),
+				'aps_php-extension' => array(
+					'label' => $lng['aps']['settings_php_extensions'],
+					'settinggroup' => 'aps',
+					'varname' => 'php-extension',
+					'type' => 'option',
+					'default' => '',
+					'option_mode' => 'multiple',
+					'option_options' => array('gd' => 'GD Library', 'pcre' => 'PCRE', 'ioncube' => 'ionCube', 'ioncube loader' => 'ionCube Loader', 'curl' => 'curl', 'mcrypt' => 'mcrypt', 'imap' => 'imap'),
+					'save_method' => 'storeSettingApsPhpExtensions',
+					),
+				'aps_php-function' => array(
+					'settinggroup' => 'aps',
+					'varname' => 'php-function',
+					'type' => 'hidden',
+					'default' => '',
+					),
+				'aps_php-configuration' => array(
+					'label' => $lng['aps']['settings_php_configuration'],
+					'settinggroup' => 'aps',
+					'varname' => 'php-configuration',
+					'type' => 'option',
+					'default' => '',
+					'option_mode' => 'multiple',
+					'option_options' => array('short_open_tag' => 'short_open_tag', 'file_uploads' => 'file_uploads', 'magic_quotes_gpc' => 'magic_quotes_gpc', 'register_globals' => 'register_globals', 'allow_url_fopen' => 'allow_url_fopen', 'safe_mode' => 'safe_mode', 'post_max_size' => 'post_max_size', 'memory_limit' => 'memory_limit', 'max_execution_time' => 'max_execution_time'),
+					'save_method' => 'storeSettingField',
+					),
+				'aps_webserver-module' => array(
+					'label' => $lng['aps']['settings_webserver_modules'],
+					'settinggroup' => 'aps',
+					'varname' => 'webserver-module',
+					'type' => 'option',
+					'default' => '',
+					'option_mode' => 'multiple',
+					'option_options' => array('mod_perl' => 'mod_perl', 'mod_rewrite' => 'mod_rewrite', 'mod_access' => 'mod_access', 'fcgid-any' => 'FastCGI/mod_fcgid', 'htaccess' => '.htaccess'),
+					'save_method' => 'storeSettingApsWebserverModules',
+					),
+				'aps_webserver-htaccess' => array(
+					'settinggroup' => 'aps',
+					'varname' => 'webserver-htaccess',
+					'type' => 'hidden',
+					'default' => '',
+					),
+				),
+			),
+		),
+	);
+
+?>
--- a/actions/admin/settings/210.security.php
+++ b/actions/admin/settings/210.security.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Settings
- *
+ * @version    $Id$
 */

 return array(
@@ -38,33 +38,71 @@ return array(
 					'default' => true,
 					'save_method' => 'storeSettingField',
 					),
-				'system_passwordcryptfunc' => array(
-					'label' => $lng['serversettings']['passwordcryptfunc'],
+				'system_mod_fcgid_enabled' => array(
+					'label' => $lng['serversettings']['mod_fcgid'],
 					'settinggroup' => 'system',
-					'varname' => 'passwordcryptfunc',
+					'varname' => 'mod_fcgid',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					),
+				'system_mod_fcgid_configdir' => array(
+					'label' => $lng['serversettings']['mod_fcgid']['configdir'],
+					'settinggroup' => 'system',
+					'varname' => 'mod_fcgid_configdir',
+					'type' => 'string',
+					'string_type' => 'dir',
+					'default' => '/var/www/php-fcgi-scripts/',
+					'save_method' => 'storeSettingField',
+					),
+				'system_mod_fcgid_tmpdir' => array(
+					'label' => $lng['serversettings']['mod_fcgid']['tmpdir'],
+					'settinggroup' => 'system',
+					'varname' => 'mod_fcgid_tmpdir',
+					'type' => 'string',
+					'string_type' => 'dir',
+					'default' => '/var/customers/tmp/',
+					'save_method' => 'storeSettingField',
+					),
+				'system_mod_fcgid_peardir' => array(
+					'label' => $lng['serversettings']['mod_fcgid']['peardir'],
+					'settinggroup' => 'system',
+					'varname' => 'mod_fcgid_peardir',
+					'type' => 'string',
+					'string_type' => 'dir',
+					'string_delimiter' => ':',
+					'string_emptyallowed' => true,
+					'default' => '/usr/share/php/:/usr/share/php5/',
+					'save_method' => 'storeSettingField',
+					),
+				'system_mod_fcgid_wrapper' => array(
+					'label' => $lng['serversettings']['mod_fcgid']['wrapper'],
+					'settinggroup' => 'system',
+					'varname' => 'mod_fcgid_wrapper',
 					'type' => 'option',
+					'option_options' => array(0 => 'ScriptAlias', 1=> 'FCGIWrapper'),
 					'default' => 0,
-					'option_mode' => 'one',
-					'option_options_method' => 'getAvailablePasswordHashes',
 					'save_method' => 'storeSettingField',
 					),
-				'system_allow_error_report_admin' => array(
-					'label' => $lng['serversettings']['allow_error_report_admin'],
+				'system_mod_fcgid_starter' => array(
+					'label' => $lng['serversettings']['mod_fcgid']['starter'],
 					'settinggroup' => 'system',
-					'varname' => 'allow_error_report_admin',
-					'type' => 'bool',
-					'default' => false,
+					'varname' => 'mod_fcgid_starter',
+					'type' => 'int',
+					'default' => 0,
 					'save_method' => 'storeSettingField',
 					),
-				'system_allow_error_report_customer' => array(
-					'label' => $lng['serversettings']['allow_error_report_customer'],
+				'system_mod_fcgid_maxrequests' => array(
+					'label' => $lng['serversettings']['mod_fcgid']['maxrequests'],
 					'settinggroup' => 'system',
-					'varname' => 'allow_error_report_customer',
-					'type' => 'bool',
-					'default' => false,
+					'varname' => 'mod_fcgid_maxrequests',
+					'type' => 'int',
+					'default' => 250,
 					'save_method' => 'storeSettingField',
-					)
-				)
-			)
-		)
+					),
+				),
+			),
+		),
 	);
+
+?>
--- a/actions/admin/settings/220.quota.php
+++ b/actions/admin/settings/220.quota.php
@@ -1,60 +0,0 @@
-<?php
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2011- the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright  (c) the authors
- * @author     Froxlor team <team@froxlor.org> (2011-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Settings
- *
- */
-
-return array(
-	'groups' => array(
-		'diskquota' => array(
-			'title' => $lng['diskquota'],
-			'fields' => array(
-				'diskquota_enabled' => array(
-					'label' => $lng['serversettings']['diskquota_enabled'],
-					'settinggroup' => 'system',
-					'varname' => 'diskquota_enabled',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					'overview_option' => true
-				),
-				'diskquota_repquota_path' => array(
-					'label' => $lng['serversettings']['diskquota_repquota_path']['description'],
-					'settinggroup' => 'system',
-					'varname' => 'diskquota_repquota_path',
-					'type' => 'string',
-					'default' => '/usr/sbin/repquota',
-					'save_method' => 'storeSettingField',
-				),
-				'diskquota_quotatool_path' => array(
-					'label' => $lng['serversettings']['diskquota_quotatool_path']['description'],
-					'settinggroup' => 'system',
-					'varname' => 'diskquota_quotatool_path',
-					'type' => 'string',
-					'default' => '/usr/bin/quotatool',
-					'save_method' => 'storeSettingField',
-				),
-				'diskquota_customer_partition' => array(
-					'label' => $lng['serversettings']['diskquota_customer_partition']['description'],
-					'settinggroup' => 'system',
-					'varname' => 'diskquota_customer_partition',
-					'type' => 'string',
-					'default' => '/dev/root',
-					'save_method' => 'storeSettingField',
-				),
-				),
-			),
-		),
-	);
-
-?>
--- a/admin_admins.php
+++ b/admin_admins.php
--- a/admin_apcuinfo.php
+++ b/admin_apcuinfo.php
@@ -1,415 +0,0 @@
-<?php
-
-/*
-  +----------------------------------------------------------------------+
-  | APC                                                                  |
-  +----------------------------------------------------------------------+
-  | Copyright (c) 2006-2011 The PHP Group                                |
-  +----------------------------------------------------------------------+
-  | This source file is subject to version 3.01 of the PHP license,      |
-  | that is bundled with this package in the file LICENSE, and is        |
-  | available through the world-wide-web at the following url:           |
-  | http://www.php.net/license/3_01.txt                                  |
-  | If you did not receive a copy of the PHP license and are unable to   |
-  | obtain it through the world-wide-web, please send a note to          |
-  | license@php.net so we can mail you a copy immediately.               |
-  +----------------------------------------------------------------------+
-  | Authors: Ralf Becker <beckerr@php.net>                               |
-  |          Rasmus Lerdorf <rasmus@php.net>                             |
-  |          Ilia Alshanetsky <ilia@prohost.org>                         |
-  +----------------------------------------------------------------------+
-
-   All other licensing and usage conditions are those of the PHP Group.
-
-   Based on https://github.com/krakjoe/apcu/blob/master/apc.php
-   Implemented into Froxlor: Janos Muzsi <muzsij@hypernics.hu>
-
- */
-
-define('AREA', 'admin');
-require './lib/init.php';
-
-
-$horizontal_bar_size = 950; // 1280px window width
-
-if ($action == 'delete' &&
-        function_exists('apcu_clear_cache') &&
-        $userinfo['change_serversettings'] == '1'
-) {
-    apcu_clear_cache();
-    $log->logAction(ADM_ACTION, LOG_INFO, "cleared APCu cache");
-    header('Location: ' . $linker->getLink(array('section' => 'apcuinfo', 'page' => 'showinfo')));
-    exit();
-}
-
-if (!function_exists('apcu_cache_info') ||
-        !function_exists('apcu_sma_info')
-) {
-    standard_error($lng['error']['no_apcuinfo']);
-}
-
-if ($page == 'showinfo'
-) {
-    $cache = apcu_cache_info();
-    $mem = apcu_sma_info();
-    $time = time();
-    $log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_apcuinfo");
-
-    $passtime = $time - $cache['start_time'] > 0 ? $time - $cache['start_time'] : 1; // zero division
-    $mem_size = $mem['num_seg'] * $mem['seg_size'];
-    $mem_avail = $mem['avail_mem'];
-    $mem_used = $mem_size - $mem_avail;
-    $seg_size = bsize($mem['seg_size']);
-    $sharedmem = sprintf($lng['apcuinfo']['sharedmemval'], $mem['num_seg'], $seg_size, $cache['memory_type']);
-    $req_rate_user = sprintf("%.2f", $cache['num_hits'] ? (($cache['num_hits'] + $cache['num_misses']) / $passtime) : 0);
-    $hit_rate_user = sprintf("%.2f", $cache['num_hits'] ? (($cache['num_hits']) / $passtime) : 0);
-    $miss_rate_user = sprintf("%.2f", $cache['num_misses'] ? (($cache['num_misses']) / $passtime) : 0);
-    $insert_rate_user = sprintf("%.2f", $cache['num_inserts'] ? (($cache['num_inserts']) / $passtime) : 0);
-    $apcversion = phpversion('apcu');
-    $phpversion = phpversion();
-    $number_vars = $cache['num_entries'];
-    $starttime = date('Y-m-d H:i:s', $cache['start_time']);
-    $uptime_duration = duration($cache['start_time']);
-    $size_vars = bsize($cache['mem_size']);
-
-    // check for possible empty values that are used in the templates
-    if (!isset($cache['file_upload_progress'])) {
-        $cache['file_upload_progress'] = $lng['logger']['unknown'];
-    }
-
-    if (!isset($cache['num_expunges'])) {
-        $cache['num_expunges'] = $lng['logger']['unknown'];
-    }
-
-    $runtimelines = '';
-    foreach (ini_get_all('apcu') as $name => $v) {
-        $value = $v['local_value'];
-        eval("\$runtimelines.=\"" . getTemplate("settings/apcuinfo/runtime_line") . "\";");
-    }
-
-    $freemem = bsize($mem_avail) . sprintf(" (%.1f%%)", $mem_avail * 100 / $mem_size);
-    $usedmem = bsize($mem_used) . sprintf(" (%.1f%%)", $mem_used * 100 / $mem_size);
-    $hits = $cache['num_hits'] . @sprintf(" (%.1f%%)", $cache['num_hits'] * 100 / ($cache['num_hits'] + $cache['num_misses']));
-    $misses = $cache['num_misses'] . @sprintf(" (%.1f%%)", $cache['num_misses'] * 100 / ($cache['num_hits'] + $cache['num_misses']));
-
-    // Fragementation: (freeseg - 1) / total_seg
-    $nseg = $freeseg = $fragsize = $freetotal = 0;
-    for ($i = 0; $i < $mem['num_seg']; $i++) {
-        $ptr = 0;
-        foreach ($mem['block_lists'][$i] as $block) {
-            if ($block['offset'] != $ptr) {
-                ++$nseg;
-            }
-            $ptr = $block['offset'] + $block['size'];
-            /* Only consider blocks <5M for the fragmentation % */
-            if ($block['size'] < (5 * 1024 * 1024))
-                $fragsize+=$block['size'];
-            $freetotal+=$block['size'];
-        }
-        $freeseg += count($mem['block_lists'][$i]);
-    }
-
-    if ($freeseg > 1) {
-        $frag = sprintf("%.2f%% (%s out of %s in %d fragments)", ($fragsize / $freetotal) * 100, bsize($fragsize), bsize($freetotal), $freeseg);
-    } else {
-        $frag = "0%";
-    }
-
-    foreach (ini_get_all('apcu') as $name => $v) {
-        $value = $v['local_value'];
-    }
-
-    $img_src1 = '';
-    $img_src2 = '';
-    $img_src3 = '';
-    if (graphics_avail()) {
-        $img_src = $linker->getLink(array('section' => 'apcuinfo', 'page' => 'img1', 'action' => mt_rand(0, 1000000)));
-        eval("\$img_src1=\"" . getTemplate("settings/apcuinfo/img_line") . "\";");
-        $img_src = $linker->getLink(array('section' => 'apcuinfo', 'page' => 'img2', 'action' => mt_rand(0, 1000000)));
-        eval("\$img_src2=\"" . getTemplate("settings/apcuinfo/img_line") . "\";");
-        $img_src = $linker->getLink(array('section' => 'apcuinfo', 'page' => 'img3', 'action' => mt_rand(0, 1000000)));
-        eval("\$img_src3=\"" . getTemplate("settings/apcuinfo/img_line") . "\";");
-    }
-
-    eval("echo \"" . getTemplate("settings/apcuinfo/showinfo") . "\";");
-    
-} elseif ($page == 'img1'
-) {
-
-    $mem = apcu_sma_info();
-
-    $size = 460;
-    $image = imagecreate($size + 5, $size + 5);
-
-    $col_white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF);
-    $col_red = imagecolorallocate($image, 0xD0, 0x60, 0x30);
-    $col_green = imagecolorallocate($image, 0x60, 0xF0, 0x60);
-    $col_black = imagecolorallocate($image, 0, 0, 0);
-
-    imagecolortransparent($image, $col_white);
-
-    $s = $mem['num_seg'] * $mem['seg_size'];
-    $a = $mem['avail_mem'];
-    $x = $y = $size / 2;
-    $fuzz = 0.000001;
-
-    // This block of code creates the pie chart.  It is a lot more complex than you
-    // would expect because we try to visualize any memory fragmentation as well.
-    $angle_from = 0;
-    $string_placement = array();
-    for ($i = 0; $i < $mem['num_seg']; $i++) {
-        $ptr = 0;
-        $free = $mem['block_lists'][$i];
-        uasort($free, 'block_sort');
-        foreach ($free as $block) {
-            if ($block['offset'] != $ptr) {       // Used block
-                $angle_to = $angle_from + ($block['offset'] - $ptr) / $s;
-                if (($angle_to + $fuzz) > 1)
-                    $angle_to = 1;
-                if (($angle_to * 360) - ($angle_from * 360) >= 1) {
-                    fill_arc($image, $x, $y, $size, $angle_from * 360, $angle_to * 360, $col_black, $col_red);
-                    if (($angle_to - $angle_from) > 0.05) {
-                        array_push($string_placement, array($angle_from, $angle_to));
-                    }
-                }
-                $angle_from = $angle_to;
-            }
-            $angle_to = $angle_from + ($block['size']) / $s;
-            if (($angle_to + $fuzz) > 1)
-                $angle_to = 1;
-            if (($angle_to * 360) - ($angle_from * 360) >= 1) {
-                fill_arc($image, $x, $y, $size, $angle_from * 360, $angle_to * 360, $col_black, $col_green);
-                if (($angle_to - $angle_from) > 0.05) {
-                    array_push($string_placement, array($angle_from, $angle_to));
-                }
-            }
-            $angle_from = $angle_to;
-            $ptr = $block['offset'] + $block['size'];
-        }
-        if ($ptr < $mem['seg_size']) { // memory at the end
-            $angle_to = $angle_from + ($mem['seg_size'] - $ptr) / $s;
-            if (($angle_to + $fuzz) > 1)
-                $angle_to = 1;
-            fill_arc($image, $x, $y, $size, $angle_from * 360, $angle_to * 360, $col_black, $col_red);
-            if (($angle_to - $angle_from) > 0.05) {
-                array_push($string_placement, array($angle_from, $angle_to));
-            }
-        }
-    }
-    foreach ($string_placement as $angle) {
-        text_arc($image, $x, $y, $size, $angle[0] * 360, $angle[1] * 360, $col_black, bsize($s * ($angle[1] - $angle[0])));
-    }
-
-    header("Content-type: image/png");
-    imagepng($image);
-    exit;
-} elseif ($page == 'img2'
-) {
-
-    $cache = apcu_cache_info();
-
-    $size = $horizontal_bar_size;
-    $image = imagecreate($size + 5, 140);
-
-    $col_white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF);
-    $col_red = imagecolorallocate($image, 0xD0, 0x60, 0x30);
-    $col_green = imagecolorallocate($image, 0x60, 0xF0, 0x60);
-    $col_black = imagecolorallocate($image, 0, 0, 0);
-
-    imagecolortransparent($image, $col_white);
-
-    $s = $cache['num_hits'] + $cache['num_misses'];
-    $a = $cache['num_hits'];
-
-    fill_box($image, 1, 10, $s ? ($a * ($size - 21) / $s) : $size, 50, $col_black, $col_green/* , sprintf("%.1f%%", $s ? $cache['num_hits'] * 100 / $s : 0) */);
-    fill_box($image, 1, 80, $s ? max(4, ($s - $a) * ($size - 21) / $s) : $size, 50, $col_black, $col_red/* , sprintf("%.1f%%", $s ? $cache['num_misses'] * 100 / $s : 0) */);
-
-    header("Content-type: image/png");
-    imagepng($image);
-    exit;
-} elseif ($page == 'img3'
-) {
-
-    $mem = apcu_sma_info();
-
-    $size = $horizontal_bar_size;
-    $image = imagecreate($size, 70);
-
-    $col_white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF);
-    $col_red = imagecolorallocate($image, 0xD0, 0x60, 0x30);
-    $col_green = imagecolorallocate($image, 0x60, 0xF0, 0x60);
-    $col_black = imagecolorallocate($image, 0, 0, 0);
-
-    imagecolortransparent($image, $col_white);
-
-    $s = $mem['num_seg'] * $mem['seg_size'];
-    $a = $mem['avail_mem'];
-    $x = 10;
-    $y = 0;
-
-    // This block of code creates the bar chart.  It is a lot more complex than you
-    // would expect because we try to visualize any memory fragmentation as well.
-    for ($i = 0; $i < $mem['num_seg']; $i++) {
-        $ptr = 0;
-        $free = $mem['block_lists'][$i];
-        uasort($free, 'block_sort');
-        foreach ($free as $block) {
-            if ($block['offset'] != $ptr) {       // Used block
-                $h = ($size - 5) * ($block['offset'] - $ptr) / $s;
-                if ($h > 0) {
-                    fill_box($image, $y, $x, $h, 50, $col_black, $col_red);
-                }
-                $y+=$h;
-            }
-            $h = ($size - 5) * ($block['size']) / $s;
-            if ($h > 0) {
-                fill_box($image, $y, $x, $h, 50, $col_black, $col_green);
-            }
-            $y+=$h;
-            $ptr = $block['offset'] + $block['size'];
-        }
-        if ($ptr < $mem['seg_size']) { // memory at the end
-            $h = ($size - 5) * ($mem['seg_size'] - $ptr) / $s;
-            if ($h > 0) {
-                fill_box($image, $y, $x, $h, 50, $col_black, $col_red, bsize($mem['seg_size'] - $ptr), $j++);
-            }
-        }
-    }
-
-    header("Content-type: image/png");
-    imagepng($image);
-    exit;
-}
-
-function graphics_avail() {
-    return extension_loaded('gd');
-}
-
-// pretty printer for byte values
-//
-function bsize($s) {
-    foreach (array('', 'K', 'M', 'G') as $i => $k) {
-        if ($s < 1024)
-            break;
-        $s/=1024;
-    }
-    return sprintf("%5.1f %sBytes", $s, $k);
-}
-
-function duration($ts) {
-    global $time;
-    $years = (int) ((($time - $ts) / (7 * 86400)) / 52.177457);
-    $rem = (int) (($time - $ts) - ($years * 52.177457 * 7 * 86400));
-    $weeks = (int) (($rem) / (7 * 86400));
-    $days = (int) (($rem) / 86400) - $weeks * 7;
-    $hours = (int) (($rem) / 3600) - $days * 24 - $weeks * 7 * 24;
-    $mins = (int) (($rem) / 60) - $hours * 60 - $days * 24 * 60 - $weeks * 7 * 24 * 60;
-    $str = '';
-    if ($years == 1)
-        $str .= "$years year, ";
-    if ($years > 1)
-        $str .= "$years years, ";
-    if ($weeks == 1)
-        $str .= "$weeks week, ";
-    if ($weeks > 1)
-        $str .= "$weeks weeks, ";
-    if ($days == 1)
-        $str .= "$days day,";
-    if ($days > 1)
-        $str .= "$days days,";
-    if ($hours == 1)
-        $str .= " $hours hour and";
-    if ($hours > 1)
-        $str .= " $hours hours and";
-    if ($mins == 1)
-        $str .= " 1 minute";
-    else
-        $str .= " $mins minutes";
-    return $str;
-}
-
-function block_sort($array1, $array2) {
-    if ($array1['offset'] > $array2['offset']) {
-        return 1;
-    } else {
-        return -1;
-    }
-}
-
-function fill_arc($im, $centerX, $centerY, $diameter, $start, $end, $color1, $color2, $text = '', $placeindex = 0) {
-    $r = $diameter / 2;
-    $w = deg2rad((360 + $start + ($end - $start) / 2) % 360);
-
-
-    if (function_exists("imagefilledarc")) {
-        // exists only if GD 2.0.1 is available
-        imagefilledarc($im, $centerX + 1, $centerY + 1, $diameter, $diameter, $start, $end, $color1, IMG_ARC_PIE);
-        imagefilledarc($im, $centerX, $centerY, $diameter, $diameter, $start, $end, $color2, IMG_ARC_PIE);
-        imagefilledarc($im, $centerX, $centerY, $diameter, $diameter, $start, $end, $color1, IMG_ARC_NOFILL | IMG_ARC_EDGED);
-    } else {
-        imagearc($im, $centerX, $centerY, $diameter, $diameter, $start, $end, $color2);
-        imageline($im, $centerX, $centerY, $centerX + cos(deg2rad($start)) * $r, $centerY + sin(deg2rad($start)) * $r, $color2);
-        imageline($im, $centerX, $centerY, $centerX + cos(deg2rad($start + 1)) * $r, $centerY + sin(deg2rad($start)) * $r, $color2);
-        imageline($im, $centerX, $centerY, $centerX + cos(deg2rad($end - 1)) * $r, $centerY + sin(deg2rad($end)) * $r, $color2);
-        imageline($im, $centerX, $centerY, $centerX + cos(deg2rad($end)) * $r, $centerY + sin(deg2rad($end)) * $r, $color2);
-        imagefill($im, $centerX + $r * cos($w) / 2, $centerY + $r * sin($w) / 2, $color2);
-    }
-    if ($text) {
-        if ($placeindex > 0) {
-            imageline($im, $centerX + $r * cos($w) / 2, $centerY + $r * sin($w) / 2, $diameter, $placeindex * 12, $color1);
-            imagestring($im, 4, $diameter, $placeindex * 12, $text, $color1);
-        } else {
-            imagestring($im, 4, $centerX + $r * cos($w) / 2, $centerY + $r * sin($w) / 2, $text, $color1);
-        }
-    }
-}
-
-function text_arc($im, $centerX, $centerY, $diameter, $start, $end, $color1, $text, $placeindex = 0) {
-    $r = $diameter / 2;
-    $w = deg2rad((360 + $start + ($end - $start) / 2) % 360);
-
-    if ($placeindex > 0) {
-        imageline($im, $centerX + $r * cos($w) / 2, $centerY + $r * sin($w) / 2, $diameter, $placeindex * 12, $color1);
-        imagestring($im, 4, $diameter, $placeindex * 12, $text, $color1);
-    } else {
-        imagestring($im, 4, $centerX + $r * cos($w) / 2, $centerY + $r * sin($w) / 2, $text, $color1);
-    }
-}
-
-function fill_box($im, $x, $y, $w, $h, $color1, $color2, $text = '', $placeindex = '') {
-    global $col_black;
-    $x1 = $x + $w - 1;
-    $y1 = $y + $h - 1;
-
-    imagerectangle($im, $x, $y1, $x1 + 1, $y + 1, $col_black);
-    if ($y1 > $y)
-        imagefilledrectangle($im, $x, $y, $x1, $y1, $color2);
-    else
-        imagefilledrectangle($im, $x, $y1, $x1, $y, $color2);
-    imagerectangle($im, $x, $y1, $x1, $y, $color1);
-    if ($text) {
-        if ($placeindex > 0) {
-
-            if ($placeindex < 16) {
-                $px = 5;
-                $py = $placeindex * 12 + 6;
-                imagefilledrectangle($im, $px + 90, $py + 3, $px + 90 - 4, $py - 3, $color2);
-                imageline($im, $x, $y + $h / 2, $px + 90, $py, $color2);
-                imagestring($im, 2, $px, $py - 6, $text, $color1);
-            } else {
-                if ($placeindex < 31) {
-                    $px = $x + 40 * 2;
-                    $py = ($placeindex - 15) * 12 + 6;
-                } else {
-                    $px = $x + 40 * 2 + 100 * intval(($placeindex - 15) / 15);
-                    $py = ($placeindex % 15) * 12 + 6;
-                }
-                imagefilledrectangle($im, $px, $py + 3, $px - 4, $py - 3, $color2);
-                imageline($im, $x + $w, $y + $h / 2, $px, $py, $color2);
-                imagestring($im, 2, $px + 2, $py - 6, $text, $color1);
-            }
-        } else {
-            imagestring($im, 4, $x + 5, $y1 - 16, $text, $color1);
-        }
-    }
-}
--- a/admin_aps.php
+++ b/admin_aps.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2003-2009 the SysCP Team (see authors).
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Panel
+ * @version    $Id$
+ */
+
+// Required code
+
+define('AREA', 'admin');
+require ("./lib/init.php");
+$Id = 0;
+
+if(isset($_GET['id']))$Id = (int)$_GET['id'];
+
+if(isset($_POST['id']))$Id = (int)$_POST['id'];
+eval("echo \"" . getTemplate("aps/header") . "\";");
+$Aps = new ApsParser($userinfo, $settings, $db);
+$Aps->MainHandler($action);
+eval("echo \"" . getTemplate("aps/footer") . "\";");
+
+?>
--- a/admin_autoupdate.php
+++ b/admin_autoupdate.php
@@ -1,209 +0,0 @@
-<?php
-
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2016 the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright  (c) the authors
- * @author     Michael Kaufmann <mkaufmann@nutime.de>
- * @author     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Frontend
- *
- * @since      0.9.35
- *
- */
-
-define('AREA', 'admin');
-require './lib/init.php';
-
-// define update-uri
-define('UPDATE_URI', "https://version.froxlor.org/Froxlor/legacy/" . $version);
-define('RELEASE_URI', "https://autoupdate.froxlor.org/froxlor-{version}.zip");
-define('CHECKSUM_URI', "https://autoupdate.froxlor.org/froxlor-{version}.zip.sha256");
-
-// check for allow_url_fopen
-if (ini_get('allow_url_fopen') === false) {
-	redirectTo($filename, array('s' => $s, 'page' => 'error', 'errno' => 1));
-}
-
-// check for archive-stuff
-if (function_exists('gzopen') === false) {
-	redirectTo($filename, array('s' => $s, 'page' => 'error', 'errno' => 2));
-}
-
-// display initial version check
-if ($page == 'overview') {
-
-	// log our actions
-	$log->logAction(ADM_ACTION, LOG_NOTICE, "checking auto-update");
-
-	// check for new version
-	$latestversion = @file(UPDATE_URI);
-
-	if (isset($latestversion[0])) {
-		$latestversion = explode('|', $latestversion[0]);
-
-		if (is_array($latestversion)
-				&& count($latestversion) >= 1
-		) {
-			$_version = $latestversion[0];
-			$_message = isset($latestversion[1]) ? $latestversion[1] : '';
-			$_link = isset($latestversion[2]) ? $latestversion[2] : htmlspecialchars($filename . '?s=' . urlencode($s) . '&page=' . urlencode($page) . '&lookfornewversion=yes');
-
-			// add the branding so debian guys are not gettings confused
-			// about their version-number
-			$version_label = $_version.$branding;
-			$version_link = $_link;
-			$message_addinfo = $_message;
-
-			// not numeric -> error-message
-			if (!preg_match('/^((\d+\\.)(\d+\\.)(\d+\\.)?(\d+)?(\-(svn|dev|rc)(\d+))?)$/', $_version)) {
-				// check for customized version to not output
-				// "There is a newer version of froxlor" besides the error-message
-				redirectTo($filename, array('s' => $s, 'page' => 'error', 'errno' => 3));
-			} elseif (version_compare2($version, $_version) == -1) {
-				// there is a newer version - yay
-				$isnewerversion = 1;
-			} else {
-				// nothing new
-				$isnewerversion = 0;
-			}
-
-			// anzeige über version-status mit ggfls. formular
-			// zum update schritt #1 -> download
-			if ($isnewerversion == 1) {
-				$text = 'There is a newer version available. Update to version <b>'.$_version.'</b> now?<br/>(Your current version is: '.$version.')';
-				$hiddenparams = '<input type="hidden" name="newversion" value="'.$_version.'" />';
-				$yesfile = $filename.'?s='.$s.'&amp;page=getdownload';
-				eval("echo \"" . getTemplate("misc/question_yesno", true) . "\";");
-				exit;
-			}
-			elseif ($isnewerversion == 0) {
-				// all good
-			    standard_success ('noupdatesavail');
-			} else {
-				standard_error ('customized_version');
-			}
-		}
-	}
-	// error (something weird came from version.froxlor.org)
-	redirectTo($filename, array('s' => $s, 'page' => 'error', 'errno' => 5));
-}
-// download the new archive
-elseif ($page == 'getdownload') {
-
-	// retrieve the new version from the form
-	$newversion = isset($_POST['newversion']) ? $_POST['newversion'] : null;
-
-	// valid?
-	if ($newversion !== null) {
-
-		// define files to get
-		$toLoad = str_replace('{version}', $newversion, RELEASE_URI);
-		$toCheck = str_replace('{version}', $newversion, CHECKSUM_URI);
-
-		// get archive data
-		$newArchive = @file_get_contents($toLoad);
-
-		// check for local destination folder
-		if (!is_dir(FROXLOR_INSTALL_DIR.'/updates/')) {
-			mkdir(FROXLOR_INSTALL_DIR.'/updates/');
-		}
-
-		// name archive
-		$localArchive = FROXLOR_INSTALL_DIR.'/updates/'.basename($toLoad);
-
-		$log->logAction(ADM_ACTION, LOG_NOTICE, "Downloading ".$toLoad." to ".$localArchive);
-
-		// remove old archive
-		if (file_exists($localArchive)) {
-		    @unlink($localArchive);
-		}
-
-		// store archive
-		$fh = fopen($localArchive, 'w');
-		if (!fwrite($fh, $newArchive)) {
-			redirectTo($filename, array('s' => $s, 'page' => 'error', 'errno' => 4));
-		}
-
-		// close file-handle
-		fclose($fh);
-
-		// validate the integrity of the downloaded file
-		$_shouldsum = @file_get_contents($toCheck);
-		if (!empty($_shouldsum)) {
-		    $_t = explode(" ", $_shouldsum);
-		    $shouldsum = $_t[0];
-		} else {
-		    $shouldsum = null;
-		}
-		$filesum = hash_file('sha256', $localArchive);
-
-		if ($filesum != $shouldsum) {
-		    redirectTo($filename, array('s' => $s, 'page' => 'error', 'errno' => 9));
-		}
-
-		// to the next step
-		redirectTo($filename, array('s' => $s, 'page' => 'extract', 'archive' => basename($localArchive)));
-	}
-	redirectTo($filename, array('s' => $s, 'page' => 'error', 'errno' => 6));
-}
-// extract and install new version
-elseif ($page == 'extract') {
-
-	$toExtract = isset($_GET['archive']) ? $_GET['archive'] : null;
-	$localArchive = FROXLOR_INSTALL_DIR.'/updates/'.$toExtract;
-
-	if (isset($_POST['send'])
-			&& $_POST['send'] == 'send'
-	) {
-		// decompress from zip
-		$zip = new ZipArchive;
-		$res = $zip->open($localArchive);
-		if ($res === true) {
-		    $log->logAction(ADM_ACTION, LOG_NOTICE, "Extracting ".$localArchive." to ".dirname(FROXLOR_INSTALL_DIR));
-			$zip->extractTo(dirname(FROXLOR_INSTALL_DIR));
-			$zip->close();
-			// success - remove unused archive
-			@unlink($localArchive);
-		} else {
-			// error
-			redirectTo($filename, array('s' => $s, 'page' => 'error', 'errno' => 8));
-		}
-
-		// redirect to update-page?
-		redirectTo('admin_updates.php', array('s' => $s));
-	}
-
-	if (!file_exists($localArchive)) {
-		redirectTo($filename, array('s' => $s, 'page' => 'error', 'errno' => 7));
-	}
-
-	$text = 'Extract downloaded archive "'.$toExtract.'"?';
-	$hiddenparams = '';
-	$yesfile = $filename.'?s='.$s.'&amp;page=extract&amp;archive='.$toExtract;
-	eval("echo \"" . getTemplate("misc/question_yesno", true) . "\";");
-}
-
-// display error
-elseif ($page == 'error') {
-
-	// retrieve error-number via url-parameter
-	$errno = isset($_GET['errno']) ? (int)$_GET['errno'] : 0;
-
-	// 1 = no allow_url_fopen
-	// 2 = no Zlib
-	// 3 = custom version detected
-	// 4 = could not store archive to local hdd
-	// 5 = some weird value came from version.froxlor.org
-	// 6 = download without valid version
-	// 7 = local archive does not exist
-	// 8 = could not extract archive
-	// 9 = checksum mismatch
-	standard_error ('autoupdate_'.$errno);
-}
--- a/admin_configfiles.php
+++ b/admin_configfiles.php
@@ -2,6 +2,7 @@

 /**
 * This file is part of the Froxlor project.
+ * Copyright (c) 2003-2009 the SysCP Team (see authors).
 * Copyright (c) 2010 the Froxlor Team (see authors).
 *
 * For the full copyright and license information, please view the COPYING
@@ -9,209 +10,173 @@
 * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
 *
 * @copyright  (c) the authors
+ * @author     Florian Lippert <flo@syscp.org> (2003-2009)
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Panel
- *
- * @since 0.9.34
+ * @version    $Id$
 */
+
 define('AREA', 'admin');
-require './lib/init.php';

-if ($userinfo['change_serversettings'] == '1') {
-    
-    $replace_arr = Array(
-        '<SQL_UNPRIVILEGED_USER>' => $sql['user'],
-        '<SQL_UNPRIVILEGED_PASSWORD>' => 'MYSQL_PASSWORD',
-        '<SQL_DB>' => $sql['db'],
-        '<SQL_HOST>' => $sql['host'],
-        '<SQL_SOCKET>' => isset($sql['socket']) ? $sql['socket'] : null,
-        '<SERVERNAME>' => Settings::Get('system.hostname'),
-        '<SERVERIP>' => Settings::Get('system.ipaddress'),
-        '<NAMESERVERS>' => Settings::Get('system.nameservers'),
-        '<VIRTUAL_MAILBOX_BASE>' => Settings::Get('system.vmail_homedir'),
-        '<VIRTUAL_UID_MAPS>' => Settings::Get('system.vmail_uid'),
-        '<VIRTUAL_GID_MAPS>' => Settings::Get('system.vmail_gid'),
-        '<SSLPROTOCOLS>' => (Settings::Get('system.use_ssl') == '1') ? 'imaps pop3s' : '',
-        '<CUSTOMER_TMP>' => (Settings::Get('system.mod_fcgid_tmpdir') != '') ? makeCorrectDir(Settings::Get('system.mod_fcgid_tmpdir')) : '/tmp/',
-        '<BASE_PATH>' => makeCorrectDir(FROXLOR_INSTALL_DIR),
-        '<BIND_CONFIG_PATH>' => makeCorrectDir(Settings::Get('system.bindconf_directory')),
-        '<WEBSERVER_RELOAD_CMD>' => Settings::Get('system.apachereload_command'),
-        '<CUSTOMER_LOGS>' => makeCorrectDir(Settings::Get('system.logfiles_directory')),
-        '<FPM_IPCDIR>' => makeCorrectDir(Settings::Get('phpfpm.fastcgi_ipcdir')),
-        '<WEBSERVER_GROUP>' => Settings::Get('system.httpgroup')
-    );
-    
-    // get distro from URL param
-    $distribution = (isset($_GET['distribution']) && $_GET['distribution'] != 'choose') ? $_GET['distribution'] : "";
-    $service = (isset($_GET['service']) && $_GET['service'] != 'choose') ? $_GET['service'] : "";
-    $daemon = (isset($_GET['daemon']) && $_GET['daemon'] != 'choose') ? $_GET['daemon'] : "";
-    $distributions_select = "";
-    $services_select = "";
-    $daemons_select = "";
-    
-    $configfiles = "";
-    $services = "";
-    $daemons = "";
-    
-    $config_dir = makeCorrectDir(FROXLOR_INSTALL_DIR . '/lib/configfiles/');
-    
-    if ($distribution != "") {
-        // create configparser object
-        $configfiles = new ConfigParser($config_dir . '/' . $distribution . ".xml");
-        
-        // get distro-info
-        $dist_display = getCompleteDistroName($configfiles);
-        
-        // get all the services from the distro
-        $services = $configfiles->getServices();
-        
-        if ($service != "") {
-            
-            $daemons = $services[$service]->getDaemons();
-            
-            if ($daemon == "") {
-                foreach ($daemons as $di => $dd) {
-                    $title = $dd->title;
-                    if ($dd->default) {
-                        $title = $title." (".strtolower($lng['panel']['default']).")";
-                    }
-                    $daemons_select .= makeoption($title, $di);
-                }
-            }
-        } else {
-            foreach ($services as $si => $sd) {
-                $services_select .= makeoption($sd->title, $si);
-            }
-        }
-    } else {
-        
-        // show list of available distro's
-        $distros = glob($config_dir . '*.xml');
-        // tmp array
-        $distributions_select_data = array();
-        // read in all the distros
-        foreach ($distros as $_distribution) {
-            // get configparser object
-            $dist = new ConfigParser($_distribution);
-            // get distro-info
-            $dist_display = getCompleteDistroName($dist);
-            // store in tmp array
-            $distributions_select_data[$dist_display] = str_replace(".xml", "", strtolower(basename($_distribution)));
-        }
-        
-        // sort by distribution name
-        ksort($distributions_select_data);
-        
-        foreach ($distributions_select_data as $dist_display => $dist_index) {
-            // create select-box-option
-            $distributions_select .= makeoption($dist_display, $dist_index);
-        }
-    }
-    
-    if ($distribution != "" && $service != "" && $daemon != "") {
-        
-        $confarr = $daemons[$daemon]->getConfig();
-        
-        $configpage = '';
-        
-        $distro_editor = $configfiles->distributionEditor;
+/**
+ * Include our init.php, which manages Sessions, Language etc.
+ */

-        $commands_pre = "";
-        $commands_file = "";
-        $commands_post = "";
-        
-        $lasttype = '';
-        $commands = '';
-        foreach ($confarr as $idx => $action) {
-            if ($lasttype != '' && $lasttype != $action['type']) {
-                $commands = trim($commands);
-                $numbrows = count(explode("\n", $commands));
-                eval("\$configpage.=\"" . getTemplate("configfiles/configfiles_commands") . "\";");
-                $lasttype = '';
-                $commands = '';
-            }
-            switch ($action['type']) {
-                case "install":
-                    $commands .= $action['content'] . "\n";
-                    $lasttype = "install";
-                    break;
-                case "command":
-                    $commands .= $action['content'] . "\n";
-                    $lasttype = "command";
-                    break;
-                case "file":
-                    if (array_key_exists('content', $action)) {
-                        $commands_file = getFileContentContainer($action['content'], $replace_arr, $action['name'], $distro_editor);
-                    } elseif (array_key_exists('subcommands', $action)) {
-                        foreach ($action['subcommands'] as $fileaction) {
-                            if (array_key_exists('execute', $fileaction) && $fileaction['execute'] == "pre") {
-                                $commands_pre .= $fileaction['content'] . "\n";
-                            } elseif (array_key_exists('execute', $fileaction) && $fileaction['execute'] == "post") {
-                                $commands_post .= $fileaction['content'] . "\n";
-                            } elseif ($fileaction['type'] == 'file') {
-                                $commands_file = getFileContentContainer($fileaction['content'], $replace_arr, $action['name'], $distro_editor);
-                            }
-                        }
-                    }
-                    $realname = $action['name'];
-                    $commands = trim($commands_pre);
-                    if ($commands != "") {
-                        $numbrows = count(explode("\n", $commands));
-                        eval("\$commands_pre=\"" . getTemplate("configfiles/configfiles_commands") . "\";");
-                    }
-                    $commands = trim($commands_post);
-                    if ($commands != "") {
-                        $numbrows = count(explode("\n", $commands));
-                        eval("\$commands_post=\"" . getTemplate("configfiles/configfiles_commands") . "\";");
-                    }
-                    eval("\$configpage.=\"" . getTemplate("configfiles/configfiles_subfileblock") . "\";");
-                    $commands = '';
-                    $commands_pre = '';
-                    $commands_post = '';
-                    break;
-            }
-        }
-        $commands = trim($commands);
-        if ($commands != '') {
-            $numbrows = count(explode("\n", $commands));
-            eval("\$configpage.=\"" . getTemplate("configfiles/configfiles_commands") . "\";");
-        }
-        eval("echo \"" . getTemplate("configfiles/configfiles") . "\";");
-    } else {
-        eval("echo \"" . getTemplate("configfiles/wizard") . "\";");
-    }
-} else {
-    die('not allowed to see this page');
-    // redirect or similar here
-}
+$need_db_sql_data = true;
+require ("./lib/init.php");
+require ("./lib/configfiles_index.inc.php");
+$distribution = '';
+$distributions_select = '';
+$service = '';
+$services_select = '';
+$daemon = '';
+$daemons_select = '';

-// helper functions
-function getFileContentContainer($file_content, &$replace_arr, $realname, $distro_editor)
+if($userinfo['change_serversettings'] == '1')
 {
-    $files = "";
-    $file_content = trim($file_content);
-    if ($file_content != '') {
-        $file_content = strtr($file_content, $replace_arr);
-        $file_content = htmlspecialchars($file_content);
-        $numbrows = count(explode("\n", $file_content));
-        eval("\$files=\"" . getTemplate("configfiles/configfiles_file") . "\";");
-    }
-    return $files;
+	if(isset($_GET['distribution'])
+	   && $_GET['distribution'] != ''
+	   && isset($configfiles[$_GET['distribution']])
+	   && is_array($configfiles[$_GET['distribution']]))
+	{
+		$distribution = $_GET['distribution'];
+
+		if(isset($_GET['service'])
+		   && $_GET['service'] != ''
+		   && isset($configfiles[$distribution]['services'][$_GET['service']])
+		   && is_array($configfiles[$distribution]['services'][$_GET['service']]))
+		{
+			$service = $_GET['service'];
+
+			if(isset($_GET['daemon'])
+			   && $_GET['daemon'] != ''
+			   && isset($configfiles[$distribution]['services'][$service]['daemons'][$_GET['daemon']])
+			   && is_array($configfiles[$distribution]['services'][$service]['daemons'][$_GET['daemon']]))
+			{
+				$daemon = $_GET['daemon'];
+			}
+			else
+			{
+				foreach($configfiles[$distribution]['services'][$service]['daemons'] as $daemon_name => $daemon_details)
+				{
+					$daemons_select.= makeoption($daemon_details['label'], $daemon_name);
+				}
+			}
+		}
+		else
+		{
+			foreach($configfiles[$distribution]['services'] as $service_name => $service_details)
+			{
+				$services_select.= makeoption($service_details['label'], $service_name);
+			}
+		}
+	}
+	else
+	{
+		foreach($configfiles as $distribution_name => $distribution_details)
+		{
+			$distributions_select.= makeoption($distribution_details['label'], $distribution_name);
+		}
+	}
+
+	if($distribution != ''
+	   && $service != ''
+	   && $daemon != '')
+	{
+		$replace_arr = Array(
+			'<SQL_UNPRIVILEGED_USER>' => $sql['user'],
+			'<SQL_UNPRIVILEGED_PASSWORD>' => 'MYSQL_PASSWORD',
+			'<SQL_DB>' => $sql['db'],
+			'<SQL_HOST>' => $sql['host'],
+			'<SERVERNAME>' => $settings['system']['hostname'],
+			'<SERVERIP>' => $settings['system']['ipaddress'],
+			'<NAMESERVERS>' => $settings['system']['nameservers'],
+			'<VIRTUAL_MAILBOX_BASE>' => $settings['system']['vmail_homedir'],
+			'<VIRTUAL_UID_MAPS>' => $settings['system']['vmail_uid'],
+			'<VIRTUAL_GID_MAPS>' => $settings['system']['vmail_gid'],
+			'<AWSTATS_PATH>' => $settings['system']['awstats_path'],
+			'<SSLPROTOCOLS>' => ($settings['system']['use_ssl'] == '1') ? 'imaps pop3s' : '',
+			'<REALTIME_PORT>' => $settings['system']['realtime_port'],
+			'<CUSTOMER_TMP>' => ($settings['system']['mod_fcgid_tmpdir'] != '') ? $settings['system']['mod_fcgid_tmpdir'] : '/tmp/'
+		);
+		$files = '';
+		$configpage = '';
+		foreach($configfiles[$distribution]['services'][$service]['daemons'][$daemon] as $action => $value)
+		{
+			if(substr($action, 0, 8) == 'commands')
+			{
+				$commands = '';
+
+				if(is_array($value))
+				{
+					$commands = implode("\n", $value);
+
+					if($commands != '')
+					{
+						eval("\$configpage.=\"" . getTemplate("configfiles/configfiles_commands") . "\";");
+					}
+				}
+			}
+			elseif(substr($action, 0, 5) == 'files')
+			{
+				$files = '';
+
+				if(is_array($value))
+				{
+					while(list($filename, $realname) = each($value))
+					{
+						$file_content = file_get_contents('./templates/misc/configfiles/' . $distribution . '/' . $daemon . '/' . $filename);
+						$file_content = strtr($file_content, $replace_arr);
+						$file_content = htmlspecialchars($file_content);
+						$numbrows = count(explode("\n", $file_content));
+						eval("\$files.=\"" . getTemplate("configfiles/configfiles_file") . "\";");
+					}
+
+					eval("\$configpage.=\"" . getTemplate("configfiles/configfiles_files") . "\";");
+				}
+			}
+		}
+
+		if(isset($configfiles[$distribution]['services'][$service]['daemons'][$daemon]['restart'])
+		   && is_array($configfiles[$distribution]['services'][$service]['daemons'][$daemon]['restart']))
+		{
+			$restart = implode("\n", $configfiles[$distribution]['services'][$service]['daemons'][$daemon]['restart']);
+		}
+		else
+		{
+			$restart = '';
+		}
+
+		eval("echo \"" . getTemplate("configfiles/configfiles") . "\";");
+	}
+	elseif($page == 'overview')
+	{
+		$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_configfiles");
+		$distributions = '';
+		foreach($configfiles as $distribution_name => $distribution_details)
+		{
+			$services = '';
+			foreach($distribution_details['services'] as $service_name => $service_details)
+			{
+				$daemons = '';
+				foreach($service_details['daemons'] as $daemon_name => $daemon_details)
+				{
+					eval("\$daemons.=\"" . getTemplate("configfiles/choose_daemon") . "\";");
+				}
+
+				eval("\$services.=\"" . getTemplate("configfiles/choose_service") . "\";");
+			}
+
+			eval("\$distributions.=\"" . getTemplate("configfiles/choose_distribution") . "\";");
+		}
+
+		eval("echo \"" . getTemplate("configfiles/choose") . "\";");
+	}
+	else
+	{
+		eval("echo \"" . getTemplate("configfiles/wizard") . "\";");
+	}
 }

-function getCompleteDistroName($cparser)
-{
-    // get distro-info
-    $dist_display = $cparser->distributionName;
-    if ($cparser->distributionCodename != '') {
-        $dist_display .= " ".$cparser->distributionCodename;
-    }
-    if ($cparser->distributionVersion != '') {
-        $dist_display .= " (" . $cparser->distributionVersion . ")";
-    }
-    if ($cparser->deprecated) {
-        $dist_display .= " [deprecated]";
-    }
-    return $dist_display;
-}
+?>
--- a/admin_cronjobs.php
+++ b/admin_cronjobs.php
@@ -12,33 +12,42 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Panel
- *
+ * @version    $Id$
 */

 define('AREA', 'admin');
-require './lib/init.php';

-if (isset($_POST['id'])) {
+require_once("./lib/init.php");
+
+if(isset($_POST['id']))
+{
 	$id = intval($_POST['id']);
-} elseif(isset($_GET['id'])) {
+}
+elseif(isset($_GET['id']))
+{
 	$id = intval($_GET['id']);
 }

-if ($page == 'cronjobs' || $page == 'overview') {
-	if ($action == '') {
-		$log->logAction(ADM_ACTION, LOG_NOTICE, 'viewed admin_cronjobs');
+if($page == 'cronjobs'
+  || $page == 'overview')
+{
+	if($action == '')
+	{
+		$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_cronjobs");

 		$fields = array(
 			'c.lastrun' => $lng['cron']['lastrun'],
 			'c.interval' => $lng['cron']['interval'],
 			'c.isactive' => $lng['cron']['isactive']
 		);
-		$paging = new paging($userinfo, TABLE_PANEL_CRONRUNS, $fields);
+		$paging = new paging($userinfo, $db, TABLE_PANEL_CRONRUNS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);

+		/*
+		 * @TODO Fix sorting
+		 */
 		$crons = '';
-		$result_stmt = Database::prepare("SELECT `c`.* FROM `" . TABLE_PANEL_CRONRUNS . "` `c` ORDER BY `module` ASC, `cronfile` ASC");
-		Database::pexecute($result_stmt);
-		$paging->setEntries(Database::num_rows());
+		$result = $db->query("SELECT `c`.* FROM `" . TABLE_PANEL_CRONRUNS . "` `c` ORDER BY `cronfile` ASC");
+		$paging->setEntries($db->num_rows($result));
 		$sortcode = $paging->getHtmlSortCode($lng);
 		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
 		$searchcode = $paging->getHtmlSearchCode($lng);
@@ -46,95 +55,62 @@ if ($page == 'cronjobs' || $page == 'overview') {

 		$i = 0;
 		$count = 0;
-		$cmod = '';

-		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-			if ($cmod != $row['module']) {
-				$_mod = explode("/", $row['module']);
-				$module = ucfirst($_mod[1]);
-				eval("\$crons.=\"" . getTemplate('cronjobs/cronjobs_cronjobmodule') . "\";");
-				$cmod = $row['module'];
-			}
-			if ($paging->checkDisplay($i)) {
+		while($row = $db->fetch_array($result))
+		{
+			if($paging->checkDisplay($i))
+			{
 				$row = htmlentities_array($row);
-
+				
 				$row['lastrun'] = date('d.m.Y H:i', $row['lastrun']);
-				$row['isactive'] = ((int)$row['isactive'] == 1) ? $lng['panel']['yes'] : $lng['panel']['no'];
-
+				
+				if((int)$row['isactive'] == 1)
+				{
+					$row['isactive'] = $lng['panel']['yes'];
+				}
+				else
+				{
+					$row['isactive'] = $lng['panel']['no'];
+				}
+				
 				$description = $lng['crondesc'][$row['desc_lng_key']];
-
-				eval("\$crons.=\"" . getTemplate('cronjobs/cronjobs_cronjob') . "\";");
+				
+				/*
+				 * don't allow deletion of 'froxlor' cronjobs
+				 */
+				$vendor_a = explode('/', $row['module']);
+				$vendor = $vendor_a[0];
+				
+				eval("\$crons.=\"" . getTemplate("cronjobs/cronjobs_cronjob") . "\";");
 				$count++;
 			}

 			$i++;
 		}

-		eval("echo \"" . getTemplate('cronjobs/cronjobs') . "\";");
+		eval("echo \"" . getTemplate("cronjobs/cronjobs") . "\";");

-	} elseif ($action == 'new') {
-		/*
-		 * @TODO later
-		 */
-	} elseif ($action == 'edit' && $id != 0) {
-		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_CRONRUNS . "` WHERE `id`= :id");
-		Database::pexecute($result_stmt, array('id' => $id));
-		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
-		if ($result['cronfile'] != '') {
-			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-				$isactive = isset($_POST['isactive']) ? 1 : 0;
-				$interval_value = validate($_POST['interval_value'], 'interval_value', '/^([0-9]+)$/Di', 'stringisempty');
-				$interval_interval = validate($_POST['interval_interval'], 'interval_interval');
-
-				if ($isactive != 1) {
-					$isactive = 0;
-				}
-
-				$interval = $interval_value . ' ' . strtoupper($interval_interval);
-
-				$upd = Database::prepare("
-					UPDATE `" . TABLE_PANEL_CRONRUNS . "`
-					SET `isactive` = :isactive, `interval` = :int
-					WHERE `id` = :id"
-				);
-				Database::pexecute($upd, array('isactive' => $isactive, 'int' => $interval, 'id' => $id));
-
-				// insert task to re-generate the cron.d-file
-				inserttask('99');
-
-				redirectTo($filename, array('page' => $page, 's' => $s));
-			} else {
-
-				// interval
-				$interval_nfo = explode(' ', $result['interval']);
-				$interval_value = $interval_nfo[0];
-
-				$interval_interval = '';
-				$interval_interval .= makeoption($lng['cronmgmt']['minutes'], 'MINUTE', $interval_nfo[1]);
-				$interval_interval .= makeoption($lng['cronmgmt']['hours'], 'HOUR', $interval_nfo[1]);
-				$interval_interval .= makeoption($lng['cronmgmt']['days'], 'DAY', $interval_nfo[1]);
-				$interval_interval .= makeoption($lng['cronmgmt']['weeks'], 'WEEK', $interval_nfo[1]);
-				$interval_interval .= makeoption($lng['cronmgmt']['months'], 'MONTH', $interval_nfo[1]);
-				// end of interval
-
-				$change_cronfile = false;
-				if (substr($result['module'], 0, strpos($result['module'], '/')) != 'froxlor') {
-					$change_cronfile = true;
-				}
-
-				$cronjobs_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/cronjobs/formfield.cronjobs_edit.php';
-				$cronjobs_edit_form = htmlform::genHTMLForm($cronjobs_edit_data);
-
-				$title = $cronjobs_edit_data['cronjobs_edit']['title'];
-				$image = $cronjobs_edit_data['cronjobs_edit']['image'];
-
-				eval("echo \"" . getTemplate('cronjobs/cronjob_edit') . "\";");
-			}
-		}
 	}
-	elseif ($action == 'delete' && $id != 0) {
+	elseif($action == 'new')
+	{
 		/*
-		 * @TODO later
+		 * @TODO Finish me
+		 */
+	}
+	elseif($action == 'edit'
+	&& $id != 0)
+	{
+		/*
+		 * @TODO Finish me
+		 */
+	}
+	elseif($action == 'delete'
+	&& $id != 0)
+	{
+		/*
+		 * @TODO Finish me
 		 */
 	}
 }
+
+?>
--- a/admin_customers.php
+++ b/admin_customers.php
--- a/admin_domains.php
+++ b/admin_domains.php
--- a/admin_index.php
+++ b/admin_index.php
@@ -14,45 +14,47 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Panel
- *
+ * @version    $Id$
 */

 define('AREA', 'admin');
-require './lib/init.php';

-if ($action == 'logout')  {
+/**
+ * Include our init.php, which manages Sessions, Language etc.
+ */

+require ("./lib/init.php");
+
+if($action == 'logout')
+{
 	$log->logAction(ADM_ACTION, LOG_NOTICE, "logged out");

-	$params = array('adminid' => (int)$userinfo['adminid']);
-
-	if (Settings::Get('session.allow_multiple_login') == '1') {
-		$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_SESSIONS . "`
-			WHERE `userid` = :adminid
-			AND `adminsession` = '1'
-			AND `hash` = :hash"
-		);
-		$params['hash'] = $s;
-	} else {
-		$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_SESSIONS . "`
-			WHERE `userid` = :adminid
-			AND `adminsession` = '1'"
-		);
+	if($settings['session']['allow_multiple_login'] == '1')
+	{
+		$db->query("DELETE FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid` = '" . (int)$userinfo['adminid'] . "' AND `adminsession` = '1' AND `hash` = '" . $s . "'");
+	}
+	else
+	{
+		$db->query("DELETE FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid` = '" . (int)$userinfo['adminid'] . "' AND `adminsession` = '1'");
 	}
-	Database::pexecute($stmt, $params);

 	redirectTo('index.php');
+	exit;
 }

-if (isset($_POST['id'])) {
+if(isset($_POST['id']))
+{
 	$id = intval($_POST['id']);
-} elseif(isset($_GET['id'])) {
+}
+elseif(isset($_GET['id']))
+{
 	$id = intval($_GET['id']);
 }

-if ($page == 'overview') {
+if($page == 'overview')
+{
 	$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_index");
-	$overview_stmt = Database::prepare("SELECT COUNT(*) AS `number_customers`,
+	$overview = $db->query_first("SELECT COUNT(*) AS `number_customers`,
 				SUM(`diskspace_used`) AS `diskspace_used`,
 				SUM(`mysqls_used`) AS `mysqls_used`,
 				SUM(`emails_used`) AS `emails_used`,
@@ -62,117 +64,137 @@ if ($page == 'overview') {
 				SUM(`ftps_used`) AS `ftps_used`,
 				SUM(`tickets_used`) AS `tickets_used`,
 				SUM(`subdomains_used`) AS `subdomains_used`,
-				SUM(`traffic_used`) AS `traffic_used`
-				FROM `" . TABLE_PANEL_CUSTOMERS . "`" . ($userinfo['customers_see_all'] ? '' : " WHERE `adminid` = :adminid "));
-	$overview = Database::pexecute_first($overview_stmt, array('adminid' => $userinfo['adminid']));
-
-	$dec_places = Settings::Get('panel.decimal_places');
-	$overview['traffic_used'] = round($overview['traffic_used'] / (1024 * 1024), $dec_places);
-	$overview['diskspace_used'] = round($overview['diskspace_used'] / 1024, $dec_places);
-
-	$number_domains_stmt = Database::prepare("
-		SELECT COUNT(*) AS `number_domains` FROM `" . TABLE_PANEL_DOMAINS . "`
-		WHERE `parentdomainid`='0'" . ($userinfo['customers_see_all'] ? '' : " AND `adminid` = :adminid")
-	);
-	$number_domains = Database::pexecute_first($number_domains_stmt, array('adminid' => $userinfo['adminid']));
-
+				SUM(`traffic_used`) AS `traffic_used`,
+				SUM(`aps_packages_used`) AS `aps_packages_used`
+				FROM `" . TABLE_PANEL_CUSTOMERS . "`" . ($userinfo['customers_see_all'] ? '' : " WHERE `adminid` = '" . (int)$userinfo['adminid'] . "' "));
+	$overview['traffic_used'] = round($overview['traffic_used'] / (1024 * 1024), $settings['panel']['decimal_places']);
+	$overview['diskspace_used'] = round($overview['diskspace_used'] / 1024, $settings['panel']['decimal_places']);
+	$number_domains = $db->query_first("SELECT COUNT(*) AS `number_domains` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `parentdomainid`='0'" . ($userinfo['customers_see_all'] ? '' : " AND `adminid` = '" . (int)$userinfo['adminid'] . "' "));
 	$overview['number_domains'] = $number_domains['number_domains'];
-
 	$phpversion = phpversion();
-	$mysqlserverversion = Database::getAttribute(PDO::ATTR_SERVER_VERSION);
+	$phpmemorylimit = @ini_get("memory_limit");
+
+	if($phpmemorylimit == "")
+	{
+		$phpmemorylimit = $lng['admin']['memorylimitdisabled'];
+	}
+
+	$mysqlserverversion = mysql_get_server_info();
+	$mysqlclientversion = mysql_get_client_info();
 	$webserverinterface = strtoupper(@php_sapi_name());

-	if ((isset($_GET['lookfornewversion']) && $_GET['lookfornewversion'] == 'yes')
-		|| (isset($lookfornewversion) && $lookfornewversion == 'yes')
-	) {
+	if((isset($_GET['lookfornewversion']) && $_GET['lookfornewversion'] == 'yes')
+	|| (isset($lookfornewversion) && $lookfornewversion == 'yes'))
+	{
 		$update_check_uri = 'http://version.froxlor.org/Froxlor/legacy/' . $version;

-		if (ini_get('allow_url_fopen')) {
+		if(ini_get('allow_url_fopen'))
+		{
 			$latestversion = @file($update_check_uri);

-			if (isset($latestversion[0])) {
+			if (isset($latestversion[0]))
+			{
 				$latestversion = explode('|', $latestversion[0]);

-				if (is_array($latestversion)
-					&& count($latestversion) >= 1
-				) {
+				if(is_array($latestversion)
+				&& count($latestversion) >= 1)
+				{
 					$_version = $latestversion[0];
-					$_message = isset($latestversion[1]) ? $latestversion[1] : '';
+					$_message = $latestversion[1];
 					$_link = isset($latestversion[2]) ? $latestversion[2] : htmlspecialchars($filename . '?s=' . urlencode($s) . '&page=' . urlencode($page) . '&lookfornewversion=yes');

-					// add the branding so debian guys are not gettings confused
-					// about their version-number
-					$lookfornewversion_lable = $_version.$branding;
+					$lookfornewversion_lable = $_version;
 					$lookfornewversion_link = $_link;
 					$lookfornewversion_addinfo = $_message;
-
-					// not numeric -> error-message
-					if (!preg_match('/^((\d+\\.)(\d+\\.)(\d+\\.)?(\d+)?(\-(svn|dev|rc)(\d+))?)$/', $_version)) {
-						// check for customized version to not output
-						// "There is a newer version of froxlor" besides the error-message
-						$isnewerversion = 2;
-					} elseif (version_compare2($version, $_version) == -1) {
+					
+					if (version_compare($version, $_version) == -1) {
 						$isnewerversion = 1;
 					} else {
 						$isnewerversion = 0;
 					}
-				} else {
-					redirectTo($update_check_uri.'/pretty', NULL, false);
 				}
-			} else {
-				redirectTo($update_check_uri.'/pretty', NULL, false);
+				else
+				{
+					redirectTo($update_check_uri.'/pretty', NULL);
+				}
+			}
+			else
+			{
+				redirectTo($update_check_uri.'/pretty', NULL);
 			}
-		} else {
-			redirectTo($update_check_uri.'/pretty', NULL, false);
 		}
-	} else {
+		else
+		{
+			redirectTo($update_check_uri.'/pretty', NULL);
+		}
+	}
+	else
+	{
 		$lookfornewversion_lable = $lng['admin']['lookfornewversion']['clickhere'];
 		$lookfornewversion_link = htmlspecialchars($filename . '?s=' . urlencode($s) . '&page=' . urlencode($page) . '&lookfornewversion=yes');
 		$lookfornewversion_addinfo = '';
 		$isnewerversion = 0;
 	}

-	$dec_places = Settings::Get('panel.decimal_places');
-	$userinfo['diskspace'] = round($userinfo['diskspace'] / 1024, $dec_places);
-	$userinfo['diskspace_used'] = round($userinfo['diskspace_used'] / 1024, $dec_places);
-	$userinfo['traffic'] = round($userinfo['traffic'] / (1024 * 1024), $dec_places);
-	$userinfo['traffic_used'] = round($userinfo['traffic_used'] / (1024 * 1024), $dec_places);
-	$userinfo = str_replace_array('-1', $lng['customer']['unlimited'], $userinfo, 'customers domains diskspace traffic mysqls emails email_accounts email_forwarders email_quota ftps tickets subdomains');
-
-	$userinfo['custom_notes'] = ($userinfo['custom_notes'] != '') ? nl2br($userinfo['custom_notes']) : '';
+	$userinfo['diskspace'] = round($userinfo['diskspace'] / 1024, $settings['panel']['decimal_places']);
+	$userinfo['diskspace_used'] = round($userinfo['diskspace_used'] / 1024, $settings['panel']['decimal_places']);
+	$userinfo['traffic'] = round($userinfo['traffic'] / (1024 * 1024), $settings['panel']['decimal_places']);
+	$userinfo['traffic_used'] = round($userinfo['traffic_used'] / (1024 * 1024), $settings['panel']['decimal_places']);
+	$userinfo = str_replace_array('-1', $lng['customer']['unlimited'], $userinfo, 'customers domains diskspace traffic mysqls emails email_accounts email_forwarders email_quota ftps tickets subdomains aps_packages');

 	$cron_last_runs = getCronjobsLastRun();
 	$outstanding_tasks = getOutstandingTasks();

-	if (function_exists('sys_getloadavg')) {
+	$opentickets = 0;
+	$opentickets = $db->query_first('SELECT COUNT(`id`) as `count` FROM `' . TABLE_PANEL_TICKETS . '`
+                                   WHERE `answerto` = "0" AND (`status` = "0" OR `status` = "1")
+                                   AND `lastreplier`="0" AND `adminid` = "' . $userinfo['adminid'] . '"');
+	$awaitingtickets = $opentickets['count'];
+	$awaitingtickets_text = '';
+
+	if($opentickets > 0)
+	{
+		$awaitingtickets_text = strtr($lng['ticket']['awaitingticketreply'], array('%s' => '<a href="admin_tickets.php?page=tickets&amp;s=' . $s . '">' . $opentickets['count'] . '</a>'));
+	}
+
+	if(function_exists('sys_getloadavg'))
+	{
 		$loadArray = sys_getloadavg();
 		$load = number_format($loadArray[0], 2, '.', '') . " / " . number_format($loadArray[1], 2, '.', '') . " / " . number_format($loadArray[2], 2, '.', '');
-	} else {
+	}
+	else
+	{
 		$load = @file_get_contents('/proc/loadavg');

-		if (!$load) {
+		if(!$load)
+		{
 			$load = $lng['admin']['noloadavailable'];
 		}
 	}

-	if (function_exists('posix_uname')) {
+	if(function_exists('posix_uname'))
+	{
 		$showkernel = 1;
 		$kernel_nfo = posix_uname();
 		$kernel = $kernel_nfo['release'] . ' (' . $kernel_nfo['machine'] . ')';
-	} else {
+	}
+	else
+	{
 		$showkernel = 0;
 		$kernel = '';
 	}

 	// Try to get the uptime
-	// First: With exec (let's hope it's enabled for the Froxlor - vHost)
+	// First: With exec (let's hope it's enabled for the SysCP - vHost)
+
 	$uptime_array = explode(" ", @file_get_contents("/proc/uptime"));

-	if (is_array($uptime_array)
-		&& isset($uptime_array[0])
-		&& is_numeric($uptime_array[0])
-	) {
+	if(is_array($uptime_array)
+	&& isset($uptime_array[0])
+	&& is_numeric($uptime_array[0]))
+	{
 		// Some calculatioon to get a nicly formatted display
+
 		$seconds = round($uptime_array[0], 0);
 		$minutes = $seconds / 60;
 		$hours = $minutes / 60;
@@ -183,224 +205,89 @@ if ($page == 'overview') {
 		$uptime = "{$days}d, {$hours}h, {$minutes}m, {$seconds}s";

 		// Just cleanup
+
 		unset($uptime_array, $seconds, $minutes, $hours, $days);
-	} else {
+	}
+	else
+	{
 		// Nothing of the above worked, show an error :/
+
 		$uptime = '';
 	}

 	eval("echo \"" . getTemplate("index/index") . "\";");
-
-} elseif($page == 'change_password') {
-
-	if (isset($_POST['send'])
-		&& $_POST['send'] == 'send'
-	) {
+}
+elseif($page == 'change_password')
+{
+	if(isset($_POST['send'])
+	&& $_POST['send'] == 'send')
+	{
 		$old_password = validate($_POST['old_password'], 'old password');

-		if (!validatePasswordLogin($userinfo,$old_password,TABLE_PANEL_ADMINS,'adminid')) {
+		if(md5($old_password) != $userinfo['password'])
+		{
 			standard_error('oldpasswordnotcorrect');
+			exit;
 		}

 		$new_password = validate($_POST['new_password'], 'new password');
 		$new_password_confirm = validate($_POST['new_password_confirm'], 'new password confirm');

-		if ($old_password == '') {
+		if($old_password == '')
+		{
 			standard_error(array('stringisempty', 'oldpassword'));
-		} elseif($new_password == '') {
+		}
+		elseif($new_password == '')
+		{
 			standard_error(array('stringisempty', 'newpassword'));
-		} elseif($new_password_confirm == '') {
+		}
+		elseif($new_password_confirm == '')
+		{
 			standard_error(array('stringisempty', 'newpasswordconfirm'));
-		} elseif($new_password != $new_password_confirm) {
+		}
+		elseif($new_password != $new_password_confirm)
+		{
 			standard_error('newpasswordconfirmerror');
-		} else {
-			$chgpwd_stmt = Database::prepare("
-				UPDATE `" . TABLE_PANEL_ADMINS . "`
-				SET `password`= :newpasswd
-				WHERE `adminid`= :adminid"
-			);
-			Database::pexecute($chgpwd_stmt, array(
-				'newpasswd' => makeCryptPassword($new_password),
-				'adminid' => (int)$userinfo['adminid']
-			));
+		}
+		else
+		{
+			$db->query("UPDATE `" . TABLE_PANEL_ADMINS . "` SET `password`='" . md5($new_password) . "' WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND `password`='" . md5($old_password) . "'");
 			$log->logAction(ADM_ACTION, LOG_NOTICE, 'changed password');
 			redirectTo($filename, Array('s' => $s));
 		}
-	} else {
+	}
+	else
+	{
 		eval("echo \"" . getTemplate("index/change_password") . "\";");
 	}
-
-} elseif($page == 'change_language') {
-
-	if (isset($_POST['send'])
-		&& $_POST['send'] == 'send'
-	) {
+}
+elseif($page == 'change_language')
+{
+	if(isset($_POST['send'])
+	&& $_POST['send'] == 'send')
+	{
 		$def_language = validate($_POST['def_language'], 'default language');

-		if (isset($languages[$def_language])) {
-			$lng_stmt = Database::prepare("
-				UPDATE `" . TABLE_PANEL_ADMINS . "`
-				SET `def_language`= :deflng
-				WHERE `adminid`= :adminid"
-			);
-			Database::pexecute($lng_stmt, array(
-				'deflng' => $def_language,
-				'adminid' => (int)$userinfo['adminid']
-			));
-
-			$lng_stmt = Database::prepare("
-				UPDATE `" . TABLE_PANEL_SESSIONS . "`
-				SET `language`= :lng
-				WHERE `hash`= :hash"
-			);
-			Database::pexecute($lng_stmt, array(
-				'lng' => $def_language,
-				'hash' => $s
-			));
+		if(isset($languages[$def_language]))
+		{
+			$db->query("UPDATE `" . TABLE_PANEL_ADMINS . "` SET `def_language`='" . $db->escape($def_language) . "' WHERE `adminid`='" . (int)$userinfo['adminid'] . "'");
+			$db->query("UPDATE `" . TABLE_PANEL_SESSIONS . "` SET `language`='" . $db->escape($def_language) . "' WHERE `hash`='" . $db->escape($s) . "'");
 		}

 		$log->logAction(ADM_ACTION, LOG_NOTICE, "changed his/her default language to '" . $def_language . "'");
-		redirectTo($filename, array('s' => $s));
-
-	} else {
-
+		redirectTo($filename, Array('s' => $s));
+	}
+	else
+	{
 		$language_options = '';

-		$default_lang = Settings::Get('panel.standardlanguage');
-		if ($userinfo['def_language'] != '') {
-			$default_lang = $userinfo['def_language'];
-		}
-
-		while (list($language_file, $language_name) = each($languages)) {
-			$language_options.= makeoption($language_name, $language_file, $default_lang, true);
+		while(list($language_file, $language_name) = each($languages))
+		{
+			$language_options.= makeoption($language_name, $language_file, $userinfo['def_language'], true);
 		}

 		eval("echo \"" . getTemplate("index/change_language") . "\";");
 	}
-
-} elseif ($page == 'change_theme') {
-
-	if (isset($_POST['send'])
-		&& $_POST['send'] == 'send'
-	) {
-		$theme = validate($_POST['theme'], 'theme');
-
-		$theme_stmt = Database::prepare("
-				UPDATE `" . TABLE_PANEL_ADMINS . "`
-				SET `theme`= :theme
-				WHERE `adminid`= :adminid"
-		);
-		Database::pexecute($theme_stmt, array(
-			'theme' => $theme,
-			'adminid' => (int)$userinfo['adminid']
-		));
-
-		$theme_stmt = Database::prepare("
-				UPDATE `" . TABLE_PANEL_SESSIONS . "`
-				SET `theme`= :theme
-				WHERE `hash`= :hash"
-		);
-		Database::pexecute($theme_stmt, array(
-			'theme' => $theme,
-			'hash' => $s
-		));
-
-		$log->logAction(ADM_ACTION, LOG_NOTICE, "changed his/her theme to '" . $theme . "'");
-		redirectTo($filename, array('s' => $s));
-
-	} else {
-
-		$theme_options = '';
-
-		$default_theme = Settings::Get('panel.default_theme');
-		if ($userinfo['theme'] != '') {
-			$default_theme = $userinfo['theme'];
-		}
-
-		$themes_avail = getThemes();
-		foreach ($themes_avail as $t => $d) {
-			$theme_options.= makeoption($d, $t, $default_theme, true);
-		}
-
-		eval("echo \"" . getTemplate("index/change_theme") . "\";");
-	}
-
-} elseif ($page == 'send_error_report'
-	&& Settings::Get('system.allow_error_report_admin') == '1'
-) {
-
-	// only show this if we really have an exception to report
-	if (isset($_GET['errorid'])
-		&& $_GET['errorid'] != ''
-	) {
-
-		$errid = $_GET['errorid'];
-		// read error file
-		$err_dir = makeCorrectDir(FROXLOR_INSTALL_DIR."/logs/");
-		$err_file = makeCorrectFile($err_dir."/".$errid."_sql-error.log");
-
-		if (file_exists($err_file)) {
-
-			$error_content = file_get_contents($err_file);
-			$error = explode("|", $error_content);
-
-			$_error = array(
-				'code' => str_replace("\n", "", substr($error[1], 5)),
-				'message' => str_replace("\n", "", substr($error[2], 4)),
-				'file' => str_replace("\n", "", substr($error[3], 5 + strlen(FROXLOR_INSTALL_DIR))),
-				'line' => str_replace("\n", "", substr($error[4], 5)),
-				'trace' => str_replace(FROXLOR_INSTALL_DIR, "", substr($error[5], 6))
-			);
-
-			// build mail-content
-			$mail_body = "Dear froxlor-team,\n\n";
-			$mail_body .= "the following error has been reported by a user:\n\n";
-			$mail_body .= "-------------------------------------------------------------\n";
-			$mail_body .= $_error['code'].' '.$_error['message']."\n\n";
-			$mail_body .= "File: ".$_error['file'].':'.$_error['line']."\n\n";
-			$mail_body .= "Trace:\n".trim($_error['trace'])."\n\n";
-			$mail_body .= "-------------------------------------------------------------\n\n";
-			$mail_body .= "Froxlor-version: ".$version."\n\n";
-			$mail_body .= "End of report";
-			$mail_html = nl2br($mail_body);
-
-			// send actual report to dev-team
-			if (isset($_POST['send'])
-					&& $_POST['send'] == 'send'
-			) {
-				// send mail and say thanks
-				$_mailerror = false;
-				try {
-					$mail->Subject = '[Froxlor] Error report by user';
-					$mail->AltBody = $mail_body;
-					$mail->MsgHTML($mail_html);
-					$mail->AddAddress('error-reports@froxlor.org', 'Froxlor Developer Team');
-					$mail->Send();
-				} catch(phpmailerException $e) {
-					$mailerr_msg = $e->errorMessage();
-					$_mailerror = true;
-				} catch (Exception $e) {
-					$mailerr_msg = $e->getMessage();
-					$_mailerror = true;
-				}
-
-				if ($_mailerror) {
-					// error when reporting an error...LOLFUQ
-					standard_error('send_report_error', $mailerr_msg);
-				}
-
-				// finally remove error from fs
-				@unlink($err_file);
-				redirectTo($filename, array('s' => $s));
-			}
-			// show a nice summary of the error-report
-			// before actually sending anything
-			eval("echo \"" . getTemplate("index/send_error_report") . "\";");
-
-		} else {
-			redirectTo($filename, array('s' => $s));
-		}
-	} else {
-		redirectTo($filename, array('s' => $s));
-	}
 }
+
+?>
--- a/admin_ipsandports.php
+++ b/admin_ipsandports.php
@@ -14,38 +14,40 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Panel
- *
+ * @version    $Id$
 */

 define('AREA', 'admin');
-require './lib/init.php';

-if (isset($_POST['id'])) {
+/**
+ * Include our init.php, which manages Sessions, Language etc.
+ */
+
+require ("./lib/init.php");
+
+if(isset($_POST['id']))
+{
 	$id = intval($_POST['id']);
-} elseif(isset($_GET['id'])) {
+}
+elseif(isset($_GET['id']))
+{
 	$id = intval($_GET['id']);
 }

-if ($page == 'ipsandports'
-	|| $page == 'overview'
-) {
-	// Do not display attributes that are not used by the current webserver
-	$websrv = Settings::Get('system.webserver');
-	$is_nginx = ($websrv == 'nginx');
-	$is_apache = ($websrv == 'apache2');
-
-	if ($action == '') {
-
+if($page == 'ipsandports'
+   || $page == 'overview')
+{
+	if($action == '')
+	{
 		$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_ipsandports");
 		$fields = array(
 			'ip' => $lng['admin']['ipsandports']['ip'],
 			'port' => $lng['admin']['ipsandports']['port']
 		);
-		$paging = new paging($userinfo, TABLE_PANEL_IPSANDPORTS, $fields);
+		$paging = new paging($userinfo, $db, TABLE_PANEL_IPSANDPORTS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
 		$ipsandports = '';
-		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_IPSANDPORTS . "` " . $paging->getSqlWhere(false) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
-		Database::pexecute($result_stmt);
-		$paging->setEntries(Database::num_rows());
+		$result = $db->query("SELECT `id`, `ip`, `port`, `listen_statement`, `namevirtualhost_statement`, `vhostcontainer`, `vhostcontainer_servername_statement`, `specialsettings`, `ssl` FROM `" . TABLE_PANEL_IPSANDPORTS . "` " . $paging->getSqlWhere(false) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
+		$paging->setEntries($db->num_rows($result));
 		$sortcode = $paging->getHtmlSortCode($lng);
 		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
 		$searchcode = $paging->getHtmlSearchCode($lng);
@@ -53,385 +55,266 @@ if ($page == 'ipsandports'
 		$i = 0;
 		$count = 0;

-		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-
-			if ($paging->checkDisplay($i)) {
+		while($row = $db->fetch_array($result))
+		{
+			if($paging->checkDisplay($i))
+			{
 				$row = htmlentities_array($row);
-				if (filter_var($row['ip'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+
+				if(filter_var($row['ip'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))
+				{
 					$row['ip'] = '[' . $row['ip'] . ']';
 				}
+
 				eval("\$ipsandports.=\"" . getTemplate("ipsandports/ipsandports_ipandport") . "\";");
 				$count++;
 			}
+
 			$i++;
 		}

 		eval("echo \"" . getTemplate("ipsandports/ipsandports") . "\";");
+	}
+	elseif($action == 'delete'
+	       && $id != 0)
+	{
+		$result = $db->query_first("SELECT `id`, `ip`, `port` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id`='" . (int)$id . "'");

-	} elseif($action == 'delete'
-		&& $id != 0
-	) {
-		$result_stmt = Database::prepare("SELECT `id`, `ip`, `port` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id` = :id");
-		$result = Database::pexecute_first($result_stmt, array('id' => $id));
+		if(isset($result['id'])
+		   && $result['id'] == $id)
+		{
+			$result_checkdomain = $db->query_first("SELECT `id` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `ipandport`='" . (int)$id . "'");

-		if (isset($result['id'])
-			&& $result['id'] == $id
-		) {
-			$result_checkdomain_stmt = Database::prepare("
-				SELECT `id_domain` as `id` FROM `" . TABLE_DOMAINTOIP . "` WHERE `id_ipandports` = :id"
-			);
-			$result_checkdomain = Database::pexecute_first($result_checkdomain_stmt, array('id' => $id));
+			if($result_checkdomain['id'] == '')
+			{
+				if($result['id'] != $settings['system']['defaultip'])
+				{
+					$result_sameipotherport = $db->query_first("SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `ip`='" . $db->escape($result['ip']) . "' AND `id`!='" . (int)$id . "'");

-			if ($result_checkdomain['id'] == '') {
-				if (!in_array($result['id'], explode(',', Settings::Get('system.defaultip')))) {
-
-					$result_sameipotherport_stmt = Database::prepare("
-						SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "`
-						WHERE `ip` = :ip AND `id` <> :id"
-					);
-					$result_sameipotherport = Database::pexecute_first($result_sameipotherport_stmt, array('id' => $id, 'ip' => $result['ip']));
-
-					if (($result['ip'] != Settings::Get('system.ipaddress'))
-						|| ($result['ip'] == Settings::Get('system.ipaddress')
-						&& $result_sameipotherport['id'] != '')
-					) {
-						$result_stmt = Database::prepare("
-							SELECT `ip`, `port` FROM `" . TABLE_PANEL_IPSANDPORTS . "`
-							WHERE `id` = :id"
-						);
-						$result = Database::pexecute_first($result_stmt, array('id' => $id));
-
-						if ($result['ip'] != '') {
-
-							if (isset($_POST['send'])
-								&& $_POST['send'] == 'send'
-							) {
-								$del_stmt = Database::prepare("
-									DELETE FROM `" . TABLE_PANEL_IPSANDPORTS . "`
-									WHERE `id` = :id"
-								);
-								Database::pexecute($del_stmt, array('id' => $id));
-
-								// also, remove connections to domains (multi-stack)
-								$del_stmt = Database::prepare("
-									DELETE FROM `".TABLE_DOMAINTOIP."` WHERE `id_ipandports` = :id"
-								);
-								Database::pexecute($del_stmt, array('id' => $id));
+					if(($result['ip'] != $settings['system']['ipaddress'])
+					   || ($result['ip'] == $settings['system']['ipaddress'] && $result_sameipotherport['id'] != ''))
+					{
+						$result = $db->query_first("SELECT `ip`, `port` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id`='" . (int)$id . "'");

+						if($result['ip'] != '')
+						{
+							if(isset($_POST['send'])
+							   && $_POST['send'] == 'send')
+							{
+								$db->query("DELETE FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id`='" . (int)$id . "'");
 								$log->logAction(ADM_ACTION, LOG_WARNING, "deleted IP/port '" . $result['ip'] . ":" . $result['port'] . "'");
 								inserttask('1');
-								// Using nameserver, insert a task which rebuilds the server config
 								inserttask('4');
-
-								redirectTo($filename, array('page' => $page, 's' => $s));
-
-							} else {
+								redirectTo($filename, Array('page' => $page, 's' => $s));
+							}
+							else
+							{
 								ask_yesno('admin_ip_reallydelete', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $result['ip'] . ':' . $result['port']);
 							}
 						}
-					} else {
+					}
+					else
+					{
 						standard_error('cantdeletesystemip');
 					}
-				} else {
+				}
+				else
+				{
 					standard_error('cantdeletedefaultip');
 				}
-			} else {
+			}
+			else
+			{
 				standard_error('ipstillhasdomains');
 			}
 		}
-
-	} elseif($action == 'add') {
-
-		if (isset($_POST['send'])
-			&& $_POST['send'] == 'send'
-		) {
-
+	}
+	elseif($action == 'add')
+	{
+		if(isset($_POST['send'])
+		   && $_POST['send'] == 'send')
+		{
 			$ip = validate_ip($_POST['ip']);
 			$port = validate($_POST['port'], 'port', '/^(([1-9])|([1-9][0-9])|([1-9][0-9][0-9])|([1-9][0-9][0-9][0-9])|([1-5][0-9][0-9][0-9][0-9])|(6[0-4][0-9][0-9][0-9])|(65[0-4][0-9][0-9])|(655[0-2][0-9])|(6553[0-5]))$/Di', array('stringisempty', 'myport'));
-			$listen_statement = isset($_POST['listen_statement']) ? 1 : 0;
-			$namevirtualhost_statement = isset($_POST['namevirtualhost_statement']) ? 1 : 0;
-			$vhostcontainer = isset($_POST['vhostcontainer']) ? 1 : 0;
+			$listen_statement = intval($_POST['listen_statement']);
+			$namevirtualhost_statement = intval($_POST['namevirtualhost_statement']);
+			$vhostcontainer = intval($_POST['vhostcontainer']);
 			$specialsettings = validate(str_replace("\r\n", "\n", $_POST['specialsettings']), 'specialsettings', '/^[^\0]*$/');
-			$vhostcontainer_servername_statement = isset($_POST['vhostcontainer_servername_statement']) ? 1 : 0;
+			$vhostcontainer_servername_statement = intval($_POST['vhostcontainer_servername_statement']);
+			$ssl = intval($_POST['ssl']);
+			$ssl_cert_file = validate($_POST['ssl_cert_file'], 'ssl_cert_file');
+			$ssl_key_file = validate($_POST['ssl_key_file'], 'ssl_key_file');
+			$ssl_ca_file = validate($_POST['ssl_ca_file'], 'ssl_ca_file');
 			$default_vhostconf_domain = validate(str_replace("\r\n", "\n", $_POST['default_vhostconf_domain']), 'default_vhostconf_domain', '/^[^\0]*$/');
-			$docroot = validate($_POST['docroot'], 'docroot');
-
-			if ((int)Settings::Get('system.use_ssl') == 1) {
-				$ssl = isset($_POST['ssl']) ? intval($_POST['ssl']) : 0;
-				$ssl_cert_file = validate($_POST['ssl_cert_file'], 'ssl_cert_file');
-				$ssl_key_file = validate($_POST['ssl_key_file'], 'ssl_key_file');
-				$ssl_ca_file = validate($_POST['ssl_ca_file'], 'ssl_ca_file');
-				$ssl_cert_chainfile = validate($_POST['ssl_cert_chainfile'], 'ssl_cert_chainfile');
-			} else {
-				$ssl = 0;
-				$ssl_cert_file = '';
-				$ssl_key_file = '';
-				$ssl_ca_file = '';
-				$ssl_cert_chainfile = '';
-			}
-
-			if ($listen_statement != '1') {
+			
+			if($listen_statement != '1')
+			{
 				$listen_statement = '0';
 			}

-			if ($namevirtualhost_statement != '1') {
+			if($namevirtualhost_statement != '1')
+			{
 				$namevirtualhost_statement = '0';
 			}

-			if ($vhostcontainer != '1') {
+			if($vhostcontainer != '1')
+			{
 				$vhostcontainer = '0';
 			}

-			if ($vhostcontainer_servername_statement != '1') {
+			if($vhostcontainer_servername_statement != '1')
+			{
 				$vhostcontainer_servername_statement = '0';
 			}

-			if ($ssl != '1') {
+			if($ssl != '1')
+			{
 				$ssl = '0';
 			}
-
-			if ($ssl_cert_file != '') {
+		
+			if($ssl_cert_file != '')
+			{
 				$ssl_cert_file = makeCorrectFile($ssl_cert_file);
 			}

-			if ($ssl_key_file != '') {
+			if($ssl_key_file != '')
+			{
 				$ssl_key_file = makeCorrectFile($ssl_key_file);
 			}

-			if ($ssl_ca_file != '') {
+			if($ssl_ca_file != '')
+			{
 				$ssl_ca_file = makeCorrectFile($ssl_ca_file);
 			}

-			if ($ssl_cert_chainfile != '') {
-				$ssl_cert_chainfile = makeCorrectFile($ssl_cert_chainfile);
-			}
+			$result_checkfordouble = $db->query_first("SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `ip`='" . $db->escape($ip) . "' AND `port`='" . (int)$port . "'");

-			if (strlen(trim($docroot)) > 0) {
-				$docroot = makeCorrectDir($docroot);
-			} else {
-				$docroot = '';
-			}
-
-			$result_checkfordouble_stmt = Database::prepare("
-				SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "`
-				WHERE `ip` = :ip AND `port` = :port"
-			);
-			$result_checkfordouble = Database::pexecute_first($result_checkfordouble_stmt, array('ip' => $ip, 'port' => $port));
-
-			if ($result_checkfordouble['id'] != '') {
+			if($result_checkfordouble['id'] != '')
+			{
 				standard_error('myipnotdouble');
-			} else {
-				$ins_stmt = Database::prepare("
-					INSERT INTO `" . TABLE_PANEL_IPSANDPORTS . "`
-					SET
-						`ip` = :ip, `port` = :port, `listen_statement` = :ls,
-						`namevirtualhost_statement` = :nvhs, `vhostcontainer` = :vhc,
-						`vhostcontainer_servername_statement` = :vhcss,
-						`specialsettings` = :ss, `ssl` = :ssl,
-						`ssl_cert_file` = :ssl_cert, `ssl_key_file` = :ssl_key,
-						`ssl_ca_file` = :ssl_ca, `ssl_cert_chainfile` = :ssl_chain,
-						`default_vhostconf_domain` = :dvhd, `docroot` = :docroot;
-				");
-				$ins_data = array(
-					'ip' => $ip,
-					'port' => $port,
-					'ls' => $listen_statement,
-					'nvhs' => $namevirtualhost_statement,
-					'vhc' => $vhostcontainer,
-					'vhcss' => $vhostcontainer_servername_statement,
-					'ss' => $specialsettings,
-					'ssl' => $ssl,
-					'ssl_cert' => $ssl_cert_file,
-					'ssl_key' => $ssl_key_file,
-					'ssl_ca' => $ssl_ca_file,
-					'ssl_chain' => $ssl_cert_chainfile,
-					'dvhd' => $default_vhostconf_domain,
-					'docroot' => $docroot
-				);
-				Database::pexecute($ins_stmt, $ins_data);
+			}
+			else
+			{
+				$db->query("INSERT INTO `" . TABLE_PANEL_IPSANDPORTS . "` (`ip`, `port`, `listen_statement`, `namevirtualhost_statement`, `vhostcontainer`, `vhostcontainer_servername_statement`, `specialsettings`, `ssl`, `ssl_cert_file`, `ssl_key_file`, `ssl_ca_file`, `default_vhostconf_domain`) VALUES ('" . $db->escape($ip) . "', '" . (int)$port . "', '" . (int)$listen_statement . "', '" . (int)$namevirtualhost_statement . "', '" . (int)$vhostcontainer . "', '" . (int)$vhostcontainer_servername_statement . "', '" . $db->escape($specialsettings) . "', '" . (int)$ssl . "', '" . $db->escape($ssl_cert_file) . "', '" . $db->escape($ssl_key_file) . "', '" . $db->escape($ssl_ca_file) . "', '" . $db->escape($default_vhostconf_domain) . "')");

-				if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+				if(filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))
+				{
 					$ip = '[' . $ip . ']';
 				}

 				$log->logAction(ADM_ACTION, LOG_WARNING, "added IP/port '" . $ip . ":" . $port . "'");
 				inserttask('1');
-				// Using nameserver, insert a task which rebuilds the server config
 				inserttask('4');
 				redirectTo($filename, Array('page' => $page, 's' => $s));
 			}
-
-		} else {
-
-			$ipsandports_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php';
-			$ipsandports_add_form = htmlform::genHTMLForm($ipsandports_add_data);
-
-			$title = $ipsandports_add_data['ipsandports_add']['title'];
-			$image = $ipsandports_add_data['ipsandports_add']['image'];
-
+		}
+		else
+		{
+			$enable_ssl = makeyesno('ssl', '1', '0', '0');
+			$listen_statement = makeyesno('listen_statement', '1', '0', '1');
+			$namevirtualhost_statement = makeyesno('namevirtualhost_statement', '1', '0', '1');
+			$vhostcontainer = makeyesno('vhostcontainer', '1', '0', '1');
+			$vhostcontainer_servername_statement = makeyesno('vhostcontainer_servername_statement', '1', '0', '1');
 			eval("echo \"" . getTemplate("ipsandports/ipsandports_add") . "\";");
 		}
+	}
+	elseif($action == 'edit'
+	       && $id != 0)
+	{
+		$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id`='" . (int)$id . "'");

-	} elseif($action == 'edit'
-		&& $id != 0
-	) {
-		$result_stmt = Database::prepare("
-			SELECT * FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id` = :id"
-		);
-		$result = Database::pexecute_first($result_stmt, array('id' => $id));
-
-		if ($result['ip'] != '') {
-
-			if (isset($_POST['send'])
-				&& $_POST['send'] == 'send'
-			) {
-
+		if($result['ip'] != '')
+		{
+			if(isset($_POST['send'])
+			   && $_POST['send'] == 'send')
+			{
 				$ip = validate_ip($_POST['ip']);
 				$port = validate($_POST['port'], 'port', '/^(([1-9])|([1-9][0-9])|([1-9][0-9][0-9])|([1-9][0-9][0-9][0-9])|([1-5][0-9][0-9][0-9][0-9])|(6[0-4][0-9][0-9][0-9])|(65[0-4][0-9][0-9])|(655[0-2][0-9])|(6553[0-5]))$/Di', array('stringisempty', 'myport'));
-				$listen_statement = isset($_POST['listen_statement']) ? 1 : 0;
-				$namevirtualhost_statement = isset($_POST['namevirtualhost_statement']) ? 1 : 0;
-				$vhostcontainer = isset($_POST['vhostcontainer']) ? 1 : 0;
+				$result_checkfordouble = $db->query_first("SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `ip`='" . $db->escape($ip) . "' AND `port`='" . (int)$port . "'");
+				$result_sameipotherport = $db->query_first("SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `ip`='" . $db->escape($result['ip']) . "' AND `id`!='" . (int)$id . "'");
+				$listen_statement = intval($_POST['listen_statement']);
+				$namevirtualhost_statement = intval($_POST['namevirtualhost_statement']);
+				$vhostcontainer = intval($_POST['vhostcontainer']);
 				$specialsettings = validate(str_replace("\r\n", "\n", $_POST['specialsettings']), 'specialsettings', '/^[^\0]*$/');
-				$vhostcontainer_servername_statement = isset($_POST['vhostcontainer_servername_statement']) ? 1 : 0;
+				$vhostcontainer_servername_statement = intval($_POST['vhostcontainer_servername_statement']);
+				$ssl = intval($_POST['ssl']);
+				$ssl_cert_file = validate($_POST['ssl_cert_file'], 'ssl_cert_file');
+				$ssl_key_file = validate($_POST['ssl_key_file'], 'ssl_key_file');
+				$ssl_ca_file = validate($_POST['ssl_ca_file'], 'ssl_ca_file');
 				$default_vhostconf_domain = validate(str_replace("\r\n", "\n", $_POST['default_vhostconf_domain']), 'default_vhostconf_domain', '/^[^\0]*$/');
-				$docroot =  validate($_POST['docroot'], 'docroot');
-
-				$result_checkfordouble_stmt = Database::prepare("
-					SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "`
-					WHERE `ip` = :ip AND `port` = :port"
-				);
-				$result_checkfordouble = Database::pexecute_first($result_checkfordouble_stmt, array('ip' => $ip, 'port' => $port));
-
-				$result_sameipotherport_stmt = Database::prepare("
-					SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "`
-					WHERE `ip` = :ip AND `id` <> :id"
-				);
-				$result_sameipotherport = Database::pexecute_first($result_sameipotherport_stmt, array('ip' => $ip, 'id' => $id));
-
-				if ((int)Settings::Get('system.use_ssl') == 1
-					&& isset($_POST['ssl'])
-					&& $_POST['ssl'] != 0
-				) {
-					$ssl = 1;
-					$ssl_cert_file = validate($_POST['ssl_cert_file'], 'ssl_cert_file');
-					$ssl_key_file = validate($_POST['ssl_key_file'], 'ssl_key_file');
-					$ssl_ca_file = validate($_POST['ssl_ca_file'], 'ssl_ca_file');
-					$ssl_cert_chainfile = validate($_POST['ssl_cert_chainfile'], 'ssl_cert_chainfile');
-				} else {
-					$ssl = 0;
-					$ssl_cert_file = '';
-					$ssl_key_file = '';
-					$ssl_ca_file = '';
-					$ssl_cert_chainfile = '';
-				}
-
-				if ($listen_statement != '1') {
+				
+				if($listen_statement != '1')
+				{
 					$listen_statement = '0';
 				}

-				if ($namevirtualhost_statement != '1') {
+				if($namevirtualhost_statement != '1')
+				{
 					$namevirtualhost_statement = '0';
 				}

-				if ($vhostcontainer != '1') {
+				if($vhostcontainer != '1')
+				{
 					$vhostcontainer = '0';
 				}

-				if ($vhostcontainer_servername_statement != '1') {
+				if($vhostcontainer_servername_statement != '1')
+				{
 					$vhostcontainer_servername_statement = '0';
 				}

-				if ($ssl != '1') {
+				if($ssl != '1')
+				{
 					$ssl = '0';
 				}
-
-				if ($ssl_cert_file != '') {
+				
+				if($ssl_cert_file != '')
+				{
 					$ssl_cert_file = makeCorrectFile($ssl_cert_file);
 				}

-				if ($ssl_key_file != '') {
+				if($ssl_key_file != '')
+				{
 					$ssl_key_file = makeCorrectFile($ssl_key_file);
 				}

-				if ($ssl_ca_file != '') {
+				if($ssl_ca_file != '')
+				{
 					$ssl_ca_file = makeCorrectFile($ssl_ca_file);
 				}

-				if ($ssl_cert_chainfile != '') {
-					$ssl_cert_chainfile = makeCorrectFile($ssl_cert_chainfile);
-				}
-
-				if (strlen(trim($docroot)) > 0) {
-					$docroot = makeCorrectDir($docroot);
-				} else {
-					$docroot = '';
-				}
-
-				if ($result['ip'] != $ip
-					&& $result['ip'] == Settings::Get('system.ipaddress')
-					&& $result_sameipotherport['id'] == ''
-				) {
+				if($result['ip'] != $ip
+				   && $result['ip'] == $settings['system']['ipaddress']
+				   && $result_sameipotherport['id'] == '')
+				{
 					standard_error('cantchangesystemip');
-
-				} elseif($result_checkfordouble['id'] != ''
-					&& $result_checkfordouble['id'] != $id
-				) {
+				}
+				elseif($result_checkfordouble['id'] != ''
+				       && $result_checkfordouble['id'] != $id)
+				{
 					standard_error('myipnotdouble');
-
-				} else {
-
-					$upd_stmt = Database::prepare("
-						UPDATE `" . TABLE_PANEL_IPSANDPORTS . "`
-						SET
-							`ip` = :ip, `port` = :port, `listen_statement` = :ls,
-							`namevirtualhost_statement` = :nvhs, `vhostcontainer` = :vhc,
-							`vhostcontainer_servername_statement` = :vhcss,
-							`specialsettings` = :ss, `ssl` = :ssl,
-							`ssl_cert_file` = :ssl_cert, `ssl_key_file` = :ssl_key,
-							`ssl_ca_file` = :ssl_ca, `ssl_cert_chainfile` = :ssl_chain,
-							`default_vhostconf_domain` = :dvhd, `docroot` = :docroot
-						WHERE `id` = :id;
-					");
-					$upd_data = array(
-						'ip' => $ip,
-						'port' => $port,
-						'ls' => $listen_statement,
-						'nvhs' => $namevirtualhost_statement,
-						'vhc' => $vhostcontainer,
-						'vhcss' => $vhostcontainer_servername_statement,
-						'ss' => $specialsettings,
-						'ssl' => $ssl,
-						'ssl_cert' => $ssl_cert_file,
-						'ssl_key' => $ssl_key_file,
-						'ssl_ca' => $ssl_ca_file,
-						'ssl_chain' => $ssl_cert_chainfile,
-						'dvhd' => $default_vhostconf_domain,
-						'docroot' => $docroot,
-						'id' => $id
-					);
-					Database::pexecute($upd_stmt, $upd_data);
-
+				}
+				else
+				{
+					$db->query("UPDATE `" . TABLE_PANEL_IPSANDPORTS . "` SET `ip`='" . $db->escape($ip) . "', `port`='" . (int)$port . "', `listen_statement`='" . (int)$listen_statement . "', `namevirtualhost_statement`='" . (int)$namevirtualhost_statement . "', `vhostcontainer`='" . (int)$vhostcontainer . "', `vhostcontainer_servername_statement`='" . (int)$vhostcontainer_servername_statement . "', `specialsettings`='" . $db->escape($specialsettings) . "', `ssl`='" . (int)$ssl . "', `ssl_cert_file`='" . $db->escape($ssl_cert_file) . "', `ssl_key_file`='" . $db->escape($ssl_key_file) . "', `ssl_ca_file`='" . $db->escape($ssl_ca_file) . "', `default_vhostconf_domain`='" . $db->escape($default_vhostconf_domain) . "' WHERE `id`='" . (int)$id . "'");
 					$log->logAction(ADM_ACTION, LOG_WARNING, "changed IP/port from '" . $result['ip'] . ":" . $result['port'] . "' to '" . $ip . ":" . $port . "'");
 					inserttask('1');
-
-					// Using nameserver, insert a task which rebuilds the server config
 					inserttask('4');
-
 					redirectTo($filename, Array('page' => $page, 's' => $s));
 				}
-
-			} else {
-
+			}
+			else
+			{
+				$enable_ssl = makeyesno('ssl', '1', '0', $result['ssl']);
 				$result = htmlentities_array($result);
-
-				$ipsandports_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php';
-				$ipsandports_edit_form = htmlform::genHTMLForm($ipsandports_edit_data);
-
-				$title = $ipsandports_edit_data['ipsandports_edit']['title'];
-				$image = $ipsandports_edit_data['ipsandports_edit']['image'];
-
+				$listen_statement = makeyesno('listen_statement', '1', '0', $result['listen_statement']);
+				$namevirtualhost_statement = makeyesno('namevirtualhost_statement', '1', '0', $result['namevirtualhost_statement']);
+				$vhostcontainer = makeyesno('vhostcontainer', '1', '0', $result['vhostcontainer']);
+				$vhostcontainer_servername_statement = makeyesno('vhostcontainer_servername_statement', '1', '0', $result['vhostcontainer_servername_statement']);
 				eval("echo \"" . getTemplate("ipsandports/ipsandports_edit") . "\";");
 			}
 		}
 	}
 }
+
+?>
--- a/admin_logger.php
+++ b/admin_logger.php
@@ -14,49 +14,57 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Panel
- *
+ * @version    $Id$
 */

 define('AREA', 'admin');
-require './lib/init.php';

-if ($page == 'log'
-   && $userinfo['change_serversettings'] == '1'
-) {
-	if ($action == '') {
+/**
+ * Include our init.php, which manages Sessions, Language etc.
+ */
+
+require ("./lib/init.php");
+
+if($page == 'log'
+   && $userinfo['change_serversettings'] == '1')
+{
+	if($action == '')
+	{
 		$fields = array(
+			'action' => $lng['logger']['action'],
 			'date' => $lng['logger']['date'],
 			'type' => $lng['logger']['type'],
-			'user' => $lng['logger']['user'],
-			'text' => $lng['logger']['action']
+			'user' => $lng['logger']['user']
 		);
-		$paging = new paging($userinfo, TABLE_PANEL_LOG, $fields, null, null, 0, 'desc');
-		$result_stmt = Database::query('
-			SELECT * FROM `' . TABLE_PANEL_LOG . '` ' . $paging->getSqlWhere(false) . ' ' . $paging->getSqlOrderBy() . ' ' . $paging->getSqlLimit()
-		);
-		$logs_count = Database::num_rows();
-		$paging->setEntries($logs_count);
+		$paging = new paging($userinfo, $db, TABLE_PANEL_LOG, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
+		$paging->sortfield = 'date';
+		$paging->sortorder = 'desc';
+		$result = $db->query('SELECT * FROM `' . TABLE_PANEL_LOG . '` ' . $paging->getSqlWhere(false) . ' ' . $paging->getSqlOrderBy() . ' ' . $paging->getSqlLimit());
+		$paging->setEntries($db->num_rows($result));
 		$sortcode = $paging->getHtmlSortCode($lng);
 		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
 		$searchcode = $paging->getHtmlSearchCode($lng);
 		$pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s);
 		$clog = array();

-		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-
-			if (!isset($clog[$row['action']])
-				|| !is_array($clog[$row['action']])
-			) {
+		while($row = $db->fetch_array($result))
+		{
+			if(!isset($clog[$row['action']])
+			   || !is_array($clog[$row['action']]))
+			{
 				$clog[$row['action']] = array();
 			}
+
 			$clog[$row['action']][$row['logid']] = $row;
 		}

-		if ($paging->sortfield == 'date'
-			&& $paging->sortorder == 'desc'
-		) {
+		if($paging->sortfield == 'date'
+		   && $paging->sortorder == 'desc')
+		{
 			krsort($clog);
-		} else {
+		}
+		else
+		{
 			ksort($clog);
 		}

@@ -64,69 +72,100 @@ if ($page == 'log'
 		$count = 0;
 		$log_count = 0;
 		$log = '';
-		foreach ($clog as $action => $logrows) {
+		foreach($clog as $action => $logrows)
+		{
 			$_action = 0;
-			foreach ($logrows as $row) {
-				if ($paging->checkDisplay($i)) {
+			foreach($logrows as $row)
+			{
+				if($paging->checkDisplay($i))
+				{
 					$row = htmlentities_array($row);
 					$row['date'] = date("d.m.y H:i:s", $row['date']);

-					if ($_action != $action) {
-						switch ($action) {
+					if($_action != $action)
+					{
+						switch($action)
+						{
 							case USR_ACTION:
 								$_action = $lng['admin']['customer'];
 								break;
 							case RES_ACTION:
-								$_action = $lng['logger']['reseller'];
+								$_action = 'Reseller';
 								break;
 							case ADM_ACTION:
-								$_action = $lng['logger']['admin'];
+								$_action = 'Administrator';
 								break;
 							case CRON_ACTION:
-								$_action = $lng['logger']['cron'];
-								break;
-							case LOGIN_ACTION:
-								$_action = $lng['logger']['login'];
+								$_action = 'Cronjob';
 								break;
 							case LOG_ERROR:
-								$_action = $lng['logger']['intern'];
+								$_action = 'Internal';
 								break;
 							default:
-								$_action = $lng['logger']['unknown'];
+								$_action = 'Unknown';
 								break;
 						}

 						$row['action'] = $_action;
-						eval("\$log.=\"" . getTemplate('logger/logger_action') . "\";");
+						eval("\$log.=\"" . getTemplate("logger/logger_action") . "\";");
 					}

 					$log_count++;
-					$row['type'] = getLogLevelDesc($row['type']);
-					eval("\$log.=\"" . getTemplate('logger/logger_log') . "\";");
+					$type = $row['type'];
+					$_type = 'unknown';
+
+					switch($type)
+					{
+						case LOG_INFO:
+							$_type = 'Information';
+							break;
+						case LOG_NOTICE:
+							$_type = 'Notice';
+							break;
+						case LOG_WARNING:
+							$_type = 'Warning';
+							break;
+						case LOG_ERR:
+							$_type = 'Error';
+							break;
+						case LOG_CRIT:
+							$_type = 'Critical';
+							break;
+						default:
+							$_type = 'Unknown';
+							break;
+					}
+
+					$row['type'] = $_type;
+					eval("\$log.=\"" . getTemplate("logger/logger_log") . "\";");
 					$count++;
 					$_action = $action;
 				}
-				$i++;
 			}
+
 			$i++;
 		}

-		eval("echo \"" . getTemplate('logger/logger') . "\";");
+		eval("echo \"" . getTemplate("logger/logger") . "\";");
+	}
+	elseif($action == 'truncate')
+	{
+		if(isset($_POST['send'])
+		   && $_POST['send'] == 'send')
+		{
+			$yesterday = time() - (60 * 10);

-	} elseif ($action == 'truncate') {
+			/* (60*60*24); */

-		if (isset($_POST['send'])
-		   && $_POST['send'] == 'send'
-		) {
-			$truncatedate = time() - (60 * 10);
-			$trunc_stmt = Database::prepare("
-				DELETE FROM `" . TABLE_PANEL_LOG . "` WHERE `date` < :trunc"
-			);
-			Database::pexecute($trunc_stmt, array('trunc' => $truncatedate));
-			$log->logAction(ADM_ACTION, LOG_WARNING, 'truncated the system-log (mysql)');
-			redirectTo($filename, array('page' => $page, 's' => $s));
-		} else {
+			$db->query("DELETE FROM `" . TABLE_PANEL_LOG . "` WHERE `date` < '" . $yesterday . "'");
+			$log->logAction(ADM_ACTION, LOG_WARNING, "truncated the system-log (mysql)");
+			redirectTo($filename, Array('page' => $page, 's' => $s));
+		}
+		else
+		{
 			ask_yesno('logger_reallytruncate', $filename, array('page' => $page, 'action' => $action), TABLE_PANEL_LOG);
 		}
 	}
 }
+
+?>
--- a/admin_message.php
+++ b/admin_message.php
@@ -14,108 +14,135 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Panel
- *
+ * @version    $Id$
 */

 define('AREA', 'admin');
-require './lib/init.php';

-if (isset($_POST['id'])) {
+/**
+ * Include our init.php, which manages Sessions, Language etc.
+ */
+
+require ("./lib/init.php");
+
+if(isset($_POST['id']))
+{
 	$id = intval($_POST['id']);
-} elseif (isset($_GET['id'])) {
+}
+elseif(isset($_GET['id']))
+{
 	$id = intval($_GET['id']);
 }

-if ($page == 'message') {
-	if ($action == '') {
-		$log->logAction(ADM_ACTION, LOG_NOTICE, 'viewed panel_message');
+if($page == 'message')
+{
+	if($action == '')
+	{
+		$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed panel_message");

-		if (isset($_POST['send'])
-		   && $_POST['send'] == 'send'
-		) {
-			if ($_POST['receipient'] == 0
-			   && $userinfo['customers_see_all'] == '1'
-			) {
-				$log->logAction(ADM_ACTION, LOG_NOTICE, 'sending messages to admins');
-				$result = Database::query('SELECT `name`, `email`  FROM `' . TABLE_PANEL_ADMINS . "`");
-			} elseif ($_POST['receipient'] == 1) {
-				if ($userinfo['customers_see_all'] == '1') {
-					$log->logAction(ADM_ACTION, LOG_NOTICE, 'sending messages to ALL customers');
-					$result = Database::query('SELECT `firstname`, `name`, `company`, `email`  FROM `' . TABLE_PANEL_CUSTOMERS . "`");
-				} else {
-					$log->logAction(ADM_ACTION, LOG_NOTICE, 'sending messages to customers');
-					$result = Database::prepare('
-						SELECT `firstname`, `name`, `company`, `email`  FROM `' . TABLE_PANEL_CUSTOMERS . "`
-						WHERE `adminid` = :adminid"
-					);
-					Database::pexecute($result, array('adminid' => $userinfo['adminid']));
+		if(isset($_POST['send'])
+		   && $_POST['send'] == 'send')
+		{
+			if($_POST['receipient'] == 0
+			   && $userinfo['customers_see_all'] == '1')
+			{
+				$log->logAction(ADM_ACTION, LOG_NOTICE, "sending messages to admins");
+				$result = $db->query('SELECT `name`, `email`  FROM `' . TABLE_PANEL_ADMINS . "`");
+			}
+			elseif($_POST['receipient'] == 1)
+			{
+				if($userinfo['customers_see_all'] == "1")
+				{
+					$log->logAction(ADM_ACTION, LOG_NOTICE, "sending messages to ALL customers");
+					$result = $db->query('SELECT `firstname`, `name`, `email`  FROM `' . TABLE_PANEL_CUSTOMERS . "`");
 				}
-			} else {
+				else
+				{
+					$log->logAction(ADM_ACTION, LOG_NOTICE, "sending messages to customers");
+					$result = $db->query('SELECT `firstname`, `name`, `email`  FROM `' . TABLE_PANEL_CUSTOMERS . "` WHERE `adminid`='" . $userinfo['adminid'] . "'");
+				}
+			}
+			else
+			{
 				standard_error('noreceipientsgiven');
 			}

 			$subject = $_POST['subject'];
 			$message = wordwrap($_POST['message'], 70);

-			if (!empty($message)) {
+			if(!empty($message))
+			{
 				$mailcounter = 0;
 				$mail->Body = $message;
 				$mail->Subject = $subject;

-				while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
-
-					$row['firstname'] = isset($row['firstname']) ? $row['firstname'] : '';
-					$row['company'] = isset($row['company']) ? $row['company'] : '';
-					$mail->AddAddress($row['email'], getCorrectUserSalutation(array('firstname' => $row['firstname'], 'name' => $row['name'], 'company' => $row['company'])));
+				while($row = $db->fetch_array($result))
+				{
+					$mail->AddAddress($row['email'], (isset($row['firstname']) ? $row['firstname'] . ' ' : '') . $row['name']);
 					$mail->From = $userinfo['email'];
 					$mail->FromName = (isset($userinfo['firstname']) ? $userinfo['firstname'] . ' ' : '') . $userinfo['name'];

-					if (!$mail->Send()) {
-						if ($mail->ErrorInfo != '') {
+					if(!$mail->Send())
+					{
+						if($mail->ErrorInfo != '')
+						{
 							$mailerr_msg = $mail->ErrorInfo;
-						} else {
-							$mailerr_msg = $row['email'];
+						}
+						else
+						{
+							$mailerr_msg = $row["email"];
 						}

-						$log->logAction(ADM_ACTION, LOG_ERR, 'Error sending mail: ' . $mailerr_msg);
-						standard_error('errorsendingmail', $row['email']);
+						$log->logAction(ADM_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
+						standard_error('errorsendingmail', $row["email"]);
 					}

 					$mailcounter++;
 					$mail->ClearAddresses();
 				}

-				redirectTo($filename, array('page' => $page, 's' => $s, 'action' => 'showsuccess', 'sentitems' => $mailcounter));
-			} else {
+				redirectTo($filename, Array('page' => $page, 's' => $s, 'action' => 'showsuccess', 'sentitems' => $mailcounter));
+			}
+			else
+			{
 				standard_error('nomessagetosend');
 			}
 		}
 	}

-	if ($action == 'showsuccess') {
-
+	if($action == 'showsuccess')
+	{
 		$success = 1;
 		$sentitems = isset($_GET['sentitems']) ? (int)$_GET['sentitems'] : 0;

-		if ($sentitems == 0) {
+		if($sentitems == 0)
+		{
 			$successmessage = $lng['message']['noreceipients'];
-		} else {
+		}
+		else
+		{
 			$successmessage = str_replace('%s', $sentitems, $lng['message']['success']);
 		}

-	} else {
+		$action = '';
+	}
+	else
+	{
 		$success = 0;
 		$sentitems = 0;
 		$successmessage = '';
+		$action = '';
 	}

-	$action = '';
 	$receipients = '';

-	if ($userinfo['customers_see_all'] == '1') {
+	if($userinfo['customers_see_all'] == "1")
+	{
 		$receipients.= makeoption($lng['panel']['reseller'], 0);
 	}

-	$receipients .= makeoption($lng['panel']['customer'], 1);
-	eval("echo \"" . getTemplate('message/message') . "\";");
+	$receipients.= makeoption($lng['panel']['customer'], 1);
+	eval("echo \"" . getTemplate("message/message") . "\";");
 }
+
+?>
--- a/admin_opcacheinfo.php
+++ b/admin_opcacheinfo.php
@@ -1,158 +0,0 @@
-<?php
-
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2010 the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright  (c) the authors
- * @author     Janos Muzsi <muzsij@hypernics.hu> (2016)
- * @author     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Panel
- *
- * Based on https://github.com/amnuts/opcache-gui
- *
- */
-
-define('AREA', 'admin');
-require './lib/init.php';
-
-
-if ($action == 'reset' &&
-        function_exists('opcache_reset') &&
-        $userinfo['change_serversettings'] == '1'
-) {
-    opcache_reset();
-    $log->logAction(ADM_ACTION, LOG_INFO, "reseted OPcache");
-    header('Location: ' . $linker->getLink(array('section' => 'opcacheinfo', 'page' => 'showinfo')));
-    exit();
-}
-
-if (!function_exists('opcache_get_configuration')
-) {
-    standard_error($lng['error']['no_opcacheinfo']);
-}
-
-if ($page == 'showinfo'
-) {
-    
-    $opcache_info = opcache_get_configuration();
-    $opcache_status = opcache_get_status(false);
-    $time = time();
-    $log->logAction(ADM_ACTION, LOG_NOTICE, "viewed OPcache info");
-    
-    $runtimelines = '';
-    if (isset($opcache_info['directives']) && is_array($opcache_info['directives'])) {
-        foreach ($opcache_info['directives'] as $name => $value) {
-            $linkname=  str_replace('_', '-', $name);
-            if ($name=='opcache.optimization_level' && is_integer($value)) {
-                $value='0x'.dechex($value);
-            }
-            if ($name=='opcache.memory_consumption' && is_integer($value) && $value%(1024*1024)==0) {
-                $value=$value/(1024*1024);
-            }
-            if ($value===null || $value==='') {
-                $value=$lng['opcacheinfo']['novalue'];
-            }
-            if ($value===true) {
-                $value=$lng['opcacheinfo']['true'];
-            }
-            if ($value===false) {
-                $value=$lng['opcacheinfo']['false'];
-            }
-            if (is_integer($value)) {
-                $value=number_format($value,0,'.',' ');
-            }
-            $name=str_replace('_', ' ', $name);
-            eval("\$runtimelines.=\"" . getTemplate("settings/opcacheinfo/runtime_line") . "\";");
-        }
-    }
-    
-    $cachehits=@$opcache_status['opcache_statistics']['hits'] ?: 0;
-    $cachemiss=@$opcache_status['opcache_statistics']['misses'] ?: 0;
-    $blacklistmiss=@$opcache_status['opcache_statistics']['blacklist_misses'] ?: 0;
-    $cachetotal=$cachehits+$cachemiss+$blacklistmiss;
-    
-    $general=array(
-        'version' => (isset($opcache_info['version']['opcache_product_name']) ? $opcache_info['version']['opcache_product_name'].' ' : '').$opcache_info['version']['version'],
-        'phpversion' => phpversion(),
-        'start_time'         => @$opcache_status['opcache_statistics']['start_time'] ? date('Y-m-d H:i:s',$opcache_status['opcache_statistics']['start_time']) : '',
-        'last_restart_time'  => @$opcache_status['opcache_statistics']['last_restart_time'] ? date('Y-m-d H:i:s',$opcache_status['opcache_statistics']['last_restart_time']) : $lng['opcacheinfo']['never'],
-        'oom_restarts' => number_format(@$opcache_status['opcache_statistics']['oom_restarts'] ?: 0,0,'.',' '),
-        'hash_restarts' => number_format(@$opcache_status['opcache_statistics']['hash_restarts'] ?: 0,0,'.',' '),
-        'manual_restarts' => number_format(@$opcache_status['opcache_statistics']['manual_restarts'] ?: 0,0,'.',' '),
-        'status' => (@$opcache_status['restart_in_progress'] ? $lng['opcacheinfo']['restartinprogress'] :
-            (@$opcache_status['restart_pending'] ? $lng['opcacheinfo']['restartpending'] :
-            (@$opcache_status['cache_full'] ? $lng['opcacheinfo']['cachefull'] :
-            (@$opcache_status['opcache_enabled'] ? $lng['opcacheinfo']['enabled'] : $lng['opcacheinfo']['novalue'])))),
-        'cachedscripts' => number_format(@$opcache_status['opcache_statistics']['num_cached_scripts'] ?: 0,0,'.',' '),
-        'cachehits' => number_format($cachehits,0,'.',' ') . ($cachetotal>0 ? sprintf(" (%.1f %%)", $cachehits/($cachetotal)*100) : ''),
-        'cachemiss' => number_format($cachemiss,0,'.',' ') . ($cachetotal>0 ? sprintf(" (%.1f %%)", $cachemiss/($cachetotal)*100) : ''),
-        'blacklistmiss' => number_format($blacklistmiss,0,'.',' ') . ($cachetotal>0 ? sprintf(" (%.1f %%)", $blacklistmiss/($cachetotal)*100) : ''),
-    );
-    
-    $usedmem=@$opcache_status['memory_usage']['used_memory'] ?: 0;
-    $usedmemstr=bsize($usedmem);
-    $freemem=@$opcache_status['memory_usage']['free_memory'] ?: 0;
-    $freememstr=bsize($freemem);
-    $totalmem=$usedmem+$freemem;
-    $wastedmem=@$opcache_status['memory_usage']['wasted_memory'] ?: 0;
-    $wastedmemstr=bsize($wastedmem);
-    if ($totalmem) {
-        $memory=array(
-            'total' => bsize($totalmem),
-            'used' => $usedmemstr . ($totalmem>0 ? sprintf(" (%.1f %%)", $usedmem/($totalmem)*100) : ''),
-            'free' => $freememstr . ($totalmem>0 ? sprintf(" (%.1f %%)", $freemem/($totalmem)*100) : ''),
-            'wasted' => $wastedmemstr . ($totalmem>0 ? sprintf(" (%.1f %%)", $wastedmem/($totalmem)*100) : ''),
-        );
-    }
-    
-    if (isset($opcache_status['interned_strings_usage'])) {
-        $usedstring=@$opcache_status['interned_strings_usage']['used_memory'] ?: 0;
-        $usedstringstr=bsize($usedstring);
-        $freestring=@$opcache_status['interned_strings_usage']['free_memory'] ?: 0;
-        $freestringstr=bsize($freestring);
-        $totalstring=$usedstring+$freestring;
-        $stringbuffer=array(
-            'total' => bsize($totalstring),
-            'used' => $usedstringstr . ($totalstring>0 ? sprintf(" (%.1f %%)", $usedstring/$totalstring*100) : ''),
-            'free' => $freestringstr . ($totalstring>0 ? sprintf(" (%.1f %%)", $freestring/$totalstring*100) : ''),
-            'strcount' => number_format(@$opcache_status['interned_strings_usage']['number_of_strings'] ?: 0,0,'.',' '),
-        );
-    }
-
-    $usedkey=@$opcache_status['opcache_statistics']['num_cached_keys'] ?: 0;
-    $usedkeystr=number_format($usedkey,0,'.',' ');
-    $totalkey=@$opcache_status['opcache_statistics']['max_cached_keys'] ?: 0;
-    $wastedkey=$usedkey - (@$opcache_status['opcache_statistics']['num_cached_scripts'] ?: 0);
-    if (isset($opcache_status['opcache_statistics'])) {
-        $keystat=array(
-            'total' => number_format($totalkey,0,'.',' '),
-            'used' => $usedkeystr . ($totalkey>0 ? sprintf(" (%.1f %%)", $usedkey/($totalkey)*100) : ''),
-            'wasted' => number_format($wastedkey,0,'.',' ') . ($totalkey>0 ? sprintf(" (%.1f %%)", $wastedkey/($totalkey)*100) : ''),
-        );
-    }
-    
-    $blacklistlines = '';
-    if (isset($opcache_info['blacklist']) && is_array($opcache_info['blacklist'])) {
-        foreach ($opcache_info['blacklist'] as $value) {
-            eval("\$blacklistlines.=\"" . getTemplate("settings/opcacheinfo/blacklist_line") . "\";");
-        }
-    }
-    
-    eval("echo \"" . getTemplate("settings/opcacheinfo/showinfo") . "\";");
-    
-}
-
-function bsize($s) {
-    foreach (array('', 'K', 'M', 'G') as $i => $k) {
-        if ($s < 1024)
-            break;
-        $s/=1024;
-    }
-    return sprintf("%5.1f %sBytes", $s, $k);
-}
--- a/admin_phpsettings.php
+++ b/admin_phpsettings.php
@@ -14,85 +14,60 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Panel
- *
+ * @version    $Id$
 */

 define('AREA', 'admin');
-require './lib/init.php';

-if (isset($_POST['id'])) {
+/**
+ * Include our init.php, which manages Sessions, Language etc.
+ */
+
+require ("./lib/init.php");
+
+if(isset($_POST['id']))
+{
 	$id = intval($_POST['id']);
-} elseif (isset($_GET['id'])) {
+}
+elseif(isset($_GET['id']))
+{
 	$id = intval($_GET['id']);
 }

-if ($page == 'overview') {
-
-	if ($action == '') {
-
+if($page == 'overview')
+{
+	if($action == '')
+	{
 		$tablecontent = '';
-		$count = 0;
-		$result = Database::query("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "`");
-
-		while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
+		$result = $db->query("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "`");

+		while($row = $db->fetch_array($result))
+		{
 			$domainresult = false;
-			$query_params = array('id' => $row['id']);

-			$query = "SELECT * FROM `".TABLE_PANEL_DOMAINS."`
-					WHERE `phpsettingid` = :id
-					AND `parentdomainid` = '0'";
-
-			if ((int)$userinfo['domains_see_all'] == 0) {
-				$query .= " AND `adminid` = :adminid";
-				$query_params['adminid'] = $userinfo['adminid'];
+			if((int)$userinfo['domains_see_all'] == 0)
+			{
+				$domainresult = $db->query("SELECT * FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `adminid` = " . (int)$userinfo['userid'] . " AND `phpsettingid` = " . (int)$row['id']);
 			}
-
-			if ((int)Settings::Get('panel.phpconfigs_hidestdsubdomain') == 1) {
-				$ssdids_res = Database::query("
-					SELECT DISTINCT `standardsubdomain` FROM `".TABLE_PANEL_CUSTOMERS."`
-					WHERE `standardsubdomain` > 0 ORDER BY `standardsubdomain` ASC;"
-				);
-				$ssdids = array();
-				while ($ssd = $ssdids_res->fetch(PDO::FETCH_ASSOC)) {
-					$ssdids[] = $ssd['standardsubdomain'];
-				}
-				if (count($ssdids) > 0) {
-					$query .= " AND `id` NOT IN (".implode(', ', $ssdids).")";
-				}
+			else
+			{
+				$domainresult = $db->query("SELECT * FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `phpsettingid` = " . (int)$row['id']);
 			}

-			$domainresult_stmt = Database::prepare($query);
-			Database::pexecute($domainresult_stmt, $query_params);
-
 			$domains = '';
-			if (Database::num_rows() > 0) {
-				while ($row2 = $domainresult_stmt->fetch(PDO::FETCH_ASSOC)) {
+
+			if($db->num_rows($domainresult) > 0)
+			{
+				while($row2 = $db->fetch_array($domainresult))
+				{
 					$domains.= $row2['domain'] . '<br/>';
 				}
 			}
-
-			// check whether we use that config as froxor-vhost config
-			if (Settings::Get('system.mod_fcgid_defaultini_ownvhost') == $row['id']
-				|| Settings::Get('phpfpm.vhost_defaultini') == $row['id']
-			) {
-				$domains .= Settings::Get('system.hostname');
-			}
-
-			if ($domains == '') {
+			else
+			{
 				$domains = $lng['admin']['phpsettings']['notused'];
 			}

-			// check whether this is our default config
-			if ((Settings::Get('system.mod_fcgid') == '1'
-				&& Settings::Get('system.mod_fcgid_defaultini') == $row['id'])
-				|| (Settings::Get('phpfpm.enabled') == '1'
-				&& Settings::Get('phpfpm.defaultini') == $row['id'])
-			) {
-				$row['description'] = '<b>'.$row['description'].'</b>';
-			}
-
-			$count ++;
 			eval("\$tablecontent.=\"" . getTemplate("phpconfig/overview_overview") . "\";");
 		}

@@ -100,245 +75,111 @@ if ($page == 'overview') {
 		eval("echo \"" . getTemplate("phpconfig/overview") . "\";");
 	}

-	if ($action == 'add') {
-
-		if ((int)$userinfo['change_serversettings'] == 1) {
-
-			if (isset($_POST['send'])
-				&& $_POST['send'] == 'send'
-			) {
+	if($action == 'add')
+	{
+		if((int)$userinfo['change_serversettings'] == 1)
+		{
+			if(isset($_POST['send'])
+			   && $_POST['send'] == 'send')
+			{
 				$description = validate($_POST['description'], 'description');
+				$binary = makeCorrectFile(validate($_POST['binary'], 'binary'));
+				$file_extensions = validate($_POST['file_extensions'], 'file_extensions', '/^[a-zA-Z0-9\s]*$/');
 				$phpsettings = validate(str_replace("\r\n", "\n", $_POST['phpsettings']), 'phpsettings', '/^[^\0]*$/');
+				$mod_fcgid_starter = validate($_POST['mod_fcgid_starter'], 'mod_fcgid_starter', '/^[0-9]*$/', '', array('-1', ''));
+				$mod_fcgid_maxrequests = validate($_POST['mod_fcgid_maxrequests'], 'mod_fcgid_maxrequests', '/^[0-9]*$/', '', array('-1', ''));

-				if (Settings::Get('system.mod_fcgid') == 1) {
-					$binary = makeCorrectFile(validate($_POST['binary'], 'binary'));
-					$file_extensions = validate($_POST['file_extensions'], 'file_extensions', '/^[a-zA-Z0-9\s]*$/');
-					$mod_fcgid_starter = validate($_POST['mod_fcgid_starter'], 'mod_fcgid_starter', '/^[0-9]*$/', '', array('-1', ''));
-					$mod_fcgid_maxrequests = validate($_POST['mod_fcgid_maxrequests'], 'mod_fcgid_maxrequests', '/^[0-9]*$/', '', array('-1', ''));
-					$mod_fcgid_umask = validate($_POST['mod_fcgid_umask'], 'mod_fcgid_umask', '/^[0-9]*$/');
-					// disable fpm stuff
-					$fpm_enableslowlog = 0;
-					$fpm_reqtermtimeout = 0;
-					$fpm_reqslowtimeout = 0;
-				}
-				elseif (Settings::Get('phpfpm.enabled') == 1) {
-					$fpm_enableslowlog = isset($_POST['phpfpm_enable_slowlog']) ? (int)$_POST['phpfpm_enable_slowlog'] : 0;
-					$fpm_reqtermtimeout = validate($_POST['phpfpm_reqtermtimeout'], 'phpfpm_reqtermtimeout', '/^([0-9]+)(|s|m|h|d)$/');
-					$fpm_reqslowtimeout = validate($_POST['phpfpm_reqslowtimeout'], 'phpfpm_reqslowtimeout', '/^([0-9]+)(|s|m|h|d)$/');
-					// disable fcgid stuff
-					$binary = '/usr/bin/php-cgi';
-					$file_extensions = 'php';
-					$mod_fcgid_starter = 0;
-					$mod_fcgid_maxrequests = 0;
-					$mod_fcgid_umask = "022";
-				}
-
-				if (strlen($description) == 0
-					|| strlen($description) > 50
-				) {
+				if(strlen($description) == 0
+				   || strlen($description) > 50)
+				{
 					standard_error('descriptioninvalid');
 				}

-				$ins_stmt = Database::prepare("
-					INSERT INTO `" . TABLE_PANEL_PHPCONFIGS . "` SET
-						`description` = :desc,
-						`binary` = :binary,
-						`file_extensions` = :fext,
-						`mod_fcgid_starter` = :starter,
-						`mod_fcgid_maxrequests` = :mreq,
-						`mod_fcgid_umask` = :umask,
-						`fpm_slowlog` = :fpmslow,
-						`fpm_reqterm` = :fpmreqterm,
-						`fpm_reqslow` = :fpmreqslow,
-						`phpsettings` = :phpsettings"
-				);
-				$ins_data = array(
-					'desc' => $description,
-					'binary' => $binary,
-					'fext' => $file_extensions,
-					'starter' => $mod_fcgid_starter,
-					'mreq' => $mod_fcgid_maxrequests,
-					'umask' => $mod_fcgid_umask,
-					'fpmslow' => $fpm_enableslowlog,
-					'fpmreqterm' => $fpm_reqtermtimeout,
-					'fpmreqslow' => $fpm_reqslowtimeout,
-					'phpsettings' => $phpsettings
-				);
-				Database::pexecute($ins_stmt, $ins_data);
-
+				$db->query("INSERT INTO `" . TABLE_PANEL_PHPCONFIGS . "` SET `description` = '" . $db->escape($description) . "', `binary` = '" . $db->escape($binary) . "', `file_extensions` = '" . $db->escape($file_extensions) . "', `mod_fcgid_starter` = '" . $db->escape($mod_fcgid_starter) . "', `mod_fcgid_maxrequests` = '" . $db->escape($mod_fcgid_maxrequests) . "', `phpsettings` = '" . $db->escape($phpsettings) . "'");
 				inserttask('1');
-				$log->logAction(ADM_ACTION, LOG_INFO, "php.ini setting with description '" . $description . "' has been created by '" . $userinfo['loginname'] . "'");
-				redirectTo($filename, array('page' => $page, 's' => $s));
-
-			} else {
-
-				$result_stmt = Database::query("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = 1");
-				$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
-
-				$phpconfig_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/phpconfig/formfield.phpconfig_add.php';
-				$phpconfig_add_form = htmlform::genHTMLForm($phpconfig_add_data);
-
-				$title = $phpconfig_add_data['phpconfig_add']['title'];
-				$image = $phpconfig_add_data['phpconfig_add']['image'];
-
+				$log->logAction(ADM_ACTION, LOG_INFO, "php.ini setting with description '" . $value . "' has been created by '" . $userinfo['loginname'] . "'");
+				redirectTo($filename, Array('page' => $page, 's' => $s));
+			}
+			else
+			{
+				$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = 1");
 				eval("echo \"" . getTemplate("phpconfig/overview_add") . "\";");
 			}
-
-		} else {
+		}
+		else
+		{
 			standard_error('nopermissionsorinvalidid');
 		}
 	}

-	if ($action == 'delete') {
-
-		$result_stmt = Database::prepare("
-			SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = :id"
-		);
-		$result = Database::pexecute_first($result_stmt, array('id' => $id));
-
-		if ((Settings::Get('system.mod_fcgid') == '1'
-			&& Settings::Get('system.mod_fcgid_defaultini_ownvhost') == $id)
-			|| (Settings::Get('phpfpm.enabled') == '1'
-			&& Settings::Get('phpfpm.vhost_defaultini') == $id)
-		) {
-			standard_error('cannotdeletehostnamephpconfig');
-		}
-
-		if ((Settings::Get('system.mod_fcgid') == '1'
-			&& Settings::Get('system.mod_fcgid_defaultini') == $id)
-			|| (Settings::Get('phpfpm.enabled') == '1'
-			&& Settings::Get('phpfpm.defaultini') == $id)
-		) {
-			standard_error('cannotdeletedefaultphpconfig');
-		}
-
-		if ($result['id'] != 0
-			&& $result['id'] == $id
-			&& (int)$userinfo['change_serversettings'] == 1
-			&& $id != 1 // cannot delete the default php.config
-		) {
-
-			if (isset($_POST['send'])
-				&& $_POST['send'] == 'send'
-			) {
-				// set php-config to default for all domains using the
-				// config that is to be deleted
-				$upd_stmt = Database::prepare("
-					UPDATE `" . TABLE_PANEL_DOMAINS . "` SET
-					`phpsettingid` = '1' WHERE `phpsettingid` = :id"
-				);
-				Database::pexecute($upd_stmt, array('id' => $id));
-
-				$del_stmt = Database::prepare("
-					DELETE FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = :id"
-				);
-				Database::pexecute($del_stmt, array('id' => $id));
+	if($action == 'delete')
+	{
+		$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = " . (int)$id);

+		if($result['id'] != 0
+		   && $result['id'] == $id
+		   && (int)$userinfo['change_serversettings'] == 1
+		   && $id != 1)
+		{
+			if(isset($_POST['send'])
+			   && $_POST['send'] == 'send')
+			{
+				$db->query("UPDATE `" . TABLE_PANEL_DOMAINS . "` SET `phpsettingid` = 1 WHERE `phpsettingid` = " . (int)$id);
+				$db->query("DELETE FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = " . (int)$id);
 				inserttask('1');
 				$log->logAction(ADM_ACTION, LOG_INFO, "php.ini setting with id #" . (int)$id . " has been deleted by '" . $userinfo['loginname'] . "'");
-				redirectTo($filename, array('page' => $page, 's' => $s));
-
-			} else {
+				redirectTo($filename, Array('page' => $page, 's' => $s));
+			}
+			else
+			{
 				ask_yesno('phpsetting_reallydelete', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $result['description']);
 			}
-		} else {
+		}
+		else
+		{
 			standard_error('nopermissionsorinvalidid');
 		}
 	}

-	if ($action == 'edit') {
+	if($action == 'edit')
+	{
+		$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = " . (int)$id);

-		$result_stmt = Database::prepare("
-			SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = :id"
-		);
-		$result = Database::pexecute_first($result_stmt, array('id' => $id));
-
-		if ($result['id'] != 0
-			&& $result['id'] == $id
-			&& (int)$userinfo['change_serversettings'] == 1
-		) {
-
-			if (isset($_POST['send'])
-				&& $_POST['send'] == 'send'
-			) {
+		if($result['id'] != 0
+		   && $result['id'] == $id
+		   && (int)$userinfo['change_serversettings'] == 1)
+		{
+			if(isset($_POST['send'])
+			   && $_POST['send'] == 'send')
+			{
 				$description = validate($_POST['description'], 'description');
+				$binary = makeCorrectFile(validate($_POST['binary'], 'binary'));
+				$file_extensions = validate($_POST['file_extensions'], 'file_extensions', '/^[a-zA-Z0-9\s]*$/');
 				$phpsettings = validate(str_replace("\r\n", "\n", $_POST['phpsettings']), 'phpsettings', '/^[^\0]*$/');
+				$mod_fcgid_starter = validate($_POST['mod_fcgid_starter'], 'mod_fcgid_starter', '/^[0-9]*$/', '', array('-1', ''));
+				$mod_fcgid_maxrequests = validate($_POST['mod_fcgid_maxrequests'], 'mod_fcgid_maxrequests', '/^[0-9]*$/', '', array('-1', ''));

-				if (Settings::Get('system.mod_fcgid') == 1) {
-					$binary = makeCorrectFile(validate($_POST['binary'], 'binary'));
-					$file_extensions = validate($_POST['file_extensions'], 'file_extensions', '/^[a-zA-Z0-9\s]*$/');
-					$mod_fcgid_starter = validate($_POST['mod_fcgid_starter'], 'mod_fcgid_starter', '/^[0-9]*$/', '', array('-1', ''));
-					$mod_fcgid_maxrequests = validate($_POST['mod_fcgid_maxrequests'], 'mod_fcgid_maxrequests', '/^[0-9]*$/', '', array('-1', ''));
-					$mod_fcgid_umask = validate($_POST['mod_fcgid_umask'], 'mod_fcgid_umask', '/^[0-9]*$/');
-					// disable fpm stuff
-					$fpm_enableslowlog = 0;
-					$fpm_reqtermtimeout = 0;
-					$fpm_reqslowtimeout = 0;
-				}
-				elseif (Settings::Get('phpfpm.enabled') == 1) {
-					$fpm_enableslowlog = isset($_POST['phpfpm_enable_slowlog']) ? (int)$_POST['phpfpm_enable_slowlog'] : 0;
-					$fpm_reqtermtimeout = validate($_POST['phpfpm_reqtermtimeout'], 'phpfpm_reqtermtimeout', '/^([0-9]+)(|s|m|h|d)$/');
-					$fpm_reqslowtimeout = validate($_POST['phpfpm_reqslowtimeout'], 'phpfpm_reqslowtimeout', '/^([0-9]+)(|s|m|h|d)$/');
-					// disable fcgid stuff
-					$binary = '/usr/bin/php-cgi';
-					$file_extensions = 'php';
-					$mod_fcgid_starter = 0;
-					$mod_fcgid_maxrequests = 0;
-					$mod_fcgid_umask = "022";
-				}
-
-				if (strlen($description) == 0
-					|| strlen($description) > 50
-				) {
+				if(strlen($description) == 0
+				   || strlen($description) > 50)
+				{
 					standard_error('descriptioninvalid');
 				}

-				$upd_stmt = Database::prepare("
-					UPDATE `" . TABLE_PANEL_PHPCONFIGS . "` SET
-						`description` = :desc,
-						`binary` = :binary,
-						`file_extensions` = :fext,
-						`mod_fcgid_starter` = :starter,
-						`mod_fcgid_maxrequests` = :mreq,
-						`mod_fcgid_umask` = :umask,
-						`fpm_slowlog` = :fpmslow,
-						`fpm_reqterm` = :fpmreqterm,
-						`fpm_reqslow` = :fpmreqslow,
-						`phpsettings` = :phpsettings
-					WHERE `id` = :id"
-				);
-				$upd_data = array(
-						'desc' => $description,
-						'binary' => $binary,
-						'fext' => $file_extensions,
-						'starter' => $mod_fcgid_starter,
-						'mreq' => $mod_fcgid_maxrequests,
-						'umask' => $mod_fcgid_umask,
-						'fpmslow' => $fpm_enableslowlog,
-						'fpmreqterm' => $fpm_reqtermtimeout,
-						'fpmreqslow' => $fpm_reqslowtimeout,
-						'phpsettings' => $phpsettings,
-						'id' => $id
-				);
-				Database::pexecute($upd_stmt, $upd_data);
-
+				$db->query("UPDATE `" . TABLE_PANEL_PHPCONFIGS . "` SET `description` = '" . $db->escape($description) . "', `binary` = '" . $db->escape($binary) . "', `file_extensions` = '" . $db->escape($file_extensions) . "', `mod_fcgid_starter` = '" . $db->escape($mod_fcgid_starter) . "', `mod_fcgid_maxrequests` = '" . $db->escape($mod_fcgid_maxrequests) . "', `phpsettings` = '" . $db->escape($phpsettings) . "' WHERE `id` = " . (int)$id);
 				inserttask('1');
 				$log->logAction(ADM_ACTION, LOG_INFO, "php.ini setting with description '" . $description . "' has been changed by '" . $userinfo['loginname'] . "'");
-				redirectTo($filename, array('page' => $page, 's' => $s));
-
-			} else {
-
-				$phpconfig_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php';
-				$phpconfig_edit_form = htmlform::genHTMLForm($phpconfig_edit_data);
-
-				$title = $phpconfig_edit_data['phpconfig_edit']['title'];
-				$image = $phpconfig_edit_data['phpconfig_edit']['image'];
-
+				redirectTo($filename, Array('page' => $page, 's' => $s));
+			}
+			else
+			{
 				eval("echo \"" . getTemplate("phpconfig/overview_edit") . "\";");
 			}
-
-		} else {
+		}
+		else
+		{
 			standard_error('nopermissionsorinvalidid');
 		}
 	}
 }
+
+?>
--- a/admin_settings.php
+++ b/admin_settings.php
@@ -14,277 +14,148 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Panel
- *
+ * @version    $Id$
 */

 define('AREA', 'admin');
-require './lib/init.php';

-// get sql-root access data
-Database::needRoot(true);
-Database::needSqlData();
-$sql_root = Database::getSqlData();
-Database::needRoot(false);
+/**
+ * Include our init.php, which manages Sessions, Language etc.
+ */

-if ($page == 'overview' && $userinfo['change_serversettings'] == '1') {
+$need_db_sql_data = true;
+$need_root_db_sql_data = true;
+require ("./lib/init.php");
+
+if(($page == 'settings' || $page == 'overview')
+   && $userinfo['change_serversettings'] == '1')
+{
 	$settings_data = loadConfigArrayDir('./actions/admin/settings/');
-	$settings = loadSettings($settings_data);
-
-	if (isset($_POST['send'])
-		&& $_POST['send'] == 'send'
-	) {
-
-		$_part = isset($_GET['part']) ? $_GET['part'] : '';
-		if ($_part == '') {
-			$_part = isset($_POST['part']) ? $_POST['part'] : '';
-		}
-
-		if ($_part != '') {
-			if ($_part == 'all') {
-				$settings_all = true;
-				$settings_part = false;
-			} else {
-				$settings_all = false;
-				$settings_part = true;
-			}
-			$only_enabledisable = false;
-
-		} else {
-			$settings_all = false;
-			$settings_part = false;
-			$only_enabledisable = true;
-		}
-		
-		// check if the session timeout is too low #815
-		if (isset($_POST['session_sessiontimeout'])
-			&& $_POST['session_sessiontimeout'] < 60
-		) {
-			standard_error($lng['error']['session_timeout'], $lng['error']['session_timeout_desc']);
-		}
-
-		if (processFormEx(
-			$settings_data,
-			$_POST,
-			array('filename' => $filename, 'action' => $action, 'page' => $page),
-			$_part,
-			$settings_all,
-			$settings_part,
-			$only_enabledisable
-			)
-		) {
-			$log->logAction(ADM_ACTION, LOG_INFO, "rebuild configfiles due to changed setting");
-			inserttask('1');
-			// Using nameserver, insert a task which rebuilds the server config
-			inserttask('4');
-
+	$settings = loadSettings(&$settings_data, &$db);
+	
+	if(isset($_POST['send'])
+	   && $_POST['send'] == 'send')
+	{
+		if(processForm(&$settings_data, &$_POST, array('filename' => $filename, 'action' => $action, 'page' => $page)))
+		{
 			standard_success('settingssaved', '', array('filename' => $filename, 'action' => $action, 'page' => $page));
 		}
-
-	} else {
-
-		$_part = isset($_GET['part']) ? $_GET['part'] : '';
-		if ($_part == '') {
-			$_part = isset($_POST['part']) ? $_POST['part'] : '';
-		}
-
-		$fields = buildFormEx($settings_data, $_part);
-
-		$settings_page = '';
-		if ($_part == '') {
-			eval("\$settings_page .= \"" . getTemplate("settings/settings_overview") . "\";");
-		} else {
-			eval("\$settings_page .= \"" . getTemplate("settings/settings") . "\";");
-		}
-
-		eval("echo \"" . getTemplate("settings/settings_form_begin") . "\";");
-		eval("echo \$settings_page;");
-		eval("echo \"" . getTemplate("settings/settings_form_end") . "\";");
-
 	}
-
-} elseif($page == 'phpinfo'
-	&& $userinfo['change_serversettings'] == '1'
-) {
-	ob_start();
-	phpinfo();
-	$phpinfo = array('phpinfo' => array());
-	if (preg_match_all(
-			'#(?:<h2>(?:<a name=".*?">)?(.*?)(?:</a>)?</h2>)|(?:<tr(?: class=".*?")?><t[hd](?: class=".*?")?>(.*?)\s*</t[hd]>(?:<t[hd](?: class=".*?")?>(.*?)\s*</t[hd]>(?:<t[hd](?: class=".*?")?>(.*?)\s*</t[hd]>)?)?</tr>)#s',
-			ob_get_clean(), $matches, PREG_SET_ORDER
-		)
-	) {
-		foreach ($matches as $match) {
-			$end = array_keys($phpinfo);
-			$end = end($end);
-			if (strlen($match[1])) {
-				$phpinfo[$match[1]] = array();
-			} elseif (isset($match[3])) {
-				$phpinfo[$end][$match[2]] = isset($match[4]) ? array($match[3], $match[4]) : $match[3];
-			} else {
-				$phpinfo[$end][] = $match[2];
-			}
-		}
-		$phpinfohtml = '';
-		foreach ($phpinfo as $name => $section) {
-			$phpinfoentries = "";
-			foreach ($section as $key => $val) {
-				if (is_array($val)) {
-					eval("\$phpinfoentries .= \"" . getTemplate("settings/phpinfo/phpinfo_3") . "\";");
-				} elseif (is_string($key)) {
-					eval("\$phpinfoentries .= \"" . getTemplate("settings/phpinfo/phpinfo_2") . "\";");
-				} else {
-					eval("\$phpinfoentries .= \"" . getTemplate("settings/phpinfo/phpinfo_1") . "\";");
-				}
-			}
-			// first header -> show actual php version
-			if (strtolower($name) == "phpinfo") {
-				$name = "PHP ".PHP_VERSION;
-			}
-			eval("\$phpinfohtml .= \"" . getTemplate("settings/phpinfo/phpinfo_table") . "\";");
-		}
-		$phpinfo = $phpinfohtml;
-	} else {
-		standard_error($lng['error']['no_phpinfo']);
+	else
+	{
+		$fields = buildForm(&$settings_data);
+		eval("echo \"" . getTemplate("settings/settings") . "\";");
 	}
-	eval("echo \"" . getTemplate("settings/phpinfo") . "\";");
-
-} elseif($page == 'rebuildconfigs'
-	&& $userinfo['change_serversettings'] == '1'
-) {
-	if (isset($_POST['send'])
-		&& $_POST['send'] == 'send'
-	) {
-
+}
+elseif($page == 'rebuildconfigs'
+       && $userinfo['change_serversettings'] == '1')
+{
+	if(isset($_POST['send'])
+	   && $_POST['send'] == 'send')
+	{
 		$log->logAction(ADM_ACTION, LOG_INFO, "rebuild configfiles");
 		inserttask('1');
-		inserttask('10');
-		// Using nameserver, insert a task which rebuilds the server config
 		inserttask('4');
-
-		standard_success('rebuildingconfigs', '', array('filename' => 'admin_index.php'));
-
-	} else {
+		inserttask('5');
+		redirectTo('admin_index.php', array('s' => $s));
+	}
+	else
+	{
 		ask_yesno('admin_configs_reallyrebuild', $filename, array('page' => $page));
 	}
-
-} elseif($page == 'updatecounters'
-	&& $userinfo['change_serversettings'] == '1'
-) {
-
-	if (isset($_POST['send'])
-		&& $_POST['send'] == 'send'
-	) {
-
+}
+elseif($page == 'updatecounters'
+       && $userinfo['change_serversettings'] == '1')
+{
+	if(isset($_POST['send'])
+	   && $_POST['send'] == 'send')
+	{
 		$log->logAction(ADM_ACTION, LOG_INFO, "updated resource-counters");
 		$updatecounters = updateCounters(true);
 		$customers = '';
-		foreach ($updatecounters['customers'] as $customerid => $customer) {
+		foreach($updatecounters['customers'] as $customerid => $customer)
+		{
 			eval("\$customers.=\"" . getTemplate("settings/updatecounters_row_customer") . "\";");
 		}

 		$admins = '';
-		foreach ($updatecounters['admins'] as $adminid => $admin) {
+		foreach($updatecounters['admins'] as $adminid => $admin)
+		{
 			eval("\$admins.=\"" . getTemplate("settings/updatecounters_row_admin") . "\";");
 		}

 		eval("echo \"" . getTemplate("settings/updatecounters") . "\";");
-
-	} else {
+	}
+	else
+	{
 		ask_yesno('admin_counters_reallyupdate', $filename, array('page' => $page));
 	}
-
-} elseif ($page == 'wipecleartextmailpws'
-	&& $userinfo['change_serversettings'] == '1'
-) {
-
-	if (isset($_POST['send'])
-		&& $_POST['send'] == 'send'
-	) {
-
+}
+elseif($page == 'wipecleartextmailpws'
+       && $userinfo['change_serversettings'] == '1')
+{
+	if(isset($_POST['send'])
+	   && $_POST['send'] == 'send')
+	{
 		$log->logAction(ADM_ACTION, LOG_WARNING, "wiped all cleartext mail passwords");
-		Database::query("UPDATE `" . TABLE_MAIL_USERS . "` SET `password` = '';");
-		Database::query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '0' WHERE `settinggroup` = 'system' AND `varname` = 'mailpwcleartext'");
-		redirectTo($filename, array('s' => $s));
-
-	} else {
+		$db->query("UPDATE `" . TABLE_MAIL_USERS . "` SET `password`='' ");
+		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='0' WHERE `settinggroup`='system' AND `varname`='mailpwcleartext'");
+		redirectTo('admin_settings.php', array('s' => $s));
+	}
+	else
+	{
 		ask_yesno('admin_cleartextmailpws_reallywipe', $filename, array('page' => $page));
 	}
-
-} elseif($page == 'wipequotas'
-	&& $userinfo['change_serversettings'] == '1'
-) {
-
-	if (isset($_POST['send'])
-		&& $_POST['send'] == 'send'
-	) {
-
+}
+elseif($page == 'wipequotas'
+       && $userinfo['change_serversettings'] == '1')
+{
+	if(isset($_POST['send'])
+	   && $_POST['send'] == 'send')
+	{
 		$log->logAction(ADM_ACTION, LOG_WARNING, "wiped all mailquotas");

 		// Set the quota to 0 which means unlimited
-		Database::query("UPDATE `" . TABLE_MAIL_USERS . "` SET `quota` = '0';");
-		Database::query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `email_quota_used` = '0'");
-		redirectTo($filename, array('s' => $s));

-	} else {
+		$db->query("UPDATE `" . TABLE_MAIL_USERS . "` SET `quota`='0' ");
+		$db->query("UPDATE " . TABLE_PANEL_CUSTOMERS . " SET `email_quota_used` = 0");
+		redirectTo('admin_settings.php', array('s' => $s));
+	}
+	else
+	{
 		ask_yesno('admin_quotas_reallywipe', $filename, array('page' => $page));
 	}
-
-} elseif ($page == 'enforcequotas'
-	&& $userinfo['change_serversettings'] == '1'
-) {
-	if (isset($_POST['send'])
-		&& $_POST['send'] == 'send'
-	) {
+}
+elseif($page == 'enforcequotas'
+       && $userinfo['change_serversettings'] == '1')
+{
+	if(isset($_POST['send'])
+	   && $_POST['send'] == 'send')
+	{
 		// Fetch all accounts
-		$result_stmt = Database::query("SELECT `quota`, `customerid` FROM `" . TABLE_MAIL_USERS . "`");

-		if (Database::num_rows() > 0) {
+		$result = $db->query("SELECT `quota`, `customerid` FROM " . TABLE_MAIL_USERS);

-			$upd_stmt = Database::prepare("
-				UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET
-				`email_quota_used` = `email_quota_used` + :diff
-				WHERE `customerid` = :customerid
-			");
-
-			while ($array = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-				$difference = Settings::Get('system.mail_quota') - $array['quota'];
-				Database::pexecute($upd_stmt, array('diff' => $difference, 'customerid' => $customerid));
-			}
+		while($array = $db->fetch_array($result))
+		{
+			$difference = $settings['system']['mail_quota'] - $array['quota'];
+			$db->query("UPDATE " . TABLE_PANEL_CUSTOMERS . " SET `email_quota_used` = `email_quota_used` + " . (int)$difference . " WHERE `customerid` = '" . $array['customerid'] . "'");
 		}

 		// Set the new quota
-		$upd_stmt = Database::prepare("
-			UPDATE `" . TABLE_MAIL_USERS . "` SET `quota` = :quota
-		");
-		Database::pexecute($upd_stmt, array('quota' => Settings::Get('system.mail_quota')));
+
+		$db->query("UPDATE `" . TABLE_MAIL_USERS . "` SET `quota`='" . $settings['system']['mail_quota'] . "'");

 		// Update the Customer, if the used quota is bigger than the allowed quota
-		Database::query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `email_quota` = `email_quota_used` WHERE `email_quota` < `email_quota_used`");
-		$log->logAction(ADM_ACTION, LOG_WARNING, 'enforcing mailquota to all customers: ' . Settings::Get('system.mail_quota') . ' MB');
-		redirectTo($filename, array('s' => $s));

-	} else {
+		$db->query("UPDATE " . TABLE_PANEL_CUSTOMERS . " SET `email_quota` = `email_quota_used` WHERE `email_quota` < `email_quota_used`");
+		$log->logAction(ADM_ACTION, LOG_WARNING, 'enforcing mailquota to all customers: ' . $settings['system']['mail_quota'] . ' MB');
+		redirectTo('admin_settings.php', array('s' => $s));
+	}
+	else
+	{
 		ask_yesno('admin_quotas_reallyenforce', $filename, array('page' => $page));
 	}
-} elseif ($page == 'integritycheck'
-	&& $userinfo['change_serversettings'] == '1'
-) {
-	$integrity = new IntegrityCheck();
-	if (isset($_POST['send'])
-		&& $_POST['send'] == 'send'
-	) {
-		$integrity->fixAll();
-	} elseif(isset($_GET['action'])
-		 && $_GET['action'] == "fix") {
-		ask_yesno('admin_integritycheck_reallyfix', $filename, array('page' => $page));
-	}
-
-	$integritycheck = '';
-	foreach ($integrity->available as $id => $check) {
-		$displayid = $id + 1;
-		$result = $integrity->$check();
-		$checkdesc = $lng['integrity_check'][$check];
-		eval("\$integritycheck.=\"" . getTemplate("settings/integritycheck_row") . "\";");
-	}
-	eval("echo \"" . getTemplate("settings/integritycheck") . "\";");
 }
+
+?>
--- a/admin_templates.php
+++ b/admin_templates.php
@@ -14,83 +14,77 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Panel
- *
+ * @version    $Id$
 */

 define('AREA', 'admin');
-require './lib/init.php';

-if (isset($_POST['subjectid'])) {
+/**
+ * Include our init.php, which manages Sessions, Language etc.
+ */
+
+require ("./lib/init.php");
+
+if(isset($_POST['subjectid']))
+{
 	$subjectid = intval($_POST['subjectid']);
 	$mailbodyid = intval($_POST['mailbodyid']);
-
-} elseif(isset($_GET['subjectid'])) {
+}
+elseif(isset($_GET['subjectid']))
+{
 	$subjectid = intval($_GET['subjectid']);
 	$mailbodyid = intval($_GET['mailbodyid']);
 }

-if (isset($_POST['id'])) {
+if(isset($_POST['id']))
+{
 	$id = intval($_POST['id']);
-
-} elseif(isset($_GET['id'])) {
+}
+elseif(isset($_GET['id']))
+{
 	$id = intval($_GET['id']);
 }

 $available_templates = array(
 	'createcustomer',
 	'pop_success',
-	'new_database_by_customer',
-	'new_ftpaccount_by_customer',
-	'password_reset'
+	'trafficninetypercent',
+	'new_ticket_by_customer',
+	'new_ticket_for_customer',
+	'new_ticket_by_staff',
+	'new_reply_ticket_by_customer',
+	'new_reply_ticket_by_staff'
 );
-
-// only show templates of features that are enabled #1191
-if ((int)Settings::Get('system.report_enable') == 1) {
-	array_push($available_templates,
-		'trafficmaxpercent',
-		'diskmaxpercent'
-	);
-}
-
-if ((int)Settings::Get('ticket.enabled') == 1) {
-	array_push($available_templates,
-		'new_ticket_by_customer',
-		'new_ticket_for_customer',
-		'new_ticket_by_staff',
-		'new_reply_ticket_by_customer',
-		'new_reply_ticket_by_staff'
-	);
-}
-
 $file_templates = array(
 	'index_html'
 );

-if ($action == '') {
+if($action == '')
+{
 	//email templates
+
 	$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_templates");

-	if (Settings::Get('panel.sendalternativemail') == 1) {
+	if($settings['panel']['sendalternativemail'] == 1)
+	{
 		$available_templates[] = 'pop_success_alternative';
 	}

 	$templates_array = array();
-	$result_stmt = Database::prepare("
-		SELECT `id`, `language`, `varname` FROM `" . TABLE_PANEL_TEMPLATES . "`
-		WHERE `adminid` = :adminid AND `templategroup`='mails'
-		ORDER BY `language`, `varname`"
-	);
-	Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid']));
+	$result = $db->query("SELECT `id`, `language`, `varname` FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND `templategroup`='mails' ORDER BY `language`, `varname`");

-	while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+	while($row = $db->fetch_array($result))
+	{
 		$parts = array();
 		preg_match('/^([a-z]([a-z_]+[a-z])*)_(mailbody|subject)$/', $row['varname'], $parts);
 		$templates_array[$row['language']][$parts[1]][$parts[3]] = $row['id'];
 	}

 	$templates = '';
-	foreach ($templates_array as $language => $template_defs) {
-		foreach ($template_defs as $action => $email) {
+	foreach($templates_array as $language => $template_defs)
+	{
+		foreach($template_defs as $action => $email)
+		{
 			$subjectid = $email['subject'];
 			$mailbodyid = $email['mailbody'];
 			$template = $lng['admin']['templates'][$action];
@@ -99,417 +93,289 @@ if ($action == '') {
 	}

 	$add = false;
-	while (list($language_file, $language_name) = each($languages)) {

+	while(list($language_file, $language_name) = each($languages))
+	{
 		$templates_done = array();
-		$result_stmt = Database::prepare("
-			SELECT `varname` FROM `" . TABLE_PANEL_TEMPLATES . "`
-			WHERE `adminid` = :adminid AND `language`= :lang
-			AND `templategroup` = 'mails' AND `varname` LIKE '%_subject'"
-		);
-		Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid'], 'lang' => $language_name));
+		$result = $db->query('SELECT `varname` FROM `' . TABLE_PANEL_TEMPLATES . '` WHERE `adminid`=\'' . (int)$userinfo['adminid'] . '\' AND `language`=\'' . $db->escape($language_name) . '\' AND `templategroup`=\'mails\' AND `varname` LIKE \'%_subject\'');

-		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+		while(($row = $db->fetch_array($result)) != false)
+		{
 			$templates_done[] = str_replace('_subject', '', $row['varname']);
 		}

-		if (count(array_diff($available_templates, $templates_done)) > 0) {
+		if(count(array_diff($available_templates, $templates_done)) > 0)
+		{
 			$add = true;
 		}
 	}

 	//filetemplates
+
 	$filetemplates = '';
 	$filetemplateadd = false;
-	$result_stmt = Database::prepare("
-		SELECT `id`, `varname` FROM `" . TABLE_PANEL_TEMPLATES . "`
-		WHERE `adminid` = :adminid AND `templategroup`='files'"
-	);
-	Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid']));
+	$result = $db->query("SELECT `id`, `varname` FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND `templategroup`='files'");

-	if (Database::num_rows() != count($file_templates)) {
-		$filetemplateadd = true;
-	}
+	if($db->num_rows($result) != count($file_templates))$filetemplateadd = true;

-	while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+	while($row = $db->fetch_array($result))
+	{
 		eval("\$filetemplates.=\"" . getTemplate("templates/templates_filetemplate") . "\";");
 	}
+
 	eval("echo \"" . getTemplate("templates/templates") . "\";");
-
-} elseif($action == 'delete'
-	&& $subjectid != 0
-	&& $mailbodyid != 0
-) {
+}
+elseif($action == 'delete'
+       && $subjectid != 0
+       && $mailbodyid != 0)
+{
 	//email templates
-	$result_stmt = Database::prepare("
-		SELECT `language`, `varname` FROM `" . TABLE_PANEL_TEMPLATES . "`
-		WHERE `adminid` = :adminid AND `id` = :id"
-	);
-	Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid'], 'id' => $subjectid));
-	$result = $result_stmt->fetch(PDO::FETCH_ASSOC);

-	if ($result['varname'] != '') {
-		if (isset($_POST['send'])
-			&& $_POST['send'] == 'send'
-		) {
-			$del_stmt = Database::prepare("
-				DELETE FROM `" . TABLE_PANEL_TEMPLATES . "`
-				WHERE `adminid` = :adminid
-				AND (`id` = :ida OR `id` = :idb)"
-			);
-			Database::pexecute($del_stmt, array(
-				'adminid' => $userinfo['adminid'],
-				'ida' => $subjectid,
-				'idb' => $mailbodyid
-			));
+	$result = $db->query_first("SELECT `language`, `varname` FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND `id`='" . (int)$subjectid . "'");
+
+	if($result['varname'] != '')
+	{
+		if(isset($_POST['send'])
+		   && $_POST['send'] == 'send')
+		{
+			$db->query("DELETE FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND (`id`='" . (int)$subjectid . "' OR `id`='" . (int)$mailbodyid . "')");
 			$log->logAction(ADM_ACTION, LOG_INFO, "deleted template '" . $result['language'] . ' - ' . $lng['admin']['templates'][str_replace('_subject', '', $result['varname'])] . "'");
-			redirectTo($filename, array('page' => $page, 's' => $s));
-
-		} else {
+			redirectTo($filename, Array('page' => $page, 's' => $s));
+		}
+		else
+		{
 			ask_yesno('admin_template_reallydelete', $filename, array('subjectid' => $subjectid, 'mailbodyid' => $mailbodyid, 'page' => $page, 'action' => $action), $result['language'] . ' - ' . $lng['admin']['templates'][str_replace('_subject', '', $result['varname'])]);
 		}
 	}
-
-} elseif($action == 'deletef'
-	&& $id != 0
-) {
+}
+elseif($action == 'delete'
+       && $id != 0)
+{
 	//file templates
-	$result_stmt = Database::prepare("
-		SELECT * FROM `" . TABLE_PANEL_TEMPLATES . "`
-		WHERE `adminid` = :adminid AND `id` = :id"
-	);
-	Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid'], 'id' => $id));

-	if (Database::num_rows() > 0) {
+	$result = $db->query("SELECT * FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND `id`='" . (int)$id . "'");

-		$row = $result_stmt->fetch(PDO::FETCH_ASSOC);
+	if($db->num_rows($result) > 0)
+	{
+		$row = $db->fetch_array($result);

-		if (isset($_POST['send'])
-			&& $_POST['send'] == 'send'
-		) {
-			$del_stmt = Database::prepare("
-				DELETE FROM `" . TABLE_PANEL_TEMPLATES . "`
-				WHERE `adminid` = :adminid AND `id` = :id"
-			);
-			Database::pexecute($del_stmt, array('adminid' => $userinfo['adminid'], 'id' => $id));
+		if(isset($_POST['send'])
+		   && $_POST['send'] == 'send')
+		{
+			$db->query("DELETE FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `adminid`=" . (int)$userinfo['adminid'] . " AND `id`=" . (int)$id . "");
 			$log->logAction(ADM_ACTION, LOG_INFO, "deleted template '" . $lng['admin']['templates'][$row['varname']] . "'");
-			redirectTo($filename, array('page' => $page, 's' => $s));
-
-		} else {
+			redirectTo($filename, Array('page' => $page, 's' => $s));
+		}
+		else
+		{
 			ask_yesno('admin_template_reallydelete', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $lng['admin']['templates'][$row['varname']]);
 		}
-
-	} else {
-		standard_error('templatenotfound');
 	}
-
-} elseif($action == 'add') {
-
-	if (Settings::Get('panel.sendalternativemail') == 1) {
+	else
+	{
+		standard_error('templatenotfound');
+		exit;
+	}
+}
+elseif($action == 'add')
+{
+	if($settings['panel']['sendalternativemail'] == 1)
+	{
 		$available_templates[] = 'pop_success_alternative';
 	}

-	if (isset($_POST['prepare'])
-		&& $_POST['prepare'] == 'prepare'
-	) {
+	if(isset($_POST['prepare'])
+	   && $_POST['prepare'] == 'prepare')
+	{
 		//email templates
-		$language = htmlentities(validate($_POST['language'], 'language', '/^[^\r\n\0"\']+$/', 'nolanguageselect'));
-		$template = validate($_POST['template'], 'template');

-		$lng_bak = $lng;
-		foreach ($langs['English'] as $key => $value) {
-			include_once makeSecurePath($value['file']);
-		}
-		if ($language != 'English') {
-			foreach ($langs[$language] as $key => $value) {
-				include makeSecurePath($value['file']);
-			}
-		}
-
-		$subject = $lng['mails'][$template]['subject'];
-		$body = str_replace('\n', "\n", $lng['mails'][$template]['mailbody']);
-
-		$lng = $lng_bak;
-
-		$template_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/templates/formfield.template_add.php';
-		$template_add_form = htmlform::genHTMLForm($template_add_data);
-
-		$title = $template_add_data['template_add']['title'];
-		$image = $template_add_data['template_add']['image'];
-
-		eval("echo \"" . getTemplate("templates/templates_add_2") . "\";");
-
-	} elseif(isset($_POST['send'])
-		&& $_POST['send'] == 'send'
-	) {
-		//email templates
-		$language = htmlentities(validate($_POST['language'], 'language', '/^[^\r\n\0"\']+$/', 'nolanguageselect'));
-		$template = validate($_POST['template'], 'template');
-		$subject = validate($_POST['subject'], 'subject', '/^[^\r\n\0]+$/', 'nosubjectcreate');
-		$mailbody = validate($_POST['mailbody'], 'mailbody', '/^[^\0]+$/', 'nomailbodycreate');
+		$language = validate($_POST['language'], 'language');
 		$templates = array();
-		$result_stmt = Database::prepare("
-			SELECT `varname` FROM `" . TABLE_PANEL_TEMPLATES . "`
-			WHERE `adminid` = :adminid AND `language` = :lang
-			AND `templategroup` = 'mails' AND `varname` LIKE '%_subject'"
-		);
-		Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid'], 'lang' => $language));
+		$result = $db->query('SELECT `varname` FROM `' . TABLE_PANEL_TEMPLATES . '` WHERE `adminid`=\'' . (int)$userinfo['adminid'] . '\' AND `language`=\'' . $db->escape($language) . '\' AND `templategroup`=\'mails\' AND `varname` LIKE \'%_subject\'');

-		while($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+		while(($row = $db->fetch_array($result)) != false)
+		{
 			$templates[] = str_replace('_subject', '', $row['varname']);
 		}

 		$templates = array_diff($available_templates, $templates);
-		if (array_search($template, $templates) === false) {
-			standard_error('templatenotfound');
-
-		} else {
-			$ins_stmt = Database::prepare("
-				INSERT INTO `" . TABLE_PANEL_TEMPLATES . "` SET
-					`adminid` = :adminid,
-					`language` = :lang,
-					`templategroup` = 'mails',
-					`varname` = :var,
-					`value` = :value"
-			);
-
-			// mail-subject
-			$ins_data = array(
-				'adminid' => $userinfo['adminid'],
-				'lang' => $language,
-				'var' =>  $template.'_subject',
-				'value' => $subject
-			);
-			Database::pexecute($ins_stmt, $ins_data);
-
-			// mail-body
-			$ins_data = array(
-				'adminid' => $userinfo['adminid'],
-				'lang' => $language,
-				'var' =>  $template.'_mailbody',
-				'value' => $mailbody
-			);
-			Database::pexecute($ins_stmt, $ins_data);
-
-			$log->logAction(ADM_ACTION, LOG_INFO, "added template '" . $language . ' - ' . $template . "'");
-			redirectTo($filename, array('page' => $page, 's' => $s));
+		$template_options = '';
+		foreach($templates as $template)
+		{
+			$template_options.= makeoption($lng['admin']['templates'][$template], $template, NULL, true);
 		}

-	} elseif(isset($_POST['filesend'])
-		&& $_POST['filesend'] == 'filesend'
-	) {
+		eval("echo \"" . getTemplate("templates/templates_add_2") . "\";");
+	}
+	elseif(isset($_POST['send'])
+	       && $_POST['send'] == 'send')
+	{
+		//email templates
+
+		$language = validate($_POST['language'], 'language', '/^[^\r\n\0"\']+$/', 'nolanguageselect');
+		$template = validate($_POST['template'], 'template');
+		$subject = validate($_POST['subject'], 'subject', '/^[^\r\n\0]+$/', 'nosubjectcreate');
+		$mailbody = validate($_POST['mailbody'], 'mailbody', '/^[^\0]+$/', 'nomailbodycreate');
+		$templates = array();
+		$result = $db->query('SELECT `varname` FROM `' . TABLE_PANEL_TEMPLATES . '` WHERE `adminid`=\'' . (int)$userinfo['adminid'] . '\' AND `language`=\'' . $db->escape($language) . '\' AND `templategroup`=\'mails\' AND `varname` LIKE \'%_subject\'');
+
+		while(($row = $db->fetch_array($result)) != false)
+		{
+			$templates[] = str_replace('_subject', '', $row['varname']);
+		}
+
+		$templates = array_diff($available_templates, $templates);
+
+		if(array_search($template, $templates) === false)
+		{
+			standard_error('templatenotfound');
+		}
+		else
+		{
+			$result = $db->query("INSERT INTO `" . TABLE_PANEL_TEMPLATES . "` (`adminid`, `language`, `templategroup`, `varname`, `value`)
+									VALUES ('" . (int)$userinfo['adminid'] . "', '" . $db->escape($language) . "', 'mails', '" . $db->escape($template) . "_subject','" . $db->escape($subject) . "')");
+			$result = $db->query("INSERT INTO `" . TABLE_PANEL_TEMPLATES . "` (`adminid`, `language`, `templategroup`, `varname`, `value`)
+									VALUES ('" . (int)$userinfo['adminid'] . "', '" . $db->escape($language) . "', 'mails', '" . $db->escape($template) . "_mailbody','" . $db->escape($mailbody) . "')");
+			$log->logAction(ADM_ACTION, LOG_INFO, "added template '" . $language . ' - ' . $template . "'");
+			redirectTo($filename, Array('page' => $page, 's' => $s));
+		}
+	}
+	elseif(isset($_POST['filesend'])
+	       && $_POST['filesend'] == 'filesend')
+	{
 		//file templates
+
 		$template = validate($_POST['template'], 'template');
 		$filecontent = validate($_POST['filecontent'], 'filecontent', '/^[^\0]+$/', 'filecontentnotset');
-
-		$ins_stmt = Database::prepare("
-			INSERT INTO `" . TABLE_PANEL_TEMPLATES . "` SET
-				`adminid` = :adminid,
-				`language` = '',
-				`templategroup` = 'files',
-				`varname` = :var,
-				`value` = :value"
-		);
-
-		$ins_data = array(
-			'adminid' => $userinfo['adminid'],
-			'var' => $template,
-			'value' => $filecontent
-		);
-		Database::pexecute($ins_stmt, $ins_data);
-
+		$db->query("INSERT INTO `" . TABLE_PANEL_TEMPLATES . "` (`adminid`, `language`, `templategroup`, `varname`, `value`)
+					VALUES ('" . (int)$userinfo['adminid'] . "', '', 'files', '" . $db->escape($template) . "','" . $db->escape($filecontent) . "')");
 		$log->logAction(ADM_ACTION, LOG_INFO, "added template '" . $template . "'");
-		redirectTo($filename, array('page' => $page, 's' => $s));
-
-	} elseif(!isset($_GET['files'])) {
-
+		redirectTo($filename, Array('page' => $page, 's' => $s));
+	}
+	elseif(!isset($_GET['files']))
+	{
 		//email templates
+
 		$add = false;
 		$language_options = '';
-		$template_options = '';

-		while (list($language_file, $language_name) = each($languages)) {
+		while(list($language_file, $language_name) = each($languages))
+		{
 			$templates = array();
-			$result_stmt = Database::prepare("
-				SELECT `varname` FROM `" . TABLE_PANEL_TEMPLATES . "`
-				WHERE `adminid` = :adminid AND `language` = :lang
-				AND `templategroup` = 'mails' AND `varname` LIKE '%_subject'"
-			);
-			Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid'], 'lang' => $language_name));
+			$result = $db->query('SELECT `varname` FROM `' . TABLE_PANEL_TEMPLATES . '` WHERE `adminid`=\'' . (int)$userinfo['adminid'] . '\' AND `language`=\'' . $db->escape($language_name) . '\' AND `templategroup`=\'mails\' AND `varname` LIKE \'%_subject\'');

-			while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+			while(($row = $db->fetch_array($result)) != false)
+			{
 				$templates[] = str_replace('_subject', '', $row['varname']);
 			}

-			if (count(array_diff($available_templates, $templates)) > 0) {
+			if(count(array_diff($available_templates, $templates)) > 0)
+			{
 				$add = true;
-				$language_options.= makeoption($language_name, $language_file, $userinfo['language'], true, true);
-
-				$templates = array_diff($available_templates, $templates);
-
-				foreach ($templates as $template) {
-					$template_options.= makeoption($lng['admin']['templates'][$template], $template, NULL, true, true, $language_file) . "\n";
-				}
+				$language_options.= makeoption($language_name, $language_file, $userinfo['language'], true);
 			}
 		}

-		if ($add) {
+		if($add)
+		{
 			eval("echo \"" . getTemplate("templates/templates_add_1") . "\";");
-		} else {
-			standard_error('alltemplatesdefined');
 		}
-
-	} else {
-		//filetemplates
-		$result_stmt = Database::prepare("
-			SELECT `id`, `varname` FROM `" . TABLE_PANEL_TEMPLATES . "`
-			WHERE `adminid` = :adminid AND `templategroup`='files'"
-		);
-		Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid']));
-
-		if (Database::num_rows() == count($file_templates)) {
+		else
+		{
 			standard_error('alltemplatesdefined');
+			exit;
+		}
+	}
+	else
+	{
+		//filetemplates

-		} else {
+		$result = $db->query("SELECT `id`, `varname` FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND `templategroup`='files'");

+		if($db->num_rows($result) == count($file_templates))
+		{
+			standard_error('alltemplatesdefined');
+			exit;
+		}
+		else
+		{
 			$templatesdefined = array();
 			$free_templates = '';

-			while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-				$templatesdefined[] = $row['varname'];
-			}
-
-			foreach (array_diff($file_templates, $templatesdefined) as $template) {
+			while($row = $db->fetch_array($result))$templatesdefined[] = $row['varname'];
+			foreach(array_diff($file_templates, $templatesdefined) as $template)
+			{
 				$free_templates.= makeoption($lng['admin']['templates'][$template], $template, '', true);
 			}

-			$filetemplate_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/templates/formfield.filetemplate_add.php';
-			$filetemplate_add_form = htmlform::genHTMLForm($filetemplate_add_data);
-
-			$title = $filetemplate_add_data['filetemplate_add']['title'];
-			$image = $filetemplate_add_data['filetemplate_add']['image'];
-
 			eval("echo \"" . getTemplate("templates/filetemplates_add") . "\";");
 		}
 	}
-
-} elseif($action == 'edit'
-	&& $subjectid != 0
-	&& $mailbodyid != 0
-) {
+}
+elseif($action == 'edit'
+       && $subjectid != 0
+       && $mailbodyid != 0)
+{
 	//email templates
-	$result_stmt = Database::prepare("
-		SELECT `language`, `varname`, `value` FROM `" . TABLE_PANEL_TEMPLATES . "`
-		WHERE `adminid` = :adminid AND `id` = :subjectid"
-	);
-	Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid'], 'subjectid' => $subjectid));
-	$result = $result_stmt->fetch(PDO::FETCH_ASSOC);

-	if ($result['varname'] != '') {
+	$result = $db->query_first("SELECT `language`, `varname`, `value` FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND `id`='" . (int)$subjectid . "'");

-		if (isset($_POST['send'])
-			&& $_POST['send'] == 'send'
-		) {
+	if($result['varname'] != '')
+	{
+		if(isset($_POST['send'])
+		   && $_POST['send'] == 'send')
+		{
 			$subject = validate($_POST['subject'], 'subject', '/^[^\r\n\0]+$/', 'nosubjectcreate');
 			$mailbody = validate($_POST['mailbody'], 'mailbody', '/^[^\0]+$/', 'nomailbodycreate');
-
-			$upd_stmt = Database::prepare("
-				UPDATE `" . TABLE_PANEL_TEMPLATES . "` SET
-					`value` = :value
-				WHERE `adminid` = :adminid AND `id` = :id"
-			);
-			// subject
-			Database::pexecute($upd_stmt, array(
-				'value' => $subject,
-				'adminid' => $userinfo['adminid'],
-				'id' => $subjectid
-			));
-			// same query but mailbody
-			Database::pexecute($upd_stmt, array(
-				'value' => $mailbody,
-				'adminid' => $userinfo['adminid'],
-				'id' => $mailbodyid
-			));
-
+			$db->query("UPDATE `" . TABLE_PANEL_TEMPLATES . "` SET `value`='" . $db->escape($subject) . "' WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND `id`='" . (int)$subjectid . "'");
+			$db->query("UPDATE `" . TABLE_PANEL_TEMPLATES . "` SET `value`='" . $db->escape($mailbody) . "' WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND `id`='" . (int)$mailbodyid . "'");
 			$log->logAction(ADM_ACTION, LOG_INFO, "edited template '" . $result['varname'] . "'");
-			redirectTo($filename, array('page' => $page, 's' => $s));
-
-		} else {
-
+			redirectTo($filename, Array('page' => $page, 's' => $s));
+		}
+		else
+		{
 			$result = htmlentities_array($result);
 			$template = $lng['admin']['templates'][str_replace('_subject', '', $result['varname'])];
 			$subject = $result['value'];
-			$result_stmt = Database::prepare("
-				SELECT `language`, `varname`, `value`
-				FROM `" . TABLE_PANEL_TEMPLATES . "`
-				WHERE `id` = :id"
-			);
-			Database::pexecute($result_stmt, array('id' => $mailbodyid));
-			$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
-			
-			$template_name = str_replace('_mailbody', '', $result['varname']);
-
-			// don't escape the already escaped language-string so save up before htmlentities()
-			$language = $result['language'];
+			$result = $db->query_first("SELECT `language`, `varname`, `value` FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `id`='$mailbodyid'");
 			$result = htmlentities_array($result);
 			$mailbody = $result['value'];
-
-			$template_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/templates/formfield.template_edit.php';
-			$template_edit_form = htmlform::genHTMLForm($template_edit_data);
-
-			$title = $template_edit_data['template_edit']['title'];
-			$image = $template_edit_data['template_edit']['image'];
-
 			eval("echo \"" . getTemplate("templates/templates_edit") . "\";");
 		}
 	}
-
-} elseif($action == 'editf'
-	&& $id != 0
-) {
+}
+elseif($action == 'edit'
+       && $id != 0)
+{
 	//file templates
-	$result_stmt = Database::prepare("
-		SELECT * FROM `" . TABLE_PANEL_TEMPLATES . "`
-		WHERE `adminid` = :adminid AND `id` = :id"
-	);
-	Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid'], 'id' => $id));

-	if(Database::num_rows() > 0) {
+	$result = $db->query("SELECT * FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND `id`='" . (int)$id . "'");

-		$row = $result_stmt->fetch(PDO::FETCH_ASSOC);
+	if($db->num_rows($result) > 0)
+	{
+		$row = $db->fetch_array($result);

 		//filetemplates
-		if (isset($_POST['filesend'])
-			&& $_POST['filesend'] == 'filesend'
-		) {
+
+		if(isset($_POST['filesend'])
+		   && $_POST['filesend'] == 'filesend')
+		{
 			$filecontent = validate($_POST['filecontent'], 'filecontent', '/^[^\0]+$/', 'filecontentnotset');
-			$upd_stmt = Database::prepare("
-				UPDATE `" . TABLE_PANEL_TEMPLATES . "` SET
-					`value` = :value
-				WHERE `adminid` = :adminid AND `id` = :id"
-			);
-			Database::pexecute($upd_stmt, array(
-				'value' => $filecontent,
-				'adminid' => $userinfo['adminid'],
-				'id' => $id
-			));
-
+			$db->query("UPDATE `" . TABLE_PANEL_TEMPLATES . "` SET `value`='" . $db->escape($filecontent) . "' WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND `id`='" . (int)$id . "'");
 			$log->logAction(ADM_ACTION, LOG_INFO, "edited template '" . $row['varname'] . "'");
-			redirectTo($filename, array('page' => $page, 's' => $s));
-
-		} else {
+			redirectTo($filename, Array('page' => $page, 's' => $s));
+		}
+		else
+		{
 			$row = htmlentities_array($row);
-
-			$filetemplate_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/templates/formfield.filetemplate_edit.php';
-			$filetemplate_edit_form = htmlform::genHTMLForm($filetemplate_edit_data);
-
-			$title = $filetemplate_edit_data['filetemplate_edit']['title'];
-			$image = $filetemplate_edit_data['filetemplate_edit']['image'];
-
 			eval("echo \"" . getTemplate("templates/filetemplates_edit") . "\";");
 		}
-
-	} else {
+	}
+	else
+	{
 		standard_error('templatenotfound');
+		exit;
 	}
 }
+
+?>
--- a/admin_tickets.php
+++ b/admin_tickets.php
--- a/admin_traffic.php
+++ b/admin_traffic.php
@@ -1,141 +0,0 @@
-<?php
-
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2003-2009 the SysCP Team (see authors).
- * Copyright (c) 2010 the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright  (c) the authors
- * @author     Morton Jonuschat <m.jonuschat@chrome-it.de>
- * @license    GPLv2 http://files.syscp.org/misc/COPYING.txt
- * @package    Panel
- *
- */
-
-define('AREA', 'admin');
-require './lib/init.php';
-
-if ($action == 'logout') {
-	$logout_stmt = Database::prepare("
-		DELETE FROM `" . TABLE_PANEL_SESSIONS . "`
-		WHERE `userid` = :adminid
-		AND `adminsession` = '1'"
-	);
-	Database::pexecute($logout_stmt, array('adminid' => $userinfo['adminid']));
-	redirectTo('index.php');
-}
-
-if (isset($_POST['id'])) {
-	$id = intval($_POST['id']);
-} elseif(isset($_GET['id'])) {
-	$id = intval($_GET['id']);
-}
-
-$months = array(
-	'0' => 'empty',
-	'1' => 'jan',
-	'2' => 'feb',
-	'3' => 'mar',
-	'4' => 'apr',
-	'5' => 'may',
-	'6' => 'jun',
-	'7' => 'jul',
-	'8' => 'aug',
-	'9' => 'sep',
-	'10' => 'oct',
-	'11' => 'nov',
-	'12' => 'dec',
-);
-
-if ($page == 'overview' || $page == 'customers') {
-
-	$customerview = 1;
-	$stats_tables = '';
-	$minyear_stmt = Database::query("SELECT `year` FROM `". TABLE_PANEL_TRAFFIC . "` ORDER BY `year` ASC LIMIT 1");
-	$minyear = $minyear_stmt->fetch(PDO::FETCH_ASSOC);
-
-	if (!isset($minyear['year']) || $minyear['year'] == 0) {
-		$maxyears = 0;
-	} else {
-		$maxyears = date("Y") - $minyear['year'];
-	}
-
-	for ($years = 0; $years<=$maxyears; $years++) {
-
-		$overview['year'] = date("Y")-$years;
-		$overview['type'] = $lng['traffic']['customer'];
-		$domain_list = '';
-		$totals = array(
-				'jan' => 0,
-				'feb' => 0,
-				'mar' => 0,
-				'apr' => 0,
-				'may' => 0,
-				'jun' => 0,
-				'jul' => 0,
-				'aug' => 0,
-				'sep' => 0,
-				'oct' => 0,
-				'nov' => 0,
-				'dec' => 0,
-		);
-
-		$customer_name_list_stmt = Database::prepare("
-			SELECT `customerid`,`company`,`name`,`firstname`
-			FROM `" . TABLE_PANEL_CUSTOMERS . "`
-			WHERE `deactivated`='0'" .
-			($userinfo['customers_see_all'] ? '' : " AND `adminid` = :id") . "
-			ORDER BY name"
-		);
-		Database::pexecute($customer_name_list_stmt, array('id' => $userinfo['adminid']));
-
-		while($customer_name = $customer_name_list_stmt->fetch(PDO::FETCH_ASSOC)) {
-
-			$virtual_host = array(
-				'name' => ($customer_name['company'] == '' ? $customer_name['name'] . ", " . $customer_name['firstname'] : $customer_name['company']),
-				'customerid' => $customer_name['customerid'],
-				'jan' => '-',
-				'feb' => '-',
-				'mar' => '-',
-				'apr' => '-',
-				'may' => '-',
-				'jun' => '-',
-				'jul' => '-',
-				'aug' => '-',
-				'sep' => '-',
-				'oct' => '-',
-				'nov' => '-',
-				'dec' => '-',
-			);
-
-			$traffic_list_stmt = Database::prepare("
-				SELECT month, SUM(http+ftp_up+ftp_down+mail)*1024 AS traffic
-				FROM `" . TABLE_PANEL_TRAFFIC . "`
-				WHERE year = :year AND `customerid` = :id
-				GROUP BY month ORDER BY month"
-			);
-			Database::pexecute($traffic_list_stmt, array('year' => (date("Y")-$years), 'id' => $customer_name['customerid']));
-
-			while ($traffic_month = $traffic_list_stmt->fetch(PDO::FETCH_ASSOC)) {
-				$virtual_host[$months[(int)$traffic_month['month']]] = size_readable($traffic_month['traffic'], 'GiB', 'bi', '%01.'.(int)Settings::Get('panel.decimal_places').'f %s');
-				$totals[$months[(int)$traffic_month['month']]] += $traffic_month['traffic'];
-			}
-			eval("\$domain_list .= sprintf(\"%s\", \"" . getTemplate("traffic/index_table_row") . "\");");
-		}
-		// sum up totals
-		$virtual_host = array(
-			'name' => $lng['traffic']['months']['total'],
-		);
-		foreach ($totals as $month => $bytes) {
-			$virtual_host[$month] = ($bytes == 0 ? '-' : size_readable($bytes, 'GiB', 'bi', '%01.'.(int)Settings::Get('panel.decimal_places').'f %s'));
-		}
-		$customerview = 0;
-		eval("\$total_list = sprintf(\"%s\", \"" . getTemplate("traffic/index_table_row") . "\");");
-		eval("\$stats_tables .= sprintf(\"%s\", \"" . getTemplate("traffic/index_table") . "\");");
-	}
-	eval("echo \"" . getTemplate("traffic/index") . "\";");
-}
--- a/admin_updates.php
+++ b/admin_updates.php
@@ -12,28 +12,30 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Panel
- *
+ * @version    $Id$
 */

 define('AREA', 'admin');
-require './lib/init.php';
+require ("./lib/init.php");

-if ($page == 'overview') {
+if($page == 'overview')
+{
 	$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_updates");

 	/**
 	 * this is a dirty hack but syscp 1.4.2.1 does not
-	 * have any version/dbversion in the database (don't know why)
+	 * has any version/dbversion in the database (don't know why)
 	 * so we have to set them both to run a correct upgrade
 	 */
 	if (!isFroxlor()) {
-		if (Settings::Get('panel.version') == null
-			|| Settings::Get('panel.version') == ''
+		if (!isset($settings['panel']['version'])
+		|| $settings['panel']['version'] == ''
 		) {
-			Settings::Set('panel.version', '1.4.2.1');
+			$settings['panel']['version'] = '1.4.2.1';
+			$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('panel','version','".$settings['panel']['version']."')");
 		}
-		if (Settings::Get('system.dbversion') == null
-			|| Settings::Get('system.dbversion') == ''
+		if (!isset($settings['system']['dbversion'])
+		|| $settings['system']['dbversion'] == ''
 		) {
 			/**
 			 * for syscp-stable (1.4.2.1) this value has to be 0
@@ -41,81 +43,58 @@ if ($page == 'overview') {
 			 * and the svn-version has its value in the database
 			 * -> bug #54
 			 */
-			$result_stmt = Database::query("
-				SELECT `value` FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `varname` = 'dbversion'"
-			);
-			$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
-
-			if (isset($result['value'])) {
-				Settings::Set('system.dbversion', (int)$result['value'], false);
+			
+			$result = $db->query_first("SELECT `value` FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `varname` = 'dbversion'");
+			
+			if(isset($result['value']))
+			{
+				$settings['system']['dbversion'] = (int)$result['value'];
 			} else {
-				Settings::Set('system.dbversion', 0, false);
+				$settings['system']['dbversion'] = 0;
 			}
 		}
 	}

-	if (hasDbUpdates($dbversion) || hasUpdates($version)) {
-		$successful_update = false;
-		$message = '';
+	if(hasUpdates($version))
+	{
+		if(isset($_POST['send'])
+		&& $_POST['send'] == 'send')
+		{

-		if (isset($_POST['send'])
-			&& $_POST['send'] == 'send'
-		) {
-			if ((isset($_POST['update_preconfig'])
-				&& isset($_POST['update_changesagreed'])
-				&& intval($_POST['update_changesagreed']) != 0)
-				|| !isset($_POST['update_preconfig'])
-			) {
-				eval("echo \"" . getTemplate('update/update_start') . "\";");
+			eval("echo \"" . getTemplate("update/update_start") . "\";");

-				include_once './install/updatesql.php';
+			include_once('./install/updatesql.php');

-				$redirect_url = 'admin_index.php?s=' . $s;
-				eval("echo \"" . getTemplate('update/update_end') . "\";");
+			$redirect_url = 'admin_index.php';
+			eval("echo \"" . getTemplate("update/update_end") . "\";");

-				updateCounters();
-				inserttask('1');
-				@chmod('./lib/userdata.inc.php', 0440);
-
-				$successful_update = true;
-			} else {
-				$message = '<br /><strong class="red">You have to agree that you have read the update notifications.</strong>';
-			}
+			updateCounters();
+			inserttask('1');
+			@chmod('./lib/userdata.inc.php', 0440);
 		}
-
-		if (!$successful_update) {
-			$current_version = Settings::Get('panel.version');
-			$current_db_version = Settings::Get('panel.db_version');
-			if (empty($current_db_version)) {
-			    $current_db_version = "0";
-			}
+		else
+		{
+			$current_version = $settings['panel']['version'];
 			$new_version = $version;
-			$new_db_version = $dbversion;

-			$ui_text = $lng['update']['update_information']['part_a'];
-			if ($version != $current_version) {
-			     $ui_text = str_replace('%curversion', $current_version, $ui_text);
-			     $ui_text = str_replace('%newversion', $new_version, $ui_text);
-			} else {
-			    // show db version
-			    $ui_text = str_replace('%curversion', $current_db_version, $ui_text);
-			    $ui_text = str_replace('%newversion', $new_db_version, $ui_text);
-			}
+			$ui_text = $lng['update']['update_information'];
+			$ui_text = str_replace('%curversion', $current_version, $ui_text);
+			$ui_text = str_replace('%newversion', $new_version, $ui_text);
 			$update_information = $ui_text;

-			include_once './install/updates/preconfig.php';
-			$preconfig = getPreConfig($current_version, $current_db_version);
-			if ($preconfig != '') {
-				$update_information .= '<br />' . $preconfig . $message;
-			}
-
-			$update_information .= $lng['update']['update_information']['part_b'];
-
-			eval("echo \"" . getTemplate('update/index') . "\";");
+			eval("echo \"" . getTemplate("update/index") . "\";");
 		}
-	} else {
+	}
+	else
+	{
+		/*
+		 * @TODO version-webcheck check here
+		 */
+
 		$success_message = $lng['update']['noupdatesavail'];
-		$redirect_url = 'admin_index.php?s=' . $s;
-		eval("echo \"" . getTemplate('update/noupdatesavail') . "\";");
+		$redirect_url = 'admin_index.php';
+		eval("echo \"" . getTemplate("update/noupdatesavail") . "\";");
 	}
 }
+
+?>
--- a/css/images/animated-overlay.gif
+++ b/css/images/animated-overlay.gif
--- a/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png
+++ b/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png
--- a/css/images/ui-bg_diagonals-thick_20_666666_40x40.png
+++ b/css/images/ui-bg_diagonals-thick_20_666666_40x40.png
--- a/css/images/ui-bg_flat_10_000000_40x100.png
+++ b/css/images/ui-bg_flat_10_000000_40x100.png
--- a/css/images/ui-bg_glass_100_f6f6f6_1x400.png
+++ b/css/images/ui-bg_glass_100_f6f6f6_1x400.png
--- a/css/images/ui-bg_glass_100_fdf5ce_1x400.png
+++ b/css/images/ui-bg_glass_100_fdf5ce_1x400.png
--- a/css/images/ui-bg_glass_65_ffffff_1x400.png
+++ b/css/images/ui-bg_glass_65_ffffff_1x400.png
--- a/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png
+++ b/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png
--- a/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
+++ b/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
--- a/css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
+++ b/css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
--- a/css/images/ui-icons_222222_256x240.png
+++ b/css/images/ui-icons_222222_256x240.png
--- a/css/images/ui-icons_228ef1_256x240.png
+++ b/css/images/ui-icons_228ef1_256x240.png
--- a/css/images/ui-icons_ef8c08_256x240.png
+++ b/css/images/ui-icons_ef8c08_256x240.png
--- a/css/images/ui-icons_ffd27a_256x240.png
+++ b/css/images/ui-icons_ffd27a_256x240.png
--- a/css/images/ui-icons_ffffff_256x240.png
+++ b/css/images/ui-icons_ffffff_256x240.png
--- a/css/jquery-ui.min.css
+++ b/css/jquery-ui.min.css
--- a/customer_aps.php
+++ b/customer_aps.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2003-2009 the SysCP Team (see authors).
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Panel
+ * @version    $Id$
+ */
+
+// Required code
+
+define('AREA', 'customer');
+require ("./lib/init.php");
+$Id = 0;
+
+if(isset($_GET['id']))$Id = (int)$_GET['id'];
+
+if(isset($_POST['id']))$Id = (int)$_POST['id'];
+eval("echo \"" . getTemplate("aps/header") . "\";");
+$Aps = new ApsParser($userinfo, $settings, $db);
+$Aps->MainHandler($action);
+eval("echo \"" . getTemplate("aps/footer") . "\";");
+
+?>
--- a/customer_autoresponder.php
+++ b/customer_autoresponder.php
@@ -0,0 +1,306 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2003-2009 the SysCP Team (see authors).
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Panel
+ * @version    $Id$
+ */
+
+// Required code
+
+define('AREA', 'customer');
+require ("./lib/init.php");
+
+// Create new autoresponder
+
+if($action == "add")
+{
+	if(isset($_POST['send'])
+	   && $_POST['send'] == 'send')
+	{
+		$account = trim($_POST['account']);
+		$subject = trim($_POST['subject']);
+		$message = trim($_POST['message']);
+		
+		$date_from_off = isset($_POST['date_from_off']) ? -1 : 0;
+		$date_until_off = isset($_POST['date_until_off']) ? -1 : 0;
+		
+		/*
+		 * @TODO validate date (DD-MM-YYYY) 
+		 */	
+		$ts_from = -1;
+		$ts_until = -1;
+
+		if($date_from_off > -1)
+		{
+			$date_from = $_POST['date_from'];
+			$ts_from = mktime(0, 0, 0, substr($date_from, 3, 2), substr($date_from, 0, 2), substr($date_from, 6, 4));
+		}
+		if($date_until_off > -1)
+		{
+			$date_until = $_POST['date_until'];
+			$ts_until = mktime(0, 0, 0, substr($date_until, 3, 2), substr($date_until, 0, 2), substr($date_until, 6, 4));
+		}
+
+		if(empty($account)
+		   || empty($subject)
+		   || empty($message))
+		{
+			standard_error('missingfields');
+		}
+
+		// Does account exist?
+
+		$result = $db->query("SELECT `email` FROM `" . TABLE_MAIL_USERS . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` = '" . $db->escape($account) . "' LIMIT 0,1");
+
+		if($db->num_rows($result) == 0)
+		{
+			standard_error('accountnotexisting');
+		}
+
+		// Does autoresponder exist?
+
+		$result = $db->query("SELECT `email` FROM `" . TABLE_MAIL_AUTORESPONDER . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` = '" . $db->escape($account) . "' LIMIT 0,1");
+
+		if($db->num_rows($result) == 1)
+		{
+			standard_error('autoresponderalreadyexists');
+		}
+
+		$db->query("INSERT INTO `" . TABLE_MAIL_AUTORESPONDER . "`
+			SET `email` = '" . $db->escape($account) . "',
+			`message` = '" . $db->escape($message) . "',
+			`enabled` = '" . (int)$_POST['active'] . "',
+			`date_from` = '" . (int)$ts_from . "',
+			`date_until` = '" . (int)$ts_until . "',
+			`subject` = '" . $db->escape($subject) . "',
+			`customerid` = '" . $db->escape((int)$userinfo['customerid']) . "'
+			");
+		redirectTo($filename, Array('s' => $s));
+	}
+
+	// Get accounts
+
+	$result = $db->query("SELECT `email` FROM `" . TABLE_MAIL_USERS . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` NOT IN (SELECT `email` FROM `" . TABLE_MAIL_AUTORESPONDER . "`) ORDER BY email ASC");
+
+	if($db->num_rows($result) == 0)
+	{
+		standard_error('noemailaccount');
+	}
+
+	$accounts = '';
+
+	while($row = $db->fetch_array($result))
+	{
+		$accounts.= "<option value=\"" . $row['email'] . "\">" . $row['email'] . "</option>";
+	}
+	
+	$date_from_off = makecheckbox('date_from_off', $lng['panel']['not_activated'], '-1', false, '-1', true, true);
+	$date_until_off = makecheckbox('date_from_off', $lng['panel']['not_activated'], '-1', false, '-1', true, true);
+
+	eval("echo \"" . getTemplate("email/autoresponder_add") . "\";");
+}
+
+// Edit autoresponder
+
+else
+
+if($action == "edit")
+{
+	if(isset($_POST['send'])
+	   && $_POST['send'] == 'send')
+	{
+		$account = trim($_POST['account']);
+		$subject = trim($_POST['subject']);
+		$message = trim($_POST['message']);
+
+		$date_from_off = isset($_POST['date_from_off']) ? -1 : 0;
+		$date_until_off = isset($_POST['date_until_off']) ? -1 : 0;
+				
+		/*
+		 * @TODO validate date (DD-MM-YYYY) 
+		 */	
+		$ts_from = -1;
+		$ts_until = -1;
+
+		if($date_from_off > -1)
+		{
+			$date_from = $_POST['date_from'];
+			$ts_from = mktime(0, 0, 0, substr($date_from, 3, 2), substr($date_from, 0, 2), substr($date_from, 6, 4));
+		}
+		if($date_until_off > -1)
+		{
+			$date_until = $_POST['date_until'];
+			$ts_until = mktime(0, 0, 0, substr($date_until, 3, 2), substr($date_until, 0, 2), substr($date_until, 6, 4));
+		}	
+
+		if(empty($account)
+		   || empty($subject)
+		   || empty($message))
+		{
+			standard_error('missingfields');
+		}
+
+		// Does account exist?
+
+		$result = $db->query("SELECT `email` FROM `" . TABLE_MAIL_USERS . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` = '" . $db->escape($account) . "' LIMIT 0,1");
+
+		if($db->num_rows($result) == 0)
+		{
+			standard_error('accountnotexisting');
+		}
+
+		// Does autoresponder exist?
+
+		$result = $db->query("SELECT `email` FROM `" . TABLE_MAIL_AUTORESPONDER . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` = '" . $db->escape($account) . "' LIMIT 0,1");
+
+		if($db->num_rows($result) == 0)
+		{
+			standard_error('invalidautoresponder');
+		}
+
+		$ResponderActive = 0;
+
+		if(isset($_POST['active'])
+		   && $_POST['active'] == '1')
+		{
+			$ResponderActive = 1;
+		}
+
+		$db->query("UPDATE `" . TABLE_MAIL_AUTORESPONDER . "`
+			SET `message` = '" . $db->escape($message) . "',
+			`enabled` = '" . (int)$ResponderActive . "',
+			`date_from` = '" . (int)$ts_from . "',
+			`date_until` = '" . (int)$ts_until . "',			
+			`subject` = '" . $db->escape($subject) . "'
+			WHERE `email` = '" . $db->escape($account) . "'
+			AND `customerid` = '" . $db->escape((int)$userinfo['customerid']) . "'
+			");
+		redirectTo($filename, Array('s' => $s));
+	}
+
+	$email = trim(htmlspecialchars($_GET['email']));
+
+	// Get account data
+
+	$result = $db->query("SELECT * FROM `" . TABLE_MAIL_AUTORESPONDER . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` = '" . $db->escape($email) . "' LIMIT 0,1");
+
+	if($db->num_rows($result) == 0)
+	{
+		standard_error('invalidautoresponder');
+	}
+
+	$row = $db->fetch_array($result);
+	$subject = htmlspecialchars($row['subject']);
+	$message = htmlspecialchars($row['message']);
+	
+	$date_from = (int)$row['date_from'];
+	$date_until = (int)$row['date_until'];
+	
+	if($date_from == -1)
+	{
+		$deactivated = '-1';
+	}
+	else
+	{
+		$deactivated = '0';
+		$date_from = date('d-m-Y', $date_from);
+	}
+	$date_from_off = makecheckbox('date_from_off', $lng['panel']['not_activated'], '-1', false, $deactivated, true, true);
+	
+	if($date_until == -1)
+	{
+		$deactivated = '-1';
+		$date_until = '-1';
+	}
+	else
+	{
+		$deactivated = '0';
+		$date_until = date('d-m-Y', $date_until);
+	}
+	$date_from_off = makecheckbox('date_until_off', $lng['panel']['not_activated'], '-1', false, $deactivated, true, true);
+
+	$checked = '';
+
+	if($row['enabled'] == 1)
+	{
+		$checked = "checked=\"checked\"";
+	}
+
+	eval("echo \"" . getTemplate("email/autoresponder_edit") . "\";");
+}
+
+// Delete autoresponder
+
+else
+
+if($action == "delete")
+{
+	if(isset($_POST['send'])
+	   && $_POST['send'] == 'send')
+	{
+		$account = trim($_POST['account']);
+
+		// Does autoresponder exist?
+
+		$result = $db->query("SELECT `email` FROM `" . TABLE_MAIL_AUTORESPONDER . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` = '" . $db->escape($account) . "' LIMIT 0,1");
+
+		if($db->num_rows($result) == 0)
+		{
+			standard_error('invalidautoresponder');
+		}
+
+		$db->query("DELETE FROM `" . TABLE_MAIL_AUTORESPONDER . "`
+			WHERE `email` = '" . $db->escape($account) . "'
+			AND `customerid` = '" . $db->escape((int)$userinfo['customerid']) . "'
+			");
+		redirectTo($filename, Array('s' => $s));
+	}
+
+	$email = trim(htmlspecialchars($_GET['email']));
+	ask_yesno('autoresponderdelete', $filename, array('action' => $action, 'account' => $email));
+}
+
+// List existing autoresponders
+
+else 
+{
+	$autoresponder = '';
+	$result = $db->query("SELECT * FROM `" . TABLE_MAIL_AUTORESPONDER . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' ORDER BY email ASC");
+
+	while($row = $db->fetch_array($result))
+	{
+		if($row['date_from'] == -1 && $row['date_until'] == -1)
+		{
+			$activated_date = $lng['panel']['not_activated'];
+		}
+		elseif($row['date_from'] == -1 && $row['date_until'] != -1)
+		{
+			$activated_date = $lng['autoresponder']['date_until'].': '.date('d-m-Y', $row['date_until']);
+		}
+		elseif($row['date_from'] != -1 && $row['date_until'] == -1)
+		{
+			$activated_date = $lng['autoresponder']['date_from'].': '.date('d-m-Y', $row['date_from']);
+		}	
+		else
+		{
+			$activated_date = date('d-m-Y', $row['date_from']) . ' - ' . date('d-m-Y', $row['date_until']);
+		}
+		eval("\$autoresponder.=\"" . getTemplate("email/autoresponder_autoresponder") . "\";");
+	}	
+
+	eval("echo \"" . getTemplate("email/autoresponder") . "\";");
+}
+
+?>
--- a/customer_domains.php
+++ b/customer_domains.php
--- a/customer_email.php
+++ b/customer_email.php
--- a/customer_extras.php
+++ b/customer_extras.php
@@ -14,34 +14,43 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Panel
- *
+ * @version    $Id$
 */

 define('AREA', 'customer');
-require './lib/init.php';

-if (isset($_POST['id'])) {
+/**
+ * Include our init.php, which manages Sessions, Language etc.
+ */
+
+require ("./lib/init.php");
+
+if(isset($_POST['id']))
+{
 	$id = intval($_POST['id']);
-} elseif (isset($_GET['id'])) {
+}
+elseif(isset($_GET['id']))
+{
 	$id = intval($_GET['id']);
 }

-if ($page == 'overview') {
+if($page == 'overview')
+{
 	$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_extras");
 	eval("echo \"" . getTemplate("extras/extras") . "\";");
-} elseif ($page == 'htpasswds') {
-	if ($action == '') {
+}
+elseif($page == 'htpasswds')
+{
+	if($action == '')
+	{
 		$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_extras::htpasswds");
 		$fields = array(
 			'username' => $lng['login']['username'],
 			'path' => $lng['panel']['path']
 		);
-		$paging = new paging($userinfo, TABLE_PANEL_HTPASSWDS, $fields);
-		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_HTPASSWDS . "`
-			WHERE `customerid`= :customerid " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit()
-		);
-		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid']));
-		$paging->setEntries(Database::num_rows());
+		$paging = new paging($userinfo, $db, TABLE_PANEL_HTPASSWDS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
+		$result = $db->query("SELECT `id`, `username`, `path` FROM `" . TABLE_PANEL_HTPASSWDS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
+		$paging->setEntries($db->num_rows($result));
 		$sortcode = $paging->getHtmlSortCode($lng);
 		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
 		$searchcode = $paging->getHtmlSearchCode($lng);
@@ -50,12 +59,15 @@ if ($page == 'overview') {
 		$count = 0;
 		$htpasswds = '';

-		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-			if ($paging->checkDisplay($i)) {
-				if (strpos($row['path'], $userinfo['documentroot']) === 0) {
-					$row['path'] = str_replace($userinfo['documentroot'], "/", $row['path']);
+		while($row = $db->fetch_array($result))
+		{
+			if($paging->checkDisplay($i))
+			{
+				if(strpos($row['path'], $userinfo['documentroot']) === 0)
+				{
+					$row['path'] = substr($row['path'], strlen($userinfo['documentroot']));
 				}
-				$row['path'] = makeCorrectDir($row['path']);
+
 				$row = htmlentities_array($row);
 				eval("\$htpasswds.=\"" . getTemplate("extras/htpasswds_htpasswd") . "\";");
 				$count++;
@@ -65,197 +77,155 @@ if ($page == 'overview') {
 		}

 		eval("echo \"" . getTemplate("extras/htpasswds") . "\";");
-	} elseif ($action == 'delete' && $id != 0) {
-		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_HTPASSWDS . "`
-			WHERE `customerid`= :customerid
-			AND `id`= :id"
-		);
-		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
-		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
-
-		if (isset($result['username']) && $result['username'] != '') {
-			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-				$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_HTPASSWDS . "`
-					WHERE `customerid`= :customerid
-					AND `id`= :id"
-				);
-				Database::pexecute($stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
+	}
+	elseif($action == 'delete'
+	       && $id != 0)
+	{
+		$result = $db->query_first("SELECT `id`, `customerid`, `username`, `path` FROM `" . TABLE_PANEL_HTPASSWDS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");

+		if(isset($result['username'])
+		   && $result['username'] != '')
+		{
+			if(isset($_POST['send'])
+			   && $_POST['send'] == 'send')
+			{
+				$db->query("DELETE FROM `" . TABLE_PANEL_HTPASSWDS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='$id'");
 				$log->logAction(USR_ACTION, LOG_INFO, "deleted htpasswd for '" . $result['username'] . " (" . $result['path'] . ")'");
 				inserttask('1');
-				redirectTo($filename, array('page' => $page, 's' => $s));
-			} else {
-				if (strpos($result['path'], $userinfo['documentroot']) === 0) {
-				    $result['path'] = str_replace($userinfo['documentroot'], "/", $result['path']);
+				redirectTo($filename, Array('page' => $page, 's' => $s));
+			}
+			else
+			{
+				if(strpos($result['path'], $userinfo['documentroot']) === 0)
+				{
+					$result['path'] = substr($result['path'], strlen($userinfo['documentroot']));
 				}

 				ask_yesno('extras_reallydelete', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $result['username'] . ' (' . $result['path'] . ')');
 			}
 		}
-	} elseif ($action == 'add') {
-		if (isset($_POST['send']) && $_POST['send'] == 'send') {
+	}
+	elseif($action == 'add')
+	{
+		if(isset($_POST['send'])
+		   && $_POST['send'] == 'send')
+		{
 			$path = makeCorrectDir(validate($_POST['path'], 'path'));
 			$userpath = $path;
 			$path = makeCorrectDir($userinfo['documentroot'] . '/' . $path);
 			$username = validate($_POST['username'], 'username', '/^[a-zA-Z0-9][a-zA-Z0-9\-_]+\$?$/');
-			$authname = validate($_POST['directory_authname'], 'directory_authname', '/^[a-zA-Z0-9][a-zA-Z0-9\-_ ]+\$?$/');
 			validate($_POST['directory_password'], 'password');
+			$username_path_check = $db->query_first("SELECT `id`, `username`, `path` FROM `" . TABLE_PANEL_HTPASSWDS . "` WHERE `username`='" . $db->escape($username) . "' AND `path`='" . $db->escape($path) . "' AND `customerid`='" . (int)$userinfo['customerid'] . "'");

-			$username_path_check_stmt = Database::prepare("SELECT `id`, `username`, `path` FROM `" . TABLE_PANEL_HTPASSWDS . "`
-				WHERE `username`= :username
-				AND `path`= :path
-				AND `customerid`= :customerid"
-			);
-			$params = array(
-				"username" => $username,
-				"path" => $path,
-				"customerid" => $userinfo['customerid']
-			);
-			Database::pexecute($username_path_check_stmt, $params);
-			$username_path_check = $username_path_check_stmt->fetch(PDO::FETCH_ASSOC);
-
-			if (CRYPT_STD_DES == 1) {
+			if(CRYPT_STD_DES == 1)
+			{
 				$saltfordescrypt = substr(md5(uniqid(microtime(), 1)), 4, 2);
 				$password = crypt($_POST['directory_password'], $saltfordescrypt);
-			} else {
+			}
+			else
+			{
 				$password = crypt($_POST['directory_password']);
 			}

-			if (!$_POST['path']) {
+			if(!$_POST['path'])
+			{
 				standard_error('invalidpath');
 			}

-			if ($username == '') {
+			if($username == '')
+			{
 				standard_error(array('stringisempty', 'myloginname'));
-			} elseif ($username_path_check['username'] == $username && $username_path_check['path'] == $path) {
+			}
+			elseif($username_path_check['username'] == $username
+			       && $username_path_check['path'] == $path)
+			{
 				standard_error('userpathcombinationdupe');
-			} elseif ($_POST['directory_password'] == '') {
+			}
+			elseif($_POST['directory_password'] == '')
+			{
 				standard_error(array('stringisempty', 'mypassword'));
-			} elseif ($path == '') {
+			}
+			elseif($path == '')
+			{
 				standard_error('patherror');
-			} elseif ($_POST['directory_password'] == $username) {
-				standard_error('passwordshouldnotbeusername');
-			} else {
-				$stmt = Database::prepare("INSERT INTO `" . TABLE_PANEL_HTPASSWDS . "` SET
-					`customerid` = :customerid,
-					`username` = :username,
-					`password` = :password,
-					`path` = :path,
-					`authname` = :authname"
-				);
-				$params = array(
-					"customerid" => $userinfo['customerid'],
-					"username" => $username,
-					"password" => $password,
-					"path" => $path,
-					"authname" => $authname
-				);
-				Database::pexecute($stmt, $params);
+			}
+			else
+			{
+				$db->query("INSERT INTO `" . TABLE_PANEL_HTPASSWDS . "` (`customerid`, `username`, `password`, `path`) VALUES ('" . (int)$userinfo['customerid'] . "', '" . $db->escape($username) . "', '" . $db->escape($password) . "', '" . $db->escape($path) . "')");
 				$log->logAction(USR_ACTION, LOG_INFO, "added htpasswd for '" . $username . " (" . $path . ")'");
 				inserttask('1');
-				redirectTo($filename, array('page' => $page, 's' => $s));
+				redirectTo($filename, Array('page' => $page, 's' => $s));
 			}
-		} else {
-			$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid']);
-
-			$htpasswd_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/extras/formfield.htpasswd_add.php';
-			$htpasswd_add_form = htmlform::genHTMLForm($htpasswd_add_data);
-
-			$title = $htpasswd_add_data['htpasswd_add']['title'];
-			$image = $htpasswd_add_data['htpasswd_add']['image'];
-
+		}
+		else
+		{
+			$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit']);
 			eval("echo \"" . getTemplate("extras/htpasswds_add") . "\";");
 		}
-	} elseif ($action == 'edit' && $id != 0) {
-		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_HTPASSWDS . "`
-			WHERE `customerid`= :customerid
-			AND `id`= :id"
-		);
-		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
-		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+	}
+	elseif($action == 'edit'
+	       && $id != 0)
+	{
+		$result = $db->query_first("SELECT `id`, `username`, `path` FROM `" . TABLE_PANEL_HTPASSWDS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");

-		if (isset($result['username']) && $result['username'] != '') {
-			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+		if(isset($result['username'])
+		   && $result['username'] != '')
+		{
+			if(isset($_POST['send'])
+			   && $_POST['send'] == 'send')
+			{
 				validate($_POST['directory_password'], 'password');
-				$authname = validate($_POST['directory_authname'], 'directory_authname', '/^[a-zA-Z0-9][a-zA-Z0-9\-_ ]+\$?$/');

-				if (CRYPT_STD_DES == 1) {
+				if(CRYPT_STD_DES == 1)
+				{
 					$saltfordescrypt = substr(md5(uniqid(microtime(), 1)), 4, 2);
 					$password = crypt($_POST['directory_password'], $saltfordescrypt);
-				} else {
+				}
+				else
+				{
 					$password = crypt($_POST['directory_password']);
 				}

-				if ($_POST['directory_password'] == $result['username']) {
-					standard_error('passwordshouldnotbeusername');
+				if($_POST['directory_password'] == '')
+				{
+					standard_error(array('stringisempty', 'mypassword'));
 				}
-
-				$params = array(
-					"customerid" => $userinfo['customerid'],
-					"id" => $id
-				);
-
-				$pwd_sql = '';
-				if ($_POST['directory_password'] != '') {
-					$pwd_sql = "`password`= :password ";
-					$params["password"] = $password;
-				}
-
-				$auth_sql = '';
-				if ($authname != $result['authname']) {
-					$auth_sql = "`authname`= :authname ";
-					$params["authname"] = $authname;
-				}
-
-				if ($pwd_sql != '' || $auth_sql != '') {
-					if ($pwd_sql !='' && $auth_sql != '') {
-						$pwd_sql.= ', ';
-					}
-
-					$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_HTPASSWDS . "`
-						SET ".$pwd_sql.$auth_sql."
-						WHERE `customerid`= :customerid
-						AND `id`= :id"
-					);
-					Database::pexecute($stmt, $params);
+				else
+				{
+					$db->query("UPDATE `" . TABLE_PANEL_HTPASSWDS . "` SET `password`='" . $db->escape($password) . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
 					$log->logAction(USR_ACTION, LOG_INFO, "edited htpasswd for '" . $result['username'] . " (" . $result['path'] . ")'");
 					inserttask('1');
-					redirectTo($filename, array('page' => $page, 's' => $s));
+					redirectTo($filename, Array('page' => $page, 's' => $s));
 				}
-			} else {
-				if (strpos($result['path'], $userinfo['documentroot']) === 0) {
-					$result['path'] = str_replace($userinfo['documentroot'], "/", $result['path']);
+			}
+			else
+			{
+				if(strpos($result['path'], $userinfo['documentroot']) === 0)
+				{
+					$result['path'] = substr($result['path'], strlen($userinfo['documentroot']));
 				}

 				$result = htmlentities_array($result);
-
-				$htpasswd_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/extras/formfield.htpasswd_edit.php';
-				$htpasswd_edit_form = htmlform::genHTMLForm($htpasswd_edit_data);
-
-				$title = $htpasswd_edit_data['htpasswd_edit']['title'];
-				$image = $htpasswd_edit_data['htpasswd_edit']['image'];
-
 				eval("echo \"" . getTemplate("extras/htpasswds_edit") . "\";");
 			}
 		}
 	}
-} elseif ($page == 'htaccess') {
-	if ($action == '') {
+}
+elseif($page == 'htaccess')
+{
+	if($action == '')
+	{
 		$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_extras::htaccess");
 		$fields = array(
 			'path' => $lng['panel']['path'],
 			'options_indexes' => $lng['extras']['view_directory'],
 			'error404path' => $lng['extras']['error404path'],
 			'error403path' => $lng['extras']['error403path'],
-			'error500path' => $lng['extras']['error500path'],
-			'options_cgi' => $lng['extras']['execute_perl']
+			'error500path' => $lng['extras']['error500path']
 		);
-		$paging = new paging($userinfo, TABLE_PANEL_HTACCESS, $fields);
-		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_HTACCESS . "`
-			WHERE `customerid`= :customerid " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit()
-		);
-		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid']));
-		$paging->setEntries(Database::num_rows());
+		$paging = new paging($userinfo, $db, TABLE_PANEL_HTACCESS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
+		$result = $db->query("SELECT `id`, `path`, `options_indexes`, `error404path`, `error403path`, `error500path` FROM `" . TABLE_PANEL_HTACCESS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
+		$paging->setEntries($db->num_rows($result));
 		$sortcode = $paging->getHtmlSortCode($lng);
 		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
 		$searchcode = $paging->getHtmlSearchCode($lng);
@@ -264,18 +234,17 @@ if ($page == 'overview') {
 		$count = 0;
 		$htaccess = '';

-		$cperlenabled = customerHasPerlEnabled($userinfo['customerid']);
-
-		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-			if ($paging->checkDisplay($i)) {
-				if (strpos($row['path'], $userinfo['documentroot']) === 0) {
-					$row['path'] = str_replace($userinfo['documentroot'], "/", $row['path']);
+		while($row = $db->fetch_array($result))
+		{
+			if($paging->checkDisplay($i))
+			{
+				if(strpos($row['path'], $userinfo['documentroot']) === 0)
+				{
+					$row['path'] = substr($row['path'], strlen($userinfo['documentroot']));
 				}
-				$row['path'] = makeCorrectDir($row['path']);
+
 				$row['options_indexes'] = str_replace('1', $lng['panel']['yes'], $row['options_indexes']);
 				$row['options_indexes'] = str_replace('0', $lng['panel']['no'], $row['options_indexes']);
-				$row['options_cgi'] = str_replace('1', $lng['panel']['yes'], $row['options_cgi']);
-				$row['options_cgi'] = str_replace('0', $lng['panel']['no'], $row['options_cgi']);
 				$row = htmlentities_array($row);
 				eval("\$htaccess.=\"" . getTemplate("extras/htaccess_htaccess") . "\";");
 				$count++;
@@ -285,200 +254,175 @@ if ($page == 'overview') {
 		}

 		eval("echo \"" . getTemplate("extras/htaccess") . "\";");
-	} elseif ($action == 'delete' && $id != 0) {
-		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_HTACCESS . "`
-			WHERE `customerid` = :customerid
-			AND `id` = :id"
-		);
-		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
-		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+	}
+	elseif($action == 'delete'
+	       && $id != 0)
+	{
+		$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_HTACCESS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");

-		if (isset($result['customerid']) && $result['customerid'] != '' && $result['customerid'] == $userinfo['customerid']) {
-			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-				// do we have to remove the symlink and folder in suexecpath?
-				if ((int)Settings::Get('perl.suexecworkaround') == 1) {
-					$loginname = getCustomerDetail($result['customerid'], 'loginname');
-					$suexecpath = makeCorrectDir(Settings::Get('perl.suexecpath').'/'.$loginname.'/'.md5($result['path']).'/');
-					$perlsymlink = makeCorrectFile($result['path'].'/cgi-bin');
-					// remove symlink
-					if (file_exists($perlsymlink)) {
-						safe_exec('rm -f '.escapeshellarg($perlsymlink));
-						$log->logAction(USR_ACTION, LOG_DEBUG, "deleted suexecworkaround symlink '" . $perlsymlink . "'");
-					}
-					// remove folder in suexec-path
-					if (file_exists($suexecpath)) {
-						safe_exec('rm -rf '.escapeshellarg($suexecpath));
-						$log->logAction(USR_ACTION, LOG_DEBUG, "deleted suexecworkaround path '" . $suexecpath . "'");
-					}
-				}
-				$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_HTACCESS . "`
-					WHERE `customerid`= :customerid
-					AND `id`= :id"
-				);
-				Database::pexecute($stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
-				$log->logAction(USR_ACTION, LOG_INFO, "deleted htaccess for '" . str_replace($userinfo['documentroot'], '/', $result['path']) . "'");
+		if(isset($result['customerid'])
+		   && $result['customerid'] != ''
+		   && $result['customerid'] == $userinfo['customerid'])
+		{
+			if(isset($_POST['send'])
+			   && $_POST['send'] == 'send')
+			{
+				$db->query("DELETE FROM `" . TABLE_PANEL_HTACCESS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
+				$log->logAction(USR_ACTION, LOG_INFO, "deleted htaccess for '" . str_replace($userinfo['documentroot'], '', $result['path']) . "'");
 				inserttask('1');
-				redirectTo($filename, array('page' => $page, 's' => $s));
-			} else {
-				ask_yesno('extras_reallydelete_pathoptions', $filename, array('id' => $id, 'page' => $page, 'action' => $action), str_replace($userinfo['documentroot'], '/', $result['path']));
+				redirectTo($filename, Array('page' => $page, 's' => $s));
+			}
+			else
+			{
+				ask_yesno('extras_reallydelete_pathoptions', $filename, array('id' => $id, 'page' => $page, 'action' => $action), str_replace($userinfo['documentroot'], '', $result['path']));
 			}
 		}
-	} elseif ($action == 'add') {
-		if (isset($_POST['send']) && $_POST['send'] == 'send') {
+	}
+	elseif($action == 'add')
+	{
+		if(isset($_POST['send'])
+		   && $_POST['send'] == 'send')
+		{
 			$path = makeCorrectDir(validate($_POST['path'], 'path'));
 			$userpath = $path;
 			$path = makeCorrectDir($userinfo['documentroot'] . '/' . $path);
-			$path_dupe_check_stmt = Database::prepare("SELECT `id`, `path` FROM `" . TABLE_PANEL_HTACCESS . "`
-				WHERE `path`= :path
-				AND `customerid`= :customerid"
-			);
-			Database::pexecute($path_dupe_check_stmt, array("path" => $path, "customerid" => $userinfo['customerid']));
-			$path_dupe_check = $path_dupe_check_stmt->fetch(PDO::FETCH_ASSOC);
+			$path_dupe_check = $db->query_first("SELECT `id`, `path` FROM `" . TABLE_PANEL_HTACCESS . "` WHERE `path`='" . $db->escape($path) . "' AND `customerid`='" . (int)$userinfo['customerid'] . "'");

-			if (!$_POST['path']) {
+			if(!$_POST['path'])
+			{
 				standard_error('invalidpath');
 			}

-			if (isset($_POST['options_cgi']) && (int)$_POST['options_cgi'] != 0) {
-				$options_cgi = '1';
-			} else {
-				$options_cgi = '0';
+			if(($_POST['error404path'] === '')
+			   || (validateUrl($idna_convert->encode($_POST['error404path']))))
+			{
+				$error404path = $_POST['error404path'];
+			}
+			else
+			{
+				standard_error('mustbeurl');
 			}

-			$error404path = '';
-			if (isset($_POST['error404path'])) {
-				$error404path = correctErrorDocument($_POST['error404path']);
+			if(($_POST['error403path'] === '')
+			   || (validateUrl($idna_convert->encode($_POST['error403path']))))
+			{
+				$error403path = $_POST['error403path'];
+			}
+			else
+			{
+				standard_error('mustbeurl');
 			}

-			$error403path = '';
-			if (isset($_POST['error403path'])) {
-				$error403path = correctErrorDocument($_POST['error403path']);
+			if(($_POST['error500path'] === '')
+			   || (validateUrl($idna_convert->encode($_POST['error500path']))))
+			{
+				$error500path = $_POST['error500path'];
+			}
+			else
+			{
+				standard_error('mustbeurl');
 			}

-			$error500path = '';
-			if (isset($_POST['error500path'])) {
-				$error500path = correctErrorDocument($_POST['error500path']);
-			}
-
-			if ($path_dupe_check['path'] == $path) {
+			if($path_dupe_check['path'] == $path)
+			{
 				standard_error('errordocpathdupe', $userpath);
-			} elseif ($path == '') {
+			}
+			elseif($path == '')
+			{
 				standard_error('patherror');
-			} else {
-				$stmt = Database::prepare('INSERT INTO `' . TABLE_PANEL_HTACCESS . '` SET
-					`customerid` = :customerid,
-					`path` = :path,
-					`options_indexes` = :options_indexes,
-					`error404path` = :error404path,
-					`error403path` = :error403path,
-					`error500path` = :error500path,
-					`options_cgi` = :options_cgi'
-				);
-				$params = array(
-					"customerid" => $userinfo['customerid'],
-					"path" => $path,
-					"options_indexes" => $_POST['options_indexes'] == '1' ? '1' : '0',
-					"error403path" => $error403path,
-					"error404path" => $error404path,
-					"error500path" => $error500path,
-					"options_cgi" => $options_cgi
-				);
-				Database::pexecute($stmt, $params);
-
+			}
+			else
+			{
+				$db->query('INSERT INTO `' . TABLE_PANEL_HTACCESS . '`  (`customerid`,  `path`,  `options_indexes`,  `error404path`,  `error403path`,  `error500path`  ) VALUES ("' . (int)$userinfo['customerid'] . '",  "' . $db->escape($path) . '",  "' . $db->escape($_POST['options_indexes'] == '1' ? '1' : '0') . '",  "' . $db->escape($error404path) . '",  "' . $db->escape($error403path) . '",  "' . $db->escape($error500path) . '"  )');
 				$log->logAction(USR_ACTION, LOG_INFO, "added htaccess for '" . $path . "'");
 				inserttask('1');
-				redirectTo($filename, array('page' => $page, 's' => $s));
+				redirectTo($filename, Array('page' => $page, 's' => $s));
 			}
-		} else {
-			$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid']);
-			$cperlenabled = customerHasPerlEnabled($userinfo['customerid']);
-
-			$htaccess_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/extras/formfield.htaccess_add.php';
-			$htaccess_add_form = htmlform::genHTMLForm($htaccess_add_data);
-
-			$title = $htaccess_add_data['htaccess_add']['title'];
-			$image = $htaccess_add_data['htaccess_add']['image'];
-
+		}
+		else
+		{
+			$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit']);
+			$options_indexes = makeyesno('options_indexes', '1', '0', '1');
 			eval("echo \"" . getTemplate("extras/htaccess_add") . "\";");
 		}
-	} elseif (($action == 'edit') && ($id != 0)) {
-		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_HTACCESS . "`
-			WHERE `customerid` = :customerid
-			AND `id` = :id"
-		);
-		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
-		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+	}
+	elseif(($action == 'edit')
+	       && ($id != 0))
+	{
+		$result = $db->query_first('SELECT * FROM `' . TABLE_PANEL_HTACCESS . '` WHERE `customerid` = "' . (int)$userinfo['customerid'] . '"  AND `id`         = "' . (int)$id . '"');

-		if ((isset($result['customerid'])) && ($result['customerid'] != '') && ($result['customerid'] == $userinfo['customerid'])) {
-			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+		if((isset($result['customerid']))
+		   && ($result['customerid'] != '')
+		   && ($result['customerid'] == $userinfo['customerid']))
+		{
+			if(isset($_POST['send'])
+			   && $_POST['send'] == 'send')
+			{
 				$option_indexes = intval($_POST['options_indexes']);
-				$options_cgi = isset($_POST['options_cgi']) ? intval($_POST['options_cgi']) : 0;

-				if ($option_indexes != '1') {
+				if($option_indexes != '1')
+				{
 					$option_indexes = '0';
 				}

-				if ($options_cgi != '1') {
-					$options_cgi = '0';
+				if(($_POST['error404path'] === '')
+				   || (validateUrl($idna_convert->encode($_POST['error404path']))))
+				{
+					$error404path = $_POST['error404path'];
+				}
+				else
+				{
+					standard_error('mustbeurl');
 				}

-				$error404path = correctErrorDocument($_POST['error404path']);
-				$error403path = correctErrorDocument($_POST['error403path']);
-				$error500path = correctErrorDocument($_POST['error500path']);
+				if(($_POST['error403path'] === '')
+				   || (validateUrl($idna_convert->encode($_POST['error403path']))))
+				{
+					$error403path = $_POST['error403path'];
+				}
+				else
+				{
+					standard_error('mustbeurl');
+				}

-				if (($option_indexes != $result['options_indexes'])
-					|| ($error404path != $result['error404path'])
-					|| ($error403path != $result['error403path'])
-					|| ($error500path != $result['error500path'])
-					|| ($options_cgi != $result['options_cgi'])
-				) {
+				if(($_POST['error500path'] === '')
+				   || (validateUrl($idna_convert->encode($_POST['error500path']))))
+				{
+					$error500path = $_POST['error500path'];
+				}
+				else
+				{
+					standard_error('mustbeurl');
+				}
+
+				if(($option_indexes != $result['options_indexes'])
+				   || ($error404path != $result['error404path'])
+				   || ($error403path != $result['error403path'])
+				   || ($error500path != $result['error500path']))
+				{
 					inserttask('1');
-					$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_HTACCESS . "`
-						SET `options_indexes` = :options_indexes,
-						`error404path` = :error404path,
-						`error403path` = :error403path,
-						`error500path` = :error500path,
-						`options_cgi` = :options_cgi
-						WHERE `customerid` = :customerid
-						AND `id` = :id"
-					);
-					$params = array(
-						"customerid" => $userinfo['customerid'],
-						"options_indexes" => $_POST['options_indexes'] == '1' ? '1' : '0',
-						"error403path" => $error403path,
-						"error404path" => $error404path,
-						"error500path" => $error500path,
-						"options_cgi" => $options_cgi,
-						"id" => $id
-					);
-					Database::pexecute($stmt, $params);
-					$log->logAction(USR_ACTION, LOG_INFO, "edited htaccess for '" . str_replace($userinfo['documentroot'], '/', $result['path']) . "'");
+					$db->query('UPDATE `' . TABLE_PANEL_HTACCESS . '` SET `options_indexes` = "' . $db->escape($option_indexes) . '", `error404path`    = "' . $db->escape($error404path) . '",  `error403path`    = "' . $db->escape($error403path) . '",  `error500path`    = "' . $db->escape($error500path) . '" WHERE `customerid` = "' . (int)$userinfo['customerid'] . '"  AND `id` = "' . (int)$id . '"');
+					$log->logAction(USR_ACTION, LOG_INFO, "edited htaccess for '" . str_replace($userinfo['documentroot'], '', $result['path']) . "'");
 				}

-				redirectTo($filename, array('page' => $page, 's' => $s));
-			} else {
-				if (strpos($result['path'], $userinfo['documentroot']) === 0) {
-					$result['path'] = str_replace($userinfo['documentroot'], "/", $result['path']);
+				redirectTo($filename, Array('page' => $page, 's' => $s));
+			}
+			else
+			{
+				if(strpos($result['path'], $userinfo['documentroot']) === 0)
+				{
+					$result['path'] = substr($result['path'], strlen($userinfo['documentroot']));
 				}

 				$result['error404path'] = $result['error404path'];
 				$result['error403path'] = $result['error403path'];
 				$result['error500path'] = $result['error500path'];
-				$cperlenabled = customerHasPerlEnabled($userinfo['customerid']);
-				/*
 				$options_indexes = makeyesno('options_indexes', '1', '0', $result['options_indexes']);
-				$options_cgi = makeyesno('options_cgi', '1', '0', $result['options_cgi']);
-				*/
 				$result = htmlentities_array($result);
-
-				$htaccess_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/extras/formfield.htaccess_edit.php';
-				$htaccess_edit_form = htmlform::genHTMLForm($htaccess_edit_data);
-
-				$title = $htaccess_edit_data['htaccess_edit']['title'];
-				$image = $htaccess_edit_data['htaccess_edit']['image'];
-
 				eval("echo \"" . getTemplate("extras/htaccess_edit") . "\";");
 			}
 		}
 	}
 }
+
+?>
--- a/customer_ftp.php
+++ b/customer_ftp.php
@@ -14,38 +14,43 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Panel
- *
+ * @version    $Id$
 */

 define('AREA', 'customer');
-require './lib/init.php';

-$id = 0;
-if (isset($_POST['id'])) {
+/**
+ * Include our init.php, which manages Sessions, Language etc.
+ */
+
+require ("./lib/init.php");
+
+if(isset($_POST['id']))
+{
 	$id = intval($_POST['id']);
-} elseif (isset($_GET['id'])) {
+}
+elseif(isset($_GET['id']))
+{
 	$id = intval($_GET['id']);
 }

-if ($page == 'overview') {
+if($page == 'overview')
+{
 	$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_ftp");
-	eval("echo \"" . getTemplate('ftp/ftp') . "\";");
-} elseif ($page == 'accounts') {
-	if ($action == '') {
+	eval("echo \"" . getTemplate("ftp/ftp") . "\";");
+}
+elseif($page == 'accounts')
+{
+	if($action == '')
+	{
 		$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_ftp::accounts");
 		$fields = array(
 			'username' => $lng['login']['username'],
-			'homedir' => $lng['panel']['path'],
-			'description' => $lng['panel']['ftpdesc']
+			'homedir' => $lng['panel']['path']
 		);
-		$paging = new paging($userinfo, TABLE_FTP_USERS, $fields);
-
-		$result_stmt = Database::prepare("SELECT `id`, `username`, `description`, `homedir` FROM `" . TABLE_FTP_USERS . "`
-			WHERE `customerid`= :customerid " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit()
-		);
-		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid']));
-		$ftps_count = Database::num_rows();
-		$paging->setEntries($ftps_count);
+		$paging = new paging($userinfo, $db, TABLE_FTP_USERS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
+		$result = $db->query("SELECT `id`, `username`, `homedir` FROM `" . TABLE_FTP_USERS . "` WHERE `customerid`='" . $userinfo['customerid'] . "' " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
+		$paging->setEntries($db->num_rows($result));
 		$sortcode = $paging->getHtmlSortCode($lng);
 		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
 		$searchcode = $paging->getHtmlSearchCode($lng);
@@ -54,396 +59,187 @@ if ($page == 'overview') {
 		$count = 0;
 		$accounts = '';

-		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-			if ($paging->checkDisplay($i)) {
-				if (strpos($row['homedir'], $userinfo['documentroot']) === 0) {
-					$row['documentroot'] = str_replace($userinfo['documentroot'], "/", $row['homedir']);
-				} else {
+		while($row = $db->fetch_array($result))
+		{
+			if($paging->checkDisplay($i))
+			{
+				if(strpos($row['homedir'], $userinfo['documentroot']) === 0)
+				{
+					$row['documentroot'] = substr($row['homedir'], strlen($userinfo['documentroot']));
+				}
+				else
+				{
 					$row['documentroot'] = $row['homedir'];
 				}

 				$row['documentroot'] = makeCorrectDir($row['documentroot']);
-
+				
 				$row = htmlentities_array($row);
-				eval("\$accounts.=\"" . getTemplate('ftp/accounts_account') . "\";");
+				eval("\$accounts.=\"" . getTemplate("ftp/accounts_account") . "\";");
 				$count++;
 			}

 			$i++;
 		}

-		eval("echo \"" . getTemplate('ftp/accounts') . "\";");
-	} elseif ($action == 'delete' && $id != 0) {
-		$result_stmt = Database::prepare("SELECT `id`, `username`, `homedir`, `up_count`, `up_bytes`, `down_count`, `down_bytes` FROM `" . TABLE_FTP_USERS . "`
-			WHERE `customerid` = :customerid
-			AND `id` = :id"
-		);
-		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
-		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
-
-		if (isset($result['username']) && $result['username'] != $userinfo['loginname']) {
-			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-				$stmt = Database::prepare("UPDATE `" . TABLE_FTP_USERS . "`
-					SET `up_count` = `up_count` + :up_count,
-					`up_bytes` = `up_bytes` + :up_bytes,
-					`down_count` = `down_count` + :down_count,
-					`down_bytes` = `down_bytes` + :down_bytes
-					WHERE `username` = :username"
-				);
-				$params = array(
-					"up_count" => $result['up_count'],
-					"up_bytes" => $result['up_bytes'],
-					"down_count" => $result['down_count'],
-					"down_bytes" => $result['down_bytes'],
-					"username" => $userinfo['loginname']
-				);
-				Database::pexecute($stmt, $params);
-
-				$result_stmt = Database::prepare("SELECT `username`, `homedir` FROM `" . TABLE_FTP_USERS . "`
-					WHERE `customerid` = :customerid
-					AND `id` = :id"
-				);
-				Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
-				$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
-
-				$stmt = Database::prepare("DELETE FROM `" . TABLE_FTP_QUOTATALLIES . "` WHERE `name` = :name");
-				Database::pexecute($stmt, array("name" => $result['username']));
-
-				$stmt = Database::prepare("DELETE FROM `" . TABLE_FTP_USERS . "`
-					WHERE `customerid` = :customerid
-					AND `id` = :id"
-				);
-				Database::pexecute($stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
-
-				$stmt = Database::prepare("
-					UPDATE `" . TABLE_FTP_GROUPS . "` SET
-					`members` = REPLACE(`members`, :username,'')
-					WHERE `customerid` = :customerid
-				");
-				Database::pexecute($stmt, array("username" => ",".$result['username'], "customerid" => $userinfo['customerid']));
+		$ftps_count = $db->num_rows($result);
+		eval("echo \"" . getTemplate("ftp/accounts") . "\";");
+	}
+	elseif($action == 'delete'
+	       && $id != 0)
+	{
+		$result = $db->query_first("SELECT `id`, `username`, `homedir`, `up_count`, `up_bytes`, `down_count`, `down_bytes` FROM `" . TABLE_FTP_USERS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");

+		if(isset($result['username'])
+		   && $result['username'] != $userinfo['loginname'])
+		{
+			if(isset($_POST['send'])
+			   && $_POST['send'] == 'send')
+			{
+				$db->query("UPDATE `" . TABLE_FTP_USERS . "` SET `up_count`=`up_count`+'" . (int)$result['up_count'] . "', `up_bytes`=`up_bytes`+'" . (int)$result['up_bytes'] . "', `down_count`=`down_count`+'" . (int)$result['down_count'] . "', `down_bytes`=`down_bytes`+'" . (int)$result['down_bytes'] . "' WHERE `username`='" . $db->escape($userinfo['loginname']) . "'");
+				$db->query("DELETE FROM `" . TABLE_FTP_USERS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
 				$log->logAction(USR_ACTION, LOG_INFO, "deleted ftp-account '" . $result['username'] . "'");
+				$db->query("UPDATE `" . TABLE_FTP_GROUPS . "` SET `members`=REPLACE(`members`,'," . $db->escape($result['username']) . "','') WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");

-				$resetaccnumber = ($userinfo['ftps_used'] == '1') ? " , `ftp_lastaccountnumber`='0'" : '';
+				//					$db->query("DELETE FROM `".TABLE_FTP_GROUPS."` WHERE `customerid`='".$userinfo['customerid']."' AND `id`='$id'");

-				// refs #293
-				if (isset($_POST['delete_userfiles']) && (int)$_POST['delete_userfiles'] == 1) {
-					inserttask('8', $userinfo['loginname'], $result['homedir']);
+				if($userinfo['ftps_used'] == '1')
+				{
+					$resetaccnumber = " , `ftp_lastaccountnumber`='0'";
+				}
+				else
+				{
+					$resetaccnumber = '';
 				}

-				$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "`
-					SET `ftps_used` = `ftps_used` - 1 $resetaccnumber
-					WHERE `customerid` = :customerid"
-				);
-				Database::pexecute($stmt, array("customerid" => $userinfo['customerid']));
-
-				redirectTo($filename, array('page' => $page, 's' => $s));
-			} else {
-				ask_yesno_withcheckbox('ftp_reallydelete', 'admin_customer_alsoremoveftphomedir', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $result['username']);
+				$result = $db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `ftps_used`=`ftps_used`-1 $resetaccnumber WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
+				redirectTo($filename, Array('page' => $page, 's' => $s));
 			}
-		} else {
+			else
+			{
+				ask_yesno('ftp_reallydelete', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $result['username']);
+			}
+		}
+		else
+		{
 			standard_error('ftp_cantdeletemainaccount');
 		}
-	} elseif ($action == 'add') {
-		if ($userinfo['ftps_used'] < $userinfo['ftps'] || $userinfo['ftps'] == '-1') {
-			if (isset($_POST['send'])
-				&& $_POST['send'] == 'send') {
-				$description = validate($_POST['ftp_description'], 'description');
-				// @FIXME use a good path-validating regex here (refs #1231)
+	}
+	elseif($action == 'add')
+	{
+		if($userinfo['ftps_used'] < $userinfo['ftps']
+		   || $userinfo['ftps'] == '-1')
+		{
+			if(isset($_POST['send'])
+			   && $_POST['send'] == 'send')
+			{
 				$path = validate($_POST['path'], 'path');
 				$password = validate($_POST['ftp_password'], 'password');
-				$password = validatePassword($password);

-				$sendinfomail = isset($_POST['sendinfomail']) ? 1 : 0;
-				if ($sendinfomail != 1) {
-					$sendinfomail = 0;
-				}
-
-				if (Settings::Get('customer.ftpatdomain') == '1') {
+				if($settings['customer']['ftpatdomain'] == '1')
+				{
 					$ftpusername = validate($_POST['ftp_username'], 'username', '/^[a-zA-Z0-9][a-zA-Z0-9\-_]+\$?$/');
-					if ($ftpusername == '') {
+					if($ftpusername == '')
+					{
 						standard_error(array('stringisempty', 'username'));
 					}
 					$ftpdomain = $idna_convert->encode(validate($_POST['ftp_domain'], 'domain'));
-					$ftpdomain_check_stmt = Database::prepare("SELECT `id`, `domain`, `customerid` FROM `" . TABLE_PANEL_DOMAINS . "`
-						WHERE `domain` = :domain
-						AND `customerid` = :customerid"
-					);
-					Database::pexecute($ftpdomain_check_stmt, array("domain" => $ftpdomain, "customerid" => $userinfo['customerid']));
-					$ftpdomain_check = $ftpdomain_check_stmt->fetch(PDO::FETCH_ASSOC);
-
-					if ($ftpdomain_check['domain'] != $ftpdomain) {
+					$ftpdomain_check = $db->query_first("SELECT `id`, `domain`, `customerid` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `domain`='" . $db->escape($ftpdomain) . "' AND `customerid`='" . (int)$userinfo['customerid'] . "'");
+					if($ftpdomain_check['domain'] != $ftpdomain)
+					{
 						standard_error('maindomainnonexist', $domain);
 					}
 					$username = $ftpusername . "@" . $ftpdomain;
-				} else {
-					$username = $userinfo['loginname'] . Settings::Get('customer.ftpprefix') . (intval($userinfo['ftp_lastaccountnumber']) + 1);
 				}
-
-				$username_check_stmt = Database::prepare("SELECT * FROM `" . TABLE_FTP_USERS . "`
-					WHERE `username` = :username"
-				);
-				Database::pexecute($username_check_stmt, array("username" => $username));
-				$username_check = $username_check_stmt->fetch(PDO::FETCH_ASSOC);
-
-				if (!empty($username_check) && $username_check['username'] = $username) {
+				else
+				{
+					$username = $userinfo['loginname'] . $settings['customer']['ftpprefix'] . (intval($userinfo['ftp_lastaccountnumber']) + 1);
+				}
+				
+				$username_check = $db->query_first('SELECT * FROM `' . TABLE_FTP_USERS .'` WHERE `username` = \'' . $db->escape($username) . '\'');
+				
+				if(!empty($username_check) && $username_check['username'] = $username)
+				{
 					standard_error('usernamealreadyexists', $username);
-				} elseif ($password == '') {
+				}
+				elseif($password == '')
+				{
 					standard_error(array('stringisempty', 'mypassword'));
-				} elseif ($path == '') {
+				}
+				elseif($path == '')
+				{
 					standard_error('patherror');
-				} elseif ($username == $password) {
-					standard_error('passwordshouldnotbeusername');
-				} else {
+				}
+				else
+				{
+					$userpath = makeCorrectDir($path);
 					$path = makeCorrectDir($userinfo['documentroot'] . '/' . $path);
+					
+					$db->query("INSERT INTO `" . TABLE_FTP_USERS . "` (`customerid`, `username`, `password`, `homedir`, `login_enabled`, `uid`, `gid`) VALUES ('" . (int)$userinfo['customerid'] . "', '" . $db->escape($username) . "', ENCRYPT('" . $db->escape($password) . "'), '" . $db->escape($path) . "', 'y', '" . (int)$userinfo['guid'] . "', '" . (int)$userinfo['guid'] . "')");
+					$db->query("UPDATE `" . TABLE_FTP_GROUPS . "` SET `members`=CONCAT_WS(',',`members`,'" . $db->escape($username) . "') WHERE `customerid`='" . $userinfo['customerid'] . "' AND `gid`='" . (int)$userinfo['guid'] . "'");

-					$cryptPassword = makeCryptPassword($password);
+					//						$db->query("INSERT INTO `".TABLE_FTP_GROUPS."` (`customerid`, `groupname`, `gid`, `members`) VALUES ('".$userinfo['customerid']."', '$username', '$uid', '$username')");

-					$stmt = Database::prepare("INSERT INTO `" . TABLE_FTP_USERS . "`
-						(`customerid`, `username`, `description`, `password`, `homedir`, `login_enabled`, `uid`, `gid`)
-						VALUES (:customerid, :username, :description, :password, :homedir, 'y', :guid, :guid)"
-					);
-					$params = array(
-						"customerid" => $userinfo['customerid'],
-						"username" => $username,
-						"description" => $description,
-						"password" => $cryptPassword,
-						"homedir" => $path,
-						"guid" => $userinfo['guid']
-					);
-					Database::pexecute($stmt, $params);
+					$db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `ftps_used`=`ftps_used`+1, `ftp_lastaccountnumber`=`ftp_lastaccountnumber`+1 WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");

-					$result_stmt = Database::prepare("SELECT `bytes_in_used` FROM `" . TABLE_FTP_QUOTATALLIES . "`
-						WHERE `name` = :name"
-					);
-					Database::pexecute($result_stmt, array("name" => $userinfo['loginname']));
-
-					while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-						$stmt = Database::prepare("INSERT INTO `" . TABLE_FTP_QUOTATALLIES . "`
-							(`name`, `quota_type`, `bytes_in_used`, `bytes_out_used`, `bytes_xfer_used`, `files_in_used`, `files_out_used`, `files_xfer_used`)
-							VALUES (:name, 'user', :bytes_in_used, '0', '0', '0', '0', '0')"
-						);
-						Database::pexecute($stmt, array("name" => $username, "bytes_in_used" => $row['bytes_in_used']));
-					}
-
-					$stmt = Database::prepare("UPDATE `" . TABLE_FTP_GROUPS . "`
-						SET `members` = CONCAT_WS(',',`members`, :username)
-						WHERE `customerid`= :customerid
-						AND `gid`= :guid"
-					);
-					$params = array(
-						"username" => $username,
-						"customerid" => $userinfo['customerid'],
-						"guid" => $userinfo['guid']
-					);
-					Database::pexecute($stmt, $params);
-
-					$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "`
-						SET `ftps_used` = `ftps_used` + 1,
-						`ftp_lastaccountnumber` = `ftp_lastaccountnumber` + 1
-						WHERE `customerid` = :customerid"
-					);
-					Database::pexecute($stmt, array("customerid" => $userinfo['customerid']));
+					//						$db->query("UPDATE `".TABLE_PANEL_SETTINGS."` SET `value`='$uid' WHERE settinggroup='ftp' AND varname='lastguid'");

 					$log->logAction(USR_ACTION, LOG_INFO, "added ftp-account '" . $username . " (" . $path . ")'");
 					inserttask(5);
-
-					if ($sendinfomail == 1) {
-						$replace_arr = array(
-							'SALUTATION' => getCorrectUserSalutation($userinfo),
-							'CUST_NAME' => getCorrectUserSalutation($userinfo), // < keep this for compatibility
-							'USR_NAME' => $username,
-							'USR_PASS' => $password,
-							'USR_PATH' => makeCorrectDir(str_replace($userinfo['documentroot'], "/", $path))
-						);
-
-						$def_language = $userinfo['def_language'];
-						$result_stmt = Database::prepare("SELECT `value` FROM `" . TABLE_PANEL_TEMPLATES . "`
-							WHERE `adminid` = :adminid
-							AND `language` = :lang
-							AND `templategroup`='mails'
-							AND `varname`='new_ftpaccount_by_customer_subject'"
-						);
-						Database::pexecute($result_stmt, array("adminid" => $userinfo['adminid'], "lang" => $def_language));
-						$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
-						$mail_subject = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['new_ftpaccount_by_customer']['subject']), $replace_arr));
-
-						$def_language = $userinfo['def_language'];
-						$result_stmt = Database::prepare("SELECT `value` FROM `" . TABLE_PANEL_TEMPLATES . "`
-							WHERE `adminid` = :adminid
-							AND `language` = :lang
-							AND `templategroup`='mails'
-							AND `varname`='new_ftpaccount_by_customer_mailbody'"
-						);
-						Database::pexecute($result_stmt, array("adminid" => $userinfo['adminid'], "lang" => $def_language));
-						$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
-						$mail_body = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['new_ftpaccount_by_customer']['mailbody']), $replace_arr));
-
-						$_mailerror = false;
-						try {
-							$mail->Subject = $mail_subject;
-							$mail->AltBody = $mail_body;
-							$mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
-							$mail->AddAddress($userinfo['email'], getCorrectUserSalutation($userinfo));
-							$mail->Send();
-						} catch(phpmailerException $e) {
-							$mailerr_msg = $e->errorMessage();
-							$_mailerror = true;
-						} catch (Exception $e) {
-							$mailerr_msg = $e->getMessage();
-							$_mailerror = true;
-						}
-
-						if ($_mailerror) {
-							$log->logAction(USR_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
-							standard_error('errorsendingmail', $userinfo['email']);
-						}
-
-						$mail->ClearAddresses();
-					}
-
-					redirectTo($filename, array('page' => $page, 's' => $s));
+					redirectTo($filename, Array('page' => $page, 's' => $s));
 				}
-			} else {
-				$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], '/');
+			}
+			else
+			{
+				$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit']);

-				if (Settings::Get('customer.ftpatdomain') == '1') {
-					$domainlist = array();
+				if($settings['customer']['ftpatdomain'] == '1')
+				{
 					$domains = '';

-					$result_domains_stmt = Database::prepare("SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "`
-						WHERE `customerid`= :customerid"
-					);
-					Database::pexecute($result_domains_stmt, array("customerid" => $userinfo['customerid']));
+					$result_domains = $db->query("SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");

-					while ($row_domain = $result_domains_stmt->fetch(PDO::FETCH_ASSOC)) {
-						$domainlist[] =  $row_domain['domain'];
-					}
-
-					sort($domainlist);
-
-					if (isset($domainlist[0]) && $domainlist[0] != '') {
-						foreach ($domainlist as $dom) {
-							$domains .= makeoption($idna_convert->decode($dom), $dom);
-						}
+					while($row_domain = $db->fetch_array($result_domains))
+					{
+						$domains.= makeoption($idna_convert->decode($row_domain['domain']), $row_domain['domain']);
 					}
 				}

-				//$sendinfomail = makeyesno('sendinfomail', '1', '0', '0');
-
-				$ftp_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/ftp/formfield.ftp_add.php';
-				$ftp_add_form = htmlform::genHTMLForm($ftp_add_data);
-
-				$title = $ftp_add_data['ftp_add']['title'];
-				$image = $ftp_add_data['ftp_add']['image'];
-
-				eval("echo \"" . getTemplate('ftp/accounts_add') . "\";");
+				eval("echo \"" . getTemplate("ftp/accounts_add") . "\";");
 			}
 		}
-	} elseif ($action == 'edit' && $id != 0) {
-		$result_stmt = Database::prepare("SELECT `id`, `username`, `description`, `homedir`, `uid`, `gid` FROM `" . TABLE_FTP_USERS . "`
-			WHERE `customerid` = :customerid
-			AND `id` = :id"
-		);
-		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
-		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+	}
+	elseif($action == 'edit'
+	       && $id != 0)
+	{
+		$result = $db->query_first("SELECT `id`, `username`, `homedir` FROM `" . TABLE_FTP_USERS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");

-		if (isset($result['username']) && $result['username'] != '') {
-			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-				// @FIXME use a good path-validating regex here (refs #1231)
-				$path = validate($_POST['path'], 'path');
+		if(isset($result['username'])
+		   && $result['username'] != '')
+		{
+			if(isset($_POST['send'])
+			   && $_POST['send'] == 'send')
+			{
+				$password = validate($_POST['ftp_password'], 'password');

-				$_setnewpass = false;
-				if (isset($_POST['ftp_password']) && $_POST['ftp_password'] != '') {
-					$password = validate($_POST['ftp_password'], 'password');
-					$password = validatePassword($password);
-					$_setnewpass = true;
+				if($password == '')
+				{
+					standard_error(array('stringisempty', 'mypassword'));
+					exit;
 				}
-
-				if ($_setnewpass) {
-					if ($password == '') {
-						standard_error(array('stringisempty', 'mypassword'));
-					} elseif ($result['username'] == $password) {
-						standard_error('passwordshouldnotbeusername');
-					}
-					$log->logAction(USR_ACTION, LOG_INFO, "updated ftp-account password for '" . $result['username'] . "'");
-					$cryptPassword = makeCryptPassword($password);
-
-					$stmt = Database::prepare("UPDATE `" . TABLE_FTP_USERS . "`
-						SET `password` = :password
-						WHERE `customerid` = :customerid
-						AND `id` = :id"
-					);
-					Database::pexecute($stmt, array("customerid" => $userinfo['customerid'], "id" => $id, "password" => $cryptPassword));
+				else
+				{
+					$db->query("UPDATE `" . TABLE_FTP_USERS . "` SET `password`=ENCRYPT('" . $db->escape($password) . "') WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
+					$log->logAction(USR_ACTION, LOG_INFO, "edited ftp-account '" . $result['username'] . "'");
+					redirectTo($filename, Array('page' => $page, 's' => $s));
 				}
-
-				if ($path != '') {
-					$path = makeCorrectDir($userinfo['documentroot'] . '/' . $path);
-
-					if ($path != $result['homedir']) {
-						if (!file_exists($path)) {
-							// it's the task for "new ftp" but that will
-							// create all directories and correct their permissions
-							inserttask(5);
-						}
-
-						$log->logAction(USR_ACTION, LOG_INFO, "updated ftp-account homdir for '" . $result['username'] . "'");
-
-						$stmt = Database::prepare("UPDATE `" . TABLE_FTP_USERS . "`
-							SET `homedir` = :homedir
-							WHERE `customerid` = :customerid
-							AND `id` = :id"
-						);
-						$params = array(
-							"homedir" => $path,
-							"customerid" => $userinfo['customerid'],
-							"id" => $id
-						);
-						Database::pexecute($stmt, $params);
-					}
-				}
-
-				$log->logAction(USR_ACTION, LOG_INFO, "edited ftp-account '" . $result['username'] . "'");
-				$description = validate($_POST['ftp_description'], 'description');
-				$stmt = Database::prepare("UPDATE `" . TABLE_FTP_USERS . "`
-					SET `description` = :desc
-					WHERE `customerid` = :customerid
-					AND `id` = :id"
-				);
-				Database::pexecute($stmt, array("desc" => $description, "customerid" => $userinfo['customerid'], "id" => $id));
-
-				redirectTo($filename, array('page' => $page, 's' => $s));
-			} else {
-				if (strpos($result['homedir'], $userinfo['documentroot']) === 0) {
-					$homedir = str_replace($userinfo['documentroot'], "/", $result['homedir']);
-				} else {
-					$homedir = $result['homedir'];
-				}
-				$homedir = makeCorrectDir($homedir);
-
-				$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $homedir);
-
-				if (Settings::Get('customer.ftpatdomain') == '1') {
-					$domains = '';
-
-					$result_domains_stmt = Database::prepare("SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "`
-						WHERE `customerid` = :customerid"
-					);
-					Database::pexecute($result_domains_stmt, array("customerid" => $userinfo['customerid']));
-
-					while ($row_domain = $result_domains_stmt->fetch(PDO::FETCH_ASSOC)) {
-						$domains .= makeoption($idna_convert->decode($row_domain['domain']), $row_domain['domain']);
-					}
-				}
-
-				$ftp_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/ftp/formfield.ftp_edit.php';
-				$ftp_edit_form = htmlform::genHTMLForm($ftp_edit_data);
-
-				$title = $ftp_edit_data['ftp_edit']['title'];
-				$image = $ftp_edit_data['ftp_edit']['image'];
-
-				eval("echo \"" . getTemplate('ftp/accounts_edit') . "\";");
+			}
+			else
+			{
+				eval("echo \"" . getTemplate("ftp/accounts_edit") . "\";");
 			}
 		}
 	}
 }
+
+?>
--- a/customer_index.php
+++ b/customer_index.php
@@ -14,300 +14,171 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Panel
- *
+ * @version    $Id$
 */

 define('AREA', 'customer');
-require './lib/init.php';

-if ($action == 'logout') {
-	$log->logAction(USR_ACTION, LOG_NOTICE, 'logged out');
+/**
+ * Include our init.php, which manages Sessions, Language etc.
+ */

-	$params = array("customerid" => $userinfo['customerid']);
-	if (Settings::Get('session.allow_multiple_login') == '1') {
-		$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_SESSIONS . "`
-			WHERE `userid` = :customerid
-			AND `adminsession` = '0'
-			AND `hash` = :hash"
-		);
-		$params["hash"] = $s;
-	} else {
-		$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_SESSIONS . "`
-			WHERE `userid` = :customerid
-			AND `adminsession` = '0'"
-		);
+require ("./lib/init.php");
+
+if($action == 'logout')
+{
+	$log->logAction(USR_ACTION, LOG_NOTICE, "logged out");
+
+	if($settings['session']['allow_multiple_login'] == '1')
+	{
+		$db->query("DELETE FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid` = '" . (int)$userinfo['customerid'] . "' AND `adminsession` = '0' AND `hash` = '" . $s . "'");
+	}
+	else
+	{
+		$db->query("DELETE FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid` = '" . (int)$userinfo['customerid'] . "' AND `adminsession` = '0'");
 	}
-	Database::pexecute($stmt, $params);

 	redirectTo('index.php');
+	exit;
 }

-if ($page == 'overview') {
+if($page == 'overview')
+{
 	$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_index");
-
-	$domain_stmt = Database::prepare("SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "`
-		WHERE `customerid` = :customerid
-		AND `parentdomainid` = '0'
-		AND `id` <> :standardsubdomain
-	");
-	Database::pexecute($domain_stmt, array("customerid" => $userinfo['customerid'], "standardsubdomain" => $userinfo['standardsubdomain']));
-
 	$domains = '';
+	$result = $db->query("SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `parentdomainid`='0' AND `id` <> '" . (int)$userinfo['standardsubdomain'] . "' ");
 	$domainArray = array();

-	while ($row = $domain_stmt->fetch(PDO::FETCH_ASSOC)) {
+	while($row = $db->fetch_array($result))
+	{
 		$domainArray[] = $idna_convert->decode($row['domain']);
 	}

 	natsort($domainArray);
-	$domains = implode(',<br />', $domainArray);
-
-	// standard-subdomain
-	$stdsubdomain = '';
-	if ($userinfo['standardsubdomain'] != '0') {
-		$std_domain_stmt = Database::prepare("
-			SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "`
-			WHERE `customerid` = :customerid
-			AND `id` = :standardsubdomain
-		");
-		$std_domain = Database::pexecute_first($std_domain_stmt, array("customerid" => $userinfo['customerid'], "standardsubdomain" => $userinfo['standardsubdomain']));
-		$stdsubdomain = $std_domain['domain'];
-	}
-
+	$domains = implode(', ', $domainArray);
 	$userinfo['email'] = $idna_convert->decode($userinfo['email']);
 	$yesterday = time() - (60 * 60 * 24);
 	$month = date('M Y', $yesterday);

-	$userinfo['diskspace'] = round($userinfo['diskspace'] / 1024, Settings::Get('panel.decimal_places'));
-	$userinfo['diskspace_used'] = round($userinfo['diskspace_used'] / 1024, Settings::Get('panel.decimal_places'));
-	$userinfo['traffic'] = round($userinfo['traffic'] / (1024 * 1024), Settings::Get('panel.decimal_places'));
-	$userinfo['traffic_used'] = round($userinfo['traffic_used'] / (1024 * 1024), Settings::Get('panel.decimal_places'));
-	$userinfo = str_replace_array('-1', $lng['customer']['unlimited'], $userinfo, 'diskspace traffic mysqls emails email_accounts email_forwarders email_quota ftps tickets subdomains');
+	/*		$traffic=$db->query_first("SELECT SUM(http) AS http_sum, SUM(ftp_up) AS ftp_up_sum, SUM(ftp_down) AS ftp_down_sum, SUM(mail) AS mail_sum FROM ".TABLE_PANEL_TRAFFIC." WHERE year='".date('Y')."' AND month='".date('m')."' AND day<='".date('d')."' AND customerid='".$userinfo['customerid']."'");
+		$userinfo['traffic_used']=$traffic['http_sum']+$traffic['ftp_up_sum']+$traffic['ftp_down_sum']+$traffic['mail_sum'];*/

-	$userinfo['custom_notes'] = ($userinfo['custom_notes'] != '') ? nl2br($userinfo['custom_notes']) : '';
+	$userinfo['diskspace'] = round($userinfo['diskspace'] / 1024, $settings['panel']['decimal_places']);
+	$userinfo['diskspace_used'] = round($userinfo['diskspace_used'] / 1024, $settings['panel']['decimal_places']);
+	$userinfo['traffic'] = round($userinfo['traffic'] / (1024 * 1024), $settings['panel']['decimal_places']);
+	$userinfo['traffic_used'] = round($userinfo['traffic_used'] / (1024 * 1024), $settings['panel']['decimal_places']);
+	$userinfo = str_replace_array('-1', $lng['customer']['unlimited'], $userinfo, 'diskspace traffic mysqls emails email_accounts email_forwarders email_quota ftps tickets subdomains aps_packages');
+	$opentickets = 0;
+	$opentickets = $db->query_first('SELECT COUNT(`id`) as `count` FROM `' . TABLE_PANEL_TICKETS . '`
+                                   WHERE `customerid` = "' . $userinfo['customerid'] . '"
+                                   AND `answerto` = "0"
+                                   AND (`status` = "0" OR `status` = "2")
+                                   AND `lastreplier`="1"');
+	$awaitingtickets = $opentickets['count'];
+	$awaitingtickets_text = '';

-	$services_enabled = "";
-	$se = array();
-	if ($userinfo['imap'] == '1') $se[] = "IMAP";
-	if ($userinfo['pop3'] == '1') $se[] = "POP3";
-	if ($userinfo['phpenabled'] == '1') $se[] = "PHP";
-	if ($userinfo['perlenabled'] == '1') $se[] = "Perl/CGI";
-	$services_enabled = implode(", ", $se);
+	if($opentickets > 0)
+	{
+		$awaitingtickets_text = strtr($lng['ticket']['awaitingticketreply'], array('%s' => '<a href="customer_tickets.php?page=tickets&amp;s=' . $s . '">' . $opentickets['count'] . '</a>'));
+	}

-	eval("echo \"" . getTemplate('index/index') . "\";");
-} elseif ($page == 'change_password') {
-	if (isset($_POST['send']) && $_POST['send'] == 'send') {
+	eval("echo \"" . getTemplate("index/index") . "\";");
+}
+elseif($page == 'change_password')
+{
+	if(isset($_POST['send'])
+	   && $_POST['send'] == 'send')
+	{
 		$old_password = validate($_POST['old_password'], 'old password');
-		if (!validatePasswordLogin($userinfo,$old_password,TABLE_PANEL_CUSTOMERS,'customerid')) {
+
+		if(md5($old_password) != $userinfo['password'])
+		{
 			standard_error('oldpasswordnotcorrect');
+			exit;
 		}

-		$new_password = validatePassword($_POST['new_password'], 'new password');
-		$new_password_confirm = validatePassword($_POST['new_password_confirm'], 'new password confirm');
+		$new_password = validate($_POST['new_password'], 'new password');
+		$new_password_confirm = validate($_POST['new_password_confirm'], 'new password confirm');

-		if ($old_password == '') {
+		if($old_password == '')
+		{
 			standard_error(array('stringisempty', 'oldpassword'));
-		} elseif ($new_password == '') {
+		}
+		elseif($new_password == '')
+		{
 			standard_error(array('stringisempty', 'newpassword'));
-		} elseif ($new_password_confirm == '') {
+		}
+		elseif($new_password_confirm == '')
+		{
 			standard_error(array('stringisempty', 'newpasswordconfirm'));
-		} elseif ($new_password != $new_password_confirm) {
+		}
+		elseif($new_password != $new_password_confirm)
+		{
 			standard_error('newpasswordconfirmerror');
-		} else {
-			// Update user password
-			$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "`
-				SET `password` = :newpassword
-				WHERE `customerid` = :customerid"
-			);
-			$params = array(
-				"newpassword" => makeCryptPassword($new_password),
-				"customerid" => $userinfo['customerid']
-			);
-			Database::pexecute($stmt, $params);
+		}
+		else
+		{
+			$db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `password`='" . md5($new_password) . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `password`='" . md5($old_password) . "'");
 			$log->logAction(USR_ACTION, LOG_NOTICE, 'changed password');

-			// Update ftp password
-			if (isset($_POST['change_main_ftp']) && $_POST['change_main_ftp'] == 'true') {
-				$cryptPassword = makeCryptPassword($new_password);
-				$stmt = Database::prepare("UPDATE `" . TABLE_FTP_USERS . "`
-					SET `password` = :password
-					WHERE `customerid` = :customerid
-					AND `username` = :username"
-				);
-				$params = array(
-					"password" => $cryptPassword,
-					"customerid" => $userinfo['customerid'],
-					"username" => $userinfo['loginname']
-				);
-				Database::pexecute($stmt, $params);
+			if(isset($_POST['change_main_ftp'])
+			   && $_POST['change_main_ftp'] == 'true')
+			{
+				$db->query("UPDATE `" . TABLE_FTP_USERS . "` SET `password`=ENCRYPT('" . $db->escape($new_password) . "') WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `username`='" . $db->escape($userinfo['loginname']) . "'");
 				$log->logAction(USR_ACTION, LOG_NOTICE, 'changed main ftp password');
 			}

-			// Update webalizer password
-			if (isset($_POST['change_webalizer']) && $_POST['change_webalizer'] == 'true') {
-				if (CRYPT_STD_DES == 1) {
+			if(isset($_POST['change_webalizer'])
+			   && $_POST['change_webalizer'] == 'true')
+			{
+				if(CRYPT_STD_DES == 1)
+				{
 					$saltfordescrypt = substr(md5(uniqid(microtime(), 1)), 4, 2);
 					$new_webalizer_password = crypt($new_password, $saltfordescrypt);
-				} else {
+				}
+				else
+				{
 					$new_webalizer_password = crypt($new_password);
 				}

-				$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_HTPASSWDS . "`
-					SET `password` = :password
-					WHERE `customerid` = :customerid
-					AND `username` = :username"
-				);
-				$params = array(
-					"password" => $new_webalizer_password,
-					"customerid" => $userinfo['customerid'],
-					"username" => $userinfo['loginname']
-				);
-				Database::pexecute($stmt, $params);
+				$db->query("UPDATE `" . TABLE_PANEL_HTPASSWDS . "` SET `password`='" . $db->escape($new_webalizer_password) . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `username`='" . $db->escape($userinfo['loginname']) . "'");
 			}

-			redirectTo($filename, array('s' => $s));
+			redirectTo($filename, Array('s' => $s));
 		}
-	} else {
-		eval("echo \"" . getTemplate('index/change_password') . "\";");
 	}
-} elseif ($page == 'change_language') {
-	if (isset($_POST['send']) && $_POST['send'] == 'send') {
+	else
+	{
+		eval("echo \"" . getTemplate("index/change_password") . "\";");
+	}
+}
+elseif($page == 'change_language')
+{
+	if(isset($_POST['send'])
+	   && $_POST['send'] == 'send')
+	{
 		$def_language = validate($_POST['def_language'], 'default language');
-		if (isset($languages[$def_language])) {
-			$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "`
-				SET `def_language` = :lang
-				WHERE `customerid` = :customerid"
-			);
-			Database::pexecute($stmt, array("lang" => $def_language, "customerid" => $userinfo['customerid']));
-
-			$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_SESSIONS . "`
-				SET `language` = :lang
-				WHERE `hash` = :hash"
-			);
-			Database::pexecute($stmt, array("lang" => $def_language, "hash" => $s));

+		if(isset($languages[$def_language]))
+		{
+			$db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `def_language`='" . $db->escape($def_language) . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
+			$db->query("UPDATE `" . TABLE_PANEL_SESSIONS . "` SET `language`='" . $db->escape($def_language) . "' WHERE `hash`='" . $db->escape($s) . "'");
 			$log->logAction(USR_ACTION, LOG_NOTICE, "changed default language to '" . $def_language . "'");
 		}

-		redirectTo($filename, array('s' => $s));
-	} else {
-		$default_lang = Settings::Get('panel.standardlanguage');
-		if ($userinfo['def_language'] != '') {
-			$default_lang = $userinfo['def_language'];
-		}
-
+		redirectTo($filename, Array('s' => $s));
+	}
+	else
+	{
 		$language_options = '';
-		while (list($language_file, $language_name) = each($languages)) {
-			$language_options .= makeoption($language_name, $language_file, $default_lang, true);
+
+		while(list($language_file, $language_name) = each($languages))
+		{
+			$language_options.= makeoption($language_name, $language_file, $userinfo['def_language'], true);
 		}

-		eval("echo \"" . getTemplate('index/change_language') . "\";");
-	}
-} elseif ($page == 'change_theme') {
-	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-		$theme = validate($_POST['theme'], 'theme');
-
-		$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "`
-			SET `theme` = :theme
-			WHERE `customerid` = :customerid"
-		);
-		Database::pexecute($stmt, array("theme" => $theme, "customerid" => $userinfo['customerid']));
-
-		$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_SESSIONS . "`
-			SET `theme` = :theme
-			WHERE `hash` = :hash"
-		);
-		Database::pexecute($stmt, array("theme" => $theme, "hash" => $s));
-
-		$log->logAction(USR_ACTION, LOG_NOTICE, "changed default theme to '" . $theme . "'");
-		redirectTo($filename, array('s' => $s));
-	} else {
-		$default_theme = Settings::Get('panel.default_theme');
-		if ($userinfo['theme'] != '') {
-			$default_theme = $userinfo['theme'];
-		}
-
-		$theme_options = '';
-		$themes_avail = getThemes();
-		foreach ($themes_avail as $t => $d) {
-			$theme_options.= makeoption($d, $t, $default_theme, true);
-		}
-
-		eval("echo \"" . getTemplate('index/change_theme') . "\";");
-	}
-
-} elseif ($page == 'send_error_report' && Settings::Get('system.allow_error_report_customer') == '1') {
-
-	// only show this if we really have an exception to report
-	if (isset($_GET['errorid']) && $_GET['errorid'] != '') {
-
-		$errid = $_GET['errorid'];
-		// read error file
-		$err_dir = makeCorrectDir(FROXLOR_INSTALL_DIR."/logs/");
-		$err_file = makeCorrectFile($err_dir."/".$errid."_sql-error.log");
-
-		if (file_exists($err_file)) {
-
-			$error_content = file_get_contents($err_file);
-			$error = explode("|", $error_content);
-
-			$_error = array(
-				'code' => str_replace("\n", "", substr($error[1], 5)),
-				'message' => str_replace("\n", "", substr($error[2], 4)),
-				'file' => str_replace("\n", "", substr($error[3], 5 + strlen(FROXLOR_INSTALL_DIR))),
-				'line' => str_replace("\n", "", substr($error[4], 5)),
-				'trace' => str_replace(FROXLOR_INSTALL_DIR, "", substr($error[5], 6))
-			);
-
-			// build mail-content
-			$mail_body = "Dear froxlor-team,\n\n";
-			$mail_body .= "the following error has been reported by a user:\n\n";
-			$mail_body .= "-------------------------------------------------------------\n";
-			$mail_body .= $_error['code'].' '.$_error['message']."\n\n";
-			$mail_body .= "File: ".$_error['file'].':'.$_error['line']."\n\n";
-			$mail_body .= "Trace:\n".trim($_error['trace'])."\n\n";
-			$mail_body .= "-------------------------------------------------------------\n\n";
-			$mail_body .= "Froxlor-version: ".$version."\n\n";
-			$mail_body .= "End of report";
-			$mail_html = str_replace("\n", "<br />", $mail_body);
-
-			// send actual report to dev-team
-			if (isset($_POST['send'])
-				&& $_POST['send'] == 'send'
-			) {
-				// send mail and say thanks
-				$_mailerror = false;
-				try {
-					$mail->Subject = '[Froxlor] Error report by user';
-					$mail->AltBody = $mail_body;
-					$mail->MsgHTML($mail_html);
-					$mail->AddAddress('error-reports@froxlor.org', 'Froxlor Developer Team');
-					$mail->Send();
-				} catch(phpmailerException $e) {
-					$mailerr_msg = $e->errorMessage();
-					$_mailerror = true;
-				} catch (Exception $e) {
-					$mailerr_msg = $e->getMessage();
-					$_mailerror = true;
-				}
-
-				if ($_mailerror) {
-					// error when reporting an error...LOLFUQ
-					standard_error('send_report_error', $mailerr_msg);
-				}
-
-				// finally remove error from fs
-				@unlink($err_file);
-				redirectTo($filename, array('s' => $s));
-			}
-			// show a nice summary of the error-report
-			// before actually sending anything
-			eval("echo \"" . getTemplate("index/send_error_report") . "\";");
-
-		} else {
-			redirectTo($filename, array('s' => $s));
-		}
-	} else {
-		redirectTo($filename, array('s' => $s));
+		eval("echo \"" . getTemplate("index/change_language") . "\";");
 	}
 }
+
+?>
--- a/customer_logger.php
+++ b/customer_logger.php
@@ -1,117 +0,0 @@
-<?php
-
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2003-2009 the SysCP Team (see authors).
- * Copyright (c) 2010 the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright  (c) the authors
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
- * @author     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Panel
- *
- */
-
-define('AREA', 'customer');
-require './lib/init.php';
-
-if ($page == 'log'
-) {
-	if ($action == '') {
-		$fields = array(
-			'date' => $lng['logger']['date'],
-			'type' => $lng['logger']['type'],
-			'user' => $lng['logger']['user'],
-			'text' => $lng['logger']['action']
-		);
-		$paging = new paging($userinfo, TABLE_PANEL_LOG, $fields, null, null, 0, 'desc');
-		$result_stmt = Database::prepare('
-			SELECT * FROM `' . TABLE_PANEL_LOG . '` WHERE `user` = :loginname ' . $paging->getSqlWhere(true) . ' ' . $paging->getSqlOrderBy() . ' ' . $paging->getSqlLimit()
-		);
-		Database::pexecute($result_stmt, array("loginname" => $userinfo['loginname']));
-		$logs_count = Database::num_rows();
-		$paging->setEntries($logs_count);
-		$sortcode = $paging->getHtmlSortCode($lng);
-		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
-		$searchcode = $paging->getHtmlSearchCode($lng);
-		$pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s);
-		$clog = array();
-
-		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-
-			if (!isset($clog[$row['action']])
-				|| !is_array($clog[$row['action']])
-			) {
-				$clog[$row['action']] = array();
-			}
-			$clog[$row['action']][$row['logid']] = $row;
-		}
-
-		if ($paging->sortfield == 'date'
-			&& $paging->sortorder == 'desc'
-		) {
-			krsort($clog);
-		} else {
-			ksort($clog);
-		}
-
-		$i = 0;
-		$count = 0;
-		$log_count = 0;
-		$log = '';
-		foreach ($clog as $action => $logrows) {
-			$_action = 0;
-			foreach ($logrows as $row) {
-				if ($paging->checkDisplay($i)) {
-					$row = htmlentities_array($row);
-					$row['date'] = date("d.m.y H:i:s", $row['date']);
-
-					if ($_action != $action) {
-						switch ($action) {
-							case USR_ACTION:
-								$_action = $lng['admin']['customer'];
-								break;
-							case RES_ACTION:
-								$_action = $lng['logger']['reseller'];
-								break;
-							case ADM_ACTION:
-								$_action = $lng['logger']['admin'];
-								break;
-							case CRON_ACTION:
-								$_action = $lng['logger']['cron'];
-								break;
-							case LOGIN_ACTION:
-								$_action = $lng['logger']['login'];
-								break;
-							case LOG_ERROR:
-								$_action = $lng['logger']['intern'];
-								break;
-							default:
-								$_action = $lng['logger']['unknown'];
-								break;
-						}
-
-						$row['action'] = $_action;
-						eval("\$log.=\"" . getTemplate('logger/logger_action') . "\";");
-					}
-
-					$log_count++;
-					$row['type'] = getLogLevelDesc($row['type']);
-					eval("\$log.=\"" . getTemplate('logger/logger_log') . "\";");
-					$count++;
-					$_action = $action;
-				}
-				$i++;
-			}
-			$i++;
-		}
-
-		eval("echo \"" . getTemplate('logger/logger') . "\";");
-
-	}
-}
--- a/customer_mysql.php
+++ b/customer_mysql.php
@@ -14,45 +14,46 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Panel
- *
+ * @version    $Id$
 */

 define('AREA', 'customer');
-require './lib/init.php';

-// get sql-root access data
-Database::needRoot(true);
-Database::needSqlData();
-$sql_root = Database::getSqlData();
-Database::needRoot(false);
+/**
+ * Include our init.php, which manages Sessions, Language etc.
+ */

-if (isset($_POST['id'])) {
+$need_db_sql_data = true;
+$need_root_db_sql_data = true;
+require ("./lib/init.php");
+
+if(isset($_POST['id']))
+{
 	$id = intval($_POST['id']);
-} elseif (isset($_GET['id'])) {
+}
+elseif(isset($_GET['id']))
+{
 	$id = intval($_GET['id']);
 }

-if ($page == 'overview') {
+if($page == 'overview')
+{
 	$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_mysql");
-	Database::needSqlData();
-	$sql = Database::getSqlData();
 	$lng['mysql']['description'] = str_replace('<SQL_HOST>', $sql['host'], $lng['mysql']['description']);
-	eval("echo \"" . getTemplate('mysql/mysql') . "\";");
-} elseif ($page == 'mysqls') {
-	if ($action == '') {
+	eval("echo \"" . getTemplate("mysql/mysql") . "\";");
+}
+elseif($page == 'mysqls')
+{
+	if($action == '')
+	{
 		$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_mysql::mysqls");
 		$fields = array(
 			'databasename' => $lng['mysql']['databasename'],
 			'description' => $lng['mysql']['databasedescription']
 		);
-		$paging = new paging($userinfo, TABLE_PANEL_DATABASES, $fields);
-		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_DATABASES . "`
-			WHERE `customerid`= :customerid " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit()
-		);
-		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid']));
-		$mysqls_count = Database::num_rows();
-		$paging->setEntries($mysqls_count);
-
+		$paging = new paging($userinfo, $db, TABLE_PANEL_DATABASES, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
+		$result = $db->query("SELECT `id`, `databasename`, `description`, `dbserver` FROM `" . TABLE_PANEL_DATABASES . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
+		$paging->setEntries($db->num_rows($result));
 		$sortcode = $paging->getHtmlSortCode($lng);
 		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
 		$searchcode = $paging->getHtmlSearchCode($lng);
@@ -61,308 +62,194 @@ if ($page == 'overview') {
 		$count = 0;
 		$mysqls = '';

-		$dbservers_stmt = Database::query("SELECT COUNT(DISTINCT `dbserver`) as numservers FROM `".TABLE_PANEL_DATABASES."`");
-		$dbserver = $dbservers_stmt->fetch(PDO::FETCH_ASSOC);
-		$count_mysqlservers = $dbserver['numservers'];
-
-		// Begin root-session
-		Database::needRoot(true);
-		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-			if ($paging->checkDisplay($i)) {
+		while($row = $db->fetch_array($result))
+		{
+			if($paging->checkDisplay($i))
+			{
 				$row = htmlentities_array($row);
-				$mbdata_stmt = Database::prepare("SELECT SUM(data_length + index_length) as MB FROM information_schema.TABLES
-					WHERE table_schema = :table_schema
-					GROUP BY table_schema"
-				);
-				Database::pexecute($mbdata_stmt, array("table_schema" => $row['databasename']));
-				$mbdata = $mbdata_stmt->fetch(PDO::FETCH_ASSOC);
-				$row['size'] = size_readable($mbdata['MB'], 'GiB', 'bi', '%01.' . (int)Settings::Get('panel.decimal_places') . 'f %s');
-				eval("\$mysqls.=\"" . getTemplate('mysql/mysqls_database') . "\";");
+				eval("\$mysqls.=\"" . getTemplate("mysql/mysqls_database") . "\";");
 				$count++;
 			}
+
 			$i++;
 		}
-		Database::needRoot(false);
-		// End root-session

-		eval("echo \"" . getTemplate('mysql/mysqls') . "\";");
+		$mysqls_count = $db->num_rows($result);
+		eval("echo \"" . getTemplate("mysql/mysqls") . "\";");
+	}
+	elseif($action == 'delete'
+	       && $id != 0)
+	{
+		$result = $db->query_first('SELECT `id`, `databasename`, `dbserver` FROM `' . TABLE_PANEL_DATABASES . '` WHERE `customerid`="' . (int)$userinfo['customerid'] . '" AND `id`="' . (int)$id . '"');

-	} elseif ($action == 'delete' && $id != 0) {
-		$result_stmt = Database::prepare('SELECT `id`, `databasename`, `description`, `dbserver` FROM `' . TABLE_PANEL_DATABASES . '`
-			WHERE `customerid`="' . (int)$userinfo['customerid'] . '"
-			AND `id`="' . (int)$id . '"'
-		);
-		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid']));
-		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
-
-		if (isset($result['databasename']) && $result['databasename'] != '') {
-
-			Database::needRoot(true, $result['dbserver']);
-			Database::needSqlData();
-			$sql_root = Database::getSqlData();
-			Database::needRoot(false);
-
-			if (!isset($sql_root[$result['dbserver']]) || !is_array($sql_root[$result['dbserver']])) {
+		if(isset($result['databasename'])
+		   && $result['databasename'] != '')
+		{
+			if(!isset($sql_root[$result['dbserver']]) || !is_array($sql_root[$result['dbserver']]))
+			{
 				$result['dbserver'] = 0;
 			}

-			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+			if(isset($_POST['send'])
+			   && $_POST['send'] == 'send')
+			{
 				// Begin root-session
-				Database::needRoot(true, $result['dbserver']);
-				$dbm = new DbManager($log);
-				$dbm->getManager()->deleteDatabase($result['databasename']);
-				$log->logAction(USR_ACTION, LOG_INFO, "deleted database '" . $result['databasename'] . "'");
-				Database::needRoot(false);
+
+				$db_root = new db($sql_root[$result['dbserver']]['host'], $sql_root[$result['dbserver']]['user'], $sql_root[$result['dbserver']]['password'], '');
+				unset($db_root->password);
+				foreach(array_map('trim', array_unique(explode(',', $settings['system']['mysql_access_host']))) as $mysql_access_host)
+				{
+					$db_root->query('REVOKE ALL PRIVILEGES ON * . * FROM `' . $db_root->escape($result['databasename']) . '`@`' . $db_root->escape($mysql_access_host) . '`');
+					$db_root->query('REVOKE ALL PRIVILEGES ON `' . str_replace('_', '\_', $db_root->escape($result['databasename'])) . '` . * FROM `' . $db_root->escape($result['databasename']) . '`@`' . $db_root->escape($mysql_access_host) . '`');
+					$db_root->query('DELETE FROM `mysql`.`user` WHERE `User` = "' . $db_root->escape($result['databasename']) . '" AND `Host` = "' . $db_root->escape($mysql_access_host) . '"');
+				}
+
+				$db_root->query('DROP DATABASE IF EXISTS `' . $db_root->escape($result['databasename']) . '`');
+				$db_root->query('FLUSH PRIVILEGES');
+				$db_root->close();
+
 				// End root-session

-				$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_DATABASES . "`
-					WHERE `customerid` = :customerid
-					AND `id` = :id"
-				);
-				Database::pexecute($stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
+				$db->query('DELETE FROM `' . TABLE_PANEL_DATABASES . '` WHERE `customerid`="' . (int)$userinfo['customerid'] . '" AND `id`="' . (int)$id . '"');

-				$resetaccnumber = ($userinfo['mysqls_used'] == '1') ? " , `mysql_lastaccountnumber` = '0' " : '';
-
-				$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "`
-					SET `mysqls_used` = `mysqls_used` - 1 " . $resetaccnumber . "
-					WHERE `customerid` = :customerid"
-				);
-				Database::pexecute($stmt, array("customerid" => $userinfo['customerid']));
-
-				redirectTo($filename, array('page' => $page, 's' => $s));
-			} else {
-				$dbnamedesc = $result['databasename'];
-				if (isset($result['description']) && $result['description'] != '') {
-					$dbnamedesc .= ' ('.$result['description'].')';
+				if($userinfo['mysqls_used'] == '1')
+				{
+					$resetaccnumber = " , `mysql_lastaccountnumber`='0' ";
 				}
-				ask_yesno('mysql_reallydelete', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $dbnamedesc);
+				else
+				{
+					$resetaccnumber = '';
+				}
+
+				$result = $db->query('UPDATE `' . TABLE_PANEL_CUSTOMERS . '` SET `mysqls_used`=`mysqls_used`-1 ' . $resetaccnumber . 'WHERE `customerid`="' . (int)$userinfo['customerid'] . '"');
+				redirectTo($filename, Array('page' => $page, 's' => $s));
+			}
+			else
+			{
+				ask_yesno('mysql_reallydelete', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $result['databasename']);
 			}
 		}
-	} elseif ($action == 'add') {
-		if ($userinfo['mysqls_used'] < $userinfo['mysqls'] || $userinfo['mysqls'] == '-1') {
-			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+	}
+	elseif($action == 'add')
+	{
+		if($userinfo['mysqls_used'] < $userinfo['mysqls']
+		   || $userinfo['mysqls'] == '-1')
+		{
+			if(isset($_POST['send'])
+			   && $_POST['send'] == 'send')
+			{
 				$password = validate($_POST['mysql_password'], 'password');
-				$password = validatePassword($password);

-				$sendinfomail = isset($_POST['sendinfomail']) ? 1 : 0;
-				if ($sendinfomail != 1) {
-					$sendinfomail = 0;
-				}
-
-				if ($password == '') {
+				if($password == '')
+				{
 					standard_error(array('stringisempty', 'mypassword'));
-				} else {
-					$dbserver = 0;
-					$dbservers_stmt = Database::query("SELECT COUNT(DISTINCT `dbserver`) as numservers FROM `".TABLE_PANEL_DATABASES."`");
-					$_dbserver = $dbservers_stmt->fetch(PDO::FETCH_ASSOC);
-					$count_mysqlservers = $_dbserver['numservers'];
-					if ($count_mysqlservers > 1) {
+				}
+				else
+				{
+					$username = $userinfo['loginname'] . $settings['customer']['mysqlprefix'] . (intval($userinfo['mysql_lastaccountnumber']) + 1);
+
+					if(count($sql_root) > 1)
+					{
 						$dbserver = validate($_POST['mysql_server'], html_entity_decode($lng['mysql']['mysql_server']), '', '', 0);
-						Database::needRoot(true, $dbserver);
-						Database::needSqlData();
-						$sql_root = Database::getSqlData();
-						Database::needRoot(false);
-						if (!isset($sql_root) || !is_array($sql_root)) {
+
+						if(!isset($sql_root[$dbserver]) || !is_array($sql_root[$dbserver]))
+						{
 							$dbserver = 0;
 						}
 					}
-
-					// validate description before actual adding the database, #1052
-					$databasedescription = validate(trim($_POST['description']), 'description');
-
-					// create database, user, set permissions, etc.pp.
-					$dbm = new DbManager($log);
-					$username = $dbm->createDatabase(
-						$userinfo['loginname'],
-						$password,
-						$userinfo['mysql_lastaccountnumber']
-					);
-
-					// we've checked against the password in dbm->createDatabase
-					if ($username == false) {
-						standard_error('passwordshouldnotbeusername');
-					}
-
-					// Statement modified for Database description -- PH 2004-11-29
-					$stmt = Database::prepare('INSERT INTO `' . TABLE_PANEL_DATABASES . '`
-						(`customerid`, `databasename`, `description`, `dbserver`)
-						VALUES (:customerid, :databasename, :description, :dbserver)'
-					);
-					$params = array(
-						"customerid" => $userinfo['customerid'],
-						"databasename" => $username,
-						"description" => $databasedescription,
-						"dbserver" => $dbserver
-					);
-					Database::pexecute($stmt, $params);
-
-					$stmt = Database::prepare('UPDATE `' . TABLE_PANEL_CUSTOMERS . '`
-						SET `mysqls_used` = `mysqls_used` + 1, `mysql_lastaccountnumber` = `mysql_lastaccountnumber` + 1
-						WHERE `customerid` = :customerid'
-					);
-					Database::pexecute($stmt, array("customerid" => $userinfo['customerid']));
-
-					if ($sendinfomail == 1) {
-						$pma = $lng['admin']['notgiven'];
-						if (Settings::Get('panel.phpmyadmin_url') != '') {
-							$pma = Settings::Get('panel.phpmyadmin_url');
-						}
-
-						Database::needRoot(true, $dbserver);
-						Database::needSqlData();
-						$sql_root = Database::getSqlData();
-						Database::needRoot(false);
-
-						$replace_arr = array(
-							'SALUTATION' => getCorrectUserSalutation($userinfo),
-							'CUST_NAME' => getCorrectUserSalutation($userinfo), // < keep this for compatibility
-							'DB_NAME' => $username,
-							'DB_PASS' => $password,
-							'DB_DESC' => $databasedescription,
-							'DB_SRV' => $sql_root['host'],
-							'PMA_URI' => $pma
-						);
-
-						$def_language = $userinfo['def_language'];
-						$result_stmt = Database::prepare("SELECT `value` FROM `" . TABLE_PANEL_TEMPLATES . "`
-							WHERE `adminid` = :adminid
-							AND `language` = :lang
-							AND `templategroup`='mails'
-							AND `varname`='new_database_by_customer_subject'"
-						);
-						Database::pexecute($result_stmt, array("adminid" => $userinfo['adminid'], "lang" => $def_language));
-						$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
-						$mail_subject = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['new_database_by_customer']['subject']), $replace_arr));
-
-						$result_stmt = Database::prepare("SELECT `value` FROM `" . TABLE_PANEL_TEMPLATES . "`
-							WHERE `adminid`= :adminid
-							AND `language`= :lang
-							AND `templategroup` = 'mails'
-							AND `varname` = 'new_database_by_customer_mailbody'"
-						);
-						Database::pexecute($result_stmt, array("adminid" => $userinfo['adminid'], "lang" => $def_language));
-						$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
-						$mail_body = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['new_database_by_customer']['mailbody']), $replace_arr));
-
-						$_mailerror = false;
-						try {
-							$mail->Subject = $mail_subject;
-							$mail->AltBody = $mail_body;
-							$mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
-							$mail->AddAddress($userinfo['email'], getCorrectUserSalutation($userinfo));
-							$mail->Send();
-						} catch(phpmailerException $e) {
-							$mailerr_msg = $e->errorMessage();
-							$_mailerror = true;
-						} catch (Exception $e) {
-							$mailerr_msg = $e->getMessage();
-							$_mailerror = true;
-						}
-
-						if ($_mailerror) {
-							$log->logAction(USR_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
-							standard_error('errorsendingmail', $userinfo['email']);
-						}
-
-						$mail->ClearAddresses();
-					}
-
-					redirectTo($filename, array('page' => $page, 's' => $s));
-				}
-			} else {
-
-				$dbservers_stmt = Database::query("SELECT DISTINCT `dbserver` FROM `".TABLE_PANEL_DATABASES."`");
-				$mysql_servers = '';
-				$count_mysqlservers = 0;
-				while ($dbserver = $dbservers_stmt->fetch(PDO::FETCH_ASSOC)) {
-					Database::needRoot(true, $dbserver['dbserver']);
-					Database::needSqlData();
-					$sql_root = Database::getSqlData();
-					$mysql_servers .= makeoption($sql_root['caption'], $dbserver['dbserver']);
-					$count_mysqlservers++;
-				}
-				Database::needRoot(false);
-
-				$mysql_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/mysql/formfield.mysql_add.php';
-				$mysql_add_form = htmlform::genHTMLForm($mysql_add_data);
-
-				$title = $mysql_add_data['mysql_add']['title'];
-				$image = $mysql_add_data['mysql_add']['image'];
-
-				eval("echo \"" . getTemplate('mysql/mysqls_add') . "\";");
-			}
-		}
-	} elseif ($action == 'edit' && $id != 0) {
-		$result_stmt = Database::prepare("SELECT `id`, `databasename`, `description`, `dbserver` FROM `" . TABLE_PANEL_DATABASES . "`
-			WHERE `customerid` = :customerid
-			AND `id` = :id"
-		);
-		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
-		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
-
-		if (isset($result['databasename']) && $result['databasename'] != '') {
-			if (!isset($sql_root[$result['dbserver']]) || !is_array($sql_root[$result['dbserver']])) {
-				$result['dbserver'] = 0;
-			}
-
-			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-				// Only change Password if it is set, do nothing if it is empty! -- PH 2004-11-29
-				$password = validate($_POST['mysql_password'], 'password');
-				if ($password != '') {
-					// validate password
-					$password = validatePassword($password);
-
-					if ($password == $result['databasename']) {
-						standard_error('passwordshouldnotbeusername');
+					else
+					{
+						$dbserver = 0;
 					}

 					// Begin root-session
-					Database::needRoot(true);
-					foreach (array_map('trim', explode(',', Settings::Get('system.mysql_access_host'))) as $mysql_access_host) {
-						$stmt = Database::prepare("SET PASSWORD FOR :dbname@:host = PASSWORD(:password)");
-						$params = array(
-							"dbname" => $result['databasename'],
-							"host" => $mysql_access_host,
-							"password" => $password
-						);
-						Database::pexecute($stmt, $params);
+
+					$db_root = new db($sql_root[$dbserver]['host'], $sql_root[$dbserver]['user'], $sql_root[$dbserver]['password'], '');
+					unset($db_root->password);
+					$db_root->query('CREATE DATABASE `' . $db_root->escape($username) . '`');
+					$log->logAction(USR_ACTION, LOG_INFO, "created database '" . $username . "'");
+					foreach(array_map('trim', explode(',', $settings['system']['mysql_access_host'])) as $mysql_access_host)
+					{
+						$db_root->query('GRANT ALL PRIVILEGES ON `' . str_replace('_', '\_', $db_root->escape($username)) . '`.* TO `' . $db_root->escape($username) . '`@`' . $db_root->escape($mysql_access_host) . '` IDENTIFIED BY \'password\'');
+						$db_root->query('SET PASSWORD FOR `' . $db_root->escape($username) . '`@`' . $db_root->escape($mysql_access_host) . '` = PASSWORD(\'' . $db_root->escape($password) . '\')');
+						$log->logAction(USR_ACTION, LOG_NOTICE, "grant all privileges for '" . $username . "'@'" . $mysql_access_host . "'");
 					}

-					$stmt = Database::prepare("FLUSH PRIVILEGES");
-					Database::pexecute($stmt);
-					Database::needRoot(false);
+					$db_root->query('FLUSH PRIVILEGES');
+					$db_root->close();
+
+					// End root-session
+					// Statement modifyed for Database description -- PH 2004-11-29
+
+					$databasedescription = validate($_POST['description'], 'description');
+					$result = $db->query('INSERT INTO `' . TABLE_PANEL_DATABASES . '` (`customerid`, `databasename`, `description`, `dbserver`) VALUES ("' . (int)$userinfo['customerid'] . '", "' . $db->escape($username) . '", "' . $db->escape($databasedescription) . '", "' . $db->escape($dbserver) . '")');
+					$result = $db->query('UPDATE `' . TABLE_PANEL_CUSTOMERS . '` SET `mysqls_used`=`mysqls_used`+1, `mysql_lastaccountnumber`=`mysql_lastaccountnumber`+1 WHERE `customerid`="' . (int)$userinfo['customerid'] . '"');
+					redirectTo($filename, Array('page' => $page, 's' => $s));
+				}
+			}
+			else
+			{
+				$mysql_servers = '';
+
+				foreach($sql_root as $mysql_server => $mysql_server_details)
+				{
+					$mysql_servers .= makeoption($mysql_server_details['caption'], $mysql_server);
+				}
+
+				eval("echo \"" . getTemplate("mysql/mysqls_add") . "\";");
+			}
+		}
+	}
+	elseif($action == 'edit'
+	       && $id != 0)
+	{
+		$result = $db->query_first('SELECT `id`, `databasename`, `description`, `dbserver` FROM `' . TABLE_PANEL_DATABASES . '` WHERE `customerid`="' . $userinfo['customerid'] . '" AND `id`="' . $id . '"');
+
+		if(isset($result['databasename'])
+		   && $result['databasename'] != '')
+		{
+			if(!isset($sql_root[$result['dbserver']]) || !is_array($sql_root[$result['dbserver']]))
+			{
+				$result['dbserver'] = 0;
+			}
+
+			if(isset($_POST['send'])
+			   && $_POST['send'] == 'send')
+			{
+				// Only change Password if it is set, do nothing if it is empty! -- PH 2004-11-29
+
+				$password = validate($_POST['mysql_password'], 'password');
+
+				if($password != '')
+				{
+					// Begin root-session
+
+					$db_root = new db($sql_root[$result['dbserver']]['host'], $sql_root[$result['dbserver']]['user'], $sql_root[$result['dbserver']]['password'], '');
+					unset($db_root->password);
+					foreach(array_map('trim', explode(',', $settings['system']['mysql_access_host'])) as $mysql_access_host)
+					{
+						$db_root->query('SET PASSWORD FOR `' . $db_root->escape($result['databasename']) . '`@`' . $db_root->escape($mysql_access_host) . '` = PASSWORD(\'' . $db_root->escape($password) . '\')');
+					}
+
+					$db_root->query('FLUSH PRIVILEGES');
+					$db_root->close();
+
 					// End root-session
 				}

 				// Update the Database description -- PH 2004-11-29
+
 				$log->logAction(USR_ACTION, LOG_INFO, "edited database '" . $result['databasename'] . "'");
 				$databasedescription = validate($_POST['description'], 'description');
-				$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_DATABASES . "`
-					SET `description` = :desc
-					WHERE `customerid` = :customerid
-					AND `id` = :id"
-				);
-				Database::pexecute($stmt, array("desc" => $databasedescription, "customerid" => $userinfo['customerid'], "id" => $id));
-				redirectTo($filename, array('page' => $page, 's' => $s));
-			} else {
-
-				$dbservers_stmt = Database::query("SELECT COUNT(DISTINCT `dbserver`) as numservers FROM `".TABLE_PANEL_DATABASES."`");
-				$dbserver = $dbservers_stmt->fetch(PDO::FETCH_ASSOC);
-				$count_mysqlservers = $dbserver['numservers'];
-
-				Database::needRoot(true, $result['dbserver']);
-				Database::needSqlData();
-				$sql_root = Database::getSqlData();
-				Database::needRoot(false);
-
-				$mysql_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/mysql/formfield.mysql_edit.php';
-				$mysql_edit_form = htmlform::genHTMLForm($mysql_edit_data);
-
-				$title = $mysql_edit_data['mysql_edit']['title'];
-				$image = $mysql_edit_data['mysql_edit']['image'];
-
-				eval("echo \"" . getTemplate('mysql/mysqls_edit') . "\";");
+				$result = $db->query('UPDATE `' . TABLE_PANEL_DATABASES . '` SET `description`="' . $db->escape($databasedescription) . '" WHERE `customerid`="' . (int)$userinfo['customerid'] . '" AND `id`="' . (int)$id . '"');
+				redirectTo($filename, Array('page' => $page, 's' => $s));
+			}
+			else
+			{
+				eval("echo \"" . getTemplate("mysql/mysqls_edit") . "\";");
 			}
 		}
 	}
 }
+
+?>
--- a/customer_tickets.php
+++ b/customer_tickets.php
@@ -14,51 +14,49 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Panel
- *
+ * @version    $Id$
 */

 define('AREA', 'customer');
-require './lib/init.php';

-if (isset($_POST['id'])) {
+/**
+ * Include our init.php, which manages Sessions, Language etc.
+ */

+require ("./lib/init.php");
+
+if(isset($_POST['id']))
+{
 	$id = intval($_POST['id']);
-
-	//Check if the current user is allowed to see the current ticket.
-	$stmt = Database::prepare("SELECT `id` FROM `panel_tickets` WHERE `id` = :id AND `customerid` = :customerid");
-	$result = Database::pexecute_first($stmt, array("id" => $id, "customerid" => $userinfo['customerid']));
-
-	if ($result == null) {
-		// no rights to see the requested ticket
-		standard_error(array('ticketnotaccessible'));
-	}
-} elseif (isset($_GET['id'])) {
+}
+elseif(isset($_GET['id']))
+{
 	$id = intval($_GET['id']);
 }

-if ($page == 'overview') {
+if($page == 'overview')
+{
 	$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_tickets");
-	eval("echo \"" . getTemplate("tickets/ticket") . "\";");
-} elseif ($page == 'tickets') {
-	if ($action == '') {
+	eval("echo \"" . getTemplate("ticket/ticket") . "\";");
+}
+elseif($page == 'tickets')
+{
+	if($action == '')
+	{
 		$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_tickets::tickets");
 		$fields = array(
 			'status' => $lng['ticket']['status'],
+			'priority' => $lng['ticket']['priority'],
 			'lastchange' => $lng['ticket']['lastchange'],
+			'ticket_answers' => $lng['ticket']['ticket_answers'],
 			'subject' => $lng['ticket']['subject'],
 			'lastreplier' => $lng['ticket']['lastreplier']
 		);
-		$paging = new paging($userinfo, TABLE_PANEL_TICKETS, $fields);
-		$stmt = Database::prepare('SELECT `main`.`id`, (SELECT COUNT(`sub`.`id`) FROM `' . TABLE_PANEL_TICKETS . '` `sub`
-			WHERE `sub`.`answerto` = `main`.`id`) AS `ticket_answers`, `main`.`lastchange`, `main`.`subject`, `main`.`status`, `main`.`lastreplier`, `main`.`priority`
-			FROM `' . TABLE_PANEL_TICKETS . '` as `main`
-			WHERE `main`.`answerto` = "0"
-			AND `archived` = "0"
-			AND `customerid`= :customerid ' . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit()
-		);
-		Database::pexecute($stmt, array("customerid" => $userinfo['customerid']));
-
-		$paging->setEntries(Database::num_rows());
+		$paging = new paging($userinfo, $db, TABLE_PANEL_TICKETS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
+		$paging->sortfield = 'lastchange';
+		$paging->sortorder = 'desc';
+		$result = $db->query('SELECT `main`.`id`, (SELECT COUNT(`sub`.`id`) FROM `' . TABLE_PANEL_TICKETS . '` `sub` WHERE `sub`.`answerto` = `main`.`id`) as `ticket_answers`, `main`.`lastchange`, `main`.`subject`, `main`.`status`, `main`.`lastreplier`, `main`.`priority` FROM `' . TABLE_PANEL_TICKETS . '` as `main` WHERE `main`.`answerto` = "0" AND `archived` = "0" AND `customerid`="' . (int)$userinfo['customerid'] . '" AND `adminid`="' . (int)$userinfo['adminid'] . '" ' . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
+		$paging->setEntries($db->num_rows($result));
 		$sortcode = $paging->getHtmlSortCode($lng);
 		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
 		$searchcode = $paging->getHtmlSearchCode($lng);
@@ -68,37 +66,44 @@ if ($page == 'overview') {
 		$tickets = '';
 		$tickets_count = 0;

-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-			if ($paging->checkDisplay($i)) {
+		while($row = $db->fetch_array($result))
+		{
+			if($paging->checkDisplay($i))
+			{
 				$tickets_count++;
 				$row = htmlentities_array($row);
 				$row['lastchange'] = date("d.m.y H:i", $row['lastchange']);

-				if ($row['status'] >= 0 && $row['status'] <= 2) {
+				if($row['status'] >= 0
+				   && $row['status'] <= 2)
+				{
 					$reopen = 0;
-				} else {
+				}
+				else
+				{
 					$reopen = 1;
 				}

 				$row['status'] = ticket::getStatusText($lng, $row['status']);
 				$row['priority'] = ticket::getPriorityText($lng, $row['priority']);

-				if ($row['lastreplier'] == '1') {
+				if($row['lastreplier'] == '1')
+				{
 					$row['lastreplier'] = $lng['ticket']['staff'];
 					$cananswer = 1;
-				} else {
+				}
+				else
+				{
 					$row['lastreplier'] = $lng['ticket']['customer'];
 					$cananswer = 0;
 				}

-				$row['subject'] = html_entity_decode($row['subject']);
-				if (strlen($row['subject']) > 30) {
-					$ts = wordwrap($row['subject'], 30, "|");
-					$ts = explode("|", $ts);
-					$row['subject'] = $ts[0]. '...';
+				if(strlen($row['subject']) > 20)
+				{
+					$row['subject'] = substr($row['subject'], 0, 17) . '...';
 				}

-				eval("\$tickets.=\"" . getTemplate("tickets/tickets_tickets") . "\";");
+				eval("\$tickets.=\"" . getTemplate("ticket/tickets_tickets") . "\";");
 				$count++;
 			}

@@ -108,46 +113,60 @@ if ($page == 'overview') {
 		$supportavailable = 0;
 		$time = date("Hi", time());
 		$day = date("w", time());
-		$start = substr(Settings::Get('ticket.worktime_begin'), 0, 2) . substr(Settings::Get('ticket.worktime_begin'), 3, 2);
-		$end = substr(Settings::Get('ticket.worktime_end'), 0, 2) . substr(Settings::Get('ticket.worktime_end'), 3, 2);
+		$start = substr($settings['ticket']['worktime_begin'], 0, 2) . substr($settings['ticket']['worktime_begin'], 3, 2);
+		$end = substr($settings['ticket']['worktime_end'], 0, 2) . substr($settings['ticket']['worktime_end'], 3, 2);

-		if ($time >= $start && $time <= $end) {
+		if($time >= $start
+		   && $time <= $end)
+		{
 			$supportavailable = 1;
 		}

-		if (Settings::Get('ticket.worktime_sat') == "0" && $day == "6") {
+		if($settings['ticket']['worktime_sat'] == "0"
+		   && $day == "6")
+		{
 			$supportavailable = 0;
 		}

-		if (Settings::Get('ticket.worktime_sun') == "0" && $day == "0") {
+		if($settings['ticket']['worktime_sun'] == "0"
+		   && $day == "0")
+		{
 			$supportavailable = 0;
 		}

-		if (Settings::Get('ticket.worktime_all') == "1") {
+		if($settings['ticket']['worktime_all'] == "1")
+		{
 			$supportavailable = 1;
 		}

 		$ticketsopen = 0;
-		$stmt = Database::prepare('SELECT COUNT(`id`) as `count` FROM `' . TABLE_PANEL_TICKETS . '`
-			WHERE `customerid` = :customerid
-			AND `answerto` = "0"
-			AND (`status` = "0" OR `status` = "1" OR `status` = "2")'
-		);
-		$opentickets = Database::pexecute_first($stmt, array("customerid" => $userinfo['customerid']));
+		$opentickets = $db->query_first('SELECT COUNT(`id`) as `count` FROM `' . TABLE_PANEL_TICKETS . '`
+                                         WHERE `customerid` = "' . $userinfo['customerid'] . '"
+                                         AND `answerto` = "0"
+                                         AND (`status` = "0" OR `status` = "1" OR `status` = "2")');

-		if (Settings::Get('ticket.concurrently_open') != - 1 && Settings::Get('ticket.concurrently_open') != '') {
-			$notmorethanxopentickets = strtr($lng['ticket']['notmorethanxopentickets'], array('%s' => Settings::Get('ticket.concurrently_open')));
-		} else {
+		if($settings['ticket']['concurrently_open'] != - 1
+		   && $settings['ticket']['concurrently_open'] != '')
+		{
+			$notmorethanxopentickets = strtr($lng['ticket']['notmorethanxopentickets'], array('%s' => $settings['ticket']['concurrently_open']));
+		}
+		else
+		{
 			$notmorethanxopentickets = '';
 		}

 		$ticketsopen = (int)$opentickets['count'];
-		eval("echo \"" . getTemplate("tickets/tickets") . "\";");
-
-	} elseif ($action == 'new') {
-		if ($userinfo['tickets_used'] < $userinfo['tickets'] || $userinfo['tickets'] == '-1') {
-			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-				$newticket = ticket::getInstanceOf($userinfo, -1);
+		eval("echo \"" . getTemplate("ticket/tickets") . "\";");
+	}
+	elseif($action == 'new')
+	{
+		if($userinfo['tickets_used'] < $userinfo['tickets']
+		   || $userinfo['tickets'] == '-1')
+		{
+			if(isset($_POST['send'])
+			   && $_POST['send'] == 'send')
+			{
+				$newticket = ticket::getInstanceOf($userinfo, $db, $settings, -1);
 				$newticket->Set('subject', validate($_POST['subject'], 'subject'), true, false);
 				$newticket->Set('priority', validate($_POST['priority'], 'priority'), true, false);
 				$newticket->Set('category', validate($_POST['category'], 'category'), true, false);
@@ -155,11 +174,16 @@ if ($page == 'overview') {
 				$newticket->Set('admin', (int)$userinfo['adminid'], true, false);
 				$newticket->Set('message', validate(str_replace("\r\n", "\n", $_POST['message']), 'message', '/^[^\0]*$/'), true, false);

-				if ($newticket->Get('subject') == null) {
+				if($newticket->Get('subject') == null)
+				{
 					standard_error(array('stringisempty', 'mysubject'));
-				} elseif ($newticket->Get('message') == null) {
+				}
+				elseif($newticket->Get('message') == null)
+				{
 					standard_error(array('stringisempty', 'mymessage'));
-				} else {
+				}
+				else
+				{
 					$now = time();
 					$newticket->Set('dt', $now, true, true);
 					$newticket->Set('lastchange', $now, true, true);
@@ -169,84 +193,86 @@ if ($page == 'overview') {
 					$newticket->Set('by', '0', true, true);
 					$newticket->Insert();
 					$log->logAction(USR_ACTION, LOG_NOTICE, "opened support-ticket '" . $newticket->Get('subject') . "'");
-
-					$stmt = Database::prepare('UPDATE `' . TABLE_PANEL_CUSTOMERS . '`
-						SET `tickets_used`=`tickets_used` + 1
-						WHERE `customerid`= :customerid'
-					);
-					Database::pexecute($stmt, array("customerid" => $userinfo['customerid']));
+					$db->query('UPDATE `' . TABLE_PANEL_CUSTOMERS . '`
+                          SET `tickets_used`=`tickets_used`+1 WHERE `customerid`="' . (int)$userinfo['customerid'] . '"');

 					// Customer mail
+
 					$newticket->sendMail((int)$userinfo['customerid'], 'new_ticket_for_customer_subject', $lng['mails']['new_ticket_for_customer']['subject'], 'new_ticket_for_customer_mailbody', $lng['mails']['new_ticket_for_customer']['mailbody']);

 					// Admin mail
+
 					$newticket->sendMail(-1, 'new_ticket_by_customer_subject', $lng['mails']['new_ticket_by_customer']['subject'], 'new_ticket_by_customer_mailbody', $lng['mails']['new_ticket_by_customer']['mailbody']);
-					redirectTo($filename, array('page' => $page, 's' => $s));
+					redirectTo($filename, Array('page' => $page, 's' => $s));
 				}
-			} else {
+			}
+			else
+			{
 				$categories = '';
-				$result_stmt = Database::prepare('SELECT `id`, `name` FROM `' . TABLE_PANEL_TICKET_CATS . '`
-					WHERE `adminid` = :adminid
-					ORDER BY `logicalorder`, `name` ASC'
-				);
-				$result = Database::pexecute_first($result_stmt, array("adminid" => $userinfo['adminid']));
+				$result = $db->query_first('SELECT `id`, `name` FROM `' . TABLE_PANEL_TICKET_CATS . '` ORDER BY `name` ASC');

-				if (isset($result['name']) && $result['name'] != '') {
-					$result2_stmt = Database::prepare('SELECT `id`, `name` FROM `' . TABLE_PANEL_TICKET_CATS . '`
-						WHERE `adminid` = :adminid
-						ORDER BY `logicalorder`, `name` ASC'
-					);
-					Database::pexecute($result2_stmt, array("adminid" => $userinfo['adminid']));
+				if(isset($result['name'])
+				   && $result['name'] != '')
+				{
+					$result2 = $db->query('SELECT `id`, `name` FROM `' . TABLE_PANEL_TICKET_CATS . '` ORDER BY `name` ASC');

-					while ($row = $result2_stmt->fetch(PDO::FETCH_ASSOC)) {
+					while($row = $db->fetch_array($result2))
+					{
 						$categories.= makeoption($row['name'], $row['id']);
 					}
-				} else {
+				}
+				else
+				{
 					$categories = makeoption($lng['ticket']['no_cat'], '0');
 				}

-				$priorities = makeoption($lng['ticket']['high'], '1');
-				$priorities.= makeoption($lng['ticket']['normal'], '2');
-				$priorities.= makeoption($lng['ticket']['low'], '3');
+				$priorities = makeoption($lng['ticket']['unf_high'], '1');
+				$priorities.= makeoption($lng['ticket']['unf_normal'], '2');
+				$priorities.= makeoption($lng['ticket']['unf_low'], '3');
 				$ticketsopen = 0;
-				$opentickets_stmt = Database::prepare('SELECT COUNT(`id`) as `count` FROM `' . TABLE_PANEL_TICKETS . '`
-					WHERE `customerid` = :customerid
-					AND `answerto` = "0"
-					AND (`status` = "0" OR `status` = "1" OR `status` = "2")'
-				);
-				$opentickets = Database::pexecute_first($opentickets_stmt, array("customerid" => $userinfo['customerid']));
+				$opentickets = $db->query_first('SELECT COUNT(`id`) as `count` FROM `' . TABLE_PANEL_TICKETS . '`
+                                           WHERE `customerid` = "' . $userinfo['customerid'] . '"
+                                           AND `answerto` = "0"
+                                           AND (`status` = "0" OR `status` = "1" OR `status` = "2")');

-				if (Settings::Get('ticket.concurrently_open') != -1 && Settings::Get('ticket.concurrently_open') != '') {
-					$notmorethanxopentickets = strtr($lng['ticket']['notmorethanxopentickets'], array('%s' => Settings::Get('ticket.concurrently_open')));
-				} else {
+				if($settings['ticket']['concurrently_open'] != - 1
+				   && $settings['ticket']['concurrently_open'] != '')
+				{
+					$notmorethanxopentickets = strtr($lng['ticket']['notmorethanxopentickets'], array('%s' => $settings['ticket']['concurrently_open']));
+				}
+				else
+				{
 					$notmorethanxopentickets = '';
 				}

 				$ticketsopen = (int)$opentickets['count'];
-
-				$ticket_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/tickets/formfield.ticket_add.php';
-				$ticket_add_form = htmlform::genHTMLForm($ticket_add_data);
-
-				$title = $ticket_add_data['ticket_add']['title'];
-				$image = $ticket_add_data['ticket_add']['image'];
-
-				eval("echo \"" . getTemplate("tickets/tickets_new") . "\";");
+				eval("echo \"" . getTemplate("ticket/tickets_new") . "\";");
 			}
-		} else {
+		}
+		else
+		{
 			standard_error('nomoreticketsavailable');
 		}
-	} elseif ($action == 'answer' && $id != 0) {
-		if (isset($_POST['send']) && $_POST['send'] == 'send') {
-			$replyticket = ticket::getInstanceOf($userinfo, -1);
+	}
+	elseif($action == 'answer'
+	       && $id != 0)
+	{
+		if(isset($_POST['send'])
+		   && $_POST['send'] == 'send')
+		{
+			$replyticket = ticket::getInstanceOf($userinfo, $db, $settings, -1);
 			$replyticket->Set('subject', validate($_POST['subject'], 'subject'), true, false);
 			$replyticket->Set('priority', validate($_POST['priority'], 'priority'), true, false);
 			$replyticket->Set('message', validate(str_replace("\r\n", "\n", $_POST['message']), 'message', '/^[^\0]*$/'), true, false);

-			if ($replyticket->Get('message') == null) {
+			if($replyticket->Get('message') == null)
+			{
 				standard_error(array('stringisempty', 'mymessage'));
-			} else {
+			}
+			else
+			{
 				$now = time();
-				$replyticket->Set('customer', (int)$userinfo['customerid'], true, true);
+				$replyticket->Set('customerid', (int)$userinfo['customerid'], true, true);
 				$replyticket->Set('lastchange', $now, true, true);
 				$replyticket->Set('ip', $_SERVER['REMOTE_ADDR'], true, true);
 				$replyticket->Set('status', '1', true, true);
@@ -255,9 +281,11 @@ if ($page == 'overview') {
 				$replyticket->Insert();

 				// Update priority if changed
-				$mainticket = ticket::getInstanceOf($userinfo, (int)$id);

-				if ($replyticket->Get('priority') != $mainticket->Get('priority')) {
+				$mainticket = ticket::getInstanceOf($userinfo, $db, $settings, (int)$id);
+
+				if($replyticket->Get('priority') != $mainticket->Get('priority'))
+				{
 					$mainticket->Set('priority', $replyticket->Get('priority'), true);
 				}

@@ -267,121 +295,120 @@ if ($page == 'overview') {
 				$mainticket->Update();
 				$log->logAction(USR_ACTION, LOG_NOTICE, "answered support-ticket '" . $mainticket->Get('subject') . "'");
 				$mainticket->sendMail(-1, 'new_reply_ticket_by_customer_subject', $lng['mails']['new_reply_ticket_by_customer']['subject'], 'new_reply_ticket_by_customer_mailbody', $lng['mails']['new_reply_ticket_by_customer']['mailbody']);
-				redirectTo($filename, array('page' => $page, 's' => $s));
+				redirectTo($filename, Array('page' => $page, 's' => $s));
 			}
-		} else {
+		}
+		else
+		{
 			$ticket_replies = '';
-			$mainticket = ticket::getInstanceOf($userinfo, (int)$id);
+			$mainticket = ticket::getInstanceOf($userinfo, $db, $settings, (int)$id);
 			$dt = date("d.m.Y H:i\h", $mainticket->Get('dt'));
 			$status = ticket::getStatusText($lng, $mainticket->Get('status'));

-			if ($mainticket->Get('status') >= 0 && $mainticket->Get('status') <= 2) {
+			if($mainticket->Get('status') >= 0
+			   && $mainticket->Get('status') <= 2)
+			{
 				$isclosed = 0;
-			} else {
+			}
+			else
+			{
 				$isclosed = 1;
 			}

-			if ($mainticket->Get('by') == '1') {
+			if($mainticket->Get('by') == '1')
+			{
 				$by = $lng['ticket']['staff'];
-			} else {
-				$cid = $mainticket->Get('customer');
-				$usr_stmt = Database::prepare('SELECT `customerid`, `firstname`, `name`, `company`, `loginname`
-					FROM `' . TABLE_PANEL_CUSTOMERS . '`
-					WHERE `customerid` = :customerid '
-				);
-				$usr = Database::pexecute_first($usr_stmt, array("customerid" => $cid));
-				$by = getCorrectFullUserDetails($usr);
+			}
+			else
+			{
+				$by = $lng['ticket']['customer'];
 			}

 			$subject = $mainticket->Get('subject');
 			$message = $mainticket->Get('message');
-			eval("\$ticket_replies.=\"" . getTemplate("tickets/tickets_tickets_main") . "\";");
-			$result_stmt = Database::prepare('SELECT `name` FROM `' . TABLE_PANEL_TICKET_CATS . '`
-				WHERE `id`= :id '
-			);
-			$row = Database::pexecute_first($result_stmt, array("id" => $mainticket->Get('category')));
+			eval("\$ticket_replies.=\"" . getTemplate("ticket/tickets_tickets_main") . "\";");
+			$result = $db->query('SELECT `name` FROM `' . TABLE_PANEL_TICKET_CATS . '`
+                                WHERE `id`="' . (int)$mainticket->Get('category') . '"');
+			$row = $db->fetch_array($result);
+			$andere = $db->query('SELECT * FROM `' . TABLE_PANEL_TICKETS . '` WHERE `answerto`="' . (int)$id . '" ORDER BY `lastchange` ASC');

-			$andere_stmt = Database::prepare('SELECT * FROM `' . TABLE_PANEL_TICKETS . '`
-				WHERE `answerto`= :answerto
-				ORDER BY `lastchange` ASC'
-			);
-			Database::pexecute($andere_stmt, array("answerto" => $id));
-			$numrows_andere = Database::num_rows();
-
-			while ($row2 = $andere_stmt->fetch(PDO::FETCH_ASSOC)) {
-				$subticket = ticket::getInstanceOf($userinfo, (int)$row2['id']);
+			while($row2 = $db->fetch_array($andere))
+			{
+				$subticket = ticket::getInstanceOf($userinfo, $db, $settings, (int)$row2['id']);
 				$lastchange = date("d.m.Y H:i\h", $subticket->Get('lastchange'));

-				if ($subticket->Get('by') == '1') {
+				if($subticket->Get('by') == '1')
+				{
 					$by = $lng['ticket']['staff'];
-				} else {
-					$cid = $subticket->Get('customer');
-					$usr_stmt = Database::prepare('
-						SELECT `customerid`, `firstname`, `name`, `company`, `loginname`
-						FROM `' . TABLE_PANEL_CUSTOMERS . '`
-						WHERE `customerid` = :customerid '
-					);
-					$usr = Database::pexecute_first($usr_stmt, array("customerid" => $cid));
-					$by = getCorrectFullUserDetails($usr);
+				}
+				else
+				{
+					$by = $lng['ticket']['customer'];
 				}

 				$subject = $subticket->Get('subject');
 				$message = $subticket->Get('message');
-				
-				$row2 = htmlentities_array($row2);
-				eval("\$ticket_replies.=\"" . getTemplate("tickets/tickets_tickets_list") . "\";");
+				eval("\$ticket_replies.=\"" . getTemplate("ticket/tickets_tickets_list") . "\";");
 			}

 			$priorities = makeoption($lng['ticket']['high'], '1', $mainticket->Get('priority'), true, true);
 			$priorities.= makeoption($lng['ticket']['normal'], '2', $mainticket->Get('priority'), true, true);
 			$priorities.= makeoption($lng['ticket']['low'], '3', $mainticket->Get('priority'), true, true);
-			$subject = htmlentities($mainticket->Get('subject'));
-			$ticket_replies_count = $numrows_andere + 1;
+			$subject = $mainticket->Get('subject');
+			$ticket_replies_count = $db->num_rows($andere) + 1;

 			// don't forget the main-ticket!
-			$ticket_reply_data = include_once dirname(__FILE__).'/lib/formfields/customer/tickets/formfield.ticket_reply.php';
-			$ticket_reply_form = htmlform::genHTMLForm($ticket_reply_data);

-			$title = $ticket_reply_data['ticket_reply']['title'];
-			$image = $ticket_reply_data['ticket_reply']['image'];
-
-			eval("echo \"" . getTemplate("tickets/tickets_reply") . "\";");
+			eval("echo \"" . getTemplate("ticket/tickets_reply") . "\";");
 		}
-	} elseif ($action == 'close' && $id != 0) {
-		if (isset($_POST['send']) && $_POST['send'] == 'send') {
+	}
+	elseif($action == 'close'
+	       && $id != 0)
+	{
+		if(isset($_POST['send'])
+		   && $_POST['send'] == 'send')
+		{
 			$now = time();
-			$mainticket = ticket::getInstanceOf($userinfo, (int)$id);
+			$mainticket = ticket::getInstanceOf($userinfo, $db, $settings, (int)$id);
 			$mainticket->Set('lastchange', $now, true, true);
 			$mainticket->Set('lastreplier', '0', true, true);
 			$mainticket->Set('status', '3', true, true);
 			$mainticket->Update();
 			$log->logAction(USR_ACTION, LOG_NOTICE, "closed support-ticket '" . $mainticket->Get('subject') . "'");
-			redirectTo($filename, array('page' => $page, 's' => $s));
-		} else {
-			$mainticket = ticket::getInstanceOf($userinfo, (int)$id);
+			redirectTo($filename, Array('page' => $page, 's' => $s));
+		}
+		else
+		{
+			$mainticket = ticket::getInstanceOf($userinfo, $db, $settings, (int)$id);
 			ask_yesno('ticket_reallyclose', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $mainticket->Get('subject'));
 		}
-	} elseif ($action == 'reopen' && $id != 0) {
+	}
+	elseif($action == 'reopen'
+	       && $id != 0)
+	{
 		$ticketsopen = 0;
-		$opentickets_stmt = Database::prepare('SELECT COUNT(`id`) as `count` FROM `' . TABLE_PANEL_TICKETS . '`
-			WHERE `customerid` = :customerid
-			AND `answerto` = "0"
-			AND (`status` = "0" OR `status` = "1" OR `status` = "2")'
-		);
-		$opentickets = Database::pexecute_first($opentickets_stmt, array("customerid" => $userinfo['customerid']));
+		$opentickets = $db->query_first('SELECT COUNT(`id`) as `count` FROM `' . TABLE_PANEL_TICKETS . '`
+                                       WHERE `customerid` = "' . $userinfo['customerid'] . '"
+                                       AND `answerto` = "0"
+                                       AND (`status` = "0" OR `status` = "1" OR `status` = "2")');
 		$ticketsopen = (int)$opentickets['count'];

-		if ($ticketsopen > Settings::Get('ticket.concurrently_open') && Settings::Get('ticket.concurrently_open') != - 1 && Settings::Get('ticket.concurrently_open') != '') {
-			standard_error('notmorethanxopentickets', Settings::Get('ticket.concurrently_open'));
+		if($ticketsopen > $settings['ticket']['concurrently_open']
+		   && $settings['ticket']['concurrently_open'] != - 1
+		   && $settings['ticket']['concurrently_open'] != '')
+		{
+			standard_error('notmorethanxopentickets', $settings['ticket']['concurrently_open']);
 		}

 		$now = time();
-		$mainticket = ticket::getInstanceOf($userinfo, (int)$id);
+		$mainticket = ticket::getInstanceOf($userinfo, $db, $settings, (int)$id);
 		$mainticket->Set('lastchange', $now, true, true);
 		$mainticket->Set('lastreplier', '0', true, true);
 		$mainticket->Set('status', '0', true, true);
 		$mainticket->Update();
 		$log->logAction(USR_ACTION, LOG_NOTICE, "reopened support-ticket '" . $mainticket->Get('subject') . "'");
-		redirectTo($filename, array('page' => $page, 's' => $s));
+		redirectTo($filename, Array('page' => $page, 's' => $s));
 	}
 }
+
+?>
--- a/customer_traffic.php
+++ b/customer_traffic.php
@@ -14,147 +14,262 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Panel
- *
+ * @version    $Id$
 */

 define('AREA', 'customer');
-$intrafficpage = 1;
-require './lib/init.php';
+
+/**
+ * Include our init.php, which manages Sessions, Language etc.
+ */
+
+require ("./lib/init.php");
 $traffic = '';
 $month = null;
 $year = null;

-if (isset($_POST['month']) && isset($_POST['year'])) {
+if(isset($_POST['month'])
+   && isset($_POST['year']))
+{
 	$month = intval($_POST['month']);
 	$year = intval($_POST['year']);
-} elseif (isset($_GET['month']) && isset($_GET['year'])) {
+}
+elseif(isset($_GET['month'])
+       && isset($_GET['year']))
+{
 	$month = intval($_GET['month']);
 	$year = intval($_GET['year']);
 }
+
 //BAM! $_GET???
-elseif (isset($_GET['page']) && $_GET['page'] == 'current') {
-	if (date('d') != '01') {
+
+elseif (isset($_GET['page'])
+       && $_GET['page'] == "current")
+{
+	if(date('d') != '01')
+	{
 		$month = date('m');
 		$year = date('Y');
-	} else {
-		if (date('m') == '01') {
+	}
+	else
+	{
+		if(date('m') == '01')
+		{
 			$month = 12;
 			$year = date('Y') - 1;
-		} else {
+		}
+		else
+		{
 			$month = date('m') - 1;
 			$year = date('Y');
 		}
 	}
 }

-if (!is_null($month) && !is_null($year)) {
+if(!is_null($month)
+   && !is_null($year))
+{
 	$traf['byte'] = 0;
-	$result_stmt = Database::prepare("SELECT SUM(`http`) as 'http', SUM(`ftp_up`) AS 'ftp_up', SUM(`ftp_down`) as 'ftp_down', SUM(`mail`) as 'mail', `day`, `month`, `year`
-		FROM `" . TABLE_PANEL_TRAFFIC . "`
-		WHERE `customerid`= :customerid
-		AND `month` = :month
-		AND `year` = :year
-		GROUP BY `day`
-		ORDER BY `day` DESC"
-	);
-	$params = array(
-		"customerid" => $userinfo['customerid'],
-		"month" => $month,
-		"year" => $year
-	);
-	Database::pexecute($result_stmt, $params);
+	$result = $db->query("SELECT MAX(`http`), MAX(`ftp_up`+`ftp_down`), MAX(`mail`)
+	                     FROM `" . TABLE_PANEL_TRAFFIC . "`
+	                     WHERE `customerid`='" . $userinfo['customerid'] . "'
+	                     AND `month` = '" . $month . "'
+	                     AND `year` = '" . $year . "'");
+	$row = mysql_fetch_row($result);
+	rsort($row);
+	$traf['max'] = ($row[0] > $row[1] ? ($row[0] > $row[2] ? $row[0] : $row[2]) : ($row[1] > $row[2] ? $row[1] : $row[2]));;
+	$result = $db->query("SELECT
+                                SUM(`http`) as 'http', SUM(`ftp_up`) AS 'ftp_up', SUM(`ftp_down`) as 'ftp_down', SUM(`mail`) as 'mail',
+                                `day`, `month`, `year`
+                             FROM `" . TABLE_PANEL_TRAFFIC . "`
+	                     WHERE `customerid`='" . $userinfo['customerid'] . "'
+	                     AND `month` = '" . $month . "' AND `year` = '" . $year . "'
+	                     GROUP BY `day` ORDER BY `day` ASC");
 	$traffic_complete['http'] = 0;
 	$traffic_complete['ftp'] = 0;
 	$traffic_complete['mail'] = 0;
 	$show = '';

-	while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+	while($row = $db->fetch_array($result))
+	{
 		$http = $row['http'];
 		$ftp = $row['ftp_up'] + $row['ftp_down'];
 		$mail = $row['mail'];
 		$traf['byte'] = $http + $ftp + $mail;
-		$traffic_complete['http'] += $http;
-		$traffic_complete['ftp'] += $ftp;
-		$traffic_complete['mail'] += $mail;
-		$traf['day'] = $row['day'] . '.';
+		$traffic_complete['http']+= $http;
+		$traffic_complete['ftp']+= $ftp;
+		$traffic_complete['mail']+= $mail;
+		$traf['day'] = $row['day'];

-		if (extension_loaded('bcmath')) {
-			$traf['ftptext'] = bcdiv($row['ftp_up'], 1024, Settings::Get('panel.decimal_places')) . " MiB up/ " . bcdiv($row['ftp_down'], 1024, Settings::Get('panel.decimal_places')) . " MiB down (FTP)";
-			$traf['httptext'] = bcdiv($http, 1024, Settings::Get('panel.decimal_places')) . " MiB (HTTP)";
-			$traf['mailtext'] = bcdiv($mail, 1024, Settings::Get('panel.decimal_places')) . " MiB (Mail)";
-			$traf['ftp'] = bcdiv($ftp, 1024, Settings::Get('panel.decimal_places'));
-			$traf['http'] = bcdiv($http, 1024, Settings::Get('panel.decimal_places'));
-			$traf['mail'] = bcdiv($mail, 1024, Settings::Get('panel.decimal_places'));
-			$traf['byte'] = bcdiv($traf['byte'], 1024, Settings::Get('panel.decimal_places'));
-		} else {
-			$traf['ftptext'] = round($row['ftp_up'] / 1024, Settings::Get('panel.decimal_places')) . " MiB up/ " . round($row['ftp_down'] / 1024, Settings::Get('panel.decimal_places')) . " MiB down (FTP)";
-			$traf['httptext'] = round($http / 1024, Settings::Get('panel.decimal_places')) . " MiB (HTTP)";
-			$traf['mailtext'] = round($mail / 1024, Settings::Get('panel.decimal_places')) . " MiB (Mail)";
-			$traf['http'] = round($http, Settings::Get('panel.decimal_places'));
-			$traf['ftp'] = round($ftp, Settings::Get('panel.decimal_places'));
-			$traf['mail'] = round($mail, Settings::Get('panel.decimal_places'));
-			$traf['byte'] = round($traf['byte'] / 1024, Settings::Get('panel.decimal_places'));
+		if(extension_loaded('bcmath'))
+		{
+			$traf['ftptext'] = bcdiv($row['ftp_up'], 1024, $settings['panel']['decimal_places']) . " MB up/ " . bcdiv($row['ftp_down'], 1024, $settings['panel']['decimal_places']) . " MB down (FTP)";
+			$traf['httptext'] = bcdiv($http, 1024, $settings['panel']['decimal_places']) . " MB (HTTP)";
+			$traf['mailtext'] = bcdiv($mail, 1024, $settings['panel']['decimal_places']) . " MB (Mail)";
+		}
+		else
+		{
+			$traf['ftptext'] = round($row['ftp_up'] / 1024, $settings['panel']['decimal_places']) . " MB up/ " . round($row['ftp_down'] / 1024, $settings['panel']['decimal_places']) . " MB down (FTP)";
+			$traf['httptext'] = round($http / 1024, $settings['panel']['decimal_places']) . " MB (HTTP)";
+			$traf['mailtext'] = round($mail / 1024, $settings['panel']['decimal_places']) . " MB (Mail)";
 		}

-		eval("\$traffic.=\"" . getTemplate('traffic/traffic_month') . "\";");
-		$show = $lng['traffic']['months'][intval($row['month'])] . ' ' . $row['year'];
+		if($traf['byte'] != 0
+		   && $traf['max'] != 0)
+		{
+			$proz = $traf['max'] / 100;
+			$traf['http'] = round($http / $proz, 0);
+			$traf['ftp'] = round($ftp / $proz, 0);
+			$traf['mail'] = round($mail / $proz, 0);
+
+			if($traf['http'] == 0)
+			{
+				$traf['http'] = 1;
+			}
+
+			if($traf['ftp'] == 0)
+			{
+				$traf['ftp'] = 1;
+			}
+
+			if($traf['mail'] == 0)
+			{
+				$traf['mail'] = 1;
+			}
+		}
+		else
+		{
+			$traf['http'] = 0;
+			$traf['ftp'] = 0;
+			$traf['mail'] = 0;
+		}
+
+		if(extension_loaded('bcmath'))
+		{
+			$traf['byte'] = bcdiv($traf['byte'], 1024, $settings['panel']['decimal_places']);
+		}
+		else
+		{
+			$traf['byte'] = round($traf['byte'] / 1024, $settings['panel']['decimal_places']);
+		}
+
+		eval("\$traffic.=\"" . getTemplate("traffic/traffic_month") . "\";");
+		$show = $lng['traffic']['months'][intval($row['month'])] . " " . $row['year'];
 	}

-	$traffic_complete['http'] = size_readable($traffic_complete['http'] * 1024, 'GiB', 'bi', '%01.'.(int)Settings::Get('panel.decimal_places').'f %s');
-	$traffic_complete['ftp'] = size_readable($traffic_complete['ftp'] * 1024, 'GiB', 'bi', '%01.'.(int)Settings::Get('panel.decimal_places').'f %s');
-	$traffic_complete['mail'] = size_readable($traffic_complete['mail'] * 1024, 'GiB', 'bi', '%01.'.(int)Settings::Get('panel.decimal_places').'f %s');
+	if(extension_loaded('bcmath'))
+	{
+		$traffic_complete['http'] = bcdiv($traffic_complete['http'], 1024, $settings['panel']['decimal_places']);
+		$traffic_complete['ftp'] = bcdiv($traffic_complete['ftp'], 1024, $settings['panel']['decimal_places']);
+		$traffic_complete['mail'] = bcdiv($traffic_complete['mail'], 1024, $settings['panel']['decimal_places']);
+	}
+	else
+	{
+		$traffic_complete['http'] = round($traffic_complete['http'] / 1024, $settings['panel']['decimal_places']);
+		$traffic_complete['ftp'] = round($traffic_complete['ftp'] / 1024, $settings['panel']['decimal_places']);
+		$traffic_complete['mail'] = round($traffic_complete['mail'] / 1024, $settings['panel']['decimal_places']);
+	}

-	eval("echo \"" . getTemplate('traffic/traffic_details') . "\";");
-} else {
-	$result_stmt = Database::prepare("SELECT `month`, `year`, SUM(`http`) AS http, SUM(`ftp_up`) AS ftp_up, SUM(`ftp_down`) AS ftp_down, SUM(`mail`) AS mail
-		FROM `" . TABLE_PANEL_TRAFFIC . "`
-		WHERE `customerid` = :customerid
-		GROUP BY CONCAT(`year`,`month`)
-		ORDER BY CONCAT(`year`,`month`) DESC
-		LIMIT 12"
-	);
-	Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid']));
+	eval("echo \"" . getTemplate("traffic/traffic_details") . "\";");
+}
+else
+{
+	$result = $db->query("SELECT MAX(`http`), MAX(`ftp_up`+`ftp_down`), MAX(`mail`)
+	                     FROM `" . TABLE_PANEL_TRAFFIC . "`
+	                     WHERE `customerid`='" . $userinfo['customerid'] . "'
+	                     GROUP BY CONCAT(`year`,`month`) ORDER BY CONCAT(`year`,`month`) DESC LIMIT 12");
+	$row = mysql_fetch_row($result);
+	rsort($row);
+	$traf['max'] = ($row[0] > $row[1] ? ($row[0] > $row[2] ? $row[0] : $row[2]) : ($row[1] > $row[2] ? $row[1] : $row[2]));
+	$result = $db->query("SELECT `month`, `year`, SUM(`http`) AS http, SUM(`ftp_up`) AS ftp_up, SUM(`ftp_down`) AS ftp_down, SUM(`mail`) AS mail
+	                     FROM `" . TABLE_PANEL_TRAFFIC . "` WHERE `customerid` = '" . $userinfo['customerid'] . "'
+	                     GROUP BY CONCAT(`year`,`month`) ORDER BY CONCAT(`year`,`month`) DESC LIMIT 12");
 	$traffic_complete['http'] = 0;
 	$traffic_complete['ftp'] = 0;
 	$traffic_complete['mail'] = 0;

-	while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+	while($row = $db->fetch_array($result))
+	{
 		$http = $row['http'];
 		$ftp_up = $row['ftp_up'];
 		$ftp_down = $row['ftp_down'];
 		$mail = $row['mail'];
-		$traffic_complete['http'] += $http;
-		$traffic_complete['ftp'] += $ftp_up + $ftp_down;
-		$traffic_complete['mail'] += $mail;
+		$traffic_complete['http']+= $http;
+		$traffic_complete['ftp']+= $ftp_up + $ftp_down;
+		$traffic_complete['mail']+= $mail;
 		$traf['month'] = $row['month'];
 		$traf['year'] = $row['year'];
 		$traf['monthname'] = $lng['traffic']['months'][intval($row['month'])] . " " . $row['year'];
 		$traf['byte'] = $http + $ftp_up + $ftp_down + $mail;

-		if (extension_loaded('bcmath')) {
-			$traf['ftptext'] = bcdiv($ftp_up, 1024, Settings::Get('panel.decimal_places')) . " MiB up/ " . bcdiv($ftp_down, 1024, Settings::Get('panel.decimal_places')) . " MiB down (FTP)";
-			$traf['httptext'] = bcdiv($http, 1024, Settings::Get('panel.decimal_places')) . " MiB (HTTP)";
-			$traf['mailtext'] = bcdiv($mail, 1024, Settings::Get('panel.decimal_places')) . " MiB (Mail)";
-			$traf['ftp'] = bcdiv(($ftp_up + $ftp_down), 1024, Settings::Get('panel.decimal_places'));
-			$traf['http'] = bcdiv($http, 1024, Settings::Get('panel.decimal_places'));
-			$traf['mail'] = bcdiv($mail, 1024, Settings::Get('panel.decimal_places'));
-			$traf['byte'] = bcdiv($traf['byte'], 1024 * 1024, Settings::Get('panel.decimal_places'));
-		} else {
-			$traf['ftptext'] = round($ftp_up / 1024, Settings::Get('panel.decimal_places')) . " MiB up/ " . round($ftp_down / 1024, Settings::Get('panel.decimal_places')) . " MiB down (FTP)";
-			$traf['httptext'] = round($http / 1024, Settings::Get('panel.decimal_places')) . " MiB (HTTP)";
-			$traf['mailtext'] = round($mail / 1024, Settings::Get('panel.decimal_places')) . " MiB (Mail)";
-			$traf['ftp'] = round(($ftp_up + $ftp_down) / 1024, Settings::Get('panel.decimal_places'));
-			$traf['http'] = round($http / 1024, Settings::Get('panel.decimal_places'));
-			$traf['mail'] = round($mail / 1024, Settings::Get('panel.decimal_places'));
-			$traf['byte'] = round($traf['byte'] / (1024 * 1024), Settings::Get('panel.decimal_places'));
+		if(extension_loaded('bcmath'))
+		{
+			$traf['ftptext'] = bcdiv($ftp_up, 1024 * 1024, $settings['panel']['decimal_places']) . " GB up/ " . bcdiv($ftp_down, 1024 * 1024, $settings['panel']['decimal_places']) . " GB down (FTP)";
+			$traf['httptext'] = bcdiv($http, 1024 * 1024, $settings['panel']['decimal_places']) . " GB (HTTP)";
+			$traf['mailtext'] = bcdiv($mail, 1024 * 1024, $settings['panel']['decimal_places']) . " GB (Mail)";
+		}
+		else
+		{
+			$traf['ftptext'] = round($ftp_up / 1024 * 1024, $settings['panel']['decimal_places']) . " GB up/ " . round($ftp_down / 1024 * 1024, $settings['panel']['decimal_places']) . " GB down (FTP)";
+			$traf['httptext'] = round($http / 1024 * 1024, $settings['panel']['decimal_places']) . " GB (HTTP)";
+			$traf['mailtext'] = round($mail / 1024 * 1024, $settings['panel']['decimal_places']) . " GB (Mail)";
 		}

-		eval("\$traffic.=\"" . getTemplate('traffic/traffic_traffic') . "\";");
+		if($traf['max'] != 0)
+		{
+			$proz = $traf['max'] / 100;
+			$traf['ftp'] = round(($ftp_up + $ftp_down) / $proz, 0);
+			$traf['http'] = round($http / $proz, 0);
+			$traf['mail'] = round($mail / $proz, 0);
+
+			if($traf['http'] == 0)
+			{
+				$traf['http'] = 1;
+			}
+
+			if($traf['ftp'] == 0)
+			{
+				$traf['ftp'] = 1;
+			}
+
+			if($traf['mail'] == 0)
+			{
+				$traf['mail'] = 1;
+			}
+		}
+		else
+		{
+			$traf['ftp'] = 0;
+			$traf['http'] = 0;
+			$traf['mail'] = 0;
+		}
+
+		if(extension_loaded('bcmath'))
+		{
+			$traf['byte'] = bcadd($traf['byte'] / (1024 * 1024), 0.0000, 4);
+		}
+		else
+		{
+			$traf['byte'] = round($traf['byte'] + (1024 * 1024), 4);
+		}
+
+		eval("\$traffic.=\"" . getTemplate("traffic/traffic_traffic") . "\";");
 	}

-	$traffic_complete['http'] = size_readable($traffic_complete['http'] * 1024, 'GiB', 'bi', '%01.'.(int)Settings::Get('panel.decimal_places').'f %s');
-	$traffic_complete['ftp'] = size_readable($traffic_complete['ftp'] * 1024, 'GiB', 'bi', '%01.'.(int)Settings::Get('panel.decimal_places').'f %s');
-	$traffic_complete['mail'] = size_readable($traffic_complete['mail'] * 1024, 'GiB', 'bi', '%01.'.(int)Settings::Get('panel.decimal_places').'f %s');
+	if(extension_loaded('bcmath'))
+	{
+		$traffic_complete['http'] = bcdiv($traffic_complete['http'], 1024 * 1024, $settings['panel']['decimal_places']);
+		$traffic_complete['ftp'] = bcdiv($traffic_complete['ftp'], 1024 * 1024, $settings['panel']['decimal_places']);
+		$traffic_complete['mail'] = bcdiv($traffic_complete['mail'], 1024 * 1024, $settings['panel']['decimal_places']);
+	}
+	else
+	{
+		$traffic_complete['http'] = round($traffic_complete['http'] / 1024 * 1024, $settings['panel']['decimal_places']);
+		$traffic_complete['ftp'] = round($traffic_complete['ftp'] / 1024 * 1024, $settings['panel']['decimal_places']);
+		$traffic_complete['mail'] = round($traffic_complete['mail'] / 1024 * 1024, $settings['panel']['decimal_places']);
+	}

-	eval("echo \"" . getTemplate('traffic/traffic') . "\";");
+	eval("echo \"" . getTemplate("traffic/traffic") . "\";");
 }
+
+?>
--- a/images/ball.gif
+++ b/images/ball.gif
--- a/images/changelanguage.gif
+++ b/images/changelanguage.gif
--- a/images/default.png
+++ b/images/default.png
--- a/images/endsection.gif
+++ b/images/endsection.gif
--- a/images/error.gif
+++ b/images/error.gif
--- a/images/error.png
+++ b/images/error.png
--- a/images/footer.gif
+++ b/images/footer.gif
--- a/images/header.gif
+++ b/images/header.gif
--- a/images/header_r.gif
+++ b/images/header_r.gif
--- a/images/info.png
+++ b/images/info.png
--- a/images/login.gif
+++ b/images/login.gif
--- a/images/logininternal.gif
+++ b/images/logininternal.gif
--- a/images/order_asc.gif
+++ b/images/order_asc.gif
--- a/images/order_desc.gif
+++ b/images/order_desc.gif
--- a/images/section.gif
+++ b/images/section.gif
--- a/images/shadow.gif
+++ b/images/shadow.gif
--- a/images/subsection.gif
+++ b/images/subsection.gif
--- a/images/title.gif
+++ b/images/title.gif
--- a/images/traffic_blue.gif
+++ b/images/traffic_blue.gif
--- a/images/traffic_green.gif
+++ b/images/traffic_green.gif
--- a/images/traffic_red.gif
+++ b/images/traffic_red.gif
--- a/images/traffic_yellow.gif
+++ b/images/traffic_yellow.gif
--- a/index.php
+++ b/index.php
@@ -14,543 +14,313 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Panel
- *
+ * @version    $Id$
 */

 define('AREA', 'login');
-require './lib/init.php';

-if ($action == '') {
+/**
+ * Include our init.php, which manages Sessions, Language etc.
+ */
+
+require ("./lib/init.php");
+
+if($action == '')
+{
 	$action = 'login';
 }

-if ($action == 'login') {
-	if (isset($_POST['send']) && $_POST['send'] == 'send') {
+if($action == 'login')
+{
+	if(isset($_POST['send'])
+	&& $_POST['send'] == 'send')
+	{
 		$loginname = validate($_POST['loginname'], 'loginname');
 		$password = validate($_POST['password'], 'password');

-		$stmt = Database::prepare("SELECT `loginname` AS `customer` FROM `" . TABLE_PANEL_CUSTOMERS . "`
-			WHERE `loginname`= :loginname"
-		);
-		Database::pexecute($stmt, array("loginname" => $loginname));
-		$row = $stmt->fetch(PDO::FETCH_ASSOC);
+		$row = $db->query_first("SELECT `loginname` AS `customer` FROM `" . TABLE_PANEL_CUSTOMERS . "` WHERE `loginname`='" . $db->escape($loginname) . "'");

-		if ($row['customer'] == $loginname) {
+		if($row['customer'] == $loginname)
+		{
 			$table = "`" . TABLE_PANEL_CUSTOMERS . "`";
 			$uid = 'customerid';
 			$adminsession = '0';
 			$is_admin = false;
-		} else {
+		}
+		else
+		{
 			$is_admin = true;
-			if ((int)Settings::Get('login.domain_login') == 1) {
-				$domainname = $idna_convert->encode(preg_replace(array('/\:(\d)+$/', '/^https?\:\/\//'), '', $loginname));
-				$stmt = Database::prepare("SELECT `customerid` FROM `" . TABLE_PANEL_DOMAINS . "`
-					WHERE `domain` = :domain"
-				);
-				Database::pexecute($stmt, array("domain" => $domainname));
-				$row2 = $stmt->fetch(PDO::FETCH_ASSOC);
-
-				if (isset($row2['customerid']) && $row2['customerid'] > 0) {
-					$loginname = getCustomerDetail($row2['customerid'], 'loginname');
-					if ($loginname !== false) {
-						$stmt = Database::prepare("SELECT `loginname` AS `customer` FROM `" . TABLE_PANEL_CUSTOMERS . "`
-							WHERE `loginname`= :loginname"
-						);
-						Database::pexecute($stmt, array("loginname" => $loginname));
-						$row3 = $stmt->fetch(PDO::FETCH_ASSOC);
-						if ($row3['customer'] == $loginname) {
-							$table = "`" . TABLE_PANEL_CUSTOMERS . "`";
-							$uid = 'customerid';
-							$adminsession = '0';
-							$is_admin = false;
-						}
-					}
-				}
-			}
 		}

-		if ((hasUpdates($version) || hasDbUpdates($dbversion)) && $is_admin == false) {
+		if(hasUpdates($version) && $is_admin == false)
+		{
 			redirectTo('index.php');
 			exit;
 		}

-		if ($is_admin) {
-			if (hasUpdates($version) || hasDbUpdates($dbversion)) {
-				$stmt = Database::prepare("SELECT `loginname` AS `admin` FROM `" . TABLE_PANEL_ADMINS . "`
-					WHERE `loginname`= :loginname
-					AND `change_serversettings` = '1'"
-				);
-				Database::pexecute($stmt, array("loginname" => $loginname));
-				$row = $stmt->fetch(PDO::FETCH_ASSOC);
-				if (!isset($row['admin'])) {
-					// not an admin who can see updates
+		if($is_admin)
+		{
+			if(hasUpdates($version))
+			{
+				$row = $db->query_first("SELECT `loginname` AS `admin` FROM `" . TABLE_PANEL_ADMINS . "` WHERE `loginname`='" . $db->escape($loginname) . "' AND `change_serversettings` = '1'");
+				/*
+				 * not an admin who can see updates
+				 */
+				if(!isset($row['admin']))
+				{
 					redirectTo('index.php');
 					exit;
 				}
-			} else {
-				$stmt = Database::prepare("SELECT `loginname` AS `admin` FROM `" . TABLE_PANEL_ADMINS . "`
-					WHERE `loginname`= :loginname"
-				);
-				Database::pexecute($stmt, array("loginname" => $loginname));
-				$row = $stmt->fetch(PDO::FETCH_ASSOC);
+			}
+			else
+			{
+				$row = $db->query_first("SELECT `loginname` AS `admin` FROM `" . TABLE_PANEL_ADMINS . "` WHERE `loginname`='" . $db->escape($loginname) . "'");
 			}

-			if ($row['admin'] == $loginname) {
+			if($row['admin'] == $loginname)
+			{
 				$table = "`" . TABLE_PANEL_ADMINS . "`";
 				$uid = 'adminid';
 				$adminsession = '1';
-			} else {
-				// Log failed login
-				$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => $_SERVER['REMOTE_ADDR']));
-				$rstlog->logAction(LOGIN_ACTION, LOG_WARNING, "Unknown user '" . $loginname . "' tried to login.");
-
-				redirectTo('index.php', array('showmessage' => '2'));
+			}
+			else
+			{
+				redirectTo('index.php', Array('showmessage' => '2'), true);
 				exit;
 			}
 		}

-		$userinfo_stmt = Database::prepare("SELECT * FROM $table
-			WHERE `loginname`= :loginname"
-		);
-		Database::pexecute($userinfo_stmt, array("loginname" => $loginname));
-		$userinfo = $userinfo_stmt->fetch(PDO::FETCH_ASSOC);
+		$userinfo = $db->query_first("SELECT * FROM $table WHERE `loginname`='" . $db->escape($loginname) . "'");

-		if ($userinfo['loginfail_count'] >= Settings::Get('login.maxloginattempts') && $userinfo['lastlogin_fail'] > (time() - Settings::Get('login.deactivatetime'))) {
-			redirectTo('index.php', array('showmessage' => '3'));
+		if($userinfo['loginfail_count'] >= $settings['login']['maxloginattempts']
+		&& $userinfo['lastlogin_fail'] > (time() - $settings['login']['deactivatetime']))
+		{
+			redirectTo('index.php', Array('showmessage' => '3'), true);
 			exit;
-		} elseif (validatePasswordLogin($userinfo, $password, $table, $uid)) {
-		    // only show "you're banned" if the login was successful
-		    // because we don't want to publish that the user does exist
-		    if ($userinfo['deactivated']) {
-		        unset($userinfo);
-		        redirectTo('index.php', array('showmessage' => '5'));
-		        exit;
-		    } else {
-		        // login correct
-		        // reset loginfail_counter, set lastlogin_succ
-		        $stmt = Database::prepare("UPDATE $table
-		              SET `lastlogin_succ`= :lastlogin_succ, `loginfail_count`='0'
-		              WHERE `$uid`= :uid"
-		        );
-		        Database::pexecute($stmt, array("lastlogin_succ" => time(), "uid" => $userinfo[$uid]));
-		        $userinfo['userid'] = $userinfo[$uid];
-		        $userinfo['adminsession'] = $adminsession;
-		    }
-		} else {
+		}
+		elseif($userinfo['password'] == md5($password))
+		{
+			// login correct
+			// reset loginfail_counter, set lastlogin_succ
+
+			$db->query("UPDATE $table SET `lastlogin_succ`='" . time() . "', `loginfail_count`='0' WHERE `$uid`='" . (int)$userinfo[$uid] . "'");
+			$userinfo['userid'] = $userinfo[$uid];
+			$userinfo['adminsession'] = $adminsession;
+		}
+		else
+		{
 			// login incorrect
-			$stmt = Database::prepare("UPDATE $table
-				SET `lastlogin_fail`= :lastlogin_fail, `loginfail_count`=`loginfail_count`+1
-				WHERE `$uid`= :uid"
-			);
-			Database::pexecute($stmt, array("lastlogin_fail" => time(), "uid" => $userinfo[$uid]));
-
-			// Log failed login
-			$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => $_SERVER['REMOTE_ADDR']));
-			$rstlog->logAction(LOGIN_ACTION, LOG_WARNING, "User '" . $loginname . "' tried to login with wrong password.");

+			$db->query("UPDATE $table SET `lastlogin_fail`='" . time() . "', `loginfail_count`=`loginfail_count`+1 WHERE `$uid`='" . (int)$userinfo[$uid] . "'");
 			unset($userinfo);
-			redirectTo('index.php', array('showmessage' => '2'));
+			redirectTo('index.php', Array('showmessage' => '2'), true);
 			exit;
 		}

-		if (isset($userinfo['userid']) && $userinfo['userid'] != '') {
+		if(isset($userinfo['userid'])
+		&& $userinfo['userid'] != '')
+		{
 			$s = md5(uniqid(microtime(), 1));

-			if (isset($_POST['language'])) {
+			if(isset($_POST['language']))
+			{
 				$language = validate($_POST['language'], 'language');
-				if ($language == 'profile') {
+
+				if($language == 'profile')
+				{
 					$language = $userinfo['def_language'];
-				} elseif (!isset($languages[$language])) {
-					$language = Settings::Get('panel.standardlanguage');
 				}
-			} else {
-				$language = Settings::Get('panel.standardlanguage');
-			}
-
-			if (isset($userinfo['theme']) && $userinfo['theme'] != '') {
-				$theme = $userinfo['theme'];
-			} else {
-				$theme = Settings::Get('panel.default_theme');
-			}
-
-			if (Settings::Get('session.allow_multiple_login') != '1') {
-				$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_SESSIONS . "`
-					WHERE `userid` = :uid
-					AND `adminsession` = :adminsession"
-				);
-				Database::pexecute($stmt, array("uid" => $userinfo['userid'], "adminsession" => $userinfo['adminsession']));
-			}
-
-			// check for field 'theme' in session-table, refs #607
-			// Changed with #1287 to new method
-			$theme_field = false;
-			$stmt = Database::query("SHOW COLUMNS FROM panel_sessions LIKE 'theme'");
-			while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-				if ($row['Field'] == "theme") {
-					$has_theme = true;
+				elseif(!isset($languages[$language]))
+				{
+					$language = $settings['panel']['standardlanguage'];
 				}
 			}
-
-			$params = array(
-				"hash" => $s,
-				"userid" => $userinfo['userid'],
-				"ipaddress" => $remote_addr,
-				"useragent" => $http_user_agent,
-				"lastactivity" => time(),
-				"language" => $language,
-				"adminsession" => $userinfo['adminsession']
-			);
-
-			if ($has_theme) {
-				$params["theme"] = $theme;
-				$stmt = Database::prepare("INSERT INTO `" . TABLE_PANEL_SESSIONS . "`
-					(`hash`, `userid`, `ipaddress`, `useragent`, `lastactivity`, `language`, `adminsession`, `theme`)
-					VALUES (:hash, :userid, :ipaddress, :useragent, :lastactivity, :language, :adminsession, :theme)"
-				);
-			} else {
-				$stmt = Database::prepare("INSERT INTO `" . TABLE_PANEL_SESSIONS . "`
-					(`hash`, `userid`, `ipaddress`, `useragent`, `lastactivity`, `language`, `adminsession`)
-					VALUES (:hash, :userid, :ipaddress, :useragent, :lastactivity, :language, :adminsession)"
-				);
+			else
+			{
+				$language = $settings['panel']['standardlanguage'];
 			}
-			Database::pexecute($stmt, $params);

-			$qryparams = array();
-			if (isset($_POST['qrystr']) && $_POST['qrystr'] != "") {
-				parse_str(urldecode($_POST['qrystr']), $qryparams);
+			if($settings['session']['allow_multiple_login'] != '1')
+			{
+				$db->query("DELETE FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid` = '" . (int)$userinfo['userid'] . "' AND `adminsession` = '" . $db->escape($userinfo['adminsession']) . "'");
 			}
-			$qryparams['s'] = $s;

-			if ($userinfo['adminsession'] == '1') {
-				if (hasUpdates($version) || hasDbUpdates($dbversion)) {
-					redirectTo('admin_updates.php', array('s' => $s));
-				} else {
-					if (isset($_POST['script']) && $_POST['script'] != "") {
-						if (preg_match("/customer\_/", $_POST['script']) === 1) {
-							redirectTo('admin_customers.php', array("page" => "customers"));
-						} else {
-							redirectTo($_POST['script'], $qryparams);
-						}
-					} else {
-						redirectTo('admin_index.php', $qryparams);
-					}
+			$db->query("INSERT INTO `" . TABLE_PANEL_SESSIONS . "` (`hash`, `userid`, `ipaddress`, `useragent`, `lastactivity`, `language`, `adminsession`) VALUES ('" . $db->escape($s) . "', '" . (int)$userinfo['userid'] . "', '" . $db->escape($remote_addr) . "', '" . $db->escape($http_user_agent) . "', '" . time() . "', '" . $db->escape($language) . "', '" . $db->escape($userinfo['adminsession']) . "')");
+
+			if($userinfo['adminsession'] == '1')
+			{
+				if(hasUpdates($version))
+				{
+					redirectTo('admin_updates.php', Array('s' => $s), true);
+					exit;
 				}
-			} else {
-				if (isset($_POST['script']) && $_POST['script'] != "") {
-					redirectTo($_POST['script'], $qryparams);
-				} else {
-					redirectTo('customer_index.php', $qryparams);
+				else
+				{
+					redirectTo('admin_index.php', Array('s' => $s), true);
+					exit;
 				}
 			}
-		} else {
-			redirectTo('index.php', array('showmessage' => '2'));
+			else
+			{
+				redirectTo('customer_index.php', Array('s' => $s), true);
+				exit;
+			}
 		}
-		exit;
-	} else {
+		else
+		{
+			redirectTo('index.php', Array('showmessage' => '2'), true);
+			exit;
+		}
+	}
+	else
+	{
 		$language_options = '';
-		$language_options .= makeoption($lng['login']['profile_lng'], 'profile', 'profile', true, true);
+		$language_options.= makeoption($lng['login']['profile_lng'], 'profile', 'profile', true, true);

-		while (list($language_file, $language_name) = each($languages)) {
-			$language_options .= makeoption($language_name, $language_file, 'profile', true);
+		while(list($language_file, $language_name) = each($languages))
+		{
+			$language_options.= makeoption($language_name, $language_file, 'profile', true);
 		}

 		$smessage = isset($_GET['showmessage']) ? (int)$_GET['showmessage'] : 0;
 		$message = '';
-		$successmessage = '';

-		switch ($smessage) {
-		case 1:
-			$successmessage = $lng['pwdreminder']['success'];
-			break;
-		case 2:
-			$message = $lng['error']['login'];
-			break;
-		case 3:
-			$message = sprintf($lng['error']['login_blocked'], Settings::Get('login.deactivatetime'));
-			break;
-		case 4:
-			$cmail = isset($_GET['customermail']) ? $_GET['customermail'] : 'unknown';
-			$message = str_replace('%s', $cmail, $lng['error']['errorsendingmail']);
-			break;
-		case 5:
-			$message = $lng['error']['user_banned'];
-			break;
-		case 6:
-			$successmessage = $lng['pwdreminder']['changed'];
-			break;
-		case 7:
-			$message = $lng['pwdreminder']['wrongcode'];
-			break;
-		case 8:
-		    $message = $lng['pwdreminder']['notallowed'];
-		    break;
+		switch($smessage)
+		{
+			case 1:
+				$message = $lng['pwdreminder']['success'];
+				break;
+			case 2:
+				$message = $lng['error']['login'];
+				break;
+			case 3:
+				$message = $lng['error']['login_blocked'];
+				break;
+			case 4:
+				$message = $lng['error']['errorsendingmail'];
+				break;
 		}

 		$update_in_progress = '';
-		if (hasUpdates($version) || hasDbUpdates($dbversion)) {
+		if(hasUpdates($version))
+		{
 			$update_in_progress = $lng['update']['updateinprogress_onlyadmincanlogin'];
 		}
-		
-		// Pass the last used page if needed
-		$lastscript = "";
-		if (isset($_REQUEST['script']) && $_REQUEST['script'] != "") {
-			$lastscript = $_REQUEST['script'];

-			if (!file_exists(__DIR__."/".$lastscript)) {
-				$lastscript = "";
-			}
-		}
-		$lastqrystr = "";
-		if (isset($_REQUEST['qrystr']) && $_REQUEST['qrystr'] != "") {
-			$lastqrystr = strip_tags($_REQUEST['qrystr']);
-		}
-
-		eval("echo \"" . getTemplate('login') . "\";");
+		eval("echo \"" . getTemplate("login") . "\";");
 	}
 }

-if ($action == 'forgotpwd') {
-	$adminchecked = false;
-	$message = '';
-
-	if (isset($_POST['send']) && $_POST['send'] == 'send') {
+if($action == 'forgotpwd')
+{
+	if(isset($_POST['send'])
+	&& $_POST['send'] == 'send')
+	{
+		$adminchecked = false;
 		$loginname = validate($_POST['loginname'], 'loginname');
 		$email = validateEmail($_POST['loginemail'], 'email');
-		$result_stmt = Database::prepare("SELECT `adminid`, `customerid`, `firstname`, `name`, `company`, `email`, `loginname`, `def_language`, `deactivated` FROM `" . TABLE_PANEL_CUSTOMERS . "`
-			WHERE `loginname`= :loginname
-			AND `email`= :email"
-		);
-		Database::pexecute($result_stmt, array("loginname" => $loginname, "email" => $email));
+		$sql = "SELECT `customerid`, `firstname`, `name`, `email`, `loginname` FROM `" . TABLE_PANEL_CUSTOMERS . "`
+				WHERE `loginname`='" . $db->escape($loginname) . "'
+				AND `email`='" . $db->escape($email) . "'";
+		$result = $db->query($sql);

-		if (Database::num_rows() == 0) {
-			$result_stmt = Database::prepare("SELECT `adminid`, `name`, `email`, `loginname`, `def_language`, `deactivated` FROM `" . TABLE_PANEL_ADMINS . "`
-				WHERE `loginname`= :loginname
-				AND `email`= :email"
-			);
-			Database::pexecute($result_stmt, array("loginname" => $loginname, "email" => $email));
-
-			if (Database::num_rows() > 0) {
-				$adminchecked = true;
-			} else {
-				$result_stmt = null;
-			}
+		if($db->num_rows() == 0)
+		{
+			$sql = "SELECT `adminid`, `name`, `email`, `loginname` FROM `" . TABLE_PANEL_ADMINS . "`
+				WHERE `loginname`='" . $db->escape($loginname) . "'
+				AND `email`='" . $db->escape($email) . "'";
+			$result = $db->query($sql);
+			$adminchecked = true;
 		}

-		if ($result_stmt !== null) {
-			$user = $result_stmt->fetch(PDO::FETCH_ASSOC);
+		$user = $db->fetch_array($result);

-			/* Check whether user is banned */
-			if ($user['deactivated']) {
-				redirectTo('index.php', array('showmessage' => '8'));
-				exit;
-			}
+		if(($adminchecked && $settings['panel']['allow_preset_admin'] == '1')
+		|| $adminchecked == false)
+		{
+			if($user !== false)
+			{
+				$password = substr(md5(uniqid(microtime(), 1)), 12, 6);

-			if (($adminchecked && Settings::Get('panel.allow_preset_admin') == '1') || $adminchecked == false) {
-				if ($user !== false) {
-					// build a activation code
-					$timestamp = time();
-					$first = substr(md5($user['loginname'] . $timestamp . randomStr(16)), 0, 15);
-					$third = substr(md5($user['email'] . $timestamp . randomStr(16)), -15);
-					$activationcode = $first . $timestamp . $third . substr(md5($third . $timestamp), 0, 10);
-
-					// Drop all existing activation codes for this user
-					$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_ACTIVATION . "`
-						WHERE `userid` = :userid
-						AND `admin` = :admin"
-					);
-					$params = array(
-						"userid" => $adminchecked ? $user['adminid'] : $user['customerid'],
-						"admin" => $adminchecked ? 1 : 0
-					);
-					Database::pexecute($stmt, $params);
-
-					// Add new activation code to database
-					$stmt = Database::prepare("INSERT INTO `" . TABLE_PANEL_ACTIVATION . "`
-						(userid, admin, creation, activationcode)
-						VALUES (:userid, :admin, :creation, :activationcode)"
-					);
-					$params = array(
-						"userid" => $adminchecked ? $user['adminid'] : $user['customerid'],
-						"admin" => $adminchecked ? 1 : 0,
-						"creation" => $timestamp,
-						"activationcode" => $activationcode
-					);
-					Database::pexecute($stmt, $params);
-
-					$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'password_reset'));
-					$rstlog->logAction(USR_ACTION, LOG_WARNING, "User '" . $user['loginname'] . "' requested a link for setting a new password.");
-
-					// Set together our activation link
-					$protocol = empty( $_SERVER['HTTPS'] ) ? 'http' : 'https';
-					// this can be a fixed value to avoid potential exploiting by modifying headers
-					$host = Settings::Get('system.hostname'); // $_SERVER['HTTP_HOST'];
-					$port = $_SERVER['SERVER_PORT'] != 80 ? ':' . $_SERVER['SERVER_PORT'] : '';
-					// don't add :443 when https is used, as it is default (and just looks weird!)
-					if ($protocol == 'https' && $_SERVER['SERVER_PORT'] == '443') {
-						$port = '';
-					}
-					// there can be only one script to handle this so we can use a fixed value here
-					$script = "/index.php"; // $_SERVER['SCRIPT_NAME'];
-					if (Settings::Get('system.froxlordirectlyviahostname') == 0) {
-						$script = makeCorrectFile("/".basename(__DIR__)."/".$script);
-					}
-					$activationlink = $protocol . '://' . $host . $port . $script . '?action=resetpwd&resetcode=' . $activationcode;
-
-					$replace_arr = array(
-						'SALUTATION' => getCorrectUserSalutation($user),
-						'USERNAME' => $loginname,
-						'LINK' => $activationlink
-					);
-
-					$def_language = ($user['def_language'] != '') ? $user['def_language'] : Settings::Get('panel.standardlanguage');
-					$result_stmt = Database::prepare('SELECT `value` FROM `' . TABLE_PANEL_TEMPLATES . '`
-						WHERE `adminid`= :adminid
-						AND `language`= :lang
-						AND `templategroup`=\'mails\'
-						AND `varname`=\'password_reset_subject\''
-					);
-					Database::pexecute($result_stmt, array("adminid" => $user['adminid'], "lang" => $def_language));
-					$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
-					$mail_subject = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['password_reset']['subject']), $replace_arr));
-
-					$result_stmt = Database::prepare('SELECT `value` FROM `' . TABLE_PANEL_TEMPLATES . '`
-						WHERE `adminid`= :adminid
-						AND `language`= :lang
-						AND `templategroup`=\'mails\'
-						AND `varname`=\'password_reset_mailbody\''
-					);
-					Database::pexecute($result_stmt, array("adminid" => $user['adminid'], "lang" => $def_language));
-					$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
-					$mail_body = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['password_reset']['mailbody']), $replace_arr));
-
-					$_mailerror = false;
-					try {
-						$mail->Subject = $mail_subject;
-						$mail->AltBody = $mail_body;
-						$mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
-						$mail->AddAddress($user['email'], getCorrectUserSalutation($user));
-						$mail->Send();
-					} catch(phpmailerException $e) {
-						$mailerr_msg = $e->errorMessage();
-						$_mailerror = true;
-					} catch (Exception $e) {
-						$mailerr_msg = $e->getMessage();
-						$_mailerror = true;
-					}
-
-					if ($_mailerror) {
-						$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'password_reset'));
-						$rstlog->logAction(ADM_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
-						redirectTo('index.php', array('showmessage' => '4', 'customermail' => $user['email']));
-						exit;
-					}
-
-					$mail->ClearAddresses();
-					redirectTo('index.php', array('showmessage' => '1'));
-					exit;
-				} else {
-					$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'password_reset'));
-					$rstlog->logAction(USR_ACTION, LOG_WARNING, "User '" . $loginname . "' requested to set a new password, but was not found in database!");
-					$message = $lng['login']['combination_not_found'];
+				if($adminchecked)
+				{
+					$db->query("UPDATE `" . TABLE_PANEL_ADMINS . "` SET `password`='" . md5($password) . "'
+							WHERE `loginname`='" . $user['loginname'] . "'
+							AND `email`='" . $user['email'] . "'");
+				}
+				else
+				{
+					$db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `password`='" . md5($password) . "'
+							WHERE `loginname`='" . $user['loginname'] . "'
+							AND `email`='" . $user['email'] . "'");
 				}

-				unset($user);
+				$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'password_reset'), $db, $settings);
+				$rstlog->logAction(USR_ACTION, LOG_WARNING, "Password for user '" . $user['loginname'] . "' has been reset!");
+				$body = strtr($lng['pwdreminder']['body'], array('%s' => $user['firstname'] . ' ' . $user['name'], '%p' => $password));
+				
+				$_mailerror = false;
+				try {
+					$mail->Subject = $lng['pwdreminder']['subject'];
+					$mail->AltBody = $body;
+					$mail->MsgHTML(str_replace("\\n", "<br />", $body));
+					$mail->AddAddress($user['email'], $user['firstname'] . ' ' . $user['name']);
+					$mail->Send();
+				} catch(phpmailerException $e) {
+					$mailerr_msg = $e->errorMessage();
+					$_mailerror = true;
+				} catch (Exception $e) {
+					$mailerr_msg = $e->getMessage();
+					$_mailerror = true;
+				}
+
+				if ($_mailerror) {
+					$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'password_reset'), $db, $settings);
+					$rstlog->logAction(ADM_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
+					redirectTo('index.php', Array('showmessage' => '4'), true);
+					exit;
+				}
+
+				$mail->ClearAddresses();
+				redirectTo('index.php', Array('showmessage' => '1'), true);
+				exit;
 			}
-		} else {
-			$message = $lng['login']['usernotfound'];
+			else
+			{
+				$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'password_reset'), $db, $settings);
+				$rstlog->logAction(USR_ACTION, LOG_WARNING, "User '" . $loginname . "' tried to reset pwd but wasn't found in database!");
+				$message = $lng['login']['usernotfound'];
+			}
+
+			unset($user);
+		}
+		else
+		{
+			$message = '';
 		}
 	}
+	else
+	{
+		$message = '';
+	}

-	if ($adminchecked) {
-		if (Settings::Get('panel.allow_preset_admin') != '1') {
+	if($adminchecked)
+	{
+		if($settings['panel']['allow_preset_admin'] != '1')
+		{
 			$message = $lng['pwdreminder']['notallowed'];
 			unset ($adminchecked);
 		}
-	} else {
-		if (Settings::Get('panel.allow_preset') != '1') {
+	}
+	else
+	{
+		if($settings['panel']['allow_preset'] != '1')
+		{
 			$message = $lng['pwdreminder']['notallowed'];
 		}
 	}

-	eval("echo \"" . getTemplate('fpwd') . "\";");
+	eval("echo \"" . getTemplate("fpwd") . "\";");
 }

-if ($action == 'resetpwd') {
-	$message = '';
-
-	// Remove old activation codes
-	$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_ACTIVATION . "`
-		WHERE creation < :oldest"
-	);
-	Database::pexecute($stmt, array("oldest" => time() - 86400));
-
-	if (isset($_GET['resetcode']) && strlen($_GET['resetcode']) == 50) {
-		// Check if activation code is valid
-		$activationcode = $_GET['resetcode'];
-		$timestamp = substr($activationcode, 15, 10);
-		$third = substr($activationcode, 25, 15);
-		$check = substr($activationcode, 40, 10);
-
-		if (substr(md5($third . $timestamp), 0, 10) == $check && $timestamp >= time() - 86400) {
-			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-				$stmt = Database::prepare("SELECT `userid`, `admin` FROM `" . TABLE_PANEL_ACTIVATION . "`
-					WHERE `activationcode` = :activationcode"
-				);
-				$result = Database::pexecute_first($stmt, array("activationcode" => $activationcode));
-
-				if ($result !== false) {
-					if ($result['admin'] == 1) {
-						$new_password = validate($_POST['new_password'], 'new password');
-						$new_password_confirm = validate($_POST['new_password_confirm'], 'new password confirm');
-					} else {
-						$new_password = validatePassword($_POST['new_password'], 'new password');
-						$new_password_confirm = validatePassword($_POST['new_password_confirm'], 'new password confirm');
-					}
-
-					if ($new_password == '') {
-						$message = $new_password;
-					} elseif ($new_password_confirm == '') {
-						$message = $new_password_confirm;
-					} elseif ($new_password != $new_password_confirm) {
-						$message = $new_password . " != " . $new_password_confirm;
-					} else {
-						// Update user password
-						if ($result['admin'] == 1) {
-							$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_ADMINS . "`
-								SET `password` = :newpassword
-								WHERE `adminid` = :userid"
-							);
-						} else {
-							$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "`
-								SET `password` = :newpassword
-								WHERE `customerid` = :userid"
-							);
-						}
-						Database::pexecute($stmt, array("newpassword" => makeCryptPassword($new_password), "userid" => $result['userid']));
-
-						$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'password_reset'));
-						$rstlog->logAction(USR_ACTION, LOG_NOTICE, "changed password using password reset.");
-
-						// Remove activation code from DB
-						$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_ACTIVATION . "`
-							WHERE `activationcode` = :activationcode
-							AND `userid` = :userid"
-						);
-						Database::pexecute($stmt, array("activationcode" => $activationcode, "userid" => $result['userid']));
-						redirectTo('index.php', array("showmessage" => '6'));
-					}
-				} else {
-					redirectTo('index.php', array("showmessage" => '7'));
-				}
-			}
-
-			eval("echo \"" . getTemplate('rpwd') . "\";");
-
-		} else {
-			redirectTo('index.php', array("showmessage" => '7'));
-		}
-
-	} else {
-		redirectTo('index.php');
-	}
-}
+?>
--- a/install/froxlor.sql
+++ b/install/froxlor.sql
--- a/install/install.php
+++ b/install/install.php
@@ -2,6 +2,7 @@

 /**
 * This file is part of the Froxlor project.
+ * Copyright (c) 2003-2009 the SysCP Team (see authors).
 * Copyright (c) 2010 the Froxlor Team (see authors).
 *
 * For the full copyright and license information, please view the COPYING
@@ -9,14 +10,819 @@
 * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
 *
 * @copyright  (c) the authors
- * @author     Michael Kaufmann <mkaufmann@nutime.de>
+ * @author     Florian Lippert <flo@syscp.org> (2003-2009)
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Install
- *
+ * @version    $Id$
 */

-require 'lib/class.FroxlorInstall.php';
+/**
+ * Most elements are taken from the phpBB (www.phpbb.com)
+ * installer, (c) 1999 - 2004 phpBB Group.
+ */

-$frxinstall = new FroxlorInstall();
-$frxinstall->run();
+if(file_exists('../lib/userdata.inc.php'))
+{
+	/**
+	 * Includes the Usersettings eg. MySQL-Username/Passwort etc. to test if Froxlor is already installed
+	 */
+
+	require ('../lib/userdata.inc.php');
+
+	if(isset($sql)
+	   && is_array($sql))
+	{
+		die('Sorry, Froxlor is already configured...');
+	}
+}
+
+/**
+ * Include the functions
+ */
+
+require ('../lib/functions.php');
+
+/**
+ * Include the MySQL-Table-Definitions
+ */
+
+require ('../lib/tables.inc.php');
+
+/**
+ * Language Managament
+ */
+
+$languages = Array(
+	'german' => 'Deutsch',
+	'english' => 'English',
+	'french' => 'Francais'
+);
+$standardlanguage = 'english';
+
+if(isset($_GET['language'])
+   && isset($languages[$_GET['language']]))
+{
+	$language = $_GET['language'];
+}
+elseif(isset($_POST['language'])
+       && isset($languages[$_POST['language']]))
+{
+	$language = $_POST['language'];
+}
+else
+{
+	$language = $standardlanguage;
+}
+
+if(file_exists('./lng/' . $language . '.lng.php'))
+{
+	/**
+	 * Includes file /lng/$language.lng.php if it exists
+	 */
+
+	require ('./lng/' . $language . '.lng.php');
+}
+
+/**
+ * BEGIN FUNCTIONS -----------------------------------------------
+ */
+
+function page_header()
+{
+
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type" />
+	<link rel="stylesheet" href="../templates/main.css" type="text/css" />
+	<title>Froxlor</title>
+</head>
+	<body style="margin: 0; padding: 0;" onload="document.loginform.loginname.focus()">
+		<!--
+			We request you retain the full copyright notice below including the link to www.froxlor.org.
+			This not only gives respect to the large amount of time given freely by the developers
+			but also helps build interest, traffic and use of Froxlor. If you refuse
+			to include even this then support on our forums may be affected.
+			The Froxlor Team : 2009-2010
+		// -->
+		<!--
+			Templates based on work by Luca Piona (info@havanastudio.ch) and Luca Longinotti (chtekk@gentoo.org)
+		// -->
+		<table cellspacing="0" cellpadding="0" border="0" width="100%">
+			<tr>
+				<td width="800"><img src="../images/header.gif" width="800" height="90" alt="" /></td>
+				<td class="header">&nbsp;</td>
+			</tr>
+		</table>
+		<table cellspacing="0" cellpadding="0" border="0" width="100%">
+			<tr>
+				<td valign="top" bgcolor="#FFFFFF">
+				<br />
+				<br />
+<?php
+}
+
+function page_footer()
+{
+
+?>
+				</td>
+			</tr>
+		</table>
+		<table cellspacing="0" cellpadding="0" border="0" width="100%">
+			<tr>
+				<td width="100%" class="footer">
+					<br />Froxlor &copy; 2009-2010 by <a href="http://www.froxlor.org/" target="_blank">the Froxlor Team</a>
+					<br /><br/>
+				</td>
+			</tr>
+		</table>
+	</body>
+</html>
+<?php
+}
+
+function status_message($case, $text)
+{
+	if($case == 'begin')
+	{
+		echo "\t\t<tr>\n\t\t\t<td class=\"main_field_name\">$text";
+	}
+	else
+	{
+		echo " <span style=\"color:$case;\">$text</span></td>\n\t\t</tr>\n";
+	}
+}
+
+/**
+ * END FUNCTIONS ---------------------------------------------------
+ */
+
+/**
+ * BEGIN VARIABLES ---------------------------------------------------
+ */
+
+//guess Servername
+
+if(!empty($_POST['servername']))
+{
+	$servername = $_POST['servername'];
+}
+else
+{
+	if(!empty($_SERVER['SERVER_NAME']))
+	{
+		if(validate_ip($_SERVER['SERVER_NAME'], true) == false)
+		{
+			$servername = $_SERVER['SERVER_NAME'];
+		}
+		else
+		{
+			$servername = '';
+		}
+	}
+	else
+	{
+		$servername = '';
+	}
+}
+
+//guess serverip
+
+if(!empty($_POST['serverip']))
+{
+	$serverip = $_POST['serverip'];
+}
+else
+{
+	if(!empty($_SERVER['SERVER_ADDR']))
+	{
+		$serverip = $_SERVER['SERVER_ADDR'];
+	}
+	else
+	{
+		$serverip = '';
+	}
+}
+
+if(!empty($_POST['mysql_host']))
+{
+	$mysql_host = $_POST['mysql_host'];
+}
+else
+{
+	$mysql_host = '127.0.0.1';
+}
+
+if(!empty($_POST['mysql_database']))
+{
+	$mysql_database = $_POST['mysql_database'];
+}
+else
+{
+	$mysql_database = 'froxlor';
+}
+
+if(!empty($_POST['mysql_unpriv_user']))
+{
+	$mysql_unpriv_user = $_POST['mysql_unpriv_user'];
+}
+else
+{
+	$mysql_unpriv_user = 'froxlor';
+}
+
+if(!empty($_POST['mysql_unpriv_pass']))
+{
+	$mysql_unpriv_pass = $_POST['mysql_unpriv_pass'];
+}
+else
+{
+	$mysql_unpriv_pass = '';
+}
+
+if(!empty($_POST['mysql_root_user']))
+{
+	$mysql_root_user = $_POST['mysql_root_user'];
+}
+else
+{
+	$mysql_root_user = 'root';
+}
+
+if(!empty($_POST['mysql_root_pass']))
+{
+	$mysql_root_pass = $_POST['mysql_root_pass'];
+}
+else
+{
+	$mysql_root_pass = '';
+}
+
+if(!empty($_POST['admin_user']))
+{
+	$admin_user = $_POST['admin_user'];
+}
+else
+{
+	$admin_user = 'admin';
+}
+
+if(!empty($_POST['admin_pass1']))
+{
+	$admin_pass1 = $_POST['admin_pass1'];
+}
+else
+{
+	$admin_pass1 = '';
+}
+
+if(!empty($_POST['admin_pass2']))
+{
+	$admin_pass2 = $_POST['admin_pass2'];
+}
+else
+{
+	$admin_pass2 = '';
+}
+
+if($mysql_host == 'localhost'
+   || $mysql_host == '127.0.0.1')
+{
+	$mysql_access_host = $mysql_host;
+}
+else
+{
+	$mysql_access_host = $serverip;
+}
+
+// gues http software
+
+if(!empty($_POST['webserver']))
+{
+	$webserver = $_POST['webserver'];
+}
+else
+{
+	if(strtoupper(@php_sapi_name()) == "APACHE2HANDLER"
+	   || stristr($_SERVER[SERVER_SOFTWARE], "apache/2"))
+	{
+		$webserver = 'apache2';
+	}
+	elseif(substr(strtoupper(@php_sapi_name()), 0, 8) == "LIGHTTPD"
+	       || stristr($_SERVER[SERVER_SOFTWARE], "lighttpd"))
+	{
+		$webserver = 'lighttpd';
+	}
+	else
+	{
+		// we don't need to bail out, since unknown does not affect any critical installation routines
+
+		$webserver = 'unknown';
+	}
+}
+
+if(!empty($_POST['httpuser']))
+{
+	$httpuser = $_POST['httpuser'];
+}
+else
+{
+	$httpuser = '';
+}
+
+if(!empty($_POST['httpgroup']))
+{
+	$httpgroup = $_POST['httpgroup'];
+}
+else
+{
+	$httpgroup = '';
+}
+
+/**
+ * END VARIABLES ---------------------------------------------------
+ */
+
+/**
+ * BEGIN INSTALL ---------------------------------------------------
+ */
+
+if(isset($_POST['installstep'])
+   && $_POST['installstep'] == '1'
+   && $admin_pass1 == $admin_pass2
+   && $admin_pass1 != ''
+   && $admin_pass2 != ''
+   && $mysql_unpriv_pass != ''
+   && $mysql_root_pass != ''
+   && $servername != ''
+   && $serverip != ''
+   && $httpuser != ''
+   && $httpgroup != ''
+   && $mysql_unpriv_user != $mysql_root_user)
+{
+	page_header();
+
+?>
+	<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable">
+		<tr>
+			<td class="maintitle"><b><img src="../images/title.gif" alt="" />&nbsp;Froxlor Installation</b></td>
+		</tr>
+<?php
+	$_die = false;
+	
+	// check for correct php version
+	status_message('begin', $lng['install']['phpversion']);
+
+	if(version_compare("5.2.0", PHP_VERSION, ">="))
+	{
+		status_message('red', $lng['install']['notinstalled']);
+		$_die = true;
+	}
+	else
+	{
+		status_message('green', 'OK');
+	}
+
+
+	status_message('begin', $lng['install']['phpmysql']);
+
+	if(!extension_loaded('mysql'))
+	{
+		status_message('red', $lng['install']['notinstalled']);
+		$_die = true;
+	}
+	else
+	{
+		status_message('green', 'OK');
+	}
+
+	status_message('begin', $lng['install']['phpfilter']);
+
+	if(!extension_loaded('filter'))
+	{
+		status_message('red', $lng['install']['notinstalled']);
+		$_die = true;
+	}
+	else
+	{
+		status_message('green', 'OK');
+	}
+
+	status_message('begin', $lng['install']['phpposix']);	
+
+	if(!extension_loaded('posix'))
+	{
+		status_message('red', $lng['install']['notinstalled']);
+		$_die = true;
+	}
+	else
+	{
+		status_message('green', 'OK');
+	}
+	
+	status_message('begin', $lng['install']['phpbcmath']);
+
+	if(!extension_loaded('bcmath'))
+	{
+		status_message('orange', $lng['install']['notinstalled'] . '<br />' . $lng['install']['bcmathdescription']);
+	}
+	else
+	{
+		status_message('green', 'OK');
+	}
+
+	status_message('begin', $lng['install']['openbasedir']);
+	$php_ob = @ini_get("open_basedir");
+
+	if(!empty($php_ob)
+	   && $php_ob != '')
+	{
+		status_message('orange', $lng['install']['openbasedirenabled']);
+	}
+	else
+	{
+		status_message('green', 'OK');
+	}
+
+	if($_die)
+	{
+		status_message('begin', $lng['install']['diedbecauseofrequirements']);
+		die();
+	}
+
+	//first test if we can access the database server with the given root user and password
+
+	status_message('begin', $lng['install']['testing_mysql']);
+	$db_root = new db($mysql_host, $mysql_root_user, $mysql_root_pass, '');
+
+	//ok, if we are here, the database class is build up (otherwise it would have already die'd this script)
+
+	status_message('green', 'OK');
+
+	//first we make a backup of the old DB if it exists
+
+	status_message('begin', $lng['install']['backup_old_db']);
+	$result = mysql_list_tables($mysql_database);
+
+	if($result)
+	{
+		$filename = "/tmp/froxlor_backup_" . date(YmdHi) . ".sql";
+
+		if(is_file("/usr/bin/mysqldump"))
+		{
+			$command = "/usr/bin/mysqldump " . $mysql_database . " -u " . $mysql_root_user . " --password='" . $mysql_root_pass . "' --result-file=" . $filename;
+			$output = exec($command);
+
+			if(stristr($output, "error"))
+			{
+				status_message('red', $lng['install']['backing_up_failed']);
+			}
+			else
+			{
+				status_message('green', 'OK');
+			}
+		}
+		else
+		{
+			status_message('red', $lng['install']['backing_up_binary_missing']);
+		}
+	}
+
+	//so first we have to delete the database and the user given for the unpriv-user if they exit
+
+	status_message('begin', $lng['install']['erasing_old_db']);
+	$db_root->query("DELETE FROM `mysql`.`user` WHERE `User` = '" . $db_root->escape($mysql_unpriv_user) . "' AND `Host` = '" . $db_root->escape($mysql_access_host) . "'");
+	$db_root->query("DELETE FROM `mysql`.`db` WHERE `User` = '" . $db_root->escape($mysql_unpriv_user) . "' AND `Host` = '" . $db_root->escape($mysql_access_host) . "'");
+	$db_root->query("DELETE FROM `mysql`.`tables_priv` WHERE `User` = '" . $db_root->escape($mysql_unpriv_user) . "' AND `Host` = '" . $db_root->escape($mysql_access_host) . "'");
+	$db_root->query("DELETE FROM `mysql`.`columns_priv` WHERE `User` = '" . $db_root->escape($mysql_unpriv_user) . "' AND `Host` = '" . $db_root->escape($mysql_access_host) . "'");
+	$db_root->query("DROP DATABASE IF EXISTS `" . $db_root->escape(str_replace('`', '', $mysql_database)) . "` ;");
+	$db_root->query("FLUSH PRIVILEGES;");
+	status_message('green', 'OK');
+
+	//then we have to create a new user and database for the froxlor unprivileged mysql access
+
+	status_message('begin', $lng['install']['create_mysqluser_and_db']);
+	$db_root->query("CREATE DATABASE `" . $db_root->escape(str_replace('`', '', $mysql_database)) . "`");
+	$mysql_access_host_array = array_map('trim', explode(',', $mysql_access_host));
+
+	if(in_array('127.0.0.1', $mysql_access_host_array)
+	   && !in_array('localhost', $mysql_access_host_array))
+	{
+		$mysql_access_host_array[] = 'localhost';
+	}
+
+	if(!in_array('127.0.0.1', $mysql_access_host_array)
+	   && in_array('localhost', $mysql_access_host_array))
+	{
+		$mysql_access_host_array[] = '127.0.0.1';
+	}
+
+	$mysql_access_host_array[] = $serverip;
+	foreach($mysql_access_host_array as $mysql_access_host)
+	{
+		$db_root->query("GRANT ALL PRIVILEGES ON `" . $db_root->escape(str_replace('`', '', $mysql_database)) . "`.* TO '" . $db_root->escape($mysql_unpriv_user) . "'@'" . $db_root->escape($mysql_access_host) . "' IDENTIFIED BY 'password'");
+		$db_root->query("SET PASSWORD FOR '" . $db_root->escape($mysql_unpriv_user) . "'@'" . $db_root->escape($mysql_access_host) . "' = PASSWORD('" . $db_root->escape($mysql_unpriv_pass) . "')");
+	}
+
+	$db_root->query("FLUSH PRIVILEGES;");
+	$mysql_access_host = implode(',', $mysql_access_host_array);
+	status_message('green', 'OK');
+
+	//now a new database and the new froxlor-unprivileged-mysql-account have been created and we can fill it now with the data.
+
+	status_message('begin', $lng['install']['testing_new_db']);
+	$db = new db($mysql_host, $mysql_unpriv_user, $mysql_unpriv_pass, $mysql_database);
+	status_message('green', 'OK');
+	status_message('begin', $lng['install']['importing_data']);
+	$db_schema = './froxlor.sql';
+	$sql_query = @file_get_contents($db_schema, 'r');
+	$sql_query = remove_remarks($sql_query);
+	$sql_query = split_sql_file($sql_query, ';');
+	for ($i = 0;$i < sizeof($sql_query);$i++)
+	{
+		if(trim($sql_query[$i]) != '')
+		{
+			$result = $db->query($sql_query[$i]);
+		}
+	}
+
+	status_message('green', 'OK');
+	status_message('begin', 'System Servername...');
+
+	if(validate_ip($_SERVER['SERVER_NAME'], true) !== false)
+	{
+		status_message('red', $lng['install']['servername_should_be_fqdn']);
+	}
+	else
+	{
+		status_message('green', 'OK');
+	}
+
+	//now let's change the settings in our settings-table
+
+	status_message('begin', $lng['install']['changing_data']);
+	$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = 'admin@" . $db->escape($servername) . "' WHERE `settinggroup` = 'panel' AND `varname` = 'adminmail'");
+	$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '" . $db->escape($serverip) . "' WHERE `settinggroup` = 'system' AND `varname` = 'ipaddress'");
+	$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '" . $db->escape($servername) . "' WHERE `settinggroup` = 'system' AND `varname` = 'hostname'");
+	$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '" . $db->escape($version) . "' WHERE `settinggroup` = 'panel' AND `varname` = 'version'");
+	$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '" . $db->escape($languages[$language]) . "' WHERE `settinggroup` = 'panel' AND `varname` = 'standardlanguage'");
+	$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '" . $db->escape($mysql_access_host) . "' WHERE `settinggroup` = 'system' AND `varname` = 'mysql_access_host'");
+	$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '" . $db->escape($webserver) . "' WHERE `settinggroup` = 'system' AND `varname` = 'webserver'");
+	$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '" . $db->escape($webserver) . "' WHERE `settinggroup` = 'system' AND `varname` = 'webserver'");
+
+	//FIXME
+
+	$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '" . $db->escape($httpuser) . "' WHERE `settinggroup` = 'system' AND `varname` = 'httpuser'");
+	$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '" . $db->escape($httpgroup) . "' WHERE `settinggroup` = 'system' AND `varname` = 'httpgroup'");
+
+	if($webserver == "apache2")
+	{
+		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/etc/apache2/sites-enabled/' WHERE `settinggroup` = 'system' AND `varname` = 'apacheconf_vhost'");
+		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/etc/apache2/sites-enabled/' WHERE `settinggroup` = 'system' AND `varname` = 'apacheconf_diroptions'");
+		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/etc/apache2/froxlor-htpasswd/' WHERE `settinggroup` = 'system' AND `varname` = 'apacheconf_htpasswddir'");
+		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/etc/init.d/apache2 reload' WHERE `settinggroup` = 'system' AND `varname` = 'apachereload_command'");
+	}
+	elseif($webserver == "lighttpd")
+	{
+		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/etc/lighttpd/conf-enabled/' WHERE `settinggroup` = 'system' AND `varname` = 'apacheconf_vhost'");
+		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/etc/lighttpd/froxlor-diroptions/' WHERE `settinggroup` = 'system' AND `varname` = 'apacheconf_diroptions'");
+		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/etc/lighttpd/froxlor-htpasswd/' WHERE `settinggroup` = 'system' AND `varname` = 'apacheconf_htpasswddir'");
+		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/etc/init.d/lighttpd reload' WHERE `settinggroup` = 'system' AND `varname` = 'apachereload_command'");
+		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/etc/lighttpd/lighttpd.pem' WHERE `settinggroup` = 'system' AND `varname` = 'ssl_cert_file'");
+	}
+
+	// insert the lastcronrun to be the installation date
+
+	$query = 'UPDATE `%s` SET `value` = UNIX_TIMESTAMP() WHERE `settinggroup` = \'system\'  AND `varname` = \'lastcronrun\'';
+	$query = sprintf($query, TABLE_PANEL_SETTINGS);
+	$db->query($query);
+
+	// and lets insert the default ip and port
+
+	$query = 'INSERT INTO `%s`  SET `ip`   = \'%s\',  `port` = \'80\' ';
+	$query = sprintf($query, TABLE_PANEL_IPSANDPORTS, $db->escape($serverip));
+	$db->query($query);
+	$defaultip = $db->insert_id();
+
+	// insert the defaultip
+
+	$query = 'UPDATE `%s` SET `value` = \'%s\' WHERE `settinggroup` = \'system\'  AND `varname` = \'defaultip\'';
+	$query = sprintf($query, TABLE_PANEL_SETTINGS, $db->escape($defaultip));
+	$db->query($query);
+	status_message('green', 'OK');
+
+	//last but not least create the main admin
+
+	status_message('begin', $lng['install']['adding_admin_user']);
+	$db->query("INSERT INTO `" . TABLE_PANEL_ADMINS . "` SET
+		`loginname` = '" . $db->escape($admin_user) . "',
+		`password` = '" . md5($admin_pass1) . "',
+		`name` = 'Siteadmin',
+		`email` = 'admin@" . $db->escape($servername) . "',
+		`customers` = -1,
+		`customers_used` = 0,
+		`customers_see_all` = 1,
+		`caneditphpsettings` = 1,
+		`domains` = -1,
+		`domains_used` = 0,
+		`domains_see_all` = 1,
+		`change_serversettings` = 1,
+		`diskspace` = -1024,
+		`diskspace_used` = 0,
+		`mysqls` = -1,
+		`mysqls_used` = 0,
+		`emails` = -1,
+		`emails_used` = 0,
+		`email_accounts` = -1,
+		`email_accounts_used` = 0,
+		`email_forwarders` = -1,
+		`email_forwarders_used` = 0,
+		`email_quota` = -1,
+		`email_quota_used` = 0,
+		`ftps` = -1,
+		`ftps_used` = 0,
+		`tickets` = -1,
+		`tickets_used` = 0,
+		`subdomains` = -1,
+		`subdomains_used` = 0,
+		`traffic` = -1048576,
+		`traffic_used` = 0,
+		`deactivated` = 0,
+		`aps_packages` = -1");
+	status_message('green', 'OK');
+
+	//now we create the userdata.inc.php with the mysql-accounts
+
+	status_message('begin', $lng['install']['creating_configfile']);
+	$userdata = "<?php\n";
+	$userdata.= "//automatically generated userdata.inc.php for Froxlor\n";
+	$userdata.= "\$sql['host']='" . addcslashes($mysql_host, "'\\") . "';\n";
+	$userdata.= "\$sql['user']='" . addcslashes($mysql_unpriv_user, "'\\") . "';\n";
+	$userdata.= "\$sql['password']='" . addcslashes($mysql_unpriv_pass, "'\\") . "';\n";
+	$userdata.= "\$sql['db']='" . addcslashes($mysql_database, "'\\") . "';\n";
+	$userdata.= "\$sql_root[0]['caption']='Default';\n";
+	$userdata.= "\$sql_root[0]['host']='" . addcslashes($mysql_host, "'\\") . "';\n";
+	$userdata.= "\$sql_root[0]['user']='" . addcslashes($mysql_root_user, "'\\") . "';\n";
+	$userdata.= "\$sql_root[0]['password']='" . addcslashes($mysql_root_pass, "'\\") . "';\n";
+	$userdata.= "?>";
+
+	//we test now if we can store the userdata.inc.php in ../lib
+
+	if($fp = @fopen('../lib/userdata.inc.php', 'w'))
+	{
+		$result = @fputs($fp, $userdata, strlen($userdata));
+		@fclose($fp);
+		status_message('green', $lng['install']['creating_configfile_succ']);
+		chmod('../lib/userdata.inc.php', 0440);
+	}
+	elseif($fp = @fopen('/tmp/userdata.inc.php', 'w'))
+	{
+		$result = @fputs($fp, $userdata, strlen($userdata));
+		@fclose($fp);
+		status_message('orange', $lng['install']['creating_configfile_temp']);
+		chmod('/tmp/userdata.inc.php', 0440);
+	}
+	else
+	{
+		status_message('red', $lng['install']['creating_configfile_failed']);
+		echo "\t\t<tr>\n\t\t\t<td class=\"main_field_name\"><p>" . nl2br(htmlspecialchars($userdata)) . "</p></td>\n\t\t</tr>\n";
+	}
+
+?>
+		<tr>
+			<td class="main_field_display" align="center">
+				<?php echo $lng['install']['froxlor_succ_installed']; ?><br />
+				<a href="../index.php"><?php echo $lng['install']['click_here_to_login']; ?></a>
+			</td>
+		</tr>
+	</table>
+	<br />
+	<br />
+<?php
+	page_footer();
+}
+else
+{
+	page_header();
+
+?>
+	<form action="<?php echo htmlspecialchars($_SERVER['PHP_SELF']) ?>" method="get">
+		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_40">
+			<tr>
+				<td class="maintitle" colspan="2"><b><img src="../images/title.gif" alt="" />&nbsp;<?php echo $lng['install']['welcome']; ?></b></td>
+			</tr>
+			<tr>
+				<td class="main_field_name" colspan="2"><?php echo $lng['install']['welcometext']; ?></td>
+			</tr>
+			<tr>
+				<td class="main_field_name"><?php echo $lng['install']['language']; ?>: </td>
+				<td class="main_field_display" nowrap="nowrap">
+					<select name="language" class="dropdown_noborder"><?php
+	$language_options = '';
+
+	while(list($language_file, $language_name) = each($languages))
+	{
+		$language_options.= "\n\t\t\t\t\t\t" . makeoption($language_name, $language_file, $language, true, true);
+	}
+
+	echo $language_options;
+
+?>
+
+					</select>
+				</td>
+			</tr>
+			<tr>
+				<td class="main_field_confirm" colspan="2">
+					<input class="bottom" type="submit" name="chooselang" value="Go" />
+				</td>
+			</tr>
+		</table>
+	</form>
+	<br />
+	<form action="<?php echo htmlspecialchars($_SERVER['PHP_SELF']) ?>" method="post">
+		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_40">
+			<tr>
+				<td class="maintitle" colspan="2"><b><img src="../images/title.gif" alt="" />&nbsp;<?php echo $lng['install']['database']; ?></b></td>
+			</tr>
+			<tr>
+				<td class="main_field_name"><?php echo $lng['install']['mysql_hostname']; ?>:</td>
+				<td class="main_field_display"><input type="text" name="mysql_host" value="<?php echo htmlspecialchars($mysql_host); ?>"/></td>
+			</tr>
+			<tr>
+				<td class="main_field_name"><?php echo $lng['install']['mysql_database']; ?>:</td>
+				<td class="main_field_display"><input type="text" name="mysql_database" value="<?php echo htmlspecialchars($mysql_database); ?>"/></td>
+			</tr>
+			<tr>
+				<td class="main_field_name"<?php echo (($mysql_unpriv_user == $mysql_root_user) ? ' style="color:blue;"' : ''); ?>><?php echo $lng['install']['mysql_unpriv_user']; ?>:</td>
+				<td class="main_field_display"><input type="text" name="mysql_unpriv_user" value="<?php echo htmlspecialchars($mysql_unpriv_user); ?>"/></td>
+			</tr>
+			<tr>
+				<td class="main_field_name"<?php echo ((!empty($_POST['installstep']) && $mysql_unpriv_pass == '') ? ' style="color:red;"' : ''); ?>><?php echo $lng['install']['mysql_unpriv_pass']; ?>:</td>
+				<td class="main_field_display"><input type="password" name="mysql_unpriv_pass" value="<?php echo htmlspecialchars($mysql_unpriv_pass); ?>"/></td>
+			</tr>
+			<tr>
+				<td class="main_field_name"<?php echo (($mysql_unpriv_user == $mysql_root_user) ? ' style="color:blue;"' : ''); ?>><?php echo $lng['install']['mysql_root_user']; ?>:</td>
+				<td class="main_field_display"><input type="text" name="mysql_root_user" value="<?php echo htmlspecialchars($mysql_root_user); ?>"/></td>
+			</tr>
+			<tr>
+				<td class="main_field_name"<?php echo ((!empty($_POST['installstep']) && $mysql_root_pass == '') ? ' style="color:red;"' : ''); ?>><?php echo $lng['install']['mysql_root_pass']; ?>:</td>
+				<td class="main_field_display"><input type="password" name="mysql_root_pass" value="<?php echo htmlspecialchars($mysql_root_pass); ?>"/></td>
+			</tr>
+			<tr>
+				<td class="maintitle" colspan="2"><b><img src="../images/title.gif" alt="" />&nbsp;<?php echo $lng['install']['admin_account']; ?></b></td>
+			</tr>
+			<tr>
+				<td class="main_field_name"><?php echo $lng['install']['admin_user']; ?>:</td>
+				<td class="main_field_display"><input type="text" name="admin_user" value="<?php echo htmlspecialchars($admin_user); ?>"/></td>
+			</tr>
+			<tr>
+				<td class="main_field_name"<?php echo ((!empty($_POST['installstep']) && ($admin_pass1 == '' || $admin_pass1 != $admin_pass2)) ? ' style="color:red;"' : ''); ?>><?php echo $lng['install']['admin_pass']; ?>:</td>
+				<td class="main_field_display"><input type="password" name="admin_pass1" value="<?php echo htmlspecialchars($admin_pass1); ?>"/></td>
+			</tr>
+			<tr>
+				<td class="main_field_name"<?php echo ((!empty($_POST['installstep']) && ($admin_pass2 == '' || $admin_pass1 != $admin_pass2)) ? ' style="color:red;"' : ''); ?>><?php echo $lng['install']['admin_pass_confirm']; ?>:</td>
+				<td class="main_field_display"><input type="password" name="admin_pass2" value="<?php echo htmlspecialchars($admin_pass2); ?>"/></td>
+			</tr>
+			<tr>
+				<td class="maintitle" colspan="2"><b><img src="../images/title.gif" alt="" />&nbsp;<?php echo $lng['install']['serversettings']; ?></b></td>
+			</tr>
+			<tr>
+				<td class="main_field_name"<?php echo ((!empty($_POST['installstep']) && $servername == '') ? ' style="color:red;"' : ''); ?>><?php echo $lng['install']['servername']; ?>:</td>
+				<td class="main_field_display"><input type="text" name="servername" value="<?php echo htmlspecialchars($servername); ?>"/></td>
+			</tr>
+			<tr>
+				<td class="main_field_name"<?php echo ((!empty($_POST['installstep']) && $serverip == '') ? ' style="color:red;"' : ''); ?>><?php echo $lng['install']['serverip']; ?>:</td>
+				<td class="main_field_display"><input type="text" name="serverip" value="<?php echo htmlspecialchars($serverip); ?>"/></td>
+			</tr>
+			<tr>
+				<td class="main_field_name"<?php echo ((!empty($_POST['installstep']) && $webserver == '') ? ' style="color:red;"' : ''); ?>><?php echo $lng['install']['webserver']; ?>:</td>
+				<td class="main_field_display"><input type="radio" name="webserver" value="apache2" <?php echo $webserver == "apache2" ? 'checked="checked"' : "" ?>/>Apache2&nbsp;<br /><input type="radio" name="webserver" value="lighttpd" <?php echo $webserver == "lighttpd" ? 'checked="checked"' : "" ?>/>Lighttpd</td>
+			</tr>
+			<tr>
+				<td class="main_field_name"<?php echo ((!empty($_POST['installstep']) && $serverip == '') ? ' style="color:red;"' : ''); ?>><?php echo $lng['install']['httpuser']; ?>:</td>
+				<td class="main_field_display"><input type="text" name="httpuser" value="<?php $posixusername = posix_getpwuid(posix_getuid()); echo $posixusername['name']; ?>"/></td>
+			</tr>
+			<tr>
+				<td class="main_field_name"<?php echo ((!empty($_POST['installstep']) && $serverip == '') ? ' style="color:red;"' : ''); ?>><?php echo $lng['install']['httpgroup']; ?>:</td>
+				<td class="main_field_display"><input type="text" name="httpgroup" value="<?php $posixgroup = posix_getgrgid(posix_getgid()); echo $posixgroup['name']; ?>"/></td>
+			</tr>
+			<tr>
+				<td class="main_field_confirm" colspan="2"><input type="hidden" name="language" value="<?php echo htmlspecialchars($language); ?>"/><input type="hidden" name="installstep" value="1"/><input class="bottom" type="submit" name="submitbutton" value="<?php echo $lng['install']['next']; ?>"/></td>
+			</tr>
+		</table>
+	</form>
+	<br />
+	<br />
+<?php
+	page_footer();
+}
+
+/**
+ * END INSTALL ---------------------------------------------------
+ */
+
+?>
--- a/install/lib/class.FroxlorInstall.php
+++ b/install/lib/class.FroxlorInstall.php
--- a/install/lng/english.lng.php
+++ b/install/lng/english.lng.php
@@ -14,78 +14,74 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Language
- *
+ * @version    $Id$
 */

-$lng['requirements']['title'] = 'Checking system requirements...';
-$lng['requirements']['installed'] = 'installed';
-$lng['requirements']['not_true'] = 'no';
-$lng['requirements']['notfound'] = 'not found';
-$lng['requirements']['notinstalled'] = 'not installed';
-$lng['requirements']['activated'] = 'enabled';
-$lng['requirements']['phpversion'] = 'PHP version >= 5.3';
-$lng['requirements']['phpmagic_quotes_runtime'] = 'magic_quotes_runtime...';
-$lng['requirements']['phpmagic_quotes_runtime_description'] = 'PHP setting "magic_quotes_runtime" must be set to "Off". We have disabled it temporary for now please fix the coresponding php.ini.';
-$lng['requirements']['phppdo'] = 'PHP PDO extension and PDO-MySQL driver...';
-$lng['requirements']['phpxml'] = 'PHP XML-extension...';
-$lng['requirements']['phpfilter'] = 'PHP filter-extension...';
-$lng['requirements']['phpposix'] = 'PHP posix-extension...';
-$lng['requirements']['phpbcmath'] = 'PHP bcmath-extension...';
-$lng['requirements']['phpcurl'] = 'PHP curl-extension...';
-$lng['requirements']['phpmbstring'] = 'PHP mbstring-extension...';
-$lng['requirements']['bcmathdescription'] = 'Traffic-calculation related functions will not work correctly!';
-$lng['requirements']['curldescription'] = 'Version-check and news-feed may not work correctly!';
-$lng['requirements']['openbasedir'] = 'open_basedir...';
-$lng['requirements']['openbasedirenabled'] = 'Froxlor will not work properly with open_basedir enabled. Please disable open_basedir for Froxlor in the coresponding php.ini';
-$lng['requirements']['diedbecauseofrequirements'] = 'Cannot install Froxlor without these requirements! Try to fix them and retry.';
-$lng['requirements']['froxlor_succ_checks'] = 'All requirements are satisfied';
+/**
+ * Begin
+ */

-$lng['install']['lngtitle'] = 'Froxlor install - choose language';
-$lng['install']['language'] = 'Installation language';
-$lng['install']['lngbtn_go'] = 'Change language';
-$lng['install']['title'] = 'Froxlor install - setup';
+$lng['install']['language'] = 'Installation - Language';
+$lng['install']['welcome'] = 'Welcome to Froxlor Installation';
 $lng['install']['welcometext'] = 'Thank you for choosing Froxlor. Please fill out the following fields with the required information to start the installation.<br /><b>Attention:</b> If the database you chose for Froxlor already exists on your System, it will be erased with all containing data!';
-$lng['install']['database'] = 'Database connection';
-$lng['install']['mysql_host'] = 'MySQL-Hostname';
-$lng['install']['mysql_database'] = 'Database name';
+$lng['install']['database'] = 'Database';
+$lng['install']['mysql_hostname'] = 'MySQL-Hostname';
+$lng['install']['mysql_database'] = 'MySQL-Database';
 $lng['install']['mysql_unpriv_user'] = 'Username for the unprivileged MySQL-account';
 $lng['install']['mysql_unpriv_pass'] = 'Password for the unprivileged MySQL-account';
 $lng['install']['mysql_root_user'] = 'Username for the MySQL-root-account';
 $lng['install']['mysql_root_pass'] = 'Password for the MySQL-root-account';
 $lng['install']['admin_account'] = 'Administrator Account';
 $lng['install']['admin_user'] = 'Administrator Username';
-$lng['install']['admin_pass1'] = 'Administrator Password';
-$lng['install']['admin_pass2'] = 'Administrator-Password (confirm)';
-$lng['install']['activate_newsfeed'] = 'Enable the official newsfeed<br><small>(https://inside.froxlor.org/news/)</small>';
+$lng['install']['admin_pass'] = 'Administrator Password';
+$lng['install']['admin_pass_confirm'] = 'Administrator-Password (confirm)';
 $lng['install']['serversettings'] = 'Server settings';
-$lng['install']['servername'] = 'Server name (FQDN, no ip-address)';
+$lng['install']['servername'] = 'Server name (FQDN)';
 $lng['install']['serverip'] = 'Server IP';
-$lng['install']['webserver'] = 'Webserver';
-$lng['install']['apache2'] = 'Apache 2';
-$lng['install']['apache24'] = 'Apache 2.4';
-$lng['install']['lighttpd'] = 'LigHTTPd';
-$lng['install']['nginx'] = 'NGINX';
 $lng['install']['httpuser'] = 'HTTP username';
 $lng['install']['httpgroup'] = 'HTTP groupname';
+$lng['install']['apacheversion'] = 'Apacheversion';
+$lng['install']['next'] = 'Next';

-$lng['install']['testing_mysql'] = 'Checking MySQL-root access...';
-$lng['install']['testing_mysql_fail'] = 'There seems to be a problem with the database-connection. Cannot continue. Please go back and check your credentials.';
-$lng['install']['backup_old_db'] = 'Creating backup of old database...';
-$lng['install']['backup_binary_missing'] = 'Could not find mysqldump';
-$lng['install']['backup_failed'] = 'Could not backup database';
-$lng['install']['prepare_db'] = 'Preparing database...';
-$lng['install']['create_mysqluser_and_db'] = 'Creating database and username...';
-$lng['install']['testing_new_db'] = 'Testing if database and user have been created correctly...';
-$lng['install']['importing_data'] = 'Importing data...';
-$lng['install']['changing_data'] = 'Adjusting settings...';
-$lng['install']['creating_entries'] = 'Inserting new values...';
-$lng['install']['adding_admin_user'] = 'Creating admin-account...';
+/**
+ * Progress
+ */
+
+$lng['install']['testing_mysql'] = 'Testing if MySQL-root-username and password are correct...';
+$lng['install']['erasing_old_db'] = 'Erasing old Database...';
+$lng['install']['backup_old_db'] = 'Create backup of the old Database...';
+$lng['install']['backing_up'] = 'Backing up';
+$lng['install']['backing_up_binary_missing'] = '/usr/bin/mysqldump is missing';
+$lng['install']['create_mysqluser_and_db'] = 'Creating MySQL-database and username...';
+$lng['install']['testing_new_db'] = 'Testing if MySQL-database and username have been created correctly...';
+$lng['install']['importing_data'] = 'Importing data into MySQL-database...';
+$lng['install']['changing_data'] = 'Changing imported data...';
+$lng['install']['adding_admin_user'] = 'Adding Administrator Account...';
 $lng['install']['creating_configfile'] = 'Creating configfile...';
+$lng['install']['creating_configfile_succ'] = 'OK, userdata.inc.php was saved in lib/.';
 $lng['install']['creating_configfile_temp'] = 'File was saved in /tmp/userdata.inc.php, please move to lib/.';
-$lng['install']['creating_configfile_failed'] = 'Could not create lib/userdata.inc.php, please create it manually with the following content:';
+$lng['install']['creating_configfile_failed'] = 'Cannot create lib/userdata.inc.php, please create it manually with the following data:';
 $lng['install']['froxlor_succ_installed'] = 'Froxlor was installed successfully.';
+$lng['install']['click_here_to_login'] = 'Click here to login.';
+$lng['install']['phpmysql'] = 'Testing if PHP MySQL-extension is installed...';
+$lng['install']['phpfilter'] = 'Testing if PHP filter-extension is installed...';
+$lng['install']['diedbecauseofrequirements'] = 'Cannot install Froxlor without these requirements! Aborting...';
+$lng['install']['notinstalled'] = 'not installed!';
+$lng['install']['phpbcmath'] = 'Testing if PHP bcmath-extension is installed...';
+$lng['install']['bcmathdescription'] = 'Traffic-calculation related functions will not work correctly!';
+$lng['install']['openbasedir'] = 'Testing if open_basedir is enabled...';
+$lng['install']['openbasedirenabled'] = 'enabled. Froxlor will not work properly with open_basedir enabled. Please disable open_basedir for Froxlor';

-$lng['click_here_to_refresh'] = 'Click here to check again';
-$lng['click_here_to_goback'] = 'Click here to go back';
-$lng['click_here_to_continue'] = 'Click here to continue';
-$lng['click_here_to_login'] = 'Click here to login.';
+/**
+ * Renamed in 1.2.19-svn40
+ */
+
+$lng['install']['webserver'] = 'Webserver';
+
+/*
+ * Added in Froxlor 0.9
+ */
+$lng['install']['phpversion'] = 'Checking for PHP version >= 5.2';
+$lng['install']['phpposix'] = 'Testing if PHP posix-extension is installed...';
+
+?>
--- a/install/lng/french.lng.php
+++ b/install/lng/french.lng.php
@@ -10,81 +10,62 @@
 * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
 *
 * @copyright  (c) the authors
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @author     Tim Zielosko <mail@zielosko.net>
+ * @author     Romain MARIADASSOU <roms2000@free.fr>
+ * @author     Froxlor Team <team@froxlor.org>
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Language
- *
+ * @version    $Id$
 */

-$lng['requirements']['title'] = 'Vérification des prérequis système...';
-$lng['requirements']['installed'] = 'installé';
-$lng['requirements']['not_true'] = 'non';
-$lng['requirements']['notfound'] = 'introuvable';
-$lng['requirements']['notinstalled'] = 'non installé';
-$lng['requirements']['activated'] = 'activé';
-$lng['requirements']['phpversion'] = 'PHP version >= 5.3';
-$lng['requirements']['phpmagic_quotes_runtime'] = 'magic_quotes_runtime...';
-$lng['requirements']['phpmagic_quotes_runtime_description'] = 'Le réglage PHP "magic_quotes_runtime" doit être positionné à "Off". Nous l\'avons désactivé temporairement pour l\'instant; merci de corriger le php.ini correspondant.';
-$lng['requirements']['phppdo'] = 'extension PHP PDO et pilote PDO-MySQL ...';
-$lng['requirements']['phpxml'] = 'extension PHP XML...';
-$lng['requirements']['phpfilter'] = 'extension PHP filter ...';
-$lng['requirements']['phpposix'] = 'extension PHP posix ...';
-$lng['requirements']['phpbcmath'] = 'extension PHP bcmath ...';
-$lng['requirements']['phpcurl'] = 'extension PHP curl...';
-$lng['requirements']['phpmbstring'] = 'extension PHP mbstring...';
-$lng['requirements']['bcmathdescription'] = 'Les fonctions de calcul de traffic ne fonctionneront pas correctement!';
-$lng['requirements']['curldescription'] = 'Les vérifications de version et les flux d\'information peuvent ne pas fonctionner correctement!';
-$lng['requirements']['openbasedir'] = 'open_basedir...';
-$lng['requirements']['openbasedirenabled'] = 'Froxlor ne fonctionnera pas correctement avec open_basedir activé. Merci de désactiver open_basedir pour Froxlor dans le php.ini correspondant';
-$lng['requirements']['diedbecauseofrequirements'] = 'Impossible d\'installer Froxlor sans ces prérequis! Essayez de les corriger et essayez à nouveau.';
-$lng['requirements']['froxlor_succ_checks'] = 'Tous les prérequis sont vérifiés';
+/**
+ * Begin
+ */

-$lng['install']['lngtitle'] = 'Installation de Froxlor - choisisez la langue';
 $lng['install']['language'] = 'Langue d\'installation';
-$lng['install']['lngbtn_go'] = 'Changer la langue';
-$lng['install']['title'] = 'Installation de Froxlor - paramètrage';
-$lng['install']['welcometext'] = 'Merci d\'avoir choisi Froxlor. Merci de remplir les champs suivant avec les informations nécessaires pour démarrer l\'installation.<br /><b>Attention:</b> Si la base de données que vous choisissez existe déjà sur votre système, elle sera écrasée ainsi que les données contenues!';
-$lng['install']['database'] = 'Connexion à la base de données';
-$lng['install']['mysql_host'] = 'Nom d\'hôte MySQL';
-$lng['install']['mysql_database'] = 'Nom de la base de données';
-$lng['install']['mysql_unpriv_user'] = 'Nom d\'utilisateur pour le compte non priviligié MySQL';
-$lng['install']['mysql_unpriv_pass'] = 'Mot de passe pour le compte non priviligié MySQL';
-$lng['install']['mysql_root_user'] = 'Nom d\'utilisateur pour le compte MySQL root';
-$lng['install']['mysql_root_pass'] = 'Mot de passe pour le compte MySQL root';
-$lng['install']['admin_account'] = 'Compte administrateur';
-$lng['install']['admin_user'] = 'Nom d\'utilisateur administrateur';
-$lng['install']['admin_pass1'] = 'Mot de passe administrateur';
-$lng['install']['admin_pass2'] = 'Mot de passe administrateur (confirmez)';
-$lng['install']['serversettings'] = 'Réglages serveur';
-$lng['install']['servername'] = 'Nom du serveur (FQDN, pas d\'adresse IP)';
+$lng['install']['welcome'] = 'Bienvenue <20> l\'installation de Froxlor';
+$lng['install']['welcometext'] = 'Merci beaucoup d\'avoir choisi Froxlor. Pour installer Froxlor remplissez les cases ci-dessous avec les informations demand<6E>es.<br /><b>Attention :</b> Si vous entrez le nom d\'une base de donn<6E>es existante, celle-ci sera effac<61>e !';
+$lng['install']['database'] = 'Base de donn<6E>es';
+$lng['install']['mysql_hostname'] = 'Nom d\'h<>te du serveur MySQL';
+$lng['install']['mysql_database'] = 'Base de donn<6E>es MySQL';
+$lng['install']['mysql_unpriv_user'] = 'Utilisateur pour l\'acc<63>s non privil<69>gi<67> <20> MySQL';
+$lng['install']['mysql_unpriv_pass'] = 'Mot de passe pour l\'acc<63>s non privil<EFBFBD>gi<EFBFBD> <20> MySQL';
+$lng['install']['mysql_root_user'] = 'Utilisateur pour l\'acc<63>s root <20> MySQL';
+$lng['install']['mysql_root_pass'] = 'Mot de passe pour l\'acc<63>s root <20> MySQL';
+$lng['install']['admin_account'] = 'Acc<63>s administratif';
+$lng['install']['admin_user'] = 'Login de l\'administrateur';
+$lng['install']['admin_pass'] = 'Mot de passe de l\'administrateur';
+$lng['install']['admin_pass_confirm'] = 'Mot de passe de l\'administrateur (confirmation)';
+$lng['install']['serversettings'] = 'Configuration du serveur';
+$lng['install']['servername'] = 'Nom du serveur (FQDN)';
 $lng['install']['serverip'] = 'Adresse IP du serveur';
-$lng['install']['webserver'] = 'Serveur Web';
-$lng['install']['apache2'] = 'Apache 2';
-$lng['install']['apache24'] = 'Apache 2.4';
-$lng['install']['lighttpd'] = 'LigHTTPd';
-$lng['install']['nginx'] = 'NGINX';
-$lng['install']['httpuser'] = 'Nom d\'utilisateur HTTP';
-$lng['install']['httpgroup'] = 'Nom de groupe HTTP';
+$lng['install']['apacheversion'] = 'Version du serveur Apache';
+$lng['install']['next'] = 'Continuer';

-$lng['install']['testing_mysql'] = 'Vérification de l\'accès root MySQL...';
-$lng['install']['testing_mysql_fail'] = 'Il semble y avoir un problème avec la connexion à la base de données. Impossible de continuer. Merci de revenir en arrière et de vérifier les informations d\'identification.';
-$lng['install']['backup_old_db'] = 'Création des sauvegardes de l\'ancienne base de données...';
-$lng['install']['backup_binary_missing'] = 'Impossible de trouver mysqldump';
-$lng['install']['backup_failed'] = 'Impossible de sauvegarde la base de données';
-$lng['install']['prepare_db'] = 'Préparation de la base de données...';
-$lng['install']['create_mysqluser_and_db'] = 'Création de la base de données et l\'utilisateur...';
-$lng['install']['testing_new_db'] = 'Teste si la base de données et l\'utilisateur ont été créés correctement...';
-$lng['install']['importing_data'] = 'Import des données...';
-$lng['install']['changing_data'] = 'Ajustement des paramètres...';
-$lng['install']['creating_entries'] = 'Insertion des nouvelles valeurs...';
-$lng['install']['adding_admin_user'] = 'Création du compte administrateur...';
-$lng['install']['creating_configfile'] = 'Création du fichier de configuration...';
-$lng['install']['creating_configfile_temp'] = 'Le fichier a été enregistré dans /tmp/userdata.inc.php, merci de le déplacer dans lib/.';
-$lng['install']['creating_configfile_failed'] = 'Impossible de créer lib/userdata.inc.php, merci de le créer manuellement avec le contenu suivant:';
-$lng['install']['froxlor_succ_installed'] = 'Froxlor a été installé avec succès.';
+/**
+ * Progress
+ */

-$lng['click_here_to_refresh'] = 'Cliquez ici pour vérifier à nouveau';
-$lng['click_here_to_goback'] = 'Cliquez ici pour revenir';
-$lng['click_here_to_continue'] = 'Cliquez ici pour continuer';
-$lng['click_here_to_login'] = 'Cliquez ici pour vous connecter.';
+$lng['install']['testing_mysql'] = 'V<>rification du login root de MySQL ...';
+$lng['install']['erasing_old_db'] = 'Effacement de l\'ancienne base de donn<6E>es ...';
+$lng['install']['create_mysqluser_and_db'] = 'Cr<43>ation de la base de donn<6E>es puis des utilisateurs ...';
+$lng['install']['testing_new_db'] = 'V<>rification de la base de donn<6E>es et des utilisateurs ...';
+$lng['install']['importing_data'] = 'Importation des informations dans la base de donn<6E>es ...';
+$lng['install']['changing_data'] = 'Modification des donn<6E>es import<72>s ...';
+$lng['install']['adding_admin_user'] = 'Ajout de l\'utilisateur administrateur ...';
+$lng['install']['creating_configfile'] = 'Cr<43>ation du fichier de configuration ...';
+$lng['install']['creating_configfile_succ'] = 'OK, userdata.inc.php a <20>t<EFBFBD> sauvegard<72> dans le dossier lib/ de Froxlor.';
+$lng['install']['creating_configfile_temp'] = 'Le fichier a <20>t<EFBFBD> sauvegard<72> dans /tmp/userdata.inc.php, veuillez le d<>placer / copier dans le dossier lib/ de Froxlor.';
+$lng['install']['creating_configfile_failed'] = 'Erreur en cr<63>ant le fichier lib/userdata.inc.php, veuillez le cr<63>er avec le contenu ci-dessous :';
+$lng['install']['froxlor_succ_installed'] = 'Froxlor a <20>t<EFBFBD> install<6C> correctement.';
+$lng['install']['click_here_to_login'] = 'Cliquez ici pour vous rendre <20> l\'invite de connexion.';
+$lng['install']['httpuser'] = 'Nom du utilisateur du HTTP';
+$lng['install']['httpgroup'] = 'Nom du la group du HTTP';
+
+/**
+ * Renamed in 1.2.19-svn40
+ */
+
+$lng['install']['webserver'] = 'Version du serveur';
+
+?>
--- a/install/lng/german.lng.php
+++ b/install/lng/german.lng.php
@@ -2,90 +2,86 @@

 /**
 * This file is part of the Froxlor project.
- * Copyright (c) 2003-2009 the SysCP Team (see authors).
+ * Copyright (c) 2003-2007 the SysCP Team (see authors).
 * Copyright (c) 2010 the Froxlor Team (see authors).
 *
 * For the full copyright and license information, please view the COPYING
 * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * COPYING file online at http://files.syscp.org/misc/COPYING.txt
 *
 * @copyright  (c) the authors
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @author     Florian Lippert <flo@syscp.org> (2003-2007)
+ * @author     Froxlor Team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Language
- *
+ * @version    $Id$
 */

-$lng['requirements']['title'] = 'Prüfe Systemvoraussetzungen...';
-$lng['requirements']['installed'] = 'installiert';
-$lng['requirements']['not_true'] = 'nein';
-$lng['requirements']['notfound'] = 'nicht gefunden';
-$lng['requirements']['notinstalled'] = 'nicht installiert';
-$lng['requirements']['activated'] = 'ist aktiviert.';
-$lng['requirements']['phpversion'] = 'PHP Version >= 5.3';
-$lng['requirements']['phpmagic_quotes_runtime'] = 'magic_quotes_runtime';
-$lng['requirements']['phpmagic_quotes_runtime_description'] = 'Die PHP Einstellung "magic_quotes_runtime" muss deaktiviert sein ("Off"). Die Einstellung wurde temporär deaktiviert, bitte ändern Sie diese in der entsprechenden php.ini.';
-$lng['requirements']['phppdo'] = 'PHP PDO Erweiterung und PDO-MySQL Treiber...';
-$lng['requirements']['phpxml'] = 'PHP XML-Erweiterung...';
-$lng['requirements']['phpfilter'] = 'PHP filter-Erweiterung...';
-$lng['requirements']['phpposix'] = 'PHP posix-Erweiterung...';
-$lng['requirements']['phpbcmath'] = 'PHP bcmath-Erweiterung...';
-$lng['requirements']['phpcurl'] = 'PHP curl-Erweiterung...';
-$lng['requirements']['phpmbstring'] = 'PHP mbstring-Erweiterung...';
-$lng['requirements']['bcmathdescription'] = 'Traffic-Berechnungs bezogene Funktionen stehen nicht vollständig zur Verfügung!';
-$lng['requirements']['curldescription'] = 'Versions-Prüfung und News-Feed stehen nicht vollständig zur Verfügung!';
-$lng['requirements']['openbasedir'] = 'open_basedir genutzt wird...';
-$lng['requirements']['openbasedirenabled'] = 'Froxlor wird mit aktiviertem open_basedir nicht vollständig funktionieren. Bitte deaktivieren Sie open_basedir für Froxlor in der entsprechenden php.ini';
-$lng['requirements']['diedbecauseofrequirements'] = 'Kann Froxlor ohne diese Voraussetzungen nicht installieren! Beheben Sie die angezeigten Probleme und versuchen Sie es erneut.';
-$lng['requirements']['froxlor_succ_checks'] = 'Alle Vorraussetzungen sind erfüllt';
+/**
+ * Begin
+ */

-$lng['install']['lngtitle'] = 'Froxlor Installation - Sprache auswählen';
-$lng['install']['language'] = 'Sprache für die Installation';
-$lng['install']['lngbtn_go'] = 'Sprache ändern';
-$lng['install']['title'] = 'Froxlor Installation - Einrichtung';
-$lng['install']['welcometext'] = 'Vielen Dank dass Sie sich für Froxlor entschieden haben. Um die Installation von Froxlor zu starten, füllen Sie bitte alle Felder mit den geforderten Angaben aus.<br /><b>Achtung:</b> Eine eventuell existierende Datenbank, die den selben Namen hat wie den Gewählten, wird mit allen enthaltenen Daten gelöscht!';
-$lng['install']['database'] = 'Datenbankverbindung';
-$lng['install']['mysql_host'] = 'MySQL-Hostname';
-$lng['install']['mysql_database'] = 'Datenbank Name';
-$lng['install']['mysql_unpriv_user'] = 'Benutzername für den unprivilegierten MySQL-Account';
-$lng['install']['mysql_unpriv_pass'] = 'Passwort für den unprivilegierten MySQL-Account';
-$lng['install']['mysql_root_user'] = 'Benutzername für den MySQL-Root-Account';
-$lng['install']['mysql_root_pass'] = 'Passwort für den MySQL-Root-Account';
+$lng['install']['language'] = 'Installations - Sprache';
+$lng['install']['welcome'] = 'Willkommen zur Froxlor Installation';
+$lng['install']['welcometext'] = 'Vielen Dank dass Sie sich f&uuml;r Froxlor entschieden haben. Um Ihre Installation von Froxlor zu starten, f&uuml;llen Sie bitte alle Felder unten mit den geforderten Angaben.<br /><b>Achtung:</b> Eine eventuell bereits existierende Datenbank, die den selben Namen hat wie den, den Sie unten eingeben werden, wird mit allen enthaltenen Daten gel&ouml;scht!';
+$lng['install']['database'] = 'Datenbank';
+$lng['install']['mysql_hostname'] = 'MySQL-Hostname';
+$lng['install']['mysql_database'] = 'MySQL-Datenbank';
+$lng['install']['mysql_unpriv_user'] = 'Benutzername f&uuml;r den unprivilegierten MySQL-Account';
+$lng['install']['mysql_unpriv_pass'] = 'Passwort f&uuml;r den unprivilegierten MySQL-Account';
+$lng['install']['mysql_root_user'] = 'Benutzername f&uuml;r den MySQL-Root-Account';
+$lng['install']['mysql_root_pass'] = 'Passwort f&uuml;r den MySQL-Root-Account';
 $lng['install']['admin_account'] = 'Admin-Zugang';
 $lng['install']['admin_user'] = 'Administrator-Benutzername';
-$lng['install']['admin_pass1'] = 'Administrator-Passwort';
-$lng['install']['admin_pass2'] = 'Administrator-Passwort (Bestätigung)';
-$lng['install']['activate_newsfeed'] = 'Aktiviere das offizielle Newsfeed<br><small>(https://inside.froxlor.org/news/)</small>';
+$lng['install']['admin_pass'] = 'Administrator-Passwort';
+$lng['install']['admin_pass_confirm'] = 'Administrator-Passwort (Best&auml;tigung)';
 $lng['install']['serversettings'] = 'Servereinstellungen';
-$lng['install']['servername'] = 'Servername (FQDN, keine IP-Adresse)';
+$lng['install']['servername'] = 'Servername (FQDN)';
 $lng['install']['serverip'] = 'Server-IP';
-$lng['install']['webserver'] = 'Webserver';
-$lng['install']['apache2'] = 'Apache 2';
-$lng['install']['apache24'] = 'Apache 2.4';
-$lng['install']['lighttpd'] = 'LigHTTPd';
-$lng['install']['nginx'] = 'NGINX';
-$lng['install']['httpuser'] = 'HTTP Username';
-$lng['install']['httpgroup'] = 'HTTP Gruppenname';
+$lng['install']['apacheversion'] = 'Apacheversion';
+$lng['install']['next'] = 'Fortfahren';

-$lng['install']['testing_mysql'] = 'Teste MySQL-Root Zugang...';
-$lng['install']['testing_mysql_fail'] = 'Bei der Verwendung der Datenbank gibt es scheinbar Probleme. Installation kann nicht fortgesetzt werden. Bitte Zugangsdaten prüfen und erneut versuchen.';
-$lng['install']['backup_old_db'] = 'Sicherung vorheriger Datenbank...';
-$lng['install']['backup_binary_missing'] = 'Konnte mysqldump nicht finden';
-$lng['install']['backup_failed'] = 'Sicherung fehlgeschlagen';
-$lng['install']['prepare_db'] = 'Datenbank wird vorbereitet...';
+/**
+ * Progress
+ */
+
+$lng['install']['testing_mysql'] = 'Teste, ob die MySQL-Root-Benutzerdaten richtig sind...';
+$lng['install']['erasing_old_db'] = 'Entferne alte Datenbank...';
+$lng['install']['backup_old_db'] = 'Sichere bisherige Datenbank...';
+$lng['install']['backing_up'] = 'Sicherung l&auml;ft';
+$lng['install']['backing_up_binary_missing'] = '/usr/bin/mysqldump nicht vorhanden';
 $lng['install']['create_mysqluser_and_db'] = 'Erstelle Datenbank und Benutzer...';
-$lng['install']['testing_new_db'] = 'Teste, ob Datenbank und Benutzer korrekt angelegt wurden...';
-$lng['install']['importing_data'] = 'Importiere Daten...';
-$lng['install']['changing_data'] = 'Einstellungen anpassen...';
-$lng['install']['creating_entries'] = 'Trage neue Werte ein...';
-$lng['install']['adding_admin_user'] = 'Erstelle Admin-Benutzer...';
+$lng['install']['testing_new_db'] = 'Teste, ob die Datenbank und Passwort korrekt angelegt wurden...';
+$lng['install']['importing_data'] = 'Importiere Daten in die MySQL-Datenbank...';
+$lng['install']['changing_data'] = 'Passe die importierten Daten an...';
+$lng['install']['adding_admin_user'] = 'F&uuml;ge den Admin-Benutzer hinzu...';
 $lng['install']['creating_configfile'] = 'Erstelle Konfigurationsdatei...';
+$lng['install']['creating_configfile_succ'] = 'OK, userdata.inc.php wurde in lib/ gespeichert.';
 $lng['install']['creating_configfile_temp'] = 'Datei wurde in /tmp/userdata.inc.php gespeichert, bitte nach lib/ verschieben.';
 $lng['install']['creating_configfile_failed'] = 'Konnte lib/userdata.inc.php nicht erstellen, bitte manuell mit folgendem Inhalt anlegen:';
 $lng['install']['froxlor_succ_installed'] = 'Froxlor wurde erfolgreich installiert.';
+$lng['install']['click_here_to_login'] = 'Hier geht es weiter zum Login-Fenster.';
+$lng['install']['phpmysql'] = 'Teste, ob die PHP MySQL-Erweiterung installiert ist...';
+$lng['install']['phpfilter'] = 'Teste, ob die PHP Filter-Erweiterung installiert ist...';
+$lng['install']['diedbecauseofrequirements'] = 'Kann Froxlor ohne diese Voraussetzungen nicht installieren! Breche ab...';
+$lng['install']['notinstalled'] = 'nicht installiert!';
+$lng['install']['phpbcmath'] = 'Teste, ob die PHP bcmath-Erweiterung installiert ist...';
+$lng['install']['bcmathdescription'] = 'Traffic-Berechnungs bezogene Funktionen stehen nicht vollst&auml;ndig zur Verf&uuml;gung!';
+$lng['install']['openbasedir'] = 'Teste, ob open_basedir genutzt wird...';
+$lng['install']['openbasedirenabled'] = 'aktiviert. Froxlor wird mit aktiviertem open_basedir nicht vollst&auml;ndig funktionieren. Bitte deaktivieren Sie open_basedir f&uuml;r Froxlor';
+$lng['install']['httpuser'] = 'HTTP Username';
+$lng['install']['httpgroup'] = 'HTTP Gruppenname';

-$lng['click_here_to_refresh'] = 'Hier klicken, um erneut zu prüfen';
-$lng['click_here_to_goback'] = 'Einen Schritt zurück';
-$lng['click_here_to_continue'] = 'Installation fortführen';
-$lng['click_here_to_login'] = 'Hier geht es weiter zum Login-Fenster.';
+/**
+ * Renamed in 1.2.19-svn40
+ */
+
+$lng['install']['webserver'] = 'Webserver';
+
+/*
+ * Added in Froxlor 0.9
+ */
+$lng['install']['phpversion'] = 'Pr&uuml;fe PHP Version >= 5.2';
+$lng['install']['phpposix'] = 'Teste, ob die PHP Posix-Erweiterung installiert ist...';
+
+?>
--- a/install/scripts/htpasswd-htaccess-remover.php
+++ b/install/scripts/htpasswd-htaccess-remover.php
@@ -0,0 +1,106 @@
+<?php
+
+/**
+ * This file is part of the SysCP project.
+ * Copyright (c) 2003-2007 the SysCP Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.syscp.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Michael Duergner <michael@duergner.com>
+ * @license    GPLv2 http://files.syscp.org/misc/COPYING.txt
+ * @package    System
+ * @version    $Id$
+ */
+
+if(@php_sapi_name() != 'cli'
+   && @php_sapi_name() != 'cgi'
+   && @php_sapi_name() != 'cgi-fcgi')
+{
+	die('This script will only work in the shell.');
+}
+
+$pathtophpfiles = '/var/www/syscp';
+$filename = 'htpasswd-htaccess-remover.php';
+
+/**
+ * Includes the Usersettings eg. MySQL-Username/Passwort etc.
+ */
+
+require ("$pathtophpfiles/lib/userdata.inc.php");
+
+/**
+ * Includes the MySQL-Tabledefinitions etc.
+ */
+
+require ("$pathtophpfiles/lib/tables.inc.php");
+
+/**
+ * Includes the MySQL-Connection-Class
+ */
+
+require ("$pathtophpfiles/lib/class_mysqldb.php");
+$debugMsg[] = 'Database Class has been loaded';
+$db = new db($sql['host'], $sql['user'], $sql['password'], $sql['db']);
+$db_root = new db($sql['host'], $sql['root_user'], $sql['root_password'], '');
+
+if($db->link_id == 0
+   || $db_root->link_id == 0)
+{
+	/**
+	 * Do not proceed further if no database connection could be established (either normal or root)
+	 */
+
+	die('Cant connect to mysqlserver. Please check userdata.inc.php! Exiting...');
+}
+
+unset($sql['password']);
+unset($db->password);
+$result = $db->query("SELECT `settingid`, `settinggroup`, `varname`, `value` FROM `" . TABLE_PANEL_SETTINGS . "`");
+
+while($row = $db->fetch_array($result))
+{
+	$settings["$row[settinggroup]"]["$row[varname]"] = $row['value'];
+}
+
+unset($row);
+unset($result);
+
+if(!isset($settings['panel']['version'])
+   || $settings['panel']['version'] != $version)
+{
+	/**
+	 * Do not proceed further if the Database version is not the same as the script version
+	 */
+
+	die('Version of File doesnt match Version of Database. Exiting...');
+}
+
+/**
+ * Includes the Functions
+ */
+
+require ("$pathtophpfiles/lib/functions.php");
+$result = $db->query('SELECT * FROM `' . TABLE_PANEL_HTACCESS . '` ');
+
+while($row = $db->fetch_array($result))
+{
+	if(file_exists($row['path'] . '.htaccess'))
+	{
+		unlink($row['path'] . '.htaccess');
+	}
+}
+
+$result = $db->query('SELECT * FROM `' . TABLE_PANEL_HTPASSWDS . '` ');
+
+while($row = $db->fetch_array($result))
+{
+	if(file_exists($row['path'] . '.htpasswd'))
+	{
+		unlink($row['path'] . '.htpasswd');
+	}
+}
+
+?>
--- a/install/scripts/language-check.php
+++ b/install/scripts/language-check.php
@@ -12,97 +12,112 @@
 * @author     Martin Burchert <eremit@syscp.org>
 * @license    GPLv2 http://files.syscp.org/misc/COPYING.txt
 * @package    System
- *
+ * @version    $Id$
 */

 // some configs
+
 $baseLanguage = 'english.lng.php';

 // Check if we're in the CLI
+
 if(@php_sapi_name() != 'cli'
   && @php_sapi_name() != 'cgi'
-   && @php_sapi_name() != 'cgi-fcgi'
-) {
+   && @php_sapi_name() != 'cgi-fcgi')
+{
 	die('This script will only work in the shell.');
 }

 // Check argument count
-/*
-if (sizeof($argv) != 2) {
+
+if(sizeof($argv) != 2)
+{
 	print_help($argv);
 	exit;
 }
-*/

 // Load the contents of the given path
+
 $path = $argv[1];
-$_f = isset($argv[2]) ? $argv[2] : null;
 $files = array();

-if ($dh = opendir($path)) {
-	while (false !== ($file = readdir($dh))) {
-		if ($file != "."
+if($dh = opendir($path))
+{
+	while(false !== ($file = readdir($dh)))
+	{
+		if($file != "."
 		   && $file != ".."
 		   && !is_dir($file)
-		   && preg_match('/(.+)\.lng\.php/i', $file)
-		) {
-			if (is_null($_f) || (!is_null($_f) && ($file == $_f || $file == $baseLanguage))) {
-				$files[$file] = str_replace('//', '/', $path . '/' . $file);
-			}
+		   && preg_match('/(.+)\.lng\.php/i', $file))
+		{
+			$files[$file] = str_replace('//', '/', $path . '/' . $file);
 		}
 	}

 	closedir($dh);
-} else {
+}
+else
+{
 	print "ERROR: The path you requested cannot be read! \n ";
 	print "\n";
-	print_help($argv);
+	print_help();
 	exit;
 }

 // check if there is the default language defined
-if (!isset($files[$baseLanguage])) {
+
+if(!isset($files[$baseLanguage]))
+{
 	print "ERROR: The baselanguage cannot be found! \n";
 	print "\n";
-	print_help($argv);
+	print_help();
 	exit;
 }

 // import the baselanguage
+
 $base = import($files[$baseLanguage]);

 // and unset it in the files, because we don't need to compare base to base
+
 unset($files[$baseLanguage]);

 // compare each language with the baselanguage
-foreach ($files as $key => $file) {
-	$comp = import($file);

+foreach($files as $key => $file)
+{
+	$comp = import($file);
 	print "\n\nComparing " . $baseLanguage . " to " . $key . "\n";
 	$result = compare($base, $comp);

-	if (is_array($result)
-	   && sizeof($result) > 0
-	) {
+	if(is_array($result)
+	   && sizeof($result) > 0)
+	{
 		print "  found missing strings: \n";
-		foreach ($result as $value) {
+		foreach($result as $value)
+		{
 			print "    " . $value . "\n";
 		}
-	} else {
+	}
+	else
+	{
 		print "   no missing strings found! \n ";
 	}

 	print "\nReverse Checking " . $key . " to " . $baseLanguage . "\n";
 	$result = compare($comp, $base);

-	if (is_array($result)
-	   && sizeof($result) > 0
-	) {
+	if(is_array($result)
+	   && sizeof($result) > 0)
+	{
 		print "  found strings not in basefile: \n";
-		foreach ($result as $key => $value) {
+		foreach($result as $key => $value)
+		{
 			print "    " . $value . "\n";
 		}
-	} else {
+	}
+	else
+	{
 		print "   There are no strings which are not in the basefile! \n ";
 	}
 }
@@ -116,45 +131,56 @@ foreach ($files as $key => $file) {
 *
 * @param  array  $argv
 */
-function print_help($argv) {
+
+function print_help($argv)
+{
 	print "Usage: php " . $argv[0] . " /PATH/TO/LNG \n";
 	print " \n ";
 }

-function import($file) {
-
+function import($file)
+{
 	$input = file($file);
 	$return = array();
-
-	foreach ($input as $key => $value) {
-
-		if (!preg_match('/^\$/', $value)) {
+	foreach($input as $key => $value)
+	{
+		if(!preg_match('/^\$/', $value))
+		{
 			unset($input[$key]);
-		} else {
+		}
+		else
+		{
 			// generate the key
+
 			$key = preg_replace('/^\$lng\[\'(.*)=(.*)$/U', '\\1', $value);
 			$key = str_replace('[\'', '/', $key);
 			$key = trim(str_replace('\']', '', $key));

 			//generate the value
+
 			$value = trim($value);

 			// set the result
+
 			$return[$key] = $value;
 		}
 	}
+
 	return $return;
 }

-function compare($array1, $array2) {
-
+function compare($array1, $array2)
+{
 	$result = array();
-
-	foreach ($array1 as $key => $value) {
-
-		if (!isset($array2[$key])) {
+	foreach($array1 as $key => $value)
+	{
+		if(!isset($array2[$key]))
+		{
 			$result[$key] = $value;
 		}
 	}
+
 	return $result;
 }
+
+?>
--- a/Show More
+++ b/Show More