diff options
| author | friendica <info@friendica.com> | 2014-01-20 14:19:25 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-01-20 14:19:25 -0800 |
| commit | 8cd6c97e217f4587dc02db66d8d22bba38159d36 (patch) | |
| tree | ee5eba7b3caf5f713fb5b98a199305b33174ce51 | |
| parent | 5b69e3b79535d7d903d1f203f03b0647188eebc8 (diff) | |
| parent | e3e7ef51afcf44fb938022cb01e77b9d8a833c3b (diff) | |
| download | volse-hubzilla-8cd6c97e217f4587dc02db66d8d22bba38159d36.tar.gz volse-hubzilla-8cd6c97e217f4587dc02db66d8d22bba38159d36.tar.bz2 volse-hubzilla-8cd6c97e217f4587dc02db66d8d22bba38159d36.zip | |
Merge https://github.com/friendica/red into zpull
| -rw-r--r-- | include/security.php | 2 | ||||
| -rw-r--r-- | mod/admin.php | 6 | ||||
| -rwxr-xr-x | view/tpl/admin_hubloc.tpl | 3 |
3 files changed, 8 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..6e7629094 100755 --- a/view/tpl/admin_hubloc.tpl +++ b/view/tpl/admin_hubloc.tpl @@ -14,6 +14,9 @@ {{foreach $hubloc as $hub}}<tr> <td>{{$hub.hubloc_id}}</td><td>{{$hub.hubloc_addr}}</td><td>{{$hub.hubloc_host}}</td><td>{{$hub.hubloc_status}}</td> + <td><input type="hidden" name="hublocid" value="{{$hub.hubloc_id}}"> + <input type="submit" name="check" value="check" > + <input type="submit" name="repair" value="repair" ></td> </tr>{{/foreach}} </tbody> </table> |