openrat-cms

commit 6b5dd1917e55b74815b87fb384a1f7dc9b18860d
parent 01483b1d5ae5e5f0f40c8bb03b226c4d666f9ae1
Author: dankert <devnull@localhost>
Date:   Sat,  6 Oct 2007 01:32:40 +0200

Nach dem Ver?ffentlichen auf Fehler abfragen.

Diffstat:
actionClasses/FolderAction.class.php
 | 
17
++++++++++++-----
actionClasses/PageAction.class.php
 | 
2
++

2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/actionClasses/FolderAction.class.php b/actionClasses/FolderAction.class.php
@@ -20,6 +20,9 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // ---------------------------------------------------------------------------
 // $Log$
+// Revision 1.41  2007-10-05 23:32:40  dankert
+// Nach dem Ver?ffentlichen auf Fehler abfragen.
+//
 // Revision 1.40  2007-10-02 21:13:44  dankert
 // Men?punkt "Neu" mit direktem Hinzuf?gen von Objekten.
 //
@@ -1144,12 +1147,16 @@ class FolderAction extends ObjectAction
 		$this->folder->publish = &$publish;
 		$this->folder->publish( $pages,$files,$subdirs );
 		$this->folder->publish->close();
-
+
+		$list = array();
 		foreach( $publish->publishedObjects as $o )
-		{
-			$this->addNotice($o['type'],$o['full_filename'],'PUBLISHED','ok');
-		}
-		
+			$list[] = $o['full_filename'];
+		
+		if	( !$publish->ok )
+			$this->addNotice('folder',$this->folder->name,'ERROR',OR_NOTICE_ERROR,array(),$publish->log);
+		else
+			$this->addNotice('folder',$this->folder->name,'PUBLISHED',OR_NOTICE_OK,array(),$list);
+				
 		// Wenn gewuenscht, das Zielverzeichnis aufraeumen
 		if	( $this->hasRequestVar('clean')      )
 			$publish->clean();
diff --git a/actionClasses/PageAction.class.php b/actionClasses/PageAction.class.php
@@ -734,6 +734,8 @@ class PageAction extends ObjectAction
 			$this->addNotice($o['type'],$o['full_filename'],'PUBLISHED','ok');
 		}
 
+		$this->addNotice($o['type'],$o['full_filename'],'PUBLISHED','ok',array(),$this->page->publish->log);
+
 		$this->callSubaction('pub');
 	}