From 25a28ccda67bc39ab1a7b8eaa38fee09e17c154f Mon Sep 17 00:00:00 2001 From: WubTheCaptain Date: Fri, 18 Sep 2015 03:32:38 +0000 Subject: Fix whitespace and restore PSR-2 style --- Gruntfile.js | 6 +- moe/includes/api.php | 1 + moe/index.php | 1 + moe/login/index.html | 60 +++++++-------- moe/panel/index.php | 77 +++++++++---------- pages/ca.swig | 6 +- pages/check_fileapica.swig | 2 +- pages/check_scriptca.swig | 2 +- pages/faq.swig | 24 +++--- pages/index.swig | 8 +- pages/layout.swig | 24 +++--- pages/layoutca.swig | 24 +++--- pages/nav.swig | 16 ++-- pages/nojs.swig | 8 +- pages/other.swig | 7 +- pages/tools.swig | 153 ++++++++++++++++++++++++-------------- static/classes/Response.class.php | 8 +- 17 files changed, 232 insertions(+), 195 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 70cbfbe..5d017de 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, 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 @@ - - - + + + - Moe Login + Moe Login - + - + - + -
+
-

Login

+

Login

-
+
-
+ - - + + - + - -
+ -
+
-
-
-

Wrong email or password

-
-

You have entered the wrong email or password, or something else went wrong.

-
-
- +
+
+

Wrong email or password

+
+

You have entered the wrong email or password, or something else went wrong.

+
+
+ diff --git a/moe/panel/index.php b/moe/panel/index.php index 1c0cc6b..17e241a 100644 --- a/moe/panel/index.php +++ b/moe/panel/index.php @@ -18,47 +18,44 @@ - -
- - - - - -
- - -
-
-

- -
- - - -
-
- - - +
+ + + +
+ +
+
+

+ +

+ +
+ + + +
- + + +
diff --git a/pages/ca.swig b/pages/ca.swig index 68c7b97..18e8fe1 100644 --- a/pages/ca.swig +++ b/pages/ca.swig @@ -2,9 +2,9 @@ {% block body %}
-
-

Roba Interior~

-
+
+

Roba Interior~

+

Màxima grandària de pujada {{max_upload_size}}MiB, read the FAQ

{% include "check_scriptca.swig" %} {% include "check_fileapica.swig" %} diff --git a/pages/check_fileapica.swig b/pages/check_fileapica.swig index a3e8120..aba061d 100644 --- a/pages/check_fileapica.swig +++ b/pages/check_fileapica.swig @@ -1,3 +1,3 @@

- El seu navegador és una merda. Instal l'última Firefox o Botnet i tornar <3 + El seu navegador és una merda. Instal l'última Firefox o Botnet i tornar <3

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 @@ diff --git a/pages/faq.swig b/pages/faq.swig index 320f4b4..ffe70ce 100644 --- a/pages/faq.swig +++ b/pages/faq.swig @@ -3,20 +3,20 @@ {% block title %}FAQ{% endblock %} {% block body %}
-

FAQ

-{% include "nav.swig" %} +

FAQ

+ {% include "nav.swig" %}
    -
  • Pantsu does NOT support Internet Explorer and older versions of Firefox, Chrome, Opera and Safari.
  • -
  • Uploading tools for Pantsu can be found at Tools. (Currently working to update them all to work with pantsu.cat)
  • -
  • 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).
  • -
  • 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).
  • -
  • All filetypes are allowed, ALL! (gif,exe,jpg,rar,ass,srt,etc,etc).
  • -
  • No data is collected or logged by us. This won't change. Cloudflare isn't in use
  • -
  • Please contact me at contact@pantsu.cat for any questions.
  • -
  • If you wish to send me any DMCA requests please contact me at transparency information page.
  • +
  • Pantsu does NOT support Internet Explorer and older versions of Firefox, Chrome, Opera and Safari.
  • +
  • Uploading tools for Pantsu can be found at Tools. (Currently working to update them all to work with pantsu.cat)
  • +
  • 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).
  • +
  • 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).
  • +
  • All filetypes are allowed, ALL! (gif,exe,jpg,rar,ass,srt,etc,etc).
  • +
  • No data is collected or logged by us. This won't change. Cloudflare isn't in use
  • +
  • Please contact me at contact@pantsu.cat for any questions.
  • +
  • If you wish to send me any DMCA requests please contact me at transparency information page.
{% 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 %}
-
-

Pantsu~

-

Ropa Interior~

-
+
+

Pantsu~

+

Ropa Interior~

+

Max upload size is {{max_upload_size}}MiB, read the FAQ

{% include "check_script.swig" %} {% include "check_fileapi.swig" %} diff --git a/pages/layout.swig b/pages/layout.swig index 7daaf0b..cad6365 100644 --- a/pages/layout.swig +++ b/pages/layout.swig @@ -1,15 +1,15 @@ - - - - Pantsu.cat · {% block title %}Kawaii File Hosting{% endblock %} - - - - -
- {% block body %}What the fuck are you doing here, baka?{% endblock %} -
- + + + + Pantsu.cat · {% block title %}Kawaii File Hosting{% endblock %} + + + + +
+ {% block body %}What the fuck are you doing here, baka?{% endblock %} +
+ diff --git a/pages/layoutca.swig b/pages/layoutca.swig index 92f9824..3d35c68 100644 --- a/pages/layoutca.swig +++ b/pages/layoutca.swig @@ -1,15 +1,15 @@ - - - - Roba Interior.cat · {% block title %}Allotjament d'arxius valent{% endblock %} - - - - -
- {% block body %}What the fuck are you doing here, baka?{% endblock %} -
- + + + + Roba Interior.cat · {% block title %}Allotjament d'arxius valent{% endblock %} + + + + +
+ {% block body %}What the fuck are you doing here, baka?{% endblock %} +
+ diff --git a/pages/nav.swig b/pages/nav.swig index 5864c43..3e326c0 100644 --- a/pages/nav.swig +++ b/pages/nav.swig @@ -1,11 +1,11 @@ diff --git a/pages/nojs.swig b/pages/nojs.swig index c526688..5b13a11 100644 --- a/pages/nojs.swig +++ b/pages/nojs.swig @@ -2,10 +2,10 @@ {% block body %}
-
-

Pantsu~

-

Ropa Interior~

-
+
+

Pantsu~

+

Ropa Interior~

+

Max upload size is {{max_upload_size}}MiB, read the FAQ

{% include "check_fileapi.swig" %} {% include "upload_form_nojs.swig" %} diff --git a/pages/other.swig b/pages/other.swig index 2efb119..20b6fa0 100644 --- a/pages/other.swig +++ b/pages/other.swig @@ -3,12 +3,11 @@ {% block title %}FAQ{% endblock %} {% block body %}
-

Other Services

+

Other Services

{% include "nav.swig" %} {% endblock %} - diff --git a/pages/tools.swig b/pages/tools.swig index f82e8e4..ad96857 100644 --- a/pages/tools.swig +++ b/pages/tools.swig @@ -6,83 +6,122 @@

Pomf Tools

{% include "nav.swig" %}
-

Pomfit

-
Download
-
https://github.com/pantsucat/pomfit
-
Contact
+
+

Pomfit

+
+
Download
+
https://github.com/pantsucat/pomfit
+
Contact
https://twitter.com/Senketsu_Dev
-
-

Bash Pomf Uploader

-
Download
+
+
+
+

Bash Pomf Uploader

+
+
Download
https://gist.github.com/pantsucat/b46320a4103afda4e0ff
-
Contact
+
Contact
https://twitter.com/AnonymousLink
-
-

Simple Bash Pomf Uploader

-
Download
+
+
+
+

Simple Bash Pomf Uploader

+
+
Download
https://gist.github.com/pantsucat/da46d56e22063704604a
-
Contact
+
Contact
https://twitter.com/dev_console
-
-

limf

-
Download
-
https://github.com/lich/limf
-
Contact
-
http://lich.github.io//
-
-

1339secure

-
Download
-
https://github.com/pantsucat/1339secure
-
Contact
-
adriankoshcha@teknik.io
-
-

Python Pomf Uploader

-
Download
+
+
+
+

limf

+
+
Download
+
https://github.com/lich/limf
+
Contact
+
http://lich.github.io//
+
+
+
+

1339secure

+
+
Download
+
https://github.com/pantsucat/1339secure
+
Contact
+
adriankoshcha@teknik.io
+
+
+
+

Python Pomf Uploader

+
+
Download
https://github.com/pantsucat/POMF
-
Contact
+
Contact
https://twitter.com/FuzzyPomf
-
-

Sharex

-
Download
+
+
+
+

Sharex

+
+
Download
https://code.google.com/p/sharex/
-
Settings
+
Settings
https://p.pantsu.cat/view/raw/b79ea507
-
-

Scotty

-
Download
+
+
+
+

Scotty

+
+
Download
https://github.com/pantsucat/Scotty
-
Contact
+
Contact
https://twitter.com/mavanmanenDev
-
-

Gyazo Client (Puush like client)

-
Download
+
+
+
+

Gyazo Client (Puush like client)

+
+
Download
https://github.com/pantsucat/gyazowin
-
Contact
+
Contact
https://twitter.com/4vailable
-
-

Bash Screenshot Uploader

+
+
+
+

Bash Screenshot Uploader

+
Download
-
https://gist.github.com/aki--aki/6258422
+
https://gist.github.com/aki--aki/6258422
Contact
-
https://twitter.com/__akiaki
-
-

Pomf.se Windows Client Dead

-
Download
+
https://twitter.com/__akiaki
+
+
+
+

Pomf.se Windows Client Dead

+
+
Download
http://mavanmanen.nl/index.php?page=projects
-
Contact
+
Contact
https://twitter.com/mavanmanenDev
-
-

ScrotUP Dead

-
Download
+
+
+
+

ScrotUP Dead

+
+
Download
https://github.com/mavanmanen/ScrotUP
-
Contact
+
Contact
https://twitter.com/mavanmanenDev
-
-

Perl Pomf Uploaer Dead

-
Download
+
+
+
+

Perl Pomf Uploaer Dead

+
+
Download
http://p.pomf.se/624
-
Contact
+
Contact
Kori
-
+
+
{% endblock %} diff --git a/static/classes/Response.class.php b/static/classes/Response.class.php index 951e39e..b7e4c5d 100755 --- a/static/classes/Response.class.php +++ b/static/classes/Response.class.php @@ -17,7 +17,7 @@ class Response $this->type = $response_type; break; - case 'html': + case 'html': header('Content-Type: text/html;charset=utf-8'); $this->type = 'html'; break; @@ -118,7 +118,7 @@ class Response $result .= $file['url']."\n"; } - return $result; + return $result; } private static function html_error($code, $description) @@ -129,10 +129,10 @@ class Response private static function html_success($files) { foreach ($files as $file) { - $result .= "".$file['url']."
"; + $result .= ''.$file['url'].'
'; } - return $result; + return $result; } private static function json_error($code, $description) -- cgit v1.2.3