openrat-cms

commit fa8620890445f0dd1549ee86eb7603fb3baf5bb4
parent 15e5139dc9124c9297cb73ac872994d67d7c9091
Author: dankert <devnull@localhost>
Date:   Mon, 20 Dec 2004 23:43:12 +0100

Uebertragen des Benutzers geaendert

Diffstat:
actionClasses/FileAction.class.php
 | 
33
+++++----------------------------
actionClasses/PageAction.class.php
 | 
27
++++++++++++---------------

2 files changed, 17 insertions(+), 43 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.12  2004-12-19 14:53:54  dankert
+// Revision 1.13  2004-12-20 22:43:12  dankert
+// Uebertragen des Benutzers geaendert
+//
+// Revision 1.12  2004/12/19 14:53:54  dankert
 // pub2() -> pubnow()
 //
 // Revision 1.11  2004/12/15 23:23:11  dankert
@@ -233,32 +236,6 @@ class FileAction extends ObjectAction
 
 		$this->setTemplateVar('full_filename',$this->file->full_filename());
 
-		if	( is_numeric($this->file->lastchange_userid) )
-		{
-			$user = new User( $this->file->lastchange_userid );
-			$user->load();
-			$this->setTemplateVar('lastchange_user',array('name'=>$user->name,
-			                                              'url' =>Html::url(array('action'=>'user',
-			                                                                      'userid'=>$user->userid))));
-		}
-		else
-		{
-			$this->setTemplateVar('lastchange_user',array('name'=>lang('UNKNOWN')));
-		}
-	
-		if	( is_numeric($this->file->create_userid) )
-		{
-			$user = new User( $this->file->create_userid );
-			$user->load();
-			$this->setTemplateVar('create_user',array('name'=>$user->name,
-			                                          'url' =>Html::url(array('action'=>'user',
-			                                                                  'userid'=>$user->userid))));
-		}
-		else
-		{
-			$this->setTemplateVar('create_user',array('name'=>lang('UNKNOWN')));
-		}
-		
 		// Alle Seiten mit dieser Datei ermitteln
 		$pages = $this->file->getDependentObjectIds();
 			
@@ -268,7 +245,7 @@ class FileAction extends ObjectAction
 			$o = new Object( $id );
 			$o->load();
 			$list[$id] = array();
-			$list[$id]['url' ] = Html::url(array('action'=>'main','callAction'=>'page','objectid'=>$id));
+			$list[$id]['url' ] = Html::url('main','page',$id);
 			$list[$id]['name'] = $o->name;
 		}
 		asort( $list );
diff --git a/actionClasses/PageAction.class.php b/actionClasses/PageAction.class.php
@@ -512,7 +512,6 @@ class PageAction extends ObjectAction
 	 */
 	function prop()
 	{
-		global $SESS;
 		$this->setTemplateVar('id',$this->page->objectid);
 	
 		$this->page->public = true;
@@ -520,9 +519,7 @@ class PageAction extends ObjectAction
 		$this->page->full_filename();
 		$this->setTemplateVars( $this->page->getProperties() );
 		
-		$this->setTemplateVar('delete',$this->page->hasRight('delete'));
-	
-		if   ( $SESS['user']['is_admin'] == '1' )
+		if   ( $this->userIsAdmin() )
 		{
 			$this->setTemplateVar('template_url',Html::url('main','template',$this->page->templateid));
 		}
@@ -532,18 +529,18 @@ class PageAction extends ObjectAction
 		$this->setTemplateVar('template_name',$template->name);
 	
 		// Alle Ordner ermitteln
-		$this->setTemplateVar('act_folderobjectid',$this->page->parentid);
-
-		$folders = array();
-		$folder = new Folder( $this->page->parentid );
+//		$this->setTemplateVar('act_folderobjectid',$this->page->parentid);
+//
+//		$folders = array();
+//		$folder = new Folder( $this->page->parentid );
 		
-		foreach( $folder->getOtherFolders() as $oid )
-		{
-			$f = new Folder( $oid );
-			$folders[$oid] = implode(' » ',$f->parentObjectNames(true,true) );
-		}
-		asort( $folders );
-		$this->setTemplateVar('folder',$folders); 
+//		foreach( $folder->getOtherFolders() as $oid )
+//		{
+//			$f = new Folder( $oid );
+//			$folders[$oid] = implode( FILE_SEP,$f->parentObjectNames(true,true) );
+//		}
+//		asort( $folders );
+//		$this->setTemplateVar('folder',$folders); 
 
 		$templates = Array();
 		foreach( Template::getAll() as $id=>$name )