openrat-cms

commit 71bf5a3a2c71bf93eaa675c0053469d87c5bcee8
parent b42bcb1d1ba8d196c57afa6a60077b32129d179f
Author: dankert <devnull@localhost>
Date:   Mon, 29 Nov 2004 22:09:51 +0100

neue Methode pub2()

Diffstat:
actionClasses/FolderAction.class.php
 | 
39
+++++++++++++++++++--------------------

1 file changed, 19 insertions(+), 20 deletions(-)
diff --git a/actionClasses/FolderAction.class.php b/actionClasses/FolderAction.class.php
@@ -20,7 +20,10 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // ---------------------------------------------------------------------------
 // $Log$
-// Revision 1.13  2004-11-28 22:59:48  dankert
+// Revision 1.14  2004-11-29 21:09:51  dankert
+// neue Methode pub2()
+//
+// Revision 1.13  2004/11/28 22:59:48  dankert
 // Ausgabe von "notices"
 //
 // Revision 1.12  2004/11/28 21:27:07  dankert
@@ -638,30 +641,26 @@ class FolderAction extends ObjectAction
 
 	function pub()
 	{
-		if	( $this->getRequestVar('go') == '1' )
-		{
-			if	( $this->getRequestVar('subdirs') == '1' )
-				$subdirs = true;
-			else	$subdirs = false;
+		$this->forward('folder_pub');
+	}
 
-			$publish = new Publish();
-			
-			$this->folder->publish = &$publish;
-			$this->folder->publish( $subdirs );
 
-			$list = array();
+	function pub2()
+	{
+		$subdirs = ( $this->hasRequestVar('subdirs') );
+		$pages   = ( $this->hasRequestVar('pages'  ) );
+		$files   = ( $this->hasRequestVar('files'  ) );
 
-			foreach( $publish->publishedObjects as $o )
-			{
-				$list[] = $o['filename'];
-			}
-			$this->setTemplateVar('filenames',$list);
+		$publish = new Publish();
+		
+		$this->folder->publish = &$publish;
+		$this->folder->publish( $pages,$files,$subdirs );
 
-			$this->forward('publish');
-		}
-		else
+		foreach( $publish->publishedObjects as $o )
 		{
-			$this->forward('folder_pub');
+			$this->addNotice('',$o['filename'],'PUBLISHED','ok');
 		}
+
+		$this->callSubaction( 'pub' );
 	}
 } 
\ No newline at end of file