From a13593590b5e5488554225ba9ff9bced24cffd0c Mon Sep 17 00:00:00 2001 From: Michael Meer Date: Mon, 20 Jan 2014 12:12:40 +0100 Subject: added buttons to perform later hubloc actions --- include/security.php | 2 +- mod/admin.php | 6 ++++-- view/tpl/admin_hubloc.tpl | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/include/security.php b/include/security.php index a87442d42..9943cf88d 100644 --- a/include/security.php +++ b/include/security.php @@ -339,7 +339,7 @@ function get_form_security_token($typename = '') { $timestamp = time(); $sec_hash = hash('whirlpool', $a->user['guid'] . $a->user['prvkey'] . session_id() . $timestamp . $typename); - + return $timestamp . '.' . $sec_hash; } diff --git a/mod/admin.php b/mod/admin.php index 91dd0b56e..984e12777 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -456,7 +456,8 @@ function admin_page_site(&$a) { } function admin_page_hubloc_post(&$a){ - check_form_security_token_redirectOnErr('/admin/hubloc', 'hubloc'); + check_form_security_token_redirectOnErr('/admin/hubloc', 'admin_hubloc'); + goaway($a->get_baseurl(true) . '/admin/hubloc' ); return; } @@ -479,7 +480,8 @@ function admin_page_hubloc(&$a) { '$queues' => $queues, //'$accounts' => $accounts, /*$accounts is empty here*/ '$pending' => Array( t('Pending registrations'), $pending), - '$plugins' => Array( t('Active plugins'), $a->plugins ) + '$plugins' => Array( t('Active plugins'), $a->plugins ), + '$form_security_token' => get_form_security_token("admin_hubloc") )); return $o; } diff --git a/view/tpl/admin_hubloc.tpl b/view/tpl/admin_hubloc.tpl index a9f250652..e1c8b3647 100755 --- a/view/tpl/admin_hubloc.tpl +++ b/view/tpl/admin_hubloc.tpl @@ -14,6 +14,8 @@ {{foreach $hubloc as $hub}} {{$hub.hubloc_id}}{{$hub.hubloc_addr}}{{$hub.hubloc_host}}{{$hub.hubloc_status}} + + {{/foreach}} -- cgit v1.2.3