X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcal.php;h=8f5c1b14c65f6f9f4210ce03d1e70f159a41131d;hb=0f546f7f0f8b41bd7510bd3644419c002746ce34;hp=4a6e2c992881155059272a09d9b9bd8eea2b29b1;hpb=6cfd3f589faa766463d0830865d6570601734879;p=friendica.git

diff --git a/mod/cal.php b/mod/cal.php
index 4a6e2c9928..8f5c1b14c6 100644
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @file mod/cal.php
  * @brief The calendar module
@@ -8,40 +7,38 @@
  */
 use Friendica\App;
 use Friendica\Content\Feature;
+use Friendica\Content\Nav;
 use Friendica\Core\Config;
-use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
+use Friendica\Model\Profile;
+use Friendica\Protocol\DFRN;
 
 require_once 'include/event.php';
-require_once 'include/redir.php';
 
 function cal_init(App $a)
 {
 	if ($a->argc > 1) {
-		auto_redir($a, $a->argv[1]);
+		DFRN::autoRedir($a, $a->argv[1]);
 	}
 
 	if ((Config::get('system', 'block_public')) && (!local_user()) && (!remote_user())) {
 		return;
 	}
 
-	nav_set_selected('events');
+	Nav::setSelected('events');
 
 	if ($a->argc > 1) {
 		$nick = $a->argv[1];
-		$user = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
-			dbesc($nick)
-		);
-
-		if (!count($user)) {
+		$user = dba::selectFirst('user', [], ['nickname' => $nick, 'blocked' => false]);
+		if (!DBM::is_result($user)) {
 			return;
 		}
 
-		$a->data['user'] = $user[0];
-		$a->profile_uid = $user[0]['uid'];
+		$a->data['user'] = $user;
+		$a->profile_uid = $user['uid'];
 
 		// if it's a json request abort here becaus we don't
 		// need the widget data
@@ -49,19 +46,19 @@ function cal_init(App $a)
 			return;
 		}
 
-		$profile = get_profiledata_by_nick($nick, $a->profile_uid);
+		$profile = Profile::getByNickname($nick, $a->profile_uid);
 
 		$account_type = Contact::getAccountType($profile);
 
 		$tpl = get_markup_template("vcard-widget.tpl");
 
-		$vcard_widget = replace_macros($tpl, array(
+		$vcard_widget = replace_macros($tpl, [
 			'$name' => $profile['name'],
 			'$photo' => $profile['photo'],
 			'$addr' => (($profile['addr'] != "") ? $profile['addr'] : ""),
 			'$account_type' => $account_type,
 			'$pdesc' => (($profile['pdesc'] != "") ? $profile['pdesc'] : ""),
-		));
+		]);
 
 		$cal_widget = widget_events();
 
@@ -78,23 +75,23 @@ function cal_init(App $a)
 
 function cal_content(App $a)
 {
-	nav_set_selected('events');
+	Nav::setSelected('events');
 
 	// get the translation strings for the callendar
 	$i18n = get_event_strings();
 
 	$htpl = get_markup_template('event_head.tpl');
-	$a->page['htmlhead'] .= replace_macros($htpl, array(
+	$a->page['htmlhead'] .= replace_macros($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(
+	$a->page['end'] .= replace_macros($etpl, [
 		'$baseurl' => System::baseUrl(),
-	));
+	]);
 
 	$mode = 'view';
 	$y = 0;
@@ -148,7 +145,7 @@ function cal_content(App $a)
 	$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') {
@@ -210,14 +207,14 @@ function cal_content(App $a)
 		$adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish);
 
 		// put the event parametes in an array so we can better transmit them
-		$event_params = array(
+		$event_params = [
 			'event_id' => (x($_GET, 'id') ? $_GET["id"] : 0),
 			'start' => $start,
 			'finish' => $finish,
 			'adjust_start' => $adjust_start,
 			'adjust_finish' => $adjust_finish,
 			'ignored' => $ignored,
-		);
+		];
 
 		// get events by id or by date
 		if (x($_GET, 'id')) {
@@ -226,7 +223,7 @@ function cal_content(App $a)
 			$r = events_by_date($owner_uid, $event_params, $sql_extra);
 		}
 
-		$links = array();
+		$links = [];
 
 		if (DBM::is_result($r)) {
 			$r = sort_by_date($r);
@@ -259,7 +256,7 @@ function cal_content(App $a)
 
 		// 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;
@@ -267,13 +264,13 @@ function cal_content(App $a)
 			$events[$key]['item'] = $event_item;
 		}
 
-		$o = replace_macros($tpl, array(
+		$o = replace_macros($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'), '', ''),
+			'$previous' => [System::baseUrl() . "/events/$prevyear/$prevmonth", t('Previous'), '', ''],
+			'$next' => [System::baseUrl() . "/events/$nextyear/$nextmonth", t('Next'), '', ''],
 			'$calendar' => cal($y, $m, $links, ' eventcal'),
 			'$events' => $events,
 			"today" => t("today"),
@@ -281,7 +278,7 @@ function cal_content(App $a)
 			"week" => t("week"),
 			"day" => t("day"),
 			"list" => t("list"),
-		));
+		]);
 
 		if (x($_GET, 'id')) {
 			echo $o;