adjust calls to url_for(), fixes #711

app/controllers/course/timesrooms.php

@@ -463,7 +463,7 @@ class Course_TimesroomsController extends AuthenticatedController
         }
 
         $this->displayMessages();
-        $this->redirect($this->url_for('course/timesrooms/index', ['contentbox_open' => $termin->metadate_id]));
+        $this->redirect('course/timesrooms/index', ['contentbox_open' => $termin->metadate_id]);
     }
 
 
@@ -569,7 +569,7 @@ class Course_TimesroomsController extends AuthenticatedController
             if ($termin->metadate_id != '') {
                 $params['contentbox_open'] = $termin->metadate_id;
             }
-            $this->redirect($this->url_for('course/timesrooms/index', $params));
+            $this->redirect('course/timesrooms/index', $params);
         }
     }
 
@@ -584,7 +584,7 @@ class Course_TimesroomsController extends AuthenticatedController
         $_SESSION['_checked_dates'] = Request::optionArray('single_dates');
         if (empty($_SESSION['_checked_dates']) && isset($_SESSION['_checked_dates'])) {
             PageLayout::postError(_('Sie haben keine Termine ausgewählt!'));
-            $this->redirect($this->url_for('course/timesrooms/index', ['contentbox_open' => $cycle_id]));
+            $this->redirect('course/timesrooms/index', ['contentbox_open' => $cycle_id]);
 
             return;
         }
@@ -683,13 +683,11 @@ class Course_TimesroomsController extends AuthenticatedController
 
         $appointment_ids = $_SESSION['_checked_dates'];
         $this->redirect(
-            $this->url_for(
-                'course/room_requests/request_start',
-                [
-                    'range' => 'date-multiple',
-                    'range_ids' => $appointment_ids
-                ]
-            )
+            'course/room_requests/request_start',
+            [
+                'range' => 'date-multiple',
+                'range_ids' => $appointment_ids
+            ]
         );
     }
 
@@ -1269,7 +1267,7 @@ class Course_TimesroomsController extends AuthenticatedController
             }
         }
         $this->displayMessages();
-        $this->redirect($this->url_for('course/timesrooms/index', ['contentbox_open' => $termin->metadate_id]));
+        $this->redirect('course/timesrooms/index', ['contentbox_open' => $termin->metadate_id]);
     }
 
     /**
@@ -1414,8 +1412,7 @@ class Course_TimesroomsController extends AuthenticatedController
 
         if (Request::isXhr()) {
             $url       = call_user_func_array('parent::url_for', $arguments);
-            $url_chunk = Trails_Inflector::underscore(mb_substr(get_class($this), 0, -10));
-            $index_url = $url_chunk . '/index';
+            $index_url = $this->action_url('index');
 
             if (mb_strpos($url, $index_url) !== false) {
                 $this->flash['update-times'] = $this->course->id;
@@ -1455,8 +1452,7 @@ class Course_TimesroomsController extends AuthenticatedController
     public function relocate($to)
     {
         if (Request::int('fromDialog')) {
-            $url = call_user_func_array([$this, 'url_for'], func_get_args());
-            $this->redirect($url);
+            $this->redirect(...func_get_args());
         } else {
             call_user_func_array('parent::relocate', func_get_args());
         }