diff options
| author | fabrixxm <fabrix.xm@gmail.com> | 2011-02-08 18:13:41 +0100 |
|---|---|---|
| committer | fabrixxm <fabrix.xm@gmail.com> | 2011-02-08 18:13:41 +0100 |
| commit | 26dfb73f48d4fcd4671d136e53f52bb81995ea34 (patch) | |
| tree | 36902abc509c4dbf6abc27fb5ba7997ee921f437 /include/notifier.php | |
| parent | 97b608db38edac6e4989c7343e9de8f32f46f263 (diff) | |
| parent | 9a1e5aaf09c1b940f4615f7dc2999e16b019ab18 (diff) | |
| download | volse-hubzilla-26dfb73f48d4fcd4671d136e53f52bb81995ea34.tar.gz volse-hubzilla-26dfb73f48d4fcd4671d136e53f52bb81995ea34.tar.bz2 volse-hubzilla-26dfb73f48d4fcd4671d136e53f52bb81995ea34.zip | |
Merge branch 'friendika-master'
Diffstat (limited to 'include/notifier.php')
| -rw-r--r-- | include/notifier.php | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/include/notifier.php b/include/notifier.php index 07bde7c4d..b6c4ca571 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -87,7 +87,7 @@ function notifier_run($argv, $argc){ } } - $r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, `user`.`page-flags` + $r = q("SELECT `contact`.*, `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, `user`.`page-flags` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1", intval($uid) @@ -179,20 +179,14 @@ function notifier_run($argv, $argc){ $mail_template = load_view_file('view/atom_mail.tpl'); $atom = ''; - $hubxml = ''; $slaps = array(); - if(strlen($hub)) { - $hubs = explode(',', $hub); - if(count($hubs)) { - foreach($hubs as $h) { - $h = trim($h); - if(! strlen($h)) - continue; - $hubxml .= '<link rel="hub" href="' . xmlify($h) . '" />' . "\n" ; - } - } - } + $hubxml = feed_hublinks(); + + $birthday = feed_birthday($owner['uid'],$owner['timezone']); + + if(strlen($birthday)) + $birthday = '<dfrn:birthday>' . xmlify($birthday) . '</dfrn:birthday>'; $atom .= replace_macros($feed_template, array( '$version' => xmlify(FRIENDIKA_VERSION), @@ -208,7 +202,7 @@ function notifier_run($argv, $argc){ '$picdate' => xmlify(datetime_convert('UTC','UTC',$owner['avatar-date'] . '+00:00' , ATOM_TIME)) , '$uridate' => xmlify(datetime_convert('UTC','UTC',$owner['uri-date'] . '+00:00' , ATOM_TIME)) , '$namdate' => xmlify(datetime_convert('UTC','UTC',$owner['name-date'] . '+00:00' , ATOM_TIME)) , - '$birthday' => '' + '$birthday' => $birthday )); if($cmd === 'mail') { @@ -394,7 +388,7 @@ function notifier_run($argv, $argc){ * */ - $max_allowed = ((get_config('system','maxpubdeliver') === false) ? 150 : intval(get_config('system','maxdeliver'))); + $max_allowed = ((get_config('system','maxpubdeliver') === false) ? 150 : intval(get_config('system','maxpubdeliver'))); /** * |