Full git history now

8 files changed, 27 insertions, 34 deletions

diff --git a/README.md b/README.md
index de0aef5..28f38e4 100644
--- a/README.md
+++ b/README.md
@@ -43,4 +43,4 @@ Make sure to disable PHP from being executed on the file download domain/directo
 * API keys?
 
 # Contact
-I can be contacted via neku@pomf.se or twitter at [@nekunekus](https://twitter.com/nekunekus).
+I can be contacted via postmaster@pantsu.cat.
diff --git a/js/pomf.js b/js/pomf.js
index f5dd06b..519d158 100644
--- a/js/pomf.js
+++ b/js/pomf.js
@@ -36,7 +36,7 @@ $(function () {
 	})
 
 	var MAX_SIZE = (function (node) {
-		var max = node.attr('data-max-size') || '10MiB'
+		var max = /*node.attr('data-max-size') ||*/ '120MiB'
 		var num = parseInt(/([0-9,]+).*/.exec(max)[1].replace(',', ''))
 		var unit = /(?:([KMGTPEZY])(i)?B|([BKMGTPEZY]))/.exec(max) || ["B","",""]
 
diff --git a/pages/banners.json b/pages/banners.json
index f7b3ca2..c3e6534 100644
--- a/pages/banners.json
+++ b/pages/banners.json
@@ -1,4 +1,3 @@
 [
-		"banners/donate.swig",
 		"banners/virusscans.swig"
 ]
diff --git a/pages/faq.swig b/pages/faq.swig
index a3233e4..48b4b32 100644
--- a/pages/faq.swig
+++ b/pages/faq.swig
@@ -7,22 +7,18 @@
 {% include "nav.swig" %}
 </div>
 <ul>
-	<li>Pomf does NOT support Internet Explorer and older versions of Firefox, Chrome, Opera and Safari.</li>
-	<li>Uploading tools for Pomf can be found at <a href="tools.html">Tools</a>.</li>
-	<li>Max file size is 50MiB, 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>Any file can be removed or replaced at any time for any reason.</li>
-	<li>No logs are kept, no logs over uploading nor over downloading. This can be temp enabled to stop certain spamming (read: child porn or such).</li>
-	<li>a/i/pomf.se is hosted as for now on 500mbit server and Cloudflare's CDN helps out a lot, I'm on a restrained budget and this costs a lot so please don't be an ass.</li>
-	<li>I want to deliver the best free service I can without ads or such so donations are very welcome via the donate button on the front page (pomf.se).</li>
-	<li>Viruses will be removed if detected most of the time, this is to not cause further damage in form of i/a/pomf.se ending up on blacklists and whatnot. (read: IT ALREADY FUCKING IS!).</li>
-	<li>For removal of a file or such contact me at neku@pomf.se or pixel@pomf.se</li>
-	<li>We also have a mail newsletter thingy which you can sign-up at <a href="http://t.co/AyrLb4GWfO" TARGET="_BLANK">here!</a></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 120MiB, 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>Any file can be removed or replaced at any time for any reason.</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 contact @ pantsu.cat for any questions.</li>
+    <li>If you wish to send me any DMCA requests please contact me at abuse@pantsu.cat.</li>
+    <li>All content uploaded is owned by the user who uploaded it.</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. Please view this link for tranparency information.</li>
 </ul>
-<p>
-<b>Follow the rules and tips I have set up above, please. The FAQ may also be changed and updated at any time.<br />
-Go to <a href="http://blog.pomf.se">the Pomf Blog</a> or <a href="http://twitter.com/nekunekus">Twitter</a> for more information.</b>
-</p>
 {% include "banners.swig" %}
 {% endblock %}
diff --git a/pages/index.swig b/pages/index.swig
index 9215859..88c9687 100644
--- a/pages/index.swig
+++ b/pages/index.swig
@@ -2,8 +2,9 @@
 
 {% block body %}
 <div class="jumbotron">
-	<h1>Ohayou!</h1>
-	<p class="lead">Max upload size is {{max_upload_size}}MiB, read the <a href="faq.html">FAQ</a></p>
+	<h1>Pantsu!</h1>
+    <h2>Ropa Interior~</h2>
+	<p class="lead">Max upload size is 120MiB, read the <a href="faq.html">FAQ</a></p>
 	{% include "check_script.swig" %}
 	{% include "check_fileapi.swig" %}
 	{% include "upload_form.swig" %}
diff --git a/pages/layout.swig b/pages/layout.swig
index d72f934..876eda8 100644
--- a/pages/layout.swig
+++ b/pages/layout.swig
@@ -3,7 +3,7 @@
 <head>
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-	<title>Pomf.se &middot; {% block title %}Kawaii File Hosting{% endblock %}</title>
+	<title>Pantsu.cat &middot; {% block title %}Kawaii File Hosting{% endblock %}</title>
 	<link rel="shortcut icon" href=favicon.ico type="image/x-icon">
 	<link rel="stylesheet" href="pomf.min.css">
 </head>
diff --git a/pages/nav.swig b/pages/nav.swig
index 297eaef..91a5e32 100644
--- a/pages/nav.swig
+++ b/pages/nav.swig
@@ -1,14 +1,11 @@
 <nav>
 	<ul><li>
-		<a href="http://pomf.se/">Pomf</a></li><li>
-		<a href="http://tracker.pomf.se">Torrent Tracker</a></li><li>
-		<a href="http://blog.pomf.se/">Blog</a></li><li>
-		<a href="irc://irc.pomf.se#cute">IRC</a></li><li>
-		<a href="https://twitter.com/nekunekus">Twitter</a></li><li>
-		<a href="http://pomf.cat">Forum</a></li><li>
-		<a href="http://p.pomf.se/">Paste</a></li><li>
-		<a href="http://moe.pomf.se">Moe Login</a></li><li>
-		<a href="https://github.com/nokonoko/Pomf">Github</a></li><li>
-		<a href="tools.html">Tools</a></li>
+		<a href="//pantsu.cat/">Pantsu</a></li><li>
+		<a href="//p.pantsu.cat/">Paste</a></li><li>
+		<a href="//github.com/pantsucat/Pomf-2">Github</a></li><li>
+        <a href="//git.pantsu.cat">Git</a></li><li>
+		<a href="tools.html">Tools</a></li><li>
+        <a href="firefox/">Firefox /g/uide</a></li><li>
+        <a href="//transparency.pantsu.cat">Transparency</a></li>
 	</ul>
 </nav>
diff --git a/static/includes/settings.inc.php b/static/includes/settings.inc.php
index cb152e8..e909b9a 100644
--- a/static/includes/settings.inc.php
+++ b/static/includes/settings.inc.php
@@ -8,11 +8,11 @@ define('POMF_DB_USER', 'pomf');
 define('POMF_DB_PASS', '***');
 
 // Root location of files
-define('POMF_FILES_ROOT', '/mnt/disk1/pomf/files/');
+define('POMF_FILES_ROOT', '/mnt/pantsu/http/files/');
 // Maximum number of iterations while generating a new name
 define('POMF_FILES_RETRIES', 15);
 // URL to prepend to output (include trailing slash)
-define('POMF_URL', 'http://a.pomf.se/');
+define('POMF_URL', 'https://i.pantsu.cat/');
 
 $doubledots = array_map('strrev', array(
 	'tar.gz',