strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Replace exit calls with exception throwing in mod/item

Browse source
This commit is contained in:
Hypolite Petovan 2020-01-29 22:43:37 -05:00
parent b03796957b
commit 4faad5a47c
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
mod/item.php
View file

@ -33,6 +33,7 @@ use Friendica\Model\FileTag;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Model\Photo; use Friendica\Model\Photo;
use Friendica\Model\Term; use Friendica\Model\Term;
use Friendica\Network\HTTPException;
use Friendica\Object\EMail\ItemCCEMail; use Friendica\Object\EMail\ItemCCEMail;
use Friendica\Protocol\Activity; use Friendica\Protocol\Activity;
use Friendica\Protocol\Diaspora; use Friendica\Protocol\Diaspora;
@ -45,7 +46,7 @@ require_once __DIR__ . '/../include/items.php';
function item_post(App $a) { function item_post(App $a) {
if (!Session::isAuthenticated()) { if (!Session::isAuthenticated()) {
return 0; throw new HTTPException\ForbiddenException();
} }
$uid = local_user(); $uid = local_user();
@ -122,7 +123,7 @@ function item_post(App $a) {
if ($return_path) { if ($return_path) {
DI::baseUrl()->redirect($return_path); DI::baseUrl()->redirect($return_path);
} }
exit(); throw new HTTPException\NotFoundException(DI::l10n()->t('Unable to locate original post.'));
} }
$toplevel_item_id = $toplevel_item['id']; $toplevel_item_id = $toplevel_item['id'];
@ -170,7 +171,7 @@ function item_post(App $a) {
DI::baseUrl()->redirect($return_path); DI::baseUrl()->redirect($return_path);
} }
exit(); throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
} }
// Init post instance // Init post instance
@ -323,7 +324,8 @@ function item_post(App $a) {
if ($return_path) { if ($return_path) {
DI::baseUrl()->redirect($return_path); DI::baseUrl()->redirect($return_path);
} }
exit();
throw new HTTPException\BadRequestException(DI::l10n()->t('Empty post discarded.'));
} }
} }
@ -706,7 +708,8 @@ function item_post(App $a) {
if ($return_path) { if ($return_path) {
DI::baseUrl()->redirect($return_path); DI::baseUrl()->redirect($return_path);
} }
exit();
throw new HTTPException\OKException(DI::l10n()->t('Post updated.'));
} }
unset($datarray['edit']); unset($datarray['edit']);
@ -727,6 +730,8 @@ function item_post(App $a) {
if ($return_path) { if ($return_path) {
DI::baseUrl()->redirect($return_path); DI::baseUrl()->redirect($return_path);
} }
throw new HTTPException\InternalServerErrorException(DI::l10n()->t('Item wasn\'t stored.'));
} }
$datarray = Item::selectFirst(Item::ITEM_FIELDLIST, ['id' => $post_id]); $datarray = Item::selectFirst(Item::ITEM_FIELDLIST, ['id' => $post_id]);
@ -736,6 +741,8 @@ function item_post(App $a) {
if ($return_path) { if ($return_path) {
DI::baseUrl()->redirect($return_path); DI::baseUrl()->redirect($return_path);
} }
throw new HTTPException\InternalServerErrorException(DI::l10n()->t('Item couldn\'t be fetched.'));
} }
// update filetags in pconfig // update filetags in pconfig
@ -886,7 +893,7 @@ function item_content(App $a)
* *
* @return array|bool ['replaced' => $replaced, 'contact' => $contact]; * @return array|bool ['replaced' => $replaced, 'contact' => $contact];
* @throws ImagickException * @throws ImagickException
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
*/ */
function handle_tag(&$body, &$inform, &$str_tags, $profile_uid, $tag, $network = "") function handle_tag(&$body, &$inform, &$str_tags, $profile_uid, $tag, $network = "")
{ {