add event titles to discovered birthday events

diff --git a/include/datetime.php b/include/datetime.php
index 58a6186108472adc123e1445fa3f2aea69366f70..e3e9b9dbf6dd8ab286008ca55a66070925f61c27 100644 (file)
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -447,11 +447,13 @@ function update_contact_birthdays() {
                         *
                         */
                         
-                       $bdtext = t('Birthday:') . ' [url=' . $rr['url'] . ']' . $rr['name'] . '[/url]' ;
+                       $bdtext = sprintf( t('%s\'s birthday'), $rr['name']);
+                       $bdtext2 = sprintf( t('Happy Birthday %s'), ' [url=' . $rr['url'] . ']' . $rr['name'] . '[/url]' ;
 
 
-                       $r = q("INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`desc`,`type`,`adjust`)
-                               VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%d' ) ",
+
+                       $r = q("INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`,`adjust`)
+                               VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%d' ) ",
                                intval($rr['uid']),
                                intval($rr['id']),
                                dbesc(datetime_convert()),
@@ -459,6 +461,7 @@ function update_contact_birthdays() {
                                dbesc(datetime_convert('UTC','UTC', $nextbd)),
                                dbesc(datetime_convert('UTC','UTC', $nextbd . ' + 1 day ')),
                                dbesc($bdtext),
+                               dbesc($bdtext2),
                                dbesc('birthday'),
                                intval(0)
                        );

diff --git a/include/items.php b/include/items.php
index e19d729ba5abb18fa3d6d22b7dd0f41ce945b1fc..a4faf3adc3ba21fccf72d68da75922f714a646e0 100755 (executable)
--- a/include/items.php
+++ b/include/items.php
@@ -1457,11 +1457,12 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
                         *
                         */
                         
-                       $bdtext = t('Birthday:') . ' [url=' . $contact['url'] . ']' . $contact['name'] . '[/url]' ;
+                       $bdtext = sprintf( t('%s\'s birthday'), $contact['name']);
+                       $bdtext2 = sprintf( t('Happy Birthday %s'), ' [url=' . $contact['url'] . ']' . $contact['name'] . '[/url]' ;
 
 
-                       $r = q("INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`desc`,`type`)
-                               VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s' ) ",
+                       $r = q("INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`)
+                               VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ",
                                intval($contact['uid']),
                                intval($contact['id']),
                                dbesc(datetime_convert()),
@@ -1469,6 +1470,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
                                dbesc(datetime_convert('UTC','UTC', $birthday)),
                                dbesc(datetime_convert('UTC','UTC', $birthday . ' + 1 day ')),
                                dbesc($bdtext),
+                               dbesc($bdtext2),
                                dbesc('birthday')
                        );