openrat-cms

commit dc021a4930cc8f721d973451d24e6969add0d0a1
parent 0033afda1e4597af6ae68b6454ad8a16d8e6f58a
Author: dankert <devnull@localhost>
Date:   Wed, 29 Dec 2004 21:43:30 +0100

Kontextsensitives Anzeigen der Veroeffentlichungs-Checkboxen

Diffstat:
actionClasses/FolderAction.class.php
 | 
18
++++++++++++++----
themes/default/pages/html/folder/pub.tpl.php
 | 
10
++++++----

2 files changed, 20 insertions(+), 8 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.23  2004-12-28 22:58:23  dankert
+// Revision 1.24  2004-12-29 20:43:30  dankert
+// Kontextsensitives Anzeigen der Veroeffentlichungs-Checkboxen
+//
+// Revision 1.23  2004/12/28 22:58:23  dankert
 // Neuer Schalter fuer "Liveserver aufraeumen"
 //
 // Revision 1.22  2004/12/27 23:26:39  dankert
@@ -652,12 +655,20 @@ class FolderAction extends ObjectAction
 
 	function pub()
 	{
+		// 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->forward('folder_pub');
 	}
 
 
 	function pubnow()
 	{
+		if	( !$this->folder->hasRight( ACL_PUBLISH ) )
+			die('no rights for publish');
+
 		$subdirs = ( $this->hasRequestVar('subdirs') );
 		$pages   = ( $this->hasRequestVar('pages'  ) );
 		$files   = ( $this->hasRequestVar('files'  ) );
@@ -672,9 +683,8 @@ class FolderAction extends ObjectAction
 			$this->addNotice($o['type'],$o['full_filename'],'PUBLISHED','ok');
 		}
 		
-		if	( $subdirs && $pages && $files &&
-			  $this->folder->isRoot        &&
-			  $this->hasRequestVar('clean')      )
+		// Wenn gewuenscht, das Zielverzeichnis aufraeumen
+		if	( $this->hasRequestVar('clean')      )
 			$publish->clean();
 
 		$this->callSubaction( 'pub' );
diff --git a/themes/default/pages/html/folder/pub.tpl.php b/themes/default/pages/html/folder/pub.tpl.php
@@ -11,10 +11,12 @@
 </tr>
 
 <tr>
-<td width="50%" class="f1"><?php echo Html::checkbox('pages'  ,true)  ?>&nbsp;<?php echo lang('GLOBAL_pages') ?><br/>
-                           <?php echo Html::checkbox('files'  ,true)  ?>&nbsp;<?php echo lang('GLOBAL_files') ?></td>
-<td width="50%" class="f1"><?php echo Html::checkbox('subdirs',false) ?>&nbsp;<?php echo lang('GLOBAL_PUBLISH_WITH_SUBDIRS') ?><br/>
-                           <?php echo Html::checkbox('clean'  ,false) ?>&nbsp;<?php echo lang('GLOBAL_CLEAN_AFTER_PUBLISH') ?></td>
+  <td width="50%" class="f1"><?php if	($pages||$subdirs) echo Html::checkbox('pages'  ,$pages).'&nbsp;'.lang('GLOBAL_pages'               ).'<br/>' ?>
+                             <?php if	($files||$subdirs) echo Html::checkbox('files'  ,$files).'&nbsp;'.lang('GLOBAL_files'               ).'<br/>' ?>
+  </td>
+  <td width="50%" class="f1"><?php if	($subdirs)         echo Html::checkbox('subdirs',false).'&nbsp;'.lang('GLOBAL_PUBLISH_WITH_SUBDIRS').'<br/>' ?>
+                             <?php if	($clean)           echo Html::checkbox('clean'  ,false).'&nbsp;'.lang('GLOBAL_CLEAN_AFTER_PUBLISH' ).'<br/>' ?>
+  </td>
 </tr>
 
 <tr>