From b1f13ce8299d581ccb889e2d98e13574bffcc5ba Mon Sep 17 00:00:00 2001 From: Jan-Hendrik Willms Date: Fri, 21 Jun 2024 09:29:24 +0000 Subject: add remaining class filename and add migration to fix the cronjobs, re #4282 Merge request studip/studip!3136 --- app/controllers/loncapa.php | 4 +- app/controllers/quicksearch.php | 2 +- cli/Commands/CleanupAdmissionRules.php | 2 +- cli/Commands/Plugins/PluginInfo.php | 4 +- composer.json | 1 - config/config_develop.inc.php | 2 +- db/migrations/1.128_step00240_coursesets.php | 2 +- db/migrations/1.12_step_120_userpic.php | 2 +- db/migrations/6.0.11_adjust_cronjobs.php | 43 ++++++++++++++++++++++ .../conditionaladmission/ConditionalAdmission.php | 2 +- .../CourseMemberAdmission.php | 2 +- .../limitedadmission/LimitedAdmission.php | 2 +- .../lockedadmission/LockedAdmission.php | 2 +- .../ParticipantRestrictedAdmission.php | 2 +- .../passwordadmission/PasswordAdmission.php | 2 +- .../PreferentialAdmission.php | 2 +- .../termsadmission/TermsAdmission.php | 2 +- .../timedadmission/TimedAdmission.php | 2 +- lib/calendar/CalendarColumn.php | 2 +- lib/calendar/CalendarView.php | 2 +- lib/calendar/CalendarWeekView.php | 2 +- lib/classes/ActionMenu.php | 2 +- lib/classes/Assets.php | 2 +- lib/classes/AuthorObject.php | 5 +-- lib/classes/AutoInsert.php | 2 +- lib/classes/Color.php | 4 +- lib/classes/Config.php | 2 +- lib/classes/CourseConfig.php | 2 +- lib/classes/CronJob.php | 2 +- lib/classes/CronjobScheduler.php | 2 +- lib/classes/DataFieldEntry.php | 2 +- lib/classes/DatabaseObject.php | 4 +- lib/classes/DateFormatter.php | 2 +- lib/classes/DbSnapshot.php | 2 +- lib/classes/DbView.php | 2 +- lib/classes/InstituteCalendarHelper.php | 2 +- lib/classes/InstituteConfig.php | 2 +- lib/classes/LockRules.php | 4 +- lib/classes/MVV.php | 2 +- lib/classes/Markup.php | 2 +- lib/classes/MessageBox.php | 2 +- lib/classes/ModulesNotification.php | 4 +- lib/classes/MultiPersonSearch.php | 4 +- lib/classes/MvvQuickSearch.php | 2 +- lib/classes/NotificationCenter.php | 2 +- lib/classes/QuickSearch.php | 6 +-- lib/classes/RangeConfig.php | 2 +- lib/classes/RangeTreeObject.php | 2 +- lib/classes/RangeTreeObjectFak.php | 2 +- lib/classes/RangeTreeObjectInst.php | 2 +- lib/classes/Score.php | 2 +- lib/classes/Seminar.php | 2 +- lib/classes/SeminarCategories.php | 4 +- lib/classes/SessionDecoder.php | 4 +- lib/classes/SimpleCollection.php | 2 +- lib/classes/SimpleORMap.php | 2 +- lib/classes/SimpleORMapCollection.php | 2 +- lib/classes/StudipAutoloader.php | 2 +- lib/classes/StudipForm.php | 2 +- lib/classes/StudipLock.php | 2 +- lib/classes/StudipMail.php | 2 +- lib/classes/StudipObject.php | 4 +- lib/classes/StudipPDO.php | 2 +- lib/classes/StudipRangeTree.php | 2 +- lib/classes/StudipRangeTreeView.php | 2 +- lib/classes/StudipRangeTreeViewAdmin.php | 2 +- lib/classes/StudipSemRangeTreeViewSimple.php | 2 +- lib/classes/StudipSemSearch.php | 2 +- lib/classes/StudipSemSearchHelper.php | 2 +- lib/classes/StudipSemTreeSearch.php | 2 +- lib/classes/StudipSemTreeView.php | 2 +- lib/classes/StudipSemTreeViewAdmin.php | 2 +- lib/classes/StudipSemTreeViewSimple.php | 2 +- lib/classes/TreeAbstract.php | 2 +- lib/classes/TreeView.php | 8 ++-- lib/classes/UserConfig.php | 2 +- lib/classes/UserLookup.php | 2 +- lib/classes/UserManagement.php | 4 +- lib/classes/admission/AdmissionAlgorithm.php | 4 +- lib/classes/admission/AdmissionPriority.php | 2 +- lib/classes/admission/AdmissionRule.php | 2 +- lib/classes/admission/AdmissionUserList.php | 2 +- lib/classes/admission/CourseSet.php | 2 +- lib/classes/admission/RandomAlgorithm.php | 2 +- lib/classes/admission/UserFilter.php | 2 +- lib/classes/admission/UserFilterField.php | 7 ++-- .../admission/userfilter/DatafieldCondition.php | 2 +- .../admission/userfilter/DegreeCondition.php | 2 +- .../admission/userfilter/PermissionCondition.php | 2 +- .../userfilter/SemesterOfStudyCondition.php | 2 +- .../userfilter/StgteilVersionCondition.php | 2 +- .../admission/userfilter/SubjectCondition.php | 2 +- .../admission/userfilter/SubjectConditionAny.php | 4 +- lib/classes/auth_plugins/StudipAuthAbstract.php | 2 +- lib/classes/auth_plugins/StudipAuthIP.php | 2 +- lib/classes/auth_plugins/StudipAuthLTI.php | 2 +- lib/classes/auth_plugins/StudipAuthLdap.php | 2 +- .../auth_plugins/StudipAuthLdapReadAndBind.php | 2 +- lib/classes/auth_plugins/StudipAuthOIDC.php | 2 +- lib/classes/auth_plugins/StudipAuthSSO.php | 2 +- lib/classes/auth_plugins/StudipAuthShib.php | 2 +- lib/classes/auth_plugins/StudipAuthStandard.php | 2 +- lib/classes/cache/Exception.php | 2 +- .../cache/InvalidCacheArgumentException.php | 2 +- lib/classes/cache/Item.php | 2 +- lib/classes/calendar/ICalendarExport.php | 2 +- .../coursewizardsteps/LVGroupsWizardStep.php | 2 +- lib/classes/exportdocument/ExportPDF.php | 2 +- lib/classes/searchtypes/MyCoursesSearch.php | 2 +- lib/classes/searchtypes/PermissionSearch.php | 2 +- lib/classes/searchtypes/ResourceSearch.php | 2 +- lib/classes/searchtypes/RoomSearch.php | 2 +- lib/classes/searchtypes/SQLSearch.php | 4 +- lib/classes/searchtypes/SearchType.php | 3 +- lib/classes/searchtypes/SeminarSearch.php | 2 +- lib/classes/searchtypes/StandardSearch.php | 4 +- lib/classes/searchtypes/TreeSearch.php | 2 +- lib/cronjobs/check_admission.php | 4 +- lib/cronjobs/cleanup_log.php | 4 +- lib/cronjobs/garbage_collector.php | 4 +- lib/cronjobs/purge_cache.php | 8 ++-- lib/cronjobs/remind_oer_upload.php | 4 +- lib/cronjobs/send_mail_queue.php | 2 +- lib/cronjobs/session_gc.php | 2 +- lib/dbviews/range_tree.view.php | 2 +- lib/dbviews/sem_tree.view.php | 2 +- lib/elearning/ConnectedCMS.php | 20 +++++----- lib/elearning/ELearningUtils.php | 2 +- lib/elearning/Ilias3ConnectedCMS.php | 2 +- lib/elearning/PmWikiConnectedCMS.php | 2 +- lib/elearning/PmWikiConnectedLink.php | 2 +- lib/elearning/PmWikiContentModule.php | 2 +- lib/exceptions/ClipboardException.php | 2 +- lib/exceptions/StudipException.php | 2 +- .../resources/GlobalResourceLockException.php | 2 +- .../GlobalResourceLockOverlapException.php | 2 +- .../resources/InvalidResourceCategoryException.php | 2 +- .../resources/InvalidResourceClassException.php | 2 +- .../resources/InvalidResourceException.php | 2 +- .../resources/InvalidResourceRequestException.php | 2 +- .../resources/ResourceBookingException.php | 2 +- .../resources/ResourceBookingOverlapException.php | 2 +- .../resources/ResourceBookingRangeException.php | 2 +- lib/exceptions/resources/ResourceException.php | 2 +- .../resources/ResourceNoTimeRangeException.php | 2 +- .../resources/ResourcePermissionException.php | 2 +- .../ResourcePropertyDefinitionException.php | 2 +- .../resources/ResourcePropertyException.php | 2 +- .../resources/ResourcePropertyStateException.php | 2 +- .../resources/ResourceRequestException.php | 2 +- .../resources/ResourceUnavailableException.php | 2 +- .../resources/ResourceUnlockableException.php | 2 +- .../resources/SeparableRoomException.php | 2 +- lib/filesystem/FileArchiveManager.php | 2 +- lib/filesystem/HomeworkFolder.php | 2 +- lib/filesystem/InboxFolder.php | 2 +- lib/filesystem/InboxOutboxFolder.php | 2 +- lib/filesystem/MessageFolder.php | 2 +- lib/filesystem/OutboxFolder.php | 2 +- lib/models/AdmissionApplication.php | 2 +- lib/models/ArchivedCourse.php | 2 +- lib/models/ArchivedCourseMember.php | 2 +- lib/models/AuthUserMd5.php | 2 +- lib/models/BannerRoles.php | 2 +- lib/models/Clipboard.php | 2 +- lib/models/ClipboardItem.php | 2 +- lib/models/ColourValue.php | 2 +- lib/models/ConfigEntry.php | 2 +- lib/models/Contact.php | 2 +- lib/models/ContentTermsOfUse.php | 2 +- lib/models/Course.php | 2 +- lib/models/CourseMember.php | 2 +- lib/models/CourseMemberNotification.php | 2 +- lib/models/Courseware/BlockTypes/Text.php | 2 - lib/models/CronjobLog.php | 2 +- lib/models/CronjobSchedule.php | 2 +- lib/models/CronjobTask.php | 2 +- lib/models/Degree.php | 2 +- lib/models/Deputy.php | 2 +- lib/models/HelpContent.php | 2 +- lib/models/HelpTour.php | 2 +- lib/models/HelpTourAudience.php | 2 +- lib/models/HelpTourSettings.php | 2 +- lib/models/HelpTourStep.php | 3 +- lib/models/HelpTourUser.php | 2 +- lib/models/Institute.php | 2 +- lib/models/LockRule.php | 2 +- lib/models/LoginBackground.php | 2 +- lib/models/LoginFaq.php | 2 +- lib/models/Message.php | 2 +- lib/models/MessageUser.php | 2 +- lib/models/MvvOverlappingConflict.php | 2 +- lib/models/MvvOverlappingExclude.php | 3 +- lib/models/MvvOverlappingSelection.php | 2 +- lib/models/NewsRange.php | 2 +- lib/models/NewsRoles.php | 2 +- lib/models/Semester.php | 2 +- lib/models/SemesterCourse.php | 2 +- lib/models/SemesterHoliday.php | 2 +- lib/models/SeminarCycleDate.php | 2 +- lib/models/StudipComment.php | 2 +- lib/models/StudipNews.php | 2 +- lib/models/StudipScmEntry.php | 2 +- lib/models/StudyCourse.php | 2 +- lib/models/ToolActivation.php | 2 +- lib/models/User.php | 4 +- lib/models/UserInfo.php | 2 +- lib/models/UserOnline.php | 4 +- lib/models/UserStudyCourse.php | 2 +- lib/models/WebserviceAccessRule.php | 2 +- lib/models/WikiPage.php | 2 +- lib/models/calendar/CalendarDate.php | 2 +- lib/models/calendar/CalendarDateAssignment.php | 2 +- lib/models/resources/BrokenResource.php | 2 +- lib/models/resources/Building.php | 2 +- lib/models/resources/GlobalResourceLock.php | 2 +- lib/models/resources/Location.php | 2 +- lib/models/resources/Resource.php | 2 +- lib/models/resources/ResourceBooking.php | 2 +- lib/models/resources/ResourceBookingInterval.php | 2 +- lib/models/resources/ResourceCategory.php | 2 +- lib/models/resources/ResourceCategoryProperty.php | 2 +- lib/models/resources/ResourceLabel.php | 2 +- lib/models/resources/ResourcePermission.php | 2 +- lib/models/resources/ResourceProperty.php | 2 +- .../resources/ResourcePropertyDefinition.php | 2 +- lib/models/resources/ResourcePropertyGroup.php | 2 +- lib/models/resources/ResourceRequest.php | 2 +- .../resources/ResourceRequestAppointment.php | 2 +- lib/models/resources/ResourceRequestProperty.php | 2 +- .../resources/ResourceTemporaryPermission.php | 2 +- lib/models/resources/Room.php | 2 +- lib/models/resources/RoomRequest.php | 2 +- lib/models/resources/SeparableRoom.php | 2 +- lib/models/resources/SeparableRoomPart.php | 2 +- lib/modules/CoreForum.php | 2 +- lib/modules/FeedbackModule.php | 2 +- lib/modules/GradebookModule.php | 2 +- lib/modules/LtiToolModule.php | 2 +- lib/object.inc.php | 4 +- lib/phplib/Seminar_Auth.php | 2 +- lib/phplib/Seminar_Default_Auth.php | 4 +- lib/phplib/Seminar_Perm.php | 2 +- lib/phplib/Seminar_Register_Auth.php | 2 +- lib/phplib/Seminar_User.php | 2 +- lib/plugins/core/AdministrationPlugin.php | 2 +- lib/plugins/core/CorePlugin.php | 2 +- lib/plugins/core/DetailspagePlugin.php | 2 +- lib/plugins/core/ForumModule.php | 4 +- lib/plugins/core/HomepagePlugin.php | 2 +- lib/plugins/core/LibraryPlugin.php | 2 +- lib/plugins/core/PortalPlugin.php | 2 +- lib/plugins/core/Role.php | 2 +- lib/plugins/core/StandardPlugin.php | 2 +- lib/plugins/core/StudIPPlugin.php | 2 +- lib/plugins/core/SystemPlugin.php | 2 +- lib/plugins/db/RolePersistence.php | 2 +- lib/plugins/engine/PluginManager.php | 6 +-- lib/plugins/engine/PluginRepository.php | 2 +- lib/raumzeit/CycleData.php | 2 +- lib/raumzeit/CycleDataDB.php | 6 +-- lib/raumzeit/Issue.php | 6 +-- lib/raumzeit/IssueDB.php | 6 +-- lib/raumzeit/MetaDate.php | 4 +- lib/raumzeit/MetaDateDB.php | 6 +-- lib/raumzeit/SeminarDB.php | 6 +-- lib/raumzeit/SingleDate.php | 2 +- lib/raumzeit/SingleDateDB.php | 6 +-- lib/resources/ResourceManager.php | 2 +- lib/resources/RoomManager.php | 2 +- lib/visual.inc.php | 4 +- phpstan.neon.dist | 2 +- public/admin_elearning_interface.php | 2 +- resources/assets/javascripts/lib/wysiwyg.js | 6 +-- 274 files changed, 375 insertions(+), 342 deletions(-) create mode 100644 db/migrations/6.0.11_adjust_cronjobs.php diff --git a/app/controllers/loncapa.php b/app/controllers/loncapa.php index 41331b6..dd7ea40 100644 --- a/app/controllers/loncapa.php +++ b/app/controllers/loncapa.php @@ -13,8 +13,8 @@ class LoncapaController extends AuthenticatedController if ($GLOBALS['perm']->have_studip_perm('user', $course_id) && isset($GLOBALS['ELEARNING_INTERFACE_MODULES'][$cms_type])) { - require_once 'lib/elearning/ELearningUtils.class.php'; - require_once 'lib/elearning/ObjectConnections.class.php'; + require_once 'lib/elearning/ELearningUtils.php'; + require_once 'lib/elearning/ObjectConnections.php'; $object_connections = new ObjectConnections($course_id); $connected_modules = $object_connections->getConnections(); diff --git a/app/controllers/quicksearch.php b/app/controllers/quicksearch.php index 9c6a4ae..c086498 100644 --- a/app/controllers/quicksearch.php +++ b/app/controllers/quicksearch.php @@ -14,7 +14,7 @@ /** * Controller for the ajax-response of the QuickSearch class found in - * lib/classes/QuickSearch.class.php + * lib/classes/QuickSearch.php */ class QuicksearchController extends AuthenticatedController { diff --git a/cli/Commands/CleanupAdmissionRules.php b/cli/Commands/CleanupAdmissionRules.php index 3079ae4..a7036d3 100644 --- a/cli/Commands/CleanupAdmissionRules.php +++ b/cli/Commands/CleanupAdmissionRules.php @@ -18,7 +18,7 @@ class CleanupAdmissionRules extends Command protected function execute(InputInterface $input, OutputInterface $output): int { - require_once 'lib/classes/admission/CourseSet.class.php'; + require_once 'lib/classes/admission/CourseSet.php'; $course_set = new \CourseSet(); diff --git a/cli/Commands/Plugins/PluginInfo.php b/cli/Commands/Plugins/PluginInfo.php index 9809b13..c8f9748 100644 --- a/cli/Commands/Plugins/PluginInfo.php +++ b/cli/Commands/Plugins/PluginInfo.php @@ -65,11 +65,11 @@ class PluginInfo extends AbstractPluginCommand private function pluginClassExists(string $plugindir, array $plugin) { - $pluginfile = $plugindir . $plugin['class'] . '.class.php'; + $pluginfile = $plugindir . $plugin['class'] . '.php'; if (file_exists($pluginfile)) { return 1; } else { - $pluginfile = $plugindir . $plugin['class'] . '.php'; + $pluginfile = $plugindir . $plugin['class'] . '.class.php'; if (file_exists($pluginfile)) { return 1; } diff --git a/composer.json b/composer.json index dfb4fe1..920069f 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,6 @@ "Trails\\": "lib/trails/", "": [ "lib/calendar/", - "lib/calendar/lib/", "lib/classes/", "lib/classes/admission/", "lib/classes/admission/userfilter/", diff --git a/config/config_develop.inc.php b/config/config_develop.inc.php index a38726a..655fd4b 100644 --- a/config/config_develop.inc.php +++ b/config/config_develop.inc.php @@ -329,7 +329,7 @@ $INST_ADMIN_DATAFIELDS_VIEW = [ /* * Fields that may not be hidden by users in their privacy settings. * Can be configured per permission level. - * @see lib/models/User.class.php in function getHomepageElements for + * @see lib/models/User.php in function getHomepageElements for * available fields. * Entries look like "'field_name' => true". */ diff --git a/db/migrations/1.128_step00240_coursesets.php b/db/migrations/1.128_step00240_coursesets.php index b767ae3..2f47805 100644 --- a/db/migrations/1.128_step00240_coursesets.php +++ b/db/migrations/1.128_step00240_coursesets.php @@ -1,6 +1,6 @@ changeCronjobFilenames('.class.php', '.php'); + } + + protected function down() + { + $this->changeCronjobFilenames('.php', '.class.php'); + } + + private function changeCronjobFilenames(string $fromExtension, string $toExtension): void + { + $query = "UPDATE `cronjobs_tasks` + SET `filename` = :new + WHERE `filename` = :old"; + $statement = DBManager::get()->prepare($query); + + foreach (self::ADJUSTMENTS as $filename) { + $statement->bindValue(':new', $filename . $toExtension); + $statement->bindValue(':old', $filename . $fromExtension); + $statement->execute(); + } + } +}; diff --git a/lib/admissionrules/conditionaladmission/ConditionalAdmission.php b/lib/admissionrules/conditionaladmission/ConditionalAdmission.php index 7fdbc00..640e800 100644 --- a/lib/admissionrules/conditionaladmission/ConditionalAdmission.php +++ b/lib/admissionrules/conditionaladmission/ConditionalAdmission.php @@ -1,7 +1,7 @@ rendering_mode; if ($rendering_mode === null) { - $rendering_mode = $this->countActions() <= Config::get()->ACTION_MENU_THRESHOLD + $rendering_mode = $this->countActions() <= 1 // Config::get()->ACTION_MENU_THRESHOLD ? self::RENDERING_MODE_ICONS : self::RENDERING_MODE_MENU; } diff --git a/lib/classes/Assets.php b/lib/classes/Assets.php index 928c47c..d4d792e 100644 --- a/lib/classes/Assets.php +++ b/lib/classes/Assets.php @@ -6,7 +6,7 @@ # Lifter010: TODO /* - * Assets.class.php - assets helper + * Assets.php - assets helper * * Copyright (C) 2007 - Marcus Lunzenauer * diff --git a/lib/classes/AuthorObject.php b/lib/classes/AuthorObject.php index b3e98e3..f08622e 100644 --- a/lib/classes/AuthorObject.php +++ b/lib/classes/AuthorObject.php @@ -5,7 +5,7 @@ # Lifter010: TODO // +--------------------------------------------------------------------------+ // This file is part of Stud.IP -// AuthorObject.class.php +// AuthorObject.php // // Class to provide basic properties of an object in Stud.IP // @@ -31,7 +31,7 @@ define("ERROR_CRITICAL", "8"); /** - * AuthorObject.class.php + * AuthorObject.php * * Class to provide basic properties of an object in Stud.IP * @@ -136,4 +136,3 @@ class AuthorObject $class->resetErrors(); } } - diff --git a/lib/classes/AutoInsert.php b/lib/classes/AutoInsert.php index b2168cc..b5cc005 100644 --- a/lib/classes/AutoInsert.php +++ b/lib/classes/AutoInsert.php @@ -14,7 +14,7 @@ */ /** - * AutoInsert.class.php + * AutoInsert.php * Provides functions required by StEP00216: * - Assign seminars for automatic registration of certain user types * - Maintenance of registration rules diff --git a/lib/classes/Color.php b/lib/classes/Color.php index a9b4506..dcd68f5 100644 --- a/lib/classes/Color.php +++ b/lib/classes/Color.php @@ -1,6 +1,6 @@ // +---------------------------------------------------------------------------+ diff --git a/lib/classes/CronjobScheduler.php b/lib/classes/CronjobScheduler.php index cc4cf8b..fbb5b66 100644 --- a/lib/classes/CronjobScheduler.php +++ b/lib/classes/CronjobScheduler.php @@ -10,7 +10,7 @@ // +---------------------------------------------------------------------------+ // This file is part of Stud.IP -// CronjobScheduler.class.php +// CronjobScheduler.php // // Copyright (C) 2013 Jan-Hendrik Willms // +---------------------------------------------------------------------------+ diff --git a/lib/classes/DataFieldEntry.php b/lib/classes/DataFieldEntry.php index fd50a0b..eca0b4a 100644 --- a/lib/classes/DataFieldEntry.php +++ b/lib/classes/DataFieldEntry.php @@ -1,6 +1,6 @@ * @author Marcus Lunzenauer diff --git a/lib/classes/DatabaseObject.php b/lib/classes/DatabaseObject.php index 2258adb..5c54229 100644 --- a/lib/classes/DatabaseObject.php +++ b/lib/classes/DatabaseObject.php @@ -5,7 +5,7 @@ # Lifter010: TODO // +--------------------------------------------------------------------------+ // This file is part of Stud.IP -// DatabaseObject.class.php +// DatabaseObject.php // // Class to provide basic properties of an DatabseObject in Stud.IP // @@ -35,7 +35,7 @@ define("INSTANCEOF_DATABASEOBJECT", "DatabaseObject"); /** - * DatabaseObject.class.php + * DatabaseObject.php * * Class to provide basic properties of an DatabaseObject in Stud.IP * diff --git a/lib/classes/DateFormatter.php b/lib/classes/DateFormatter.php index 5f7c558..5309cbc 100644 --- a/lib/classes/DateFormatter.php +++ b/lib/classes/DateFormatter.php @@ -1,7 +1,7 @@ diff --git a/lib/classes/DbView.php b/lib/classes/DbView.php index 81e9b91..0215f8e 100644 --- a/lib/classes/DbView.php +++ b/lib/classes/DbView.php @@ -5,7 +5,7 @@ # Lifter010: TODO // +---------------------------------------------------------------------------+ // This file is part of Stud.IP -// DbView.class.php +// DbView.php // Class to provide simple Views and Prepared Statements // Mainly for MySql, may work with other DBs (not tested) // Copyright (c) 2002 André Noack diff --git a/lib/classes/InstituteCalendarHelper.php b/lib/classes/InstituteCalendarHelper.php index 4302cf1..6c934b4 100644 --- a/lib/classes/InstituteCalendarHelper.php +++ b/lib/classes/InstituteCalendarHelper.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GPL version 2 diff --git a/lib/classes/InstituteConfig.php b/lib/classes/InstituteConfig.php index d1a51cb..551ea4d 100644 --- a/lib/classes/InstituteConfig.php +++ b/lib/classes/InstituteConfig.php @@ -1,6 +1,6 @@ diff --git a/lib/classes/LockRules.php b/lib/classes/LockRules.php index 59679db..f1feb9f 100644 --- a/lib/classes/LockRules.php +++ b/lib/classes/LockRules.php @@ -1,6 +1,6 @@ , Suchi & Berg GmbH // +---------------------------------------------------------------------------+ diff --git a/lib/classes/MultiPersonSearch.php b/lib/classes/MultiPersonSearch.php index af10e6b..3ca617b 100644 --- a/lib/classes/MultiPersonSearch.php +++ b/lib/classes/MultiPersonSearch.php @@ -1,6 +1,6 @@ withButton->render(); * //code-end - * Watch the SearchType class in lib/classes/searchtypes/SearchType.class.php + * Watch the SearchType class in lib/classes/searchtypes/SearchType.php * for details. * Enjoy! */ @@ -166,7 +166,7 @@ class QuickSearch /** * constructor which prepares a searchfield for persons, courses, institutes or * special items you may want to search for. This is a GUI-class, see - * QuickSearch.class.php for further documentation. + * QuickSearch.php for further documentation. * * @param string $name the name of the destinated variable in your html-form. Handle it * as if it was an '' input. diff --git a/lib/classes/RangeConfig.php b/lib/classes/RangeConfig.php index b1030e3..ad48207 100644 --- a/lib/classes/RangeConfig.php +++ b/lib/classes/RangeConfig.php @@ -1,6 +1,6 @@ diff --git a/lib/classes/RangeTreeObjectFak.php b/lib/classes/RangeTreeObjectFak.php index 76cc366..9e980ca 100644 --- a/lib/classes/RangeTreeObjectFak.php +++ b/lib/classes/RangeTreeObjectFak.php @@ -5,7 +5,7 @@ # Lifter010: TODO // +---------------------------------------------------------------------------+ // This file is part of Stud.IP -// RangeTreeObjectFak.class.php +// RangeTreeObjectFak.php // Class to handle items in the "range tree" // // Copyright (c) 2002 André Noack diff --git a/lib/classes/RangeTreeObjectInst.php b/lib/classes/RangeTreeObjectInst.php index c291dfc..d41b03d 100644 --- a/lib/classes/RangeTreeObjectInst.php +++ b/lib/classes/RangeTreeObjectInst.php @@ -5,7 +5,7 @@ # Lifter010: TODO // +---------------------------------------------------------------------------+ // This file is part of Stud.IP -// RangeTreeObjectInst.class.php +// RangeTreeObjectInst.php // Class to handle items in the "range tree" // // Copyright (c) 2002 André Noack diff --git a/lib/classes/Score.php b/lib/classes/Score.php index 4d114d5..3b7f149 100644 --- a/lib/classes/Score.php +++ b/lib/classes/Score.php @@ -1,6 +1,6 @@ , data-quest GmbH // +---------------------------------------------------------------------------+ diff --git a/lib/classes/SessionDecoder.php b/lib/classes/SessionDecoder.php index d437494..fc40c07 100644 --- a/lib/classes/SessionDecoder.php +++ b/lib/classes/SessionDecoder.php @@ -3,7 +3,7 @@ # Lifter003: TODO # Lifter010: TODO /** - * SessionDecoder.class.php + * SessionDecoder.php * * decodes serialized PHP session data * @@ -13,7 +13,7 @@ */ // +---------------------------------------------------------------------------+ // This file is part of Stud.IP -// SessionDecoder.class.php +// SessionDecoder.php // // Copyright (C) 2008 André Noack , data-quest GmbH // +---------------------------------------------------------------------------+ diff --git a/lib/classes/SimpleCollection.php b/lib/classes/SimpleCollection.php index 6acc10d..ae773f5 100644 --- a/lib/classes/SimpleCollection.php +++ b/lib/classes/SimpleCollection.php @@ -7,7 +7,7 @@ if (!defined('SORT_FLAG_CASE')) { } /** - * SimpleCollection.class.php + * SimpleCollection.php * collection of assoc arrays with convenience * * This program is free software; you can redistribute it and/or diff --git a/lib/classes/SimpleORMap.php b/lib/classes/SimpleORMap.php index 7124cc4..7492906 100644 --- a/lib/classes/SimpleORMap.php +++ b/lib/classes/SimpleORMap.php @@ -1,6 +1,6 @@ diff --git a/lib/classes/StudipLock.php b/lib/classes/StudipLock.php index 601db8b..ce5752f 100644 --- a/lib/classes/StudipLock.php +++ b/lib/classes/StudipLock.php @@ -1,6 +1,6 @@ diff --git a/lib/classes/StudipRangeTreeView.php b/lib/classes/StudipRangeTreeView.php index 2532e4b..7b23089 100644 --- a/lib/classes/StudipRangeTreeView.php +++ b/lib/classes/StudipRangeTreeView.php @@ -6,7 +6,7 @@ # Lifter010: TODO // +---------------------------------------------------------------------------+ // This file is part of Stud.IP -// StudipRangeTreeView.class.php +// StudipRangeTreeView.php // Class to print out the "range tree" // // Copyright (c) 2002 André Noack diff --git a/lib/classes/StudipRangeTreeViewAdmin.php b/lib/classes/StudipRangeTreeViewAdmin.php index 0620957..1c5e5a1 100644 --- a/lib/classes/StudipRangeTreeViewAdmin.php +++ b/lib/classes/StudipRangeTreeViewAdmin.php @@ -6,7 +6,7 @@ # Lifter010: TODO // +---------------------------------------------------------------------------+ // This file is part of Stud.IP -// StudipRangeTreeViewAdmin.class.php +// StudipRangeTreeViewAdmin.php // Class to print out the "range tree" // // Copyright (c) 2002 André Noack diff --git a/lib/classes/StudipSemRangeTreeViewSimple.php b/lib/classes/StudipSemRangeTreeViewSimple.php index eecdd70..78b5ccf 100644 --- a/lib/classes/StudipSemRangeTreeViewSimple.php +++ b/lib/classes/StudipSemRangeTreeViewSimple.php @@ -6,7 +6,7 @@ # Lifter010: TODO // +---------------------------------------------------------------------------+ // This file is part of Stud.IP -// StudipSemRangeTreeViewSimple.class.php +// StudipSemRangeTreeViewSimple.php // Class to print out the seminar tree // // Copyright (c) 2003 André Noack diff --git a/lib/classes/StudipSemSearch.php b/lib/classes/StudipSemSearch.php index 8932dd1..6d86b44 100644 --- a/lib/classes/StudipSemSearch.php +++ b/lib/classes/StudipSemSearch.php @@ -5,7 +5,7 @@ # Lifter010: TODO // +---------------------------------------------------------------------------+ // This file is part of Stud.IP -// StudipSemSearchForm.class.php +// StudipSemSearchForm.php // Class to build search formular and execute search // // Copyright (c) 2003 André Noack diff --git a/lib/classes/StudipSemSearchHelper.php b/lib/classes/StudipSemSearchHelper.php index 29ee5d3..d221869 100644 --- a/lib/classes/StudipSemSearchHelper.php +++ b/lib/classes/StudipSemSearchHelper.php @@ -5,7 +5,7 @@ # Lifter010: TODO // +---------------------------------------------------------------------------+ // This file is part of Stud.IP -// StudipSemSearchHelper.class.php +// StudipSemSearchHelper.php // // // Copyright (c) 2003 André Noack diff --git a/lib/classes/StudipSemTreeSearch.php b/lib/classes/StudipSemTreeSearch.php index e79a34f..0d8f935 100644 --- a/lib/classes/StudipSemTreeSearch.php +++ b/lib/classes/StudipSemTreeSearch.php @@ -5,7 +5,7 @@ # Lifter010: TODO // +---------------------------------------------------------------------------+ // This file is part of Stud.IP -// StudipSemTreeSearch.class.php +// StudipSemTreeSearch.php // Class to build search formular and execute search // // Copyright (c) 2003 André Noack diff --git a/lib/classes/StudipSemTreeView.php b/lib/classes/StudipSemTreeView.php index 3e984cc..f2d6fbe 100644 --- a/lib/classes/StudipSemTreeView.php +++ b/lib/classes/StudipSemTreeView.php @@ -5,7 +5,7 @@ # Lifter010: TODO // +---------------------------------------------------------------------------+ // This file is part of Stud.IP -// StudipSemTreeView.class.php +// StudipSemTreeView.php // Class to print out the seminar tree // // Copyright (c) 2003 André Noack diff --git a/lib/classes/StudipSemTreeViewAdmin.php b/lib/classes/StudipSemTreeViewAdmin.php index edc65c8..59c926a 100644 --- a/lib/classes/StudipSemTreeViewAdmin.php +++ b/lib/classes/StudipSemTreeViewAdmin.php @@ -7,7 +7,7 @@ # Lifter010: TODO // +---------------------------------------------------------------------------+ // This file is part of Stud.IP -// StudipSemTreeViewAdmin.class.php +// StudipSemTreeViewAdmin.php // Class to print out the seminar tree in administration mode // // Copyright (c) 2003 André Noack diff --git a/lib/classes/StudipSemTreeViewSimple.php b/lib/classes/StudipSemTreeViewSimple.php index e2dba76..239275b 100644 --- a/lib/classes/StudipSemTreeViewSimple.php +++ b/lib/classes/StudipSemTreeViewSimple.php @@ -6,7 +6,7 @@ # Lifter010: TODO // +---------------------------------------------------------------------------+ // This file is part of Stud.IP -// StudipSemTreeViewSimple.class.php +// StudipSemTreeViewSimple.php // Class to print out the seminar tree // // Copyright (c) 2003 André Noack diff --git a/lib/classes/TreeAbstract.php b/lib/classes/TreeAbstract.php index ccdb6e1..a1413b3 100644 --- a/lib/classes/TreeAbstract.php +++ b/lib/classes/TreeAbstract.php @@ -5,7 +5,7 @@ # Lifter010: TODO // +---------------------------------------------------------------------------+ // This file is part of Stud.IP -// TreeAbstract.class.php +// TreeAbstract.php // Abstract Base Class to handle in-memory tree structures // // Copyright (c) 2002 André Noack diff --git a/lib/classes/TreeView.php b/lib/classes/TreeView.php index 243a9b9..0bc2810 100644 --- a/lib/classes/TreeView.php +++ b/lib/classes/TreeView.php @@ -5,8 +5,8 @@ // +---------------------------------------------------------------------------+ // This file is part of Stud.IP -// TreeView.class.php -// Class to print out html represantation of a tree object based on TreeAbstract.class.php +// TreeView.php +// Class to print out html represantation of a tree object based on TreeAbstract.php // // Copyright (c) 2002 André Noack // Suchi & Berg GmbH @@ -26,9 +26,7 @@ // +---------------------------------------------------------------------------+ /** -* Class to print out html represantation of a tree object based on TreeAbstract.class.php -* -* Class to print out html represantation of a tree object based on TreeAbstract.class.php +* Class to print out html represantation of a tree object based on TreeAbstract.php * * @access public * @author André Noack diff --git a/lib/classes/UserConfig.php b/lib/classes/UserConfig.php index 4cb1ff6..413d4c8 100644 --- a/lib/classes/UserConfig.php +++ b/lib/classes/UserConfig.php @@ -1,6 +1,6 @@ \ No newline at end of file +?> diff --git a/lib/classes/admission/AdmissionPriority.php b/lib/classes/admission/AdmissionPriority.php index 47e1564..22d426e 100644 --- a/lib/classes/admission/AdmissionPriority.php +++ b/lib/classes/admission/AdmissionPriority.php @@ -1,6 +1,6 @@ diff --git a/lib/classes/auth_plugins/StudipAuthIP.php b/lib/classes/auth_plugins/StudipAuthIP.php index e0d6afa..dd42a28 100644 --- a/lib/classes/auth_plugins/StudipAuthIP.php +++ b/lib/classes/auth_plugins/StudipAuthIP.php @@ -1,6 +1,6 @@ diff --git a/lib/classes/auth_plugins/StudipAuthLdapReadAndBind.php b/lib/classes/auth_plugins/StudipAuthLdapReadAndBind.php index 742f0cb..3acb1d8 100644 --- a/lib/classes/auth_plugins/StudipAuthLdapReadAndBind.php +++ b/lib/classes/auth_plugins/StudipAuthLdapReadAndBind.php @@ -4,7 +4,7 @@ # Lifter010: TODO // +---------------------------------------------------------------------------+ // This file is part of Stud.IP -// StudipAuthLdapReadAndBind.class.php +// StudipAuthLdapReadAndBind.php // Stud.IP authentication against LDAP Server using read-only account and // user bind // diff --git a/lib/classes/auth_plugins/StudipAuthOIDC.php b/lib/classes/auth_plugins/StudipAuthOIDC.php index adfe9c9..b26c17b 100644 --- a/lib/classes/auth_plugins/StudipAuthOIDC.php +++ b/lib/classes/auth_plugins/StudipAuthOIDC.php @@ -1,6 +1,6 @@ * * This program is free software; you can redistribute it and/or diff --git a/lib/classes/auth_plugins/StudipAuthSSO.php b/lib/classes/auth_plugins/StudipAuthSSO.php index 752fa59..dd6af11 100644 --- a/lib/classes/auth_plugins/StudipAuthSSO.php +++ b/lib/classes/auth_plugins/StudipAuthSSO.php @@ -3,7 +3,7 @@ # Lifter003: TODO # Lifter010: TODO /* - * StudipAuthSSO.class.php - abstract base class for SSO auth plugins + * StudipAuthSSO.php - abstract base class for SSO auth plugins * Copyright (c) 2007 Elmar Ludwig, Universitaet Osnabrueck * * This program is free software; you can redistribute it and/or diff --git a/lib/classes/auth_plugins/StudipAuthShib.php b/lib/classes/auth_plugins/StudipAuthShib.php index 3eedc65..135b3f6 100644 --- a/lib/classes/auth_plugins/StudipAuthShib.php +++ b/lib/classes/auth_plugins/StudipAuthShib.php @@ -3,7 +3,7 @@ # Lifter003: TODO # Lifter010: TODO /* - * StudipAuthShib.class.php - Stud.IP authentication against Shibboleth server + * StudipAuthShib.php - Stud.IP authentication against Shibboleth server * Copyright (c) 2007 Elmar Ludwig, Universitaet Osnabrueck * * This program is free software; you can redistribute it and/or diff --git a/lib/classes/auth_plugins/StudipAuthStandard.php b/lib/classes/auth_plugins/StudipAuthStandard.php index 5bb3e65..927a13c 100644 --- a/lib/classes/auth_plugins/StudipAuthStandard.php +++ b/lib/classes/auth_plugins/StudipAuthStandard.php @@ -4,7 +4,7 @@ # Lifter010: TODO // +---------------------------------------------------------------------------+ // This file is part of Stud.IP -// StudipAuthStandard.class.php +// StudipAuthStandard.php // Basic Stud.IP authentication, using the Stud.IP database // // Copyright (c) 2003 André Noack diff --git a/lib/classes/cache/Exception.php b/lib/classes/cache/Exception.php index 64ee364..061d090 100644 --- a/lib/classes/cache/Exception.php +++ b/lib/classes/cache/Exception.php @@ -1,6 +1,6 @@ , Suchi & Berg GmbH * @access public @@ -49,7 +49,7 @@ class CheckAdmissionJob extends CronJob public function setUp() { - require_once 'lib/classes/admission/CourseSet.class.php'; + require_once 'lib/classes/admission/CourseSet.php'; if (empty($GLOBALS['ABSOLUTE_URI_STUDIP'])) { throw new Exception('To use check_admission job you MUST set correct values for $ABSOLUTE_URI_STUDIP in config_local.inc.php!'); } diff --git a/lib/cronjobs/cleanup_log.php b/lib/cronjobs/cleanup_log.php index 378a6ec..e88f803 100644 --- a/lib/cronjobs/cleanup_log.php +++ b/lib/cronjobs/cleanup_log.php @@ -10,7 +10,7 @@ // +---------------------------------------------------------------------------+ // This file is part of Stud.IP -// cleanup_log.class.php +// cleanup_log.php // // Copyright (C) 2013 Jan-Hendrik Willms // +---------------------------------------------------------------------------+ @@ -28,7 +28,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +---------------------------------------------------------------------------+ -require_once 'lib/classes/CronJob.class.php'; +require_once 'lib/classes/CronJob.php'; class CleanupLogJob extends CronJob { diff --git a/lib/cronjobs/garbage_collector.php b/lib/cronjobs/garbage_collector.php index bab44b2..eba57fc 100644 --- a/lib/cronjobs/garbage_collector.php +++ b/lib/cronjobs/garbage_collector.php @@ -1,12 +1,12 @@ , Suchi & Berg GmbH * @access public * @since 2.4 */ -require_once 'lib/classes/CronJob.class.php'; +require_once 'lib/classes/CronJob.php'; class GarbageCollectorJob extends CronJob { diff --git a/lib/cronjobs/purge_cache.php b/lib/cronjobs/purge_cache.php index d2e3697..2e253e1 100644 --- a/lib/cronjobs/purge_cache.php +++ b/lib/cronjobs/purge_cache.php @@ -1,6 +1,6 @@ , Suchi & Berg GmbH * @author Jan-Hendrik Willms @@ -10,7 +10,7 @@ // +---------------------------------------------------------------------------+ // This file is part of Stud.IP -// purge_cache.class.php +// purge_cache.php // // Copyright (C) 2013 Jan-Hendrik Willms // +---------------------------------------------------------------------------+ @@ -28,7 +28,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +---------------------------------------------------------------------------+ -require_once 'lib/classes/CronJob.class.php'; +require_once 'lib/classes/CronJob.php'; class PurgeCacheJob extends CronJob { @@ -70,7 +70,7 @@ class PurgeCacheJob extends CronJob */ public function setUp() { - require_once 'lib/classes/cache/FileCache.class.php'; + require_once 'lib/classes/cache/FileCache.php'; } /** diff --git a/lib/cronjobs/remind_oer_upload.php b/lib/cronjobs/remind_oer_upload.php index a1a8ee1..528d789 100644 --- a/lib/cronjobs/remind_oer_upload.php +++ b/lib/cronjobs/remind_oer_upload.php @@ -1,13 +1,13 @@ , Suchi & Berg GmbH * @access public * @since 5.2 */ -require_once 'lib/classes/CronJob.class.php'; +require_once 'lib/classes/CronJob.php'; class RemindOerUpload extends CronJob { diff --git a/lib/cronjobs/send_mail_queue.php b/lib/cronjobs/send_mail_queue.php index 8f72918..f9cdd94 100644 --- a/lib/cronjobs/send_mail_queue.php +++ b/lib/cronjobs/send_mail_queue.php @@ -1,6 +1,6 @@ , Suchi & Berg GmbH * @access public diff --git a/lib/cronjobs/session_gc.php b/lib/cronjobs/session_gc.php index 4289a29..54763ee 100644 --- a/lib/cronjobs/session_gc.php +++ b/lib/cronjobs/session_gc.php @@ -1,6 +1,6 @@ , Suchi & Berg GmbH * @access public diff --git a/lib/dbviews/range_tree.view.php b/lib/dbviews/range_tree.view.php index 8d3af86..913330d 100644 --- a/lib/dbviews/range_tree.view.php +++ b/lib/dbviews/range_tree.view.php @@ -5,7 +5,7 @@ # Lifter010: TODO // +---------------------------------------------------------------------------+ // This file is part of Stud.IP -// range_tree.view.class.php +// range_tree.view.php // Database views used with "range_tree" // // Copyright (c) 2002 André Noack diff --git a/lib/dbviews/sem_tree.view.php b/lib/dbviews/sem_tree.view.php index 008ee93..8980e71 100644 --- a/lib/dbviews/sem_tree.view.php +++ b/lib/dbviews/sem_tree.view.php @@ -5,7 +5,7 @@ # Lifter010: TODO // +---------------------------------------------------------------------------+ // This file is part of Stud.IP -// sem_tree.view.class.php +// sem_tree.view.php // Database views used with "sem_tree" // // Copyright (c) 2003 André Noack diff --git a/lib/elearning/ConnectedCMS.php b/lib/elearning/ConnectedCMS.php index 3dd3bfb..f5617e8 100644 --- a/lib/elearning/ConnectedCMS.php +++ b/lib/elearning/ConnectedCMS.php @@ -100,15 +100,15 @@ class ConnectedCMS public function initSubclasses() { if ($this->auth_necessary) { - require_once $this->CLASS_PREFIX . "ConnectedUser.class.php"; + require_once $this->CLASS_PREFIX . "ConnectedUser.php"; $classname = $this->CLASS_PREFIX . "ConnectedUser"; $this->user = new $classname($this->cms_type); - require_once $this->CLASS_PREFIX . "ConnectedPermissions.class.php"; + require_once $this->CLASS_PREFIX . "ConnectedPermissions.php"; $classname = $this->CLASS_PREFIX . "ConnectedPermissions"; $this->permissions = new $classname($this->cms_type); } - require_once $this->CLASS_PREFIX . "ConnectedLink.class.php"; + require_once $this->CLASS_PREFIX . "ConnectedLink.php"; $classname = $this->CLASS_PREFIX . "ConnectedLink"; $this->link = new $classname($this->cms_type); } @@ -203,14 +203,14 @@ class ConnectedCMS $el_path = $GLOBALS['STUDIP_BASE_PATH'] . '/lib/elearning'; // check if needed classes exist $files = [ - 'class_link' => "{$el_path}/{$this->CLASS_PREFIX}ConnectedLink.class.php", - 'class_content' => "{$el_path}/{$this->CLASS_PREFIX}ContentModule.class.php", - 'class_cms' => "{$el_path}/{$this->CLASS_PREFIX}ConnectedCMS.class.php", + 'class_link' => "{$el_path}/{$this->CLASS_PREFIX}ConnectedLink.php", + 'class_content' => "{$el_path}/{$this->CLASS_PREFIX}ContentModule.php", + 'class_cms' => "{$el_path}/{$this->CLASS_PREFIX}ConnectedCMS.php", ]; if ($this->auth_necessary) { - $files['class_user'] = "{$el_path}/{$this->CLASS_PREFIX}ConnectedUser.class.php"; - $files['class_perm'] = "{$el_path}/{$this->CLASS_PREFIX}ConnectedPermissions.class.php"; + $files['class_user'] = "{$el_path}/{$this->CLASS_PREFIX}ConnectedUser.php"; + $files['class_perm'] = "{$el_path}/{$this->CLASS_PREFIX}ConnectedPermissions.php"; } $errors = 0; @@ -281,7 +281,7 @@ class ConnectedCMS global $current_module; $current_module = $data["ref_id"]; - require_once($this->CLASS_PREFIX . "ContentModule.class.php"); + require_once($this->CLASS_PREFIX . "ContentModule.php"); $classname = $this->CLASS_PREFIX . "ContentModule"; $this->content_module[$current_module] = new $classname("", $data["type"], $this->cms_type); @@ -305,7 +305,7 @@ class ConnectedCMS global $current_module; $current_module = $module_id; - require_once($this->CLASS_PREFIX . "ContentModule.class.php"); + require_once($this->CLASS_PREFIX . "ContentModule.php"); $classname = $this->CLASS_PREFIX . "ContentModule"; if ($is_connected == false) diff --git a/lib/elearning/ELearningUtils.php b/lib/elearning/ELearningUtils.php index 33fb4a2..806cff9 100644 --- a/lib/elearning/ELearningUtils.php +++ b/lib/elearning/ELearningUtils.php @@ -26,7 +26,7 @@ class ELearningUtils global $connected_cms, $ELEARNING_INTERFACE_MODULES; if (!isset($connected_cms[$cms]) || !is_object($connected_cms[$cms])) { - require_once "lib/elearning/{$ELEARNING_INTERFACE_MODULES[$cms]['CLASS_PREFIX']}ConnectedCMS.class.php"; + require_once "lib/elearning/{$ELEARNING_INTERFACE_MODULES[$cms]['CLASS_PREFIX']}ConnectedCMS.php"; $classname = "{$ELEARNING_INTERFACE_MODULES[$cms]['CLASS_PREFIX']}ConnectedCMS"; $connected_cms[$cms] = new $classname($cms); $connected_cms[$cms]->initSubclasses(); diff --git a/lib/elearning/Ilias3ConnectedCMS.php b/lib/elearning/Ilias3ConnectedCMS.php index 3e428ff..759880a 100644 --- a/lib/elearning/Ilias3ConnectedCMS.php +++ b/lib/elearning/Ilias3ConnectedCMS.php @@ -44,7 +44,7 @@ class Ilias3ConnectedCMS extends ConnectedCMS parent::__construct($cms); - require_once($this->CLASS_PREFIX . "Soap.class.php"); + require_once($this->CLASS_PREFIX . "Soap.php"); $classname = $this->CLASS_PREFIX . "Soap"; $this->soap_client = new $classname($this->cms_type); $this->soap_client->setCachingStatus(true); diff --git a/lib/elearning/PmWikiConnectedCMS.php b/lib/elearning/PmWikiConnectedCMS.php index 7de0a78..d890126 100644 --- a/lib/elearning/PmWikiConnectedCMS.php +++ b/lib/elearning/PmWikiConnectedCMS.php @@ -5,7 +5,7 @@ # Lifter010: TODO /* - * PmWikiConnectedCMS.class.php - Provides search capabilities + * PmWikiConnectedCMS.php - Provides search capabilities * to search WikiFarm * * Copyright (C) 2006 - Marco Diedrich (mdiedric@uos.de) diff --git a/lib/elearning/PmWikiConnectedLink.php b/lib/elearning/PmWikiConnectedLink.php index 8ed7416..973c272 100644 --- a/lib/elearning/PmWikiConnectedLink.php +++ b/lib/elearning/PmWikiConnectedLink.php @@ -5,7 +5,7 @@ # Lifter010: TODO /* - * PmWikiConnectedLink.class.php - Provides links to PmWiki Modules + * PmWikiConnectedLink.php - Provides links to PmWiki Modules * * Copyright (C) 2006 - Marco Diedrich (mdiedric@uos.de) * diff --git a/lib/elearning/PmWikiContentModule.php b/lib/elearning/PmWikiContentModule.php index 06533dd..fb3cccd 100644 --- a/lib/elearning/PmWikiContentModule.php +++ b/lib/elearning/PmWikiContentModule.php @@ -5,7 +5,7 @@ # Lifter010: TODO /* - * PmWikiContentModule.class.php - Provides access PmWiki Modules + * PmWikiContentModule.php - Provides access PmWiki Modules * * Copyright (C) 2006 - Marco Diedrich (mdiedric@uos.de) * diff --git a/lib/exceptions/ClipboardException.php b/lib/exceptions/ClipboardException.php index 676da93..1c80175 100644 --- a/lib/exceptions/ClipboardException.php +++ b/lib/exceptions/ClipboardException.php @@ -1,7 +1,7 @@ * @license GPL 2 or later diff --git a/lib/models/ContentTermsOfUse.php b/lib/models/ContentTermsOfUse.php index fb2e592..1982dd6 100644 --- a/lib/models/ContentTermsOfUse.php +++ b/lib/models/ContentTermsOfUse.php @@ -1,6 +1,6 @@ // +---------------------------------------------------------------------------+ diff --git a/lib/models/CronjobSchedule.php b/lib/models/CronjobSchedule.php index 0eb19ba..08a18d3 100644 --- a/lib/models/CronjobSchedule.php +++ b/lib/models/CronjobSchedule.php @@ -1,7 +1,7 @@ // +---------------------------------------------------------------------------+ diff --git a/lib/models/CronjobTask.php b/lib/models/CronjobTask.php index 8a56ca0..1304bc1 100644 --- a/lib/models/CronjobTask.php +++ b/lib/models/CronjobTask.php @@ -1,7 +1,7 @@ // +---------------------------------------------------------------------------+ diff --git a/lib/models/Degree.php b/lib/models/Degree.php index 6fef834..9c908d3 100644 --- a/lib/models/Degree.php +++ b/lib/models/Degree.php @@ -1,6 +1,6 @@ * @access public diff --git a/lib/models/HelpTour.php b/lib/models/HelpTour.php index 68bd830..978e203 100644 --- a/lib/models/HelpTour.php +++ b/lib/models/HelpTour.php @@ -21,7 +21,7 @@ require_once 'lib/object.inc.php'; /** - * HelpTour.class.php - model class for Stud.IP tours + * HelpTour.php - model class for Stud.IP tours * * * diff --git a/lib/models/HelpTourAudience.php b/lib/models/HelpTourAudience.php index 6255a46..f341196 100644 --- a/lib/models/HelpTourAudience.php +++ b/lib/models/HelpTourAudience.php @@ -19,7 +19,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +---------------------------------------------------------------------------+ /** - * HelpTourSteps.class.php - model class for tour audiences + * HelpTourSteps.php - model class for tour audiences * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/lib/models/HelpTourSettings.php b/lib/models/HelpTourSettings.php index f24c86b..1cac957 100644 --- a/lib/models/HelpTourSettings.php +++ b/lib/models/HelpTourSettings.php @@ -19,7 +19,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +---------------------------------------------------------------------------+ /** - * HelpTourSteps.class.php - model class for tour steps + * HelpTourSteps.php - model class for tour steps * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/lib/models/HelpTourStep.php b/lib/models/HelpTourStep.php index 6f31326..3bd5ad8 100644 --- a/lib/models/HelpTourStep.php +++ b/lib/models/HelpTourStep.php @@ -19,7 +19,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +---------------------------------------------------------------------------+ /** - * HelpTourSteps.class.php - model class for tour steps + * HelpTourSteps.php - model class for tour steps * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -104,4 +104,3 @@ class HelpTourStep extends SimpleORMap return true; } } - diff --git a/lib/models/HelpTourUser.php b/lib/models/HelpTourUser.php index aa2869d..4992225 100644 --- a/lib/models/HelpTourUser.php +++ b/lib/models/HelpTourUser.php @@ -19,7 +19,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +---------------------------------------------------------------------------+ /** - * HelpTourUser.class.php - model class for tour user visits + * HelpTourUser.php - model class for tour user visits * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/lib/models/Institute.php b/lib/models/Institute.php index 47cf271..df344ff 100644 --- a/lib/models/Institute.php +++ b/lib/models/Institute.php @@ -1,6 +1,6 @@ , Suchi & Berg GmbH * @author Arne Schröder diff --git a/lib/models/StudipScmEntry.php b/lib/models/StudipScmEntry.php index 7001a4a..30c13d3 100644 --- a/lib/models/StudipScmEntry.php +++ b/lib/models/StudipScmEntry.php @@ -1,6 +1,6 @@ * @copyright 2021 Authors diff --git a/lib/plugins/core/DetailspagePlugin.php b/lib/plugins/core/DetailspagePlugin.php index 36e6efa..3cc3b57 100644 --- a/lib/plugins/core/DetailspagePlugin.php +++ b/lib/plugins/core/DetailspagePlugin.php @@ -1,6 +1,6 @@ * diff --git a/lib/plugins/core/ForumModule.php b/lib/plugins/core/ForumModule.php index 33784db..e72ffc2 100644 --- a/lib/plugins/core/ForumModule.php +++ b/lib/plugins/core/ForumModule.php @@ -1,6 +1,6 @@ * Copyright (c) 2009 - Elmar Ludwig diff --git a/lib/plugins/core/LibraryPlugin.php b/lib/plugins/core/LibraryPlugin.php index a7fb873..3c1a751 100644 --- a/lib/plugins/core/LibraryPlugin.php +++ b/lib/plugins/core/LibraryPlugin.php @@ -2,7 +2,7 @@ /* - * LibraryPlugin.class.php - A plugin class for library plugins. + * LibraryPlugin.php - A plugin class for library plugins. * * Copyright (c) 2020 Moritz Strohm * diff --git a/lib/plugins/core/PortalPlugin.php b/lib/plugins/core/PortalPlugin.php index cb5aca4..826e410 100644 --- a/lib/plugins/core/PortalPlugin.php +++ b/lib/plugins/core/PortalPlugin.php @@ -1,7 +1,7 @@ * Copyright (c) 2009 - Elmar Ludwig diff --git a/lib/plugins/core/Role.php b/lib/plugins/core/Role.php index 3ca8a11..91e00e8 100644 --- a/lib/plugins/core/Role.php +++ b/lib/plugins/core/Role.php @@ -1,6 +1,6 @@ * @author Michael Riehemann diff --git a/lib/plugins/core/StandardPlugin.php b/lib/plugins/core/StandardPlugin.php index 960ffd0..5180891 100644 --- a/lib/plugins/core/StandardPlugin.php +++ b/lib/plugins/core/StandardPlugin.php @@ -1,7 +1,7 @@ * Copyright (c) 2009 - Elmar Ludwig diff --git a/lib/plugins/core/StudIPPlugin.php b/lib/plugins/core/StudIPPlugin.php index fe74259..6642dbd 100644 --- a/lib/plugins/core/StudIPPlugin.php +++ b/lib/plugins/core/StudIPPlugin.php @@ -1,6 +1,6 @@ * @copyright 2009 Authors diff --git a/lib/plugins/core/SystemPlugin.php b/lib/plugins/core/SystemPlugin.php index c204567..0ffd16f 100644 --- a/lib/plugins/core/SystemPlugin.php +++ b/lib/plugins/core/SystemPlugin.php @@ -1,7 +1,7 @@ * Copyright (c) 2009 - Elmar Ludwig diff --git a/lib/plugins/db/RolePersistence.php b/lib/plugins/db/RolePersistence.php index df63a77..54a0053 100644 --- a/lib/plugins/db/RolePersistence.php +++ b/lib/plugins/db/RolePersistence.php @@ -1,6 +1,6 @@ diff --git a/lib/raumzeit/Issue.php b/lib/raumzeit/Issue.php index 939aaee..eeb38b3 100644 --- a/lib/raumzeit/Issue.php +++ b/lib/raumzeit/Issue.php @@ -5,7 +5,7 @@ # Lifter010: TODO // +--------------------------------------------------------------------------+ // This file is part of Stud.IP -// Issue.class.php +// Issue.php // // Repräsentiert ein einzelnes Thema einer Veranstaltung // @@ -26,7 +26,7 @@ /** - * Issue.class.php + * Issue.php * * * @author Till Glöggler @@ -156,7 +156,7 @@ class Issue { function restore() { /* * To avoid inconsistency, the restore function has been removed. - * The only way to load an Issue is via the Seminar.class.php, with the function fillValuesFromArray + * The only way to load an Issue is via the Seminar.php, with the function fillValuesFromArray */ $this->fillValuesFromArray(IssueDB::restoreIssue($this->issue_id)); } diff --git a/lib/raumzeit/IssueDB.php b/lib/raumzeit/IssueDB.php index d6c0ba3..17d8b95 100644 --- a/lib/raumzeit/IssueDB.php +++ b/lib/raumzeit/IssueDB.php @@ -5,9 +5,9 @@ # Lifter010: TODO // +--------------------------------------------------------------------------+ // This file is part of Stud.IP -// IssueDB.class.php +// IssueDB.php // -// Datenbank-Abfragen für Issue.class.php +// Datenbank-Abfragen für Issue.php // // +--------------------------------------------------------------------------+ // This program is free software; you can redistribute it and/or @@ -26,7 +26,7 @@ /** - * IssueDB.class.php + * IssueDB.php * * * @author Till Glöggler diff --git a/lib/raumzeit/MetaDate.php b/lib/raumzeit/MetaDate.php index 0af632d..1348222 100644 --- a/lib/raumzeit/MetaDate.php +++ b/lib/raumzeit/MetaDate.php @@ -5,7 +5,7 @@ # Lifter010: TODO // +--------------------------------------------------------------------------+ // This file is part of Stud.IP -// MetaDate.class.php +// MetaDate.php // // Repräsentiert die Zeit- und Turnusdaten einer Veranstaltung // @@ -26,7 +26,7 @@ /** - * MetaDate.class.php + * MetaDate.php * * * @author Till Glöggler diff --git a/lib/raumzeit/MetaDateDB.php b/lib/raumzeit/MetaDateDB.php index 5f5e1df..29af00e 100644 --- a/lib/raumzeit/MetaDateDB.php +++ b/lib/raumzeit/MetaDateDB.php @@ -6,9 +6,9 @@ // +--------------------------------------------------------------------------+ // This file is part of Stud.IP -// MetaDateDB.class.php +// MetaDateDB.php // -// Datenbank-Abfragen für MetaDate.class.php +// Datenbank-Abfragen für MetaDate.php // // +--------------------------------------------------------------------------+ // This program is free software; you can redistribute it and/or @@ -27,7 +27,7 @@ /** - * MetaDateDB.class.php + * MetaDateDB.php * * * @author Till Glöggler diff --git a/lib/raumzeit/SeminarDB.php b/lib/raumzeit/SeminarDB.php index 63241fe..600510b 100644 --- a/lib/raumzeit/SeminarDB.php +++ b/lib/raumzeit/SeminarDB.php @@ -5,9 +5,9 @@ # Lifter010: DONE // +--------------------------------------------------------------------------+ // This file is part of Stud.IP -// SeminarDB.class.php +// SeminarDB.php // -// Datenbank-Abfragen für Seminar.class.php +// Datenbank-Abfragen für Seminar // // +--------------------------------------------------------------------------+ // This program is free software; you can redistribute it and/or @@ -26,7 +26,7 @@ /** - * SeminarDB.class.php + * SeminarDB.php * * * @author Till Glöggler diff --git a/lib/raumzeit/SingleDate.php b/lib/raumzeit/SingleDate.php index 2e8f41e..06cb9a2 100644 --- a/lib/raumzeit/SingleDate.php +++ b/lib/raumzeit/SingleDate.php @@ -4,7 +4,7 @@ # Lifter003: TODO # Lifter010: TODO /** - * SingelDate.class.php - Ein (Ex-)Termin + * SingelDate.php - Ein (Ex-)Termin * * Diese Klasse stellt einen einzelnen Eintrag in der Tabelle termine, bzw. ex_termine dar. * diff --git a/lib/raumzeit/SingleDateDB.php b/lib/raumzeit/SingleDateDB.php index e50d6cf..04144a6 100644 --- a/lib/raumzeit/SingleDateDB.php +++ b/lib/raumzeit/SingleDateDB.php @@ -4,9 +4,9 @@ # Lifter010: DONE // +--------------------------------------------------------------------------+ // This file is part of Stud.IP -// SingleDateDB.class.php +// SingleDateDB.php // -// Datenbank-Abfragen für SingleDate.class.php +// Datenbank-Abfragen für SingleDate.php // // +--------------------------------------------------------------------------+ // This program is free software; you can redistribute it and/or @@ -25,7 +25,7 @@ /** - * SingleDateDB.class.php + * SingleDateDB.php * * * @author Till Glöggler diff --git a/lib/resources/ResourceManager.php b/lib/resources/ResourceManager.php index a30c470..b6115e7 100644 --- a/lib/resources/ResourceManager.php +++ b/lib/resources/ResourceManager.php @@ -1,7 +1,7 @@ ELEARNING_INTERFACE_ENABLE) } if (!count(array_column($connection_status, 'error'))) { - require_once ("lib/elearning/" . $ELEARNING_INTERFACE_MODULES[$cms_select]["CLASS_PREFIX"] . "ConnectedCMS.class.php"); + require_once ("lib/elearning/" . $ELEARNING_INTERFACE_MODULES[$cms_select]["CLASS_PREFIX"] . "ConnectedCMS.php"); $classname = $ELEARNING_INTERFACE_MODULES[$cms_select]["CLASS_PREFIX"] . "ConnectedCMS"; $connected_cms[$cms_select] = new $classname($cms_select); $connected_cms[$cms_select]->initSubclasses(); diff --git a/resources/assets/javascripts/lib/wysiwyg.js b/resources/assets/javascripts/lib/wysiwyg.js index f9acb81..47c64d0 100644 --- a/resources/assets/javascripts/lib/wysiwyg.js +++ b/resources/assets/javascripts/lib/wysiwyg.js @@ -13,17 +13,17 @@ const wysiwyg = { isHtml: function isHtml(text) { // NOTE keep this function in sync with - // Markup::isHtml in Markup.class.php + // Markup::isHtml in Markup.php return this.hasHtmlMarker(text); }, hasHtmlMarker: function hasHtmlMarker(text) { // NOTE keep this function in sync with - // Markup::hasHtmlMarker in Markup.class.php + // Markup::hasHtmlMarker in Markup.php return this.htmlMarkerRegExp.test(text); }, markAsHtml: function markAsHtml(text) { // NOTE keep this function in sync with - // Markup::markAsHtml in Markup.class.php + // Markup::markAsHtml in Markup.php if (this.hasHtmlMarker(text) || text.trim() == '') { return text; // marker already set, don't set twice } -- cgit v1.0