diff options
| author | friendica <info@friendica.com> | 2012-07-29 18:29:27 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-07-29 18:29:27 -0700 |
| commit | 4824e5b8b8d57ba9af8a5a26f78a5dc90eb714d1 (patch) | |
| tree | 217a692747878df4b68a6db0cb163eca9024a2b4 | |
| parent | eae7522bc99cc3af0074c189560a66181d2b70a0 (diff) | |
| download | volse-hubzilla-4824e5b8b8d57ba9af8a5a26f78a5dc90eb714d1.tar.gz volse-hubzilla-4824e5b8b8d57ba9af8a5a26f78a5dc90eb714d1.tar.bz2 volse-hubzilla-4824e5b8b8d57ba9af8a5a26f78a5dc90eb714d1.zip | |
birthdays and events are now notifications
| -rw-r--r-- | include/conversation.php | 1 | ||||
| -rw-r--r-- | include/zot.php | 6 | ||||
| -rw-r--r-- | mod/editpost.php | 1 | ||||
| -rw-r--r-- | mod/network.php | 4 | ||||
| -rw-r--r-- | mod/profile.php | 4 | ||||
| -rw-r--r-- | version.inc | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/include/conversation.php b/include/conversation.php index f0d453cf5..74cf787bd 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1210,6 +1210,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { '$bang' => $x['bang'], '$profile_uid' => $x['profile_uid'], '$preview' => t('Preview'), + '$mobileapp' => t('Friendica mobile web'), )); diff --git a/include/zot.php b/include/zot.php index f49af08ad..82bd8c7f1 100644 --- a/include/zot.php +++ b/include/zot.php @@ -47,4 +47,10 @@ function zot_get_hubloc($arr,$primary) { 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'])); +} + +// Given an item and an identity, verify the signature. + +function zot_verify(&$item,$identity) { + return rsa_verify($item[signed'],base64url_decode($item['signature']),$identity['pubkey']); }
\ No newline at end of file diff --git a/mod/editpost.php b/mod/editpost.php index 4c00201ca..d7b0c39da 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -124,6 +124,7 @@ function editpost_content(&$a) { '$profile_uid' => $_SESSION['uid'], '$preview' => t('Preview'), '$jotplugins' => $jotplugins, + '$mobileapp' => t('Friendica mobile web'), )); return $o; diff --git a/mod/network.php b/mod/network.php index 4ab0c790b..a85e11f90 100644 --- a/mod/network.php +++ b/mod/network.php @@ -459,10 +459,6 @@ function network_content(&$a, $update = 0, $load = false) { } } - if((! $group) && (! $cid) && (! $update)) { - $o .= get_birthdays(); - $o .= get_events(); - } if(! $update) { // The special div is needed for liveUpdate to kick in for this page. diff --git a/mod/profile.php b/mod/profile.php index 78507820f..1b5bfa40c 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -289,10 +289,6 @@ function profile_content(&$a, $update = 0) { $items = array(); } - if($is_owner && ! $update) { - $o .= get_birthdays(); - $o .= get_events(); - } if((! $update) && ($tab === 'posts')) { diff --git a/version.inc b/version.inc index 47c00d85a..12a8adddf 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2012-07-28.29 +2012-07-29.30 |