-
Notifications
You must be signed in to change notification settings - Fork 171
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[#1032] Convert /misc/adult_* from BML
Also converts to Foundation since that was straightforward
- Loading branch information
Showing
10 changed files
with
274 additions
and
278 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,151 @@ | ||
| #!/usr/bin/perl | ||
| # | ||
| # DW::Controller::Journal::Protected | ||
| # | ||
| # Displays when a user tries to access protected content. | ||
| # | ||
| # Author: | ||
| # Allen Petersen <allen@suberic.net> | ||
| # | ||
| # Copyright (c) 2010-2014 by Dreamwidth Studios, LLC. | ||
| # | ||
| # This program is free software; you may redistribute it and/or modify it under | ||
| # the same terms as Perl itself. For a copy of the license, please reference | ||
| # 'perldoc perlartistic' or 'perldoc perlgpl'. | ||
| # | ||
|
|
||
| package DW::Controller::Journal::Protected; | ||
|
|
||
| use strict; | ||
|
|
||
| use DW::Controller; | ||
| use DW::Template; | ||
| use DW::Routing; | ||
| use DW::Request; | ||
|
|
||
| DW::Routing->register_string( "/journal/adult_concepts", \&adult_concepts_handler, app => 1 ); | ||
| DW::Routing->register_string( "/journal/adult_explicit", \&adult_explicit_handler, app => 1 ); | ||
| DW::Routing->register_string( "/journal/adult_explicit_blocked", \&adult_explicit_blocked_handler, app => 1 ); | ||
|
|
||
| sub _init_vars { | ||
| my ( $type, $journal, $entry ) = @_; | ||
| return { | ||
| type => $type, | ||
| form_url => LJ::create_url( DW::Logic::AdultContent->adult_interstitial_path( type => $type ), host => $LJ::DOMAIN_WEB ), | ||
|
|
||
| entry => $entry, | ||
| journal => $journal, | ||
|
|
||
| poster => defined $entry ? $entry->poster : $journal, | ||
| markedby => defined $entry ? $entry->adult_content_marker : $journal->adult_content_marker, | ||
| reason => DW::Logic::AdultContent->interstitial_reason( $journal, $entry ), | ||
| }; | ||
| } | ||
|
|
||
| sub _extract_from_request { | ||
| my $r = $_[0]; | ||
| my $get = $r->get_args; | ||
| my $post = $r->post_args; | ||
|
|
||
| return ( | ||
| $r->note( 'returl' ) || $post->{ret} || $get->{ret}, | ||
| $r->pnote( 'entry' ), | ||
| $r->pnote( 'user' ), | ||
| ) | ||
| } | ||
|
|
||
| sub adult_concepts_handler { | ||
| my ( $opts ) = @_; | ||
|
|
||
| my ( $ok, $rv ) = controller( anonymous => 1, form_auth => 1 ); | ||
| return $rv unless $ok; | ||
|
|
||
| my $r = $rv->{r}; | ||
| my $remote = $rv->{remote}; | ||
|
|
||
| my ( $returl, $entry, $journal ) = _extract_from_request( $r ); | ||
| my $type = "concepts"; | ||
|
|
||
| # reload this entry if the user is logged in and is not choosing to | ||
| # hide adult content since otherwise, the user shouldn't be here | ||
| return $r->redirect( $returl ) if $remote && $remote->hide_adult_content ne 'concepts'; | ||
|
|
||
| # if we posted, then record we did so and let them view the entry | ||
| if ( $r->did_post && $returl ) { | ||
| my $post = $r->post_args; | ||
| DW::Logic::AdultContent->set_confirmed_pages( user => $remote, | ||
| journalid => $post->{journalid}, | ||
| entryid => $post->{entryid}, | ||
| adult_content => $type | ||
| ); | ||
| return $r->redirect( $returl ); | ||
| } | ||
|
|
||
| # if we didn't provide a journal, then redirect away. We can't do anything here | ||
| return $r->redirect( $LJ::SITEROOT ) unless $journal; | ||
|
|
||
| my $vars = _init_vars( $type, $journal, $entry ); | ||
| $vars->{returl} = $returl; | ||
|
|
||
| return DW::Template->render_template( 'journal/adult_content.tt', $vars ); | ||
| } | ||
|
|
||
| sub adult_explicit_handler { | ||
| my ( $opts ) = @_; | ||
|
|
||
| my ( $ok, $rv ) = controller( anonymous => 1, form_auth => 1 ); | ||
| return $rv unless $ok; | ||
|
|
||
| my $r = $rv->{r}; | ||
| my $remote = $rv->{remote}; | ||
|
|
||
| my ( $returl, $entry, $journal ) = _extract_from_request( $r ); | ||
| my $type = "explicit"; | ||
|
|
||
| # reload this entry if the user is logged in, has an age, and is not | ||
| # choosing to hide adult content since otherwise, the user shouldn't be here | ||
| return $r->redirect( $returl ) if $remote && $remote->best_guess_age && $remote->hide_adult_content eq 'none'; | ||
|
|
||
| # if we posted, then record we did so and let them view the entry | ||
| if ( $r->did_post && $returl ) { | ||
| my $post = $r->post_args; | ||
| DW::Logic::AdultContent->set_confirmed_pages( user => $remote, | ||
| journalid => $post->{journalid}, | ||
| entryid => $post->{entryid}, | ||
| adult_content => $type | ||
| ); | ||
| return $r->redirect( $returl ); | ||
| } | ||
|
|
||
| # if we didn't provide a journal, then redirect away. We can't do anything here | ||
| return $r->redirect( $LJ::SITEROOT ) unless $journal; | ||
|
|
||
| my $vars = _init_vars( $type, $journal, $entry ); | ||
| $vars->{returl} = $returl; | ||
|
|
||
| return DW::Template->render_template( 'journal/adult_content.tt', $vars ); | ||
| } | ||
|
|
||
| sub adult_explicit_blocked_handler { | ||
| my ( $opts ) = @_; | ||
|
|
||
| my ( $ok, $rv ) = controller( anonymous => 1 ); | ||
| return $rv unless $ok; | ||
|
|
||
| my $r = $rv->{r}; | ||
| my $remote = $rv->{remote}; | ||
|
|
||
| my ( $returl, $entry, $journal ) = _extract_from_request( $r ); | ||
| my $type = "explicit_blocked"; | ||
|
|
||
| # if we didn't provide a journal, then redirect away. We can't do anything here | ||
| return $r->redirect( $LJ::SITEROOT ) unless $journal; | ||
|
|
||
| my $vars = _init_vars( $type, $journal, $entry ); | ||
| $vars->{returl} = $returl; | ||
| delete $vars->{form_url}; | ||
|
|
||
| return DW::Template->render_template( 'journal/adult_content.tt', $vars ); | ||
| } | ||
|
|
||
| 1; |
6 changes: 3 additions & 3 deletions
6
cgi-bin/DW/Controller/Protected.pm → cgi-bin/DW/Controller/Journal/Protected.pm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.