diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..6704f18 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "parsedown"] + path = parsedown + url = https://github.com/erusev/parsedown.git +[submodule "parsedown-extra"] + path = parsedown-extra + url = https://github.com/erusev/parsedown-extra.git diff --git a/.htaccess b/.htaccess new file mode 100644 index 0000000..3428078 --- /dev/null +++ b/.htaccess @@ -0,0 +1,2 @@ +RewriteEngine On +ErrorDocument 404 http://tylda.org/404/ diff --git a/404.php b/404.php new file mode 100644 index 0000000..0a15667 --- /dev/null +++ b/404.php @@ -0,0 +1,16 @@ + + + +
+

> BŁĄD 404

+ nieznaleziono +
+ +
+ +

Halo, co to za strona? Ona istnieje? Nie znaleźliśmy jej, co mam ci powiedzieć...

+Tak się teraz mogą czuć czytelnicy + +
+ + diff --git a/fingerprint.php b/fingerprint.php new file mode 100644 index 0000000..ade2847 --- /dev/null +++ b/fingerprint.php @@ -0,0 +1,16 @@ + + + +
+

> SSH Fingerprint

+
+ +
+ +

SHA256:MPApCxVOpQc/9rXExcYC2bDwM9SzSwRx2RSaEhGoGEw (RSA)

+

SHA256:Jeciv5YkUraww9aAxtz/nzsWywKx649dqUuMjDAzER0 (ED25519)

+

SHA256:65R9vGOH/3c/E5upbYB2yhK83fO0cts9c6hShg/ylio (ECDSA)

+ +
+ + diff --git a/footer.php b/footer.php index 67ff4ef..cd9d716 100644 --- a/footer.php +++ b/footer.php @@ -1,6 +1,7 @@ diff --git a/index.php b/index.php index d8adb6f..47a5c1d 100644 --- a/index.php +++ b/index.php @@ -20,8 +20,26 @@ include 'header.php'; $slogans = file("slogans.txt"); $slogan = $slogans[rand(0, count($slogans) - 1)]; +$activeUsers = json_decode(file_get_contents('/opt/html/online.json'), true); ?> +
+
Użytkownicy online: ';
+    foreach ($activeUsers as $user) {
+        $username = htmlspecialchars($user);
+        echo "$username  ";
+    }
+    echo '';
+} else {
+    echo "/dev/null";
+}
+
+?>

+
+
+ 
    /$$               /$$       /$$
   | $$              | $$      | $$
diff --git a/parsedown b/parsedown
new file mode 160000
index 0000000..4e433a8
--- /dev/null
+++ b/parsedown
@@ -0,0 +1 @@
+Subproject commit 4e433a8d57078645b55d21fd12c887d3ba6ca01e
diff --git a/parsedown-extra b/parsedown-extra
new file mode 160000
index 0000000..cf4dc29
--- /dev/null
+++ b/parsedown-extra
@@ -0,0 +1 @@
+Subproject commit cf4dc29794d22ab441fddd2b336b5c54f7ae2e2f
diff --git a/slogans.txt b/slogans.txt
index e1f404f..f9d4001 100644
--- a/slogans.txt
+++ b/slogans.txt
@@ -11,3 +11,9 @@ bo prawdziwi ludzie używają `vi`.
 retro jest teraz.
 jesteśmy tu dla `echo "hello world"`.
 dzwoń do nas przez `write`.
+bez slopu!
+mniej to więcej.
+o jeden ssh z dala.
+tak, lubimy terminale.
+`ed` jest standardowym edytorem tekstu.
+wszystko albo /dev/null.
diff --git a/static/css/main.css b/static/css/main.css
index 2e39fdb..d8932c1 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -86,12 +86,12 @@ footer#footer {
     justify-content: center;
 }
 
-.link {
+a[href] {
     color: var(--link);
     text-decoration: none;
 }
 
-.link:hover {
+a[href]:hover {
     color: var(--link-hover);
 }
 
@@ -103,11 +103,54 @@ footer#footer > *:not(:last-child)::after {
 }
 
 pre.ascii {
+    margin-top: 2rem;
     margin-bottom: 2rem;
     font-size: 1rem;
     overflow: auto;
 }
 
+.scroll {
+    display: flex;
+    overflow: hidden;
+    white-space: pre;
+    align-items: center;
+}
+
+.scroll h3 {
+    flex-shrink:0;
+}
+
+.scroll a:before {
+    content:"~";
+}
+
+.scroll marquee {
+    margin-bottom: -.3rem;
+    width: 60%;
+}
+
+.scroll a {
+    padding: .3rem
+}
+
+.user-list {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(195px, 1fr));
+}
+
+.user-list a {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    flex: 10em;
+    padding-bottom: .3rem;
+    padding-top: .3rem;
+}
+
+.user-list a:before {
+    content:"~";
+}
+
 .user_home {
   display: grid;
   grid-template-columns: 100px 30px 100px 100px 40px 120px 15px;
diff --git a/static/img/reaction.png b/static/img/reaction.png
new file mode 100644
index 0000000..e2cff63
Binary files /dev/null and b/static/img/reaction.png differ
diff --git a/stats.png b/static/img/stats.png
similarity index 100%
rename from stats.png
rename to static/img/stats.png
diff --git a/stats.php b/stats.php
index 1dc589e..8a35820 100644
--- a/stats.php
+++ b/stats.php
@@ -26,7 +26,7 @@ error_reporting(E_ALL);
     
  • Ostatni server load: 
    • 
     
  • Wolny RAM: 
     
-    
+    
 
 
 
 
    > Users 
    
 
    
-Lista użytkowników i linki do ich blogów
+Lista użytkowników obecnie aktywnych:
+
+
    
+    $username";
+        }
+    } else {
+        echo "...";
+    }
+
+    ?>
+
    
+
+
    
+
+Lista użytkowników i linki do ich blogów:
 
      
-~$file";
-}
 
-?>
+
      
+    $file";
+    }
 
+    ?>
+
      
 
 
    
 
    
diff --git a/wiki/COPYRIGHT.md b/wiki/COPYRIGHT.md
new file mode 100644
index 0000000..7cdbe0b
--- /dev/null
+++ b/wiki/COPYRIGHT.md
@@ -0,0 +1,438 @@
+Attribution-NonCommercial-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-NonCommercial-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-NonCommercial-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-NC-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, NonCommercial, 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. 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.
+
+  l. 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.
+
+  m. 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.
+
+  n. 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, reproduce, and 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. 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, 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 (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-NC-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 for NonCommercial purposes
+     only;
+
+  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.
+
diff --git a/wiki/README.md b/wiki/README.md
new file mode 100644
index 0000000..c8c5612
--- /dev/null
+++ b/wiki/README.md
@@ -0,0 +1,10 @@
+# wiki tylda.org
+każdy artykuł posiada na początku wartości:
+
+title [nazwa twojego artykułu]
+
+authors: [twoja nazwa na tyldzie]
+
+category: [tylda, poradniki, technologia, linki]
+
+po utworzeniu nowego artykułu utwórz PR'a lub wyślij patcha mailem.
diff --git a/wiki/index.php b/wiki/index.php
index 12e5bff..43c487e 100644
--- a/wiki/index.php
+++ b/wiki/index.php
@@ -1,60 +1,66 @@
 setMarkupEscaped(true);
+$Extra = new ParsedownExtra();
 
 ?>
-
    - /$$$$$$$$        /$$       /$$                 /$$      /$$ /$$ /$$       /$$
-|__  $$__/       | $$      | $$                | $$  /$ | $$|__/| $$      |__/
-   | $$ /$$   /$$| $$  /$$$$$$$  /$$$$$$       | $$ /$$$| $$ /$$| $$   /$$ /$$
-   | $$| $$  | $$| $$ /$$__  $$ |____  $$      | $$/$$ $$ $$| $$| $$  /$$/| $$
-   | $$| $$  | $$| $$| $$  | $$  /$$$$$$$      | $$$$_  $$$$| $$| $$$$$$/ | $$
-   | $$| $$  | $$| $$| $$  | $$ /$$__  $$      | $$$/ \  $$$| $$| $$_  $$ | $$
-   | $$|  $$$$$$$| $$|  $$$$$$$|  $$$$$$$      | $$/   \  $$| $$| $$ \  $$| $$
-   |__/ \____  $$|__/ \_______/ \_______/      |__/     \__/|__/|__/  \__/|__/
-        /$$  | $$
-       |  $$$$$$/
-        \______/
-
    
-
+
 
    
     
    > Wiki
    
 
    
 
 
    
-Wiki jest aktualnie w trakcie tworzenia, poniżej znajdziesz najważniejsze informacje, które przydadzą Ci się na starcie ;)
    
-
    Poruszanie się po systemie
    
-
    Po zalogowaniu domyślnie będziesz mieć otwartą sesję TMUX z trzema zakładkami: Mail (neomutt), IRC (weechat) oraz shell i kilkoma keybindami.
    
-
    Keybindy, które mogą Ci się tu przydać to:
    
-
      
-
    • F1 - przejście do karty pierwszej (mail)
      • 
-
    • F2 - przejście do karty drugiej (IRC)
      • 
-
    • F3 - przejście do karty trzeciej (shell)
      • 
-
    • F12 - zamknięcie sesji TMUX i wylogowanie (domyślnie)
      • 
-
    
-
    Możesz oczywiście dostosować całość do siebie, konfiguracja keybinów jest dostępna w twoim katalogu domowym w pliku .tmux.conf
    
-
    Jeśli chodzi o Weechat (IRC), najważniejsze, co musisz znać to Alt + 1-9, żeby poruszać się po kanałach :)


    
-
    Usługi publiczne
    
-
    Domyślnie dla twojego konta uruchomiona jest strona internetowa na protokole HTTPS pod linkiem: tylda.org/~username. Pliki tejże strony możesz śmiało edytować, usuwać i robić z nimi co chcesz. Strona jest w twoim katalogu domowym pod public_html.
    
-
    Dodatkowo dla każdego jest również uruchomiona kapsuła gemini dostępna pod linkiem: gemini://tylda.org/~username. Pliki kapsuły są dla ciebie dostępne w katalogu domowym pod public_gemini.


    
-
    Git
    
-
    Na ten moment publiczna rejestracja na gitea jest wyłączona, boty się rejestrowały. Natomiast każdemu, kto chce założyć swoje repo lub wspomóc nas przy tworzeniu projektu zachęcam do kontaktu na mail/IRC z v0id1st lub smoorg, założymy bez problemu.
    
 
-  
    Webring
    
-  
    Webring jest prostym mechanizmem "skakania" po stronach użytkowników tylda.org. Każde konto jest domyślnie dodane do webringa, jeśli chcesz usunąć swoje to skaskuj plik .webring w swoim katalogu public_html.
    
-  
    Żeby dodać nawigację webring na swoją stronę, można przykładowo dorzucić taki HTML:
    
-  
     
-      ← poprzedni
-      losowy
-      następny →
-    
-  ');
+
+$categories = ['tylda', 'poradniki', 'technologia', 'linki'];
+$category_to_articles = [];
+
+foreach (glob("source/*.md") as $file)
+{
+  $article = basename($file, ".md");
+  $title = preg_match("/title: (.*)/i", file_get_contents($file), $matches) ? $matches[1] : $article;
+  $title = ucfirst($title);
+  $category = preg_match("/category: (.*)/i", file_get_contents($file), $matches) ? $matches[1] : 'default';
+
+  if (array_key_exists($category, $category_to_articles))
+    array_push($category_to_articles[$category], [$article, $title]);
+  else
+	$category_to_articles[$category] = [[$article, $title]];
+  
+  ksort($category_to_articles);
+}
+
+foreach ($categories as $category) 
+{
+  echo '
     > '.ucwords($category).'
    ';
+  echo '
      ';
+
+  $article_titles = [];
+  $article_names = [];
+
+  foreach ($category_to_articles[$category] as $article)
+  {
+    array_push($article_names, $article[0]);
+    array_push($article_titles, $article[1]);
+  }
+
+  $name_to_title = array_combine($article_names, $article_titles);
+  asort($name_to_title);
+
+  foreach ($name_to_title as $name => $title)
+    echo '
    • '.$title.'
      • ';
+  echo '

    ';
+}
+
 ?>
-  
    
-  
    Linki będą działały automatycznie.
    
+
+
    Artykuły są publiczne pod licencją CC BY-NC-SA 4.0.
    
 
    
 
 setMarkupEscaped(true);
+$Extra = new ParsedownExtra();
+
+$article = $_GET['article'] ?? '';
+$article = basename($article); 
+
+$path = __DIR__ . "/source/{$article}.md";
+if (!is_file($path)) {
+  http_response_code(404);
+  exit;
+}
+
+$raw = file_get_contents($path);
+
+$title = preg_match("/^title:\s*(.*)$/mi", $raw, $m) ? trim($m[1]) : ucfirst($article);
+$authors = preg_match("/^authors:\s*(.*)$/mi", $raw, $m) ? trim($m[1]) : ucfirst($article);
+
+$body = preg_replace("/^(title|category|authors):[^\r\n]*\r?\n/m", "", $raw);
+
+$html = $Extra->text($body); 
+?>
+
+
    
+  
    > 
    
+  
    osoby autorskie: >~
    
+
    
+
+
    
+  
+
    
+
+
diff --git a/wiki/source/cloud.md b/wiki/source/cloud.md
new file mode 100644
index 0000000..9d4fb40
--- /dev/null
+++ b/wiki/source/cloud.md
@@ -0,0 +1,5 @@
+title: Cloud
+authors: v0id1st
+category: linki
+
+Posiadamy własną instancję Nextcloud znajduje się pod adresem: [https://cloud.tylda.org/](https://cloud.tylda.org)
diff --git a/wiki/source/gitea.md b/wiki/source/gitea.md
new file mode 100644
index 0000000..9bca8ff
--- /dev/null
+++ b/wiki/source/gitea.md
@@ -0,0 +1,5 @@
+title: Gitea
+authors: v0id1st
+category: tylda
+
+Na ten moment publiczna rejestracja na gitea jest wyłączona, boty się rejestrowały. Natomiast każdemu, kto chce założyć swoje repo lub wspomóc nas przy tworzeniu projektu zachęcam do kontaktu na mail/IRC z v0id1st lub smoorg, założymy bez problemu.
diff --git a/wiki/source/moving.md b/wiki/source/moving.md
new file mode 100644
index 0000000..c82c582
--- /dev/null
+++ b/wiki/source/moving.md
@@ -0,0 +1,17 @@
+title: Poruszanie się po systemie
+authors: v0id1st
+category: tylda
+
+Po zalogowaniu domyślnie będziesz mieć otwartą sesję TMUX z trzema zakładkami: Mail (neomutt), IRC (weechat) oraz shell i kilkoma keybindami.
+
+Keybindy, które mogą Ci się tu przydać to:
+
+F1 - przejście do karty pierwszej (mail)
+F2 - przejście do karty drugiej (IRC)
+F3 - przejście do karty trzeciej (shell)
+F12 - zamknięcie sesji TMUX i wylogowanie (domyślnie)
+Możesz oczywiście dostosować całość do siebie, konfiguracja keybinów jest dostępna w twoim katalogu domowym w pliku .tmux.conf
+
+Jeśli chodzi o Weechat (IRC), najważniejsze, co musisz znać to Alt + 1-9, żeby poruszać się po kanałach :)
+
+
diff --git a/wiki/source/public_services.md b/wiki/source/public_services.md
new file mode 100644
index 0000000..9120475
--- /dev/null
+++ b/wiki/source/public_services.md
@@ -0,0 +1,7 @@
+title: Usługi publiczne
+authors: v0id1st
+category: tylda
+
+Domyślnie dla twojego konta uruchomiona jest strona internetowa na protokole HTTPS pod linkiem: tylda.org/~username. Pliki tejże strony możesz śmiało edytować, usuwać i robić z nimi co chcesz. Strona jest w twoim katalogu domowym pod public_html.
+
+Dodatkowo dla każdego jest również uruchomiona kapsuła gemini dostępna pod linkiem: gemini://tylda.org/~username. Pliki kapsuły są dla ciebie dostępne w katalogu domowym pod public_gemini.
diff --git a/wiki/source/vim.md b/wiki/source/vim.md
new file mode 100644
index 0000000..6a7754d
--- /dev/null
+++ b/wiki/source/vim.md
@@ -0,0 +1,12 @@
+title: Wprowadzenie do edytora Vim
+authors: io
+category: poradniki
+
+`vim` to jest edytor tekstu, a w sumie klon edytora `vi`. `vim` posiada własną licencję tzw. Vim License, jest to licensja Charityware kompatybilna z GPL.
+Dodam, że to bardzo powszechny program w tych kręgach :)
+
+### Tryby Pracy
+`vim` jako edytor modalny używa trybów pracy. Takich trybów jest wiele ale z praktycznych powodów omawiam parę z nich.
+Po uruchomieniu edytora poprzez komendę `vim` wrzuca nas w domyślny - NORMAL. Aby wprowadzić tekst można wcisnąć klawisz `Insert` lub małą literę `i`. Edytor wskaże, że obecny tryb jako INSERT tym samym jesteśmy w stanie wprowadzać tekst. Aby opuścić tryb INSERT należy wsciśnać `Esc`, lub też `C-c` albo `C-[`, zakładając że nam się śpieszy.
+Inny tryb VISUAL to tryb w którym możemy zaznaczyć pole tekstu i ewentualnie potem nim manipulować. W tryb można wejść poprzez wciśnięcie małej litery `v`.
+Jest też tryb REPLACE
diff --git a/wiki/source/webring.md b/wiki/source/webring.md
new file mode 100644
index 0000000..df45b68
--- /dev/null
+++ b/wiki/source/webring.md
@@ -0,0 +1,14 @@
+title: webring
+authors: v0id1st
+category: technologia
+
+Webring jest prostym mechanizmem "skakania" po stronach użytkowników tylda.org. Każde konto jest domyślnie dodane do webringa, jeśli chcesz usunąć swoje to skaskuj plik **.webring** w swoim katalogu **public_html**.
+Żeby dodać nawigację webring na swoją stronę, można przykładowo dorzucić taki HTML:
+```php
+    
+```
+Linki będą działały automatycznie.