Remove/replace killme() with *exit()

[friendica.git] / mod / item.php

diff --git a/mod/item.php b/mod/item.php
index 4617dfa02e8c10d81edbaf186d1cce46c300b3af..5e6f88bac7ea33224c78b741d68633c76fd43491 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -31,6 +31,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\Conversation;
 use Friendica\Model\FileTag;
 use Friendica\Model\Item;
+use Friendica\Model\Photo;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\Email;
 use Friendica\Util\DateTimeFormat;
@@ -50,7 +51,7 @@ function item_post(App $a) {
                drop_items($arr_drop);
                $json = ['success' => 1];
                echo json_encode($json);
-               killme();
+               exit();
        }
 
        Addon::callHooks('post_local_start', $_REQUEST);
@@ -117,7 +118,7 @@ function item_post(App $a) {
                        if (!empty($_REQUEST['return'])) {
                                $a->internalRedirect($return_path);
                        }
-                       killme();
+                       exit();
                }
 
                $parent = $parent_item['id'];
@@ -168,7 +169,7 @@ function item_post(App $a) {
                        $a->internalRedirect($return_path);
                }
 
-               killme();
+               exit();
        }
 
        // Init post instance
@@ -279,13 +280,13 @@ function item_post(App $a) {
 
                if (!strlen($body)) {
                        if ($preview) {
-                               killme();
+                               exit();
                        }
                        info(L10n::t('Empty post discarded.') . EOL);
                        if (!empty($_REQUEST['return'])) {
                                $a->internalRedirect($return_path);
                        }
-                       killme();
+                       exit();
                }
        }
 
@@ -456,16 +457,18 @@ function item_post(App $a) {
                                // Ensure to only modify photos that you own
                                $srch = '<' . intval($original_contact_id) . '>';
 
-                               $condition = ['allow_cid' => $srch, 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '',
-                                               'resource-id' => $image_uri, 'uid' => $profile_uid];
-                               if (!DBA::exists('photo', $condition)) {
+                               $condition = [
+                                       'allow_cid' => $srch, 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '',
+                                       'resource-id' => $image_uri, 'uid' => $profile_uid
+                               ];
+                               if (!Photo::exists($condition)) {
                                        continue;
                                }
 
                                $fields = ['allow_cid' => $str_contact_allow, 'allow_gid' => $str_group_allow,
                                                'deny_cid' => $str_contact_deny, 'deny_gid' => $str_group_deny];
                                $condition = ['resource-id' => $image_uri, 'uid' => $profile_uid];
-                               DBA::update('photo', $fields, $condition);
+                               Photo::update($fields, $condition);
                        }
                }
        }
@@ -690,7 +693,7 @@ function item_post(App $a) {
                }
 
                echo json_encode($json);
-               killme();
+               exit();
        }
 
        if ($orig_post) {
@@ -718,7 +721,7 @@ function item_post(App $a) {
                        Logger::log('return: ' . $return_path);
                        $a->internalRedirect($return_path);
                }
-               killme();
+               exit();
        } else {
                $post_id = 0;
        }
@@ -871,7 +874,7 @@ function item_post_return($baseurl, $api_source, $return_path)
        Logger::log('post_json: ' . print_r($json, true), Logger::DEBUG);
 
        echo json_encode($json);
-       killme();
+       exit();
 }
 
 function item_content(App $a)
@@ -897,7 +900,7 @@ function item_content(App $a)
                if ($a->isAjax()) {
                        // ajax return: [<item id>, 0 (no perm) | <owner id>]
                        echo json_encode([intval($a->argv[2]), intval($o)]);
-                       killme();
+                       exit();
                }
        }
 
@@ -909,7 +912,7 @@ function item_content(App $a)
  * the appropiate link.
  *
  * @param App $a Application instance @TODO is unused in this function's scope (excluding included files)
- * @param unknown_type $body the text to replace the tag in
+ * @param string $body the text to replace the tag in
  * @param string $inform a comma-seperated string containing everybody to inform
  * @param string $str_tags string to add the tag to
  * @param integer $profile_uid