namespace Friendica\Model;
-use dba;
use Friendica\BaseObject;
use Friendica\Content\Text\BBCode;
use Friendica\Core\Addon;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Core\System;
-use Friendica\Database\DBM;
-use Friendica\Model\Item;
+use Friendica\Database\DBA;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Map;
public static function getHTML(array $event, $simple = false)
{
- if (!is_array($event) || !!count($event)) {
+ if (empty($event)) {
return '';
}
$bd_format = L10n::t('l F d, Y \@ g:i A'); // Friday January 18, 2011 @ 8 AM.
$event_start = day_translate(
- $event['adjust'] ?
+ !empty($event['adjust']) ?
DateTimeFormat::local($event['start'], $bd_format) : DateTimeFormat::utc($event['start'], $bd_format)
);
- $event_end = day_translate(
- $event['adjust'] ?
- DateTimeFormat::local($event['finish'], $bd_format) : DateTimeFormat::utc($event['finish'], $bd_format)
- );
+ if (!empty($event['finish'])) {
+ $event_end = day_translate(
+ !empty($event['adjust']) ?
+ DateTimeFormat::local($event['finish'], $bd_format) : DateTimeFormat::utc($event['finish'], $bd_format)
+ );
+ } else {
+ $event_end = '';
+ }
if ($simple) {
- $o = "<h3>" . BBCode::convert($event['summary'], false, $simple) . "</h3>";
+ if (!empty($event['summary'])) {
+ $o = "<h3>" . BBCode::convert($event['summary'], false, $simple) . "</h3>";
+ }
- $o .= "<div>" . BBCode::convert($event['desc'], false, $simple) . "</div>";
+ if (!empty($event['desc'])) {
+ $o .= "<div>" . BBCode::convert($event['desc'], false, $simple) . "</div>";
+ }
$o .= "<h4>" . L10n::t('Starts:') . "</h4><p>" . $event_start . "</p>";
$o .= '<div class="summary event-summary">' . BBCode::convert($event['summary'], false, $simple) . '</div>' . "\r\n";
$o .= '<div class="event-start"><span class="event-label">' . L10n::t('Starts:') . '</span> <span class="dtstart" title="'
- . DateTimeFormat::utc($event['start'], (($event['adjust']) ? DateTimeFormat::ATOM : 'Y-m-d\TH:i:s'))
+ . DateTimeFormat::utc($event['start'], (!empty($event['adjust']) ? DateTimeFormat::ATOM : 'Y-m-d\TH:i:s'))
. '" >' . $event_start
. '</span></div>' . "\r\n";
if (!$event['nofinish']) {
$o .= '<div class="event-end" ><span class="event-label">' . L10n::t('Finishes:') . '</span> <span class="dtend" title="'
- . DateTimeFormat::utc($event['finish'], (($event['adjust']) ? DateTimeFormat::ATOM : 'Y-m-d\TH:i:s'))
+ . DateTimeFormat::utc($event['finish'], (!empty($event['adjust']) ? DateTimeFormat::ATOM : 'Y-m-d\TH:i:s'))
. '" >' . $event_end
. '</span></div>' . "\r\n";
}
- $o .= '<div class="description event-description">' . BBCode::convert($event['desc'], false, $simple) . '</div>' . "\r\n";
+ if (!empty($event['desc'])) {
+ $o .= '<div class="description event-description">' . BBCode::convert($event['desc'], false, $simple) . '</div>' . "\r\n";
+ }
- if (strlen($event['location'])) {
+ if (!empty($event['location'])) {
$o .= '<div class="event-location"><span class="event-label">' . L10n::t('Location:') . '</span> <span class="location">'
. BBCode::convert($event['location'], false, $simple)
. '</span></div>' . "\r\n";
* @param array $event Array which contains the event data.
* @return string The event as a bbcode formatted string.
*/
- public static function getBBCode(array $event)
+ private static function getBBCode(array $event)
{
$o = '';
return;
}
- dba::delete('event', ['id' => $event_id]);
+ DBA::delete('event', ['id' => $event_id]);
logger("Deleted event ".$event_id, LOGGER_DEBUG);
}
*
* Store the event in the event table and create an event item in the item table.
*
- * @param array $event Array with event data.
- * @return int The event id.
+ * @param array $arr Array with event data.
+ * @return int The new event id.
*/
public static function store($arr)
{
$a = self::getApp();
- $event['uri'] = defaults($arr, 'uri' , item_new_uri($a->get_hostname(), $event['uid']));
+ $event = [];
$event['id'] = intval(defaults($arr, 'id' , 0));
$event['uid'] = intval(defaults($arr, 'uid' , 0));
$event['cid'] = intval(defaults($arr, 'cid' , 0));
+ $event['uri'] = defaults($arr, 'uri' , Item::newURI($event['uid']));
$event['type'] = defaults($arr, 'type' , 'event');
$event['summary'] = defaults($arr, 'summary' , '');
$event['desc'] = defaults($arr, 'desc' , '');
$event['allow_gid'] = defaults($arr, 'allow_gid', '');
$event['deny_cid'] = defaults($arr, 'deny_cid' , '');
$event['deny_gid'] = defaults($arr, 'deny_gid' , '');
- $event['private'] = intval(defaults($arr, 'private' , 0));
$event['adjust'] = intval(defaults($arr, 'adjust' , 0));
$event['nofinish'] = intval(defaults($arr, 'nofinish' , !empty($event['start']) && empty($event['finish'])));
if ($event['finish'] < NULL_DATE) {
$event['finish'] = NULL_DATE;
}
+ $private = intval(defaults($arr, 'private', 0));
- $condition = ['uid' => $event['uid']];
+ $conditions = ['uid' => $event['uid']];
if ($event['cid']) {
- $condition['id'] = $event['cid'];
+ $conditions['id'] = $event['cid'];
+ } else {
+ $conditions['self'] = true;
}
- $contact = dba::selectFirst('contact', [], ['id' => $event['cid'], 'uid' => $event['uid']]);
+ $contact = DBA::selectFirst('contact', [], $conditions);
// Existing event being modified.
if ($event['id']) {
// has the event actually changed?
- $existing_event = dba::selectFirst('event', ['edited'], ['id' => $event['id'], 'uid' => $event['uid']]);
- if ((! DBM::is_result($existing_event)) || ($existing_event['edited'] === $event['edited'])) {
+ $existing_event = DBA::selectFirst('event', ['edited'], ['id' => $event['id'], 'uid' => $event['uid']]);
+ if (!DBA::isResult($existing_event) || ($existing_event['edited'] === $event['edited'])) {
- $item = dba::selectFirst('item', [], ['event-id' => $event['id'], 'uid' => $event['uid']]);
+ $item = Item::selectFirst(['id'], ['event-id' => $event['id'], 'uid' => $event['uid']]);
- return DBM::is_result($item) ? $item['id'] : 0;
+ return DBA::isResult($item) ? $item['id'] : 0;
}
$updated_fields = [
'nofinish' => $event['nofinish'],
];
- dba::update('event', $updated_fields, ['id' => $event['cid'], 'uid' => $event['uid']]);
+ DBA::update('event', $updated_fields, ['id' => $event['id'], 'uid' => $event['uid']]);
- $item = dba::selectFirst('item', ['id'], ['event-id' => $event['id'], 'uid' => $event['uid']]);
- if (DBM::is_result($item)) {
+ $item = Item::selectFirst(['id'], ['event-id' => $event['id'], 'uid' => $event['uid']]);
+ if (DBA::isResult($item)) {
$object = '<object><type>' . xmlify(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . xmlify($event['uri']) . '</id>';
- $object .= '<content>' . xmlify(format_event_bbcode($event)) . '</content>';
+ $object .= '<content>' . xmlify(self::getBBCode($event)) . '</content>';
$object .= '</object>' . "\n";
- $fields = ['body' => format_event_bbcode($event), 'object' => $object, 'edited' => $event['edited']];
+ $fields = ['body' => self::getBBCode($event), 'object' => $object, 'edited' => $event['edited']];
Item::update($fields, ['id' => $item['id']]);
$item_id = $item['id'];
Addon::callHooks('event_updated', $event['id']);
} else {
- $event['guid'] = get_guid(32);
+ $event['guid'] = defaults($arr, 'guid', System::createGUID(32));
// New event. Store it.
- dba::insert('event', $event);
+ DBA::insert('event', $event);
- $event['id'] = dba::lastInsertId();
+ $event['id'] = DBA::lastInsertId();
$item_arr = [];
$item_arr['uri'] = $event['uri'];
$item_arr['parent-uri'] = $event['uri'];
$item_arr['guid'] = $event['guid'];
- $item_arr['type'] = 'activity';
+ $item_arr['plink'] = defaults($arr, 'plink', '');
+ $item_arr['post-type'] = Item::PT_EVENT;
$item_arr['wall'] = $event['cid'] ? 0 : 1;
$item_arr['contact-id'] = $contact['id'];
$item_arr['owner-name'] = $contact['name'];
$item_arr['allow_gid'] = $event['allow_gid'];
$item_arr['deny_cid'] = $event['deny_cid'];
$item_arr['deny_gid'] = $event['deny_gid'];
- $item_arr['private'] = $event['private'];
+ $item_arr['private'] = $private;
$item_arr['visible'] = 1;
$item_arr['verb'] = ACTIVITY_POST;
$item_arr['object-type'] = ACTIVITY_OBJ_EVENT;
$item_arr['origin'] = $event['cid'] === 0 ? 1 : 0;
- $item_arr['body'] = format_event_bbcode($event);
+ $item_arr['body'] = self::getBBCode($event);
$item_arr['event-id'] = $event['id'];
$item_arr['object'] = '<object><type>' . xmlify(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . xmlify($event['uri']) . '</id>';
- $item_arr['object'] .= '<content>' . xmlify(format_event_bbcode($event)) . '</content>';
+ $item_arr['object'] .= '<content>' . xmlify(self::getBBCode($event)) . '</content>';
$item_arr['object'] .= '</object>' . "\n";
$item_id = Item::insert($item_arr);
*
* @todo We should replace this with a separate update function if there is some time left.
*/
- public static function removeDuplicates(array $dates)
+ private static function removeDuplicates(array $dates)
{
$dates2 = [];
}
// Query for the event by event id
- $r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`,
- `item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event`
+ $r = q("SELECT `event`.*, `item`.`id` AS `itemid` FROM `event`
LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid`
WHERE `event`.`uid` = %d AND `event`.`id` = %d $sql_extra",
intval($owner_uid),
intval($event_id)
);
- if (DBM::is_result($r)) {
- $return = event_remove_duplicates($r);
+ if (DBA::isResult($r)) {
+ $return = self::removeDuplicates($r);
}
return $return;
}
// Query for the event by date.
- $r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`,
- `item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event`
+ // @todo Slow query (518 seconds to run), to be optimzed
+ $r = q("SELECT `event`.*, `item`.`id` AS `itemid` FROM `event`
LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid`
WHERE `event`.`uid` = %d AND event.ignore = %d
AND ((`adjust` = 0 AND (`finish` >= '%s' OR (nofinish AND start >= '%s')) AND `start` <= '%s')
$sql_extra ",
intval($owner_uid),
intval($event_params["ignore"]),
- dbesc($event_params["start"]),
- dbesc($event_params["start"]),
- dbesc($event_params["finish"]),
- dbesc($event_params["adjust_start"]),
- dbesc($event_params["adjust_start"]),
- dbesc($event_params["adjust_finish"])
+ DBA::escape($event_params["start"]),
+ DBA::escape($event_params["start"]),
+ DBA::escape($event_params["finish"]),
+ DBA::escape($event_params["adjust_start"]),
+ DBA::escape($event_params["adjust_start"]),
+ DBA::escape($event_params["adjust_finish"])
);
- if (DBM::is_result($r)) {
- $return = event_remove_duplicates($r);
+ if (DBA::isResult($r)) {
+ $return = self::removeDuplicates($r);
}
return $return;
$last_date = '';
$fmt = L10n::t('l, F j');
foreach ($event_result as $event) {
+ $item = Item::selectFirst(['plink', 'author-name', 'author-avatar', 'author-link'], ['id' => $event['itemid']]);
+ if (DBA::isResult($item)) {
+ $event = array_merge($event, $item);
+ }
+
$start = $event['adjust'] ? DateTimeFormat::local($event['start'], 'c') : DateTimeFormat::utc($event['start'], 'c');
$j = $event['adjust'] ? DateTimeFormat::local($event['start'], 'j') : DateTimeFormat::utc($event['start'], 'j');
$day = $event['adjust'] ? DateTimeFormat::local($event['start'], $fmt) : DateTimeFormat::utc($event['start'], $fmt);
$title = strip_tags(html_entity_decode($title, ENT_QUOTES, 'UTF-8'));
}
- $html = format_event_html($event);
+ $html = self::getHTML($event);
$event['desc'] = BBCode::convert($event['desc']);
$event['location'] = BBCode::convert($event['location']);
$event_list[] = [
*
* @todo Implement timezone support
*/
- public static function formatListForExport(array $events, $format, $timezone)
+ private static function formatListForExport(array $events, $format, $timezone)
{
if (!count($events)) {
return '';
*
* @return array Query results.
*/
- public static function getListByUserId($uid = 0)
+ private static function getListByUserId($uid = 0)
{
$return = [];
$conditions += ['allow_cid' => '', 'allow_gid' => ''];
}
- $events = dba::select('event', $fields, $conditions);
- if (DBM::is_result($events)) {
- $return = $events;
+ $events = DBA::select('event', $fields, $conditions);
+ if (DBA::isResult($events)) {
+ $return = DBA::toArray($events);
}
return $return;
{
$process = false;
- $user = dba::selectFirst('user', ['timezone'], ['uid' => $uid]);
- if (DBM::is_result($user)) {
+ $user = DBA::selectFirst('user', ['timezone'], ['uid' => $uid]);
+ if (DBA::isResult($user)) {
$timezone = $user['timezone'];
}
// Get all events which are owned by a uid (respects permissions).
- $events = events_by_uid($uid);
+ $events = self::getListByUserId($uid);
// We have the events that are available for the requestor.
// Now format the output according to the requested format.
- $res = event_format_export($events, $format, $timezone);
+ $res = self::formatListForExport($events, $format, $timezone);
// If there are results the precess was successfull.
if (!empty($res)) {
/**
* @brief Format an item array with event data to HTML.
*
- * @param arr $item Array with item and event data.
+ * @param array $item Array with item and event data.
* @return string HTML output.
*/
- public static function getItemHTML($item) {
+ public static function getItemHTML(array $item) {
$same_date = false;
$finish = false;
if (substr($dtstart_title, 0, 10) === substr($dtend_title, 0, 10)) {
$same_date = true;
}
+ } else {
+ $dtend_title = '';
+ $dtend_dt = '';
+ $end_time = '';
+ $end_short = '';
}
// Format the event location.
- $location = event_location2array($item['event-location']);
+ $location = self::locationToArray($item['event-location']);
// Construct the profile link (magic-auth).
- $sp = false;
- $profile_link = best_link_url($item, $sp);
-
- if (!$sp) {
- $profile_link = Profile::zrl($profile_link);
- }
+ $profile_link = Contact::magicLinkById($item['author-id']);
$tpl = get_markup_template('event_stream_item.tpl');
$return = replace_macros($tpl, [
* 'address' => The address of the location,<br>
* 'coordinates' => Latitude and longitude (e.g. '48.864716,2.349014').<br>
*/
- public static function locationToArray($s = '') {
+ private static function locationToArray($s = '') {
if ($s == '') {
return [];
}
projects / friendica.git / blobdiff