diff options
| author | friendica <info@friendica.com> | 2013-09-24 05:22:07 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-09-24 05:22:07 -0700 |
| commit | 5ee339c99e7a19fa7af064446b0d21973e9a22c0 (patch) | |
| tree | e7868d192145c41a784a4d4fe63c44727611f684 | |
| parent | d4ea56a77ef408347a9d73b36e8066334b8835ea (diff) | |
| parent | c9b485bc3e799773edfb21f5368d057c982cda29 (diff) | |
| download | volse-hubzilla-5ee339c99e7a19fa7af064446b0d21973e9a22c0.tar.gz volse-hubzilla-5ee339c99e7a19fa7af064446b0d21973e9a22c0.tar.bz2 volse-hubzilla-5ee339c99e7a19fa7af064446b0d21973e9a22c0.zip | |
Merge https://github.com/friendica/red into zpull
| -rw-r--r-- | mod/admin.php | 20 | ||||
| -rwxr-xr-x | view/tpl/admin_hubloc.tpl | 22 |
2 files changed, 42 insertions, 0 deletions
diff --git a/mod/admin.php b/mod/admin.php index e9a456b52..c140cbc6f 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -49,6 +49,7 @@ function admin_post(&$a){ if(is_ajax()) return; goaway($a->get_baseurl(true) . '/admin/themes/' . $theme ); + return; break; case 'logs': @@ -458,6 +459,25 @@ function admin_page_hubloc_post(&$a){ function admin_page_hubloc(&$a) { $o = ''; + $hubloc = q("SELECT hubloc_id, hubloc_addr, hubloc_host, hubloc_status FROM hubloc"); + + + if(! $hubloc){ + notice( t('No server found') . EOL); + goaway($a->get_baseurl(true) . '/admin/hubloc'); + } + + $t = get_markup_template("admin_hubloc.tpl"); + return replace_macros($t, array( + '$hubloc' => $hubloc, + '$th_hubloc' => array(t('ID'), t('for channel'), t('on server'), t('Status')), + '$title' => t('Administration'), + '$page' => t('Server'), + '$queues' => $queues, + '$accounts' => $accounts, + '$pending' => Array( t('Pending registrations'), $pending), + '$plugins' => Array( t('Active plugins'), $a->plugins ) + )); return $o; } diff --git a/view/tpl/admin_hubloc.tpl b/view/tpl/admin_hubloc.tpl new file mode 100755 index 000000000..a9f250652 --- /dev/null +++ b/view/tpl/admin_hubloc.tpl @@ -0,0 +1,22 @@ +<div class="generic-content-wrapper" id='adminpage'> + <h1>{{$title}} - {{$page}}</h1> + + <form action="{{$baseurl}}/admin/hubloc" method="post"> + <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> + + <table id='server'> + <thead> + <tr> + {{foreach $th_hubloc as $th}}<th>{{$th}}</th>{{/foreach}} + </tr> + </thead> + <tbody> + + {{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> + </tr>{{/foreach}} + </tbody> + </table> + + +</div> |