diff options
| -rw-r--r-- | pages/check_script.swig | 11 | ||||
| -rw-r--r-- | pages/nav.swig | 1 | ||||
| -rw-r--r-- | pages/nojs.swig | 5 | ||||
| -rw-r--r-- | pages/other.swig | 5 | ||||
| -rw-r--r-- | pages/upload_form_nojs.swig | 5 | ||||
| -rwxr-xr-x | static/classes/Response.class.php | 18 |
6 files changed, 39 insertions, 6 deletions
diff --git a/pages/check_script.swig b/pages/check_script.swig index 224c547..d612980 100644 --- a/pages/check_script.swig +++ b/pages/check_script.swig @@ -1,5 +1,7 @@ {# -Copyright (c) 2015 the Pantsu.cat developers <hostmaster@pantsu.cat> +Copyright (c) 2013 Eric Johansson <neku@pomf.se> +Copyright (c) 2013 Peter Lejeck <peter.lejeck@gmail.com> +Copyright (c) 2015, 2016 the Pantsu.cat developers <hostmaster@pantsu.cat> 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 @@ -19,6 +21,11 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #} +{# +JavaScript-free uploader is deprecated since 2.1.0. It may be removed in a +future release. +#} + <noscript> - <p class="alert alert-error">This site requires JavaScript. Please enable JavaScript in your browser or use the <a href="nojs.html">JavaScript-free uploader</a>.</p> + <p class="alert alert-error"><strong>Enable JavaScript</strong> you fucking autistic neckbeard, it's not gonna hurt you. There's also a <a href="nojs.html">JavaScript-free uploader</a> if you need it, <span lang="jp">baka</span>.</p> </noscript> diff --git a/pages/nav.swig b/pages/nav.swig index 775174e..6f1a74e 100644 --- a/pages/nav.swig +++ b/pages/nav.swig @@ -25,6 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. <li><a href="//p.pantsu.cat/">Paste</a></li> <li><a href="tools.html">Tools</a></li> <li><a href="//git.pantsu.cat/pantsu/pomf">Git</a></li> + {# other.html is deprecated since 2.1.0. #} <li><a href="other.html">Other</a></li> <li><a href="//transparency.pantsu.cat">Transparency</a></li> </ul> diff --git a/pages/nojs.swig b/pages/nojs.swig index 5552b11..46eb08c 100644 --- a/pages/nojs.swig +++ b/pages/nojs.swig @@ -20,6 +20,11 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #} +{# +This template is deprecated since version 2.1.0. It may be removed in a future +release. +#} + {% extends "layout.swig" %} {% block body %} diff --git a/pages/other.swig b/pages/other.swig index a664aa5..9fb129d 100644 --- a/pages/other.swig +++ b/pages/other.swig @@ -20,6 +20,11 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #} +{# +This template is deprecated since version 2.1.0. It may be removed in a future +release. +#} + {% extends "layout.swig" %} {% block title %}Other Services{% endblock %} diff --git a/pages/upload_form_nojs.swig b/pages/upload_form_nojs.swig index 1952a0d..efb0978 100644 --- a/pages/upload_form_nojs.swig +++ b/pages/upload_form_nojs.swig @@ -19,6 +19,11 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #} +{# +This template is deprecated since version 2.1.0. It may be removed in a future +release. +#} + <form enctype="multipart/form-data" method="post" action="upload.php?output=html"> <input type="file" name="files[]" multiple data-max-size="{{max_upload_size}}MiB"> <input type="submit" value="Submit"> diff --git a/static/classes/Response.class.php b/static/classes/Response.class.php index 48b9b58..03dfad7 100755 --- a/static/classes/Response.class.php +++ b/static/classes/Response.class.php @@ -58,6 +58,7 @@ class Response $this->type = $response_type; break; case 'html': + // Deprecated since version 2.1.0 header('Content-Type: text/html; charset=UTF-8'); $this->type = $response_type; break; @@ -71,6 +72,7 @@ class Response $this->type = 'text'; break; case 'text': + // Deprecated since version 2.1.0 header('Content-Type: text/plain; charset=UTF-8'); $this->type = $response_type; break; @@ -98,12 +100,14 @@ class Response $response = $this->csv_error($desc); break; case 'html': + // Deprecated since version 2.1.0 $response = $this->html_error($code, $desc); break; case 'json': $response = $this->json_error($code, $desc); break; case 'text': + // Deprecated since version 2.1.0 $response = $this->text_error($code, $desc); break; } @@ -127,12 +131,14 @@ class Response $response = $this->csv_success($files); break; case 'html': + // Deprecated since version 2.1.0 $response = $this->html_success($files); break; case 'json': $response = $this->json_success($files); break; case 'text': + // Deprecated since version 2.1.0 $response = $this->text_success($files); break; } @@ -176,7 +182,8 @@ class Response /** * Indicates with HTML body the request was invalid. * - * @deprecated 2.1.0 Will be renamed to camelCase format. + * @deprecated 2.1.0 May be removed in a major release or renamed to + * camelCase format. * @param int $code HTTP status code number. * @param int $description Descriptive error message. * @return string Error message in HTML format. @@ -189,7 +196,8 @@ class Response /** * Indicates with HTML body the request was successful. * - * @deprecated 2.1.0 Will be renamed to camelCase format. + * @deprecated 2.1.0 May be removed in a major release or renamed to + * camelCase format. * @param mixed[] $files * @return string Success message in HTML format. */ @@ -239,7 +247,8 @@ class Response /** * Indicates with plain text body the request was invalid. * - * @deprecated 2.1.0 Will be renamed to camelCase format. + * @deprecated 2.1.0 May be removed in a major release or renamed to + * camelCase format. * @param int $code HTTP status code number. * @param int $description Descriptive error message. * @return string Error message in plain text format. @@ -252,7 +261,8 @@ class Response /** * Indicates with plain text body the request was successful. * - * @deprecated 2.1.0 Will be renamed to camelCase format. + * @deprecated 2.1.0 May be removed in a major release or renamed to + * camelCase format. * @param mixed[] $files * @return string Success message in plain text format. */ |