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

9 files changed, 5 insertions, 19 deletions

diff --git a/modules/baseconfig.inc.php b/modules/baseconfig.inc.php
index 99e7f1bb..7d586ef3 100644
--- a/modules/baseconfig.inc.php
+++ b/modules/baseconfig.inc.php
@@ -89,8 +89,7 @@ class Page_BaseConfig extends Page
 		}
 		$settings = array_values($settings);
 		Render::addTemplate('page-baseconfig', array(
-			'categories'  => $settings,
-			'token'       => Session::get('token'),
+			'categories'  => $settings
 		));
 	}
 
diff --git a/modules/minilinux.inc.php b/modules/minilinux.inc.php
index f947ef41..17cb7c86 100644
--- a/modules/minilinux.inc.php
+++ b/modules/minilinux.inc.php
@@ -53,8 +53,7 @@ class Page_MiniLinux extends Page
 				}
 			}
 			echo Render::parse('minilinux/filelist', array(
-				'systems' => $data['systems'],
-				'token' => Session::get('token')
+				'systems' => $data['systems']
 			));
 			return;
 		case 'download':
diff --git a/modules/serversetup.inc.php b/modules/serversetup.inc.php
index 46a8fb4e..c03fe9e3 100644
--- a/modules/serversetup.inc.php
+++ b/modules/serversetup.inc.php
@@ -42,11 +42,9 @@ class Page_ServerSetup extends Page
 		Render::setTitle('Serverseitige Konfiguration');
 
 		Render::addTemplate('serversetup/ipaddress', array(
-			'ips' => $this->taskStatus['data']['addresses'],
-			'token' => Session::get('token')
+			'ips' => $this->taskStatus['data']['addresses']
 		));
 		$data = $this->currentMenu;
-		$data['token'] = Session::get('token');
 		$data['taskid'] = Property::getIPxeTaskId();
 		if (!isset($data['defaultentry']))
 			$data['defaultentry'] = 'net';
diff --git a/modules/sysconfig.inc.php b/modules/sysconfig.inc.php
index 4bfcc3f8..c6f210f8 100644
--- a/modules/sysconfig.inc.php
+++ b/modules/sysconfig.inc.php
@@ -144,8 +144,7 @@ class Page_SysConfig extends Page
 		}
 		Render::addTemplate('page-sysconfig-main', array(
 			'configs' => $configs,
-			'modules' => $modules,
-			'token' => Session::get('token')
+			'modules' => $modules
 		));
 	}
 	
@@ -201,7 +200,6 @@ class Page_SysConfig extends Page
 		
 		// render the template
 		Render::addDialog('Inhalt von "' . $row['title'] . '"', false, 'sysconfig/custom-filelist', array(
-				'token' => Session::get('token'),
 				'files' => $list,
 		));
 	}
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,
 		));
diff --git a/modules/syslog.inc.php b/modules/syslog.inc.php
index 2c54b8f4..1ce79924 100644
--- a/modules/syslog.inc.php
+++ b/modules/syslog.inc.php
@@ -59,7 +59,6 @@ class Page_SysLog extends Page
 		}
 
 		$paginate->render('page-syslog', array(
-			'token'    => Session::get('token'),
 			'filter'   => $filter,
 			'not'      => $not,
 			'list'     => $lines
diff --git a/modules/vmstore.inc.php b/modules/vmstore.inc.php
index 602ab258..9c8e5f42 100644
--- a/modules/vmstore.inc.php
+++ b/modules/vmstore.inc.php
@@ -33,7 +33,6 @@ class Page_VmStore extends Page
 		if (isset($vmstore['storetype'])) {
 			$vmstore['pre-' . $vmstore['storetype']] = 'checked';
 		}
-		$vmstore['token'] = Session::get('token');
 		Render::addTemplate('page-vmstore', $vmstore);
 	}