diff options
Diffstat (limited to 'app/controllers/shared')
| -rw-r--r-- | app/controllers/shared/contacts.php | 8 | ||||
| -rw-r--r-- | app/controllers/shared/download.php | 4 | ||||
| -rw-r--r-- | app/controllers/shared/log_event.php | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/app/controllers/shared/contacts.php b/app/controllers/shared/contacts.php index 98670f4..820d2ab 100644 --- a/app/controllers/shared/contacts.php +++ b/app/controllers/shared/contacts.php @@ -114,7 +114,7 @@ class Shared_ContactsController extends MVVController if ($this->contact_id) { $contact_range = MvvContactRange::findOneBySQL('contact_id=?', [$this->contact_id]); if (!$contact_range) { - throw new Trails_Exception(404); + throw new Trails\Exception(404); } $this->relations = $contact_range->getRelations($this->filter); $this->origin = 'index'; @@ -155,7 +155,7 @@ class Shared_ContactsController extends MVVController { $this->contact_range = MvvContactRange::findOneBySQL('contact_id = ?', [$contact_id]); if (!$this->contact_range) { - throw new Trails_Exception(404); + throw new Trails\Exception(404); } $this->relations = $this->contact_range->getRelations($this->filter); @@ -725,7 +725,7 @@ class Shared_ContactsController extends MVVController $this->mvvcontact_id = $user_id; $this->selected_sem_end = $this->filter['end_sem.ende']; - $this->selected_inst = $this->filter['mvv_studiengang.institut_id']; + $this->selected_inst = $this->filter['mvv_studiengang.institut_id'] ?? null; if (Request::submitted('store')) { $selected = Request::getArray('ranges'); @@ -871,7 +871,7 @@ class Shared_ContactsController extends MVVController )); $filter = [ 'mvv_modul.stat' => $stat, - 'mvv_modul_inst.institut_id' => $this->filter['mvv_modul_inst.institut_id'], + 'mvv_modul_inst.institut_id' => $this->filter['mvv_modul_inst.institut_id'] ?? '', 'start_sem.beginn' => $this->filter['start_sem.beginn'], 'end_sem.ende' => $this->filter['end_sem.ende'] ]; diff --git a/app/controllers/shared/download.php b/app/controllers/shared/download.php index 92d15d9..f94bc86 100644 --- a/app/controllers/shared/download.php +++ b/app/controllers/shared/download.php @@ -158,7 +158,7 @@ class Shared_DownloadController extends AuthenticatedController } $path = $GLOBALS['STUDIP_BASE_PATH'] . '/app/views/shared/modul/'; - $factory = new Flexi_TemplateFactory($path); + $factory = new Flexi\Factory($path); $template = $factory->open('_modul'); $template->_ = function ($string) { return $this->_($string); }; @@ -166,7 +166,7 @@ class Shared_DownloadController extends AuthenticatedController $template->display_language = $display_language; $content = $template->render(); - $factory = new \Flexi_TemplateFactory($path); + $factory = new Flexi\Factory($path); $type = 1; if (count($modul->modulteile) == 1) { $modulteil = $modul->modulteile->first(); diff --git a/app/controllers/shared/log_event.php b/app/controllers/shared/log_event.php index 0355e45..3d8af7e 100644 --- a/app/controllers/shared/log_event.php +++ b/app/controllers/shared/log_event.php @@ -122,12 +122,12 @@ class Shared_LogEventController extends MVVController $search_action .= " AND `log_actions`.`name` LIKE CONCAT('%_'," . DBManager::get()->quote($log_action) . ")"; } - $statement = DBManager::get()->prepare("SELECT *, `log_actions`.`name` + $statement = DBManager::get()->prepare("SELECT * FROM `log_events` LEFT JOIN `log_actions` ON `log_events`.`action_id` = `log_actions`.`action_id` WHERE `info` = ? " . $search_action . " - ORDER BY `log_events`.`mkdate` DESC"); + ORDER BY `log_events`.`event_id` DESC"); $statement->execute([$mvv_field]); $res = $statement->fetchOne(); if ($res) { |