aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-01-30 14:37:50 -0800
committerfriendica <info@friendica.com>2014-01-30 14:37:50 -0800
commit2f876334d5d55282ef4705d80c975e508b52c343 (patch)
treeae13a518464da622b568fba41f4f68911bd9b5ce
parent0fae8acdefa26c19429ffef218066050d1ae825e (diff)
parent70de97fca17bac28e174373cd03581b5bae0c471 (diff)
downloadvolse-hubzilla-2f876334d5d55282ef4705d80c975e508b52c343.tar.gz
volse-hubzilla-2f876334d5d55282ef4705d80c975e508b52c343.tar.bz2
volse-hubzilla-2f876334d5d55282ef4705d80c975e508b52c343.zip
Merge https://github.com/friendica/red into zpull
-rw-r--r--include/network.php6
-rwxr-xr-xindex.php3
-rw-r--r--mod/admin.php37
-rw-r--r--mod/post.php9
-rwxr-xr-xview/tpl/admin_hubloc.tpl1
-rwxr-xr-xview/tpl/profile_vcard.tpl3
6 files changed, 39 insertions, 20 deletions
diff --git a/include/network.php b/include/network.php
index 3fe7f5400..1fb4beaa7 100644
--- a/include/network.php
+++ b/include/network.php
@@ -78,7 +78,7 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) {
@curl_setopt($ch, CURLOPT_BINARYTRANSFER,1);
- // don't let curl abort the entire application
+ // don't let curl abort the entire application'
// if it throws any errors.
$s = @curl_exec($ch);
@@ -86,7 +86,7 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) {
$base = $s;
$curl_info = @curl_getinfo($ch);
$http_code = $curl_info['http_code'];
-// logger('fetch_url:' . $http_code . ' data: ' . $s);
+ //logger('fetch_url:' . $http_code . ' data: ' . $s);
$header = '';
// Pull out multiple headers, e.g. proxy and continuation headers
@@ -129,7 +129,7 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) {
function z_post_url($url,$params, $redirects = 0, $opts = array()) {
-
+
$ret = array('return_code' => 0, 'success' => false, 'header' => "", 'body' => "");
$ch = curl_init($url);
diff --git a/index.php b/index.php
index 6ffef19cb..c2421bc0e 100755
--- a/index.php
+++ b/index.php
@@ -19,7 +19,7 @@ $a = new App;
/**
*
* Load the configuration file which contains our DB credentials.
- * Ignore errors. If the file doesn't exist or is empty, we are running in installation mode.
+ * Ignore errors. If the file doesn't exist or is empty, we are running in installation mode.'
*
*/
@@ -182,7 +182,6 @@ if(strlen($a->module)) {
* Otherwise, look for the standard program module in the 'mod' directory
*/
-
if(! $a->module_loaded) {
if(file_exists("custom/{$a->module}.php")) {
include_once("custom/{$a->module}.php");
diff --git a/mod/admin.php b/mod/admin.php
index 950c7e5ce..76decae09 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -9,7 +9,7 @@
* @param App $a
*/
function admin_post(&$a){
-
+ logger('admin_post', LOGGER_DEBUG);
if(!is_site_admin()) {
return;
@@ -74,6 +74,7 @@ function admin_post(&$a){
*/
function admin_content(&$a) {
+ logger('admin_content', LOGGER_DEBUG);
if(!is_site_admin()) {
return login(false);
}
@@ -468,6 +469,7 @@ function admin_page_site(&$a) {
}
function admin_page_hubloc_post(&$a){
check_form_security_token_redirectOnErr('/admin/hubloc', 'admin_hubloc');
+ require_once('include/zot.php');
//prepare for ping
@@ -477,18 +479,33 @@ function admin_page_hubloc_post(&$a){
intval($hublocid)
);
$hublocurl = $arrhublocurl[0]['hubloc_url'] . '/post';
- logger('hubloc_url : ' . $hublocurl , LOGGER_DEBUG);
- }
+
+ //perform ping
+ $m = zot_build_packet($a->get_channel(),'ping');
+ $r = zot_zot($hublocurl,$m);
+ //handle results and set the hubloc flags in db to make results visible
+ $r2 = $r[body];
+ $r3 = $r2[success];
+ if ( $r3[success] == True ){
+ //set HUBLOC_OFFLINE to 0
+ logger(' success = true ',LOGGER_DEBUG);
+ } else {
+ //set HUBLOC_OFFLINE to 1
+ logger(' success = false ', LOGGER_DEBUG);
- //if ( $_POST'' == "check" ) {
- // //todo
- //}
+ }
+
+ //unfotunatly zping wont work, I guess return format is not correct
+ //require_once('mod/zping.php');
+ //$r = zping_content($hublocurl);
+ //logger('zping answer: ' . $r, LOGGER_DEBUG);
+
- //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
+
+ }
- //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/mod/post.php b/mod/post.php
index 965ba09a3..cb0dc8302 100644
--- a/mod/post.php
+++ b/mod/post.php
@@ -255,6 +255,11 @@ function post_init(&$a) {
$a->set_groups(init_groups_visitor($_SESSION['visitor_id']));
info(sprintf( t('Welcome %s. Remote authentication successful.'),$x[0]['xchan_name']));
logger('mod_zot: auth success from ' . $x[0]['xchan_addr']);
+ q("update hubloc set hubloc_status = (hubloc_status | %d ) where hubloc_id = %d ",
+ intval(HUBLOC_WORKS),
+ intval($x[0]['hubloc_id'])
+ );
+
} else {
if($test) {
@@ -445,14 +450,12 @@ function post_init(&$a) {
function post_post(&$a) {
- logger('mod_zot: ' . print_r($_REQUEST,true), LOGGER_DEBUG);
$encrypted_packet = false;
$ret = array('success' => false);
$data = json_decode($_REQUEST['data'],true);
- logger('mod_zot: data: ' . print_r($data,true), LOGGER_DATA);
/**
* Many message packets will arrive encrypted. The existence of an 'iv' element
@@ -481,7 +484,6 @@ function post_post(&$a) {
$data = array('type' => 'bogus');
}
- logger('mod_zot: decoded data: ' . print_r($data,true), LOGGER_DATA);
$msgtype = ((array_key_exists('type',$data)) ? $data['type'] : '');
@@ -490,6 +492,7 @@ function post_post(&$a) {
// Useful to get a health check on a remote site.
// This will let us know if any important communication details
// that we may have stored are no longer valid, regardless of xchan details.
+ logger('POST: got ping send pong now back: ' . z_root() , LOGGER_DEBUG );
$ret['success'] = true;
$ret['site'] = array();
diff --git a/view/tpl/admin_hubloc.tpl b/view/tpl/admin_hubloc.tpl
index ea840e1b3..06a8cdf6a 100755
--- a/view/tpl/admin_hubloc.tpl
+++ b/view/tpl/admin_hubloc.tpl
@@ -15,6 +15,7 @@
<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='hidden' name='url' value='{{$hub.hubloc_host}}'>
<input type="submit" name="check" value="check" >
<input type="submit" name="repair" value="repair" ></td>
</form>
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 7a857fd67..187c3039d 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -10,8 +10,7 @@
</li>
{{/foreach}}
<li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li>
- <li><a href="profiles/new" id="profile-listing-new-link">{{$profile.menu.cr_new}}</a></li>
-
+ {{if $profile.menu.cr_new}}<li><a href="profiles/new" id="profile-listing-new-link">{{$profile.menu.cr_new}}</a></li>{{/if}}
</ul>
</div>
{{/if}}