X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcal.php;h=9e32b87d6f60bc829eb8a9c7c3936b3c855ddc4b;hb=9435cc4b88de611407bf992f571e12e8f54b3c51;hp=6279bc24116b9ca2c0f84f61264c435417ed4fe5;hpb=5dfee31108fc92a7abca5f99b8fdf1b34aec5dd5;p=friendica.git

diff --git a/mod/cal.php b/mod/cal.php
index 6279bc2411..9e32b87d6f 100644
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -11,8 +11,6 @@ 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\Session;
 use Friendica\Database\DBA;
@@ -21,12 +19,13 @@ 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()) {
+	if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
 		throw new \Friendica\Network\HTTPException\ForbiddenException(DI::l10n()->t('Access denied.'));
 	}
 
@@ -103,27 +102,14 @@ 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(DI::l10n()->t('Access to this profile has been restricted.') . EOL);
@@ -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') {
@@ -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");