openrat-cms

commit 797082ed7d60ce36a127693299aded26599ec196
parent 6c7f7c2782d8f6661847d4ccca8bee178be2089a
Author: dankert <devnull@localhost>
Date:   Thu, 16 Dec 2004 00:24:58 +0100

Html::url()-Parameter angepasst

Diffstat:
actionClasses/MainAction.class.php
 | 
9
++++++---
actionClasses/TitleAction.class.php
 | 
12
+++++++-----
actionClasses/TreeAction.class.php
 | 
13
++++++++-----

3 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/actionClasses/MainAction.class.php b/actionClasses/MainAction.class.php
@@ -20,7 +20,10 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // ---------------------------------------------------------------------------
 // $Log$
-// Revision 1.3  2004-11-27 13:07:05  dankert
+// Revision 1.4  2004-12-15 23:23:47  dankert
+// Html::url()-Parameter angepasst
+//
+// Revision 1.3  2004/11/27 13:07:05  dankert
 // *** empty log message ***
 //
 // Revision 1.2  2004/05/02 14:49:37  dankert
@@ -50,8 +53,8 @@ class MainAction extends Action
 			$this->setSessionVar( $this->getRequestVar('callAction').'action',$this->getRequestVar('callSubaction') );
 		}
 
-		$this->setTemplateVar('frame_src_main_menu',Html::url( array('action'=>'mainmenu','subaction'=>$this->getRequestVar('subaction') ) ));
-		$this->setTemplateVar('frame_src_main_main',Html::url( array('action'=>$this->getRequestVar('subaction')) ));
+		$this->setTemplateVar('frame_src_main_menu',Html::url( 'mainmenu'                       ,$this->getRequestVar('subaction'),$this->getRequestId() ) );
+		$this->setTemplateVar('frame_src_main_main',Html::url( $this->getRequestVar('subaction'),'',$this->getRequestId() ));
 		
 		$this->forward('frameset_main');
 	}
diff --git a/actionClasses/TitleAction.class.php b/actionClasses/TitleAction.class.php
@@ -20,7 +20,10 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // ---------------------------------------------------------------------------
 // $Log$
-// Revision 1.3  2004-11-10 22:40:32  dankert
+// Revision 1.4  2004-12-15 23:24:23  dankert
+// Html::url()-Parameter angepasst
+//
+// Revision 1.3  2004/11/10 22:40:32  dankert
 // Benutzen der Session-Klasse
 //
 // Revision 1.2  2004/05/02 14:49:37  dankert
@@ -63,11 +66,10 @@ class TitleAction extends Action
 		$this->setTemplateVar('userfullname',$user->fullname);
 		
 		// Urls zum Benutzerprofil und zum Abmelden
-		$this->setTemplateVar('profile_url',Html::url( array('action'   =>'user',
-		                                                     'subaction'=>'profile' ) ));
-		$this->setTemplateVar('logout_url' ,Html::url( array('action'   =>'index',
-		                                                     'subaction'=>'logout'  ) ));
+		$this->setTemplateVar('profile_url',Html::url( 'user' ,'profile' ));
+		$this->setTemplateVar('logout_url' ,Html::url( 'index','logout'  ));
 		
+		$this->setTemplateVar('css_body_class','title');
 		$this->forward( 'title' );
 	}
 }
diff --git a/actionClasses/TreeAction.class.php b/actionClasses/TreeAction.class.php
@@ -20,7 +20,10 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // ---------------------------------------------------------------------------
 // $Log$
-// Revision 1.8  2004-11-27 13:08:49  dankert
+// Revision 1.9  2004-12-15 23:24:58  dankert
+// Html::url()-Parameter angepasst
+//
+// Revision 1.8  2004/11/27 13:08:49  dankert
 // Benutzen "id"-Attribut
 //
 // Revision 1.7  2004/11/10 22:40:49  dankert
@@ -76,7 +79,7 @@ class TreeAction extends Action
 	function open()
 	{
 		$this->tree = Session::getTree();
-		$this->tree->open( $this->getRequestVar('id') );
+		$this->tree->open( $this->getRequestId() );
 		Session::setTree( $this->tree );
 
 		$this->callSubAction('show');
@@ -89,7 +92,7 @@ class TreeAction extends Action
 	function close()
 	{
 		$this->tree = Session::getTree();
-		$this->tree->close( $this->getRequestVar('id') );
+		$this->tree->close( $this->getRequestId() );
 		Session::setTree( $this->tree );
 
 		$this->callSubAction('show');
@@ -161,7 +164,7 @@ class TreeAction extends Action
 	                    $zeile['image'] = 'plus_end';
 	               else $zeile['image'] = 'plus';
 
-	               $zeile['image_url'     ] = Html::url(array('action'=>'tree','subaction'=>'open','id'=>$elId));
+	               $zeile['image_url'     ] = Html::url('tree','open',$elId);
 	               $zeile['image_url_desc'] = lang('TREE_OPEN_ELEMENT');
 	          }
 	          else
@@ -170,7 +173,7 @@ class TreeAction extends Action
 	                    $zeile['image'] = 'minus_end';
 	               else $zeile['image'] = 'minus';
 
-	               $zeile['image_url'     ] = Html::url(array('action'=>'tree','subaction'=>'close','id'=>$elId));
+	               $zeile['image_url'     ] = Html::url('tree','close',$elId);
 	               $zeile['image_url_desc'] = lang('TREE_CLOSE_ELEMENT');
 	          }
 	     }