use correct case for classes, closes #1233

Closes #1233

Merge request studip/studip!747

app/controllers/calendar/single.php

@@ -197,7 +197,8 @@ class Calendar_SingleController extends Calendar_CalendarController
         $calendar = new SingleCalendar($this->range_id);
         $event = $calendar->getEvent($event_id);
         if (!$event->isNew()) {
-            $export = new CalendarExportFile(new CalendarWriterICalendar());
+            $calender_writer = new CalendarWriterICalendar();
+            $export = new CalendarExportFile($calender_writer);
             $export->exportFromObjects($event);
             $export->sendFile();
         }
@@ -210,7 +211,8 @@ class Calendar_SingleController extends Calendar_CalendarController
         $this->calendar = new SingleCalendar($this->range_id);
 
         if (Request::submitted('export')) {
-            $export = new CalendarExportFile(new CalendarWriterICalendar());
+            $calender_writer = new CalendarWriterICalendar();
+            $export = new CalendarExportFile($calender_writer);
             if (Request::get('event_type') == 'user') {
                 $types = ['CalendarEvent'];
             } else if (Request::get('event_type') == 'course') {
@@ -245,8 +247,8 @@ class Calendar_SingleController extends Calendar_CalendarController
         if ($this->calendar->havePermission(Calendar::PERMISSION_OWN)) {
             if (Request::submitted('import')) {
                 CSRFProtection::verifySecurityToken();
-                $import = new CalendarImportFile(new CalendarParserICalendar(),
-                        $_FILES['importfile']);
+                $calender_parser = new CalendarParserICalendar();
+                $import = new CalendarImportFile($calender_parser, $_FILES['importfile']);
                 if (Request::get('import_as_private_imp')) {
                     $import->changePublicToPrivate();
                 }

app/controllers/course/enrolment.php

@@ -46,7 +46,7 @@ class Course_EnrolmentController extends AuthenticatedController
             (in_array($enrolment_info['cause'], words('root courseadmin member'))
                 || ($enrolment_info['cause'] == 'free_access' && $GLOBALS['user']->id == 'nobody'))
         ) {
-            $redirect_url = UrlHelper::getUrl('seminar_main.php', ['auswahl' => $this->course_id]);
+            $redirect_url = URLHelper::getUrl('seminar_main.php', ['auswahl' => $this->course_id]);
             if (Request::isXhr()) {
                 $this->response->add_header('X-Location', $redirect_url);
                 $this->render_nothing();

app/controllers/course/lvgselector.php

@@ -276,9 +276,9 @@ class Course_LvgselectorController extends AuthenticatedController
         if ($this->is_locked($course_id)) {
             throw new AccessDeniedException();
         }
-        
+
         $lv_group_ids = $selection->getLvgruppenIDs();
-        
+
         // check whether at least one lv-group or study area is required
         $study_areas_combined_enabled = CourseWizardStepRegistry::findOneBySQL("
                 `classname` = 'StudyAreasLVGroupsCombinedWizardStep'
@@ -291,7 +291,7 @@ class Course_LvgselectorController extends AuthenticatedController
             }
         }
         // write the new lvgruppen to the db
-        LvGruppe::setLvgruppen($course_id, $lv_group_ids);
+        Lvgruppe::setLvgruppen($course_id, $lv_group_ids);
         PageLayout::postMessage(MessageBox::success(_('Die Zuordnung der LV-Gruppen wurde übernommen.')));
     }
 

app/controllers/course/studygroup.php

@@ -775,7 +775,7 @@ class Course_StudygroupController extends AuthenticatedController
             // save invite in database
             StudygroupModel::inviteMember($receiver, $id);
             // send invite message to user
-            $msg     = new Messaging();
+            $msg     = new messaging();
             $sem     = new Seminar($id);
             $message = sprintf(_("%s möchte Sie auf die Studiengruppe %s aufmerksam machen. Klicken Sie auf den untenstehenden Link, um direkt zur Studiengruppe zu gelangen.\n\n %s"),
                 get_fullname(), $sem->name, URLHelper::getlink("dispatch.php/course/studygroup/details/" . $id, ['cid' => null]));
@@ -795,7 +795,7 @@ class Course_StudygroupController extends AuthenticatedController
                 $addedUsers
             ));
         } else if ($count >= 1) {
-            pageLayout::postSuccess(sprintf(
+            PageLayout::postSuccess(sprintf(
                 _('%s wurden in die Studiengruppe eingeladen.'),
                 $addedUsers
             ));

app/controllers/ical.php

@@ -52,7 +52,8 @@ class iCalController extends StudipController
             $GLOBALS['perm'] = new Seminar_Perm();
 
             $extype = 'ALL_EVENTS';
-            $export = new CalendarExport(new CalendarWriterICalendar());
+            $calender_writer = new CalendarWriterICalendar();
+            $export = new CalendarExport($calender_writer);
             $export->exportFromDatabase($user_id, strtotime('-4 week'), 2114377200, 'ALL_EVENTS');
 
             if ($GLOBALS['_calendar_error']->getMaxStatus(ErrorHandler::ERROR_CRITICAL)) {

app/controllers/messages.php

@@ -943,7 +943,7 @@ class MessagesController extends AuthenticatedController {
     public function delete_tag_action()
     {
         CSRFProtection::verifyUnsafeRequest();
-        DbManager::get()->execute("DELETE FROM message_tags WHERE user_id=? AND tag LIKE ?", [$GLOBALS['user']->id, Request::get('tag')]);
+        DBManager::get()->execute("DELETE FROM message_tags WHERE user_id=? AND tag LIKE ?", [$GLOBALS['user']->id, Request::get('tag')]);
         PageLayout::postMessage(MessageBox::success(_('Schlagwort gelöscht!')));
         $this->redirect('messages/overview');
     }

app/controllers/oer/mymaterial.php

@@ -21,7 +21,7 @@ class Oer_MymaterialController extends AuthenticatedController
 
     public function edit_action(OERMaterial $material = null)
     {
-        Pagelayout::setTitle($material->isNew() ? _('Neues Material hochladen') : _('Material bearbeiten'));
+        PageLayout::setTitle($material->isNew() ? _('Neues Material hochladen') : _('Material bearbeiten'));
         if ($material->id && !$material->isMine() && !$GLOBALS['perm']->have_perm('root')) {
             throw new AccessDeniedException();
         }
@@ -198,7 +198,7 @@ class Oer_MymaterialController extends AuthenticatedController
 
     public function statistics_action(OERMaterial $material)
     {
-        Pagelayout::setTitle(sprintf(
+        PageLayout::setTitle(sprintf(
             _('Zugriffszahlen für %s'),
             $material->name
         ));

app/controllers/studiengaenge/informationen.php

 <?php
 /**
  * @author      Peter Thienel <thienel@data-quest.de>
- * @author      
+ * @author
  * @license     GPL2 or any later version
  * @since       4.6
  */
@@ -11,7 +11,7 @@ class Studiengaenge_InformationenController extends MVVController
     public function before_filter(&$action, &$args)
     {
         parent::before_filter($action, $args);
-        
+
         if (!($GLOBALS['perm']->have_perm('root') || RolePersistence::isAssignedRole(
                         $GLOBALS['user']->id, 'MVVAdmin'))) {
             throw new AccessDeniedException();
@@ -21,7 +21,7 @@ class Studiengaenge_InformationenController extends MVVController
             Navigation::activateItem('mvv/studiengaenge/informationen');
         }
     }
-    
+
     public function index_action()
     {
         $this->createSidebar();
@@ -38,13 +38,13 @@ class Studiengaenge_InformationenController extends MVVController
             [':inst_ids' => $inst_ids]);
         }
     }
-    
+
     public function degree_action ()
     {
         $this->createSidebar('degrees');
         $this->degree = Degree::findBySQL('abschluss_id IN (SELECT DISTINCT(abschluss_id) FROM user_studiengang) ORDER BY name');
     }
-    
+
     public function showdegree_action($studycourse_id, $nr = 0)
     {
         $this->studycourse = Fach::find($studycourse_id);
@@ -55,7 +55,7 @@ class Studiengaenge_InformationenController extends MVVController
                 ['studycourse_id' => $studycourse_id,
                  'abschluss_ids' => $this->studycourse->degrees->pluck('abschluss_id')]);
     }
-    
+
     public function showstudycourse_action($degree_id, $nr = 0)
     {
         $this->nr = $nr;
@@ -75,7 +75,7 @@ class Studiengaenge_InformationenController extends MVVController
             [':inst_ids' => $inst_ids]);
         }
     }
-    
+
     public function messagehelper_action()
     {
         $fach_id = Request::get('fach_id');
@@ -96,7 +96,7 @@ class Studiengaenge_InformationenController extends MVVController
                 [':abschluss_id' => $degree_id]);
         }
         if (empty($user)) {
-            Pagelayout::postError(_('Keine Studierenden zu den gewählten Angaben gefunden'));
+            PageLayout::postError(_('Keine Studierenden zu den gewählten Angaben gefunden'));
             $this->redirect('index');
             return;
         }
@@ -114,7 +114,7 @@ class Studiengaenge_InformationenController extends MVVController
             ['default_subject' => $subject, 'emailrequest' => 1]
         ));
     }
-    
+
     private function createSidebar($view = 'subject' )
     {
         $widget = new ViewsWidget();
@@ -124,7 +124,7 @@ class Studiengaenge_InformationenController extends MVVController
                 ->setActive($view == 'degrees');
         Sidebar::Get()->addWidget($widget);
     }
-    
+
     public static function getStudyCount($degree_id)
     {
         if ($GLOBALS['perm']->have_perm('root', $GLOBALS['user']->id)) {
@@ -142,5 +142,5 @@ class Studiengaenge_InformationenController extends MVVController
 
         }
     }
-    
+
 }
\ No newline at end of file

app/routes/Events.php

@@ -83,8 +83,8 @@ class Events extends \RESTAPI\RouteMap
         if ($user_id !== $GLOBALS['user']->id) {
             $this->error(401);
         }
-
-        $export = new CalendarExport(new CalendarWriterICalendar());
+        $calender_writer = new CalendarWriterICalendar();
+        $export = new CalendarExport($calender_writer);
         $export->exportFromDatabase($user_id, 0, 2114377200, 'ALL_EVENTS');
 
         if ($GLOBALS['_calendar_error']->getMaxStatus(\ErrorHandler::ERROR_CRITICAL)) {

app/views/blubber/compose.php

@@ -48,7 +48,7 @@
             <span class="container">
                 <select name="user_ids[]" class="select2" id="blubber_contacts" multiple>
                     <? foreach ($contacts as $contact) : ?>
-                        <option value="<?= htmlReady($contact['user_id']) ?>" data-avatar="<?= htmlReady(Avatar::getAvatar($contact['user_id'])->getImageTag(AVATAR::SMALL)) ?>">
+                        <option value="<?= htmlReady($contact['user_id']) ?>" data-avatar="<?= htmlReady(Avatar::getAvatar($contact['user_id'])->getImageTag(Avatar::SMALL)) ?>">
                             <?= htmlReady($contact->friend->getFullName()) ?>
                         </option>
                     <? endforeach ?>

app/views/my_studygroups/_course.php

@@ -27,7 +27,7 @@
                 <? foreach (MyRealmModel::array_rtrim($group['navigation']) as $key => $nav)  : ?>
                     <? if (isset($nav) && $nav->isVisible(true)) : ?>
                         <a href="<?=
-                        UrlHelper::getLink('seminar_main.php',
+                        URLHelper::getLink('seminar_main.php',
                             ['auswahl'     => $group['seminar_id'],
                                   'redirect_to' => strtr($nav->getURL(), '?', '&')]) ?>" <?= $nav->hasBadgeNumber() ? 'class="badge" data-badge-number="' . intval($nav->getBadgeNumber()) . '"' : '' ?>>
                             <?= $nav->getImage()->asImg(20, $nav->getLinkAttributes()) ?>

app/views/studiengaenge/studiengaenge/stgteil_bezeichnungen.php

@@ -27,7 +27,7 @@
                 <? endif; ?>
             </tbody>
         <? endforeach; ?>
-        <? if ($studiengang->typ === 'mehrfach' && MvvPerm::haveFieldPermStudiengangteil($studiengang, MVVPerm::PERM_CREATE)) : ?>
+        <? if ($studiengang->typ === 'mehrfach' && MvvPerm::haveFieldPermStudiengangteil($studiengang, MvvPerm::PERM_CREATE)) : ?>
             <tfoot>
                 <tr>
                     <td colspan="3">

app/views/studiengaenge/studiengaenge/studiengangteile.php

@@ -5,11 +5,11 @@
             <col width="1%">
         </colgroup>
         <? foreach ($stgteile as $stgteil) : ?>
-            <tbody id="<?= $stg_stgbez_id . '_' . $stgteil->id ?>"<?= MvvPerm::haveFieldPermStudiengangteil($studiengang, MVVPerm::PERM_WRITE) ? 'class="sort_items"' : '' ?>>
+            <tbody id="<?= $stg_stgbez_id . '_' . $stgteil->id ?>"<?= MvvPerm::haveFieldPermStudiengangteil($studiengang, MvvPerm::PERM_WRITE) ? 'class="sort_items"' : '' ?>>
                 <tr class="header-row">
                     <td width="90%"><?= htmlReady($stgteil->getDisplayName()) ?></td>
                     <td class="actions">
-                        <? if (MvvPerm::haveFieldPermStudiengangteil($studiengang, MVVPerm::PERM_CREATE)) : ?>
+                        <? if (MvvPerm::haveFieldPermStudiengangteil($studiengang, MvvPerm::PERM_CREATE)) : ?>
                             <? if ($stg_bez) : ?>
                                 <? $msg = sprintf(
                                         _('Wollen Sie die Zuordnung des Studiengangteils "%s" als "%s" zum Studiengang "%s" wirklich löschen?'),
@@ -47,7 +47,7 @@
                 </tr>
             </tbody>
         <? endforeach; ?>
-        <? if (MvvPerm::haveFieldPermStudiengangteil($studiengang, MVVPerm::PERM_CREATE)) : ?>
+        <? if (MvvPerm::haveFieldPermStudiengangteil($studiengang, MvvPerm::PERM_CREATE)) : ?>
             <tfoot>
                 <tr>
                     <td colspan="2">

db/migrations/1.155_tic_5170_clean_up.php

@@ -8,7 +8,7 @@ class Tic5170CleanUp extends Migration
 
     public function up()
     {
-        $db = DbManager::get();
+        $db = DBManager::get();
         $db->exec("ALTER TABLE `message` DROP `chat_id`, DROP `readed`");
         $db->exec("ALTER TABLE `message_user` DROP `confirmed_read`");
         try {

db/migrations/1.156_tic_5204_add_datafield_type.php

@@ -8,7 +8,7 @@ class Tic5204AddDatafieldType extends Migration
 
     public function up()
     {
-        $db = DbManager::get();
+        $db = DBManager::get();
         $db->exec("ALTER TABLE `datafields` CHANGE `type` `type` ENUM('bool','textline','textarea','selectbox','date','time','email','phone','radio','combo','link','selectboxmultiple') NOT NULL DEFAULT 'textline'");
         $db->exec("ALTER TABLE `datafields` ADD `is_userfilter` TINYINT UNSIGNED NOT NULL DEFAULT '0' AFTER `is_required`");
     }

lib/calendar/CalendarWriterICalendar.class.php

@@ -18,7 +18,7 @@
 
 define('CALENDAR_WEEKSTART', 'MO');
 
-class CalendarWriteriCalendar extends CalendarWriter
+class CalendarWriterICalendar extends CalendarWriter
 {
     var $newline = "\r\n";
 

lib/classes/FilesSearch/Result.php

@@ -345,11 +345,11 @@ class Result
     private function getOrderBy()
     {
         switch ($this->query->getSort()) {
-            case QUERY::SORT_CHDATE:
+            case Query::SORT_CHDATE:
                 $orderBy = 'ORDER BY fsa.file_ref_mkdate DESC';
                 break;
 
-            case QUERY::SORT_RELEVANCE:
+            case Query::SORT_RELEVANCE:
                 $orderBy = 'ORDER BY sr.ranking DESC';
                 break;
 

lib/classes/ForumAbo.php

@@ -78,7 +78,6 @@ class ForumAbo
         // send message to all abo-users
         $db = DBManager::get();
         $messaging = new ForumBulkMail();
-        // $messaging = new Messaging();
 
         // get all parent topic-ids, to find out which users to notify
         $path = ForumEntry::getPathToPosting($topic_id);

lib/classes/JsonApi/Routes/Events/UserEventsIcal.php

@@ -23,8 +23,8 @@ class UserEventsIcal extends NonJsonApiController
             // damit unsichtbare Nutzer nicht ermittelt werden können
             throw new RecordNotFoundException();
         }
-
-        $export = new \CalendarExport(new \CalendarWriterICalendar());
+        $calender_writer = new \CalendarWriterICalendar();
+        $export = new \CalendarExport($calender_writer);
         $export->exportFromDatabase($observedUser->id, 0, 2114377200, ['CalendarEvent', 'CourseEvent', 'CourseCancelledEvent']);
         if ($GLOBALS['_calendar_error']->getMaxStatus(\ErrorHandler::ERROR_CRITICAL)) {
             throw new InternalServerError();

lib/classes/JsonApi/Routes/Events/UserEventsIndex.php

@@ -18,9 +18,6 @@ class UserEventsIndex extends JsonApiController
 
     public function __invoke(Request $request, Response $response, $args)
     {
-        require_once 'lib/calendar/CalendarExportFile.class.php';
-        require_once 'lib/calendar/CalendarWriterICalendar.class.php';
-
         if (!$observedUser = \User::find($args['id'])) {
             throw new RecordNotFoundException();
         }