openrat-cms

commit b7d156552b94d80cea50f3a7fa5b756f78539b96
parent 61f9ce4ed81127d2827d8b54dd50dffac7033f43
Author: dankert <devnull@localhost>
Date:   Fri,  6 Nov 2009 09:57:54 +0100

Funktion zum Veröffentlichen überarbeitet.

Diffstat:
actionClasses/FileAction.class.php
 | 
11
+++++------
actionClasses/FileAction.ini.php
 | 
5
+----
actionClasses/FolderAction.class.php
 | 
8
++------
actionClasses/FolderAction.ini.php
 | 
5
+----

4 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/actionClasses/FileAction.class.php b/actionClasses/FileAction.class.php
@@ -572,23 +572,22 @@ class FileAction extends ObjectAction
 
 
 	/**
-	 * Datei ver?ffentlichen
+	 * Datei veroeffentlichen
 	 */
-	function pub()
+	function pubView()
 	{
 	}
 
 
 	/**
-	 * Datei ver?ffentlichen
+	 * Datei veroeffentlichen
 	 */
-	function pubnow()
+	function pubAction()
 	{
 		$this->file->publish();
 		$this->file->publish->close();
-		$this->addNotice('file',$this->file->fullFilename,'PUBLISHED'.($this->file->publish->ok?'':'_ERROR'),$this->file->publish->ok,array(),$this->file->publish->log);
 		
-		$this->callSubaction('pub');
+		$this->addNotice('file',$this->file->fullFilename,'PUBLISHED'.($this->file->publish->ok?'':'_ERROR'),$this->file->publish->ok,array(),$this->file->publish->log);
 	}
 
 
diff --git a/actionClasses/FileAction.ini.php b/actionClasses/FileAction.ini.php
@@ -43,12 +43,9 @@ goto=prop
 goto=prop
 
 [pub]
-target=pubnow
+write=true
 menu=pub
 
-[pubnow]
-goto=pub
-
 ; Die Aktionen "rights", "aclform", "addacl" und "delacl" sind
 ; f�r Seiten,Ordner,Links und Dateien identisch.
 [rights]
diff --git a/actionClasses/FolderAction.class.php b/actionClasses/FolderAction.class.php
@@ -1256,19 +1256,17 @@ class FolderAction extends ObjectAction
 	}
 
 
-	function pub()
+	function pubView()
 	{
 		// Schalter nur anzeigen, wenn sinnvoll
 		$this->setTemplateVar('files'  ,count($this->folder->getFiles()) > 0 );
 		$this->setTemplateVar('pages'  ,count($this->folder->getPages()) > 0 );
 		$this->setTemplateVar('subdirs',count($this->folder->getSubFolderIds()) > 0 );
 		$this->setTemplateVar('clean'  ,$this->folder->isRoot );
-		
-//		$this->addNotice('folder',$this->folder->name,'MUCH_TIME',OR_NOTICE_WARN);
 	}
 
 
-	function pubnow()
+	function pubAction()
 	{
 		if	( !$this->folder->hasRight( ACL_PUBLISH ) )
 			die('no rights for publish');
@@ -1295,8 +1293,6 @@ class FolderAction extends ObjectAction
 		// Wenn gewuenscht, das Zielverzeichnis aufraeumen
 		if	( $this->hasRequestVar('clean')      )
 			$publish->clean();
-
-		$this->callSubaction( 'pub' );
 	}
 	
 	
diff --git a/actionClasses/FolderAction.ini.php b/actionClasses/FolderAction.ini.php
@@ -61,10 +61,7 @@ goto=rights
 
 [pub]
 menu=pub
-target=pubnow
-
-[pubnow]
-goto=pub
+write=true
 
 [create]
 target=createnew