X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fevent.php;h=b8b60a86da7d7f15acf0643539f3a81e75e490ce;hb=4fb2547df87825c136d3ee080bc6960f5c957c65;hp=a0509aa0fee048261f378e18bf0b1a66c0022415;hpb=93e6f5da472b11d5058921b99f7666187521d07d;p=friendica.git
diff --git a/include/event.php b/include/event.php
index a0509aa0fe..b8b60a86da 100644
--- a/include/event.php
+++ b/include/event.php
@@ -5,14 +5,16 @@
*/
use Friendica\App;
+use Friendica\Content\Feature;
use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Database\DBM;
+use Friendica\Model\Profile;
+use Friendica\Util\Map;
require_once 'include/bbcode.php';
-require_once 'include/map.php';
require_once 'include/datetime.php';
-require_once "include/conversation.php";
+require_once 'include/conversation.php';
function format_event_html($ev, $simple = false) {
if (! ((is_array($ev)) && count($ev))) {
@@ -74,7 +76,7 @@ function format_event_html($ev, $simple = false) {
// Include a map of the location if the [map] BBCode is used.
if (strpos($ev['location'], "[map") !== false) {
- $map = generate_named_map($ev['location']);
+ $map = Map::byLocation($ev['location']);
if ($map !== $ev['location']) {
$o.= $map;
}
@@ -87,7 +89,7 @@ function format_event_html($ev, $simple = false) {
/**
* @brief Convert an array with event data to bbcode.
- *
+ *
* @param array $ev Array which conains the event data.
* @return string The event as a bbcode formatted string.
*/
@@ -125,7 +127,7 @@ function format_event_bbcode($ev) {
/**
* @brief Extract bbcode formatted event data from a string
* and convert it to html.
- *
+ *
* @params: string $s The string which should be parsed for event data.
* @return string The html output.
*/
@@ -142,7 +144,7 @@ function bbtovcal($s) {
/**
* @brief Extract bbcode formatted event data from a string.
- *
+ *
* @params: string $s The string which should be parsed for event data.
* @return array The array with the event information.
*/
@@ -205,10 +207,10 @@ function ev_compare($a,$b) {
/**
* @brief Delete an event from the event table.
- *
+ *
* Note: This function does only delete the event from the event table not its
* related entry in the item table.
- *
+ *
* @param int $event_id Event ID.
* @return void
*/
@@ -223,9 +225,9 @@ function event_delete($event_id) {
/**
* @brief Store the event.
- *
+ *
* Store the event in the event table and create an event item in the item table.
- *
+ *
* @param array $arr Array with event data.
* @return int The event id.
*/
@@ -260,13 +262,10 @@ function event_store($arr) {
$contact = $c[0];
}
-
// Existing event being modified.
-
if ($arr['id']) {
// has the event actually changed?
-
$r = q("SELECT * FROM `event` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($arr['id']),
intval($arr['uid'])
@@ -274,7 +273,6 @@ function event_store($arr) {
if ((! DBM::is_result($r)) || ($r[0]['edited'] === $arr['edited'])) {
// Nothing has changed. Grab the item id to return.
-
$r = q("SELECT * FROM `item` WHERE `event-id` = %d AND `uid` = %d LIMIT 1",
intval($arr['id']),
intval($arr['uid'])
@@ -283,8 +281,7 @@ function event_store($arr) {
}
// The event changed. Update it.
-
- $r = q("UPDATE `event` SET
+ q("UPDATE `event` SET
`edited` = '%s',
`start` = '%s',
`finish` = '%s',
@@ -308,6 +305,7 @@ function event_store($arr) {
intval($arr['id']),
intval($arr['uid'])
);
+
$r = q("SELECT * FROM `item` WHERE `event-id` = %d AND `uid` = %d LIMIT 1",
intval($arr['id']),
intval($arr['uid'])
@@ -335,8 +333,7 @@ function event_store($arr) {
return $item_id;
} else {
// New event. Store it.
-
- $r = q("INSERT INTO `event` (`uid`,`cid`,`guid`,`uri`,`created`,`edited`,`start`,`finish`,`summary`, `desc`,`location`,`type`,
+ q("INSERT INTO `event` (`uid`,`cid`,`guid`,`uri`,`created`,`edited`,`start`,`finish`,`summary`, `desc`,`location`,`type`,
`adjust`,`nofinish`,`allow_cid`,`allow_gid`,`deny_cid`,`deny_gid`)
VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', '%s', '%s' ) ",
intval($arr['uid']),
@@ -402,21 +399,7 @@ function event_store($arr) {
$item_arr['object'] .= '' . "\n";
$item_id = item_store($item_arr);
-
- $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
- intval($arr['uid'])
- );
- //if (DBM::is_result($r))
- // $plink = System::baseUrl() . '/display/' . $r[0]['nickname'] . '/' . $item_id;
-
-
if ($item_id) {
- //q("UPDATE `item` SET `plink` = '%s', `event-id` = %d WHERE `uid` = %d AND `id` = %d",
- // dbesc($plink),
- // intval($event['id']),
- // intval($arr['uid']),
- // intval($item_id)
- //);
q("UPDATE `item` SET `event-id` = %d WHERE `uid` = %d AND `id` = %d",
intval($event['id']),
intval($arr['uid']),
@@ -432,7 +415,7 @@ function event_store($arr) {
/**
* @brief Create an array with translation strings used for events.
- *
+ *
* @return array Array with translations strings.
*/
function get_event_strings() {
@@ -525,10 +508,10 @@ function event_remove_duplicates($dates) {
/**
* @brief Get an event by its event ID.
*
- * @param type $owner_uid The User ID of the owner of the event
- * @param type $event_params An assoziative array with
- * int 'event_id' => The ID of the event in the event table
- * @param type $sql_extra
+ * @param int $owner_uid The User ID of the owner of the event
+ * @param array $event_params An assoziative array with
+ * int 'event_id' => The ID of the event in the event table
+ * @param string $sql_extra
* @return array Query result
*/
function event_by_id($owner_uid = 0, $event_params, $sql_extra = '') {
@@ -563,7 +546,7 @@ function event_by_id($owner_uid = 0, $event_params, $sql_extra = '') {
* string 'adjust_start' =>
*
* @param string $sql_extra Additional sql conditions (e.g. permission request).
- *
+ *
* @return array Query results.
*/
function events_by_date($owner_uid = 0, $event_params, $sql_extra = '') {
@@ -625,6 +608,9 @@ function process_events($arr) {
// Show edit and drop actions only if the user is the owner of the event and the event
// is a real event (no bithdays).
+ $edit = null;
+ $copy = null;
+ $drop = null;
if (local_user() && local_user() == $rr['uid'] && $rr['type'] == 'event') {
$edit = ((! $rr['cid']) ? array(System::baseUrl() . '/events/event/' . $rr['id'], t('Edit event'), '', '') : null);
$copy = ((! $rr['cid']) ? array(System::baseUrl() . '/events/copy/' . $rr['id'], t('Duplicate event'), '', '') : null);
@@ -671,9 +657,12 @@ function process_events($arr) {
* @param string $timezone The timezone of the user (not implemented yet).
*
* @return string Content according to selected export format.
+ *
+ * @todo Implement timezone support
*/
-function event_format_export ($events, $format = 'ical', $timezone) {
- if (! ((is_array($events)) && count($events))) {
+function event_format_export($events, $format = 'ical', $timezone)
+{
+ if (!((is_array($events)) && count($events))) {
return;
}
@@ -767,7 +756,7 @@ function event_format_export ($events, $format = 'ical', $timezone) {
/**
* @brief Get all events for a user ID.
- *
+ *
* The query for events is done permission sensitive.
* If the user is the owner of the calendar he/she
* will get all of his/her available events.
@@ -899,7 +888,7 @@ function widget_events() {
* for exporting the cal is enabled (otherwise the widget would appear for logged in users
* on foreigen profile pages even if the widget is disabled).
*/
- if (intval($owner_uid) && local_user() !== $owner_uid && ! feature_enabled($owner_uid, "export_calendar")) {
+ if (intval($owner_uid) && local_user() !== $owner_uid && ! Feature::isEnabled($owner_uid, "export_calendar")) {
return;
}
@@ -907,7 +896,7 @@ function widget_events() {
* If it's a kind of profile page (intval($owner_uid)) return if the user not logged in and
* export feature isn't enabled.
*/
- if (intval($owner_uid) && ! local_user() && ! feature_enabled($owner_uid, "export_calendar")) {
+ if (intval($owner_uid) && ! local_user() && ! Feature::isEnabled($owner_uid, "export_calendar")) {
return;
}
@@ -921,7 +910,7 @@ function widget_events() {
/**
* @brief Format an item array with event data to HTML.
- *
+ *
* @param arr $item Array with item and event data.
* @return string HTML output.
*/
@@ -966,9 +955,9 @@ function format_event_item($item) {
}
// Construct the map HTML.
if (isset($evloc['address'])) {
- $location['map'] = '' . generate_named_map($evloc['address']) . '
';
+ $location['map'] = '' . Map::byLocation($evloc['address']) . '
';
} elseif (isset($evloc['coordinates'])) {
- $location['map'] = '' . generate_map(str_replace('/', ' ', $evloc['coordinates'])) . '
';
+ $location['map'] = '' . Map::byCoordinates(str_replace('/', ' ', $evloc['coordinates'])) . '
';
}
// Construct the profile link (magic-auth).
@@ -976,7 +965,7 @@ function format_event_item($item) {
$profile_link = best_link_url($item, $sp);
if (!$sp) {
- $profile_link = zrl($profile_link);
+ $profile_link = Profile::zrl($profile_link);
}
$event = replace_macros(get_markup_template('event_stream_item.tpl'), array(
@@ -1012,12 +1001,12 @@ function format_event_item($item) {
/**
* @brief Format a string with map bbcode to an array with location data.
- *
+ *
* Note: The string must only contain location data. A string with no bbcode will be
* handled as location name.
- *
+ *
* @param string $s The string with the bbcode formatted location data.
- *
+ *
* @return array The array with the location data.
* 'name' => The name of the location,
* 'address' => The address of the location,