openrat-cms

commit 1bee81b41da9a8e3db2acbdac05b5c7fd140d24b
parent d2531ac0e608bfc45752ebcad767a2eb9d50aeec
Author: dankert <devnull@localhost>
Date:   Mon,  7 Nov 2005 23:31:38 +0100

Wenn Dateiname=Objekt-Id, dann Dateinamen auf leer setzen.

Diffstat:
actionClasses/FileAction.class.php
 | 
12
++++++++++--
actionClasses/FolderAction.class.php
 | 
9
++++++++-
actionClasses/PageAction.class.php
 | 
4
++++

3 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/actionClasses/FileAction.class.php b/actionClasses/FileAction.class.php
@@ -20,7 +20,10 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // ---------------------------------------------------------------------------
 // $Log$
-// Revision 1.15  2005-01-27 22:21:29  dankert
+// Revision 1.16  2005-11-07 22:31:08  dankert
+// Wenn Dateiname=Objekt-Id, dann Dateinamen auf leer setzen.
+//
+// Revision 1.15  2005/01/27 22:21:29  dankert
 // Nach Generierung Systembefehl mit exec() ausf?hren
 //
 // Revision 1.14  2005/01/14 21:41:23  dankert
@@ -239,6 +242,11 @@ class FileAction extends ObjectAction
 
 	function prop()
 	{
+		global $conf;
+		
+		if	( $this->file->filename == $this->file->objectid )
+			$this->file->filename = '';
+
 		// Eigenschaften der Datei uebertragen
 		$this->setTemplateVars( $this->file->getProperties() );
 
@@ -258,7 +266,7 @@ class FileAction extends ObjectAction
 		}
 		asort( $list );
 		$this->setTemplateVar('pages',$list);
-	
+		$this->setTemplateVar('edit_filename',$conf['filename']['edit']);	
 		$this->forward( 'file_prop' );
 	}
 
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.29  2005-01-28 23:05:39  dankert
+// Revision 1.30  2005-11-07 22:31:38  dankert
+// Wenn Dateiname=Objekt-Id, dann Dateinamen auf leer setzen.
+//
+// Revision 1.29  2005/01/28 23:05:39  dankert
 // Bei Aenderungen des Verzeichnis-Inhaltes den Timestamp des Verzeichnisses aktualisieren
 //
 // Revision 1.28  2005/01/27 22:21:30  dankert
@@ -656,6 +659,10 @@ class FolderAction extends ObjectAction
 		if	( $this->folder->isRoot )
 			$this->callSubAction('show');
 
+		if	( $this->folder->filename == $this->folder->objectid )
+			$this->folder->filename = '';
+
+
 		$this->setTemplateVars( $this->folder->getProperties() );
 	
 		// Alle Ordner ermitteln
diff --git a/actionClasses/PageAction.class.php b/actionClasses/PageAction.class.php
@@ -603,6 +603,10 @@ class PageAction extends ObjectAction
 		$this->page->public = true;
 		$this->page->load();
 		$this->page->full_filename();
+
+		if	( $this->page->filename == $this->page->objectid )
+			$this->page->filename = '';
+
 		$this->setTemplateVars( $this->page->getProperties() );
 		
 		if   ( $this->userIsAdmin() )