diff options
| author | Moritz Strohm <strohm@data-quest.de> | 2024-03-14 17:08:26 +0000 |
|---|---|---|
| committer | Moritz Strohm <strohm@data-quest.de> | 2024-03-14 17:08:26 +0000 |
| commit | 0fb33e2e8ea3a40bd45f72dc16f65419e82a656c (patch) | |
| tree | bb3eff329cd9719c20030ab9d09427f755b9f898 | |
| parent | f2f70529462f10f08d7a0ca57bfb50c80e645fa4 (diff) | |
replaced getFullname with getFullName, re #3499
Merge request studip/studip!2660
148 files changed, 286 insertions, 286 deletions
diff --git a/app/controllers/admin/configuration.php b/app/controllers/admin/configuration.php index c61446a..9cc2e26 100644 --- a/app/controllers/admin/configuration.php +++ b/app/controllers/admin/configuration.php @@ -127,7 +127,7 @@ class Admin_ConfigurationController extends AuthenticatedController $this->configs = ConfigurationModel::searchConfiguration($range); $this->title = sprintf( _('Vorhandene Konfigurationsparameter für "%s"'), - $range->getFullname() + $range->getFullName() ); $this->linkchunk = 'admin/configuration/edit_range_config/' . $range_id; } else { @@ -148,7 +148,7 @@ class Admin_ConfigurationController extends AuthenticatedController $field = Request::get('field'); $range = RangeFactory::find($range_id); - PageLayout::setTitle(_('Bearbeiten von Konfigurationsparametern für die Range: ') . $range->getFullname()); + PageLayout::setTitle(_('Bearbeiten von Konfigurationsparametern für die Range: ') . $range->getFullName()); if (Request::isPost()) { CSRFProtection::verifyUnsafeRequest(); @@ -186,7 +186,7 @@ class Admin_ConfigurationController extends AuthenticatedController $this->configs = ConfigurationModel::searchConfiguration($user); $this->title = sprintf( _('Vorhandene Konfigurationsparameter für "%s"'), - $user->getFullname() + $user->getFullName() ); $this->linkchunk = 'admin/configuration/edit_user_config/' . $user_id; } else { @@ -205,7 +205,7 @@ class Admin_ConfigurationController extends AuthenticatedController */ public function edit_user_config_action(User $user) { - PageLayout::setTitle(_('Bearbeiten von Konfigurationsparametern für die Person: ') . $user->getFullname()); + PageLayout::setTitle(_('Bearbeiten von Konfigurationsparametern für die Person: ') . $user->getFullName()); $field = Request::get('field'); @@ -246,7 +246,7 @@ class Admin_ConfigurationController extends AuthenticatedController $this->configs = ConfigurationModel::searchConfiguration($course); $this->title = sprintf( _('Vorhandene Konfigurationsparameter für "%s"'), - $course->getFullname() + $course->getFullName() ); $this->linkchunk = 'admin/configuration/edit_course_config/' . $course_id; } else { @@ -265,7 +265,7 @@ class Admin_ConfigurationController extends AuthenticatedController */ public function edit_course_config_action(Course $course) { - PageLayout::setTitle(_('Bearbeiten von Konfigurationsparametern für die Veranstaltung: ') . $course->getFullname()); + PageLayout::setTitle(_('Bearbeiten von Konfigurationsparametern für die Veranstaltung: ') . $course->getFullName()); $field = Request::get('field'); @@ -306,7 +306,7 @@ class Admin_ConfigurationController extends AuthenticatedController $this->configs = ConfigurationModel::searchConfiguration($institute); $this->title = sprintf( _('Vorhandene Konfigurationsparameter für "%s"'), - $institute->getFullname() + $institute->getFullName() ); $this->linkchunk = 'admin/configuration/edit_institute_config/' . $institute_id; } else { @@ -325,7 +325,7 @@ class Admin_ConfigurationController extends AuthenticatedController */ public function edit_institute_config_action(Institute $institute) { - PageLayout::setTitle(_('Bearbeiten von Konfigurationsparametern für die Einrichtung: ') . $institute->getFullname()); + PageLayout::setTitle(_('Bearbeiten von Konfigurationsparametern für die Einrichtung: ') . $institute->getFullName()); $field = Request::get('field'); diff --git a/app/controllers/admin/user.php b/app/controllers/admin/user.php index 44a0a4d..7c6ea9a 100644 --- a/app/controllers/admin/user.php +++ b/app/controllers/admin/user.php @@ -534,12 +534,12 @@ class Admin_UserController extends AuthenticatedController StudipLog::log('INST_USER_ADD', $institute_id, $user_id, $editPerms[0]); NotificationCenter::postNotification('UserInstitutionDidUpdate', $institute_id, $user_id); InstituteMember::ensureDefaultInstituteForUser($user_id); - $details[] = sprintf(_('%s wurde hinzugefügt.'), htmlReady($membership->institute->getFullname())); + $details[] = sprintf(_('%s wurde hinzugefügt.'), htmlReady($membership->institute->getFullName())); } } elseif ($institute_id != '' && Request::option('new_student_inst') == $institute_id && $editPerms[0] != 'root') { $details[] = sprintf( _('<b>%s wurde nicht hinzugefügt.</b> Sie können keine Person gleichzeitig als Studierende/-r und als Mitarbeiter/-in einer Einrichtung hinzufügen.'), - htmlReady(Institute::find($institute_id)->getFullname()) + htmlReady(Institute::find($institute_id)->getFullName()) ); } } @@ -779,7 +779,7 @@ class Admin_UserController extends AuthenticatedController . " und steht Ihnen als neuer Ansprechpartner bei Fragen oder Problemen " . "in Stud.IP zur Verfügung. "), $admin['Vorname'], $admin['Nachname'], - $institute->getFullname(), $this->user['Vorname'], $this->user['Nachname']); + $institute->getFullName(), $this->user['Vorname'], $this->user['Nachname']); StudipMail::sendMessage($admin['Email'], $subject, $mailbody); $notin[] = $admin['user_id']; @@ -812,7 +812,7 @@ class Admin_UserController extends AuthenticatedController . " und steht Ihnen als neuer Ansprechpartner bei Fragen oder Problemen " . "in Stud.IP zur Verfügung. "), $admin['Vorname'], $admin['Nachname'], - $institute->getFullname(), $this->user['Vorname'], $this->user['Nachname']); + $institute->getFullName(), $this->user['Vorname'], $this->user['Nachname']); StudipMail::sendMessage($admin['Email'], $subject, $mailbody); $i++; @@ -824,20 +824,20 @@ class Admin_UserController extends AuthenticatedController _('Es wurden ingesamt %s Mails an die %s der Einrichtung "%s" geschickt.'), $i, $wem, - htmlReady($institute->getFullname()) + htmlReady($institute->getFullName()) ); } } $details[] = sprintf( _('Person wurde erfolgreich in die Einrichtung "%s" mit dem Status "%s" eingetragen.'), - htmlReady($institute->getFullname()), + htmlReady($institute->getFullName()), $UserManagement->user_data['auth_user_md5.perms'] ); } else { $details[] = sprintf( _('Person konnte nicht in die Einrichtung "%s" eingetragen werden.'), - htmlReady($institute->getFullname()) + htmlReady($institute->getFullName()) ); } } @@ -988,7 +988,7 @@ class Admin_UserController extends AuthenticatedController public function lock_comment_action($user_id) { $this->user = User::find($user_id); - PageLayout::setTitle(sprintf(_('%s sperren'), $this->user->getFullname())); + PageLayout::setTitle(sprintf(_('%s sperren'), $this->user->getFullName())); $this->params = []; if (Request::int('from_index')) { @@ -1012,7 +1012,7 @@ class Admin_UserController extends AuthenticatedController if ($user->store()) { PageLayout::postSuccess(sprintf( _('%s wurde gesperrt.'), - htmlReady($user->getFullname()) + htmlReady($user->getFullName()) )); } @@ -1040,12 +1040,12 @@ class Admin_UserController extends AuthenticatedController if ($user->store()) { PageLayout::postSuccess(sprintf( _('%s wurde entsperrt.'), - htmlReady($user->getFullname()) + htmlReady($user->getFullName()) )); } else { PageLayout::postError(sprintf( _('%s konnte nicht entsperrt werden.'), - htmlReady($user->getFullname()) + htmlReady($user->getFullName()) )); } @@ -1242,7 +1242,7 @@ class Admin_UserController extends AuthenticatedController public function activities_action($user_id) { $this->user = User::find($user_id); - $this->fullname = $this->user->getFullname(); + $this->fullname = $this->user->getFullName(); $this->params = []; if (Request::int('from_index')) { @@ -1380,7 +1380,7 @@ class Admin_UserController extends AuthenticatedController if (is_null($this->range)) { $this->range = Institute::find($range_id); } - PageLayout::setTitle(sprintf(_('Dateiübersicht für %s'), $this->range->getFullname())); + PageLayout::setTitle(sprintf(_('Dateiübersicht für %s'), $this->range->getFullName())); } /** diff --git a/app/controllers/admission/userlist.php b/app/controllers/admission/userlist.php index 683f1e2..3192a50 100644 --- a/app/controllers/admission/userlist.php +++ b/app/controllers/admission/userlist.php @@ -146,7 +146,7 @@ class Admission_UserlistController extends AuthenticatedController PageLayout::postInfo( sprintf(_('%s wurde von der Liste entfernt, die Liste ist aber noch nicht gespeichert.'), - User::find($userId)->getFullname())); + User::find($userId)->getFullName())); $this->redirect($this->url_for('admission/userlist/configure', $userlistId)); } diff --git a/app/controllers/calendar/contentbox.php b/app/controllers/calendar/contentbox.php index 5d77ed4..8ba5215 100644 --- a/app/controllers/calendar/contentbox.php +++ b/app/controllers/calendar/contentbox.php @@ -87,10 +87,10 @@ class Calendar_ContentboxController extends StudipController foreach ($this->termine as $course_date) { if ($this->course_range) { //Display only date and time: - $this->titles[$course_date->id] = $course_date->getFullname('include-room'); + $this->titles[$course_date->id] = $course_date->getFullName('include-room'); } else { //Include the course title: - $this->titles[$course_date->id] = $course_date->getFullname('verbose'); + $this->titles[$course_date->id] = $course_date->getFullName('verbose'); } } } @@ -118,7 +118,7 @@ class Calendar_ContentboxController extends StudipController $this->titles[$course_date->id] = sprintf( '%1$s: %2$s', $course_date->course->name, - $course_date->getFullname() + $course_date->getFullName() ); $this->termine[] = $course_date; } diff --git a/app/controllers/calendar/date.php b/app/controllers/calendar/date.php index 32cf99c..3c16fa6 100644 --- a/app/controllers/calendar/date.php +++ b/app/controllers/calendar/date.php @@ -175,13 +175,13 @@ class Calendar_DateController extends AuthenticatedController if ($compare_name) { $a_name = ''; if ($a->course instanceof Course) { - $a_name = $a->course->getFullname(); + $a_name = $a->course->getFullName(); } elseif ($a->user instanceof User) { $a_name = $a->user->getFullName(); } $b_name = ''; if ($b->course instanceof Course) { - $b_name = $b->course->getFullname(); + $b_name = $b->course->getFullName(); } elseif ($b->user instanceof User) { $b_name = $b->user->getFullName(); } diff --git a/app/controllers/consultation/admin.php b/app/controllers/consultation/admin.php index 7acb725..bc63a1a 100644 --- a/app/controllers/consultation/admin.php +++ b/app/controllers/consultation/admin.php @@ -27,7 +27,7 @@ class Consultation_AdminController extends ConsultationController $this->activateNavigation('admin'); if (Context::isCourse() || Context::isInstitute()) { - PageLayout::setTitle(Context::get()->getFullname() . ' - ' . _('Verwaltung der Termine')); + PageLayout::setTitle(Context::get()->getFullName() . ' - ' . _('Verwaltung der Termine')); } else { PageLayout::setTitle(_('Verwaltung der Termine')); } diff --git a/app/controllers/course/admission.php b/app/controllers/course/admission.php index c2a3fb0..56342bb 100644 --- a/app/controllers/course/admission.php +++ b/app/controllers/course/admission.php @@ -37,7 +37,7 @@ class Course_AdmissionController extends AuthenticatedController $this->course = Course::find($this->course_id); $this->user_id = $GLOBALS['user']->id; PageLayout::setHelpKeyword("Basis.VeranstaltungenVerwaltenZugangsberechtigungen"); - PageLayout::setTitle($this->course->getFullname()." - " ._("Verwaltung von Zugangsberechtigungen")); + PageLayout::setTitle($this->course->getFullName()." - " ._("Verwaltung von Zugangsberechtigungen")); $lockrules = words('admission_turnout admission_type admission_endtime admission_binding passwort read_level write_level admission_prelim admission_prelim_txt admission_starttime admission_endtime_sem admission_disable_waitlist user_domain admission_binding admission_studiengang'); $this->is_locked = []; diff --git a/app/controllers/course/archive.php b/app/controllers/course/archive.php index 1177fd8..f181cca 100644 --- a/app/controllers/course/archive.php +++ b/app/controllers/course/archive.php @@ -166,7 +166,7 @@ class Course_ArchiveController extends AuthenticatedController $course = Course::find($courseId); if ($course) { $seminar = new Seminar($course); - $coursename = $course->getFullname(); + $coursename = $course->getFullName(); if ($seminar->delete()) { $this->deletedCourses[] = $courseId; PageLayout::postSuccess(sprintf( diff --git a/app/controllers/course/basicdata.php b/app/controllers/course/basicdata.php index e0611ed..8cc7d94 100644 --- a/app/controllers/course/basicdata.php +++ b/app/controllers/course/basicdata.php @@ -286,7 +286,7 @@ class Course_BasicdataController extends AuthenticatedController PageLayout::setHelpKeyword("Basis.VeranstaltungenVerwaltenGrunddaten"); PageLayout::setTitle(_("Verwaltung der Grunddaten")); if ($this->course_id) { - PageLayout::setTitle(Course::find($this->course_id)->getFullname()." - ".PageLayout::getTitle()); + PageLayout::setTitle(Course::find($this->course_id)->getFullName()." - ".PageLayout::getTitle()); } //Daten sammeln: @@ -614,9 +614,9 @@ class Course_BasicdataController extends AuthenticatedController foreach ($mp->getAddedUsers() as $a) { $result = $this->$func($a, $course_id); if ($result !== false) { - $succeeded[] = User::find($a)->getFullname('no_title_rev'); + $succeeded[] = User::find($a)->getFullName('no_title_rev'); } else { - $failed[] = User::find($a)->getFullname('no_title_rev'); + $failed[] = User::find($a)->getFullName('no_title_rev'); } } // Only show the success messagebox once diff --git a/app/controllers/course/block_appointments.php b/app/controllers/course/block_appointments.php index 31daa0d..fef0d31 100644 --- a/app/controllers/course/block_appointments.php +++ b/app/controllers/course/block_appointments.php @@ -36,7 +36,7 @@ class Course_BlockAppointmentsController extends AuthenticatedController throw new Trails_Exception(400); } PageLayout::setHelpKeyword('Basis.VeranstaltungenVerwaltenAendernVonZeitenUndTerminen'); - PageLayout::setTitle(Course::findCurrent()->getFullname() . " - " . _('Blockveranstaltungstermine anlegen')); + PageLayout::setTitle(Course::findCurrent()->getFullName() . " - " . _('Blockveranstaltungstermine anlegen')); } @@ -245,7 +245,7 @@ class Course_BlockAppointmentsController extends AuthenticatedController $singledate = new SingleDate($d); $singledate->bookRoom(Request::option('room_id')); } - return $result ? $d->getFullname() : null; + return $result ? $d->getFullName() : null; }, $dates)); if ($date_count > 1) { $dates_created = array_count_values($dates_created); diff --git a/app/controllers/course/cancel_dates.php b/app/controllers/course/cancel_dates.php index f3420cb..0d5463c 100644 --- a/app/controllers/course/cancel_dates.php +++ b/app/controllers/course/cancel_dates.php @@ -42,7 +42,7 @@ class Course_CancelDatesController extends AuthenticatedController throw new Trails_Exception(400); } PageLayout::setHelpKeyword('Basis.VeranstaltungenVerwaltenAendernVonZeitenUndTerminen'); - PageLayout::setTitle(Course::findCurrent()->getFullname() . " - " . _('Veranstaltungstermine absagen')); + PageLayout::setTitle(Course::findCurrent()->getFullName() . " - " . _('Veranstaltungstermine absagen')); } public function index_action() diff --git a/app/controllers/course/courseware.php b/app/controllers/course/courseware.php index 30ab5f1..22b124b 100644 --- a/app/controllers/course/courseware.php +++ b/app/controllers/course/courseware.php @@ -23,7 +23,7 @@ class Course_CoursewareController extends CoursewareController if (!Context::get()) { throw new CheckObjectException(_('Sie haben kein Objekt gewählt.')); } - PageLayout::setTitle(Context::get()->getFullname() . ' - ' . _('Courseware')); + PageLayout::setTitle(Context::get()->getFullName() . ' - ' . _('Courseware')); PageLayout::setHelpKeyword('Basis.Courseware'); checkObject(); diff --git a/app/controllers/course/dates.php b/app/controllers/course/dates.php index 18df893..a4e18e9 100644 --- a/app/controllers/course/dates.php +++ b/app/controllers/course/dates.php @@ -15,7 +15,7 @@ class Course_DatesController extends AuthenticatedController $this->course = Context::get(); if ($this->course) { - PageLayout::setTitle($this->course->getFullname() . ' ' . _('Termine')); + PageLayout::setTitle($this->course->getFullName() . ' ' . _('Termine')); } else { PageLayout::setTitle(_('Termine')); } @@ -143,7 +143,7 @@ class Course_DatesController extends AuthenticatedController Navigation::activateItem('/course/schedule/dates'); PageLayout::setTitle( $this->date->getTypeName() . ': ' . - $this->date->getFullname(CourseDate::FORMAT_VERBOSE) + $this->date->getFullName(CourseDate::FORMAT_VERBOSE) ); if ($this->hasAccess()) { @@ -168,7 +168,7 @@ class Course_DatesController extends AuthenticatedController Navigation::activateItem('/course/schedule/dates'); PageLayout::setTitle( $this->date->getTypeName() . ': ' . - $this->date->getFullname(CourseDate::FORMAT_VERBOSE) + $this->date->getFullName(CourseDate::FORMAT_VERBOSE) ); $this->render_action('details'); } @@ -224,7 +224,7 @@ class Course_DatesController extends AuthenticatedController } } elseif ($termin_id) { $this->date = new CourseDate($termin_id); - $xtitle = $this->date->getTypeName() . ': ' . $this->date->getFullname(); + $xtitle = $this->date->getTypeName() . ': ' . $this->date->getFullName(); } else { $this->date = new CourseDate(); @@ -484,7 +484,7 @@ class Course_DatesController extends AuthenticatedController if ($date->related_persons) { foreach ($date->related_persons as $user_id) { - $related_persons .= User::find($user_id)->getFullname() . "\n"; + $related_persons .= User::find($user_id)->getFullName() . "\n"; } } @@ -606,12 +606,12 @@ class Course_DatesController extends AuthenticatedController if (count($dates_with_folders) === 1) { PageLayout::postWarning(sprintf( _('Für den Termin am %s existiert bereits ein Sitzungs-Ordner. Möchten Sie trotzdem einen weiteren Sitzungs-Ordner erstellen?'), - htmlReady($dates_with_folders[0]->getFullname()) + htmlReady($dates_with_folders[0]->getFullName()) )); } else { $dates_string = []; foreach ($dates_with_folders as $date) { - $dates_string[] = $date->getFullname(); + $dates_string[] = $date->getFullName(); } PageLayout::postWarning( _('Für die folgenden Termine gibt es bereits Sitzungs-Ordner. Möchten Sie trotzdem weitere Sitzungs-Ordner erstellen?'), diff --git a/app/controllers/course/details.php b/app/controllers/course/details.php index 1c9b034..2a330e3 100644 --- a/app/controllers/course/details.php +++ b/app/controllers/course/details.php @@ -68,7 +68,7 @@ class Course_DetailsController extends AuthenticatedController public function index_action() { $this->prelim_discussion = vorbesprechung($this->course->id); - $this->title = $this->course->getFullname(); + $this->title = $this->course->getFullName(); $this->course_domains = UserDomain::getUserDomainsForSeminar($this->course->id); $this->sem = new Seminar($this->course); $this->links = []; diff --git a/app/controllers/course/enrolment.php b/app/controllers/course/enrolment.php index 275620d..eb4428e 100644 --- a/app/controllers/course/enrolment.php +++ b/app/controllers/course/enrolment.php @@ -59,7 +59,7 @@ class Course_EnrolmentController extends AuthenticatedController if (!$enrolment_info['enrolment_allowed']) { throw new AccessDeniedException($enrolment_info['description']); } - PageLayout::setTitle($course->getFullname() . " - " . _("Veranstaltungsanmeldung")); + PageLayout::setTitle($course->getFullName() . " - " . _("Veranstaltungsanmeldung")); if (Request::submitted('cancel')) { $this->redirect(URLHelper::getURL('dispatch.php/course/details/', ['sem_id' => $this->course_id])); } diff --git a/app/controllers/course/files.php b/app/controllers/course/files.php index 7ce2962..19c3697 100644 --- a/app/controllers/course/files.php +++ b/app/controllers/course/files.php @@ -30,7 +30,7 @@ class Course_FilesController extends AuthenticatedController $this->last_visitdate = object_get_visit($this->course->id, $this->studip_module->getPluginId()); PageLayout::setHelpKeyword('Basis.Dateien'); - PageLayout::setTitle(Context::get()->getFullname() . ' - ' . _('Dateien')); + PageLayout::setTitle(Context::get()->getFullName() . ' - ' . _('Dateien')); Navigation::activateItem('/course/files'); diff --git a/app/controllers/course/grouping.php b/app/controllers/course/grouping.php index 5202967..198932e 100644 --- a/app/controllers/course/grouping.php +++ b/app/controllers/course/grouping.php @@ -43,7 +43,7 @@ class Course_GroupingController extends AuthenticatedController */ public function parent_action() { - PageLayout::setTitle($this->course->getFullname() . ' - ' . _('Zuordnung zu Hauptveranstaltung')); + PageLayout::setTitle($this->course->getFullName() . ' - ' . _('Zuordnung zu Hauptveranstaltung')); Navigation::activateItem('/course/admin/parent'); $this->parent = $this->course->parent; @@ -84,7 +84,7 @@ class Course_GroupingController extends AuthenticatedController */ public function children_action() { - PageLayout::setTitle($this->course->getFullname() . ' - ' . _('Unterveranstaltungen')); + PageLayout::setTitle($this->course->getFullName() . ' - ' . _('Unterveranstaltungen')); Navigation::activateItem('/course/admin/children'); $this->children = $this->course->children; @@ -144,7 +144,7 @@ class Course_GroupingController extends AuthenticatedController { PageLayout::setTitle(sprintf( '%s - %s', - Course::findCurrent()->getFullname(), + Course::findCurrent()->getFullName(), _('Teilnehmende in Unterveranstaltungen') )); Navigation::activateItem('course/members/children'); @@ -181,7 +181,7 @@ class Course_GroupingController extends AuthenticatedController $this->url_for('messages/write', [ 'filter' => 'all', 'course_id' => $this->course->id, - 'default_subject' => '[' . $this->course->getFullname() . ']', + 'default_subject' => '[' . $this->course->getFullName() . ']', ]), Icon::create('mail', 'clickable') )->asDialog('size=auto'); @@ -198,7 +198,7 @@ class Course_GroupingController extends AuthenticatedController htmlReady(sprintf( '%s %s', get_title_for_status('autor', 2), - $this->course->getFullname() + $this->course->getFullName() )), 'csv', 'csv-teiln', @@ -217,7 +217,7 @@ class Course_GroupingController extends AuthenticatedController 'person', htmlReady(sprintf( '%s %s', - get_title_for_status('autor', 2), $this->course->getFullname() + get_title_for_status('autor', 2), $this->course->getFullName() )), 'rtf', 'rtf-teiln', @@ -279,7 +279,7 @@ class Course_GroupingController extends AuthenticatedController case 'message': $this->redirect($this->url_for('messages/write', [ 'rec_uname' => $users->pluck('username'), - 'default_subject' => '[' . Course::find($course_id)->getFullname() . ']', + 'default_subject' => '[' . Course::find($course_id)->getFullName() . ']', ])); break; case 'move': @@ -550,20 +550,20 @@ class Course_GroupingController extends AuthenticatedController $d->user_id = $user; // Error on storing. if (!$d->store()) { - $fail[$sem->getFullname()][] = $user; + $fail[$sem->getFullName()][] = $user; // Check if new deputy was regular member before, remove entry. } else { $m = CourseMember::find([$course, $user]); // Could not delete old course membership, remove deputy entry. if ($m && !$m->delete()) { $d->delete(); - $fail[$sem->getFullname()][] = $user; + $fail[$sem->getFullName()][] = $user; } } } // Add member with given permission. } elseif (!$sem->addMember($user, Request::option('permission'))) { - $fail[$sem->getFullname()][] = $user; + $fail[$sem->getFullName()][] = $user; } } } diff --git a/app/controllers/course/lvgselector.php b/app/controllers/course/lvgselector.php index 2ef55ea..3542a11 100644 --- a/app/controllers/course/lvgselector.php +++ b/app/controllers/course/lvgselector.php @@ -55,7 +55,7 @@ class Course_LvgselectorController extends AuthenticatedController Navigation::activateItem('/course/admin/lvgruppen'); } PageLayout::setTitle(sprintf('%s - %s', - $this->course->getFullname(), + $this->course->getFullName(), _('Lehrveranstaltungsgruppen'))); // is locked? diff --git a/app/controllers/course/members.php b/app/controllers/course/members.php index b6807c5..5ead0ea 100644 --- a/app/controllers/course/members.php +++ b/app/controllers/course/members.php @@ -55,7 +55,7 @@ class Course_MembersController extends AuthenticatedController $this->is_locked = LockRules::Check($this->course_id, 'participants'); // Layoutsettings - PageLayout::setTitle(sprintf('%s - %s', Course::findCurrent()->getFullname(), _("Teilnehmende"))); + PageLayout::setTitle(sprintf('%s - %s', Course::findCurrent()->getFullName(), _("Teilnehmende"))); $this->studip_module = checkObjectModule('participants'); object_set_visit_module( $this->studip_module->getPluginId()); @@ -2186,13 +2186,13 @@ class Course_MembersController extends AuthenticatedController messaging::sendSystemMessage($user_id, sprintf('%s %s', _('Systemnachricht:'), _('Anmeldung aufgehoben, auf Warteliste gesetzt')), $message); if ($course->addToWaitlist($user_id, $which_end)) { - $msgs['success'][] = $temp_user->getFullname('no_title'); + $msgs['success'][] = $temp_user->getFullName('no_title'); } else { - $msgs['error'][] = $temp_user->getFullname('no_title'); + $msgs['error'][] = $temp_user->getFullName('no_title'); } // Something went wrong on inserting the user in waitlist. } else { - $msgs['error'][] = $temp_user->getFullname('no_title'); + $msgs['error'][] = $temp_user->getFullName('no_title'); } } return $msgs; diff --git a/app/controllers/course/messenger.php b/app/controllers/course/messenger.php index ca0ec3c..3e692aa 100644 --- a/app/controllers/course/messenger.php +++ b/app/controllers/course/messenger.php @@ -13,7 +13,7 @@ class Course_MessengerController extends AuthenticatedController public function course_action($thread_id = null) { if (Context::get()) { - PageLayout::setTitle(Context::get()->getFullname() . ' - ' . _('Blubber')); + PageLayout::setTitle(Context::get()->getFullName() . ' - ' . _('Blubber')); } if (Navigation::hasItem('/course/blubber')) { diff --git a/app/controllers/course/room_requests.php b/app/controllers/course/room_requests.php index 42628c8..ae32594 100644 --- a/app/controllers/course/room_requests.php +++ b/app/controllers/course/room_requests.php @@ -50,7 +50,7 @@ class Course_RoomRequestsController extends AuthenticatedController } PageLayout::setHelpKeyword('Basis.VeranstaltungenVerwaltenAendernVonZeitenUndTerminen'); - $pagetitle .= Course::find($this->course_id)->getFullname() . ' - '; + $pagetitle .= Course::find($this->course_id)->getFullName() . ' - '; $pagetitle .= _('Verwalten von Raumanfragen'); PageLayout::setTitle($pagetitle); diff --git a/app/controllers/course/statusgroups.php b/app/controllers/course/statusgroups.php index 02f4579..3edccb2 100644 --- a/app/controllers/course/statusgroups.php +++ b/app/controllers/course/statusgroups.php @@ -32,7 +32,7 @@ class Course_StatusgroupsController extends AuthenticatedController $course = Course::findCurrent(); $this->course_id = $course->id; - $this->course_title = $course->getFullname(); + $this->course_title = $course->getFullName(); $this->config = CourseConfig::get($this->course_id); // Check perms @@ -49,7 +49,7 @@ class Course_StatusgroupsController extends AuthenticatedController $this->is_locked = LockRules::Check($this->course_id, 'groups'); $this->is_participants_locked = LockRules::Check($this->course_id, 'participants'); - PageLayout::setTitle(sprintf('%s - %s', Course::findCurrent()->getFullname(), _('Gruppen'))); + PageLayout::setTitle(sprintf('%s - %s', Course::findCurrent()->getFullName(), _('Gruppen'))); PageLayout::addStyleSheet('studip-statusgroups.css'); PageLayout::addScript('studip-statusgroups.js'); } @@ -672,7 +672,7 @@ class Course_StatusgroupsController extends AuthenticatedController } $s = StatusgruppeUser::find([$group_id, $user_id]); - $name = $s->user->getFullname(); + $name = $s->user->getFullName(); if ($s->delete()) { if ($user_id == $GLOBALS['user']->id) { PageLayout::postSuccess(sprintf( @@ -943,7 +943,7 @@ class Course_StatusgroupsController extends AuthenticatedController $dates = CourseDate::findBySeminar_id($this->course_id); $singledates = array_filter($dates, function ($d) { return !((bool) $d->metadate_id); }); foreach ($singledates as $d) { - $name = $d->getFullname(); + $name = $d->getFullName(); // Append description to group title if applicable. if ($d->description) { diff --git a/app/controllers/course/study_areas.php b/app/controllers/course/study_areas.php index 4de29dc..df54bb4 100644 --- a/app/controllers/course/study_areas.php +++ b/app/controllers/course/study_areas.php @@ -47,7 +47,7 @@ class Course_StudyAreasController extends AuthenticatedController $this->values[get_class($this->step)]['ajax_url'] = $this->url_for('course/study_areas/ajax'); $this->values[get_class($this->step)]['no_js_url'] = $this->url_for('course/study_areas/show'); - PageLayout::setTitle($this->course->getFullname() . ' - ' . _('Studienbereiche')); + PageLayout::setTitle($this->course->getFullName() . ' - ' . _('Studienbereiche')); } diff --git a/app/controllers/course/studygroup.php b/app/controllers/course/studygroup.php index 4caad47..b75d91e 100644 --- a/app/controllers/course/studygroup.php +++ b/app/controllers/course/studygroup.php @@ -82,7 +82,7 @@ class Course_StudygroupController extends AuthenticatedController if (Request::isXhr()) { PageLayout::setTitle(_('Studiengruppendetails')); } else { - PageLayout::setTitle((Context::getHeaderLine() ?: Course::find($id)->getFullname()) . ' - ' . _('Studiengruppendetails')); + PageLayout::setTitle((Context::getHeaderLine() ?: Course::find($id)->getFullName()) . ' - ' . _('Studiengruppendetails')); PageLayout::setHelpKeyword('Basis.StudiengruppenAbonnieren'); $stmt = DBManager::get()->prepare("SELECT * FROM admission_seminar_user" @@ -507,7 +507,7 @@ class Course_StudygroupController extends AuthenticatedController $this->last_visitdate = object_get_visit($id, $this->studip_module->getPluginId()); $this->anzahl = StudygroupModel::countMembers($id); - $this->groupname = $sem->getFullname(); + $this->groupname = $sem->getFullName(); $this->sem_id = $id; $this->groupdescription = $sem->beschreibung; $this->moderators = $sem->getMembersWithStatus('dozent'); diff --git a/app/controllers/course/timesrooms.php b/app/controllers/course/timesrooms.php index f1c2f8e..672495f 100644 --- a/app/controllers/course/timesrooms.php +++ b/app/controllers/course/timesrooms.php @@ -56,7 +56,7 @@ class Course_TimesroomsController extends AuthenticatedController PageLayout::setHelpKeyword('Basis.Veranstaltungen'); $title = _('Verwaltung von Zeiten und Räumen'); - $title = $this->course->getFullname() . ' - ' . $title; + $title = $this->course->getFullName() . ' - ' . $title; PageLayout::setTitle($title); @@ -411,7 +411,7 @@ class Course_TimesroomsController extends AuthenticatedController //time changed for regular date. create normal singledate and cancel the regular date if ($termin->metadate_id != '' && $time_changed) { $termin_values = $termin->toArray(); - $termin_info = $termin->getFullname(); + $termin_info = $termin->getFullName(); $termin->cancelDate(); PageLayout::postInfo(sprintf( @@ -537,7 +537,7 @@ class Course_TimesroomsController extends AuthenticatedController */ public function createSingleDate_action() { - PageLayout::setTitle(Course::findCurrent()->getFullname() . " - " . _('Einzeltermin anlegen')); + PageLayout::setTitle(Course::findCurrent()->getFullName() . " - " . _('Einzeltermin anlegen')); $this->restoreRequest( words('date start_time end_time room related_teachers related_statusgruppen freeRoomText dateType fromDialog course_type') ); @@ -624,7 +624,7 @@ class Course_TimesroomsController extends AuthenticatedController $this->course->setFilter('all'); } - $this->course->createMessage(sprintf(_('Der Termin %s wurde hinzugefügt!'), htmlReady($termin->getFullname()))); + $this->course->createMessage(sprintf(_('Der Termin %s wurde hinzugefügt!'), htmlReady($termin->getFullName()))); $this->course->store(); $this->displayMessages(); @@ -643,7 +643,7 @@ class Course_TimesroomsController extends AuthenticatedController if ($termin) { $this->course->createMessage(sprintf( _('Der Termin %s wurde wiederhergestellt!'), - htmlReady($termin->getFullname()) + htmlReady($termin->getFullName()) )); $this->displayMessages(); } @@ -852,7 +852,7 @@ class Course_TimesroomsController extends AuthenticatedController if ($termin !== null) { $this->course->createMessage(sprintf( _('Der Termin %s wurde wiederhergestellt!'), - htmlReady($termin->getFullname()) + htmlReady($termin->getFullName()) )); } } @@ -1174,7 +1174,7 @@ class Course_TimesroomsController extends AuthenticatedController */ public function createCycle_action($cycle_id = null) { - PageLayout::setTitle(Course::findCurrent()->getFullname() . " - " . _('Regelmäßige Termine anlegen')); + PageLayout::setTitle(Course::findCurrent()->getFullName() . " - " . _('Regelmäßige Termine anlegen')); $this->restoreRequest( words('day start_time end_time description cycle startWeek teacher_sws fromDialog course_type') ); @@ -1440,18 +1440,18 @@ class Course_TimesroomsController extends AuthenticatedController if ($termin->store()) { $this->course->createMessage(sprintf( _('Der Kommtentar des gelöschten Termins %s wurde geändert.'), - htmlReady($termin->getFullname()) + htmlReady($termin->getFullName()) )); } else { $this->course->createInfo(sprintf( _('Der gelöschte Termin %s wurde nicht verändert.'), - htmlReady($termin->getFullname()) + htmlReady($termin->getFullName()) )); } } else { $this->course->createInfo(sprintf( _('Der gelöschte Termin %s wurde nicht verändert.'), - htmlReady($termin->getFullname()) + htmlReady($termin->getFullName()) )); } if (Request::int('cancel_send_message')) { @@ -1474,7 +1474,7 @@ class Course_TimesroomsController extends AuthenticatedController $actions->addLink( sprintf( _('Semester ändern (%s)'), - $this->course->getFullname('sem-duration-name') + $this->course->getFullName('sem-duration-name') ), $this->url_for('course/timesrooms/editSemester'), Icon::create('date') @@ -1569,7 +1569,7 @@ class Course_TimesroomsController extends AuthenticatedController { $seminar_id = $termin->range_id; $termin_room = $termin->getRoomName(); - $termin_date = $termin->getFullname(); + $termin_date = $termin->getFullName(); $has_topics = $termin->topics->count(); if ($cancel_comment != '') { diff --git a/app/controllers/course/topics.php b/app/controllers/course/topics.php index dc75276..2d97490 100644 --- a/app/controllers/course/topics.php +++ b/app/controllers/course/topics.php @@ -15,7 +15,7 @@ class Course_TopicsController extends AuthenticatedController checkObjectModule("schedule"); Navigation::activateItem('/course/schedule/topics'); - PageLayout::setTitle(sprintf('%s - %s', Course::findCurrent()->getFullname(), _("Themen"))); + PageLayout::setTitle(sprintf('%s - %s', Course::findCurrent()->getFullName(), _("Themen"))); $seminar = new Seminar(Course::findCurrent()); $this->forum_activated = $seminar->getSlotModule('forum'); diff --git a/app/controllers/course/wizard.php b/app/controllers/course/wizard.php index 636d6eb..b45f9e5 100644 --- a/app/controllers/course/wizard.php +++ b/app/controllers/course/wizard.php @@ -201,13 +201,13 @@ class Course_WizardController extends AuthenticatedController $message = MessageBox::success(sprintf( _('Die Veranstaltung <a class="link-intern" href="%s">"%s"</a> wurde angelegt.'), $this->link_for($dest_url, ['cid' => $this->course->id]), - htmlReady($this->course->getFullname()) + htmlReady($this->course->getFullName()) )); $target = $this->url_for('admin/courses'); } else { $message = MessageBox::success(sprintf( _('Die Veranstaltung "%s" wurde angelegt. Sie können sie direkt hier weiter verwalten.'), - htmlReady($this->course->getFullname()) + htmlReady($this->course->getFullName()) )); $target = $this->url_for($dest_url, ['cid' => $this->course->id]); } diff --git a/app/controllers/file.php b/app/controllers/file.php index 83152e3..65344ef 100644 --- a/app/controllers/file.php +++ b/app/controllers/file.php @@ -1926,7 +1926,7 @@ class FileController extends AuthenticatedController ) { PageLayout::postWarning(sprintf( _('Für den Termin am %s existiert bereits ein Sitzungs-Ordner. Möchten Sie trotzdem einen weiteren Sitzungs-Ordner erstellen?'), - htmlReady($course_date->getFullname()) + htmlReady($course_date->getFullName()) )); $this->show_confirmation_button = true; $this->folder = $new_folder ?: new StandardFolder(); diff --git a/app/controllers/institute/files.php b/app/controllers/institute/files.php index 6f622ae..afcd0fd 100644 --- a/app/controllers/institute/files.php +++ b/app/controllers/institute/files.php @@ -31,7 +31,7 @@ class Institute_FilesController extends AuthenticatedController object_set_visit_module($this->studip_module->getPluginId()); PageLayout::setHelpKeyword("Basis.Dateien"); - PageLayout::setTitle($this->institute->getFullname() . " - " . _("Dateien")); + PageLayout::setTitle($this->institute->getFullName() . " - " . _("Dateien")); $this->last_visitdate = object_get_visit($this->institute->id, $this->studip_module->getPluginId()); Navigation::activateItem('/course/files'); diff --git a/app/controllers/messages.php b/app/controllers/messages.php index 96a3aac..17ad4ce 100644 --- a/app/controllers/messages.php +++ b/app/controllers/messages.php @@ -641,11 +641,11 @@ class MessagesController extends AuthenticatedController { $this->msg['from'] = $message['autor_id'] === '____%system%____' ? _('Stud.IP') : ($message->getSender() - ? $message->getSender()->getFullname() + ? $message->getSender()->getFullName() : _('unbekannt')); $this->msg['to'] = $GLOBALS['user']->id == $message->autor_id ? join(', ', $message->getRecipients()->pluck('fullname')) : - $GLOBALS['user']->getFullname() . ' ' . sprintf(_('(und %d weitere)'), $message->getNumRecipients()-1); + $GLOBALS['user']->getFullName() . ' ' . sprintf(_('(und %d weitere)'), $message->getNumRecipients()-1); if ($attachment_folder = Folder::findOneByRange_id($message->id)) { $this->msg['attachments'] = $attachment_folder->file_refs->toArray('name size'); diff --git a/app/controllers/my_courses.php b/app/controllers/my_courses.php index f2ddb37..8b4d037 100644 --- a/app/controllers/my_courses.php +++ b/app/controllers/my_courses.php @@ -680,12 +680,12 @@ class MyCoursesController extends AuthenticatedController if ($deputy && $deputy->delete()) { PageLayout::postSuccess(sprintf( _('Sie wurden als Standardvertretung von %s entfernt.'), - htmlReady($boss->getFullname()) + htmlReady($boss->getFullName()) )); } else { PageLayout::postError(sprintf( _('Sie konnten nicht als Standardvertretung von %s entfernt werden.'), - htmlReady($boss->getFullname()) + htmlReady($boss->getFullName()) )); } $this->redirect($this->url_for('my_courses')); diff --git a/app/controllers/news.php b/app/controllers/news.php index 96ecd92..f935017 100644 --- a/app/controllers/news.php +++ b/app/controllers/news.php @@ -375,7 +375,7 @@ class NewsController extends StudipController 'type' => 'no', 'mapper' => function () use ($news) { $author = $news->user_id ? User::find($news->user_id): User::findCurrent(); - return $author ? $author->getFullname() : ''; + return $author ? $author->getFullName() : ''; } ] ] diff --git a/app/controllers/profile.php b/app/controllers/profile.php index 31494ae..a4e7c56a 100644 --- a/app/controllers/profile.php +++ b/app/controllers/profile.php @@ -61,7 +61,7 @@ class ProfileController extends AuthenticatedController ) ) ) { - PageLayout::setTitle(_('Profil von') . ' ' . $this->current_user->getFullname()); + PageLayout::setTitle(_('Profil von') . ' ' . $this->current_user->getFullName()); object_add_view($this->current_user->id); } else { PageLayout::setTitle(_('Profil')); diff --git a/app/controllers/resources/resource.php b/app/controllers/resources/resource.php index 47d6b99..202e763 100644 --- a/app/controllers/resources/resource.php +++ b/app/controllers/resources/resource.php @@ -423,7 +423,7 @@ class Resources_ResourceController extends AuthenticatedController PageLayout::setTitle( sprintf( _('%s: bearbeiten'), - $this->resource->getFullname() + $this->resource->getFullName() ) ); } @@ -436,7 +436,7 @@ class Resources_ResourceController extends AuthenticatedController PageLayout::setTitle( sprintf( _('%s: löschen'), - $this->resource->getFullname() + $this->resource->getFullName() ) ); } diff --git a/app/controllers/resources/room_request.php b/app/controllers/resources/room_request.php index 2344b6d..515d4d3 100644 --- a/app/controllers/resources/room_request.php +++ b/app/controllers/resources/room_request.php @@ -2193,7 +2193,7 @@ class Resources_RoomRequestController extends AuthenticatedController ); return; } - $range_name = $course_date->course->getFullname(); + $range_name = $course_date->course->getFullName(); try { $booking = $room->createBooking( $this->current_user, @@ -2228,7 +2228,7 @@ class Resources_RoomRequestController extends AuthenticatedController ); return; } - $range_name = $metadate->course->getFullname(); + $range_name = $metadate->course->getFullName(); if ($metadate->dates) { foreach ($metadate->dates as $date) { try { diff --git a/app/controllers/tree.php b/app/controllers/tree.php index 7665b60..655e717 100644 --- a/app/controllers/tree.php +++ b/app/controllers/tree.php @@ -35,7 +35,7 @@ class TreeController extends AuthenticatedController $data[] = [ $course->veranstaltungsnummer, - $course->getFullname('type-number-name'), + $course->getFullName('type-number-name'), $course->getTextualSemester(), $sem->getDatesExport(), implode(', ', $lecturersSorted) diff --git a/app/views/admin/overlapping/admin_info.php b/app/views/admin/overlapping/admin_info.php index f340e75..1eeac77 100644 --- a/app/views/admin/overlapping/admin_info.php +++ b/app/views/admin/overlapping/admin_info.php @@ -17,7 +17,7 @@ <?= _('Heimateinrichtung') ?> </dt> <dd> - <?= htmlReady($course->home_institut->getFullname()) ?> + <?= htmlReady($course->home_institut->getFullName()) ?> </dd> <dt> <?= _('Zuständige Administratoren') ?> @@ -25,7 +25,7 @@ <? foreach ($admins as $admin) : ?> <dd> <a href="<?= $controller->url_for('profile', ['username' => $admin->username]) ?>"> - <?= htmlReady($admin->user->getFullname()) ?> + <?= htmlReady($admin->user->getFullName()) ?> </a> </dd> <? endforeach; ?> diff --git a/app/views/admin/overlapping/conflicts.php b/app/views/admin/overlapping/conflicts.php index 3bf39b7..6d22c1d 100644 --- a/app/views/admin/overlapping/conflicts.php +++ b/app/views/admin/overlapping/conflicts.php @@ -73,7 +73,7 @@ <a href="<?= $controller->url_for('admin/overlapping/course_info', $comp_cycle->comp_course_id) ?>" data-dialog=""> <?= Icon::create('info-circle', Icon::ROLE_INFO, ['style' => 'vertical-align: text-bottom;', 'title' => _('Veranstaltungsdetails')]) ?> </a> - <?= htmlReady($comp_cycle->comp_course->getFullname('type-name')) ?> + <?= htmlReady($comp_cycle->comp_course->getFullName('type-name')) ?> <? if ($comp_cycle->comp_course->admission_turnout) : ?> <?= sprintf(_('(erw. TN %s)'), htmlReady($comp_cycle->comp_course->admission_turnout)) ?> <? endif; ?> @@ -82,7 +82,7 @@ }); ?> <?= Icon::create('date-cycle', Icon::ROLE_INFO, ['style' => 'vertical-align: text-bottom;']) ?> <?= sprintf('%s (%sx)', $comp_cycle->comp_cycle->toString('short'), count($dates)); ?> - <a href="<?= $controller->url_for('admin/overlapping/admin_info', $comp_cycle->comp_course->id) ?>" data-dialog="size=auto;title='<?= htmlReady($comp_cycle->comp_course->getFullname()) ?>';"> + <a href="<?= $controller->url_for('admin/overlapping/admin_info', $comp_cycle->comp_course->id) ?>" data-dialog="size=auto;title='<?= htmlReady($comp_cycle->comp_course->getFullName()) ?>';"> <?= Icon::create('person-online', Icon::ROLE_INFO, ['style' => 'vertical-align: text-bottom;', 'title' => _('Zuständige Administratoren')]) ?> </a> <span title="<?= $comp_cycle->isExcluded() ? _('Veranstaltung nicht berücksichtigen') : _('Veranstaltung berücksichtigen') ?>" diff --git a/app/views/admin/overlapping/courses.php b/app/views/admin/overlapping/courses.php index ef6b9d7..aa2e83f 100644 --- a/app/views/admin/overlapping/courses.php +++ b/app/views/admin/overlapping/courses.php @@ -26,7 +26,7 @@ 'title' => _('Veranstaltungsdetails') ]) ?> </a> - <?= htmlReady($course_obj->getFullname('type-name')) ?> + <?= htmlReady($course_obj->getFullName('type-name')) ?> <? if ($course_obj->admission_turnout) : ?> <?= sprintf(_('(erw. TN %s)'), htmlReady($course_obj->admission_turnout)) ?> <? endif; ?> diff --git a/app/views/admin/role/assign_role_institutes.php b/app/views/admin/role/assign_role_institutes.php index 4afc617..fef6279 100644 --- a/app/views/admin/role/assign_role_institutes.php +++ b/app/views/admin/role/assign_role_institutes.php @@ -14,7 +14,7 @@ </legend> <label> - <?= sprintf(_("Einrichtungszuordnung für %s in der Rolle %s"), htmlReady($user->getFullname()), htmlready($role->getRoleName()))?> + <?= sprintf(_("Einrichtungszuordnung für %s in der Rolle %s"), htmlReady($user->getFullName()), htmlready($role->getRoleName()))?> <div class="hgroup"> <?= $qsearch->render() ?> diff --git a/app/views/admin/statusgroups/delete.php b/app/views/admin/statusgroups/delete.php index d31e1eb..20dc80a 100644 --- a/app/views/admin/statusgroups/delete.php +++ b/app/views/admin/statusgroups/delete.php @@ -13,7 +13,7 @@ </legend> <section> - <?= sprintf(_('%s wirklich aus %s austragen?'), htmlReady($user->getFullname()), htmlReady($group->name)) ?> + <?= sprintf(_('%s wirklich aus %s austragen?'), htmlReady($user->getFullName()), htmlReady($group->name)) ?> </section> </fieldset> diff --git a/app/views/admin/tree/batch_assign_semtree.php b/app/views/admin/tree/batch_assign_semtree.php index 9993781..4b1a4ff 100644 --- a/app/views/admin/tree/batch_assign_semtree.php +++ b/app/views/admin/tree/batch_assign_semtree.php @@ -23,9 +23,9 @@ <tr> <td> <a href="<?= URLHelper::getLink('dispatch.php/course/overview', ['cid' => $course->id])?>" - title="<?= sprintf(_('Zur Veranstaltung %s'), htmlReady($course->getFullname())) ?>" + title="<?= sprintf(_('Zur Veranstaltung %s'), htmlReady($course->getFullName())) ?>" target="_blank"> - <?= htmlReady($course->getFullname('number-name-semester')) ?> + <?= htmlReady($course->getFullName('number-name-semester')) ?> </a> <input type="hidden" name="courses[]" value="<?= htmlReady($course->id) ?>"> </td> diff --git a/app/views/admin/user/_results.php b/app/views/admin/user/_results.php index dc996fb..1541907 100644 --- a/app/views/admin/user/_results.php +++ b/app/views/admin/user/_results.php @@ -82,7 +82,7 @@ <?= htmlReady($user->username) ?> </a> <? if ($user->locked) : ?> - <?= Icon::create('lock-locked', Icon::ROLE_INFO)->asImg(tooltip2(sprintf(_('%s ist gesperrt'), htmlReady($user->getFullname())))) ?> + <?= Icon::create('lock-locked', Icon::ROLE_INFO)->asImg(tooltip2(sprintf(_('%s ist gesperrt'), htmlReady($user->getFullName())))) ?> <? endif ?> </td> <td> diff --git a/app/views/admin/user/batch_export_members.php b/app/views/admin/user/batch_export_members.php index 258df5b..71b6358 100644 --- a/app/views/admin/user/batch_export_members.php +++ b/app/views/admin/user/batch_export_members.php @@ -16,9 +16,9 @@ <tr> <td> <a href="<?= URLHelper::getLink('dispatch.php/course/overview', ['cid' => $course->id])?>" - title="<?= sprintf(_('Zur Veranstaltung %s'), htmlReady($course->getFullname())) ?>" + title="<?= sprintf(_('Zur Veranstaltung %s'), htmlReady($course->getFullName())) ?>" target="_blank"> - <?= htmlReady($course->getFullname('number-name-semester')) ?> + <?= htmlReady($course->getFullName('number-name-semester')) ?> </a> <input type="hidden" name="courses[]" value="<?= htmlReady($course->id) ?>"> </td> diff --git a/app/views/admin/user/migrate.php b/app/views/admin/user/migrate.php index dbfd1ef..be7a731 100644 --- a/app/views/admin/user/migrate.php +++ b/app/views/admin/user/migrate.php @@ -19,7 +19,7 @@ use Studip\Button, Studip\LinkButton; <? if ($user !== null): ?> <?= QuickSearch::get('old_id', new StandardSearch('user_id')) - ->defaultValue($user->id, $user->getFullname() . ' (' . $user->username . ')') + ->defaultValue($user->id, $user->getFullName() . ' (' . $user->username . ')') ->render() ?> <? else: ?> <?= QuickSearch::get('old_id', new StandardSearch('user_id'))->render() ?> diff --git a/app/views/admin/user/show_user_courses.php b/app/views/admin/user/show_user_courses.php index ef07aba..9d1d3f0 100644 --- a/app/views/admin/user/show_user_courses.php +++ b/app/views/admin/user/show_user_courses.php @@ -34,9 +34,9 @@ <tr> <td> <input type="checkbox" name="courses[]" value="<?= htmlReady($course->id) ?>" - title="<?= sprintf(_('%s auswählen'), htmlReady($course->getFullname())) ?>"> + title="<?= sprintf(_('%s auswählen'), htmlReady($course->getFullName())) ?>"> </td> - <td><?= htmlReady($course->getFullname()) ?></td> + <td><?= htmlReady($course->getFullName()) ?></td> <td class="actions"> <?= Icon::create('trash')->asInput([ 'formaction' => $controller->delete_course_assignment( @@ -49,7 +49,7 @@ ), 'title' => sprintf( _('Aus %s austragen'), - htmlReady($course->getFullname()) + htmlReady($course->getFullName()) ), 'data-dialog' => 'size=auto' ]) ?> diff --git a/app/views/admission/courseset/configure.php b/app/views/admission/courseset/configure.php index b3f3030..773624e 100644 --- a/app/views/admission/courseset/configure.php +++ b/app/views/admission/courseset/configure.php @@ -159,7 +159,7 @@ if (isset($flash['error'])) { <? else : ?> <? Course::findEachMany(function($c) { - echo htmlReady($c->getFullname('number-name-semester')); + echo htmlReady($c->getFullName('number-name-semester')); echo '<br>'; }, $courseIds, diff --git a/app/views/admission/userlist/configure.php b/app/views/admission/userlist/configure.php index 4e5df25..3736758 100644 --- a/app/views/admission/userlist/configure.php +++ b/app/views/admission/userlist/configure.php @@ -83,7 +83,7 @@ Helpbar::get()->addPlainText(_('Info'), "Stellen Sie hier ein, wie die Chancen b </td> <td> <a href="<?= URLHelper::getLink('dispatch.php/profile?username=' . $u->username) ?>"> - <?= $u->getFullname('full_rev') . ' (' . $u->username . ')' ?> + <?= $u->getFullName('full_rev') . ' (' . $u->username . ')' ?> </a> <input type="hidden" name="users[]" value="<?= $u->id ?>"/> </td> @@ -91,7 +91,7 @@ Helpbar::get()->addPlainText(_('Info'), "Stellen Sie hier ein, wie die Chancen b <a href="<?= $controller->url_for('admission/userlist/delete_member', $userlist_id, $u->id) ?>" class="userlist-delete-user" data-confirm="<?= sprintf(_('Soll %s wirklich von der Liste entfernt werden?'), - htmlReady($u->getFullname())) ?>"> + htmlReady($u->getFullName())) ?>"> <?= Icon::create('trash', 'clickable') ?> </a> </td> diff --git a/app/views/consultation/admin/block-responsibilities.php b/app/views/consultation/admin/block-responsibilities.php index 82f4586..ebdb37b 100644 --- a/app/views/consultation/admin/block-responsibilities.php +++ b/app/views/consultation/admin/block-responsibilities.php @@ -46,7 +46,7 @@ $selected = function ($type, $id) use ($block) { <select name="responsibilities[institute][]" multiple class="nested-select"> <? foreach ($responsible['institutes'] as $institute): ?> <option value="<?= htmlReady($institute->id) ?>" <?= $selected('institute', $institute->id) ?>> - <?= htmlReady($institute->getFullname()) ?> + <?= htmlReady($institute->getFullName()) ?> </option> <? endforeach; ?> </select> diff --git a/app/views/course/dates/_date_row-exdate.php b/app/views/course/dates/_date_row-exdate.php index 0b86f6e..bc9beab 100644 --- a/app/views/course/dates/_date_row-exdate.php +++ b/app/views/course/dates/_date_row-exdate.php @@ -1,11 +1,11 @@ <tr id="date_<?= $date->id ?>" class="ausfall" data-termin-id="<?= htmlReady($date->id) ?>"> <td data-sort-value="<?= htmlReady($date->date) ?>" class="date_name"> <?= Icon::create('date', Icon::ROLE_INFO)->asImg(['class' => 'text-bottom']) ?> - <?= htmlReady($date->getFullname()) ?> + <?= htmlReady($date->getFullName()) ?> <?= tooltipIcon($date->content) ?> <? if (count($date->dozenten) > 0): ?> <br> - (<?= htmlReady(implode(', ', $date->dozenten->getFullname())) ?>) + (<?= htmlReady(implode(', ', $date->dozenten->getFullName())) ?>) <? endif; ?> </td> <td class="hidden-small-down"></td> diff --git a/app/views/course/dates/_date_row.php b/app/views/course/dates/_date_row.php index 32433ae..0246455 100644 --- a/app/views/course/dates/_date_row.php +++ b/app/views/course/dates/_date_row.php @@ -8,11 +8,11 @@ $dialog_url = $show_raumzeit <td data-sort-value="<?= htmlReady($date->date) ?>" class="date_name"> <a href="<?= $dialog_url ?>" data-dialog> <?= Icon::create($icon)->asImg(['class' => 'text-bottom']) ?> - <?= htmlReady($date->getFullname(CourseDate::FORMAT_VERBOSE)) ?> + <?= htmlReady($date->getFullName(CourseDate::FORMAT_VERBOSE)) ?> </a> <? if (count($date->dozenten) > 0): ?> <br> - (<?= htmlReady(implode(', ', $date->dozenten->getFullname())) ?>) + (<?= htmlReady(implode(', ', $date->dozenten->getFullName())) ?>) <? endif; ?> </td> <td class="hidden-small-down"> diff --git a/app/views/course/dates/details-edit.php b/app/views/course/dates/details-edit.php index 0f91d72..7fb409e 100644 --- a/app/views/course/dates/details-edit.php +++ b/app/views/course/dates/details-edit.php @@ -57,7 +57,7 @@ <?= Avatar::getAvatar($teacher->user_id)->getImageTag(Avatar::SMALL) ?> </span> <span class="studip-selection-label"> - <?= htmlReady($teacher->getFullname()) ?> + <?= htmlReady($teacher->getFullName()) ?> </span> </li> <? endforeach; ?> @@ -78,7 +78,7 @@ <?= Avatar::getAvatar($teacher->id)->getImageTag(Avatar::SMALL) ?> </span> <span class="studip-selection-label"> - <?= htmlReady($teacher->getFullname()) ?> + <?= htmlReady($teacher->getFullName()) ?> </span> </li> <? endif; ?> diff --git a/app/views/course/dates/details.php b/app/views/course/dates/details.php index 96f7e2e..b63662a 100644 --- a/app/views/course/dates/details.php +++ b/app/views/course/dates/details.php @@ -31,7 +31,7 @@ <li> <a href="<?= $controller->link_for('profile?username=' . $teacher->username) ?>"> <?= Avatar::getAvatar($teacher->user_id)->getImageTag(Avatar::SMALL) ?> - <?= htmlReady($teacher->getFullname()) ?> + <?= htmlReady($teacher->getFullName()) ?> </a> </li> <? endforeach ?> diff --git a/app/views/course/dates/new_topic.php b/app/views/course/dates/new_topic.php index 7ec97f3..1cc303d 100644 --- a/app/views/course/dates/new_topic.php +++ b/app/views/course/dates/new_topic.php @@ -12,7 +12,7 @@ <tbody> <tr> <td><?= _("Termin") ?></td> - <td class="date_name"><?= htmlReady($date->getFullname()) ?></td> + <td class="date_name"><?= htmlReady($date->getFullName()) ?></td> </tr> <tr> <td><label for="topic_title"><?= _("Thema") ?></label></td> diff --git a/app/views/course/details/index.php b/app/views/course/details/index.php index 583f715..eb7da10 100644 --- a/app/views/course/details/index.php +++ b/app/views/course/details/index.php @@ -58,7 +58,7 @@ <strong><?= _('Semester') ?></strong> </td> <td> - <?= htmlReady($course->getFullname('sem-duration-name')) ?> + <?= htmlReady($course->getFullName('sem-duration-name')) ?> </td> </tr> <? endif ?> @@ -128,8 +128,8 @@ <?= _('Diese Veranstaltung gehört zu einer Hauptveranstaltung') ?>: <br><br> <a href="<?= $controller->link_for('course/details/', ['sem_id' => $course->parent->id]) ?>" - title="<?= htmlReady($course->parent->getFullname()) ?>"> - <?= htmlReady($course->parent->getFullname()) ?> + title="<?= htmlReady($course->parent->getFullName()) ?>"> + <?= htmlReady($course->parent->getFullName()) ?> </a> <? if (count($siblings) > 0) : ?> <br><br> @@ -139,8 +139,8 @@ <? foreach ($siblings as $sibling): ?> <li> <a href="<?= $controller->link_for('course/details/', ['sem_id' => $sibling->id]) ?>" - title="<?= htmlReady($sibling->getFullname()) ?>"> - <?= htmlReady($sibling->getFullname()) ?> + title="<?= htmlReady($sibling->getFullName()) ?>"> + <?= htmlReady($sibling->getFullName()) ?> </a> </li> <? endforeach ?> @@ -158,8 +158,8 @@ <? foreach ($children as $child): ?> <li> <a href="<?= $controller->link_for('course/details/', ['sem_id' => $child->id]) ?>" - title="<?= htmlReady($child->getFullname()) ?>"> - <?= htmlReady($child->getFullname()) ?> + title="<?= htmlReady($child->getFullName()) ?>"> + <?= htmlReady($child->getFullName()) ?> </a> </li> <? endforeach ?> diff --git a/app/views/course/forum/index/_last_post.php b/app/views/course/forum/index/_last_post.php index 2f3a38b..3532d40 100644 --- a/app/views/course/forum/index/_last_post.php +++ b/app/views/course/forum/index/_last_post.php @@ -5,7 +5,7 @@ <? endif; ?> <? if (empty($entry['last_posting']['anonymous']) || $entry['last_posting']['user_id'] == $GLOBALS['user']->id || $GLOBALS['perm']->have_perm('root')): ?> <a href="<?= URLHelper::getLink('dispatch.php/profile', ['username' => $entry['last_posting']['username'] ?? '']) ?>"> - <?= htmlReady(($temp_user = User::find($entry['last_posting']['user_id'])) ? $temp_user->getFullname() : $entry['last_posting']['user_fullname'] ?? '') ?> + <?= htmlReady(($temp_user = User::find($entry['last_posting']['user_id'])) ? $temp_user->getFullName() : $entry['last_posting']['user_fullname'] ?? '') ?> </a> <? endif; ?> <br> diff --git a/app/views/course/forum/index/_threads.php b/app/views/course/forum/index/_threads.php index daf8a29..85ed72c 100644 --- a/app/views/course/forum/index/_threads.php +++ b/app/views/course/forum/index/_threads.php @@ -78,7 +78,7 @@ <? endif; ?> <? if (!$entry['anonymous'] || $entry['user_id'] == $GLOBALS['user']->id || $GLOBALS['perm']->have_perm('root')): ?> <a href="<?= URLHelper::getLink('dispatch.php/profile', ['username' => get_username($entry['user_id'])]) ?>"> - <?= htmlReady(($temp_user = User::find($entry['user_id'])) ? $temp_user->getFullname() : $entry['author']) ?> + <?= htmlReady(($temp_user = User::find($entry['user_id'])) ? $temp_user->getFullName() : $entry['author']) ?> </a> <? endif; ?> <?= _("am") ?> <?= strftime($time_format_string_short, (int)$entry['mkdate']) ?> diff --git a/app/views/course/grouping/_perm_level.php b/app/views/course/grouping/_perm_level.php index 37f1080..2f1e0e7 100644 --- a/app/views/course/grouping/_perm_level.php +++ b/app/views/course/grouping/_perm_level.php @@ -7,7 +7,7 @@ <? $actionMenu->addLink( URLHelper::getURL('dispatch.php/messages/write', [ 'rec_uname' => $members->pluck('username'), - 'default_subject' => '[' . $current->getFullname() . ']', + 'default_subject' => '[' . $current->getFullName() . ']', ]), _('Nachricht schicken'), Icon::create('mail', Icon::ROLE_CLICKABLE, ['title' => _('Nachricht schicken')]), @@ -65,7 +65,7 @@ <? $actionMenu->addLink( URLHelper::getURL('dispatch.php/messages/write', [ 'rec_uname' => $m->user_id, - 'default_subject' => '[' . $current->getFullname() . ']' + 'default_subject' => '[' . $current->getFullName() . ']' ]), _('Nachricht schicken'), Icon::create('mail', Icon::ROLE_CLICKABLE, ['title' => _('Nachricht schicken')]), diff --git a/app/views/course/grouping/children.php b/app/views/course/grouping/children.php index 9e7a239..31accc6 100644 --- a/app/views/course/grouping/children.php +++ b/app/views/course/grouping/children.php @@ -10,7 +10,7 @@ <? foreach ($children as $child) : ?> <li> <a href="<?= $controller->url_for('course/management', ['cid' => $child->id]) ?>"> - <?= htmlReady($child->getFullname()) ?> + <?= htmlReady($child->getFullName()) ?> </a> <a href="<?= $controller->url_for('course/grouping/unassign_child', $child->id) ?>" data-confirm="<?= _('Wollen Sie die Zuordnung dieser Unterveranstaltung wirklich entfernen?') ?>"> diff --git a/app/views/course/grouping/members.php b/app/views/course/grouping/members.php index 3c3b022..48f852b 100644 --- a/app/views/course/grouping/members.php +++ b/app/views/course/grouping/members.php @@ -15,7 +15,7 @@ data-get-members-url="<?= $controller->url_for('course/grouping/child_course_members', $child->id) ?>" class="get-course-members"> <?= Icon::create('seminar') ?> - <?= htmlReady($child->getFullname()) ?> + <?= htmlReady($child->getFullName()) ?> </a> </h1> <span class="actions"> @@ -24,7 +24,7 @@ $controller->url_for('messages/write', [ 'filter' => 'all', 'course_id' => $child->id, - 'default_subject' => '[' . $child->getFullname() . ']', + 'default_subject' => '[' . $child->getFullName() . ']', ]), _('Nachricht schicken'), Icon::create('mail', Icon::ROLE_CLICKABLE, ['title' => _('Nachricht schicken')]), diff --git a/app/views/course/grouping/move_members_target.php b/app/views/course/grouping/move_members_target.php index 793fc19..d20d488 100644 --- a/app/views/course/grouping/move_members_target.php +++ b/app/views/course/grouping/move_members_target.php @@ -8,7 +8,7 @@ <? foreach ($targets as $one) : ?> <label> <input type="radio" name="target" value="<?= $one->id ?>"> - <?= htmlReady($one->getFullname()) ?> + <?= htmlReady($one->getFullName()) ?> </label> <? endforeach ?> </section> diff --git a/app/views/course/grouping/parent.php b/app/views/course/grouping/parent.php index 1278cc3..0e4783d 100644 --- a/app/views/course/grouping/parent.php +++ b/app/views/course/grouping/parent.php @@ -10,9 +10,9 @@ sprintf( '<a href="%s" title="%s">', $controller->link_for('course/grouping/children', ['cid' => $parent->id]), - htmlReady($parent->getFullname()) + htmlReady($parent->getFullName()) ), - htmlReady($parent->getFullname()), + htmlReady($parent->getFullName()), '</a>' ) ?> </p> diff --git a/app/views/course/statusgroups/edit.php b/app/views/course/statusgroups/edit.php index 72dac2e..1e71d3d 100644 --- a/app/views/course/statusgroups/edit.php +++ b/app/views/course/statusgroups/edit.php @@ -83,7 +83,7 @@ <label for="<?= $d->id ?>"> <input type="checkbox" name="dates[]" value="<?= $d->id ?>" id="<?= $d->id?>" <?= $group->dates->find($d->id) ? ' checked' : '' ?>> - <?= htmlReady($d->getFullname()) ?> + <?= htmlReady($d->getFullName()) ?> </label> <?php endforeach ?> </section> @@ -100,7 +100,7 @@ <label for="<?= $s->id ?>"> <input type="checkbox" name="dates[]" value="<?= $s->id ?>" id="<?= $s->id?>" <?= $group->dates->find($s->id) ? ' checked' : '' ?>> - <?= htmlReady($s->getFullname()) ?> + <?= htmlReady($s->getFullName()) ?> </label> <?php endforeach ?> </fieldset> diff --git a/app/views/course/statusgroups/groupinfo.php b/app/views/course/statusgroups/groupinfo.php index 3fff472..ddab481 100644 --- a/app/views/course/statusgroups/groupinfo.php +++ b/app/views/course/statusgroups/groupinfo.php @@ -71,7 +71,7 @@ <ul> <?php foreach ($group->dates as $d) : ?> <li> - <?= htmlReady($d->getFullname()) ?> + <?= htmlReady($d->getFullName()) ?> </li> <?php endforeach ?> </ul> @@ -94,7 +94,7 @@ <?= sprintf(_('Zugeordnete %s:'), htmlReady(get_title_for_status('dozent', 2))) ?> <ul> <?php foreach ($lecturers as $l) : ?> - <li><?= htmlReady($l->getFullname()) ?></li> + <li><?= htmlReady($l->getFullName()) ?></li> <?php endforeach ?> </ul> </p> diff --git a/app/views/course/studygroup/_members_gallery.php b/app/views/course/studygroup/_members_gallery.php index 140a98b..52a81f9 100644 --- a/app/views/course/studygroup/_members_gallery.php +++ b/app/views/course/studygroup/_members_gallery.php @@ -2,7 +2,7 @@ <ul class="studygroup-gallery"> <? foreach ($members as $user_id => $m) : ?> - <? $fullname = $m instanceof CourseMember ? $m->user->getFullname('no_title_rev') : $m['fullname']?> + <? $fullname = $m instanceof CourseMember ? $m->user->getFullName('no_title_rev') : $m['fullname']?> <? ($last_visitdate <= $m['mkdate'] && $GLOBALS['perm']->have_studip_perm('tutor', $sem_id)) ? $options = ['style' => 'border: 3px solid rgb(255, 100, 100);border: 1px solid rgba(255, 0, 0, 0.5)'] : $options = [] ?> diff --git a/app/views/course/studygroup/_members_list.php b/app/views/course/studygroup/_members_list.php index 470815a..c1dbc26 100644 --- a/app/views/course/studygroup/_members_list.php +++ b/app/views/course/studygroup/_members_list.php @@ -29,7 +29,7 @@ </thead> <tbody> <? foreach ($members as $m): ?> - <? $fullname = $m instanceof CourseMember ? $m->user->getFullname('no_title_rev') : $m['fullname']?> + <? $fullname = $m instanceof CourseMember ? $m->user->getFullName('no_title_rev') : $m['fullname']?> <tr <? if ($last_visitdate <= $m['mkdate'] && $GLOBALS['perm']->have_studip_perm('tutor', $sem_id)) echo 'class="new-member"'; ?>> <? if ($GLOBALS['perm']->have_studip_perm('tutor', $sem_id)): ?> <td> diff --git a/app/views/course/studygroup/members.php b/app/views/course/studygroup/members.php index 58a3b07..c12d97b 100644 --- a/app/views/course/studygroup/members.php +++ b/app/views/course/studygroup/members.php @@ -67,7 +67,7 @@ </td> <td> <a href="<?= URLHelper::getLink('dispatch.php/profile', ['username' => $p->username]) ?>"> - <?= htmlReady($p->user->getFullname('no_title_rev')) ?> + <?= htmlReady($p->user->getFullName('no_title_rev')) ?> </a> </td> <td class="actions"> diff --git a/app/views/course/timesrooms/_cycleRow.php b/app/views/course/timesrooms/_cycleRow.php index 6f4f459..71a5085 100644 --- a/app/views/course/timesrooms/_cycleRow.php +++ b/app/views/course/timesrooms/_cycleRow.php @@ -21,14 +21,14 @@ $is_exTermin = $termin instanceof CourseExDate; <td class="<?= $termin->getRoom() !== null ? 'green' : 'red' ?>"> <? if ($is_exTermin) : ?> <span class="is_ex_termin"> - <?= htmlReady($termin->getFullname(CourseDate::FORMAT_VERBOSE)) ?> + <?= htmlReady($termin->getFullName(CourseDate::FORMAT_VERBOSE)) ?> </span> <? elseif ($locked): ?> - <?= htmlReady($termin->getFullname(CourseDate::FORMAT_VERBOSE)) ?> + <?= htmlReady($termin->getFullName(CourseDate::FORMAT_VERBOSE)) ?> <? else: ?> <a data-dialog href="<?= $controller->url_for('course/timesrooms/editDate/' . $termin->termin_id, $linkAttributes) ?>"> - <?= htmlReady($termin->getFullname(CourseDate::FORMAT_VERBOSE)) ?> + <?= htmlReady($termin->getFullName(CourseDate::FORMAT_VERBOSE)) ?> </a> <? endif ?> </td> @@ -37,7 +37,7 @@ $is_exTermin = $termin instanceof CourseExDate; <? if (count($termin->dozenten) > 0): ?> <ul class="list-unstyled list-csv <? if ($is_exTermin) echo 'is_ex_termin' ?>"> <? foreach ($termin->dozenten as $dozent) : ?> - <li><?= $dozent instanceof User ? htmlReady($dozent->getFullname()) : '' ?></li> + <li><?= $dozent instanceof User ? htmlReady($dozent->getFullName()) : '' ?></li> <? endforeach ?> </ul> <? endif ?> diff --git a/app/views/course/timesrooms/editDate.php b/app/views/course/timesrooms/editDate.php index 13a699a..30d1090 100644 --- a/app/views/course/timesrooms/editDate.php +++ b/app/views/course/timesrooms/editDate.php @@ -130,7 +130,7 @@ <?= Avatar::getAvatar($teacher->user_id)->getImageTag(Avatar::SMALL) ?> </span> <span class="studip-selection-label"> - <?= htmlReady($teacher->getFullname()) ?> + <?= htmlReady($teacher->getFullName()) ?> </span> </li> <? endforeach ?> diff --git a/app/views/course/wizard/steps/basicdata/_user.php b/app/views/course/wizard/steps/basicdata/_user.php index 320ec7c..9c87659 100644 --- a/app/views/course/wizard/steps/basicdata/_user.php +++ b/app/views/course/wizard/steps/basicdata/_user.php @@ -1,5 +1,5 @@ <div class="<?= $class ?>"> <input type="hidden" name="<?= $inputname ?>[<?= $user->id ?>]" value="1" id="<?= $user->id ?>"/> - <?= htmlReady($user->getFullname('full_rev')) ?> (<?= htmlReady($user->username) ?>) + <?= htmlReady($user->getFullName('full_rev')) ?> (<?= htmlReady($user->username) ?>) <?= Icon::create('trash', 'clickable')->asInput(["name" => 'remove_'.$class.'['.$user->id.']', "onclick" => "return STUDIP.CourseWizard.removePerson('".$user->id."')"]) ?> </div> diff --git a/app/views/course/wizard/summary.php b/app/views/course/wizard/summary.php index 423ad18..5217bac 100644 --- a/app/views/course/wizard/summary.php +++ b/app/views/course/wizard/summary.php @@ -24,7 +24,7 @@ sprintf( '<a data-dialog href="%s">%s</a>', URLHelper::getLink('dispatch.php/course/details', ['sem_id' => $source_course->id]), - htmlReady($source_course->getFullname()) + htmlReady($source_course->getFullName()) ) ) ?> </label> diff --git a/app/views/file/choose_file_from_course.php b/app/views/file/choose_file_from_course.php index 968d78c..7ebf73a 100644 --- a/app/views/file/choose_file_from_course.php +++ b/app/views/file/choose_file_from_course.php @@ -49,7 +49,7 @@ if (Request::get('range_type')) { </td> <td> <a href="<?= $controller->link_for('file/choose_file_from_course/' . $folder_id, array_merge($options, ['course_id' => $course->id])) ?>" data-dialog> - <?= htmlReady($course->getFullname()) ?> + <?= htmlReady($course->getFullName()) ?> </a> </td> <td> diff --git a/app/views/file/choose_folder_from_course.php b/app/views/file/choose_folder_from_course.php index 27bcb09..413a920 100644 --- a/app/views/file/choose_folder_from_course.php +++ b/app/views/file/choose_folder_from_course.php @@ -55,7 +55,7 @@ jQuery(function ($) { name="course_id" value="<?= htmlReady($course->id) ?>" class="undecorated"> - <?= htmlReady($course->getFullname()) ?> + <?= htmlReady($course->getFullName()) ?> </button> </td> <td data-sort-value="<?= htmlReady($course->getTextualSemester()) ?>"> diff --git a/app/views/files_dashboard/_search_tr.php b/app/views/files_dashboard/_search_tr.php index e8e7010..60c5671 100644 --- a/app/views/files_dashboard/_search_tr.php +++ b/app/views/files_dashboard/_search_tr.php @@ -67,7 +67,7 @@ <?= $controller->markPhrase($searchResult['folder']->message->subject, $query->getQuery()) ?> <? elseif ($searchResult['folder']->range_type === 'user') : ?> <?= _('Öffentlicher Dateibereich') ?>: - <?= $controller->markPhrase($searchResult['folder']->user->getFullname('full_rev_username'), $query->getQuery()) ?> + <?= $controller->markPhrase($searchResult['folder']->user->getFullName('full_rev_username'), $query->getQuery()) ?> <? endif ?> </a> </td> diff --git a/app/views/lti/content_item.php b/app/views/lti/content_item.php index d686052..5284105 100644 --- a/app/views/lti/content_item.php +++ b/app/views/lti/content_item.php @@ -12,7 +12,7 @@ <select name="course_id" class="nested-select"> <? foreach ($courses as $course): ?> <option value="<?= $course->id ?>"> - <?= htmlReady($course->getFullname('number-name-semester')) ?> + <?= htmlReady($course->getFullName('number-name-semester')) ?> </option> <? endforeach ?> </select> diff --git a/app/views/profile/seminare.php b/app/views/profile/seminare.php index acb6714..b218eca 100644 --- a/app/views/profile/seminare.php +++ b/app/views/profile/seminare.php @@ -11,9 +11,9 @@ <? foreach ($seminar as $one) :?> <a href="<?= URLHelper::getScriptLink('dispatch.php/course/details', ['sem_id' => $one->id])?>"> - <?= htmlReady($one->getFullname('number-name')) ?> + <?= htmlReady($one->getFullName('number-name')) ?> <? if ($one->start_semester !== $one->end_semester) : ?> - (<?= htmlReady($one->getFullname('sem-duration-name')) ?>) + (<?= htmlReady($one->getFullName('sem-duration-name')) ?>) <? endif ?> </a><br> <?endforeach?> diff --git a/app/views/questionnaire/question_types/vote/vote_evaluation.php b/app/views/questionnaire/question_types/vote/vote_evaluation.php index 9d06055..bd6ce85 100644 --- a/app/views/questionnaire/question_types/vote/vote_evaluation.php +++ b/app/views/questionnaire/question_types/vote/vote_evaluation.php @@ -126,10 +126,10 @@ rsort($ordered_results); ) ?>"> <?= Avatar::getAvatar($user_id, $user->username)->getImageTag( Avatar::SMALL, - ['title' => $user->getFullname('no_title')] + ['title' => $user->getFullName('no_title')] ) ?> <? if (count($results_users[$key]) < 4) : ?> - <?= htmlReady($user->getFullname('no_title')) ?> + <?= htmlReady($user->getFullName('no_title')) ?> <? endif ?> </a> <? endif ?> diff --git a/lib/activities/CourseContext.php b/lib/activities/CourseContext.php index d09a508..1beb4d3 100644 --- a/lib/activities/CourseContext.php +++ b/lib/activities/CourseContext.php @@ -81,6 +81,6 @@ class CourseContext extends Context */ public function getContextFullname($format = 'default') { - return $this->course->getFullname($format); + return $this->course->getFullName($format); } } diff --git a/lib/activities/CoursewareContext.php b/lib/activities/CoursewareContext.php index 6bee019..66cd991 100644 --- a/lib/activities/CoursewareContext.php +++ b/lib/activities/CoursewareContext.php @@ -48,13 +48,13 @@ class CoursewareContext extends Context if ($this->context === 'user') { $user = \User::find($this->range_id); - return $user->getFullname($format); + return $user->getFullName($format); } if ($this->context === 'course') { $course = \Course::find($this->range_id); - return $course->getFullname($format); + return $course->getFullName($format); } throw new \UnexpectedValueException("Unknown context {$this->context}"); diff --git a/lib/activities/InstituteContext.php b/lib/activities/InstituteContext.php index 9b7d5c4..0f7689d 100644 --- a/lib/activities/InstituteContext.php +++ b/lib/activities/InstituteContext.php @@ -75,6 +75,6 @@ class InstituteContext extends Context */ public function getContextFullname($format = 'default') { - return $this->institute->getFullname($format); + return $this->institute->getFullName($format); } } diff --git a/lib/activities/UserContext.php b/lib/activities/UserContext.php index 0ff8921..d438425 100644 --- a/lib/activities/UserContext.php +++ b/lib/activities/UserContext.php @@ -69,6 +69,6 @@ class UserContext extends Context */ public function getContextFullname($format = 'default') { - return $this->user->getFullname($format); + return $this->user->getFullName($format); } } diff --git a/lib/admissionrules/coursememberadmission/CourseMemberAdmission.class.php b/lib/admissionrules/coursememberadmission/CourseMemberAdmission.class.php index dc13a62..a502971 100644 --- a/lib/admissionrules/coursememberadmission/CourseMemberAdmission.class.php +++ b/lib/admissionrules/coursememberadmission/CourseMemberAdmission.class.php @@ -211,7 +211,7 @@ class CourseMemberAdmission extends AdmissionRule $message = parent::getMessage(); if ($course) { - return sprintf($message, $course->getFullname('number-name')); + return sprintf($message, $course->getFullName('number-name')); } else { return $message; } diff --git a/lib/admissionrules/coursememberadmission/templates/info.php b/lib/admissionrules/coursememberadmission/templates/info.php index 5e35643..9c844e3 100644 --- a/lib/admissionrules/coursememberadmission/templates/info.php +++ b/lib/admissionrules/coursememberadmission/templates/info.php @@ -12,7 +12,7 @@ <ul> <? foreach ($courses as $course): ?> <li> - <strong><?= htmlReady($course->getFullname('number-name-semester')) ?></strong> + <strong><?= htmlReady($course->getFullName('number-name-semester')) ?></strong> <a href="<?= URLHelper::getLink('dispatch.php/course/details/index/' . $course->id) ?>" data-dialog> <?= Icon::create('info-circle')->asImg([ 'title' => _('Veranstaltungsdetails aufrufen') diff --git a/lib/classes/ConfigurationModel.php b/lib/classes/ConfigurationModel.php index 9ce5a38..ad37c87 100644 --- a/lib/classes/ConfigurationModel.php +++ b/lib/classes/ConfigurationModel.php @@ -45,7 +45,7 @@ class ConfigurationModel 'description' => 'missing in table `config`', ]; $data['value'] = $value; - $data['fullname'] = $range->getFullname(); + $data['fullname'] = $range->getFullName(); $allconfigs[] = $data; } @@ -80,7 +80,7 @@ class ConfigurationModel ]; $data['value'] = $range->getConfiguration()->$field; - $data['fullname'] = $range->getFullname(); + $data['fullname'] = $range->getFullName(); return $data; } diff --git a/lib/classes/Context.php b/lib/classes/Context.php index 2d6c7cd..695da80 100644 --- a/lib/classes/Context.php +++ b/lib/classes/Context.php @@ -190,7 +190,7 @@ class Context if (!self::$context) { return null; } - return self::get()->getFullname(); + return self::get()->getFullName(); } /** diff --git a/lib/classes/ForumBulkMail.php b/lib/classes/ForumBulkMail.php index 3f76194..6c2f666 100644 --- a/lib/classes/ForumBulkMail.php +++ b/lib/classes/ForumBulkMail.php @@ -48,13 +48,13 @@ class ForumBulkMail extends messaging $template = $GLOBALS['template_factory']->open('mail/text'); $template->message = kill_format(stripslashes($message)); - $template->rec_fullname = $receiver->getFullname(); + $template->rec_fullname = $receiver->getFullName(); $mailmessage = $template->render(); $template = $GLOBALS['template_factory']->open('mail/html'); $template->lang = getUserLanguagePath($rec_user_id); $template->message = stripslashes($message); - $template->rec_fullname = $receiver->getFullname(); + $template->rec_fullname = $receiver->getFullName(); $mailhtml = $template->render(); $this->bulk_mail[md5($message)][getenv('LANG')] = [ diff --git a/lib/classes/InstituteCalendarHelper.class.php b/lib/classes/InstituteCalendarHelper.class.php index a573683..9412a34 100644 --- a/lib/classes/InstituteCalendarHelper.class.php +++ b/lib/classes/InstituteCalendarHelper.class.php @@ -285,7 +285,7 @@ class InstituteCalendarHelper $course = Course::find($cid); $cycle_dates = SeminarCycleDate::findBySeminar($course->seminar_id); if (count($cycle_dates) < 1) { - $eventless[$cid] = $course->getFullname('number-name'); + $eventless[$cid] = $course->getFullName('number-name'); } elseif ($semester) { $has_date_in_semester = false; foreach ($cycle_dates as $cycle_date) { @@ -298,7 +298,7 @@ class InstituteCalendarHelper if ($has_date_in_semester) break; } if (!$has_date_in_semester) { - $eventless[$cid] = $course->getFullname('number-name'); + $eventless[$cid] = $course->getFullName('number-name'); } } } @@ -399,7 +399,7 @@ class InstituteCalendarHelper $end_time = implode(':', $end_time); $move_url = URLHelper::getURL('dispatch.php/admin/courseplanning/move_event'); - $name = $course->getFullname('number-name'); + $name = $course->getFullName('number-name'); if ($start_time != $cycle_date['start_time'] && $end_time != $cycle_date['end_time']) { $start = self::iso8601date(strtotime($day_offset . ' days'), $cycle_date['start_time']); @@ -525,7 +525,7 @@ class InstituteCalendarHelper $event_colors = self::getCourseEventcolors($course); $move_url = URLHelper::getURL('dispatch.php/admin/courseplanning/move_event'); - $name = $course->getFullname('number-name'); + $name = $course->getFullName('number-name'); if ($start_time != $cycle_date['start_time'] && $end_time != $cycle_date['end_time']) { $start = self::iso8601date(strtotime($day_offset . ' days'), $cycle_date['start_time']); @@ -596,11 +596,11 @@ class InstituteCalendarHelper { $info_string = ''; - $info_string .= $course->getFullname('number-name') . "\n"; + $info_string .= $course->getFullName('number-name') . "\n"; $dozenten = []; foreach (CourseMember::findByCourseAndStatus($course->id, 'dozent') as $cmember) { - $dozenten[$cmember->user->user_id] = $cmember->user->getFullname(); + $dozenten[$cmember->user->user_id] = $cmember->user->getFullName(); } if ($dozenten) { $info_string .= implode(', ', $dozenten) . "\n"; diff --git a/lib/classes/MembersModel.php b/lib/classes/MembersModel.php index bf776d9..d9dc104 100644 --- a/lib/classes/MembersModel.php +++ b/lib/classes/MembersModel.php @@ -449,7 +449,7 @@ class MembersModel foreach (AdmissionPriority::getPrioritiesByCourse($cs->getId(), $this->course_id) as $user_id => $p) { $user = User::find($user_id); $data = $user->toArray('user_id username vorname nachname email'); - $data['fullname'] = $user->getFullname('full_rev'); + $data['fullname'] = $user->getFullName('full_rev'); $data['position'] = $cs->hasAdmissionRule('LimitedAdmission') ? $p : '-'; $data['visible'] = 'unknown'; $data['status'] = 'claiming'; @@ -503,15 +503,15 @@ class MembersModel // Insert user in waitlist at current position. if ($course->addToWaitlist($user_id, $which_end)) { $temp_user = User::find($user_id); - $msgs['success'][] = $temp_user->getFullname('no_title'); + $msgs['success'][] = $temp_user->getFullName('no_title'); $curpos++; // Something went wrong on removing the user from course. } else { - $msgs['error'][] = $temp_user->getFullname('no_title'); + $msgs['error'][] = $temp_user->getFullName('no_title'); } // Something went wrong on inserting the user in waitlist. } else { - $msgs['error'][] = $temp_user->getFullname('no_title'); + $msgs['error'][] = $temp_user->getFullName('no_title'); } } return $msgs; diff --git a/lib/classes/ObjectdisplayHelper.php b/lib/classes/ObjectdisplayHelper.php index 1d0bbc3..145647e 100644 --- a/lib/classes/ObjectdisplayHelper.php +++ b/lib/classes/ObjectdisplayHelper.php @@ -55,10 +55,10 @@ class ObjectdisplayHelper { return URLHelper::getLink('dispatch.php/profile', ['username' => $obj->username]); }, 'name' => function($obj) { - return htmlReady($obj->getFullname()); + return htmlReady($obj->getFullName()); }, 'avatar' => function($obj) { - return Avatar::getAvatar($obj->id, $obj->username)->getImageTag(Avatar::SMALL,['title' => $obj->getFullname('no_title')]); + return Avatar::getAvatar($obj->id, $obj->username)->getImageTag(Avatar::SMALL,['title' => $obj->getFullName('no_title')]); } ], 'Course' => [ diff --git a/lib/classes/Range.interface.php b/lib/classes/Range.interface.php index 41cc100..97aa074 100644 --- a/lib/classes/Range.interface.php +++ b/lib/classes/Range.interface.php @@ -34,7 +34,7 @@ interface Range * @param string $format * @return string */ - public function getFullname($format = 'default'); + public function getFullName($format = 'default'); /** * Returns the configuration object for this range. diff --git a/lib/classes/ResponsiveHelper.php b/lib/classes/ResponsiveHelper.php index 4256d52..3e29db3 100644 --- a/lib/classes/ResponsiveHelper.php +++ b/lib/classes/ResponsiveHelper.php @@ -236,7 +236,7 @@ class ResponsiveHelper $cnav = [ 'icon' => $icon, 'avatar' => $hasAvatar, - 'title' => $course->getFullname(), + 'title' => $course->getFullName(), 'url' => URLHelper::getURL($url, ['cid' => $course->id]), 'parent' => 'browse/my_courses', 'path' => 'browse/my_courses/' . $course->id, diff --git a/lib/classes/StudipLog.class.php b/lib/classes/StudipLog.class.php index d214aaa..7a520c9 100644 --- a/lib/classes/StudipLog.class.php +++ b/lib/classes/StudipLog.class.php @@ -280,7 +280,7 @@ class StudipLog foreach ($users as $user) { $name = sprintf( '%s (%s)', - my_substr($user->getFullname(), 0, 20), + my_substr($user->getFullName(), 0, 20), $user->username ); $result[] = [$user->getId(), $name]; diff --git a/lib/classes/StudipObject.class.php b/lib/classes/StudipObject.class.php index 38ce187..151fcdb 100644 --- a/lib/classes/StudipObject.class.php +++ b/lib/classes/StudipObject.class.php @@ -150,7 +150,7 @@ class StudipObject extends AuthorObject { * @access public * @return string The authorID */ - function getFullname () { + function getFullName () { return get_fullname ($this->authorID); } diff --git a/lib/classes/admission/CourseSet.class.php b/lib/classes/admission/CourseSet.class.php index a2ac383..d94bc05 100644 --- a/lib/classes/admission/CourseSet.class.php +++ b/lib/classes/admission/CourseSet.class.php @@ -1029,7 +1029,7 @@ class CourseSet $courses = Course::findAndMapMany(function($c) { return [ 'id' => $c->id, - 'name' => $c->getFullname('number-name-semester'), + 'name' => $c->getFullName('number-name-semester'), 'visible' => $c->visible ]; }, diff --git a/lib/classes/calendar/ICalendarExport.class.php b/lib/classes/calendar/ICalendarExport.class.php index fba0974..066dcc7 100644 --- a/lib/classes/calendar/ICalendarExport.class.php +++ b/lib/classes/calendar/ICalendarExport.class.php @@ -159,7 +159,7 @@ class ICalendarExport { $properties = [ - 'SUMMARY' => $date->course->getFullname(), + 'SUMMARY' => $date->course->getFullName(), 'DESCRIPTION' => '', 'LOCATION' => $date->getRoomName(), 'CATEGORIES' => $GLOBALS['TERMIN_TYP'][$date->date_typ]['name'], diff --git a/lib/classes/forms/NewsRangesInput.php b/lib/classes/forms/NewsRangesInput.php index 2571698..1a4a830 100644 --- a/lib/classes/forms/NewsRangesInput.php +++ b/lib/classes/forms/NewsRangesInput.php @@ -165,7 +165,7 @@ class NewsRangesInput extends Input $options[] = [ 'value' => $course->id . '__seminar', - 'name' => $course->getFullname($name_format), + 'name' => $course->getFullName($name_format), ]; } diff --git a/lib/classes/forms/SelectedRangesInput.php b/lib/classes/forms/SelectedRangesInput.php index 77b2db2..8e17fe8 100644 --- a/lib/classes/forms/SelectedRangesInput.php +++ b/lib/classes/forms/SelectedRangesInput.php @@ -20,7 +20,7 @@ class SelectedRangesInput extends Input foreach ($this->selected_items as $item) { $item_data = []; if ($item instanceof \Range) { - $item_data['name'] = $item->getFullname(); + $item_data['name'] = $item->getFullName(); $item_data['id'] = $item->getRangeId(); } elseif ($item instanceof \StudipItem) { $item_data['name'] = $item->getItemName(); diff --git a/lib/classes/globalsearch/GlobalSearchCourses.php b/lib/classes/globalsearch/GlobalSearchCourses.php index 3725484..bf29ca0 100644 --- a/lib/classes/globalsearch/GlobalSearchCourses.php +++ b/lib/classes/globalsearch/GlobalSearchCourses.php @@ -214,7 +214,7 @@ class GlobalSearchCourses extends GlobalSearchModule implements GlobalSearchFull $result = [ 'id' => $course->id, 'number' => self::mark($course->veranstaltungsnummer, $search), - 'name' => self::mark($course->getFullname(), $search), + 'name' => self::mark($course->getFullName(), $search), 'url' => URLHelper::getURL("dispatch.php/course/details/index/{$course->id}", [], true), 'date' => htmlReady($semester->short_name), 'dates' => $turnus_string, diff --git a/lib/classes/globalsearch/GlobalSearchFiles.php b/lib/classes/globalsearch/GlobalSearchFiles.php index e0cd9f4..4810fbe 100644 --- a/lib/classes/globalsearch/GlobalSearchFiles.php +++ b/lib/classes/globalsearch/GlobalSearchFiles.php @@ -220,14 +220,14 @@ class GlobalSearchFiles extends GlobalSearchModule implements GlobalSearchFullte true ), 'img' => FileManager::getIconForMimeType($data['mime_type'])->asImagePath(), - 'additional' => self::mark($range ? $range->getFullname() : '', $search, false, true), + 'additional' => self::mark($range ? $range->getFullName() : '', $search, false, true), 'date' => strftime('%x', $fileref['chdate']), 'expand' => URLHelper::getURL( "dispatch.php{$range_path}/files/index/{$fileref->folder_id}", ['cid' => $data['range_id']] ), 'expandtext' => _('In diesem Dateibereich suchen'), - 'user' => $user ? $user->getFullname() : _('unbekannt') + 'user' => $user ? $user->getFullName() : _('unbekannt') ]; } diff --git a/lib/classes/globalsearch/GlobalSearchForum.php b/lib/classes/globalsearch/GlobalSearchForum.php index 999757a..ed167d1 100644 --- a/lib/classes/globalsearch/GlobalSearchForum.php +++ b/lib/classes/globalsearch/GlobalSearchForum.php @@ -122,19 +122,19 @@ class GlobalSearchForum extends GlobalSearchModule implements GlobalSearchFullte if ($data['name']) { $name = self::mark($data['name'], $search); } elseif ($course) { - $name = htmlReady($course->getFullname()); + $name = htmlReady($course->getFullName()); } // Get additional info if ($user && !$data['anonymous']) { - $temp = $user->getFullname(); + $temp = $user->getFullName(); } else { $temp = _('Anonym'); } $additional = sprintf( _('Beitrag von %1$s in %2$s'), $temp, - $course ? $course->getFullname() : _('Ohne Titel') + $course ? $course->getFullName() : _('Ohne Titel') ); // Clear content from blockquotes diff --git a/lib/classes/globalsearch/GlobalSearchInstitutes.php b/lib/classes/globalsearch/GlobalSearchInstitutes.php index 1933515..05192d5 100644 --- a/lib/classes/globalsearch/GlobalSearchInstitutes.php +++ b/lib/classes/globalsearch/GlobalSearchInstitutes.php @@ -65,7 +65,7 @@ class GlobalSearchInstitutes extends GlobalSearchModule $inst = Institute::buildExisting($inst_id); $result = [ 'id' => $inst->id, - 'name' => self::mark($inst->getFullname(), $search), + 'name' => self::mark($inst->getFullName(), $search), 'url' => URLHelper::getURL( 'dispatch.php/institute/overview', ['cid' => $inst->id], diff --git a/lib/classes/globalsearch/GlobalSearchMessages.php b/lib/classes/globalsearch/GlobalSearchMessages.php index fb1aef4..d1a91a5 100644 --- a/lib/classes/globalsearch/GlobalSearchMessages.php +++ b/lib/classes/globalsearch/GlobalSearchMessages.php @@ -82,7 +82,7 @@ class GlobalSearchMessages extends GlobalSearchModule $additional = sprintf( '<a href="%s">%s</a>', URLHelper::getLink('dispatch.php/profile', ['username' => $user->username]), - self::mark($user->getFullname(), $search) + self::mark($user->getFullName(), $search) ); } } diff --git a/lib/classes/globalsearch/GlobalSearchMyCourses.php b/lib/classes/globalsearch/GlobalSearchMyCourses.php index 124fb17..f8f2f11 100644 --- a/lib/classes/globalsearch/GlobalSearchMyCourses.php +++ b/lib/classes/globalsearch/GlobalSearchMyCourses.php @@ -151,7 +151,7 @@ class GlobalSearchMyCourses extends GlobalSearchModule $result = [ 'id' => $course->id, 'number' => self::mark($course->veranstaltungsnummer, $search), - 'name' => self::mark($course->getFullname(), $search), + 'name' => self::mark($course->getFullName(), $search), 'url' => URLHelper::getURL('seminar_main.php', ['cid' => $course->id], true), 'date' => htmlReady($semester->short_name), 'dates' => $turnus_string, diff --git a/lib/classes/globalsearch/GlobalSearchUsers.php b/lib/classes/globalsearch/GlobalSearchUsers.php index 548c6ac..fb8677a 100644 --- a/lib/classes/globalsearch/GlobalSearchUsers.php +++ b/lib/classes/globalsearch/GlobalSearchUsers.php @@ -80,7 +80,7 @@ class GlobalSearchUsers extends GlobalSearchModule implements GlobalSearchFullte $user = User::buildExisting($data); return [ 'id' => $user->id, - 'name' => self::markMany($user->getFullname(), $search), + 'name' => self::markMany($user->getFullName(), $search), 'url' => URLHelper::getURL( 'dispatch.php/profile', ['username' => $user->username], diff --git a/lib/classes/searchtypes/NewsRangesSearch.php b/lib/classes/searchtypes/NewsRangesSearch.php index 849b5c5..458d6f0 100644 --- a/lib/classes/searchtypes/NewsRangesSearch.php +++ b/lib/classes/searchtypes/NewsRangesSearch.php @@ -123,7 +123,7 @@ class NewsRangesSearch extends SearchType ) AS tmp_user_table WHERE `name` LIKE :input"; $parameters[':user_id'] = $user->id; - $parameters[':user_name'] = $user->getFullname(); + $parameters[':user_name'] = $user->getFullName(); $parameters[':profile_name'] = _('Profilseite'); } diff --git a/lib/classes/vCard.php b/lib/classes/vCard.php index cc2b618..9171f22 100644 --- a/lib/classes/vCard.php +++ b/lib/classes/vCard.php @@ -61,7 +61,7 @@ class vCard { // User specific data //Fullname - $vCard['FN'] = $user->getFullname(); + $vCard['FN'] = $user->getFullName(); //Name $vCard['N'][] = $user->Nachname; diff --git a/lib/cronjobs/courseware.php b/lib/cronjobs/courseware.php index 38c9807..3242b43 100644 --- a/lib/cronjobs/courseware.php +++ b/lib/cronjobs/courseware.php @@ -239,7 +239,7 @@ class CoursewareCronjob extends CronJob $folder = $this->requireCertificateFolder($unit); $data = [ - 'name'=> $user->getFullname('full') . '-' . date('ymd') . '.pdf', + 'name'=> $user->getFullName('full') . '-' . date('ymd') . '.pdf', 'tmp_name'=> $pdf, 'type' => 'application/pdf', 'size' => @filesize($pdf) @@ -250,7 +250,7 @@ class CoursewareCronjob extends CronJob setTempLanguage('', $user->preferred_language); // Send the message containing a link to the PDF certificate. - $subject = _('Courseware: Zertifikat') . ' - ' . $course->getFullname() . + $subject = _('Courseware: Zertifikat') . ' - ' . $course->getFullName() . ' (' . $unit->structural_element->title . ')'; $message = sprintf( _('Sie haben einen Fortschritt von %1$u % % im Lernmaterial "%2$s" erreicht und können daher Ihr ' . @@ -294,7 +294,7 @@ class CoursewareCronjob extends CronJob URLHelper::getURL('dispatch.php/course/courseware/courseware/' . $unit->id, ['cid' => $course->id])); ; - $mail->setSubject(_('Courseware: Erinnerung') . ' - ' . $course->getFullname() . + $mail->setSubject(_('Courseware: Erinnerung') . ' - ' . $course->getFullName() . ', ' . $unit->structural_element->title) ->setBodyText($message); @@ -332,7 +332,7 @@ class CoursewareCronjob extends CronJob sprintf(_('Sie können das Lernmaterial [direkt hier aufrufen]%s .'), URLHelper::getURL('dispatch.php/course/courseware/courseware/' . $unit->id, ['cid' => $course->id])); - $mail->setSubject(_('Courseware: Fortschritt zurückgesetzt') . ' - ' . $course->getFullname()) + $mail->setSubject(_('Courseware: Fortschritt zurückgesetzt') . ' - ' . $course->getFullName()) ->setBodyText($message); return $mail->send(); diff --git a/lib/evaluation/classes/db/EvaluationObjectDB.class.php b/lib/evaluation/classes/db/EvaluationObjectDB.class.php index 8b8d7df..fd5728d 100644 --- a/lib/evaluation/classes/db/EvaluationObjectDB.class.php +++ b/lib/evaluation/classes/db/EvaluationObjectDB.class.php @@ -60,7 +60,7 @@ class EvaluationObjectDB extends DatabaseObject if (in_array($o_type, ['sem','inst','fak'])) { $range = get_object_by_range_id($rangeID); if ($range) { - $rangename = $range->getFullname('number-name-semester'); + $rangename = $range->getFullName('number-name-semester'); } else { $rangename = _('Kein Titel gefunden.'); } diff --git a/lib/evaluation/evaluation_admin_overview.lib.php b/lib/evaluation/evaluation_admin_overview.lib.php index add53c2..40174ec 100644 --- a/lib/evaluation/evaluation_admin_overview.lib.php +++ b/lib/evaluation/evaluation_admin_overview.lib.php @@ -231,7 +231,7 @@ class EvalOverview case "public_template": $arrowLink = " "; $titleLink = $eval->getTitle() ? $eval->getTitle() : " "; - $content[0] = $eval->getFullname() ? $eval->getFullname() : " "; + $content[0] = $eval->getFullName() ? $eval->getFullName() : " "; $content[1] = $eval->getChangedate() == NULL ? " " : date("d.m.Y", $eval->getChangedate()); $button = LinkButton::create(_('Vorschau'), URLHelper::getURL('show_evaluation.php?evalID=' . $evalID . '&isPreview=' . YES), ['title' => _('Vorschau dieser öffentlichen Evaluationsvorlage.'), @@ -276,7 +276,7 @@ class EvalOverview case EVAL_STATE_NEW: $arrowLink->addContent(EvalCommon::createImage(($open ? EVAL_PIC_ARROW_NEW_OPEN : EVAL_PIC_ARROW_NEW), _("Aufklappen"))); - $content[0] = $eval->getFullname() ? $eval->getFullname() : " "; + $content[0] = $eval->getFullName() ? $eval->getFullName() : " "; $content[1] = $startDate; if (!$no_buttons) { $content[2] = Button::create(_('Start'), 'start_button', ['title' => _('Evaluation starten')]); @@ -289,7 +289,7 @@ class EvalOverview case EVAL_STATE_ACTIVE: $arrowLink->addContent(EvalCommon::createImage(($open ? EVAL_PIC_ARROW_RUNNING_OPEN : EVAL_PIC_ARROW_RUNNING), _("Aufklappen"))); - $content[0] = $eval->getFullname() ? $eval->getFullname() : " "; + $content[0] = $eval->getFullName() ? $eval->getFullName() : " "; $content[1] = $stopDate; if (!$no_buttons) { $content[2] = Button::createCancel(_('Stop'), 'stop_button', ['title' => _('Evaluation stoppen')]);; @@ -304,7 +304,7 @@ class EvalOverview case EVAL_STATE_STOPPED: $arrowLink->addContent(EvalCommon::createImage(($open ? EVAL_PIC_ARROW_STOPPED_OPEN : EVAL_PIC_ARROW_STOPPED), _("Aufklappen"))); - $content[0] = $eval->getFullname() ? $eval->getFullname() : " "; + $content[0] = $eval->getFullName() ? $eval->getFullName() : " "; //$content[1] = $eval->isVisible() ? "yes" : "no"; if (!$no_buttons) { $content[2] = Button::create(_('Fortsetzen'), 'continue_button', ['title' => _('Evaluation fortsetzen')]); diff --git a/lib/extern/ExternPage.php b/lib/extern/ExternPage.php index a70e3f3..8ed0e96 100644 --- a/lib/extern/ExternPage.php +++ b/lib/extern/ExternPage.php @@ -273,7 +273,7 @@ abstract class ExternPage $user = $member->user; $content[] = array_merge( [ - 'FULLNAME' => $user->getFullname(), + 'FULLNAME' => $user->getFullName(), 'LASTNAME' => $user->nachname, 'FIRSTNAME' => $user->vorname, 'TITLEFRONT' => $user->title_front, diff --git a/lib/extern/ExternPageCourseDetails.php b/lib/extern/ExternPageCourseDetails.php index 3dd0159..06f009d 100644 --- a/lib/extern/ExternPageCourseDetails.php +++ b/lib/extern/ExternPageCourseDetails.php @@ -128,7 +128,7 @@ class ExternPageCourseDetails extends ExternPage $content = [ 'TITLE' => $course->name, 'SUBTITLE' => $course->untertitel, - 'FULLNAME' => $course->getFullname(), + 'FULLNAME' => $course->getFullName(), 'SEMESTER' => $course->getTextualSemester(), 'CYCLE' => $seminar->getDatesExport(), 'ROOM' => $course->ort, @@ -278,7 +278,7 @@ class ExternPageCourseDetails extends ExternPage 'BODY' => $news_detail->body, 'TOPIC' => $news_detail->topic, 'DATE' => $news_detail->date, - 'FULLNAME' => $news_detail->owner->getFullname(), + 'FULLNAME' => $news_detail->owner->getFullName(), 'LASTNAME' => $news_detail->owner->nachname, 'FIRSTNAME' => $news_detail->owner->vorname, 'TITLEFRONT' => $news_detail->owner->title_front, diff --git a/lib/extern/ExternPageCourses.php b/lib/extern/ExternPageCourses.php index 3c6d9cb..0e6b461 100644 --- a/lib/extern/ExternPageCourses.php +++ b/lib/extern/ExternPageCourses.php @@ -443,10 +443,10 @@ class ExternPageCourses extends ExternPage { $course_content = [ 'TITLE' => $course->name, - 'FULLTITLE' => $course->getFullname(), + 'FULLTITLE' => $course->getFullName(), 'SUBTITLE' => $course->untertitel, 'NUMBER' => $course->veranstaltungsnummer, - 'SEMESTER' => $course->getFullname('sem-duration-name'), + 'SEMESTER' => $course->getFullName('sem-duration-name'), 'FORM' => $course->art, 'ROOM' => $course->ort, 'CYCLE' => Seminar::getInstance($course->id)->getDatesExport(['show_room' => true]), diff --git a/lib/extern/ExternPageDownload.php b/lib/extern/ExternPageDownload.php index 6e3a5ad..98ed50e 100644 --- a/lib/extern/ExternPageDownload.php +++ b/lib/extern/ExternPageDownload.php @@ -114,7 +114,7 @@ class ExternPageDownload extends ExternPage $content_owner = [ 'USERNAME' => $file_ref->owner->username, 'USERID' => $file_ref->owner->id, - 'FULLNAME' => $file_ref->owner->getFullname(), + 'FULLNAME' => $file_ref->owner->getFullName(), 'FIRSTNAME' => $file_ref->owner->vorname, 'LASTNAME' => $file_ref->owner->nachname, 'TITLEFRONT' => $file_ref->owner->title_front, diff --git a/lib/extern/ExternPagePersBrowse.php b/lib/extern/ExternPagePersBrowse.php index 270e991..ceb72d5 100644 --- a/lib/extern/ExternPagePersBrowse.php +++ b/lib/extern/ExternPagePersBrowse.php @@ -377,7 +377,7 @@ class ExternPagePersBrowse extends ExternPage $content[] = array_merge( [ 'NAME' => $institute->name, - 'FULLNAME' => $institute->getFullname(), + 'FULLNAME' => $institute->getFullName(), 'ID' => $institute->id, 'COUNT_USERS' => $row_count['count_user'], ], diff --git a/lib/extern/ExternPageTimetable.php b/lib/extern/ExternPageTimetable.php index 1035411..d427600 100644 --- a/lib/extern/ExternPageTimetable.php +++ b/lib/extern/ExternPageTimetable.php @@ -263,10 +263,10 @@ class ExternPageTimetable extends ExternPage { return [ 'TITLE' => $date->course->name, - 'FULLTITLE' => $date->course->getFullname(), + 'FULLTITLE' => $date->course->getFullName(), 'SUBTITLE' => $date->course->untertitel, 'NUMBER' => $date->course->veranstaltungsnummer, - 'SEMESTER' => $date->course->getFullname('sem-duration-name'), + 'SEMESTER' => $date->course->getFullName('sem-duration-name'), 'AVATAR_URL' => $date->course->getItemAvatarURL(), 'INFO_URL' => $date->course->getItemURL(), 'SEMTYPENAME' => $GLOBALS['SEM_TYPE'][$date->course->status]['name'], @@ -284,7 +284,7 @@ class ExternPageTimetable extends ExternPage $lecturers_content[] = [ 'LASTNAME' => $lecturer->nachname, 'FIRSTNAME' => $lecturer->vorname, - 'FULLNAME' => $lecturer->getFullname(), + 'FULLNAME' => $lecturer->getFullName(), 'ID' => $lecturer->id, 'EMAIL' => $lecturer->email ]; diff --git a/lib/filesystem/CourseDateFolder.php b/lib/filesystem/CourseDateFolder.php index 09eae1a..2ab0435 100644 --- a/lib/filesystem/CourseDateFolder.php +++ b/lib/filesystem/CourseDateFolder.php @@ -24,7 +24,7 @@ class CourseDateFolder extends PermissionEnabledFolder implements FolderType _("%'.02d. %s am %s"), CourseDate::getConsecutiveNumber($date), $date->getTypeName(), - $date->getFullname() + $date->getFullName() ); } diff --git a/lib/filesystem/FilesystemVueDataManager.php b/lib/filesystem/FilesystemVueDataManager.php index 06ea273..28670bf 100644 --- a/lib/filesystem/FilesystemVueDataManager.php +++ b/lib/filesystem/FilesystemVueDataManager.php @@ -138,7 +138,7 @@ class FilesystemVueDataManager ? count($folder->getFiles()) + count($folder->getSubfolders()) : 0 ), - 'author_name' => $folder->owner ? $folder->owner->getFullname('no_title_rev') : '', + 'author_name' => $folder->owner ? $folder->owner->getFullName('no_title_rev') : '', 'author_url' => $folder->owner && $folder->owner->id !== $GLOBALS['user']->id? URLHelper::getURL('dispatch.php/profile', ['username' => $folder->owner->username]) : '', 'chdate' => (int) $folder->chdate, 'actions' => $actionMenu->render(), diff --git a/lib/filesystem/RootFolder.php b/lib/filesystem/RootFolder.php index 1089c97..0727770 100644 --- a/lib/filesystem/RootFolder.php +++ b/lib/filesystem/RootFolder.php @@ -36,7 +36,7 @@ class RootFolder extends StandardFolder { if ($attribute === 'name') { $range = $this->getRangeObject(); - return isset($range) ? $range->getFullname('short') : ''; + return isset($range) ? $range->getFullName('short') : ''; } return $this->folderdata[$attribute]; } diff --git a/lib/models/AdmissionApplication.class.php b/lib/models/AdmissionApplication.class.php index 2901455..d1f2cba 100644 --- a/lib/models/AdmissionApplication.class.php +++ b/lib/models/AdmissionApplication.class.php @@ -81,7 +81,7 @@ class AdmissionApplication extends SimpleORMap implements PrivacyObject public function getUserFullname($format = 'full') { - return User::build(array_merge(['motto' => ''], $this->toArray('vorname nachname username title_front title_rear')))->getFullname($format); + return User::build(array_merge(['motto' => ''], $this->toArray('vorname nachname username title_front title_rear')))->getFullName($format); } /** @@ -123,7 +123,7 @@ class AdmissionApplication extends SimpleORMap implements PrivacyObject foreach (AdmissionPriority::getPrioritiesByCourse($cs->getId(), $course_id) as $user_id => $p) { $user = User::find($user_id); $data = $user->toArray('user_id username vorname nachname email'); - $data['fullname'] = $user->getFullname('full_rev'); + $data['fullname'] = $user->getFullName('full_rev'); $data['position'] = $cs->hasAdmissionRule('LimitedAdmission') ? $p : '-'; $data['visible'] = 'unknown'; $data['status'] = 'claiming'; diff --git a/lib/models/ConsultationBlock.php b/lib/models/ConsultationBlock.php index a4d1579..e42daaf 100644 --- a/lib/models/ConsultationBlock.php +++ b/lib/models/ConsultationBlock.php @@ -76,7 +76,7 @@ class ConsultationBlock extends SimpleORMap implements PrivacyObject } if ($block->range instanceof Institute) { - return sprintf(_('Einrichtung: %s'), $block->range->getFullname()); + return sprintf(_('Einrichtung: %s'), $block->range->getFullName()); } throw new Exception('Not implemented yet'); diff --git a/lib/models/Course.class.php b/lib/models/Course.class.php index 75dad33..98f2fec 100644 --- a/lib/models/Course.class.php +++ b/lib/models/Course.class.php @@ -589,7 +589,7 @@ class Course extends SimpleORMap implements Range, PrivacyObject, StudipItem, Fe * @param string formatting template name * @return string Fullname */ - public function getFullname($format = 'default') + public function getFullName($format = 'default') { $template = [ 'name' => '%1$s', diff --git a/lib/models/CourseDate.class.php b/lib/models/CourseDate.class.php index 2a5b77e..21ef00e 100644 --- a/lib/models/CourseDate.class.php +++ b/lib/models/CourseDate.class.php @@ -262,7 +262,7 @@ class CourseDate extends SimpleORMap implements PrivacyObject, Event * 'verbose' are supported by now) * @return String containing the full name of this date. */ - public function getFullname($format = 'default') + public function getFullName($format = 'default') { if (!$this->date || !in_array($format, ['default', 'verbose', 'include-room'])) { return ''; @@ -388,11 +388,11 @@ class CourseDate extends SimpleORMap implements PrivacyObject, Event { if (!$this->metadate_id) { if ($type == 'after_create') { - StudipLog::log('SEM_ADD_SINGLEDATE', $this->range_id, $this->getFullname()); + StudipLog::log('SEM_ADD_SINGLEDATE', $this->range_id, $this->getFullName()); } if ($type == 'before_store' && !$this->isNew() && ($this->isFieldDirty('date') || $this->isFieldDirty('end_time'))) { $old_entry = self::build($this->content_db); - StudipLog::log('SINGLEDATE_CHANGE_TIME', $this->range_id, $this->getFullname(), $old_entry->getFullname() . ' -> ' . $this->getFullname()); + StudipLog::log('SINGLEDATE_CHANGE_TIME', $this->range_id, $this->getFullName(), $old_entry->getFullName() . ' -> ' . $this->getFullName()); } } } @@ -572,7 +572,7 @@ class CourseDate extends SimpleORMap implements PrivacyObject, Event { $descriptions = []; if (count($this->dozenten) > 0) { - $descriptions[_('Durchführende Lehrende')] = implode(', ', $this->dozenten->getFullname()); + $descriptions[_('Durchführende Lehrende')] = implode(', ', $this->dozenten->getFullName()); } if (count($this->statusgruppen) > 0) { $descriptions[_('Beteiligte Gruppen')] = implode(', ', $this->statusgruppen->getValue('name')); diff --git a/lib/models/CourseExDate.class.php b/lib/models/CourseExDate.class.php index ce50e31..2d3afea 100644 --- a/lib/models/CourseExDate.class.php +++ b/lib/models/CourseExDate.class.php @@ -129,7 +129,7 @@ class CourseExDate extends SimpleORMap implements PrivacyObject, Event * 'verbose' are supported by now) * @return String containing the full name of this date. */ - public function getFullname($format = 'default') + public function getFullName($format = 'default') { if (!$this->date || !in_array($format, ['default', 'verbose'])) { return ''; @@ -337,7 +337,7 @@ class CourseExDate extends SimpleORMap implements PrivacyObject, Event { $descriptions = []; if (count($this->dozenten) > 0) { - $descriptions[_('Durchführende Lehrende')] = implode(', ', $this->dozenten->getFullname()); + $descriptions[_('Durchführende Lehrende')] = implode(', ', $this->dozenten->getFullName()); } if (count($this->statusgruppen) > 0) { $descriptions[_('Beteiligte Gruppen')] = implode(', ', $this->statusgruppen->getValue('name')); diff --git a/lib/models/CourseMember.class.php b/lib/models/CourseMember.class.php index a8a900b..91256a9 100644 --- a/lib/models/CourseMember.class.php +++ b/lib/models/CourseMember.class.php @@ -146,7 +146,7 @@ class CourseMember extends SimpleORMap implements PrivacyObject return User::build(array_merge( ['motto' => ''], $this->toArray('vorname nachname username title_front title_rear') - ))->getFullname($format); + ))->getFullName($format); } public function cbRemoveNotifications() diff --git a/lib/models/Courseware/BlockTypes/BlockType.php b/lib/models/Courseware/BlockTypes/BlockType.php index de69161..b3d5abf 100644 --- a/lib/models/Courseware/BlockTypes/BlockType.php +++ b/lib/models/Courseware/BlockTypes/BlockType.php @@ -279,7 +279,7 @@ abstract class BlockType $feedbacks = []; foreach ($this->block['feedback'] as $item) { if ($item['user_id']) { - $item['user_name'] = \User::find($item['user_id'])->getFullname(); + $item['user_name'] = \User::find($item['user_id'])->getFullName(); $item['user_avatar'] = \Avatar::getAvatar($item['user_id'])->getImageTag(\Avatar::SMALL); } array_push($feedbacks, $item); diff --git a/lib/models/Courseware/StructuralElement.php b/lib/models/Courseware/StructuralElement.php index 35a0184..9b68ea2 100644 --- a/lib/models/Courseware/StructuralElement.php +++ b/lib/models/Courseware/StructuralElement.php @@ -1063,7 +1063,7 @@ SQL; $doc->setHeaderTitle(sprintf(_('Courseware aus %s'), $this->course->name)); } if ($this->user) { - $doc->setHeaderTitle(sprintf(_('Courseware von %s'), $this->user->getFullname())); + $doc->setHeaderTitle(sprintf(_('Courseware von %s'), $this->user->getFullName())); } if (!self::canVisit($user)) { diff --git a/lib/models/Deputy.php b/lib/models/Deputy.php index f433e22..e2917e7 100644 --- a/lib/models/Deputy.php +++ b/lib/models/Deputy.php @@ -70,25 +70,25 @@ class Deputy extends SimpleORMap /** * Gets the full deputy name (in fact just redirecting to User class) - * @see User::getFullname + * @see User::getFullName * @param string $format one of full,full_rev,no_title,no_title_rev,no_title_short,no_title_motto,full_rev_username * @return string The deputy's full name, like "John Doe" or "Doe, John" */ public function getDeputyFullname($format = 'full') { - return $this->deputy->getFullname($format); + return $this->deputy->getFullName($format); } /** * Gets the full boss name (in fact just redirecting to User class) - * @see User::getFullname + * @see User::getFullName * @param string $format one of full,full_rev,no_title,no_title_rev,no_title_short,no_title_motto,full_rev_username * @return string The bosses full name, like "John Doe" or "Doe, John" */ public function getBossFullname($format = 'full') { if ($this->boss) { - return $this->boss->getFullname($format); + return $this->boss->getFullName($format); } else { return null; } @@ -96,7 +96,7 @@ class Deputy extends SimpleORMap /** * Gets the full course name (in fact just redirecting to Course class) - * @see Course::getFullname + * @see Course::getFullName * @param string $format one of default, type-name, number-type-name, number-name, * number-name-semester, sem-duration-name * @return string The courses' full name, like "1234 Lecture: Databases" @@ -104,7 +104,7 @@ class Deputy extends SimpleORMap public function getCourseFullname($format = 'default') { if ($this->course) { - return $this->course->getFullname($format); + return $this->course->getFullName($format); } else { return null; } diff --git a/lib/models/Institute.class.php b/lib/models/Institute.class.php index ece1e13..47cf271 100644 --- a/lib/models/Institute.class.php +++ b/lib/models/Institute.class.php @@ -236,7 +236,7 @@ class Institute extends SimpleORMap implements Range * @param string formatting template name * @return string Fullname */ - public function getFullname($format = 'default'): string + public function getFullName($format = 'default'): string { $template['type-name'] = '%2$s: %1$s'; if ($format === 'default' || !isset($template[$format])) { diff --git a/lib/models/InstituteMember.class.php b/lib/models/InstituteMember.class.php index 3a513fe..ec1c026 100644 --- a/lib/models/InstituteMember.class.php +++ b/lib/models/InstituteMember.class.php @@ -159,7 +159,7 @@ class InstituteMember extends SimpleORMap implements PrivacyObject return User::build(array_merge( ['motto' => ''], $this->toArray('vorname nachname username title_front title_rear') - ))->getFullname($format); + ))->getFullName($format); } /** diff --git a/lib/models/Message.class.php b/lib/models/Message.class.php index e4f938b..46493d6 100644 --- a/lib/models/Message.class.php +++ b/lib/models/Message.class.php @@ -164,7 +164,7 @@ class Message extends SimpleORMap implements PrivacyObject unset($data['user_id']); $user = User::build($data); $ret = $user->toArray('username vorname nachname'); - $ret['fullname'] = $user->getFullname(); + $ret['fullname'] = $user->getFullName(); $ret['user_id'] = $user_id; return $ret; }) diff --git a/lib/models/NewsRange.class.php b/lib/models/NewsRange.class.php index d780b55..7785214 100644 --- a/lib/models/NewsRange.class.php +++ b/lib/models/NewsRange.class.php @@ -60,7 +60,7 @@ class NewsRange extends SimpleORMap return $this->course->name; break; case 'user': - return $this->user->getFullname(); + return $this->user->getFullName(); break; case 'inst': case 'fak': diff --git a/lib/models/OERMaterial.php b/lib/models/OERMaterial.php index a023ad1..9de4298 100644 --- a/lib/models/OERMaterial.php +++ b/lib/models/OERMaterial.php @@ -695,7 +695,7 @@ class OERMaterial extends SimpleORMap if ($this->users[0]) { $user_name = $this->users[0]['external_contact'] ? $this->users[0]['oeruser']['name'] - : User::find($this->users[0]['user_id'])->getFullname(); + : User::find($this->users[0]['user_id'])->getFullName(); } else { $user_name = _("unbekannt"); } diff --git a/lib/models/StatusgruppeUser.php b/lib/models/StatusgruppeUser.php index 7bd3133..a36dcdc 100644 --- a/lib/models/StatusgruppeUser.php +++ b/lib/models/StatusgruppeUser.php @@ -88,12 +88,12 @@ class StatusgruppeUser extends SimpleORMap implements PrivacyObject */ public function name($format = 'full_rev') { - return $this->user->getFullname($format); + return $this->user->getFullName($format); } public function getUserFullname($format = "full") { - return User::build(array_merge(['motto' => ''], $this->toArray('vorname nachname username title_front title_rear')))->getFullname($format); + return User::build(array_merge(['motto' => ''], $this->toArray('vorname nachname username title_front title_rear')))->getFullName($format); } /** diff --git a/lib/models/calendar/CalendarDateAssignment.class.php b/lib/models/calendar/CalendarDateAssignment.class.php index ba0f387..6caae9e 100644 --- a/lib/models/calendar/CalendarDateAssignment.class.php +++ b/lib/models/calendar/CalendarDateAssignment.class.php @@ -681,7 +681,7 @@ class CalendarDateAssignment extends SimpleORMap implements Event public function getRangeName() : string { if ($this->course instanceof Course) { - return $this->course->getFullname(); + return $this->course->getFullName(); } elseif ($this->user instanceof User) { return $this->user->getFullName(); } diff --git a/lib/models/resources/ResourceBooking.class.php b/lib/models/resources/ResourceBooking.class.php index 84fc9c7..f55b3b3 100644 --- a/lib/models/resources/ResourceBooking.class.php +++ b/lib/models/resources/ResourceBooking.class.php @@ -1464,13 +1464,13 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen { $name = ''; if ($this->getAssignedUserType() === 'course') { - $name = $this->assigned_course_date->course->getFullname(); + $name = $this->assigned_course_date->course->getFullName(); $name .= ' (' . implode(',', $this->assigned_course_date->course->getMembersWithStatus('dozent', true)->limit(3)->getValue('nachname')) . ')'; } elseif ($this->getAssignedUserType() === 'user') { if (get_visibility_by_id($this->assigned_user->id) || ($this->assigned_user->id == $GLOBALS['user']->id) ) { - $name = $this->assigned_user->getFullname(); + $name = $this->assigned_user->getFullName(); if ($this->description) { $name .= " \n" . $this->description; } @@ -1482,7 +1482,7 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen $current_user = User::findCurrent(); if (($resource instanceof Resource) && ($current_user instanceof User)) { if ($resource->userHasPermission($current_user, 'user')) { - $name = $this->assigned_user->getFullname(); + $name = $this->assigned_user->getFullName(); if ($this->description) { $name .= " \n" . $this->description; } diff --git a/lib/models/resources/ResourceProperty.class.php b/lib/models/resources/ResourceProperty.class.php index 8481644..4bbc4ec 100644 --- a/lib/models/resources/ResourceProperty.class.php +++ b/lib/models/resources/ResourceProperty.class.php @@ -48,7 +48,7 @@ class ResourceProperty extends SimpleORMap ]; $config['additional_fields']['name'] = ['definition', 'name']; - $config['additional_fields']['fullname'] = ['get' => 'getFullname']; + $config['additional_fields']['fullname'] = ['get' => 'getFullName']; $config['additional_fields']['display_name'] = ['definition', 'display_name']; $config['additional_fields']['type'] = ['definition', 'type']; $config['additional_fields']['info_label'] = ['definition', 'info_label']; @@ -114,7 +114,7 @@ class ResourceProperty extends SimpleORMap return $string; } - public function getFullname() + public function getFullName() { $name = (string)$this->definition->display_name ?: $this->definition->name; $category = trim(strstr($name, ':', true)); diff --git a/lib/models/resources/ResourceRequest.class.php b/lib/models/resources/ResourceRequest.class.php index 6200127..6b22b44 100644 --- a/lib/models/resources/ResourceRequest.class.php +++ b/lib/models/resources/ResourceRequest.class.php @@ -1446,14 +1446,14 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen continue; } if ($rra->appointment) { - $parts[] = $rra->appointment->getFullname('include-room'); + $parts[] = $rra->appointment->getFullName('include-room'); } } $strings[] = implode('; ', $parts); } elseif ($this->termin_id) { if ($this->date) { if ($with_past_intervals || $this->date->end_time >= $now) { - $strings[] = $this->date->getFullname('include-room'); + $strings[] = $this->date->getFullName('include-room'); } } } elseif ($this->metadate_id) { @@ -1461,7 +1461,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen $this->cycle->dates->filter(function($date) use($with_past_intervals, $now) { return $with_past_intervals || $date->end_time >= $now; })->map(function($date) use(&$strings) { - $strings[] = $date->getFullname('include-room'); + $strings[] = $date->getFullName('include-room'); }); } } elseif ($this->course_id) { @@ -1519,13 +1519,13 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen if ($short || !$date) { return _('Einzeltermin'); } else { - return sprintf(_('Einzeltermin (%s)'), $date->getFullname()); + return sprintf(_('Einzeltermin (%s)'), $date->getFullName()); } } elseif ($this->date) { if ($short) { return _('Einzeltermin'); } else { - return sprintf(_('Einzeltermin (%s)'), $this->date->getFullname()); + return sprintf(_('Einzeltermin (%s)'), $this->date->getFullName()); } } elseif ($this->cycle) { if ($short) { @@ -1820,7 +1820,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen public function getRangeName() { if ($this->getRangeType() === 'course') { - $name = $this->getRangeObject()->getFullname(); + $name = $this->getRangeObject()->getFullName(); $name .= ' (' . implode(',', $this->getRangeObject()->getMembersWithStatus('dozent', true)->limit(3)->getValue('nachname')) . ')'; } else { $range_object = $this->getRangeObject(); @@ -1837,9 +1837,9 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen //see the name of the requester. if ($this->resource_id && ($this->resource instanceof Resource) && $this->resource->userHasPermission($current_user, 'autor')) { - $name = $range_object->getFullname(); + $name = $range_object->getFullName(); } else if (ResourceManager::userHasGlobalPermission($current_user, 'autor')) { - $name = $range_object->getFullname(); + $name = $range_object->getFullName(); } else { return ''; } @@ -1848,7 +1848,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen } } } else { - $name = $range_object->getFullname(); + $name = $range_object->getFullName(); } if ($this->comment) { $name .= " \n" . $this->comment; @@ -2210,7 +2210,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen $range_object = $this->getRangeObject(); $mail_title = _('Raumanfrage wurde abgelehnt'); if($range_object instanceof Course) { - $mail_title .= ': ' . $range_object->getFullname(); + $mail_title .= ': ' . $range_object->getFullName(); } $mail_text = $template->render( [ diff --git a/locale/de/LC_MAILS/close_resource_request.php b/locale/de/LC_MAILS/close_resource_request.php index 3f017d7..2ff931f 100644 --- a/locale/de/LC_MAILS/close_resource_request.php +++ b/locale/de/LC_MAILS/close_resource_request.php @@ -25,7 +25,7 @@ Die folgenden Zeiträume wurden gebucht: <? foreach ($single_dates as $date) : ?> <? if($date instanceof CourseDate) : ?> - - <?= $date->getFullname() ?> + - <?= $date->getFullName() ?> <? else : ?> - <?= $date->toString('default') ?> <? endif ?> diff --git a/locale/de/LC_MAILS/delete_booking_notification.php b/locale/de/LC_MAILS/delete_booking_notification.php index c5ef18d..4ba483f 100644 --- a/locale/de/LC_MAILS/delete_booking_notification.php +++ b/locale/de/LC_MAILS/delete_booking_notification.php @@ -7,7 +7,7 @@ Ihre Buchung der Ressource <?= $resource->name ?> am <?= date('d.m.Y', $begin) ? <? endif ?> <? if ($booking_course instanceof Course): ?> -Es handelte sich um eine Buchung für die Veranstaltung <?= $booking_course->getFullname() ?>. +Es handelte sich um eine Buchung für die Veranstaltung <?= $booking_course->getFullName() ?>. <? endif ?> <? if ($deleting_user instanceof User) : ?> diff --git a/locale/de/LC_MAILS/request_denied_mail.inc.php b/locale/de/LC_MAILS/request_denied_mail.inc.php index 4721677..e267e2a 100644 --- a/locale/de/LC_MAILS/request_denied_mail.inc.php +++ b/locale/de/LC_MAILS/request_denied_mail.inc.php @@ -1,5 +1,5 @@ Ihre Raumanfrage vom <?= date('d.m.Y', $request->mkdate) ?> - <?= $range_object instanceof Course ? sprintf('zur Veranstaltung %s', htmlReady($range_object->getFullname())) : ''?> wurde + <?= $range_object instanceof Course ? sprintf('zur Veranstaltung %s', htmlReady($range_object->getFullName())) : ''?> wurde <?= $request->last_modifier instanceof User ? 'von ' . $request->last_modifier->getFullName() : '' diff --git a/locale/en/LC_MAILS/close_resource_request.php b/locale/en/LC_MAILS/close_resource_request.php index 44d995b..2adcad9 100644 --- a/locale/en/LC_MAILS/close_resource_request.php +++ b/locale/en/LC_MAILS/close_resource_request.php @@ -25,7 +25,7 @@ The following time ranges have been booked: <? foreach ($single_dates as $date) : ?> <? if($date instanceof CourseDate) : ?> -- <?= $date->getFullname() ?> +- <?= $date->getFullName() ?> <? else : ?> - <?= $date->toString('default') ?> <? endif ?> diff --git a/locale/en/LC_MAILS/delete_booking_notification.php b/locale/en/LC_MAILS/delete_booking_notification.php index 3e57aea..4146dd9 100644 --- a/locale/en/LC_MAILS/delete_booking_notification.php +++ b/locale/en/LC_MAILS/delete_booking_notification.php @@ -7,7 +7,7 @@ Your booking of the resource <?= $resource->name ?> on <?= date('d.m.Y', $begin) <? endif ?> <? if ($booking_course instanceof Course): ?> -The booking deleted belonged to course <?= $booking_course->getFullname() ?>. +The booking deleted belonged to course <?= $booking_course->getFullName() ?>. <? endif ?> <? if ($deleting_user instanceof User) : ?> diff --git a/locale/en/LC_MAILS/request_denied_mail.inc.php b/locale/en/LC_MAILS/request_denied_mail.inc.php index f852967..4a601ab 100644 --- a/locale/en/LC_MAILS/request_denied_mail.inc.php +++ b/locale/en/LC_MAILS/request_denied_mail.inc.php @@ -1,5 +1,5 @@ Your room request from <?= date('d.m.Y', $request->mkdate) ?> - <?= $range_object instanceof Course ? sprintf('for the Course %s', htmlReady($range_object->getFullname())) : ''?> has been denied + <?= $range_object instanceof Course ? sprintf('for the Course %s', htmlReady($range_object->getFullName())) : ''?> has been denied <?= $request->last_modifier instanceof User ? 'by ' . $request->last_modifier->getFullName() : '' diff --git a/templates/admission/userlist.php b/templates/admission/userlist.php index 872d691..6ce2af2 100644 --- a/templates/admission/userlist.php +++ b/templates/admission/userlist.php @@ -9,7 +9,7 @@ <ul> <? foreach ($userlist->getUsers(true) as $user): ?> <li> - <?= htmlReady($user->getFullname('full_rev')) ?> + <?= htmlReady($user->getFullName('full_rev')) ?> (<?= htmlReady($user->username) ?>) </li> <? endforeach; ?> diff --git a/templates/blubber/course_context.php b/templates/blubber/course_context.php index 206397a..e611992 100644 --- a/templates/blubber/course_context.php +++ b/templates/blubber/course_context.php @@ -22,7 +22,7 @@ <h4><?= _('Nächster Termin') ?></h4> <a href="<?= URLHelper::getLink("dispatch.php/course/dates/details/".$nextdate->getId(), ['cid' => $course->id]) ?>" data-dialog="size=auto"> <?= Icon::create('date')->asImg(['class' => "text-bottom"]) ?> - <?= htmlReady($nextdate->getFullname()) ?> + <?= htmlReady($nextdate->getFullName()) ?> </a> </div> <? endif ?> diff --git a/templates/courseware/mails/certificate.php b/templates/courseware/mails/certificate.php index 1e948be..c24f96a 100644 --- a/templates/courseware/mails/certificate.php +++ b/templates/courseware/mails/certificate.php @@ -5,7 +5,7 @@ <?= htmlReady($unit->config['certificate']['title']) ?> </h1> <h2 style="font-size: 14px; text-align: center"> - <?= sprintf(_('für %s'), htmlReady($user->getFullname())) ?> + <?= sprintf(_('für %s'), htmlReady($user->getFullName())) ?> </h2> <p style="font-size: 14px; text-align: center;"> <?= $unit->config['certificate']['text'] ?> diff --git a/templates/filesystem/topic_folder/description.php b/templates/filesystem/topic_folder/description.php index c0e80bd..b80740f 100644 --- a/templates/filesystem/topic_folder/description.php +++ b/templates/filesystem/topic_folder/description.php @@ -7,7 +7,7 @@ <?= _('(Studierende dürfen keine Dateien hochladen.)')?> <? endif ?> <? endif ?> - <?$dates = isset($topic) ? $topic->dates->getFullname() : [];?> + <?$dates = isset($topic) ? $topic->dates->getFullName() : [];?> <? if (count($dates)) :?> <?=_('Folgende Termine sind diesem Thema zugeordnet:') ?> <div> diff --git a/templates/header.php b/templates/header.php index 73e3713..5ff5a1f 100644 --- a/templates/header.php +++ b/templates/header.php @@ -76,7 +76,7 @@ if ($navigation) { $hasSidebar = false; } ?> <responsive-navigation :me="<?= htmlReady(json_encode($me)) ?>" - context="<?= htmlReady(Context::get() ? Context::get()->getFullname() : '') ?>" + context="<?= htmlReady(Context::get() ? Context::get()->getFullName() : '') ?>" :has-sidebar="<?= $hasSidebar ? 'true' : 'false' ?>" :navigation="<?= htmlReady(json_encode(ResponsiveHelper::getNavigationObject($_COOKIE['responsive-navigation-hash'] ?? null))) ?>" ></responsive-navigation> @@ -290,7 +290,7 @@ if ($navigation) { <div id="context-title"> <? if (Context::isCourse()) : ?> <?= Icon::create('seminar', Icon::ROLE_INFO)->asImg(20, ['class' => 'context_icon']) ?> - <?= htmlReady(Context::get()->getFullname()) ?> + <?= htmlReady(Context::get()->getFullName()) ?> <? if ($GLOBALS['user']->config->SHOWSEM_ENABLE && !Context::get()->isOpenEnded()): ?> (<?= htmlReady(Context::get()->getTextualSemester()) ?>) <? endif ?> |