openrat-cms

commit 6c2bdfc3ddfd944c86894b84cab456a6d60b0c35
parent 54d779e2dc698711a3f1fa8729382cfadcad9cc0
Author: dankert <devnull@localhost>
Date:   Sun, 26 Dec 2010 00:20:31 +0100

Fix: Korrekte URLs erzeugen.

Diffstat:
actionClasses/FolderAction.class.php
 | 
8
++++----
actionClasses/SearchAction.class.php
 | 
4
++--

2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/actionClasses/FolderAction.class.php b/actionClasses/FolderAction.class.php
@@ -933,7 +933,7 @@ class FolderAction extends ObjectAction
 		global $conf_php;
 
 		if   ( ! $this->folder->isRoot )
-			$this->setTemplateVar('up_url',Html::url('main','folder',$this->folder->parentid));
+			$this->setTemplateVar('up_url',Html::url('folder','show',$this->folder->parentid));
 
 		$this->setTemplateVar('writable',$this->folder->hasRight(ACL_WRITE) );
 		
@@ -957,7 +957,7 @@ class FolderAction extends ObjectAction
 				
 				$list[$id]['icon' ] = $o->getType();
 				$list[$id]['class'] = $o->getType();
-				$list[$id]['url' ] = Html::url('main',$o->getType(),$id);
+				$list[$id]['url' ] = Html::url($o->getType(),'',$id);
 				
 				if	( $o->getType() == 'file' )
 				{
@@ -1023,7 +1023,7 @@ class FolderAction extends ObjectAction
 //						$list[$id]['icon'] = 'text';
 				}
 
-				$list[$id]['url' ] = Html::url('main',$o->getType(),$id);
+				$list[$id]['url' ] = Html::url($o->getType(),'',$id);
 				$list[$id]['date'] = date( lang('DATE_FORMAT'),$o->lastchangeDate );
 				$list[$id]['user'] = $o->lastchangeUser;
 				
@@ -1108,7 +1108,7 @@ class FolderAction extends ObjectAction
 						$list[$id]['icon'] = 'image';
 				}
 
-				$list[$id]['url' ] = Html::url('main',$o->getType(),$id);
+				$list[$id]['url' ] = Html::url($o->getType(),'',$id);
 				$list[$id]['date'] = $o->lastchangeDate;
 				$list[$id]['user'] = $o->lastchangeUser;
 
diff --git a/actionClasses/SearchAction.class.php b/actionClasses/SearchAction.class.php
@@ -91,7 +91,7 @@ class SearchAction extends Action
 			$o = new Object( $objectid );
 			$o->load();
 			$resultList[$objectid] = array();
-			$resultList[$objectid]['url']  = Html::url('main',$o->getType(),$objectid);
+			$resultList[$objectid]['url']  = Html::url($o->getType(),'',$objectid);
 			$resultList[$objectid]['type'] = $o->getType();
 			$resultList[$objectid]['name'] = $o->name;
 			$resultList[$objectid]['lastchange_date'] = $o->lastchangeDate;
@@ -107,7 +107,7 @@ class SearchAction extends Action
 			$t = new Template( $templateid );
 			$t->load();
 			$resultList['t'.$templateid] = array();
-			$resultList['t'.$templateid]['url' ]  = Html::url('main','template',$templateid);
+			$resultList['t'.$templateid]['url' ]  = Html::url('template','',$templateid);
 			$resultList['t'.$templateid]['type'] = 'template';
 			$resultList['t'.$templateid]['name'] = $t->name;
 			$resultList['t'.$templateid]['desc'] = lang('NO_DESCRIPTION_AVAILABLE');