use Friendica\BaseObject;
use Friendica\Content\Text\BBCode;
-use Friendica\Core\Addon;
+use Friendica\Core\Hook;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\PConfig;
use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Database\DBA;
-use Friendica\Model\Contact;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Map;
+use Friendica\Util\Strings;
use Friendica\Util\XML;
/**
}
if ($simple) {
+ $o = '';
+
if (!empty($event['summary'])) {
- $o = "<h3>" . BBCode::convert($event['summary'], false, $simple) . "</h3>";
+ $o .= "<h3>" . BBCode::convert(Strings::escapeHtml($event['summary']), false, $simple) . "</h3>";
}
if (!empty($event['desc'])) {
- $o .= "<div>" . BBCode::convert($event['desc'], false, $simple) . "</div>";
+ $o .= "<div>" . BBCode::convert(Strings::escapeHtml($event['desc']), false, $simple) . "</div>";
}
$o .= "<h4>" . L10n::t('Starts:') . "</h4><p>" . $event_start . "</p>";
}
if (!empty($event['location'])) {
- $o .= "<h4>" . L10n::t('Location:') . "</h4><p>" . BBCode::convert($event['location'], false, $simple) . "</p>";
+ $o .= "<h4>" . L10n::t('Location:') . "</h4><p>" . BBCode::convert(Strings::escapeHtml($event['location']), false, $simple) . "</p>";
}
return $o;
$o = '<div class="vevent">' . "\r\n";
- $o .= '<div class="summary event-summary">' . BBCode::convert($event['summary'], false, $simple) . '</div>' . "\r\n";
+ $o .= '<div class="summary event-summary">' . BBCode::convert(Strings::escapeHtml($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'], (!empty($event['adjust']) ? DateTimeFormat::ATOM : 'Y-m-d\TH:i:s'))
}
if (!empty($event['desc'])) {
- $o .= '<div class="description event-description">' . BBCode::convert($event['desc'], false, $simple) . '</div>' . "\r\n";
+ $o .= '<div class="description event-description">' . BBCode::convert(Strings::escapeHtml($event['desc']), false, $simple) . '</div>' . "\r\n";
}
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)
+ . BBCode::convert(Strings::escapeHtml($event['location']), false, $simple)
. '</span></div>' . "\r\n";
// Include a map of the location if the [map] BBCode is used.
* @brief Extract bbcode formatted event data from a string.
*
* @params: string $s The string which should be parsed for event data.
+ * @param $text
* @return array The array with the event information.
*/
public static function fromBBCode($text)
*
* @param int $event_id Event ID.
* @return void
+ * @throws \Exception
*/
public static function delete($event_id)
{
*
* @param array $arr Array with event data.
* @return int The new event id.
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
public static function store($arr)
{
- $a = self::getApp();
-
$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['guid'] = defaults($arr, 'guid' , System::createUUID());
+ $event['uri'] = defaults($arr, 'uri' , Item::newURI($event['uid'], $event['guid']));
$event['type'] = defaults($arr, 'type' , 'event');
$event['summary'] = defaults($arr, 'summary' , '');
$event['desc'] = defaults($arr, 'desc' , '');
$item_id = 0;
}
- Addon::callHooks('event_updated', $event['id']);
+ Hook::callAll('event_updated', $event['id']);
} else {
- $event['guid'] = defaults($arr, 'guid', System::createUUID());
-
// New event. Store it.
DBA::insert('event', $event);
$item_id = Item::insert($item_arr);
}
- Addon::callHooks("event_created", $event['id']);
+ Hook::callAll("event_created", $event['id']);
}
return $item_id;
* @brief Create an array with translation strings used for events.
*
* @return array Array with translations strings.
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
public static function getStrings()
{
"February" => L10n::t("February"),
"March" => L10n::t("March"),
"April" => L10n::t("April"),
- "May" => L10n::t("May"),
"June" => L10n::t("June"),
"July" => L10n::t("July"),
"August" => L10n::t("August"),
* @param int $event_id The ID of the event in the event table
* @param string $sql_extra
* @return array Query result
+ * @throws \Exception
*/
public static function getListById($owner_uid, $event_id, $sql_extra = '')
{
/**
* @brief Get all events in a specific time frame.
*
- * @param int $owner_uid The User ID of the owner of the events.
- * @param array $event_params An associative array with
- * int 'ignore' =>
- * string 'start' => Start time of the timeframe.
- * string 'finish' => Finish time of the timeframe.
- * string 'adjust_start' =>
- * string 'adjust_finish' =>
+ * @param int $owner_uid The User ID of the owner of the events.
+ * @param array $event_params An associative array with
+ * int 'ignore' =>
+ * string 'start' => Start time of the timeframe.
+ * string 'finish' => Finish time of the timeframe.
+ * string 'adjust_start' =>
+ * string 'adjust_finish' =>
*
- * @param string $sql_extra Additional sql conditions (e.g. permission request).
+ * @param string $sql_extra Additional sql conditions (e.g. permission request).
*
* @return array Query results.
+ * @throws \Exception
*/
public static function getListByDate($owner_uid, $event_params, $sql_extra = '')
{
*
* @param array $event_result Event query array.
* @return array Event array for the template.
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
public static function prepareListForTemplate(array $event_result)
{
$drop = [System::baseUrl() . '/events/drop/' . $event['id'] , L10n::t('Delete event') , '', ''];
}
- $title = strip_tags(html_entity_decode(BBCode::convert($event['summary']), ENT_QUOTES, 'UTF-8'));
+ $title = BBCode::convert(Strings::escapeHtml($event['summary']));
if (!$title) {
- list($title, $_trash) = explode("<br", BBCode::convert($event['desc']), 2);
- $title = strip_tags(html_entity_decode($title, ENT_QUOTES, 'UTF-8'));
+ list($title, $_trash) = explode("<br", BBCode::convert(Strings::escapeHtml($event['desc'])), 2);
}
$author_link = $event['author-link'];
$event['plink'] = Contact::magicLink($author_link, $plink);
$html = self::getHTML($event);
- $event['desc'] = BBCode::convert($event['desc']);
- $event['location'] = BBCode::convert($event['location']);
+ $event['summary'] = BBCode::convert(Strings::escapeHtml($event['summary']));
+ $event['desc'] = BBCode::convert(Strings::escapeHtml($event['desc']));
+ $event['location'] = BBCode::convert(Strings::escapeHtml($event['location']));
$event_list[] = [
'id' => $event['id'],
'start' => $start,
/**
* @brief Format event to export format (ical/csv).
*
- * @param array $events Query result for events.
- * @param string $format The output format (ical/csv).
- * @param string $timezone The timezone of the user (not implemented yet).
+ * @param array $events Query result for events.
+ * @param string $format The output format (ical/csv).
*
+ * @param $timezone
* @return string Content according to selected export format.
*
- * @todo Implement timezone support
+ * @todo Implement timezone support
*/
- private static function formatListForExport(array $events, $format, $timezone)
+ private static function formatListForExport(array $events, $format)
{
+ $o = '';
+
if (!count($events)) {
- return '';
+ return $o;
}
switch ($format) {
// Format the exported data as a CSV file.
case "csv":
header("Content-type: text/csv");
- $o = '"Subject", "Start Date", "Start Time", "Description", "End Date", "End Time", "Location"' . PHP_EOL;
+ $o .= '"Subject", "Start Date", "Start Time", "Description", "End Date", "End Time", "Location"' . PHP_EOL;
foreach ($events as $event) {
/// @todo The time / date entries don't include any information about the
* @param int $uid The user ID.
*
* @return array Query results.
+ * @throws \Exception
*/
private static function getListByUserId($uid = 0)
{
/**
*
- * @param int $uid The user ID.
+ * @param int $uid The user ID.
* @param string $format Output format (ical/csv).
* @return array With the results:
- * bool 'success' => True if the processing was successful,<br>
- * string 'format' => The output format,<br>
- * string 'extension' => The file extension of the output format,<br>
- * string 'content' => The formatted output content.<br>
+ * bool 'success' => True if the processing was successful,<br>
+ * string 'format' => The output format,<br>
+ * string 'extension' => The file extension of the output format,<br>
+ * string 'content' => The formatted output content.<br>
*
+ * @throws \Exception
* @todo Respect authenticated users with events_by_uid().
*/
public static function exportListByUserId($uid, $format = 'ical')
{
$process = false;
- $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 = self::getListByUserId($uid);
// We have the events that are available for the requestor.
// Now format the output according to the requested format.
- $res = self::formatListForExport($events, $format, $timezone);
+ $res = self::formatListForExport($events, $format);
- // If there are results the precess was successfull.
+ // If there are results the precess was successful.
if (!empty($res)) {
$process = true;
}
*
* @param array $item Array with item and event data.
* @return string HTML output.
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
public static function getItemHTML(array $item) {
$same_date = false;
* 'name' => The name of the location,<br>
* 'address' => The address of the location,<br>
* 'coordinates' => Latitude and longitude (e.g. '48.864716,2.349014').<br>
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
private static function locationToArray($s = '') {
if ($s == '') {
* @param array $contact Contact array, expects: id, uid, url, name
* @param string $birthday Birthday of the contact
* @return bool
+ * @throws \Exception
*/
public static function createBirthday($contact, $birthday)
{
projects / friendica.git / blobdiff