From d5fdd4287dec00adcb08e389385b1ecbc23cca6a Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 13 Jun 2011 19:06:49 -0700 Subject: event sharing, cont. --- mod/dfrn_notify.php | 20 ++++++++ mod/events.php | 130 ++++++++++------------------------------------------ mod/pubsub.php | 8 ++-- 3 files changed, 48 insertions(+), 110 deletions(-) (limited to 'mod') diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index 12e7ff7ce..949d9f9ab 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -2,6 +2,9 @@ require_once('simplepie/simplepie.inc'); require_once('include/items.php'); +require_once('include/event.php'); + + function dfrn_notify_post(&$a) { $dfrn_id = ((x($_POST,'dfrn_id')) ? notags(trim($_POST['dfrn_id'])) : ''); @@ -591,6 +594,23 @@ function dfrn_notify_post(&$a) { $item_id = $item->get_id(); $datarray = get_atom_elements($feed,$item); + if((x($datarray,'object-type')) && ($datarray['object-type'] === ACTIVITY_OBJ_EVENT)) { + $ev = bbtoevent($datarray['body']); + if(x($ev,'desc') && x($ev,'start')) { + $ev['cid'] = $importer['id']; + $ev['uid'] = $importer['uid']; + + $r = q("SELECT * FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", + dbesc($item_id), + intval($importer['uid']) + ); + if(count($r)) + $ev['id'] = $r[0]['id']; + $xyz = event_store($ev); + continue; + } + } + $r = q("SELECT `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($item_id), intval($importer['importer_uid']) diff --git a/mod/events.php b/mod/events.php index bdc4b8d87..a4809607c 100644 --- a/mod/events.php +++ b/mod/events.php @@ -67,113 +67,28 @@ function events_post(&$a) { $str_group_allow = $str_contact_deny = $str_group_deny = ''; } - if($event_id) { - $r = q("UPDATE `event` SET - `edited` = '%s', - `start` = '%s', - `finish` = '%s', - `desc` = '%s', - `location` = '%s', - `type` = '%s', - `adjust` = %d, - `nofinish` = %d, - `allow_cid` = '%s', - `allow_gid` = '%s', - `deny_cid` = '%s', - `deny_gid` = '%s' - WHERE `id` = %d AND `uid` = %d LIMIT 1", - - dbesc(datetime_convert()), - dbesc($start), - dbesc($finish), - dbesc($desc), - dbesc($location), - dbesc($type), - intval($adjust), - intval($nofinish), - dbesc($str_contact_allow), - dbesc($str_group_allow), - dbesc($str_contact_deny), - dbesc($str_group_deny), - intval($event_id), - intval($local_user()) - ); - - } - else { - $uri = item_new_uri($a->get_hostname(),local_user()); + $datarray = array(); + $datarray['start'] = $start; + $datarray['finish'] = $finish; + $datarray['desc'] = $desc; + $datarray['location'] = $location; + $datarray['type'] = $type; + $datarray['adjust'] = $adjust; + $datarray['nofinish'] = $nofinish; + $datarray['uid'] = $uid; + $datarray['cid'] = 0; + $datarray['allow_cid'] = $str_contact_allow; + $datarray['allow_gid'] = $str_group_allow; + $datarray['deny_cid'] = $str_contact_deny; + $datarray['deny_gid'] = $str_group_deny; + $datarray['id'] = $event_id; + $datarray['created'] = $created; + $datarray['edited'] = $edited; + + $item_id = event_store($datarray); + proc_run('php',"include/notifier.php","event","$item_id"); - $r = q("INSERT INTO `event` ( `uid`,`uri`,`created`,`edited`,`start`,`finish`,`desc`,`location`,`type`, - `adjust`,`nofinish`,`allow_cid`,`allow_gid`,`deny_cid`,`deny_gid`) - VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', '%s', '%s' ) ", - intval(local_user()), - dbesc($uri), - dbesc(datetime_convert()), - dbesc(datetime_convert()), - dbesc($start), - dbesc($finish), - dbesc($desc), - dbesc($location), - dbesc($type), - intval($adjust), - intval($nofinish), - dbesc($str_contact_allow), - dbesc($str_group_allow), - dbesc($str_contact_deny), - dbesc($str_group_deny) - - ); - - $r = q("SELECT * FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", - dbesc($uri), - intval(local_user()) - ); - if(count($r)) - $event = $r[0]; - - $arr = array(); - - $arr['uid'] = local_user(); - $arr['uri'] = $uri; - $arr['parent-uri'] = $uri; - $arr['type'] = 'activity'; - $arr['wall'] = 1; - $arr['contact-id'] = $a->contact['id']; - $arr['owner-name'] = $a->contact['name']; - $arr['owner-link'] = $a->contact['url']; - $arr['owner-avatar'] = $a->contact['thumb']; - $arr['author-name'] = $a->contact['name']; - $arr['author-link'] = $a->contact['url']; - $arr['author-avatar'] = $a->contact['thumb']; - $arr['title'] = ''; - $arr['allow_cid'] = $str_contact_allow; - $arr['allow_gid'] = $str_group_allow; - $arr['deny_cid'] = $str_contact_deny; - $arr['deny_gid'] = $str_group_deny; - $arr['last-child'] = 1; - $arr['visible'] = 1; - $arr['verb'] = ACTIVITY_POST; - $arr['object-type'] = ACTIVITY_OBJ_EVENT; - - $arr['body'] = format_event_bbcode($event); - - - $arr['object'] = '' . xmlify(ACTIVITY_OBJ_EVENT) . '' . xmlify($uri) . ''; - $arr['object'] .= '' . xmlify(format_event_bbcode($event)) . ''; - $arr['object'] .= '' . "\n"; - - $item_id = item_store($arr); - if($item_id) { - q("UPDATE `item` SET `plink` = '%s', `event-id` = %d WHERE `uid` = %d AND `id` = %d LIMIT 1", - dbesc($a->get_baseurl() . '/display/' . $owner_record['nickname'] . '/' . $item_id), - intval($event['id']), - intval(local_user()), - intval($item_id) - ); - proc_run('php',"include/notifier.php","tag","$item_id"); - } - } } @@ -245,7 +160,8 @@ function events_content(&$a) { $adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish); - $r = q("SELECT * FROM `event` WHERE `uid` = %d + $r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink` FROM `event` LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` + WHERE `event`.`uid` = %d AND (( `adjust` = 0 AND `start` >= '%s' AND `finish` <= '%s' ) OR ( `adjust` = 1 AND `start` >= '%s' AND `finish` <= '%s' )) ", intval(local_user()), @@ -269,6 +185,8 @@ function events_content(&$a) { $o .= '
' . $d . '
'; $last_date = $d; $o .= format_event_html($rr); + if($rr['plink']) + $o .= get_plink($rr) . '
'; } } return $o; diff --git a/mod/pubsub.php b/mod/pubsub.php index f829eb4d9..edb0a7fe1 100644 --- a/mod/pubsub.php +++ b/mod/pubsub.php @@ -91,10 +91,10 @@ function pubsub_post(&$a) { logger('pubsub: user-agent: ' . $_SERVER['HTTP_USER_AGENT'] ); logger('pubsub: data: ' . $xml, LOGGER_DATA); - if(! stristr($xml,'argc > 1) ? notags(trim($a->argv[1])) : ''); $contact_id = (($a->argc > 2) ? intval($a->argv[2]) : 0 ); -- cgit v1.2.3 From fb92dbf5d683c3d92a76216c09d23e338c7d3341 Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 13 Jun 2011 20:32:30 -0700 Subject: link events + personal notes to profile tabs --- mod/apps.php | 14 ++------------ mod/events.php | 17 ++++++++++++++++- mod/notes.php | 2 +- mod/profile.php | 4 +++- 4 files changed, 22 insertions(+), 15 deletions(-) (limited to 'mod') diff --git a/mod/apps.php b/mod/apps.php index f25722df7..7a0a3f59e 100644 --- a/mod/apps.php +++ b/mod/apps.php @@ -5,19 +5,9 @@ function apps_content(&$a) { $o .= '

' . t('Applications') . '

'; - $apps = false; - - if(local_user()) { - $apps = true; - $o .= '
' . t('Private Notes') . '
'; - } - - if($a->apps) { - $apps = true; + if($a->apps) $o .= $a->apps; - } - - if(! $apps) + else notice( t('No installed applications.') . EOL); return $o; diff --git a/mod/events.php b/mod/events.php index a4809607c..1418a7549 100644 --- a/mod/events.php +++ b/mod/events.php @@ -130,6 +130,14 @@ function events_content(&$a) { if(! $m) $m = intval($thismonth); + // Put some limits on dates. The PHP date functions don't seem to do so well before 1900. + // An upper limit was chosen to keep search engines from exploring links endlessly. + + if($y < 1901) + $y = 1900; + if($y > 2099) + $y = 2100; + $nextyear = $y; $nextmonth = $m + 1; if($nextmonth > 12) { @@ -144,11 +152,18 @@ function events_content(&$a) { $prevmonth = 12; $prevyear --; } + $o .= ''; - $o .= '' . t('<< Previous') . ' | ' . t('Next >>') . ''; + $o .= '
'; + + $o .= ''; $o .= cal($y,$m,false, ' eventcal'); + $o .= ''; + $o .= '
'; + $o .= '
'; + $dim = get_dim($y,$m); $start = sprintf('%d-%d-%d %d:%d:%d',$y,$m,1,0,0,0); $finish = sprintf('%d-%d-%d %d:%d:%d',$y,$m,$dim,23,59,59); diff --git a/mod/notes.php b/mod/notes.php index 7a826bf61..0f980ff67 100644 --- a/mod/notes.php +++ b/mod/notes.php @@ -38,7 +38,7 @@ function notes_content(&$a) { $is_owner = true; - $o .= '

' . t('Private Notes') . '

'; + $o .= '

' . t('Personal Notes') . '

'; $commpage = false; $commvisitor = false; diff --git a/mod/profile.php b/mod/profile.php index 7dfdb49de..aeb21f077 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -115,7 +115,9 @@ function profile_content(&$a, $update = 0) { '$phototab' => $a->get_baseurl() . '/photos/' . $a->profile['nickname'], '$status' => t('Status'), '$profile' => t('Profile'), - '$photos' => t('Photos') + '$photos' => t('Photos'), + '$events' => (($is_owner) ? '' . t('Events') . '' : ''), + '$notes' => (($is_owner) ? '' . t('Personal Notes') . '' : '') )); -- cgit v1.2.3 From 05eb9ceaba9f87776b61a51a49a967cc578ef58a Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 13 Jun 2011 20:42:37 -0700 Subject: avoid returning events from getting posted again --- mod/dfrn_notify.php | 1 + 1 file changed, 1 insertion(+) (limited to 'mod') diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index 949d9f9ab..6ca3f9fc2 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -599,6 +599,7 @@ function dfrn_notify_post(&$a) { if(x($ev,'desc') && x($ev,'start')) { $ev['cid'] = $importer['id']; $ev['uid'] = $importer['uid']; + $ev['uri'] = $item_id; $r = q("SELECT * FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($item_id), -- cgit v1.2.3 From 4469f92ea30c7af23b28daf244f827621928d19e Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 13 Jun 2011 21:43:21 -0700 Subject: prev/next icons (instead of text) for photos --- mod/photos.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mod') diff --git a/mod/photos.php b/mod/photos.php index 18fff703e..717800364 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1041,7 +1041,7 @@ function photos_content(&$a) { } if($prevlink) - $prevlink = array($prevlink, t('<< Prev')) ; + $prevlink = array($prevlink, '') ; $photo = array( 'href' => $a->get_baseurl() . '/photo/' . $hires['resource-id'] . '-' . $hires['scale'] . '.jpg', @@ -1050,7 +1050,7 @@ function photos_content(&$a) { ); if($nextlink) - $nextlink = array($nextlink, t('Next >>')); + $nextlink = array($nextlink, ''); // Do we have an item for this photo? -- cgit v1.2.3