Exit through sendExit() (#9784)

pabzm · web-flow · commit 6d51c2193195 · 2025-02-19T17:55:04.000+01:00
That way it's testable.
diff --git a/program/actions/mail/get.php b/program/actions/mail/get.php
@@ -48,7 +48,7 @@ public function run($args = [])
                 . '<meta http-equiv="refresh" content="0; url=' . rcube::Q($url) . '">' . "\n"
                 . '<meta http-equiv="content-type" content="text/html; charset=' . RCUBE_CHARSET . '">' . "\n"
                 . "</head>\n<body>\n{$message}\n</body>\n</html>";
-            exit;
+            $rcmail->output->sendExit();
         }
 
         $attachment = new rcmail_attachment_handler();
@@ -117,7 +117,7 @@ public function run($args = [])
                     readfile($cache_file);
                 }
 
-                exit;
+                $rcmail->output->sendExit();
             }
         }
 
@@ -213,7 +213,7 @@ public function run($args = [])
                         $rcmail->output->write();
                     }
 
-                    exit;
+                    $rcmail->output->sendExit();
                 }
             }
 
@@ -265,7 +265,7 @@ public function run($args = [])
                 }
 
                 $rcmail->output->write($out);
-                exit;
+                $rcmail->output->sendExit();
             }
 
             // add filename extension if missing
@@ -295,12 +295,12 @@ public function run($args = [])
                 $attachment->output($mimetype);
             }
 
-            exit;
+            $rcmail->output->sendExit();
         }
 
         // if we arrive here, the requested part was not found
         http_response_code(404);
-        exit;
+        $rcmail->output->sendExit();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function run($args = [])`
`48`	`48`	`. '<meta http-equiv="refresh" content="0; url=' . rcube::Q($url) . '">' . "\n"`
`49`	`49`	`. '<meta http-equiv="content-type" content="text/html; charset=' . RCUBE_CHARSET . '">' . "\n"`
`50`	`50`	`. "</head>\n<body>\n{$message}\n</body>\n</html>";`
`51`		`- exit;`
	`51`	`+ $rcmail->output->sendExit();`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`$attachment = new rcmail_attachment_handler();`
`@@ -117,7 +117,7 @@ public function run($args = [])`
`117`	`117`	`readfile($cache_file);`
`118`	`118`	`}`
`119`	`119`
`120`		`- exit;`
	`120`	`+ $rcmail->output->sendExit();`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`
`@@ -213,7 +213,7 @@ public function run($args = [])`
`213`	`213`	`$rcmail->output->write();`
`214`	`214`	`}`
`215`	`215`
`216`		`- exit;`
	`216`	`+ $rcmail->output->sendExit();`
`217`	`217`	`}`
`218`	`218`	`}`
`219`	`219`
`@@ -265,7 +265,7 @@ public function run($args = [])`
`265`	`265`	`}`
`266`	`266`
`267`	`267`	`$rcmail->output->write($out);`
`268`		`- exit;`
	`268`	`+ $rcmail->output->sendExit();`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`// add filename extension if missing`
`@@ -295,12 +295,12 @@ public function run($args = [])`
`295`	`295`	`$attachment->output($mimetype);`
`296`	`296`	`}`
`297`	`297`
`298`		`- exit;`
	`298`	`+ $rcmail->output->sendExit();`
`299`	`299`	`}`
`300`	`300`
`301`	`301`	`// if we arrive here, the requested part was not found`
`302`	`302`	`http_response_code(404);`
`303`		`- exit;`
	`303`	`+ $rcmail->output->sendExit();`
`304`	`304`	`}`
`305`	`305`
`306`	`306`	`/**`