aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-01-27 14:47:58 -0800
committerfriendica <info@friendica.com>2014-01-27 14:47:58 -0800
commit9551f6b40485e951db25f6c1b31b1f46cbeda5cd (patch)
tree5b84022724afb278691f663de2df20edfd9781fb
parentd6a9497e4a3839d9fb4dba4634167f006bb3fe87 (diff)
parenta3bf272753183f61723fea5dccd52abe6f0662dd (diff)
downloadvolse-hubzilla-9551f6b40485e951db25f6c1b31b1f46cbeda5cd.tar.gz
volse-hubzilla-9551f6b40485e951db25f6c1b31b1f46cbeda5cd.tar.bz2
volse-hubzilla-9551f6b40485e951db25f6c1b31b1f46cbeda5cd.zip
Merge https://github.com/friendica/red into zpull
-rw-r--r--mod/admin.php22
-rwxr-xr-xview/tpl/admin_hubloc.tpl9
2 files changed, 27 insertions, 4 deletions
diff --git a/mod/admin.php b/mod/admin.php
index 70a753c46..950c7e5ce 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -468,6 +468,28 @@ function admin_page_site(&$a) {
}
function admin_page_hubloc_post(&$a){
check_form_security_token_redirectOnErr('/admin/hubloc', 'admin_hubloc');
+
+ //prepare for ping
+
+ if ( $_POST['hublocid']) {
+ $hublocid = $_POST['hublocid'];
+ $arrhublocurl = q("SELECT hubloc_url FROM hubloc WHERE hubloc_id = %d ",
+ intval($hublocid)
+ );
+ $hublocurl = $arrhublocurl[0]['hubloc_url'] . '/post';
+ logger('hubloc_url : ' . $hublocurl , LOGGER_DEBUG);
+ }
+
+ //if ( $_POST'' == "check" ) {
+ // //todo
+ //}
+
+ //perform ping
+ //handle results and set the hubloc flags in db to make results visible
+
+ //in case of repair store new pub key for tested hubloc (all channel with this hubloc) in db
+ //after repair set hubloc flags to 0
+
goaway($a->get_baseurl(true) . '/admin/hubloc' );
return;
}
diff --git a/view/tpl/admin_hubloc.tpl b/view/tpl/admin_hubloc.tpl
index 6e7629094..ea840e1b3 100755
--- a/view/tpl/admin_hubloc.tpl
+++ b/view/tpl/admin_hubloc.tpl
@@ -1,9 +1,6 @@
<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>
@@ -14,9 +11,13 @@
{{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}}">
+ <td>
+ <form action="{{$baseurl}}/admin/hubloc" method="post">
+ <input type="hidden" name="hublocid" value="{{$hub.hubloc_id}}">
+ <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
<input type="submit" name="check" value="check" >
<input type="submit" name="repair" value="repair" ></td>
+ </form>
</tr>{{/foreach}}
</tbody>
</table>