use Friendica\App;
use Friendica\Content\Nav;
+use Friendica\Content\Widget\CalendarExport;
+use Friendica\Core\ACL;
use Friendica\Core\L10n;
use Friendica\Core\System;
use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Model\Event;
use Friendica\Model\Item;
use Friendica\Model\Profile;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Temporal;
-require_once 'include/event.php';
require_once 'include/items.php';
function events_init(App $a) {
- if (! local_user()) {
+ if (!local_user()) {
return;
}
- if ($a->argc > 1) {
- // If it's a json request abort here because we don't
- // need the widget data
- if ($a->argv[1] === 'json') {
- return;
- }
+ // If it's a json request abort here because we don't
+ // need the widget data
+ if ($a->argc > 1 && $a->argv[1] === 'json') {
+ return;
+ }
- $cal_widget = widget_events();
+ if (empty($a->page['aside'])) {
+ $a->page['aside'] = '';
+ }
- if (! x($a->page,'aside')) {
- $a->page['aside'] = '';
- }
+ $cal_widget = CalendarExport::getHTML();
- $a->page['aside'] .= $cal_widget;
- }
+ $a->page['aside'] .= $cal_widget;
return;
}
logger('post: ' . print_r($_REQUEST, true), LOGGER_DATA);
- if (! local_user()) {
+ if (!local_user()) {
return;
}
- $event_id = ((x($_POST, 'event_id')) ? intval($_POST['event_id']) : 0);
- $cid = ((x($_POST, 'cid')) ? intval($_POST['cid']) : 0);
+ $event_id = (x($_POST, 'event_id') ? intval($_POST['event_id']) : 0);
+ $cid = (x($_POST, 'cid') ? intval($_POST['cid']) : 0);
$uid = local_user();
$start_text = escape_tags($_REQUEST['start_text']);
if ($adjust) {
$start = DateTimeFormat::convert($start, 'UTC', date_default_timezone_get());
- if (! $nofinish) {
+ if (!$nofinish) {
$finish = DateTimeFormat::convert($finish, 'UTC', date_default_timezone_get());
}
} else {
$start = DateTimeFormat::utc($start);
- if (! $nofinish) {
+ if (!$nofinish) {
$finish = DateTimeFormat::utc($finish);
}
}
goaway($onerror_url);
}
- if ((! $summary) || ($start === NULL_DATE)) {
+ if (!$summary || ($start === NULL_DATE)) {
notice(L10n::t('Event title and start time are required.') . EOL);
if (intval($_REQUEST['preview'])) {
echo L10n::t('Event title and start time are required.');
goaway($onerror_url);
}
- $share = ((intval($_POST['share'])) ? intval($_POST['share']) : 0);
+ $share = (intval($_POST['share']) ? intval($_POST['share']) : 0);
$c = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
intval(local_user())
);
- if (count($c)) {
+
+ if (DBA::isResult($c)) {
$self = $c[0]['id'];
} else {
$self = 0;
if ($share) {
- $str_group_allow = perms2str($_POST['group_allow']);
- $str_contact_allow = perms2str($_POST['contact_allow']);
- $str_group_deny = perms2str($_POST['group_deny']);
- $str_contact_deny = perms2str($_POST['contact_deny']);
+ $str_group_allow = !empty($_POST['group_allow']) ? perms2str($_POST['group_allow']) : '';
+ $str_contact_allow = !empty($_POST['contact_allow']) ? perms2str($_POST['contact_allow']) : '';
+ $str_group_deny = !empty($_POST['group_deny']) ? perms2str($_POST['group_deny']) : '';
+ $str_contact_deny = !empty($_POST['contact_deny']) ? perms2str($_POST['contact_deny']) : '';
// Undo the pseudo-contact of self, since there are real contacts now
if (strpos($str_contact_allow, '<' . $self . '>') !== false ) {
$datarray = [];
- $datarray['guid'] = get_guid(32);
$datarray['start'] = $start;
$datarray['finish'] = $finish;
$datarray['summary'] = $summary;
$datarray['allow_gid'] = $str_group_allow;
$datarray['deny_cid'] = $str_contact_deny;
$datarray['deny_gid'] = $str_group_deny;
- $datarray['private'] = (($private_event) ? 1 : 0);
+ $datarray['private'] = $private_event;
$datarray['id'] = $event_id;
- $datarray['created'] = $created;
- $datarray['edited'] = $edited;
if (intval($_REQUEST['preview'])) {
- $html = format_event_html($datarray);
+ $html = Event::getHTML($datarray);
echo $html;
killme();
}
- $item_id = event_store($datarray);
+ $item_id = Event::store($datarray);
- if (! $cid) {
+ if (!$cid) {
Worker::add(PRIORITY_HIGH, "Notifier", "event", $item_id);
}
function events_content(App $a) {
- if (! local_user()) {
+ if (!local_user()) {
notice(L10n::t('Permission denied.') . EOL);
return;
}
}
// get the translation strings for the callendar
- $i18n = get_event_strings();
+ $i18n = Event::getStrings();
$htpl = get_markup_template('event_head.tpl');
$a->page['htmlhead'] .= replace_macros($htpl, [
$mode = 'view';
$y = 0;
$m = 0;
- $ignored = ((x($_REQUEST, 'ignored')) ? intval($_REQUEST['ignored']) : 0);
+ $ignored = (x($_REQUEST, 'ignored') ? intval($_REQUEST['ignored']) : 0);
if ($a->argc > 1) {
if ($a->argc > 2 && $a->argv[1] == 'event') {
$thisyear = DateTimeFormat::localNow('Y');
$thismonth = DateTimeFormat::localNow('m');
- if (! $y) {
+ if (!$y) {
$y = intval($thisyear);
}
- if (! $m) {
+ if (!$m) {
$m = intval($thismonth);
}
// put the event parametes in an array so we can better transmit them
$event_params = [
- 'event_id' => (x($_GET, 'id') ? $_GET['id'] : 0),
+ 'event_id' => intval(defaults($_GET, 'id', 0)),
'start' => $start,
'finish' => $finish,
'adjust_start' => $adjust_start,
'adjust_finish' => $adjust_finish,
- 'ignored' => $ignored,
+ 'ignore' => $ignored,
];
// get events by id or by date
- if (x($_GET, 'id')) {
- $r = event_by_id(local_user(), $event_params);
+ if ($event_params['event_id']) {
+ $r = Event::getListById(local_user(), $event_params['event_id']);
} else {
- $r = events_by_date(local_user(), $event_params);
+ $r = Event::getListByDate(local_user(), $event_params);
}
$links = [];
- if (DBM::is_result($r)) {
- $r = sort_by_date($r);
+ if (DBA::isResult($r)) {
+ $r = Event::sortByDate($r);
foreach ($r as $rr) {
$j = $rr['adjust'] ? DateTimeFormat::local($rr['start'], 'j') : DateTimeFormat::utc($rr['start'], 'j');
- if (! x($links,$j)) {
+ if (!x($links,$j)) {
$links[$j] = System::baseUrl() . '/' . $a->cmd . '#link-' . $j;
}
}
$events = [];
// transform the event in a usable array
- if (DBM::is_result($r)) {
- $r = sort_by_date($r);
- $events = process_events($r);
+ if (DBA::isResult($r)) {
+ $r = Event::sortByDate($r);
+ $events = Event::prepareListForTemplate($r);
}
if ($a->argc > 1 && $a->argv[1] === 'json'){
}
if (x($_GET, 'id')) {
- $tpl = get_markup_template("event.tpl");
+ $tpl = get_markup_template("event.tpl");
} else {
$tpl = get_markup_template("events_js.tpl");
}
intval($event_id),
intval(local_user())
);
- if (DBM::is_result($r)) {
+ if (DBA::isResult($r)) {
$orig_event = $r[0];
}
}
// Passed parameters overrides anything found in the DB
if (in_array($mode, ['edit', 'new', 'copy'])) {
- if (!x($orig_event)) {$orig_event = [];}
+ if (empty($orig_event)) {
+ $orig_event = [];
+ }
+
// In case of an error the browser is redirected back here, with these parameters filled in with the previous values
if (x($_REQUEST, 'nofinish')) {$orig_event['nofinish'] = $_REQUEST['nofinish'];}
if (x($_REQUEST, 'adjust')) {$orig_event['adjust'] = $_REQUEST['adjust'];}
if (x($_REQUEST, 'location')) {$orig_event['location'] = $_REQUEST['location'];}
if (x($_REQUEST, 'start')) {$orig_event['start'] = $_REQUEST['start'];}
if (x($_REQUEST, 'finish')) {$orig_event['finish'] = $_REQUEST['finish'];}
+ if (x($_REQUEST,'finish')) $orig_event['finish'] = $_REQUEST['finish'];
$n_checked = ((x($orig_event) && $orig_event['nofinish']) ? ' checked="checked" ' : '');
$a_checked = ((x($orig_event) && $orig_event['adjust']) ? ' checked="checked" ' : '');
- $t_orig = ((x($orig_event)) ? $orig_event['summary'] : '');
- $d_orig = ((x($orig_event)) ? $orig_event['desc'] : '');
- $l_orig = ((x($orig_event)) ? $orig_event['location'] : '');
- $eid = ((x($orig_event)) ? $orig_event['id'] : 0);
- $cid = ((x($orig_event)) ? $orig_event['cid'] : 0);
- $uri = ((x($orig_event)) ? $orig_event['uri'] : '');
+ $t_orig = (x($orig_event) ? $orig_event['summary'] : '');
+ $d_orig = (x($orig_event) ? $orig_event['desc'] : '');
+ $l_orig = (x($orig_event) ? $orig_event['location'] : '');
+ $eid = (x($orig_event) ? $orig_event['id'] : 0);
+ $cid = (x($orig_event) ? $orig_event['cid'] : 0);
+ $uri = (x($orig_event) ? $orig_event['uri'] : '');
$sh_disabled = '';
$sh_checked = '';
if (x($orig_event)) {
- $sh_checked = (($orig_event['allow_cid'] === '<' . local_user() . '>' && (! $orig_event['allow_gid']) && (! $orig_event['deny_cid']) && (! $orig_event['deny_gid'])) ? '' : ' checked="checked" ');
+ $sh_checked = (($orig_event['allow_cid'] === '<' . local_user() . '>' && !$orig_event['allow_gid'] && !$orig_event['deny_cid'] && !$orig_event['deny_gid']) ? '' : ' checked="checked" ');
}
if ($cid || $mode === 'edit') {
$sh_disabled = 'disabled="disabled"';
}
- $sdt = ((x($orig_event)) ? $orig_event['start'] : 'now');
- $fdt = ((x($orig_event)) ? $orig_event['finish'] : 'now');
+ $sdt = (x($orig_event) ? $orig_event['start'] : 'now');
+ $fdt = (x($orig_event) ? $orig_event['finish'] : 'now');
$tz = date_default_timezone_get();
if (x($orig_event)) {
- $tz = (($orig_event['adjust']) ? date_default_timezone_get() : 'UTC');
+ $tz = ($orig_event['adjust'] ? date_default_timezone_get() : 'UTC');
}
$syear = DateTimeFormat::convert($sdt, $tz, 'UTC', 'Y');
$smonth = DateTimeFormat::convert($sdt, $tz, 'UTC', 'm');
$sday = DateTimeFormat::convert($sdt, $tz, 'UTC', 'd');
- $shour = ((x($orig_event)) ? DateTimeFormat::convert($sdt, $tz, 'UTC', 'H') : '00');
- $sminute = ((x($orig_event)) ? DateTimeFormat::convert($sdt, $tz, 'UTC', 'i') : '00');
+ $shour = (x($orig_event) ? DateTimeFormat::convert($sdt, $tz, 'UTC', 'H') : '00');
+ $sminute = (x($orig_event) ? DateTimeFormat::convert($sdt, $tz, 'UTC', 'i') : '00');
$fyear = DateTimeFormat::convert($fdt, $tz, 'UTC', 'Y');
$fmonth = DateTimeFormat::convert($fdt, $tz, 'UTC', 'm');
$fday = DateTimeFormat::convert($fdt, $tz, 'UTC', 'd');
- $fhour = ((x($orig_event)) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'H') : '00');
- $fminute = ((x($orig_event)) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'i') : '00');
-
- require_once 'include/acl_selectors.php' ;
+ $fhour = (x($orig_event) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'H') : '00');
+ $fminute = (x($orig_event) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'i') : '00');
- $perms = get_acl_permissions($orig_event);
+ $perms = ACL::getDefaultUserPermissions($orig_event);
if ($mode === 'new' || $mode === 'copy') {
- $acl = (($cid) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $a->user)));
+ $acl = ($cid ? '' : ACL::getFullSelectorHTML(x($orig_event) ? $orig_event : $a->user));
}
// If we copy an old event, we need to remove the ID and URI
if ($mode === 'drop' && $event_id) {
$del = 0;
- $params = ['event_id' => ($event_id)];
- $ev = event_by_id(local_user(), $params);
+ $ev = Event::getListById(local_user(), $event_id);
// Delete only real events (no birthdays)
- if (DBM::is_result($ev) && $ev[0]['type'] == 'event') {
- $del = Item::deleteById($ev[0]['itemid']);
+ if (DBA::isResult($ev) && $ev[0]['type'] == 'event') {
+ $del = Item::deleteForUser(['id' => $ev[0]['itemid']], local_user());
}
if ($del == 0) {
projects / friendica.git / blobdiff