From d358f88ee701f12bcc898e79ca821aec44e4838c Mon Sep 17 00:00:00 2001 From: Juuso Lapinlampi Date: Sun, 29 May 2016 09:46:46 +0000 Subject: pages: Bring back autistic neckbeard rant The return of the almost legendary autistic neckbeard rant loved or hated by everyone. Shown to noscript users. This bug was introduced in the following commits: - Rephrase check_script.swig JavaScript warning (6c3491c) - Remove unnecessary paragraphs (254760b) - Add link to JS free version (55fb54d) This also fixes a grammar issue found in the previous iteration of this feature: "autist neckbeard" -> "autistic neckbeard". ewhal fell off. Cc: Eliot Whalan --- pages/check_script.swig | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pages/check_script.swig b/pages/check_script.swig index 224c547..1cc5b45 100644 --- a/pages/check_script.swig +++ b/pages/check_script.swig @@ -1,5 +1,7 @@ {# -Copyright (c) 2015 the Pantsu.cat developers +Copyright (c) 2013 Eric Johansson +Copyright (c) 2013 Peter Lejeck +Copyright (c) 2015, 2016 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 @@ -20,5 +22,5 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #} -- cgit v1.2.3 From 51450de2fd8f723506551c025e6692af72236d17 Mon Sep 17 00:00:00 2001 From: Juuso Lapinlampi Date: Fri, 27 May 2016 07:53:39 +0000 Subject: pages: Deprecate JavaScript-free upload JavaScript-free uploading was introduced in Pomf 2.0 as a misfeature. It increases complexity of the API code base and duplicates some code. This was obviously a misled approach to Pomf development. The recommended approach to solving this issue is using the upload API with external tools. ewhal fell off. Cc: Eliot Whalan --- pages/check_script.swig | 5 +++++ pages/nojs.swig | 5 +++++ pages/upload_form_nojs.swig | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/pages/check_script.swig b/pages/check_script.swig index 1cc5b45..d612980 100644 --- a/pages/check_script.swig +++ b/pages/check_script.swig @@ -21,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. +#} + 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/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. +#} +
-- cgit v1.2.3 From 5337198d9cdad99380057ec3df8fdb83892c0865 Mon Sep 17 00:00:00 2001 From: Juuso Lapinlampi Date: Fri, 27 May 2016 08:09:39 +0000 Subject: pages: Deprecate other services The other services page was introduced in Pomf 2.0 as a customization for Pantsu.cat, pushed to master branch as a misled approach to development. There's no good reason to keep this as a Pomf core feature. ewhal fell off. Cc: Eliot Whalan --- pages/nav.swig | 1 + pages/other.swig | 5 +++++ 2 files changed, 6 insertions(+) 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.
  • Paste
  • Tools
  • Git
    • + {# other.html is deprecated since 2.1.0. #}
  • Other
  • Transparency
    • 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 %} -- cgit v1.2.3 From 2933ff1b06223a96b27d8e78ba5c04ab43806b55 Mon Sep 17 00:00:00 2001 From: Juuso Lapinlampi Date: Fri, 27 May 2016 08:58:54 +0000 Subject: Response: Deprecate HTML and text responses HTML and text responses were introduced by Eliot to Pomf 2.0 primarily for the JavaScript-free uploader (which is also deprecated). I can't imagine any sane tool preferring to have either of these flawed responses over JSON or CSV. They increase code complexity and duplication. Let them fall off. ewhal fell off. Cc: Eliot Whalan --- static/classes/Response.class.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) 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. */ -- cgit v1.2.3