fu: Close-up of Fu, bringing a scoop of water to her mouth (Default)
fu ([personal profile] fu) wrote in [site community profile] changelog2011-05-12 10:02 am
  • Add Memory
  • Share This Entry

[dw-free] Move ::CutExpand controller to ::Controller::RPC namespace

[commit: http://hg.dwscoalition.org/dw-free/rev/bafea8052e02]

http://bugs.dwscoalition.org/show_bug.cgi?id=3604

Move package for clarity; some cleanup.

Patch by [personal profile] exor674.

Files modified:
  • cgi-bin/DW/Controller/CutExpander.pm
  • cgi-bin/DW/Controller/RPC/CutExpander.pm
--------------------------------------------------------------------------------
diff -r 7eba3c2b55ff -r bafea8052e02 cgi-bin/DW/Controller/CutExpander.pm
--- a/cgi-bin/DW/Controller/CutExpander.pm	Thu May 12 17:30:09 2011 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-#!/usr/bin/perl
-#
-# DW::Controller::CutExpander
-#
-# AJAX endpoint that returns the expanded text for a cut tag.
-#
-# Author:
-#      Allen Petersen
-#
-# Copyright (c) 2009-2010 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::CutExpander;
-
-use strict;
-use warnings;
-use DW::Routing;
-use JSON;
-
-DW::Routing->register_string( "/__rpc_cuttag", \&cutexpander_handler, app => 1, user => 1, format => 'json' );
-
-my $formats = {
-    'json' => [ "application/json; charset=utf-8", sub { $_[0]->print( objToJson( $_[1] ) ); } ],
-};
-
-sub cutexpander_handler {
-    my $opts = shift;
-
-    # gets the request and args
-    my $r = DW::Request->get;
-    my $args = $r->get_args;
-
-
-    my $remote = LJ::get_remote();
-
-    my $format = $formats->{json};
-
-    # error handler
-    my $error_out = sub {
-       my ( $code, $message ) = @_;
-       $r->status( $code );
-       $format->[1]->( $r, { error => $message } );
-
-       return $r->OK;
-    };
-
-    if ( $args->{ditemid} && $args->{journal} && $args->{cutid} ) {
-        # all parameters are included; get the entry.
-        my $ditemid = $args->{ditemid};
-        my $uid = LJ::get_userid( $args->{journal} );
-        my $entry = LJ::Entry->new( $uid, ditemid => $ditemid ) if $uid;
-
-        # FIXME: This returns 200 due to old library, Make return proper when we are jQuery only.
-        return $error_out->( 200, BML::ml( "error.nopermission" ) ) unless $entry;
-        
-        # make sure the user can read the entry
-        if ( $entry->visible_to( $remote ) ) {
-            my $text = load_cuttext( $entry, $remote, $args->{cutid} );
-            # FIXME: temporary fix.
-            # remove some unicode characters that could cause the returned JSON to break
-            # like in LJ::ejs, but we don't need to escape quotes, etc (objToJson does that)
-            $text =~ s/\xE2\x80[\xA8\xA9]//gs;
-            $r->print( objToJson( { text => $text } ) );
-            return $r->OK;
-        }
-    }
-
-    # FIXME: This returns 200 due to old library, Make return proper when we are jQuery only.
-    return $error_out->( 200, BML::ml( "error.nopermission" ) );
-}
-
-# loads the cutttext for the given entry
-sub load_cuttext {
-    my ( $entry_obj, $remote, $cutid ) = @_;
-
-    # most of this is taken from S2->Entry_from_entryobj, modified for this
-    # more limited purpose.
-    my $get = {};
-    my $subject = "";
-
-    my $anum = $entry_obj->anum;
-    my $jitemid = $entry_obj->jitemid;
-    my $ditemid = $entry_obj->ditemid;
-
-    # $journal: journal posted to
-    my $journalid = $entry_obj->journalid;
-    my $journal = LJ::load_userid( $journalid );
-
-    # is style=mine used?  or if remote has it on and this entry is not part of
-    # their journal.  if either are yes, it needs to be added to comment links
-    my %opt_stylemine = $remote && $remote->prop( 'opt_stylemine' ) && $remote->id != $journalid ? ( style => 'mine' ) : ();
-    my $style_args = LJ::viewing_style_args( %$get, %opt_stylemine );
-    
-    #load and prepare text of entry
-    my $text = LJ::CleanHTML::quote_html( $entry_obj->event_raw, $get->{nohtml} );
-    LJ::item_toutf8( $journal, \$subject, \$text ) if $LJ::UNICODE && $entry_obj->props->{unknown8bit};
-
-    my $suspend_msg = $entry_obj && $entry_obj->should_show_suspend_msg_to( $remote ) ? 1 : 0;
-    # cleaning the entry text: cuts and such
-    my $cleanhtml_opts = { cuturl => LJ::item_link( $journal, $jitemid, $anum, $style_args ),
-        journal => $journal->username,
-        ditemid => $ditemid,
-        suspend_msg => $suspend_msg,
-        unsuspend_supportid => $suspend_msg ? $entry_obj->prop( 'unsuspend_supportid' ) : 0,
-        preformatted => $entry_obj->prop( "opt_preformatted" ),
-        cut_retrieve => $cutid, 
-    };
-
-    LJ::CleanHTML::clean_event( \$text, $cleanhtml_opts );
-
-    LJ::expand_embedded( $journal, $jitemid, $remote, \$text );
-    
-    return $text;
-}
-
-1;
diff -r 7eba3c2b55ff -r bafea8052e02 cgi-bin/DW/Controller/RPC/CutExpander.pm
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cgi-bin/DW/Controller/RPC/CutExpander.pm	Thu May 12 18:02:17 2011 +0800
@@ -0,0 +1,113 @@
+#!/usr/bin/perl
+#
+# DW::Controller::RPC::CutExpander
+#
+# AJAX endpoint that returns the expanded text for a cut tag.
+#
+# Author:
+#      Allen Petersen
+#
+# Copyright (c) 2009-2011 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::RPC::CutExpander;
+
+use strict;
+use warnings;
+use DW::Routing;
+use JSON;
+
+DW::Routing->register_string( "/__rpc_cuttag", \&cutexpander_handler, app => 1, user => 1, format => 'json' );
+
+sub cutexpander_handler {
+    my $opts = shift;
+
+    # gets the request and args
+    my $r = DW::Request->get;
+    my $args = $r->get_args;
+
+    my $remote = LJ::get_remote();
+
+    # error handler
+    my $error_out = sub {
+       my ( $code, $message ) = @_;
+       $r->status( $code );
+       $r->print( objToJson( { error => $message } ) );
+
+       return $r->OK;
+    };
+
+    if ( $args->{ditemid} && $args->{journal} && $args->{cutid} ) {
+        # all parameters are included; get the entry.
+        my $ditemid = $args->{ditemid};
+        my $uid = LJ::get_userid( $args->{journal} );
+        my $entry = LJ::Entry->new( $uid, ditemid => $ditemid ) if $uid;
+
+        # FIXME: This returns 200 due to old library, Make return proper when we are jQuery only.
+        return $error_out->( 200, BML::ml( "error.nopermission" ) ) unless $entry;
+        
+        # make sure the user can read the entry
+        if ( $entry->visible_to( $remote ) ) {
+            my $text = load_cuttext( $entry, $remote, $args->{cutid} );
+            # FIXME: temporary fix.
+            # remove some unicode characters that could cause the returned JSON to break
+            # like in LJ::ejs, but we don't need to escape quotes, etc (objToJson does that)
+            $text =~ s/\xE2\x80[\xA8\xA9]//gs;
+            $r->print( objToJson( { text => $text } ) );
+            return $r->OK;
+        }
+    }
+
+    # FIXME: This returns 200 due to old library, Make return proper when we are jQuery only.
+    return $error_out->( 200, BML::ml( "error.nopermission" ) );
+}
+
+# loads the cutttext for the given entry
+sub load_cuttext {
+    my ( $entry_obj, $remote, $cutid ) = @_;
+
+    # most of this is taken from S2->Entry_from_entryobj, modified for this
+    # more limited purpose.
+    my $get = {};
+    my $subject = "";
+
+    my $anum = $entry_obj->anum;
+    my $jitemid = $entry_obj->jitemid;
+    my $ditemid = $entry_obj->ditemid;
+
+    # $journal: journal posted to
+    my $journalid = $entry_obj->journalid;
+    my $journal = LJ::load_userid( $journalid );
+
+    # is style=mine used?  or if remote has it on and this entry is not part of
+    # their journal.  if either are yes, it needs to be added to comment links
+    my %opt_stylemine = $remote && $remote->prop( 'opt_stylemine' ) && $remote->id != $journalid ? ( style => 'mine' ) : ();
+    my $style_args = LJ::viewing_style_args( %$get, %opt_stylemine );
+    
+    #load and prepare text of entry
+    my $text = LJ::CleanHTML::quote_html( $entry_obj->event_raw, $get->{nohtml} );
+    LJ::item_toutf8( $journal, \$subject, \$text ) if $LJ::UNICODE && $entry_obj->props->{unknown8bit};
+
+    my $suspend_msg = $entry_obj && $entry_obj->should_show_suspend_msg_to( $remote ) ? 1 : 0;
+    # cleaning the entry text: cuts and such
+    my $cleanhtml_opts = { cuturl => LJ::item_link( $journal, $jitemid, $anum, $style_args ),
+        journal => $journal->username,
+        ditemid => $ditemid,
+        suspend_msg => $suspend_msg,
+        unsuspend_supportid => $suspend_msg ? $entry_obj->prop( 'unsuspend_supportid' ) : 0,
+        preformatted => $entry_obj->prop( "opt_preformatted" ),
+        cut_retrieve => $cutid, 
+    };
+
+    LJ::CleanHTML::clean_event( \$text, $cleanhtml_opts );
+
+    LJ::expand_embedded( $journal, $jitemid, $remote, \$text );
+    
+    return $text;
+}
+
+1;
--------------------------------------------------------------------------------