diff options
| author | Jan-Hendrik Willms <tleilax+github@gmail.com> | 2023-05-08 17:08:52 +0200 |
|---|---|---|
| committer | Jan-Hendrik Willms <tleilax+github@gmail.com> | 2023-05-08 17:08:52 +0200 |
| commit | a1fda2758e9c241ac3eb980ac8716dfedbe9dd3c (patch) | |
| tree | 2190f0478fb153efdb8ba48ebb574c7691f4f351 | |
| parent | 244d00ed91ad2b4b83e902a45cd6def3d7bc7e86 (diff) | |
let phpcsfixer fix errors according to @PSR12 rules on lib/modelsphpcsfixer
130 files changed, 1719 insertions, 1200 deletions
diff --git a/lib/models/Abschluss.php b/lib/models/Abschluss.php index a3299c8..69701ad 100644 --- a/lib/models/Abschluss.php +++ b/lib/models/Abschluss.php @@ -119,12 +119,21 @@ class Abschluss extends ModuleManagementModelTreeItem implements PrivacyObject * to filter the result set. * @return object A SimpleORMapCollection of Abschluss objects. */ - public static function getAllEnriched($sortby = 'name', $order = 'ASC', - $row_count = null, $offset = null, $filter = null) - { - $sortby = self::createSortStatement($sortby, $order, 'chdate', - ['kategorie_name', 'count_faecher', 'count_studiengaenge']); - return parent::getEnrichedByQuery(' + public static function getAllEnriched( + $sortby = 'name', + $order = 'ASC', + $row_count = null, + $offset = null, + $filter = null + ) { + $sortby = self::createSortStatement( + $sortby, + $order, + 'chdate', + ['kategorie_name', 'count_faecher', 'count_studiengaenge'] + ); + return parent::getEnrichedByQuery( + ' SELECT abschluss.*, mvv_abschl_kategorie.name AS `kategorie_name`, COUNT(DISTINCT mvv_stgteil.fach_id) AS `count_faecher`, COUNT(DISTINCT mvv_studiengang.studiengang_id) AS `count_studiengaenge` @@ -138,7 +147,10 @@ class Abschluss extends ModuleManagementModelTreeItem implements PrivacyObject ' . self::getFilterSql($filter, true) . ' GROUP BY abschluss_id ORDER BY ' . $sortby, - [], $row_count, $offset); + [], + $row_count, + $offset + ); } /** @@ -173,7 +185,8 @@ class Abschluss extends ModuleManagementModelTreeItem implements PrivacyObject */ public static function findByFach($fach_id) { - return parent::getEnrichedByQuery(' + return parent::getEnrichedByQuery( + ' SELECT ma.*, COUNT(DISTINCT mss.studiengang_id) AS count_studiengaenge FROM mvv_stgteil AS mst @@ -231,7 +244,8 @@ class Abschluss extends ModuleManagementModelTreeItem implements PrivacyObject */ public static function findByFachbereich($fachbereich_id) { - return parent::getEnrichedByQuery(' + return parent::getEnrichedByQuery( + ' SELECT a.*, maz.kategorie_id FROM abschluss AS a INNER JOIN mvv_studiengang AS ms USING (abschluss_id) @@ -253,7 +267,8 @@ class Abschluss extends ModuleManagementModelTreeItem implements PrivacyObject */ public static function findByModul($modul_id) { - return parent::getEnrichedByQuery(' + return parent::getEnrichedByQuery( + ' SELECT ma.* FROM abschluss ma INNER JOIN mvv_studiengang USING (abschluss_id) @@ -317,7 +332,8 @@ class Abschluss extends ModuleManagementModelTreeItem implements PrivacyObject { $institute = []; - $stmt = DBManager::get()->prepare(' + $stmt = DBManager::get()->prepare( + ' SELECT inst.* FROM mvv_studiengang ms INNER JOIN Institute inst ON (inst.Institut_id = ms.institut_id) @@ -373,7 +389,8 @@ class Abschluss extends ModuleManagementModelTreeItem implements PrivacyObject { $_SESSION['MVV/Modul/trail_parent_id'] = $this->getId(); // return Modulteil::findByModul($this->getId()); - return Modul::getEnrichedByQuery(' + return Modul::getEnrichedByQuery( + ' SELECT mm.* FROM mvv_modul mm LEFT JOIN mvv_stgteilabschnitt_modul USING (modul_id) @@ -434,8 +451,10 @@ class Abschluss extends ModuleManagementModelTreeItem implements PrivacyObject . DBManager::get()->quote($this->name)); if (sizeof($existing)) { $ret['name'] = true; - $messages[] = sprintf(_('Es existiert bereits ein Abschluss mit dem Namen "%s"!'), - $this->name); + $messages[] = sprintf( + _('Es existiert bereits ein Abschluss mit dem Namen "%s"!'), + $this->name + ); $rejected = true; } } @@ -457,7 +476,8 @@ class Abschluss extends ModuleManagementModelTreeItem implements PrivacyObject public function countUserByStudycourse($studycourse_id) { - $stmt = DBManager::get()->prepare(' + $stmt = DBManager::get()->prepare( + ' SELECT COUNT(DISTINCT user_id) FROM user_studiengang WHERE fach_id = ? diff --git a/lib/models/AbschlussKategorie.php b/lib/models/AbschlussKategorie.php index e605201..8196a0e 100644 --- a/lib/models/AbschlussKategorie.php +++ b/lib/models/AbschlussKategorie.php @@ -16,7 +16,6 @@ class AbschlussKategorie extends ModuleManagementModelTreeItem { - /** * Number of Abschluesse this Kategorie is assigned to. * @var int @@ -72,13 +71,13 @@ class AbschlussKategorie extends ModuleManagementModelTreeItem ]; $config['additional_fields']['count_abschluesse']['get'] = - function($ak) { return $ak->count_abschluesse; }; + function ($ak) { return $ak->count_abschluesse; }; $config['additional_fields']['count_studiengaenge']['get'] = - function($ak) { return $ak->count_studiengaenge; }; + function ($ak) { return $ak->count_studiengaenge; }; $config['additional_fields']['count_dokumente']['get'] = - function($ak) { return $ak->count_dokumente; }; + function ($ak) { return $ak->count_dokumente; }; $config['additional_fields']['count_objects']['get'] = - function($ak) { return $ak->count_objects; }; + function ($ak) { return $ak->count_objects; }; $config['i18n_fields']['name'] = true; $config['i18n_fields']['name_kurz'] = true; @@ -124,16 +123,21 @@ class AbschlussKategorie extends ModuleManagementModelTreeItem * to filter the result set. * @return object A SimpleORMapCollection of Abschluss objects. */ - public static function getAllEnriched($sortby = 'position', $order = 'ASC', - $row_count = null, $offset = null, $filter = null) - { + public static function getAllEnriched( + $sortby = 'position', + $order = 'ASC', + $row_count = null, + $offset = null, + $filter = null + ) { $sortby = self::createSortStatement( $sortby, $order, 'position', ['count_abschluesse', 'count_dokumente', 'count_studiengaenge'] ); - return parent::getEnrichedByQuery(" + return parent::getEnrichedByQuery( + " SELECT mvv_abschl_kategorie.*, COUNT(DISTINCT mvv_abschl_zuord.abschluss_id) AS `count_abschluesse`, COUNT(DISTINCT mvv_files_ranges.mvvfile_id) AS `count_dokumente`, @@ -177,7 +181,8 @@ class AbschlussKategorie extends ModuleManagementModelTreeItem */ public static function findByFachbereich($fachbereich_id) { - return parent::getEnrichedByQuery(' + return parent::getEnrichedByQuery( + ' SELECT mak.* FROM mvv_abschl_kategorie mak INNER JOIN mvv_abschl_zuord USING (kategorie_id) @@ -264,8 +269,10 @@ class AbschlussKategorie extends ModuleManagementModelTreeItem $existing = AbschlussKategorie::findOneBySQL('name = ?', [trim($this->name)]); if ($existing && $existing->getId() != $this->getId()) { $ret['name'] = true; - $messages[] = sprintf(_('Es existiert bereits eine Abschluss-Kategorie mit dem Namen "%s"!'), - $this->name); + $messages[] = sprintf( + _('Es existiert bereits eine Abschluss-Kategorie mit dem Namen "%s"!'), + $this->name + ); $rejected = true; } } @@ -310,7 +317,8 @@ class AbschlussKategorie extends ModuleManagementModelTreeItem $start_sem = self::$object_filter['StgteilVersion']['start_semester'] ?? null; $end_sem = self::$object_filter['StgteilVersion']['end_semester'] ?? null; - return StgteilVersion::getEnrichedByQuery(" + return StgteilVersion::getEnrichedByQuery( + " SELECT msv.* FROM mvv_abschl_zuord maz INNER JOIN mvv_studiengang ms ON ( @@ -331,7 +339,8 @@ class AbschlussKategorie extends ModuleManagementModelTreeItem [':kategorie_id' => $this->getId(), ':parent_id' => $trail_parent_id, ':sem_begin' => ($start_sem ? $start_sem->beginn : 0), - ':sem_end' => ($end_sem ? $end_sem->ende : PHP_INT_MAX)]); + ':sem_end' => ($end_sem ? $end_sem->ende : PHP_INT_MAX)] + ); } diff --git a/lib/models/AbschlussZuord.php b/lib/models/AbschlussZuord.php index 9a83e58..53405aa 100644 --- a/lib/models/AbschlussZuord.php +++ b/lib/models/AbschlussZuord.php @@ -17,7 +17,6 @@ class AbschlussZuord extends ModuleManagementModel { - protected static function configure($config = []) { $config['db_table'] = 'mvv_abschl_zuord'; diff --git a/lib/models/AdmissionApplication.class.php b/lib/models/AdmissionApplication.class.php index 4da0c6b..abf347c 100644 --- a/lib/models/AdmissionApplication.class.php +++ b/lib/models/AdmissionApplication.class.php @@ -57,25 +57,29 @@ class AdmissionApplication extends SimpleORMap implements PrivacyObject public static function findByCourse($course_id) { $db = DBManager::get(); - return $db->fetchAll("SELECT admission_seminar_user.*, aum.vorname,aum.nachname,aum.email, + return $db->fetchAll( + "SELECT admission_seminar_user.*, aum.vorname,aum.nachname,aum.email, aum.username,ui.title_front,ui.title_rear FROM admission_seminar_user LEFT JOIN auth_user_md5 aum USING (user_id) LEFT JOIN user_info ui USING (user_id) WHERE seminar_id = ? ORDER BY position", - [$course_id], - __CLASS__ . '::buildExisting'); + [$course_id], + __CLASS__ . '::buildExisting' + ); } public static function findByUser($user_id) { $db = DBManager::get(); - return $db->fetchAll("SELECT admission_seminar_user.*, seminare.Name as course_name + return $db->fetchAll( + "SELECT admission_seminar_user.*, seminare.Name as course_name FROM admission_seminar_user LEFT JOIN seminare USING (seminar_id) WHERE user_id = ? ORDER BY seminare.Name", - [$user_id], - __CLASS__ . '::buildExisting'); + [$user_id], + __CLASS__ . '::buildExisting' + ); } public function getUserFullname($format = 'full') @@ -164,7 +168,8 @@ class AdmissionApplication extends SimpleORMap implements PrivacyObject */ public static function checkMemberPosition(string $user_id, string $seminar_id): bool { - $position = DBManager::get()->fetchColumn("SELECT IFNULL(position, 'na') + $position = DBManager::get()->fetchColumn( + "SELECT IFNULL(position, 'na') FROM admission_seminar_user WHERE user_id = ? AND seminar_id = ? AND status = 'awaiting'", [$user_id, $seminar_id] @@ -181,12 +186,12 @@ class AdmissionApplication extends SimpleORMap implements PrivacyObject */ public static function addMembers(string $seminar_id, bool $send_message = true): void { - $messaging = new messaging; + $messaging = new messaging(); //Daten holen / Abfrage ob ueberhaupt begrenzt $seminar = Seminar::GetInstance($seminar_id, true); - if($seminar->isAdmissionEnabled()){ + if($seminar->isAdmissionEnabled()) { $sem_preliminary = ($seminar->admission_prelim == 1); $cs = $seminar->getCourseSet(); //Veranstaltung einfach auffuellen (nach Lostermin und Ende der Kontingentierung) @@ -224,9 +229,9 @@ class AdmissionApplication extends SimpleORMap implements PrivacyObject if (($sem_preliminary || $affected > 0) && $send_message) { setTempLanguage($membership->user_id); if (!$sem_preliminary) { - $message = sprintf (_('Sie sind in die Veranstaltung **%s (%s)** eingetragen worden, da für Sie ein Platz frei geworden ist. Damit sind Sie für die Teilnahme an der Veranstaltung zugelassen. Ab sofort finden Sie die Veranstaltung in der Übersicht Ihrer Veranstaltungen.'), $seminar->getName(), $seminar->getFormattedTurnus(true)); + $message = sprintf(_('Sie sind in die Veranstaltung **%s (%s)** eingetragen worden, da für Sie ein Platz frei geworden ist. Damit sind Sie für die Teilnahme an der Veranstaltung zugelassen. Ab sofort finden Sie die Veranstaltung in der Übersicht Ihrer Veranstaltungen.'), $seminar->getName(), $seminar->getFormattedTurnus(true)); } else { - $message = sprintf (_('Sie haben den Status vorläufig akzeptiert in der Veranstaltung **%s (%s)** erhalten, da für Sie ein Platz frei geworden ist.'), $seminar->getName(), $seminar->getFormattedTurnus(true)); + $message = sprintf(_('Sie haben den Status vorläufig akzeptiert in der Veranstaltung **%s (%s)** erhalten, da für Sie ein Platz frei geworden ist.'), $seminar->getName(), $seminar->getFormattedTurnus(true)); } $subject = sprintf(_("Teilnahme an der Veranstaltung %s"), $seminar->getName()); restoreLanguage(); @@ -236,7 +241,7 @@ class AdmissionApplication extends SimpleORMap implements PrivacyObject } } //Warteposition der restlichen User neu eintragen - AdmissionApplication::renumberAdmission($seminar_id, FALSE); + AdmissionApplication::renumberAdmission($seminar_id, false); } $seminar->restore(); } @@ -248,9 +253,9 @@ class AdmissionApplication extends SimpleORMap implements PrivacyObject * @param bool $send_message * @return void */ - public static function renumberAdmission (string $seminar_id, bool $send_message = true): void + public static function renumberAdmission(string $seminar_id, bool $send_message = true): void { - $messaging = new messaging; + $messaging = new messaging(); $seminar = Seminar::GetInstance($seminar_id); if ($seminar->isAdmissionEnabled()) { $admission_users = self::findBySQL( @@ -263,14 +268,16 @@ class AdmissionApplication extends SimpleORMap implements PrivacyObject if ($admission->store() && Config::get()->NOTIFY_ON_WAITLIST_ADVANCE && $send_message) { $username = $admission->user->username; setTempLanguage($admission->user_id); - $message = sprintf(_('Sie sind auf der Warteliste der Veranstaltung **%s (%s)** hochgestuft worden. Sie stehen zur Zeit auf Position %s.'), + $message = sprintf( + _('Sie sind auf der Warteliste der Veranstaltung **%s (%s)** hochgestuft worden. Sie stehen zur Zeit auf Position %s.'), $seminar->name, $seminar->getFormattedTurnus(), - $position); + $position + ); $subject = sprintf(_('Ihre Position auf der Warteliste der Veranstaltung %s wurde verändert'), $seminar->name); restoreLanguage(); - $messaging->insert_message($message, $username, '____%system%____', FALSE, FALSE, '1', FALSE, $subject); + $messaging->insert_message($message, $username, '____%system%____', false, false, '1', false, $subject); } $position += 1; } diff --git a/lib/models/AdmissionRuleCompatibility.php b/lib/models/AdmissionRuleCompatibility.php index f3447bc..40cb8f6 100644 --- a/lib/models/AdmissionRuleCompatibility.php +++ b/lib/models/AdmissionRuleCompatibility.php @@ -21,7 +21,6 @@ */ class AdmissionRuleCompatibility extends SimpleORMap { - protected static function configure($config = []) { $config['db_table'] = 'admissionrule_compat'; diff --git a/lib/models/Banner.class.php b/lib/models/Banner.class.php index 8c283e5..e9cf0f6 100644 --- a/lib/models/Banner.class.php +++ b/lib/models/Banner.class.php @@ -139,7 +139,7 @@ class Banner extends SimpleORMap ->fetchColumn(); $computed = true; } -// return '1/' . (1 / (pow(2, $prio) / $sum)); + // return '1/' . (1 / (pow(2, $prio) / $sum)); return number_format(100 / (1 / (pow(2, $this->priority) / $sum)), 2, ',', '.') . '%'; } @@ -227,5 +227,5 @@ class Banner extends SimpleORMap $this->store(); return sprintf('<div style="padding: 5px; text-align: center;">%s</div>', $link); - } + } } diff --git a/lib/models/BlubberThread.php b/lib/models/BlubberThread.php index d0f2f89..68c5470 100644 --- a/lib/models/BlubberThread.php +++ b/lib/models/BlubberThread.php @@ -249,7 +249,8 @@ class BlubberThread extends SimpleORMap implements PrivacyObject { $query = SQLQuery::table('blubber_threads')->join( 'blubber_comments', - 'blubber_comments', 'blubber_threads.thread_id = blubber_comments.thread_id', + 'blubber_comments', + 'blubber_threads.thread_id = blubber_comments.thread_id', 'LEFT JOIN' ); @@ -362,7 +363,7 @@ class BlubberThread extends SimpleORMap implements PrivacyObject $threads = array_map(function ($thread) { return self::upgradeThread($thread); }, $threads); - $threads = array_filter($threads, function ($t) use ($user_id){ + $threads = array_filter($threads, function ($t) use ($user_id) { return $t->isVisibleInStream() && $t->isReadable($user_id); }); return $threads; diff --git a/lib/models/CalendarEvent.class.php b/lib/models/CalendarEvent.class.php index 96cc869..eaa5737 100644 --- a/lib/models/CalendarEvent.class.php +++ b/lib/models/CalendarEvent.class.php @@ -27,11 +27,11 @@ */ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject { - const PARTSTAT_TENTATIVE = 1; - const PARTSTAT_ACCEPTED = 2; - const PARTSTAT_DECLINED = 3; - const PARTSTAT_DELEGATED = 4; - const PARTSTAT_NEEDS_ACTION = 5; + public const PARTSTAT_TENTATIVE = 1; + public const PARTSTAT_ACCEPTED = 2; + public const PARTSTAT_DECLINED = 3; + public const PARTSTAT_DELEGATED = 4; + public const PARTSTAT_NEEDS_ACTION = 5; protected static function configure($config = []) { @@ -104,9 +104,9 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject { if ($this->user) { return $this->user; - } else if ($this->course) { + } elseif ($this->course) { return $this->course; - } else if ($this->institute) { + } elseif ($this->institute) { return $this->institute; } return null; @@ -162,14 +162,18 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject global $PERS_TERMIN_KAT; $categories = []; - if ($this->havePermission(Event::PERMISSION_READABLE, - $this->permission_user_id)) { + if ($this->havePermission( + Event::PERMISSION_READABLE, + $this->permission_user_id + )) { if ($this->event->categories) { $categories = array_map('trim', explode(',', $this->event->categories)); } if ($this->event->category_intern) { - array_unshift($categories, - $PERS_TERMIN_KAT[$this->event->category_intern]['name']); + array_unshift( + $categories, + $PERS_TERMIN_KAT[$this->event->category_intern]['name'] + ); } } return $as_array ? $categories : implode(', ', $categories); @@ -187,13 +191,13 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject $status = $this->group_status; } switch ($status) { - case CalendarEvent::PARTSTAT_TENTATIVE : + case CalendarEvent::PARTSTAT_TENTATIVE: return _('Abwartend'); - case CalendarEvent::PARTSTAT_ACCEPTED : + case CalendarEvent::PARTSTAT_ACCEPTED: return _('Angenommen'); - case CalendarEvent::PARTSTAT_DECLINED : + case CalendarEvent::PARTSTAT_DECLINED: return _('Abgelehnt'); - case CalendarEvent::PARTSTAT_DELEGATED : + case CalendarEvent::PARTSTAT_DELEGATED: return _('Angenommen (keine Teilnahme)'); } return ''; @@ -210,8 +214,10 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject public function getRecurrence($index = null) { $recurrence = [ - 'ts' => $this->event->ts ?: mktime(12, 0, 0, date('n', $this->getStart()), date('j', - $this->getStart()), date('Y', $this->getStart())), + 'ts' => $this->event->ts ?: mktime(12, 0, 0, date('n', $this->getStart()), date( + 'j', + $this->getStart() + ), date('Y', $this->getStart())), 'linterval' => $this->event->linterval, 'sinterval' => $this->event->sinterval, 'wdays' => $this->event->wdays, @@ -240,28 +246,52 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject * @param array $r_rule * @return array|false The values of the recurrence rule. */ - function setRecurrence($r_rule) + public function setRecurrence($r_rule) { $start = $this->getStart(); $end = $this->getEnd(); - $duration = (int) ((mktime(12, 0, 0, date('n', $end), - date('j', $end), date('Y', $end)) - - mktime(12, 0, 0, date('n', $start), - date('j', $start), date('Y', $start))) / 86400); + $duration = (int) ((mktime( + 12, + 0, + 0, + date('n', $end), + date('j', $end), + date('Y', $end) + ) + - mktime( + 12, + 0, + 0, + date('n', $start), + date('j', $start), + date('Y', $start) + )) / 86400); if (!isset($r_rule['count'])) { $r_rule['count'] = 0; } switch ($r_rule['rtype']) { case 'SINGLE': - $ts = mktime(12, 0, 0, date('n', $start), - date('j', $start), date('Y', $start)); + $ts = mktime( + 12, + 0, + 0, + date('n', $start), + date('j', $start), + date('Y', $start) + ); $rrule = [$ts, 0, 0, '', 0, 0, 'SINGLE', $duration]; break; case 'DAILY': $r_rule['linterval'] = $r_rule['linterval'] ? intval($r_rule['linterval']) : 1; - $ts = mktime(12, 0, 0, date('n', $start), - date('j', $start) + $r_rule['linterval'], date('Y', $start)); + $ts = mktime( + 12, + 0, + 0, + date('n', $start), + date('j', $start) + $r_rule['linterval'], + date('Y', $start) + ); if ($r_rule['count']) { $r_rule['expire'] = mktime(23, 59, 59, date('n', $start), date('j', $start) + ($r_rule['count'] - 1) * $r_rule['linterval'], date('Y', $start)); @@ -271,21 +301,37 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject case 'WEEKLY': $r_rule['linterval'] = $r_rule['linterval'] ? intval($r_rule['linterval']) : 1; if (!$r_rule['wdays']) { - $ts = mktime(12, 0, 0, date('n', $start), date('j', $start) + + $ts = mktime( + 12, + 0, + 0, + date('n', $start), + date('j', $start) + ($r_rule['linterval'] * 7 - (strftime('%u', $start) - 1)), - date('Y', $start)); + date('Y', $start) + ); if ($r_rule['count']) { - $r_rule['expire'] = mktime(23, 59, 59, date('n', $start), - date('j', $start) + ($r_rule['linterval'] * 7 * ($r_rule['count'] - 1)), - date('Y', $start)); + $r_rule['expire'] = mktime( + 23, + 59, + 59, + date('n', $start), + date('j', $start) + ($r_rule['linterval'] * 7 * ($r_rule['count'] - 1)), + date('Y', $start) + ); } $rrule = [$ts, $r_rule['linterval'], 0, strftime('%u', $start), 0, 0, 'WEEKLY', $duration]; } else { - $ts = mktime(12, 0, 0, date('n', $start), - date('j', $start) + (7 - (strftime('%u', $start) - 1)) + $ts = mktime( + 12, + 0, + 0, + date('n', $start), + date('j', $start) + (7 - (strftime('%u', $start) - 1)) - ((strftime('%u', $start) <= substr($r_rule['wdays'], -1)) ? 7 : 0), - date('Y', $start)); + date('Y', $start) + ); if ($r_rule['count']) { $dt_ts = DateTime::createFromFormat('U', $ts); @@ -317,8 +363,14 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject } $expire_ts = $dt_expire->format('U'); - $r_rule['expire'] = mktime(23, 59, 59, date('n', $expire_ts), - date('j', $expire_ts), date('Y', $expire_ts)); + $r_rule['expire'] = mktime( + 23, + 59, + 59, + date('n', $expire_ts), + date('j', $expire_ts), + date('Y', $expire_ts) + ); } $rrule = [$ts, $r_rule['linterval'], 0, $r_rule['wdays'], 0, 0, 'WEEKLY', $duration]; @@ -334,7 +386,7 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject $ts = mktime(12, 0, 0, $amonth, date('j', $start), date('Y', $start)); $rrule = [$ts, $r_rule['linterval'], 0, '', 0, date('j', $start), 'MONTHLY', $duration]; - } else if (!$r_rule['sinterval'] && !$r_rule['wdays']) { + } elseif (!$r_rule['sinterval'] && !$r_rule['wdays']) { if ($r_rule['day'] < date('j', $start)) { $amonth = date('n', $start) + $r_rule['linterval']; } else { @@ -343,12 +395,18 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject $ts = mktime(12, 0, 0, $amonth, $r_rule['day'], date('Y', $start)); $rrule = [$ts, $r_rule['linterval'], 0, '', 0, $r_rule['day'], 'MONTHLY', $duration]; - } else if (!$r_rule['day']) { + } elseif (!$r_rule['day']) { $amonth = date('n', $start); - $adate = mktime(12, 0, 0, $amonth, 1, - date('Y', $start)) + ($r_rule['sinterval'] - 1) * 604800; + $adate = mktime( + 12, + 0, + 0, + $amonth, + 1, + date('Y', $start) + ) + ($r_rule['sinterval'] - 1) * 604800; $awday = strftime('%u', $adate); - $adate -= ( $awday - $r_rule['wdays']) * 86400; + $adate -= ($awday - $r_rule['wdays']) * 86400; if ($r_rule['sinterval'] == 5) { if (date('j', $adate) < 10) { $adate -= 604800; @@ -356,15 +414,21 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject if (date('n', $adate) == date('n', $adate + 604800)) { $adate += 604800; } - } else if ($awday > $r_rule['wdays']) { + } elseif ($awday > $r_rule['wdays']) { $adate += 604800; } if (date('Ymd', $adate) < date('Ymd', $start)) { $amonth = date('n', $start) + $r_rule['linterval']; - $adate = mktime(12, 0, 0, $amonth, 1, - date('Y', $start)) + ($r_rule['sinterval'] - 1) * 604800; + $adate = mktime( + 12, + 0, + 0, + $amonth, + 1, + date('Y', $start) + ) + ($r_rule['sinterval'] - 1) * 604800; $awday = strftime('%u', $adate); - $adate -= ( $awday - $r_rule['wdays']) * 86400; + $adate -= ($awday - $r_rule['wdays']) * 86400; if ($r_rule['sinterval'] == 5) { if (date('j', $adate) < 10) { $adate -= 604800; @@ -372,7 +436,7 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject if (date('n', $adate) == date('n', $adate + 604800)) { $adate += 604800; } - } else if ($awday > $r_rule['wdays']) { + } elseif ($awday > $r_rule['wdays']) { $adate += 604800; } } @@ -388,29 +452,53 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject break; case 'YEARLY': if (!$r_rule['month'] && !$r_rule['day'] && !$r_rule['sinterval'] && !$r_rule['wdays']) { - $ts = mktime(12, 0, 0, date('n', $start), - date('j', $start), date('Y', $start) + 1); + $ts = mktime( + 12, + 0, + 0, + date('n', $start), + date('j', $start), + date('Y', $start) + 1 + ); $rrule = [$ts, 1, 0, '', date('n', $start), date('j', $start), 'YEARLY', $duration]; - } else if (!$r_rule['sinterval'] && !$r_rule['wdays']) { + } elseif (!$r_rule['sinterval'] && !$r_rule['wdays']) { if (!$r_rule['day']) { $r_rule['day'] = date('j', $start); } - $ts = mktime(12, 0, 0, $r_rule['month'], $r_rule['day'], - date('Y', $start)); + $ts = mktime( + 12, + 0, + 0, + $r_rule['month'], + $r_rule['day'], + date('Y', $start) + ); if ($ts <= mktime(12, 0, 0, date('n', $start), date('j', $start), date('Y', $start))) { - $ts = mktime(12, 0, 0, $r_rule['month'], $r_rule['day'], - date('Y', $start) + 1); + $ts = mktime( + 12, + 0, + 0, + $r_rule['month'], + $r_rule['day'], + date('Y', $start) + 1 + ); } $rrule = [$ts, 1, 0, '', $r_rule['month'], $r_rule['day'], 'YEARLY', $duration]; - } else if (!$r_rule['day']) { + } elseif (!$r_rule['day']) { $ayear = date('Y', $start); do { - $adate = mktime(12, 0, 0, $r_rule['month'], - 1 + ($r_rule['sinterval'] - 1) * 7, $ayear); + $adate = mktime( + 12, + 0, + 0, + $r_rule['month'], + 1 + ($r_rule['sinterval'] - 1) * 7, + $ayear + ); $aday = strftime('%u', $adate); - $adate -= ( $aday - $r_rule['wdays']) * 86400; + $adate -= ($aday - $r_rule['wdays']) * 86400; if ($r_rule['sinterval'] == 5) { if (date('j', $adate) < 10) { $adate -= 604800; @@ -418,7 +506,7 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject if (date('n', $adate) == date('n', $adate + 604800)) { $adate += 604800; } - } else if ($aday > $r_rule['wdays']) { + } elseif ($aday > $r_rule['wdays']) { $adate += 604800; } $ts = $adate; @@ -429,13 +517,25 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject } if ($r_rule['count']) { - $r_rule['expire'] = mktime(23, 59, 59, date('n', $ts), - date('j', $ts), date('Y', $ts) + $r_rule['count'] - 1); + $r_rule['expire'] = mktime( + 23, + 59, + 59, + date('n', $ts), + date('j', $ts), + date('Y', $ts) + $r_rule['count'] - 1 + ); } break; - default : - $ts = mktime(12, 0, 0, date('n', $start), - date('j', $start), date('Y', $start)); + default: + $ts = mktime( + 12, + 0, + 0, + date('n', $start), + date('j', $start), + date('Y', $start) + ); $rrule = [$ts, 0, 0, '', 0, 0, 'SINGLE', $duration]; $r_rule['count'] = 0; } @@ -476,9 +576,11 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject switch ($rrule['rtype']) { case 'DAILY': if ($rrule['linterval'] > 1) { - $type = 'xdaily'; - $text = sprintf(_('Der Termin wird alle %s Tage wiederholt.'), - $rrule['linterval']); + $type = 'xdaily'; + $text = sprintf( + _('Der Termin wird alle %s Tage wiederholt.'), + $rrule['linterval'] + ); } else { $type = 'daily'; $text = _('Der Termin wird täglich wiederholt'); @@ -487,8 +589,11 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject case 'WEEKLY': if ($rrule['linterval'] > 1) { $type = 'xweek_wdaily'; - $text = sprintf(_('Der Termin wird alle %s Wochen am %s wiederholt.'), - $rrule['linterval'], $wdays); + $text = sprintf( + _('Der Termin wird alle %s Wochen am %s wiederholt.'), + $rrule['linterval'], + $wdays + ); } else { if ($rrule['wdays'] = '12345') { $type = 'workdaily'; @@ -502,33 +607,53 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject if ($rrule['linterval'] > 1) { if ($rrule['day']) { $type = 'mday_xmonthly'; - $text = sprintf(_('Der Termin wird am %s. alle %s Monate wiederholt.'), - $rrule['day'], $rrule['linterval']); + $text = sprintf( + _('Der Termin wird am %s. alle %s Monate wiederholt.'), + $rrule['day'], + $rrule['linterval'] + ); } else { if ($rrule['sinterval'] != '5') { $type = 'xwday_xmonthly'; - $text = sprintf(_('Der Termin wird jeden %s. %s alle %s Monate wiederholt.'), - $rrule['sinterval'], $wdays, $rrule['linterval']); + $text = sprintf( + _('Der Termin wird jeden %s. %s alle %s Monate wiederholt.'), + $rrule['sinterval'], + $wdays, + $rrule['linterval'] + ); } else { $type = 'lastwday_xmonthly'; - $text = sprintf(_('Der Termin wird jeden letzten %s alle %s Monate wiederholt.'), - $wdays, $rrule['linterval']); + $text = sprintf( + _('Der Termin wird jeden letzten %s alle %s Monate wiederholt.'), + $wdays, + $rrule['linterval'] + ); } } } else { if ($rrule['day']) { $type = 'mday_monthly'; - $text = sprintf(_('Der Termin wird am %s. jeden Monat wiederholt.'), - $rrule['day'], $rrule['linterval']); + $text = sprintf( + _('Der Termin wird am %s. jeden Monat wiederholt.'), + $rrule['day'], + $rrule['linterval'] + ); } else { if ($rrule['sinterval'] != '5') { $type = 'xwday_monthly'; - $text = sprintf(_('Der Termin wird am %s. %s jeden Monat wiederholt.'), - $rrule['sinterval'], $wdays, $rrule['linterval']); + $text = sprintf( + _('Der Termin wird am %s. %s jeden Monat wiederholt.'), + $rrule['sinterval'], + $wdays, + $rrule['linterval'] + ); } else { $type = 'lastwday_monthly'; - $text = sprintf(_('Der Termin wird jeden letzten %s jeden Monat wiederholt.'), - $wdays, $rrule['linterval']); + $text = sprintf( + _('Der Termin wird jeden letzten %s jeden Monat wiederholt.'), + $wdays, + $rrule['linterval'] + ); } } } @@ -539,17 +664,27 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject _('November'), _('Dezember')]; if ($rrule['day']) { $type = 'mday_month_yearly'; - $text = sprintf(_('Der Termin wird jeden %s. %s wiederholt.'), - $rrule['day'], $month_names[$rrule['month'] - 1]); + $text = sprintf( + _('Der Termin wird jeden %s. %s wiederholt.'), + $rrule['day'], + $month_names[$rrule['month'] - 1] + ); } else { if ($rrule['sinterval'] != '5') { $type = 'xwday_month_yearly'; - $text = sprintf(_('Der Termin wird jeden %s. %s im %s wiederholt.'), - $rrule['sinterval'], $wdays, $month_names[$rrule['month'] - 1]); + $text = sprintf( + _('Der Termin wird jeden %s. %s im %s wiederholt.'), + $rrule['sinterval'], + $wdays, + $month_names[$rrule['month'] - 1] + ); } else { $type = 'lastwday_month_yearly'; - $text = sprintf(_('Der Termin wird jeden letzten %s im %s wiederholt.'), - $wdays, $month_names[$rrule['month'] - 1]); + $text = sprintf( + _('Der Termin wird jeden letzten %s im %s wiederholt.'), + $wdays, + $month_names[$rrule['month'] - 1] + ); } } break; @@ -568,8 +703,10 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject */ public function toStringPriority() { - if (!$this->havePermission(Event::PERMISSION_READABLE, - $this->permission_user_id)) { + if (!$this->havePermission( + Event::PERMISSION_READABLE, + $this->permission_user_id + )) { return ''; } switch ($this->event->priority) { @@ -592,8 +729,10 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject */ public function toStringAccessibility() { - if ($this->havePermission(Event::PERMISSION_READABLE, - $this->permission_user_id)) { + if ($this->havePermission( + Event::PERMISSION_READABLE, + $this->permission_user_id + )) { switch ($this->event->class) { case 'PUBLIC': return _('Öffentlich'); @@ -631,8 +770,14 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject if (is_array($exceptions)) { $exc = array_map(function ($exception) { $exception = intval($exception); - return mktime(12, 0, 0, date('n', $exception), - date('j', $exception), date('Y', $exception)); + return mktime( + 12, + 0, + 0, + date('n', $exception), + date('j', $exception), + date('Y', $exception) + ); }, $exceptions); } $this->event->exceptions = implode(',', $exc); @@ -647,8 +792,10 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject */ public function getTitle() { - if (!$this->havePermission(Event::PERMISSION_READABLE, - $this->permission_user_id)) { + if (!$this->havePermission( + Event::PERMISSION_READABLE, + $this->permission_user_id + )) { return _('Keine Berechtigung.'); } if ($this->event->summary == '') { @@ -742,7 +889,7 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject * * @return int the duration of this event in seconds */ - function getDuration() + public function getDuration() { return $this->event->end - $this->event->start; } @@ -756,8 +903,10 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject public function getLocation() { $location = ''; - if ($this->havePermission(Event::PERMISSION_READABLE, - $this->permission_user_id)) { + if ($this->havePermission( + Event::PERMISSION_READABLE, + $this->permission_user_id + )) { if (trim($this->event->location) != '') { $location = $this->event->location; } @@ -787,8 +936,10 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject public function getDescription() { $description = ''; - if ($this->havePermission(Event::PERMISSION_READABLE, - $this->permission_user_id)) { + if ($this->havePermission( + Event::PERMISSION_READABLE, + $this->permission_user_id + )) { $description = trim($this->event->description); } return $description; @@ -806,8 +957,10 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject global $PERS_TERMIN_KAT; $category = 0; - if ($this->havePermission(Event::PERMISSION_READABLE, - $this->permission_user_id)) { + if ($this->havePermission( + Event::PERMISSION_READABLE, + $this->permission_user_id + )) { if ($this->event->category_intern) { $category = $this->event->category_intern; } @@ -841,8 +994,10 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject */ public function getUserDefinedCategories() { - if ($this->havePermission(Event::PERMISSION_READABLE, - $this->permission_user_id)) { + if ($this->havePermission( + Event::PERMISSION_READABLE, + $this->permission_user_id + )) { return trim((string) $this->event->categories); } return ''; @@ -891,8 +1046,7 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject */ public function setPriority($priority) { - if ($priority >= 0 && $priority < 4) - { + if ($priority >= 0 && $priority < 4) { $this->event->priority = $priority; } else { $this->event->priority = 0; @@ -947,8 +1101,8 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject public function getAccessibilityOptions($permission) { switch ($permission) { - case Calendar::PERMISSION_OWN : - case Calendar::PERMISSION_ADMIN : + case Calendar::PERMISSION_OWN: + case Calendar::PERMISSION_ADMIN: $options = [ // SEMBBS nur private und vertrauliche Termine 'PUBLIC' => _('Öffentlich'), @@ -956,13 +1110,13 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject 'CONFIDENTIAL' => _('Vertraulich') ]; break; - case Calendar::PERMISSION_WRITABLE : + case Calendar::PERMISSION_WRITABLE: $options = [ 'PRIVATE' => _('Privat'), 'CONFIDENTIAL' => _('Vertraulich') ]; break; - default : + default: $options = []; } return $options; @@ -1009,8 +1163,10 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject */ public function getPriority() { - if ($this->havePermission(Event::PERMISSION_READABLE, - $this->permission_user_id)) { + if ($this->havePermission( + Event::PERMISSION_READABLE, + $this->permission_user_id + )) { return $this->event->priority ?: 0; } return 0; @@ -1197,9 +1353,7 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject if (empty($permissions[$user_id][$this->event_id])) { if ($user_id == $this->event->author_id) { $permissions[$user_id][$this->event_id] = Event::PERMISSION_OWN; - } else - - // SEMBBS + } elseif// SEMBBS // Admins dürfen alle Termine löschen /* if ($GLOBALS['perm']->have_perm('admin')) { @@ -1208,7 +1362,7 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject * */ - if ($user_id == $this->range_id) { + ($user_id == $this->range_id) { if ($this->group_status) { $permissions[$user_id][$this->event_id] = Event::PERMISSION_READABLE; } else { @@ -1254,7 +1408,8 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject $permission = Event::PERMISSION_READABLE; } $calendar_user = CalendarUser::find( - [$this->user->getId(), $user_id]); + [$this->user->getId(), $user_id] + ); if ($calendar_user) { if ($accessibility == 'CONFIDENTIAL') { if ($this->event->calendars->findOneBy('range_id', $user_id)) { @@ -1326,7 +1481,7 @@ class CalendarEvent extends SimpleORMap implements Event, PrivacyObject if ($this->institute->id) { $institute_perm = $perm->get_studip_perm($this->institute->id, $user_id); switch ($institute_perm) { - case 'user'; + case 'user': case 'autor': $permission = Event::PERMISSION_READABLE; break; diff --git a/lib/models/CalendarUser.class.php b/lib/models/CalendarUser.class.php index 02fdfce..ca276cf 100644 --- a/lib/models/CalendarUser.class.php +++ b/lib/models/CalendarUser.class.php @@ -43,11 +43,12 @@ class CalendarUser extends SimpleORMap { if ($permission == Calendar::PERMISSION_READABLE) { $this->permission = Calendar::PERMISSION_READABLE; - } else if ($permission == Calendar::PERMISSION_WRITABLE) { + } elseif ($permission == Calendar::PERMISSION_WRITABLE) { $this->permission = Calendar::PERMISSION_WRITABLE; } else { throw new InvalidArgumentException( - 'Calendar permission must be of type PERMISSION_READABLE or PERMISSION_WRITABLE.'); + 'Calendar permission must be of type PERMISSION_READABLE or PERMISSION_WRITABLE.' + ); } } @@ -57,15 +58,17 @@ class CalendarUser extends SimpleORMap Calendar::PERMISSION_WRITABLE]; if (!$permission) { $permission = $permission_array; - } else if (!in_array($permission, $permission_array)) { + } elseif (!in_array($permission, $permission_array)) { throw new InvalidArgumentException( - 'Calendar permission must be of type PERMISSION_READABLE or PERMISSION_WRITABLE.'); + 'Calendar permission must be of type PERMISSION_READABLE or PERMISSION_WRITABLE.' + ); } else { $permission = [$permission]; } return SimpleORMapCollection::createFromArray(CalendarUser::findBySQL( - 'owner_id = ? AND permission IN(?)', - [$user_id, $permission])); + 'owner_id = ? AND permission IN(?)', + [$user_id, $permission] + )); } @@ -75,9 +78,10 @@ class CalendarUser extends SimpleORMap Calendar::PERMISSION_WRITABLE]; if (!$permission) { $permission = $permission_array; - } else if (!in_array($permission, $permission_array)) { + } elseif (!in_array($permission, $permission_array)) { throw new InvalidArgumentException( - 'Calendar permission must be of type PERMISSION_READABLE or PERMISSION_WRITABLE.'); + 'Calendar permission must be of type PERMISSION_READABLE or PERMISSION_WRITABLE.' + ); } else { $permission = [$permission]; } diff --git a/lib/models/ConfigValue.php b/lib/models/ConfigValue.php index 829567d..b9c717a 100644 --- a/lib/models/ConfigValue.php +++ b/lib/models/ConfigValue.php @@ -26,7 +26,7 @@ class ConfigValue extends SimpleORMap { - const RANGE_STUDIP = 'studip'; + public const RANGE_STUDIP = 'studip'; /** * Configures this model. diff --git a/lib/models/ConsultationBlock.php b/lib/models/ConsultationBlock.php index f35e98b..0f6331a 100644 --- a/lib/models/ConsultationBlock.php +++ b/lib/models/ConsultationBlock.php @@ -443,7 +443,7 @@ class ConsultationBlock extends SimpleORMap implements PrivacyObject /** * @return string A string representation of the consultation block instance. */ - public function __toString() : string + public function __toString(): string { return sprintf( _('Terminblock am %1$s, %2$s von %3$s bis %4$s Uhr'), diff --git a/lib/models/ConsultationSlot.php b/lib/models/ConsultationSlot.php index ab1dfa7..8d4f797 100644 --- a/lib/models/ConsultationSlot.php +++ b/lib/models/ConsultationSlot.php @@ -311,7 +311,7 @@ class ConsultationSlot extends SimpleORMap /** * @return string A string representation of the consultation slot. */ - public function __toString() : string + public function __toString(): string { return sprintf( _('Termin am %1$s, %2$s von %3$s bis %4$s'), diff --git a/lib/models/ContentTermsOfUse.class.php b/lib/models/ContentTermsOfUse.class.php index 0e939a4..3d57001 100644 --- a/lib/models/ContentTermsOfUse.class.php +++ b/lib/models/ContentTermsOfUse.class.php @@ -184,7 +184,9 @@ class ContentTermsOfUse extends SimpleORMap if ($allow_owner) { if (in_array($context_type, ['course', 'institute']) && Seminar_Perm::get()->have_studip_perm( - 'tutor', $context_id, $user_id + 'tutor', + $context_id, + $user_id ) ) { return true; diff --git a/lib/models/Course.class.php b/lib/models/Course.class.php index 315b52e..af9c55c 100644 --- a/lib/models/Course.class.php +++ b/lib/models/Course.class.php @@ -558,7 +558,7 @@ class Course extends SimpleORMap implements Range, PrivacyObject, StudipItem, Fe ]; if ($format === 'default' || !isset($template[$format])) { - $format = Config::get()->IMPORTANT_SEMNUMBER ? 'type-number-name' : 'type-name'; + $format = Config::get()->IMPORTANT_SEMNUMBER ? 'type-number-name' : 'type-name'; } $sem_type = $this->getSemType(); $data[0] = $this->name; @@ -595,7 +595,7 @@ class Course extends SimpleORMap implements Range, PrivacyObject, StudipItem, Fe $dates = $this->ex_dates->findBy('content', '', '<>'); $dates->merge($this->dates); } - $dates->uasort(function($a, $b) { + $dates->uasort(function ($a, $b) { return $a->date - $b->date ?: strnatcasecmp($a->getRoomName(), $b->getRoomName()); }); @@ -787,11 +787,11 @@ class Course extends SimpleORMap implements Range, PrivacyObject, StudipItem, Fe $log = []; if ($this->isFieldDirty('admission_prelim')) { - $log[] = $this->admission_prelim ? _('Neuer Anmeldemodus: Vorläufiger Eintrag') : _('Neuer Anmeldemodus: Direkter Eintrag'); + $log[] = $this->admission_prelim ? _('Neuer Anmeldemodus: Vorläufiger Eintrag') : _('Neuer Anmeldemodus: Direkter Eintrag'); } if ($this->isFieldDirty('admission_binding')) { - $log[] = $this->admission_binding? _('Anmeldung verbindlich') : _('Anmeldung unverbindlich'); + $log[] = $this->admission_binding ? _('Anmeldung verbindlich') : _('Anmeldung unverbindlich'); } if ($this->isFieldDirty('admission_turnout')) { @@ -937,7 +937,7 @@ class Course extends SimpleORMap implements Range, PrivacyObject, StudipItem, Fe } - public function getLink() : StudipLink + public function getLink(): StudipLink { return new StudipLink($this->getItemURL(), $this->name, Icon::create('seminar')); } @@ -1033,7 +1033,7 @@ class Course extends SimpleORMap implements Range, PrivacyObject, StudipItem, Fe /** * @see Range::__toString() */ - public function __toString() : string + public function __toString(): string { return $this->getFullName(); } diff --git a/lib/models/CourseCancelledEvent.class.php b/lib/models/CourseCancelledEvent.class.php index de2e4de..d1d055a 100644 --- a/lib/models/CourseCancelledEvent.class.php +++ b/lib/models/CourseCancelledEvent.class.php @@ -14,7 +14,6 @@ class CourseCancelledEvent extends CourseEvent { - protected static function configure($config = []) { $config['alias_fields']['ex_description'] = 'content'; diff --git a/lib/models/CourseDate.class.php b/lib/models/CourseDate.class.php index 9ae0268..4b03d40 100644 --- a/lib/models/CourseDate.class.php +++ b/lib/models/CourseDate.class.php @@ -35,8 +35,8 @@ class CourseDate extends SimpleORMap implements PrivacyObject { - const FORMAT_DEFAULT = 'default'; - const FORMAT_VERBOSE = 'verbose'; + public const FORMAT_DEFAULT = 'default'; + public const FORMAT_VERBOSE = 'verbose'; private static $numbered_dates = null; @@ -124,10 +124,12 @@ class CourseDate extends SimpleORMap implements PrivacyObject if (!isset(self::$numbered_dates[$semester_id])) { $db = DBManager::get(); - $numbered = array_flip($db->fetchFirst("SELECT termin_id FROM termine WHERE range_id = ?" . + $numbered = array_flip($db->fetchFirst( + "SELECT termin_id FROM termine WHERE range_id = ?" . ($semester ? " AND date BETWEEN ? AND ?" : "") . " ORDER BY date", - $semester ? [$date->range_id, $semester->beginn, $semester->ende] : [$date->range_id])); + $semester ? [$date->range_id, $semester->beginn, $semester->ende] : [$date->range_id] + )); self::$numbered_dates[$semester_id] = $numbered; } return isset(self::$numbered_dates[$semester_id][$date->termin_id]) @@ -143,7 +145,8 @@ class CourseDate extends SimpleORMap implements PrivacyObject */ public static function findByIssue_id($issue_id) { - return self::findBySQL("INNER JOIN themen_termine USING (termin_id) + return self::findBySQL( + "INNER JOIN themen_termine USING (termin_id) WHERE themen_termine.issue_id = ? ORDER BY date ASC", [$issue_id] @@ -181,7 +184,8 @@ class CourseDate extends SimpleORMap implements PrivacyObject */ public static function findByStatusgruppe_id($group_id) { - return self::findBySQL("INNER JOIN `termin_related_groups` USING (`termin_id`) + return self::findBySQL( + "INNER JOIN `termin_related_groups` USING (`termin_id`) WHERE `termin_related_groups`.`statusgruppe_id` = ? ORDER BY `date` ASC", [$group_id] @@ -239,7 +243,7 @@ class CourseDate extends SimpleORMap implements PrivacyObject public function getRoom() { if (Config::get()->RESOURCES_ENABLE && !empty($this->room_booking->resource)) { - return $this->room_booking->resource->getDerivedClassInstance(); + return $this->room_booking->resource->getDerivedClassInstance(); } return null; } @@ -270,7 +274,7 @@ class CourseDate extends SimpleORMap implements PrivacyObject $latter_template = $format === 'verbose' ? _('%R Uhr') : '%R'; if (($this->end_time - $this->date) / 60 / 60 > 23) { - $string = strftime('%a., %x (' . _('ganztägig') . ')' , $this->date); + $string = strftime('%a., %x (' . _('ganztägig') . ')', $this->date); } else { $string = strftime('%a., %x, %R', $this->date) . ' - ' . strftime($latter_template, $this->end_time); @@ -279,7 +283,8 @@ class CourseDate extends SimpleORMap implements PrivacyObject if($format === 'include-room') { $room = $this->getRoom(); if($room) { - $string = sprintf('%s <a href="%s" target="_blank">%s</a>', + $string = sprintf( + '%s <a href="%s" target="_blank">%s</a>', $string, $room->getActionURL('booking_plan'), htmlReady($room->name) @@ -465,7 +470,7 @@ class CourseDate extends SimpleORMap implements PrivacyObject /** * @return string A string representation of the course date. */ - public function __toString() : string + public function __toString(): string { return sprintf( _('Termin am %1$s, %2$s von %3$s bis %4$s Uhr'), diff --git a/lib/models/CourseEvent.class.php b/lib/models/CourseEvent.class.php index 2d564b5..61d907f 100644 --- a/lib/models/CourseEvent.class.php +++ b/lib/models/CourseEvent.class.php @@ -79,15 +79,15 @@ class CourseEvent extends CourseDate implements Event ':start' => $start->getTimestamp(), ':end' => $end->getTimestamp() ]); - $event_collection = []; - foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) { - $event = new CourseEvent(); - $event->setData($row); - $event->setNew(false); - // related persons (dozenten) or groups - if (self::checkRelated($event, $user_id)) { - $event_collection[] = $event; - } + $event_collection = []; + foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) { + $event = new CourseEvent(); + $event->setData($row); + $event->setNew(false); + // related persons (dozenten) or groups + if (self::checkRelated($event, $user_id)) { + $event_collection[] = $event; + } } $event_collection = SimpleORMapCollection::createFromArray($event_collection, false); $event_collection->setClassName('Event'); @@ -110,7 +110,7 @@ class CourseEvent extends CourseDate implements Event $check_related = false; $permission = $perm->get_studip_perm($event->range_id, $user_id); switch ($permission) { - case 'dozent' : + case 'dozent': $related_persons = $event->dozenten->pluck('user_id'); if (sizeof($related_persons)) { if (in_array($user_id, $related_persons)) { @@ -120,15 +120,16 @@ class CourseEvent extends CourseDate implements Event $check_related = true; } break; - case 'tutor' : + case 'tutor': $check_related = true; break; - default : + default: $group_ids = $event->statusgruppen->pluck('statusgruppe_id'); if (sizeof($group_ids)) { $member = StatusgruppeUser::findBySQL( - 'statusgruppe_id IN(?) AND user_id = ?', - [$group_ids, $user_id]); + 'statusgruppe_id IN(?) AND user_id = ?', + [$group_ids, $user_id] + ); $check_related = sizeof($member) > 0; } else { $check_related = true; @@ -266,7 +267,7 @@ class CourseEvent extends CourseDate implements Event * * @return int the duration of this event in seconds */ - function getDuration() + public function getDuration() { return $this->end - $this->start; } @@ -278,7 +279,7 @@ class CourseEvent extends CourseDate implements Event * @see ClendarDate::getRoomName() * @return string The location */ - function getLocation() + public function getLocation() { $location = ''; if ($this->havePermission(Event::PERMISSION_READABLE)) { @@ -304,7 +305,7 @@ class CourseEvent extends CourseDate implements Event * * @return String the description */ - function getDescription() + public function getDescription() { $description = ''; if ($this->havePermission(Event::PERMISSION_READABLE)) { diff --git a/lib/models/CourseExDate.class.php b/lib/models/CourseExDate.class.php index f2c75b5..e5b09c2 100644 --- a/lib/models/CourseExDate.class.php +++ b/lib/models/CourseExDate.class.php @@ -66,8 +66,8 @@ class CourseExDate extends SimpleORMap implements PrivacyObject parent::configure($config); } - const FORMAT_DEFAULT = 'default'; - const FORMAT_VERBOSE = 'verbose'; + public const FORMAT_DEFAULT = 'default'; + public const FORMAT_VERBOSE = 'verbose'; /** * Returns course dates by course id @@ -139,7 +139,7 @@ class CourseExDate extends SimpleORMap implements PrivacyObject : '%R'; if (($this->end_time - $this->date) / 60 / 60 > 23) { - return strftime('%a., %x' . ' (' . _('ganztägig') . ')' , $this->date) . " (" . _("fällt aus") . ")"; + return strftime('%a., %x' . ' (' . _('ganztägig') . ')', $this->date) . " (" . _("fällt aus") . ")"; } return strftime('%a., %x, %R', $this->date) . ' - ' @@ -236,7 +236,7 @@ class CourseExDate extends SimpleORMap implements PrivacyObject /** * @return string A string representation of the course date. */ - public function __toString() : string + public function __toString(): string { return sprintf( _('Ausgefallener Termin am %1$s, %2$s von %3$s bis %4$s Uhr'), diff --git a/lib/models/CourseMarkedEvent.class.php b/lib/models/CourseMarkedEvent.class.php index 76cc050..6d35629 100644 --- a/lib/models/CourseMarkedEvent.class.php +++ b/lib/models/CourseMarkedEvent.class.php @@ -14,7 +14,6 @@ class CourseMarkedEvent extends CourseEvent { - protected static function configure($config= []) { parent::configure($config); diff --git a/lib/models/CourseMember.class.php b/lib/models/CourseMember.class.php index e905d4b..e9ac194 100644 --- a/lib/models/CourseMember.class.php +++ b/lib/models/CourseMember.class.php @@ -52,7 +52,7 @@ class CourseMember extends SimpleORMap implements PrivacyObject $config['has_many']['datafields'] = [ 'class_name' => DatafieldEntryModel::class, 'assoc_foreign_key' => - function($model, $params) { + function ($model, $params) { list($sec_range_id, $range_id) = (array)$params[0]->getId(); $model->setValue('range_id', $range_id); $model->setValue('sec_range_id', $sec_range_id); @@ -61,7 +61,7 @@ class CourseMember extends SimpleORMap implements PrivacyObject 'on_delete' => 'delete', 'on_store' => 'store', 'foreign_key' => - function($course_member) { + function ($course_member) { return [$course_member]; } ]; @@ -206,7 +206,8 @@ class CourseMember extends SimpleORMap implements PrivacyObject */ public static function getMemberByIdentification(string $course_id, string $nachname, string $vorname = null): array { - return DBManager::get()->fetchAll("SELECT + return DBManager::get()->fetchAll( + "SELECT auth_user_md5.user_id, auth_user_md5.username, auth_user_md5.perms, @@ -219,7 +220,8 @@ class CourseMember extends SimpleORMap implements PrivacyObject AND auth_user_md5.visible <> 'never' AND auth_user_md5.Nachname LIKE ? AND (? IS NULL OR auth_user_md5.Vorname LIKE ?) ORDER BY auth_user_md5.Nachname, auth_user_md5.Vorname", - [$course_id, $nachname, $vorname, $vorname]); + [$course_id, $nachname, $vorname, $vorname] + ); } /** @@ -276,7 +278,7 @@ class CourseMember extends SimpleORMap implements PrivacyObject * @param string $datafield_id * @return Array */ - public static function getMemberByDatafield(string $course_id, string $nachname, string $datafield_id): array + public static function getMemberByDatafield(string $course_id, string $nachname, string $datafield_id): array { // TODO Fullname return DBManager::get()->fetchAll( diff --git a/lib/models/CourseTopic.class.php b/lib/models/CourseTopic.class.php index 56a060d..026cc53 100644 --- a/lib/models/CourseTopic.class.php +++ b/lib/models/CourseTopic.class.php @@ -63,7 +63,8 @@ class CourseTopic extends SimpleORMap public static function findByTermin_id($termin_id) { - return self::findBySQL("INNER JOIN themen_termine USING (issue_id) + return self::findBySQL( + "INNER JOIN themen_termine USING (issue_id) WHERE themen_termine.termin_id = ? ORDER BY priority ASC", [$termin_id] @@ -117,7 +118,7 @@ class CourseTopic extends SimpleORMap { if ($this->seminar_id) { $forum_module = Seminar::getInstance($this->seminar_id)->getSlotModule('forum'); - if ($forum_module instanceOf ForumModule) { + if ($forum_module instanceof ForumModule) { $forum_module->setThreadForIssue($this->id, $this->title, $this->description); return true; } @@ -129,7 +130,7 @@ class CourseTopic extends SimpleORMap { if ($this->seminar_id) { $forum_module = Seminar::getInstance($this->seminar_id)->getSlotModule('forum'); - if ($forum_module instanceOf ForumModule) { + if ($forum_module instanceof ForumModule) { return html_entity_decode($forum_module->getLinkToThread($this->id)); } } diff --git a/lib/models/CourseWizardStepRegistry.php b/lib/models/CourseWizardStepRegistry.php index 4f9eb6fc..5630832 100644 --- a/lib/models/CourseWizardStepRegistry.php +++ b/lib/models/CourseWizardStepRegistry.php @@ -16,7 +16,6 @@ class CourseWizardStepRegistry extends SimpleORMap { - protected static function configure($config = []) { $config['db_table'] = 'coursewizardsteps'; @@ -36,8 +35,7 @@ class CourseWizardStepRegistry extends SimpleORMap public static function unregisterStep($id) { $step = self::find($id); - if ($step) - { + if ($step) { return $step->delete(); } return true; @@ -48,4 +46,4 @@ class CourseWizardStepRegistry extends SimpleORMap return sizeof(self::findBySQL("`enabled`=1")) > 0 ? true : false; } -}
\ No newline at end of file +} diff --git a/lib/models/Courseware/BlockTypes/BlockType.php b/lib/models/Courseware/BlockTypes/BlockType.php index 13364d5..2ad04ae 100644 --- a/lib/models/Courseware/BlockTypes/BlockType.php +++ b/lib/models/Courseware/BlockTypes/BlockType.php @@ -116,9 +116,9 @@ abstract class BlockType ]; // try { - foreach (\PluginEngine::getPlugins(CoursewarePlugin::class) as $plugin) { - $blockTypes = $plugin->registerBlockTypes($blockTypes); - } + foreach (\PluginEngine::getPlugins(CoursewarePlugin::class) as $plugin) { + $blockTypes = $plugin->registerBlockTypes($blockTypes); + } // } catch (\Exception $e) { // // there is nothing we can do here other than absorbing exceptions // } diff --git a/lib/models/Courseware/BlockTypes/Folder.php b/lib/models/Courseware/BlockTypes/Folder.php index b3a0767..4d88e06 100644 --- a/lib/models/Courseware/BlockTypes/Folder.php +++ b/lib/models/Courseware/BlockTypes/Folder.php @@ -73,7 +73,7 @@ class Folder extends BlockType $file['meta'] = [ 'download-url' => $folderFile->getDownloadURL(), ]; - + if ($this->filePermission($typedFolder, $file, $user)) { array_push($payload['files'], $file); } diff --git a/lib/models/Courseware/BlockTypes/Gallery.php b/lib/models/Courseware/BlockTypes/Gallery.php index 2ad19b9..70d6eec 100644 --- a/lib/models/Courseware/BlockTypes/Gallery.php +++ b/lib/models/Courseware/BlockTypes/Gallery.php @@ -70,7 +70,7 @@ class Gallery extends BlockType $file['meta'] = [ 'download-url' => $folderFile->getDownloadURL(), ]; - + if ($this->filePermission($typedFolder, $file, $user) && $fileRef->isImage()) { array_push($payload['files'], $file); } diff --git a/lib/models/Courseware/BlockTypes/Text.php b/lib/models/Courseware/BlockTypes/Text.php index 4bccd88..9e7c07d 100644 --- a/lib/models/Courseware/BlockTypes/Text.php +++ b/lib/models/Courseware/BlockTypes/Text.php @@ -3,6 +3,7 @@ namespace Courseware\BlockTypes; use Opis\JsonSchema\Schema; + require_once 'lib/classes/Markup.class.php'; /** diff --git a/lib/models/Courseware/Certificate.php b/lib/models/Courseware/Certificate.php index d0c9fd9..2cdf726 100644 --- a/lib/models/Courseware/Certificate.php +++ b/lib/models/Courseware/Certificate.php @@ -2,7 +2,8 @@ namespace Courseware; -use \User, \Course; +use User; +use Course; /** * Courseware's certificates. diff --git a/lib/models/Courseware/Instance.php b/lib/models/Courseware/Instance.php index 66c024c..1c2b3a0 100644 --- a/lib/models/Courseware/Instance.php +++ b/lib/models/Courseware/Instance.php @@ -237,8 +237,8 @@ class Instance $this->unit->config['sequential_progression'] = $isSequentialProgression ? 1 : 0; } - const EDITING_PERMISSION_DOZENT = 'dozent'; - const EDITING_PERMISSION_TUTOR = 'tutor'; + public const EDITING_PERMISSION_DOZENT = 'dozent'; + public const EDITING_PERMISSION_TUTOR = 'tutor'; /** * Returns the level needed to edit this courseware instance. diff --git a/lib/models/Courseware/StructuralElement.php b/lib/models/Courseware/StructuralElement.php index 3cfca28..72fa2fe 100644 --- a/lib/models/Courseware/StructuralElement.php +++ b/lib/models/Courseware/StructuralElement.php @@ -867,7 +867,7 @@ SQL; return $element; } - private function copyImage(User $user, StructuralElement $parent) : ?string + private function copyImage(User $user, StructuralElement $parent): ?string { $file_ref_id = null; diff --git a/lib/models/Courseware/Template.php b/lib/models/Courseware/Template.php index 8161d98..146050a 100644 --- a/lib/models/Courseware/Template.php +++ b/lib/models/Courseware/Template.php @@ -25,4 +25,4 @@ class Template extends \SimpleORMap parent::configure($config); } -}
\ No newline at end of file +} diff --git a/lib/models/Courseware/Unit.php b/lib/models/Courseware/Unit.php index 5c470c9..c6e113c 100644 --- a/lib/models/Courseware/Unit.php +++ b/lib/models/Courseware/Unit.php @@ -79,7 +79,8 @@ class Unit extends \SimpleORMap public function canEdit(\User $user): bool { - return $this->structural_element->canEdit($user);; + return $this->structural_element->canEdit($user); + ; } public function copy(\User $user, string $rangeId, string $rangeType, array $modified = null): Unit diff --git a/lib/models/CronjobLog.class.php b/lib/models/CronjobLog.class.php index 942bf6a..da14bd5 100644 --- a/lib/models/CronjobLog.class.php +++ b/lib/models/CronjobLog.class.php @@ -1,4 +1,5 @@ <?php + // +---------------------------------------------------------------------------+ // This file is part of Stud.IP // CronjobLog.class.php diff --git a/lib/models/CronjobSchedule.class.php b/lib/models/CronjobSchedule.class.php index 028eed7..c8167fb 100644 --- a/lib/models/CronjobSchedule.class.php +++ b/lib/models/CronjobSchedule.class.php @@ -1,4 +1,5 @@ <?php + // +---------------------------------------------------------------------------+ // This file is part of Stud.IP // CronjobSchedule.class.php @@ -53,9 +54,9 @@ class CronjobSchedule extends SimpleORMap { - const PRIORITY_LOW = 'low'; - const PRIORITY_NORMAL = 'normal'; - const PRIORITY_HIGH = 'high'; + public const PRIORITY_LOW = 'low'; + public const PRIORITY_NORMAL = 'normal'; + public const PRIORITY_HIGH = 'high'; protected static function configure($config = []) { diff --git a/lib/models/CronjobTask.class.php b/lib/models/CronjobTask.class.php index 5b5350f..e42a1c7 100644 --- a/lib/models/CronjobTask.class.php +++ b/lib/models/CronjobTask.class.php @@ -1,4 +1,5 @@ <?php + // +---------------------------------------------------------------------------+ // This file is part of Stud.IP // CronjobSchedule.class.php @@ -110,7 +111,7 @@ class CronjobTask extends SimpleORMap $parameters ); - $task = new $this->class; + $task = new $this->class(); $task->setUp(); $result = $task->execute($last_result, $parameters); @@ -164,9 +165,11 @@ class CronjobTask extends SimpleORMap * @param Array $parameters Optional parameters passed to the task * @return CronjobSchedule The generated schedule object. */ - public function scheduleOnce($timestamp, $priority = CronjobSchedule::PRIORITY_NORMAL, - $parameters = []) - { + public function scheduleOnce( + $timestamp, + $priority = CronjobSchedule::PRIORITY_NORMAL, + $parameters = [] + ) { return CronjobScheduler::getInstance()->scheduleOnce( $this->id, $timestamp, @@ -204,11 +207,15 @@ class CronjobTask extends SimpleORMap * @param Array $parameters Optional parameters passed to the task * @return CronjobSchedule The generated schedule object. */ - public function schedulePeriodic($minute = null, $hour = null, - $day = null, $month = null, $day_of_week = null, - $priority = CronjobSchedule::PRIORITY_NORMAL, - $parameters = []) - { + public function schedulePeriodic( + $minute = null, + $hour = null, + $day = null, + $month = null, + $day_of_week = null, + $priority = CronjobSchedule::PRIORITY_NORMAL, + $parameters = [] + ) { return CronjobScheduler::getInstance()->schedulePeriodic( $this->id, $minute, diff --git a/lib/models/DataField.class.php b/lib/models/DataField.class.php index ae7b7ac..b175522 100644 --- a/lib/models/DataField.class.php +++ b/lib/models/DataField.class.php @@ -227,8 +227,7 @@ class DataField extends SimpleORMap implements PrivacyObject // user may see his own data if this either no system field // or the user may edit the field if ($watcher && $user && $user === $watcher && - (!$this->system || $this->editAllowed($perm))) - { + (!$this->system || $this->editAllowed($perm))) { return true; } diff --git a/lib/models/DatafieldEntryModel.class.php b/lib/models/DatafieldEntryModel.class.php index e1c2406..36c294d 100644 --- a/lib/models/DatafieldEntryModel.class.php +++ b/lib/models/DatafieldEntryModel.class.php @@ -139,9 +139,9 @@ class DatafieldEntryModel extends SimpleORMap implements PrivacyObject ':object_type' => $object_type, ':object_class' => (int) $object_class ]); - } else if ($object_type === 'studycourse') { + } elseif ($object_type === 'studycourse') { $query .= " AND (LOCATE(:object_class, object_class) OR LOCATE('all', object_class)) ORDER BY priority"; - $params = array_merge($params,[ + $params = array_merge($params, [ ':range_id' => (string) $range_id, ':sec_range_id' => (string) $sec_range_id, ':object_type' => $object_type, @@ -151,7 +151,7 @@ class DatafieldEntryModel extends SimpleORMap implements PrivacyObject || $object_type === 'modulteildeskriptor') { // find datafields by language (string) $query .= " AND (LOCATE(:object_class, object_class) OR object_class IS NULL) ORDER BY priority"; - $params = array_merge($params,[ + $params = array_merge($params, [ ':range_id' => (string) $range_id, ':sec_range_id' => (string) $sec_range_id, ':object_type' => $object_type, diff --git a/lib/models/Degree.class.php b/lib/models/Degree.class.php index c5b83c5..4908992 100644 --- a/lib/models/Degree.class.php +++ b/lib/models/Degree.class.php @@ -44,9 +44,11 @@ class Degree extends SimpleORMap $sql = 'SELECT COUNT(DISTINCT `user_id`) FROM `user_studiengang`'; $parameters = [':degree_id' => $this->id]; if (!$GLOBALS['perm']->have_perm('root')) { - $inst_ids = SimpleCollection::createFromArray(Institute::findBySQL('Institut_id IN (SELECT institut_id FROM roles_user WHERE userid = :user_id) + $inst_ids = SimpleCollection::createFromArray(Institute::findBySQL( + 'Institut_id IN (SELECT institut_id FROM roles_user WHERE userid = :user_id) OR fakultaets_id IN (SELECT institut_id FROM roles_user WHERE userid = :user_id)', - [':user_id' => $GLOBALS['user']->user_id]))->pluck('institut_id'); + [':user_id' => $GLOBALS['user']->user_id] + ))->pluck('institut_id'); $sql .= 'JOIN `mvv_fach_inst` as `fach_inst` ON (`user_studiengang`.`fach_id` = `fach_inst`.`fach_id`) WHERE `user_studiengang`.`abschluss_id` = :degree_id AND `fach_inst`.`institut_id` IN (:inst_ids)'; diff --git a/lib/models/Deputy.php b/lib/models/Deputy.php index eef56d4..817843f 100644 --- a/lib/models/Deputy.php +++ b/lib/models/Deputy.php @@ -104,7 +104,8 @@ class Deputy extends SimpleORMap * @param string $range_id ID of a course or a person * @return int Number of affected rows in the database (hopefully 1). */ - public static function addDeputy($user_id, $range_id) { + public static function addDeputy($user_id, $range_id) + { if (self::exists([$range_id, $user_id])) { return true; } @@ -136,7 +137,8 @@ class Deputy extends SimpleORMap * the other person's profile * @return boolean Is the given person deputy in the given context? */ - public static function isDeputy(string $user_id, string $range_id, bool $check_edit_about=false) { + public static function isDeputy(string $user_id, string $range_id, bool $check_edit_about=false) + { $d = self::find([$range_id, $user_id]); if (!$d) { return false; @@ -163,7 +165,8 @@ class Deputy extends SimpleORMap * * @return boolean activation status of the deputy boss profile page editing functionality. */ - public static function isEditActivated() { + public static function isEditActivated() + { return self::isActivated() && Config::get()->DEPUTIES_EDIT_ABOUT_ENABLE; } @@ -210,7 +213,8 @@ class Deputy extends SimpleORMap } return SimpleCollection::createFromArray( - self::findBySQL('JOIN auth_user_md5 ON (deputies.range_id = auth_user_md5.user_id) + self::findBySQL( + 'JOIN auth_user_md5 ON (deputies.range_id = auth_user_md5.user_id) WHERE deputies.user_id = ?', [$user_id] ) @@ -247,7 +251,8 @@ class Deputy extends SimpleORMap * @return string The SQL query for getting all courses where the current * user is deputy in */ - public static function getMySeminarsQuery($type, $sem_number_sql, $sem_number_end_sql, $add_fields, $add_query, $studygroups = false) { + public static function getMySeminarsQuery($type, $sem_number_sql, $sem_number_end_sql, $add_fields, $add_query, $studygroups = false) + { global $user; switch ($type) { // My courses list @@ -283,7 +288,7 @@ class Deputy extends SimpleORMap $where .= " AND seminare.status IN ({$studygroup_types})"; } break; - // Grouping and notification settings for my courses + // Grouping and notification settings for my courses case 'gruppe': case 'notification': $fields = [ @@ -301,7 +306,7 @@ class Deputy extends SimpleORMap ]; $where = " WHERE deputies.user_id = '$user->id'"; break; - // Notification mail sending from client script + // Notification mail sending from client script case 'notification_cli': $fields = [ "aum.user_id", diff --git a/lib/models/EventData.class.php b/lib/models/EventData.class.php index e5e4140..31e58cf 100644 --- a/lib/models/EventData.class.php +++ b/lib/models/EventData.class.php @@ -51,7 +51,7 @@ class EventData extends SimpleORMap implements PrivacyObject $ret = parent::delete(); // only one calendar is left if ($ret) { - $calendars->each(function($c) { $c->delete(); }); + $calendars->each(function ($c) { $c->delete(); }); } return $ret; } @@ -72,8 +72,14 @@ class EventData extends SimpleORMap implements PrivacyObject return $this->content['start'] + 3600; } if ($field == 'ts' && $this->content['start']) { - return mktime(12, 0, 0, date('n', $this->content['start']), - date('j', $this->content['start']), date('Y', $this->content['start'])); + return mktime( + 12, + 0, + 0, + date('n', $this->content['start']), + date('j', $this->content['start']), + date('Y', $this->content['start']) + ); } return parent::getDefaultValue($field); } diff --git a/lib/models/Fach.php b/lib/models/Fach.php index cc5d914..5731959 100644 --- a/lib/models/Fach.php +++ b/lib/models/Fach.php @@ -51,19 +51,19 @@ class Fach extends ModuleManagementModelTreeItem implements PrivacyObject ]; $config['additional_fields']['count_abschluesse']['get'] = - function($fach) { return $fach->count_abschluesse; }; + function ($fach) { return $fach->count_abschluesse; }; $config['additional_fields']['count_abschluesse']['set'] = false; $config['additional_fields']['count_user']['get'] = - function($fach) { return $fach->count_user; }; + function ($fach) { return $fach->count_user; }; $config['additional_fields']['count_user']['set'] = false; $config['additional_fields']['count_sem']['get'] = - function($fach) { return $fach->count_sem; }; + function ($fach) { return $fach->count_sem; }; $config['additional_fields']['count_sem']['set'] = false; $config['additional_fields']['count_stgteile']['get'] = - function($fach) { return $fach->count_stgteile; }; + function ($fach) { return $fach->count_stgteile; }; $config['additional_fields']['count_stgteile']['set'] = false; $config['additional_fields']['count_module']['get'] = - function($fach) { return $fach->count_module; }; + function ($fach) { return $fach->count_module; }; $config['i18n_fields']['name'] = true; $config['i18n_fields']['name_kurz'] = true; @@ -101,12 +101,21 @@ class Fach extends ModuleManagementModelTreeItem implements PrivacyObject * @param int $offset The first object to return in a result set. * @return object A SimpleORMapCollection of Abschluss objects. */ - public static function getAllEnriched($sortby = 'name', $order = 'ASC', - $row_count = null, $offset = null, $filter = null) - { - $sortby = self::createSortStatement($sortby, $order, 'name', - ['count_abschluesse']); - return parent::getEnrichedByQuery(' + public static function getAllEnriched( + $sortby = 'name', + $order = 'ASC', + $row_count = null, + $offset = null, + $filter = null + ) { + $sortby = self::createSortStatement( + $sortby, + $order, + 'name', + ['count_abschluesse'] + ); + return parent::getEnrichedByQuery( + ' SELECT fach.*, COUNT(DISTINCT abschluss_id) AS `count_abschluesse` FROM fach @@ -153,16 +162,21 @@ class Fach extends ModuleManagementModelTreeItem implements PrivacyObject * @param array $filter Array of filter parameters (name of column as key, * @return object Collection of Faecher. */ - public static function getAllEnrichedByStgteile($sortby = 'name', - $order = 'ASC', $row_count = null, $offset = null, $filter = null) - { + public static function getAllEnrichedByStgteile( + $sortby = 'name', + $order = 'ASC', + $row_count = null, + $offset = null, + $filter = null + ) { $sortby = self::createSortStatement( $sortby, $order, 'name', ['count_stgteile'] ); - return parent::getEnrichedByQuery(' + return parent::getEnrichedByQuery( + ' SELECT fach.*, COUNT(stgteil_id) as `count_stgteile` FROM fach @@ -186,7 +200,8 @@ class Fach extends ModuleManagementModelTreeItem implements PrivacyObject */ public static function findByStudiengangTeil($stgteil_id) { - return parent::getEnrichedByQuery(' + return parent::getEnrichedByQuery( + ' SELECT mf.* FROM fach mf LEFT JOIN mvv_stgteil AS ms USING (fach_id) @@ -222,7 +237,8 @@ class Fach extends ModuleManagementModelTreeItem implements PrivacyObject */ public static function findByAbschluss($abschluss_id) { - return parent::getEnrichedByQuery(' + return parent::getEnrichedByQuery( + ' SELECT mf.* FROM fach mf LEFT JOIN mvv_stgteil USING (fach_id) @@ -247,7 +263,8 @@ class Fach extends ModuleManagementModelTreeItem implements PrivacyObject $has_stgteile_sql = $has_stgteile ? 'INNER JOIN mvv_stgteil USING (fach_id) ' : ''; - return parent::getEnrichedByQuery(' + return parent::getEnrichedByQuery( + ' SELECT mf.* FROM fach mf ' . $has_stgteile_sql . ' @@ -267,7 +284,8 @@ class Fach extends ModuleManagementModelTreeItem implements PrivacyObject */ public static function findPublicByModule($modul_ids) { - return parent::getEnrichedByQuery(' + return parent::getEnrichedByQuery( + ' SELECT mf.*, COUNT(DISTINCT msm.modul_id) AS count_module FROM mvv_stgteilabschnitt_modul AS msm @@ -323,16 +341,22 @@ class Fach extends ModuleManagementModelTreeItem implements PrivacyObject * @param array $filter Array of filter parameters (name of column as key, * @return object Collection of Faecher. */ - public static function findByIdsStgteile($stgteil_ids, $sortby = 'name', - $order = 'ASC', $row_count = null, $offset = null, $filter = null) - { + public static function findByIdsStgteile( + $stgteil_ids, + $sortby = 'name', + $order = 'ASC', + $row_count = null, + $offset = null, + $filter = null + ) { $sortby = self::createSortStatement( $sortby, $order, 'name', ['count_stgteile'] ); - return parent::getEnrichedByQuery(' + return parent::getEnrichedByQuery( + ' SELECT fach.*, COUNT(DISTINCT stgteil_id) as `count_stgteile` FROM fach @@ -358,7 +382,8 @@ class Fach extends ModuleManagementModelTreeItem implements PrivacyObject { $order = ($order == 'DESC' ? $order : 'ASC'); $fachbereiche = []; - $stmt = DBManager::get()->prepare(' + $stmt = DBManager::get()->prepare( + ' SELECT mfi.institut_id, i.Name AS `name`, COUNT(fach_id) AS faecher FROM mvv_fach_inst AS mfi @@ -409,9 +434,10 @@ class Fach extends ModuleManagementModelTreeItem implements PrivacyObject * @param string $abschluss_id The id of the Abschluss. * @return array Found Fachbereiche as array. Empty array if none was found. */ - public static function findUsedFachbereiche($kategorie_id = null, - $abschluss_id = null) - { + public static function findUsedFachbereiche( + $kategorie_id = null, + $abschluss_id = null + ) { $fachbereiche = []; if (!is_null($kategorie_id) && is_null($abschluss_id)) { $stmt = DBManager::get()->prepare(' @@ -427,8 +453,8 @@ class Fach extends ModuleManagementModelTreeItem implements PrivacyObject GROUP BY i.Institut_id ORDER BY `name` '); $stmt->execute([$kategorie_id]); - } else if (!is_null($abschluss_id)) { - $stmt = DBManager::get()->prepare(' + } elseif (!is_null($abschluss_id)) { + $stmt = DBManager::get()->prepare(' SELECT i.Name AS `name`, i.Institut_id AS institut_id FROM mvv_fach_inst AS mfi @@ -439,7 +465,7 @@ class Fach extends ModuleManagementModelTreeItem implements PrivacyObject WHERE ms.abschluss_id = ? GROUP BY i.Institut_id ORDER BY `name` '); - $stmt->execute([$abschluss_id]); + $stmt->execute([$abschluss_id]); } else { $stmt = DBManager::get()->prepare(' SELECT i.Name AS `name`, @@ -469,13 +495,16 @@ class Fach extends ModuleManagementModelTreeItem implements PrivacyObject * see ModulManagementModel::getFilterSql()). * @return array Associative array of Fachbereiche (id as key). */ - public static function getAllFachbereiche($sortby = 'name', $order = 'ASC', - $filter = null) - { + public static function getAllFachbereiche( + $sortby = 'name', + $order = 'ASC', + $filter = null + ) { $sortby = ($sortby == 'name' ? 'name' : 'faecher'); $order = ($order == 'ASC' ? 'ASC' : 'DESC'); $fachbereiche = []; - $stmt = DBManager::get()->prepare(' + $stmt = DBManager::get()->prepare( + ' SELECT Institute.Name AS `name`, Institute.Institut_id AS `institut_id`, COUNT(DISTINCT fach_id) AS `faecher` @@ -691,8 +720,10 @@ class Fach extends ModuleManagementModelTreeItem implements PrivacyObject $existing = $this->findBySql('name = ' . DBManager::get()->quote($this->name)); if (sizeof($existing)) { $ret['name'] = true; - $messages[] = sprintf(_('Es existiert bereits ein Fach mit dem Namen "%s"!'), - $this->name); + $messages[] = sprintf( + _('Es existiert bereits ein Fach mit dem Namen "%s"!'), + $this->name + ); $rejected = true; } } diff --git a/lib/models/FachFachbereich.php b/lib/models/FachFachbereich.php index 0de4454..c392b5a 100644 --- a/lib/models/FachFachbereich.php +++ b/lib/models/FachFachbereich.php @@ -49,8 +49,7 @@ class FachFachbereich extends ModuleManagementModel $ret = []; $fach_insts = parent::getEnrichedByQuery('SELECT mfi.* ' . 'FROM mvv_fach_inst mfi ' - . 'WHERE mfi.fach_id = ? ' - , $params); + . 'WHERE mfi.fach_id = ? ', $params); foreach ($fach_insts as $fach_inst) { $ret[$fach_inst->institut_id] = $fach_inst; } diff --git a/lib/models/Fachbereich.php b/lib/models/Fachbereich.php index 19b88a4..e89485b 100644 --- a/lib/models/Fachbereich.php +++ b/lib/models/Fachbereich.php @@ -21,9 +21,9 @@ class Fachbereich extends ModuleManagementModelTreeItem $config['db_table'] = 'Institute'; $config['additional_fields']['count_objects']['get'] = - function($fb) { return $fb->count_objects; }; + function ($fb) { return $fb->count_objects; }; $config['additional_fields']['count_module']['get'] = - function($fb) { return $fb->count_module; }; + function ($fb) { return $fb->count_module; }; $config['i18n_fields']['name'] = true; @@ -219,8 +219,9 @@ class Fachbereich extends ModuleManagementModelTreeItem . 'WHERE fak.Institut_id = fak.fakultaets_id ' . 'AND fak.Institut_id = inst.fakultaets_id ' . parent::getFilterSql( - ['mvv_studiengang.studiengang_id' - => $studiengang_ids]) + ['mvv_studiengang.studiengang_id' + => $studiengang_ids] + ) . 'GROUP BY inst.Institut_id ' . 'ORDER BY is_fak DESC, fak_name ASC, inst_name ASC'); } @@ -233,11 +234,17 @@ class Fachbereich extends ModuleManagementModelTreeItem * @param string $order The direction of sorting. * @return Object SimplORMapCollection of all Fachbereiche */ - public static function getFachbereiche($sortby = 'name', $order = 'ASC', - $filter = null) - { - $sortby = self::createSortStatement($sortby, $order, 'name', - words('name count_objects')); + public static function getFachbereiche( + $sortby = 'name', + $order = 'ASC', + $filter = null + ) { + $sortby = self::createSortStatement( + $sortby, + $order, + 'name', + words('name count_objects') + ); return Fachbereich::getEnrichedByQuery('SELECT Institute.*, ' . 'COUNT(DISTINCT studiengang_id) AS count_objects ' . 'FROM mvv_stg_stgteil ' diff --git a/lib/models/File.php b/lib/models/File.php index 16c81ef..eb1c4d5 100644 --- a/lib/models/File.php +++ b/lib/models/File.php @@ -106,7 +106,7 @@ class File extends SimpleORMap if (!@move_uploaded_file($path_to_file, $newpath)) { return false; } - } else if (!@copy($path_to_file, $newpath)) { + } elseif (!@copy($path_to_file, $newpath)) { return false; } $this->size = filesize($newpath); diff --git a/lib/models/FileRef.php b/lib/models/FileRef.php index f440d50..4c2dae3 100644 --- a/lib/models/FileRef.php +++ b/lib/models/FileRef.php @@ -124,7 +124,8 @@ class FileRef extends SimpleORMap implements PrivacyObject, FeedbackRange * If you set download URL to null, the normal sendfile.php will be set as default download URL. * @param $url : string as URL or null to set URL to sendfile.php-URL */ - public function setDownloadURL($field, $url) { + public function setDownloadURL($field, $url) + { $this->download_url = $url; } @@ -167,7 +168,7 @@ class FileRef extends SimpleORMap implements PrivacyObject, FeedbackRange $link[] = 'sendfile.php'; if ($dltype == 'zip') { $params['zip'] = 1; - } elseif (in_array($dltype, ['force_download', 'force'])) { + } elseif (in_array($dltype, ['force_download', 'force'])) { $params['force_download'] = 1; } $params['type'] = $type; @@ -193,7 +194,7 @@ class FileRef extends SimpleORMap implements PrivacyObject, FeedbackRange /** * Returns true if the file is accessible */ - public function getAccessibility() : bool + public function getAccessibility(): bool { return (bool) $this->file->is_accessible; } @@ -207,7 +208,7 @@ class FileRef extends SimpleORMap implements PrivacyObject, FeedbackRange { $this->downloads += 1; if (!$this->isNew()) { - $where_query = join(' AND ' , $this->getWhereQuery()); + $where_query = join(' AND ', $this->getWhereQuery()); $query = "UPDATE `{$this->db_table()}` SET `downloads` = `downloads` + 1 WHERE {$where_query}"; diff --git a/lib/models/Folder.php b/lib/models/Folder.php index d1d778a..6385fed 100644 --- a/lib/models/Folder.php +++ b/lib/models/Folder.php @@ -283,7 +283,7 @@ class Folder extends SimpleORMap implements FeedbackRange 'id' => $this->id, ]); - $found_folders = Folder::countBySql("name = :file_name AND parent_id= :id",[ + $found_folders = Folder::countBySql("name = :file_name AND parent_id= :id", [ 'file_name' => $file_name, 'id' => $this->id, ]); diff --git a/lib/models/Freetext.php b/lib/models/Freetext.php index 4922030..673270a 100644 --- a/lib/models/Freetext.php +++ b/lib/models/Freetext.php @@ -9,7 +9,7 @@ class Freetext extends QuestionnaireQuestion implements QuestionType * @param bool $active: true if Icon should be clickable, false for black info-icon. * @return Icon : guestbook-icon. */ - public static function getIcon(bool $active = false) : Icon + public static function getIcon(bool $active = false): Icon { return Icon::create( static::getIconShape(), @@ -35,7 +35,7 @@ class Freetext extends QuestionnaireQuestion implements QuestionType return _('Freitextfrage'); } - static public function getEditingComponent() + public static function getEditingComponent() { return ['freetext-edit', '']; } diff --git a/lib/models/Grading/Definition.php b/lib/models/Grading/Definition.php index ed6df55..8f4e876 100644 --- a/lib/models/Grading/Definition.php +++ b/lib/models/Grading/Definition.php @@ -4,7 +4,7 @@ namespace Grading; class Definition extends \SimpleORMap { - const CUSTOM_DEFINITIONS_CATEGORY = 'xyzzy'; + public const CUSTOM_DEFINITIONS_CATEGORY = 'xyzzy'; protected static function configure($config = []) { diff --git a/lib/models/HelpContent.class.php b/lib/models/HelpContent.class.php index b254e21..be97c28 100644 --- a/lib/models/HelpContent.class.php +++ b/lib/models/HelpContent.class.php @@ -1,4 +1,5 @@ <?php + // +---------------------------------------------------------------------------+ // This file is part of Stud.IP // @@ -85,9 +86,11 @@ class HelpContent extends SimpleORMap $statement = DBManager::get()->prepare($query); $statement->execute([$route, $language]); $ret = $statement->fetchGrouped(PDO::FETCH_ASSOC); - foreach ($ret as $index => $data) - if (! match_route($data['route'], $route)) + foreach ($ret as $index => $data) { + if (! match_route($data['route'], $route)) { unset($ret[$index]); + } + } return $ret; } @@ -172,8 +175,8 @@ class HelpContent extends SimpleORMap public static function GetContentObjects($content_result) { $objects = []; - if (is_array($content_result)){ - foreach($content_result as $id => $result){ + if (is_array($content_result)) { + foreach($content_result as $id => $result) { $objects[$id] = new HelpContent(); $objects[$id]->setData($result, true); $objects[$id]->setNew(false); diff --git a/lib/models/HelpTour.class.php b/lib/models/HelpTour.class.php index 18ed68e..fcfe0cd 100644 --- a/lib/models/HelpTour.class.php +++ b/lib/models/HelpTour.class.php @@ -1,4 +1,5 @@ <?php + // +---------------------------------------------------------------------------+ // This file is part of Stud.IP // @@ -118,8 +119,7 @@ class HelpTour extends SimpleORMap //if there is an active tour, initialize it if (isset($_SESSION['active_tour']['tour_id']) && ($_SESSION['active_tour']['last_route'] === $route - || $_SESSION['active_tour']['next_route'] === $route)) - { + || $_SESSION['active_tour']['next_route'] === $route)) { $active_tour = new HelpTour($_SESSION['active_tour']['tour_id']); $step_nr = $_SESSION['active_tour']['step_nr']; if ($_SESSION['active_tour']['last_route'] !== $route && $_SESSION['active_tour']['next_route'] === $route) { @@ -238,8 +238,8 @@ class HelpTour extends SimpleORMap public static function GetTourObjects($tour_result) { $objects = []; - if (is_array($tour_result)){ - foreach($tour_result as $id => $result){ + if (is_array($tour_result)) { + foreach($tour_result as $id => $result) { $objects[$id] = new HelpTour(); $objects[$id]->setData($result, true); $objects[$id]->setNew(false); @@ -275,23 +275,23 @@ class HelpTour extends SimpleORMap case 'inst': $table_name = 'user_inst'; $field_name = 'Institut_id'; - break; + break; case 'sem': $table_name = 'seminar_user'; $field_name = 'Seminar_id'; - break; + break; case 'studiengang': $table_name = 'user_studiengang'; $field_name = 'fach_id'; - break; + break; case 'abschluss': $table_name = 'user_studiengang'; $field_name = 'abschluss_id'; - break; + break; case 'userdomain': $table_name = 'user_userdomains'; $field_name = 'userdomain_id'; - break; + break; } if ($audience->range_id && $table_name) { $query = "SELECT * diff --git a/lib/models/HelpTourAudience.class.php b/lib/models/HelpTourAudience.class.php index 0d6e8c2..64bc10d 100644 --- a/lib/models/HelpTourAudience.class.php +++ b/lib/models/HelpTourAudience.class.php @@ -1,4 +1,5 @@ <?php + // +---------------------------------------------------------------------------+ // This file is part of Stud.IP // @@ -29,7 +30,7 @@ * @author Arne Schröder <schroeder@data-quest> * @license http://www.gnu.org/licenses/gpl-2.0.html GPL version 2 * @category Stud.IP - * + * * @property string tour_id database column * @property string range_id database column * @property string type database column @@ -40,7 +41,7 @@ class HelpTourAudience extends SimpleORMap protected static function configure($config = []) { $config['db_table'] = 'help_tour_audiences'; - + parent::configure($config); } } diff --git a/lib/models/HelpTourSettings.class.php b/lib/models/HelpTourSettings.class.php index 7392c56..0569093 100644 --- a/lib/models/HelpTourSettings.class.php +++ b/lib/models/HelpTourSettings.class.php @@ -1,4 +1,5 @@ <?php + // +---------------------------------------------------------------------------+ // This file is part of Stud.IP // @@ -29,7 +30,7 @@ * @author Arne Schröder <schroeder@data-quest> * @license http://www.gnu.org/licenses/gpl-2.0.html GPL version 2 * @category Stud.IP - * + * * @property string tour_id database column * @property string id alias column for tour_id * @property string active database column @@ -40,7 +41,7 @@ class HelpTourSettings extends SimpleORMap protected static function configure($config = []) { $config['db_table'] = 'help_tour_settings'; - + parent::configure($config); } } diff --git a/lib/models/HelpTourStep.class.php b/lib/models/HelpTourStep.class.php index d2ce1dc..6c3c572 100644 --- a/lib/models/HelpTourStep.class.php +++ b/lib/models/HelpTourStep.class.php @@ -1,4 +1,5 @@ <?php + // +---------------------------------------------------------------------------+ // This file is part of Stud.IP // @@ -88,9 +89,11 @@ class HelpTourStep extends SimpleORMap * @todo Das Model sollte nix über PageLayout wissen, das sollte anders raus transportiert werden * @return boolean true or false */ - public function validate() { - if (!$this->orientation) + public function validate() + { + if (!$this->orientation) { $this->orientation = 'B'; + } if (!$this->title && !$this->tip) { PageLayout::postMessage(MessageBox::error(_('Der Schritt muss einen Titel oder Inhalt besitzen.'))); return false; @@ -102,4 +105,3 @@ class HelpTourStep extends SimpleORMap return true; } } - diff --git a/lib/models/HelpTourUser.class.php b/lib/models/HelpTourUser.class.php index 49b1647..787bf15 100644 --- a/lib/models/HelpTourUser.class.php +++ b/lib/models/HelpTourUser.class.php @@ -1,4 +1,5 @@ <?php + // +---------------------------------------------------------------------------+ // This file is part of Stud.IP // diff --git a/lib/models/Institute.class.php b/lib/models/Institute.class.php index 9e662cc..fad66dc 100644 --- a/lib/models/Institute.class.php +++ b/lib/models/Institute.class.php @@ -67,14 +67,14 @@ class Institute extends SimpleORMap implements Range $config['has_many']['datafields'] = [ 'class_name' => DatafieldEntryModel::class, 'assoc_foreign_key' => - function($model,$params) { + function ($model, $params) { $model->setValue('range_id', $params[0]->id); }, 'assoc_func' => 'findByModel', 'on_delete' => 'delete', 'on_store' => 'store', 'foreign_key' => - function($i) { + function ($i) { return [$i]; } ]; @@ -174,7 +174,7 @@ class Institute extends SimpleORMap implements Range * * @return array */ - public static function getMyInstitutes($user_id = NULL) + public static function getMyInstitutes($user_id = null) { global $perm, $user; if (!$user_id) { @@ -188,7 +188,7 @@ class Institute extends SimpleORMap implements Range "WHERE (user_id = ".$db->quote($user_id)." " . "AND (inst_perms = 'dozent' OR inst_perms = 'tutor')) " . "ORDER BY Institute.Name ASC")->fetchAll(PDO::FETCH_ASSOC); - } else if (!$perm->have_perm("root", $user_id)) { + } elseif (!$perm->have_perm("root", $user_id)) { $result = $db->query("SELECT user_inst.Institut_id, Institute.Name, Institute.fakultaets_id, IF(user_inst.Institut_id=Institute.fakultaets_id,1,0) AS is_fak, user_inst.inst_perms " . "FROM user_inst " . "LEFT JOIN Institute USING (institut_id) " . @@ -229,7 +229,7 @@ class Institute extends SimpleORMap implements Range { $template['type-name'] = '%2$s: %1$s'; if ($format === 'default' || !isset($template[$format])) { - $format = 'type-name'; + $format = 'type-name'; } $type = $GLOBALS['INST_TYPE'][$this['type']]['name']; if (!$type) { @@ -320,11 +320,11 @@ class Institute extends SimpleORMap implements Range */ public function setDefaultTools() { - $this->tools = []; - foreach (array_values($this->getSemClass()->getActivatedModuleObjects()) as $module) { - PluginManager::getInstance()->setPluginActivated($module->getPluginId(), $this->id, true); - $this->tools[] = ToolActivation::find([$this->id, $module->getPluginId()]); - } + $this->tools = []; + foreach (array_values($this->getSemClass()->getActivatedModuleObjects()) as $module) { + PluginManager::getInstance()->setPluginActivated($module->getPluginId(), $this->id, true); + $this->tools[] = ToolActivation::find([$this->id, $module->getPluginId()]); + } } /** @@ -350,7 +350,7 @@ class Institute extends SimpleORMap implements Range /** * @see Range::__toString() */ - public function __toString() : string + public function __toString(): string { return $this->getFullName(); } diff --git a/lib/models/InstituteMember.class.php b/lib/models/InstituteMember.class.php index a501c61..7ab3154 100644 --- a/lib/models/InstituteMember.class.php +++ b/lib/models/InstituteMember.class.php @@ -51,7 +51,7 @@ class InstituteMember extends SimpleORMap implements PrivacyObject $config['has_many']['datafields'] = [ 'class_name' => DatafieldEntryModel::class, 'assoc_foreign_key' => - function($model, $params) { + function ($model, $params) { $model->setValue('range_id', $params[0]->user_id); $model->setValue('sec_range_id', $params[0]->institut_id); }, @@ -59,7 +59,7 @@ class InstituteMember extends SimpleORMap implements PrivacyObject 'on_delete' => 'delete', 'on_store' => 'store', 'foreign_key' => - function($institute_member) { + function ($institute_member) { return [$institute_member]; } ]; diff --git a/lib/models/LikertScale.php b/lib/models/LikertScale.php index 5e55e3c..df385f7 100644 --- a/lib/models/LikertScale.php +++ b/lib/models/LikertScale.php @@ -1,9 +1,10 @@ <?php + require_once 'lib/classes/QuestionType.interface.php'; class LikertScale extends QuestionnaireQuestion implements QuestionType { - public static function getIcon(bool $active = false) : Icon + public static function getIcon(bool $active = false): Icon { return Icon::create(static::getIconShape(), $active ? 'clickable' : 'info'); } @@ -22,7 +23,7 @@ class LikertScale extends QuestionnaireQuestion implements QuestionType return _('Likert-Skala'); } - static public function getEditingComponent() + public static function getEditingComponent() { return ['likert-edit', '']; } diff --git a/lib/models/LockRule.class.php b/lib/models/LockRule.class.php index 3f07a10..461686a 100644 --- a/lib/models/LockRule.class.php +++ b/lib/models/LockRule.class.php @@ -50,7 +50,7 @@ class LockRule extends SimpleORMap * @param string $seminar_id id of a course * @return LockRule */ - static function findBySeminar($seminar_id) + public static function findBySeminar($seminar_id) { $db = DBManager::get(); $lock_rule_id = $db->query("SELECT lock_rule FROM seminare WHERE seminar_id = " . $db->quote($seminar_id)) @@ -64,7 +64,7 @@ class LockRule extends SimpleORMap * @param string $institute_id id of an institute * @return LockRule */ - static function findByInstitute($institute_id) + public static function findByInstitute($institute_id) { $db = DBManager::get(); $lock_rule_id = $db->query("SELECT lock_rule FROM Institute WHERE Institut_id = " . $db->quote($institute_id)) @@ -78,7 +78,7 @@ class LockRule extends SimpleORMap * @param string $user_id id of a user * @return LockRule */ - static function findByUser($user_id) + public static function findByUser($user_id) { $db = DBManager::get(); $lock_rule_id = $db->query("SELECT lock_rule FROM user_info WHERE user_id = " . $db->quote($user_id)) @@ -92,14 +92,14 @@ class LockRule extends SimpleORMap * @param string $type entity type, one of [sem,inst,user] * @return array of LockRule objects */ - static function findAllByType($type) + public static function findAllByType($type) { return self::findByObject_type($type, " ORDER BY name"); } /** * @see SimpleORMap::delete() */ - function delete() + public function delete() { $id = $this->getId(); $object_type = $this->object_type; @@ -118,7 +118,7 @@ class LockRule extends SimpleORMap * * @return integer */ - function getUsage() + public function getUsage() { if (!$this->isNew()) { $db = DBManager::get(); diff --git a/lib/models/LogEvent.php b/lib/models/LogEvent.php index 7205dba..8c42ee7 100644 --- a/lib/models/LogEvent.php +++ b/lib/models/LogEvent.php @@ -196,12 +196,16 @@ class LogEvent extends SimpleORMap implements PrivacyObject if (!$course) { return $this->$field; } - return sprintf('<a href="%s">%s %s (%s)</a>', - URLHelper::getLink('dispatch.php/course/details', - ['sem_id' => $course->getId()]), - htmlReady($course->VeranstaltungsNummer), - htmlReady(my_substr($course->name, 0, 100)), - htmlReady($course->start_semester->name)); + return sprintf( + '<a href="%s">%s %s (%s)</a>', + URLHelper::getLink( + 'dispatch.php/course/details', + ['sem_id' => $course->getId()] + ), + htmlReady($course->VeranstaltungsNummer), + htmlReady(my_substr($course->name, 0, 100)), + htmlReady($course->start_semester->name) + ); } /** @@ -219,10 +223,14 @@ class LogEvent extends SimpleORMap implements PrivacyObject return $this->$field; } - return sprintf('<a href="%s">%s</a>', - URLHelper::getLink('dispatch.php/institute/overview', - ['auswahl' => $institute->getId()]), - htmlReady(my_substr($institute->name, 0, 100))); + return sprintf( + '<a href="%s">%s</a>', + URLHelper::getLink( + 'dispatch.php/institute/overview', + ['auswahl' => $institute->getId()] + ), + htmlReady(my_substr($institute->name, 0, 100)) + ); } /** @@ -249,7 +257,8 @@ class LogEvent extends SimpleORMap implements PrivacyObject * @param string $field The name of the table field. * @return string The singledate. */ - protected function formatSingledate($field) { + protected function formatSingledate($field) + { $termin = new SingleDate($this->$field); return '<em>' . $termin->toString() . '</em>'; } @@ -261,7 +270,8 @@ class LogEvent extends SimpleORMap implements PrivacyObject * @param string $field The name of the table field. * @return string The name of plugin or the id. */ - protected function formatPlugin($field) { + protected function formatPlugin($field) + { $plugin_manager = PluginManager::getInstance(); $plugin_info = $plugin_manager->getPluginInfoById($this->$field); @@ -275,7 +285,8 @@ class LogEvent extends SimpleORMap implements PrivacyObject * @param string $field The name of the table field. * @return string The name of semester or the id. */ - protected function formatSemester($field) { + protected function formatSemester($field) + { $all_semester = Semester::findAllVisible(false); foreach ($all_semester as $val) { if (!empty($val['beginn']) && ($val['beginn'] == $this->$field)) { diff --git a/lib/models/Lvgruppe.php b/lib/models/Lvgruppe.php index 3355f77..02684f4 100644 --- a/lib/models/Lvgruppe.php +++ b/lib/models/Lvgruppe.php @@ -40,16 +40,16 @@ class Lvgruppe extends ModuleManagementModelTreeItem ]; $config['additional_fields']['count_seminare']['get'] = - function($lvgruppe) { return $lvgruppe->count_seminare; }; + function ($lvgruppe) { return $lvgruppe->count_seminare; }; $config['additional_fields']['count_seminare']['set'] = false; $config['additional_fields']['count_archiv']['get'] = - function($lvgruppe) { return $lvgruppe->count_archiv; }; + function ($lvgruppe) { return $lvgruppe->count_archiv; }; $config['additional_fields']['count_archiv']['set'] = false; $config['additional_fields']['count_modulteile']['get'] = - function($lvgruppe) { return $lvgruppe->count_modulteile; }; + function ($lvgruppe) { return $lvgruppe->count_modulteile; }; $config['additional_fields']['count_modulteile']['set'] = false; $config['additional_fields']['count_semester']['get'] = - function($lvgruppe) { return $lvgruppe->count_semester; }; + function ($lvgruppe) { return $lvgruppe->count_semester; }; $config['additional_fields']['count_semester']['set'] = false; $config['i18n_fields']['alttext'] = true; @@ -91,12 +91,20 @@ class Lvgruppe extends ModuleManagementModelTreeItem * assigned to courses span the semesters time range. * @return object A SimpleORMapCollection of Abschluss objects. */ - public static function getAllEnriched($sortby = 'name', $order = 'ASC', - $filter = null, $row_count = null, $offset = null, - $semester_id = null) - { - $sortby = self::createSortStatement($sortby, $order, 'name', - ['count_seminare', 'count_modulteile', 'count_archiv']); + public static function getAllEnriched( + $sortby = 'name', + $order = 'ASC', + $filter = null, + $row_count = null, + $offset = null, + $semester_id = null + ) { + $sortby = self::createSortStatement( + $sortby, + $order, + 'name', + ['count_seminare', 'count_modulteile', 'count_archiv'] + ); $params = []; if (!is_null($filter)) { $filter_sql = is_array($filter) @@ -180,7 +188,7 @@ class Lvgruppe extends ModuleManagementModelTreeItem $filter_sql .= ' WHERE'; } - $filter_sql = trim($filter_sql) ? $filter_sql : ' AND'; + $filter_sql = trim($filter_sql) ? $filter_sql : ' AND'; $filter_sql .= ' seminare.start_time <= :beginn ' . 'AND (semester_courses.semester_id IS NULL OR semester_courses.semester_id = :semester_id) ' . 'AND (start_sem.beginn <= :ende AND ' @@ -229,7 +237,7 @@ class Lvgruppe extends ModuleManagementModelTreeItem $term = '%' . $term . '%'; return parent::getEnrichedByQuery( - "SELECT mvv_lvgruppe.*, GROUP_CONCAT(DISTINCT mvv_modul.modul_id SEPARATOR ',') " + "SELECT mvv_lvgruppe.*, GROUP_CONCAT(DISTINCT mvv_modul.modul_id SEPARATOR ',') " . 'AS `assigned_modul_ids` ' . 'FROM mvv_lvgruppe ' . 'INNER JOIN mvv_lvgruppe_modulteil USING(lvgruppe_id) ' @@ -248,7 +256,9 @@ class Lvgruppe extends ModuleManagementModelTreeItem . 'OR mvv_modul_deskriptor.bezeichnung LIKE :search_term) ' . $filter_sql . 'GROUP BY lvgruppe_id ' - . 'ORDER BY `name`', [':search_term' => $term]); + . 'ORDER BY `name`', + [':search_term' => $term] + ); } /** @@ -289,11 +299,19 @@ class Lvgruppe extends ModuleManagementModelTreeItem * @param array $filter Array of filter. * @return array Array of found Fachbereiche. */ - public static function getAllAssignedInstitutes($sortby = 'name', - $order = 'ASC', $filter = null, $row_count = null, $offset = null) - { - $sortby = Fachbereich::createSortStatement($sortby, $order, 'name', - ['count_module']); + public static function getAllAssignedInstitutes( + $sortby = 'name', + $order = 'ASC', + $filter = null, + $row_count = null, + $offset = null + ) { + $sortby = Fachbereich::createSortStatement( + $sortby, + $order, + 'name', + ['count_module'] + ); return Fachbereich::getEnrichedByQuery('SELECT Institute.*, ' . 'Institute.Name as `name`, ' . 'Institute.Institut_id AS institut_id, ' @@ -304,8 +322,7 @@ class Lvgruppe extends ModuleManagementModelTreeItem . 'INNER JOIN Institute ' . 'ON mvv_modul_inst.institut_id = Institute.Institut_id ' . Fachbereich::getFilterSql($filter, true) - . 'GROUP BY institut_id ORDER BY ' . $sortby - , [], $row_count, $offset); + . 'GROUP BY institut_id ORDER BY ' . $sortby, [], $row_count, $offset); } /** @@ -397,7 +414,7 @@ class Lvgruppe extends ModuleManagementModelTreeItem */ public function getParents($mode = null) { - return Modulteil::findByLvgruppe($this->getId()); + return Modulteil::findByLvgruppe($this->getId()); } /** @@ -432,7 +449,7 @@ class Lvgruppe extends ModuleManagementModelTreeItem ':semester_beginn' => $semester->beginn, ':semester_ende' => $semester->ende ]); - } else if ($only_visible === true) { + } elseif ($only_visible === true) { $stmt = DBManager::get()->prepare($sql . ' AND sem.visible = 1 '); $stmt->execute([ ':id' => $this->getId(), @@ -450,7 +467,7 @@ class Lvgruppe extends ModuleManagementModelTreeItem ':semester_beginn' => $semester->beginn, ':semester_ende' => $semester->ende ]); - } else if ($user_perm == 'admin') { + } elseif ($user_perm == 'admin') { $perm_institute_ids = []; foreach (Institute::getMyInstitutes($only_visible) as $perm_institute) { $perm_institute_ids[] = $perm_institute['Institut_id']; @@ -511,10 +528,12 @@ class Lvgruppe extends ModuleManagementModelTreeItem $sem_start_times[$semester->id] = $semester->beginn; } else { $sem_start_times = SimpleORMapCollection::createFromArray( - Semester::getAll())->toGroupedArray('id', 'beginn'); + Semester::getAll() + )->toGroupedArray('id', 'beginn'); $sem_start_times = array_map( - function ($sem) { return $sem['beginn']; } - , $sem_start_times); + function ($sem) { return $sem['beginn']; }, + $sem_start_times + ); } $visible_sql = $only_visible ? ' AND visible = 1' : ''; $courses = []; @@ -533,7 +552,9 @@ class Lvgruppe extends ModuleManagementModelTreeItem $stmt->execute([$this->getId()]); $sem_ids = array_keys($sem_start_times); foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $course) { - if ($course['sem_number'] == 0) $course['sem_number'] = 1; + if ($course['sem_number'] == 0) { + $course['sem_number'] = 1; + } for ($i = $course['sem_number']; $i <= $course['sem_number_end']; $i++) { $courses[$sem_ids[$i-1]][] = $course; } @@ -606,8 +627,10 @@ class Lvgruppe extends ModuleManagementModelTreeItem $existing = $this->findBySql('name = ' . DBManager::get()->quote($this->name)); if (sizeof($existing)) { $ret['name'] = true; - $messages[] = sprintf(_('Es existiert bereits eine Lehrveranstaltungsgruppe mit dem Namen "%s"!'), - $this->name); + $messages[] = sprintf( + _('Es existiert bereits eine Lehrveranstaltungsgruppe mit dem Namen "%s"!'), + $this->name + ); $rejected = true; } } diff --git a/lib/models/MailQueueEntry.class.php b/lib/models/MailQueueEntry.class.php index 11d0a2f..b1b62a4 100644 --- a/lib/models/MailQueueEntry.class.php +++ b/lib/models/MailQueueEntry.class.php @@ -82,27 +82,29 @@ class MailQueueEntry extends SimpleORMap //The status messages will be returned $status_messages = []; - self::findEachBySQL(function ($m) use (&$status_messages) { - // Reconstruct the StudipMail object - $mail = new StudipMail($m->mail); - $status_message = sprintf( - 'sending message %1$s (sender: %2$s, %3$u recipient(s))...', - $m->message_id, - $mail->getSenderEmail(), - count($mail->getRecipients()) - ); - - $was_sent = $m->send(); - $status_message .= $was_sent ? 'DONE' : 'FAILURE'; - - if ($m->tries > 0) { - // If sending the message has failed at least once - // we add the amount of tries to the status message. - $status_message .= "(t={$m->tries})"; - } - - $status_messages[] = $status_message; - }, "tries = 0 " . + self::findEachBySQL( + function ($m) use (&$status_messages) { + // Reconstruct the StudipMail object + $mail = new StudipMail($m->mail); + $status_message = sprintf( + 'sending message %1$s (sender: %2$s, %3$u recipient(s))...', + $m->message_id, + $mail->getSenderEmail(), + count($mail->getRecipients()) + ); + + $was_sent = $m->send(); + $status_message .= $was_sent ? 'DONE' : 'FAILURE'; + + if ($m->tries > 0) { + // If sending the message has failed at least once + // we add the amount of tries to the status message. + $status_message .= "(t={$m->tries})"; + } + + $status_messages[] = $status_message; + }, + "tries = 0 " . "OR (last_try > (UNIX_TIMESTAMP() - 60 * 60) AND tries < 25) ORDER BY mkdate". ($limit > 0 ? " LIMIT ". (int) $limit : "") ); diff --git a/lib/models/Message.class.php b/lib/models/Message.class.php index 05cfc39..6dd38b3 100644 --- a/lib/models/Message.class.php +++ b/lib/models/Message.class.php @@ -158,18 +158,20 @@ class Message extends SimpleORMap implements PrivacyObject } $db = DBManager::get(); return new SimpleCollection( - $db->fetchAll($sql, - $params, - function ($data) { - $user_id = $data['user_id']; - unset($data['user_id']); - $user = User::build($data); - $ret = $user->toArray('username vorname nachname'); - $ret['fullname'] = $user->getFullname(); - $ret['user_id'] = $user_id; - return $ret; - }) - ); + $db->fetchAll( + $sql, + $params, + function ($data) { + $user_id = $data['user_id']; + unset($data['user_id']); + $user = User::build($data); + $ret = $user->toArray('username vorname nachname'); + $ret['fullname'] = $user->getFullname(); + $ret['user_id'] = $user_id; + return $ret; + } + ) + ); } public function getNumRecipients() @@ -233,14 +235,16 @@ class Message extends SimpleORMap implements PrivacyObject $sender = '____%system%____'; } $messaging = new \messaging(); - $result = $messaging->insert_message($message, - $recipients, - $sender, - time(), - $message_id = md5(uniqid('message', true)), - false, // deleted - '', // force email - $subject); + $result = $messaging->insert_message( + $message, + $recipients, + $sender, + time(), + $message_id = md5(uniqid('message', true)), + false, // deleted + '', // force email + $subject + ); return $result ? self::find($message_id) : null; } diff --git a/lib/models/Modul.php b/lib/models/Modul.php index 80e2753..ddd0367 100644 --- a/lib/models/Modul.php +++ b/lib/models/Modul.php @@ -150,7 +150,8 @@ class Modul extends ModuleManagementModelTreeItem */ public static function getEnriched($modul_id) { - $modul = parent::getEnrichedByQuery(' + $modul = parent::getEnrichedByQuery( + ' SELECT mvv_modul.*, mvv_modul_deskriptor.bezeichnung AS bezeichnung, COUNT(DISTINCT(mvv_modulteil.modulteil_id)) AS count_modulteile FROM mvv_modul @@ -187,12 +188,21 @@ class Modul extends ModuleManagementModelTreeItem * to filter the result set. * @return SimpleORMapCollection A collection of module objects. */ - public static function getAllEnriched($sortby = 'chdate', $order = 'ASC', - $row_count = null, $offset = null, $filter = null) - { - $sortby = self::createSortStatement($sortby, $order, 'bezeichnung,chdate', - words('bezeichnung count_modulteile chdate')); - return parent::getEnrichedByQuery(' + public static function getAllEnriched( + $sortby = 'chdate', + $order = 'ASC', + $row_count = null, + $offset = null, + $filter = null + ) { + $sortby = self::createSortStatement( + $sortby, + $order, + 'bezeichnung,chdate', + words('bezeichnung count_modulteile chdate') + ); + return parent::getEnrichedByQuery( + ' SELECT mvv_modul.*, mvv_modul_deskriptor.bezeichnung AS bezeichnung, COUNT(DISTINCT(mvv_modulteil.modulteil_id)) AS count_modulteile FROM mvv_modul @@ -263,7 +273,8 @@ class Modul extends ModuleManagementModelTreeItem public function getChildren() { $_SESSION['MVV/Lvgruppe/trail_parent_id'] = $this->getId(); - return Lvgruppe::getEnrichedByQuery(' + return Lvgruppe::getEnrichedByQuery( + ' SELECT ml.* FROM mvv_lvgruppe ml LEFT JOIN mvv_lvgruppe_modulteil USING (lvgruppe_id) @@ -289,7 +300,8 @@ class Modul extends ModuleManagementModelTreeItem return StgteilabschnittModul::findBySQL('modul_id = ?', [$this->id]); } - public function getDisplayName($options = self::DISPLAY_DEFAULT) { + public function getDisplayName($options = self::DISPLAY_DEFAULT) + { $options = ($options !== self::DISPLAY_DEFAULT) ? $options : self::DISPLAY_CODE; $with_code = $options & self::DISPLAY_CODE; @@ -320,11 +332,16 @@ class Modul extends ModuleManagementModelTreeItem if ($end_sem || $start_sem) { if ($end_sem) { if ($start_sem->name == $end_sem->name) { - $ret .= sprintf(_('gültig im %s'), - $start_sem->name); + $ret .= sprintf( + _('gültig im %s'), + $start_sem->name + ); } else { - $ret .= sprintf(_('gültig %s bis %s'), - $start_sem->name, $end_sem->name); + $ret .= sprintf( + _('gültig %s bis %s'), + $start_sem->name, + $end_sem->name + ); } } else { $ret .= sprintf(_('gültig ab %s'), $start_sem->name); @@ -368,7 +385,8 @@ class Modul extends ModuleManagementModelTreeItem * @param bool If true returns always a new descriptor * @return object The Deskriptor. */ - public function getDeskriptor($language = null, $force_new = false) { + public function getDeskriptor($language = null, $force_new = false) + { if (!isset($GLOBALS['MVV_MODUL_DESKRIPTOR']['SPRACHE']['values'][$language])) { $language = $this->default_language; } @@ -391,7 +409,8 @@ class Modul extends ModuleManagementModelTreeItem * @param string $institut_id The id of the institute to assign. * @return boolean True if institute was successfully assigned. */ - public function assignResponsibleInstitute($institut_id) { + public function assignResponsibleInstitute($institut_id) + { $institute = Fachbereich::find($institut_id); if (!$institute) { @@ -420,7 +439,8 @@ class Modul extends ModuleManagementModelTreeItem * * @param array $institut_ids Array of institute ids. */ - public function assignInstitutes($institut_ids) { + public function assignInstitutes($institut_ids) + { $institutes = []; foreach ($institut_ids as $pos => $institut_id) { $modul_inst = new ModulInst(); @@ -456,7 +476,8 @@ class Modul extends ModuleManagementModelTreeItem } $this->languages = SimpleORMapCollection::createFromArray( - $assigned_languages); + $assigned_languages + ); } public function getResponsibleInstitutes() @@ -550,7 +571,8 @@ class Modul extends ModuleManagementModelTreeItem public static function findBySearchTerm($term, $filter = null) { $term = '%' . $term . '%'; - return parent::getEnrichedByQuery(" + return parent::getEnrichedByQuery( + " SELECT mvv_modul.*, CONCAT(mvv_modul_deskriptor.bezeichnung, ' (', code, ')') AS name FROM mvv_modul @@ -564,7 +586,7 @@ class Modul extends ModuleManagementModelTreeItem WHERE (code LIKE :term OR mvv_modul_deskriptor.bezeichnung LIKE :term) " . self::getFilterSql($filter) . " ORDER BY name", - [':term' => $term] + [':term' => $term] ); } @@ -578,7 +600,8 @@ class Modul extends ModuleManagementModelTreeItem */ public static function findByStgteilAbschnitt($abschnitt_id, $filter) { - return parent::getEnrichedByQuery(' + return parent::getEnrichedByQuery( + ' SELECT mvv_modul.* FROM mvv_modul LEFT JOIN mvv_stgteilabschnitt_modul USING(modul_id) LEFT JOIN semester_data start_sem @@ -608,12 +631,21 @@ class Modul extends ModuleManagementModelTreeItem * @param int $offset * @return array Array of Module. */ - public static function findByInstitut($sortby = 'chdate', $order = 'ASC', - $filter = [], $row_count = null, $offset = null) - { - $sortby = self::createSortStatement($sortby, $order, 'chdate', - ['count_modulteile', 'bezeichnung']); - return parent::getEnrichedByQuery(' + public static function findByInstitut( + $sortby = 'chdate', + $order = 'ASC', + $filter = [], + $row_count = null, + $offset = null + ) { + $sortby = self::createSortStatement( + $sortby, + $order, + 'chdate', + ['count_modulteile', 'bezeichnung'] + ); + return parent::getEnrichedByQuery( + ' SELECT mvv_modul.*, mvv_modul_deskriptor.bezeichnung, COUNT(DISTINCT(mvv_modulteil.modulteil_id)) AS count_modulteile FROM mvv_modul @@ -645,7 +677,8 @@ class Modul extends ModuleManagementModelTreeItem */ public static function findByLvgruppe($lvgruppe_id) { - return parent::getEnrichedByQuery(' + return parent::getEnrichedByQuery( + ' SELECT mm.* FROM mvv_modul mm LEFT JOIN mvv_modulteil mmt USING(modul_id) @@ -663,11 +696,16 @@ class Modul extends ModuleManagementModelTreeItem * @param array $modul_ids Ids of modules. * @return object a SimpleORMapColection of institutes. */ - public static function getAssignedInstitutes($sortby = 'name', - $order = 'ASC', $modul_ids = []) - { - return self::getAllAssignedInstitutes($sortby, $order, - ['mvv_modul.modul_id' => $modul_ids]); + public static function getAssignedInstitutes( + $sortby = 'name', + $order = 'ASC', + $modul_ids = [] + ) { + return self::getAllAssignedInstitutes( + $sortby, + $order, + ['mvv_modul.modul_id' => $modul_ids] + ); } /** @@ -679,12 +717,21 @@ class Modul extends ModuleManagementModelTreeItem * @param array $filter Array of filter. * @return array Array of found Fachbereiche. */ - public static function getAllAssignedInstitutes($sortby = 'name', - $order = 'ASC', $filter = null, $row_count = null, $offset = null) - { - $sortby = Fachbereich::createSortStatement($sortby, $order, 'name', - ['count_objects']); - return Fachbereich::getEnrichedByQuery(' + public static function getAllAssignedInstitutes( + $sortby = 'name', + $order = 'ASC', + $filter = null, + $row_count = null, + $offset = null + ) { + $sortby = Fachbereich::createSortStatement( + $sortby, + $order, + 'name', + ['count_objects'] + ); + return Fachbereich::getEnrichedByQuery( + ' SELECT Institute.*, Institute.Name as `name`, Institute.Institut_id AS institut_id, @@ -699,7 +746,7 @@ class Modul extends ModuleManagementModelTreeItem ON (mvv_modul.end = end_sem.semester_id) '.Fachbereich::getFilterSql($filter, true).' GROUP BY institut_id ORDER BY ' . $sortby, - [], + [], $row_count, $offset ); @@ -761,7 +808,8 @@ class Modul extends ModuleManagementModelTreeItem if ($filter_sql == '') { return []; } - $stmt = DBManager::get()->prepare(' + $stmt = DBManager::get()->prepare( + ' SELECT DISTINCT mvv_modul.modul_id FROM mvv_modul LEFT JOIN mvv_modulteil @@ -868,7 +916,7 @@ class Modul extends ModuleManagementModelTreeItem $ret['start'] = true; $messages[] = _('Ungültiges Semester.'); $rejected = true; - } else if ($this->end) { + } elseif ($this->end) { $end_sem = Semester::find($this->end); if ($end_sem) { if ($start_sem->beginn > $end_sem->beginn) { @@ -882,7 +930,7 @@ class Modul extends ModuleManagementModelTreeItem $rejected = true; } } - } else { + } else { $ret['start'] = true; $messages[] = _('Bitte ein Startsemester angeben.'); $rejected = true; @@ -897,8 +945,10 @@ class Modul extends ModuleManagementModelTreeItem $existing = $this->findBySql('code = ' . DBManager::get()->quote($this->code)); if (sizeof($existing)) { $ret['code'] = true; - $messages[] = sprintf(_('Es existiert bereits ein Modul mit dem Code "%s"!'), - $this->code); + $messages[] = sprintf( + _('Es existiert bereits ein Modul mit dem Code "%s"!'), + $this->code + ); $rejected = true; } } diff --git a/lib/models/ModulDeskriptor.php b/lib/models/ModulDeskriptor.php index 330e325..8a32d1a 100644 --- a/lib/models/ModulDeskriptor.php +++ b/lib/models/ModulDeskriptor.php @@ -29,14 +29,14 @@ class ModulDeskriptor extends ModuleManagementModel $config['has_many']['datafields'] = [ 'class_name' => DatafieldEntryModel::class, 'assoc_foreign_key' => - function($model, $params) { + function ($model, $params) { $model->setValue('range_id', $params[0]->id); }, 'assoc_func' => 'findByModel', 'on_delete' => 'delete', 'on_store' => 'store', 'foreign_key' => - function($m) { + function ($m) { return [$m]; } ]; diff --git a/lib/models/ModulInst.php b/lib/models/ModulInst.php index 7393bdf..ead63c6 100644 --- a/lib/models/ModulInst.php +++ b/lib/models/ModulInst.php @@ -48,7 +48,8 @@ class ModulInst extends ModuleManagementModel $params = is_null($group) ? [$modul_id] : [$modul_id, $group]; $ret = []; - $modul_insts = parent::getEnrichedByQuery(' + $modul_insts = parent::getEnrichedByQuery( + ' SELECT mmi.* FROM mvv_modul_inst mmi WHERE mmi.modul_id = ? ' diff --git a/lib/models/ModulLanguage.php b/lib/models/ModulLanguage.php index 160a101..f4302ab 100644 --- a/lib/models/ModulLanguage.php +++ b/lib/models/ModulLanguage.php @@ -41,7 +41,8 @@ class ModulLanguage extends ModuleManagementModel public static function findByModul($modul_id) { $languages = []; - $module_languages = parent::getEnrichedByQuery(' + $module_languages = parent::getEnrichedByQuery( + ' SELECT * FROM mvv_modul_language WHERE modul_id = ? diff --git a/lib/models/ModuleManagementModel.php b/lib/models/ModuleManagementModel.php index d6b3eab..84005c9 100644 --- a/lib/models/ModuleManagementModel.php +++ b/lib/models/ModuleManagementModel.php @@ -22,50 +22,50 @@ abstract class ModuleManagementModel extends SimpleORMap implements ModuleManage * Usable as option for ModuleManagementModel::getDisplayName(). * Use the deafault display options for this object. */ - const DISPLAY_DEFAULT = 1; + public const DISPLAY_DEFAULT = 1; /** * Usable as option for ModuleManagementModel::getDisplayName(). * Displays semesters of the validity period if available for this object. */ - const DISPLAY_SEMESTER = 2; + public const DISPLAY_SEMESTER = 2; /** * Usable as option for ModuleManagementModel::getDisplayName(). * Displays the code (usually a unique identifier) if available for this object. */ - const DISPLAY_CODE = 4; + public const DISPLAY_CODE = 4; /** * Usable as option for ModuleManagementModel::getDisplayName(). * Displays the name of the faculty if available for this object. */ - const DISPLAY_FACULTY = 8; + public const DISPLAY_FACULTY = 8; /** * Usable as option for ModuleManagementModel::getDisplayName(). * Displays the name of the Fach (subject of study) if available for this object. */ - const DISPLAY_FACH = 16; + public const DISPLAY_FACH = 16; /** * Usable as option for ModuleManagementModel::getDisplayName(). * Displays the name of the Studiengangteil if available for this object. */ - const DISPLAY_STGTEIL = 32; + public const DISPLAY_STGTEIL = 32; /** * Usable as option ModuleManagementModel::getDisplayName(). * Displays the name of the Abschluss if available for this object. */ - const DISPLAY_ABSCHLUSS = 64; + public const DISPLAY_ABSCHLUSS = 64; /** * Usable as option ModuleManagementModel::getDisplayName(). * Displays the name of the Abschluss-Kategorie * if available for this object. */ - const DISPLAY_KATEGORIE = 128; + public const DISPLAY_KATEGORIE = 128; protected static $filter_params = []; @@ -158,20 +158,26 @@ abstract class ModuleManagementModel extends SimpleORMap implements ModuleManage if (!$perm->haveObjectPerm(MvvPerm::PERM_CREATE, $user_id)) { throw new Exception(sprintf( 'Permission denied! The user is not allowed to ' - . 'create/delete an object of type %s.', static::class)); + . 'create/delete an object of type %s.', + static::class + )); } } else { if (!$perm->haveObjectPerm(MvvPerm::PERM_WRITE, $user_id)) { throw new Exception(sprintf( 'Permission denied! The user is not allowed to store an ' - . 'object of type %s', static::class)); + . 'object of type %s', + static::class + )); } } // check the permissions for every single db field except primary keys if ($this->isNew()) { - $fields = array_diff(array_keys($this->db_fields()), - array_values($this->pk())); + $fields = array_diff( + array_keys($this->db_fields()), + array_values($this->pk()) + ); } else { $fields = array_keys($this->db_fields()); } @@ -179,8 +185,11 @@ abstract class ModuleManagementModel extends SimpleORMap implements ModuleManage if ($this->isFieldDirty($field) && !$perm->haveFieldPerm($field, MvvPerm::PERM_WRITE, $user_id)) { throw new Exception(sprintf( - 'Permission denied! The user is not allowed to change ' - . 'value of field %s.%s.', static::class, $field)); + 'Permission denied! The user is not allowed to change ' + . 'value of field %s.%s.', + static::class, + $field + )); } } @@ -202,7 +211,11 @@ abstract class ModuleManagementModel extends SimpleORMap implements ModuleManage if (!$perm->haveDfEntryPerm($entry->datafield_id, MvvPerm::PERM_WRITE)) { throw new Exception(sprintf( 'Permission denied! The user is not ' - . 'allowed to change value of field %s::datafields[%s] ("%s").', static::class, $entry->datafield_id, $entry->datafield->name)); + . 'allowed to change value of field %s::datafields[%s] ("%s").', + static::class, + $entry->datafield_id, + $entry->datafield->name + )); } } } @@ -234,14 +247,18 @@ abstract class ModuleManagementModel extends SimpleORMap implements ModuleManage && !$perm->haveFieldPerm($relation_name, MvvPerm::PERM_CREATE, $user_id)) { throw new Exception(sprintf( 'Permission denied! The user is not allowed to create/delete a relation %s::%s.', - get_class($relation_object), $relation_name)); + get_class($relation_object), + $relation_name + )); } elseif ($relation_object->isDirty()) { if ($relation_object instanceof ModuleManagementModel) { $relation_object->verifyPermission($user_id); } elseif (!$perm->haveFieldPerm($relation_name, MvvPerm::PERM_WRITE, $user_id)) { throw new Exception(sprintf( 'Permission denied! The user is not allowed to modify a relation %s::%s.', - get_class($relation_object), $relation_name)); + get_class($relation_object), + $relation_name + )); } } return true; @@ -286,7 +303,8 @@ abstract class ModuleManagementModel extends SimpleORMap implements ModuleManage * * @throws InvalidValuesException */ - public function validate() { + public function validate() + { } @@ -294,7 +312,8 @@ abstract class ModuleManagementModel extends SimpleORMap implements ModuleManage * @see SimpleOrMap::delete() * Triggers logging. */ - public function delete() { + public function delete() + { $this->logChanges('delete'); return parent::delete(); } @@ -305,7 +324,8 @@ abstract class ModuleManagementModel extends SimpleORMap implements ModuleManage * @param string $action new, update or delete * @return boolean Return true if logging was successful. */ - protected function logChanges ($action = null) { + protected function logChanges($action = null) + { switch ($this->db_table()) { case 'abschluss' : @@ -462,7 +482,7 @@ abstract class ModuleManagementModel extends SimpleORMap implements ModuleManage if ($action == 'update') { foreach ($this->content as $name => $value) { - if ($name == 'author_id' || $name == 'editor_id' || $name == 'mkdate' || $name == 'chdate' ) { + if ($name == 'author_id' || $name == 'editor_id' || $name == 'mkdate' || $name == 'chdate') { continue; } if ($this->isFieldDirty($name)) { @@ -497,9 +517,12 @@ abstract class ModuleManagementModel extends SimpleORMap implements ModuleManage * @param int $offset Offset where the result set starts * @return SimpleOrMapCollection with all found objects or empty array */ - public static function getEnrichedByQuery($query = null, $params = [], - $row_count = null, $offset = null) - { + public static function getEnrichedByQuery( + $query = null, + $params = [], + $row_count = null, + $offset = null + ) { $enriched = []; $params = array_merge($params, self::$filter_params); self::$filter_params = []; @@ -605,24 +628,26 @@ abstract class ModuleManagementModel extends SimpleORMap implements ModuleManage . join(',', array_map( function ($val) { return DBManager::get()->quote($val); - }, $val)) + }, + $val + )) . ') '; } - } else if (trim($val)) { + } elseif (trim($val)) { if ($val == '__undefined__') { $sql_parts[] = '(ISNULL(' . $col . ') OR ' . $col . " = '')"; } else { if (preg_match('/([\w\.]+)\s+([\<\>\!]\=?)/', $col, $matches)) { $sql_parts[] = trim($matches[1]) . ' ' . $matches[2] . ' ' . DBManager::get()->quote($val) . ' '; - } else if ($col == 'start_sem.beginn') { + } elseif ($col == 'start_sem.beginn') { if ((int) $val >= 0) { // start semester filter for Module, Studiengaenge, ... $sql_parts[] = '(start_sem.beginn <= ' . DBManager::get()->quote($val) . ' OR ISNULL(start_sem.beginn))'; } - } else if ($col == 'end_sem.ende') { + } elseif ($col == 'end_sem.ende') { if ((int) $val >= 0) { // end semester filter for Module, Studiengaenge, ... $sql_parts[] = '(end_sem.ende >= ' @@ -655,15 +680,18 @@ abstract class ModuleManagementModel extends SimpleORMap implements ModuleManage * @param string $additional_fields additional allowed fields * @return string|null the verified sort fields */ - protected static function checkSortFields($sort, $standard_field = null, - $additional_fields = []) - { + protected static function checkSortFields( + $sort, + $standard_field = null, + $additional_fields = [] + ) { if (!is_array($sort)) { $sort = explode(',', $sort); } if (sizeof(array_intersect( - array_merge(array_keys(static::db_fields()), $additional_fields), - $sort))) { + array_merge(array_keys(static::db_fields()), $additional_fields), + $sort + ))) { return implode(',', $sort); } return $standard_field; @@ -678,9 +706,12 @@ abstract class ModuleManagementModel extends SimpleORMap implements ModuleManage * @param array $additional_fields Calculated columns. * @return string The sort query part. */ - protected static function createSortStatement($sort, $order = 'ASC', - $standard_field = null, $additional_fields = []) - { + protected static function createSortStatement( + $sort, + $order = 'ASC', + $standard_field = null, + $additional_fields = [] + ) { $order = mb_strtoupper(trim($order)) !== 'DESC' ? ' ASC' : ' DESC'; if (!is_array($sort)) { $sort = explode(',', $sort); @@ -742,8 +773,10 @@ abstract class ModuleManagementModel extends SimpleORMap implements ModuleManage */ public static function getCountBySql($sql, $filter = null) { - $stmt = DBManager::get()->prepare($sql . self::getFilterSql($filter, - true)); + $stmt = DBManager::get()->prepare($sql . self::getFilterSql( + $filter, + true + )); $stmt->execute(self::$filter_params); return $stmt->fetchColumn(0); } @@ -756,7 +789,7 @@ abstract class ModuleManagementModel extends SimpleORMap implements ModuleManage * @see mvv_config.php * @param string $language The language. */ - public static final function setLanguage($language) + final public static function setLanguage($language) { $language = mb_strtoupper(mb_strstr($language . '_', '_', true)); if (isset($GLOBALS['MVV_LANGUAGES']['values'][$language])) { @@ -807,7 +840,7 @@ abstract class ModuleManagementModel extends SimpleORMap implements ModuleManage * * @return string The currently selected language. */ - public static final function getLanguage() + final public static function getLanguage() { $language = self::$language ?: $GLOBALS['MVV_LANGUAGES']['default']; return $language; @@ -951,7 +984,7 @@ abstract class ModuleManagementModel extends SimpleORMap implements ModuleManage * @param Callable $finder Function to actually locate the item. * @return ModuleManagementModel object or null */ - protected static function fromCache($index, $id, Callable $finder) + protected static function fromCache($index, $id, callable $finder) { // Leave immeditately if $id cannot be used as array index if (!is_string($id) && !is_int($id)) { diff --git a/lib/models/ModuleManagementModelTreeItem.php b/lib/models/ModuleManagementModelTreeItem.php index c2d4269..ac46772 100644 --- a/lib/models/ModuleManagementModelTreeItem.php +++ b/lib/models/ModuleManagementModelTreeItem.php @@ -138,15 +138,19 @@ abstract class ModuleManagementModelTreeItem extends ModuleManagementModel imple * in class ModuleManagementModel. * @return type */ - public static function getPathes($trails, $delimiter = ' · ', - $display_options = self::DISPLAY_DEFAULT) - { + public static function getPathes( + $trails, + $delimiter = ' · ', + $display_options = self::DISPLAY_DEFAULT + ) { $pathes = []; foreach ($trails as $trail) { $pathes[] = join($delimiter, array_map( - function($a) use ($display_options) { - return $a->getDisplayName($display_options); - }, $trail)); + function ($a) use ($display_options) { + return $a->getDisplayName($display_options); + }, + $trail + )); } sort($pathes, SORT_LOCALE_STRING); return $pathes; diff --git a/lib/models/Modulteil.php b/lib/models/Modulteil.php index 14a34ba..d6c935c 100644 --- a/lib/models/Modulteil.php +++ b/lib/models/Modulteil.php @@ -102,7 +102,8 @@ class Modulteil extends ModuleManagementModelTreeItem */ public static function findByModul($modul_id) { - return parent::getEnrichedByQuery(' + return parent::getEnrichedByQuery( + ' SELECT mmt.*, COUNT(lvgruppe_id) AS count_lvgruppen FROM mvv_modulteil AS mmt @@ -122,7 +123,8 @@ class Modulteil extends ModuleManagementModelTreeItem */ public static function findByLvgruppe($lvgruppe_id) { - return parent::getEnrichedByQuery(' + return parent::getEnrichedByQuery( + ' SELECT mmt.* FROM mvv_modulteil mmt LEFT JOIN mvv_lvgruppe_modulteil mlm USING(modulteil_id) @@ -132,13 +134,14 @@ class Modulteil extends ModuleManagementModelTreeItem ); } - public function getDisplayName($options = self::DISPLAY_DEFAULT) { + public function getDisplayName($options = self::DISPLAY_DEFAULT) + { $name = ''; if ($this->num_bezeichnung) { $name .= $GLOBALS['MVV_MODULTEIL']['NUM_BEZEICHNUNG']['values'][$this->num_bezeichnung]['name']; $name .= !is_null($this->nummer) ? ' ' . $this->nummer : ''; $name .= ': '; - } else if ($this->nummer) { + } elseif ($this->nummer) { $name .= $this->nummer . ': '; } $name .= $GLOBALS['MVV_MODULTEIL']['LERNLEHRFORM']['values'][$this->lernlehrform]['name'] ?? ''; @@ -171,7 +174,8 @@ class Modulteil extends ModuleManagementModelTreeItem * @param bool If true returns always a new descriptor * @return object The Deskriptor. */ - public function getDeskriptor($language = null, $force_new = false) { + public function getDeskriptor($language = null, $force_new = false) + { if (!isset($GLOBALS['MVV_MODULTEIL_DESKRIPTOR']['SPRACHE']['values'][$language])) { $language = $this->default_language; } @@ -297,7 +301,8 @@ class Modulteil extends ModuleManagementModelTreeItem } $this->languages = SimpleORMapCollection::createFromArray( - $assigned_languages); + $assigned_languages + ); } /** diff --git a/lib/models/ModulteilDeskriptor.php b/lib/models/ModulteilDeskriptor.php index 8b1801c..6fb122a 100644 --- a/lib/models/ModulteilDeskriptor.php +++ b/lib/models/ModulteilDeskriptor.php @@ -29,14 +29,14 @@ class ModulteilDeskriptor extends ModuleManagementModel $config['has_many']['datafields'] = [ 'class_name' => DatafieldEntryModel::class, 'assoc_foreign_key' => - function($model, $params) { + function ($model, $params) { $model->setValue('range_id', $params[0]->deskriptor_id); }, 'assoc_func' => 'findByModel', 'on_delete' => 'delete', 'on_store' => 'store', 'foreign_key' => - function($m) { + function ($m) { return [$m]; } ]; diff --git a/lib/models/ModulteilLanguage.php b/lib/models/ModulteilLanguage.php index ed09bff..e5a30fa 100644 --- a/lib/models/ModulteilLanguage.php +++ b/lib/models/ModulteilLanguage.php @@ -42,7 +42,8 @@ class ModulteilLanguage extends ModuleManagementModel public static function findByModulteil($modulteil_id) { $languages = []; - $modulteil_languages = parent::getEnrichedByQuery(' + $modulteil_languages = parent::getEnrichedByQuery( + ' SELECT * FROM mvv_modulteil_language WHERE modulteil_id = ? diff --git a/lib/models/MvvContact.php b/lib/models/MvvContact.php index 26ff5f0..1597e48 100644 --- a/lib/models/MvvContact.php +++ b/lib/models/MvvContact.php @@ -81,12 +81,20 @@ class MvvContact extends ModuleManagementModel * @param int $offset The first object to return in a result set. * @return object A SimpleORMapCollection of Dokument objects. */ - public static function getAllEnriched($sortby = 'chdate', $order = 'DESC', - $row_count = null, $offset = null, $filter = null) - { + public static function getAllEnriched( + $sortby = 'chdate', + $order = 'DESC', + $row_count = null, + $offset = null, + $filter = null + ) { - $sortby = self::createSortStatement($sortby, $order, 'name', - ['count_zuordnungen']); + $sortby = self::createSortStatement( + $sortby, + $order, + 'name', + ['count_zuordnungen'] + ); $ids = self::getIdsFiltered($filter); return parent::getEnrichedByQuery(" @@ -326,14 +334,23 @@ class MvvContact extends ModuleManagementModel * @param array $filter Array of filter. * @return array Array of found Fachbereiche. */ - public static function getAllAssignedInstitutes($sortby = 'name', - $order = 'ASC', $filter = null, $row_count = null, $offset = null) - { + public static function getAllAssignedInstitutes( + $sortby = 'name', + $order = 'ASC', + $filter = null, + $row_count = null, + $offset = null + ) { $ids = self::getIdsFiltered($filter); - $sortby = Fachbereich::createSortStatement($sortby, $order, 'name', - ['count_objects']); + $sortby = Fachbereich::createSortStatement( + $sortby, + $order, + 'name', + ['count_objects'] + ); - return Fachbereich::getEnrichedByQuery(" + return Fachbereich::getEnrichedByQuery( + " SELECT *, `Institut_id` AS `institut_id`, `Name` AS `name`, COUNT(`object_id`) AS `count_objects` FROM (SELECT Institute.*, @@ -358,7 +375,9 @@ class MvvContact extends ModuleManagementModel AND `mvv_contacts_ranges`.`category` IN (:categories) AND `mvv_contacts_ranges`.`range_id` IN (:ranges)) tab1 GROUP BY institut_id ORDER BY " . $sortby, - $ids, $row_count, $offset + $ids, + $row_count, + $offset ); } @@ -373,7 +392,7 @@ class MvvContact extends ModuleManagementModel */ public function addRange($range_id, $range_type, $contact_type, $category) { - if (!MvvContactRange::findOneBySQL("contact_id =? AND range_id =? AND category=?",[$this->contact_id, $range_id, $category])){ + if (!MvvContactRange::findOneBySQL("contact_id =? AND range_id =? AND category=?", [$this->contact_id, $range_id, $category])) { $mvv_cr = new MvvContactRange(); $mvv_cr->contact_id = $this->contact_id; $mvv_cr->range_id = $range_id; diff --git a/lib/models/MvvContactRange.php b/lib/models/MvvContactRange.php index 85bdf63..60834b66d 100644 --- a/lib/models/MvvContactRange.php +++ b/lib/models/MvvContactRange.php @@ -134,7 +134,9 @@ class MvvContactRange extends ModuleManagementModel . join(',', array_map( function ($val) { return DBManager::get()->quote($val); - }, $val)) + }, + $val + )) . ') '; } else { $sql .= ' AND '.$column.' = ? '; diff --git a/lib/models/MvvCourse.php b/lib/models/MvvCourse.php index 0e82d3b..68061ac 100644 --- a/lib/models/MvvCourse.php +++ b/lib/models/MvvCourse.php @@ -16,7 +16,6 @@ class MvvCourse extends ModuleManagementModelTreeItem { - protected static function configure($config = []) { $config['db_table'] = 'seminare'; @@ -66,6 +65,6 @@ class MvvCourse extends ModuleManagementModelTreeItem */ public function getParents($mode = null) { - return Lvgruppe::findBySeminar($this->getId()); + return Lvgruppe::findBySeminar($this->getId()); } } diff --git a/lib/models/MvvFile.php b/lib/models/MvvFile.php index 109ac2b..cadcbc9 100644 --- a/lib/models/MvvFile.php +++ b/lib/models/MvvFile.php @@ -165,9 +165,13 @@ class MvvFile extends ModuleManagementModel * @param int $offset The first object to return in a result set. * @return object A SimpleORMapCollection of Dokument objects. */ - public static function getAllEnriched($sortby = 'chdate', $order = 'DESC', - $row_count = null, $offset = null, $filter = null) - { + public static function getAllEnriched( + $sortby = 'chdate', + $order = 'DESC', + $row_count = null, + $offset = null, + $filter = null + ) { $sortby = self::createSortStatement( $sortby, $order, @@ -376,7 +380,7 @@ class MvvFile extends ModuleManagementModel if ($mvvfile_range = MvvFileRange::find([$this->mvvfile_id, $range_id])) { $vacant = $mvvfile_range->position; if ($mvvfile_range->delete()) { - foreach (MvvFileRange::findBySQL('range_id = ? ORDER BY position ASC',[$range_id]) as $other_range) { + foreach (MvvFileRange::findBySQL('range_id = ? ORDER BY position ASC', [$range_id]) as $other_range) { if ($other_range->position > $vacant) { $tmp = $other_range->position; $other_range->position = $vacant; @@ -417,13 +421,22 @@ class MvvFile extends ModuleManagementModel * @param array $filter Array of filter. * @return array Array of found Fachbereiche. */ - public static function getAllAssignedInstitutes($sortby = 'name', - $order = 'ASC', $filter = null, $row_count = null, $offset = null) - { - $sortby = Fachbereich::createSortStatement($sortby, $order, 'name', - ['count_objects']); + public static function getAllAssignedInstitutes( + $sortby = 'name', + $order = 'ASC', + $filter = null, + $row_count = null, + $offset = null + ) { + $sortby = Fachbereich::createSortStatement( + $sortby, + $order, + 'name', + ['count_objects'] + ); - return Fachbereich::getEnrichedByQuery(" + return Fachbereich::getEnrichedByQuery( + " SELECT `Institute`.*, `Institute`.`Name` as `name`, `Institute`.`Institut_id` AS `institut_id`, @@ -440,7 +453,10 @@ class MvvFile extends ModuleManagementModel LEFT JOIN `semester_data` `end_sem` ON (`mvv_studiengang`.`end` = `end_sem`.`semester_id`)" . Fachbereich::getFilterSql($filter, true) . " - GROUP BY `institut_id` ORDER BY " . $sortby, [], $row_count, $offset + GROUP BY `institut_id` ORDER BY " . $sortby, + [], + $row_count, + $offset ); } diff --git a/lib/models/MvvOverlappingConflict.class.php b/lib/models/MvvOverlappingConflict.class.php index a36f6bf..75dca8d 100644 --- a/lib/models/MvvOverlappingConflict.class.php +++ b/lib/models/MvvOverlappingConflict.class.php @@ -21,7 +21,8 @@ class MvvOverlappingConflict extends SimpleORMap * * @param array $config Configuration */ - protected static function configure($config = array()) { + protected static function configure($config = array()) + { $config['db_table'] = 'mvv_ovl_conflicts'; $config['belongs_to']['selection'] = [ @@ -84,9 +85,11 @@ class MvvOverlappingConflict extends SimpleORMap */ public static function deleteBySelection($selection_id) { - return self::deleteBySQL('INNER JOIN `mvv_ovl_selections` + return self::deleteBySQL( + 'INNER JOIN `mvv_ovl_selections` ON `mvv_ovl_selections`.`id` = `mvv_ovl_conflicts`.`selection_id` WHERE `mvv_ovl_selections`.`selection_id` = ?', - [$selection_id]); + [$selection_id] + ); } } diff --git a/lib/models/MvvOverlappingExclude.php b/lib/models/MvvOverlappingExclude.php index a940787..108de7f 100644 --- a/lib/models/MvvOverlappingExclude.php +++ b/lib/models/MvvOverlappingExclude.php @@ -22,7 +22,8 @@ class MvvOverlappingExclude extends SimpleORMap * * @param array $config Configuration */ - protected static function configure($config = array()) { + protected static function configure($config = array()) + { $config['db_table'] = 'mvv_ovl_excludes'; $config['belongs_to']['selection'] = [ @@ -38,4 +39,3 @@ class MvvOverlappingExclude extends SimpleORMap } } - diff --git a/lib/models/MvvOverlappingSelection.class.php b/lib/models/MvvOverlappingSelection.class.php index 8dc2ef0..83705fc 100644 --- a/lib/models/MvvOverlappingSelection.class.php +++ b/lib/models/MvvOverlappingSelection.class.php @@ -253,7 +253,8 @@ class MvvOverlappingSelection extends SimpleORMap $visible_sql = ''; if ($only_visible) { $excluded_courses = SimpleORMapCollection::createFromArray( - MvvOverlappingExclude::findBySelection_id($selection_id))->pluck('course_id'); + MvvOverlappingExclude::findBySelection_id($selection_id) + )->pluck('course_id'); if ($excluded_courses) { $visible_sql = 'AND `mvv_ovl_conflicts`.`comp_course_id` NOT IN (:course_ids)'; } diff --git a/lib/models/NewsRange.class.php b/lib/models/NewsRange.class.php index 0bcaaa6..087e12b 100644 --- a/lib/models/NewsRange.class.php +++ b/lib/models/NewsRange.class.php @@ -43,12 +43,12 @@ class NewsRange extends SimpleORMap parent::configure($config); } - function getType() + public function getType() { return get_object_type($this->range_id, ['sem','inst','user','fak']); } - function getName() + public function getName() { switch ($this->type) { case 'global': @@ -64,6 +64,6 @@ class NewsRange extends SimpleORMap case 'fak': return $this->institute->name; break; - } + } } } diff --git a/lib/models/OERDownloadcounter.php b/lib/models/OERDownloadcounter.php index 4e0a687..b2ae669 100644 --- a/lib/models/OERDownloadcounter.php +++ b/lib/models/OERDownloadcounter.php @@ -1,4 +1,5 @@ <?php + class OERDownloadcounter extends SimpleORMap { protected static function configure($config = []) diff --git a/lib/models/OERHost.php b/lib/models/OERHost.php index 19f2bb2..5703704 100644 --- a/lib/models/OERHost.php +++ b/lib/models/OERHost.php @@ -2,10 +2,9 @@ class OERHost extends OERIdentity { - //These two HTTP-headers are non-conformant custom HTTP-headers for requests - const OER_HEADER_PUBLIC_KEY_HASH = "Publickey-Hash"; - const OER_HEADER_SIGNATURE = "RSA-Signature-Base64"; + public const OER_HEADER_PUBLIC_KEY_HASH = "Publickey-Hash"; + public const OER_HEADER_SIGNATURE = "RSA-Signature-Base64"; /** * Fetches the OERHost of this Stud.IP. If none existed before it will be created and the object returnd. diff --git a/lib/models/OERHostOERSI.php b/lib/models/OERHostOERSI.php index 24d3251..cece8ba 100644 --- a/lib/models/OERHostOERSI.php +++ b/lib/models/OERHostOERSI.php @@ -2,7 +2,6 @@ class OERHostOERSI extends OERHost { - /** * Executes a search request on the host. * @param string|null $text : the search string @@ -28,7 +27,7 @@ class OERHostOERSI extends OERHost $output = curl_exec($cr); $error = curl_error($cr); if ($error) { - $error_number = curl_getinfo($cr, CURLINFO_HTTP_CODE); + $error_number = curl_getinfo($cr, CURLINFO_HTTP_CODE); error_log('OERSI search is not working. '.$error_number.': '.$error); } curl_close($cr); diff --git a/lib/models/OERMaterial.php b/lib/models/OERMaterial.php index 911aaa2..6786bd3 100644 --- a/lib/models/OERMaterial.php +++ b/lib/models/OERMaterial.php @@ -70,10 +70,12 @@ class OERMaterial extends SimpleORMap public static function findMine($user_id = null) { $user_id = $user_id ?: $GLOBALS['user']->id; - return self::findBySQL("INNER JOIN `oer_material_users` USING (material_id) + return self::findBySQL( + "INNER JOIN `oer_material_users` USING (material_id) WHERE `oer_material_users`.user_id = ? AND external_contact = '0' - ORDER BY mkdate DESC", [$user_id] + ORDER BY mkdate DESC", + [$user_id] ); } @@ -138,11 +140,13 @@ class OERMaterial extends SimpleORMap if ($tag) { self::fetchRemoteSearch($tag['name'], true); } - return self::findBySQL("INNER JOIN oer_tags_material USING (material_id) + return self::findBySQL( + "INNER JOIN oer_tags_material USING (material_id) LEFT JOIN oer_hosts ON (oer_hosts.host_id = oer_material.host_id) WHERE oer_tags_material.tag_hash = ? AND (oer_material.host_id IS NULL OR oer_hosts.`active` = '1') - AND draft = '0'", [$tag_hash] + AND draft = '0'", + [$tag_hash] ); } diff --git a/lib/models/OpenGraphURL.class.php b/lib/models/OpenGraphURL.class.php index 62eecc4..53c7988 100644 --- a/lib/models/OpenGraphURL.class.php +++ b/lib/models/OpenGraphURL.class.php @@ -26,7 +26,7 @@ */ class OpenGraphURL extends SimpleORMap { - const EXPIRES_DURATION = 86400; // = 24 * 60 * 60 + public const EXPIRES_DURATION = 86400; // = 24 * 60 * 60 /** * Configures this model. @@ -159,7 +159,7 @@ class OpenGraphURL extends SimpleORMap $isOpenGraph = false; $response = FileManager::fetchURLMetadata($this['url']); - if ((int)$response['response_code'] === 200 && isset($response['Content-Type']) && mb_strpos($response['Content-Type'],'html') !== false) { + if ((int)$response['response_code'] === 200 && isset($response['Content-Type']) && mb_strpos($response['Content-Type'], 'html') !== false) { if (preg_match('/(?<=charset=)[^;]*/i', $response['Content-Type'], $match)) { $currentEncoding = trim($match[0], '"'); } else { @@ -193,13 +193,11 @@ class OpenGraphURL extends SimpleORMap foreach ($metatags as $tag) { $key = false; if ($tag->hasAttribute('property') - && mb_strpos($tag->getAttribute('property'), 'og:') === 0) - { + && mb_strpos($tag->getAttribute('property'), 'og:') === 0) { $key = mb_strtolower(mb_substr($tag->getAttribute('property'), 3)); } if (!$key && $tag->hasAttribute('name') - && mb_strpos($tag->getAttribute('name'), 'og:') === 0) - { + && mb_strpos($tag->getAttribute('name'), 'og:') === 0) { $key = mb_strtolower(mb_substr($tag->getAttribute('name'), 3)); } if ($key) { @@ -223,8 +221,7 @@ class OpenGraphURL extends SimpleORMap if (empty($this['description']) && $isOpenGraph) { foreach ($metatags as $tag) { if (mb_stripos($tag->getAttribute('name'), "description") !== false - || mb_stripos($tag->getAttribute('property'), "description") !== false) - { + || mb_stripos($tag->getAttribute('property'), "description") !== false) { $this['description'] = $tag->getAttribute('content'); } } diff --git a/lib/models/PersonalNotifications.class.php b/lib/models/PersonalNotifications.class.php index dbdb266..52ed86d 100644 --- a/lib/models/PersonalNotifications.class.php +++ b/lib/models/PersonalNotifications.class.php @@ -39,8 +39,8 @@ */ class PersonalNotifications extends SimpleORMap { - const GC_MAX_DAYS = 30; // Garbage collector removes notifications after 30 days - const CACHE_DURATION = 86400; // 24 * 60 * 60 = 1 day + public const GC_MAX_DAYS = 30; // Garbage collector removes notifications after 30 days + public const CACHE_DURATION = 86400; // 24 * 60 * 60 = 1 day protected static function configure($config = []) { diff --git a/lib/models/PluginAsset.php b/lib/models/PluginAsset.php index dbd4c2b..ca2a326 100644 --- a/lib/models/PluginAsset.php +++ b/lib/models/PluginAsset.php @@ -8,7 +8,7 @@ */ class PluginAsset extends SimpleORMap { - const CACHE_DURATION = 2419200; // = 4 * 7 * 24 * 60 * 60 = 4 weeks + public const CACHE_DURATION = 2419200; // = 4 * 7 * 24 * 60 * 60 = 4 weeks /** * Configures the model diff --git a/lib/models/Questionnaire.php b/lib/models/Questionnaire.php index f221ca1..6ab4f04 100644 --- a/lib/models/Questionnaire.php +++ b/lib/models/Questionnaire.php @@ -99,7 +99,8 @@ class Questionnaire extends SimpleORMap implements PrivacyObject $statusgruppe_user = StatusgruppeUser::findOneBySQL( "statusgruppe_id = ? AND user_id = ?", - [$assignment['range_id'], $GLOBALS['user']->id]); + [$assignment['range_id'], $GLOBALS['user']->id] + ); if ($statusgruppe_user) { return true; } diff --git a/lib/models/QuestionnaireInfo.php b/lib/models/QuestionnaireInfo.php index ffc09ff..1de80d6 100644 --- a/lib/models/QuestionnaireInfo.php +++ b/lib/models/QuestionnaireInfo.php @@ -1,7 +1,8 @@ <?php + class QuestionnaireInfo extends QuestionnaireQuestion implements QuestionType { - public static function getIcon(bool $active = false) : Icon + public static function getIcon(bool $active = false): Icon { return Icon::create(static::getIconShape(), $active ? 'clickable' : 'info'); } @@ -20,7 +21,7 @@ class QuestionnaireInfo extends QuestionnaireQuestion implements QuestionType return _('Information'); } - static public function getEditingComponent() + public static function getEditingComponent() { return ['questionnaire-info-edit', '']; } diff --git a/lib/models/RangeScale.php b/lib/models/RangeScale.php index 3c89195..03ca96a 100644 --- a/lib/models/RangeScale.php +++ b/lib/models/RangeScale.php @@ -1,9 +1,10 @@ <?php + require_once 'lib/classes/QuestionType.interface.php'; class RangeScale extends QuestionnaireQuestion implements QuestionType { - public static function getIcon(bool $active = false) : Icon + public static function getIcon(bool $active = false): Icon { return Icon::create(static::getIconShape(), $active ? 'clickable' : 'info'); } @@ -31,7 +32,7 @@ class RangeScale extends QuestionnaireQuestion implements QuestionType return $questiondata; } - static public function getEditingComponent() + public static function getEditingComponent() { return ['rangescale-edit', '']; } diff --git a/lib/models/Semester.class.php b/lib/models/Semester.class.php index 1a490a6..874b379 100644 --- a/lib/models/Semester.class.php +++ b/lib/models/Semester.class.php @@ -40,7 +40,7 @@ class Semester extends SimpleORMap $config['additional_fields']['last_sem_week']['get'] = 'getLastSemesterWeek'; $config['additional_fields']['current']['get'] = 'isCurrent'; $config['additional_fields']['past']['get'] = 'isPast'; - $config['additional_fields']['short_name']['get'] = function($semester) { + $config['additional_fields']['short_name']['get'] = function ($semester) { return (string) $semester->semester_token ?: (string) $semester->name; }; @@ -153,7 +153,7 @@ class Semester extends SimpleORMap public static function findAllVisible($with_before_first = true): array { return array_values( - array_filter(self::getAllAsArray(), function ($semester, $key) use($with_before_first) { + array_filter(self::getAllAsArray(), function ($semester, $key) use ($with_before_first) { return $GLOBALS['perm']->have_perm('admin') || !empty($semester['visible']) || ((int)$key === 0 && $with_before_first); }, ARRAY_FILTER_USE_BOTH) ); @@ -264,8 +264,7 @@ class Semester extends SimpleORMap $option_value = 'semester_id', $include_all = true, $use_semester_id = true - ) - { + ) { $select_attributes = array_merge([ 'name' => 'sem_select', ], $select_attributes ?? []); @@ -392,7 +391,8 @@ class Semester extends SimpleORMap $start_weeks[$i] = sprintf( _('%u. Semesterwoche (ab %s)'), $i + 1, - strftime('%x', $timestamp)); + strftime('%x', $timestamp) + ); $i += 1; diff --git a/lib/models/SemesterHoliday.class.php b/lib/models/SemesterHoliday.class.php index ee3d2bc..1751537 100644 --- a/lib/models/SemesterHoliday.class.php +++ b/lib/models/SemesterHoliday.class.php @@ -62,7 +62,7 @@ class SemesterHoliday extends SimpleORMap $ret = []; if ($timestamp_start < $timestamp_end) { foreach(self::getAll() as $holiday) { - if ($holiday->beginn >= $timestamp_start && $holiday->ende <= $timestamp_end) { + if ($holiday->beginn >= $timestamp_start && $holiday->ende <= $timestamp_end) { $ret[] = $holiday; } } @@ -92,7 +92,7 @@ class SemesterHoliday extends SimpleORMap { if (!is_array(self::$holiday_cache) || $force_reload) { self::$holiday_cache = []; - foreach(self::findBySql('1 ORDER BY beginn') as $holiday){ + foreach(self::findBySql('1 ORDER BY beginn') as $holiday) { self::$holiday_cache[$holiday->getId()] = $holiday; } } diff --git a/lib/models/SeminarCycleDate.class.php b/lib/models/SeminarCycleDate.class.php index 50f7105..4d09296 100644 --- a/lib/models/SeminarCycleDate.class.php +++ b/lib/models/SeminarCycleDate.class.php @@ -194,7 +194,8 @@ class SeminarCycleDate extends SimpleORMap $template['full'] .= '%s'; $cycles = [_('wöchentlich'), _('zweiwöchentlich'), _('dreiwöchentlich')]; $day = getWeekDay($this->weekday, $format == 'short'); - $result = sprintf($template[$format], + $result = sprintf( + $template[$format], $day, $this->start_hour, $this->start_minute, @@ -202,8 +203,9 @@ class SeminarCycleDate extends SimpleORMap $this->end_minute, $cycles[(int)$this->cycle], $this->week_offset + 1, - $this->end_offset ? $this->end_offset: '', - $this->description ? ' (' . $this->description . ')' : ''); + $this->end_offset ? $this->end_offset : '', + $this->description ? ' (' . $this->description . ')' : '' + ); return $result; } @@ -295,7 +297,7 @@ class SeminarCycleDate extends SimpleORMap return 0; } $this->resetRelation("dates"); - StudipLog::log('SEM_ADD_CYCLE', $this->seminar_id, NULL, $this->toString()); + StudipLog::log('SEM_ADD_CYCLE', $this->seminar_id, null, $this->toString()); return $result; } return 0; @@ -309,20 +311,22 @@ class SeminarCycleDate extends SimpleORMap if ($this->start_time != $old_cycle->start_time || $this->end_time != $old_cycle->end_time - || $old_cycle->weekday != $this->weekday ) - { + || $old_cycle->weekday != $this->weekday) { $update_count = $this->updateExistingDates($old_cycle); } if ($old_cycle->week_offset != $this->week_offset || $old_cycle->end_offset != $this->end_offset - || $old_cycle->cycle != $this->cycle ) - { + || $old_cycle->cycle != $this->cycle) { $update_count = $this->generateNewDates(); } - StudipLog::log('SEM_CHANGE_CYCLE', $this->seminar_id, NULL, - $old_cycle->toString() .' -> ' . $this->toString()); + StudipLog::log( + 'SEM_CHANGE_CYCLE', + $this->seminar_id, + null, + $old_cycle->toString() .' -> ' . $this->toString() + ); return $update_count; } @@ -377,13 +381,13 @@ class SeminarCycleDate extends SimpleORMap if ($holiday_date && $date instanceof CourseDate) { $date->cancelDate(); - } else if (!$holiday_date && $date instanceof CourseExDate) { + } elseif (!$holiday_date && $date instanceof CourseExDate) { $date->unCancelDate(); - } else if ($date->isDirty()) { + } elseif ($date->isDirty()) { $date->store(); $update_count++; } - } else if ($date->isDirty()) { + } elseif ($date->isDirty()) { $date->store(); $update_count++; } @@ -418,7 +422,8 @@ class SeminarCycleDate extends SimpleORMap $end_time_offset = $course->end_semester->vorles_ende; } } else { - $end_time_offset = $this->calculateTimestamp($course->start_semester->vorles_beginn, + $end_time_offset = $this->calculateTimestamp( + $course->start_semester->vorles_beginn, ($this->end_offset + 1) * 7 ); } @@ -488,11 +493,13 @@ class SeminarCycleDate extends SimpleORMap $sem_end = $this->calculateTimestamp($course->start_semester->vorles_beginn, ($this->end_offset + 1) * 7); } - $semester = Semester::findBySQL('beginn <= :ende AND ende >= :start', - ['start' => $startAfterTimeStamp, 'ende' => $sem_end]); + $semester = Semester::findBySQL( + 'beginn <= :ende AND ende >= :start', + ['start' => $startAfterTimeStamp, 'ende' => $sem_end] + ); foreach ($semester as $val) { - $ret[$val['semester_id']] = $this->createSemesterTerminSlots($val['vorles_beginn'], $val['vorles_ende'], $startAfterTimeStamp); + $ret[$val['semester_id']] = $this->createSemesterTerminSlots($val['vorles_beginn'], $val['vorles_ende'], $startAfterTimeStamp); } return $ret; } @@ -539,7 +546,8 @@ class SeminarCycleDate extends SimpleORMap 0, // Second date("n", $stamp), // Month date("j", $stamp), // Day - date("Y", $stamp)); // Year + date("Y", $stamp) + ); // Year $end = explode(':', $this->end_time); $end_time = mktime( @@ -548,7 +556,8 @@ class SeminarCycleDate extends SimpleORMap 0, // Second date("n", $stamp), // Month date("j", $stamp), // Day - date("Y", $stamp)); // Year + date("Y", $stamp) + ); // Year $course = Course::find($this->seminar_id); @@ -655,7 +664,7 @@ class SeminarCycleDate extends SimpleORMap if (!$date->isNew()) { $dates_to_delete[] = $date; } - } else if ($this->cycle == 2 && $week_count % 3 != 0 && $week_count > 0) { + } elseif ($this->cycle == 2 && $week_count % 3 != 0 && $week_count > 0) { if (!$date->isNew()) { $dates_to_delete[] = $date; } @@ -742,8 +751,7 @@ class SeminarCycleDate extends SimpleORMap protected function buildOpenRequestsForDatesQuery( $include_metadate = false, $order = '' - ) - { + ) { $sql = "closed < '1' AND "; $sql_params = []; @@ -787,8 +795,7 @@ class SeminarCycleDate extends SimpleORMap public function getOpenRequestsForDates( $include_metadate = false, $order = 'mkdate DESC' - ) - { + ) { $data = $this->buildOpenRequestsForDatesQuery($include_metadate, $order); return ResourceRequest::findBySql($data['sql'], $data['sql_params']); } diff --git a/lib/models/SimpleCollection.class.php b/lib/models/SimpleCollection.class.php index 11dd296..95fe662 100644 --- a/lib/models/SimpleCollection.class.php +++ b/lib/models/SimpleCollection.class.php @@ -1,4 +1,5 @@ <?php + if (!defined('SORT_NATURAL')) { define('SORT_NATURAL', 6); } @@ -105,23 +106,23 @@ class SimpleCollection extends StudipArrayObject $comp_func = function ($a) use ($args) { return in_array($a, $args); }; - break; + break; case '===': $comp_func = function ($a) use ($args) { return in_array($a, $args, true); }; - break; + break; case '!=': case '<>': $comp_func = function ($a) use ($args) { return !in_array($a, $args); }; - break; + break; case '!==': $comp_func = function ($a) use ($args) { return !in_array($a, $args, true); }; - break; + break; case '<': case '>': case '<=': @@ -140,12 +141,12 @@ class SimpleCollection extends StudipArrayObject $comp_func = function ($a) use ($op_func, $args) { return $op_func($a, $args[0]); }; - break; + break; case '><': $comp_func = function ($a) use ($args) { return $a > $args[0] && $a < $args[1]; }; - break; + break; case '>=<=': $comp_func = function ($a) use ($args) { return $a >= $args[0] && $a <= $args[1]; @@ -158,7 +159,7 @@ class SimpleCollection extends StudipArrayObject $args = array_map('mb_strtolower', $args); return in_array($a, $args); }; - break; + break; case '*=': $comp_func = function ($a) use ($args) { foreach ($args as $arg) { @@ -168,7 +169,7 @@ class SimpleCollection extends StudipArrayObject } return false; }; - break; + break; case '^=': $comp_func = function ($a) use ($args) { foreach ($args as $arg) { @@ -178,7 +179,7 @@ class SimpleCollection extends StudipArrayObject } return false; }; - break; + break; case '$=': $comp_func = function ($a) use ($args) { foreach ($args as $arg) { @@ -189,7 +190,7 @@ class SimpleCollection extends StudipArrayObject } return false; }; - break; + break; case '~=': $comp_func = function ($a) use ($args) { foreach ($args as $arg) { @@ -202,9 +203,9 @@ class SimpleCollection extends StudipArrayObject break; default: throw new InvalidArgumentException('unknown operator: ' . $operator); - } - } - return $comp_func; + } + } + return $comp_func; } /** @@ -219,17 +220,17 @@ class SimpleCollection extends StudipArrayObject return $text; } $text = str_replace(['ä','Ä','ö','Ö','ü','Ü','ß'], ['a','A','o','O','u','U','s'], $text); - $text = str_replace(['À','Á','Â','Ã','Å','Æ'], 'A' , $text); - $text = str_replace(['à','á','â','ã','å','æ'], 'a' , $text); - $text = str_replace(['È','É','Ê','Ë'], 'E' , $text); - $text = str_replace(['è','é','ê','ë'], 'e' , $text); - $text = str_replace(['Ì','Í','Î','Ï'], 'I' , $text); - $text = str_replace(['ì','í','î','ï'], 'i' , $text); - $text = str_replace(['Ò','Ó','Õ','Ô','Ø'], 'O' , $text); - $text = str_replace(['ò','ó','ô','õ','ø'], 'o' , $text); - $text = str_replace(['Ù','Ú','Û'], 'U' , $text); - $text = str_replace(['ù','ú','û'], 'u' , $text); - $text = str_replace(['Ç','ç','Ð','Ñ','Ý','ñ','ý','ÿ'], ['C','c','D','N','Y','n','y','y'] , $text); + $text = str_replace(['À','Á','Â','Ã','Å','Æ'], 'A', $text); + $text = str_replace(['à','á','â','ã','å','æ'], 'a', $text); + $text = str_replace(['È','É','Ê','Ë'], 'E', $text); + $text = str_replace(['è','é','ê','ë'], 'e', $text); + $text = str_replace(['Ì','Í','Î','Ï'], 'I', $text); + $text = str_replace(['ì','í','î','ï'], 'i', $text); + $text = str_replace(['Ò','Ó','Õ','Ô','Ø'], 'O', $text); + $text = str_replace(['ò','ó','ô','õ','ø'], 'o', $text); + $text = str_replace(['Ù','Ú','Û'], 'U', $text); + $text = str_replace(['ù','ú','û'], 'u', $text); + $text = str_replace(['Ç','ç','Ð','Ñ','Ý','ñ','ý','ÿ'], ['C','c','D','N','Y','n','y','y'], $text); return $text; } @@ -267,15 +268,16 @@ class SimpleCollection extends StudipArrayObject public function toArray() { $args = func_get_args(); - return $this->map(function ($a) use ($args) { - if (method_exists($a, 'toArray')) { - return call_user_func_array([$a, 'toArray'], $args); - } - if (method_exists($a, 'getArrayCopy')) { - return $a->getArrayCopy(); + return $this->map( + function ($a) use ($args) { + if (method_exists($a, 'toArray')) { + return call_user_func_array([$a, 'toArray'], $args); + } + if (method_exists($a, 'getArrayCopy')) { + return $a->getArrayCopy(); + } + return (array) $a; } - return (array) $a; - } ); } @@ -663,27 +665,27 @@ class SimpleCollection extends StudipArrayObject //('name asc, nummer desc ') $sort_locale = false; switch ($sort_flags) { - case SORT_NATURAL: - $sort_func = 'strnatcmp'; - break; - case SORT_NATURAL | SORT_FLAG_CASE: - $sort_func = 'strnatcasecmp'; - break; - case SORT_STRING | SORT_FLAG_CASE: - $sort_func = 'strcasecmp'; - break; - case SORT_STRING: - $sort_func = 'strcmp'; - break; - case SORT_NUMERIC: - $sort_func = function ($a, $b) { - return (int) $a - (int) $b; - }; - break; - case SORT_LOCALE_STRING: - default: - $sort_func = 'strnatcasecmp'; - $sort_locale = true; + case SORT_NATURAL: + $sort_func = 'strnatcmp'; + break; + case SORT_NATURAL | SORT_FLAG_CASE: + $sort_func = 'strnatcasecmp'; + break; + case SORT_STRING | SORT_FLAG_CASE: + $sort_func = 'strcasecmp'; + break; + case SORT_STRING: + $sort_func = 'strcmp'; + break; + case SORT_NUMERIC: + $sort_func = function ($a, $b) { + return (int) $a - (int) $b; + }; + break; + case SORT_LOCALE_STRING: + default: + $sort_func = 'strnatcasecmp'; + $sort_locale = true; } $sorter = []; @@ -704,7 +706,9 @@ class SimpleCollection extends StudipArrayObject $value2 = static::translitLatin1(mb_substr($d2[$field], 0, 100)); } $ret = $sort_func($value1, $value2); - if (strtolower($dir) == 'desc') $ret = $ret * -1; + if (strtolower($dir) == 'desc') { + $ret = $ret * -1; + } } while ($ret === 0 && next($sorter)); return $ret; @@ -750,7 +754,8 @@ class SimpleCollection extends StudipArrayObject * @param array $params parameters for methodcall * @return array of all return values */ - public function sendMessage($method, $params = []) { + public function sendMessage($method, $params = []) + { $results = []; foreach ($this->storage as $record) { $results[] = call_user_func_array([$record, $method], $params); diff --git a/lib/models/SimpleORMap.class.php b/lib/models/SimpleORMap.class.php index 2187979..5ad2015 100644 --- a/lib/models/SimpleORMap.class.php +++ b/lib/models/SimpleORMap.class.php @@ -19,7 +19,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate /** * Defines `_` as character used when joining composite primary keys. */ - const ID_SEPARATOR = '_'; + public const ID_SEPARATOR = '_'; /** * table row data @@ -45,10 +45,10 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate */ protected $is_deleted = false; - /** - * db table metadata - * @var ?array $schemes; - */ + /** + * db table metadata + * @var ?array $schemes; + */ public static $schemes = null; /** @@ -420,7 +420,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate } if (!isset(self::$schemes[$db_table])) { $db = DBManager::get()->query("SHOW COLUMNS FROM $db_table"); - while($rs = $db->fetch(PDO::FETCH_ASSOC)){ + while($rs = $db->fetch(PDO::FETCH_ASSOC)) { $db_fields[strtolower($rs['Field'])] = [ 'name' => $rs['Field'], 'null' => $rs['Null'], @@ -428,7 +428,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate 'type' => $rs['Type'], 'extra' => $rs['Extra'] ]; - if ($rs['Key'] == 'PRI'){ + if ($rs['Key'] == 'PRI') { $pk[] = strtolower($rs['Field']); } } @@ -638,7 +638,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate $record = static::build([], false); $ret = []; - do { + do { $clone = clone $record; $stmt->setFetchMode(PDO::FETCH_INTO, $clone); @@ -801,7 +801,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate public static function findAndMapBySQL($callable, $where, $params = []) { $ret = []; - $calleach = function($m) use (&$ret, $callable) { + $calleach = function ($m) use (&$ret, $callable) { $ret[] = $callable($m); }; static::findEachBySQL($calleach, $where, $params); @@ -821,7 +821,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate public static function findAndMapMany($callable, $pks = [], $order = '', $order_params = []) { $ret = []; - $calleach = function($m) use (&$ret, $callable) { + $calleach = function ($m) use (&$ret, $callable) { $ret[] = $callable($m); }; $db_table = static::db_table(); @@ -843,7 +843,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate */ public static function deleteBySQL($where, $params = []) { - $killeach = function($record) {$record->delete();}; + $killeach = function ($record) {$record->delete();}; return static::findEachBySQL($killeach, $where, $params); } @@ -951,7 +951,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate * * @param null|int|string|array $id primary key of table */ - function __construct($id = null) + public function __construct($id = null) { foreach(['has_many', 'belongs_to', 'has_one', 'has_and_belongs_to_many'] as $type) { foreach (array_keys($this->$type()) as $one) { @@ -1043,7 +1043,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate * clean up references after cloning * @return void */ - function __clone() + public function __clone() { //all references link still to old object => reset all aliases foreach ($this->alias_fields() as $alias => $field) { @@ -1096,7 +1096,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate if (empty($options['assoc_foreign_key'])) { if ($type === 'has_many' || $type === 'has_one') { $options['assoc_foreign_key'] = $this->pk()[0]; - } else if ($type === 'belongs_to') { + } elseif ($type === 'belongs_to') { $options['assoc_foreign_key'] = 'id'; } } @@ -1139,21 +1139,21 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate $options['foreign_key'] = 'id'; } if (isset($options['foreign_key']) && $options['foreign_key'] instanceof Closure) { - $options['assoc_func_params_func'] = function($record) use ($name, $options) { return call_user_func($options['foreign_key'], $record, $name, $options);}; + $options['assoc_func_params_func'] = function ($record) use ($name, $options) { return call_user_func($options['foreign_key'], $record, $name, $options);}; } else { - $options['assoc_func_params_func'] = function($record) use ($name, $options) { return $options['foreign_key'] === 'id' ? $record->getId() : $record->getValue($options['foreign_key']);}; + $options['assoc_func_params_func'] = function ($record) use ($name, $options) { return $options['foreign_key'] === 'id' ? $record->getId() : $record->getValue($options['foreign_key']);}; } if (isset($options['assoc_foreign_key']) && $options['assoc_foreign_key'] instanceof Closure) { if ($type === 'belongs_to') { - $options['assoc_foreign_key_getter'] = function($record, $that) use ($name, $options) { return call_user_func($options['assoc_foreign_key'], $record, $name, $options, $that);}; + $options['assoc_foreign_key_getter'] = function ($record, $that) use ($name, $options) { return call_user_func($options['assoc_foreign_key'], $record, $name, $options, $that);}; } else { - $options['assoc_foreign_key_setter'] = function($record, $params) use ($name, $options) { return call_user_func($options['assoc_foreign_key'], $record, $params, $name, $options);}; + $options['assoc_foreign_key_setter'] = function ($record, $params) use ($name, $options) { return call_user_func($options['assoc_foreign_key'], $record, $params, $name, $options);}; } } elseif (!empty($options['assoc_foreign_key'])) { if ($type === 'belongs_to') { - $options['assoc_foreign_key_getter'] = function($record, $that) use ($name, $options) { return $record->getValue($options['assoc_foreign_key']);}; + $options['assoc_foreign_key_getter'] = function ($record, $that) use ($name, $options) { return $record->getValue($options['assoc_foreign_key']);}; } else { - $options['assoc_foreign_key_setter'] = function($record, $value) use ($name, $options) { return $record->setValue($options['assoc_foreign_key'], $value);}; + $options['assoc_foreign_key_setter'] = function ($record, $value) use ($name, $options) { return $record->setValue($options['assoc_foreign_key'], $value);}; } } else { throw new Exception("Could not determine assoc_foreign_key for relation " . $name); @@ -1182,7 +1182,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate * @param string $relation name of relation * @return array assoc array containing options */ - function getRelationOptions($relation) + public function getRelationOptions($relation) { $options = []; foreach(['has_many', 'belongs_to', 'has_one', 'has_and_belongs_to_many'] as $type) { @@ -1204,7 +1204,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate * * @return array assoc array with columns, primary keys and name of table */ - function getTableMetadata() + public function getTableMetadata() { return ['fields' => $this->db_fields(), 'pk' => $this->pk(), @@ -1219,7 +1219,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate * * @return boolean */ - function hasAutoIncrementColumn() + public function hasAutoIncrementColumn() { return $this->db_fields()[$this->pk()[0]]['extra'] == 'auto_increment'; } @@ -1232,13 +1232,13 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate */ public function setId($id) { - if (!is_array($id)){ + if (!is_array($id)) { $id = [$id]; } - if (count($this->pk()) != count($id)){ - throw new InvalidArgumentException("Invalid ID, Primary Key {$this->db_table()} is " .join(",",$this->pk())); + if (count($this->pk()) != count($id)) { + throw new InvalidArgumentException("Invalid ID, Primary Key {$this->db_table()} is " .join(",", $this->pk())); } else { - foreach ($this->pk() as $count => $key){ + foreach ($this->pk() as $count => $key) { $this->content[$key] = $id[$count]; } return true; @@ -1249,7 +1249,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate * returns primary key, multiple keys as array * @return null|string|array current primary key, null if not set */ - function getId() + public function getId() { if (count($this->pk()) == 1) { return $this->content[$this->pk()[0]] ?? null; @@ -1269,7 +1269,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate * if pk consists of multiple columns, false is returned * @return boolean|string */ - function getNewId() + public function getNewId() { $id = false; if (count($this->pk()) == 1) { @@ -1290,7 +1290,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate * @param null|array|string $only_these_fields limit returned fields * @return array */ - function toArray($only_these_fields = null) + public function toArray($only_these_fields = null) { $ret = []; if (is_string($only_these_fields)) { @@ -1298,7 +1298,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate } $fields = array_diff($this->known_slots(), array_keys($this->relations)); if (is_array($only_these_fields)) { - $only_these_fields = array_filter(array_map(function($s) { + $only_these_fields = array_filter(array_map(function ($s) { return is_string($s) ? strtolower($s) : null; }, $only_these_fields)); $fields = array_intersect($only_these_fields, $fields); @@ -1321,7 +1321,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate * @param null|array|string $only_these_fields * @return array */ - function toRawArray($only_these_fields = null) + public function toRawArray($only_these_fields = null) { $ret = []; if (is_string($only_these_fields)) { @@ -1366,7 +1366,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate * @param null|array|string $only_these_fields limit returned fields * @return array */ - function toArrayRecursive($only_these_fields = null) + public function toArrayRecursive($only_these_fields = null) { if (is_string($only_these_fields)) { $only_these_fields = words($only_these_fields); @@ -1401,8 +1401,10 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate $options['type'] === 'has_and_belongs_to_many') { $ret[$relation_name] = $this->{$relation_name}-> - sendMessage('toArrayRecursive', - [$relation_only_these_fields]); + sendMessage( + 'toArrayRecursive', + [$relation_only_these_fields] + ); } } } @@ -1467,7 +1469,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate * @throws InvalidArgumentException if no relation with given name is found * @return mixed the value from the related object */ - function getRelationValue($relation, $field) + public function getRelationValue($relation, $field) { $field = strtolower($field); $options = $this->getRelationOptions($relation); @@ -1484,7 +1486,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate * @param string $field name of column * @return mixed the default value */ - function getDefaultValue($field) + public function getDefaultValue($field) { $default_value = null; if (!isset($this->default_values()[$field])) { @@ -1516,7 +1518,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate * @param mixed $value * @return string */ - function setValue($field, $value) + public function setValue($field, $value) { $field = strtolower($field); $ret = false; @@ -1528,7 +1530,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate if (array_key_exists($field, $this->serialized_fields())) { $ret = $this->setSerializedValue($field, $value); } elseif ($this->isI18nField($field)) { - $ret = $this->setI18nValue($field, $value); + $ret = $this->setI18nValue($field, $value); } else { $ret = ($this->content[$field] = $value); } @@ -1603,7 +1605,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate * @param string $field the column or additional field * @return null|string|SimpleORMapCollection */ - function __get($field) + public function __get($field) { return $this->getValue($field); } @@ -1616,7 +1618,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate * @param string $value * @return string */ - function __set($field, $value) + public function __set($field, $value) { return $this->setValue($field, $value); } @@ -1626,12 +1628,12 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate * @param string $field * @return bool */ - function __isset($field) + public function __isset($field) { $field = strtolower($field); if (in_array($field, $this->known_slots())) { $value = $this->getValue($field); - return $value instanceOf SimpleORMapCollection ? (bool)count($value) : !is_null($value); + return $value instanceof SimpleORMapCollection ? (bool)count($value) : !is_null($value); } else { return false; } @@ -1725,7 +1727,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate * @param string $field * @return boolean */ - function isField($field) + public function isField($field) { $field = strtolower($field); return isset($this->db_fields()[$field]); @@ -1736,7 +1738,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate * @param string $field * @return boolean */ - function isAdditionalField($field) + public function isAdditionalField($field) { $field = strtolower($field); return isset($this->additional_fields()[$field]); @@ -1747,7 +1749,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate * @param string $field * @return boolean */ - function isAliasField($field) + public function isAliasField($field) { $field = strtolower($field); return isset($this->alias_fields()[$field]); @@ -1758,7 +1760,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate * @param string $field * @return boolean */ - function isI18nField($field) + public function isI18nField($field) { $field = strtolower($field); return isset($this->i18n_fields()[$field]); @@ -1774,7 +1776,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate * @param ?boolean $reset existing data in object will be discarded * @return int|bool number of columns changed */ - function setData($data, $reset = false) + public function setData($data, $reset = false) { $count = 0; if ($reset) { @@ -1805,7 +1807,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate * check if object exists in database * @return boolean */ - function isNew() + public function isNew() { return $this->is_new; } @@ -1815,7 +1817,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate * * @return boolean */ - function isDeleted() + public function isDeleted() { return $this->is_deleted; } @@ -1825,7 +1827,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate * @param boolean $is_new * @return boolean */ - function setNew($is_new) + public function setNew($is_new) { return $this->is_new = $is_new; } @@ -1835,7 +1837,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate * @throws UnexpectedValueException if the primary key is incomplete * @return boolean|array<string> */ - function getWhereQuery() + public function getWhereQuery() { $where_query = null; $pk_not_set = []; @@ -1847,11 +1849,11 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate $pk_not_set[] = $key; } } - if (!$where_query || count($pk_not_set)){ + if (!$where_query || count($pk_not_set)) { if ($this->isNew()) { return false; } else { - throw new UnexpectedValueException(sprintf("primary key incomplete: %s must not be null", join(',',$pk_not_set))); + throw new UnexpectedValueException(sprintf("primary key incomplete: %s must not be null", join(',', $pk_not_set))); } } return $where_query; @@ -1861,7 +1863,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate * restore entry from database * @return boolean */ - function restore() + public function restore() { $where_query = $this->getWhereQuery(); $id = $this->getId(); @@ -1874,7 +1876,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate . join(" AND ", $where_query); $st = DBManager::get()->prepare($query); $st->execute(); - $st->setFetchMode(PDO::FETCH_INTO , $this); + $st->setFetchMode(PDO::FETCH_INTO, $this); if ($st->fetch()) { $this->setNew(false); $this->applyCallbacks('after_initialize'); @@ -1895,7 +1897,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate * @throws UnexpectedValueException if there are forbidden NULL values * @return number|boolean */ - function store() + public function store() { // Set id or prepare setting of id if ($this->isNew() && $this->getId() === null) { @@ -2069,7 +2071,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate * set chdate column to current timestamp * @return boolean */ - function triggerChdate() + public function triggerChdate() { if ($this->db_fields()['chdate']) { $this->content['chdate'] = time(); @@ -2088,7 +2090,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate * the object is cleared, but is not(!) turned to new state * @return bool|int number of deleted rows */ - function delete() + public function delete() { $ret = false; if (!$this->isDeleted() && !$this->isNew()) { @@ -2214,7 +2216,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate $field = strtolower($field); if ($this->content[$field] === null || $this->content_db[$field] === null) { return $this->content[$field] !== $this->content_db[$field]; - } else if ($this->content[$field] instanceof I18NString || $this->content_db[$field] instanceof I18NString) { + } elseif ($this->content[$field] instanceof I18NString || $this->content_db[$field] instanceof I18NString) { return $this->content[$field] != $this->content_db[$field]; } else { return (string)$this->content[$field] !== (string)$this->content_db[$field]; @@ -2266,17 +2268,18 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate $options = $this->getRelationOptions($relation); $to_call = [$options['class_name'], $options['assoc_func']]; if (!is_callable($to_call)) { - throw new RuntimeException('assoc_func: ' . join('::', $to_call) . ' is not callable.' ); + throw new RuntimeException('assoc_func: ' . join('::', $to_call) . ' is not callable.'); } $params = $options['assoc_func_params_func']; if ($options['type'] === 'has_many') { - $records = function($record) use ($to_call, $params, $options) { + $records = function ($record) use ($to_call, $params, $options) { $p = (array)$params($record); return call_user_func_array($to_call, array_merge(count($p) ? $p : [null], [$options['order_by'] ?? null])); }; $this->relations[$relation] = new SimpleORMapCollection($records, $options, $this); } elseif ($options['type'] === 'has_and_belongs_to_many') { - $records = function($record) use ($to_call, $params, $options) {$p = (array)$params($record); return call_user_func_array($to_call, array_merge(count($p) ? $p : [null], [$options]));}; + $records = function ($record) use ($to_call, $params, $options) {$p = (array)$params($record); + return call_user_func_array($to_call, array_merge(count($p) ? $p : [null], [$options]));}; $this->relations[$relation] = new SimpleORMapCollection($records, $options, $this); } else { $p = (array)$params($this); diff --git a/lib/models/SimpleORMapCollection.class.php b/lib/models/SimpleORMapCollection.class.php index f06ee17..d52b212 100644 --- a/lib/models/SimpleORMapCollection.class.php +++ b/lib/models/SimpleORMapCollection.class.php @@ -22,12 +22,12 @@ class SimpleORMapCollection extends SimpleCollection /** * @var int Exception error code denoting a wrong type of objects. */ - const WRONG_OBJECT_TYPE = 1; + public const WRONG_OBJECT_TYPE = 1; /** * @var int Exception error code denoting that an object of this `id` already exists. */ - const OBJECT_EXISTS = 2; + public const OBJECT_EXISTS = 2; /** * the record object this collection belongs to diff --git a/lib/models/StatusgruppeUser.php b/lib/models/StatusgruppeUser.php index 44fda26..a0311ce 100644 --- a/lib/models/StatusgruppeUser.php +++ b/lib/models/StatusgruppeUser.php @@ -40,10 +40,10 @@ class StatusgruppeUser extends SimpleORMap implements PrivacyObject $config['has_many']['datafields'] = [ 'class_name' => DatafieldEntryModel::class, - 'foreign_key' => function($group_member) { + 'foreign_key' => function ($group_member) { return [$group_member]; }, - 'assoc_foreign_key' => function($model, $params) { + 'assoc_foreign_key' => function ($model, $params) { $model->setValue('range_id', $params[0]->user_id); $model->setValue('sec_range_id', $params[0]->statusgruppe_id); }, diff --git a/lib/models/Statusgruppen.php b/lib/models/Statusgruppen.php index 64623b2..d0f1881 100644 --- a/lib/models/Statusgruppen.php +++ b/lib/models/Statusgruppen.php @@ -133,8 +133,7 @@ class Statusgruppen extends SimpleORMap implements PrivacyObject $selfassign_end, $makefolder, $dates = null - ) - { + ) { $group = new Statusgruppen($id); $group->name = $name; diff --git a/lib/models/StgteilAbschnitt.php b/lib/models/StgteilAbschnitt.php index 6e758a5..10feedd 100644 --- a/lib/models/StgteilAbschnitt.php +++ b/lib/models/StgteilAbschnitt.php @@ -48,7 +48,7 @@ class StgteilAbschnitt extends ModuleManagementModelTreeItem ]; $config['additional_fields']['count_module']['get'] = - function($fach) { return $fach->count_module; }; + function ($fach) { return $fach->count_module; }; $config['additional_fields']['count_module']['set'] = false; $config['i18n_fields']['name'] = true; @@ -72,12 +72,13 @@ class StgteilAbschnitt extends ModuleManagementModelTreeItem public static function getEnriched($abschnitt_id) { $abschnitte = parent::getEnrichedByQuery( - 'SELECT msa.*, COUNT(modul_id) AS count_module ' + 'SELECT msa.*, COUNT(modul_id) AS count_module ' . 'FROM mvv_stgteilabschnitt msa ' . 'LEFT JOIN mvv_stgteilabschnitt_modul msm USING(abschnitt_id) ' . 'WHERE msa.abschnitt_id = ? ' . 'GROUP BY abschnitt_id', - [$abschnitt_id]); + [$abschnitt_id] + ); if (sizeof($abschnitte)) { return $abschnitte[$abschnitt_id]; } @@ -146,7 +147,8 @@ class StgteilAbschnitt extends ModuleManagementModelTreeItem } if (!$this->modul_zuordnungen) { $this->modul_zuordnungen = SimpleORMapCollection::createFromArray( - [$abschnitt_modul]); + [$abschnitt_modul] + ); } else { $this->modul_zuordnungen->append($abschnitt_modul); } @@ -176,8 +178,9 @@ class StgteilAbschnitt extends ModuleManagementModelTreeItem return false; } $modul_zuordnung = StgteilabschnittModul::findOneBySQL( - 'abschnitt_id = ? AND modul_id = ?', - [$this->id, $modul->id]); + 'abschnitt_id = ? AND modul_id = ?', + [$this->id, $modul->id] + ); $removed = $this->modul_zuordnungen->unsetByPk($modul_zuordnung->id); return $removed !== false; } diff --git a/lib/models/StgteilBezeichnung.php b/lib/models/StgteilBezeichnung.php index 926e6ab..6e1898d 100644 --- a/lib/models/StgteilBezeichnung.php +++ b/lib/models/StgteilBezeichnung.php @@ -21,10 +21,10 @@ class StgteilBezeichnung extends ModuleManagementModel $config['db_table'] = 'mvv_stgteil_bez'; $config['additional_fields']['count_stgteile']['get'] = - function($stg_bez) { return $stg_bez->count_stgteile; }; + function ($stg_bez) { return $stg_bez->count_stgteile; }; $config['additional_fields']['count_stgteile']['set'] = false; $config['additional_fields']['count_studiengaenge']['get'] = - function($stg_bez) { return $stg_bez->count_studiengaenge; }; + function ($stg_bez) { return $stg_bez->count_studiengaenge; }; $config['additional_fields']['count_studiengaenge']['set'] = false; $config['i18n_fields']['name'] = true; @@ -55,12 +55,20 @@ class StgteilBezeichnung extends ModuleManagementModel * @return SimpleORMapCollection A collection of Studiengangteil- * Bezeichnungen. */ - public static function getAllEnriched($sortby = 'position', $order = 'ASC', - $row_count = null, $offset = null) - { - $sortby = self::createSortStatement($sortby, $order, 'position', - ['count_studiengaenge', 'count_stgteile']); - return parent::getEnrichedByQuery(' + public static function getAllEnriched( + $sortby = 'position', + $order = 'ASC', + $row_count = null, + $offset = null + ) { + $sortby = self::createSortStatement( + $sortby, + $order, + 'position', + ['count_studiengaenge', 'count_stgteile'] + ); + return parent::getEnrichedByQuery( + ' SELECT msb.*, COUNT(DISTINCT studiengang_id) AS `count_studiengaenge`, COUNT(DISTINCT stgteil_id) AS `count_stgteile` @@ -98,7 +106,8 @@ class StgteilBezeichnung extends ModuleManagementModel */ public static function findByStudiengang($studiengang_id) { - return parent::getEnrichedByQuery(' + return parent::getEnrichedByQuery( + ' SELECT msb.*, COUNT(DISTINCT stgteil_id) AS `count_stgteile` FROM mvv_stgteil_bez msb diff --git a/lib/models/StgteilVersion.php b/lib/models/StgteilVersion.php index 7d71374..b74d361 100644 --- a/lib/models/StgteilVersion.php +++ b/lib/models/StgteilVersion.php @@ -46,9 +46,9 @@ class StgteilVersion extends ModuleManagementModelTreeItem ]; $config['additional_fields']['count_abschnitte']['get'] = - function($version) { return $version->count_abschnitte; }; + function ($version) { return $version->count_abschnitte; }; $config['additional_fields']['count_dokumente']['get'] = - function($version) { return $version->count_dokumente; }; + function ($version) { return $version->count_dokumente; }; $config['i18n_fields']['beschreibung'] = true; @@ -83,7 +83,8 @@ class StgteilVersion extends ModuleManagementModelTreeItem */ public static function getEnriched($version_id) { - $version = parent::getEnrichedByQuery(' + $version = parent::getEnrichedByQuery( + ' SELECT msv.*, COUNT(msa.abschnitt_id) AS count_abschnitte FROM mvv_stgteilversion AS msv LEFT JOIN mvv_stgteilabschnitt AS msa USING(version_id) @@ -112,12 +113,21 @@ class StgteilVersion extends ModuleManagementModelTreeItem * @param int $offset The first object to return in a result set. * @return SimpleORMapCollection A collection of Studiengangteil-Versionen. */ - public static function getAllEnriched($sortby = 'start', $order = 'ASC', - $filter = null, $row_count = null, $offset = null) - { - $sortby = self::createSortStatement($sortby, $order, 'start', - ['start', 'count_abschnitte', 'count_dokumente']); - return parent::getEnrichedByQuery(" + public static function getAllEnriched( + $sortby = 'start', + $order = 'ASC', + $filter = null, + $row_count = null, + $offset = null + ) { + $sortby = self::createSortStatement( + $sortby, + $order, + 'start', + ['start', 'count_abschnitte', 'count_dokumente'] + ); + return parent::getEnrichedByQuery( + " SELECT mvv_stgteilversion.*, start_sem.beginn AS start, COUNT(abschnitt_id) AS count_abschnitte, @@ -173,11 +183,16 @@ class StgteilVersion extends ModuleManagementModelTreeItem * to filter the result set. * @return SimpleORMapCollection A collection of Studiengangteil-Versionen. */ - public static function findByStgteil($stgteil_id, - $sortby = 'start', $order = 'ASC', $filter = null) - { - $filter = array_merge((array) $filter, - ['mvv_stgteilversion.stgteil_id' => $stgteil_id]); + public static function findByStgteil( + $stgteil_id, + $sortby = 'start', + $order = 'ASC', + $filter = null + ) { + $filter = array_merge( + (array) $filter, + ['mvv_stgteilversion.stgteil_id' => $stgteil_id] + ); return self::getAllEnriched($sortby, $order, $filter); } @@ -212,7 +227,8 @@ class StgteilVersion extends ModuleManagementModelTreeItem */ public static function findByStgteilAbschnitt($abschnitt_id) { - $versions = parent::getEnrichedByQuery(' + $versions = parent::getEnrichedByQuery( + ' SELECT msv.*, sd.beginn AS start FROM mvv_stgteilversion msv LEFT JOIN semester_data sd ON msv.start_sem = sd.semester_id @@ -247,14 +263,16 @@ class StgteilVersion extends ModuleManagementModelTreeItem : 'WHERE mst.fach_id = ? AND msg.abschluss_id = ? ') . ' ORDER BY mst.kp DESC, sem_start.beginn'; - return DBManager::get()->fetchAll($stmt, - ($version_id + return DBManager::get()->fetchAll( + $stmt, + ($version_id ? [$version_id, $fach_id, $abschluss_id] : [$fach_id, $abschluss_id]), - function ($row) { - $version = StgteilVersion::buildExisting($row); - return $version; - }); + function ($row) { + $version = StgteilVersion::buildExisting($row); + return $version; + } + ); } public function getDisplayName($options = self::DISPLAY_DEFAULT) @@ -350,7 +368,8 @@ class StgteilVersion extends ModuleManagementModelTreeItem $new_mvv_objects[] = $new_modul_assignment; } $modulteil_assignments = ModulteilStgteilabschnitt::findBySql( - 'abschnitt_id = ' . DBManager::get()->quote($abschnitt->getId())); + 'abschnitt_id = ' . DBManager::get()->quote($abschnitt->getId()) + ); foreach ($modulteil_assignments as $assignment) { $new_modulteil_assignment = clone $assignment; $new_modulteil_assignment->setNew(true); @@ -359,8 +378,8 @@ class StgteilVersion extends ModuleManagementModelTreeItem } } $success = array_walk($new_mvv_objects, function ($mvv_object) { - return $mvv_object->store(false); - }); + return $mvv_object->store(false); + }); return ($success ? $new_version : false); } @@ -417,7 +436,7 @@ class StgteilVersion extends ModuleManagementModelTreeItem $ret['start_sem'] = true; $messages[] = _('Ungültiges Semester.'); $rejected = true; - } else if ($this->end_sem) { + } elseif ($this->end_sem) { $end_sem = Semester::find($this->end_sem); if ($end_sem) { if ($start_sem->beginn > $end_sem->beginn) { @@ -431,7 +450,7 @@ class StgteilVersion extends ModuleManagementModelTreeItem $rejected = true; } } - } else { + } else { $ret['start_sem'] = true; $messages[] = _('Bitte ein Startsemester angeben.'); $rejected = true; diff --git a/lib/models/StgteilabschnittModul.php b/lib/models/StgteilabschnittModul.php index 020c0de..adbc1ca 100644 --- a/lib/models/StgteilabschnittModul.php +++ b/lib/models/StgteilabschnittModul.php @@ -77,8 +77,11 @@ class StgteilabschnittModul extends ModuleManagementModelTreeItem $name .= trim($this->bezeichnung) ?: trim($this->modul->getDeskriptor()->bezeichnung); if ($end_sem || $start_sem) { if ($end_sem) { - $name .= sprintf(_(', gültig %s bis %s'), - $start_sem->name, $end_sem->name); + $name .= sprintf( + _(', gültig %s bis %s'), + $start_sem->name, + $end_sem->name + ); } else { $name .= sprintf(_(', gültig ab %s'), $start_sem->name); } @@ -122,7 +125,8 @@ class StgteilabschnittModul extends ModuleManagementModelTreeItem public function getFachsemester($modulteil_id, $fachsemester) { return ModulteilStgteilabschnitt::find( - [$modulteil_id, $this->abschnitt_id, $fachsemester]); + [$modulteil_id, $this->abschnitt_id, $fachsemester] + ); } /** @@ -135,9 +139,10 @@ class StgteilabschnittModul extends ModuleManagementModelTreeItem { $ret = []; $modulteil_abschnitte = ModulteilStgteilabschnitt::findBySql( - 'modulteil_id = ' . DBManager::get()->quote($modulteil_id) + 'modulteil_id = ' . DBManager::get()->quote($modulteil_id) . ' AND abschnitt_id = ' - . DBManager::get()->quote($this->abschnitt_id)); + . DBManager::get()->quote($this->abschnitt_id) + ); foreach ($modulteil_abschnitte as $modulteil_abschnitt) { $ret[$modulteil_abschnitt->fachsemester] = $modulteil_abschnitt; } @@ -151,10 +156,11 @@ class StgteilabschnittModul extends ModuleManagementModelTreeItem { foreach ($this->modul->modulteile as $modulteil) { ModulteilStgteilabschnitt::deleteBySql( - 'modulteil_id = ' + 'modulteil_id = ' . DBManager::get()->quote($modulteil->getId()) . ' AND abschnitt_id = ' - . DBManager::get()->quote($this->abschnitt_id)); + . DBManager::get()->quote($this->abschnitt_id) + ); } return parent::delete(); diff --git a/lib/models/Studiengang.php b/lib/models/Studiengang.php index eccd0cd..1d602bb 100644 --- a/lib/models/Studiengang.php +++ b/lib/models/Studiengang.php @@ -84,14 +84,14 @@ class Studiengang extends ModuleManagementModelTreeItem $config['has_many']['datafields'] = [ 'class_name' => DatafieldEntryModel::class, 'assoc_foreign_key' => - function($model, $params) { + function ($model, $params) { $model->setValue('range_id', $params[0]->id); }, 'assoc_func' => 'findByModel', 'on_delete' => 'delete', 'on_store' => 'store', 'foreign_key' => - function($stg) { + function ($stg) { return [$stg]; } ]; @@ -152,7 +152,8 @@ class Studiengang extends ModuleManagementModelTreeItem */ public static function findByAbschluss($abschluss_id) { - return parent::getEnrichedByQuery(' + return parent::getEnrichedByQuery( + ' SELECT ms.* FROM mvv_studiengang ms WHERE ms.abschluss_id = ?', @@ -170,7 +171,8 @@ class Studiengang extends ModuleManagementModelTreeItem */ public static function findByFachAbschluss($fach_id, $abschluss_id, $filter = null) { - return parent::getEnrichedByQuery(' + return parent::getEnrichedByQuery( + ' SELECT mvv_studiengang.* FROM mvv_studiengang LEFT JOIN mvv_stg_stgteil USING(studiengang_id) @@ -191,7 +193,8 @@ class Studiengang extends ModuleManagementModelTreeItem */ public static function findByFachbereich($fachbereich_id) { - return parent::getEnrichedByQuery(' + return parent::getEnrichedByQuery( + ' SELECT ms.*, COUNT(mst.fach_id) as `count_faecher`, mak.name AS `kategorie_name` @@ -216,7 +219,8 @@ class Studiengang extends ModuleManagementModelTreeItem */ public static function findByAbschlussKategorie($kategorie_id) { - return parent::getEnrichedByQuery(' + return parent::getEnrichedByQuery( + ' SELECT ms.*, COUNT(mst.fach_id) AS `count_faecher` FROM mvv_studiengang AS ms @@ -240,10 +244,12 @@ class Studiengang extends ModuleManagementModelTreeItem * @param string $fachbereich_id The id of an institute. * @return SimpleORMapCollection A collection of Studiengaenge. */ - public static function findByAbschlussKategorieFachbereich($kategorie_id, - $fachbereich_id) - { - return parent::getEnrichedByQuery(' + public static function findByAbschlussKategorieFachbereich( + $kategorie_id, + $fachbereich_id + ) { + return parent::getEnrichedByQuery( + ' SELECT ms.*, COUNT(mfi.fach_id) AS `count_faecher` FROM mvv_studiengang AS ms @@ -266,7 +272,8 @@ class Studiengang extends ModuleManagementModelTreeItem */ public static function findByStgTeil($stgteil_id) { - return parent::getEnrichedByQuery(' + return parent::getEnrichedByQuery( + ' SELECT ms.* FROM mvv_studiengang ms LEFT JOIN mvv_stg_stgteil mss USING(studiengang_id) @@ -288,7 +295,8 @@ class Studiengang extends ModuleManagementModelTreeItem public static function findByModule($modul_ids, $only_public = true) { if ($only_public) { - return parent::getEnrichedByQuery(' + return parent::getEnrichedByQuery( + ' SELECT ms.*, COUNT(DISTINCT modul_id) AS count_module FROM mvv_stgteilabschnitt_modul AS msm @@ -308,7 +316,8 @@ class Studiengang extends ModuleManagementModelTreeItem ] ); } else { - return parent::getEnrichedByQuery(' + return parent::getEnrichedByQuery( + ' SELECT ms.*, COUNT(DISTINCT modul_id) AS count_module FROM mvv_stgteilabschnitt_modul AS msm INNER JOIN mvv_stgteilabschnitt USING (abschnitt_id) @@ -318,7 +327,8 @@ class Studiengang extends ModuleManagementModelTreeItem WHERE msm.modul_id IN (?) GROUP BY studiengang_id ORDER BY count_module DESC', - [$modul_ids]); + [$modul_ids] + ); } } @@ -333,9 +343,10 @@ class Studiengang extends ModuleManagementModelTreeItem * @return array The array with studiengaenge. Empty if no Studiengang * was found. */ - public static function toArrayFachbereichAbschlussKategorie($fachbereich_id, - $kategorie_id) - { + public static function toArrayFachbereichAbschlussKategorie( + $fachbereich_id, + $kategorie_id + ) { $studiengaenge = []; $query = ' SELECT ms.studiengang_id, ms.name @@ -369,13 +380,22 @@ class Studiengang extends ModuleManagementModelTreeItem * @param int $offset The first object to return in a result set. * @return SimpleORMapCollection A collection of Studiengaenge. */ - public static function getAllEnriched($sortby = 'name', $order = 'ASC', - $filter = null, $row_count = null, $offset = null) - { - $sortby = self::createSortStatement($sortby, $order, 'name', - words('abschluss_name kategorie_name count_faecher ' - . 'count_stgteile count_dokumente institut_name')); - return parent::getEnrichedByQuery(" + public static function getAllEnriched( + $sortby = 'name', + $order = 'ASC', + $filter = null, + $row_count = null, + $offset = null + ) { + $sortby = self::createSortStatement( + $sortby, + $order, + 'name', + words('abschluss_name kategorie_name count_faecher ' + . 'count_stgteile count_dokumente institut_name') + ); + return parent::getEnrichedByQuery( + " SELECT mvv_studiengang.*, abschluss.name AS `abschluss_name`, mvv_abschl_kategorie.name AS `kategorie_name`, @@ -443,7 +463,8 @@ class Studiengang extends ModuleManagementModelTreeItem */ public static function getEnriched($studiengang_id) { - $studiengaenge = parent::getEnrichedByQuery(' + $studiengaenge = parent::getEnrichedByQuery( + ' SELECT ms.*, a.name AS `abschluss_name`, mak.name AS `kategorie_name`, mak.kategorie_id, COUNT(mst.fach_id) AS `count_faecher`, @@ -475,7 +496,8 @@ class Studiengang extends ModuleManagementModelTreeItem $ret .= ' (' . $this->abschluss->name . ')'; } if ($options & self::DISPLAY_KATEGORIE) { - $ret .= (mb_strlen($this->abschluss->category->name) + $ret .= ( + mb_strlen($this->abschluss->category->name) ? ' (' . $this->abschluss->category->name . ')' : '' ); @@ -558,7 +580,8 @@ class Studiengang extends ModuleManagementModelTreeItem } else { $fach_sql = ''; } - return parent::getEnrichedByQuery(' + return parent::getEnrichedByQuery( + ' SELECT mvv_studiengang.*, abschluss.name AS `abschluss_name`, mvv_abschl_kategorie.name AS `kategorie_name`, @@ -752,7 +775,8 @@ class Studiengang extends ModuleManagementModelTreeItem return $start_sem->beginn <= $time && $time <= $end_sem->ende; } - public function getVariant() { + public function getVariant() + { return $this->typ; } @@ -819,7 +843,8 @@ class Studiengang extends ModuleManagementModelTreeItem } $this->languages = SimpleORMapCollection::createFromArray( - $assigned_languages); + $assigned_languages + ); } /** @@ -915,7 +940,7 @@ class Studiengang extends ModuleManagementModelTreeItem $ret['start'] = true; $messages[] = _('Ungültiges Semester.'); $rejected = true; - } else if ($this->end) { + } elseif ($this->end) { $end_sem = Semester::find($this->end); if ($end_sem) { if ($start_sem->beginn > $end_sem->beginn) { @@ -929,7 +954,7 @@ class Studiengang extends ModuleManagementModelTreeItem $rejected = true; } } - } else { + } else { $ret['start'] = true; $messages[] = _('Bitte ein Startsemester angeben.'); $rejected = true; diff --git a/lib/models/StudiengangStgteil.php b/lib/models/StudiengangStgteil.php index 9914022..2f5a33f 100644 --- a/lib/models/StudiengangStgteil.php +++ b/lib/models/StudiengangStgteil.php @@ -38,11 +38,11 @@ class StudiengangStgteil extends ModuleManagementModel ]; $config['additional_fields']['stgteil_name']['get'] = - function($st) { return $st->stgteil_name; }; + function ($st) { return $st->stgteil_name; }; $config['additional_fields']['stgbez_id']['get'] = - function($st) { return $st->stgbez_id; }; + function ($st) { return $st->stgbez_id; }; $config['additional_fields']['stgbez_name']['get'] = - function($st) { return $st->stgbez_name; }; + function ($st) { return $st->stgbez_name; }; parent::configure($config); } @@ -64,7 +64,7 @@ class StudiengangStgteil extends ModuleManagementModel return false; } $stg_stgteil = parent::getEnrichedByQuery( - 'SELECT mss.*, CONCAT(mf.name, ": ", ' + 'SELECT mss.*, CONCAT(mf.name, ": ", ' . 'mst.zusatz, " (", mst.kp, " CP)") AS `stgteil_name`, ' . 'msb.name AS `stgbez_name` ' . 'FROM mvv_stg_stgteil mss ' @@ -72,7 +72,8 @@ class StudiengangStgteil extends ModuleManagementModel . 'LEFT JOIN fach mf USING(fach_id) ' . 'LEFT JOIN mvv_stgteil_bez msb USING(stgteil_bez_id) ' . 'WHERE mss.studiengang_id = ? AND mss.stgteil_id = ?', - [$id[0], $id[1]]); + [$id[0], $id[1]] + ); if (sizeof($stg_stgteil)) { return $stg_stgteil->find(join('_', $id)); } @@ -108,19 +109,24 @@ class StudiengangStgteil extends ModuleManagementModel * @param string $bez_id The id of a Studiengangteil-Bezeichnung. * @return SimpleORMapCollection A collection of StudiengangStgteile. */ - public static function findByStudiengangStgteilBez($studiengang_id, - $bez_id = null) - { + public static function findByStudiengangStgteilBez( + $studiengang_id, + $bez_id = null + ) { if ($bez_id) { - return parent::getEnrichedByQuery('SELECT * FROM mvv_stg_stgteil WHERE ' + return parent::getEnrichedByQuery( + 'SELECT * FROM mvv_stg_stgteil WHERE ' . 'studiengang_id = ? AND stgteil_bez_id = ? ' . 'ORDER BY position, mkdate', - [$studiengang_id, $bez_id]); + [$studiengang_id, $bez_id] + ); } else { - return parent::getEnrichedByQuery('SELECT * FROM mvv_stg_stgteil WHERE ' + return parent::getEnrichedByQuery( + 'SELECT * FROM mvv_stg_stgteil WHERE ' . "studiengang_id = ? AND stgteil_bez_id = '' " . 'ORDER BY position, mkdate', - [$studiengang_id]); + [$studiengang_id] + ); } } diff --git a/lib/models/StudiengangTeil.php b/lib/models/StudiengangTeil.php index 0d73c3d..546eacc 100644 --- a/lib/models/StudiengangTeil.php +++ b/lib/models/StudiengangTeil.php @@ -53,13 +53,13 @@ class StudiengangTeil extends ModuleManagementModelTreeItem $config['additional_fields']['count_versionen']['get'] = - function($stgteil) { return $stgteil->count_versionen; }; + function ($stgteil) { return $stgteil->count_versionen; }; $config['additional_fields']['fach_name']['get'] = - function($stgteil) { return $stgteil->fach_name; }; + function ($stgteil) { return $stgteil->fach_name; }; $config['additional_fields']['count_contacts']['get'] = - function($stgteil) { return $stgteil->count_contacts; }; + function ($stgteil) { return $stgteil->count_contacts; }; $config['additional_fields']['stgteil_name']['get'] = - function($stgteil) { return $stgteil->stgteil_name; }; + function ($stgteil) { return $stgteil->stgteil_name; }; $config['i18n_fields']['zusatz'] = true; @@ -115,8 +115,8 @@ class StudiengangTeil extends ModuleManagementModelTreeItem } else { $name = ''; } - $name .= $this->kp ? $this->kp . ' CP ' : ''; - $name .= $this->zusatz ? $this->zusatz : ''; + $name .= $this->kp ? $this->kp . ' CP ' : ''; + $name .= $this->zusatz ? $this->zusatz : ''; return trim($name); } @@ -162,7 +162,8 @@ class StudiengangTeil extends ModuleManagementModelTreeItem */ public static function getEnriched($stgteil_id) { - $stgteil = parent::getEnrichedByQuery(" + $stgteil = parent::getEnrichedByQuery( + " SELECT `mvv_stgteil`.*, CONCAT(`fach`.`name`, ': ', `mvv_stgteil`.`zusatz`, ' (', `mvv_stgteil`.`kp`, ' CP)') AS stgteil_name, `fach`.`name` AS `fach_name`, @@ -170,7 +171,8 @@ class StudiengangTeil extends ModuleManagementModelTreeItem FROM `mvv_stgteil` LEFT JOIN `fach` USING(`fach_id`) WHERE `mvv_stgteil`.`stgteil_id` = ?", - [$stgteil_id]); + [$stgteil_id] + ); if (sizeof($stgteil)) { return $stgteil->find($stgteil_id); } @@ -191,14 +193,21 @@ class StudiengangTeil extends ModuleManagementModelTreeItem * @param int $offset The first object to return in a result set. * @return SimpleORMapCollection A collection of Studiengangteile. */ - public static function getAllEnriched($sortby = 'fach_name', - $order = 'ASC', $filter = null, $row_count = null, $offset = null) - { - $sortby = self::createSortStatement($sortby, $order, - 'fach_name', - words('fach_name stgteil_name count_contacts count_versionen')); + public static function getAllEnriched( + $sortby = 'fach_name', + $order = 'ASC', + $filter = null, + $row_count = null, + $offset = null + ) { + $sortby = self::createSortStatement( + $sortby, + $order, + 'fach_name', + words('fach_name stgteil_name count_contacts count_versionen') + ); return parent::getEnrichedByQuery( - 'SELECT mvv_stgteil.*, CONCAT(fach.name, ": ", ' + 'SELECT mvv_stgteil.*, CONCAT(fach.name, ": ", ' . 'mvv_stgteil.zusatz, " (", mvv_stgteil.kp, " KP)") AS stgteil_name, ' . 'fach.name AS fach_name, ' . 'COUNT(DISTINCT mvv_contacts_ranges.contact_range_id) AS count_contacts, ' @@ -211,7 +220,11 @@ class StudiengangTeil extends ModuleManagementModelTreeItem . 'LEFT JOIN mvv_stgteilversion USING(stgteil_id) ' . self::getFilterSql($filter, true) . 'GROUP BY mvv_stgteil.stgteil_id ' - . 'ORDER BY ' . $sortby, [], $row_count, $offset); + . 'ORDER BY ' . $sortby, + [], + $row_count, + $offset + ); } /** @@ -243,20 +256,28 @@ class StudiengangTeil extends ModuleManagementModelTreeItem * @param string $order ASC or DESC direction of order. * @return SimpleORMapCollection A collection of Studiengangteile. */ - public static function findByStudiengang($studiengang_id, - $sort = 'stgteil_position, stgteil_chdate', $order = 'ASC') - { - $sort = self::createSortStatement($sort, $order, 'chdate', - ['stgteil_position', 'stgteil_chdate']); + public static function findByStudiengang( + $studiengang_id, + $sort = 'stgteil_position, stgteil_chdate', + $order = 'ASC' + ) { + $sort = self::createSortStatement( + $sort, + $order, + 'chdate', + ['stgteil_position', 'stgteil_chdate'] + ); return parent::getEnrichedByQuery( - 'SELECT mst.*, msb.*, mss.position AS `stgteil_position`, ' + 'SELECT mst.*, msb.*, mss.position AS `stgteil_position`, ' . 'mss.chdate AS `stgteil_chdate`' . 'FROM mvv_stg_stgteil mss ' . 'LEFT JOIN mvv_stgteil_bez msb USING(stgteil_bez_id) ' . 'LEFT JOIN mvv_stgteil mst USING(stgteil_id) ' . 'LEFT JOIN fach mf USING(fach_id) ' . 'WHERE studiengang_id = ? ' - . 'ORDER BY ' . $sort, [$studiengang_id]); + . 'ORDER BY ' . $sort, + [$studiengang_id] + ); } /** @@ -270,9 +291,12 @@ class StudiengangTeil extends ModuleManagementModelTreeItem * @param string $order ASC or DESC direction of order. * @return SimpleORMapCollection A collection of Studiengangteile. */ - public static function findByFach($fach_id, $filter = null, - $sort = 'chdate', $order = 'DESC') - { + public static function findByFach( + $fach_id, + $filter = null, + $sort = 'chdate', + $order = 'DESC' + ) { $sort = self::createSortStatement($sort, $order, 'chdate'); $params = [$fach_id]; return parent::getEnrichedByQuery( @@ -281,7 +305,9 @@ class StudiengangTeil extends ModuleManagementModelTreeItem LEFT JOIN `fach` USING(`fach_id`) WHERE `fach`.`fach_id` = ? ' . self::getFilterSql($filter) . - 'ORDER BY ' . $sort, $params); + 'ORDER BY ' . $sort, + $params + ); } /** @@ -296,11 +322,18 @@ class StudiengangTeil extends ModuleManagementModelTreeItem * @param string $order ASC or DESC direction of order. * @return SimpleORMapCollection A collection of Studiengangteile. */ - public static function findByFachbereich($fachbereich_id, $filter = null, - $sort = 'chdate', $order = 'DESC') - { - $sort = self::createSortStatement($sort, $order, 'chdate', - ['fach_name']); + public static function findByFachbereich( + $fachbereich_id, + $filter = null, + $sort = 'chdate', + $order = 'DESC' + ) { + $sort = self::createSortStatement( + $sort, + $order, + 'chdate', + ['fach_name'] + ); $params = [$fachbereich_id]; return parent::getEnrichedByQuery(' SELECT `mvv_stgteil`.*, `fach`.`name` AS `fach_name` @@ -322,11 +355,15 @@ class StudiengangTeil extends ModuleManagementModelTreeItem * to filter the result set. * @return SimpleORMapCollection A collection of Studiengangteile. */ - public static function getAssignedFachbereiche($sortby = 'name', $order = 'ASC', - $filter = null) - { - $sortby = (in_array($sortby, - words('name stgteile')) + public static function getAssignedFachbereiche( + $sortby = 'name', + $order = 'ASC', + $filter = null + ) { + $sortby = (in_array( + $sortby, + words('name stgteile') + ) ? $sortby : 'name'); $order = ($order != 'DESC' ? ' ASC' : ' DESC'); $fachbereiche = []; @@ -358,9 +395,10 @@ class StudiengangTeil extends ModuleManagementModelTreeItem * @param string $stgteil_bez_id The id of a Studiengangteil-Bezeichnung. * @return SimpleORMapCollection A collection of Studiengangteile. */ - public static function findByStudiengangStgteilBez($studiengang_id, - $stgteil_bez_id) - { + public static function findByStudiengangStgteilBez( + $studiengang_id, + $stgteil_bez_id + ) { return parent::getEnrichedByQuery( 'SELECT `mvv_stgteil`.* FROM `mvv_stgteil` @@ -369,7 +407,8 @@ class StudiengangTeil extends ModuleManagementModelTreeItem WHERE `mvv_stg_stgteil`.`studiengang_id` = ? AND `mvv_stg_stgteil`.`stgteil_bez_id` = ? ORDER BY `position`, `chdate`', - [$studiengang_id, $stgteil_bez_id]); + [$studiengang_id, $stgteil_bez_id] + ); } /** @@ -395,7 +434,9 @@ class StudiengangTeil extends ModuleManagementModelTreeItem WHERE (`mvv_stgteil`.`zusatz` LIKE ? OR `fach`.`name` LIKE ?) ' . self::getFilterSql($filter) . - 'GROUP BY `stgteil_id` ORDER BY `fach`.`name`', [$term, $term]); + 'GROUP BY `stgteil_id` ORDER BY `fach`.`name`', + [$term, $term] + ); } /** @@ -417,7 +458,8 @@ class StudiengangTeil extends ModuleManagementModelTreeItem 'SELECT COUNT(DISTINCT `fach_id`) FROM `mvv_stgteil` INNER JOIN `mvv_fach_inst` USING(`fach_id`) ' . - self::getFilterSql($filter, true)); + self::getFilterSql($filter, true) + ); return $result->fetchColumn(); } diff --git a/lib/models/StudipComment.class.php b/lib/models/StudipComment.class.php index 226daab..9110409 100644 --- a/lib/models/StudipComment.class.php +++ b/lib/models/StudipComment.class.php @@ -1,4 +1,5 @@ <?php + # Lifter007: TODO # Lifter003: TEST # Lifter010: TODO diff --git a/lib/models/StudipEvaluation.php b/lib/models/StudipEvaluation.php index 58a8f53..5c67c66 100644 --- a/lib/models/StudipEvaluation.php +++ b/lib/models/StudipEvaluation.php @@ -82,7 +82,7 @@ class StudipEvaluation extends SimpleORMap return null; } - function getNumberOfVotes () + public function getNumberOfVotes() { return DBManager::get()->fetchColumn("SELECT count(DISTINCT user_id) FROM eval_user WHERE eval_id = ?", [$this->id]); } diff --git a/lib/models/StudipNews.class.php b/lib/models/StudipNews.class.php index 648ae1e..344ba9d 100644 --- a/lib/models/StudipNews.class.php +++ b/lib/models/StudipNews.class.php @@ -1,4 +1,5 @@ <?php + // +---------------------------------------------------------------------------+ // This file is part of Stud.IP // @@ -297,14 +298,15 @@ class StudipNews extends SimpleORMap implements PrivacyObject if (!isset($objects[$area][$id]['semester'])) { $objects[$area][$id]['semester'] = ''; } - $objects[$area][$id]['semester'] .= sprintf('(%s%s)', + $objects[$area][$id]['semester'] .= sprintf( + '(%s%s)', $result['startsem'], - $result['startsem'] != $result['endsem'] ? ' - ' . $result['endsem'] : ''); + $result['startsem'] != $result['endsem'] ? ' - ' . $result['endsem'] : '' + ); } elseif ($area === 'user') { if ($GLOBALS['user']->id === $result['userid']) { $objects[$area][$id]['title'] = _('Ankündigungen auf Ihrer Profilseite'); - } - else { + } else { $objects[$area][$id]['title'] = sprintf(_('Ankündigungen auf der Profilseite von %s'), get_fullname($result['userid'])); } } elseif ($area === 'global') { @@ -331,7 +333,7 @@ class StudipNews extends SimpleORMap implements PrivacyObject public static function GetRangeFromRssID($rss_id) { - if ($rss_id){ + if ($rss_id) { $query = "SELECT range_id ,range_type FROM news_rss_range WHERE rss_id = ?"; @@ -362,7 +364,7 @@ class StudipNews extends SimpleORMap implements PrivacyObject public static function SetRssId($range_id, $type = false) { - if (!$type){ + if (!$type) { $type = get_object_type($range_id); if ($type === 'fak') { $type = 'inst'; @@ -480,22 +482,25 @@ class StudipNews extends SimpleORMap implements PrivacyObject $type = get_object_type($range_id, ['global', 'sem', 'inst', 'fak', 'user']); switch($type) { case 'global': - if ($operation === 'view') + if ($operation === 'view') { return $news_range_perm_cache[$user_id.$range_id.$operation] = true; + } break; case 'fak': case 'inst': case 'sem': if ($operation === 'view' - && ($type !== 'sem' + && ( + $type !== 'sem' || $GLOBALS['perm']->have_studip_perm('user', $range_id) || (Config::get()->ENABLE_FREE_ACCESS && Seminar::getInstance($range_id)->read_level == 0) - )) { - return $news_range_perm_cache[$user_id.$range_id.$operation] = true; - } + )) { + return $news_range_perm_cache[$user_id.$range_id.$operation] = true; + } if ($operation === 'edit' || $operation === 'copy') { - if ($GLOBALS['perm']->have_studip_perm('tutor', $range_id)) + if ($GLOBALS['perm']->have_studip_perm('tutor', $range_id)) { return $news_range_perm_cache[$user_id.$range_id.$operation] = true; + } } break; case 'user': @@ -504,8 +509,9 @@ class StudipNews extends SimpleORMap implements PrivacyObject return $news_range_perm_cache[$user_id.$range_id.$operation] = true; } } elseif ($operation === 'edit' || $operation == 'copy') { - if ($GLOBALS['perm']->have_profile_perm('user', $range_id)) + if ($GLOBALS['perm']->have_profile_perm('user', $range_id)) { return $news_range_perm_cache[$user_id.$range_id.$operation] = true; + } } break; } @@ -590,8 +596,7 @@ class StudipNews extends SimpleORMap implements PrivacyObject // root, owner, and owner's deputy have full permission if ($GLOBALS['perm']->have_perm('root', $user_id) || ($user_id === $this->user_id && $GLOBALS['perm']->have_perm('autor')) - || (Deputy::isEditActivated() && Deputy::isDeputy($user_id, $this->user_id, true))) - { + || (Deputy::isEditActivated() && Deputy::isDeputy($user_id, $this->user_id, true))) { return true; } @@ -635,7 +640,7 @@ class StudipNews extends SimpleORMap implements PrivacyObject $this->user_id = $GLOBALS['user']->id; $this->author = get_fullname(false, 'full', false); } - if (!$this->user_id OR !$this->author) { + if (!$this->user_id or !$this->author) { PageLayout::postError(_('Fehler: Personenangabe unvollständig.')); return false; } diff --git a/lib/models/StudipStudyArea.class.php b/lib/models/StudipStudyArea.class.php index 6650526..463d198 100644 --- a/lib/models/StudipStudyArea.class.php +++ b/lib/models/StudipStudyArea.class.php @@ -34,7 +34,7 @@ class StudipStudyArea extends SimpleORMap /** * This constant represents the key of the root area. */ - const ROOT = 'root'; + public const ROOT = 'root'; protected static function configure($config = []) { @@ -69,7 +69,7 @@ class StudipStudyArea extends SimpleORMap /** * Returns the children of the study area with the specified ID. */ - static function findByParent($parent_id) + public static function findByParent($parent_id) { return self::findByparent_id($parent_id, "ORDER BY priority,name"); } @@ -80,13 +80,11 @@ class StudipStudyArea extends SimpleORMap public static function find($id) { - $result = NULL; + $result = null; if ($id === self::ROOT) { $result = self::getRootArea(); - } - - else { + } else { $result = parent::find($id); } @@ -156,7 +154,7 @@ class StudipStudyArea extends SimpleORMap */ public function getParent() { - $result = NULL; + $result = null; if ($this->getID() !== self::ROOT) { $result = $this->_parent; } @@ -198,7 +196,7 @@ class StudipStudyArea extends SimpleORMap */ public function getTypeName() { - if(isset($GLOBALS['SEM_TREE_TYPES'][$this->getType()]['name'])){ + if(isset($GLOBALS['SEM_TREE_TYPES'][$this->getType()]['name'])) { return $GLOBALS['SEM_TREE_TYPES'][$this->getType()]['name']; } else { return ''; @@ -212,7 +210,7 @@ class StudipStudyArea extends SimpleORMap */ public function isEditable() { - if(isset($GLOBALS['SEM_TREE_TYPES'][$this->getType()]['editable'])){ + if(isset($GLOBALS['SEM_TREE_TYPES'][$this->getType()]['editable'])) { return (bool)$GLOBALS['SEM_TREE_TYPES'][$this->getType()]['editable']; } else { return false; @@ -240,7 +238,7 @@ class StudipStudyArea extends SimpleORMap * * @return mixed TODO */ - public function getPath($separator = NULL) + public function getPath($separator = null) { $path = []; diff --git a/lib/models/TFASecret.php b/lib/models/TFASecret.php index 6d14c81..6ae2562 100644 --- a/lib/models/TFASecret.php +++ b/lib/models/TFASecret.php @@ -1,4 +1,5 @@ <?php + use OTPHP\TOTP; /** @@ -23,7 +24,7 @@ class TFASecret extends SimpleORMap { // Possible authentication types (email may require more tokens in a short // period of time with a larger window to accept them). - const TYPES = [ + public const TYPES = [ 'email' => [ 'window' => 60, 'period' => 5, diff --git a/lib/models/User.class.php b/lib/models/User.class.php index 8219fa7..82c5551 100644 --- a/lib/models/User.class.php +++ b/lib/models/User.class.php @@ -514,7 +514,7 @@ class User extends AuthUserMd5 implements Range, PrivacyObject */ public function triggerChdate() { - return $this->info->triggerChdate(); + return $this->info->triggerChdate(); } /** @@ -540,10 +540,10 @@ class User extends AuthUserMd5 implements Range, PrivacyObject return $this->nachname . ', ' . $this->vorname; } if ($concat === null) { - $concat = function() {return join('', func_get_args());}; - $left = function($str, $c = 0) {return mb_substr($str,0,$c);}; - $if = function($ok,$yes,$no) {return $ok ? $yes : $no;}; - $quote = function($str) {return "'" . addcslashes($str, "\\'\0") . "'";}; + $concat = function () {return join('', func_get_args());}; + $left = function ($str, $c = 0) {return mb_substr($str, 0, $c);}; + $if = function ($ok, $yes, $no) {return $ok ? $yes : $no;}; + $quote = function ($str) {return "'" . addcslashes($str, "\\'\0") . "'";}; } $data = array_map($quote, $this->toArray('vorname nachname username title_front title_rear motto perms')); @@ -666,7 +666,7 @@ class User extends AuthUserMd5 implements Range, PrivacyObject parent::initRelation($relation); if ($relation == 'info' && is_null($this->relations['info'])) { $options = $this->getRelationOptions($relation); - $result = new $options['class_name']; + $result = new $options['class_name'](); $foreign_key_value = call_user_func($options['assoc_func_params_func'], $this); call_user_func($options['assoc_foreign_key_setter'], $result, $foreign_key_value); $this->relations[$relation] = $result; @@ -700,7 +700,7 @@ class User extends AuthUserMd5 implements Range, PrivacyObject */ public function getStudipKingIcon() { - $is_king = StudipKing::is_king($this->user_id, TRUE); + $is_king = StudipKing::is_king($this->user_id, true); $result = ''; foreach ($is_king as $type => $text) { @@ -930,7 +930,7 @@ class User extends AuthUserMd5 implements Range, PrivacyObject return false; } - $validator = new email_validation_class; ## Klasse zum Ueberpruefen der Eingaben + $validator = new email_validation_class(); ## Klasse zum Ueberpruefen der Eingaben $validator->timeout = 10; $REMOTE_ADDR = $_SERVER['REMOTE_ADDR']; $Zeit = date('H:i:s, d.m.Y'); @@ -944,14 +944,16 @@ class User extends AuthUserMd5 implements Range, PrivacyObject for ($email_restriction_count = 0; $email_restriction_count < count($email_restriction_parts); $email_restriction_count++) { if ($email_restriction_count == count($email_restriction_parts) - 1) { $email_restriction_msg_part .= '@' . trim($email_restriction_parts[$email_restriction_count]) . '<br>'; - } else if (($email_restriction_count + 1) % 3) { + } elseif (($email_restriction_count + 1) % 3) { $email_restriction_msg_part .= '@' . trim($email_restriction_parts[$email_restriction_count]) . ', '; } else { $email_restriction_msg_part .= '@' . trim($email_restriction_parts[$email_restriction_count]) . ',<br>'; } } - PageLayout::postError(sprintf(_('Die E-Mail-Adresse fehlt, ist falsch geschrieben oder gehört nicht zu folgenden Domains:%s'), - '<br>' . htmlReady($email_restriction_msg_part))); + PageLayout::postError(sprintf( + _('Die E-Mail-Adresse fehlt, ist falsch geschrieben oder gehört nicht zu folgenden Domains:%s'), + '<br>' . htmlReady($email_restriction_msg_part) + )); } else { PageLayout::postError(_('Die E-Mail-Adresse fehlt oder ist falsch geschrieben!')); } @@ -970,8 +972,10 @@ class User extends AuthUserMd5 implements Range, PrivacyObject } if (self::countBySql('email = ? AND user_id != ?', [$email, $this->user_id])) { - PageLayout::postError(sprintf(_('Die angegebene E-Mail-Adresse wird bereits von einem anderen Benutzer (%s) verwendet. Bitte geben Sie eine andere E-Mail-Adresse an.'), - htmlReady($this->getFullName()))); + PageLayout::postError(sprintf( + _('Die angegebene E-Mail-Adresse wird bereits von einem anderen Benutzer (%s) verwendet. Bitte geben Sie eine andere E-Mail-Adresse an.'), + htmlReady($this->getFullName()) + )); return false; } @@ -982,13 +986,15 @@ class User extends AuthUserMd5 implements Range, PrivacyObject // generate 10 char activation key $key = ''; - mt_srand((double)microtime() * 1000000); + mt_srand((float)microtime() * 1000000); for ($i = 1; $i <= 10; $i++) { $temp = mt_rand() % 36; - if ($temp < 10) - $temp += 48; // 0 = chr(48), 9 = chr(57) - else - $temp += 87; // a = chr(97), z = chr(122) + if ($temp < 10) { + $temp += 48; + } // 0 = chr(48), 9 = chr(57) + else { + $temp += 87; + } // a = chr(97), z = chr(122) $key .= chr($temp); } $this->validation_key = $key; @@ -1461,7 +1467,7 @@ class User extends AuthUserMd5 implements Range, PrivacyObject /** * @see Range::__toString() */ - public function __toString() : string + public function __toString(): string { return $this->getFullName(); } diff --git a/lib/models/UserDomain.php b/lib/models/UserDomain.php index 8179082..7a75209 100644 --- a/lib/models/UserDomain.php +++ b/lib/models/UserDomain.php @@ -9,7 +9,7 @@ */ class UserDomain extends SimpleORMap { - const REGEXP = '^[\\w\.\-]{1,32}$'; + public const REGEXP = '^[\\w\.\-]{1,32}$'; protected static function configure($config = []) { @@ -43,7 +43,7 @@ class UserDomain extends SimpleORMap * Get an array of all defined user domains. * Returns an array of UserDomain objects. */ - public static function getUserDomains () + public static function getUserDomains() { return self::findBySQL('1 ORDER BY name'); } @@ -75,7 +75,7 @@ class UserDomain extends SimpleORMap /** * Add a user to this user domain. */ - public function addUser ($user_id) + public function addUser($user_id) { $query = "INSERT IGNORE INTO user_userdomains (user_id, userdomain_id) VALUES (:user_id, :id)"; @@ -90,7 +90,7 @@ class UserDomain extends SimpleORMap /** * Remove a user from this user domain. */ - public function removeUser ($user_id) + public function removeUser($user_id) { $query = "DELETE FROM user_userdomains WHERE user_id = :user_id @@ -107,7 +107,7 @@ class UserDomain extends SimpleORMap * Get an array of all user domains for a specific user. * Returns an array of UserDomain objects. */ - public static function getUserDomainsForUser ($user_id) + public static function getUserDomainsForUser($user_id) { $domains = User::find($user_id)->domains; return $domains ? $domains->getArrayCopy() : []; @@ -116,7 +116,7 @@ class UserDomain extends SimpleORMap /** * Remove all user domains for a specific user. */ - public static function removeUserDomainsForUser ($user_id) + public static function removeUserDomainsForUser($user_id) { $query = "DELETE FROM user_userdomains WHERE user_id = :user_id"; @@ -130,7 +130,7 @@ class UserDomain extends SimpleORMap /** * Add a seminar to this user domain. */ - public function addSeminar ($seminar_id) + public function addSeminar($seminar_id) { $query = "INSERT IGNORE INTO seminar_userdomains (seminar_id, userdomain_id) VALUES (:seminar_id, :id)"; @@ -145,7 +145,7 @@ class UserDomain extends SimpleORMap /** * Remove a seminar from this user domain. */ - public function removeSeminar ($seminar_id) + public function removeSeminar($seminar_id) { $query = "DELETE FROM seminar_userdomains WHERE seminar_id = :seminar_id @@ -162,7 +162,7 @@ class UserDomain extends SimpleORMap * Get an array of all user domains for a specific seminar. * Returns an array of UserDomain objects. */ - public static function getUserDomainsForSeminar ($seminar_id) + public static function getUserDomainsForSeminar($seminar_id) { return Course::find($seminar_id)->domains->getArrayCopy(); } @@ -170,7 +170,7 @@ class UserDomain extends SimpleORMap /** * Remove all user domains for a specific seminar. */ - public static function removeUserDomainsForSeminar ($seminar_id) + public static function removeUserDomainsForSeminar($seminar_id) { $query = "DELETE FROM seminar_userdomains WHERE seminar_id = :seminar_id"; diff --git a/lib/models/UserInfo.class.php b/lib/models/UserInfo.class.php index 403e70b..b15b133 100644 --- a/lib/models/UserInfo.class.php +++ b/lib/models/UserInfo.class.php @@ -43,10 +43,10 @@ class UserInfo extends SimpleORMap /** * Constants for column geschlecht */ - const GENDER_UNKNOWN = 0; - const GENDER_MALE = 1; - const GENDER_FEMALE = 2; - const GENDER_DIVERSE = 3; + public const GENDER_UNKNOWN = 0; + public const GENDER_MALE = 1; + public const GENDER_FEMALE = 2; + public const GENDER_DIVERSE = 3; protected static function configure($config = []) { diff --git a/lib/models/UserOnline.class.php b/lib/models/UserOnline.class.php index ec3c0cb..df13887 100644 --- a/lib/models/UserOnline.class.php +++ b/lib/models/UserOnline.class.php @@ -24,4 +24,4 @@ class UserOnline extends SimpleORMap $config['db_table'] = 'user_online'; parent::configure($config); } -}
\ No newline at end of file +} diff --git a/lib/models/Vote.php b/lib/models/Vote.php index d3d6d75..2fcfa03 100644 --- a/lib/models/Vote.php +++ b/lib/models/Vote.php @@ -1,9 +1,10 @@ <?php + require_once 'lib/classes/QuestionType.interface.php'; class Vote extends QuestionnaireQuestion implements QuestionType { - public static function getIcon(bool $active = false) : Icon + public static function getIcon(bool $active = false): Icon { return Icon::create(static::getIconShape(), $active ? Icon::ROLE_CLICKABLE : Icon::ROLE_INFO); } @@ -22,7 +23,7 @@ class Vote extends QuestionnaireQuestion implements QuestionType return _('Auswahlfrage'); } - static public function getEditingComponent() + public static function getEditingComponent() { return ['vote-edit', '']; } @@ -54,8 +55,7 @@ class Vote extends QuestionnaireQuestion implements QuestionType $userAnswer = $answers[$this->getId()]['answerdata']['answers']; if (is_array($userAnswer)) { $userAnswer = array_map('intval', $userAnswer); - } - else { + } else { $userAnswer = (int) $userAnswer; } } diff --git a/lib/models/WebserviceAccessRule.class.php b/lib/models/WebserviceAccessRule.class.php index 51eceee..ca32488 100644 --- a/lib/models/WebserviceAccessRule.class.php +++ b/lib/models/WebserviceAccessRule.class.php @@ -45,7 +45,7 @@ class WebserviceAccessRule extends SimpleORMap * @param string $api_key * @return array of WebserviceAccessRule objects */ - static function findByApiKey($api_key) + public static function findByApiKey($api_key) { return self::findByapi_key($api_key, " ORDER BY type"); } @@ -55,7 +55,7 @@ class WebserviceAccessRule extends SimpleORMap * * @return array of WebserviceAccessRule objects */ - static function findAll() + public static function findAll() { return self::findBySQL("1 ORDER BY api_key, type"); } @@ -69,7 +69,7 @@ class WebserviceAccessRule extends SimpleORMap * @param string $ip an IP Address * @return boolean returns true if access fpr given params is allowed */ - static function checkAccess($api_key, $method, $ip) + public static function checkAccess($api_key, $method, $ip) { $rules = self::findByApiKey($api_key); $access = false; @@ -95,7 +95,7 @@ class WebserviceAccessRule extends SimpleORMap * @param string $check_ip an IP Address * @return boolean true if given Address is in specified range */ - function checkIpInRange($check_ip) + public function checkIpInRange($check_ip) { if (!ip2long($check_ip)) { return false; @@ -108,7 +108,7 @@ class WebserviceAccessRule extends SimpleORMap if (!$mask) { $mask = 32; } - if ( (ip2long($check_ip) & ~((1 << (32 - $mask)) - 1)) == ip2long($ip)) { + if ((ip2long($check_ip) & ~((1 << (32 - $mask)) - 1)) == ip2long($ip)) { return true; } } @@ -124,7 +124,7 @@ class WebserviceAccessRule extends SimpleORMap * @param string $method a webservice method name * @return boolean true if given name matches the specified */ - function checkMethodName($method) + public function checkMethodName($method) { return ($method && (!$this->method || mb_strpos($method, $this->method) !== false)); } diff --git a/lib/models/WikiPage.class.php b/lib/models/WikiPage.class.php index 82abcd4..a2520df 100644 --- a/lib/models/WikiPage.class.php +++ b/lib/models/WikiPage.class.php @@ -139,8 +139,7 @@ class WikiPage extends SimpleORMap implements PrivacyObject // anyone can see this page if it belongs to a free course if (!$this->config->read_restricted && Config::get()->ENABLE_FREE_ACCESS - && $this->course && $this->course->lesezugriff == 0) - { + && $this->course && $this->course->lesezugriff == 0) { return true; } @@ -236,7 +235,8 @@ class WikiPage extends SimpleORMap implements PrivacyObject * * @param string ancestor Wikipage name to be set as the parent */ - public function setAncestorForAllVersions($ancestor) { + public function setAncestorForAllVersions($ancestor) + { $query = "UPDATE wiki SET diff --git a/lib/models/eTask/Attempt.php b/lib/models/eTask/Attempt.php index f4a6cbe..d121f60 100644 --- a/lib/models/eTask/Attempt.php +++ b/lib/models/eTask/Attempt.php @@ -1,4 +1,5 @@ <?php + namespace eTask; /** diff --git a/lib/models/eTask/Response.php b/lib/models/eTask/Response.php index 5b2edb5..f30b8fc 100644 --- a/lib/models/eTask/Response.php +++ b/lib/models/eTask/Response.php @@ -1,4 +1,5 @@ <?php + namespace eTask; /** diff --git a/lib/models/resources/BrokenResource.class.php b/lib/models/resources/BrokenResource.class.php index d1014ef..1e16927 100644 --- a/lib/models/resources/BrokenResource.class.php +++ b/lib/models/resources/BrokenResource.class.php @@ -57,8 +57,7 @@ class BrokenResource extends Resource $description = '', $internal_comment = '', $booking_type = 0 - ) - { + ) { return null; } @@ -71,8 +70,7 @@ class BrokenResource extends Resource $booking_type = 0, $prepend_preparation_time = false, $notify_lecturers = false - ) - { + ) { return null; } @@ -98,8 +96,7 @@ class BrokenResource extends Resource DateTime $end, $comment = '', $preparation_time = 0 - ) - { + ) { return null; } @@ -110,8 +107,7 @@ class BrokenResource extends Resource $comment = '', $properties = [], $preparation_time = 0 - ) - { + ) { return null; } @@ -120,8 +116,7 @@ class BrokenResource extends Resource DateTime $begin, DateTime $end, $internal_comment = '' - ) - { + ) { return null; } @@ -159,8 +154,7 @@ class BrokenResource extends Resource public function setPropertyByDefinitionId( $property_definition_id = null, $state = null - ) - { + ) { return false; } @@ -183,8 +177,7 @@ class BrokenResource extends Resource DateTime $begin, DateTime $end, $excluded_booking_ids = [] - ) - { + ) { return false; } @@ -192,8 +185,7 @@ class BrokenResource extends Resource DateTime $begin, DateTime $end, $excluded_reservation_ids = [] - ) - { + ) { return false; } @@ -201,8 +193,7 @@ class BrokenResource extends Resource DateTime $begin, DateTime $end, $excluded_lock_ids = [] - ) - { + ) { return true; } @@ -210,8 +201,7 @@ class BrokenResource extends Resource DateTime $begin, DateTime $end, $excluded_booking_ids = [] - ) - { + ) { return false; } diff --git a/lib/models/resources/Building.class.php b/lib/models/resources/Building.class.php index f6bb5a1..7e5e7e1 100644 --- a/lib/models/resources/Building.class.php +++ b/lib/models/resources/Building.class.php @@ -167,8 +167,7 @@ class Building extends Resource $action = 'show', $id = null, $link_parameters = [] - ) - { + ) { return URLHelper::getLink( self::buildPathForAction($action, $id), $link_parameters @@ -191,8 +190,7 @@ class Building extends Resource $action = 'show', $id = null, $url_parameters = [] - ) - { + ) { return URLHelper::getURL( self::buildPathForAction($action, $id), $url_parameters @@ -408,8 +406,7 @@ class Building extends Resource $description = '', $internal_comment = '', $booking_type = 0 - ) - { + ) { return null; } @@ -422,8 +419,7 @@ class Building extends Resource $booking_type = 0, $prepend_preparation_time = false, $notify_lecturers = false - ) - { + ) { return null; } @@ -440,8 +436,7 @@ class Building extends Resource $internal_comment = '', $booking_type = 0, $force_booking = false - ) - { + ) { return null; } @@ -451,8 +446,7 @@ class Building extends Resource DateTime $end, $comment = '', $preparation_time = 0 - ) - { + ) { return null; } @@ -462,8 +456,7 @@ class Building extends Resource $comment = '', $properties = [], $preparation_time = 0 - ) - { + ) { return null; } @@ -472,8 +465,7 @@ class Building extends Resource DateTime $begin, DateTime $end, $internal_comment = '' - ) - { + ) { return null; } @@ -481,8 +473,7 @@ class Building extends Resource DateTime $begin, DateTime $end, $excluded_booking_ids = [] - ) - { + ) { return false; } @@ -490,8 +481,7 @@ class Building extends Resource DateTime $begin, DateTime $end, $excluded_reservation_ids = [] - ) - { + ) { return false; } @@ -499,8 +489,7 @@ class Building extends Resource DateTime $begin, DateTime $end, $excluded_lock_ids = [] - ) - { + ) { return true; } @@ -508,8 +497,7 @@ class Building extends Resource DateTime $begin, DateTime $end, $excluded_booking_ids = [] - ) - { + ) { return false; } } diff --git a/lib/models/resources/GlobalResourceLock.class.php b/lib/models/resources/GlobalResourceLock.class.php index 541cc0f..8b0d01b 100644 --- a/lib/models/resources/GlobalResourceLock.class.php +++ b/lib/models/resources/GlobalResourceLock.class.php @@ -28,13 +28,13 @@ class GlobalResourceLock extends SimpleORMap { protected static $defined_types = []; - + public function __construct($id = null) { self::initDefinedTypes(); parent::__construct($id); } - + protected static function initDefinedTypes() { if (empty(self::$defined_types)) { @@ -45,14 +45,14 @@ class GlobalResourceLock extends SimpleORMap ]; } } - + protected static function configure($config = []) { $config['db_table'] = 'global_resource_locks'; - + parent::configure($config); } - + public static function isLocked($begin, $end) { return self::countBySql('begin < :end AND end > :begin', compact('begin', 'end')) > 0; @@ -68,7 +68,7 @@ class GlobalResourceLock extends SimpleORMap self::initDefinedTypes(); return self::$defined_types; } - + /** * Returns a string representation of the type of this resource lock. * diff --git a/lib/models/resources/Location.class.php b/lib/models/resources/Location.class.php index c543153..088df2e 100644 --- a/lib/models/resources/Location.class.php +++ b/lib/models/resources/Location.class.php @@ -117,8 +117,7 @@ class Location extends Resource $action = 'show', $id = null, $link_parameters = [] - ) - { + ) { return URLHelper::getLink( self::buildPathForAction($action, $id), $link_parameters @@ -143,8 +142,7 @@ class Location extends Resource $action = 'show', $id = null, $url_parameters = [] - ) - { + ) { return URLHelper::getURL( self::buildPathForAction($action, $id), $url_parameters @@ -329,8 +327,7 @@ class Location extends Resource $description = '', $internal_comment = '', $booking_type = 0 - ) - { + ) { return null; } @@ -343,8 +340,7 @@ class Location extends Resource $booking_type = 0, $prepend_preparation_time = false, $notify_lecturers = false - ) - { + ) { return null; } @@ -360,8 +356,7 @@ class Location extends Resource $internal_comment = '', $booking_type = 0, $force_booking = false - ) - { + ) { return null; } @@ -371,8 +366,7 @@ class Location extends Resource DateTime $end, $comment = '', $preparation_time = 0 - ) - { + ) { return null; } @@ -382,8 +376,7 @@ class Location extends Resource $comment = '', $properties = [], $preparation_time = 0 - ) - { + ) { return null; } @@ -392,8 +385,7 @@ class Location extends Resource DateTime $begin, DateTime $end, $internal_comment = '' - ) - { + ) { return null; } @@ -401,8 +393,7 @@ class Location extends Resource DateTime $begin, DateTime $end, $excluded_booking_ids = [] - ) - { + ) { return false; } @@ -410,8 +401,7 @@ class Location extends Resource DateTime $begin, DateTime $end, $excluded_reservation_ids = [] - ) - { + ) { return false; } @@ -419,8 +409,7 @@ class Location extends Resource DateTime $begin, DateTime $end, $excluded_lock_ids = [] - ) - { + ) { return true; } @@ -428,8 +417,7 @@ class Location extends Resource DateTime $begin, DateTime $end, $excluded_booking_ids = [] - ) - { + ) { return false; } } diff --git a/lib/models/resources/Resource.class.php b/lib/models/resources/Resource.class.php index 9050734..76091fc 100644 --- a/lib/models/resources/Resource.class.php +++ b/lib/models/resources/Resource.class.php @@ -262,8 +262,7 @@ class Resource extends SimpleORMap implements StudipItem $action = 'show', $id = null, $link_parameters = [] - ) - { + ) { return URLHelper::getLink( self::buildPathForAction($action, $id), $link_parameters @@ -289,8 +288,7 @@ class Resource extends SimpleORMap implements StudipItem $action = 'show', $id = null, $url_parameters = [] - ) - { + ) { return URLHelper::getURL( self::buildPathForAction($action, $id), $url_parameters @@ -455,8 +453,7 @@ class Resource extends SimpleORMap implements StudipItem $description = '', $internal_comment = '', $booking_type = 0 - ) - { + ) { return $this->createBooking( $user, $user->id, @@ -508,8 +505,7 @@ class Resource extends SimpleORMap implements StudipItem $booking_type = 0, $prepend_preparation_time = false, $notify_lecturers = false - ) - { + ) { $course_dates = $request->getAffectedDates(); $bookings = []; @@ -521,7 +517,7 @@ class Resource extends SimpleORMap implements StudipItem [ [ 'begin' => ( - $prepend_preparation_time + $prepend_preparation_time ? $course_date->date - $preparation_time : $course_date->date ), @@ -546,7 +542,7 @@ class Resource extends SimpleORMap implements StudipItem //Such requests are resolved into multiple bookings. foreach ($request->appointments as $appointment) { $begin = ( - $prepend_preparation_time + $prepend_preparation_time ? $appointment->appointment->date - $preparation_time : $appointment->appointment->date ); @@ -583,7 +579,7 @@ class Resource extends SimpleORMap implements StudipItem [ [ 'begin' => ( - $prepend_preparation_time + $prepend_preparation_time ? $request->begin - $preparation_time : $request->begin ), @@ -686,8 +682,7 @@ class Resource extends SimpleORMap implements StudipItem $internal_comment = '', $booking_type = 0, $force_booking = false - ) - { + ) { if (!is_array($time_ranges)) { throw new InvalidArgumentException( _('Es wurden keine Zeitbereiche für die Buchung angegeben!') @@ -940,8 +935,7 @@ class Resource extends SimpleORMap implements StudipItem DateTime $end, $comment = '', $preparation_time = 0 - ) - { + ) { //All users are permitted to create a request, //if the resource is requestable. @@ -980,7 +974,7 @@ class Resource extends SimpleORMap implements StudipItem $request->begin = $begin->getTimestamp(); $request->end = $end->getTimestamp(); $request->preparation_time = ( - $preparation_time > 0 + $preparation_time > 0 ? $preparation_time : 0 ); @@ -1041,8 +1035,7 @@ class Resource extends SimpleORMap implements StudipItem $comment = '', $properties = [], $preparation_time = 0 - ) - { + ) { if (!$date_range_ids) { throw new InvalidArgumentException( _('Es wurde keine ID eines Objektes angegeben, welches Zeiträume für eine Ressourcenanfrage liefern kann!') @@ -1135,7 +1128,7 @@ class Resource extends SimpleORMap implements StudipItem $request->user_id = $user->id; $request->comment = $comment; $request->preparation_time = ( - $preparation_time > 0 + $preparation_time > 0 ? $preparation_time : 0 ); @@ -1252,8 +1245,7 @@ class Resource extends SimpleORMap implements StudipItem DateTime $begin, DateTime $end, $internal_comment = '' - ) - { + ) { if (!$this->userHasPermission($user, 'admin', [$begin, $end])) { throw new AccessDeniedException( sprintf( @@ -1398,7 +1390,8 @@ class Resource extends SimpleORMap implements StudipItem INNER JOIN resource_property_definitions rpd ON resource_properties.property_id = rpd.property_id WHERE resource_properties.resource_id = :resource_id - AND rpd.name = :name"); + AND rpd.name = :name" + ); $exists_stmt->execute( [ @@ -1469,8 +1462,10 @@ class Resource extends SimpleORMap implements StudipItem public function getInfolabelProperties() { return SimpleCollection::createFromArray( - ResourceProperty::findBySQL('INNER JOIN `resource_property_definitions` USING (`property_id`) - WHERE `info_label` = 1 AND `state` != "" AND `resource_id` = ?', [$this->id] + ResourceProperty::findBySQL( + 'INNER JOIN `resource_property_definitions` USING (`property_id`) + WHERE `info_label` = 1 AND `state` != "" AND `resource_id` = ?', + [$this->id] ) ); } @@ -1514,7 +1509,8 @@ class Resource extends SimpleORMap implements StudipItem INNER JOIN resource_property_definitions rpd ON resource_properties.property_id = rpd.property_id WHERE resource_properties.resource_id = :resource_id - AND rpd.name = :name"); + AND rpd.name = :name" + ); $value_stmt->execute( [ @@ -1829,23 +1825,23 @@ class Resource extends SimpleORMap implements StudipItem _("Eine Ressourceneigenschaft vom Typ 'user' benötigt ein Nutzer-Objekt zur Wertzuweisung!") ); } - break; + break; case 'institute': if (!($object instanceof Institute)) { throw new ResourcePropertyException( _("Eine Ressourceneigenschaft vom Typ 'institute' benötigt ein Institut-Objekt zur Wertzuweisung!") ); } - break; + break; case 'fileref': if (!($object instanceof FileRef)) { throw new ResourcePropertyException( _("Eine Ressourceneigenschaft vom Typ 'fileref' benötigt ein FileRef-Objekt zur Wertzuweisung!") ); } - break; + break; default: - break; + break; } //When no exception is thrown above we can set the object's ID @@ -2014,19 +2010,18 @@ class Resource extends SimpleORMap implements StudipItem DateTime $begin, DateTime $end, $excluded_booking_ids = [] - ) - { + ) { return ResourceBooking::countByResourceAndTimeRanges( - $this, - [ + $this, + [ [ 'begin' => $begin->getTimestamp(), 'end' => $end->getTimestamp() ] ], - [0], - $excluded_booking_ids - ) > 0; + [0], + $excluded_booking_ids + ) > 0; } /** @@ -2048,22 +2043,21 @@ class Resource extends SimpleORMap implements StudipItem DateTime $begin, DateTime $end, $excluded_reservation_ids = [] - ) - { + ) { //One second is added to the begin timestamp to avoid //getting "false" overlaps where another booking ends on exactly //the begin timestamp. return ResourceBooking::countByResourceAndTimeRanges( - $this, - [ + $this, + [ [ 'begin' => $begin->getTimestamp(), 'end' => $end->getTimestamp() ] ], - [1, 3], - $excluded_reservation_ids - ) > 0; + [1, 3], + $excluded_reservation_ids + ) > 0; } /** @@ -2085,22 +2079,21 @@ class Resource extends SimpleORMap implements StudipItem DateTime $begin, DateTime $end, $excluded_lock_ids = [] - ) - { + ) { //One second is added to the begin timestamp to avoid //getting "false" overlaps where another booking ends on exactly //the begin timestamp. return ResourceBooking::countByResourceAndTimeRanges( - $this, - [ + $this, + [ [ 'begin' => $begin->getTimestamp(), 'end' => $end->getTimestamp() ] ], - [2], - $excluded_lock_ids - ) > 0; + [2], + $excluded_lock_ids + ) > 0; } /** @@ -2120,19 +2113,18 @@ class Resource extends SimpleORMap implements StudipItem DateTime $begin, DateTime $end, $excluded_booking_ids = [] - ) - { + ) { return ResourceBooking::countByResourceAndTimeRanges( - $this, - [ + $this, + [ [ 'begin' => $begin->getTimestamp(), 'end' => $end->getTimestamp() ] ], - [0, 2], - $excluded_booking_ids - ) == 0; + [0, 2], + $excluded_booking_ids + ) == 0; } /** @@ -2410,8 +2402,7 @@ class Resource extends SimpleORMap implements StudipItem ?User $user, string $permission = 'user', array $time_range = [] - ) - { + ) { if (!in_array($permission, ['user', 'autor', 'tutor', 'admin']) || $user === null) { return false; } @@ -2520,8 +2511,7 @@ class Resource extends SimpleORMap implements StudipItem User $user, $begin = null, $end = null - ) - { + ) { if ($begin && $end) { $time_range = [$begin, $end]; } else { @@ -2621,8 +2611,7 @@ class Resource extends SimpleORMap implements StudipItem $depth = 0, $convert_objects = true, $order_by_name = true - ) - { + ) { $result = []; if ($this->children) { //this resource has children: iterate over them and @@ -2807,11 +2796,11 @@ class Resource extends SimpleORMap implements StudipItem //directly in the database. Since resource folders do not //have subfolders we will count any file of the resource: return FileRef::countBySql( - 'folder_id = :folder_id', - [ + 'folder_id = :folder_id', + [ 'folder_id' => $folder->id ] - ) > 0; + ) > 0; } /** @@ -2964,7 +2953,7 @@ class Resource extends SimpleORMap implements StudipItem } - public function getLink() : StudipLink + public function getLink(): StudipLink { return new StudipLink($this->getActionURL(), $this->name, Icon::create('resources')); } diff --git a/lib/models/resources/ResourceBooking.class.php b/lib/models/resources/ResourceBooking.class.php index 3d8ec28..63a5e9d 100644 --- a/lib/models/resources/ResourceBooking.class.php +++ b/lib/models/resources/ResourceBooking.class.php @@ -185,8 +185,7 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen $time_ranges = [], $booking_types = [], $excluded_booking_ids = [] - ) - { + ) { if (!is_array($time_ranges)) { throw new InvalidArgumentException( _('Es wurde keine Liste mit Zeiträumen angegeben!') @@ -332,8 +331,7 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen $time_ranges = [], $booking_types = [], $excluded_booking_ids = [] - ) - { + ) { //Build the SQL query and the parameter array. $sql_data = self::buildResourceAndTimeRangesSqlQuery( @@ -362,8 +360,7 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen $time_ranges = [], $booking_types = [], $excluded_booking_ids = [] - ) - { + ) { //Build the SQL query and the parameter array. $sql_data = self::buildResourceAndTimeRangesSqlQuery( @@ -392,8 +389,7 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen $time_ranges = [], $booking_types = [], $excluded_booking_ids = [] - ) - { + ) { //Build the SQL query and the parameter array. $sql_data = self::buildResourceAndTimeRangesSqlQuery( $resource, @@ -491,7 +487,9 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen //(the moment this booking is saved). $derived_resource = $this->resource->getDerivedClassInstance(); $user_has_booking_rights = $derived_resource->userHasBookingRights( - $this->booking_user, $this->begin, $this->end + $this->booking_user, + $this->begin, + $this->end ); if (!$user_has_booking_rights) { throw new ResourcePermissionException( @@ -1766,8 +1764,7 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen $range_type = null, $begin = null, $end = null - ) - { + ) { $sql = "booking_id = :booking_id AND takes_place = 1 "; $sql_array = [ 'booking_id' => $this->id diff --git a/lib/models/resources/ResourceCategory.class.php b/lib/models/resources/ResourceCategory.class.php index 9738cbc..e1b90ba 100644 --- a/lib/models/resources/ResourceCategory.class.php +++ b/lib/models/resources/ResourceCategory.class.php @@ -292,8 +292,7 @@ class ResourceCategory extends SimpleORMap $requestable = false, $protected = false, $write_permission_level = 'autor' - ) - { + ) { if (!$name) { throw new ResourcePropertyException( _('Es wurde kein Name für die Eigenschaft angegeben!') @@ -424,8 +423,7 @@ class ResourceCategory extends SimpleORMap $parent_id = '', $properties = [], $ignore_invalid = false - ) - { + ) { if (($this->class_name != 'Resource') and !is_subclass_of($this->class_name, 'Resource')) { //Invalid resource category specification: @@ -440,7 +438,7 @@ class ResourceCategory extends SimpleORMap ); } - $resource = new $this->class_name; + $resource = new $this->class_name(); $resource->parent_id = $parent_id; $resource->category_id = $this->id; $resource->name = $name; @@ -484,8 +482,7 @@ class ResourceCategory extends SimpleORMap */ protected function setPropertyDefaultState( ResourcePropertyDefinition $definition - ) - { + ) { switch ($definition->type) { case 'bool': return false; @@ -614,8 +611,7 @@ class ResourceCategory extends SimpleORMap ResourceRequest $request, $name, $state = null - ) - { + ) { if ($request->category_id != $this->id) { throw new InvalidResourceCategoryException( sprintf( @@ -710,7 +706,7 @@ class ResourceCategory extends SimpleORMap { if ($type) { return ResourceCategoryProperty::countBySql( - 'INNER JOIN resource_property_definitions + 'INNER JOIN resource_property_definitions USING (property_id) WHERE name = :name @@ -718,25 +714,25 @@ class ResourceCategory extends SimpleORMap type = :type AND category_id = :category_id', - [ + [ 'name' => $name, 'type' => $type, 'category_id' => $this->id ] - ) > 0; + ) > 0; } else { return ResourceCategoryProperty::countBySql( - 'INNER JOIN resource_property_definitions + 'INNER JOIN resource_property_definitions USING (property_id) WHERE name = :name AND category_id = :category_id', - [ + [ 'name' => $name, 'category_id' => $this->id ] - ) > 0; + ) > 0; } } diff --git a/lib/models/resources/ResourceLabel.class.php b/lib/models/resources/ResourceLabel.class.php index b75d047..00294f9 100644 --- a/lib/models/resources/ResourceLabel.class.php +++ b/lib/models/resources/ResourceLabel.class.php @@ -50,8 +50,7 @@ class ResourceLabel extends Resource $description = '', $internal_comment = '', $booking_type = 0 - ) - { + ) { return null; } @@ -64,8 +63,7 @@ class ResourceLabel extends Resource $booking_type = 0, $prepend_preparation_time = false, $notify_lecturers = false - ) - { + ) { return null; } @@ -81,8 +79,7 @@ class ResourceLabel extends Resource $internal_comment = '', $booking_type = 0, $force_booking = false - ) - { + ) { return null; } @@ -92,8 +89,7 @@ class ResourceLabel extends Resource DateTime $end, $comment = '', $preparation_time = 0 - ) - { + ) { return null; } @@ -103,8 +99,7 @@ class ResourceLabel extends Resource $comment = '', $properties = [], $preparation_time = 0 - ) - { + ) { return null; } @@ -113,8 +108,7 @@ class ResourceLabel extends Resource DateTime $begin, DateTime $end, $internal_comment = '' - ) - { + ) { return null; } @@ -152,8 +146,7 @@ class ResourceLabel extends Resource public function setPropertyByDefinitionId( $property_definition_id = null, $state = null - ) - { + ) { return false; } @@ -176,8 +169,7 @@ class ResourceLabel extends Resource DateTime $begin, DateTime $end, $excluded_booking_ids = [] - ) - { + ) { return false; } @@ -185,8 +177,7 @@ class ResourceLabel extends Resource DateTime $begin, DateTime $end, $excluded_reservation_ids = [] - ) - { + ) { return false; } @@ -194,8 +185,7 @@ class ResourceLabel extends Resource DateTime $begin, DateTime $end, $excluded_lock_ids = [] - ) - { + ) { return true; } @@ -203,8 +193,7 @@ class ResourceLabel extends Resource DateTime $begin, DateTime $end, $excluded_booking_ids = [] - ) - { + ) { return false; } @@ -245,6 +234,6 @@ class ResourceLabel extends Resource public function getItemAvatarURL() { - return Icon::create('info', Icon::ROLE_INFO)->asImagePath(); + return Icon::create('info', Icon::ROLE_INFO)->asImagePath(); } } diff --git a/lib/models/resources/ResourcePropertyDefinition.class.php b/lib/models/resources/ResourcePropertyDefinition.class.php index 37fa89b..5400732 100644 --- a/lib/models/resources/ResourcePropertyDefinition.class.php +++ b/lib/models/resources/ResourcePropertyDefinition.class.php @@ -49,7 +49,7 @@ class ResourcePropertyDefinition extends SimpleORMap * are always in a format as specified by the ISO-6709 * string representation. */ - const CRSWGS84_REGEX = '/[+-]\d{1,3}\.\d{1,10}[+-]\d{1,3}\.\d{1,10}[+-]\d{1,5}\.\d{1,10}CRSWGS_84\/$/'; + public const CRSWGS84_REGEX = '/[+-]\d{1,3}\.\d{1,10}[+-]\d{1,3}\.\d{1,10}[+-]\d{1,5}\.\d{1,10}CRSWGS_84\/$/'; protected static function configure($config = []) { @@ -141,8 +141,7 @@ class ResourcePropertyDefinition extends SimpleORMap $special_name = '', $with_label = false, $allow_boolean_false = true - ) - { + ) { $label_html_classes = ''; $type = $this->type; $input_name = $special_name diff --git a/lib/models/resources/ResourceRequest.class.php b/lib/models/resources/ResourceRequest.class.php index d521781..cb82528 100644 --- a/lib/models/resources/ResourceRequest.class.php +++ b/lib/models/resources/ResourceRequest.class.php @@ -69,7 +69,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen /** * The amount of defined marking states. */ - const MARKING_STATES = 4; + public const MARKING_STATES = 4; protected static function configure($config = []) { @@ -209,8 +209,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen $excluded_request_ids = [], $additional_conditions = '', $additional_parameters = [] - ) - { + ) { if (!is_array($time_ranges)) { throw new InvalidArgumentException( _('Es wurde keine Liste mit Zeiträumen angegeben!') @@ -403,8 +402,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen $excluded_request_ids = [], $additional_conditions = '', $additional_parameters = [] - ) - { + ) { //Build the SQL query and the parameter array. $sql_data = self::buildResourceAndTimeRangesSqlQuery( @@ -427,8 +425,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen $excluded_request_ids = [], $additional_conditions = '', $additional_parameters = [] - ) - { + ) { $sql_data = self::buildResourceAndTimeRangesSqlQuery( $resource, $time_ranges, @@ -1209,7 +1206,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen if ($with_range) { $interval['range'] = 'CourseDate'; $interval['range_id'] = $this->termin_id; - $interval['booked_room'] = $this->date->room_booking ? $this->date->room_booking->resource_id: null; + $interval['booked_room'] = $this->date->room_booking ? $this->date->room_booking->resource_id : null; $interval['booking_id'] = $this->date->room_booking ? $this->date->room_booking->id : null; } return [$interval]; @@ -1410,7 +1407,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen } if ((int)$this->closed === 0) { return _('Die Anfrage wurde noch nicht bearbeitet.'); - } else if ((int)$this->closed === 3) { + } elseif ((int)$this->closed === 3) { return _('Die Anfrage wurde bearbeitet und abgelehnt.'); } else { return _('Die Anfrage wurde bearbeitet.'); @@ -1453,15 +1450,16 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen } } elseif ($this->metadate_id) { if ($this->cycle) { - $this->cycle->dates->filter(function($date) use($with_past_intervals, $now) { + $this->cycle->dates->filter(function ($date) use ($with_past_intervals, $now) { return $with_past_intervals || $date->end_time >= $now; - })->map(function($date) use(&$strings) { + })->map(function ($date) use (&$strings) { $strings[] = $date->getFullname('include-room'); }); } } elseif ($this->course_id) { $course = new Seminar($this->course_id); - $strings[] = $course->getDatesTemplate('dates/seminar_html_roomplanning', + $strings[] = $course->getDatesTemplate( + 'dates/seminar_html_roomplanning', [ 'shrink' => false, 'show_room' => true, @@ -1639,7 +1637,8 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen INNER JOIN resource_property_definitions rpd ON resource_request_properties.property_id = rpd.property_id WHERE resource_request_properties.request_id = :request_id - AND rpd.name = :name"); + AND rpd.name = :name" + ); $exists_stmt->execute( [ @@ -1676,7 +1675,8 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen INNER JOIN resource_property_definitions rpd ON resource_request_properties.property_id = rpd.property_id WHERE resource_request_properties.request_id = :request_id - AND rpd.name = :name"); + AND rpd.name = :name" + ); $value_stmt->execute( [ @@ -1822,7 +1822,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen if ($range_object instanceof User) { if (get_visibility_by_id($range_object->id)) { $name = $range_object->getFullName(); - } else if ($this->user_id === $GLOBALS['user']->id) { + } elseif ($this->user_id === $GLOBALS['user']->id) { $name = $range_object->getFullName(); } else { $current_user = User::findCurrent(); @@ -1833,7 +1833,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen if ($this->resource_id && ($this->resource instanceof Resource) && $this->resource->userHasPermission($current_user, 'autor')) { $name = $range_object->getFullname(); - } else if (ResourceManager::userHasGlobalPermission($current_user, 'autor')) { + } elseif (ResourceManager::userHasGlobalPermission($current_user, 'autor')) { $name = $range_object->getFullname(); } else { return ''; @@ -2391,8 +2391,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen $range_type = null, $begin = null, $end = null - ) - { + ) { $intervals = $this->getTimeIntervals(true); $time_intervals = []; diff --git a/lib/models/resources/ResourceTemporaryPermission.class.php b/lib/models/resources/ResourceTemporaryPermission.class.php index 1f0bedb..6e5e3b3 100644 --- a/lib/models/resources/ResourceTemporaryPermission.class.php +++ b/lib/models/resources/ResourceTemporaryPermission.class.php @@ -117,8 +117,7 @@ class ResourceTemporaryPermission extends SimpleORMap implements PrivacyObject string $resource_id, DateTime $begin, DateTime $end - ) - { + ) { //Query explaination: We want exactly one permission object //for the specified user and the resource. //The permission must exist during the whole specified time range diff --git a/lib/models/resources/Room.class.php b/lib/models/resources/Room.class.php index 1c9a0e4..c52b333 100644 --- a/lib/models/resources/Room.class.php +++ b/lib/models/resources/Room.class.php @@ -169,8 +169,7 @@ class Room extends Resource $limit = 0, $searchable_rooms = [], $properties = [] - ) - { + ) { //We have to check first if the user is permitted to search: //The user must have at least 'tutor' status in the //room and resource management: @@ -543,8 +542,7 @@ class Room extends Resource $comment = '', $properties = [], $preparation_time = 0 - ) - { + ) { $request = parent::createRequest( $user, $date_range_id, diff --git a/lib/models/resources/RoomRequest.class.php b/lib/models/resources/RoomRequest.class.php index c0898d7..a88855e 100644 --- a/lib/models/resources/RoomRequest.class.php +++ b/lib/models/resources/RoomRequest.class.php @@ -60,11 +60,11 @@ class RoomRequest extends ResourceRequest if ($this->termin_id) { $query = sprintf("SELECT id FROM resource_bookings WHERE range_id = %s ", $db->quote($this->termin_id)); $existing_assign = $db->query($query)->fetchColumn(); - //metadate request + //metadate request } elseif ($this->metadate_id) { $query = sprintf("SELECT count(termin_id)=count(resource_bookings.id) FROM termine LEFT JOIN resource_bookings ON(termin_id=resource_bookings.range_id) WHERE metadate_id=%s", $db->quote($this->metadate_id)); - //seminar request + //seminar request } else { $query = sprintf("SELECT count(termin_id)=count(resource_bookings.id) FROM termine LEFT JOIN resource_bookings ON(termin_id=resource_bookings.range_id) WHERE range_id='%s' AND date_typ IN" . getPresenceTypeClause(), $this->course_id); |