Add token in Render class, instead of passing it to its methods explicitly all over the place

3 files changed, 1 insertions, 7 deletions

diff --git a/modules/sysconfig/addconfig.inc.php b/modules/sysconfig/addconfig.inc.php
index 96c29fea..d9ad1054 100644
--- a/modules/sysconfig/addconfig.inc.php
+++ b/modules/sysconfig/addconfig.inc.php
@@ -126,7 +126,6 @@ class AddConfig_Start extends AddConfig_Base
 			$mods[$row['moduletype']]['modules'][] = $row;
 		}
 		Render::addDialog('Konfiguration zusammenstellen', false, 'sysconfig/cfg-start', array(
-			'token' => Session::get('token'),
 			'step' => 'AddConfig_Finish',
 			'groups' => array_values($mods)
 		));
@@ -198,7 +197,6 @@ class AddConfig_Finish extends AddConfig_Base
 			));
 		}
 		Render::addDialog('Konfiguration zusammenstellen', false, 'sysconfig/cfg-finish', array(
-			'token' => Session::get('token'),
 			'configid' => $confid
 		));
 	}
diff --git a/modules/sysconfig/addmodule_ad.inc.php b/modules/sysconfig/addmodule_ad.inc.php
index d533a2b8..e016685b 100644
--- a/modules/sysconfig/addmodule_ad.inc.php
+++ b/modules/sysconfig/addmodule_ad.inc.php
@@ -23,8 +23,7 @@ class AdModule_Start extends AddModule_Base
 			'searchbase' => Request::post('searchbase'),
 			'binddn' => Request::post('binddn'),
 			'bindpw' => Request::post('bindpw'),
-			'home' => Request::post('home'),
-			'token' => Session::get('token')
+			'home' => Request::post('home')
 		));
 	}
 
@@ -69,7 +68,6 @@ class AdModule_CheckConnection extends AddModule_Base
 				'searchbase' => Request::post('searchbase'),
 				'binddn' => Request::post('binddn'),
 				'bindpw' => Request::post('bindpw'),
-				'token' => Session::get('token'),
 				'home' => Request::post('home'),
 				'step' => 'AdModule_Finish'
 			))
diff --git a/modules/sysconfig/addmodule_custom.inc.php b/modules/sysconfig/addmodule_custom.inc.php
index e5def1ef..5673be2c 100644
--- a/modules/sysconfig/addmodule_custom.inc.php
+++ b/modules/sysconfig/addmodule_custom.inc.php
@@ -21,7 +21,6 @@ class CustomModule_UploadForm extends AddModule_Base
 	{
 		Session::set('mod_temp', false);
 		Render::addDialog('Eigenes Modul hinzufügen', false, 'sysconfig/custom-upload', array(
-			'token' => Session::get('token'),
 			'step' => 'CustomModule_ProcessUpload'
 			));
 	}
@@ -94,7 +93,6 @@ class CustomModule_ProcessUpload extends AddModule_Base
 			}
 		}
 		Render::addDialog('Eigenes Modul hinzufügen', false, 'sysconfig/custom-fileselect', array(
-			'token' => Session::get('token'),
 			'step' => 'CustomModule_CompressModule',
 			'files' => $list,
 		));