Skip to content
Snippets Groups Projects
Commit 9c2549b8 authored by Elmar Ludwig's avatar Elmar Ludwig
Browse files

fix warnings on PHP 8

parent 1024a0ce
No related branches found
No related tags found
No related merge requests found
...@@ -54,9 +54,11 @@ class StudycourseModel ...@@ -54,9 +54,11 @@ class StudycourseModel
$studycourses = DBManager::get()->query($query1)->fetchAll(PDO::FETCH_ASSOC); $studycourses = DBManager::get()->query($query1)->fetchAll(PDO::FETCH_ASSOC);
$users = DBManager::get()->query($query2)->fetchGrouped(PDO::FETCH_COLUMN); $users = DBManager::get()->query($query2)->fetchGrouped(PDO::FETCH_COLUMN);
foreach ($studycourses as $index => $course) { foreach ($studycourses as $index => $course) {
if (isset($users[$course['studiengang_id']])) {
$studycourses[$index]['count_user'] = $users[$course['studiengang_id']]; $studycourses[$index]['count_user'] = $users[$course['studiengang_id']];
} }
} }
}
$query = "SELECT DISTINCT abschluss.name, abschluss.abschluss_id, $query = "SELECT DISTINCT abschluss.name, abschluss.abschluss_id,
COUNT(user_studiengang.abschluss_id) AS count_user COUNT(user_studiengang.abschluss_id) AS count_user
...@@ -69,7 +71,7 @@ class StudycourseModel ...@@ -69,7 +71,7 @@ class StudycourseModel
foreach ($studycourses as $index => $row) { foreach ($studycourses as $index => $row) {
// get one profession with all degrees // get one profession with all degrees
$statement->execute(array($row['studiengang_id,'])); $statement->execute(array($row['studiengang_id']));
$studycourses[$index]['degree'] = $statement->fetchAll(PDO::FETCH_ASSOC); $studycourses[$index]['degree'] = $statement->fetchAll(PDO::FETCH_ASSOC);
$statement->closeCursor(); $statement->closeCursor();
} }
...@@ -108,9 +110,11 @@ class StudycourseModel ...@@ -108,9 +110,11 @@ class StudycourseModel
$users = DBManager::get()->query($query2)->fetchAll(PDO::FETCH_COLUMN|PDO::FETCH_GROUP); $users = DBManager::get()->query($query2)->fetchAll(PDO::FETCH_COLUMN|PDO::FETCH_GROUP);
foreach ($studydegrees as $index => $degree) { foreach ($studydegrees as $index => $degree) {
if (isset($users[$degree['abschluss_id']])) {
$studydegrees[$index]['count_user'] = $users[$degree['abschluss_id']][0]; $studydegrees[$index]['count_user'] = $users[$degree['abschluss_id']][0];
} }
} }
}
$query = "SELECT DISTINCT fach.name, fach.fach_id AS studiengang_id, $query = "SELECT DISTINCT fach.name, fach.fach_id AS studiengang_id,
COUNT(user_studiengang.fach_id) AS count_user COUNT(user_studiengang.fach_id) AS count_user
......
pluginname=MultiMess pluginname=MultiMess
pluginclassname=MultiMess pluginclassname=MultiMess
origin=elan-ev origin=elan-ev
version=2.5.3 version=2.5.4
studipMinVersion=5.3 studipMinVersion=5.3
...@@ -7,7 +7,7 @@ use Studip\Button, Studip\LinkButton; ...@@ -7,7 +7,7 @@ use Studip\Button, Studip\LinkButton;
</label></br></br></br> </label></br></br></br>
<div style="clear:both" align="center"> <div style="clear:both" align="center">
<div style="float:left;width:45%;"> <div style="float:left;width:45%;">
<textarea id="cand_addressee" name="cand_addressee" rows="15" cols="40" wrap="virtual"><?=(is_array($addressee_list) ? join("\n", array_keys($addressee_list)): '')?></textarea> <textarea id="cand_addressee" name="cand_addressee" rows="15" cols="40" wrap="virtual"><?= isset($cand_addressees) ? join("\n", array_keys($cand_addressees)): '' ?></textarea>
</div> </div>
<div align="left"> <div align="left">
<input type="checkbox" name="perms[]" value="admin"> Administratoren<br> <input type="checkbox" name="perms[]" value="admin"> Administratoren<br>
......
...@@ -73,7 +73,7 @@ $infobox = array('picture' => 'infobox/messages.jpg', 'content' => $infobox_cont ...@@ -73,7 +73,7 @@ $infobox = array('picture' => 'infobox/messages.jpg', 'content' => $infobox_cont
</div> </div>
<form action="<?= PluginEngine::getLink('multimess/admin/send/') ?>" method=post> <form action="<?= PluginEngine::getLink('multimess/admin/send') ?>" method=post>
<div id="compose-accordion"> <div id="compose-accordion">
<h3> <h3>
<?= _("Empfänger") ?> <?= _("Empfänger") ?>
...@@ -89,7 +89,7 @@ $infobox = array('picture' => 'infobox/messages.jpg', 'content' => $infobox_cont ...@@ -89,7 +89,7 @@ $infobox = array('picture' => 'infobox/messages.jpg', 'content' => $infobox_cont
</h3> </h3>
<div class="admin-accordion-content"> <div class="admin-accordion-content">
<?//=Icon::create('edit', array('id'=> 'addressee_lookup'))?> <?//=Icon::create('edit', array('id'=> 'addressee_lookup'))?>
<? if (count($cand_addressees) > 0) : ?> <? if (!empty($cand_addressees)) : ?>
<?=$this->render_partial("admin/_addressees", array('cand_addressees' => $cand_addressees));?> <?=$this->render_partial("admin/_addressees", array('cand_addressees' => $cand_addressees));?>
<? endif; ?> <? endif; ?>
</div> </div>
......
...@@ -48,7 +48,7 @@ echo PluginEngine::getLink('multimess/admin/addressee_lookup/') ...@@ -48,7 +48,7 @@ echo PluginEngine::getLink('multimess/admin/addressee_lookup/')
<div class="form-group adressees"> <div class="form-group adressees">
<label for="cand_addressee"><?php echo _('Empfänger:') ?></label> <label for="cand_addressee"><?php echo _('Empfänger:') ?></label>
<textarea id="cand_addressee" name="cand_addressee"><?php <textarea id="cand_addressee" name="cand_addressee"><?php
echo join(PHP_EOL, array_keys($addressee_list ?: array())) echo join(PHP_EOL, array_keys($cand_addressees ?? array()))
?></textarea> ?></textarea>
</div> </div>
<div class="form-group groups"> <div class="form-group groups">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment