Update includes/footer.md

Update articles/server.md
2024-03-25 02:53:13 +00:00 · 2024-03-25 02:49:49 +00:00 · 2024-03-25 02:48:56 +00:00 · 2024-03-25 02:29:18 +00:00 · 2024-03-25 01:32:36 +00:00 · 2024-03-25 01:22:50 +00:00
120 changed files with 6189 additions and 40511 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,5 @@
+*.swp
+webmail
+includes/report
+report
+tilde.json
--- a/.htaccess
+++ b/.htaccess
@ -0,0 +1,5 @@
+    RewriteEngine On
+    RewriteRule ^$           main  [QSA]
+    RewriteRule ^index\.php$ wiki.php?page=main  [QSA]
+    RewriteCond %{REQUEST_URI} !(/includes/|/media/|tilde.json|humans.txt|/webmail/|/favicon.ico|/~|githook|sitemap.xml)
+    RewriteRule ^([^\d]+)/?$ wiki.php?page=$1 [QSA]
--- a/FOOTER.php
+++ b/FOOTER.php
@ -1,11 +0,0 @@
-<hr>
-<p><address>
-<p>Copyright &copy; 2018 <a href="/~amcclure">Anton McClure</a> <a href="mailto:amcclure@ttm.sh">&lt;amcclure@ttm.sh&gt;</a><br>
-Copyright &copy; 2018 <a href="/~ubergeek">Ubergeek</a> <a href="mailto:ubergeek@yourtilde.com">&lt;ubergeek@yourtilde.com&gt;</a></p>
-<p>This page is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/4.0/">Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License</a>. Permissions beyond the scope of this license may be available at <a xmlns:cc="http://creativecommons.org/ns#" href="/copyright.php" rel="cc:morePermissions">https://www.thunix.cf/copyright.php</a>.</p>
-<p><?php echo "Page last updated on " . date ("Y-m-d\TH:i:sO.", getlastmod());?></p>
-<p>You may have to refresh the page to see any changes or updates.</p>
-<p>All questions, comments, and concerns about this site should be emailed to <a href="mailto:amcclure@ttm.sh">amcclure@ttm.sh</a>.</p>
-</address></p>
-</body>
-</html>
--- a/HEADER.php
+++ b/HEADER.php
@ -1,4 +0,0 @@
-<?php include 'HEADERS.php';?>
-<center><h1>thunix Shell Provider and Web Host</h1></center><hr>
-<center><p><?php include 'MENU.php';?></p></center>
-<hr>
--- a/HEADERS.php
+++ b/HEADERS.php
@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<link rev="made" href="mailto:amcclure@ttm.sh">
-<meta name="description" content="thunix Shell Provider and Web Host & thunix Phoenix Project">
-<meta name="author" content="Anton McClure">
-<meta name="keywords" content="thunix,Shell,Provider,And,Web,Host,Phoenix,UNIX,Linux,HTML,CSS,XML,JavaScript,Gnu,Ubuntu,Debian,Arch,Mirrors,Mirror,Forums,Tildeverse">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<link href="/site.css" rel="stylesheet" type="text/css" media="all">
-<script src=/site.js"></script>
-<link href="/favicon.png" rel="icon">
-</head>
-<body>
--- a/86
+++ b/86
@ -1,86 +0,0 @@
-Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Creative Commons Corporation ("Creative Commons") is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an "as-is" basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible.
-Using Creative Commons Public Licenses
-Creative Commons public licenses provide a standard set of terms and conditions that creators and other rights holders may use to share original works of authorship and other material subject to copyright and certain other rights specified in the public license below. The following considerations are for informational purposes only, are not exhaustive, and do not form part of our licenses.
-Considerations for licensors: Our public licenses are intended for use by those authorized to give the public permission to use material in ways otherwise restricted by copyright and certain other rights. Our licenses are irrevocable. Licensors should read and understand the terms and conditions of the license they choose before applying it. Licensors should also secure all rights necessary before applying our licenses so that the public can reuse the material as expected. Licensors should clearly mark any material not subject to the license. This includes other CC-licensed material, or material used under an exception or limitation to copyright. More considerations for licensors : wiki.creativecommons.org/Considerations_for_licensors
-Considerations for the public: By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensor's permission is not necessary for any reason–for example, because of any applicable exception or limitation to copyright–then that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. Although not required by our licenses, you are encouraged to respect those requests where reasonable. More considerations for the public : wiki.creativecommons.org/Considerations_for_licensees
-Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License
-By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
-   
-   Section 1 – Definitions.
-      a. Adapted Material means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.
-      b. Copyright and Similar Rights means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
-      c. Effective Technological Measures means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements.
-      d. Exceptions and Limitations means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.
-      e. Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public License.
-      f. Licensed Rights means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.
-      g. Licensor means the individual(s) or entity(ies) granting rights under this Public License.
-      h. NonCommercial means not primarily intended for or directed towards commercial advantage or monetary compensation. For purposes of this Public License, the exchange of the Licensed Material for other material subject to Copyright and Similar Rights by digital file-sharing or similar means is NonCommercial provided there is no payment of monetary compensation in connection with the exchange.
-      i. Share means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.
-      j. Sui Generis Database Rights means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.
-      k. You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning.
-   
-   Section 2 – Scope.
-      a. License grant.
-         1. Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
-            A. reproduce and Share the Licensed Material, in whole or in part, for NonCommercial purposes only; and
-            B. produce and reproduce, but not Share, Adapted Material for NonCommercial purposes only.
-         2. Exceptions and Limitations. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.
-         3. Term. The term of this Public License is specified in Section 6(a).
-         4. Media and formats; technical modifications allowed. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material.
-         5. Downstream recipients.
-            A. Offer from the Licensor – Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.
-            B. No downstream restrictions. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.
-         6. No endorsement. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i).
-      b. Other rights.
-         1. Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.
-         2. Patent and trademark rights are not licensed under this Public License.
-         3. To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties, including when the Licensed Material is used other than for NonCommercial purposes.
-   
-   Section 3 – License Conditions.
-   Your exercise of the Licensed Rights is expressly made subject to the following conditions.
-      a. Attribution.
-         1. If You Share the Licensed Material, You must:
-            A. retain the following if it is supplied by the Licensor with the Licensed Material:
-               i. identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);
-               ii. a copyright notice;
-               iii. a notice that refers to this Public License;
-               iv. a notice that refers to the disclaimer of warranties;
-               v. a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
-            B. indicate if You modified the Licensed Material and retain an indication of any previous modifications; and
-            C. indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License.
-         For the avoidance of doubt, You do not have permission under this Public License to Share Adapted Material.
-         2. You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.
-         3. If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable.
-   
-   Section 4 – Sui Generis Database Rights.
-   Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:
-      a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database for NonCommercial purposes only and provided You do not Share Adapted Material;
-      b. if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and
-      c. You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database.
-   For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
-   
-   Section 5 – Disclaimer of Warranties and Limitation of Liability.
-      a. Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.
-      b. To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.
-      c. The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.
-   
-   Section 6 – Term and Termination.
-      a. This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.
-      b. Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates:
-         1. automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or
-         2. upon express reinstatement by the Licensor.
-      For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.
-      c. For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.
-      d. Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
-   
-   Section 7 – Other Terms and Conditions.
-      a. The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.
-      b. Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.
-   
-   Section 8 – Interpretation.
-      a. For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.
-      b. To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.
-      c. No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.
-      d. Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.
-Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the "Licensor." The text of the Creative Commons public licenses is dedicated to the public domain under the CC0 Public Domain Dedication. Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at creativecommons.org/policies, Creative Commons does not authorize the use of the trademark "Creative Commons" or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses.
-Creative Commons may be contacted at creativecommons.org.
--- a/LICENSE.md
+++ b/LICENSE.md
@ -0,0 +1,163 @@
+GNU Lesser General Public License
+=================================
+
+_Version 3, 29 June 2007_  
+_Copyright © 2007 Free Software Foundation, Inc. &lt;<http://fsf.org/>&gt;_
+
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+
+This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+### 0. Additional Definitions
+
+As used herein, “this License” refers to version 3 of the GNU Lesser
+General Public License, and the “GNU GPL” refers to version 3 of the GNU
+General Public License.
+
+“The Library” refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+An “Application” is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+A “Combined Work” is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the “Linked
+Version”.
+
+The “Minimal Corresponding Source” for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+The “Corresponding Application Code” for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+### 1. Exception to Section 3 of the GNU GPL
+
+You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+### 2. Conveying Modified Versions
+
+If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+* **a)** under this License, provided that you make a good faith effort to
+ensure that, in the event an Application does not supply the
+function or data, the facility still operates, and performs
+whatever part of its purpose remains meaningful, or
+
+* **b)** under the GNU GPL, with none of the additional permissions of
+this License applicable to that copy.
+
+### 3. Object Code Incorporating Material from Library Header Files
+
+The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+* **a)** Give prominent notice with each copy of the object code that the
+Library is used in it and that the Library and its use are
+covered by this License.
+* **b)** Accompany the object code with a copy of the GNU GPL and this license
+document.
+
+### 4. Combined Works
+
+You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+* **a)** Give prominent notice with each copy of the Combined Work that
+the Library is used in it and that the Library and its use are
+covered by this License.
+
+* **b)** Accompany the Combined Work with a copy of the GNU GPL and this license
+document.
+
+* **c)** For a Combined Work that displays copyright notices during
+execution, include the copyright notice for the Library among
+these notices, as well as a reference directing the user to the
+copies of the GNU GPL and this license document.
+
+* **d)** Do one of the following:
+    - **0)** Convey the Minimal Corresponding Source under the terms of this
+License, and the Corresponding Application Code in a form
+suitable for, and under terms that permit, the user to
+recombine or relink the Application with a modified version of
+the Linked Version to produce a modified Combined Work, in the
+manner specified by section 6 of the GNU GPL for conveying
+Corresponding Source.
+    - **1)** Use a suitable shared library mechanism for linking with the
+Library.  A suitable mechanism is one that **(a)** uses at run time
+a copy of the Library already present on the user's computer
+system, and **(b)** will operate properly with a modified version
+of the Library that is interface-compatible with the Linked
+Version.
+
+* **e)** Provide Installation Information, but only if you would otherwise
+be required to provide such information under section 6 of the
+GNU GPL, and only to the extent that such information is
+necessary to install and execute a modified version of the
+Combined Work produced by recombining or relinking the
+Application with a modified version of the Linked Version. (If
+you use option **4d0**, the Installation Information must accompany
+the Minimal Corresponding Source and Corresponding Application
+Code. If you use option **4d1**, you must provide the Installation
+Information in the manner specified by section 6 of the GNU GPL
+for conveying Corresponding Source.)
+
+### 5. Combined Libraries
+
+You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+* **a)** Accompany the combined library with a copy of the same work based
+on the Library, uncombined with any other library facilities,
+conveyed under the terms of this License.
+* **b)** Give prominent notice with the combined library that part of it
+is a work based on the Library, and explaining where to find the
+accompanying uncombined form of the same work.
+
+### 6. Revised Versions of the GNU Lesser General Public License
+
+The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License “or any later version”
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
--- a/LICENSE.txt
+++ b/LICENSE.txt
@ -0,0 +1,427 @@
+Attribution-ShareAlike 4.0 International
+
+=======================================================================
+
+Creative Commons Corporation ("Creative Commons") is not a law firm and
+does not provide legal services or legal advice. Distribution of
+Creative Commons public licenses does not create a lawyer-client or
+other relationship. Creative Commons makes its licenses and related
+information available on an "as-is" basis. Creative Commons gives no
+warranties regarding its licenses, any material licensed under their
+terms and conditions, or any related information. Creative Commons
+disclaims all liability for damages resulting from their use to the
+fullest extent possible.
+
+Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and
+conditions that creators and other rights holders may use to share
+original works of authorship and other material subject to copyright
+and certain other rights specified in the public license below. The
+following considerations are for informational purposes only, are not
+exhaustive, and do not form part of our licenses.
+
+     Considerations for licensors: Our public licenses are
+     intended for use by those authorized to give the public
+     permission to use material in ways otherwise restricted by
+     copyright and certain other rights. Our licenses are
+     irrevocable. Licensors should read and understand the terms
+     and conditions of the license they choose before applying it.
+     Licensors should also secure all rights necessary before
+     applying our licenses so that the public can reuse the
+     material as expected. Licensors should clearly mark any
+     material not subject to the license. This includes other CC-
+     licensed material, or material used under an exception or
+     limitation to copyright. More considerations for licensors:
+	wiki.creativecommons.org/Considerations_for_licensors
+
+     Considerations for the public: By using one of our public
+     licenses, a licensor grants the public permission to use the
+     licensed material under specified terms and conditions. If
+     the licensor's permission is not necessary for any reason--for
+     example, because of any applicable exception or limitation to
+     copyright--then that use is not regulated by the license. Our
+     licenses grant only permissions under copyright and certain
+     other rights that a licensor has authority to grant. Use of
+     the licensed material may still be restricted for other
+     reasons, including because others have copyright or other
+     rights in the material. A licensor may make special requests,
+     such as asking that all changes be marked or described.
+     Although not required by our licenses, you are encouraged to
+     respect those requests where reasonable. More considerations
+     for the public: 
+	wiki.creativecommons.org/Considerations_for_licensees
+
+=======================================================================
+
+Creative Commons Attribution-ShareAlike 4.0 International Public
+License
+
+By exercising the Licensed Rights (defined below), You accept and agree
+to be bound by the terms and conditions of this Creative Commons
+Attribution-ShareAlike 4.0 International Public License ("Public
+License"). To the extent this Public License may be interpreted as a
+contract, You are granted the Licensed Rights in consideration of Your
+acceptance of these terms and conditions, and the Licensor grants You
+such rights in consideration of benefits the Licensor receives from
+making the Licensed Material available under these terms and
+conditions.
+
+
+Section 1 -- Definitions.
+
+  a. Adapted Material means material subject to Copyright and Similar
+     Rights that is derived from or based upon the Licensed Material
+     and in which the Licensed Material is translated, altered,
+     arranged, transformed, or otherwise modified in a manner requiring
+     permission under the Copyright and Similar Rights held by the
+     Licensor. For purposes of this Public License, where the Licensed
+     Material is a musical work, performance, or sound recording,
+     Adapted Material is always produced where the Licensed Material is
+     synched in timed relation with a moving image.
+
+  b. Adapter's License means the license You apply to Your Copyright
+     and Similar Rights in Your contributions to Adapted Material in
+     accordance with the terms and conditions of this Public License.
+
+  c. BY-SA Compatible License means a license listed at
+     creativecommons.org/compatiblelicenses, approved by Creative
+     Commons as essentially the equivalent of this Public License.
+
+  d. Copyright and Similar Rights means copyright and/or similar rights
+     closely related to copyright including, without limitation,
+     performance, broadcast, sound recording, and Sui Generis Database
+     Rights, without regard to how the rights are labeled or
+     categorized. For purposes of this Public License, the rights
+     specified in Section 2(b)(1)-(2) are not Copyright and Similar
+     Rights.
+
+  e. Effective Technological Measures means those measures that, in the
+     absence of proper authority, may not be circumvented under laws
+     fulfilling obligations under Article 11 of the WIPO Copyright
+     Treaty adopted on December 20, 1996, and/or similar international
+     agreements.
+
+  f. Exceptions and Limitations means fair use, fair dealing, and/or
+     any other exception or limitation to Copyright and Similar Rights
+     that applies to Your use of the Licensed Material.
+
+  g. License Elements means the license attributes listed in the name
+     of a Creative Commons Public License. The License Elements of this
+     Public License are Attribution and ShareAlike.
+
+  h. Licensed Material means the artistic or literary work, database,
+     or other material to which the Licensor applied this Public
+     License.
+
+  i. Licensed Rights means the rights granted to You subject to the
+     terms and conditions of this Public License, which are limited to
+     all Copyright and Similar Rights that apply to Your use of the
+     Licensed Material and that the Licensor has authority to license.
+
+  j. Licensor means the individual(s) or entity(ies) granting rights
+     under this Public License.
+
+  k. Share means to provide material to the public by any means or
+     process that requires permission under the Licensed Rights, such
+     as reproduction, public display, public performance, distribution,
+     dissemination, communication, or importation, and to make material
+     available to the public including in ways that members of the
+     public may access the material from a place and at a time
+     individually chosen by them.
+
+  l. Sui Generis Database Rights means rights other than copyright
+     resulting from Directive 96/9/EC of the European Parliament and of
+     the Council of 11 March 1996 on the legal protection of databases,
+     as amended and/or succeeded, as well as other essentially
+     equivalent rights anywhere in the world.
+
+  m. You means the individual or entity exercising the Licensed Rights
+     under this Public License. Your has a corresponding meaning.
+
+
+Section 2 -- Scope.
+
+  a. License grant.
+
+       1. Subject to the terms and conditions of this Public License,
+          the Licensor hereby grants You a worldwide, royalty-free,
+          non-sublicensable, non-exclusive, irrevocable license to
+          exercise the Licensed Rights in the Licensed Material to:
+
+            a. reproduce and Share the Licensed Material, in whole or
+               in part; and
+
+            b. produce, reproduce, and Share Adapted Material.
+
+       2. Exceptions and Limitations. For the avoidance of doubt, where
+          Exceptions and Limitations apply to Your use, this Public
+          License does not apply, and You do not need to comply with
+          its terms and conditions.
+
+       3. Term. The term of this Public License is specified in Section
+          6(a).
+
+       4. Media and formats; technical modifications allowed. The
+          Licensor authorizes You to exercise the Licensed Rights in
+          all media and formats whether now known or hereafter created,
+          and to make technical modifications necessary to do so. The
+          Licensor waives and/or agrees not to assert any right or
+          authority to forbid You from making technical modifications
+          necessary to exercise the Licensed Rights, including
+          technical modifications necessary to circumvent Effective
+          Technological Measures. For purposes of this Public License,
+          simply making modifications authorized by this Section 2(a)
+          (4) never produces Adapted Material.
+
+       5. Downstream recipients.
+
+            a. Offer from the Licensor -- Licensed Material. Every
+               recipient of the Licensed Material automatically
+               receives an offer from the Licensor to exercise the
+               Licensed Rights under the terms and conditions of this
+               Public License.
+
+            b. Additional offer from the Licensor -- Adapted Material.
+               Every recipient of Adapted Material from You
+               automatically receives an offer from the Licensor to
+               exercise the Licensed Rights in the Adapted Material
+               under the conditions of the Adapter's License You apply.
+
+            c. No downstream restrictions. You may not offer or impose
+               any additional or different terms or conditions on, or
+               apply any Effective Technological Measures to, the
+               Licensed Material if doing so restricts exercise of the
+               Licensed Rights by any recipient of the Licensed
+               Material.
+
+       6. No endorsement. Nothing in this Public License constitutes or
+          may be construed as permission to assert or imply that You
+          are, or that Your use of the Licensed Material is, connected
+          with, or sponsored, endorsed, or granted official status by,
+          the Licensor or others designated to receive attribution as
+          provided in Section 3(a)(1)(A)(i).
+
+  b. Other rights.
+
+       1. Moral rights, such as the right of integrity, are not
+          licensed under this Public License, nor are publicity,
+          privacy, and/or other similar personality rights; however, to
+          the extent possible, the Licensor waives and/or agrees not to
+          assert any such rights held by the Licensor to the limited
+          extent necessary to allow You to exercise the Licensed
+          Rights, but not otherwise.
+
+       2. Patent and trademark rights are not licensed under this
+          Public License.
+
+       3. To the extent possible, the Licensor waives any right to
+          collect royalties from You for the exercise of the Licensed
+          Rights, whether directly or through a collecting society
+          under any voluntary or waivable statutory or compulsory
+          licensing scheme. In all other cases the Licensor expressly
+          reserves any right to collect such royalties.
+
+
+Section 3 -- License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the
+following conditions.
+
+  a. Attribution.
+
+       1. If You Share the Licensed Material (including in modified
+          form), You must:
+
+            a. retain the following if it is supplied by the Licensor
+               with the Licensed Material:
+
+                 i. identification of the creator(s) of the Licensed
+                    Material and any others designated to receive
+                    attribution, in any reasonable manner requested by
+                    the Licensor (including by pseudonym if
+                    designated);
+
+                ii. a copyright notice;
+
+               iii. a notice that refers to this Public License;
+
+                iv. a notice that refers to the disclaimer of
+                    warranties;
+
+                 v. a URI or hyperlink to the Licensed Material to the
+                    extent reasonably practicable;
+
+            b. indicate if You modified the Licensed Material and
+               retain an indication of any previous modifications; and
+
+            c. indicate the Licensed Material is licensed under this
+               Public License, and include the text of, or the URI or
+               hyperlink to, this Public License.
+
+       2. You may satisfy the conditions in Section 3(a)(1) in any
+          reasonable manner based on the medium, means, and context in
+          which You Share the Licensed Material. For example, it may be
+          reasonable to satisfy the conditions by providing a URI or
+          hyperlink to a resource that includes the required
+          information.
+
+       3. If requested by the Licensor, You must remove any of the
+          information required by Section 3(a)(1)(A) to the extent
+          reasonably practicable.
+
+  b. ShareAlike.
+
+     In addition to the conditions in Section 3(a), if You Share
+     Adapted Material You produce, the following conditions also apply.
+
+       1. The Adapter's License You apply must be a Creative Commons
+          license with the same License Elements, this version or
+          later, or a BY-SA Compatible License.
+
+       2. You must include the text of, or the URI or hyperlink to, the
+          Adapter's License You apply. You may satisfy this condition
+          in any reasonable manner based on the medium, means, and
+          context in which You Share Adapted Material.
+
+       3. You may not offer or impose any additional or different terms
+          or conditions on, or apply any Effective Technological
+          Measures to, Adapted Material that restrict exercise of the
+          rights granted under the Adapter's License You apply.
+
+
+Section 4 -- Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that
+apply to Your use of the Licensed Material:
+
+  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
+     to extract, reuse, reproduce, and Share all or a substantial
+     portion of the contents of the database;
+
+  b. if You include all or a substantial portion of the database
+     contents in a database in which You have Sui Generis Database
+     Rights, then the database in which You have Sui Generis Database
+     Rights (but not its individual contents) is Adapted Material,
+
+     including for purposes of Section 3(b); and
+  c. You must comply with the conditions in Section 3(a) if You Share
+     all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not
+replace Your obligations under this Public License where the Licensed
+Rights include other Copyright and Similar Rights.
+
+
+Section 5 -- Disclaimer of Warranties and Limitation of Liability.
+
+  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
+     EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
+     AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
+     ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
+     IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
+     WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
+     PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
+     ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
+     KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
+     ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
+
+  b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
+     TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
+     NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
+     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
+     COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
+     USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
+     ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
+     DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
+     IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
+
+  c. The disclaimer of warranties and limitation of liability provided
+     above shall be interpreted in a manner that, to the extent
+     possible, most closely approximates an absolute disclaimer and
+     waiver of all liability.
+
+
+Section 6 -- Term and Termination.
+
+  a. This Public License applies for the term of the Copyright and
+     Similar Rights licensed here. However, if You fail to comply with
+     this Public License, then Your rights under this Public License
+     terminate automatically.
+
+  b. Where Your right to use the Licensed Material has terminated under
+     Section 6(a), it reinstates:
+
+       1. automatically as of the date the violation is cured, provided
+          it is cured within 30 days of Your discovery of the
+          violation; or
+
+       2. upon express reinstatement by the Licensor.
+
+     For the avoidance of doubt, this Section 6(b) does not affect any
+     right the Licensor may have to seek remedies for Your violations
+     of this Public License.
+
+  c. For the avoidance of doubt, the Licensor may also offer the
+     Licensed Material under separate terms or conditions or stop
+     distributing the Licensed Material at any time; however, doing so
+     will not terminate this Public License.
+
+  d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
+     License.
+
+
+Section 7 -- Other Terms and Conditions.
+
+  a. The Licensor shall not be bound by any additional or different
+     terms or conditions communicated by You unless expressly agreed.
+
+  b. Any arrangements, understandings, or agreements regarding the
+     Licensed Material not stated herein are separate from and
+     independent of the terms and conditions of this Public License.
+
+
+Section 8 -- Interpretation.
+
+  a. For the avoidance of doubt, this Public License does not, and
+     shall not be interpreted to, reduce, limit, restrict, or impose
+     conditions on any use of the Licensed Material that could lawfully
+     be made without permission under this Public License.
+
+  b. To the extent possible, if any provision of this Public License is
+     deemed unenforceable, it shall be automatically reformed to the
+     minimum extent necessary to make it enforceable. If the provision
+     cannot be reformed, it shall be severed from this Public License
+     without affecting the enforceability of the remaining terms and
+     conditions.
+
+  c. No term or condition of this Public License will be waived and no
+     failure to comply consented to unless expressly agreed to by the
+     Licensor.
+
+  d. Nothing in this Public License constitutes or may be interpreted
+     as a limitation upon, or waiver of, any privileges and immunities
+     that apply to the Licensor or You, including from the legal
+     processes of any jurisdiction or authority.
+
+
+=======================================================================
+
+Creative Commons is not a party to its public
+licenses. Notwithstanding, Creative Commons may elect to apply one of
+its public licenses to material it publishes and in those instances
+will be considered the “Licensor.” The text of the Creative Commons
+public licenses is dedicated to the public domain under the CC0 Public
+Domain Dedication. Except for the limited purpose of indicating that
+material is shared under a Creative Commons public license or as
+otherwise permitted by the Creative Commons policies published at
+creativecommons.org/policies, Creative Commons does not authorize the
+use of the trademark "Creative Commons" or any other trademark or logo
+of Creative Commons without its prior written consent including,
+without limitation, in connection with any unauthorized modifications
+to any of its public licenses or any other arrangements,
+understandings, or agreements concerning use of licensed material. For
+the avoidance of doubt, this paragraph does not form part of the
+public licenses.
+
+Creative Commons may be contacted at creativecommons.org.
--- a/MENU.php
+++ b/MENU.php
@ -1,5 +0,0 @@
-<a href="index.php">Home</a> |
-<a href="faq.php">FAQ</a> |
-<a href="tos.php">Terms of Service</a> |
-<a href="contact.php">Contact Us</a> |
-<a href="signup.php">Sign Up</a>
--- a/README.md
+++ b/README.md
@ -1,3 +1,7 @@
-# www
+# Thunix Website Code

-This is the code powering the website for thunix, made by hexhaxtron, amcclure, and ubergeek.
+This is the code powering the thunix website.  It is based on [wiki.php](https://tildegit.org/ubergeek/wiki.php).
+
+Content is licensed under the Creative Commons, Share Alike, Attribution Licence.
+
+Code is licensed under the AGPL 3 or later.
--- a/articles/contact.md
+++ b/articles/contact.md
@ -0,0 +1,19 @@
+If you have any questions or problems relating to our service, or this website, please fill in the form below. Be sure to include a contact name, email address, subject line and your message below. Once you've filled in the form, click on the send button; the message will be sent and you'll receive a response within a reasonable amount of time.
+
+<form action='/includes/contact.php'>
+<table>
+<tr><td>Contact Name:</td> <td> <input type='text' name='contact_name'></td></tr>
+<tr><td>Email Address:</td> <td> <input type='text' name='email_address'></td></tr>
+<tr><td>Subject:</td> <td>
+<select name="type">
+    <option value="abuse">Abuse</option>
+    <option value="support">Support</option>
+    <option value="copyright">Copyright Problem</option></td></tr>
+    
+</select><br> </td></tr>
+<tr><td>Type the word tildeverse here:</td> <td> <input type='textarea' name='tv'></td></tr>
+<tr><td>Message:</td><td><textarea name='message' rows = "10" cols = "80"></textarea><td>
+</table>
+<input type='submit'>
+</form>
+
--- a/articles/copyright.md
+++ b/articles/copyright.md
@ -0,0 +1,176 @@
+## creative commons
+
+# Contributors
+
+A list of all contributors can be found here: [Commit log for Git Repo](https://tildegit.org/thunix/www/commits/branch/master)
+# Attribution-ShareAlike 4.0 International
+
+Creative Commons Corporation (“Creative Commons”) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is” basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible.
+
+### Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and conditions that creators and other rights holders may use to share original works of authorship and other material subject to copyright and certain other rights specified in the public license below. The following considerations are for informational purposes only, are not exhaustive, and do not form part of our licenses.
+
+* __Considerations for licensors:__ Our public licenses are intended for use by those authorized to give the public permission to use material in ways otherwise restricted by copyright and certain other rights. Our licenses are irrevocable. Licensors should read and understand the terms and conditions of the license they choose before applying it. Licensors should also secure all rights necessary before applying our licenses so that the public can reuse the material as expected. Licensors should clearly mark any material not subject to the license. This includes other CC-licensed material, or material used under an exception or limitation to copyright. [More considerations for licensors](http://wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensors).
+
+* __Considerations for the public:__ By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensor’s permission is not necessary for any reason–for example, because of any applicable exception or limitation to copyright–then that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. Although not required by our licenses, you are encouraged to respect those requests where reasonable. [More considerations for the public](http://wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensees).
+
+## Creative Commons Attribution-ShareAlike 4.0 International Public License
+
+By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
+
+### Section 1 – Definitions.
+
+a. __Adapted Material__ means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.
+
+b. __Adapter's License__ means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.
+
+c. __BY-SA Compatible License__ means a license listed at [creativecommons.org/compatiblelicenses](http://creativecommons.org/compatiblelicenses), approved by Creative Commons as essentially the equivalent of this Public License.
+
+d. __Copyright and Similar Rights__ means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
+
+e. __Effective Technological Measures__ means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements.
+
+f. __Exceptions and Limitations__ means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.
+
+g. __License Elements__ means the license attributes listed in the name of a Creative Commons Public License. The License Elements of this Public License are Attribution and ShareAlike.
+
+h. __Licensed Material__ means the artistic or literary work, database, or other material to which the Licensor applied this Public License.
+
+i. __Licensed Rights__ means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.
+
+j. __Licensor__ means the individual(s) or entity(ies) granting rights under this Public License.
+
+k. __Share__ means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.
+
+l. __Sui Generis Database Rights__ means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.
+
+m. __You__ means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning.
+
+### Section 2 – Scope.
+
+a. ___License grant.___
+
+   1. Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
+
+       A. reproduce and Share the Licensed Material, in whole or in part; and
+
+       B. produce, reproduce, and Share Adapted Material.
+
+   2. __Exceptions and Limitations.__ For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.
+
+   3. __Term.__ The term of this Public License is specified in Section 6(a).
+
+   4. __Media and formats; technical modifications allowed.__ The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material.
+
+   5. __Downstream recipients.__
+
+       A. __Offer from the Licensor – Licensed Material.__ Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.
+
+       B. __Additional offer from the Licensor – Adapted Material.__ Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter’s License You apply.
+
+       C. __No downstream restrictions.__ You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.
+
+   6. __No endorsement.__ Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i).
+
+b. ___Other rights.___
+
+   1. Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.
+
+   2. Patent and trademark rights are not licensed under this Public License.
+
+   3. To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.
+
+### Section 3 – License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the following conditions.
+
+a. ___Attribution.___
+
+   1. If You Share the Licensed Material (including in modified form), You must:
+
+       A. retain the following if it is supplied by the Licensor with the Licensed Material:
+
+         i. identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);
+
+         ii. a copyright notice;
+
+         iii. a notice that refers to this Public License;
+
+         iv. a notice that refers to the disclaimer of warranties;
+
+         v. a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
+
+       B. indicate if You modified the Licensed Material and retain an indication of any previous modifications; and
+
+       C. indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License.
+
+   2. You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.
+
+   3. If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable.
+
+b. ___ShareAlike.___
+
+In addition to the conditions in Section 3(a), if You Share Adapted Material You produce, the following conditions also apply.
+
+1. The Adapter’s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-SA Compatible License.
+
+2. You must include the text of, or the URI or hyperlink to, the Adapter's License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material.
+
+3. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter's License You apply.
+
+### Section 4 – Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:
+
+a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database;
+
+b. if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material, including for purposes of Section 3(b); and
+
+c. You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
+
+### Section 5 – Disclaimer of Warranties and Limitation of Liability.
+
+a. __Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.__
+
+b. __To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.__
+
+c. The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.
+
+### Section 6 – Term and Termination.
+
+a. This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.
+
+b. Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates:
+
+   1. automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or
+
+   2. upon express reinstatement by the Licensor.
+
+   For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.
+
+c. For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.
+
+d. Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
+
+### Section 7 – Other Terms and Conditions.
+
+a. The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.
+
+b. Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.
+
+### Section 8 – Interpretation.
+
+a. For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.
+
+b. To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.
+
+c. No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.
+
+d. Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.
+
+> Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the “Licensor.” The text of the Creative Commons public licenses is dedicated to the public domain under the [CC0 Public Domain Dedication](https://creativecommons.org/publicdomain/zero/1.0/legalcode). Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at [creativecommons.org/policies](http://creativecommons.org/policies), Creative Commons does not authorize the use of the trademark “Creative Commons” or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses.
+>
+> Creative Commons may be contacted at creativecommons.org.
--- a/articles/donate.md
+++ b/articles/donate.md
@ -0,0 +1,12 @@
+# Donations
+
+As this server and our projects are all a labor of love and goodwill for the community, operating the thunix server costs money. We love what we do and we love sharing what we do for free, but over time, operating expenses can have a big impact.
+
+That being said, we also rely on the good nature of generous people, who are willing to donate to us. The price breakdown right now is €80/month. So to help with server costs and time spent, you can donate the following ways:
+
+<div style="text-align:center;">
+
+<p>You can donate via Liberapay here: <a href="https://liberapay.com/deepend/donate"><img src="https://liberapay.com/assets/widgets/donate.svg"></a></p>
+
+</p>
+</div>
--- a/articles/faq.md
+++ b/articles/faq.md
@ -0,0 +1,43 @@
+# Frequently Asked Questions
+
+**How do I sign up for an account?**
+
+- Simply by going to our [signup page](/signup) and filling in the form. You can ask for help in \#thunix on tilde.chat, or you can [contact us](contact), if you run into any difficulties.
+
+**How can I request an account recovery or public key replacement?**
+
+- Just send the request from the email you used to register and we'll poke a new key in for you.
+
+**Who is running thunix?**
+
+- The current system administrators are [deepend](/~deepend), [Naglfar](/~naglfar), [ubergeek](/~ubergeek) still helps out from time to time but not sure if he wants the admin role going forward. If this changes it will be updated ASAP.
+
+**What happened to the old thunix? Why the name change?**
+
+- The original machine and founder dissappeared without any warning to anyone, including server staff. For this reason, most things were not backed up, and we needed to obtain a new domain name, and a new set of machines.
+
+**I want a new package installed, or I want something changed on Thunix!**
+
+- Excellent! We're looking to make this system useful for the community! You can submit a PR or an issue [here](https://tildegit.org/thunix/ansible) to request the system change.
+
+**Can I get password-based login? Old thunix had it!**
+
+- No. Sorry. Not for shell access. For other integrated services, password auth will be enabled, but not for your ssh connection. We use key based authentication, as it's more secure, and more convienent for you, to be honest.
+
+**I want to run {fill in the blank} server, but I can't seem to access it?**
+
+- The only exposed ports to the internet are services as defined in our [ansible playbook.](https://tildegit.org/thunix/ansible) If there is a public service you want to see, open an issue, or do a pull request for it, and we'll probably enable it without much question.
+
+**That's too hard! Can you just open the port up for this service I have running?**
+
+- No. Due to security issues, we cannot. HOWEVER! You can certainly use an [SSH tunnel](https://duckduckgo.com/?q=ssh+tunnnel) to access it.
+
+**Old thunix did {fill in the blank}, and now it doesn't. Make it work like it used to!**
+
+- There was a huge changeover. Maybe we can get something going old thunix had, and maybe not. You can mention it in the IRC channel, and we'll see what we can do.
+
+**How can I access my thunix email?**
+
+- You can use the following for your mail settings (This is Thunderbird's setting screen, but the settings are the same):
+
+[![](/media/mail.png)](/media/mail.png)
--- a/articles/gdpr.md
+++ b/articles/gdpr.md
@ -0,0 +1,27 @@
+# GDPR Statement and Privacy Policy
+
+Thunix takes privacy seriously, and as such remains committed to being in compliance with the GDPR, which took affect on May 25th, 2018.
+
+## What data do we collect from you?
+
+Thunix collects your email address, during signup, and IPs you log into the system from, in accordance with technical requirements.
+
+We also store whatever data you create or maintain in your home directory on Thunix, which may include emails to and from your Thunix account.
+
+## How long do we retain data about you?
+
+Your email address is retained only long enough to process you account creation request. IPs you log into from are retained for a maximum of 30 days.
+
+## How can I request a copy of my data?
+
+You can submit a request at [contact page](/contact). We will endeavor to provide you a copy of all data we store within 14 days.
+
+## How can I request removal of my information?
+
+You can submit a request at [contact page](/contact), and we will endeavor to remove all personal data of yours from our system within 14 days. However, this will include removal of your user account from our system as well, which will prevent access to most of the services provided by Thunix.
+
+If you request deletion of your account, all of your data will be purged within 14 days from our system.
+
+## How do you protect my data?
+
+All data on thunix is encrypted at rest. Logs are maintained only for as long as is technically required (30 days, for troubleshooting of issues). Personally created data, is protected by the UNIX permissions model, as dictated by yourself, however, by default, your personally created data is viewable by all other users of the system, per design.
--- a/articles/main.md
+++ b/articles/main.md
@ -0,0 +1,32 @@
+# Welcome to thunix!
+
+We're so glad you could drop by and we hope you enjoy your visit. Stay a while! Feel free to inquire about what we have to offer and explore our services.
+
+
+## About thunix
+
+The Thunix project provide Secure Shell (SSH) accounts, Web Hosting, Email Accounts, and many other UNIX-like services. But, most of all, we are a community of users. It was founded by hexhaxtron in the Summer of 2017, and was continued by [ubergeek](/~ubergeek) since 2018 however in 2023 [deepend](/~deepend) has since taken the role. We aim to provide the best service possible with a wide variety of features, and we hope you have fun with it!
+
+
+Join us on IRC on irc.newnet.net/6697 in the #thunix channel, or just click here for a web client: [![#thunix channel](https://stats.newnet.net/badges/badge.php?channel=%23thunix)](https://tilde.chat/kiwi/#thunix)
+
+If you want to sign up for an account, simply open our [signup form](/signup) and provide us with:
+
+* Your contact name
+* Your email address (so that we can contact you with login details)
+* Your desired username (all lowercase, alphanumeric characters only, no spaces)
+* How you heard about us and what interests you in thunix
+* Your Public SSH Key
+
+thunix tries to adhere to the values and philosophy of the Hacker Ethic whenever possible. The hacker ethics and beliefs as described by Levy are:
+
+* Access to computers - and anything which might teach you something about the way the world works - should be unlimited and total. Always yield to the Hands-On Imperative!
+* All information should be free
+* Mistrust authority - promote decentralization
+* Hackers should be judged by their hacking, not criteria such as degrees, age, race, sex, or position
+* You can create art and beauty on a computer
+* Computers can change your life for the better
+
+thunix will never use proprietary software but users can do that if they wish. This is something they should avoid however.
+
+If you want to help keep thunix running, please consider [donating](/donate).
--- a/articles/news.md
+++ b/articles/news.md
@ -0,0 +1,7 @@
+# State of the Thunix - July 2023
+
+We are on the mend.   deepend from tilde.club has taken on running Thunix and has started to build it up on his
+own infrastructure.   Sign ups that come in will be kept in queue until the system is ready
+for more users. 
+
+More to come very soon.
--- a/articles/server.md
+++ b/articles/server.md
@ -0,0 +1,45 @@
+# Service Status and Information
+
+## Minetest
+
+Connect to thunix.net:30000 in your minetest client
+
+## Minecraft
+
+Connect to thunix.net in your minecraft client. Running the Paperclip minecraft server.
+
+## Mail Services
+
+Thunix offers webmail at [https://thunix.net/webmail](/webmail). You can also connect via imap. Thunderbird will autodetect your settings, and we recommend the use of Thunderbird email client, so you can get the best-of-breed email experience. We also recommend using enigmail with Thunderbird as well. You can get it from your distro's package manager, or from [the Thunderbird project's site](https://www.thunderbird.net/)
+
+## SSH Fingerprints
+
+256 SHA256:iuqEWXCqUNihqO7o4xLrJ05M+te09i3P+WrHZsjUdZY thunix.net (ECDSA)  
+3072 SHA256:7gZXCqNUYBfrTQ8wYmLrD6rVc5zL5nYf2l5t8ZrLIBU thunix.net (RSA)  
+256 SHA256:d+J8u5pmQ8sR1BM8/EpUiNAlL9by371utl1ncNgFG6A thunix.net (ED25519)  
+ 
+## Onion Service
+
+Thunix's websites are available as a onion site as well. (SSH access is currently not available over Tor)
+Our Tor network (The Onion Router) address is kbguajmip4jlr2k3vpscmvymtxqnft267ox2ij6pdrgb5jcvx3kctkyd.onion.
+
+## BZFlag Game Server
+
+BZFlag runs on the standard port. If you have a specific map you want loaded, send an email to [root](mailto:root@thunix.net), and we'll look at getting the map swapped out
+
+## IRC Chat
+
+Thunix is part of the Newnet IRC network. You can access chat via the terminal, with the 'chat' command, via your favorite email client at irc.newnet.net/6697, or via a web chat interface located [![#thunix channel](https://stats.newnet.net/badges/badge.php?channel=%23thunix)](https://web.newnet.net/?join=thunix). 
+
+
+## FOSS Project Mirrors 
+
+Thunix hosts mirrors for several FOSS projects. You can see the full mirror list in the sidebar link.
+
+## Website and CMS hosting
+
+Collaborative creation, modification and management of digital content.
+- LAMP (Apache HTTP server, MySQL database and PHP scripting language) is an open source software stack on Linux environment, available to host a variety of web sites, content management systems and applications.
+- Django web development framework.
+
+<!-- Begin autogen content from /includes/server.php -->
--- a/articles/signup.md
+++ b/articles/signup.md
@ -0,0 +1,19 @@
+To sign up for an account with thunix, please fill in the form below. Be sure to include a contact name, email address, a desired username, a little blurb about your interest in us and a public SSH key. Once you've filled in the form, click on the send button; the signup form will be processed and you'll receive an email, with instructions on how to log into your new account.
+
+If you have any questions or problems, feel free to contact us.
+
+<form action='/includes/signup.php'>
+<table>
+<tr><td>Contact Name:</td> <td><input type='text' name='contact_name'></td></tr>
+<tr><td>Email Address:</td> <td> <input type='text' name='email_address'></td></tr>
+<tr><td>Desired Username:</td> <td> <input type='text' name='username'></td></tr>
+<tr><td>What interests you about thunix:</td> <td> <textarea name='interest' rows = "3" cols = "80"></textarea></td></tr>
+<tr><td>SSH Public Key:</td> <td> <textarea name='pubkey' rows = "5" cols = "80"></textarea></td></tr>
+<tr><td>Type the word tildeverse here:</td> <td> <input type='text' name='tv'></td></tr>
+</table>
+<input type='submit'>
+</form>
+
+If you don't have a public SSH key, don't worry! Check out [this guide to SSH keys](https://wiki.thunix.net/wiki/ssh) and make sure that you only fill in your public SSH key here.
+
+Signing up implies that you agree with our [terms of service](/tos). If you haven't done so, please read it before you sign up.
--- a/articles/success1.md
+++ b/articles/success1.md
@ -0,0 +1,3 @@
+# Form Failure 
+
+You didn't properly fill out the signup form.  Please try again.
--- a/articles/success2.md
+++ b/articles/success2.md
@ -0,0 +1,3 @@
+# Success!
+
+You will hear back shortly from us!
--- a/articles/success3.md
+++ b/articles/success3.md
@ -0,0 +1,3 @@
+# Form Failure 
+
+This username is already registered, please choose another one.
--- a/articles/success4.md
+++ b/articles/success4.md
@ -0,0 +1,3 @@
+# Form Failure 
+
+Please check SSH public key format.
--- a/articles/tos.md
+++ b/articles/tos.md
@ -0,0 +1,43 @@
+# Terms of Service
+
+Nothing is without its rules and regulations; thunix is no exception.
+
+Below are the site's service terms. Everything in this page should be clear to everyone who wishes to use thunix's services; failure to abide by these terms can result in penalties such as service bans and may result in legal action against any offending users, depending on the severity of each case and any other individuals who may have been affected. Thunix may conduct investigations on any suspected violations, and we will cooperate with law enforcement agencies with their investigations. Be sure to read this page carefully and understand it.
+
+You are responsibe for checking your local mail account from time to
+time. This email address is the only one we retain, and as such, any
+warnings and notices regarding your account, or service status will be
+sent to this account.
+
+1.  Deliberately defacing the accounts of other users.
+2.  Deliberately trying to disrupt thunix's server.
+3.  Using thunix as a launch pad for disrupting other servers.
+4.  Using thunix to impersonate other websites and businesses for
+    criminal purposes.
+5.  Storing/distributing pornography of any genre and medium (especially
+    child pornography).
+6.  Storing/distributing content that defames any individual.
+7.  Promoting racial, ethnic, religious, political and other forms of
+    bigotry.
+8.  Storing/distributing, promoting, or encouraging use of
+    pirated/cracked software, license keys, license/registration
+    circumvention programs, or any questionable programs/scripts that
+    can risk causing unauthorized modifications, or disrupts network
+    services for any programs or devices.
+9.  Mining cryptocurrencies.
+10. Spamming on any forums, mailing lists, irc channels,
+    newsgroups, etc.
+11. Leaking or publishing any user's or individual's personal
+    information without that person's consent.
+12. If you think what you are doing is illegal, it probably is.
+13. Our services must not be used for commercial reasons.
+14. We backup your data on a best-endeavours basis, but you should take your own backups.
+15. Our support is volunteer led; we are all helping each other.
+16. Do not resell our services under any circumstances.
+17. If your service is attacked on a regular basis, we reserve the right to shut it down.
+
+Copyright infringement is not allowed on thunix, and we will not allow any illegal content to be distributed. It's also expected that all users respect the copyrights of those who produce original content of any kind and only share if the author or license grants you permission. Content hosted on accounts used for external file storage must also follow copyright law.
+
+If you want to request for content you own the copyright for to be removed from thunix, please refer to our [abuse reporting page](/contact). In the email, please identify who you are, if you are the copyright holder or legally representing them, the exact files you want removed with links to the files and infringed content, and contact information such as phone numbers or a reply-to email address.
+
+Users that repeatedly violate the Terms of Service will have their account removed. Depending on the degree of the offense, their account may be removed immediately. These terms also apply to communication services such as forums, mailing lists, irc channels, newsgroups, and any other service either hosted on or used for thunix. If you come across anything that violates the terms of service, please let us know with the [abuse reporting page](/contact).
--- a/articles/users.md
+++ b/articles/users.md
@ -0,0 +1,5 @@
+# Users
+
+Below is a list of user web directories:
+
+<!-- Begin Autogen user content from /includes/users.php -->
--- a/config.php
+++ b/config.php
@ -0,0 +1,13 @@
+<?php
+//Name of your site
+$site_name="🌻  thunix  🌻";
+
+//Root for the site, in a browser
+$site_root="https://".$_SERVER['HTTP_HOST'];
+//Local base root for app files
+$doc_root="/var/www/thunix.cf";
+
+//Site style
+// site is the default.  Specify something else here to switch
+$site_style="newthunix";
+?>
--- a/contact.php
+++ b/contact.php
@ -1,5 +0,0 @@
-<?php include 'HEADER.php';?>
-<title>Contact Us - thunix Shell Provider and Web Host</title>
-<h2>Contact Us</h2>
-<p>(Coming soon)</p>
-<?php include 'FOOTER.php';?>
--- a/copyright.php
+++ b/copyright.php
@ -1,5 +0,0 @@
-<?php include 'HEADER.php';?>
-<title>Copyright Notices and Acknowledgements - thunix Shell Provider and Web Host</title>
-<h2>Copyright Notices and Acknowledgements</h2>
-<p>(Coming soon)</p>
-<?php include 'FOOTER.php';?>
--- a/donate.php
+++ b/donate.php
@ -1,8 +0,0 @@
-<?php include 'HEADER.php';?>
-<title> - thunix Shell Provider and Web Host</title>
-<h2>Donations</h2>
-<p>This server costs money to operate.  It's also operated as a labor of love and goodwill for the community</p>
-<p>That being said, the price breakdown right now is 38Euro/month.  So help with server costs, and time spent, for now, you can send some BTC my (ubergeek's) way</p>
-<p>1DFM3qY7XmCxGTFPATSQJVCNjvmWiVubGN</p>
-<p>I'll set up a Patreon or Liberapay soonish.</p>
-<?php include 'FOOTER.php';?>
--- a/faq.php
+++ b/faq.php
@ -1,13 +0,0 @@
-<?php include 'HEADER.php';?>
-<title>Frequently Asked Questions - thunix Shell Provider and Web Host</title>
-<h2>Frequently Asked Questions</h2>
-
-<p><b>How do I sign up for an account?</b><br>
-You can ask in #thunix on tilde.chat, or you can email amcclure (with the instructions on the main page).
-<p><b>Who is running thunix?</b><br>
-The current system administrators are <a href="/~amcclure">amcclure</a> and <a href="/~ubergeek">ubergeek</a>.
-<p><b>What happened to the old thunix?  Why the name change?</b><br>
-The original machine and founder dissappeared without any warning to anyone, including server staff.
-For this reason, most things were not backed up. The founder hexhaxtron is currently not reachable,
-so we needed to obtain a new domain name, and a new set of machines.
-<?php include 'FOOTER.php';?>
--- a/favicon.png
+++ b/favicon.png
--- a/githook.php
+++ b/githook.php
@ -0,0 +1,112 @@
+<?php
+/* gitea deploy webhook for thunix*/
+/*
+ * So, this webhook current accepts hooks for www, ansible, and soon
+ * gopher.  It's pretty extensible, and is currently written for gitea,
+ * but things like gitlab, github, etc should be feasible, if not
+ * downright easy.
+ * 
+ * While this 'should' work fine with numberic keys, and has been
+ * tested, php's loose casting makes it a crap shoot.  We should
+ * probably not start tokens with a 0, or a number for that matter?
+ * All project hooks need to use the same key.
+ * 
+ * Also, tildegit's IP address is hard-wired here, so we only accept
+ * hooks from tildegit.  This will need that change, if it moves.
+
+/* security */
+$access_token     = "secret";
+$www_lastrun      = '/dev/shm/www-hook-last-run';
+$www_dropfile     = '/dev/shm/run-www';
+$gopher_lastrun   = '/dev/shm/gopher-hook-last-run';
+$gopher_dropfile  = '/dev/shm/run-gopher';
+$wiki_lastrun     = '/dev/shm/wiki-hook-last-run';
+$wiki_dropfile    = '/dev/shm/run-wiki';
+
+$allowedip        = '198.50.210.248';
+$remoteip         = $_SERVER['REMOTE_ADDR'];
+$ratelimit        = 300;
+
+/* get json data */
+$json = file_get_contents('php://input');
+$data = json_decode($json, true);
+
+
+/* check our token */
+$client_token = $data["secret"];
+if ( strcmp($client_token, $access_token) !== 0 ) 
+{
+	http_response_code(403); 
+	echo "HTTP 403 - Forbidden, P1.\n";
+	exit(0);
+}
+
+/* check our source ip for the hook */
+if ( strcmp($remoteip, $allowedip) !== 0 )
+{
+	http_response_code(403);
+	echo "HTTP 403 - Forbidden, P2.\n";
+	exit(0);
+}
+
+// Hook for www repo here.  Same rules apply, as above, for www.  We
+// could probably make it able to run more frequently.  Backend job is
+// just a git pull, and is quick.
+elseif ($data["repository"]["full_name"] == 'thunix/www') {
+	syslog(LOG_INFO, 'WWW Webhook recieved.');
+	if ( time () - filemtime ( $www_lastrun ) > $ratelimit/30 ) {
+		touch ( $www_dropfile );
+		touch ( $www_lastrun );
+		http_response_code(200);
+		echo "HTTP 200 - WWW webhook recieved.\n";
+		} 
+	else {
+		http_response_code(429);
+		echo "HTTP 429 - Rate Limited.\n";
+		exit(0);
+		}
+}
+
+// Hook for gopher.  Not implemented on the backend yet.
+elseif ($data["repository"]["full_name"] == 'thunix/thunix_gopher') {
+	syslog(LOG_INFO, 'Gopher Webhook recieved.');
+	if ( time () - filemtime ( $gopher_lastrun ) > $ratelimit ) {
+		touch ( $gopher_dropfile );
+		touch ( $gopher_lastrun );
+		http_response_code(200);
+		echo "HTTP 200 - Gopher webhook recieved.\n";
+		} 
+	else {
+		http_response_code(429);
+		echo "HTTP 429 - Rate Limited.\n";
+		exit(0);
+		}
+}
+
+//Wiki webhook
+elseif ($data["repository"]["full_name"] == 'thunix/wiki') {
+  syslog(LOG_INFO, 'Wiki Webhook recieved.');
+  if ( time () - filemtime ( $wiki_lastrun ) > $ratelimit/30 ) {
+    touch ( $wiki_dropfile );
+    touch ( $wiki_lastrun );
+    http_response_code(200);
+    echo "HTTP 200 - Wiki webhook recieved.\n";
+    }
+  else {
+    http_response_code(429);
+    echo "HTTP 429 - Rate Limited.\n";
+    exit(0);
+    }
+}
+
+// Easter egg for anyone probing the hook.  Enjoy.  We're a tea pot
+// and not a coffee maker :)
+else {
+	http_response_code(418);
+	echo "HTTP 418 - I'm a teapot.\n";
+	syslog(LOG_INFO, "Tea Pot Webhook recieved.\n");
+	exit(0);
+	}
+
+?>
+
--- a/humans.txt
+++ b/humans.txt
@ -0,0 +1,16 @@
+    /* TEAM */
+    Your title: deepend, naglfar
+    Site: https://thunix.net, root@thunix.net 
+    Location: Quebec, Canada
+    							
+    /* THANKS */
+    Name: deepend     https://thunix.net/~deepend
+          ubergeek    https://thunix.net/~ubergeek
+          naglfar     https://thunix.net/~naglfar
+					fosslinux		https://thunix.net/~fosslinux
+                                
+    /* SITE */
+    Last update: 2023/12/26 
+    Standards: HTML5
+    Components: Apache2, Git, and PHP, Parsedown, Parsedown Extra
+    Software: vim, geany, ansible, wiki.php 
--- a/includes/contact.php
+++ b/includes/contact.php
@ -0,0 +1,34 @@
+<?php
+include "../config.php";
+// This code is licensed under the AGPL 3 or later by ubergeek (https://tildegit.org/ubergeek)
+
+$name             = $_GET['contact_name'];
+$return_addr      = $_GET['email_address'];
+$type             = $_GET['type'];
+$body             = $_GET['message'];
+
+$tv               = $_GET['tv'];
+
+$destination_addr = "root@thunix.net";
+$subject          = "Contact Form";
+$mailbody         = "The following submission via the contact form was recieved:
+
+Real Name:      $name
+Type:           $type
+Message:        $body";
+
+if ( $tv != "tildeverse" ) {
+    print "Spam attempt";
+    header("Location: $site_root/?page=success1");
+    die();
+}
+
+shell_exec("echo '$mailbody' | /usr/bin/mail -s '$subject' -r '$return_addr' $destination_addr ");
+
+// In the future, here, we *should* be able to build a process that 
+// auto opens an issue in the tildegit project
+
+header("Location: $site_root/?page=success2");
+die()
+
+?>
--- a/includes/dot.ttf
+++ b/includes/dot.ttf
--- a/includes/footer.md
+++ b/includes/footer.md
@ -0,0 +1,5 @@
+All content is licensed as [CC BY-SA 4.0 license](https://creativecommons.org/licenses/by-sa/4.0/).  Users define their own licensing and own all of their content.
+
+All questions, comments, and concerns about this site should be sent to [the administration team](/contact).
+
+Created with valid [HTML](https://validator.w3.org/check?uri=referer) and [CSS](https://jigsaw.w3.org/css-validator/check/referer) code.
--- a/includes/header.md
+++ b/includes/header.md
@ -0,0 +1 @@
+![🌻 thunix🌻](/media/thunix.gif)
--- a/includes/minithunix.css
+++ b/includes/minithunix.css
@ -0,0 +1,15 @@
+body{font-family:"Courier New",Courier,monospace;background:#000;color:lime}
+#body{width:95%}
+#body h1{color:green}
+#body h2{color:green}
+#body h3{color:green}
+#body a{background:#000;color:lime}
+#body a:visited{color:green}
+#header{width:90%;text-align:center;font-size:xx-large}
+#content{width:78%;float:left;font-size:medium}
+#content img{max-height:400px;max-width:98%}
+.lineitem{border:1px;border-color:#fff}
+#sidebar{width:18%;float:right;font-size:small}
+#sidebar h1{color:green;background:#000}
+#sidebar h2{color:green;background:#000}
+#footer{width:95%;text-align:center;clear:both;font-size:smaller}
--- a/includes/newthunix.css
+++ b/includes/newthunix.css
@ -0,0 +1,16 @@
+@font-face { font-family: dot; src: url('https://thunix.net/includes/dot.ttf'); }
+body{font-family:"dot",Courier,monospace;background:#000;color:#F79862}
+#body{width:95%}
+#body h1{color:orange}
+#body h2{color:orange}
+#body h3{color:orange}
+a{background:#000;color:#F79862}
+a:visited{color:orange}
+#header{width:90%;text-align:center;font-size:xx-large}
+#content{width:78%;float:left;font-size:medium}
+#content img{max-height:400px;max-width:98%}
+.lineitem{border:1px;border-color:#fff}
+#sidebar{width:18%;float:right;font-size:small}
+#sidebar h1{color:orange;background:#000}
+#sidebar h2{color:orange;background:#000}
+#footer{width:95%;text-align:center;clear:both;font-size:smaller}
--- a/includes/report
+++ b/includes/report
@ -0,0 +1,8 @@
+thunix.net,sshd,GOOD
+thunix.net,BZFlag_Server,GOOD
+thunix.net,Memory,GOOD
+thunix.net,Minetest_Server,GOOD
+thunix.net,web_site,GOOD
+thunix.net,web_site_https,GOOD
+thunix.net,imap,GOOD
+thunix.net,smtp,GOOD
--- a/includes/server.php
+++ b/includes/server.php
@ -0,0 +1,48 @@
+<?php
+// Monitoring section
+
+$hosts="all";
+
+$f = fopen("$doc_root/report", "r");
+
+echo "Last update: " . date ("H:i", filemtime('./report'))."<p>\n";
+echo "<table style='width:80%'>";
+echo " <tr>
+       <th>Host</th>
+       <th>Check</th>
+       <th>Status</th>
+       </tr>";
+while (($line = fgetcsv($f)) !== false) {
+  echo "<tr>";
+  if ($hosts == "failed" ) {
+    if ($line[2] == "FAILED") {
+      foreach ($line as $cell) {
+        if ($cell == "FAILED") {
+            echo '<td style="color:#FF0000">' . htmlspecialchars($cell) . '</td>';
+        }
+        else {
+          echo "<td>" .htmlspecialchars($cell) . "</td>";
+        }
+      }
+    }
+  }
+  elseif ($hosts == "all") {
+    foreach ($line as $cell) {
+      if ($cell == "FAILED") {
+      echo '<td style="color:#FF0000">' . htmlspecialchars($cell) . '</td>';
+    }
+    elseif ($cell=="GOOD") {
+      echo '<td style="color:#00FF00">' . htmlspecialchars($cell) . "</td>";
+    }
+    else {
+      echo "<td>" .htmlspecialchars($cell) . "</td>";
+      }
+    }
+  }
+  echo "</tr>\n";
+}
+echo "\n</table>\n";
+fclose($f);
+
+// End monitoring section
+?>
--- a/includes/sidebar.md
+++ b/includes/sidebar.md
@ -0,0 +1,30 @@
+-   Main Menu
+    ---------
+
+    -   [Home](/main)
+    -   [FAQ](/faq)
+    -   [Terms of Service](/tos)
+    -   [GDPR Statement and Privacy Policy](/gdpr)
+    -   [Contact Us](/contact)
+    -   [Sign Up](/signup)
+    -   [Donations](/donate)
+-   Status of Servers and Services
+    ---------------------------
+
+    -   [Status and Information](/server)
+    -   [thunix Mirror Services](https://ftp.thunix.net/)
+    -   [Web Server Stats](https://stats.thunix.net/)
+    -   [Web Mail](/webmail/)
+    -   [ZNC Service](https://thunix.net:1356/)
+    -   [Service News](/news)
+-   Main Resources On This Site
+    ---------------------------
+
+    -   [Wiki](https://wiki.thunix.net/)
+    -   [User Web Directories](/users)
+    -   [User Gopher Directories](https://gopher.tildeverse.org/thunix.net)
+-   Server Staff
+    ------------
+
+    -   [deepend](/~deepend/)
+    -   [Naglfar](/~naglfar/)
--- a/includes/signup.php
+++ b/includes/signup.php
@ -0,0 +1,63 @@
+<?php
+// This code is licensed under the AGPL 3 or later by ubergeek (https://tildegit.org/ubergeek)
+include "../config.php";
+
+$name             = $_GET['contact_name'];
+$email            = $_GET['email_address'];
+$username         = $_GET['username'];
+$interest         = $_GET['interest'];
+$pubkey           = $_GET['pubkey'];
+$tv               = $_GET['tv'];
+
+// username passed lowercased
+$username = strtolower($username);
+
+// strip new line characters from the end
+$pubkey = trim($pubkey);
+
+$from 		  = 'From: www-data <www-data@thunix.net>';
+$destination_addr = "newuser@thunix.net";
+$subject          = "New User Registration";
+$mailbody         = "A new user has tried to register.
+Username:       $username
+Real Name:      $name
+Email Address:  $email
+Interest:       $interest
+Pubkey:         $pubkey";
+
+// In the future, here, we *should* be able to build a process that 
+// somehow auto-verifies the user, and instead of email, it'll kick off the new user process here
+
+$user_queue       = '/dev/shm/userqueue';
+
+// Spam attempt
+$success = 'success1';
+if ( $tv == "tildeverse" )
+{
+  // Success!
+  $success = 'success2';
+  
+// Check if username already taken
+if (posix_getpwnam($username)) {
+    $success = 'success3';
+}
+
+// Simple SSH public key format check
+$valid_key_starts = ['ssh-rsa', 'ssh-dss', 'ecdsa-sha2', 'ssh-ed25519'];
+$key_parts = explode(' ', $pubkey, 3);
+if (!in_array($key_parts[0], $valid_key_starts) || count($key_parts) < 2) {
+    $success = 'success4';
+}
+
+if ($success == "success2") {
+    mail($destination_addr, $subject, $mailbody, $from);
+    $fp = fopen($user_queue, 'a');
+    fwrite($fp, "'$username','$email','$pubkey'\n");
+    fclose($fp);
+}
+}
+
+header("Location: $site_root/?page=$success");
+die();
+
+?>
--- a/includes/site.css
+++ b/includes/site.css
@ -0,0 +1,40 @@
+/*
+This file is licensed under the GPL 3.0 or later.
+*/
+
+body {
+	font-family: "Courier New", Courier, monospace;
+}
+
+#body {
+	width: 95%;
+}
+
+#header {
+	width: 90%;
+	text-align: center;
+	font-size: xx-large;
+}
+#content {
+	width: 78%;
+	float: left;
+	font-size: medium;
+}
+
+#content img {
+  max-height: 400px;
+  max-width: 98%;
+}
+
+#sidebar {
+	width: 18%;
+	float: right;
+	font-size: small;
+}
+
+#footer {
+	width: 90%;
+	text-align: center;
+	clear: both;
+	font-size: smaller;
+}
--- a/includes/thunix.css
+++ b/includes/thunix.css
@ -0,0 +1,78 @@
+/*
+This file is licensed under the GPL 3.0 or later.
+*/
+
+body {
+	font-family: "Courier New", Courier, monospace;
+	background: black;
+	color: lime;
+}
+
+#body {
+	width: 95%;
+}
+
+#body h1 {
+	color: green;
+}
+
+#body h2 {
+	color: green;
+}
+
+#body h3 {
+	color: green;
+}
+
+#body a {
+	background: black;
+	color: lime;
+}
+
+#body a:visited {
+	color: green;
+}
+
+#header {
+	width: 90%;
+	text-align: center;
+	font-size: xx-large;
+}
+#content {
+	width: 78%;
+	float: left;
+	font-size: medium;
+	text-align: justify;
+}
+
+#content img {
+  max-height: 400px;
+  max-width: 98%;
+}
+
+.lineitem {
+	border: 1px;
+	border-color:white;
+}
+#sidebar {
+	width: 18%;
+	float: right;
+	font-size: small;
+}
+
+#sidebar h1 {
+	color: green;
+	background: black;
+}
+
+#sidebar h2 {
+	color: green;
+	background: black;
+}
+
+#footer {
+	width: 95%;
+	text-align: center;
+	clear: both;
+	font-size: smaller;
+}
--- a/includes/users.php
+++ b/includes/users.php
@ -0,0 +1,17 @@
+<?php
+$html_skel='/etc/skel/public_html/index.html';
+print "<!-- Begin autogen userdir list -->";
+print "<ul style='list-style: none; margin-left: -40px;'>";
+foreach (glob("/home/*") as $userpath):
+    if (is_dir("$userpath/public_html"))
+    {
+	$user = basename($userpath);
+	if(sha1_file($html_skel) == sha1_file("$userpath/public_html/index.html") || count(scandir("$userpath/public_html")) == 2)
+	  print"<li>~$user</li>\n";
+	else
+	  print"<li><a href='$site_root/~$user/'>~$user</a></li>\n";
+    }
+endforeach;
+print "</ul></div>
+<!-- End Autgen userdir list -->";
+?>
--- a/index.php
+++ b/index.php
@ -1,65 +0,0 @@
-<?php include 'HEADER.php';?>
-<title>thunix Home Page - thunix Shell Provider and Web Host</title>
-<h2>Welcome to thunix Shell Provider and Web Host!</h2>
-<h3>Main Resource On This Site</h3>
-<p>
-<ul>
-<li><a href="users.php">User Web Directories</a>;</li>
-<li><a href="server.php">Status of thunix Servers and Services</a>;</li>
-</ul>
-</p>
-
-<h3>About thunix Shell Provider and Web Host</h3>
-<p>thunix offers Secure Shell (SSH) accounts, Web Hosting, Email Accounts,
-and many other services. It was founded by hexhaxtron in the Summer of 2017,
-and was continued by <a href="/~amcclure">amcclure</a> and <a href="/~ubergeek">ubergeek</a>
-since 2018. We aim to provide the best service possible with a wide variety of features,
-and we hope you have fun with it!</p>
-<h3>thunix Phoenix</h3>
-<p>The thunix Phoenix project aims to provide a new user experience for shell users, with
-integration into Ben Harris's Tildeverse network.</p>
-<p>Join us on IRC at tilde.chat in these channels:
-	<ul>
-	<li>#thunix - General discussion about thunix and thunix services, including issues. Shell-specific issues go in #phoenix.</li>
-	<li>#phoenix - Discussion about the phoenix shell server, including issues.</li>
-	</ul>
-</p>
-<p>If you want to sign up for an account, send an email to <a href="mailto:newuser@thunix.cf"><code>&lt;newuser@thunix.cf&gt;</code></a> with:
-	<ul>
-	<li>Your desired username (all lowercase, alphanumeric characters only, no spaces)</li>
-	<li>An alternate username (in case the desired username is unavailable) (all lowercase, alphanumeric characters only, no spaces)</li>
-	<li>Contact email address</li>
-	<li>How you heard about thunix</li>
-	<li>What interests you in thunix</li>
-	<li>Public SSH Key</li>
-	</ul>
-</p>
-<p>thunix tries to adhere to the values and philosophy of the Hacker Ethic whenever possible. The hacker ethics and beliefs as described by Levy are:
-	<ul>
-	<li>Access to computers - and anything which might teach you something about the way the world works - should be unlimited and total. Always yield to the Hands-On Imperative!</li>
-	<li>All information should be free</li>
-	<li>Mistrust authority - promote decentralization</li>
-	<li>Hackers should be judged by their hacking, not criteria such as degrees, age, race, sex, or position</li>
-	<li>You can create art and beauty on a computer</li>
-	<li>Computers can change your life for the better</li>
-	</ul>
-</p>
-<p>thunix will never use proprietary software but users can do that if they wish. This is something they should avoid however.</p>
-<p>If you want to help keep thunix running, please consider <a href="donate.php">donating</a>.</p>
-
-<h3>Server Staff</h3>
-<ul>
-<li><a href="/~amcclure/"><b>Head Administrator:</b> Anton McClure</a></li>
-<li><a href="/~ubergeek/"><b>Administrator & Server Host:</b> Ubergeek</a></li>
-</ul>
-
-<h3>Other information and resources</h3>
-<ul>
-<li>(Coming soon)</li>
-<!--<li><a href=""></a>;</li>-->
-</ul>
-<p>Note that most content on thunix are provided by thunix's users, not the owner of
-the server. Comments should be addressed to the owner of the web directory in the
-first instance - their email address here is <code>&lt;username&gt;@thunix.cf</code>
-unless otherwise specified within their web directory.</p>
-<?php include 'FOOTER.php';?>
--- a/media/gotthunix.png
+++ b/media/gotthunix.png
--- a/media/mail.png
+++ b/media/mail.png
--- a/media/thunix.gif
+++ b/media/thunix.gif
--- a/media/thunix.png
+++ b/media/thunix.png
--- a/page.php
+++ b/page.php
@ -1,5 +0,0 @@
-<?php include 'HEADER.php';?>
-<title> - thunix Shell Provider and Web Host</title>
-<h2></h2>
-<p></p>
-<?php include 'FOOTER.php';?>
--- a/parsedown-1.7.3/LICENSE.txt
+++ b/parsedown-1.7.3/LICENSE.txt
@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2013-2018 Emanuil Rusev, erusev.com
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/parsedown-1.7.3/Parsedown.php
+++ b/parsedown-1.7.3/Parsedown.php
--- a/parsedown-1.7.3/README.md
+++ b/parsedown-1.7.3/README.md
@ -0,0 +1,86 @@
+> I also make [Caret](https://caret.io?ref=parsedown) - a Markdown editor for Mac and PC.
+
+## Parsedown
+
+[![Build Status](https://img.shields.io/travis/erusev/parsedown/master.svg?style=flat-square)](https://travis-ci.org/erusev/parsedown)
+<!--[![Total Downloads](http://img.shields.io/packagist/dt/erusev/parsedown.svg?style=flat-square)](https://packagist.org/packages/erusev/parsedown)-->
+
+Better Markdown Parser in PHP
+
+[Demo](http://parsedown.org/demo) |
+[Benchmarks](http://parsedown.org/speed) |
+[Tests](http://parsedown.org/tests/) |
+[Documentation](https://github.com/erusev/parsedown/wiki/)
+
+### Features
+
+* One File
+* No Dependencies
+* Super Fast
+* Extensible
+* [GitHub flavored](https://help.github.com/articles/github-flavored-markdown)
+* Tested in 5.3 to 7.1 and in HHVM
+* [Markdown Extra extension](https://github.com/erusev/parsedown-extra)
+
+### Installation
+
+Include `Parsedown.php` or install [the composer package](https://packagist.org/packages/erusev/parsedown).
+
+### Example
+
+``` php
+$Parsedown = new Parsedown();
+
+echo $Parsedown->text('Hello _Parsedown_!'); # prints: <p>Hello <em>Parsedown</em>!</p>
+```
+
+More examples in [the wiki](https://github.com/erusev/parsedown/wiki/) and in [this video tutorial](http://youtu.be/wYZBY8DEikI).
+
+### Security
+
+Parsedown is capable of escaping user-input within the HTML that it generates. Additionally Parsedown will apply sanitisation to additional scripting vectors (such as scripting link destinations) that are introduced by the markdown syntax itself.
+
+To tell Parsedown that it is processing untrusted user-input, use the following:
+```php
+$parsedown = new Parsedown;
+$parsedown->setSafeMode(true);
+```
+
+If instead, you wish to allow HTML within untrusted user-input, but still want output to be free from XSS it is recommended that you make use of a HTML sanitiser that allows HTML tags to be whitelisted, like [HTML Purifier](http://htmlpurifier.org/).
+
+In both cases you should strongly consider employing defence-in-depth measures, like [deploying a Content-Security-Policy](https://scotthelme.co.uk/content-security-policy-an-introduction/) (a browser security feature) so that your page is likely to be safe even if an attacker finds a vulnerability in one of the first lines of defence above.
+
+#### Security of Parsedown Extensions
+
+Safe mode does not necessarily yield safe results when using extensions to Parsedown. Extensions should be evaluated on their own to determine their specific safety against XSS.
+
+### Escaping HTML
+> ⚠️  **WARNING:** This method isn't safe from XSS!
+
+If you wish to escape HTML **in trusted input**, you can use the following:
+```php
+$parsedown = new Parsedown;
+$parsedown->setMarkupEscaped(true);
+```
+
+Beware that this still allows users to insert unsafe scripting vectors, such as links like `[xss](javascript:alert%281%29)`.
+
+### Questions
+
+**How does Parsedown work?**
+
+It tries to read Markdown like a human. First, it looks at the lines. It’s interested in how the lines start. This helps it recognise blocks. It knows, for example, that if a line starts with a `-` then perhaps it belongs to a list. Once it recognises the blocks, it continues to the content. As it reads, it watches out for special characters. This helps it recognise inline elements (or inlines).
+
+We call this approach "line based". We believe that Parsedown is the first Markdown parser to use it. Since the release of Parsedown, other developers have used the same approach to develop other Markdown parsers in PHP and in other languages.
+
+**Is it compliant with CommonMark?**
+
+It passes most of the CommonMark tests. Most of the tests that don't pass deal with cases that are quite uncommon. Still, as CommonMark matures, compliance should improve.
+
+**Who uses it?**
+
+[Laravel Framework](https://laravel.com/), [Bolt CMS](http://bolt.cm/), [Grav CMS](http://getgrav.org/), [Herbie CMS](http://www.getherbie.org/), [Kirby CMS](http://getkirby.com/), [October CMS](http://octobercms.com/), [Pico CMS](http://picocms.org), [Statamic CMS](http://www.statamic.com/), [phpDocumentor](http://www.phpdoc.org/), [RaspberryPi.org](http://www.raspberrypi.org/), [Symfony demo](https://github.com/symfony/symfony-demo) and [more](https://packagist.org/packages/erusev/parsedown/dependents).
+
+**How can I help?**
+
+Use it, star it, share it and if you feel generous, [donate](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=528P3NZQMP8N2).
--- a/parsedown-1.7.3/composer.json
+++ b/parsedown-1.7.3/composer.json
@ -0,0 +1,33 @@
+{
+    "name": "erusev/parsedown",
+    "description": "Parser for Markdown.",
+    "keywords": ["markdown", "parser"],
+    "homepage": "http://parsedown.org",
+    "type": "library",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Emanuil Rusev",
+            "email": "hello@erusev.com",
+            "homepage": "http://erusev.com"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.0",
+        "ext-mbstring": "*"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^4.8.35"
+    },
+    "autoload": {
+        "psr-0": {"Parsedown": ""}
+    },
+    "autoload-dev": {
+        "psr-0": {
+            "TestParsedown": "test/",
+            "ParsedownTest": "test/",
+            "CommonMarkTest": "test/",
+            "CommonMarkTestWeak": "test/"
+        }
+    }
+}
--- a/parsedown-extra-0.7.1/.travis.yml
+++ b/parsedown-extra-0.7.1/.travis.yml
@ -0,0 +1,11 @@
+language: php
+
+php:
+  - 5.6
+  - 5.5
+  - 5.4
+  - 5.3
+
+install:
+  - composer self-update
+  - composer install
--- a/parsedown-extra-0.7.1/LICENSE.txt
+++ b/parsedown-extra-0.7.1/LICENSE.txt
@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Emanuil Rusev, erusev.com
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/parsedown-extra-0.7.1/ParsedownExtra.php
+++ b/parsedown-extra-0.7.1/ParsedownExtra.php
@ -0,0 +1,526 @@
+<?php
+
+#
+#
+# Parsedown Extra
+# https://github.com/erusev/parsedown-extra
+#
+# (c) Emanuil Rusev
+# http://erusev.com
+#
+# For the full license information, view the LICENSE file that was distributed
+# with this source code.
+#
+#
+
+class ParsedownExtra extends Parsedown
+{
+    # ~
+
+    const version = '0.7.0';
+
+    # ~
+
+    function __construct()
+    {
+        if (parent::version < '1.5.0')
+        {
+            throw new Exception('ParsedownExtra requires a later version of Parsedown');
+        }
+
+        $this->BlockTypes[':'] []= 'DefinitionList';
+        $this->BlockTypes['*'] []= 'Abbreviation';
+
+        # identify footnote definitions before reference definitions
+        array_unshift($this->BlockTypes['['], 'Footnote');
+
+        # identify footnote markers before before links
+        array_unshift($this->InlineTypes['['], 'FootnoteMarker');
+    }
+
+    #
+    # ~
+
+    function text($text)
+    {
+        $markup = parent::text($text);
+
+        # merge consecutive dl elements
+
+        $markup = preg_replace('/<\/dl>\s+<dl>\s+/', '', $markup);
+
+        # add footnotes
+
+        if (isset($this->DefinitionData['Footnote']))
+        {
+            $Element = $this->buildFootnoteElement();
+
+            $markup .= "\n" . $this->element($Element);
+        }
+
+        return $markup;
+    }
+
+    #
+    # Blocks
+    #
+
+    #
+    # Abbreviation
+
+    protected function blockAbbreviation($Line)
+    {
+        if (preg_match('/^\*\[(.+?)\]:[ ]*(.+?)[ ]*$/', $Line['text'], $matches))
+        {
+            $this->DefinitionData['Abbreviation'][$matches[1]] = $matches[2];
+
+            $Block = array(
+                'hidden' => true,
+            );
+
+            return $Block;
+        }
+    }
+
+    #
+    # Footnote
+
+    protected function blockFootnote($Line)
+    {
+        if (preg_match('/^\[\^(.+?)\]:[ ]?(.*)$/', $Line['text'], $matches))
+        {
+            $Block = array(
+                'label' => $matches[1],
+                'text' => $matches[2],
+                'hidden' => true,
+            );
+
+            return $Block;
+        }
+    }
+
+    protected function blockFootnoteContinue($Line, $Block)
+    {
+        if ($Line['text'][0] === '[' and preg_match('/^\[\^(.+?)\]:/', $Line['text']))
+        {
+            return;
+        }
+
+        if (isset($Block['interrupted']))
+        {
+            if ($Line['indent'] >= 4)
+            {
+                $Block['text'] .= "\n\n" . $Line['text'];
+
+                return $Block;
+            }
+        }
+        else
+        {
+            $Block['text'] .= "\n" . $Line['text'];
+
+            return $Block;
+        }
+    }
+
+    protected function blockFootnoteComplete($Block)
+    {
+        $this->DefinitionData['Footnote'][$Block['label']] = array(
+            'text' => $Block['text'],
+            'count' => null,
+            'number' => null,
+        );
+
+        return $Block;
+    }
+
+    #
+    # Definition List
+
+    protected function blockDefinitionList($Line, $Block)
+    {
+        if ( ! isset($Block) or isset($Block['type']))
+        {
+            return;
+        }
+
+        $Element = array(
+            'name' => 'dl',
+            'handler' => 'elements',
+            'text' => array(),
+        );
+
+        $terms = explode("\n", $Block['element']['text']);
+
+        foreach ($terms as $term)
+        {
+            $Element['text'] []= array(
+                'name' => 'dt',
+                'handler' => 'line',
+                'text' => $term,
+            );
+        }
+
+        $Block['element'] = $Element;
+
+        $Block = $this->addDdElement($Line, $Block);
+
+        return $Block;
+    }
+
+    protected function blockDefinitionListContinue($Line, array $Block)
+    {
+        if ($Line['text'][0] === ':')
+        {
+            $Block = $this->addDdElement($Line, $Block);
+
+            return $Block;
+        }
+        else
+        {
+            if (isset($Block['interrupted']) and $Line['indent'] === 0)
+            {
+                return;
+            }
+
+            if (isset($Block['interrupted']))
+            {
+                $Block['dd']['handler'] = 'text';
+                $Block['dd']['text'] .= "\n\n";
+
+                unset($Block['interrupted']);
+            }
+
+            $text = substr($Line['body'], min($Line['indent'], 4));
+
+            $Block['dd']['text'] .= "\n" . $text;
+
+            return $Block;
+        }
+    }
+
+    #
+    # Header
+
+    protected function blockHeader($Line)
+    {
+        $Block = parent::blockHeader($Line);
+
+        if (preg_match('/[ #]*{('.$this->regexAttribute.'+)}[ ]*$/', $Block['element']['text'], $matches, PREG_OFFSET_CAPTURE))
+        {
+            $attributeString = $matches[1][0];
+
+            $Block['element']['attributes'] = $this->parseAttributeData($attributeString);
+
+            $Block['element']['text'] = substr($Block['element']['text'], 0, $matches[0][1]);
+        }
+
+        return $Block;
+    }
+
+    #
+    # Markup
+
+    protected function blockMarkupComplete($Block)
+    {
+        if ( ! isset($Block['void']))
+        {
+            $Block['markup'] = $this->processTag($Block['markup']);
+        }
+
+        return $Block;
+    }
+
+    #
+    # Setext
+
+    protected function blockSetextHeader($Line, array $Block = null)
+    {
+        $Block = parent::blockSetextHeader($Line, $Block);
+
+        if (preg_match('/[ ]*{('.$this->regexAttribute.'+)}[ ]*$/', $Block['element']['text'], $matches, PREG_OFFSET_CAPTURE))
+        {
+            $attributeString = $matches[1][0];
+
+            $Block['element']['attributes'] = $this->parseAttributeData($attributeString);
+
+            $Block['element']['text'] = substr($Block['element']['text'], 0, $matches[0][1]);
+        }
+
+        return $Block;
+    }
+
+    #
+    # Inline Elements
+    #
+
+    #
+    # Footnote Marker
+
+    protected function inlineFootnoteMarker($Excerpt)
+    {
+        if (preg_match('/^\[\^(.+?)\]/', $Excerpt['text'], $matches))
+        {
+            $name = $matches[1];
+
+            if ( ! isset($this->DefinitionData['Footnote'][$name]))
+            {
+                return;
+            }
+
+            $this->DefinitionData['Footnote'][$name]['count'] ++;
+
+            if ( ! isset($this->DefinitionData['Footnote'][$name]['number']))
+            {
+                $this->DefinitionData['Footnote'][$name]['number'] = ++ $this->footnoteCount; # » &
+            }
+
+            $Element = array(
+                'name' => 'sup',
+                'attributes' => array('id' => 'fnref'.$this->DefinitionData['Footnote'][$name]['count'].':'.$name),
+                'handler' => 'element',
+                'text' => array(
+                    'name' => 'a',
+                    'attributes' => array('href' => '#fn:'.$name, 'class' => 'footnote-ref'),
+                    'text' => $this->DefinitionData['Footnote'][$name]['number'],
+                ),
+            );
+
+            return array(
+                'extent' => strlen($matches[0]),
+                'element' => $Element,
+            );
+        }
+    }
+
+    private $footnoteCount = 0;
+
+    #
+    # Link
+
+    protected function inlineLink($Excerpt)
+    {
+        $Link = parent::inlineLink($Excerpt);
+
+        $remainder = substr($Excerpt['text'], $Link['extent']);
+
+        if (preg_match('/^[ ]*{('.$this->regexAttribute.'+)}/', $remainder, $matches))
+        {
+            $Link['element']['attributes'] += $this->parseAttributeData($matches[1]);
+
+            $Link['extent'] += strlen($matches[0]);
+        }
+
+        return $Link;
+    }
+
+    #
+    # ~
+    #
+
+    protected function unmarkedText($text)
+    {
+        $text = parent::unmarkedText($text);
+
+        if (isset($this->DefinitionData['Abbreviation']))
+        {
+            foreach ($this->DefinitionData['Abbreviation'] as $abbreviation => $meaning)
+            {
+                $pattern = '/\b'.preg_quote($abbreviation, '/').'\b/';
+
+                $text = preg_replace($pattern, '<abbr title="'.$meaning.'">'.$abbreviation.'</abbr>', $text);
+            }
+        }
+
+        return $text;
+    }
+
+    #
+    # Util Methods
+    #
+
+    protected function addDdElement(array $Line, array $Block)
+    {
+        $text = substr($Line['text'], 1);
+        $text = trim($text);
+
+        unset($Block['dd']);
+
+        $Block['dd'] = array(
+            'name' => 'dd',
+            'handler' => 'line',
+            'text' => $text,
+        );
+
+        if (isset($Block['interrupted']))
+        {
+            $Block['dd']['handler'] = 'text';
+
+            unset($Block['interrupted']);
+        }
+
+        $Block['element']['text'] []= & $Block['dd'];
+
+        return $Block;
+    }
+
+    protected function buildFootnoteElement()
+    {
+        $Element = array(
+            'name' => 'div',
+            'attributes' => array('class' => 'footnotes'),
+            'handler' => 'elements',
+            'text' => array(
+                array(
+                    'name' => 'hr',
+                ),
+                array(
+                    'name' => 'ol',
+                    'handler' => 'elements',
+                    'text' => array(),
+                ),
+            ),
+        );
+
+        uasort($this->DefinitionData['Footnote'], 'self::sortFootnotes');
+
+        foreach ($this->DefinitionData['Footnote'] as $definitionId => $DefinitionData)
+        {
+            if ( ! isset($DefinitionData['number']))
+            {
+                continue;
+            }
+
+            $text = $DefinitionData['text'];
+
+            $text = parent::text($text);
+
+            $numbers = range(1, $DefinitionData['count']);
+
+            $backLinksMarkup = '';
+
+            foreach ($numbers as $number)
+            {
+                $backLinksMarkup .= ' <a href="#fnref'.$number.':'.$definitionId.'" rev="footnote" class="footnote-backref">&#8617;</a>';
+            }
+
+            $backLinksMarkup = substr($backLinksMarkup, 1);
+
+            if (substr($text, - 4) === '</p>')
+            {
+                $backLinksMarkup = '&#160;'.$backLinksMarkup;
+
+                $text = substr_replace($text, $backLinksMarkup.'</p>', - 4);
+            }
+            else
+            {
+                $text .= "\n".'<p>'.$backLinksMarkup.'</p>';
+            }
+
+            $Element['text'][1]['text'] []= array(
+                'name' => 'li',
+                'attributes' => array('id' => 'fn:'.$definitionId),
+                'text' => "\n".$text."\n",
+            );
+        }
+
+        return $Element;
+    }
+
+    # ~
+
+    protected function parseAttributeData($attributeString)
+    {
+        $Data = array();
+
+        $attributes = preg_split('/[ ]+/', $attributeString, - 1, PREG_SPLIT_NO_EMPTY);
+
+        foreach ($attributes as $attribute)
+        {
+            if ($attribute[0] === '#')
+            {
+                $Data['id'] = substr($attribute, 1);
+            }
+            else # "."
+            {
+                $classes []= substr($attribute, 1);
+            }
+        }
+
+        if (isset($classes))
+        {
+            $Data['class'] = implode(' ', $classes);
+        }
+
+        return $Data;
+    }
+
+    # ~
+
+    protected function processTag($elementMarkup) # recursive
+    {
+        # http://stackoverflow.com/q/1148928/200145
+        libxml_use_internal_errors(true);
+
+        $DOMDocument = new DOMDocument;
+
+        # http://stackoverflow.com/q/11309194/200145
+        $elementMarkup = mb_convert_encoding($elementMarkup, 'HTML-ENTITIES', 'UTF-8');
+
+        # http://stackoverflow.com/q/4879946/200145
+        $DOMDocument->loadHTML($elementMarkup);
+        $DOMDocument->removeChild($DOMDocument->doctype);
+        $DOMDocument->replaceChild($DOMDocument->firstChild->firstChild->firstChild, $DOMDocument->firstChild);
+
+        $elementText = '';
+
+        if ($DOMDocument->documentElement->getAttribute('markdown') === '1')
+        {
+            foreach ($DOMDocument->documentElement->childNodes as $Node)
+            {
+                $elementText .= $DOMDocument->saveHTML($Node);
+            }
+
+            $DOMDocument->documentElement->removeAttribute('markdown');
+
+            $elementText = "\n".$this->text($elementText)."\n";
+        }
+        else
+        {
+            foreach ($DOMDocument->documentElement->childNodes as $Node)
+            {
+                $nodeMarkup = $DOMDocument->saveHTML($Node);
+
+                if ($Node instanceof DOMElement and ! in_array($Node->nodeName, $this->textLevelElements))
+                {
+                    $elementText .= $this->processTag($nodeMarkup);
+                }
+                else
+                {
+                    $elementText .= $nodeMarkup;
+                }
+            }
+        }
+
+        # because we don't want for markup to get encoded
+        $DOMDocument->documentElement->nodeValue = 'placeholder\x1A';
+
+        $markup = $DOMDocument->saveHTML($DOMDocument->documentElement);
+        $markup = str_replace('placeholder\x1A', $elementText, $markup);
+
+        return $markup;
+    }
+
+    # ~
+
+    protected function sortFootnotes($A, $B) # callback
+    {
+        return $A['number'] - $B['number'];
+    }
+
+    #
+    # Fields
+    #
+
+    protected $regexAttribute = '(?:[#.][-\w]+[ ]*)';
+}
--- a/parsedown-extra-0.7.1/README.md
+++ b/parsedown-extra-0.7.1/README.md
@ -0,0 +1,31 @@
+> You might also like [Caret](http://caret.io?ref=parsedown) - our Markdown editor for the Desktop.
+
+## Parsedown Extra
+
+[![Build Status](https://img.shields.io/travis/erusev/parsedown-extra/master.svg?style=flat-square)](https://travis-ci.org/erusev/parsedown-extra)
+
+An extension of [Parsedown](http://parsedown.org) that adds support for [Markdown Extra](https://michelf.ca/projects/php-markdown/extra/).
+
+[See Demo](http://parsedown.org/extra/)
+
+### Installation
+
+Include both `Parsedown.php` and `ParsedownExtra.php` or install [the composer package](https://packagist.org/packages/erusev/parsedown-extra).
+
+### Example
+
+``` php
+$Extra = new ParsedownExtra();
+
+echo $Extra->text('# Header {.sth}'); # prints: <h1 class="sth">Header</h1>
+```
+
+### Questions
+
+**Who uses Parsedown Extra?**
+
+[October CMS](http://octobercms.com/), [Bolt CMS](http://bolt.cm/), [Kirby CMS](http://getkirby.com/), [Grav CMS](http://getgrav.org/), [Statamic CMS](http://www.statamic.com/) and [more](https://www.versioneye.com/php/erusev:parsedown-extra/references).
+
+**How can I help?**
+
+Use it, star it, share it and in case you feel generous, [donate some money](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=528P3NZQMP8N2).
--- a/parsedown-extra-0.7.1/composer.json
+++ b/parsedown-extra-0.7.1/composer.json
@ -0,0 +1,21 @@
+{
+    "name": "erusev/parsedown-extra",
+    "description": "An extension of Parsedown that adds support for Markdown Extra.",
+    "keywords": ["markdown", "markdown extra", "parser", "parsedown"],
+    "homepage": "https://github.com/erusev/parsedown-extra",
+    "type": "library",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Emanuil Rusev",
+            "email": "hello@erusev.com",
+            "homepage": "http://erusev.com"
+        }
+    ],
+    "require": {
+        "erusev/parsedown": "~1.4"
+    },
+    "autoload": {
+        "psr-0": {"ParsedownExtra": ""}
+    }
+}
--- a/parsedown-extra-0.7.1/phpunit.xml.dist
+++ b/parsedown-extra-0.7.1/phpunit.xml.dist
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="test/bootstrap.php" colors="true">
+	<testsuites>
+		<testsuite>
+			<file>test/ParsedownExtraTest.php</file>
+		</testsuite>
+	</testsuites>
+</phpunit>
--- a/parsedown-extra-0.7.1/test/ParsedownExtraTest.php
+++ b/parsedown-extra-0.7.1/test/ParsedownExtraTest.php
@ -0,0 +1,20 @@
+<?php
+
+class ParsedownExtraTest extends ParsedownTest
+{
+    protected function initDirs()
+    {
+        $dirs = parent::initDirs();
+
+        $dirs []= dirname(__FILE__).'/data/';
+
+        return $dirs;
+    }
+
+    protected function initParsedown()
+    {
+        $Parsedown = new ParsedownExtra();
+
+        return $Parsedown;
+    }
+}
--- a/parsedown-extra-0.7.1/test/bootstrap.php
+++ b/parsedown-extra-0.7.1/test/bootstrap.php
@ -0,0 +1,10 @@
+<?php
+
+$dir = file_exists('../parsedown/')
+    ? '../parsedown/' # child
+    : 'vendor/erusev/parsedown/'; # parent
+
+include $dir . 'Parsedown.php';
+include $dir . 'test/ParsedownTest.php';
+
+include 'ParsedownExtra.php';
--- a/parsedown-extra-0.7.1/test/data/abbreviation.html
+++ b/parsedown-extra-0.7.1/test/data/abbreviation.html
@ -0,0 +1,3 @@
+<p>The <abbr title="Hyper Text Markup Language">HTML</abbr> specification
+is maintained by the <abbr title="World Wide Web Consortium">W3C</abbr>.
+The abbreviation <abbr title="Markup Language">ML</abbr> is contained in the abbreviation <abbr title="Hyper Text Markup Language">HTML</abbr>.</p>
--- a/parsedown-extra-0.7.1/test/data/abbreviation.md
+++ b/parsedown-extra-0.7.1/test/data/abbreviation.md
@ -0,0 +1,7 @@
+The HTML specification
+is maintained by the W3C.
+The abbreviation ML is contained in the abbreviation HTML.
+
+*[HTML]: Hyper Text Markup Language
+*[W3C]: World Wide Web Consortium
+*[ML]: Markup Language
--- a/parsedown-extra-0.7.1/test/data/compound_footnote.html
+++ b/parsedown-extra-0.7.1/test/data/compound_footnote.html
@ -0,0 +1,18 @@
+<p>footnote <sup id="fnref1:1"><a href="#fn:1" class="footnote-ref">1</a></sup> and another one <sup id="fnref1:2"><a href="#fn:2" class="footnote-ref">2</a></sup></p>
+<div class="footnotes">
+<hr />
+<ol>
+<li id="fn:1">
+<p>line 1
+line 2</p>
+<blockquote>
+<p>quote</p>
+</blockquote>
+<p>another paragraph&#160;<a href="#fnref1:1" rev="footnote" class="footnote-backref">&#8617;</a></p>
+</li>
+<li id="fn:2">
+<p>paragraph</p>
+<p>another paragraph&#160;<a href="#fnref1:2" rev="footnote" class="footnote-backref">&#8617;</a></p>
+</li>
+</ol>
+</div>
--- a/parsedown-extra-0.7.1/test/data/compound_footnote.md
+++ b/parsedown-extra-0.7.1/test/data/compound_footnote.md
@ -0,0 +1,14 @@
+footnote [^1] and another one [^2]
+
+[^1]: line 1
+      line 2
+
+    > quote
+
+    another paragraph
+      
+[^2]:
+    paragraph
+    
+    another paragraph
+    
--- a/parsedown-extra-0.7.1/test/data/definition_list.html
+++ b/parsedown-extra-0.7.1/test/data/definition_list.html
@ -0,0 +1,17 @@
+<dl>
+<dt>Term 1</dt>
+<dd>one</dd>
+<dd>two
+extra line</dd>
+<dt>Term 2</dt>
+<dd><p>lazy
+line</p></dd>
+<dd><p>multiple</p>
+<p>paragraphs</p></dd>
+<dd><p>nested</p>
+<pre><code>code block</code></pre>
+<blockquote>
+<p>quote
+block</p>
+</blockquote></dd>
+</dl>
--- a/parsedown-extra-0.7.1/test/data/definition_list.md
+++ b/parsedown-extra-0.7.1/test/data/definition_list.md
@ -0,0 +1,20 @@
+Term 1
+:   one
+:   two
+    extra line
+
+Term 2
+
+:   lazy
+line
+
+:   multiple
+
+    paragraphs
+
+:   nested
+
+        code block
+
+    > quote
+    > block
--- a/parsedown-extra-0.7.1/test/data/footnote.html
+++ b/parsedown-extra-0.7.1/test/data/footnote.html
@ -0,0 +1,20 @@
+<p>first <sup id="fnref1:1"><a href="#fn:1" class="footnote-ref">1</a></sup> second <sup id="fnref1:2"><a href="#fn:2" class="footnote-ref">2</a></sup>.</p>
+<p>first <sup id="fnref1:a"><a href="#fn:a" class="footnote-ref">3</a></sup> second <sup id="fnref1:b"><a href="#fn:b" class="footnote-ref">4</a></sup>.</p>
+<p>second time <sup id="fnref2:1"><a href="#fn:1" class="footnote-ref">1</a></sup></p>
+<div class="footnotes">
+<hr />
+<ol>
+<li id="fn:1">
+<p>one&#160;<a href="#fnref1:1" rev="footnote" class="footnote-backref">&#8617;</a> <a href="#fnref2:1" rev="footnote" class="footnote-backref">&#8617;</a></p>
+</li>
+<li id="fn:2">
+<p>two&#160;<a href="#fnref1:2" rev="footnote" class="footnote-backref">&#8617;</a></p>
+</li>
+<li id="fn:a">
+<p>one&#160;<a href="#fnref1:a" rev="footnote" class="footnote-backref">&#8617;</a></p>
+</li>
+<li id="fn:b">
+<p>two&#160;<a href="#fnref1:b" rev="footnote" class="footnote-backref">&#8617;</a></p>
+</li>
+</ol>
+</div>
--- a/parsedown-extra-0.7.1/test/data/footnote.md
+++ b/parsedown-extra-0.7.1/test/data/footnote.md
@ -0,0 +1,11 @@
+first [^1] second [^2].
+
+[^1]: one
+[^2]: two
+
+first [^a] second [^b].
+
+[^a]: one
+[^b]: two
+
+second time [^1]
--- a/parsedown-extra-0.7.1/test/data/markdown_inside_markup.html
+++ b/parsedown-extra-0.7.1/test/data/markdown_inside_markup.html
@ -0,0 +1,25 @@
+<div class="example">
+<p><em>markdown</em></p>
+<p>This is another paragraph. It contains <em>inline markup</em>.</p>
+<div>
+_no markdown_
+</div>
+</div>
+<hr />
+<div>
+<p><em>markdown</em></p>
+<div>
+<p><em>markdown</em></p>
+</div>
+</div>
+<hr />
+<div>
+_no markdown_
+<div>
+<p><em>markdown</em></p>
+</div>
+</div>
+<hr />
+<div markdown="0">
+_no markdown_
+</div>
--- a/parsedown-extra-0.7.1/test/data/markdown_inside_markup.md
+++ b/parsedown-extra-0.7.1/test/data/markdown_inside_markup.md
@ -0,0 +1,32 @@
+<div class="example" markdown="1">
+_markdown_
+
+This is another paragraph. It contains <em>inline markup</em>.
+<div>
+_no markdown_
+</div>
+</div>
+
+---
+
+<div markdown="1">
+_markdown_
+<div markdown="1">
+_markdown_
+</div>
+</div>
+
+---
+
+<div>
+_no markdown_
+<div markdown="1">
+_markdown_
+</div>
+</div>
+
+---
+
+<div markdown="0">
+_no markdown_
+</div>
--- a/parsedown-extra-0.7.1/test/data/special_attributes.html
+++ b/parsedown-extra-0.7.1/test/data/special_attributes.html
@ -0,0 +1,6 @@
+<h1 id="header1">Header 1</h1>
+<h2 id="header2">Header 2</h2>
+<h2 class="main">The Site</h2>
+<h2 id="the-site" class="main shine">The Site</h2>
+<p><a href="http://parsedown.org" id="link" class="primary upper-case">link</a></p>
+<p><img src="/md.png" alt="logo" id="logo" class="big" /></p>
--- a/parsedown-extra-0.7.1/test/data/special_attributes.md
+++ b/parsedown-extra-0.7.1/test/data/special_attributes.md
@ -0,0 +1,12 @@
+Header 1 {#header1}
+========
+
+## Header 2 ## {#header2}
+
+## The Site ## {.main}
+
+## The Site ## {.main .shine #the-site}
+
+[link](http://parsedown.org) {.primary #link .upper-case}
+
+![logo](/md.png) {#logo .big}
--- a/server.php
+++ b/server.php
@ -1,5 +0,0 @@
-<?php include 'HEADER.php';?>
-<title>Information and Announcements - thunix Shell Provider and Web Host</title>
-<h2>Information and Announcements</h2>
-<p>(Coming soon)</p>
-<?php include 'FOOTER.php';?>
--- a/server/Site.css
+++ b/server/Site.css
@ -1,293 +0,0 @@
-/* DEFAULTS
----------------------------------------------------------*/
-
-body   
-{
-    background: #b6b7bc;
-    font-size: .80em;
-    font-family: "Helvetica Neue", "Lucida Grande", "Segoe UI", Arial, Helvetica, Verdana, sans-serif;
-    margin: 0px;
-    padding: 0px;
-    color: #696969;
-}
-
-a:link, a:visited
-{
-    color: #034af3;
-}
-
-a:hover
-{
-    color: #1d60ff;
-    text-decoration: none;
-}
-
-a:active
-{
-    color: #034af3;
-}
-
-p
-{
-    margin-bottom: 10px;
-    line-height: 1.6em;
-}
-
-
-/* HEADINGS   
----------------------------------------------------------*/
-
-h1, h2, h3, h4, h5, h6
-{
-    font-size: 1.5em;
-    color: #666666;
-    font-variant: small-caps;
-    text-transform: none;
-    font-weight: 700;
-    margin-bottom: 0px;
-}
-
-h1
-{
-    font-size: 1.6em;
-    padding-bottom: 0px;
-    margin-bottom: 0px;
-}
-
-h2
-{
-    font-size: 1.5em;
-    font-weight: 700;
-}
-
-h3
-{
-    font-size: 1.2em;
-}
-
-h4
-{
-    font-size: 1.1em;
-}
-
-h5, h6
-{
-    font-size: 1em;
-}
-
-/* this rule styles <h1> and <h2> tags that are the 
-first child of the left and right table columns */
-.rightColumn > h1, .rightColumn > h2, .leftColumn > h1, .leftColumn > h2
-{
-    margin-top: 0px;
-}
-
-
-/* PRIMARY LAYOUT ELEMENTS   
----------------------------------------------------------*/
-
-.page
-{
-    width: 960px;
-    background-color: #fff;
-    margin: 20px auto 0px auto;
-    border: 1px solid #496077;
-}
-
-.header
-{
-    position: relative;
-    margin: 0px;
-    padding: 0px;
-    background: #4b6c9e;
-    width: 100%;
-}
-
-.header h1
-{
-    font-weight: 700;
-    margin: 0px;
-    padding: 0px 0px 0px 20px;
-    color: #f9f9f9;
-    border: none;
-    line-height: 2em;
-    font-size: 2em;
-}
-
-.main
-{
-    padding: 0px 12px;
-    margin: 12px 8px 8px 8px;
-    min-height: 420px;
-}
-
-.leftCol
-{
-    padding: 6px 0px;
-    margin: 12px 8px 8px 8px;
-    width: 200px;
-    min-height: 200px;
-}
-
-.footer
-{
-    color: #4e5766;
-    padding: 8px 0px 0px 0px;
-    margin: 0px auto;
-    text-align: center;
-    line-height: normal;
-}
-
-
-/* TAB MENU   
----------------------------------------------------------*/
-
-div.hideSkiplink
-{
-    background-color:#3a4f63;
-    width:100%;
-}
-
-div.menu
-{
-    padding: 4px 0px 4px 8px;
-}
-
-div.menu ul
-{
-    list-style: none;
-    margin: 0px;
-    padding: 0px;
-    width: auto;
-}
-
-div.menu ul li a, div.menu ul li a:visited
-{
-    background-color: #465c71;
-    border: 1px #4e667d solid;
-    color: #dde4ec;
-    display: block;
-    line-height: 1.35em;
-    padding: 4px 20px;
-    text-decoration: none;
-    white-space: nowrap;
-}
-
-div.menu ul li a:hover
-{
-    background-color: #bfcbd6;
-    color: #465c71;
-    text-decoration: none;
-}
-
-div.menu ul li a:active
-{
-    background-color: #465c71;
-    color: #cfdbe6;
-    text-decoration: none;
-}
-
-/* FORM ELEMENTS   
----------------------------------------------------------*/
-
-fieldset
-{
-    margin: 1em 0px;
-    padding: 1em;
-    border: 1px solid #ccc;
-}
-
-fieldset p 
-{
-    margin: 2px 12px 10px 10px;
-}
-
-fieldset.login label, fieldset.register label, fieldset.changePassword label
-{
-    display: block;
-}
-
-fieldset label.inline 
-{
-    display: inline;
-}
-
-legend 
-{
-    font-size: 1.1em;
-    font-weight: 600;
-    padding: 2px 4px 8px 4px;
-}
-
-input.textEntry 
-{
-    width: 320px;
-    border: 1px solid #ccc;
-}
-
-input.passwordEntry 
-{
-    width: 320px;
-    border: 1px solid #ccc;
-}
-
-div.accountInfo
-{
-    width: 42%;
-}
-
-/* MISC  
----------------------------------------------------------*/
-
-.clear
-{
-    clear: both;
-}
-
-.title
-{
-    display: block;
-    float: left;
-    width: auto;
-}
-
-.loginDisplay
-{
-    font-size: 1.1em;
-    display: block;
-    text-align: right;
-    padding: 10px;
-    color: White;
-}
-
-.loginDisplay a:link
-{
-    color: white;
-}
-
-.loginDisplay a:visited
-{
-    color: white;
-}
-
-.loginDisplay a:hover
-{
-    color: white;
-}
-
-.failureNotification
-{
-    font-size: 1.2em;
-    color: Red;
-}
-
-.bold
-{
-    font-weight: bold;
-}
-
-.submitButton
-{
-    text-align: right;
-    padding-right: 10px;
-}
--- a/server/WebResource.gif
+++ b/server/WebResource.gif
--- a/server/WebResource.js
+++ b/server/WebResource.js
@ -1,696 +0,0 @@
-if (!window.Sys) { window.Sys = {}; }
-if (!Sys.WebForms) { Sys.WebForms = {}; }
-Sys.WebForms.Menu = function(options) {
-    this.items = [];
-    this.depth = options.depth || 1;
-    this.parentMenuItem = options.parentMenuItem;
-    this.element = Sys.WebForms.Menu._domHelper.getElement(options.element);
-    if (this.element.tagName === 'DIV') {
-        var containerElement = this.element;
-        this.element = Sys.WebForms.Menu._domHelper.firstChild(containerElement);
-        this.element.tabIndex = options.tabIndex || 0;
-        options.element = containerElement;
-        options.menu = this;
-        this.container = new Sys.WebForms._MenuContainer(options);
-        Sys.WebForms.Menu._domHelper.setFloat(this.element, this.container.rightToLeft ? "right" : "left");
-    }
-    else {
-        this.container = options.container;
-        this.keyMap = options.keyMap;
-    }
-    Sys.WebForms.Menu._elementObjectMapper.map(this.element, this);
-    if (this.parentMenuItem && this.parentMenuItem.parentMenu) {
-        this.parentMenu = this.parentMenuItem.parentMenu;
-        this.rootMenu = this.parentMenu.rootMenu;
-        if (!this.element.id) {
-            this.element.id = (this.container.element.id || 'menu') + ':submenu:' + Sys.WebForms.Menu._elementObjectMapper._computedId;
-        }
-        if (this.depth > this.container.staticDisplayLevels) {
-            this.displayMode = "dynamic";
-            this.element.style.display = "none";
-            this.element.style.position = "absolute";
-            if (this.rootMenu && this.container.orientation === 'horizontal' && this.parentMenu.isStatic()) {
-                this.element.style.top = "100%";
-                if (this.container.rightToLeft) {
-                    this.element.style.right = "0px";
-                }
-                else {
-                    this.element.style.left = "0px";
-                }
-            }
-            else {
-                this.element.style.top = "0px";
-                if (this.container.rightToLeft) {
-                    this.element.style.right = "100%";
-                }
-                else {
-                    this.element.style.left = "100%";
-                }
-            }
-            if (this.container.rightToLeft) {
-                this.keyMap = Sys.WebForms.Menu._keyboardMapping.verticalRtl;
-            }
-            else {
-                this.keyMap = Sys.WebForms.Menu._keyboardMapping.vertical;
-            }
-        }
-        else {
-            this.displayMode = "static";
-            this.element.style.display = "block";
-            if (this.container.orientation === 'horizontal') {
-                Sys.WebForms.Menu._domHelper.setFloat(this.element, this.container.rightToLeft ? "right" : "left");
-            }
-        }
-    }
-    Sys.WebForms.Menu._domHelper.appendCssClass(this.element, this.displayMode);
-    var children = this.element.childNodes;
-    var count = children.length;
-    for (var i = 0; i < count; i++) {
-        var node = children[i];
-        if (node.nodeType !== 1) {   
-            continue;
-        }
-        var topLevelMenuItem = null;
-        if (this.parentMenuItem) {
-            topLevelMenuItem = this.parentMenuItem.topLevelMenuItem;
-        }
-        var menuItem = new Sys.WebForms.MenuItem(this, node, topLevelMenuItem);
-        var previousMenuItem = this.items[this.items.length - 1];
-        if (previousMenuItem) {
-            menuItem.previousSibling = previousMenuItem;
-            previousMenuItem.nextSibling = menuItem;
-        }
-        this.items[this.items.length] = menuItem;
-    }
-};
-Sys.WebForms.Menu.prototype = {
-    blur: function() { if (this.container) this.container.blur(); },
-    collapse: function() {
-        this.each(function(menuItem) {
-            menuItem.hover(false);
-            menuItem.blur();
-            var childMenu = menuItem.childMenu;
-            if (childMenu) {
-                childMenu.collapse();
-            }
-        });
-        this.hide();
-    },
-    doDispose: function() { this.each(function(item) { item.doDispose(); }); },
-    each: function(fn) {
-        var count = this.items.length;
-        for (var i = 0; i < count; i++) {
-            fn(this.items[i]);
-        }
-    },
-    firstChild: function() { return this.items[0]; },
-    focus: function() { if (this.container) this.container.focus(); },
-    get_displayed: function() { return this.element.style.display !== 'none'; },
-    get_focused: function() {
-        if (this.container) {
-            return this.container.focused;
-        }
-        return false;
-    },
-    handleKeyPress: function(keyCode) {
-        if (this.keyMap.contains(keyCode)) {
-            if (this.container.focusedMenuItem) {
-                this.container.focusedMenuItem.navigate(keyCode);
-                return;
-            }
-            var firstChild = this.firstChild();
-            if (firstChild) {
-                this.container.navigateTo(firstChild);
-            }
-        }
-    },
-    hide: function() {
-        if (!this.get_displayed()) {
-            return;
-        }
-        this.each(function(item) {
-            if (item.childMenu) {
-                item.childMenu.hide();
-            }
-        });
-        if (!this.isRoot()) {
-            if (this.get_focused()) {
-                this.container.navigateTo(this.parentMenuItem);
-            }
-            this.element.style.display = 'none';
-        }
-    },
-    isRoot: function() { return this.rootMenu === this; },
-    isStatic: function() { return this.displayMode === 'static'; },
-    lastChild: function() { return this.items[this.items.length - 1]; },
-    show: function() { this.element.style.display = 'block'; }
-};
-if (Sys.WebForms.Menu.registerClass) {
-    Sys.WebForms.Menu.registerClass('Sys.WebForms.Menu');
-}
-Sys.WebForms.MenuItem = function(parentMenu, listElement, topLevelMenuItem) {
-    this.keyMap = parentMenu.keyMap;
-    this.parentMenu = parentMenu;
-    this.container = parentMenu.container;
-    this.element = listElement;
-    this.topLevelMenuItem = topLevelMenuItem || this;
-    this._anchor = Sys.WebForms.Menu._domHelper.firstChild(listElement);
-    while (this._anchor && this._anchor.tagName !== 'A') {
-        this._anchor = Sys.WebForms.Menu._domHelper.nextSibling(this._anchor);
-    }
-    if (this._anchor) {
-        this._anchor.tabIndex = -1;
-        var subMenu = this._anchor;
-        while (subMenu && subMenu.tagName !== 'UL') {
-            subMenu = Sys.WebForms.Menu._domHelper.nextSibling(subMenu);
-        }
-        if (subMenu) {
-            this.childMenu = new Sys.WebForms.Menu({ element: subMenu, parentMenuItem: this, depth: parentMenu.depth + 1, container: this.container, keyMap: this.keyMap });
-            if (!this.childMenu.isStatic()) {
-                Sys.WebForms.Menu._domHelper.appendCssClass(this.element, 'has-popup');
-                Sys.WebForms.Menu._domHelper.appendAttributeValue(this.element, 'aria-haspopup', this.childMenu.element.id);
-            }
-        }
-    }
-    Sys.WebForms.Menu._elementObjectMapper.map(listElement, this);
-    Sys.WebForms.Menu._domHelper.appendAttributeValue(listElement, 'role', 'menuitem');
-    Sys.WebForms.Menu._domHelper.appendCssClass(listElement, parentMenu.displayMode);
-    if (this._anchor) {
-        Sys.WebForms.Menu._domHelper.appendCssClass(this._anchor, parentMenu.displayMode);
-    }
-    this.element.style.position = "relative";
-    if (this.parentMenu.depth == 1 && this.container.orientation == 'horizontal') {
-        Sys.WebForms.Menu._domHelper.setFloat(this.element, this.container.rightToLeft ? "right" : "left");
-    }
-    if (!this.container.disabled) {
-        Sys.WebForms.Menu._domHelper.addEvent(this.element, 'mouseover', Sys.WebForms.MenuItem._onmouseover);
-        Sys.WebForms.Menu._domHelper.addEvent(this.element, 'mouseout', Sys.WebForms.MenuItem._onmouseout);
-    }
-};
-Sys.WebForms.MenuItem.prototype = {
-    applyUp: function(fn, condition) {
-        condition = condition || function(menuItem) { return menuItem; };
-        var menuItem = this;
-        var lastMenuItem = null;
-        while (condition(menuItem)) {
-            fn(menuItem);
-            lastMenuItem = menuItem;
-            menuItem = menuItem.parentMenu.parentMenuItem;
-        }
-        return lastMenuItem;
-    },
-    blur: function() { this.setTabIndex(-1); },
-    doDispose: function() {
-        Sys.WebForms.Menu._domHelper.removeEvent(this.element, 'mouseover', Sys.WebForms.MenuItem._onmouseover);
-        Sys.WebForms.Menu._domHelper.removeEvent(this.element, 'mouseout', Sys.WebForms.MenuItem._onmouseout);
-        if (this.childMenu) {
-            this.childMenu.doDispose();
-        }
-    },
-    focus: function() {
-        if (!this.parentMenu.get_displayed()) {
-            this.parentMenu.show();
-        }
-        this.setTabIndex(0);
-        this.container.focused = true;
-        this._anchor.focus();
-    },
-    get_highlighted: function() { return /(^|\s)highlighted(\s|$)/.test(this._anchor.className); },
-    getTabIndex: function() { return this._anchor.tabIndex; },
-    highlight: function(highlighting) {
-        if (highlighting) {
-            this.applyUp(function(menuItem) {
-                menuItem.parentMenu.parentMenuItem.highlight(true);
-            },
-            function(menuItem) {
-                return !menuItem.parentMenu.isStatic() && menuItem.parentMenu.parentMenuItem;
-            }
-        );
-            Sys.WebForms.Menu._domHelper.appendCssClass(this._anchor, 'highlighted');
-        }
-        else {
-            Sys.WebForms.Menu._domHelper.removeCssClass(this._anchor, 'highlighted');
-            this.setTabIndex(-1);
-        }
-    },
-    hover: function(hovering) {
-        if (hovering) {
-            var currentHoveredItem = this.container.hoveredMenuItem;
-            if (currentHoveredItem) {
-                currentHoveredItem.hover(false);
-            }
-            var currentFocusedItem = this.container.focusedMenuItem;
-            if (currentFocusedItem && currentFocusedItem !== this) {
-                currentFocusedItem.hover(false);
-            }
-            this.applyUp(function(menuItem) {
-                if (menuItem.childMenu && !menuItem.childMenu.get_displayed()) {
-                    menuItem.childMenu.show();
-                }
-            });
-            this.container.hoveredMenuItem = this;
-            this.highlight(true);
-        }
-        else {
-            var menuItem = this;
-            while (menuItem) {
-                menuItem.highlight(false);
-                if (menuItem.childMenu) {
-                    if (!menuItem.childMenu.isStatic()) {
-                        menuItem.childMenu.hide();
-                    }
-                }
-                menuItem = menuItem.parentMenu.parentMenuItem;
-            }
-        }
-    },
-    isSiblingOf: function(menuItem) { return menuItem.parentMenu === this.parentMenu; },
-    mouseout: function() {
-        var menuItem = this,
-            id = this.container.pendingMouseoutId,
-            disappearAfter = this.container.disappearAfter;
-        if (id) {
-            window.clearTimeout(id);
-        }
-        if (disappearAfter > -1) {
-            this.container.pendingMouseoutId =
-                window.setTimeout(function() { menuItem.hover(false); }, disappearAfter);
-        }
-    },
-    mouseover: function() {
-        var id = this.container.pendingMouseoutId;
-        if (id) {
-            window.clearTimeout(id);
-            this.container.pendingMouseoutId = null;
-        }
-        this.hover(true);
-        if (this.container.menu.get_focused()) {
-            this.container.navigateTo(this);
-        }
-    },
-    navigate: function(keyCode) {
-        switch (this.keyMap[keyCode]) {
-            case this.keyMap.next:
-                this.navigateNext();
-                break;
-            case this.keyMap.previous:
-                this.navigatePrevious();
-                break;
-            case this.keyMap.child:
-                this.navigateChild();
-                break;
-            case this.keyMap.parent:
-                this.navigateParent();
-                break;
-            case this.keyMap.tab:
-                this.navigateOut();
-                break;
-        }
-    },
-    navigateChild: function() {
-        var subMenu = this.childMenu;
-        if (subMenu) {
-            var firstChild = subMenu.firstChild();
-            if (firstChild) {
-                this.container.navigateTo(firstChild);
-            }
-        }
-        else {
-            if (this.container.orientation === 'horizontal') {
-                var nextItem = this.topLevelMenuItem.nextSibling || this.topLevelMenuItem.parentMenu.firstChild();
-                if (nextItem == this.topLevelMenuItem) {
-                    return;
-                }
-                this.topLevelMenuItem.childMenu.hide();
-                this.container.navigateTo(nextItem);
-                if (nextItem.childMenu) {
-                    this.container.navigateTo(nextItem.childMenu.firstChild());
-                }
-            }
-        }
-    },
-    navigateNext: function() {
-        if (this.childMenu) {
-            this.childMenu.hide();
-        }
-        var nextMenuItem = this.nextSibling;
-        if (!nextMenuItem && this.parentMenu.isRoot()) {
-            nextMenuItem = this.parentMenu.parentMenuItem;
-            if (nextMenuItem) {
-                nextMenuItem = nextMenuItem.nextSibling;
-            }
-        }
-        if (!nextMenuItem) {
-            nextMenuItem = this.parentMenu.firstChild();
-        }
-        if (nextMenuItem) {
-            this.container.navigateTo(nextMenuItem);
-        }
-    },
-    navigateOut: function() {
-        this.parentMenu.blur();
-    },
-    navigateParent: function() {
-        var parentMenu = this.parentMenu,
-            horizontal = this.container.orientation === 'horizontal';
-        if (!parentMenu) return;
-        if (horizontal && this.childMenu && parentMenu.isRoot()) {
-            this.navigateChild();
-            return;
-        }
-        if (parentMenu.parentMenuItem && !parentMenu.isRoot()) {
-            if (horizontal && this.parentMenu.depth === 2) {
-                var previousItem = this.parentMenu.parentMenuItem.previousSibling;
-                if (!previousItem) {
-                    previousItem = this.parentMenu.rootMenu.lastChild();
-                }
-                this.topLevelMenuItem.childMenu.hide();
-                this.container.navigateTo(previousItem);
-                if (previousItem.childMenu) {
-                    this.container.navigateTo(previousItem.childMenu.firstChild());
-                }
-            }
-            else {
-                this.parentMenu.hide();
-            }
-        }
-    },
-    navigatePrevious: function() {
-        if (this.childMenu) {
-            this.childMenu.hide();
-        }
-        var previousMenuItem = this.previousSibling;
-        if (previousMenuItem) {
-            var childMenu = previousMenuItem.childMenu;
-            if (childMenu && childMenu.isRoot()) {
-                previousMenuItem = childMenu.lastChild();
-            }
-        }
-        if (!previousMenuItem && this.parentMenu.isRoot()) {
-            previousMenuItem = this.parentMenu.parentMenuItem;
-        }
-        if (!previousMenuItem) {
-            previousMenuItem = this.parentMenu.lastChild();
-        }
-        if (previousMenuItem) {
-            this.container.navigateTo(previousMenuItem);
-        }
-    },
-    setTabIndex: function(index) { if (this._anchor) this._anchor.tabIndex = index; }
-};
-Sys.WebForms.MenuItem._onmouseout = function(e) {
-    var menuItem = Sys.WebForms.Menu._elementObjectMapper.getMappedObject(this);
-    if (!menuItem) {
-        return;
-    }
-    menuItem.mouseout();
-    Sys.WebForms.Menu._domHelper.cancelEvent(e);
-};
-Sys.WebForms.MenuItem._onmouseover = function(e) {
-    var menuItem = Sys.WebForms.Menu._elementObjectMapper.getMappedObject(this);
-    if (!menuItem) {
-        return;
-    }
-    menuItem.mouseover();
-    Sys.WebForms.Menu._domHelper.cancelEvent(e);
-};
-Sys.WebForms.Menu._domHelper = {
-    addEvent: function(element, eventName, fn, useCapture) {
-        if (element.addEventListener) {
-            element.addEventListener(eventName, fn, !!useCapture);
-        }
-        else {
-            element['on' + eventName] = fn;
-        }
-    },
-    appendAttributeValue: function(element, name, value) {
-        this.updateAttributeValue('append', element, name, value);
-    },
-    appendCssClass: function(element, value) {
-        this.updateClassName('append', element, name, value);
-    },
-    appendString: function(getString, setString, value) {
-        var currentValue = getString();
-        if (!currentValue) {
-            setString(value);
-            return;
-        }
-        var regex = this._regexes.getRegex('(^| )' + value + '($| )');
-        if (regex.test(currentValue)) {
-            return;
-        }
-        setString(currentValue + ' ' + value);
-    },
-    cancelEvent: function(e) {
-        var event = e || window.event;
-        if (event) {
-            event.cancelBubble = true;
-            if (event.stopPropagation) {
-                event.stopPropagation();
-            }
-        }
-    },
-    contains: function(ancestor, descendant) {
-        for (; descendant && (descendant !== ancestor); descendant = descendant.parentNode) { }
-        return !!descendant;
-    },
-    firstChild: function(element) {
-        var child = element.firstChild;
-        if (child && child.nodeType !== 1) {   
-            child = this.nextSibling(child);
-        }
-        return child;
-    },
-    getElement: function(elementOrId) { return typeof elementOrId === 'string' ? document.getElementById(elementOrId) : elementOrId; },
-    getElementDirection: function(element) {
-        if (element) {
-            if (element.dir) {
-                return element.dir;
-            }
-            return this.getElementDirection(element.parentNode);
-        }
-        return "ltr";
-    },
-    getKeyCode: function(event) { return event.keyCode || event.charCode || 0; },
-    insertAfter: function(element, elementToInsert) {
-        var next = element.nextSibling;
-        if (next) {
-            element.parentNode.insertBefore(elementToInsert, next);
-        }
-        else if (element.parentNode) {
-            element.parentNode.appendChild(elementToInsert);
-        }
-    },
-    nextSibling: function(element) {
-        var sibling = element.nextSibling;
-        while (sibling) {
-            if (sibling.nodeType === 1) {   
-                return sibling;
-            }
-            sibling = sibling.nextSibling;
-        }
-    },
-    removeAttributeValue: function(element, name, value) {
-        this.updateAttributeValue('remove', element, name, value);
-    },
-    removeCssClass: function(element, value) {
-        this.updateClassName('remove', element, name, value);
-    },
-    removeEvent: function(element, eventName, fn, useCapture) {
-        if (element.removeEventListener) {
-            element.removeEventListener(eventName, fn, !!useCapture);
-        }
-        else if (element.detachEvent) {
-            element.detachEvent('on' + eventName, fn)
-        }
-        element['on' + eventName] = null;
-    },
-    removeString: function(getString, setString, valueToRemove) {
-        var currentValue = getString();
-        if (currentValue) {
-            var regex = this._regexes.getRegex('(\\s|\\b)' + valueToRemove + '$|\\b' + valueToRemove + '\\s+');
-            setString(currentValue.replace(regex, ''));
-        }
-    },
-    setFloat: function(element, direction) {
-        element.style.styleFloat = direction;
-        element.style.cssFloat = direction;
-    },
-    updateAttributeValue: function(operation, element, name, value) {
-        this[operation + 'String'](
-                function() {
-                    return element.getAttribute(name);
-                },
-                function(newValue) {
-                    element.setAttribute(name, newValue);
-                },
-                value
-            );
-    },
-    updateClassName: function(operation, element, name, value) {
-        this[operation + 'String'](
-                function() {
-                    return element.className;
-                },
-                function(newValue) {
-                    element.className = newValue;
-                },
-                value
-            );
-    },
-    _regexes: {
-        getRegex: function(pattern) {
-            var regex = this[pattern];
-            if (!regex) {
-                this[pattern] = regex = new RegExp(pattern);
-            }
-            return regex;
-        }
-    }
-};
-Sys.WebForms.Menu._elementObjectMapper = {
-    _computedId: 0,
-    _mappings: {},
-    _mappingIdName: 'Sys.WebForms.Menu.Mapping',
-    getMappedObject: function(element) {
-        var id = element[this._mappingIdName];
-        if (id) {
-            return this._mappings[this._mappingIdName + ':' + id];
-        }
-    },
-    map: function(element, theObject) {
-        var mappedObject = element[this._mappingIdName];
-        if (mappedObject === theObject) {
-            return;
-        }
-        var objectId = element[this._mappingIdName] || element.id || '%' + (++this._computedId); 
-        element[this._mappingIdName] = objectId;
-        this._mappings[this._mappingIdName + ':' + objectId] = theObject;
-        theObject.mappingId = objectId;
-    }
-};
-Sys.WebForms.Menu._keyboardMapping = new (function() {
-    var LEFT_ARROW = 37;
-    var UP_ARROW = 38;
-    var RIGHT_ARROW = 39;
-    var DOWN_ARROW = 40;
-    var TAB = 9;
-    var ESCAPE = 27;
-    this.vertical = { next: 0, previous: 1, child: 2, parent: 3, tab: 4 };
-    this.vertical[DOWN_ARROW] = this.vertical.next;
-    this.vertical[UP_ARROW] = this.vertical.previous;
-    this.vertical[RIGHT_ARROW] = this.vertical.child;
-    this.vertical[LEFT_ARROW] = this.vertical.parent;
-    this.vertical[TAB] = this.vertical[ESCAPE] = this.vertical.tab;
-    this.verticalRtl = { next: 0, previous: 1, child: 2, parent: 3, tab: 4 };
-    this.verticalRtl[DOWN_ARROW] = this.verticalRtl.next;
-    this.verticalRtl[UP_ARROW] = this.verticalRtl.previous;
-    this.verticalRtl[LEFT_ARROW] = this.verticalRtl.child;
-    this.verticalRtl[RIGHT_ARROW] = this.verticalRtl.parent;
-    this.verticalRtl[TAB] = this.verticalRtl[ESCAPE] = this.verticalRtl.tab;
-    this.horizontal = { next: 0, previous: 1, child: 2, parent: 3, tab: 4 };
-    this.horizontal[RIGHT_ARROW] = this.horizontal.next;
-    this.horizontal[LEFT_ARROW] = this.horizontal.previous;
-    this.horizontal[DOWN_ARROW] = this.horizontal.child;
-    this.horizontal[UP_ARROW] = this.horizontal.parent;
-    this.horizontal[TAB] = this.horizontal[ESCAPE] = this.horizontal.tab;
-    this.horizontalRtl = { next: 0, previous: 1, child: 2, parent: 3, tab: 4 };
-    this.horizontalRtl[RIGHT_ARROW] = this.horizontalRtl.previous;
-    this.horizontalRtl[LEFT_ARROW] = this.horizontalRtl.next;
-    this.horizontalRtl[DOWN_ARROW] = this.horizontalRtl.child;
-    this.horizontalRtl[UP_ARROW] = this.horizontalRtl.parent;
-    this.horizontalRtl[TAB] = this.horizontalRtl[ESCAPE] = this.horizontalRtl.tab;
-    this.horizontal.contains = this.horizontalRtl.contains = this.vertical.contains = this.verticalRtl.contains = function(keycode) {
-        return this[keycode] != null;
-    };
-})();
-Sys.WebForms._MenuContainer = function(options) {
-    this.focused = false;
-    this.disabled = options.disabled;
-    this.staticDisplayLevels = options.staticDisplayLevels || 1;
-    this.element = options.element;
-    this.orientation = options.orientation || 'vertical';
-    this.disappearAfter = options.disappearAfter;
-    this.rightToLeft = Sys.WebForms.Menu._domHelper.getElementDirection(this.element) === 'rtl';
-    Sys.WebForms.Menu._elementObjectMapper.map(this.element, this);
-    this.menu = options.menu;
-    this.menu.rootMenu = this.menu;
-    this.menu.displayMode = 'static';
-    this.menu.element.style.position = 'relative';
-    this.menu.element.style.width = 'auto';
-    if (this.orientation === 'vertical') {
-        Sys.WebForms.Menu._domHelper.appendAttributeValue(this.menu.element, 'role', 'menu');
-        if (this.rightToLeft) {
-            this.menu.keyMap = Sys.WebForms.Menu._keyboardMapping.verticalRtl;
-        }
-        else {
-            this.menu.keyMap = Sys.WebForms.Menu._keyboardMapping.vertical;
-        }
-    }
-    else {
-        Sys.WebForms.Menu._domHelper.appendAttributeValue(this.menu.element, 'role', 'menubar');
-        if (this.rightToLeft) {
-            this.menu.keyMap = Sys.WebForms.Menu._keyboardMapping.horizontalRtl;
-        }
-        else {
-            this.menu.keyMap = Sys.WebForms.Menu._keyboardMapping.horizontal;
-        }
-    }
-    var floatBreak = document.createElement('div');
-    floatBreak.style.clear = this.rightToLeft ? "right" : "left";
-    this.element.appendChild(floatBreak);
-    Sys.WebForms.Menu._domHelper.setFloat(this.element, this.rightToLeft ? "right" : "left");
-    Sys.WebForms.Menu._domHelper.insertAfter(this.element, floatBreak);
-    if (!this.disabled) {
-        Sys.WebForms.Menu._domHelper.addEvent(this.menu.element, 'focus', this._onfocus, true);
-        Sys.WebForms.Menu._domHelper.addEvent(this.menu.element, 'keydown', this._onkeydown);
-        var menuContainer = this;
-        this.element.dispose = function() {
-            if (menuContainer.element.dispose) {
-                menuContainer.element.dispose = null;
-                Sys.WebForms.Menu._domHelper.removeEvent(menuContainer.menu.element, 'focus', menuContainer._onfocus, true);
-                Sys.WebForms.Menu._domHelper.removeEvent(menuContainer.menu.element, 'keydown', menuContainer._onkeydown);
-                menuContainer.menu.doDispose();
-            }
-        };
-        Sys.WebForms.Menu._domHelper.addEvent(window, 'unload', function() {
-            if (menuContainer.element.dispose) {
-                menuContainer.element.dispose();
-            }
-        });
-    }
-};
-Sys.WebForms._MenuContainer.prototype = {
-    blur: function() {
-        this.focused = false;
-        this.isBlurring = false;
-        this.menu.collapse();
-        this.focusedMenuItem = null;
-    },
-    focus: function(e) { this.focused = true; },
-    navigateTo: function(menuItem) {
-        if (this.focusedMenuItem && this.focusedMenuItem !== this) {
-            this.focusedMenuItem.highlight(false);
-        }
-        menuItem.highlight(true);
-        menuItem.focus();
-        this.focusedMenuItem = menuItem;
-    },
-    _onfocus: function(e) {
-        var event = e || window.event;
-        if (event.srcElement && this) {
-            if (Sys.WebForms.Menu._domHelper.contains(this.element, event.srcElement)) {
-                if (!this.focused) {
-                    this.focus();
-                }
-            }
-        }
-    },
-    _onkeydown: function(e) {
-        var thisMenu = Sys.WebForms.Menu._elementObjectMapper.getMappedObject(this);
-        var keyCode = Sys.WebForms.Menu._domHelper.getKeyCode(e || window.event);
-        if (thisMenu) {
-            thisMenu.handleKeyPress(keyCode);
-        }
-    }
-};
--- a/server/bootstrap/css/bootstrap.css
+++ b/server/bootstrap/css/bootstrap.css
--- a/server/bootstrap/css/bootstrap.css.map
+++ b/server/bootstrap/css/bootstrap.css.map
--- a/server/bootstrap/css/bootstrap.min.css
+++ b/server/bootstrap/css/bootstrap.min.css
--- a/server/bootstrap/css/bootstrap.min.css.map
+++ b/server/bootstrap/css/bootstrap.min.css.map
--- a/server/bootstrap/js/bootstrap.bundle.js
+++ b/server/bootstrap/js/bootstrap.bundle.js
--- a/server/bootstrap/js/bootstrap.bundle.js.map
+++ b/server/bootstrap/js/bootstrap.bundle.js.map
--- a/server/bootstrap/js/bootstrap.bundle.min.js
+++ b/server/bootstrap/js/bootstrap.bundle.min.js
--- a/server/bootstrap/js/bootstrap.bundle.min.js.map
+++ b/server/bootstrap/js/bootstrap.bundle.min.js.map
--- a/server/bootstrap/js/bootstrap.js
+++ b/server/bootstrap/js/bootstrap.js
--- a/server/bootstrap/js/bootstrap.js.map
+++ b/server/bootstrap/js/bootstrap.js.map
--- a/server/bootstrap/js/bootstrap.min.js
+++ b/server/bootstrap/js/bootstrap.min.js
--- a/server/bootstrap/js/bootstrap.min.js.map
+++ b/server/bootstrap/js/bootstrap.min.js.map
--- a/server/csi.min.js
+++ b/server/csi.min.js
@ -1 +0,0 @@
-window.onload=function(){function a(a,b){var c=/^(?:file):/,d=new XMLHttpRequest,e=0;d.onreadystatechange=function(){4==d.readyState&&(e=d.status),c.test(location.href)&&d.responseText&&(e=200),4==d.readyState&&200==e&&(a.outerHTML=d.responseText)};try{d.open("GET",b,!0),d.send()}catch(f){}}var b,c=document.getElementsByTagName("*");for(b in c)c[b].hasAttribute&&c[b].hasAttribute("data-include")&&a(c[b],c[b].getAttribute("data-include"))};
--- a/server/download.png
+++ b/server/download.png
--- a/server/favicon.png
+++ b/server/favicon.png
--- a/server/index.html
+++ b/server/index.html
--- a/server/jquery/jquery.js
+++ b/server/jquery/jquery.js
--- a/server/jquery/jquery.min.js
+++ b/server/jquery/jquery.min.js
--- a/server/jquery/jquery.min.map
+++ b/server/jquery/jquery.min.map
--- a/server/jquery/jquery.slim.js
+++ b/server/jquery/jquery.slim.js
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`window.onload=function(){function a(a,b){var c=/^(?:file):/,d=new XMLHttpRequest,e=0;d.onreadystatechange=function(){4==d.readyState&&(e=d.status),c.test(location.href)&&d.responseText&&(e=200),4==d.readyState&&200==e&&(a.outerHTML=d.responseText)};try{d.open("GET",b,!0),d.send()}catch(f){}}var b,c=document.getElementsByTagName("*");for(b in c)c[b].hasAttribute&&c[b].hasAttribute("data-include")&&a(c[b],c[b].getAttribute("data-include"))};`