aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-02-10 20:38:26 -0800
committerfriendica <info@friendica.com>2014-02-10 20:38:26 -0800
commit59094cda5166e58a451cb0372a59d8059cbacd6f (patch)
tree1b1afd97b3aad6732ac57fd94fe2173c21337a02
parent74fb7d158b770906aafab9e85641c5de3d2488cf (diff)
downloadvolse-hubzilla-59094cda5166e58a451cb0372a59d8059cbacd6f.tar.gz
volse-hubzilla-59094cda5166e58a451cb0372a59d8059cbacd6f.tar.bz2
volse-hubzilla-59094cda5166e58a451cb0372a59d8059cbacd6f.zip
reversed args in update_modtime, incorrect ud_guid and ud_hash
-rw-r--r--include/dir_fns.php4
-rw-r--r--include/directory.php2
-rw-r--r--include/poller.php2
-rw-r--r--include/zot.php2
4 files changed, 5 insertions, 5 deletions
diff --git a/include/dir_fns.php b/include/dir_fns.php
index ab8b67985..74e12c078 100644
--- a/include/dir_fns.php
+++ b/include/dir_fns.php
@@ -221,8 +221,8 @@ function syncdirs($uid) {
}
}
- $ud_hash = random_string();
- update_modtime($ud_hash,$hash,$p[0]['channel_address'] . '@' . get_app()->get_hostname(),1);
+ $ud_hash = random_string() . '@' . get_app()->get_hostname();
+ update_modtime($hash,$ud_hash,$p[0]['channel_address'] . '@' . get_app()->get_hostname(),1);
}
diff --git a/include/directory.php b/include/directory.php
index 491240a9d..233899e88 100644
--- a/include/directory.php
+++ b/include/directory.php
@@ -10,7 +10,7 @@ function directory_run($argv, $argc){
cli_startup();
- if($argc != 2)
+ if($argc < 2)
return;
logger('directory update', LOGGER_DEBUG);
diff --git a/include/poller.php b/include/poller.php
index 0dcec4c0f..76c82db09 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -64,7 +64,7 @@ function poller_run($argv, $argc){
$r = q("select channel_id from channel where channel_dirdate < UTC_TIMESTAMP() - INTERVAL 30 DAY");
if($r) {
foreach($r as $rr) {
- proc_run('php','include/directory.php',$rr['channel_id']);
+ proc_run('php','include/directory.php',$rr['channel_id'],'ping');
if($interval)
@time_sleep_until(microtime(true) + (float) $interval);
}
diff --git a/include/zot.php b/include/zot.php
index d35f43161..109744c53 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -518,7 +518,7 @@ function zot_register_hub($arr) {
/**
* @function import_xchan($arr,$ud_flags = 1)
- * Takes an associative array of a fecthed discovery packet and updates
+ * Takes an associative array of a fetched discovery packet and updates
* all internal data structures which need to be updated as a result.
*
* @param array $arr => json_decoded discovery packet