summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LICENSE4
-rw-r--r--README.md2
-rw-r--r--pages/tools.swig85
-rw-r--r--schema.sql40
-rwxr-xr-xstatic/classes/Response.class.php6
-rwxr-xr-xupdate.sql16
6 files changed, 18 insertions, 135 deletions
diff --git a/LICENSE b/LICENSE
index 1a2fe26..a1f9a1f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,8 @@
The MIT License (MIT)
-Copyright (c) 2013 nokonoko
+Copyright (c) 2013, 2014, 2015 Eric Johansson
+Copyright (c) 2013, 2014 Peter Lejeck
+Copyright (c) 2015 the Pantsu.cat developers
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
diff --git a/README.md b/README.md
index efedfaf..ae782d8 100644
--- a/README.md
+++ b/README.md
@@ -65,4 +65,4 @@ license. See LICENSE.
## Contact
-The maintainer can be contacted via hostmaster@pantsu.cat.
+The maintainer can be contacted via <hostmaster@pantsu.cat>.
diff --git a/pages/tools.swig b/pages/tools.swig
index a53a83c..839bf31 100644
--- a/pages/tools.swig
+++ b/pages/tools.swig
@@ -7,112 +7,49 @@
{% include "nav.swig" %}
</div>
<section>
- <h1>Pomfit</h1>
+ <h2>pomfload</h2>
<dl>
<dt>Download</dt>
- <dd><a href="https://git.pantsu.cat/pantsucat/pantsuit">https://git.pantsu.cat/pantsucat/pantsuit</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>
- <dd><a href="https://git.pantsu.cat/pantsucat/pantsuscripts/raw/master/pomf">https://git.pantsu.cat/pantsucat/pantsuscripts/raw/master/pomf</a></dd>
+ <dd><a href="https://git.pantsu.cat/pantsu/pomfload">https://git.pantsu.cat/pantsu/pomfload</a></dd>
<dt>Contact</dt>
<dd><a href="https://twitter.com/AnonymousLink">https://twitter.com/AnonymousLink</a></dd>
</dl>
</section>
<section>
- <h1>limf</h1>
+ <h2>limf</h2>
<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>
+ <dd><a href="http://lich.github.io/">http://lich.github.io/</a></dd>
</dl>
</section>
<section>
- <h1>1339secure</h1>
+ <h2>1339secure</h2>
<dl>
<dt>Download</dt>
- <dd><a href="https://git.pantsu.cat/pantsucat/pantsusecure">https://git.pantsu.cat/pantsucat/pantsusecure</a></dd>
+ <dd><a href="https://git.pantsu.cat/pantsucat/pomfsecure">https://git.pantsu.cat/pantsucat/pomfsecure</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://git.pantsu.cat/pantsucat/pantsupy">https://git.pantsu.cat/pantsucat/pantsupy</a></dd>
- <dt>Contact</dt>
- <dd><a href="https://twitter.com/FuzzyPomf">https://twitter.com/FuzzyPomf</a></dd>
- </dl>
-</section>
-<section>
- <h1>Sharex</h1>
+ <h2>Sharex</h2>
<dl>
<dt>Download</dt>
<dd><a href="https://code.google.com/p/sharex/">https://code.google.com/p/sharex/</a></dd>
<dt>Settings</dt>
- <dd><a href="https://p.pantsu.cat/view/raw/a8f6e714">https://p.pantsu.cat/view/raw/a8f6e714</a></dd>
+ <dd><a href="https://p.pantsu.cat/view/raw/21cfb1f3">https://p.pantsu.cat/view/raw/21cfb1f3</a></dd>
</dl>
</section>
<section>
- <h1>Scotty</h1>
+ <h2>Gyazo Client (Puush like client)</h2>
<dl>
<dt>Download</dt>
- <dd><a href="https://git.pantsu.cat/pantsucat/Scotty">https://git.pantsu.cat/pantsucat/Scotty</a></dd>
- <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>
- <dd><a href="https://github.com/pantsucat/gyazowin">https://github.com/pantsucat/gyazowin</a></dd>
+ <dd><a href="https://github.com/pantsu/gyazowin">https://github.com/pantsu/gyazowin</a></dd>
+ <dd><a href="https://i.pantsu.cat/hnpgjr.exe">https://i.pantsu.cat/hnpgjr.exe</a></dd>
<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>
- <dd><a href="https://gist.github.com/aki--aki/6258422">https://gist.github.com/aki--aki/6258422</a></dd>
- <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>
- <dd><a href="http://mavanmanen.nl/index.php?page=projects">http://mavanmanen.nl/index.php?page=projects</a></dd>
- <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>
- <dd><a href="https://github.com/mavanmanen/ScrotUP">https://github.com/mavanmanen/ScrotUP</a></dd>
- <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>
- <dd><a href="http://p.pomf.se/624">http://p.pomf.se/624</a></dd>
- <dt>Contact</dt>
- <dd>Kori</dd>
- </dl>
-</section>
-
{% endblock %}
diff --git a/schema.sql b/schema.sql
index a640e6d..f668c5e 100644
--- a/schema.sql
+++ b/schema.sql
@@ -3,18 +3,6 @@
-- Host: localhost Database: pomf
--
--- Table structure for table `accounts`
---
-
-CREATE TABLE `accounts` (
- `id` int(10) unsigned NOT NULL auto_increment,
- `email` varchar(255) NOT NULL,
- `pass` varchar(255) NOT NULL,
- `level` int(11) NOT NULL,
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
-
---
-- Table structure for table `files`
--
@@ -35,33 +23,5 @@ CREATE TABLE `files` (
-- [6 for the name + the file extension length], but since there is no limit for the file
-- extension length (at the moment, at least) let's keep it high in order to avoid problems
---
--- Table structure for table `invites`
---
-
-CREATE TABLE `invites` (
- `id` int(10) unsigned NOT NULL auto_increment,
- `email` varchar(50) default '0',
- `code` varchar(50) default '0',
- `used` int(11) default '0',
- `level` int(11) default NULL,
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
-
---
--- Table structure for table `reports`
---
-
-CREATE TABLE `reports` (
- `id` int(10) unsigned NOT NULL auto_increment,
- `hash` char(40) default '0',
- `date` date default NULL,
- `file` varchar(255) NOT NULL default '0',
- `fileid` int(11) default '0',
- `reporter` varchar(255) NOT NULL default '0',
- `status` int(11) default '0',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
-
-- Dump completed on 2014-12-07 19:30:13
diff --git a/static/classes/Response.class.php b/static/classes/Response.class.php
index b7e4c5d..037d94f 100755
--- a/static/classes/Response.class.php
+++ b/static/classes/Response.class.php
@@ -16,10 +16,9 @@ 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';
+ header('Content-Type: text/html; charset=UTF-8');
+ $this->type = $response_type;
break;
default:
header('Content-Type: application/json; charset=UTF-8');
@@ -107,6 +106,7 @@ class Response
{
return POMF_URL.$files[0]['url'];
}
+
private static function txt_error($code, $description)
{
return 'ERROR: ('.$code.') '.$description;
diff --git a/update.sql b/update.sql
deleted file mode 100755
index 263718e..0000000
--- a/update.sql
+++ /dev/null
@@ -1,16 +0,0 @@
-ALTER TABLE `accounts`
-CHANGE COLUMN `id` `id` int(10) unsigned NOT NULL auto_increment;
-
-ALTER TABLE `files`
-CHANGE COLUMN `id` `id` int(10) unsigned NOT NULL auto_increment,
-CHANGE COLUMN `originalname` `originalname` varchar(255) NULL default NULL,
-CHANGE COLUMN `size` `size` int(10) NULL default NULL,
-CHANGE COLUMN `user` `user` int(10) NULL default '0';
-
-ALTER TABLE `invites`
-CHANGE COLUMN `id` `id` int(10) unsigned NOT NULL auto_increment;
-
-ALTER TABLE `reports`
-CHANGE COLUMN `id` `id` int(10) unsigned NOT NULL auto_increment,
-CHANGE COLUMN `file` `file` varchar(255) NOT NULL,
-CHANGE COLUMN `reporter` `reporter` varchar(255) NOT NULL;