Merge branch 'wub'

3 files changed, 175 insertions, 113 deletions

diff --git a/README.md b/README.md
index 87b9efb..e6d09ff 100644
--- a/README.md
+++ b/README.md
@@ -1,41 +1,55 @@
 # Pomf
-Original development environment is Nginx + PHP5.5 + MySQL, but is confirmed to work with Apache 2.4
-and newer PHP versions. Should work with any other PDO-compatible database.
 
 ## Install
+
 For the purposes of this guide, we won't cover setting up Nginx, PHP, MySQL,
-Node, or NPM.  So we'll just assume you already have them all running well.
+Node, or NPM. So we'll just assume you already have them all running well.
 
 ### Compiling
+
 The assets are minified and combined using [Grunt](http://gruntjs.com/).
 
-Assuming you already have Node and NPM working, compilation is easy:
-```
-$ npm install -g grunt-cli
-$ git clone git://github.com/pantsucat/pomf.git
-$ cd pomf/
-$ npm install
-$ grunt
-```
-After this, the pomf site is now compressed and set up inside `dist/`.
+Assuming you already have Node and NPM working, compilation is easy. Use the
+following shell code:
 
 #### Apache
 If you are running Apache and want to compress your output when serving files, add to your `.htaccess` file:
+=======
 ```
-AddOutputFilterByType DEFLATE text/html text/plain text/css application/javascript application/x-javascript application/json
+npm install -g grunt-cli
+git clone git://github.com/pantsucat/pomf.git
+cd pomf/
+npm install
+grunt
 ```
-Remember to enable `deflate_module` and `filter_module` modules in your Apache configuration file.
 
-### Configuring
-The majority of settings are in `static/includes/settings.inc.php`.  Read the 
+After this, the pomf site is now compressed and set up inside `dist/`.
+
+## Configuring
+
+The majority of settings are in `static/includes/settings.inc.php`. Read the
 comments in that file for more information.
 
-For file size configuration, there is no server-side verification: we assume 
-that PHP and Nginx provide ample protection in this department.  There is,
+For file size configuration, there is no server-side verification: we assume
+that PHP and Nginx provide ample protection in this department. There is,
 however, client-side configuration for max size, the `data-max-size` attribute
 on the file input in `pages/upload_form.swig`.
 
-Make sure to disable PHP from being executed on the file download domain/directory (e.g a.site.com), otherwise a attacker can upload a malicious .php file and execute it on your server.
+Make sure to disable PHP from being executed on the file download
+domain/directory (e.g a.site.com), otherwise a attacker can upload a malicious
+.php file and execute it on your server.
+
+### Apache
+
+If you are running Apache and want to compress your output when serving files,
+add to your `.htaccess` file:
+
+```
+AddOutputFilterByType DEFLATE text/html text/plain text/css application/javascript application/x-javascript application/json
+```
+
+Remember to enable `deflate_module` and `filter_module` modules in your Apache
+configuration file.
 
 ## Todo
 
@@ -44,3 +58,12 @@ Make sure to disable PHP from being executed on the file download domain/directo
 
 ## Contact
 I can be contacted via hostmaster@pantsu.cat.
+=======
+## License
+
+Pomf is free software, and is released under the terms of the MIT (Expat)
+license. See LICENSE.
+
+## Contact
+
+The maintainer can be contacted via hostmaster@pantsu.cat.
diff --git a/moe/panel/index.php b/moe/panel/index.php
index 9a1dbdf..7a8bceb 100644
--- a/moe/panel/index.php
+++ b/moe/panel/index.php
@@ -19,43 +19,43 @@
     </head>
     <body class="homepage">
         <!-- Wrapper-->
-       <div id="wrapper">
-                <!-- Nav -->
-                    <nav id="nav">
-                        <a href="#me" class="fa fa-home active"><span>Home</span></a>
-                        <a href="ghetto-search.php" class="fa fa-folder"><span>Files</span></a>
-                        <a href="http://twitter.com/nekunekus" target="_BLANK" class="fa fa-twitter"><span>Twitter</span></a>
-                    </nav>
-                <!-- Main -->
-           <div id="main">
-                        <!-- Me -->
-                            <article id="me" class="panel">
-                                <header>
-                                <h1>
-                                    <?php session_start();
-                                        if (!isset($_SESSION['id'])) {
-                                            header('Location: ../login/');
-                                        }
-                                        echo 'Hi '.$_SESSION['email'];
-                                    ?>
-                                </h1>
-                                    <span class="byline">Are you being cayoot today?</span>
-                                </header>
-                                <a href="#files" class="jumplink pic">
-                                    <img src="images/cute.png" alt="" />
-                                </a>
-                            </article>
-                        </div>
-                <!-- Footer -->
-                    <div id="footer">
-                        <ul class="links">
-                            <li><a href="http://pomf.se/">Pomf</a></li>
-                            <li><a href="http://p.pomf.se/">Paste</a></li>
-                            <li><a href="http://blog.pomf.se">Blog</a></li>
-                            <li><a href="http://pomf.se/faq.html">FAQ</a></li>
-                            <li><a href="../includes/api.php?do=logout">Logout</a></li>
-                        </ul>
-                    </div>
+        <div id="wrapper">
+            <!-- Nav -->
+            <nav id="nav">
+                <a href="#me" class="fa fa-home active"><span>Home</span></a>
+                <a href="ghetto-search.php" class="fa fa-folder"><span>Files</span></a>
+                <a href="http://twitter.com/nekunekus" target="_BLANK" class="fa fa-twitter"><span>Twitter</span></a>
+            </nav>
+            <!-- Main -->
+            <div id="main">
+                <!-- Me -->
+                <article id="me" class="panel">
+                    <header>
+                        <h1>
+                            <?php session_start();
+                                if (!isset($_SESSION['id'])) {
+                                    header('Location: ../login/');
+                                }
+                                echo 'Hi '.$_SESSION['email'];
+                            ?>
+                        </h1>
+                        <span class="byline">Are you being cayoot today?</span>
+                    </header>
+                    <a href="#files" class="jumplink pic">
+                        <img src="images/cute.png" alt="" />
+                    </a>
+                </article>
             </div>
+            <!-- Footer -->
+            <div id="footer">
+                <ul class="links">
+                    <li><a href="http://pomf.se/">Pomf</a></li>
+                    <li><a href="http://p.pomf.se/">Paste</a></li>
+                    <li><a href="http://blog.pomf.se">Blog</a></li>
+                    <li><a href="http://pomf.se/faq.html">FAQ</a></li>
+                    <li><a href="../includes/api.php?do=logout">Logout</a></li>
+                </ul>
+            </div>
+        </div>
     </body>
 </html>
diff --git a/pages/tools.swig b/pages/tools.swig
index f82e8e4..2632f5f 100644
--- a/pages/tools.swig
+++ b/pages/tools.swig
@@ -6,83 +6,122 @@
 <h1>Pomf Tools</h1>
 {% include "nav.swig" %}
 </div>
-<section><h1>Pomfit</h1><dl>
-	<dt>Download</dt>
-    <dd><a href="https://github.com/pantsucat/pomfit">https://github.com/pantsucat/pomfit</a></dd>
-	<dt>Contact</dt>
+<section>
+   <h1>Pomfit</h1>
+   <dl>
+       <dt>Download</dt>
+       <dd><a href="https://github.com/pantsucat/pomfit">https://github.com/pantsucat/pomfit</a></dd>
+       <dt>Contact</dt>
 		<dd><a href="https://twitter.com/Senketsu_Dev">https://twitter.com/Senketsu_Dev</a></dd>
-</dl></section>
-<section><h1>Bash Pomf Uploader</h1><dl>
-	<dt>Download</dt>
+   </dl>
+</section>
+<section>
+   <h1>Bash Pomf Uploader</h1>
+   <dl>
+       <dt>Download</dt>
 		<dd><a href="https://gist.github.com/pantsucat/b46320a4103afda4e0ff">https://gist.github.com/pantsucat/b46320a4103afda4e0ff</a></dd>
-	<dt>Contact</dt>
+       <dt>Contact</dt>
 		<dd><a href="https://twitter.com/AnonymousLink">https://twitter.com/AnonymousLink</a></dd>
-</dl></section>
-<section><h1>Simple Bash Pomf Uploader</h1><dl>
-	<dt>Download</dt>
+   </dl>
+</section>
+<section>
+   <h1>Simple Bash Pomf Uploader</h1>
+   <dl>
+       <dt>Download</dt>
 		<dd><a href="https://gist.github.com/pantsucat/da46d56e22063704604a">https://gist.github.com/pantsucat/da46d56e22063704604a</a></dd>
-	<dt>Contact</dt>
+       <dt>Contact</dt>
 		<dd><a href="https://twitter.com/dev_console">https://twitter.com/dev_console</a></dd>
-</dl></section>
-<section><h1>limf</h1><dl>
-    <dt>Download</dt>
-        <dd><a href="https://github.com/lich/limf">https://github.com/lich/limf</a></dd>
-    <dt>Contact</dt>
-        <dd><a href="http://lich.github.io/">http://lich.github.io//</a></dd>
-</dl></section>
-<section><h1>1339secure</h1><dl>
-    <dt>Download</dt>
-        <dd><a href="https://github.com/pantsucat/1339secure">https://github.com/pantsucat/1339secure</a></dd>
-    <dt>Contact</dt>
-        <dd><a href="mailto:adriankoshcha@teknik.io">adriankoshcha@teknik.io</a></dd>
-</dl></section>
-<section><h1>Python Pomf Uploader</h1><dl>
-	<dt>Download</dt>
+   </dl>
+</section>
+<section>
+   <h1>limf</h1>
+   <dl>
+       <dt>Download</dt>
+       <dd><a href="https://github.com/lich/limf">https://github.com/lich/limf</a></dd>
+       <dt>Contact</dt>
+       <dd><a href="http://lich.github.io/">http://lich.github.io//</a></dd>
+   </dl>
+</section>
+<section>
+   <h1>1339secure</h1>
+   <dl>
+       <dt>Download</dt>
+       <dd><a href="https://github.com/pantsucat/1339secure">https://github.com/pantsucat/1339secure</a></dd>
+       <dt>Contact</dt>
+       <dd><a href="mailto:adriankoshcha@teknik.io">adriankoshcha@teknik.io</a></dd>
+   </dl>
+</section>
+<section>
+   <h1>Python Pomf Uploader</h1>
+   <dl>
+       <dt>Download</dt>
 		<dd><a href="https://github.com/pantsucat/POMF">https://github.com/pantsucat/POMF</a></dd>
-	<dt>Contact</dt>
+       <dt>Contact</dt>
 		<dd><a href="https://twitter.com/FuzzyPomf">https://twitter.com/FuzzyPomf</a></dd>
-</dl></section>
-<section><h1>Sharex</h1><dl>
-	<dt>Download</dt>
+   </dl>
+</section>
+<section>
+   <h1>Sharex</h1>
+   <dl>
+       <dt>Download</dt>
 		<dd><a href="https://code.google.com/p/sharex/">https://code.google.com/p/sharex/</a></dd>
-	<dt>Settings</dt>
+       <dt>Settings</dt>
 		<dd><a href="https://p.pantsu.cat/view/raw/b79ea507">https://p.pantsu.cat/view/raw/b79ea507</a></dd>
-</dl></section>
-<section><h1>Scotty</h1><dl>
-	<dt>Download</dt>
+   </dl>
+</section>
+<section>
+   <h1>Scotty</h1>
+   <dl>
+       <dt>Download</dt>
 		<dd><a href="https://github.com/pantsucat/Scotty">https://github.com/pantsucat/Scotty</a></dd>
-	<dt>Contact</dt>
+       <dt>Contact</dt>
 		<dd><a href="https://twitter.com/mavanmanenDev">https://twitter.com/mavanmanenDev</a></dd>
-</dl></section>
-<section class="ded"><h1>Gyazo Client (Puush like client)</h1><dl>
-	<dt>Download</dt>
+   </dl>
+</section>
+<section class="ded">
+   <h1>Gyazo Client (Puush like client)</h1>
+   <dl>
+       <dt>Download</dt>
 		<dd><a href="https://github.com/pantsucat/gyazowin">https://github.com/pantsucat/gyazowin</a></dd>
-	<dt>Contact</dt>
+       <dt>Contact</dt>
 		<dd><a href="https://twitter.com/4vailable">https://twitter.com/4vailable</a></dd>
-</dl></section>
-<section class="ded"><h1>Bash Screenshot Uploader</h1><dl>
-	<dt>Download</dt>
+   </dl>
+</section>
+<section class="ded">
+   <h1>Bash Screenshot Uploader</h1>
+   <dl>
+       <dt>Download</dt>
 		<dd><a href="https://gist.github.com/aki--aki/6258422">https://gist.github.com/aki--aki/6258422</a></dd>
-	<dt>Contact</dt>
+       <dt>Contact</dt>
 		<dd><a href="https://twitter.com/__akiaki">https://twitter.com/__akiaki</a></dd>
-</dl></section>
-<section class="ded"><h1>Pomf.se Windows Client <span class="old">Dead</span></h1><dl>
-	<dt>Download</dt>
+   </dl>
+</section>
+<section class="ded">
+   <h1>Pomf.se Windows Client <span class="old">Dead</span></h1>
+   <dl>
+       <dt>Download</dt>
 		<dd><a href="http://mavanmanen.nl/index.php?page=projects">http://mavanmanen.nl/index.php?page=projects</a></dd>
-	<dt>Contact</dt>
+       <dt>Contact</dt>
 		<dd><a href="https://twitter.com/mavanmanenDev">https://twitter.com/mavanmanenDev</a></dd>
-</dl></section>
-<section class="ded"><h1>ScrotUP <span class="old">Dead</span></h1><dl>
-	<dt>Download</dt>
+   </dl>
+</section>
+<section class="ded">
+   <h1>ScrotUP <span class="old">Dead</span></h1>
+   <dl>
+       <dt>Download</dt>
 		<dd><a href="https://github.com/mavanmanen/ScrotUP">https://github.com/mavanmanen/ScrotUP</a></dd>
-	<dt>Contact</dt>
+       <dt>Contact</dt>
 		<dd><a href="https://twitter.com/mavanmanenDev">https://twitter.com/mavanmanenDev</a></dd>
-</dl></section>
-<section class="ded"><h1>Perl Pomf Uploaer <span class="old">Dead</span></h1><dl>
-	<dt>Download</dt>
+   </dl>
+</section>
+<section class="ded">
+   <h1>Perl Pomf Uploaer <span class="old">Dead</span></h1>
+   <dl>
+       <dt>Download</dt>
 		<dd><a href="http://p.pomf.se/624">http://p.pomf.se/624</a></dd>
-	<dt>Contact</dt>
+       <dt>Contact</dt>
 		<dd>Kori</dd>
-</dl></section>
+   </dl>
+</section>
 
 {% endblock %}