Merge branch 'develop' into issue/3878-move-Contact-to-src

[friendica.git] / mod / cal.php

diff --git a/mod/cal.php b/mod/cal.php
index b3cd1e3221a215e2b81bd5abe1ffb641ac54b8a9..170e7ea4c2f44dc55a8383f037b41280bdd1a4be 100644 (file)
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -6,14 +6,21 @@
  *     of the profile owner
  */
 
-require_once('include/event.php');
-require_once('include/redir.php');
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
+use Friendica\Object\Contact;
+
+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]);
 
-       if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+       if((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
                return;
        }
 
@@ -40,7 +47,7 @@ function cal_init(App $a) {
 
                $profile = get_profiledata_by_nick($nick, $a->profile_uid);
 
-               $account_type = account_type($profile);
+               $account_type = Contact::getAccountType($profile);
 
                $tpl = get_markup_template("vcard-widget.tpl");
 
@@ -67,30 +74,23 @@ function cal_init(App $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;
+       $firstDay = PConfig::get(local_user(),'system','first_day_of_week', 0);
 
        // 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(
-               '$baseurl' => App::get_baseurl(),
+               '$baseurl' => System::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' => App::get_baseurl(),
-               '$editselect' => $editselect
+               '$baseurl' => System::baseUrl(),
        ));
 
        $o ="";
@@ -132,7 +132,7 @@ function cal_content(App $a) {
                        intval($contact_id),
                        intval($a->profile['profile_uid'])
                );
-               if (dbm::is_result($r)) {
+               if (DBM::is_result($r)) {
                        $contact = $r[0];
                        $remote_contact = true;
                }
@@ -227,12 +227,12 @@ function cal_content(App $a) {
 
                $links = array();
 
-               if (dbm::is_result($r)) {
+               if (DBM::is_result($r)) {
                        $r = sort_by_date($r);
                        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] = App::get_baseurl() . '/' . $a->cmd . '#link-' . $j;
+                                       $links[$j] = System::baseUrl() . '/' . $a->cmd . '#link-' . $j;
                                }
                        }
                }
@@ -241,7 +241,7 @@ function cal_content(App $a) {
                $events=array();
 
                // transform the event in a usable array
-               if (dbm::is_result($r))
+               if (DBM::is_result($r))
                        $r = sort_by_date($r);
                        $events = process_events($r);
 
@@ -253,7 +253,7 @@ function cal_content(App $a) {
                if (x($_GET,'id')){
                        $tpl =  get_markup_template("event.tpl");
                } else {
-//                     if (get_config('experimentals','new_calendar')==1){
+//                     if (Config::get('experimentals','new_calendar')==1){
                                $tpl = get_markup_template("events_js.tpl");
 //                     } else {
 //                             $tpl = get_markup_template("events.tpl");
@@ -271,12 +271,12 @@ function cal_content(App $a) {
                }
 
                $o = replace_macros($tpl, array(
-                       '$baseurl'      => App::get_baseurl(),
+                       '$baseurl'      => System::baseUrl(),
                        '$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(System::baseUrl()."/events/$prevyear/$prevmonth", t('Previous'),'',''),
+                       '$next'         => array(System::baseUrl()."/events/$nextyear/$nextmonth", t('Next'),'',''),
                        '$calendar' => cal($y,$m,$links, ' eventcal'),
 
                        '$events'       => $events,