diff options
| -rw-r--r-- | Gruntfile.js | 6 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | moe/includes/api.php | 1 | ||||
| -rw-r--r-- | moe/index.php | 1 | ||||
| -rw-r--r-- | pages/ca.swig | 1 | ||||
| -rw-r--r-- | pages/check_fileapica.swig | 2 | ||||
| -rw-r--r-- | pages/check_scriptca.swig | 2 | ||||
| -rw-r--r-- | pages/faq.swig | 24 | ||||
| -rw-r--r-- | pages/index.swig | 8 | ||||
| -rw-r--r-- | pages/layout.swig | 24 | ||||
| -rw-r--r-- | pages/nav.swig | 16 | ||||
| -rw-r--r-- | pages/nojs.swig | 8 | ||||
| -rw-r--r-- | pages/other.swig | 7 | ||||
| -rwxr-xr-x | static/classes/Response.class.php | 5 |
14 files changed, 53 insertions, 56 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index 70cbfbe..96fbab2 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -18,9 +18,9 @@ module.exports = function (grunt) { 'index.swig', 'faq.swig', 'tools.swig', - 'other.swig', - 'nojs.swig', - 'ca.swig' + 'other.swig', + 'nojs.swig', + 'ca.swig' ], siteUrl: 'https://pantsu.cat/', production: false, @@ -12,7 +12,7 @@ The assets are minified and combined using [Grunt](http://gruntjs.com/). Assuming you already have Node and NPM working, compilation is easy. Use the following shell code: -#### Apache +## Apache If you are running Apache and want to compress your output when serving files, add to your `.htaccess` file: ======= ``` @@ -56,8 +56,6 @@ configuration file. * Clean up Moe code, a lot.. * API keys? -## Contact -I can be contacted via hostmaster@pantsu.cat. ======= ## License diff --git a/moe/includes/api.php b/moe/includes/api.php index b85cbbf..634cd74 100644 --- a/moe/includes/api.php +++ b/moe/includes/api.php @@ -1,4 +1,5 @@ <?php + // This file will act as a APIish thing require_once 'core.php'; diff --git a/moe/index.php b/moe/index.php index 70e081b..8a44f41 100644 --- a/moe/index.php +++ b/moe/index.php @@ -1,4 +1,5 @@ <?php + session_start(); if (isset($_SESSION['id'])) { diff --git a/pages/ca.swig b/pages/ca.swig index 7a51e13..f0ce3d6 100644 --- a/pages/ca.swig +++ b/pages/ca.swig @@ -2,7 +2,6 @@ {% block body %} <div class="jumbotron"> - <header> <h1>Ropa Interior~</h1> </header> diff --git a/pages/check_fileapica.swig b/pages/check_fileapica.swig index a3e8120..1797a9b 100644 --- a/pages/check_fileapica.swig +++ b/pages/check_fileapica.swig @@ -1,3 +1,3 @@ <p id="no-file-api" class="alert alert-error"> - <strong> El seu navegador és una merda. </strong> Instal l'última <a href="http://firefox.com/"> Firefox </a> o <a href = "http://chrome.google.com / "> </a> Botnet i tornar <3 + <strong>El seu navegador és una merda.</strong> Instal l'última <a href="http://firefox.com/">Firefox</a> o <a href="http://chrome.google.com/">Botnet</a> i tornar <3 </p> diff --git a/pages/check_scriptca.swig b/pages/check_scriptca.swig index 0a5f0ea..3c8b01a 100644 --- a/pages/check_scriptca.swig +++ b/pages/check_scriptca.swig @@ -1,3 +1,3 @@ <noscript> - <p class="alert alert-error"><a href="https://no.pantsu.cat"> Javascript versió gratuïta</p> + <p class="alert alert-error"><a href="https://no.pantsu.cat">Javascript versió gratuïta</a></p> </noscript> diff --git a/pages/faq.swig b/pages/faq.swig index 320f4b4..dca3c80 100644 --- a/pages/faq.swig +++ b/pages/faq.swig @@ -3,20 +3,20 @@ {% block title %}FAQ{% endblock %} {% block body %} <div class="jumbotron"> -<h1>FAQ</h1> -{% include "nav.swig" %} + <h1>FAQ</h1> + {% include "nav.swig" %} </div> <ul> - <li>Pantsu does NOT support Internet Explorer and older versions of Firefox, Chrome, Opera and Safari.</li> - <li>Uploading tools for Pantsu can be found at Tools. (Currently working to update them all to work with pantsu.cat)</li> - <li>Max file size is {{max_upload_size}}MiB, hopefully I won't have to change this to a even lower number. (read: don't be an ass).</li> - <li>No Child porn, anything else goes until I get a lawsuit I guess. (unless its a virus, because that goes into the being an ass category).</li> - <li>All filetypes are allowed, ALL! (gif,exe,jpg,rar,ass,srt,etc,etc).</li> - <li>No data is collected or logged by us. This won't change. Cloudflare isn't in use</li> - <li>Please contact me at <a href="mailto:contact@pantsu.cat">contact@pantsu.cat</a> for any questions.</li> - <li>If you wish to send me any DMCA requests please contact me at <a href="mailto:abuse@pantsu.cat>abuse@pantsu.cat</a></li> - <li>If any changes to these policies happen you will be informed about them.</li> - <li>I will keep the site as transparent as possible. This will include any files that I remove will be publically listed and have a copy of the DMCA notice. For more information please visit the <a href="//transparency.pantsu.cat">transparency information</a> page.</li> + <li>Pantsu does NOT support Internet Explorer and older versions of Firefox, Chrome, Opera and Safari.</li> + <li>Uploading tools for Pantsu can be found at Tools. (Currently working to update them all to work with pantsu.cat)</li> + <li>Max file size is {{max_upload_size}}MiB, hopefully I won't have to change this to a even lower number. (read: don't be an ass).</li> + <li>No Child porn, anything else goes until I get a lawsuit I guess. (unless its a virus, because that goes into the being an ass category).</li> + <li>All filetypes are allowed, ALL! (gif,exe,jpg,rar,ass,srt,etc,etc).</li> + <li>No data is collected or logged by us. This won't change. Cloudflare isn't in use</li> + <li>Please contact me at <a href="mailto:contact@pantsu.cat">contact@pantsu.cat</a> for any questions.</li> + <li>If you wish to send me any DMCA requests please contact me at <a href="mailto:abuse@pantsu.cat>abuse@pantsu.cat</a></li> + <li>If any changes to these policies happen you will be informed about them.</li> + <li>I will keep the site as transparent as possible. This will include any files that I remove will be publically listed and have a copy of the DMCA notice. For more information please visit the <a href="//transparency.pantsu.cat">transparency information</a> page.</li> </ul> {% include "banners.swig" %} {% endblock %} diff --git a/pages/index.swig b/pages/index.swig index 8a1635e..3335661 100644 --- a/pages/index.swig +++ b/pages/index.swig @@ -2,10 +2,10 @@ {% block body %} <div class="jumbotron"> - <header> - <h1>Pantsu~</h1> - <p lang="ca">Ropa Interior~</p> - </header> + <header> + <h1>Pantsu~</h1> + <p lang="ca">Ropa Interior~</p> + </header> <p class="lead">Max upload size is {{max_upload_size}}MiB, read the <a href="faq.html">FAQ</a></p> {% include "check_script.swig" %} {% include "check_fileapi.swig" %} diff --git a/pages/layout.swig b/pages/layout.swig index 7daaf0b..d887a3e 100644 --- a/pages/layout.swig +++ b/pages/layout.swig @@ -1,15 +1,15 @@ <!DOCTYPE html> <html lang="en"> -<head> - <meta charset="utf-8"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <title>Pantsu.cat · {% block title %}Kawaii File Hosting{% endblock %}</title> - <link rel="icon" href="favicon.ico"> - <link rel="stylesheet" href="pomf.min.css"> -</head> -<body> -<div class="container"> - {% block body %}What the fuck are you doing here, baka?{% endblock %} -</div> -</body> + <head> + <meta charset="utf-8"> + <meta name="viewport" content="width=device-width, initial-scale=1"> + <title>Pantsu.cat · {% block title %}Kawaii File Hosting{% endblock %}</title> + <link rel="icon" href="favicon.ico"> + <link rel="stylesheet" href="pomf.min.css"> + </head> + <body> + <div class="container"> + {% block body %}What the fuck are you doing here, baka?{% endblock %} + </div> + </body> </html> diff --git a/pages/nav.swig b/pages/nav.swig index 5864c43..cd2f43d 100644 --- a/pages/nav.swig +++ b/pages/nav.swig @@ -1,11 +1,11 @@ <nav> - <ul><li> - <a href="//pantsu.cat/">Pantsu</a></li><li> - <a href="//p.pantsu.cat/">Paste</a></li><li> - <a href="tools.html">Tools</a></li><li> - <a href="//github.com/pantsucat/pomf">Github</a></li><li> - <a href="other.html">Other</a></li><li> - <a href="//transparency.pantsu.cat">Transparency</a></li> - <a href="ca.html">Catalan</a></li><li> + <ul> + <li><a href="//pantsu.cat/">Pantsu</a></li> + <li><a href="//p.pantsu.cat/">Paste</a></li> + <li><a href="tools.html">Tools</a></li> + <li><a href="//github.com/pantsucat/pomf">Github</a></li> + <li><a href="other.html">Other</a></li> + <li><a href="//transparency.pantsu.cat">Transparency</a></li> + <li><a href="ca.html">Catalan</a></li> </ul> </nav> diff --git a/pages/nojs.swig b/pages/nojs.swig index c526688..91d1105 100644 --- a/pages/nojs.swig +++ b/pages/nojs.swig @@ -2,10 +2,10 @@ {% block body %} <div class="jumbotron"> - <header> - <h1>Pantsu~</h1> - <p lang="ca">Ropa Interior~</p> - </header> + <header> + <h1>Pantsu~</h1> + <p lang="ca">Ropa Interior~</p> + </header> <p class="lead">Max upload size is {{max_upload_size}}MiB, read the <a href="faq.html">FAQ</a></p> {% include "check_fileapi.swig" %} {% include "upload_form_nojs.swig" %} diff --git a/pages/other.swig b/pages/other.swig index 2efb119..4071fb5 100644 --- a/pages/other.swig +++ b/pages/other.swig @@ -3,12 +3,11 @@ {% block title %}FAQ{% endblock %} {% block body %} <div class="jumbotron"> -<h1>Other Services</h1> + <h1>Other Services</h1> </div> <ul> - <li><a href="//git.pantsu.cat">Git</a></li> - <li><a href="firefox/">Firefox /g/uide</a></li> + <li><a href="//git.pantsu.cat">Git</a></li> + <li><a href="firefox/">Firefox /g/uide</a></li> </ul> {% include "nav.swig" %} {% endblock %} - diff --git a/static/classes/Response.class.php b/static/classes/Response.class.php index 951e39e..c340a4c 100755 --- a/static/classes/Response.class.php +++ b/static/classes/Response.class.php @@ -16,7 +16,6 @@ class Response header('Content-Type: text/plain; charset=UTF-8'); $this->type = $response_type; break; - case 'html': header('Content-Type: text/html;charset=utf-8'); $this->type = 'html'; @@ -118,7 +117,7 @@ class Response $result .= $file['url']."\n"; } - return $result; + return $result; } private static function html_error($code, $description) @@ -132,7 +131,7 @@ class Response $result .= "<a href=\"".$file['url']."\">".$file['url']."</a><br>"; } - return $result; + return $result; } private static function json_error($code, $description) |