Merge branch 'main' into issue-3911issue-3911

9 files changed, 24 insertions, 24 deletions

diff --git a/app/controllers/studiengaenge/abschluesse.php b/app/controllers/studiengaenge/abschluesse.php
index 8ec055b..60bc091 100644
--- a/app/controllers/studiengaenge/abschluesse.php
+++ b/app/controllers/studiengaenge/abschluesse.php
@@ -50,7 +50,7 @@ class Studiengaenge_AbschluesseController extends Studiengaenge_StudiengaengeCon
         $perm_institutes = MvvPerm::getOwnInstitutes();
         $abschluss = Abschluss::find($abschluss_id);
         if (!$abschluss) {
-            throw new Trails_Exception(404);
+            throw new Trails\Exception(404);
         }
         $this->abschluss_id = $abschluss->id;
         if (count($perm_institutes)) {
@@ -59,7 +59,7 @@ class Studiengaenge_AbschluesseController extends Studiengaenge_StudiengaengeCon
                 $perm_institutes
             );
             if (!count($institutes_abschluss)) {
-                throw new Trails_Exception(403);
+                throw new Trails\Exception(403);
             }
             $this->studiengaenge = SimpleORMapCollection::createFromArray(
                 Studiengang::findByAbschluss_id($this->abschluss_id)
@@ -91,4 +91,4 @@ class Studiengaenge_AbschluesseController extends Studiengaenge_StudiengaengeCon
             $this->perform_relayed('index');
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/controllers/studiengaenge/fachbereiche.php b/app/controllers/studiengaenge/fachbereiche.php
index 970c8d9..35f997b 100644
--- a/app/controllers/studiengaenge/fachbereiche.php
+++ b/app/controllers/studiengaenge/fachbereiche.php
@@ -51,7 +51,7 @@ class Studiengaenge_FachbereicheController extends Studiengaenge_StudiengaengeCo
         $this->fachbereich_id = $fachbereich_id;
         if (count($perm_institutes)) {
             if (!in_array($this->fachbereich_id, $perm_institutes)) {
-                throw new Trails_Exception(403);
+                throw new Trails\Exception(403);
             }
         }
 
diff --git a/app/controllers/studiengaenge/fachbereichestgteile.php b/app/controllers/studiengaenge/fachbereichestgteile.php
index c8037dc..73ad2aa 100644
--- a/app/controllers/studiengaenge/fachbereichestgteile.php
+++ b/app/controllers/studiengaenge/fachbereichestgteile.php
@@ -67,7 +67,7 @@ class Studiengaenge_FachbereichestgteileController extends Studiengaenge_Studien
             $this->fachbereich = $fachbereich;
             $this->perform_relayed('stgteil');
         } else {
-            throw new Trails_Exception(404);
+            throw new Trails\Exception(404);
         }
     }
 }
diff --git a/app/controllers/studiengaenge/faecher.php b/app/controllers/studiengaenge/faecher.php
index c9546a3..9990f7d 100644
--- a/app/controllers/studiengaenge/faecher.php
+++ b/app/controllers/studiengaenge/faecher.php
@@ -83,7 +83,7 @@ class Studiengaenge_FaecherController extends Studiengaenge_StudiengangteileCont
             $this->stgteil = StudiengangTeil::get();
             $this->stgteil->assignFach($fach->getId());
         } else {
-            throw new Trails_Exception(404);
+            throw new Trails\Exception(404);
         }
         $this->perform_relayed('stgteil');
     }
diff --git a/app/controllers/studiengaenge/kategorien.php b/app/controllers/studiengaenge/kategorien.php
index 03d28fc..8f6a98d 100644
--- a/app/controllers/studiengaenge/kategorien.php
+++ b/app/controllers/studiengaenge/kategorien.php
@@ -73,7 +73,7 @@ class Studiengaenge_KategorienController extends Studiengaenge_StudiengaengeCont
             
             if (count($perm_institutes)) {
                 if (!in_array($studiengang->institut_id, $perm_institutes)) {
-                    throw new Trails_Exception(403);
+                    throw new Trails\Exception(403);
                 }
             }
             
@@ -98,4 +98,4 @@ class Studiengaenge_KategorienController extends Studiengaenge_StudiengaengeCont
             $this->perform_relayed('index');
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/controllers/studiengaenge/shared_version.php b/app/controllers/studiengaenge/shared_version.php
index 696fac0..a6265b0 100644
--- a/app/controllers/studiengaenge/shared_version.php
+++ b/app/controllers/studiengaenge/shared_version.php
@@ -11,18 +11,18 @@ abstract class SharedVersionController extends MVVController
     {
         $this->stgteil = StudiengangTeil::find($stgteil_id);
         if (!$this->stgteil) {
-            throw new Trails_Exception(404);
+            throw new Trails\Exception(404);
         }
 
         if (!MvvPerm::haveFieldPermVersionen($this->stgteil, MvvPerm::PERM_READ)) {
-            throw new Trails_Exception(403);
+            throw new Trails\Exception(403);
         }
 
         if (!isset($this->version)) {
             $this->version = StgteilVersion::find($version_id);
             if (!$this->version) {
                 if (!MvvPerm::haveFieldPermVersionen($this->stgteil, MvvPerm::PERM_CREATE)) {
-                    throw new Trails_Exception(403);
+                    throw new Trails\Exception(403);
                 }
                 $this->version = new StgteilVersion();
             }
@@ -51,7 +51,7 @@ abstract class SharedVersionController extends MVVController
         if (Request::submitted('store')) {
             CSRFProtection::verifyUnsafeRequest();
             if (!MvvPerm::haveFieldPermVersionen($this->stgteil)) {
-                throw new Trails_Exception(403);
+                throw new Trails\Exception(403);
             }
             $stored = false;
             $this->version->stgteil_id = $this->stgteil->getId();
@@ -220,7 +220,7 @@ abstract class SharedVersionController extends MVVController
     {
         $version = StgteilVersion::find($version_id);
         if (!$version) {
-             throw new Trails_Exception(404, _('Unbekannte Version'));
+             throw new Trails\Exception(404, _('Unbekannte Version'));
         }
         if (Request::isPost()) {
             CSRFProtection::verifyUnsafeRequest();
@@ -267,16 +267,16 @@ abstract class SharedVersionController extends MVVController
         $perm = MvvPerm::get($this->version);
 
         if (!$perm->haveFieldPerm('abschnitte', MvvPerm::PERM_READ)) {
-            throw new Trails_Exception(403);
+            throw new Trails\Exception(403);
         }
         if ($this->abschnitt->isNew() && !$perm->haveFieldPerm('abschnitte', MvvPerm::PERM_CREATE)) {
-            throw new Trails_Exception(403);
+            throw new Trails\Exception(403);
         }
 
         if (Request::submitted('store')) {
             CSRFProtection::verifyUnsafeRequest();
             if (!$perm->haveFieldPerm('abschnitte', MvvPerm::PERM_WRITE)) {
-                throw new Trails_Exception(403);
+                throw new Trails\Exception(403);
             }
             $this->abschnitt->version_id = $this->version->getId();
             $this->abschnitt->name = Request::i18n('name')->trim();
@@ -494,7 +494,7 @@ abstract class SharedVersionController extends MVVController
         $abschnitt = StgteilAbschnitt::find($abschnitt_id);
         if ($abschnitt) {
             if (!MvvPerm::haveFieldPermModul_zuordnungen($abschnitt, MvvPerm::PERM_CREATE)) {
-                throw new Trails_Exception(403);
+                throw new Trails\Exception(403);
             }
             $modul = Modul::find($modul_id);
             if (!$modul) {
@@ -614,7 +614,7 @@ abstract class SharedVersionController extends MVVController
     {
         $version = StgteilVersion::find($version_id);
         if (!$version) {
-             throw new Trails_Exception(404, _('Unbekannte Version'));
+             throw new Trails\Exception(404, _('Unbekannte Version'));
         } else {
             if (Request::isPost()) {
                 CSRFProtection::verifyUnsafeRequest();
@@ -754,7 +754,7 @@ abstract class SharedVersionController extends MVVController
                     $this->redirect($this->action_url('abschnitte/' . $version_id));
                 }
             } else {
-                throw new Trails_Exception(403);
+                throw new Trails\Exception(403);
             }
         }
         if (Request::isXhr()) {
diff --git a/app/controllers/studiengaenge/studiengaenge.php b/app/controllers/studiengaenge/studiengaenge.php
index d053f48..8465665 100644
--- a/app/controllers/studiengaenge/studiengaenge.php
+++ b/app/controllers/studiengaenge/studiengaenge.php
@@ -541,7 +541,7 @@ class Studiengaenge_StudiengaengeController extends MVVController
                 if (Request::isPost()) {
                     CSRFProtection::verifyRequest();
                     if (!MvvPerm::haveFieldPermStudiengangteile($studiengang, MvvPerm::PERM_CREATE)) {
-                        throw new Trails_Exception(403);
+                        throw new Trails\Exception(403);
                     }
                     $stgteil_name = $this->stg_stgteil->stgteil_name;
                     $stgbez_name = $this->stg_stgteil->stgbez_name;
@@ -588,7 +588,7 @@ class Studiengaenge_StudiengaengeController extends MVVController
                 if (Request::isPost()) {
                     CSRFProtection::verifyUnsafeRequest();
                     if (!MvvPerm::haveFieldPermStudiengangteile($studiengang, MvvPerm::PERM_CREATE)) {
-                        throw new Trails_Exception(403);
+                        throw new Trails\Exception(403);
                     }
                     $stgteil_name = $stg_stgteil->stgteil_name;
                     $stgbez_name = $stg_stgteil->stgbez_name;
diff --git a/app/controllers/studiengaenge/studiengangteile.php b/app/controllers/studiengaenge/studiengangteile.php
index 0fddd44..bc1449f 100644
--- a/app/controllers/studiengaenge/studiengangteile.php
+++ b/app/controllers/studiengaenge/studiengangteile.php
@@ -144,7 +144,7 @@ class Studiengaenge_StudiengangteileController extends SharedVersionController
             $this->stgteil->contact_assignments = $stgteil_orig->contact_assignments;
 
         } else {
-            throw new Trails_Exception(404);
+            throw new Trails\Exception(404);
         }
         $this->perform_relayed('stgteil');
     }
diff --git a/app/controllers/studiengaenge/versionen.php b/app/controllers/studiengaenge/versionen.php
index 9b60b3d..41625bf 100644
--- a/app/controllers/studiengaenge/versionen.php
+++ b/app/controllers/studiengaenge/versionen.php
@@ -52,7 +52,7 @@ class Studiengaenge_VersionenController extends SharedVersionController
                 $this->redirect($this->action_url('index/' .  $this->chooser_filter['stgteile']));
                 return;
             default :
-                throw new Trails_Exception(400);
+                throw new Trails\Exception(400);
         }
         $this->name = $list;
         if (!empty($this->lists[$list]['elements'])) {
@@ -218,7 +218,7 @@ class Studiengaenge_VersionenController extends SharedVersionController
         if ($stgteil_id) {
             $this->stgteil = StudiengangTeil::find($stgteil_id);
             if (!$this->stgteil) {
-                throw new Trails_Exception(404, _('Unbekannter Studiengangteil'));
+                throw new Trails\Exception(404, _('Unbekannter Studiengangteil'));
             }
 
             $this->initPageParams();