X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcal.php;h=edcbaa7e8ff875ba5da970f2b54f4c7b0cab117e;hb=010ec99b35c2bee8f23060e96c2af3ba5849cf84;hp=d8140cf4104a125d82baae3326cb7ed81779050e;hpb=6c36fd9e01510a14fea9de766b4afe6760912a2e;p=friendica.git

diff --git a/mod/cal.php b/mod/cal.php
index d8140cf410..edcbaa7e8f 100644
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -1,6 +1,22 @@
 <?php
 /**
- * @file mod/cal.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  * The calendar module
  *
  * This calendar is for profile visitors and contains only the events
@@ -10,8 +26,8 @@
 use Friendica\App;
 use Friendica\Content\Feature;
 use Friendica\Content\Nav;
+use Friendica\Content\Text\BBCode;
 use Friendica\Content\Widget;
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
@@ -20,6 +36,7 @@ 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;
 
@@ -54,14 +71,14 @@ function cal_init(App $a)
 
 	$account_type = Contact::getAccountType($profile);
 
-	$tpl = Renderer::getMarkupTemplate("widget/vcard.tpl");
+	$tpl = Renderer::getMarkupTemplate('widget/vcard.tpl');
 
 	$vcard_widget = Renderer::replaceMacros($tpl, [
 		'$name' => $profile['name'],
 		'$photo' => $profile['photo'],
-		'$addr' => (($profile['addr'] != "") ? $profile['addr'] : ""),
+		'$addr' => $profile['addr'] ?: '',
 		'$account_type' => $account_type,
-		'$pdesc' => (($profile['pdesc'] != "") ? $profile['pdesc'] : ""),
+		'$about' => BBCode::convert($profile['about'] ?: ''),
 	]);
 
 	$cal_widget = Widget\CalendarExport::getHTML();
@@ -102,27 +119,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);
@@ -135,7 +139,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') {