openrat-cms

commit d4ddb43b08c7be0f929aba63de60c9a77902f407
parent ac47fc85fba630a46b78f27a0841945b83b6d52a
Author: dankert <devnull@localhost>
Date:   Fri,  6 Nov 2009 09:47:49 +0100

Funktion zum Veröffentlichen überarbeitet.

Diffstat:
actionClasses/PageAction.class.php
 | 
8
+++-----
actionClasses/PageAction.ini.php
 | 
5
+----

2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/actionClasses/PageAction.class.php b/actionClasses/PageAction.class.php
@@ -702,7 +702,7 @@ class PageAction extends ObjectAction
 	 * Es wird ein Formular angzeigt, mit dem die Seite veroeffentlicht
 	 * werden kann 
 	 */
-	function pub()
+	function pubView()
 	{
 	}
 
@@ -713,10 +713,10 @@ class PageAction extends ObjectAction
 	 *
 	 * Die Seite wird generiert.
 	 */
-	function pubnow()
+	function pubAction()
 	{
 		if	( !$this->page->hasRight( ACL_PUBLISH ) )
-			die( 'no right for publish' );
+			Http::notAuthorized( 'no right for publish' );
 
 		$this->page->public = true;
 		$this->page->publish();
@@ -728,8 +728,6 @@ class PageAction extends ObjectAction
 //		}
 
 		$this->addNotice('page',$this->page->fullFilename,'PUBLISHED'.($this->page->publish->ok?'':'_ERROR'),$this->page->publish->ok,array(),$this->page->publish->log);
-
-		$this->callSubaction('pub');
 	}
 	
 	
diff --git a/actionClasses/PageAction.ini.php b/actionClasses/PageAction.ini.php
@@ -24,10 +24,7 @@ menu=elements
 
 [pub]
 menu=pub
-target=pubnow
-
-[pubnow]
-goto=pub
+write=true
 
 [saveform]
 goto=el