harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into zpull

Browse Source
This commit is contained in:
friendica 2014-01-20 14:19:25 -08:00
commit 8cd6c97e21
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/security.php
View File

@ -339,7 +339,7 @@ function get_form_security_token($typename = '') {
$timestamp = time(); $timestamp = time();
$sec_hash = hash('whirlpool', $a->user['guid'] . $a->user['prvkey'] . session_id() . $timestamp . $typename); $sec_hash = hash('whirlpool', $a->user['guid'] . $a->user['prvkey'] . session_id() . $timestamp . $typename);
return $timestamp . '.' . $sec_hash; return $timestamp . '.' . $sec_hash;
} }

6
mod/admin.php
View File

@ -456,7 +456,8 @@ function admin_page_site(&$a) {
} }
function admin_page_hubloc_post(&$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; return;
} }
@ -479,7 +480,8 @@ function admin_page_hubloc(&$a) {
'$queues' => $queues, '$queues' => $queues,
//'$accounts' => $accounts, /*$accounts is empty here*/ //'$accounts' => $accounts, /*$accounts is empty here*/
'$pending' => Array( t('Pending registrations'), $pending), '$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; return $o;
} }

3
view/tpl/admin_hubloc.tpl
View File

@ -14,6 +14,9 @@
{{foreach $hubloc as $hub}}<tr> {{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>{{$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}} </tr>{{/foreach}}
</tbody> </tbody>
</table> </table>