Changeset 2139
- Timestamp:
- 04/29/08 01:49:22 (7 months ago)
- Files:
-
- branches/release-36/default_templates/javascript.mtml (modified) (2 diffs)
- branches/release-36/lib/MT/App/Comments.pm (modified) (3 diffs)
- branches/release-36/lib/MT/Template/ContextHandlers.pm (modified) (1 diff)
- branches/release-36/tmpl/comment/login.tmpl (modified) (2 diffs)
- branches/release-36/tmpl/comment/signup.tmpl (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/release-36/default_templates/javascript.mtml
r2062 r2139 385 385 var doc_url = document.URL; 386 386 doc_url = doc_url.replace(/#.+/, ''); 387 var url = '<$MTSignInLink$>&entry_id=' + entry_id + 388 '&return_to=' + encodeURIComponent(doc_url); 387 var url = '<$MTSignInLink$>'; 388 if (entry_id) 389 url += '&entry_id=' + entry_id; 390 else 391 url += '&return_url=' + encodeURIComponent(doc_url); 389 392 mtClearUser(); 390 393 location.href = url; … … 450 453 } else { 451 454 if (reg_reqd) { 452 phrase = '<__trans phrase="[_1]Sign in[_2] to comment." params="<a href="javascript:void(0)" onclick="mtSignIn( )">%%</a>">';455 phrase = '<__trans phrase="[_1]Sign in[_2] to comment." params="<a href="javascript:void(0)" onclick="mtSignIn(' + entry_id + ')">%%</a>">'; 453 456 } else { 454 457 phrase = '<__trans phrase="[_1]Sign in[_2] to comment, or [_3]comment anonymously[_2]." params="<a href="javascript:void(0)" onclick="mtSignIn(' + entry_id + ')">%%</a>%%<a href="javascript:void(0);" onclick="mtShowAnonymousForm();">">'; branches/release-36/lib/MT/App/Comments.pm
r2062 r2139 333 333 my %opt = @_; 334 334 my $param = {}; 335 $param->{$_} = $app->param($_) foreach qw(blog_id entry_id static username );335 $param->{$_} = $app->param($_) foreach qw(blog_id entry_id static username return_url ); 336 336 my $blog = $app->model('blog')->load( $param->{blog_id} ) 337 337 or return $app->error($app->translate('Can\'t load blog #[_1].', $param->{blog_id})); … … 358 358 $param->{$_} = $q->param($_) 359 359 foreach 360 qw(blog_id entry_id static email url username nickname email hint );360 qw(blog_id entry_id static email url username nickname email hint return_url ); 361 361 362 362 my $user = $app->create_user_pending($param); … … 387 387 else { 388 388 $app->build_page( 'signup_thanks.tmpl', 389 { email => $user->email, return_url => is_valid_url( $param->{ static} ) }389 { email => $user->email, return_url => is_valid_url( $param->{return_url} || $param->{static} ) } 390 390 ); 391 391 } branches/release-36/lib/MT/Template/ContextHandlers.pm
r2108 r2139 4852 4852 $path .= '/' unless $path =~ m!/$!; 4853 4853 my $comment_script = $cfg->CommentScript; 4854 my $static_arg = $args->{static} ? "&static=" . $args->{static} : "&static=0";4854 my $static_arg = $args->{static} ? "&static=" . $args->{static} : ''; 4855 4855 my $e = $ctx->stash('entry'); 4856 4856 return "$path$comment_script?__mode=login$static_arg" . branches/release-36/tmpl/comment/login.tmpl
r2088 r2139 68 68 <input type="hidden" name="entry_id" value="<mt:var name="entry_id">" /> 69 69 <input type="hidden" name="static" value="<mt:var name="static" escape="html">" /> 70 <input type="hidden" name="return_url" value="<mt:var name="return_url" escape="html">" /> 70 71 <mt:unless name="auth_mode_mt"><input type="hidden" name="external_auth" value="1" /></mt:unless> 71 72 <mtapp:setting … … 95 96 </div> 96 97 <mt:if name="registration_allowed"> 97 <div class="right"><__trans phrase="Not a member? <a href="[_1]">Sign Up</a>!" params="<mt:var name="script_url">?__mode=signup&blog_id=<mt:var name="blog_id">&entry_id=<mt:var name="entry_id"> &static=<mt:var name="static" escape="url">"></div>98 <div class="right"><__trans phrase="Not a member? <a href="[_1]">Sign Up</a>!" params="<mt:var name="script_url">?__mode=signup&blog_id=<mt:var name="blog_id">&entry_id=<mt:var name="entry_id"><mt:if name="static">&static=<mt:var name="static" escape="url"></mt:if><mt:if name="return_url">&return_url=<mt:var name="return_url" escape="url"></mt:if>"></div> 98 99 </mt:if> 99 100 </form> branches/release-36/tmpl/comment/signup.tmpl
r2088 r2139 34 34 <input type="hidden" name="entry_id" value="<mt:var name="entry_id" escape="html">" /> 35 35 <input type="hidden" name="static" value="<mt:var name="static" escape="html">" /> 36 <input type="hidden" name="return_url" value="<mt:var name="return_url" escape="html">" /> 36 37 <mt:if name="auth_mode_mt"> 37 38 <input type="hidden" name="__mode" value="do_signup" />
