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