Merge branch 'develop' into improvement/move-app-to-src-2

[friendica.git] / mod / cal.php

diff --git a/mod/cal.php b/mod/cal.php
index 8b8dbed958ad3284bf3aee4ad85126e7b229c9ed..cd884e50e4b000b02f62512048cd73e7afa43909 100644 (file)
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -6,10 +6,12 @@
  *     of the profile owner
  */
 
+use Friendica\App;
+
 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 +66,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;
@@ -84,13 +82,11 @@ function cal_content(&$a) {
                '$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' => App::get_baseurl(),
-               '$editselect' => $editselect
        ));
 
        $o ="";
@@ -229,9 +225,9 @@ function cal_content(&$a) {
 
                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)) {
+                               if (! x($links,$j)) {
                                        $links[$j] = App::get_baseurl() . '/' . $a->cmd . '#link-' . $j;
                                }
                        }
@@ -275,8 +271,8 @@ function cal_content(&$a) {
                        '$tabs'         => $tabs,
                        '$title'        => t('Events'),
                        '$view'         => t('View'),
-                       '$previus'      => array(App::get_baseurl()."/events/$prevyear/$prevmonth",t('Previous'),'',''),
-                       '$next'         => array(App::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,