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 /lib | |
| parent | f2f70529462f10f08d7a0ca57bfb50c80e645fa4 (diff) | |
replaced getFullname with getFullName, re #3499
Merge request studip/studip!2660
Diffstat (limited to 'lib')
60 files changed, 108 insertions, 108 deletions
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( [ |
