tedkulp/PrivateBin
1
0
Fork 0
mirror of https://github.com/PrivateBin/PrivateBin.git synced 2026-03-05 13:30:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactored exceptions in controller

Browse Source 
- added missing exception doc blocks
- introduced exception type that translates message during construction
- catch explicit exception types where possible
This commit is contained in:
El RIDO
2025-11-17 17:28:13 +01:00
parent fdd2c67b49
commit 3e6f1733f9
10 changed files with 105 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/Controller.php
View File

@@ -17,6 +17,7 @@ use PrivateBin\Persistence\TrafficLimiter;
use PrivateBin\Proxy\AbstractProxy;
use PrivateBin\Proxy\ShlinkProxy;
use PrivateBin\Proxy\YourlsProxy;
use PrivateBin\TranslatedException;
/**
* Controller
@@ -195,6 +196,7 @@ class Controller
* Set default language
*
* @access private
* @throws Exception
*/
private function _setDefaultLanguage()
{
@@ -211,6 +213,7 @@ class Controller
* Set default template
*
* @access private
* @throws Exception
*/
private function _setDefaultTemplate()
{
@@ -260,6 +263,7 @@ class Controller
* pasteid (optional) = in discussions, which paste this comment belongs to.
*
* @access private
* @throws Exception
* @return string
*/
private function _create()
@@ -270,8 +274,7 @@ class Controller
TrafficLimiter::setStore($this->_model->getStore());
try {
TrafficLimiter::canPass();
} catch (Exception $e) {
// traffic limiter exceptions come translated
} catch (TranslatedException $e) {
$this->_json_error($e->getMessage());
return;
}
@@ -305,9 +308,8 @@ class Controller
$comment = $paste->getComment($data['parentid']);
$comment->setData($data);
$comment->store();
} catch (Exception $e) {
// comment exceptions need translation
$this->_json_error(I18n::_($e->getMessage()));
} catch (TranslatedException $e) {
$this->_json_error($e->getMessage());
return;
}
$this->_json_result($comment->getId());
@@ -319,7 +321,7 @@ class Controller
else {
try {
$this->_model->purge();
} catch (Exception $e) {
} catch (Exception $e) { // JSON error!!!
error_log('Error purging documents: ' . $e->getMessage() . PHP_EOL .
'Use the administration scripts statistics to find ' .
'damaged paste IDs and either delete them or restore them ' .
@@ -329,9 +331,8 @@ class Controller
try {
$paste->setData($data);
$paste->store();
} catch (Exception $e) {
// paste exceptions need translation
$this->_json_error(I18n::_($e->getMessage()));
} catch (TranslatedException $e) {
$this->_json_error($e->getMessage());
return;
}
$this->_json_result($paste->getId(), array('deletetoken' => $paste->getDeleteToken()));
@@ -399,9 +400,8 @@ class Controller
} else {
$this->_json_error(I18n::_(self::GENERIC_ERROR));
}
} catch (Exception $e) {
// paste exceptions need translation
$this->_json_error(I18n::_($e->getMessage()));
} catch (TranslatedException $e) {
$this->_json_error($e->getMessage());
}
}
@@ -409,6 +409,7 @@ class Controller
* Display frontend.
*
* @access private
* @throws Exception
*/
private function _view()
{