From 956bc89af815fe31b0ef68721f051eb80c24786d Mon Sep 17 00:00:00 2001 From: Jan-Hendrik Willms Date: Thu, 3 Feb 2022 14:00:22 +0100 Subject: transfer changeset 59448 from svn --- app/controllers/my_courses.php | 14 +++---- app/controllers/my_institutes.php | 8 +--- app/controllers/search/courses.php | 5 +-- app/controllers/search/globalsearch.php | 4 +- app/controllers/studip_controller.php | 6 +-- app/views/messages/overview.php | 6 +-- app/views/search/globalsearch/index.php | 2 +- lib/classes/Assets.class.php | 5 +-- lib/classes/MyRealmModel.php | 10 ++--- lib/classes/QuickSearch.class.php | 18 ++++----- lib/classes/Request.class.php | 2 +- lib/classes/SemBrowse.class.php | 44 ++++++++++++---------- lib/classes/SemClass.class.php | 10 +++-- lib/classes/Seminar.class.php | 6 ++- lib/classes/SeminarCategories.class.php | 10 +++-- lib/classes/Smiley.php | 2 +- lib/classes/StudipSemSearch.class.php | 1 + lib/classes/StudipSemTree.class.php | 2 +- lib/classes/StudipSemTreeViewSimple.class.php | 5 ++- lib/classes/TreeAbstract.class.php | 14 +++++-- lib/classes/helpbar/Helpbar.php | 4 +- lib/classes/searchtypes/SearchType.class.php | 1 + lib/classes/sidebar/SelectWidget.php | 2 + lib/functions.php | 4 +- lib/models/Semester.class.php | 6 ++- lib/models/SimpleORMap.class.php | 16 ++++---- lib/navigation/BrowseNavigation.php | 2 +- lib/plugins/engine/PluginManager.class.php | 3 +- .../core/Forum/models/ForumVisit.php | 4 +- templates/quicksearch/inputfield.php | 2 +- templates/sidebar/list-widget.php | 4 +- templates/sidebar/search-widget.php | 2 +- 32 files changed, 121 insertions(+), 103 deletions(-) diff --git a/app/controllers/my_courses.php b/app/controllers/my_courses.php index 395bef9..fa6699c 100644 --- a/app/controllers/my_courses.php +++ b/app/controllers/my_courses.php @@ -723,14 +723,14 @@ class MyCoursesController extends AuthenticatedController public function check_course($seminar_content) { - if ($seminar_content['visitdate'] <= $seminar_content['chdate'] || $seminar_content['last_modified'] > 0) { - $last_modified = $seminar_content['visitdate'] <= $seminar_content['chdate'] - && $seminar_content['chdate'] > $seminar_content['last_modified'] - ? $seminar_content['chdate'] - : $seminar_content['last_modified']; - if ($last_modified) { + if ($seminar_content['visitdate'] <= $seminar_content['chdate']) { return true; - } + // $last_modified = $seminar_content['visitdate'] <= $seminar_content['chdate'] + // ? $seminar_content['chdate'] + // : $seminar_content['last_modified']; + // if ($last_modified) { + // return true; + // } } $plugins_navigation = $seminar_content['navigation']; diff --git a/app/controllers/my_institutes.php b/app/controllers/my_institutes.php index 0bdff85..c3d5c2f 100644 --- a/app/controllers/my_institutes.php +++ b/app/controllers/my_institutes.php @@ -83,14 +83,8 @@ class MyInstitutesController extends AuthenticatedController protected function check_institute($institute): bool { - if ($institute['visitdate'] || $institute['last_modified']) { - if ($institute['visitdate'] <= $institute["chdate"] || $institute['last_modified'] > 0) { - $last_modified = ($institute['visitdate'] <= $institute["chdate"] - && $institute["chdate"] > $institute['last_modified'] ? $institute["chdate"] : $institute['last_modified']); - if ($last_modified) { + if ($institute['visitdate'] && $institute['visitdate'] <= $institute["chdate"]) { return true; - } - } } $plugins = $institute['navigation']; diff --git a/app/controllers/search/courses.php b/app/controllers/search/courses.php index 9a3294c..cd38f94 100644 --- a/app/controllers/search/courses.php +++ b/app/controllers/search/courses.php @@ -30,8 +30,7 @@ class Search_CoursesController extends AuthenticatedController // activate navigation item $nav_options = Config::get()->COURSE_SEARCH_NAVIGATION_OPTIONS; URLHelper::bindLinkParam('option', $this->nav_option); - if ($nav_options[$this->nav_option] - && Navigation::hasItem('/search/courses/' . $this->nav_option)) { + if (!empty($nav_options[$this->nav_option]) && Navigation::hasItem('/search/courses/' . $this->nav_option)) { Navigation::activateItem('/search/courses/' . $this->nav_option); } else { URLHelper::removeLinkParam('option'); @@ -114,7 +113,7 @@ class Search_CoursesController extends AuthenticatedController } // show information about course class if class was changed - $class = $GLOBALS['SEM_CLASS'][$_SESSION['sem_browse_data']['show_class']]; + $class = $GLOBALS['SEM_CLASS'][$_SESSION['sem_browse_data']['show_class']] ?? null; if (is_object($class) && $class->countSeminars() > 0) { if (trim($GLOBALS['SEM_CLASS'][$_SESSION['sem_browse_data']['show_class']]['description'])) { PageLayout::postInfo(sprintf(_('Gewählte Veranstaltungsklasse %1s: %2s'), diff --git a/app/controllers/search/globalsearch.php b/app/controllers/search/globalsearch.php index 49c2861..9c41112 100644 --- a/app/controllers/search/globalsearch.php +++ b/app/controllers/search/globalsearch.php @@ -90,7 +90,7 @@ class Search_GlobalsearchController extends AuthenticatedController null, 'seminar_type', $this->getSemClasses(), - $_SESSION['global_search']['selects']['seminar_type'], + $_SESSION['global_search']['selects']['seminar_type'] ?? null, ['id' => 'seminar_type_select'] ); @@ -101,7 +101,7 @@ class Search_GlobalsearchController extends AuthenticatedController null, 'institute', $this->getInstitutes(), - $_SESSION['global_search']['selects']['institute'], + $_SESSION['global_search']['selects']['institute'] ?? null, ['id' => 'institute_select'] ); } diff --git a/app/controllers/studip_controller.php b/app/controllers/studip_controller.php index 357ded7..a299915 100644 --- a/app/controllers/studip_controller.php +++ b/app/controllers/studip_controller.php @@ -163,11 +163,11 @@ abstract class StudipController extends Trails_Controller $reflection = new ReflectionMethod($this, $this->current_action . '_action'); $parameters = $reflection->getParameters(); foreach ($parameters as $i => $parameter) { - $class_type = $parameter->getClass(); + $class_type = $parameter->getType(); if (!$class_type - || !class_exists($class_type->name) - || !is_a($class_type->name, SimpleORMap::class, true)) + || !class_exists($class_type->getName()) + || !is_a($class_type->getName(), SimpleORMap::class, true)) { continue; } diff --git a/app/views/messages/overview.php b/app/views/messages/overview.php index 1a1decb..c30ac6b 100644 --- a/app/views/messages/overview.php +++ b/app/views/messages/overview.php @@ -40,7 +40,7 @@ 0) : ?> - 0)) : ?> + 0)) : ?> - render_partial("messages/_message_row.php", compact("message", "received". "settings")) ?> + render_partial("messages/_message_row.php", compact("message", "received", "settings")) ?> - 0)) : ?> + 0)) : ?>