]> git.mxchange.org Git - friendica.git/commitdiff
Replace exit calls with exception throwing in mod/item
authorHypolite Petovan <hypolite@mrpetovan.com>
Thu, 30 Jan 2020 03:43:37 +0000 (22:43 -0500)
committerHypolite Petovan <hypolite@mrpetovan.com>
Thu, 30 Jan 2020 03:43:37 +0000 (22:43 -0500)
mod/item.php

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