fixed Stud.IP 6.0 and PHP 8 problems, fixes #2

d7722cf0 · Moritz Strohm · 523aaec7 · d7722cf0 · d7722cf0 · d7722cf0
Commit d7722cf0 authored 5 months ago by Moritz Strohm
--- a/TandemPlugin.class.php
+++ b/TandemPlugin.class.php
@@ -23,19 +23,19 @@ require_once(__DIR__ . '/classes/TandemMatching.class.php');
 class TandemPlugin extends StudIPPlugin implements SystemPlugin, PortalPlugin
 {
-    public static function isGenderSearchEnabled()
+    public static function isGenderSearchEnabled() : bool
    {
        return (bool)Config::get()->TANDEMPLUGIN_GENDER_SEARCH_ENABLED;
    }
-    public function isOldStudip()
+    public function isOldStudip() : bool
    {
        return version_compare($GLOBALS['SOFTWARE_VERSION'], '5.0', '<');
    }
-    public function getLevels()
+    public function getLevels() : array
    {
        return [
            'A1',
@@ -48,7 +48,7 @@ class TandemPlugin extends StudIPPlugin implements SystemPlugin, PortalPlugin
    }
-    public function userHasAccess($user_id)
+    public function userHasAccess($user_id) : bool
    {
        return !\TandemPlugin\BlocklistEntry::userIsBlocked($user_id);
    }
@@ -180,7 +180,7 @@ class TandemPlugin extends StudIPPlugin implements SystemPlugin, PortalPlugin
    }
-    public function cleanupTandemData($event, User $user)
+    public function cleanupTandemData($event, User $user) : void
    {
        TandemUserMotherLanguage::deleteByUser_id($user->id);
@@ -264,12 +264,14 @@ class TandemPlugin extends StudIPPlugin implements SystemPlugin, PortalPlugin
        if(count($profiles) == 0) {
            $template->set_attribute('never_used', true);
        } else {
-            $pair_exist = [];
            $match_count   = [];
+            $pair_requests = [];
+            $pairs         = [];
            $matches_exist = false;
            foreach($profiles as $profile) {
-                $pairs[$profile->id] = TandemPair::findByProfileAndStatus($profile, 1)[0];
+                $pairs[$profile->id] = TandemPair::findByProfileAndStatus($profile)[0];
                $pair_requests[$profile->id] = TandemPair::countByProfileAndStatus($profile, 0);
                if(!$pairs[$profile->id]) {
                    //We're only looking for matches if no pairs have been found.

--- a/TandemPluginCronjob.class.php
+++ b/TandemPluginCronjob.class.php
@@ -14,9 +14,6 @@
 **/
-require_once('lib/classes/CronJob.class.php');
 class TandemPluginCronjob extends CronJob
 {
    public static function getName()
@@ -33,7 +30,7 @@ class TandemPluginCronjob extends CronJob
    public function setUp()
    {
        global $STUDIP_BASE_PATH;
-        require_once($STUDIP_BASE_PATH . '/lib/classes/Config.class.php');
+        require_once($STUDIP_BASE_PATH . '/lib/classes/Config.php');
    }

--- a/classes/TandemManager.class.php
+++ b/classes/TandemManager.class.php
@@ -23,7 +23,7 @@ class TandemManager
    /**
     * Sends a match notification to the user who owns the tandem request.
     */
-    public static function sendMatchNotification(TandemProfile $request, TandemProfile $match)
+    public static function sendMatchNotification(TandemProfile $request, TandemProfile $match) : void
    {
        $message_title = '';
        $message_text = '';
@@ -92,9 +92,10 @@ class TandemManager
     *
     * @param TandemProfile $request The profile of the user who is applying for a tandem.
     * @param TandemProfile $offer The profile where the user applies for building a tandem.
-     * @param User $user The user who applies for a tandem.
+     *
+     * @returns bool True on success, false on failure.
     */
-    public static function applyForPair(TandemProfile $request, TandemProfile $offer)
+    public static function applyForPair(TandemProfile $request, TandemProfile $offer) : bool
    {
        $pair = new TandemPair();
        $pair->request_profile_id = $request->id;
@@ -448,9 +449,9 @@ class TandemManager
     * This method handles termination of a tandem pair.
     *
-     * @return True on success, false on failure.
+     * @return bool True on success, false on failure.
     */
-    public static function terminatePair(TandemPair $pair, User $user, $delete_users_profile = false)
+    public static function terminatePair(TandemPair $pair, User $user, $delete_users_profile = false) : bool
    {
        $message_text = '';
        $message_title = '';
@@ -474,11 +475,7 @@ class TandemManager
            $message_text = sprintf(
                '%s has terminated the tandem for the language %s!',
-                (
+                $user->getFullName(),
-                    $user
-                    ? $user->getFullName()
-                    : 'unknown'
-                ),
                ($target_language->name_eng
                    ? $target_language->name_eng
                    : $target_language->name)
@@ -491,11 +488,7 @@ class TandemManager
            $message_text = sprintf(
                '%s hat das Tandem für die Sprache %s aufgelöst!',
-                (
+                $user->getFullName(),
-                    $user
-                    ? $user->getFullName()
-                    : 'unbekannt'
-                ),
                ($target_language->name_ger
                    ? $target_language->name_ger
                    : $target_language->name)

--- a/controllers/admin.php
+++ b/controllers/admin.php
@@ -148,17 +148,26 @@ class AdminController extends PluginController
                    }
                }
+                $requester_sex = '?';
+                if ($pair->request->user->geschlecht == '1') {
+                    $requester_sex = 'm';
+                } elseif ($pair->request->user->geschlecht == '2') {
+                    $requester_sex = 'w';
+                }
+                $offerer_sex = '?';
+                if ($pair->offer->user->geschlecht == '1') {
+                    $offerer_sex = 'm';
+                } elseif ($pair->offer->user->geschlecht == '2') {
+                    $offerer_sex = 'w';
+                }
                if (Config::get()->TANDEMPLUGIN_PROOF_FIELDS_ENABLED) {
                    $csv_data[] = [
                        $pair->request->user->nachname,
                        $pair->request->user->vorname,
                        $pair->request->user->email,
                        implode(',', $user1_study_names),
-                        (($pair->request->user->geschlecht == '1')
+                        $requester_sex,
-                       ? 'm'
-                       : ($pair->request->user->geschlecht == '2')
-                       ? 'w'
-                       : '?'),
                        $pair->offer->target_language_id,
                        $pair->request->target_language_id,
                        $user1_proofs,
@@ -167,11 +176,7 @@ class AdminController extends PluginController
                        $pair->offer->user->vorname,
                        $pair->offer->user->email,
                        implode(',', $user2_study_names),
-                        (($pair->offer->user->geschlecht == '1')
+                        $offerer_sex,
-                       ? 'm'
-                       : ($pair->offer->user->geschlecht == '2')
-                       ? 'w'
-                       : '?'),
                        $pair->request->target_language_id,
                        $pair->offer->target_language_id,
                        $user2_proofs,
@@ -184,11 +189,7 @@ class AdminController extends PluginController
                        $pair->request->user->vorname,
                        $pair->request->user->email,
                        implode(',', $user1_study_names),
-                        (($pair->request->user->geschlecht == '1')
+                        $requester_sex,
-                       ? 'm'
-                       : ($pair->request->user->geschlecht == '2')
-                       ? 'w'
-                       : '?'),
                        $pair->offer->target_language_id,
                        $pair->request->target_language_id,
@@ -196,11 +197,7 @@ class AdminController extends PluginController
                        $pair->offer->user->vorname,
                        $pair->offer->user->email,
                        implode(',', $user2_study_names),
-                        (($pair->offer->user->geschlecht == '1')
+                        $offerer_sex,
-                       ? 'm'
-                       : ($pair->offer->user->geschlecht == '2')
-                       ? 'w'
-                       : '?'),
                        $pair->request->target_language_id,
                        $pair->offer->target_language_id,
@@ -250,10 +247,7 @@ class AdminController extends PluginController
        $this->terminated_pairs = [];
-        $this->terminated_pairs = TerminatedTandemPair::findBySql(
+        $this->terminated_pairs = TerminatedTandemPair::findBySql('TRUE ORDER BY `mkdate` DESC');
-            'TRUE ORDER BY mkdate DESC',
-            []
-        );
        if(Request::get('csv_export')) {
            //A CSV file with all terminated pairs shall be created instead of
@@ -283,28 +277,32 @@ class AdminController extends PluginController
                    }
                }
+                $requester_sex = '?';
+                if ($pair->requester->geschlecht == '1') {
+                    $requester_sex = 'm';
+                } elseif ($pair->requester->geschlecht == '2') {
+                    $requester_sex = 'w';
+                }
+                $offerer_sex = '?';
+                if ($pair->offerer->geschlecht == '1') {
+                    $offerer_sex = 'm';
+                } elseif ($pair->offerer->geschlecht == '2') {
+                    $offerer_sex = 'w';
+                }
                $csv_data[] = [
                    $pair->requester->nachname,
                    $pair->requester->vorname,
                    $pair->requester->email,
                    implode(',', $user1_study_names),
-                    (($pair->requester->geschlecht == '1')
+                    $requester_sex,
-                   ? 'm'
-                   : ($pair->requester->geschlecht == '2')
-                   ? 'w'
-                   : '?'),
                    $pair->offerer_language_id,
                    $pair->requester_language_id,
                    $pair->offerer->nachname,
                    $pair->offerer->vorname,
                    $pair->offerer->email,
                    implode(',', $user2_study_names),
-                    (($pair->offerer->geschlecht == '1')
+                    $offerer_sex,
-                   ? 'm'
-                   : ($pair->offerer->geschlecht == '2')
-                   ? 'w'
-                   : '?'),
                    $pair->requester_language_id,
                    $pair->offerer_language_id,
@@ -621,7 +619,7 @@ class AdminController extends PluginController
    }
-    protected function validateFormFields()
+    protected function validateFormFields() :bool
    {
        $name = Request::get('name');
        $name_ger = Request::get('name_ger');
@@ -824,7 +822,7 @@ class AdminController extends PluginController
                );
                $this->response->add_header('X-Dialog-Close', '1');
            } else {
-                PageLayout::postFailure(
+                PageLayout::postError(
                    sprintf(
                        dgettext('TandemPlugin', 'Beim Hinzufügen von %s zur Blockliste trat ein Fehler auf.'),
                        $user->getFullName()

--- a/controllers/my_tandems.php
+++ b/controllers/my_tandems.php
@@ -22,9 +22,7 @@ require_once(__DIR__ . '/../models/TandemUserMotherLanguage.class.php');
 class MyTandemsController extends PluginController
 {
-    protected $utf8decode_xhr = true;
+    protected function buildSidebar() : void
-    private function buildSidebar()
    {
        $sidebar = Sidebar::get();
@@ -82,6 +80,8 @@ class MyTandemsController extends PluginController
            Navigation::activateItem('/profile/my_tandems/index');
        }
+        $this->first_run = false;
        $this->mother_languages = TandemUserMotherLanguage::findByUser_id(
            $this->user->id
        );
@@ -174,12 +174,12 @@ class MyTandemsController extends PluginController
        if (Request::submitted('manage')) {
            //check for added, edited and deleted entries:
-            $ids = Request::getArray('ids', []);
+            $ids          = Request::getArray('ids');
-            $language_ids = Request::getArray('language_ids', []);
+            $language_ids = Request::getArray('language_ids');
-            $countries = Request::getArray('countries', []);
+            $countries    = Request::getArray('countries');
-            $regions = Request::getArray('regions', []);
+            $regions      = Request::getArray('regions');
-            $status = Request::getArray('status', []);
+            $status       = Request::getArray('status');
-            $levels = Request::getArray('level', []);
+            $levels       = Request::getArray('level');
            $processed_language_ids = []; //array of languages that were processed
            $duplicate_language = false;

--- a/controllers/pair.php
+++ b/controllers/pair.php
@@ -276,7 +276,7 @@ class PairController extends PluginController
            return;
        }
-        //Check, if the "offerer" (the opposite person) has made an request
+        //Check, if the "offerer" (the opposite person) has made a request
        //for the current user's request.
        //This would mean the current user can simply accept or reject the offer
        //from the "offerer".
@@ -589,7 +589,7 @@ class PairController extends PluginController
        $result = TandemManager::terminatePair(
            $pair,
            $user,
-            (($pair->request->user_id == $user->id) ? true : false)
+            ($pair->request->user_id === $user->id)
        );
        if($result) {

--- a/controllers/profile.php
+++ b/controllers/profile.php
@@ -23,9 +23,6 @@ require_once(__DIR__ . '/../classes/TandemManager.class.php');
 class ProfileController extends PluginController
 {
-    protected $utf8decode_xhr = true;
    public function before_filter(&$action, &$args)
    {
        parent::before_filter($action, $args);
@@ -38,8 +35,11 @@ class ProfileController extends PluginController
    }
-    private function addEditHandler($edit_mode = false)
+    private function addEditHandler($edit_mode = false) : void
    {
+        $this->hide_form = false;
+        $this->pair_exists = false;
        //load the list of languages:
        $this->language_list = TandemLanguage::findBySql('TRUE');
@@ -57,7 +57,7 @@ class ProfileController extends PluginController
        if ($edit_mode) {
            //In edit mode we have to check, if the tandem profile referenced by its
            //ID exists in the database:
-            if(!$this->tandem_profile) {
+            if ($this->tandem_profile->isNew()) {
                PageLayout::postError(
                    dgettext('TandemPlugin', 'Das ausgewählte Profil wurde nicht in der Datenbank gefunden!')
                );
@@ -78,15 +78,15 @@ class ProfileController extends PluginController
        }
        if($edit_mode) {
-            $this->pair_exists = (TandemPair::countByProfileAndStatus($this->tandem_profile, 1) > 0);
+            $this->pair_exists = (TandemPair::countByProfileAndStatus($this->tandem_profile) > 0);
        }
        if(Request::submitted('save')) {
            //A tandem profile shall be saved.
            //Read all attributes:
-            $this->target_language_id = Request::get('target_language_id', null);
+            $this->target_language_id = Request::get('target_language_id');
-            $this->level = Request::get('level', null);
+            $this->level = Request::get('level');
            $this->requested_level = Config::get()->TANDEMPLUGIN_USE_LEVEL
                ? Request::get('requested_level', '')
                : '';
@@ -181,7 +181,7 @@ class ProfileController extends PluginController
                $result = $this->tandem_profile->store();
            }
-            if($result == true) {
+            if ($result) {
                //Saving was successful. We can now look for matches.
                $matches = TandemMatching::findMatches(
                    $this->tandem_profile
@@ -206,7 +206,7 @@ class ProfileController extends PluginController
                    }
                }
-                $pair_exists = (TandemPair::countByProfileAndStatus($this->tandem_profile, 1) > 0);
+                $pair_exists = (TandemPair::countByProfileAndStatus($this->tandem_profile) > 0);
                if($pair_exists) {
                    PageLayout::postSuccess(
@@ -300,7 +300,7 @@ class ProfileController extends PluginController
        PageLayout::setTitle(
            dgettext('TandemPlugin', 'Profil hinzufügen')
        );
-        $this->addEditHandler(false);
+        $this->addEditHandler();
    }

--- a/migrations/01_initial.php
+++ b/migrations/01_initial.php
@@ -17,12 +17,13 @@
 class Initial extends Migration
 {
-    private static $cronjob = array(
+    protected string $cronjob_md5 = '';
+    private static array $cronjob = [
            'filename' => 'public/plugins_packages/data-quest/TandemPlugin/TandemPluginCronjob.class.php',
            'class' => 'TandemPluginCronjob',
-            'priority' => 'normal',
            'execution_interval' => ['3', '0'] //at 3:00 every day
-    );
+    ];
    public function __construct()
@@ -30,7 +31,6 @@ class Initial extends Migration
        $this->cronjob_md5 = md5(
            self::$cronjob['filename'] .
            self::$cronjob['class'] .
-            self::$cronjob['priority'] .
            self::$cronjob['execution_interval']
        );
@@ -145,12 +145,12 @@ class Initial extends Migration
            $db->exec(
                "INSERT INTO `cronjobs_schedules`
-                (`schedule_id`, `task_id`, `active`, `parameters`, `priority`,
+                (`schedule_id`, `task_id`, `active`, `parameters`,
-                `type`, `hour`, `minute`, `mkdate`, `chdate`, `last_result`)
+                `hour`, `minute`, `mkdate`, `chdate`, `last_result`)
                VALUES
                ('".$schedule_id."', '"
-                .$this->cronjob_md5."', '1', '[]', '".self::$cronjob['priority']
+                .$this->cronjob_md5."', '1', '[]', "
-                ."', 'periodic', '".self::$cronjob['execution_interval'][0]
+                ."'".self::$cronjob['execution_interval'][0]
                ."', '" . self::$cronjob['execution_interval'][1]
                ."', UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), NULL)"
            );

--- a/migrations/02_add_data.php
+++ b/migrations/02_add_data.php
@@ -17,7 +17,7 @@
 class AddData extends Migration
 {
-    private $languages = [
+    private array $languages = [
        ["ara", "Arabic", "Arabisch"],
        ["chi", "Chinese", "Chinesisch"],
        ["dan", "Danish", "Dänisch"],

--- a/models/BlocklistEntry.class.php
+++ b/models/BlocklistEntry.class.php
@@ -53,7 +53,7 @@ class BlocklistEntry extends \SimpleORMap
    }
-    public static function userIsBlocked($user_id)
+    public static function userIsBlocked($user_id) : bool
    {
        return self::countByUser_id($user_id) > 0;
    }

--- a/models/TandemOffer.class.php
+++ b/models/TandemOffer.class.php
@@ -14,9 +14,6 @@
 **/
-require_once(__DIR__ . '/TandemData.class.php');
 /**
 * A model class to store tandem offers for the TandemPlugin.
 *
@@ -84,9 +81,10 @@ require_once(__DIR__ . '/TandemData.class.php');
                if(count($correct_levels)) {
                    //at least one given level was correct:
-                    $sql .= "AND tandem_offers.level IN ( '" . implode($correct_levels, "','") . "')
+                    $sql .= "AND tandem_offers.level IN ( :correct_levels )'
                        ORDER BY FIELD(tandem_offers.level, '"
-                        . implode($correct_levels, "','") . "'), mkdate ";
+                        . implode( "','", $correct_levels) . "'), mkdate ";
+                    $sql_params['correct_levels'] = $correct_levels;
                }
            } else {
                //Only one level in array:
@@ -124,7 +122,7 @@ require_once(__DIR__ . '/TandemData.class.php');
    static public function countByTandemDataAndLevel(TandemData $tandem_data, Array $levels)
    {
-        $query = self::sqlForTandemDataAndLevel($tandem_data, $levels, $limit);
+        $query = self::sqlForTandemDataAndLevel($tandem_data, $levels);
        return self::countBySql($query['sql'], $query['params']);
    }
 }
--- a/models/TandemPair.class.php
+++ b/models/TandemPair.class.php
@@ -33,8 +33,8 @@ require_once(__DIR__ . '/TerminatedTandemPair.class.php');
 *     0: undecided/unanswered, 1: accepted, -1: rejected
 * @property string mkdate database column
 * @property string chdate database column
- * @property TandemRequest request belongs to TandemRequest
+ * @property TandemProfile request belongs to TandemProfile
- * @property TandemOffer offer belongs to TandemOffer
+ * @property TandemProfile offer belongs to TandemProfile
 */
 class TandemPair extends SimpleORMap
 {
@@ -63,7 +63,7 @@ require_once(__DIR__ . '/TerminatedTandemPair.class.php');
     * Finds tandem pairs by looking at the tandem requests and
     * tandem offers bound to tandem pairs.
     */
-    static public function findByUserId($user_id = null, Array $status = [])
+    static public function findByUserId($user_id = null, Array $status = []) : array
    {
        if($user_id == null) {
            return [];
@@ -118,7 +118,7 @@ require_once(__DIR__ . '/TerminatedTandemPair.class.php');
    /**
     * Returns the number of pairs for a given status and a given profile.
     */
-    static public function countByProfileAndStatus(TandemProfile $profile, $status = 1)
+    static public function countByProfileAndStatus(TandemProfile $profile, $status = 1) : int
    {
        return self::countBySql(
            '(request_profile_id = :profile_id OR offer_profile_id = :profile_id)
@@ -131,7 +131,7 @@ require_once(__DIR__ . '/TerminatedTandemPair.class.php');
    }
-    public function getStatusNameForUser(User $user)
+    public function getStatusNameForUser(User $user) : string
    {
        if($this->status == 0) {
            if($this->request->user_id == $user->id) {
@@ -159,7 +159,7 @@ require_once(__DIR__ . '/TerminatedTandemPair.class.php');
     *
     * @returns TerminatedTandemPair|null A TerminatedTandemPair object or null on failure.
     */
-    public function createTerminatedTandemPair()
+    public function createTerminatedTandemPair() : ?TerminatedTandemPair
    {
        if (!$this->request->user_id || !$this->offer->user_id) {
            return null;

--- a/models/TandemProfile.class.php
+++ b/models/TandemProfile.class.php
@@ -56,7 +56,7 @@ require_once(__DIR__ . '/TandemUserMotherLanguage.class.php');
        parent::configure($config);
    }
-    public function getTargetName()
+    public function getTargetName() : string
    {
        return $this->target_language->getLocalName()
            . ' ('
@@ -67,7 +67,7 @@ require_once(__DIR__ . '/TandemUserMotherLanguage.class.php');
    }
-    public function matchesSpokenLanguages(string $user_id)
+    public function matchesSpokenLanguages(string $user_id) : bool
    {
        return TandemUserMotherLanguage::countBySql(
            'user_id = :user_id

--- a/models/TandemUserMotherLanguage.class.php
+++ b/models/TandemUserMotherLanguage.class.php
@@ -52,7 +52,7 @@ require_once(__DIR__ . '/TandemLanguage.class.php');
    }
-    static public function findSortedByName($user_id = null)
+    static public function findSortedByName($user_id = null) : array
    {
        if(!$user_id) {
            return [];
@@ -85,7 +85,7 @@ require_once(__DIR__ . '/TandemLanguage.class.php');
            } elseif($this->country && $this->region) {
                $html .= sprintf('(%1$s, %2$s)', htmlReady($this->country), htmlReady($this->region));
            } elseif($this->region) {
-                $html .= sprintf('(%s)', htmlReady($uml->region));
+                $html .= sprintf('(%s)', htmlReady($this->region));
            }
        }
        if (Config::get()->TANDEMPLUGIN_USE_LEVEL && $this->level) {

--- a/plugin.manifest
+++ b/plugin.manifest
 pluginname=TandemPlugin
 pluginclassname=TandemPlugin
 origin=data-quest
-version=1.5.5-rc1
+version=1.6
 description=Dieses Plugin ermöglicht es, Sprachtandems innerhalb der Stud.IP Platform zu bilden.
-studipMinVersion=5.0
+studipMinVersion=5.5
-studipMaxVersion=5.9.99
+studipMaxVersion=6.0.99
--- a/templates/start.php
+++ b/templates/start.php
+<?php
+/**
+ * @var bool $never_used
+ * @var TandemProfile[] $profiles
+ * @var TandemPair[] $pairs
+ * @var string $current_user_id
+ * @var array $pair_requests
+ * @var array $match_count
+ */
+?>
 <section class="contentbox">
    <section>
        <a href="<?= PluginEngine::getLink('tandemplugin/my_tandems/index') ?>">
-        <? if($never_used): ?>
+        <?php if ($never_used) : ?>
            <?= dgettext('TandemPlugin', 'Hier klicken, um ein Sprachtandem zu finden!') ?>
-        <? else: ?>
+        <?php else : ?>
            <table class="default">
-            <? foreach($profiles as $profile): ?>
+            <?php foreach($profiles as $profile) : ?>
            <tr>
                <td>
                    <strong style="display:block;"><?= htmlReady($profile->target_language->getLocalName()) ?></strong>(<?= htmlReady($profile->level) ?>)
                </td>
                <td>
-                <? if($pairs[$profile->id]): ?>
+                <?php if ($pairs[$profile->id]) : ?>
                    <?= sprintf(
                        dgettext('TandemPlugin', 'Bestehendes Tandem mit %s'),
                        ($pairs[$profile->id]->request->user_id == $current_user_id)
@@ -22,34 +32,34 @@
                            : dgettext('TandemPlugin', 'unbekannt')
                        )
                    ) ?>
-                <? elseif($pair_requests[$profile->id] > 0): ?>
+                <?php elseif ($pair_requests[$profile->id] > 0) : ?>
-                    <? if($pair_requests[$profile->id] == 1): ?>
+                    <?php if($pair_requests[$profile->id] == 1) : ?>
                        <?= dgettext('TandemPlugin', 'Es gibt eine Anfrage zur Tandem-Bildung!') ?>
-                    <? else: ?>
+                    <?php else : ?>
                        <?= sprintf(
                            dgettext('TandemPlugin', 'Es gibt %s Anfragen zur Tandem-Bildung!'),
                            $pair_requests[$profile->id]
                            ) ?>
-                    <? endif ?>
+                    <?php endif ?>
-                <? else: ?>
+                <?php else : ?>
-                    <? if($match_count[$profile->id] > 0): ?>
+                    <?php if ($match_count[$profile->id] > 0) : ?>
                        <?= dgettext('TandemPlugin', 'Es wurden passende Sprachtandem-Angebote gefunden!') ?>
-                    <? else: ?>
+                    <?php else : ?>
                        <?= dgettext('TandemPlugin', 'Die Tandemsuche läuft. Im Moment liegen keine Angebote vor.') ?>
-                    <? endif ?>
+                    <?php endif ?>
-                <? endif ?>
+                <?php endif ?>
                </td>
            </tr>
-            <? endforeach ?>
+            <?php endforeach ?>
            </table>
-        <? endif ?>
+        <?php endif ?>
        </a>
    </section>
-    <? if(!empty($profiles)): ?>
+    <?php if(!empty($profiles)) : ?>
    <section>
        <a href="<?= PluginEngine::getLink('tandemplugin/my_tandems/index') ?>">
            <?= dgettext('TandemPlugin', 'Hier klicken, um weitere Sprachtandems anzulegen!') ?>
        </a>
    </section>
-    <? endif ?>
+    <?php endif ?>
 </section>
--- a/views/_common/_profile.php
+++ b/views/_common/_profile.php
+<?php
+/**
+ * @var TandemProfile $profile
+ * @var string[] $highlighted_languages
+ */
+?>
 <?= Avatar::getAvatar($profile->user_id)->getImageTag(
    Avatar::MEDIUM,
    ['style' => 'float:left; margin-right: 0.5em;']
 ) ?>
 <div style="float:left;">
-    <? if ($profile->user): ?>
+    <?php if ($profile->user) : ?>
        <a href="<?= URLHelper::getLink(
                 'dispatch.php/profile',
                 ['username' => $profile->user->username]
                 ) ?>">
            <strong><?= htmlReady($profile->user->getFullName()) ?></strong>
        </a>
-    <? else: ?>
+    <?php else : ?>
        <strong><?= dgettext('TandemPlugin', 'unbekannt') ?></strong>
-    <? endif ?>
+    <?php endif ?>
-    <? if($established_pair or $admin_view): ?>
+    <?php if (!empty($established_pair) || !empty($admin_view)) : ?>
-        <? if ($profile->user) : ?>
+        <?php if ($profile->user) : ?>
            <a href="<?= URLHelper::getLink(
                     'dispatch.php/messages/write',
                     ['rec_uname' => $profile->user->username]
                     ) ?>" data-dialog>
                <?= Icon::create('mail', 'clickable')->asImg('20px', ['class' => 'text-bottom']) ?>
            </a>
-        <? endif ?>
+        <?php endif ?>
-    <? endif ?>
+    <?php endif ?>
    <div>
-        <? if ($profile->user): ?>
+        <?php if ($profile->user) : ?>
            <strong><?= dgettext('TandemPlugin', 'Geschlecht') ?>:</strong>
            <?= ($profile->user->geschlecht == '1')
              ? dgettext('TandemPlugin', 'männlich')
              : (($profile->user->geschlecht == '2')
               ? dgettext('TandemPlugin', 'weiblich')
               : dgettext('TandemPlugin', 'Keine Angabe')) ?>
-        <? endif ?>
+        <?php endif ?>
    </div>
-    <? $study_names = null; ?>
+    <?php
-    <? if ($profile->user): ?>
+    $study_names = null;
-        <? if($profile->user->studycourses): ?>
+    ?>
-            <? $study_names = [];
+    <?php if ($profile->user) : ?>
+        <?php if($profile->user->studycourses) : ?>
+            <?php
+            $study_names = [];
            foreach ($profile->user->studycourses as $studycourse) {
                $study_names[] = $studycourse->studycourse->name;
-            } ?>
+            }
-        <? endif ?>
+            ?>
-    <? endif ?>
+        <?php endif ?>
+    <?php endif ?>
    <div>
        <strong><?= dgettext('TandemPlugin', 'Studiengänge') ?>:</strong>
        <?= ($study_names
@@ -51,52 +61,52 @@
           : dgettext('TandemPlugin', 'Keine Angabe')) ?>
    </div>
-    <? if($established_pair or $admin_view): ?>
+    <?php if (!empty($established_pair) || !empty($admin_view)) : ?>
-        <? if($highlighted_languages): ?>
+        <?php if (!empty($highlighted_languages)) : ?>
            <div>
                <strong><?= htmlReady($highlighted_languages[0]) ?></strong>
                <?= Icon::create('group', 'info')->asImg('16px', ['class' => 'text-bottom']) ?>
                <?= htmlReady($profile->getTargetName()) ?>
            </div>
-        <? endif ?>
+        <?php endif ?>
-    <? else: ?>
+    <?php else : ?>
        <div>
            <strong><?= dgettext('TandemPlugin', 'Sucht') ?>:</strong>
            <?= htmlReady($profile->getTargetName()) ?>
        </div>
        <div>
            <strong><?= dgettext('TandemPlugin', 'Spricht') ?>:</strong>
-            <? $user_mother_languages = TandemUserMotherLanguage::findSortedByName($profile->user_id) ?>
+            <?php $user_mother_languages = TandemUserMotherLanguage::findSortedByName($profile->user_id) ?>
-            <? foreach($user_mother_languages as $uml): ?>
+            <?php foreach($user_mother_languages as $uml) : ?>
                <span style="white-space: nowrap;">
                    <?= $uml->render(
                        $highlighted_languages && in_array($uml->language->getLocalName(), $highlighted_languages),
                        true
                    ) ?>
                </span>
-            <? endforeach ?>
+            <?php endforeach ?>
        </div>
-    <? endif ?>
+    <?php endif ?>
-    <? if($profile->comment): ?>
+    <?php if ($profile->comment): ?>
        <div>
            <strong><?= dgettext('TandemPlugin', 'Bemerkung') ?>:</strong>
            <?= htmlReady($profile->comment) ?>
        </div>
-    <? endif ?>
+    <?php endif ?>
-    <? if($admin_view and Config::get()->TANDEMPLUGIN_PROOF_FIELDS_ENABLED): ?>
+    <?php if (!empty($admin_view) && Config::get()->TANDEMPLUGIN_PROOF_FIELDS_ENABLED) : ?>
        <div>
-            <? if($profile->proof_of_achievement): ?>
+            <?php if($profile->proof_of_achievement) : ?>
                <div>
                    <strong><?= dgettext('TandemPlugin', 'Leistungsbescheinigung') ?>:</strong>
                    <span><?= dgettext('TandemPlugin', 'gewünscht') ?></span>
                </div>
-            <? endif ?>
+            <?php endif ?>
-            <? if($profile->proof_of_attendance): ?>
+            <?php if($profile->proof_of_attendance) : ?>
                <div>
                    <strong><?= dgettext('TandemPlugin', 'Teilnahmebestätigung') ?>:</strong>
                    <span><?= dgettext('TandemPlugin', 'gewünscht') ?></span>
                </div>
-            <? endif ?>
+            <?php endif ?>
-    <? endif ?>
+    <?php endif ?>
        </div>
 </div>
--- a/views/admin/_common_language_form.php
+++ b/views/admin/_common_language_form.php
+<?php
+/**
+ * @var string $name
+ * @var string $name_ger
+ * @var string $name_eng
+ */
+?>
 <label>
    <?= dgettext('TandemPlugin', 'Name') ?>
    <input type="text" name="name" value="<?= htmlReady($name) ?>">

--- a/views/admin/add_language.php
+++ b/views/admin/add_language.php
+<?php
+/**
+ * @var PluginController $controller
+ * @var string $lang_id
+ * @var string $name
+ * @var string $name_ger
+ * @var string $name_eng
+ */
+?>
 <form class="default" method="post" data-dialog="reload-on-close"
      action="<?= $controller->link_for('admin/add_language') ?>">
    <?= CSRFProtection::tokenTag() ?>

--- a/views/admin/add_to_blocklist.php
+++ b/views/admin/add_to_blocklist.php
+<?php
+/**
+ * @var PluginController $controller
+ * @var QuickSearch $user_search
+ * @var string $reason
+ */
+?>
 <form class="default" method="post" action="<?= $controller->link_for('admin/add_to_blocklist') ?>"
      data-dialog="reload-on-close">
    <?= CSRFProtection::tokenTag() ?>