harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

birthdays and events are now notifications

Browse Source
This commit is contained in:
friendica 2012-07-29 18:29:27 -07:00
parent eae7522bc9
commit 4824e5b8b8
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/conversation.php
View File

@ -1210,6 +1210,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
'$bang' => $x['bang'], '$bang' => $x['bang'],
'$profile_uid' => $x['profile_uid'], '$profile_uid' => $x['profile_uid'],
'$preview' => t('Preview'), '$preview' => t('Preview'),
'$mobileapp' => t('Friendica mobile web'),
)); ));

6
include/zot.php
View File

@ -48,3 +48,9 @@ function zot_sign(&$item,$identity) {
$item['signed'] = str_replace(array(" ","\t","\n","\r"),array('','','',''),base64url_encode($item['body'],true)); $item['signed'] = str_replace(array(" ","\t","\n","\r"),array('','','',''),base64url_encode($item['body'],true));
$item['signature'] = base64url_encode(rsa_sign($item['signed'],$identity['prvkey'])); $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']);
}

1
mod/editpost.php
View File

@ -124,6 +124,7 @@ function editpost_content(&$a) {
'$profile_uid' => $_SESSION['uid'], '$profile_uid' => $_SESSION['uid'],
'$preview' => t('Preview'), '$preview' => t('Preview'),
'$jotplugins' => $jotplugins, '$jotplugins' => $jotplugins,
'$mobileapp' => t('Friendica mobile web'),
)); ));
return $o; return $o;

4
mod/network.php
View File

@ -459,10 +459,6 @@ function network_content(&$a, $update = 0, $load = false) {
} }
} }
if((! $group) && (! $cid) && (! $update)) {
$o .= get_birthdays();
$o .= get_events();
}
if(! $update) { if(! $update) {
// The special div is needed for liveUpdate to kick in for this page. // The special div is needed for liveUpdate to kick in for this page.

4
mod/profile.php
View File

@ -289,10 +289,6 @@ function profile_content(&$a, $update = 0) {
$items = array(); $items = array();
} }
if($is_owner && ! $update) {
$o .= get_birthdays();
$o .= get_events();
}
if((! $update) && ($tab === 'posts')) { if((! $update) && ($tab === 'posts')) {

2
version.inc
View File

@ -1 +1 @@
2012-07-28.29 2012-07-29.30