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 a130e7a30f81de33c380c8a347d9d741da6f6865..170e7ea4c2f44dc55a8383f037b41280bdd1a4be 100644 (file)
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -7,16 +7,20 @@
  */
 
 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');
+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;
        }
 
@@ -43,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");
 
@@ -71,8 +75,7 @@ function cal_content(App $a) {
        nav_set_selected('events');
 
        // 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();
@@ -129,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;
                }
@@ -224,7 +227,7 @@ 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'));
@@ -238,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);
 
@@ -250,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");