API tools faq
paste
Guest User

Untitled

a guest
Mar 14th, 2018
101
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 7.08 KB | None | 0 0
raw download clone embed print report
  1. Index: app/controllers/mags_online/mag_issues_controller.rb
  2. ===================================================================
  3. --- app/controllers/mags_online/mag_issues_controller.rb (revision 4200)
  4. +++ app/controllers/mags_online/mag_issues_controller.rb (working copy)
  5. @@ -98,7 +98,7 @@
  6.  
  7. MagsOnlineMailer.deliver_issue_email_page(@friend.email, @page_url, issue_hash)
  8. end
  9. - redirect_to :back
  10. + redirect_to @page_url
  11. else
  12. super
  13. end
  14. Index: app/controllers/mags_online/assets_controller.rb
  15. ===================================================================
  16. --- app/controllers/mags_online/assets_controller.rb (revision 4200)
  17. +++ app/controllers/mags_online/assets_controller.rb (working copy)
  18. @@ -43,7 +43,7 @@
  19. @asset = Asset.find(params[:last_id]) if params[:last_id]
  20. MagsOnlineMailer.deliver_asset_email_page(@friend.email, @page_url, @asset)
  21. end
  22. - redirect_to :back
  23. + redirect_to @page_url
  24. else
  25. super
  26. end
  27. Index: app/controllers/mags_online/mags_online_parent_controller.rb
  28. ===================================================================
  29. --- app/controllers/mags_online/mags_online_parent_controller.rb (revision 4200)
  30. +++ app/controllers/mags_online/mags_online_parent_controller.rb (working copy)
  31. @@ -16,8 +16,7 @@
  32. end
  33. @shop_session[:mag_status] = params[:status][:type]
  34. set_date_and_status
  35. -
  36. - redirect_to :back
  37. + redirect_back
  38. end
  39.  
  40. def rss_links
  41. @@ -29,7 +28,7 @@
  42. MagsOnlineMailer.deliver_default_email_page(@friend.email, @page_url)
  43. end
  44.  
  45. - redirect_to :back
  46. + redirect_to @page_url
  47. end
  48.  
  49.  
  50. @@ -42,15 +41,21 @@
  51.  
  52. MagsOnlineMailer.deliver_special_interest_email_page(@friend.email, @page_url, @name, @top_articles)
  53. end
  54. - redirect_to :back
  55. + redirect_to @page_url
  56. else
  57. super
  58. end
  59. end
  60.  
  61. def email_page_params_ok?
  62. - @friend = OpenStruct.new(params[:friend])
  63. - @page_url = request.env["HTTP_REFERER"]
  64. + @friend = OpenStruct.new(params[:friend])
  65. + controller, action, id = params[:controller], params[:last_action], params[:last_id]
  66. + unless action
  67. + flash[:error] = "The URL which you have specified is invalid"
  68. + @page_url = url_for(:controller => 'mags_online/home')
  69. + return false
  70. + end
  71. + @page_url = url_for(:controller => controller, :action => action, :id => id)
  72. if @friend.email.blank? or !@friend.email.is_valid_email?
  73. flash[:error] = "The email address you entered is not valid"
  74. false
  75. Index: app/controllers/mags_online/content_controller.rb
  76. ===================================================================
  77. --- app/controllers/mags_online/content_controller.rb (revision 4200)
  78. +++ app/controllers/mags_online/content_controller.rb (working copy)
  79. @@ -118,7 +118,7 @@
  80. MagsOnlineMailer.deliver_cartoon_email_page(@friend.email, @page_url, @content)
  81. end
  82. end
  83. - redirect_to :back
  84. + redirect_to @page_url
  85. else
  86. super
  87. end
  88. [oqureshi@soitsrv08 store]$ svn diff app/controllers/mags_online/mag_issues_controller.rb app/controllers/mags_online/assets_controller.rb app/controllers/mags_online/mags_online_parent_controller.rb app/controllers/mags_online/content_controller.rb app/views/shared/_mags_status_form.rhtml
  89. Index: app/controllers/mags_online/mag_issues_controller.rb
  90. ===================================================================
  91. --- app/controllers/mags_online/mag_issues_controller.rb (revision 4200)
  92. +++ app/controllers/mags_online/mag_issues_controller.rb (working copy)
  93. @@ -98,7 +98,7 @@
  94.  
  95. MagsOnlineMailer.deliver_issue_email_page(@friend.email, @page_url, issue_hash)
  96. end
  97. - redirect_to :back
  98. + redirect_to @page_url
  99. else
  100. super
  101. end
  102. Index: app/controllers/mags_online/assets_controller.rb
  103. ===================================================================
  104. --- app/controllers/mags_online/assets_controller.rb (revision 4200)
  105. +++ app/controllers/mags_online/assets_controller.rb (working copy)
  106. @@ -43,7 +43,7 @@
  107. @asset = Asset.find(params[:last_id]) if params[:last_id]
  108. MagsOnlineMailer.deliver_asset_email_page(@friend.email, @page_url, @asset)
  109. end
  110. - redirect_to :back
  111. + redirect_to @page_url
  112. else
  113. super
  114. end
  115. Index: app/controllers/mags_online/mags_online_parent_controller.rb
  116. ===================================================================
  117. --- app/controllers/mags_online/mags_online_parent_controller.rb (revision 4200)
  118. +++ app/controllers/mags_online/mags_online_parent_controller.rb (working copy)
  119. @@ -16,8 +16,7 @@
  120. end
  121. @shop_session[:mag_status] = params[:status][:type]
  122. set_date_and_status
  123. -
  124. - redirect_to :back
  125. + redirect_back
  126. end
  127.  
  128. def rss_links
  129. @@ -29,7 +28,7 @@
  130. MagsOnlineMailer.deliver_default_email_page(@friend.email, @page_url)
  131. end
  132.  
  133. - redirect_to :back
  134. + redirect_to @page_url
  135. end
  136.  
  137.  
  138. @@ -42,15 +41,21 @@
  139.  
  140. MagsOnlineMailer.deliver_special_interest_email_page(@friend.email, @page_url, @name, @top_articles)
  141. end
  142. - redirect_to :back
  143. + redirect_to @page_url
  144. else
  145. super
  146. end
  147. end
  148.  
  149. def email_page_params_ok?
  150. - @friend = OpenStruct.new(params[:friend])
  151. - @page_url = request.env["HTTP_REFERER"]
  152. + @friend = OpenStruct.new(params[:friend])
  153. + controller, action, id = params[:controller], params[:last_action], params[:last_id]
  154. + unless action
  155. + flash[:error] = "The URL which you have specified is invalid"
  156. + @page_url = url_for(:controller => 'mags_online/home')
  157. + return false
  158. + end
  159. + @page_url = url_for(:controller => controller, :action => action, :id => id)
  160. if @friend.email.blank? or !@friend.email.is_valid_email?
  161. flash[:error] = "The email address you entered is not valid"
  162. false
  163. Index: app/controllers/mags_online/content_controller.rb
  164. ===================================================================
  165. --- app/controllers/mags_online/content_controller.rb (revision 4200)
  166. +++ app/controllers/mags_online/content_controller.rb (working copy)
  167. @@ -118,7 +118,7 @@
  168. MagsOnlineMailer.deliver_cartoon_email_page(@friend.email, @page_url, @content)
  169. end
  170. end
  171. - redirect_to :back
  172. + redirect_to @page_url
  173. else
  174. super
  175. end
  176. Index: app/views/shared/_mags_status_form.rhtml
  177. ===================================================================
  178. --- app/views/shared/_mags_status_form.rhtml (revision 4200)
  179. +++ app/views/shared/_mags_status_form.rhtml (working copy)
  180. @@ -1,6 +1,7 @@
  181. <% if current_user and current_user.admin %>
  182. <div id = "status_form" class="adminbox">
  183. <% form_tag :controller => "mags_online_parent", :action => "update_status" do %>
  184. + <%= hidden_field_tag :url, request.request_uri -%>
  185. <p>
  186. <span>Date</span>
  187. <%= select_date(@date || Date.today, :order => [:day, :month, :year]) %>
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!