rename CSS attributes notify => notification

[friendica.git] / mod / cal.php

diff --git a/mod/cal.php b/mod/cal.php
index 1c14f9e77057f19aecdee24890c44c0a16da14b5..e6570018b7cb64aa8fcc972c5ff6b21b3992a2df 100644 (file)
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -11,7 +11,6 @@ use Friendica\App;
 use Friendica\Content\Feature;
 use Friendica\Content\Nav;
 use Friendica\Content\Widget;
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
@@ -25,7 +24,7 @@ use Friendica\Util\Temporal;
 
 function cal_init(App $a)
 {
-       if (Config::get('system', 'block_public') && !Session::isAuthenticated()) {
+       if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
                throw new \Friendica\Network\HTTPException\ForbiddenException(DI::l10n()->t('Access denied.'));
        }
 
@@ -102,27 +101,14 @@ function cal_content(App $a)
        }
 
        // Setup permissions structures
-       $remote_contact = false;
-       $contact_id = 0;
-
        $owner_uid = intval($a->data['user']['uid']);
        $nick = $a->data['user']['nickname'];
 
-       if (!empty(Session::getRemoteContactID($a->profile['profile_uid']))) {
-               $contact_id = Session::getRemoteContactID($a->profile['profile_uid']);
-       }
+       $contact_id = Session::getRemoteContactID($a->profile['uid']);
 
-       if ($contact_id) {
-               $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-                       intval($contact_id),
-                       intval($a->profile['profile_uid'])
-               );
-               if (DBA::isResult($r)) {
-                       $remote_contact = true;
-               }
-       }
+       $remote_contact = $contact_id && DBA::exists('contact', ['id' => $contact_id, 'uid' => $a->profile['uid']]);
 
-       $is_owner = local_user() == $a->profile['profile_uid'];
+       $is_owner = local_user() == $a->profile['uid'];
 
        if ($a->profile['hidewall'] && !$is_owner && !$remote_contact) {
                notice(DI::l10n()->t('Access to this profile has been restricted.') . EOL);
@@ -237,7 +223,7 @@ function cal_content(App $a)
                if (!empty($_GET['id'])) {
                        $tpl = Renderer::getMarkupTemplate("event.tpl");
                } else {
-//                     if (Config::get('experimentals','new_calendar')==1){
+//                     if (DI::config()->get('experimentals','new_calendar')==1){
                        $tpl = Renderer::getMarkupTemplate("events_js.tpl");
 //                     } else {
 //                             $tpl = Renderer::getMarkupTemplate("events.tpl");