fix most of the errors reported from phpstan in `app/controllers`, fixes #1328

Closes #1328

Merge request studip/studip!813

2 files changed, 19 insertions, 32 deletions

diff --git a/app/controllers/shared/contacts.php b/app/controllers/shared/contacts.php
index d4a9576..b1d82c4 100644
--- a/app/controllers/shared/contacts.php
+++ b/app/controllers/shared/contacts.php
@@ -469,11 +469,10 @@ class Shared_ContactsController extends MVVController
                 }
                 if (!$user_id) {
                     if (Request::isXhr()) {
-                        header('X-Dialog-Close: 1');
-                        exit;
-                    } else {
-                        return;
+                        $this->response->add_header('X-Dialog-Close', 1);
+                        $this->render_nothing();
                     }
+                    return;
                 }
             }
 
@@ -565,7 +564,7 @@ class Shared_ContactsController extends MVVController
             $this->response->add_header('X-Dialog-Close', 1);
         } else {
             $this->response->add_header('X-Dialog-Close', 1);
-            $this->response->add_header('X-Location', $this->url_for('/index', ['contact_id' => $mvv_contact->id]));
+            $this->response->add_header('X-Location', $this->url_for('/index', ['contact_id' => $contact_range->contact_id]));
         }
         $this->render_nothing();
     }
@@ -584,10 +583,9 @@ class Shared_ContactsController extends MVVController
             PageLayout::postSuccess(_('Die Verknüpfung wurde gelöscht.'));
         }
 
-        $this->range_id = $range_id;
         if (Request::isXhr()) {
-            header('X-Dialog-Close: 1');
-            exit;
+            $this->response->add_header('X-Dialog-Close', 1);
+            $this->render_nothing();
         }
     }
 
@@ -607,8 +605,8 @@ class Shared_ContactsController extends MVVController
             ));
         }
         if (Request::isXhr()) {
-            header('X-Dialog-Close: 1');
-            exit;
+            $this->response->add_header('X-Dialog-Close', 1);
+            $this->render_nothing();
         }
     }
 
@@ -627,8 +625,8 @@ class Shared_ContactsController extends MVVController
             ));
         }
         if (Request::isXhr()) {
-            header('X-Dialog-Close: 1');
-            exit;
+            $this->response->add_header('X-Dialog-Close', 1);
+            $this->render_nothing();
         }
     }
 
diff --git a/app/controllers/shared/download.php b/app/controllers/shared/download.php
index 59b1751..92d15d9 100644
--- a/app/controllers/shared/download.php
+++ b/app/controllers/shared/download.php
@@ -7,7 +7,7 @@ class Shared_DownloadController extends AuthenticatedController
 
         parent::before_filter($action, $args);
     }
-    
+
     /**
      * @param type $format only pdf is implememted yet
      * @param type $semester_id
@@ -27,14 +27,14 @@ class Shared_DownloadController extends AuthenticatedController
         }
 
         include  $GLOBALS['STUDIP_BASE_PATH'] . '/config/mvv_config.php';
-        
+
         $this->MHBPdf($semester_id, $version_id, $language);
 
         init_i18n($current_lang);
         $_SESSION['_language'] = $current_lang;
         include  $GLOBALS['STUDIP_BASE_PATH'] . '/config/mvv_config.php';
     }
-    
+
     private function MHBPdf($semester_id, $version_id, $language)
     {
         $semester = Semester::find($semester_id);
@@ -90,13 +90,11 @@ class Shared_DownloadController extends AuthenticatedController
             $language
         ));
     }
-    
+
     /**
      * Renders a template and outputs it as a PDF file.
      * @param string $view_path the path of the template (controller/view...)
      * @param string $title the title, optional. If not set, takes title from pagelayout.
-     * @param bool $force_pdf forces PDF download, oterwise can be overridden by setting the request no_export.
-     * @return type
      */
     protected function exportTcpdf($html, string $title = '')
     {
@@ -129,19 +127,10 @@ class Shared_DownloadController extends AuthenticatedController
             $pdf->writeHTMLCell(0, 0, '', '', $html_block , 0, 1, 0, true, '', true);
         }
 
-        $output = $pdf->Output(null, 'S');
-
         $filename = trim($title ?: PageLayout::getTitle());
-
-        $this->set_content_type('application/pdf');
-        $this->response->add_header('Content-Disposition', sprintf(
-            'attachment;filename="%s.pdf"',
-            preg_replace('/_{2,}/', '_', preg_replace('/\W/', '_', $filename))
-        ));
-        $this->response->add_header('Content-Length', strlen($output));
-        $this->render_text($output);
+        $this->render_pdf($pdf, $filename . '.pdf');
     }
-    
+
     private static function sanitizeFilename($filename)
     {
         $replacements = [
@@ -161,7 +150,7 @@ class Shared_DownloadController extends AuthenticatedController
 
         return $filename;
     }
-    
+
     public function getMVVPluginModulDescription($modul, $display_language = null)
     {
         if ($display_language == null) {
@@ -211,11 +200,11 @@ class Shared_DownloadController extends AuthenticatedController
 
         return $content;
     }
-    
+
     /**
      * Retrieves all modules assigned to the given Studiengangteilversion
      * grouped by Studiengangteilabschnitte
-     * 
+     *
      * @param StgteilVersion $StgteilVersion
      * @param Semester $semester
      * @return type