115 files changed, 13 insertions, 5665 deletions

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 89c1f5b..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-files/
-database/
-temp/
-tmp/
-
-ineigenersache.php
-*swp
-piwik.php
-*.txt
-_setup.php
diff --git a/bootstrap/action.php b/action.php
index a52d471..a52d471 100644
--- a/bootstrap/action.php
+++ b/action.php
diff --git a/blob/database_schema b/blob/database_schema
deleted file mode 100644
index f83e2d9..0000000
--- a/blob/database_schema
+++ /dev/null
@@ -1,9 +0,0 @@
-CREATE TABLE banned_user (id INTEGER PRIMARY KEY, login_attempts INTEGER, ip TEXT, session_id TEXT, time INTEGER, user INTEGER);
-
-CREATE TABLE jg(id INTEGER PRIMARY KEY, name TEXT, adresse TEXT, telefonnummer INTEGER, handynummer INTEGER, email TEXT, geburtstag TEXT);
-
-CREATE TABLE log (id INTEGER PRIMARY KEY, user INTEGER, login INTEGER, FOREIGN KEY(user) REFERENCES user(id));
-
-CREATE TABLE sprueche(id INTEGER PRIMARY KEY, spruch TEXT);
-
-CREATE TABLE user (id INTEGER PRIMARY KEY, name TEXT UNIQUE, password TEXT, email TEXT UNIQUE, status INTEGER, register INTEGER);
diff --git a/blob/nginx_rewrite_rules b/blob/nginx_rewrite_rules
deleted file mode 100755
index d8a6611..0000000
--- a/blob/nginx_rewrite_rules
+++ /dev/null
@@ -1,73 +0,0 @@
-error_page 401 		/failure.php?e=401;
-error_page 403 		/failure.php?e=403;
-error_page 404		/failure.php?e=404;
-
-error_page 500 		/failure.php?e=500;
-error_page 502		/failure.php?e=502;
-error_page 504		/failure.php?e=504;
-
-location	/robots.txt {} 					#stop rewriting the robots.txt
-
-location 	/favicon.ico {}
-location 	/static {}
-
-location ~* ^/liste {
-	rewrite ^/liste/?$						/index.php?task=liste&id=0;
-	rewrite ^/liste/([0-9]+)/?$					/index.php?task=liste&id=$1;
-	rewrite ^/liste/updated?/?$					/index.php?task=update;
-	rewrite ^/liste/new_member/?					/index.php?task=new_member;
-}
-
-rewrite ^/banned							/failure.php?e=401;
-rewrite ^/quote/?$							/index.php?task=quote;
-rewrite ^/quote/([0-9]+)/?$						/index.php?task=quote&id=$1;
-rewrite ^/new_member/?							/index.php?task=new_member;
-rewrite ^/update/?							/index.php?task=update;
-rewrite ^/Startseite/?							/index.php;
-rewrite ^/startseite/?							/index.php;
-rewrite ^/help/?							/help.php;
-rewrite ^/hilfe/?							/help.php;
-rewrite ^/services?/?							/index.php?task=services;
-
-location ~* ^/account {
-	rewrite ^/account/?$						/index.php?task=account;
-	rewrite ^/account/change:(user)/?$				/index.php?task=account&change=$1;
-	rewrite ^/account/change:(password)/?$				/index.php?task=account&change=$1;
-}
-
-location ~* ^/?login/?([a-z0-9]+=[a-z0-9]+(&[a-z0-9]+=[a-z0-9]+)?)?$ {
-	rewrite ^/?login([?/]?.*) 					/index.php?task=login&arguments=$1	last;
-}
-
-location ~* ^/?logout/?(\?[0-9a-zA-Z]+(=[0-9a-zA-Z]*)?)?$ {
-	rewrite ^/?logout([?/]?.*)                              	/index.php?task=logout&arguments=$1	last;
-}
-
-
-location ~* ^/?register/?(\?[0-9a-zA-Z]+(=[0-9a-zA-Z]*)?)?$ {
-	rewrite ^/?register(\?[0-9a-zA-Z]*(=[0-9a-zA-Z]*)?)?		/index.php?task=register&arguments=$1	last;
-}
-
-#location ~* ^/?invite/?(\?[0-9a-zA-Z]+(=[0-9a-zA-Z]*)?)?$ {
-#	rewrite ^/?invite(\?[0-9a-zA-Z]*(=[0-9a-zA-Z]*)?)?		/index.php?task=invite&arguments=$1	last;
-#}
-
-location ~* ^/?user/?(\?[0-9a-zA-Z]+(=[0-9a-zA-Z]*)?)?$ {
-        rewrite ^/?user(\?[0-9a-zA-Z]*(=[0-9a-zA-Z]*)?)?		/index.php?task=user&arguments=$1     	last;
-}
-
-#location ~* ^/?download/?(\?[0-9a-zA-Z]+(=[0-9a-zA-Z]*)?)?$ {
-#        rewrite ^/?download(\?[0-9a-zA-Z]*(=[0-9a-zA-Z]*)?)?		/index.php?task=download&arguments=$1    last;
-#}
-
-location ~* ^/password_recover/?(\?[0-9a-zA-Z]+(=[0-9a-zA-Z]*)?)?$ {
-        rewrite ^/?password_recover(\?[0-9a-zA-Z]*(=[0-9a-zA-Z]*)?)?	/index.php?task=password_recover&arguments=$1    last;
-}
-#location ~* \.php(\?[0-9a-zA-Z]+(=[0-9a-zA-Z]*)?)?$ {}			#empty block to catch all
-
-#location / {
-#	rewrite ^/([0-9a-zA-Z-_]+)/(.*)					/index.php?name=$1&folder=$2 		last;
-#	rewrite ^/([0-9a-zA-Z-_]+)$					/index.php?name=$1&folder=		last;
-#	rewrite ^/$							/index.php 				last;
-#	break;
-#}
diff --git a/bootstrap/bootstrap.php b/bootstrap.php
index aab8bbe..aab8bbe 100644
--- a/bootstrap/bootstrap.php
+++ b/bootstrap.php
diff --git a/bootstrap/config.php b/bootstrap/config.php
deleted file mode 100644
index 585f34a..0000000
--- a/bootstrap/config.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-### mysql access
-define('DBHOST', '127.0.0.1');
-define('DBUSER', 'jg');
-define('DBNAME', 'jg');
-define('DBPASSWORD', 'secretpassword');
-define('DBCHARSET', 'utf8');
-define('DBPREFIX', 'jg_');
-
-### define your pepper for password security
-define('PEPPER_IS_FILE', false);
-define('PEPPER', 'somelongstringhere');
-
-# define('PEPPER_IS_FILE', true);
-# define('PEPPER', dirname(__FILE__) . '/../pepper.txt');
-
-### absolute path
-# define('ABSPATH', dirname(__FILE__) . '/');
-
-### file directory
-# define('FILEPATH', ABSPATH . '../files');
-
-### scheme, set to https if possible, otherwise plain http
-# define('SCHEME', 'http://');
-# define('SCHEME', 'https://');
-
-### hostname
-# define('HOST', 'jungegemeinde.iamfabulous.de');
-# define('DOMAIN', 'https://jungegemeinde.iamfabulous.de');
-
-#define('INVITEKEY', 'fadfhaoshfasodfhioadsfhadsofhpf');
-define('INVITEKEY', 'p');
diff --git a/class/.user.php.swp b/class/.user.php.swp
new file mode 100644
index 0000000..3864e3f
--- /dev/null
+++ b/class/.user.php.swp
diff --git a/bootstrap/class/cache.php b/class/cache.php
index 8005484..8005484 100644
--- a/bootstrap/class/cache.php
+++ b/class/cache.php
diff --git a/bootstrap/class/mysql.php b/class/mysql.php
index 8d75538..8d75538 100644
--- a/bootstrap/class/mysql.php
+++ b/class/mysql.php
diff --git a/bootstrap/class/user.php b/class/user.php
index 969d734..969d734 100644
--- a/bootstrap/class/user.php
+++ b/class/user.php
diff --git a/database/README b/database/README
deleted file mode 100755
index 1ebbdb6..0000000
--- a/database/README
+++ /dev/null
@@ -1,2 +0,0 @@
-# Do nothing here, use setup.php to create the database.
-
diff --git a/bootstrap/functions.php b/functions.php
index 3e937d2..3e937d2 100644
--- a/bootstrap/functions.php
+++ b/functions.php
diff --git a/bootstrap/index.php b/index.php
index 21cbda7..21cbda7 100644
--- a/bootstrap/index.php
+++ b/index.php
diff --git a/oldwww/LICENSE b/oldwww/LICENSE
deleted file mode 100644
index 4ba7077..0000000
--- a/oldwww/LICENSE
+++ /dev/null
@@ -1,676 +0,0 @@
-GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. {http://fsf.org/}
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7. This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy. This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged. This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source. This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge. You need not require recipients to copy the
-    Corresponding Source along with the object code. If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source. Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    {one line to give the program's name and a brief idea of what it does.}
-    Copyright (C) {year} {name of author}
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program. If not, see {http://www.gnu.org/licenses/}.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    Website for the "Junge Gemeinde Adlershof" Copyright (C) 2013 Maximilian Möhring
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-{http://www.gnu.org/licenses/}.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-{http://www.gnu.org/philosophy/why-not-lgpl.html}.
-
-Source: https://github.com
diff --git a/oldwww/account.php b/oldwww/account.php
deleted file mode 100644
index 2db7e85..0000000
--- a/oldwww/account.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php include('auth.php');
-
-/* Copyright Maximilian Möhring, 2013
-Licensed under the GPL. Read LICENSE for more Information.*/
-
-include("header.php");
-
-if ($_SESSION["username"] != "jg-adlershof"){
-
-	$username = $_SESSION["username"];
-	$db_check = new SQLite3("../database/database.sqlite");
-
-	$safe_username = SQLite3::escapeString("$username");
-	$email_db = $db_check->query("SELECT email FROM user where name='$safe_username';");
-	while($email_array = $email_db->fetchArray(SQLITE3_NUM)){
-		foreach($email_array as $thirdelement){
-                        $email=$thirdelement;
-                }
-        }
-
-	/*Anzahl der hochgeladenen Dateien.*/
-        $count_db = $db_check->query("SELECT count(*) as count FROM file where fk=(SELECT id from user where name='$safe_username');");
-	$count_array = $count_db->fetchArray();
-	$count = $count_array["count"];
-
-
-//echo "$username Test $email";
-echo "
-<div id='content_container' align='center'>
-        <br>
-        <div class='kleineschrift'>
-                <div class='ueberschrift'><p>JUNGE GEMEINDE ADLERSHOF</p>
-                </div>
-        </div>
-
-<br>
-<div class='mittlereschrift'>
-	Verwalte deine Account Informationen hier.
-</div>
-<br>
-
-
-<table><tr>
-<td><p>Name:&#160</td><td align='right'>$username</p></td></tr>
-<tr><td><p>E-Mail:</td><td align='right'>$email</p></td></tr>
-<tr><td align='left'><p>Stored files:</td> <td align='right'>$count</p></td></tr>
-</table>
-
-
-";
-
-
-} else {
-header("Location: member_login.php");
-exit;
-}
-
-?>
diff --git a/oldwww/auth.php b/oldwww/auth.php
deleted file mode 100644
index a63e5ea..0000000
--- a/oldwww/auth.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-     session_start();
-
-     if (!isset($_SESSION['login']) || !$_SESSION['login']) {
-      header('Location: login.php');
-      exit;
-      }
-?>
diff --git a/oldwww/check.php b/oldwww/check.php
deleted file mode 100644
index 3e575a9..0000000
--- a/oldwww/check.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/* Copyright Maximilian Möhring, 2013
-Licensed under the GPL. Read LICENSE for more Information.*/
-
-session_start();
-
-/*___Datenbankabfrage: Login___*/
-	$unsafe_username = $_POST["username"];
-	$unsafe_passwort = $_POST["password"];
-	$username = SQLite3::escapeString("$unsafe_username");
-	$passwort = SQLite3::escapeString("$unsafe_passwort");
-
-	$db = new SQLite3("../database/database.sqlite");
-        $salt_db  = $db->query("SELECT salt FROM user WHERE name='$username';");
-        while($salt_array = $salt_db->fetchArray(SQLITE3_NUM)){
-                foreach($salt_array as $firstelement){
-                        $salt=$firstelement;
-                }
-        }
-
-        $password = "$salt"."$passwort";
-        $hash_password = md5($password);
-        for($i=0;$i<15000;$i++)
-                $hash_password = md5($hash_password);
-
-        $real_password_db = $db->query("SELECT password FROM user WHERE name='$username';");
-        while($real_password_array = $real_password_db->fetchArray(SQLITE3_NUM)){
-                 foreach($real_password_array as $secondelement){
-                        $real_password=$secondelement;
-                }
-        }
-
-/*___Einloggen___*/
-if ($real_password == $hash_password) {
-
-	$_SESSION["login"] = true;
-	$_SESSION["username"] = "$username";
-
-/*___Datenbankabfrage: Spruch___*/
-	$zufall  = mt_rand(1,52);
-
-	$zufall = SQLite3::escapeString("$zufall");
-	$ergebnis = $db->query("SELECT * FROM sprueche where id=$zufall;");
-
-	while($row=$ergebnis->fetchArray()){
-		$spruch = $row["spruch"];
-	}
-
-
-echo"
-<!doctype html public '-//W3C//DTD XHTML 1.0 //EN'>
-
-
-<html>
-<head>
-  <title>Login: Random Quote.</title>
-<script type='text/javascript'>
-    function animiere() {
-            var ladebalken = document.getElementById('ladebalken');
-            var laenge = parseInt(ladebalken.style.width);
-
-            laenge++;
-            ladebalken.style.width = laenge + 'px';
-
-            if (laenge < 450) {
-                window.setTimeout(animiere, 8);
-            } 
-            if (laenge == 450) {
-	    document.location='/';
-	    } 
-        }
-    </script>
-  <meta http-equiv='Content-type' content='text/html; charset=utf-8' />
-  <link rel='stylesheet' type='text/css' href='hyperstyle.css' />
-  <link rel='shortcut icon' href='/favicon.ico' type='image/x-icon'>
-</head>
-
-<body onload='animiere()' link='#000000' vlink='#000000' alink='#FF0000' >
-
-<div id='distance' ></div>
-<div id='container' align='center' class='mittlereschrift'>
-<b>Zitat Nummer #$zufall</b><br><br><div id='bgcolor'>
-$spruch
-</div>
-
-<br><br>
-<div class='katze'<p> Fortschritt: </p></div>
-	<div id='balken' align='left'>
-		<span id='ladebalken' style='display: block; background: #ecece1; width: 0px;'>&nbsp;
-		</span>
-	</div>
-
-<br><br>
-<div class='unterstrich'><a href='/'>Überspringen</a></div>
-
-</div>
-
-</body>
-</html>
-";
-header("Refresh: 7; /");
-} else {
-header("Location: login.php?failure=1");
-}
-?>
diff --git a/oldwww/config/401.css b/oldwww/config/401.css
deleted file mode 100644
index b017224..0000000
--- a/oldwww/config/401.css
+++ /dev/null
@@ -1,6 +0,0 @@
-h1 {
-font-family: Calibri;
-font-size: 200%;
-color: black;
-text-align: center;
-}
diff --git a/oldwww/config/404.css b/oldwww/config/404.css
deleted file mode 100644
index 08276dd..0000000
--- a/oldwww/config/404.css
+++ /dev/null
@@ -1,3 +0,0 @@
-body {
-background: white url("dead_link.png") no-repeat fixed top;
-}
diff --git a/oldwww/config/dead_link.png b/oldwww/config/dead_link.png
deleted file mode 100755
index 37eb36b..0000000
--- a/oldwww/config/dead_link.png
+++ /dev/null
diff --git a/oldwww/config/error-handler-404.html b/oldwww/config/error-handler-404.html
deleted file mode 100644
index 6264849..0000000
--- a/oldwww/config/error-handler-404.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!doctype html public "-//W3C//DTD XHTML 1.0 //EN">
-
-<html>
-<head>
-<title>404 - Dead Link.</title>
-<link rel="stylesheet" type="text/css" href="/config/404.css" />
-<meta http-equiv="refresh" content="0; /404">
-</head>
-
-<body>
-
-</body>
-
diff --git a/oldwww/config/favicon.ico b/oldwww/config/favicon.ico
deleted file mode 100755
index eff0501..0000000
--- a/oldwww/config/favicon.ico
+++ /dev/null
diff --git a/oldwww/config/fonts/2Q-AW1e_taO6pHwMXcXW5w.ttf b/oldwww/config/fonts/2Q-AW1e_taO6pHwMXcXW5w.ttf
deleted file mode 100644
index 0e35cfb..0000000
--- a/oldwww/config/fonts/2Q-AW1e_taO6pHwMXcXW5w.ttf
+++ /dev/null
diff --git a/oldwww/config/fonts/BfQP1MR3mJNaumtWa4Tizg.ttf b/oldwww/config/fonts/BfQP1MR3mJNaumtWa4Tizg.ttf
deleted file mode 100644
index cf324e4..0000000
--- a/oldwww/config/fonts/BfQP1MR3mJNaumtWa4Tizg.ttf
+++ /dev/null
diff --git a/oldwww/config/fonts/Muli.css b/oldwww/config/fonts/Muli.css
deleted file mode 100644
index 4fa7a93..0000000
--- a/oldwww/config/fonts/Muli.css
+++ /dev/null
@@ -1,6 +0,0 @@
-@font-face {
-  font-family: 'Muli';
-  font-style: normal;
-  font-weight: 400;
-  src: local('Muli'), "/config/fonts/muli.ttf" format('truetype');
-}
diff --git a/oldwww/config/fonts/Ubuntu.css b/oldwww/config/fonts/Ubuntu.css
deleted file mode 100644
index 6ab025f..0000000
--- a/oldwww/config/fonts/Ubuntu.css
+++ /dev/null
@@ -1,6 +0,0 @@
-@font-face {
-  font-family: 'Ubuntu';
-  font-style: normal;
-  font-weight: 400;
-  src: local('Ubuntu'), "/config/fonts/ubuntu.ttf" format('truetype');
-}
diff --git a/oldwww/config/fonts/muli.tff b/oldwww/config/fonts/muli.tff
deleted file mode 100644
index cf324e4..0000000
--- a/oldwww/config/fonts/muli.tff
+++ /dev/null
diff --git a/oldwww/config/fonts/ubuntu.ttf b/oldwww/config/fonts/ubuntu.ttf
deleted file mode 100644
index 0e35cfb..0000000
--- a/oldwww/config/fonts/ubuntu.ttf
+++ /dev/null
diff --git a/oldwww/config/index.html b/oldwww/config/index.html
deleted file mode 100644
index 267f175..0000000
--- a/oldwww/config/index.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!doctype html public "-//W3C//DTD XHTML 1.0 //EN">
-
-<html>
-<head>
-<title>401 - Acces forbidden.</title>
-<link rel="stylesheet" type="text/css" href="/config/401.css" />
-<link rel="shortcut icon" href="/404/favicon.ico" type="image/x-icon">
-</head>
-
-<body>
-
-<div align="center">
-  <table width="750">
-<tr>
-      <td align="center"><img src="http://i.imgur.com/CY7ntqP.png" alt="Goddess" vspace="1"></td>
-</tr>
-<tr>
-     <td><h1>Access forbidden. Now get the fuck out.</h1></td>
-</tr>
-</table>
-</div>
-</body>
-</html>
diff --git a/oldwww/config/status-401.html b/oldwww/config/status-401.html
deleted file mode 100644
index e980ac9..0000000
--- a/oldwww/config/status-401.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!doctype html public "-//W3C//DTD XHTML 1.0 //EN">
-
-<html>
-<head>
-<title>401 - Acces forbidden.</title>
-<link rel="stylesheet" type="text/css" href="/config/401.css" />
-<meta http-equiv="refresh" content="0; /401">
-</head>
-
-<body>
-
-<div align="center">
-  <table width="750">
-<tr>
-      <td align="center"><img src="http://i.imgur.com/CY7ntqP.png" alt="Goddess" vspace="1"></td>
-</tr
-<tr>
-     <td align="center" valign="top"><h1>Access forbidden. Now get the fuck out.</h1></td>
-</tr>
-
-</body>
-
diff --git a/oldwww/config/test_401.css b/oldwww/config/test_401.css
deleted file mode 100644
index 80ad4d0..0000000
--- a/oldwww/config/test_401.css
+++ /dev/null
@@ -1,29 +0,0 @@
-body {
-/*background: white url("haruhi.png") no-repeat fixed top;*/
-}
-
-<style type="text/css">
-  div.container {top: 0; left: 0; width: 100%; height: 100%;
-    position: fixed; display: table}
-  p {display: table-cell; vertical-align: middle}
-
-  /* Horizontal centering of image: set left & right margins to 'auto' */
-  img.displayed {display: block; margin: 1em auto}
-
-  /* Also center the lines in the paragraph */
-  p {top: 590px; text-align: center font-size: 300%; font-family: Courier; color: black;}
-</style>
-
-/*<div class=container>
-  <p>Access forbidden. Now get the fuck out.
-  <img class=displayed src="./haruhi.png"></p>
-</div>*/
-
-h1 {
-/*position: relative;*/
-top: 590px;
-font-family: Courier;
-font-size: 300%;
-color: black;
-text-align: center;
-}
diff --git a/oldwww/favicon.ico b/oldwww/favicon.ico
deleted file mode 100755
index 41f6475..0000000
--- a/oldwww/favicon.ico
+++ /dev/null
diff --git a/oldwww/files.php b/oldwww/files.php
deleted file mode 100644
index 1c38d68..0000000
--- a/oldwww/files.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-/* Copyright Maximilian Möhring, 2013
-Licensed under the GPL. Read LICENSE for more Information.*/
-
-#include("auth.php");
-include("header.php");
diff --git a/oldwww/header.php b/oldwww/header.php
deleted file mode 100644
index e4a0ba6..0000000
--- a/oldwww/header.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php include('auth.php');
-
-/* Copyright Maximilian Möhring, 2013
-Licensed under the GPL. Read LICENSE for more Information.*/
-
-
-if ($_SESSION["username"] == "jg-adlershof"){
-        $account ="<td><a href='member_login.php'>Login</a></td>
-        <td>|</td>
-        <td><a href='register.php'>Register</a></td>
-        <td>|</td>
-" ;
-} else {
-         $account ="<td><a href='account.php'>Account</a></td>
-        <td>|</td>
-";
-}
-
-?>
-<!doctype html public '-//W3C//DTD XHTML 1.0 //EN'>
-
-<html>
-<head>
-  <title>Junge Gemeinde Adlershof.</title>
-  <meta http-equiv='Content-type' content='text/html; charset=utf-8' />
-  <link rel='stylesheet' type='text/css' href='hyperstyle.css' />
-  <link rel='shortcut icon' href='/favicon.ico' type='image/x-icon'>
-</head>
-
-<body link='#000000' vlink='#000000' alink='#FF0000'>
-
-<?php include("piwik.php");?>
-
-<div class='kleineschrif'>
-
-<div id='header' class='kleineschrift'>
-        <table width='700px'><tr>
-        <td><a href='/'>Home</a></td>
-        <td>|</td>
-        <td><a href='liste.php'>Adressliste</a></td>
-        <td>|</td>
-        <td><a href='help.php'>Kalender</a></td>
-        <td>|</td>
-        <td><a href='help.php'>Share</a></td>
-        <td>|</td>
-        <td><a href='quote.php'>Zitat</a></td>
-        <td>|</td>
-        <td><a href='to-do-list.html'>to-do</a></td>
-        <td>|</td>
-        <td><a href='help.php'>Hilfe</a></td>
-        <td>|</td>
-<?php echo "    $account"; ?>
-        <td><a href='logout.php'>Logout</a></td>
-        <tr></table>
-
-        <br>
-        <hr>
-</div>
-
diff --git a/oldwww/help.php b/oldwww/help.php
deleted file mode 100644
index 8a3aa22..0000000
--- a/oldwww/help.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php include('auth.php');
-
-/* Copyright Maximilian Möhring, 2013
-Licensed under the GPL. Read LICENSE for more Information.*/
-
-include("header.php");
-
-echo "<br><br><h1>Noch nicht implementiert.</h1>";
-
-header("Refresh: 3; index.php");
-?>
diff --git a/oldwww/hyperstyle.css b/oldwww/hyperstyle.css
deleted file mode 100644
index 74176fc..0000000
--- a/oldwww/hyperstyle.css
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
-This is a random mess. I'm studying Computer Science, not Art & Design.
-*/
-
-@import "/config/fonts/Muli.css";
-@import "/config/fonts/Ubuntu.css";
-
-
-* {
-margin:0;
-padding:0;
-}
-
-.noscript{
-display: none;
-}
-
-.katze {
-font-family: 'Muli';
-font-size: 120%;
-color: black;
-}
-
-.hundertfuenfzig {
-font-family: 'Muli';
-font-size: 150%;
-color: black;
-}
-
-.ueberschrift {
-font-family: 'Muli';
-font-size: 350%;
-color: black;
-text-align: center;
-}
-
-.kleineschrift {
-font-family: 'Ubuntu';
-font-size:75%;
-color: black;
-}
-
-.mittlereschrift {
-font-family: 'Ubuntu';
-font-size: 100%;
-color: black;
-}
-
-
-/*
-#footer {
-    position:fixed;
-    bottom:0px;
-}
-*/
-#content_container{
-/*	padding-top:3.00em;*/
-	padding-bottom:3em;
-	padding-left:0;
-}
-/*
-#content_container {
-    height:95%;
-    overflow:auto;
-	}
-*/
-#header {
-    position:;
-    top:0px; left:0px; right:0px;
-    background:;
-    text-align:center;
-    padding:10px;
-/*    color: #f0ecde;*/
-    width: 700px;
-    height: 20px;
-    margin: 0px auto;
-}
-
-html, body {
-height: 100%;
-width: 100%;
-background: #ecece1;
-}
-
-#distance {
-width: 10px;
-height: 45%;
-margin-bottom: -250px;
-float: left;
-/*background-color: #f00; nur zu Demozwecken*/
-}
-
-#container {
-margin: 0 auto;
-position: relative;
-height: 500px;
-width: 700px;
-clear: left;
-/*background-color: #ADFF2F;*/
-}
-
-#behaelter {
-margin: 0 auto;
-position: relative;
-/*height: 500px;
-width: 700px;*/
-clear: left;
-/*background-color: #ADFF2F;*/
-}
-
-#balken {
-position: relative;
-height: 10 px;
-width: 450px;
-background-color: grey;
-}
-
-#bgcolor {
-background-color: #f0ecde;
-}
-
-/*body {
-}*/
-
-a:link, a:visited {
-  /*font-family:Arial,Helvetica,sans-serif;
-  font-size: 12px;*/
-  text-decoration: none;
-/*  color: #009F00;*/
-  }
-
-h1 {
-font-family: 'Muli:400';
-/*font-family: Calibri;*/
-font-size: 260%;
-color: black;
-text-align: center;
-}
-
-h2 {
-font-family: 'Muli:400';
-/*font-family: Calibri;*/
-font-size: 130%;
-color: black;
-text-align: center;
-}
-
-
-p2 {
-font-family: 'Ubuntu';
-/*font-family: Calibri;*/
-font-size: 100%;
-color: grey;
-text-align: center;
-}
-
-p3 {
-font-family: 'Ubuntu';
-/*font-family: Calibri;*/
-/*font-size: 250%;*/
-color: black;
-text-align: center;
-}
-
-p4 {
-font-family: 'Ubuntu';
-/*font-family: Calibri;*/
-font-size: 350%;
-color: black;
-text-align: center;
-}
-
-p5 {
-font-family: 'Muli';
-/*font-family: Calibri;*/
-font-size: 270%;
-color: black;
-text-align: center;
-}
-
-
-a2 {
-font-family: 'Ubuntu';
-/*font-family: 'Nobile';*/
-/*font-family: Calibri;*/
-font-size: 125%;
-color: black;
-text-align: grey;
-}
-
-a3 {
-font-family: 'Ubuntu';
-/*font-family: Calibri;*/
-font-size: 130%;
-color: black;
-text-align: grey;
-}
-
-a4 {
-font-family: 'Ubuntu';
-/*font-family: Calibri;*/
-font-size: 100%;
-color: black;
-}
-
-a5 {
-font-family: 'Ubuntu';
-font-size:75%;
-/*font-family: Calibri;*/
-color: black;
-}
-
-
-.unterstrich {text-decoration: underline;}
diff --git a/oldwww/index.php b/oldwww/index.php
deleted file mode 100644
index 88a7fa6..0000000
--- a/oldwww/index.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php include('auth.php'); 
-
-/* Copyright Maximilian Möhring, 2013
-Licensed under the GPL. Read LICENSE for more Information.*/
-
-include("header.php");
-?>
-
-<div id='content_container' align='center'>
-	<br>
-	<div class='kleineschrift'>
-		<div class='ueberschrift'><p>JUNGE GEMEINDE ADLERSHOF</p>
-		</div>
-	</div>
-<?php
-if($_SESSION["username"] == "jg-adlershof"){
-$name = "Gast";
-} else {
-$name = $_SESSION["username"];
-}
-	echo "
-<br>
-<div class='kleineschrift'>
-<div style='width:800px;' class='katze' id='behaelter' align='center'>
-	Hallo $name.<br> Willkommen auf der Webpage für die Junge Gemeinde in Adlershof. Für einen persönlichen Zugang, und um alle Features zu nutzen, registriere dich doch <a 
-style='text-decoration:underline;color:blue;' href='register.php'>hier</a>. Wenn du Probleme bei der Navigation hast, dann schau unter <a style='text-decoration: underline;color:blue;' 
-href='help.php'>Hilfe</a> nach.	<br>
-	Für Anregungen und Kritik bin ich immer zu haben. Schick mir einfach ne Mail oder sags mir nächsten Donnerstag. ;)
-	<br><bR>
-	PS: Du kannst dich nach einer Registrierung auch mit deinem Username einloggen.
-</div>
-</div>
-";
-?>
-
-<br><br>
-<div class='katze' align='center'><pre>
-            ,/|         _.--''^``-...___.._.,; 
-          /, \'.     _-'          ,--,,,--'''  
-         { \    `_-''       '    /}            
-            `;;'             ;   ; ;           
-      ._.--''     ._,,, _..'  .;.'             
-      (,_....----'''     (,..--''              
-</pre></div>
-
-
-</div>
-</div>
-</body>
-</html>
-
diff --git a/oldwww/inreg.php b/oldwww/inreg.php
deleted file mode 100644
index 341ba06..0000000
--- a/oldwww/inreg.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php include('auth.php');
-
-/* Copyright Maximilian Möhring, 2013
-Licensed under the GPL. Read LICENSE for more Information.*/
-
-/*Registrierung in der Datenbank!*/
-
-$name = $_POST["name"];
-$cleartext_password = $_POST["pswd"];
-$email = $_POST["email"];
-
-$db = new SQLite3("../database/database.sqlite");
-
-	$safe_name =  SQLite3::escapeString("$name");
-	$safe_email =  SQLite3::escapeString("$email");
-
-        $email_db = $db->query("SELECT id FROM user where email='$safe_email';");
-	$name_db  = $db->query("SELECT id FROM user where name='$safe_name';");
-	$name_arr = $name_db->fetchArray(SQLITE3_NUM);
-	$email_arr = $email_db->fetchArray(SQLITE3_NUM);
-	$name_int = $name_arr[0];
-	$email_int = $email_arr[0];
-
-
-
-if ($_POST["pswd"] == "" || ($email_int > 0 && !$email == "")|| $name_int > 0){
-//echo "1$cleartext_password 2$email_int 3$name_int";
-
-header("Location: register.php?false=1");
-} else {
-
-	$salt = uniqid(mt_rand(), true);
-	$password = "$salt"."$cleartext_password";
-	$hash_password = md5($password);
-	for($i=0;$i<15000;$i++)
-		$hash_password = md5($hash_password);
-
-
-        $result = $db->exec("INSERT INTO user (id, name, salt, password, email) VALUES (NULL, '$safe_name', '$salt', '$hash_password', '$safe_email');");
-
-	$_SESSION["username"] = $name;
-	header("Location: account.php?reg=1");
-}
-?>
diff --git a/oldwww/insert.php b/oldwww/insert.php
deleted file mode 100644
index 17002e3..0000000
--- a/oldwww/insert.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php include('auth.php');
-
-/* Copyright Maximilian Möhring, 2013
-Licensed under the GPL. Read LICENSE for more Information.*/
-
-include("header.php");
-
-if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-	$db = new SQLite3('../database/database.sqlite');
-
-	$safe1 = SQLite3::escapeString("$_POST[name]");
-	$safe2 = SQLite3::escapeString("$_POST[adresse]");
-	$safe3 = SQLite3::escapeString("$_POST[telefonnummer]");
-	$safe4 = SQLite3::escapeString("$_POST[handynummer]");
-	$safe5 = SQLite3::escapeString("$_POST[email]");
-	$safe6 = SQLite3::escapeString("$_POST[geburtstag]");
-	$query = "INSERT INTO member(id, name, adresse, telefonnummer, handynummer, email, geburtstag) VALUES(NULL,'$safe1','$safe2','$safe3','$safe4','$safe5','$safe6');";
-	$result = $db->exec("$query");
-}
-
-echo "
-
-<div id='content_container' align='center'>
-        <br>
-        <div class='kleineschrift'>
-                <div class='ueberschrift'><p>JUNGE GEMEINDE ADLERSHOF</p>
-                </div>
-        </div>
-";
-     if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-echo "
-<center>
-<br>
-Vielen Dank, der Eintrag zu $_POST[name] wurde erfolgreich hinzugefügt.<br>
-<br>
-
-<tr>
-      <td align='center'><img src='http://i.imgur.com/UQDEVQy.png' alt='Teh wizzard'></td>
-</tr>
-<br>
-<br>
-Einen Moment, sie werden gleich weitergeleitet.
-
-";
-header("Refresh: 4; /liste.php");
-
-	} else {
-	echo "
-        <br><a2>Trage einfach die Daten von unserem neuen Mitglied  ein: </a2><br>
-                <form method='post' action='insert.php' ><table><tr>
-                <td align='right'><a2>Name: <input type='text' name='name' ></a2> </td>
-                        <td align='right'><a2>Adresse: <input type='text' name='adresse' > </a2></td>
-                        <td align='right'><a2>Telefon: <input type='text' name='telefonnummer'></a2> </td></tr>
-                        <tr align='right'><td><a2>Handy: <input type='text' name='handynummer' ></a2> </td>
-                        <td align='right'><a2>E-Mail: <input type='text' name='email' ></a2> </td>
-                        <td align='right'><a2>Geburtstag: <input type='text' name='geburtstag' ></a2> </td></tr>
-                        <tr><td>&#160;</td><td align='center'><input type='submit' name='submit' value='Hinzufügen'/></td><td>&#160;</td></tr>
-                        </table></form>
-        ";
-
-}
-/*
-</body>";
-*/
-
-//echo '<br><a href="login.php?x=$cryptedip">Zur&uuml;ck</a></center>';
-
-?>
diff --git a/oldwww/liste.php b/oldwww/liste.php
deleted file mode 100644
index 94deb1a..0000000
--- a/oldwww/liste.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php include('auth.php'); 
-
-/* Copyright Maximilian Möhring, 2013
-Licensed under the GPL. Read LICENSE for more Information.*/
-
-include("header.php");
-
-$db = new SQLite3("../database/database.sqlite");
-
-?>
-
-<script>
-// Elemente einblenden
-function show_elements()
- {
-  var elementNames = show_elements.arguments;
-  for (var i=0; i<elementNames.length; i++)
-   {
-     var elementName = elementNames[i];
-     document.getElementById(elementName).style.display='block';
-   }
- }
-// Elemente ausblenden
-function hide_elements()
- {
-  var elementNames = hide_elements.arguments;
-  for (var i=0; i<elementNames.length; i++)
-   {
-     var elementName = elementNames[i];
-     document.getElementById(elementName).style.display='none';
-   }
- }
-</script>
-
-<div id='content_container' align='center'>
-        <br>
-        <div class='kleineschrift'>
-                <div class='ueberschrift'><p>JUNGE GEMEINDE ADLERSHOF</p>
-		</div>
-        </div>
-
-<?php if($_GET["id"] == 0 || $_GET["id"] == "" || !isset($_GET["id"])){
-
-echo"
-<br><br>
-	<table height='350' border='1' rules='all' cellpadding='20' cellbording='20' cellspacing='20'>
-	<!-- Wenn mir mal einer erklären könnte, warum die Zellen trotzdem keinen Abstand haben? -->
-	      <thead>
-        	<tr>
-	           <th><a3>&#160;</a3></th>
-        	   <th><a3>Name</a3></th>
-	           <th><a3>Adresse</a3></th>
-        	   <th><a3>Telefon</a3></th>
-        	   <th><a3>Handynummer</a3></th>
-        	   <th><a3>E-Mail</a3></th>
-        	   <th><a3>Geburtstag</a3></th>
-      		 <tr>
-     		 </thead>
-		<tbody cellpadding='20' cellbording='20' cellspacing='20'>
-
-";
-		$ergebnis = $db->query("SELECT * FROM member");
-		while($row=$ergebnis->fetchArray(SQLITE3_NUM)){
-		$id=$row[0];
-        	echo "<tr>";
- 		foreach($row as $element){
-                	echo "<td align='left'><a href=\"?id=$id\" onclick=\"document.location.href='liste.php?id=$id'\">$element</a></td>";
-        	}
-
-        	echo "
-		</tr>";
-	}
-
-echo "
-	</tbody>
-	</table>
-
-<br><br>
-<div style='width:1000px;' class='mittlereschrift'>
-Da es in letzter Zeit doch öfters vorgekommen ist, dass jemand seine Adresse geändert hat, ist es jetzt möglich, einen Eintrag in der Adressliste zu ändern oder zu ergänzen.
-Wenn du deine Adresse <b>ändern</b> möchtest, dann drücke einfach auf deinen Namen in der richtigen Zeile. <a  href='insert.php'>Möchtest du jemanden <b>hinzufügen</b>, dann drücke bitte <u>hier</u>.</a>
-</div>
-
-<br><br>
-";
-} else {
-
-
-	$id = $_GET["id"];
-	$safe_id = SQLite3::escapeString("$id");
-        $ergebnis = $db->query("SELECT * FROM member where id=$safe_id;");
-        while($row=$ergebnis->fetchArray()){
-  	      echo "<br><a2>Trage einfach die neuen Daten von $row[name] ein: </a2><br>
-			 <form method='post' action='update.php' ><table><tr>";
-		echo "<td align='right'><a2>Name: <input type='text' name='name' value='$row[name]'></a2> </td>
-			<td align='right'><a2>Adresse: <input type='text' name='adresse' value='$row[adresse]'> </a2></td>
-			<td align='right'><a2>Telefon: <input type='text' name='telefonnummer' value='$row[telefonnummer]'></a2> </td></tr>
-			<tr align='right'><td><a2>Handy: <input type='text' name='handynummer' value='$row[handynummer]'></a2> </td>
-			<td align='right'><a2>E-Mail: <input type='text' name='email' value='$row[email]'></a2> </td>
-			<td align='right'><a2>Geburtstag: <input type='text' name='geburtstag' value='$row[geburtstag]'></a2> </td></tr>
-			<tr><td>&#160;<input type='hidden' name='id' value='$id'></td><td align='center'><input type='submit' name='submit' value='Update!'/></td><td>&#160;</td></tr>
-			</table></form>
-	";
-	}
-}
-?>
-
-<!--AUSKOMMENTIERT#################################################################################
-<table width="400px" >
-<colgroup width="170" span="3"></colgroup>
-<tr align='center'>
-<td nowrap>
-<div id="show_update" class='unterstrich'>
-	<a style='color:blue;' href="#" title="Anzeigen" onclick="show_elements('update_db');">Eintrag aktualisieren?</a>
-
-
-</div>
-</td>
-<td>
-oder
-</td>
-<td nowrap>
-<div id="show_update" class='unterstrich'>
-        <a style='color:blue;' href="#" title="Anzeigen" onclick="show_elements('update_db');">Eintrag ergänzen?</a>
-</div>
-</td>
-</table>
-
-<div id="update_db" class="noscript">
-
-<br><br>
-        <form method='get' action='index.php' >
-                <table><tr>
-                        <td><input type=</td>
-                        <td><p>Nummer:</p></td><td><p><input type='text' name='id' size='1'/></p></td>
-                        <td><p><input type='submit' name=submit value='weiter'/></p></td>
-                </table>
-        </form>
-
-
-</div>
--->
-	</div>
-</body>
-</html>
diff --git a/oldwww/login.php b/oldwww/login.php
deleted file mode 100644
index bfba63e..0000000
--- a/oldwww/login.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/* Copyright Maximilian Möhring, 2013
-Licensed under the GPL. Read LICENSE for more Information.*/
-
-if ($_GET["logout"] == 1) {
-	$logout = "<br><div style='color:red;'>Ausloggen erfolgreich</div>";
-}
-if ($_GET["failure"] == 1) {
-        $logout = "<br><div style='color:red;'>Name oder Passwort falsch!</div>";
-}
-
-
-?>
-<!doctype html public '-//W3C//DTD XHTML 1.0 //EN'>
-
-<html>
-<head>
-  <title>Junge Gemeinde Adlershof.</title>
-  <meta http-equiv='Content-type' content='text/html; charset=utf-8' />
-  <link rel='stylesheet' type='text/css' href='hyperstyle.css' />
-  <link rel='shortcut icon' href='/favicon.ico' type='image/x-icon'>
-</head>
-
-<body link='#000000' vlink='#000000' alink='#FF0000'>
-
-<div class='kleineschrift'>
-	<div id='header' >
-		<br><br>
-		<hr>
-	</div>
-
-	<div id='content_container' align='center'>
-		<br>
-		<div class='ueberschrift'><p>JUNGE GEMEINDE ADLERSHOF</p></div>
-		<div id='container' align='center'>
-
-			<?php echo $logout; ?>
-			<br>
-			<form method='post' action='check.php' >
-				<div class='hundertfuenfzig'><p>Login:</p></div>
-				<p><input type='text' name='username' size='40'/></p>
-				<p><input type='password' name='password' size='40'/></p> 
-
-
-				<p><input type='submit' name='submit' value='Miau!'/></p>  
- 
-			</form><br>
-			Info: You have five attempts. You will be banned for 6 hours after your login attempts run out.<br>
-		<a style='text-decoration:underline;' href='reset.php'>Passwort vergessen? Klick hier.</a>
-
-
-			<br><br>
-			<div class='katze' align='center'>
-<pre>
-    _                ___       _.--.    
-    \`.|\..----...-'`   `-._.-'_.-'`    
-    /  ' `         ,       __.--'       
-    )/' _/     \   `-_,   /             
-    `-''' `''\_,_.-;_.-\_ ',            
-        _.-'_./   {_.'   ; /            
-       {_.-``-'         {_/             
-</pre>
-			</div>
-		</div>
-	</div>
-</div>
-</body>
-</html>
-
diff --git a/oldwww/logout.php b/oldwww/logout.php
deleted file mode 100644
index 7c527b2..0000000
--- a/oldwww/logout.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-     session_start();
-     session_destroy();
-     header('Location: login.php?logout=1');
-?>
diff --git a/oldwww/lolrndm.php b/oldwww/lolrndm.php
deleted file mode 100644
index d24fd0b..0000000
--- a/oldwww/lolrndm.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/* Copyright Maximilian Möhring, 2013
-Licensed under the GPL. Read LICENSE for more Information.*/
-
-include("auth.php");
-include("header.php");?>
-
-<div id='content_container' align='center'>
-<div class='kleineschrift'>
-	<div style='width:800px;' class='katze' id='behaelter' align='center'>
-	<br/><br/><br/>
-	<div class='kleineschrift'>
-		<div class='ueberschrift'><p>Upps. Das scheint nicht die Seite zu sein, die du gesucht hast.</p>
-		</div>
-	</div>
-
-<br/>
-<br/>
-<br/>
-
-<p>
-  <object classid="CLSID:D27CDB6E-AE6D-11cf-96B8-444553540000" width="100%" height="100%"
-          codebase="http://active.macromedia.com/flash2/cabs/swflash.cab#version=4,0,0,0">
-    <param name="movie" value="Gununu_all.swf">
-    <param name="quality" value="high">
-    <param name="scale" value="exactfit">
-    <param name="menu" value="true">
-    <param name="bgcolor" value="#000040">
-    <embed src="https://cdn.iamfabulous.de/swf/Gununu_all.swf" quality="high" scale="exactfit" menu="false"
-           bgcolor="#000000" width="600" height="400" swLiveConnect="false"
-           type="application/x-shockwave-flash"
-           pluginspage="http://www.macromedia.com/shockwave/download/download.cgi?P1_Prod_Version=ShockwaveFlash">
-    </embed>
-  </object>
-</p>
-<br>
-<p><a href="/">Zurück zur Startseite.</a></p>
-</div>
-</div>
-</div>
-</div>
-
-</body>
diff --git a/oldwww/member_login.php b/oldwww/member_login.php
deleted file mode 100644
index 8628a44..0000000
--- a/oldwww/member_login.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-/* Copyright Maximilian Möhring, 2013
-Licensed under the GPL. Read LICENSE for more Information.*/
-
-include('auth.php');
-include("header.php");
-
-$name = $_SESSION["username"];
-
-if ($_SESSION["username"] == "jg-adlershof"){
-        $account ="<td><a href='member_login.php'>Login</a></td>
-        <td>|</td>
-        <td><a href='register.php'>Register</a></td>
-        <td>|</td>
-" ;
-	$name = "Gast";
-
-} else {
-	header("Location: account.php");
-	exit;
-        $account ="<td><a href='account.php'>Account</a></td>
-        <td>|</td>
-";
-}
-
-if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-        $username = $_POST["username"];
-        $passwort = $_POST["password"];
-
-	$safe_username = SQLite3::escapeString("$username");
-	$safe_passwort = SQLite3::escapeString("$passwort");
-
-        $db_check = new SQLite3("../database/database.sqlite");
-        $salt_db  = $db_check->query("SELECT salt FROM user WHERE name='$safe_username';");
-        while($salt_array = $salt_db->fetchArray(SQLITE3_NUM)){
-                foreach($salt_array as $firstelement){
-                        $salt=$firstelement;
-                }
-        }
-
-        $password = "$salt"."$passwort";
-        $hash_password = md5($password);
-        for($i=0;$i<15000;$i++)
-                $hash_password = md5($hash_password);
-
-        $real_password_db = $db_check->query("SELECT password FROM user WHERE name='$safe_username';");
-        while($real_password_array = $real_password_db->fetchArray(SQLITE3_NUM)){
-                 foreach($real_password_array as $secondelement){
-                        $real_password=$secondelement;
-                }
-        }
-
-	if ($real_password == $hash_password) {
-
-		$_SESSION["username"] = $_POST["username"];
-		header("Location: member_login.php?stat=1");
-
-	} else {
-		header("Location: member_login.php?stat=2");
-	}
-
-} else {
-
-if ($_GET["stat"] == 2) {
-	$failure="<br><div style='color:red;'>Name und/oder Passwort sind falsch!</div>";
-} else {
-	if ($_GET["stat"] == 1) {
-	header("Location: account.php");
-	exit;
-	}
-}
-
-
-echo "
-
-<div id='content_container' align='center'>
-        <br>
-        <div class='kleineschrift'>
-                <div class='ueberschrift'>
-			<p>JUNGE GEMEINDE ADLERSHOF</p>
-		</div>
-
-<br>
-
-	<div id='behaelter' align='center' class=''>
-			<div class='katze'>
-			Hallo $name, <br>
-			hier kannst du dich für den Mitgliederbereich einloggen.
-			</div><br>
-
-			Noch kein eigenes Passwort? Dann <a style='text-decoration:underline;' href='register.php'>registrier</a> dich einfach.<br><br>
-			$failure
-                        <form method='post' action='member_login.php' >
-                                <p><input type='text' name='username' size='40'/></p>
-                                <p><input type='password' name='password' size='40'/></p> 
-
-
-                                <p><input type='submit' name='submit' value='Miau!'/></p>  
- 
-                        </form>
-        </div>
-</div>
-</div>
-</body>
-</html>
-";
-}
-?>
diff --git a/oldwww/piwik.php b/oldwww/piwik.php
deleted file mode 100644
index 86bfb94..0000000
--- a/oldwww/piwik.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php include("auth.php");?>
-<!-- Piwik -->
-<script type="text/javascript">
-  var _paq = _paq || [];
-  _paq.push(["trackPageView"]);
-  _paq.push(["enableLinkTracking"]);
-
-  (function() {
-    var u=(("https:" == document.location.protocol) ? "https" : "http") + "://a.iamfabulous.de/";
-    _paq.push(["setTrackerUrl", u+"piwik.php"]);
-    _paq.push(["setSiteId", "2"]);
-    var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-    g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<noscript><img src="https://a.iamfabulous.de/piwik.php?idsite=2&amp;rec=1" style="border:0" alt="" /></noscript>
-<!-- End Piwik Code -->
diff --git a/oldwww/quote.php b/oldwww/quote.php
deleted file mode 100644
index b0bc136..0000000
--- a/oldwww/quote.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-/* Copyright Maximilian Möhring, 2013
-Licensed under the GPL. Read LICENSE for more Information.*/
-
-include('auth.php');
-include("header.php");
-
-$zufall = $_GET["id"];
-
-/*__Datenbank___*/
-$db = new SQLite3("../database/database.sqlite");
-$rows = $db->query("SELECT count(*) as count FROM sprueche;");
-$row = $rows->fetchArray();
-$numRows = $row["count"];
-
-if ($zufall == ""){
-	$zufall  = mt_rand(1,$numRows);
-}
-
-
-$safe_zufall = SQLite3::escapeString("$zufall");
-$ergebnis = $db->query("SELECT * FROM sprueche where id=$safe_zufall;");
-
-echo"
-
-<div id='content_container' align='center'>
-        <br>
-        <div class='kleineschrift'>
-                <div class='ueberschrift'><p>JUNGE GEMEINDE ADLERSHOF</p></div>
-        </div>
-        <div id='container' align='center'>
-
-<br><br><br>
-
-<b>Zitat Nummer #$zufall</b><br><br><div id='bgcolor'>";
-
-
-if (preg_match('/[0-9]/',$zufall)){	// I really need this hack to get the 404 when /[0-9][a-zA-Z]/ is happening. Bad PHP!
-	if (preg_match('/[^0-9]/',$zufall)){
-		$zufall = 0;
-	}
-}
-
-
-
-if ($zufall > 0 && $zufall <= ($numRows)){
-	while($row=$ergebnis->fetchArray()){
-        	echo $row["spruch"];
-	}
-} else {
-echo "\"Sorry, can't find the quote, but a cat is fine too, right?\"<br><br>
-<pre>
-      ,/|         _.--''^``-...___.._.,;
-     /, \'.     _-'          ,--,,,--'''
-    { \    `_-''       '    /}          
-     `;;'            ;   ; ;            
- ._.--''     ._,,, _..'  .;.'           
-  (,_....----'''     (,..--''           
-</pre><br><br>
-<i>404 - Eintrag nicht vorhanden.</i>";
-}
-
-echo "</div>
-
-<br><br><br>
-   -----------------------------------------------------------------
-<div class='kleineschrift'><p>Es sind momentan <b><i>$numRows</i></b> Zitate in der Datenbank enthalten.</p>
-Du suchst ein bestimmtes Zitat? Gib hier dessen Nummer ein: <form method='get' action='quote.php' >
-    <input name='id' type='text' size='2' maxlength='30'>
-    <input type='submit' style='display:none'/>
-
-  </form>
-</div>
-
-</div></div></div>
-</body></html>";
-
-?>
diff --git a/oldwww/redirect.php b/oldwww/redirect.php
deleted file mode 100644
index e45e078..0000000
--- a/oldwww/redirect.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php include("auth.php");
-
-$location = $_Get["dest"];
-header("Location: $location");
-?>
diff --git a/oldwww/register.php b/oldwww/register.php
deleted file mode 100644
index 39d22f9..0000000
--- a/oldwww/register.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/* Copyright Maximilian Möhring, 2013
-Licensed under the GPL. Read LICENSE for more Information.*/
-
-include('auth.php');
-include("header.php");
-
-if ($_GET["false"] == 1){
-$failure= "<div style='color:red;'>Fehler! Entweder ist der Nutzer schon registriert oder dein Passwort war leer!</div><br>";
-}
-
-echo "
-
-<div id='content_container' align='center'>
-        <br>
-        <div class='kleineschrift'>
-	        <div class='ueberschrift'>
-			<p>JUNGE GEMEINDE ADLERSHOF</p>
-	        </div>
-
-
-
-<br><div style='width:800px;' id='behaelter' align='center' class='katze'>
-Registriere dich, um einen persönlichen Zugang zu erhalten. Such dir einen beliebigen Spitznamen und ein geeignetes Passwort aus. Keine Angst, dein Passwort wird sicher verwahrt und nicht im Klartext abgelegt.
-<br><br>Die E-Mail Adresse ist keine Pflicht, aber notwendig, wenn du dein Passwort vergessen hast.
-<br/><br/>
-
-$failure
-
-<div class='katze'>
-<form method='post' action='inreg.php'>
-<table width='320px'>
-<tr>
-	<td align='left'><p>Name:</td><td align='right'><input name='name' type='text' size='20' maxlength='30'></p></td>
-</tr>
-<tr>
-	<td align='left'><p>Passwort:</td><td align='right'><input name='pswd' type='password' size='20' maxlength='30'></p></td>
-</tr>
-<tr><td align='left'><p>E-Mail:</td> <td align='right'><input name='email' type='text' size='20' maxlength='30'></p></td>
-</tr>
-</table>
-<center><input type='submit' name='submit' value='Register'/></center>
-</form>
-</div>
-
-</div>
-</body>
-</html>
-";
-
-
-
-?>
diff --git a/oldwww/reset.php b/oldwww/reset.php
deleted file mode 100644
index b18f8eb..0000000
--- a/oldwww/reset.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-
-/* Copyright Maximilian Möhring, 2013
-Licensed under the GPL. Read LICENSE for more Information.*/
-
-session_start() ?>
-<!doctype html>
-
-<html>
- <head>
-  <title>Junge Gemeinde Adlershof.</title>
-  <meta http-equiv='Content-type' content='text/html; charset=utf-8' />
-  <link rel='stylesheet' type='text/css' href='hyperstyle.css' />
-  <link rel='shortcut icon' href='/favicon.ico' type='image/x-icon'>
- </head>
-
- <body link="#000000" vlink="#000000" alink="#FF0000">
-
-<?php
-
-if($_SESSION["login"]){
-
-include("header.php");
-
-} else {
-	echo "
-	<div id='header' class='kleineschrift'>
-	<br><br>
-	<hr>
-	</div>
-	";
-
-$startseite="<div class='kleineschrift'><a style='text-decoration:underline;' href='login.php'>Zurück zur Startseite.</a></div>";
-}
-?>
-        <div id='content_container' align="center"><br>
-
-        <div align='center'>
-        <p5>JUNGE GEMEINDE ADLERSHOF</p5>
-<br><br><div id='behaelter' align='center'>
-
-<?php
-
-$email_post = $_POST["email"];
-$try = $_POST["try"];
-
-if (empty($email_post)){
-echo "
-<a5>Gib deine E-Mail Adresse ein, um dir ein neues Passwort zuzuschicken.</a5><br><br>
-<form action='reset.php' method='post'>
-<input type='text' name='email' size='30'/>
-</form>
-";
-} else {
-
-	/*___Datenbank___*/
-	$db_check = new SQLite3("../database/database.sqlite");
-	$safe_email = SQLite3::escapeString("$email_post");
-
-        $email_db = $db_check->query("SELECT email FROM user WHERE email='$safe_email';");
-        while($email_array = $email_db->fetchArray(SQLITE3_NUM)){
-                foreach($email_array as $thirdelement){
-                        $email=$thirdelement;
-                }
-        }
-
-	if (empty($email)){
-		$try = $try +1;
-
-		if ($try > 0){
-			header("HTTP/1.0 401 Unauthorized");
-		}
-		$maxtry = 3 - $try;
-
-			if ($maxtry == 0) {
-				echo "<a4><b>YOU ARE BANNED! ;_;</b></a4><br>	";
-				header("Refresh: 3; /401");
-
-			} else {
-				echo "<a5>Die E-Mail ist nicht in der Datenbank gespeichert. Achte auf Tippfehler und probiere noch einmal.<br>
-				Du hast noch $maxtry Versuche, bevor du gesperrt wirst.</a5>
-				<br><br>
-				<form action='reset.php' method='post'>
-				<input type='text' name='email' size='30'/>
-				<input type='hidden' name='try' value='$try'/>
-				</form>
-				";
-			}
-	} else {
-
-		$secret = explode(" ", "a b c d e f g h i j k l m n o p q r s t u v w x y z 0 1 2 3 4 5 6 7 8 9");
-		shuffle($secret);
-		$secret = substr(implode($secret), 0, 10);
-
-	        $salt = uniqid(mt_rand(), true);
-        	$password = "$salt"."$secret";
-	        $hash_password = md5($password);
-        	for($i=0;$i<15000;$i++)
-                	$hash_password = md5($hash_password);
-
-		if($db_check->exec("UPDATE user SET password='$hash_password', salt='$salt' where email='$email';")){
-			if(mail($email, "Dein neues Passwort", "Dein neues Passwort für https://jungegemeinde.iamfabulous.de lautet: '" . $secret . "'. Wenn du diese E-Mail nicht erwartet hast, bitte sende eine Nachricht an max-moehring@web.de. Danke.", "From: no-reply@jg-adlershof.de")){
-				echo "Wir haben deine E-Mail in der Datenbank. Eine E-Mail mit deinem neuen Passwort wurde soeben verschickt.<br>";
-			} else {
-				echo "Fehler mit der mail() Funktion. Bitte schick eine Benachrichtigung an <a href='mailto:max-moehring@web.de'>max-moehring@web.de</a>.";
-			}
-		} else {
-			echo "Fataler Datenbankfehler. Schick eine Nachricht an: <a href='mailto:max-moehring@web.de'>max-moehring@web.de</a>.";
-		}
-
-//		exec('curl -vv --user max:sommer13 -F sender="mailer-daemon@jg-adlershof.de" -F recipient="'.$email.'" -F subject="Angefordertes neues Passwort - BITTE NICHT ANTWORTEN"  -F message="Dein neues Passwort lautet: '.$secret.'." http://playground.oweissbarth.de/mail/send.php'); 
-
-
-	}
-
-
-}
-
-?>
-<br>
-<?php echo $startseite; ?>
-</div>
-</div>
-</div>
-</body>
-</html>
-<?php 
-?>
diff --git a/oldwww/robots.txt b/oldwww/robots.txt
deleted file mode 100755
index 1f53798..0000000
--- a/oldwww/robots.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-User-agent: *
-Disallow: /
diff --git a/oldwww/setup.php b/oldwww/setup.php
deleted file mode 100644
index 2465822..0000000
--- a/oldwww/setup.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?
-
-$db = new SQLite3("../database/database.sqlite");
-
-if($db-exec("
-	BEGIN TRANSACTION;
-	CREATE TABLE log (id INTEGER PRIMARY KEY, user INTEGER, login TEXT, FOREIGN KEY(user) REFERENCES user(id));
-	CREATE TABLE user (id INTEGER PRIMARY KEY, name TEXT, adresse TEXT, telefonnummer TEXT, handynummer TEXT, email TEXT, geburtstag TEXT, salt TEXT, password TEXT);
-	COMMIT;
-	")){
-		echo "Success!";
-else{
-	echo "Failure. :(";
-}
diff --git a/oldwww/share.php b/oldwww/share.php
deleted file mode 100644
index 59af81f..0000000
--- a/oldwww/share.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/* Copyright Maximilian Möhring, 2013
-Licensed under the GPL. Read LICENSE for more Information.*/
-
-include('auth.php'); 
-include("header.php");
-?>
-
-<div id='content_container' align='center'>
-	<br>
-	<div class='kleineschrift'>
-		<div class='ueberschrift'><p>JUNGE GEMEINDE ADLERSHOF</p>
-		</div>
-	</div>
-
-<?php
-$db = new SQLite3("../database/database.sqlite");
-
-$show_public_db = $db->query("SELECT filename FROM file WHERE private=0;");
-
-while($show_public_array = $show_public_db->fetchArray() ){
-		echo " $show_public_array[filename]";
-}
-
-?>
diff --git a/oldwww/to-do-list.php b/oldwww/to-do-list.php
deleted file mode 100644
index 1dc1dde..0000000
--- a/oldwww/to-do-list.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/* Copyright Maximilian Möhring, 2013
-Licensed under the GPL. Read LICENSE for more Information.*/
-
-include('auth.php'); ?>
-<!DOCTYPE html>
-<head>
-<title>to-do-list</title>
-</head>
-
-Auf Python umsteigen!<br>
-SQL: UPDATE --fix (09.10.13) ENDLICH!!<br>
-SQL: .DUMP <br>
-SQL: DROP? <br>
-Everything is hard coded atm. ;( <br>
-email Benachrichtigung bei UPDATE <br>
-Javascript for fancy programming <br>
-PHP kann in zu PDFs? <br>
-verfickte Umlaute reparieren --fix (05.10.13)<br>
-Wie siehts aus mit SQL Injections? --wer schaffts?<br>
-URL Rewriting? Warum eigentlich nicht. <br>
-.csv output fixen ("") <br>
-CSS erweitern, zB alternative Schriftarten festlegen, bzw importieren --unwichtig<br>
-Mit der Tabelle umziehen, f&uuml;r die f&uuml;hrende Null. (Felix hat mich daran erinnert, danke.) --fix (09.10.13) War nicht schwierig, konnte aber so die Seite testen. Trotzdem k&ouml;nnen wir nun nicht mehr sortiert nach der Quersumme der Handynummern die Liste anzeigen. :/<br>
-mailto: Links einf&uuml;gen -- Ist das wichtig? <br>
-Bevor jemand meckert. Die Methoden wieder zur Startseite zu kommen sind bei "aktualisieren" und "neuen Eintrag" unterschiedlich, ist mir bewusst. St&ouml;rt das den "Flow"? Dann muss ich das kurz umschreiben. Ansonsten gehts bei mir auch so. <br>
-Update umschreiben, sodass man nicht mehr den Prim&auml;rschl&uuml;ssel manuell eingeben muss, sondern nur noch eine Checkbox dr&uuml;ckt und er wird automatisch &uuml;bergeben.<br>
-Design: Formular  von UPDATE und INSERT sieht auch nicht gleich aus.<br>
-Ich mag Katzen und hab noch ein paar mehr davon:<br><pre>
-    _                ___       _.--.
-    \`.|\..----...-'`   `-._.-'_.-'`
-    /  ' `         ,       __.--'
-    )/' _/     \   `-_,   /
-    `-'" `"\_  ,_.-;_.-\_ ',     fsc/as
-        _.-'_./   {_.'   ; /
-       {_.-``-'         {_/
-</pre><br>
-Andere folgen eventuell sp&auml;ter.
-
-
-<!-- Obligatory Piwik -->
-<script type="text/javascript">
-  var _paq = _paq || [];
-  _paq.push(["trackPageView"]);
-  _paq.push(["enableLinkTracking"]);
-
-  (function() {
-    var u=(("https:" == document.location.protocol) ? "https" : "http") + "://a.iamfabulous.de/";
-    _paq.push(["setTrackerUrl", u+"piwik.php"]);
-    _paq.push(["setSiteId", "2"]);
-    var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-    g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<noscript><img src="https://a.iamfabulous.de/piwik.php?idsite=2&amp;rec=1" style="border:0" alt="" /></noscript>
-<!-- End Piwik Code -->
diff --git a/oldwww/update.php b/oldwww/update.php
deleted file mode 100644
index e59bf8e..0000000
--- a/oldwww/update.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/* Copyright Maximilian Möhring, 2013
-Licensed under the GPL. Read LICENSE for more Information.*/
-
-include('auth.php');
-/*error_reporting(E_ALL);
-
-ini_set('display_errors', '1');*/
-
-$id = SQLite3::escapeString($_POST["id"]);
-$name = SQLite3::escapeString($_POST["name"]);
-$adresse = SQLite3::escapeString($_POST["adresse"]);
-$telefonnummer = SQLite3::escapeString($_POST["telefonnummer"]);
-$handynummer = SQLite3::escapeString($_POST["handynummer"]);
-$email = SQLite3::escapeString($_POST["email"]);
-$bday = SQLite3::escapeString($_POST["geburtstag"]);
-
-//echo "$name<br> $adresse<br>$telefonnummer<br>$handynummer<br>$email<br>$bday<br>$ip<br>$cryptedip";
-
-
-
-$db = new SQLite3('../database/database.sqlite');
-
-$db->exec("UPDATE member SET name='$name' where id=$id;");
-$db->exec("UPDATE member SET adresse='$adresse' where id=$id;");
-$db->exec("UPDATE member SET telefonnummer='$telefonnummer' where id=$id;");
-$db->exec("UPDATE member SET handynummer='$handynummer' where id=$id;");
-$db->exec("UPDATE member SET email='$email' where id=$id;");
-$db->exec("UPDATE member SET geburtstag='$bday' where id=$id;");
-
-/*echo "
-<!doctype html public '-//W3C//DTD XHTML 1.0 //EN'>
-
-<html>
- <head>
-  <title>Junge Gemeinde Adlershof - Update erfolgreich!</title>
-  <meta http-equiv='Content-type' content='text/html; charset=utf-8' />
-  <link rel='stylesheet' type='text/css' href='style.css' />
-  <link rel='shortcut icon' href='/favicon.ico' type='image/x-icon'>
- </head>
-
- <body>
-<center>
-<p5>Update erfolgreich!</p5><br><br>
-<a4>Weiterleitung in 3.. 2.. 1..</a4>
-</center></body></html>";*/
-
-header("Refresh: 0; liste.php");
-
-
-
-?>
diff --git a/bootstrap/robots.txt b/robots.txt
index 1f53798..1f53798 100644
--- a/bootstrap/robots.txt
+++ b/robots.txt
diff --git a/setup.php b/setup.php
new file mode 100755
index 0000000..018781d
--- /dev/null
+++ b/setup.php
@@ -0,0 +1,13 @@
+<?php
+# init file to set up the database
+# TODO: pretty html
+
+$db = new db();
+$db->createTables();
+$db->close();
+
+echo "<p>Successfully created the database.</p>";
+
+# rename this file to avoid setting up the tables twice
+rename(ABSPATH . 'setup.php', ABSPATH . '_setup.php');
+exit;
diff --git a/bootstrap/static/footer.php b/static/footer.php
index 2c6a6cf..2c6a6cf 100755
--- a/bootstrap/static/footer.php
+++ b/static/footer.php
diff --git a/bootstrap/static/header.php b/static/header.php
index d20ddf9..d20ddf9 100644
--- a/bootstrap/static/header.php
+++ b/static/header.php
diff --git a/bootstrap/static/kitten-praying.jpg b/static/kitten-praying.jpg
index 7f291e0..7f291e0 100644
--- a/bootstrap/static/kitten-praying.jpg
+++ b/static/kitten-praying.jpg
diff --git a/bootstrap/static/kitten-prays-small.jpg b/static/kitten-prays-small.jpg
index 5734aea..5734aea 100644
--- a/bootstrap/static/kitten-prays-small.jpg
+++ b/static/kitten-prays-small.jpg
diff --git a/bootstrap/static/kitten-prays.jpg b/static/kitten-prays.jpg
index 3eb6ede..3eb6ede 100644
--- a/bootstrap/static/kitten-prays.jpg
+++ b/static/kitten-prays.jpg
diff --git a/bootstrap/static/kitten.jpg b/static/kitten.jpg
index 376c195..376c195 100644
--- a/bootstrap/static/kitten.jpg
+++ b/static/kitten.jpg
diff --git a/bootstrap/static/style.css b/static/style.css
index 5821df4..5821df4 100644
--- a/bootstrap/static/style.css
+++ b/static/style.css
diff --git a/bootstrap/static/style.min.css b/static/style.min.css
index dc54b0f..dc54b0f 100644
--- a/bootstrap/static/style.min.css
+++ b/static/style.min.css
diff --git a/www/account.php b/www/account.php
deleted file mode 100644
index 0b1543d..0000000
--- a/www/account.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-function account($db){
-
-}
diff --git a/www/auth.php b/www/auth.php
deleted file mode 100644
index 4851f7b..0000000
--- a/www/auth.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-//session_start();
-
-if ((!isset($_SESSION['login']) || !$_SESSION['login']) && $_GET["task"] != "login" && $_GET["task"] != "password_recover") {
-	header("Refresh: 0; ".$scheme.$_SERVER["HTTP_HOST"]."/login");
-	exit;
-}
diff --git a/www/config/401.css b/www/config/401.css
deleted file mode 100644
index b017224..0000000
--- a/www/config/401.css
+++ /dev/null
@@ -1,6 +0,0 @@
-h1 {
-font-family: Calibri;
-font-size: 200%;
-color: black;
-text-align: center;
-}
diff --git a/www/config/404.css b/www/config/404.css
deleted file mode 100644
index 08276dd..0000000
--- a/www/config/404.css
+++ /dev/null
@@ -1,3 +0,0 @@
-body {
-background: white url("dead_link.png") no-repeat fixed top;
-}
diff --git a/www/config/dead_link.png b/www/config/dead_link.png
deleted file mode 100755
index 37eb36b..0000000
--- a/www/config/dead_link.png
+++ /dev/null
diff --git a/www/config/error-handler-404.html b/www/config/error-handler-404.html
deleted file mode 100644
index 6264849..0000000
--- a/www/config/error-handler-404.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!doctype html public "-//W3C//DTD XHTML 1.0 //EN">
-
-<html>
-<head>
-<title>404 - Dead Link.</title>
-<link rel="stylesheet" type="text/css" href="/config/404.css" />
-<meta http-equiv="refresh" content="0; /404">
-</head>
-
-<body>
-
-</body>
-
diff --git a/www/config/favicon.ico b/www/config/favicon.ico
deleted file mode 100755
index eff0501..0000000
--- a/www/config/favicon.ico
+++ /dev/null
diff --git a/www/config/fonts/2Q-AW1e_taO6pHwMXcXW5w.ttf b/www/config/fonts/2Q-AW1e_taO6pHwMXcXW5w.ttf
deleted file mode 100644
index 0e35cfb..0000000
--- a/www/config/fonts/2Q-AW1e_taO6pHwMXcXW5w.ttf
+++ /dev/null
diff --git a/www/config/fonts/BfQP1MR3mJNaumtWa4Tizg.ttf b/www/config/fonts/BfQP1MR3mJNaumtWa4Tizg.ttf
deleted file mode 100644
index cf324e4..0000000
--- a/www/config/fonts/BfQP1MR3mJNaumtWa4Tizg.ttf
+++ /dev/null
diff --git a/www/config/fonts/Muli.css b/www/config/fonts/Muli.css
deleted file mode 100644
index 4fa7a93..0000000
--- a/www/config/fonts/Muli.css
+++ /dev/null
@@ -1,6 +0,0 @@
-@font-face {
-  font-family: 'Muli';
-  font-style: normal;
-  font-weight: 400;
-  src: local('Muli'), "/config/fonts/muli.ttf" format('truetype');
-}
diff --git a/www/config/fonts/Ubuntu.css b/www/config/fonts/Ubuntu.css
deleted file mode 100644
index 6ab025f..0000000
--- a/www/config/fonts/Ubuntu.css
+++ /dev/null
@@ -1,6 +0,0 @@
-@font-face {
-  font-family: 'Ubuntu';
-  font-style: normal;
-  font-weight: 400;
-  src: local('Ubuntu'), "/config/fonts/ubuntu.ttf" format('truetype');
-}
diff --git a/www/config/fonts/muli.tff b/www/config/fonts/muli.tff
deleted file mode 100644
index cf324e4..0000000
--- a/www/config/fonts/muli.tff
+++ /dev/null
diff --git a/www/config/fonts/ubuntu.ttf b/www/config/fonts/ubuntu.ttf
deleted file mode 100644
index 0e35cfb..0000000
--- a/www/config/fonts/ubuntu.ttf
+++ /dev/null
diff --git a/www/config/index.html b/www/config/index.html
deleted file mode 100644
index c04f57f..0000000
--- a/www/config/index.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!doctype html>
-
-<html>
-<head>
-<title>401 - Acces forbidden.</title>
-<link rel="stylesheet" type="text/css" href="/config/401.css" />
-<link rel="shortcut icon" href="/404/favicon.ico" type="image/x-icon">
-</head>
-
-<body>
-
-<div align="center">
-  <table width="750">
-<tr>
-      <td align="center"><img src="http://i.imgur.com/CY7ntqP.png" alt="Goddess" vspace="1"></td>
-</tr>
-<tr>
-     <td><h1>Access forbidden. Now get the fuck out.</h1></td>
-</tr>
-</table>
-</div>
-</body>
-</html>
diff --git a/www/config/status-401.html b/www/config/status-401.html
deleted file mode 100644
index e980ac9..0000000
--- a/www/config/status-401.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!doctype html public "-//W3C//DTD XHTML 1.0 //EN">
-
-<html>
-<head>
-<title>401 - Acces forbidden.</title>
-<link rel="stylesheet" type="text/css" href="/config/401.css" />
-<meta http-equiv="refresh" content="0; /401">
-</head>
-
-<body>
-
-<div align="center">
-  <table width="750">
-<tr>
-      <td align="center"><img src="http://i.imgur.com/CY7ntqP.png" alt="Goddess" vspace="1"></td>
-</tr
-<tr>
-     <td align="center" valign="top"><h1>Access forbidden. Now get the fuck out.</h1></td>
-</tr>
-
-</body>
-
diff --git a/www/config/test_401.css b/www/config/test_401.css
deleted file mode 100644
index 80ad4d0..0000000
--- a/www/config/test_401.css
+++ /dev/null
@@ -1,29 +0,0 @@
-body {
-/*background: white url("haruhi.png") no-repeat fixed top;*/
-}
-
-<style type="text/css">
-  div.container {top: 0; left: 0; width: 100%; height: 100%;
-    position: fixed; display: table}
-  p {display: table-cell; vertical-align: middle}
-
-  /* Horizontal centering of image: set left & right margins to 'auto' */
-  img.displayed {display: block; margin: 1em auto}
-
-  /* Also center the lines in the paragraph */
-  p {top: 590px; text-align: center font-size: 300%; font-family: Courier; color: black;}
-</style>
-
-/*<div class=container>
-  <p>Access forbidden. Now get the fuck out.
-  <img class=displayed src="./haruhi.png"></p>
-</div>*/
-
-h1 {
-/*position: relative;*/
-top: 590px;
-font-family: Courier;
-font-size: 300%;
-color: black;
-text-align: center;
-}
diff --git a/www/constants.php b/www/constants.php
deleted file mode 100644
index 05e4192..0000000
--- a/www/constants.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-define("EMPTY", 0);
-
-define("LOGIN_SUCCESSFULL", 1);
-define("LOGIN_DATABASE", 2);
-define("LOGIN_PASSWORD", 3);
-
-define("LOGOUT_SUCCESSFULL", 4);
-define("LOGOUT_FAILURE", 5);
-
-define("REGISTER_SUCCESSFULL", 6);
-define("REGISTER_PASSWORD", 7);
-define("REGISTER_EMAIL", 8);
-define("REGISTER_DATABASE", 9);
-define("REGISTER_PROHIBITED", 10);
-define("REGISTER_INVITEKEY", 11);
-define("REGISTER_USERNAME", 12);
-define("REGISTER_INVITE", 13);
-
-define("INVITE_SUCCESSFULL", 14);
-define("INVITE_INVITES", 15);
-define("INVITE_DATABASE", 16);
-define("INVITE_USEREXISTS", 17);
-
-define("PASSWORD_SUCCESS", 18);
-define("PASSWORD_PASSWORD", 19);
-define("PASSWORD_DATABASE", 20);
-
-define("RECOVER_SUCCESS", 21);
-define("RECOVER_EMAIL", 22);
-define("RECOVER_PROHIBITED", 23);
-
-define("NOT_LOGED_IN", 67);
-define("FOLDER_NOT_OWNER", 68);
-define("DATABASE", 69);
-define("CH_USERNAME_EXISTS", 70);
-define("CH_USERNAME_SUCCESS", 71);
-define("CH_EMAIL_EXISTS", 72);
-define("CH_EMAIL_SUCCESS", 73);
diff --git a/www/failure.php b/www/failure.php
deleted file mode 100644
index 7461a28..0000000
--- a/www/failure.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-session_start();
-
-$scheme="http://";
-
-if(isset($_SERVER["HTTPS"])){
-        if($_SERVER["HTTPS"] == "on"){
-                $scheme="https://";
-        }   
-}
-
-include("functions/func_login.php");
-$db = new SQLite3("../database/sqlite.db");
-if($_GET["e"] != "401" && check_if_banned($db)){
-        banned();
-}	
-//include("include.php");
-if(!empty($_GET)){
-	switch($_GET["e"]){
-		case("401"):
-			$message = "You are banned!";
-			break;
-
-		case("403"):
-			$message = "I could do that... but access forbidden";
-			break;
-
-		case("404"):
-			$message = "404 - File Not Found";
-			break;
-		
-		case("500"):
-			$message = "Server fault.";
-			break;
-
-		case("502"):
-			$message = "Bad Gateway";
-			break;
-
-		case("504"):
-			$message = "Someone other is too slow. I can't wait forever.";
-			break;
-
-		default:
-			$message = "200 / Everything is okay.";
-			break;
-	}
-} else {
-	header("Refresh: 0; https://".$_SERVER["HTTP_HOST"]."/");
-	exit;
-	$message = "200 / Everything is okay.";
-	$_GET["e"] = 200;
-}
-
-?><!doctype html>
-<html>
-<head>
-	<title><?php if($_GET["e"] != "401"){ echo "Failure ".$_GET["e"]; } else { echo "You are banned! "; } ?> :: Junge Gemeinde Adlershof</title>
-	<meta http-equiv='Content-type' content='text/html; charset=utf-8' />
-	<link rel='stylesheet' type='text/css' href='/static/hyperstyle.css' />
-	<link rel='shortcut icon' href='/favicon.ico' type='image/x-icon'>
-</head>
-
-<?php
-
-if($_SESSION["login"]){
-	include("static/head.php");
-
-	echo "
-<br><br>
-<div id='content_container' align='center'>
-	<div class='kleineschrift'><div class='ueberschrift'><b><p style='text-decoration:underline;'>". $message ."</p></b></div></div>
-	";
-
-	echo "
-<br><br>
-	<p style='font-size:14px'>Upps, it seems to be something went wrong, sorry.</p>
-	<p style='font-size:14px'>Have a random quote to bridge the time. Try to reload the site or check for typos in the URL.</p>
-	";
-
-	$rows = $db->query("SELECT count(*) as count FROM sprueche;");
-	$row = $rows->fetchArray();
-	$numRows = $row["count"];
-
-	$zufall  = mt_rand(1,$numRows);
-	$ergebnis = $db->query("SELECT * FROM sprueche where id=$zufall;");
-
-	echo "
-        <br>
-        <div id='container' align='center'>
-	<br><br><br>
-	<b>Zitat Nummer #<?php echo $zufall; ?></b><br><br><div id='bgcolor'>
-	";
-
-	while($row=$ergebnis->fetchArray()){
-		echo $row["spruch"];
-	}
-
-	echo "</div>
-	</div>
-	";
-} else {
-	echo "
-		<body link='#000000' vlink='#000000' alink='#FF0000'>	
-	";
-	echo "
-<br><br>
-<div id='content_container' align='center'>
-	<div class='kleineschrift'><div class='ueberschrift'><b><p style='text-decoration:underline;'>". $message ."</p></b></div></div>
-	";
-
-	if($_GET["e"] != "401"){
-		echo "
-		<br><br>
-		<p style='font-size:14px'>Upps, it seems to be something went wrong, sorry.</p>
-		<p style='font-size:14px'>Have a random quote to bridge the time. Try to reload the site or check for typos in the URL.</p>
-		<br>
-		<font style='font-size:14px'>Zurück zur <a href='/login'><u>Startseite</u></a> oder <a href='/password_recover'><u>Passwort vergessen?</u></a></font>
-		";
-
-		$rows = $db->query("SELECT count(*) as count FROM sprueche;");
-		$row = $rows->fetchArray();
-		$numRows = $row["count"];
-
-		$zufall  = mt_rand(1,$numRows);
-		$ergebnis = $db->query("SELECT * FROM sprueche where id=$zufall;");
-
-		echo "
-	        <br>
-        	<div id='container' align='center'>
-		<br><br><br>
-		<b>Zitat Nummer #". $zufall ."</b><br><br><div id='bgcolor'>
-		";
-
-		while($row=$ergebnis->fetchArray()){
-			echo $row["spruch"];
-		}
-
-		echo "</div>
-		</div>
-		";
-		}
-}
diff --git a/www/favicon.ico b/www/favicon.ico
deleted file mode 100755
index 41f6475..0000000
--- a/www/favicon.ico
+++ /dev/null
diff --git a/www/functions/func_failure.php b/www/functions/func_failure.php
deleted file mode 100755
index e54cfaf..0000000
--- a/www/functions/func_failure.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/* --PAGE NOT FOUND - 404 -- */
-
-//function get_404($working_path, $wrong_folder){
-//        include("httperror.php");
-//        exit;
-//}
-
-function failure($reason){
-        echo "A 404 error occurred. <br>";
-        echo $reason;
-        exit;
-}
diff --git a/www/functions/func_interface.php b/www/functions/func_interface.php
deleted file mode 100755
index 08b9790..0000000
--- a/www/functions/func_interface.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-//function print_invite($var){
-//	include("invite.php");
-//}
-
-/*
-function print_recover_password(){
-	echo "
-		<!DOCTYPE html>
-		<html>
-		<body>
-		<form method='POST' action='/password_reset'>
-		<p>E-Mail <input type='text' name='email'></p>
-		</form>
-		</body>
-	";
-}
-*/
-
-//function print_login($var){
-//	echo "Coming soon";
-//}
-
-//function print_index(){
-//	echo "Coming soon";
-//}
diff --git a/www/functions/func_login.php b/www/functions/func_login.php
deleted file mode 100755
index 7944c3e..0000000
--- a/www/functions/func_login.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-function login($db){
-
-        /*___Database Query: Login___*/
-	$username = $_POST["username"];
-        $password = $_POST["password"];
-        $safe_username = SQLite3::escapeString(htmlentities($username));
-
-	$log_in = false;
-	$real_password = "";
-
-	if($username == "Guest"){
-
-		$real_password_db = $db->query("SELECT email FROM jg;");
-		while($row = $real_password_db->fetchArray(SQLITE3_NUM)){
-			if($row[0] == $password){
-				$log_in = true;
-				break;
-			}		
-		}
-	} else {
-		$pepper = file_get_contents("../database/pepper.txt");
-		$password = $password . $pepper;
-
-        	$real_password_db = $db->query("SELECT password FROM user WHERE name='" . $safe_username . "';");
-        	while($real_password_array = $real_password_db->fetchArray(SQLITE3_NUM)){
-        		foreach($real_password_array as $secondelement){
-                		$real_password=$secondelement;
-                	}   
-		}   
-
-        	if (password_verify($password, $real_password)) {
-			$log_in = true;
-		}
-	}
-
-        /*___Login___*/
-	if(!$log_in){
-		return LOGIN_PASSWORD;
-	}
-
-	
-	$id = user_id($db, $username);
-	$banned_db = $db->query("SELECT 1 FROM banned_user WHERE user=".$id);
-	$banned_ar = $banned_db->fetchArray(SQLITE3_NUM);
-
-	if($banned_ar[0] == 1){
-		echo "You are banned. ;_;";
-		exit;
-	}
-
-        if($db->exec("
-        	BEGIN TRANSACTION;
-                INSERT INTO log (id, user, login) VALUES (NULL, (SELECT id FROM user WHERE name='" . $username . "'), (SELECT strftime('%s', 'now')));
-                COMMIT;
-	")){
-
-
-                $_SESSION["login"] = true;
-                $_SESSION["username"] = $username;
-		$_SESSION["userid"] = $id;
-
-		return LOGIN_SUCCESSFULL; 
-
-	} else {
-		return LOGIN_DATABASE;
-	}   
-}
-
-function logout(){
-        
-	if(session_destroy()){
-                return LOGOUT_SUCCESSFULL;
-        } else {
-                return LOGOUT_FAILURE;
-        }   
-}
-
-function brutforce_protection($db){
-	$_SESSION["login_attempts"] = $_SESSION["login_attempts"] - 1;
-
-	$remote_ip = $_SERVER["REMOTE_ADDR"];
-	$session_id = session_id();
-	$time = $_SERVER["REQUEST_TIME"];
-	
-	if($_SESSION["login_attempts"] <= 0){
-		$db->exec("
-			BEGIN TRANSACTION;
-			INSERT INTO banned_user (id, login_attempts, ip, session_id, time) VALUES (NULL, ".$_SESSION["login_attempts"].", '".SQLite3::escapeString($remote_ip)."', '".SQLite3::escapeString($session_id)."', ".$time.");
-			COMMIT;
-		");
-		banned();
-
-	} else {
-		if($db->exec("
-			BEGIN TRANSACTION;
-			INSERT INTO banned_user (id, login_attempts, ip, session_id, time) VALUES (NULL, ".$_SESSION["login_attempts"].", '".$db->escapeString($remote_ip)."', '".SQLite3::escapeString($session_id)."', '".$time."');
-			COMMIT;
-		")){
-			return true;
-		} else {
-			return false;
-		}
-	}
-}
-
-function check_if_banned($db){
-
-	$remote_ip = $_SERVER["REMOTE_ADDR"];
-	$session_id = session_id();
-	$check_db = $db->query("SELECT time, login_attempts, id FROM banned_user WHERE ip='".SQLite3::escapeString($remote_ip)."' OR session_id='".SQLite3::escapeString($session_id)."' ORDER BY id DESC;");
-	$check_ar = $check_db->fetchArray(SQLITE3_NUM);
-
-	$log_at = $check_ar[1];
-	if($log_at){
-		$_SESSION["login_attempts"] = $log_at;
-	}
-
-	$accepted_time = $_SERVER["REQUEST_TIME"] - 21600; 	// == 6h
-	$db->exec("DELETE FROM banned_user WHERE time<'".$accepted_time."'");	
-
-	if($log_at <= 0){
-		if($check_ar[0] >= $accepted_time){
-			return true;					// still banned
-		}
-	}
-
-	return false; 					// not longer banned
-}
-
-function banned(){
-	header("Refresh: 0; ".$GLOBALS["scheme"].$_SERVER["HTTP_HOST"]."/banned");
-	exit;
-}
diff --git a/www/functions/func_password.php b/www/functions/func_password.php
deleted file mode 100644
index e515111..0000000
--- a/www/functions/func_password.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-function change_password($db, $first_password, $second_password){
-	if($_SESSION["login"]){
-		$username = user_id($db, $_SESSION["username"]);
-	} else {
-		$username_db = $db->query("SELECT id FROM user WHERE email='" . SQLite3::escapeString(htmlentities($_POST['email'])) . "';");
-		$username_ar = $username_db->fetchArray(SQLITE3_NUM);
-		$username = $username_ar[0];
-	}
-	
-	if($first_password != $second_password || !isset($first_password) || empty($first_password) || $first_password == ""){
-		return PASSWORD_PASSWORD;
-	}
-
-	$pepper = file_get_contents("../database/pepper.txt");
-	$password = $first_password . $pepper;
-
-	$hash_password = password_hash($password, PASSWORD_DEFAULT);
-
-	if($db->exec("
-		BEGIN TRANSACTION;
-		UPDATE user SET password='" . $hash_password . "' WHERE id=" . $username . ";
-		COMMIT;
-	")){
-		return PASSWORD_SUCCESS;
-	} else {
-		return PASSWORD_DATABASE;
-	}
-}
-
-function recover_password($db){
-	$test_email_db = $db->query("SELECT 1 FROM user WHERE email='" . SQLite3::escapeString(htmlentities($_POST['email'])) . "';");
-	$test_email_ar = $test_email_db->fetchArray(SQLITE3_NUM);
-
-	if($test_email_ar[0] == 1){
-		$password_array = array("a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "_", "-", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" );
-
-		$length = count($password_array);
-		$password = ""; 
-
-		for ($i=0;$i<21;$i++){
-			$index = mt_rand(0,$length-1);
-			$password = "$password".$password_array[$index];
-		}
-
-		$var = change_password($db, $password, $password);
-
-		if($var == PASSWORD_SUCCESS){
-
-			$subject = "Your new password is" . $password;
-			if(mail($_POST['email'], "New password", $subject, "From: mail@iamfabulous.de")){
-				return RECOVER_SUCCESS;
-			} else {
-				return RECOVER_EMAIL;
-			}
-		} else {
-			return $var;
-		}
-	} else {
-		return RECOVER_PROHIBITED;
-	}
-}
-
-function validate_password($db, $username, $password){
-	$res_db = $db->query("SELECT password FROM user WHERE name='".$db->escapeString(htmlentities($username))."'");
-	$res_ar = $res_db->fetchArray(SQLITE3_NUM);
-
-	$pepper = file_get_contents("../database/pepper.txt");
-	$password .= $pepper;
-
-	if(password_verify($password, $res_ar[0])){
-		return true;
-	} else {
-		return false;
-	}
-}
diff --git a/www/functions/func_register.php b/www/functions/func_register.php
deleted file mode 100755
index da804d4..0000000
--- a/www/functions/func_register.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-function register($db){
-
-	$name = $_POST["name"];
-        $cleartext_password = $_POST["pswd"];
-        $second_password = $_POST["2ndpswd"];
-        $email = $_POST["email"];
-
-        /* checking for empty password etc. */
-
-        if(($cleartext_password != $second_password) || !isset($_POST["pswd"]) || !isset($_POST["2ndpswd"]) || $cleartext_password == "" || empty($_POST["pswd"]) || empty($_POST["2ndpswd"])){
-		return REGISTER_PASSWORD;
-	}   
-
-	if(!empty($email)){
-		if(!preg_match("/[^.+@.+]/", $email)){
-			return REGISTER_EMAIL;
-		}   
-	} else {
-		$email = "";
-	}
-
-        $safe_name =  SQLite3::escapeString(htmlentities($name));
-        $safe_email =  SQLite3::escapeString(htmlentities($email));
-
-        /*Checks the validation of the registration attempt*/
-
-	$doubleusername_db = $db->query("SELECT 1 FROM user WHERE name='" . $safe_name . "';");
-	$doubleusername_ar = $doubleusername_db->fetchArray(SQLITE3_NUM);
-
-	if($doubleusername_ar[0] == 1){
-		return REGISTER_USERNAME;
-	}
-
-        /*Generates the encrypted password and the database transaction*/
-
-	$pepper = file_get_contents("../database/pepper.txt");
-	$password = $cleartext_password . $pepper;
-
-	$hash_password = password_hash($password, PASSWORD_DEFAULT);
-
-        if($db->exec("
-		BEGIN TRANSACTION;
-		INSERT INTO user (id, name, password, email, status, register) VALUES (NULL, '".$safe_name."', '".$hash_password."', '".$safe_email."', 1, (SELECT strftime('%s', 'now')));
-		INSERT INTO log (id, user, login) VALUES (NULL, (SELECT id FROM user WHERE name='" . $safe_name. "'), (SELECT strftime('%s', 'now')));
-                COMMIT;")
-	){
-
-		$userid = user_id($db, $safe_name);
-
-        	$_SESSION["login"] = true;
-                $_SESSION["username"] = $safe_name;
-		$_SESSION["userid"] = $userid;
-
-		return REGISTER_SUCCESSFULL;
-
-	} else {
-		return REGISTER_DATABASE;
-	}
-
-}
diff --git a/www/functions/func_user.php b/www/functions/func_user.php
deleted file mode 100755
index 394a8f7..0000000
--- a/www/functions/func_user.php
+++ /dev/null
@@ -1,341 +0,0 @@
-<?php
-function account($db, $var){
-	
-	if(empty($_GET["id"])){
-		$info_db = $db->query("SELECT * FROM user WHERE name='".$_SESSION["username"]."';");
-		$info_ar = $info_db->fetchArray(SQLITE3_NUM);
-
-		$ls_db = $db->query("SELECT login FROM log WHERE user=".$info_ar[0]." ORDER BY id DESC");
-		$last_seen = $ls_db->fetchArray(SQLITE3_NUM);
-	}
-
-	echo "
-	<!doctype html>
-
-	<html>
-	<head>
-		<title>Account :: Junge Gemeinde Adlershof</title>
-		<meta http-equiv='Content-type' content='text/html; charset=utf-8' />
-		<link rel='stylesheet' type='text/css' href='/static/hyperstyle.css' />
-		<link rel='shortcut icon' href='/favicon.ico' type='image/x-icon'>
-		<script>
-			function showChangeUsername(){
-				document.getElementById(\"newUsername\").style.visibility = \"visible\";
-
-				return;
-			}
-
-			function showNewPassword(){
-				document.getElementById(\"newPassword\").style.visibility = \"visible\";
-
-				return;
-			}
-		</script>
-		<style type='text/css'>
-			#newUsername{
-				width: 100%;
-				height: 100%;
-				background: #ecece1;
-				position: fixed;
-				z-index: 99;
-				top: 0px;
-				opacity: 0.85;
-				visibility: hidden;
-			}
-
-			#newUsername-area{
-				height: 190px;
-				width: 400px;
-				position: fixed;
-				top: 50%;
-				margin-top: -100px;
-				padding: 10px;
-				left: 50%;
-				margin-left: -200px;
-				border: 1px solid black;
-			}
-	
-			#newPassword{
-				width: 100%;
-				height: 100%;
-				background: #ecece1;
-				position: fixed;
-				z-index: 99;
-				top: 0px;
-				opacity: 0.85;
-				visibility: hidden;
-			}
-
-			#newPassword-area{
-				height: 190px;
-				width: 400px;
-				position: fixed;
-				top: 50%;
-				margin-top: -100px;
-				padding: 10px;
-				left: 50%;
-				margin-left: -200px;
-				border: 1px solid black;
-			}
-
-			#UserData-area{
-				width: 20%;
-				height: 120%;
-				/*opacity: 0.75;*/
-				/*background: white;*/
-				
-			}
-	
-		</style>
-	</head>
-	";
-	include("static/head.php");
-//        echo "loged in as: " . $_SESSION["username"];
-/*
-	echo "<center>
-	
-	<table width='400px' border='1' rules='group'>
-		<thead>
-			<tr>
-				<th>Name</th>
-				<th>E-Mail</th>
-			</tr>
-		</thead>
-		<tbody>
-			<tr><td align='center'>".$info_ar[1]."</td><td align='center'>".$info_ar[3]."</td></tr>
-
-	";
-*/
-
-	switch($var){
-		case("password"):
-			$passage = "<font color='red'>Falsches Passwort.</font><br>";
-			break;
-		case(PASSWORD_SUCCESS):
-			$passage = "<font color='red'>Dein Passwort wurde erfolgreich geändert.</font><br>";
-			break;
-		case(CH_USERNAME_SUCCESS):
-			$passage = "<font color='red'>Erfolg! Ab sofort bist du unter ".$_SESSION["username"]." bekannt.</font><br>";
-			break;
-		case(CH_EMAIL_SUCCESS):
-			$passage = "<font color='red'>Deine E-Mail Adresse wurde erfolgreich geändert.</font><br>";
-			break;
-		case(CH_EMAIL_EXISTS):
-			$passage = "<font color='red'>Diese E-Mail Adresse ist schon in Benutzung.</font><br>";
-			break;
-		case(CH_USERNAME_EXISTS):
-			$passage = "<font color='red'>Dieser Name ist schon in Benutzung.</font><br>";
-			break;
-		default:
-			$passage = "";
-			break;
-	}
-
-	echo "<center>
-
-	<br><br>
-	<div id='content_container' align='center'>
-		<div class='kleineschrift'><div class='ueberschrift'><p>Account Informationen</p></div></div>
-		<br>
-		".$passage."
-		<br>
-
-		<div id='UserData-area'>
-			<p>Deine Daten: (<a href='#' onclick='showChangeUsername()' style='text-decoration:underline; font-size:15px'>ändern?</a>)</p>
-			<br>
-			<table >
-				<tr><td>
-					Name:
-				</td><td>
-					&#160;
-				</td><td>
-					".$info_ar[1]."
-				</td><td>
-				<tr><td>
-					E-Mail:
-				</td><td>
-					&#160;
-				</td><td>
-					".$info_ar[3]."
-				</td></tr>
-				<tr><td>&#160;</td></tr>
-				<tr><td>
-					Registrierungsdatum:
-				</td><td>
-					&#160;
-				</td><td>
-					".date("j.n.Y H:i:s", $info_ar[5])."
-				</td><td>
-				</td><td>
-					&#160;
-				</td></tr>
-				<tr><td>
-					Zuletzt gesehen:
-				</td><td>
-					&#160;
-				</td><td>
-					".date("j.n.Y /  H:i:s", $last_seen[0])."
-				</td></tr>
-			</table>
-			<br>
-
-		</div>
-					
-					<br>
-		<div style='width:400px'><hr></div>
-		<br>
-		<br>
-		<p>Passwort Verwaltung:</p>
-		<br>
-		<table>
-			<tr><td>
-				<a href='#' onclick='showNewPassword()' style='text-decoration:underline;'>Passwort ändern?</a>
-			</td>
-			<td>
-				&#160;
-			</td>
-			<td>
-				|
-			</td>
-			<td>
-				&#160;
-			</td>
-			<td>
-				<a href='/password_recover' style='text-decoration:underline;'>Passwort vergessen?</a>
-			</td></tr>
-		</table>
-					
-
-		<div id='newUsername'>
-			<div id='newUsername-area'>
-		<p>Wechsle deinen Spitznamen oder deine E-Mail Adresse. Bitte bestätige die Änderung mit deinem Passwort.</p>
-		<br>
-		<form method='POST' action='/account/change:user'>
-			<table>
-			<tr><td>
-				Name:
-			</td>
-			<td>
-				<input type='text' name='name' value='".$info_ar[1]."'>
-			</td></tr>
-			<tr><td>
-				E-Mail:
-			</td>
-			<td>
-				<input type='text' name='email' value='".$info_ar[3]."'>
-			</td></tr>
-			<tr><td>
-				Passwort:
-			</td>
-			<td>
-				<input type='password' name='pswd'>
-			</td></tr>
-			<tr><td>
-			</td>
-			<td>
-				<input type='submit' value='ändern'>
-			</td></tr>
-			</table>
-		</form>
-			</div>
-		</div>
-		<br>
-		<div id='newPassword'>
-			<div id='newPassword-area'>
-				<p>Aktualisiere deine Passwort. Bitte bestätige die Änderung mit deinem aktuell gültigen Passwort.
-				<form method='POST' action='/account/change:password'>
-					<table>
-						<tr><td>
-							Neues Passwort:
-						</td>
-						<td>
-							<input type='password' name='pswd'>
-						</td></tr>
-						<tr><td>
-							Neues Passwort wiederholen:
-						</td>
-						<td>
-							<input type='password' name='2ndpswd'>
-						</td></tr>
-						<tr><td>
-						</td>
-						<td>
-						</td></tr>
-						<tr><td>
-							Altes Passwort:
-						</td>
-						<td>
-							<input type='password' name='oldpswd'>
-						</td></tr>
-						<tr><td>
-						</td>
-						<td>
-							<input type='submit' value='ändern'>
-						</td></tr>
-					</table>
-				</form>
-			</div>
-		</div>
-	</div>
-	";
-	return true;
-}
-
-function user_id($db, $user){
-
-	$owner_db = $db->query("SELECT id FROM user WHERE name='" . SQLite3::escapeString($user) . "';");
-	$owner_ar = $owner_db->fetchArray(SQLITE3_NUM);
-	if(empty($owner_ar[0])){
-		return false;
-	}
-
-	$owner = $owner_ar[0];
-	if($owner != ""){
-		return $owner;
-	} else {
-		return false;
-	}
-}
-
-function change_username($db, $oldname, $newname){
-	$oldname = $db->escapeString(htmlentities($oldname));
-	$newname = $db->escapeString(htmlentities($newname));
-	$check_db = $db->query("SELECT 1 FROM user WHERE name='".$newname."'");
-	$check_ar = $check_db->fetchArray(SQLITE3_NUM);
-
-	if($check_ar[0] == 1){
-		return CH_USERNAME_EXISTS;
-	}
-
-	if($db->exec("
-		BEGIN TRANSACTION;
-		UPDATE user SET name='".$newname."'WHERE name='".$oldname."';
-		COMMIT;
-	")){
-		$_SESSION["username"] = $newname;
-		return CH_USERNAME_SUCCESS;
-	} else {
-		return DATABASE;
-	}
-}
-
-function change_email($db, $name, $email){
-	$res_db = $db->query("SELECT 1, name FROM user WHERE email='".$db->escapeString(htmlentities($email))."'");
-	$res_ar = $res_db->fetchArray(SQLITE3_NUM);
-
-	if($res_ar[0] == 1){
-		if($name != $res_ar[1]){
-			return CH_EMAIL_EXISTS;
-		}
-	}
-
-	if($db->exec("
-		BEGIN TRANSACTION;
-		UPDATE user SET email='".$db->escapeString(htmlentities($email))."' WHERE name='".$db->escapeString(htmlentities($name))."';
-		COMMIT;
-	")){
-		return CH_EMAIL_SUCCESS;
-	} else {
-		return DATABASE;
-	}
-}
diff --git a/www/functions/notused/func_content.php b/www/functions/notused/func_content.php
deleted file mode 100755
index ad0c87e..0000000
--- a/www/functions/notused/func_content.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-
-function collect_content($db,$username, $folder_path){
-	$owner = user_id($db, $username);
-
-	if(!$owner){
-		failure("This user doesn't exist!");
-	}
-
-	$file_id = select_file_id($db, $owner, $folder_path);
-
-	if(!$file_id){
-		return FILE_NOT_FOUND;
-	}
-
-	$content = get_content($db, $file_id, $owner);
-
-	if(!$content){
-		return EMPTY_FOLDER;
-	}
-	
-	return $content;
-}
-
-function get_content($db, $file_id, $owner){
-
-	if($_SESSION["login"] && $_SESSION["userid"] == $owner){
-		$share="";
-	} else {
-		$share =" AND share='PUBLIC'";
-	}
-
-	$content_db = $db->query("SELECT * FROM files WHERE parent=" . $file_id . " AND owner=" . $owner . $share . " ORDER BY folder, name;");
-	
-	$count=0;
-
-	while($row = $content_db->fetchArray(SQLITE3_NUM)){
-		$content[$count][0] = $row[0];
-		$content[$count][1] = $row[1];
-		$content[$count][2] = $row[2];
-		$content[$count][3] = $row[3];
-		$content[$count][4] = $row[4];
-		$content[$count][5] = $row[5];
-		$content[$count][6] = $row[6];
-		$content[$count][7] = $row[7];
-		$content[$count][8] = $row[8];
-		$count++;
-	}
-
-	if(!empty($content)){
-		return $content;	// returns everything listed in the folder which is commited as parameter
-	} else {
-		return false;		// empty folder
-	}
-}
-
-function get_path_to_wrong_folder($db, $username, $folder_path){
-
-	$owner = user_id($db, $username);
-
-	if($_SESSION["login"] && $_SESSION["userid"] == $owner){
-		$share = "";
-	} else {
-		$share =" AND share='PUBLIC'";
-	}
-
-	$folder_array_unsafe = explode("/",$folder_path);
-	$length = count($folder_array_unsafe);
-
-	$root_db = $db->query("SELECT id FROM files WHERE parent=0 AND owner=" . SQLite3::escapeString($owner) . " AND folder='DIRECTORY' " . $share . ";");
-	$root_ar = $root_db->fetchArray(SQLITE3_NUM);
-	$root_id = $root_ar[0];
-
-	if(empty($root_id)){
-		return FOLDER_NOT_PUBLIC;
-	}
-
-	$parentdir = $root_id;
-	
-	for($i=0; $i<$length; $i++){
-		$parentdir_db = $db->query("SELECT id, parent FROM files WHERE owner=" . $owner . $share . " AND parent=". $parentdir . " AND name='" . SQLite3::escapeString($folder_array_unsafe[$i]) . "';");
-		$prim_id = $parentdir_db->fetchArray(SQLITE3_NUM);
-
-		if($parentdir != $prim_id[1]){
-			$wrong_folder = $folder_array_unsafe[$i];
-			$working_path[0] = $wrong_folder;
-
-			for($j=0; $j<$i; $j++){
-				$working_path[$j] = $folder_array_unsafe[$j];
-			}
-
-			$lwp = count($working_path);
-			$working_path[$lwp] = $wrong_folder;
-
-			if($i == 0){
-				$working_path[0] = "";	// shows just the root slash
-			}
-
-			return $working_path; 	// returns working path and wrong folder as an array
-		}
-
-		$parentdir = $prim_id[0];
-
-	}
-
-	return false;
-}
-
-function print_wrong_folder($content){
-
-	$length = count($content);
-
-	$wrong_folder = $content[$length-1];
-	$working_path[0] = $wrong_folder;	// initialize empty array
-	
-	for($i=0; $i<$length-1; $i++){
-		$working_path[$i] = $content[$i];
-	}
-
-	get_404($working_path, $wrong_folder);
-}
diff --git a/www/functions/notused/func_delete.php b/www/functions/notused/func_delete.php
deleted file mode 100644
index 6220f8a..0000000
--- a/www/functions/notused/func_delete.php
+++ /dev/null
@@ -1,207 +0,0 @@
-<?php
-
-/*
-	expected state: tested?; but broken
-*/
-
-function check_if_deletable($db, $id, $hash){
-	$check_db = $db->query("SELECT hash FROM files WHERE id!=".$id." AND folder='FILE';");
-	
-	$count = 0;
-	while($check_ar = $check_db->fetchArray(SQLITE3_NUM)){
-		if($check_ar[0] == $hash){
-			$count = $count +1;
-			break;
-		}
-	}
-
-	if($count == 0){
-		return true;
-	} else {
-		return false;
-	}
-}
-
-function delete_file($user, $path){
-
-	if(!$_SESSION["login"]){
-		return DELETE_FILE_LOGIN;
-	}
-
-	$db = $GLOBALS["db"];
-	$uploaddir = "../files/";
-
-	$file_id = select_file_id($db, $user, $path);
-
-	$file_owner_db = $db->query("SELECT owner FROM files WHERE id=".$file_id.";");
-	$file_owner_ar = $file_owner_db->fetchArray(SQLITE3_NUM);
-
-	if($file_owner_ar[0] != $_SESSION["userid"]){
-		return DELETE_FILE_NOT_OWNER;
-	}
-
-	$check_if_file_db = $db->query("SELECT folder, hash FROM files WHERE id=".$file_id.";");
-	$check_if_file_ar = $check_if_file_db->fetchArray(SQLITE3_NUM);
-
-	if($check_if_file_ar[0] != "FILE"){
-		return DELETE_FILE_NO_FILE;
-	}
-
-	$file_hash = $check_if_file_ar[1];
-
-	$hash_array_db = $db->query("SELECT hash FROM files WHERE hash='".$file_hash.";'");
-	$count = 0;
-
-	while($row1 = $hash_array_db->fetchArray(SQLITE3_NUM)){
-		$hash_ar[$count] = $row1[0];
-		$count++;
-	}
-
-	$count = 0;
-
-	for($i=0; $i<count($hash_ar); $i++){
-		$file_id_owner_db = $db->query("SELECT id, owner FROM files WHERE folder='FILE' AND hash='".$hash_ar[$i].    "';");			
-		while($row2 = $file_id_owner->fetchArray(SQLITE3_NUM)){
-			if($row2[1] != $_SESSION["userid"]){
-				$saved_files[$count] = $hash_ar[$i];			
-			}
-			$count++;
- 		}
-	}
-
-	for($i=0; $i<count($saved_files); $i++){
-		$cur = $saved_files[$i];
-		for($j=0; $j<count($hash_ar); $j++){
-			if($cur == $hash_ar[$j]){
-				$hash_ar[$j] = "";
-			}
-		}
-	}
-	
-	for($i=0; $i<count($hash_ar); $i++){
-		if(!$file_hash[$i] != ""){
-			if(!unlink($uploaddir.$file_hash.".gz")){
-				return DELETE_FILE_UNLINK;
-			}
-		}
-	}
-
-	if($db->exec("
-		BEGIN TRANSACTION;
-		DELETE FROM files WHERE id=".$file_id.";
-		COMMIT;
-	")){
-		return DELETE_FILE_SUCCESS;
-	} else {
-		return DELETE_FILE_DATABASE;
-	}
-}
-
-function delete_folder($user, $path){
-
-	if(!$_SESSION["login"]){
-		return DELETE_FOLDER_LOGIN;
-	}
-
-	$db = $GLOBALS["db"];
-
-	$folder_id = select_file_id($db, $user, $path);
-
-	$folder_owner_db = $db->query("SELECT owner FROM files WHERE id=".$folder_id.";");
-	$folder_owner_ar = $db->fetchArray(SQLITE3_NUM);
-
-	if($folder_owner_ar[0] != $_SESSION["userid"]){
-		return DELETE_FOLDER_NOT_OWNER;
-	}
-
-	$folder_content_db = $db->query("SELECT id FROM files WHERE parent=".$folder_id.";");
-	$folder_content_ar = $folder_content_db->fetchArray(SQLITE3_NUM);
-	
-	if(empty($folder_content_ar[0])){
-		return DELETE_FOLDER_NOT_EMPTY;
-	}
-
-	if($db->exec("
-		BEGIN TRANSACTION;
-		DELETE FROM files WHERE id=".$folder_id.";
-		COMMIT;
-	")){
-		return DELETE_FOLDER_SUCCESS;
-	} else {
-		return DELETE_FOLDER_DATABASE;
-	}
-}
-
-function delete_user($user, $password, $password_verify){
-
-	if(!$_SESSION["login"]){
-		return DELETE_USER_LOGIN;
-	}
-
-	$db = $GLOBALS["db"];
-	$uploaddir = "../files/";
-
-	$owner = user_id($db, $user);
-
-	if(($password != $password_verify ) || $password = ""){
-		return DELETE_USER_EMPTY_PASSWORD;
-	}
-
-	$password_hash_db = $db->query("SELECT password FROM user WHERE id=".$owner.";");
-	$password_hash_ar = $password_hash_db->fetchArray(SQLITE3_NUM);
-
-	$admin_password_hash_db = $db->query("SELECT password FROM user WHERE id=1;");
-	$admin_password_hash_ar = $admin_password_hash_db->fetchArray(SQLITE3_NUM);
-
-	if(!password_verify($password, $password_hash_ar[0]) || !password_verify($password, $admin_password_hash_ar[0])){
-		return DELETE_USER_WRONG_PASSWORD;
-	}
-
-	$hash_array_db = $db->query("SELECT hash FROM files WHERE folder='FILE' AND owner=".$owner.";");
-
-	$count = 0;
-
-	while($row1 = $hash_array_db->fetchArray(SQLITE3_NUM)){
-		$hash_ar[$count] = $row1[0];
-		$count++;
-	}
-
-	$count = 0;
-
-	for($i=0; $i<count($hash_ar); $i++){
-		$file_id_owner_db = $db->query("SELECT id, owner FROM files WHERE folder='FILE' AND hash='".$hash_ar[$i]."';");
-		while($row2 = $file_id_owner->fetchArray(SQLITE3_NUM)){
-			if($row2[1] != $_SESSION["userid"]){
-				$saved_files[$count] = $hash_ar[$i];
-			}
-		$count++;
-		}
-	}
-
-	for($i=0; $i<count($saved_files); $i++){
-		$cur = $saved_files[$i];
-		for($j=0;$j<count($hash_ar); $j++){
-			if($cur == $hash_ar[$j]){
-				$hash_ar[$j] = "";
-			}
-		}
-	}
-
-	for($i=0; $ii<count($hash_ar); $i++){
-		if($hash_ar[$i] != ""){
-			if(!unlink($uploaddir.$hash_ar[$i].".gz")){
-				return DELETE_USER_FILE_DELETE;
-			}
-		}
-	}	
-
-	if($db->exec("
-		BEGIN TRANSACTION;
-		DELETE FROM user WHERE id=".$owner.";
-		COMMIT;
-	")){
-		return DELETE_USER_SUCCESS;
-	} else {
-		return DELETE_USER_DATABASE;
-	}
-}
diff --git a/www/functions/notused/func_download.php b/www/functions/notused/func_download.php
deleted file mode 100644
index 26b25b1..0000000
--- a/www/functions/notused/func_download.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-/*
-	Expected state: tested, should work.
-*/
-
-function check_if_file($db, $name, $folder_path){
-
-	$owner = user_id($db, $name);
-
-	$file_id = select_file_id($db, $owner, $folder_path);
-
-	if($file_id){
-		$check_if_file_db = $db->query("SELECT folder FROM files WHERE id=".$file_id.";");
-		$check_if_file_ar = $check_if_file_db->fetchArray(SQLITE3_NUM);
-
-		if($check_if_file_ar[0] == "FILE"){
-			return true;
-		} else {
-			return false;
-		}
-	} else {
-		//$content = get_path_to_empty_folder($db, $name, $folder_path);
-		//print_empty_folder($content);
-		//get_404("/", "Protected file");
-		return false;
-	}
-}
-
-function start_file_download($user, $path){
-
-	$db = $GLOBALS["db"];
-
-	$owner = user_id($db, $user);
-
-	$file_id = select_file_id($db, $owner, $path);
-
-	$file_db = $db->query("SELECT owner, share FROM files WHERE id=" . $file_id . ";");
-	$file_ar = $file_db->fetchArray(SQLITE3_NUM);
-	$file_owner = $file_ar[0];
-	$share = $file_ar[1];
-
-	if($_SESSION["login"] && ($_SESSION["userid"] == $file_owner)){
-		if(download_file($db, $file_id)){
-			return true;
-		} else {
-			return false;
-		}
-	} else {
-		if($share != "PUBLIC"){
-			return false;
-		}
-
-		if(download_file($db, $file_id)){
-			return true;
-		} else {
-			return false;
-		}
-	}
-}
-
-function check_file_hash($db, $file_id, $download_hash){
-	if(preg_match("/[^0-9]/", $file_id)){
-		return DOWNLOAD_FALSE_ID;
-	}
-
-	$check_hash_db = $db->query("SELECT owner, folder, share, download_link FROM files WHERE id=" . SQLite3::escapeString($file_id).";");
-	$check_hash_ar = $check_hash_db->fetchArray(SQLITE3_NUM);
-
-	if($check_hash_ar[1] != "FILE"){
-		return DOWNLOAD_NOT_FILE;
-	}
-
-	if($check_hash_ar[2] != "PUBLIC"){
-		if($_SESSION["userid"] != $check_hash_ar[0]){
-			if($check_hash_ar[3] != $download_hash){
-				return DOWNLOAD_PRIVATE_FILE;
-			}
-		}
-	}
-
-	if(!download_file($db, $file_id)){
-		return false;
-	} else {
-		return true;
-	}
-
-}
-
-function download_file($db, $file_id){
-
-	$file_db = $db->query("SELECT name, mime, size, hash FROM files WHERE id=". SQLite3::escapeString($file_id).";");
-	$file_ar = $file_db->fetchArray(SQLITE3_NUM);
-
-	$file_name = $file_ar[0];
-	$file_mime = $file_ar[1];
-	$file_size = $file_ar[2];
-	$file_hash = $file_ar[3];
-
-	$uploaddir = "../files/";
-	$gzip_file = $uploaddir . $file_hash . ".gz";
-
-//TODO: buffer output, print if reading == true
-
-	header("Content-Type: ".$file_mime);
-
-	if(!preg_match("/^image\/.+/", $file_mime)){
-		header("Content-Disposition: attachment; filename=\"".$file_name."\"");
-	} else {
-		header("filename=".$file_name."");
-	}
-	header("Content-Length: ".$file_size);
-	set_time_limit(0);
-	$uncompressed_file = readgzfile($gzip_file);
-
-	if($uncompressed_file){
-		return true;
-	} else {
-		return false;
-	}
-
-
-}
diff --git a/www/functions/notused/func_folder.php b/www/functions/notused/func_folder.php
deleted file mode 100644
index 044fd8e..0000000
--- a/www/functions/notused/func_folder.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-
-function database_mkdir($db, $file_id, $new_folder_name, $share){
-	if($db->exec("
-		BEGIN TRANSACTION;
-		INSERT INTO files (id, parent, owner, name, folder, size, share, hash) VALUES (Null, " . $file_id . ", " . $_SESSION['userid'] . ", '" . SQLite3::escapeString($new_folder_name) . "', 'DIRECTORY', 0, '" . SQLite3::escapeString($share) . "', '');
-		COMMIT;
-	")){
-		return true;
-	} else {
-		return false;
-	}
-}
-
-function create_folder($path, $new_folder_name, $share){
-
-	$db = $GLOBALS["db"];
-
-	if(!$_SESSION["login"]){
-		return MKDIR_LOGIN;
-	}
-
-	$file_id = select_file_id($db, $_SESSION["userid"], $path);
-
-	$owner_db = $db->query("SELECT owner FROM files WHERE id=" . SQLite3::escapeString($file_id) . ";");
-	$owner_ar = $owner_db->fetchArray(SQLITE3_NUM);
-
-	if($owner_ar[0] != $_SESSION["userid"]){
-		return MKDIR_OWNER;
-	}
-
-	//TODO: Cut trailing or leading slash
-	//TODO: Maye create two folders instead of returning an error?
-	if(preg_match("/\//", $new_folder_name)){
-		return SLASH_IN_FOLDER_NAME;
-	}
-
-	$dupl_db = $db->query("SELECT parent FROM files WHERE name='" . SQLite3::escapeString($new_folder_name) . "' AND owner=".$_SESSION["userid"].";");
-	while($dupl_ar = $dupl_db->fetchArray(SQLITE3_NUM)){
-		if($dupl_ar[0] == $file_id){
-			return MKDIR_DUPLICATE;
-		}
-	}
-	
-	if(database_mkdir($db, $file_id, $new_folder_name, $share)){
-		return MKDIR_SUCCESS;
-	} else {
-		return MKDIR_DATABASE;
-	}
-}
-
-function move_folder($old_path, $new_path){
-
-	if(!$_SESSION["login"]){
-		return NOT_LOGED_IN;
-	}
-
-	$db = $GLOBALS["db"];
-	$old_file_id = select_file_id($db, $_SESSION["userid"], $old_path);
-	$new_file_id = select_file_id($db, $_SESSION["userid"], $new_path);
-
-	$old_folder_owner_db = $db->query("SELECT owner FROM files WHERE id=".$old_file_id.";");
-	$old_folder_owner_ar = $old_folder_owner_db->fetchArray(SQLITE3_NUM);
-
-	if($_SESSION["userid"] != $old_folder_owner_ar[0]){
-		return MV_OLD_FOLDER_NOT_OWNER;
-	}
-
-	if(!$new_file_id){
-		return MV_FOLDER_TARGET_NOT_EXIST;
-	}
-
-	$new_folder_owner_db = $db->query("SELECT owner FROM files WHERE id=".$new_file_id.";");
-	$new_folder_owner_ar = $new_folder_owner_db->fetchArray(SQLITE3_NUM);
-
-	if($_SESSION["userid"] != $new_folder_owner_ar[0]){
-		return MV_NEW_FOLDER_NOT_OWNER; }
-
-	if($db->exec("
-		BEGIN TRANSACTION;
-		UPDATE files SET parent=".$new_file_id." WHERE id=".$old_file_id.";
-		COMMIT;
-	")){
-		return MV_FOLDER_SUCCESS;
-	} else {
-		return MV_FOLDER_DATABASE;
-	}
-}
-
-function rename_folder($path, $new_name){
-	if(!$_SESSION["login"]){
-		return NOT_LOGED_IN;
-	}
-
-	$db = $GLOBALS["db"];
-
-	$file_id = select_file_id($db, $_SESSION["username"], $path);
-
-	$folder_owner_db = $db->query("SELECT owner FROM fiiles where id=".$file_id.";");
-	$folder_owner_ar = $folder_owner_db->fetchArray(SQLITE3_NUM);
-
-	if($folder_owner_ar[0] != $_SESSION["userid"]){
-		return FOLDER_NOT_OWNER;
-	}
-
-	if(preg_match("/\//", $new_name)){
-		return SLASH_IN_FOLDER_NAME;
-	}
-
-	$dupl_db = $db->query("SELECT parent FROM files WHERE name='" . SQLite3::escapeString($new_name) . "' AND owner=".$_SESSION["userid"].";");
-	while($dupl_ar = $dupl_db->fetchArray(SQLITE3_NUM)){
-		if($dupl_ar[0] == $file_id){
-			return MKDIR_DUPLICATE;
-		}
-	}
-
-	if($db->exec("
-		BEGIN TRANSACTION;
-		UPDATE files SET name='".SQLite3::escapeString($new_name)."' WHERE id=".$file_id.";
-		COMMIT;
-	")){
-		return true;
-	} else {
-		return DATABASE;
-	}
-}
-
-function generate_download_link($file_id){
-
-	if(!$_SESSION["login"]){
-		return NOT_LOGED_IN;
-	}
-
-	$db = $GLOBALS["db"];
-
-	$folder_owner_db = $db->query("SELECT owner FROM files where id=".$file_id.";");
-	$folder_owner_ar = $folder_owner_db->fetchArray(SQLITE3_NUM);
-
-	if($folder_owner_ar[0] != $_SESSION["userid"]){
-		return FOLDER_NOT_OWNER;
-	}
-	
-	$key_array = array("a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s",     "t", "u", "v", "w", "x", "y", "z", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q",     "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "_", "-", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" );
-
-	$length = count($key_array);
-	$key = "";
-
-	for ($i=0;$i<21;$i++){
-		$index = mt_rand(0,$length-1);
-		$key = $key.$key_array[$index];
-	}
-
-	if($db->exec("
-		BEGIN TRANSACTION;
-		UPDATE files SET download_link='".$key."' WHERE id=".$file_id.";
-		COMMIT;
-	")){
-		return $key;
-	} else {
-		return DATABASE;
-	}
-}
diff --git a/www/functions/notused/func_invite.php b/www/functions/notused/func_invite.php
deleted file mode 100755
index d7613d5..0000000
--- a/www/functions/notused/func_invite.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-function invite($db){
-
-	$name=$_SESSION["username"];
-        $safe_name = SQLite3::escapeString("$name");
-
-        $email=$_POST["email"];
-        $safe_email=SQLite3::escapeString("$email");
-
-        $invite_db = $db->query("SELECT invites FROM user WHERE name='" . $safe_name . "';");
-        $invite_ar = $invite_db->fetchArray(SQLITE3_NUM);
-        $invite = $invite_ar[0];
-
-        if($invite <= 0){ 
-		return INVITE_INVITES;
-	}
-
-	$email_db = $db->query("Select 1 FROM user WHERE email='" . $safe_email . "';");
-	$email_ar = $email_db->fetchArray(SQLITE3_NUM);
-
-	if($email_ar[0] == 1){
-		return INVITE_USEREXISTS;
-	}
-
-        /*Generates the invite key => [-_0-9a-zA-Z]{11}*/
-
-      	$key_array = array("a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "_", "-", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" );
-
-         $length = count($key_array);
-         $key = ""; 
-
-         for ($i=0;$i<11;$i++){
-               	$index = mt_rand(0,$length-1);
-                $key = "$key".$key_array[$index];
-         }   
-
-         $id_db = $db->query("SELECT id FROM USER WHERE name='" . $safe_name . "';");
-         $id_ar = $id_db->fetchArray(SQLITE3_NUM);
-         $id = $id_ar[0];
-
-        /*Generates the new user and decrease the invites*/
-
-         $invite = $invite-1;
-
-         if($db->exec("
-         	BEGIN TRANSACTION;
-                INSERT INTO user (id, name, email, senpai, key, status) VALUES (NULL, NULL, '" . $safe_email . "', '" . $id . "', '" . $key . "', 0);
-                UPDATE user SET invites='" . $invite . "' WHERE id='" . $id . "'; 
-                COMMIT;")
-         ){  
-
-               	$subject="Welcome, you were invited to the new virtual filesystem.\nYour key is " . $key . "\nVisit files.iamfabulous.de/register to complete your registration.";
-
-		// Doesn't work with GMX or Web.de atm.
-                mail($email, "Invite", $subject, "From: mail@iamfabulous.de");
-
-                return INVITE_SUCCESSFULL;
-
-         } else {
-              	return INVITE_DATABASE;
-         }   
-}
diff --git a/www/functions/notused/func_rewrite.php b/www/functions/notused/func_rewrite.php
deleted file mode 100755
index 0a123d6..0000000
--- a/www/functions/notused/func_rewrite.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-function rewrite($db){
-
-        /* test if first argument a username or folder */
-
-	$name = user_id($db, $_GET["name"]);
-
-        if($name == ""){
-	
-                /* if first argument wasn't valid, rewrite the URL to include the username */
-
-		$folder = $_GET["folder"];
-
-		if(preg_match("/\/$/", $_GET["folder"])){
-			$folder = substr($_GET["folder"], 0, -1);
-		}
-
-                if($_SESSION["login"]){
-			$scheme = $GLOBALS["scheme"];
-                        header("Refresh: 0; ".$scheme.$_SERVER["HTTP_HOST"]."/" . $_SESSION['username'] . "/" . $_GET["name"] . "/" . $folder . "");
-			exit;
-                }
-
-		return false;
-
-	} else {
-		return true;
-	}
-}
-
diff --git a/www/functions/notused/func_select.php b/www/functions/notused/func_select.php
deleted file mode 100755
index 9f10cd6..0000000
--- a/www/functions/notused/func_select.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-function select_file_id($db, $owner, $folder_path){
-
-	if($_SESSION["login"] && $_SESSION["userid"] == $owner){ 	// TODO: Check if loged in user really the user who does the query - fix 12.3.14
-		$share="";						// to print all files, even hidden ones
-	} else {
-		$share =" AND share='PUBLIC'";				// just use files with the correct permissions
-	}
-
-	$folder_array_unsafe = explode("/",$folder_path);
-
-	$root_db = $db->query("SELECT id FROM files WHERE parent=0 AND owner=" . SQLite3::escapeString($owner) . " AND folder='DIRECTORY' " . $share . ";");
-	$root_ar = $root_db->fetchArray(SQLITE3_NUM);
-	$root_id = $root_ar[0];
-	if(empty($root_ar[0])){
-		failure("Seems like the user doesn't want to show his tree: " . $root_id);
-	}
-
-	$tmp_length = count($folder_array_unsafe);
-
-	if(empty($folder_array_unsafe[$tmp_length-1])){
-		$length = $tmp_length-1;
-	} else {
-		$length = $tmp_length;
-	}
-
-	$parentdir = SQLite3::escapeString($root_id);
-
-	if(empty($folder_array_unsafe[0])){
-		return $root_id;		// returns the primary key from the root dir
-	}
-
-	for($i=0; $i<$length; $i++){
-
-		$parentdir_db = $db->query("SELECT id, parent FROM files WHERE owner=" . $owner . $share . " AND parent=" . $parentdir . " AND name='" . SQLite3::escapeString($folder_array_unsafe[$i]) . "' COLLATE NOCASE;");
-
-		$prim_id = $parentdir_db->fetchArray(SQLITE3_NUM);
-
-
-		if($parentdir != $prim_id[1]){
-
-/*
-			$wrong_folder = $folder_array_unsafe[$i];
-			$working_path[0] = $wrong_folder;
-
-			for($j=0; $j<$i; $j++){
-				$working_path[$j] = $folder_array_unsafe[$j];
-			}
-
-			get_404($working_path, $wrong_folder);
-*/
-
-			return false;
-		}
-
-
-		$parentdir = $prim_id[0];
-	}
-
-	return $parentdir;		// returns the primary key from the last entry in the folder array
-
-}
diff --git a/www/functions/notused/func_upload.php b/www/functions/notused/func_upload.php
deleted file mode 100755
index 31fe304..0000000
--- a/www/functions/notused/func_upload.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-
-function database_upload($db, $parentdir, $owner, $filename, $folder, $mime, $size, $share, $filehash){
-	if($db->exec("
-		BEGIN TRANSACTION;
-		INSERT INTO files (id, parent, owner, name, folder, mime, size, share, hash) VALUES (NULL, " . $parentdir . ", " . $owner . ", '" . $filename . "', '" . $folder . "', '" . $mime . "', '" . $size . "', '" . $share ."', '" . $filehash . "');
-		COMMIT;
-	")){
-		return true;
-	} else  {
-		return false;
-	}
-}
-
-function database_upload_update($db, $id, $name, $mime, $size, $share, $filehash){
-	if($db->exec("
-		BEGIN TRANSACTION;
-		UPDATE files SET name='".$name."', mime='".$mime."', size='".$size."', share='".$share."', hash='".$filehash."' WHERE id=".$id.";
-		COMMIT;
-	")){
-		return true;
-	} else {
-		return false;
-	}
-}
-
-function upload($path){
-
-	$db = $GLOBALS["db"];
-
-	set_time_limit(0);
-
-	if(!$_SESSION["login"]){
-		return UPLOAD_LOGIN;
-	}
-	
-	if($_FILES["userfile"]["error"] > 0 || !$_FILES['userfile']['size'] > 0 || empty($_FILES['userfile']['size'])){
-		return UPLOAD_UPLOAD;
-	}
-
-	$parentdir = select_file_id($db, $_SESSION["userid"], $path);
-
-	$folder_owner_db = $db->query("SELECT owner FROM files WHERE id=".$parentdir.";");
-	$folder_owner_ar = $folder_owner_db->fetchArray(SQLITE3_NUM);
-
-	if($folder_owner_ar[0] != $_SESSION["userid"]){
-		return UPLOAD_FOLDER_NOT_OWNER;
-	}
-
-	$owner = $_SESSION["userid"];
-
-	$overall_size_db = $db->query("SELECT size FROM files WHERE owner=" . $owner . " AND size > 0;");
-	$overall_size = 0;
-	while($row = $overall_size_db->fetchArray(SQLITE3_NUM)){
-		$overall_size = $overall_size + $row[0];
-	}
-	
-	if($overall_size > 2147483648){		// == 2GB
-		return UPLOAD_QUOTA;
-	}
-
-	$filename = $_FILES['userfile']['name'];
-
-	$folder = "FILE";
-	$mime = $_FILES['userfile']['type'];
-	$size = $_FILES['userfile']['size'];
-
-	if(isset($_POST["share"])){
-		$share = "PUBLIC";
-	} else {
-		$share = "PRIVATE";
-	}
-
-	$uploaddir = "../files/";
-
-	//$filehash = hash_file("md5", $uploaddir . $filename);
-	$filehash = hash_file("md5", $_FILES['userfile']['tmp_name']);
-
-	$exists = false;
-	$check_if_filename_already_exists_db = $db->query("SELECT id, name FROM files WHERE parent=".$parentdir." AND folder='FILE'");
-
-	while($row = $check_if_filename_already_exists_db->fetchArray(SQLITE3_NUM)){
-		if($row[1] == $filename){
-			$fileid = $row[0];
-			$exists = true;
-			break;
-		}
-	}
-
-	$hashtest_db = $db->query("SELECT hash FROM files WHERE hash='" . $filehash ."';");
-	$hashtest_ar = $hashtest_db->fetchArray(SQLITE3_NUM);
-
-	/* new file was uploaded */
-	if(empty($hashtest_ar[0])){
-
-		if(!move_uploaded_file($_FILES['userfile']['tmp_name'], $uploaddir . $_FILES['userfile']['name'])){
-			return UPLOAD_MOVING;
-		}
-
-		/* checks if filename exists in the same directory */
-		if($exists){
-			$delete_file_db = $db->query("SELECT hash FROM files WHERE name='".$filename."' AND parent='".$parentdir."';");
-			$delete_file_ar = $delete_file_db->fetchArray(SQLITE3_NUM);
-
-			if(check_if_deletable($db, $fileid, $delete_file_ar[0])){
-
-				if(!unlink($uploaddir.$delete_file_ar[0].".gz")){
-					return UPLOAD_FILE_HANDLING;
-				}
-			}
-			if(!database_upload_update($db, $fileid, $filename, $mime, $size, $share, $filehash)){
-				return UPLOAD_DATABASE;
-			}
-		} else {
-			if(!database_upload($db, $parentdir, $owner, $filename, $folder, $mime, $size, $share, $filehash)){
-				return UPLOAD_DATABASE;
-			}	
-		}
-
-		$gzfile = $uploaddir . $filehash . ".gz";
-		$fp = gzopen($gzfile, 'w9');
-
-		if(!gzwrite($fp, file_get_contents($uploaddir . $filename))){
-			return UPLOAD_FILE_HANDLING;
-		}
-
-		if(!gzclose($fp)){
-			return UPLOAD_FILE_HANDLING;
-		}
-
-		if(!unlink($uploaddir . $filename)){
-			return UPLOAD_FILE_HANDLING;
-		}
-
-		return UPLOAD_SUCCESS;
-
-	/* new file already exists, only thing is a new entry in the database */
-	} else {
-
-		$dupl_db = $db->query("SELECT parent, mime, size, share, name FROM files WHERE hash='" . $filehash . "';");
-
-		while($row = $dupl_db->fetchArray(SQLITE3_NUM)){
-			if($row[0] == $parentdir){
-				if($mime == $row[1] && $size == $row[2] && $share == $row[3] && $filename == $row[4]){
-					return UPLOAD_DUPLICATE;
-				}
-			}
-		}
-		
-		if($exists){
-			$delete_file_db = $db->query("SELECT hash FROM files WHERE name='".$filename."' AND parent='".$parentdir."';");
-			$delete_file_ar = $delete_file_db->fetchArray(SQLITE3_NUM);
-
-			if(check_if_deletable($db, $fileid, $delete_file_ar[0])){
-				if(!unlink($uploaddir.$delete_file_ar[0].".gz")){
-					return UPLOAD_FILE_HANDLING;
-				}
-			}
-			if(!database_upload_update($db, $fileid, $filename, $mime, $size, $share, $filehash)){
-				return UPLOAD_DATABASE;
-			}
-		} else {
-			if(!database_upload($db, $parentdir, $owner, $filename, $folder, $mime, $size, $share, $filehash)){
-				return UPLOAD_DATABASE;
-			}
-		}
-
-		if(!unlink($_FILES['userfile']['tmp_name'])){
-			return UPLOAD_FILE_HANDLING;
-		}
-
-		return UPLOAD_SUCCESS;
-	}
-}
-
-//not used atm
-
-//function web_upload($db){
-//	$url = $_POST["url"]; 
-//	if(!preg_match("/^((https?|ftp)?://|www\.|ftp\.)?([-a-z0-9+&@#/%?=~_|!:,.;]+\.)+[a-z]{2}[a-z]*/i", $url)){
-//		echo "no hyperlink";
-//		return false;
-//	}
-//	if(!preg_match("/^[a-zA-Z]+://", $url){
-//		$url = "http://".$url;
-//	}
-//	$file = file_get_contents($url);
-//	if(!$file){
-//		echo "Couldn't download ".$url;
-//		return false;
-//	}
-//}
diff --git a/www/help.php b/www/help.php
deleted file mode 100644
index 89d7e33..0000000
--- a/www/help.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php 
-
-/* Copyright Maximilian Möhring, 2013
-Licensed under the GPL. Read LICENSE for more Information.*/
-
-include("static/header.php");
-
-header("Refresh: 3; https://".$_SERVER["HTTP_HOST"]."/Startseite");
-echo "<br><br><h1>Noch nicht implementiert.</h1>";
-
-?>
diff --git a/www/include.php b/www/include.php
deleted file mode 100755
index 59aa1a9..0000000
--- a/www/include.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-$db = new SQLite3("../database/sqlite.db");
-
-$scheme="http://";
-
-if(isset($_SERVER["HTTPS"])){
-	if($_SERVER["HTTPS"] == "on"){
-		$scheme="https://";
-	}
-}
-
-require_once("constants.php");
-require_once("auth.php");
-
-$func_dir = "functions/";
-
-require_once($func_dir . "func_failure.php");		// 404 and other errors
-require_once($func_dir . "func_interface.php");		// presents the vfs content
-//require_once($func_dir . "func_invite.php");		// handles the invite routine
-require_once($func_dir . "func_login.php");		// handles also logout
-require_once($func_dir . "func_register.php");		// processing the registration
-//require_once($func_dir . "func_rewrite.php");		// rewrites URL if user forgot to add the username while loged in
-//require_once($func_dir . "func_select.php");		// get the primary key from the last folder
-require_once($func_dir . "func_user.php");		// gets the userid and account specific stuff
-//require_once($func_dir . "func_content.php");		// get the vfs content
-require_once($func_dir . "func_password.php");		// changes the user password
-//require_once($func_dir . "func_folder.php");		// creates a new folder
-//require_once($func_dir . "func_delete.php");		// deletes files, folder and user
-//require_once($func_dir . "func_download.php");		// handles the file download
-//require_once($func_dir . "func_upload.php");		// handles the file upload
-
-require_once("login.php");				// prints the login page
-require_once("register.php");				// prints the register page
-require_once("reset.php");				// prints the password recover page
-require_once("liste.php");
-require_once("quote.php");
-require_once("insert.php");
-require_once("update.php");
-require_once("print_index.php");
-require_once("services.php");
-//require_once("browse.php");				// prints the file browser page
diff --git a/www/index.php b/www/index.php
deleted file mode 100755
index 189e880..0000000
--- a/www/index.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-session_start();
-
-if(!isset($_SESSION["login"])){
-	$_SESSION["login"] = false;
-}
-
-if(!isset($_SESSION["login_attempts"])){
-	$_SESSION["login_attempts"] = 6;
-}
-
-require_once("include.php");		// handles all the stuff that needs to be included
-
-if(check_if_banned($db)){
-	banned();
-} 
-
-if(empty($_GET)){
-	print_index($db);
-} else {
-	switch($_GET["task"]){
-			case("login"):
-				if($_SESSION["login"]){
-					header("Refresh: 0; ".$scheme.$_SERVER["HTTP_HOST"]."/");
-					exit;
-				}
-
-				if($_SERVER['REQUEST_METHOD'] == 'POST'){
-					$var = login($db);
-					if($var == LOGIN_SUCCESSFULL){
-						$_SESSION["login_attempts"] = 6;
-						header("Refresh: 0; ".$scheme.$_SERVER["HTTP_HOST"]."/");
-					} elseif ($var == LOGIN_PASSWORD){
-						brutforce_protection($db);
-						print_login($var);
-
-					} else {
-						print_login($var);
-					}
-				} else {
-					print_login(constant("EMPTY"));
-				}
-				break;
-
-			case("logout"):
-				if(!$_SESSION["login"]){
-					print_login(constant("EMPTY"));
-					exit;
-				}
-
-				$var = logout();
-				if($var == LOGOUT_SUCCESSFULL){
-					print_login($var);
-				} else {
-					header("Refresh: 0; ".$scheme.$_SERVER["HTTP_HOST"]."/httperror.php?e=500");
-				}
-				break;
-
-			case("register"):
-//				if($_SESSION["login"]){
-//					header("Refresh: 0; ".$scheme.$_SERVER["HTTP_HOST"]."/");
-//					exit;
-//				}
-
-				if($_SERVER['REQUEST_METHOD'] == 'POST'){
-					$var = register($db);
-					if($var == REGISTER_SUCCESSFULL){
-						print_index($db);
-					} else {
-						print_register($var);
-					}
-				} else {
-					print_register(constant("EMPTY"));
-				}
-				break;
-
-			case("password_recover"):
-				if($_SERVER['REQUEST_METHOD'] == 'POST'){
-					$var = recover_password($db);	//TODO: Print error message
-					if($var == RECOVER_PROHIBITED || $var = RECOVER_EMAIL){
-						brutforce_protection($db);
-						print_recover_password($var);
-					}
-				} else {
-					print_recover_password("");
-				}
-				break;
-
-			case("liste"):
-				print_list($db);
-				break;
-
-			case("quote"):
-				print_quote($db);
-				break;
-
-			case("new_member"):
-				if($_SERVER["REQUEST_METHOD"] == "POST"){
-					if(!insert_db($db)){
-						echo "Database error. Please send me a <a href'mailto:max-moehring@web.de?subject=database error'>mail</a>";
-						exit;
-					} else {
-						print_list($db);
-					}
-				} else {
-					print_insert();
-				}
-				break;
-
-			case("update"):
-				if($_SERVER["REQUEST_METHOD"] == "POST"){
-					$var = update_db($db);
-					if($var){
-						print_list($db);
-					} else {
-						echo $var."<br>";
-						echo "Database error. Please send me a <a href'mailto:max-moehring@web.de?subject=database error'>mail</a>";
-						exit;
-					}
-				} else {
-					print_list($db);
-				}
-
-				break;
-
-			case("account"):
-				$var = "";
-
-				if($_SERVER["REQUEST_METHOD"] == "POST"){
-					if($_GET["change"] == "password"){
-						if(validate_password($db, $_SESSION["username"], $_POST["oldpswd"])){
-							$var=change_password($db, $_POST["pswd"], $_POST["2ndpswd"]);
-						} else {
-							$var = "password";
-						}
-							
-					} elseif($_GET["change"] == "user"){
-						if(validate_password($db, $_SESSION["username"], $_POST["pswd"])){
-							$var = change_email($db, $_SESSION["username"], $_POST["email"]);
-							if($var != CH_MAIL_EXISTS && $var != DATABASE){
-								$eb = true;
-								$var = change_username($db, $_SESSION["username"], $_POST["name"]);	
-								if($eb && $var == CH_USERNAME_EXISTS){
-									$var = CH_EMAIL_SUCCESS;
-								}
-							}
-						} else {
-							$var = "password";
-						}
-						/*if($var != CH_USERNAME_EXISTS && $var != DATABASE){
-							$var="success";
-						}*/
-					}
-				}
-
-				account($db, $var);
-				break;
-
-			case("services"):
-				print_services();
-				break;
-
-			default:
-				echo "404";
-				//get_404($_GET["task"], $_GET["task"]); 	//TODO: Commit EMPTY constant
-				break;
-		}
-}
-include("piwik.php");
-echo "</body>";
-echo "</html>";
diff --git a/www/insert.php b/www/insert.php
deleted file mode 100644
index f373205..0000000
--- a/www/insert.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-/* Copyright Maximilian Möhring, 2013
-Licensed under the GPL. Read LICENSE for more Information.*/
-
-function insert_db($db){
-
-	$safe1 = SQLite3::escapeString(htmlentities($_POST[name]));
-	$safe2 = SQLite3::escapeString(htmlentities($_POST[adresse]));
-	$safe3 = SQLite3::escapeString(htmlentities($_POST[telefonnummer]));
-	$safe4 = SQLite3::escapeString(htmlentities($_POST[handynummer]));
-	$safe5 = SQLite3::escapeString(htmlentities($_POST[email]));
-	$safe6 = SQLite3::escapeString(htmlentities($_POST[geburtstag]));
-	$query = "INSERT INTO jg (id, name, adresse, telefonnummer, handynummer, email, geburtstag) VALUES(NULL,'$safe1','$safe2','$safe3','$safe4','$safe5','$safe6');";
-	if($db->exec("
-		BEGIN TRANSACTION;
-		".$query."
-		COMMIT;
-	")){
-		return true;
-	} else {
-		return false;
-	}
-}
-
-function print_insert(){
-
-	include("static/header.php");
-echo "
-
-<div id='content_container' align='center'>
-        <br>
-        <div class='kleineschrift'>
-                <div class='ueberschrift'><p>JUNGE GEMEINDE ADLERSHOF</p>
-                </div>
-        </div>
-        <br><a2>Trage einfach die Daten von unserem neuen Mitglied  ein: </a2><br>
-                <form method='post' action='/liste/new_member' >
-			<table>
-				<tr>
-			                <td align='right'><a2>Name: <input type='text' name='name' ></a2> </td>
-        	        	        <td align='right'><a2>Adresse: <input type='text' name='adresse' > </a2></td>
-                	        	<td align='right'><a2>Telefon: <input type='text' name='telefonnummer'></a2> </td></tr>
-	                	        <tr align='right'><td><a2>Handy: <input type='text' name='handynummer' ></a2> </td>
-        	                	<td align='right'><a2>E-Mail: <input type='text' name='email' ></a2> </td>
-	                	        <td align='right'><a2>Geburtstag: <input type='text' name='geburtstag' ></a2> </td>
-				</tr>
-                        	<tr>
-					<td>&#160;</td>
-					<td align='center'><input type='submit' name='submit' value='Hinzufügen'/></td>
-					<td>&#160;</td>
-				</tr>
-                        </table>
-		</form>
-	</div>
-        ";
-
-}
-/*
-</body>";
-*/
-
-/*
-echo "
-<center>
-<br>
-Vielen Dank, der Eintrag zu $_POST[name] wurde erfolgreich hinzugefügt.<br>
-<br>
-
-<tr>
-      <td align='center'><img src='http://i.imgur.com/UQDEVQy.png' alt='Teh wizzard'></td>
-</tr>
-<br>
-<br>
-Einen Moment, sie werden gleich weitergeleitet.
-
-";
-header("Refresh: 4; /liste.php");
-*/
-//echo '<br><a href="login.php?x=$cryptedip">Zur&uuml;ck</a></center>';
diff --git a/www/liste.php b/www/liste.php
deleted file mode 100644
index 211f485..0000000
--- a/www/liste.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php 
-
-/* Copyright Maximilian Möhring, 2013
-Licensed under the GPL. Read LICENSE for more Information.*/
-
-function print_list($db){
-
-	echo "	<!doctype html>
-		<head>
-			<title>Adressliste :: Junge Gemeinde</title>
-			<meta http-equiv='Content-type' content='text/html; charset=utf-8' />
-			<link rel='stylesheet' type='text/css' href='/static/hyperstyle.css' />
-			<link rel='shortcut icon' href='/favicon.ico' type='image/x-icon'>
-			<style>
-				/* a:focus, a:hover { color:#ffffff; background-color:#888080; opacity: 0.85;} */
-				 a:focus, a:hover { color:#ffffff; background-color:#888080; opacity: 0.85;}
-				.liste a { display:block; width:100%; }
-			</style>
-		</head>
-	";
-	include("static/head.php");
-
-	echo "
-<script>
-// Elemente einblenden
-function show_elements()
- {
-  var elementNames = show_elements.arguments;
-  for (var i=0; i<elementNames.length; i++)
-   {
-     var elementName = elementNames[i];
-     document.getElementById(elementName).style.display='block';
-   }
- }
-// Elemente ausblenden
-function hide_elements()
- {
-  var elementNames = hide_elements.arguments;
-  for (var i=0; i<elementNames.length; i++)
-   {
-     var elementName = elementNames[i];
-     document.getElementById(elementName).style.display='none';
-   }
- }
-</script>
-
-<div id='content_container' align='center'>
-        <br>
-        <div class='kleineschrift'>
-                <div class='ueberschrift'><p>JUNGE GEMEINDE ADLERSHOF</p>
-		</div>
-        </div>
-	";
-	if($_GET["id"] == 0 || $_GET["id"] == "" || !isset($_GET["id"])){
-
-	echo"
-<br><br>
-	<table class='liste' width='1190' height='350' border='0' rules='all' cellpadding='20' cellbording='20' cellspacing='20'>
-	<!-- Wenn mir mal einer erklären könnte, warum die Zellen trotzdem keinen Abstand haben? -->
-	      <thead>
-        	<tr>
-	           <th><p>#</p></th>
-        	   <th><p>Name</p></th>
-	           <th><p>Adresse</p></th>
-        	   <th><p>Telefon</p></th>
-        	   <th><p>Handynummer</p></th>
-        	   <th><p>E-Mail</p></th>
-        	   <th><p>Geburtstag</p></th>
-        	   <th><p>ändern</p></th>
-      		 <tr>
-     		 </thead>
-		<tbody cellpadding='20' cellbording='20' cellspacing='20'>
-
-	";
-		$ergebnis = $db->query("SELECT id, name, adresse, telefonnummer, handynummer, email, geburtstag FROM jg");
-		$count = 1;
-		while($row=$ergebnis->fetchArray(SQLITE3_NUM)){
-
-                	//echo "<r><td align='left'><a href=\"/liste/.".$id."\" onclick=\"document.location.href='/liste/."$id."'\">$element</a></td></tr>";
-                	echo "<tr><td align='center'><a href=\"/liste/".$row[0]."\">".$count."</a></td><td align='left'><a href=\"/liste/".$row[0]."\">".$row[1]."</a></td><td align='left'><a href=\"/liste/".$row[0]."\">".$row[2]."</a></td><td align='left'><a href=\"/liste/".$row[0]."\">".$row[3]."</a></td><td align='left'><a href=\"/liste/".$row[0]."\">".$row[4]."</a></td><td align='left'><a href=\"/liste/".$row[0]."\">".$row[5]."</a></td><td align='left'><a href=\"/liste/".$row[0]."\">".$row[6]."</a></td><td align='center'><a href=\"/liste/".$row[0]."\"><input type='checkbox' name='change' value='true'</td></a><tr>";
-                	//echo "<tr><td align='center'><a href=\"/liste/".$row[0]."\">".$count."</a></td><td align='left'><a href=\"/liste/".$row[0]."\">".$row[1]."</a></td><td align='left'><a href=\"/liste/".$row[0]."\">".$row[2]."</a></td><td align='left'><a href=\"/liste/".$row[0]."\">".$row[3]."</a></td><td align='left'><a href=\"/liste/".$row[0]."\">".$row[4]."</a></td><td align='left'><a href=\"/liste/".$row[0]."\">".$row[5]."</a></td><td align='left'><a href=\"/liste/".$row[0]."\">".$row[6]."</a></td><td align='center'><a href=\"/liste/".$row[0]."\"><input type='checkbox' name='change' value='true'</td></a><tr>";
-			$count++;
-        	}
-
-
-	echo "
-	</tbody>
-	</table>
-
-<br><br>
-<div style='width:1000px;' class='mittlereschrift'>
-Da es in letzter Zeit doch öfters vorgekommen ist, dass jemand seine Adresse geändert hat, ist es jetzt möglich, einen Eintrag in der Adressliste zu ändern oder zu ergänzen.
-Wenn du deine Adresse <b>ändern</b> möchtest, dann klicke in der richtigen Zeile 'ändern' an. <a  href='/new_member'>Möchtest du jemanden <b>hinzufügen</b>, dann drücke bitte <u>hier</u>.</a>
-<br><br>
-Mitglied <a href='/new_member'><u>hinzufügen</u></a>
-</div>
-
-<br><br>
-	";
-} else {
-
-	$id = $_GET["id"];
-	$safe_id = SQLite3::escapeString("$id");
-        $ergebnis = $db->query("SELECT * FROM jg where id=$safe_id;");
-        while($row=$ergebnis->fetchArray()){
-  	      echo "<br><a2>Trage einfach die neuen Daten von $row[name] ein: </a2><br>
-			 <form method='post' action='/liste/updated' ><table><tr>";
-		echo "<td align='right'><a2>Name: <input type='text' name='name' value='$row[name]'></a2> </td>
-			<td align='right'><a2>Adresse: <input type='text' name='adresse' value='$row[adresse]'> </a2></td>
-			<td align='right'><a2>Telefon: <input type='text' name='telefonnummer' value='$row[telefonnummer]' ></a2> </td></tr>
-			<tr align='right'><td><a2>Handy: <input type='text' name='handynummer' value='$row[handynummer]'></a2> </td>
-			<td align='right'><a2>E-Mail: <input type='text' name='email' value='$row[email]'></a2> </td>
-			<td align='right'><a2>Geburtstag: <input type='text' name='geburtstag' value='$row[geburtstag]'></a2> </td></tr>
-			<tr><td>&#160;<input type='hidden' name='id' value='$id'></td><td align='center'><input type='submit' name='submit' value='Update!'/></td><td>&#160;</td></tr>
-			</table></form>
-	";
-	}
-}
-
-/*
-<!--AUSKOMMENTIERT#################################################################################
-<table width="400px" >
-<colgroup width="170" span="3"></colgroup>
-<tr align='center'>
-<td nowrap>
-<div id="show_update" class='unterstrich'>
-	<a style='color:blue;' href="#" title="Anzeigen" onclick="show_elements('update_db');">Eintrag aktualisieren?</a>
-
-
-</div>
-</td>
-<td>
-oder
-</td>
-<td nowrap>
-<div id="show_update" class='unterstrich'>
-        <a style='color:blue;' href="#" title="Anzeigen" onclick="show_elements('update_db');">Eintrag ergänzen?</a>
-</div>
-</td>
-</table>
-
-<div id="update_db" class="noscript">
-
-<br><br>
-        <form method='get' action='index.php' >
-                <table><tr>
-                        <td><input type=</td>
-                        <td><p>Nummer:</p></td><td><p><input type='text' name='id' size='1'/></p></td>
-                        <td><p><input type='submit' name=submit value='weiter'/></p></td>
-                </table>
-        </form>
-
-
-</div>
--->
-*/
-	echo"
-	</div>
-";
-}
diff --git a/www/login.php b/www/login.php
deleted file mode 100644
index f20a568..0000000
--- a/www/login.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/* Copyright Maximilian Möhring, 2013
-Licensed under the GPL. Read LICENSE for more Information.*/
-
-function print_login($var){
-
-	if ($var == LOGOUT_SUCCESSFULL) {
-		$logout = "<br><div style='color:red;'>Ausloggen erfolgreich</div>";
-	}
-	if ($var == LOGIN_PASSWORD) {
-        	$logout = "<br><div style='color:red;'>Name oder Passwort falsch!</div>";
-	}
-
-	echo "
-<!doctype html>
-
-<html>
-<head>
-  <title>Junge Gemeinde Adlershof.</title>
-  <meta http-equiv='Content-type' content='text/html; charset=utf-8' />
-  <link rel='stylesheet' type='text/css' href='/static/hyperstyle.css' />
-  <link rel='shortcut icon' href='/favicon.ico' type='image/x-icon'>
-</head>
-
-<body link='#000000' vlink='#000000' alink='#FF0000'>
-
-<div class='kleineschrift'>
-	<div id='header' >
-		<br><br>
-		<hr>
-	</div>
-
-	<div id='content_container' align='center'>
-		<br>
-		<div class='ueberschrift'><p>JUNGE GEMEINDE ADLERSHOF</p></div>
-		<div id='container' align='center'>
-
-			$logout
-			<br>
-			<form method='post' action='/login' >
-				<div class='hundertfuenfzig'><p>Login:</p></div>
-				<p><input type='text' name='username' size='40'/></p>
-				<p><input type='password' name='password' size='40'/></p> 
-
-
-				<p><input type='submit' name='submit' value='Miau!'/></p>  
- 
-			</form><br>
-			Info: You have ".$_SESSION["login_attempts"]." attempts. You will be banned for six hours after your login attempts run out.<br>
-		<a style='text-decoration:underline;' href='/password_recover'>Passwort vergessen? Klick hier.</a>
-
-
-			<br><br>
-			<div class='katze' align='center'>
-<pre>
-    _                ___       _.--.    
-    \`.|\..----...-'`   `-._.-'_.-'`    
-    /  ' `         ,       __.--'       
-    )/' _/     \   `-_,   /             
-    `-''' `''\_,_.-;_.-\_ ',            
-        _.-'_./   {_.'   ; /            
-       {_.-``-'         {_/             
-</pre>
-			</div>
-		</div>
-	</div>
-</div>
-";
-}
diff --git a/www/print_index.php b/www/print_index.php
deleted file mode 100644
index 3f848b6..0000000
--- a/www/print_index.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/* Copyright Maximilian Möhring, 2013
-Licensed under the GPL. Read LICENSE for more Information.*/
-
-function print_index(){
-	include("static/header.php");
-
-	if($_SESSION["username"] == "jg-adlershof"){
-		$name = "Gast";
-	} else {
-	$name = $_SESSION["username"];
-	}
-
-	echo "
-<div id='content_container' align='center'>
-	<br>
-	<div class='kleineschrift'>
-		<div class='ueberschrift'><p>JUNGE GEMEINDE ADLERSHOF</p>
-		</div>
-	</div>
-<br>
-<div class='kleineschrift'>
-<div style='width:800px;' class='katze' id='behaelter' align='center'>
-	Hallo ".$name.".<br> Willkommen auf der Webpage für die Junge Gemeinde in Adlershof. Für einen persönlichen Zugang, und um alle Features zu nutzen, registriere dich doch <a 
-style='text-decoration:underline;color:blue;' href='/register'>hier</a>. Wenn du Probleme bei der Navigation hast, dann schau unter <a style='text-decoration: underline;color:blue;' 
-href='/help'>Hilfe</a>* nach.	<br>
-	Für Anregungen und Kritik bin ich immer zu haben. Schick mir einfach ne Mail oder sags mir nächsten Donnerstag. ;)
-	<br><bR>
-	PS: Du kannst dich nach einer Registrierung auch mit deinem Username einloggen.
-</div>
-</div>
-
-<br><br>
-<div class='katze' align='center'><pre>
-            ,/|         _.--''^``-...___.._.,; 
-          /, \'.     _-'          ,--,,,--'''  
-         { \    `_-''       '    /}            
-            `;;'             ;   ; ;           
-      ._.--''     ._,,, _..'  .;.'             
-      (,_....----'''     (,..--''              
-</pre></div>
-
-<br>
-<p style='font-size:11px'>*Hilfe noch nich implementiert. Dokumentation schreiben ist nicht so mein Ding. :)</p>
-</div>
-</div>
-	";
-}
diff --git a/www/quote.php b/www/quote.php
deleted file mode 100644
index 70b1b84..0000000
--- a/www/quote.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-/* Copyright Maximilian Möhring, 2013
-Licensed under the GPL. Read LICENSE for more Information.*/
-
-function print_quote($db){
-	include("static/header.php");
-
-	if(!empty($_GET["id"])){
-		$zufall = $_GET["id"];
-	} else {
-		$zufall = "";
-	}
-
-	/*__Datenbank___*/
-	$rows = $db->query("SELECT count(*) as count FROM sprueche;");
-	$row = $rows->fetchArray();
-	$numRows = $row["count"];
-
-	if ($zufall == ""){
-		$zufall  = mt_rand(1,$numRows);
-	}
-
-
-	$safe_zufall = SQLite3::escapeString("$zufall");
-	$ergebnis = $db->query("SELECT * FROM sprueche where id=$safe_zufall;");
-
-	echo"
-
-<div id='content_container' align='center'>
-        <br>
-        <div class='kleineschrift'>
-                <div class='ueberschrift'><p>JUNGE GEMEINDE ADLERSHOF</p></div>
-        </div>
-        <div id='container' align='center'>
-
-<br><br><br>
-
-<b>Zitat Nummer #$zufall</b><br><br><div id='bgcolor'>
-	";
-
-
-	if (preg_match('/[0-9]/',$zufall)){	// I really need this hack to get the 404 when /[0-9][a-zA-Z]/ is happening. Bad PHP!
-		if (preg_match('/[^0-9]/',$zufall)){
-			$zufall = 0;
-		}
-	}
-
-
-
-	if ($zufall > 0 && $zufall <= ($numRows)){
-		while($row=$ergebnis->fetchArray()){
-        		echo $row["spruch"];
-		}
-	} else {
-	echo "\"Sorry, can't find the quote, but a cat is fine too, right?\"<br><br>
-<pre>
-      ,/|         _.--''^``-...___.._.,;
-     /, \'.     _-'          ,--,,,--'''
-    { \    `_-''       '    /}          
-     `;;'            ;   ; ;            
- ._.--''     ._,,, _..'  .;.'           
-  (,_....----'''     (,..--''           
-</pre><br><br>
-<i>404 - Eintrag nicht vorhanden.</i>
-	";
-	}
-
-	echo "</div>
-
-<br><br><br>
-   -----------------------------------------------------------------
-<div class='kleineschrift'><p>Es sind momentan <b><i>$numRows</i></b> Zitate in der Datenbank enthalten.</p>
-Du suchst ein bestimmtes Zitat? Gib hier dessen Nummer ein: <form method='get' action='/quote' >
-    <input name='id' type='text' size='2' maxlength='30'>
-    <input type='submit' style='display:none'/>
-
-  </form>
-</div>
-
-</div></div></div>
-";
-}
diff --git a/www/register.php b/www/register.php
deleted file mode 100644
index 6283f14..0000000
--- a/www/register.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/* Copyright Maximilian Möhring, 2013
-Licensed under the GPL. Read LICENSE for more Information.*/
-
-function print_register($var){
-
-	include("static/header.php");
-
-	if ($var != ""){
-		$failure= "<div style='color:red;'>Fehler! Entweder ist der Nutzer schon registriert oder dein Passwort war leer!</div><br>";
-	}	
-
-echo "
-
-<div id='content_container' align='center'>
-        <br>
-        <div class='kleineschrift'>
-	        <div class='ueberschrift'>
-			<p>JUNGE GEMEINDE ADLERSHOF</p>
-	        </div>
-
-
-
-<br><div style='width:800px;' id='behaelter' align='center' class='katze'>
-Registriere dich, um einen persönlichen Zugang zu erhalten. Such dir einen beliebigen Spitznamen und ein geeignetes Passwort aus. Keine Angst, dein Passwort wird sicher verwahrt und nicht im Klartext abgelegt.
-<br><br>Die E-Mail Adresse ist keine Pflicht, aber notwendig, wenn du dein Passwort vergessen hast.
-<br/><br/>
-
-$failure
-
-<div class='katze'>
-<form method='post' action='/register'>
-<table width='320px'>
-<tr>
-	<td align='left'><p>Name:</td><td align='right'><input name='name' type='text' size='20' maxlength='30'></p></td>
-</tr>
-<tr>
-	<td align='left'><p>Passwort:</td><td align='right'><input name='pswd' type='password' size='20' maxlength='30'></p></td>
-</tr>
-<tr>
-	<td align='left'><p>Passwort wiederholen:</td><td align='right'><input name='2ndpswd' type='password' size='20' maxlength='30'></p></td>
-</tr>
-<tr><td align='left'><p>E-Mail:</td> <td align='right'><input name='email' type='text' size='20' maxlength='30'></p></td>
-</tr>
-</table>
-<center><input type='submit' name='submit' value='Register'/></center>
-</form>
-</div>
-
-</div>
-";
-}
diff --git a/www/reset.php b/www/reset.php
deleted file mode 100644
index 4d6069e..0000000
--- a/www/reset.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/* Copyright Maximilian Möhring, 2013
-Licensed under the GPL. Read LICENSE for more Information.*/
-
-function print_recover_password($var){
-
-	echo "
-<!doctype html>
-
-<html>
- <head>
-  <title>Junge Gemeinde Adlershof.</title>
-  <meta http-equiv='Content-type' content='text/html; charset=utf-8' />
-  <link rel='stylesheet' type='text/css' href='/static/hyperstyle.css' />
-  <link rel='shortcut icon' href='/favicon.ico' type='image/x-icon'>
- </head>
-
-";
-
-	if($_SESSION["login"]){
-		include("static/head.php");
-
-	} else {
-		echo "
-			<div id='header' class='kleineschrift'>
-			<br><br>
-			<hr>
-			</div>
-		";
-		include("piwik.php");
-	}
-
-	$startseite="<div class='kleineschrift'><a style='text-decoration:underline;' href='/'>Zurück zur Startseite.</a></div>";
-	echo "
-        <div id='content_container' align='center'><br>
-
-        <div align='center'>
-        <p5>JUNGE GEMEINDE ADLERSHOF</p5>
-<br><br><div id='behaelter' align='center'>
-	";
-
-	if($var == RECOVER_EMAIL){
-		$p = "
-			<a5>Die E-Mail ist nicht in der Datenbank gespeichert. Achte auf Tippfehler und probiere noch einmal.<br>
-			Du hast noch ".$_SESSION["login_attempts"] ."Versuche, bevor du gesperrt wirst.</a5>
-		";
-	} else {
-		$p = "<a5>Gib deine E-Mail Adresse ein, um dir ein neues Passwort zuzuschicken.</a5><br><br>";
-	}
-
-	echo 
-		$p.
-		"
-		<form action='/password_recover' method='post'>
-		<input type='text' name='email' size='30'/>
-		</form>
-		<br>
-		$startseite
-		</div>
-		</div>
-		</div>
-	";
-			//if(mail($email, "Dein neues Passwort", "Dein neues Passwort für https://jungegemeinde.iamfabulous.de lautet: '" . $secret . "'. Wenn du diese E-Mail nicht erwartet hast, bitte sende eine Nachricht an max-moehring@web.de. Danke.", "From: no-reply@jg-adlershof.de")){
-//				echo "Wir haben deine E-Mail in der Datenbank. Eine E-Mail mit deinem neuen Passwort wurde soeben verschickt.<br>";
-//			} else {
-//				echo "Fehler mit der mail() Funktion. Bitte schick eine Benachrichtigung an <a href='mailto:max-moehring@web.de'>max-moehring@web.de</a>.";
-//			}
-
-}
diff --git a/www/robots.txt b/www/robots.txt
deleted file mode 100755
index 1f53798..0000000
--- a/www/robots.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-User-agent: *
-Disallow: /
diff --git a/www/services.php b/www/services.php
deleted file mode 100644
index 03c9da7..0000000
--- a/www/services.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-
-function print_services(){
-
-	echo "<!doctype html>
-
-		<html>
-			<head>
-				<title>Services :: Junge Gemeinde Adlershof</title>
-				<meta http-equiv='Content-type' content='text/html; charset=utf-8' />
-				<link rel='stylesheet' type='text/css' href='/static/hyperstyle.css' />
-				<link rel='shortcut icon' href='/favicon.ico' type='image/x-icon'>
-			</head>
-	";
-	include("static/head.php");
-
-	echo "
-		<br><br>
-		<div class='kleineschrift'><div class='ueberschrift'><p>In eigener Sache</p></div></div>
-		<br>
-
-		<div align='center'>	
-			<table width='700px'>
-				<tr><td>
-					<p>Hallo,</p>
-				</td></tr>
-				<tr><td>
-					<p>ich möchte diesen Platz hier nutzen um ein paar Projekte zu bewerben, die ich in meiner Freizeit so betreue.</p>
-				</td></tr>
-				<tr><td>
-					<p>Sie haben alle was mit Computern zu tun, natürlich. ;)</p>
-				</td></tr>
-				<tr><td>
-					<br>
-				</td></tr>
-				<tr><td>
-					<p><b>#1</b> ist eine Website, welche dir <b>zufällige Youtube Videos</b> präsentiert.</p>
-				</td></tr>
-				<tr><td>
-					<br>
-				</td></tr>
-				<tr><td>
-					<p>Der Algorithmus ist etwas komplex, aber ich kann dir versichern, dass die Videos wirklich zufällig sind. Ausgewählt werden sie durch eine Reihe von Umgebungsvariablen, die allesamt zufällig ausgesucht sind.</p>
-				</td></tr>
-				<tr><td>
-					<p>Ich hab schon viele Stunden davor verbracht und mir die skurillsten Sachen angesehen, deswegen möchte ich die Seite gerne mit dir teilen.</p>
-				</td></tr>
-				<tr><td>
-					<br>
-				</td></tr>
-				<tr><td>
-					<p>->Link: <a href='https://random.iamfabulous.de/youtube' style='text-decoration:underline;'>https://random.iamfabulous.de/youtube</a></p>
-				</td></tr>
-				<tr><td>
-					<p style='font-size:11px'>Solltet ihr ab und zu mal einen '500er' Fehler sehen, keine Sorge. Das muss so, einfach die Seite neuladen, es ging nichts kaputt.</p>
-				</td></tr>
-				<tr><td>
-					<br>
-				</td></tr>
-				<tr><td>
-					<br>
-				</td></tr>
-				<tr><td>
-					<p><b>#2 Der Dropbox Ersatz</b></p>
-				</td></tr>
-				<tr><td>
-					<br>
-				</td></tr>
-				<tr><td>
-					Suchst du nach einer Möglichkeit, einfach 'einen Ordner im Internet' anzulegen, über den du einfach und schnell Dateien mit jemand anderem tauschen kannst?</p>
-				</td></tr>
-				<tr><td>
-					<br>
-				</td></tr>
-				<tr><td>
-					<p>Ein Freund und ich setzen gerade ein Projekt um, dass eine Strukur wie ein Dateisystem abbildet, nur das der Zugriff komplett über das Internet erfolgt!<p>
-				</td></tr>
-				<tr><td>
-					<p>Also mit anderen Worten, du kannst Ordner anlegen, verschieben, Bilder, Filme, Musik hochladen, sie auf privat stellen oder mit deinen Freunden oder dem Rest der Welt teilen.</p>
-				</td></tr>
-				<tr><td>
-					<p>Wer einen ersten Einblick erlangen will, der kann sich zB meinen Ordner anschauen:</p>
-				</td></tr>
-				<tr><td>
-					<br>
-				</td></tr>
-				<tr><td>
-					<p>->Link: <a href='https://files.iamfabulous.de/max' style='text-decoration:underline;'>https://files.iamfabulous.de/max</a></p>
-				</td></tr>
-				<tr><td>
-					<br>
-				</td></tr>
-				<tr><td>
-					<br>
-				</td></tr>
-				<tr><td>
-					<p><b>#3 Der garantiert abhörsichere Chat</b></p>
-				</td></tr>
-				<tr><td>
-					<br>
-				</td></tr>
-				<tr><td>
-					<p>Da ich im Zuge des NSA-Skandals zu dem Entschluss gekommen bin, dass ich wenigstens einen abhörsicheren Kommunikationskanal brauch, habe ich auf meinem Server zu Hause einen eigenen Chat-Server laufen.</p>
-				</td></tr>
-				<tr><td>
-					<p>Man kann sich frei verbinden, ohne Konsequenzen oder Logs, und ich biete eine garantiert abhörsicherbare Verschlüsselung an. Ich nutze den Server um täglich mit Freunden zu chatten, ohne dass irgendjemand fremdes mit liest.</p>
-				</td></tr>
-				<tr><td>
-					<p>Ihr solltet euch vor in den <a href='https://de.wikipedia.org/wiki/Internet_Relay_Chat' style='text-decoration:underline;'>Internet Relay Chat</a> einlesen.</p>
-				</td></tr>
-				<tr><td>
-					<p>Kommt vorbei, und wer weiß, vielleicht trefft ihr ja sogar tux. ;)</p>
-				</td></tr>
-				<tr><td>
-					<br>
-				</td></tr>
-				<tr><td>
-					<p>->Link: <a href='irc://irc.iamfabulous.de' style='text-decoration:underline;'>irc://irc.iamfabulous.de</a></p>
-				</td><tr>
-				<tr><td>
-					<p style='font-size:11px'>Port 9999 ist verschlüsselt. Das Zertifikat ist selber unterschrieben, dafür aber Heartbleed sicher. :)</p>
-				</td></tr>
-				<tr><td>
-					<br>
-				</td></tr>
-				<tr><td>
-					<br>
-				</td></tr>
-				<tr><td>
-					<p><b>#n+1 Dotfiles, bots, autonome Systeme, custom E-Mail und noch vieles mehr</b></p>
-				</td></tr>
-				<tr><td>
-					<br>
-				</td></tr>
-				<tr><td>
-					<p>Der Platz reicht hier leider auch nicht aus, alles aufzuzählen. Aber das wichtigste sollte dabei gewesen sein.</p>
-				</td></tr>
-				<tr><td>
-					<p>Bei Fragen, Kritik, Anregungen oder Projekte, ihr kennt ja meine E-Mail.<p>
-				</td></tr>
-				<tr><td>
-					<p>Kleiner Nachtrag: Ich lizenziere so gut wie jeden Quellcode meiner Projekte unter der GPL, unter anderem auch der Source dieser Website für die JG. Wen es interessiert, was unter der Haube läuft, der findet die Sammlung auf meinem privaten Git Server. Wo ihr natürlich auch ein Repo haben könntet. ;) </p>
-				</td></tr>
-				<tr><td>
-					<br>
-				</td></tr>
-				<tr><td>
-					<p>->Link: <a href='https://git.iamfabulous.de' style='text-decoration:underline;'>https://git.iamfabulous.de</a></p>
-				</td></tr>
-
-
-			</table>
-		</div>
-		</div>
-		<br>
-		<br>
-		<br>
-		<!-- You lost the game -->
-	";
-}
-
-
diff --git a/www/setup.php b/www/setup.php
deleted file mode 100755
index 7b691df..0000000
--- a/www/setup.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-/*
-	Sets up the database with the necessary tables. Add ?drop to drop _everything_!
-	Don't forget to create a individual pepper in ../database/pepper.txt first!
-*/
-
-$db = new SQLite3("../database/sqlite.db");
-session_start();
-
-$bool = false;
-
-if (version_compare(phpversion(), '5.5', '<')) {
-	echo "You need at least PHP version 5.5 or higher";
-	exit;
-}
-
-foreach ($_GET as $name => $value) {
-	if(preg_match("/drop(ped)?/i",$name)){
-		$bool=true;
-	}
-}
-
-if($bool){
-	if(isset($_SESSION["login"])){
-		session_destroy();
-	}
-	if($db->exec("
-		BEGIN TRANSACTION;
-		DROP TRIGGER delete_files;
-		PRAGMA writable_schema = 1;
-		DELETE FROM sqlite_master WHERE type = 'table';
-		PRAGMA writable_schema = 0;
-		COMMIT;
-		VACUUM;")
-	){
-		echo "dropped everything";
-	} else {
-		echo "error with database";
-	}
-} else {
-	$cleartext_password="password";
-	$email="admin@iamfabulous.de";
-	$pepper = file_get_contents("../database/pepper.txt");
-	if(!$pepper){
-		echo "There is no pepper in '../database/pepper.txt'! <br> Please generate one manually and run this script again.";
-		exit;
-	}
-	$password = $cleartext_password . $pepper;
-	
-	$hash_password = password_hash($password, PASSWORD_DEFAULT);
-
-	if($db->exec("
-		BEGIN TRANSACTION;
-		CREATE TABLE IF NOT EXISTS user (id INTEGER PRIMARY KEY, name TEXT UNIQUE, password TEXT, email TEXT UNIQUE, status INTEGER, register INTEGER);
-		INSERT INTO user (id, name, status, password, email, register) VALUES (NULL, 'admin', 0, '" . $hash_password . "', '" . $email . "', (SELECT strftime('%s', 'now')));
-		CREATE TABLE IF NOT EXISTS log (id INTEGER PRIMARY KEY, user INTEGER, login INTEGER, FOREIGN KEY(user) REFERENCES user(id));
-		CREATE TABLE IF NOT EXISTS banned_user (id INTEGER PRIMARY KEY, login_attempts INTEGER, ip TEXT, session_id TEXT, time INTEGER, user INTEGER);
-		CREATE TABLE IF NOT EXISTS jg(id INTEGER PRIMARY KEY, name TEXT, adresse TEXT, telefonnummer INTEGER, handynummer INTEGER, email TEXT, geburtstag TEXT);
-		CREATE TRIGGER IF NOT EXISTS delete_files AFTER DELETE ON user FOR EACH ROW BEGIN DELETE FROM files WHERE owner=OLD.id; END;
-		COMMIT;")
-	) {
-		$_SESSION["login"] = true;
-		$_SESSION["username"] = "admin";
-		$_SESSION["userid"] = 1;
-
-		include("include.php");
-		header("Refresh: 2; ".$scheme.$_SERVER["HTTP_HOST"]."/");
-		echo "Success! You will redirected any moment.";
-	} else {
-		echo "Failure! :( <br>";
-		echo "Your password: ".$hash_password;
-	}
-}
-//	INSERT INT0 user (id, name, salt, password, status, invites, email, senpai, key) VALUES (NULL, 'admin', '$salt', '$hash_password', 1, 5, 'admin@iamfabulous.de', 0, '11111');
-
diff --git a/www/static/head.php b/www/static/head.php
deleted file mode 100644
index 3750d9b..0000000
--- a/www/static/head.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php 
-
-/* Copyright Maximilian Möhring, 2013
-Licensed under the GPL. Read LICENSE for more Information.*/
-
-
-if ($_SESSION["username"] == "jg-adlershof"){
-        $account ="<td><a href='member_login.php'>Login</a></td>
-        <td>|</td>
-        <td><a href='/register'>Register</a></td>
-        <td>|</td>
-" ;
-} else {
-         $account ="<td><a href='/account'>Account</a></td>
-        <td>|</td>
-";
-}
-
-?>
-<body link='#000000' vlink='#000000' alink='#FF0000'>
-
-<?php //include("piwik.php");?>
-
-<div class='kleineschrif'>
-
-<div id='header' class='kleineschrift'>
-        <table width='700px'><tr>
-        <td><a href='/Startseite'>Home</a></td>
-        <td>|</td>
-        <td><a href='/liste'>Adressliste</a></td>
-        <td>|</td>
-<?php /*        <td><a href='/help'>Kalender</a></td>
-        <td>|</td>
-        <td><a href='/help'>Share</a></td>
-        <td>|</td>
-*/ ?>
-        <td><a href='/quote'>Zitat</a></td>
-        <td>|</td>
-        <td><a href='/to-do-list.html'>to-do</a></td>
-        <td>|</td>
-        <td><a href='/help'>Hilfe</a></td>
-        <td>|</td>
-<?php echo "    $account"; ?>
-        <td><a href='/services'>Services</a></td>
-        <td>|</td>
-        <td><a href='/logout'>Logout</a></td>
-        <tr></table>
-
-        <br>
-        <hr>
-</div>
-
diff --git a/www/static/header.php b/www/static/header.php
deleted file mode 100644
index 33a6a7d..0000000
--- a/www/static/header.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php 
-
-/* Copyright Maximilian Möhring, 2013
-Licensed under the GPL. Read LICENSE for more Information.*/
-
-
-if ($_SESSION["username"] == "jg-adlershof"){
-        $account ="<td><a href='member_login.php'>Login</a></td>
-        <td>|</td>
-        <td><a href='/register'>Register</a></td>
-        <td>|</td>
-" ;
-} else {
-         $account ="<td><a href='/account'>Account</a></td>
-        <td>|</td>
-";
-}
-
-?>
-<!doctype html>
-
-<html>
-<head>
-  <title>Junge Gemeinde Adlershof.</title>
-  <meta http-equiv='Content-type' content='text/html; charset=utf-8' />
-  <link rel='stylesheet' type='text/css' href='/static/hyperstyle.css' />
-  <link rel='shortcut icon' href='/favicon.ico' type='image/x-icon'>
-</head>
-
-<body link='#000000' vlink='#000000' alink='#FF0000'>
-
-<?php //include("piwik.php");?>
-
-<div class='kleineschrif'>
-
-<div id='header' class='kleineschrift'>
-        <table width='700px'><tr>
-        <td><a href='/Startseite'>Home</a></td>
-        <td>|</td>
-        <td><a href='/liste'>Adressliste</a></td>
-        <td>|</td>
-<?php /*        <td><a href='/help'>Kalender</a></td>
-        <td>|</td>
-        <td><a href='/help'>Share</a></td>
-        <td>|</td>
-*/ ?>
-        <td><a href='/quote'>Zitat</a></td>
-        <td>|</td>
-        <td><a href='/to-do-list.html'>to-do</a></td>
-        <td>|</td>
-        <td><a href='/help'>Hilfe</a></td>
-        <td>|</td>
-<?php echo "    $account"; ?>
-        <td><a href='/services'>Services</a></td>
-        <td>|</td>
-        <td><a href='/logout'>Logout</a></td>
-        <tr></table>
-
-        <br>
-        <hr>
-</div>
-
diff --git a/www/static/hyperstyle.css b/www/static/hyperstyle.css
deleted file mode 100644
index 74176fc..0000000
--- a/www/static/hyperstyle.css
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
-This is a random mess. I'm studying Computer Science, not Art & Design.
-*/
-
-@import "/config/fonts/Muli.css";
-@import "/config/fonts/Ubuntu.css";
-
-
-* {
-margin:0;
-padding:0;
-}
-
-.noscript{
-display: none;
-}
-
-.katze {
-font-family: 'Muli';
-font-size: 120%;
-color: black;
-}
-
-.hundertfuenfzig {
-font-family: 'Muli';
-font-size: 150%;
-color: black;
-}
-
-.ueberschrift {
-font-family: 'Muli';
-font-size: 350%;
-color: black;
-text-align: center;
-}
-
-.kleineschrift {
-font-family: 'Ubuntu';
-font-size:75%;
-color: black;
-}
-
-.mittlereschrift {
-font-family: 'Ubuntu';
-font-size: 100%;
-color: black;
-}
-
-
-/*
-#footer {
-    position:fixed;
-    bottom:0px;
-}
-*/
-#content_container{
-/*	padding-top:3.00em;*/
-	padding-bottom:3em;
-	padding-left:0;
-}
-/*
-#content_container {
-    height:95%;
-    overflow:auto;
-	}
-*/
-#header {
-    position:;
-    top:0px; left:0px; right:0px;
-    background:;
-    text-align:center;
-    padding:10px;
-/*    color: #f0ecde;*/
-    width: 700px;
-    height: 20px;
-    margin: 0px auto;
-}
-
-html, body {
-height: 100%;
-width: 100%;
-background: #ecece1;
-}
-
-#distance {
-width: 10px;
-height: 45%;
-margin-bottom: -250px;
-float: left;
-/*background-color: #f00; nur zu Demozwecken*/
-}
-
-#container {
-margin: 0 auto;
-position: relative;
-height: 500px;
-width: 700px;
-clear: left;
-/*background-color: #ADFF2F;*/
-}
-
-#behaelter {
-margin: 0 auto;
-position: relative;
-/*height: 500px;
-width: 700px;*/
-clear: left;
-/*background-color: #ADFF2F;*/
-}
-
-#balken {
-position: relative;
-height: 10 px;
-width: 450px;
-background-color: grey;
-}
-
-#bgcolor {
-background-color: #f0ecde;
-}
-
-/*body {
-}*/
-
-a:link, a:visited {
-  /*font-family:Arial,Helvetica,sans-serif;
-  font-size: 12px;*/
-  text-decoration: none;
-/*  color: #009F00;*/
-  }
-
-h1 {
-font-family: 'Muli:400';
-/*font-family: Calibri;*/
-font-size: 260%;
-color: black;
-text-align: center;
-}
-
-h2 {
-font-family: 'Muli:400';
-/*font-family: Calibri;*/
-font-size: 130%;
-color: black;
-text-align: center;
-}
-
-
-p2 {
-font-family: 'Ubuntu';
-/*font-family: Calibri;*/
-font-size: 100%;
-color: grey;
-text-align: center;
-}
-
-p3 {
-font-family: 'Ubuntu';
-/*font-family: Calibri;*/
-/*font-size: 250%;*/
-color: black;
-text-align: center;
-}
-
-p4 {
-font-family: 'Ubuntu';
-/*font-family: Calibri;*/
-font-size: 350%;
-color: black;
-text-align: center;
-}
-
-p5 {
-font-family: 'Muli';
-/*font-family: Calibri;*/
-font-size: 270%;
-color: black;
-text-align: center;
-}
-
-
-a2 {
-font-family: 'Ubuntu';
-/*font-family: 'Nobile';*/
-/*font-family: Calibri;*/
-font-size: 125%;
-color: black;
-text-align: grey;
-}
-
-a3 {
-font-family: 'Ubuntu';
-/*font-family: Calibri;*/
-font-size: 130%;
-color: black;
-text-align: grey;
-}
-
-a4 {
-font-family: 'Ubuntu';
-/*font-family: Calibri;*/
-font-size: 100%;
-color: black;
-}
-
-a5 {
-font-family: 'Ubuntu';
-font-size:75%;
-/*font-family: Calibri;*/
-color: black;
-}
-
-
-.unterstrich {text-decoration: underline;}
diff --git a/www/to-do-list.html b/www/to-do-list.html
deleted file mode 100644
index f324642..0000000
--- a/www/to-do-list.html
+++ /dev/null
@@ -1,25 +0,0 @@
-TODO!!
-<br>
-<br>
-
-Wenn jemand Lust hat, sich in Webdesign zu schulen und das Design dieser Webseite aufzumöbeln, nur her damit! <br>
-Wir können sicher gemeinsam daran arbeiten.
-<br>
-<br>
-<a href='/Startseite'>Zurück zur Startseite</a>
-<!-- Piwik -->
-<script type="text/javascript">
-  var _paq = _paq || [];
-  _paq.push(["trackPageView"]);
-  _paq.push(["enableLinkTracking"]);
-
-  (function() {
-    var u=(("https:" == document.location.protocol) ? "https" : "http") + "://a.iamfabulous.de/";
-    _paq.push(["setTrackerUrl", u+"piwik.php"]);
-    _paq.push(["setSiteId", "2"]);
-    var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-    g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<noscript><img src="https://a.iamfabulous.de/piwik.php?idsite=2&amp;rec=1" style="border:0" alt="" /></noscript>
-<!-- End Piwik Code -->
diff --git a/www/update.php b/www/update.php
deleted file mode 100644
index 26c05ca..0000000
--- a/www/update.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-function update_db($db){
-
-	$id = SQLite3::escapeString(htmlentities($_POST["id"]));
-	$name = SQLite3::escapeString(htmlentities($_POST["name"]));
-	$adresse = SQLite3::escapeString(htmlentities($_POST["adresse"]));
-	$telefonnummer = SQLite3::escapeString(htmlentities($_POST["telefonnummer"]));
-	$handynummer = SQLite3::escapeString(htmlentities($_POST["handynummer"]));
-	$email = SQLite3::escapeString(htmlentities($_POST["email"]));
-	$bday = SQLite3::escapeString(htmlentities($_POST["geburtstag"]));
-
-	if((!empty($id) && !preg_match("/^[0-9]+$/", $id)) || (!empty($telefonnummer) && !preg_match("/^[0-9]+$/", $telefonnummer) )|| (!empty($email) && !preg_match("/^.+@.+$/", $email))){
-		return false;
-	}
-
-	if($db->exec("
-		BEGIN TRANSACTION;
-		UPDATE jg SET name='".$name."', adresse='".$adresse."', telefonnummer='".$telefonnummer."', handynummer='".$handynummer."', email='".$email."', geburtstag='".$bday."' WHERE id=".$id.";
-		COMMIT;
-	")){
-		return true;
-	} else {
-		return false;
-	}
-}