diff options
| -rw-r--r-- | include/zot.php | 50 | ||||
| -rw-r--r-- | mod/ping.php | 11 | ||||
| -rw-r--r-- | version.inc | 2 |
3 files changed, 62 insertions, 1 deletions
diff --git a/include/zot.php b/include/zot.php new file mode 100644 index 000000000..f49af08ad --- /dev/null +++ b/include/zot.php @@ -0,0 +1,50 @@ +<?php + +/** + * + * @function zot_new_uid($entity_id) + * @entity_id = integer id of controlling entity + * @returns string + * + */ + +function zot_new_uid($entity_id) { + $rawstr = z_root() . '/' . $entity_id . '.' . mt_rand(); + return(base64url_encode(hash('whirlpool',$rawstr,true),true)); +} + + +/** + * + * Given an array of zot_uid(s), return all distinct hubs + * If primary is true, return only primary hubs + * Result is ordered by url to assist in batching. + * + */ + +function zot_get_hubloc($arr,$primary) { + + $tmp = ''; + + if(is_array($arr)) { + foreach($arr as $e) { + if(strlen($tmp)) + $tmp .= ','; + $tmp .= "'" . dbesc($e) . "'" ; + } + } + + if(! strlen($tmp)) + return array(); + + $sql_extra = (($primary) ? " and hubloc_primary = 1 " : "" ); + return q("select * from hubloc where hubloc_zuid in ( $tmp ) $sql_extra order by hubloc_url"); + +} + +// Given an item and an identity, sign the data. + +function zot_sign(&$item,$identity) { + $item['signed'] = str_replace(array(" ","\t","\n","\r"),array('','','',''),base64url_encode($item['body'],true)); + $item['signature'] = base64url_encode(rsa_sign($item['signed'],$identity['prvkey'])); +}
\ No newline at end of file diff --git a/mod/ping.php b/mod/ping.php index 05bfe7842..99ff48aa7 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -14,6 +14,7 @@ function ping_init(&$a) { $result['intros'] = 0; $result['mail'] = 0; $result['register'] = 0; + $result['events'] = 0; $result['notice'] = array(); $result['info'] = array(); @@ -154,6 +155,16 @@ function ping_init(&$a) { $t5 = dba_timer(); + $events = q("SELECT count(`event`.`id`) as total FROM `event` + WHERE `event`.`uid` = %d AND `start` < '%s' AND `finish` > '%s' + ORDER BY `start` ASC ", + intval(local_user()), + dbesc(datetime_convert('UTC','UTC','now + 1 days')), + dbesc(datetime_convert('UTC','UTC','now')) + ); + + if($events) + $result['events'] = intval($events[0]['total']); $x = json_encode($result); diff --git a/version.inc b/version.inc index f203edae8..47c00d85a 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2012-07-27.28 +2012-07-28.29 |