X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcal.php;h=f43a4e8a70b647d13501bf276033970f4d1bb0cf;hb=fb94a0add71642b08bab610d1cfb70eab4598ffc;hp=3a229ebadb607d1424e5f9300b20eefac06e1b05;hpb=e09c55527c2e192621cbea6703f56b34bbc3b4bd;p=friendica.git

diff --git a/mod/cal.php b/mod/cal.php
index 3a229ebadb..f43a4e8a70 100644
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -9,7 +9,7 @@
 require_once('include/event.php');
 require_once('include/redir.php');
 
-function cal_init(&$a) {
+function cal_init(App $a) {
 	if($a->argc > 1)
 		auto_redir($a, $a->argv[1]);
 
@@ -64,13 +64,9 @@ function cal_init(&$a) {
 	return;
 }
 
-function cal_content(&$a) {
+function cal_content(App $a) {
 	nav_set_selected('events');
 
-	$editselect = 'none';
-	if( feature_enabled(local_user(), 'richtext') )
-		$editselect = 'textareas';
-
 	// First day of the week (0 = Sunday)
 	$firstDay = get_pconfig(local_user(),'system','first_day_of_week');
 	if ($firstDay === false) $firstDay=0;
@@ -80,17 +76,15 @@ function cal_content(&$a) {
 
 	$htpl = get_markup_template('event_head.tpl');
 	$a->page['htmlhead'] .= replace_macros($htpl,array(
-		'$baseurl' => $a->get_baseurl(),
+		'$baseurl' => App::get_baseurl(),
 		'$module_url' => '/cal/' . $a->data['user']['nickname'],
 		'$modparams' => 2,
 		'$i18n' => $i18n,
-		'$editselect' => $editselect
 	));
 
 	$etpl = get_markup_template('event_end.tpl');
 	$a->page['end'] .= replace_macros($etpl,array(
-		'$baseurl' => $a->get_baseurl(),
-		'$editselect' => $editselect
+		'$baseurl' => App::get_baseurl(),
 	));
 
 	$o ="";
@@ -132,7 +126,7 @@ function cal_content(&$a) {
 			intval($contact_id),
 			intval($a->profile['profile_uid'])
 		);
-		if(count($r)) {
+		if (dbm::is_result($r)) {
 			$contact = $r[0];
 			$remote_contact = true;
 		}
@@ -227,12 +221,13 @@ function cal_content(&$a) {
 
 		$links = array();
 
-		if(count($r)) {
+		if (dbm::is_result($r)) {
 			$r = sort_by_date($r);
-			foreach($r as $rr) {
+			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))
-					$links[$j] = $a->get_baseurl() . '/' . $a->cmd . '#link-' . $j;
+				if (! x($links,$j)) {
+					$links[$j] = App::get_baseurl() . '/' . $a->cmd . '#link-' . $j;
+				}
 			}
 		}
 
@@ -240,7 +235,7 @@ function cal_content(&$a) {
 		$events=array();
 
 		// transform the event in a usable array
-		if(count($r))
+		if (dbm::is_result($r))
 			$r = sort_by_date($r);
 			$events = process_events($r);
 
@@ -270,12 +265,12 @@ function cal_content(&$a) {
 		}
 
 		$o = replace_macros($tpl, array(
-			'$baseurl'	=> $a->get_baseurl(),
+			'$baseurl'	=> App::get_baseurl(),
 			'$tabs'		=> $tabs,
 			'$title'	=> t('Events'),
 			'$view'		=> t('View'),
-			'$previus'	=> array($a->get_baseurl()."/events/$prevyear/$prevmonth",t('Previous'),'',''),
-			'$next'		=> array($a->get_baseurl()."/events/$nextyear/$nextmonth",t('Next'),'',''),
+			'$previous'	=> array(App::get_baseurl()."/events/$prevyear/$prevmonth",t('Previous'),'',''),
+			'$next'		=> array(App::get_baseurl()."/events/$nextyear/$nextmonth",t('Next'),'',''),
 			'$calendar' => cal($y,$m,$links, ' eventcal'),
 
 			'$events'	=> $events,