diff --git a/lib/classes/DataFieldEntry.class.php b/lib/classes/DataFieldEntry.class.php index c934e51eb753fcac38e4b65ffea6a951aa5d129c..6acd2739ae809a92e6819e8c9b414e414bf13769 100644 --- a/lib/classes/DataFieldEntry.class.php +++ b/lib/classes/DataFieldEntry.class.php @@ -103,6 +103,7 @@ abstract class DataFieldEntry } $clause1 = ''; $parameters = []; + $clause1 = ''; if(is_array($range_id)) { // rangeID may be an array ("classic" rangeID and second rangeID used for user roles) $secRangeID = $range_id[1]; diff --git a/lib/classes/I18N.php b/lib/classes/I18N.php index 18e1e7aa74926977951103f85df9174013838303..5ba2c88954290abd672be6ac31edf0f7e02bbc10 100644 --- a/lib/classes/I18N.php +++ b/lib/classes/I18N.php @@ -101,7 +101,7 @@ class I18N */ public function checkMvvPerms(ModuleManagementModel $object, $perm = MvvPerm::PERM_WRITE) { - $may_edit = MvvPerm::get($object)->haveFieldPerm($field ?: $this->name, $perm); + $may_edit = MvvPerm::get($object)->haveFieldPerm($this->name, $perm); return $this->setReadOnly(!$may_edit); } diff --git a/lib/classes/JsonApi/Models/ForumEntry.php b/lib/classes/JsonApi/Models/ForumEntry.php index 767926c975deb544dd4cec6c5935fec76d4f9e09..3355244d7b5e712826f5e401783749b9435f4adb 100644 --- a/lib/classes/JsonApi/Models/ForumEntry.php +++ b/lib/classes/JsonApi/Models/ForumEntry.php @@ -125,7 +125,6 @@ class ForumEntry extends \SimpleORMap $stmt_four = \DBManager::get()->prepare('DELETE FROM forum_categories_entries WHERE topic_id = ?'); - $stmt_four->bindParam(':ids', $ids, \StudipPDO::PARAM_ARRAY); $stmt_four->execute([$topicId]); return $stmt_one && $stmt_two && $stmt_three && $stmt_four; diff --git a/lib/classes/JsonApi/Routes/Files/RangeFileRefsCreate.php b/lib/classes/JsonApi/Routes/Files/RangeFileRefsCreate.php index a91320d4c1504a0c68d788b86569075eb1e9e1ab..4afc5ca4180fce7f296e151df70a707631091299 100644 --- a/lib/classes/JsonApi/Routes/Files/RangeFileRefsCreate.php +++ b/lib/classes/JsonApi/Routes/Files/RangeFileRefsCreate.php @@ -41,7 +41,7 @@ class RangeFileRefsCreate extends JsonApiController $json = $this->validate($request); - if (!$parent = $this->getRelationshipParent($json)) { + if (!$parentFolder = $this->getRelationshipParent($json)) { throw new RecordNotFoundException('Bad `parent` folder.'); } if ($parentFolder->range_id !== $range->id) { diff --git a/lib/classes/MvvI18N.php b/lib/classes/MvvI18N.php index 7ff7a6a2ea5609ecc26824d0b9224150e956f6ed..11b3adbc8928908a287bba51ef09da6517e8f7c0 100644 --- a/lib/classes/MvvI18N.php +++ b/lib/classes/MvvI18N.php @@ -17,7 +17,7 @@ class MvvI18N extends I18N */ public function checkPermission(ModuleManagementModel $object, $perm = MvvPerm::PERM_WRITE) { - $may_edit = MvvPerm::get($object)->haveFieldPerm($field ?: $this->name, $perm); + $may_edit = MvvPerm::get($object)->haveFieldPerm($this->name, $perm); return $this->setReadOnly(!$may_edit); } } diff --git a/lib/classes/Smiley.php b/lib/classes/Smiley.php index 8d37e4f225b620e4bc12904e42d12c5dcd9d1b3a..4bf5d83bbd3220a4c26d8c3fb218a509e8403d1d 100644 --- a/lib/classes/Smiley.php +++ b/lib/classes/Smiley.php @@ -397,7 +397,7 @@ class Smiley 'update' => 0 ]; - if ($filename === null) { + if ($smiley_file === null) { $files = glob(self::getFilename('*')); } else { $files = [$smiley_file]; diff --git a/lib/classes/StudipForm.class.php b/lib/classes/StudipForm.class.php index f756052357244081b1f797dc3ae2380e2e0145e1..fd76fee9879a04c56c889deee50824f855e49d13 100644 --- a/lib/classes/StudipForm.class.php +++ b/lib/classes/StudipForm.class.php @@ -259,6 +259,7 @@ class StudipForm { { $date_values = explode("-", $default); //YYYY-MM-DD $value = ''; + $ret = ''; if(count($date_values)==3){ $value = $date_values[2]. '.' . $date_values[1]. '.' .$date_values[0]; } diff --git a/lib/classes/StudipRangeTreeViewAdmin.class.php b/lib/classes/StudipRangeTreeViewAdmin.class.php index 28577b3ba04c4c14bb2e09404c96df27e602f033..1bde3715be9c5ebd6d35d3ec4b95bb8c15233935 100644 --- a/lib/classes/StudipRangeTreeViewAdmin.class.php +++ b/lib/classes/StudipRangeTreeViewAdmin.class.php @@ -652,6 +652,7 @@ class StudipRangeTreeViewAdmin extends TreeView{ } function getEditItemContent(){ + $content = ''; ob_start(); ?> <div style="margin: 0px 5%"> @@ -733,6 +734,7 @@ class StudipRangeTreeViewAdmin extends TreeView{ function getEditCatContent($item_id, $cat_snap) { + $content = ''; ob_start(); ?> <form name="cat_form_<?= $item_id ?>" method="post" class="default" diff --git a/lib/classes/TreeView.class.php b/lib/classes/TreeView.class.php index 2223cc1d8bb286280e72f978097850b822e0deea..b2d8f5b851eafd4fd3968cd12065e4859f3e865c 100644 --- a/lib/classes/TreeView.class.php +++ b/lib/classes/TreeView.class.php @@ -289,6 +289,7 @@ class TreeView { * @param string $item_id */ function printItemDetails($item_id){ + $level_output = ''; if (!$this->tree->hasKids($item_id) || !$this->open_ranges[$item_id] || $item_id == $this->start_item_id) $level_output = "<td class=\"blank\" background=\"" . Assets::image_path('forumleer.gif') . "\">" . Assets::img('forumleer.gif', ['size' => '10@20']) @@ -326,7 +327,6 @@ class TreeView { echo "<td class=\"printcontent\" width=\"100%\"><br>"; echo $this->getItemContent($item_id); echo "<br></td></tr></table>"; - return; } /** diff --git a/lib/classes/restapi/ConsumerPermissions.php b/lib/classes/restapi/ConsumerPermissions.php index f0e0f03a0850fe212a0d82bb2f479d4b9321f338..a62ec11f7c1d7e64e58ad4ac4d85d7bbc31effc2 100644 --- a/lib/classes/restapi/ConsumerPermissions.php +++ b/lib/classes/restapi/ConsumerPermissions.php @@ -195,14 +195,14 @@ class ConsumerPermissions VALUES (:route, IFNULL(:consumer_id, 'global'), :method, :granted) ON DUPLICATE KEY UPDATE granted = VALUES(granted)"; $statement = DBManager::get()->prepare($query); - $statement->bindParam(':route', $route_id); $statement->bindValue(':consumer_id', $this->consumer_id); - $statement->bindParam(':method', $method); - $statement->bindParam(':granted', $granted); foreach ($this->permissions as $route_id => $methods) { + $statement->bindParam(':route', $route_id); foreach ($methods as $method => $granted) { + $statement->bindParam(':method', $method); $granted = (int) !empty($granted); + $statement->bindParam(':granted', $granted); $result = $result && $statement->execute(); } }