Merge pull request ezsystems#1118 from ezsystems/EZP-23478-website_to…

…olbar_redirection

EZP-23478: added redirection form fields in content/edit.tpl

design/standard/templates/content/edit.tpl

@@ -33,6 +33,7 @@
     {include uri="design:content/edit_right_menu.tpl"}
     <!-- Right part end -->
 
+    {include uri='design:content/edit_redirection.tpl'}
     </td>
 </tr>
 </table>

design/standard/templates/content/edit_redirection.tpl

@@ -0,0 +1,23 @@
+{* Redirection hidden inputs, based on session variables, themselves based on POST data *}
+{if ezhttp_hasvariable( 'RedirectURIAfterPublish', 'session' )}
+    {def $redirect_uri_after_publish=ezhttp( 'RedirectURIAfterPublish', 'session' )}
+{else}
+    {if ezhttp_hasvariable( 'LastAccessesURI', 'session' )}
+        {def $redirect_uri_after_publish=ezhttp( 'LastAccessesURI', 'session' )}
+    {/if}
+{/if}
+
+{if ezhttp_hasvariable( 'RedirectIfDiscarded', 'session' )}
+    {def $redirect_if_discarded=ezhttp( 'RedirectIfDiscarded', 'session' )}
+{else}
+    {if ezhttp_hasvariable( 'LastAccessesURI', 'session' )}
+        {def $redirect_if_discarded=ezhttp( 'LastAccessesURI', 'session' )}
+    {/if}
+{/if}
+
+{if is_set( $redirect_uri_after_publish) }
+    <input type="hidden" name="RedirectURIAfterPublish" value="{$redirect_uri_after_publish}" />
+{/if}
+{if is_set( $redirect_if_discarded ) }
+    <input type="hidden" name="RedirectIfDiscarded" value="{$redirect_if_discarded}" />
+{/if}