X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fcal.php;h=9e32b87d6f60bc829eb8a9c7c3936b3c855ddc4b;hb=f2d917114f949b3f76c04f99247092a16b1e3e9e;hp=f7fe2435d055549f2db3bdaadd37a5bc21f59e72;hpb=6d7362da4134cce31f28a5efa2c623a11f89afc2;p=friendica.git

diff --git a/mod/cal.php b/mod/cal.php
index f7fe2435d0..9e32b87d6f 100644
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -1,19 +1,17 @@
 <?php
 /**
  * @file mod/cal.php
- * @brief The calendar module
- * 	This calendar is for profile visitors and contains only the events
- * 	of the profile owner
+ * The calendar module
+ *
+ * This calendar is for profile visitors and contains only the events
+ * of the profile owner
  */
 
 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\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -21,17 +19,18 @@ use Friendica\Model\Contact;
 use Friendica\Model\Event;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
+use Friendica\Module\BaseProfile;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Temporal;
 
 function cal_init(App $a)
 {
-	if (Config::get('system', 'block_public') && !Session::isAuthenticated()) {
-		throw new \Friendica\Network\HTTPException\ForbiddenException(L10n::t('Access denied.'));
+	if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
+		throw new \Friendica\Network\HTTPException\ForbiddenException(DI::l10n()->t('Access denied.'));
 	}
 
 	if ($a->argc < 2) {
-		throw new \Friendica\Network\HTTPException\ForbiddenException(L10n::t('Access denied.'));
+		throw new \Friendica\Network\HTTPException\ForbiddenException(DI::l10n()->t('Access denied.'));
 	}
 
 	Nav::setSelected('events');
@@ -103,30 +102,17 @@ function cal_content(App $a)
 	}
 
 	// Setup permissions structures
-	$remote_contact = false;
-	$contact_id = 0;
-
 	$owner_uid = intval($a->data['user']['uid']);
 	$nick = $a->data['user']['nickname'];
 
-	if (!empty(Session::getRemoteContactID($a->profile['profile_uid']))) {
-		$contact_id = Session::getRemoteContactID($a->profile['profile_uid']);
-	}
+	$contact_id = Session::getRemoteContactID($a->profile['uid']);
 
-	if ($contact_id) {
-		$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-			intval($contact_id),
-			intval($a->profile['profile_uid'])
-		);
-		if (DBA::isResult($r)) {
-			$remote_contact = true;
-		}
-	}
+	$remote_contact = $contact_id && DBA::exists('contact', ['id' => $contact_id, 'uid' => $a->profile['uid']]);
 
-	$is_owner = local_user() == $a->profile['profile_uid'];
+	$is_owner = local_user() == $a->profile['uid'];
 
 	if ($a->profile['hidewall'] && !$is_owner && !$remote_contact) {
-		notice(L10n::t('Access to this profile has been restricted.') . EOL);
+		notice(DI::l10n()->t('Access to this profile has been restricted.') . EOL);
 		return;
 	}
 
@@ -136,7 +122,7 @@ function cal_content(App $a)
 	$sql_extra = " AND `event`.`cid` = 0 " . $sql_perms;
 
 	// get the tab navigation bar
-	$tabs = Profile::getTabs($a, 'cal', false, $a->data['user']['nickname']);
+	$tabs = BaseProfile::getTabsHTML($a, 'cal', false, $a->data['user']['nickname']);
 
 	// The view mode part is similiar to /mod/events.php
 	if ($mode == 'view') {
@@ -221,7 +207,7 @@ function cal_content(App $a)
 			foreach ($r as $rr) {
 				$j = $rr['adjust'] ? DateTimeFormat::local($rr['start'], 'j') : DateTimeFormat::utc($rr['start'], 'j');
 				if (empty($links[$j])) {
-					$links[$j] = System::baseUrl() . '/' . DI::args()->getCommand() . '#link-' . $j;
+					$links[$j] = DI::baseUrl() . '/' . DI::args()->getCommand() . '#link-' . $j;
 				}
 			}
 		}
@@ -238,7 +224,7 @@ function cal_content(App $a)
 		if (!empty($_GET['id'])) {
 			$tpl = Renderer::getMarkupTemplate("event.tpl");
 		} else {
-//			if (Config::get('experimentals','new_calendar')==1){
+//			if (DI::config()->get('experimentals','new_calendar')==1){
 			$tpl = Renderer::getMarkupTemplate("events_js.tpl");
 //			} else {
 //				$tpl = Renderer::getMarkupTemplate("events.tpl");
@@ -257,17 +243,17 @@ function cal_content(App $a)
 
 		$o = Renderer::replaceMacros($tpl, [
 			'$tabs' => $tabs,
-			'$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'), '', ''],
+			'$title' => DI::l10n()->t('Events'),
+			'$view' => DI::l10n()->t('View'),
+			'$previous' => [DI::baseUrl() . "/events/$prevyear/$prevmonth", DI::l10n()->t('Previous'), '', ''],
+			'$next' => [DI::baseUrl() . "/events/$nextyear/$nextmonth", DI::l10n()->t('Next'), '', ''],
 			'$calendar' => Temporal::getCalendarTable($y, $m, $links, ' eventcal'),
 			'$events' => $events,
-			"today" => L10n::t("today"),
-			"month" => L10n::t("month"),
-			"week" => L10n::t("week"),
-			"day" => L10n::t("day"),
-			"list" => L10n::t("list"),
+			"today" => DI::l10n()->t("today"),
+			"month" => DI::l10n()->t("month"),
+			"week" => DI::l10n()->t("week"),
+			"day" => DI::l10n()->t("day"),
+			"list" => DI::l10n()->t("list"),
 		]);
 
 		if (!empty($_GET['id'])) {
@@ -280,14 +266,14 @@ function cal_content(App $a)
 
 	if ($mode == 'export') {
 		if (!$owner_uid) {
-			notice(L10n::t('User not found'));
+			notice(DI::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() !== $owner_uid) && !Feature::isEnabled($owner_uid, "export_calendar")) {
-			notice(L10n::t('Permission denied.') . EOL);
+			notice(DI::l10n()->t('Permission denied.') . EOL);
 			DI::baseUrl()->redirect('cal/' . $nick);
 		}
 
@@ -296,9 +282,9 @@ function cal_content(App $a)
 
 		if (!$evexport["success"]) {
 			if ($evexport["content"]) {
-				notice(L10n::t('This calendar format is not supported'));
+				notice(DI::l10n()->t('This calendar format is not supported'));
 			} else {
-				notice(L10n::t('No exportable data found'));
+				notice(DI::l10n()->t('No exportable data found'));
 			}
 
 			// If it the own calendar return to the events page
@@ -315,7 +301,7 @@ function cal_content(App $a)
 		// If nothing went wrong we can echo the export content
 		if ($evexport["success"]) {
 			header('Content-type: text/calendar');
-			header('content-disposition: attachment; filename="' . L10n::t('calendar') . '-' . $nick . '.' . $evexport["extension"] . '"');
+			header('content-disposition: attachment; filename="' . DI::l10n()->t('calendar') . '-' . $nick . '.' . $evexport["extension"] . '"');
 			echo $evexport["content"];
 			exit();
 		}