X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcal.php;h=526e33c00cd796b09a29591192b33db7a317346f;hb=3fc5c1ad840f98926319478a855dab3686a0ace3;hp=dece5ac188be2ac0266730e26e787247d0d107b0;hpb=f97752383ab84cf6f95a56363e005a43d869e828;p=friendica.git

diff --git a/mod/cal.php b/mod/cal.php
index dece5ac188..526e33c00c 100644
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -8,14 +8,22 @@
 
 use Friendica\App;
 use Friendica\Content\Feature;
+use Friendica\Content\Nav;
+use Friendica\Content\Widget;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
+use Friendica\Model\Event;
 use Friendica\Model\Group;
+use Friendica\Model\Item;
+use Friendica\Model\Profile;
 use Friendica\Protocol\DFRN;
-
-require_once 'include/event.php';
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Temporal;
+use Friendica\Util\Security;
 
 function cal_init(App $a)
 {
@@ -23,79 +31,76 @@ function cal_init(App $a)
 		DFRN::autoRedir($a, $a->argv[1]);
 	}
 
-	if ((Config::get('system', 'block_public')) && (!local_user()) && (!remote_user())) {
-		return;
+	if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
+		System::httpExit(403, ['title' => L10n::t('Access denied.')]);
 	}
 
-	nav_set_selected('events');
+	if ($a->argc < 2) {
+		System::httpExit(403, ['title' => L10n::t('Access denied.')]);
+	}
 
-	if ($a->argc > 1) {
-		$nick = $a->argv[1];
-		$user = dba::selectFirst('user', [], ['nickname' => $nick, 'blocked' => false]);
-		if (!DBM::is_result($user)) {
-			return;
-		}
+	Nav::setSelected('events');
 
-		$a->data['user'] = $user;
-		$a->profile_uid = $user['uid'];
+	$nick = $a->argv[1];
+	$user = DBA::selectFirst('user', [], ['nickname' => $nick, 'blocked' => false]);
+	if (!DBA::isResult($user)) {
+		System::httpExit(404, ['title' => L10n::t('Page not found.')]);
+	}
 
-		// if it's a json request abort here becaus we don't
-		// need the widget data
-		if ($a->argv[2] === 'json') {
-			return;
-		}
+	$a->data['user'] = $user;
+	$a->profile_uid = $user['uid'];
 
-		$profile = get_profiledata_by_nick($nick, $a->profile_uid);
+	// if it's a json request abort here becaus we don't
+	// need the widget data
+	if (!empty($a->argv[2]) && ($a->argv[2] === 'json')) {
+		return;
+	}
 
-		$account_type = Contact::getAccountType($profile);
+	$profile = Profile::getByNickname($nick, $a->profile_uid);
 
-		$tpl = get_markup_template("vcard-widget.tpl");
+	$account_type = Contact::getAccountType($profile);
 
-		$vcard_widget = replace_macros($tpl, array(
-			'$name' => $profile['name'],
-			'$photo' => $profile['photo'],
-			'$addr' => (($profile['addr'] != "") ? $profile['addr'] : ""),
-			'$account_type' => $account_type,
-			'$pdesc' => (($profile['pdesc'] != "") ? $profile['pdesc'] : ""),
-		));
+	$tpl = Renderer::getMarkupTemplate("vcard-widget.tpl");
 
-		$cal_widget = widget_events();
+	$vcard_widget = Renderer::replaceMacros($tpl, [
+		'$name' => $profile['name'],
+		'$photo' => $profile['photo'],
+		'$addr' => (($profile['addr'] != "") ? $profile['addr'] : ""),
+		'$account_type' => $account_type,
+		'$pdesc' => (($profile['pdesc'] != "") ? $profile['pdesc'] : ""),
+	]);
 
-		if (!x($a->page, 'aside')) {
-			$a->page['aside'] = '';
-		}
+	$cal_widget = Widget\CalendarExport::getHTML();
 
-		$a->page['aside'] .= $vcard_widget;
-		$a->page['aside'] .= $cal_widget;
+	if (empty($a->page['aside'])) {
+		$a->page['aside'] = '';
 	}
 
+	$a->page['aside'] .= $vcard_widget;
+	$a->page['aside'] .= $cal_widget;
+
 	return;
 }
 
 function cal_content(App $a)
 {
-	nav_set_selected('events');
+	Nav::setSelected('events');
 
 	// 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, array(
+	$htpl = Renderer::getMarkupTemplate('event_head.tpl');
+	$a->page['htmlhead'] .= Renderer::replaceMacros($htpl, [
 		'$baseurl' => System::baseUrl(),
 		'$module_url' => '/cal/' . $a->data['user']['nickname'],
 		'$modparams' => 2,
 		'$i18n' => $i18n,
-	));
-
-	$etpl = get_markup_template('event_end.tpl');
-	$a->page['end'] .= replace_macros($etpl, array(
-		'$baseurl' => System::baseUrl(),
-	));
+	]);
 
 	$mode = 'view';
 	$y = 0;
 	$m = 0;
-	$ignored = ((x($_REQUEST, 'ignored')) ? intval($_REQUEST['ignored']) : 0);
+	$ignored = (!empty($_REQUEST['ignored']) ? intval($_REQUEST['ignored']) : 0);
 
 	$format = 'ical';
 	if ($a->argc == 4 && $a->argv[2] == 'export') {
@@ -110,7 +115,7 @@ function cal_content(App $a)
 	$owner_uid = $a->data['user']['uid'];
 	$nick = $a->data['user']['nickname'];
 
-	if (x($_SESSION, 'remote') && is_array($_SESSION['remote'])) {
+	if (!empty($_SESSION['remote']) && is_array($_SESSION['remote'])) {
 		foreach ($_SESSION['remote'] as $v) {
 			if ($v['uid'] == $a->profile['profile_uid']) {
 				$contact_id = $v['cid'];
@@ -126,30 +131,30 @@ function cal_content(App $a)
 			intval($contact_id),
 			intval($a->profile['profile_uid'])
 		);
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$remote_contact = true;
 		}
 	}
 
 	$is_owner = local_user() == $a->profile['profile_uid'];
 
-	if ($a->profile['hidewall'] && (!$is_owner) && (!$remote_contact)) {
-		notice(t('Access to this profile has been restricted.') . EOL);
+	if ($a->profile['hidewall'] && !$is_owner && !$remote_contact) {
+		notice(L10n::t('Access to this profile has been restricted.') . EOL);
 		return;
 	}
 
 	// get the permissions
-	$sql_perms = item_permissions_sql($owner_uid, $remote_contact, $groups);
+	$sql_perms = Item::getPermissionsSQLByUserId($owner_uid, $remote_contact, $groups);
 	// we only want to have the events of the profile owner
 	$sql_extra = " AND `event`.`cid` = 0 " . $sql_perms;
 
 	// get the tab navigation bar
-	$tabs = profile_tabs($a, false, $a->data['user']['nickname']);
+	$tabs = Profile::getTabs($a, false, $a->data['user']['nickname']);
 
 	// The view mode part is similiar to /mod/events.php
 	if ($mode == 'view') {
-		$thisyear = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y');
-		$thismonth = datetime_convert('UTC', date_default_timezone_get(), 'now', 'm');
+		$thisyear = DateTimeFormat::localNow('Y');
+		$thismonth = DateTimeFormat::localNow('m');
 		if (!$y) {
 			$y = intval($thisyear);
 		}
@@ -184,78 +189,78 @@ function cal_content(App $a)
 			$prevyear --;
 		}
 
-		$dim = get_dim($y, $m);
+		$dim = Temporal::getDaysInMonth($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);
 
 
-		if ($a->argv[2] === 'json') {
-			if (x($_GET, 'start')) {
+		if (!empty($a->argv[2]) && ($a->argv[2] === 'json')) {
+			if (!empty($_GET['start'])) {
 				$start = $_GET['start'];
 			}
 
-			if (x($_GET, 'end')) {
+			if (!empty($_GET['end'])) {
 				$finish = $_GET['end'];
 			}
 		}
 
-		$start = datetime_convert('UTC', 'UTC', $start);
-		$finish = datetime_convert('UTC', 'UTC', $finish);
+		$start = DateTimeFormat::utc($start);
+		$finish = DateTimeFormat::utc($finish);
 
-		$adjust_start = datetime_convert('UTC', date_default_timezone_get(), $start);
-		$adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish);
+		$adjust_start = DateTimeFormat::local($start);
+		$adjust_finish = DateTimeFormat::local($finish);
 
 		// put the event parametes in an array so we can better transmit them
-		$event_params = array(
-			'event_id' => (x($_GET, 'id') ? $_GET["id"] : 0),
-			'start' => $start,
-			'finish' => $finish,
-			'adjust_start' => $adjust_start,
+		$event_params = [
+			'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($owner_uid, $event_params, $sql_extra);
+		if ($event_params['event_id']) {
+			$r = Event::getListById($owner_uid, $event_params['event_id'], $sql_extra);
 		} else {
-			$r = events_by_date($owner_uid, $event_params, $sql_extra);
+			$r = Event::getListByDate($owner_uid, $event_params, $sql_extra);
 		}
 
-		$links = array();
+		$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']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['start'], 'j') : datetime_convert('UTC', 'UTC', $rr['start'], 'j'));
-				if (!x($links, $j)) {
+				$j = $rr['adjust'] ? DateTimeFormat::local($rr['start'], 'j') : DateTimeFormat::utc($rr['start'], 'j');
+				if (empty($links[$j])) {
 					$links[$j] = System::baseUrl() . '/' . $a->cmd . '#link-' . $j;
 				}
 			}
 		}
 
 		// transform the event in a usable array
-		$events = process_events($r);
+		$events = Event::prepareListForTemplate($r);
 
-		if ($a->argv[2] === 'json') {
+		if (!empty($a->argv[2]) && ($a->argv[2] === 'json')) {
 			echo json_encode($events);
 			killme();
 		}
 
 		// links: array('href', 'text', 'extra css classes', 'title')
-		if (x($_GET, 'id')) {
-			$tpl = get_markup_template("event.tpl");
+		if (!empty($_GET['id'])) {
+			$tpl = Renderer::getMarkupTemplate("event.tpl");
 		} else {
 //			if (Config::get('experimentals','new_calendar')==1){
-			$tpl = get_markup_template("events_js.tpl");
+			$tpl = Renderer::getMarkupTemplate("events_js.tpl");
 //			} else {
-//				$tpl = get_markup_template("events.tpl");
+//				$tpl = Renderer::getMarkupTemplate("events.tpl");
 //			}
 		}
 
 		// Get rid of dashes in key names, Smarty3 can't handle them
 		foreach ($events as $key => $event) {
-			$event_item = array();
+			$event_item = [];
 			foreach ($event['item'] as $k => $v) {
 				$k = str_replace('-', '_', $k);
 				$event_item[$k] = $v;
@@ -263,23 +268,23 @@ function cal_content(App $a)
 			$events[$key]['item'] = $event_item;
 		}
 
-		$o = replace_macros($tpl, array(
+		$o = Renderer::replaceMacros($tpl, [
 			'$baseurl' => System::baseUrl(),
 			'$tabs' => $tabs,
-			'$title' => t('Events'),
-			'$view' => t('View'),
-			'$previous' => array(System::baseUrl() . "/events/$prevyear/$prevmonth", t('Previous'), '', ''),
-			'$next' => array(System::baseUrl() . "/events/$nextyear/$nextmonth", t('Next'), '', ''),
-			'$calendar' => cal($y, $m, $links, ' eventcal'),
+			'$title' => L10n::t('Events'),
+			'$view' => L10n::t('View'),
+			'$previous' => [System::baseUrl() . "/events/$prevyear/$prevmonth", L10n::t('Previous'), '', ''],
+			'$next' => [System::baseUrl() . "/events/$nextyear/$nextmonth", L10n::t('Next'), '', ''],
+			'$calendar' => Temporal::getCalendarTable($y, $m, $links, ' eventcal'),
 			'$events' => $events,
-			"today" => t("today"),
-			"month" => t("month"),
-			"week" => t("week"),
-			"day" => t("day"),
-			"list" => t("list"),
-		));
-
-		if (x($_GET, 'id')) {
+			"today" => L10n::t("today"),
+			"month" => L10n::t("month"),
+			"week" => L10n::t("week"),
+			"day" => L10n::t("day"),
+			"list" => L10n::t("list"),
+		]);
+
+		if (!empty($_GET['id'])) {
 			echo $o;
 			killme();
 		}
@@ -288,26 +293,26 @@ function cal_content(App $a)
 	}
 
 	if ($mode == 'export') {
-		if (!(intval($owner_uid))) {
-			notice(t('User not found'));
+		if (!intval($owner_uid)) {
+			notice(L10n::t('User not found'));
 			return;
 		}
 
 		// Test permissions
 		// Respect the export feature setting for all other /cal pages if it's not the own profile
-		if (((local_user() !== intval($owner_uid))) && !Feature::isEnabled($owner_uid, "export_calendar")) {
-			notice(t('Permission denied.') . EOL);
-			goaway('cal/' . $nick);
+		if ((local_user() !== intval($owner_uid)) && !Feature::isEnabled($owner_uid, "export_calendar")) {
+			notice(L10n::t('Permission denied.') . EOL);
+			$a->internalRedirect('cal/' . $nick);
 		}
 
 		// Get the export data by uid
-		$evexport = event_export($owner_uid, $format);
+		$evexport = Event::exportListByUserId($owner_uid, $format);
 
 		if (!$evexport["success"]) {
 			if ($evexport["content"]) {
-				notice(t('This calendar format is not supported'));
+				notice(L10n::t('This calendar format is not supported'));
 			} else {
-				notice(t('No exportable data found'));
+				notice(L10n::t('No exportable data found'));
 			}
 
 			// If it the own calendar return to the events page
@@ -318,13 +323,13 @@ function cal_content(App $a)
 				$return_path = "cal/" . $nick;
 			}
 
-			goaway($return_path);
+			$a->internalRedirect($return_path);
 		}
 
 		// If nothing went wrong we can echo the export content
 		if ($evexport["success"]) {
 			header('Content-type: text/calendar');
-			header('content-disposition: attachment; filename="' . t('calendar') . '-' . $nick . '.' . $evexport["extension"] . '"');
+			header('content-disposition: attachment; filename="' . L10n::t('calendar') . '-' . $nick . '.' . $evexport["extension"] . '"');
 			echo $evexport["content"];
 			killme();
 		}