From ec6b351dc45b9a03ec29625618bc6927213b2812 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 4 Jun 2014 18:55:21 +0200
Subject: Add token in Render class, instead of passing it to its methods
explicitly all over the place
---
inc/menu.inc.php | 3 +--
inc/render.inc.php | 35 +++++++++++++++++++-----------
modules/baseconfig.inc.php | 3 +--
modules/minilinux.inc.php | 3 +--
modules/serversetup.inc.php | 4 +---
modules/sysconfig.inc.php | 4 +---
modules/sysconfig/addconfig.inc.php | 2 --
modules/sysconfig/addmodule_ad.inc.php | 4 +---
modules/sysconfig/addmodule_custom.inc.php | 2 --
modules/syslog.inc.php | 1 -
modules/vmstore.inc.php | 1 -
11 files changed, 28 insertions(+), 34 deletions(-)
diff --git a/inc/menu.inc.php b/inc/menu.inc.php
index 90bc4ebd..fdec08c3 100644
--- a/inc/menu.inc.php
+++ b/inc/menu.inc.php
@@ -10,8 +10,7 @@ class Menu
{
if (User::getName() === false) return Render::parse('menu-login');
return Render::parse('menu-logout', array(
- 'user' => User::getName(),
- 'token' => Session::get('token')
+ 'user' => User::getName()
));
}
diff --git a/inc/render.inc.php b/inc/render.inc.php
index 4fe9d002..6c746c93 100644
--- a/inc/render.inc.php
+++ b/inc/render.inc.php
@@ -11,8 +11,10 @@ Mustache_Autoloader::register();
* HTML rendering helper class
*/
Render::init();
+
class Render
{
+
private static $mustache = false;
private static $body = '';
private static $header = '';
@@ -22,7 +24,8 @@ class Render
public static function init()
{
- if (self::$mustache !== false) Util::traceError('Called Render::init() twice!');
+ if (self::$mustache !== false)
+ Util::traceError('Called Render::init() twice!');
self::$mustache = new Mustache_Engine;
}
@@ -33,9 +36,10 @@ class Render
{
Header('Content-Type: text/html; charset=utf-8');
$zip = isset($_SERVER['HTTP_ACCEPT_ENCODING']) && (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false);
- if ($zip) ob_start();
+ if ($zip)
+ ob_start();
echo
- '
+ '
', RENDER_DEFAULT_TITLE, self::$title, '
@@ -51,13 +55,13 @@ class Render
',
self::$header
,
- '
+ '
',
self::$body
,
- '
+ '
@@ -95,9 +99,9 @@ class Render
*/
public static function addTemplate($template, $params = false)
{
- self::$body .= self::$mustache->render(self::getTemplate($template), $params);
+ self::$body .= self::parse($template, $params);
}
-
+
/**
* Add a dialog to the page output.
*
@@ -111,7 +115,7 @@ class Render
self::addTemplate('dialog-generic', array(
'title' => $title,
'next' => $next,
- 'body' => self::$mustache->render(self::getTemplate($template), $params)
+ 'body' => self::parse($template, $params)
));
}
@@ -128,6 +132,8 @@ class Render
*/
public static function parse($template, $params = false)
{
+ if (is_array($params))
+ $params['token'] = Session::get('token');
return self::$mustache->render(self::getTemplate($template), $params);
}
@@ -153,9 +159,11 @@ class Render
*/
public static function closeTag($tag)
{
- if (empty(self::$tags)) Util::traceError('Tried to close tag ' . $tag . ' when no open tags exist.');
+ if (empty(self::$tags))
+ Util::traceError('Tried to close tag ' . $tag . ' when no open tags exist.');
$last = array_pop(self::$tags);
- if ($last !== $tag) Util::traceError('Tried to close tag ' . $tag . ' when last opened tag was ' . $last);
+ if ($last !== $tag)
+ Util::traceError('Tried to close tag ' . $tag . ' when last opened tag was ' . $last);
self::$body .= '';
}
@@ -169,9 +177,10 @@ class Render
}
// Load from disk
$data = @file_get_contents('templates/' . $template . '.html');
- if ($data === false) $data = 'Non-existent template ' . $template . ' requested!';
- self::$templateCache[$template] =& $data;
+ if ($data === false)
+ $data = 'Non-existent template ' . $template . ' requested!';
+ self::$templateCache[$template] = & $data;
return $data;
}
-}
+}
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);
}
--
cgit v1.2.3-55-g7522