openrat-cms

commit fe5e05ffbf61ef996cd2301f86b076369a628553
parent a6fe9694a37049b131341842a56dc977bae7171d
Author: dankert <devnull@localhost>
Date:   Tue, 30 Oct 2007 00:29:17 +0100

Konstanten f?r Request-Variablen.

Diffstat:
actionClasses/IndexAction.class.php
 | 
10
+++++-----
actionClasses/MainmenuAction.class.php
 | 
2
+-
actionClasses/ObjectAction.class.php
 | 
7
+++++--
actionClasses/PageAction.class.php
 | 
2
+-
actionClasses/TreeAction.class.php
 | 
7
+++++--

5 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/actionClasses/IndexAction.class.php b/actionClasses/IndexAction.class.php
@@ -618,7 +618,7 @@ class IndexAction extends Action
 
 	function language()
 	{
-		$this->evaluateRequestVars( array('languageid'=>$this->getRequestId()) );
+		$this->evaluateRequestVars( array(REQ_PARAM_LANGUAGE_ID=>$this->getRequestId()) );
 
 		$user = Session::getUser();
 		$user->loadRights( $project->projectid,$language->languageid );
@@ -656,7 +656,7 @@ class IndexAction extends Action
 			$project->load();
 			Session::setProject( $project );
 			
-			$language = new Language( isset($vars['languageid'])?$vars['languageid']:$project->getDefaultLanguageId() );
+			$language = new Language( isset($vars[REQ_PARAM_LANGUAGE_ID])?$vars[REQ_PARAM_LANGUAGE_ID]:$project->getDefaultLanguageId() );
 			$language->load();
 			Session::setProjectLanguage( $language );
 	
@@ -664,9 +664,9 @@ class IndexAction extends Action
 			$model->load();
 			Session::setProjectModel( $model );
 		}
-		elseif	( isset($vars['languageid']) )
+		elseif	( isset($vars[REQ_PARAM_LANGUAGE_ID]) )
 		{
-			$language = new Language( $vars['languageid'] );
+			$language = new Language( $vars[REQ_PARAM_LANGUAGE_ID] );
 			$language->load();
 			Session::setProjectLanguage( $language );
 	
@@ -724,7 +724,7 @@ class IndexAction extends Action
 	
 			Session::setProject( $project );
 			
-			$language = new Language( isset($vars['languageid'])?$vars['languageid']:$project->getDefaultLanguageId() );
+			$language = new Language( isset($vars[REQ_PARAM_LANGUAGE_ID])?$vars[REQ_PARAM_LANGUAGE_ID]:$project->getDefaultLanguageId() );
 			$language->load();
 			Session::setProjectLanguage( $language );
 	
diff --git a/actionClasses/MainmenuAction.class.php b/actionClasses/MainmenuAction.class.php
@@ -426,7 +426,7 @@ class MainmenuAction extends Action
 			$this->addSubaction('edit');
 
 		$this->setTemplateVar('windowMenu',$this->subActionList);
-		$this->setTemplateVar('param','languageid');
+		$this->setTemplateVar('param',REQ_PARAM_LANGUAGE_ID);
 		$this->setTemplateVar('text',lang('GLOBAL_LANGUAGE'));
 	}
 
diff --git a/actionClasses/ObjectAction.class.php b/actionClasses/ObjectAction.class.php
@@ -20,7 +20,10 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // ---------------------------------------------------------------------------
 // $Log$
-// Revision 1.6  2006-01-29 17:25:07  dankert
+// Revision 1.7  2007-10-29 23:29:17  dankert
+// Konstanten f?r Request-Variablen.
+//
+// Revision 1.6  2006/01/29 17:25:07  dankert
 // Methode setWindowMenu() entfernt
 //
 // Revision 1.5  2006/01/23 23:10:46  dankert
@@ -110,7 +113,7 @@ class ObjectAction extends Action
 			default:
 		}
 
-		$acl->languageid    = $this->getRequestVar('languageid');
+		$acl->languageid    = $this->getRequestVar(REQ_PARAM_LANGUAGE_ID);
 
 		$acl->write         = ( $this->hasRequestVar('write'        ) );
 		$acl->prop          = ( $this->hasRequestVar('prop'         ) );
diff --git a/actionClasses/PageAction.class.php b/actionClasses/PageAction.class.php
@@ -125,7 +125,7 @@ class PageAction extends ObjectAction
 				else
 				{
 					// sonst nur 1x speichern (fuer die aktuelle Sprache)
-					$value->languageid = $this->getSessionVar('languageid');
+					$value->languageid = $this->getSessionVar(REQ_PARAM_LANGUAGE_ID);
 					$value->save();
 				}
 			}
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.10  2004-12-18 00:16:15  dankert
+// Revision 1.11  2007-10-29 23:29:17  dankert
+// Konstanten f?r Request-Variablen.
+//
+// Revision 1.10  2004/12/18 00:16:15  dankert
 // language_read() entfernt
 //
 // Revision 1.9  2004/12/15 23:24:58  dankert
@@ -124,7 +127,7 @@ class TreeAction extends Action
 			$this->tree = new ProjectTree();
 			$this->tree->projectId = $projectid;
 
-			$SESS['languageid'] = Language::getDefaultId();
+			$SESS[REQ_PARAM_LANGUAGE_ID] = Language::getDefaultId();
 			$SESS['modelid'   ] = Model::getDefaultId();
 		}