X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fstarred.php;h=0705d5436ac88cc8c7a5b4494fe0976e86d962e6;hb=a876c208504af3ee801689886ec8cab8f3eeff00;hp=78ba4ce61ef121e2d429dc21fad6006f33461914;hpb=78114c13d5ce27b36682a960859056d4ebf9d9be;p=friendica.git diff --git a/mod/starred.php b/mod/starred.php index 78ba4ce61e..0705d5436a 100644 --- a/mod/starred.php +++ b/mod/starred.php @@ -3,8 +3,7 @@ * @file mod/starred.php */ use Friendica\App; -use Friendica\Core\System; -use Friendica\Database\DBM; +use Friendica\Database\DBA; use Friendica\Model\Item; function starred_init(App $a) { @@ -12,18 +11,18 @@ function starred_init(App $a) { $message_id = null; if (!local_user()) { - killme(); + exit(); } if ($a->argc > 1) { $message_id = intval($a->argv[1]); } if (!$message_id) { - killme(); + exit(); } - $item = Item::selectForUser(local_user(), ['starred'], ['uid' => local_user(), 'id' => $message_id]); - if (!DBM::is_result($item)) { - killme(); + $item = Item::selectFirstForUser(local_user(), ['starred'], ['uid' => local_user(), 'id' => $message_id]); + if (!DBA::isResult($item)) { + exit(); } if (!intval($item['starred'])) { @@ -33,7 +32,7 @@ function starred_init(App $a) { Item::update(['starred' => $starred], ['id' => $message_id]); // See if we've been passed a return path to redirect to - $return_path = (x($_REQUEST,'return') ? $_REQUEST['return'] : ''); + $return_path = defaults($_REQUEST, 'return', ''); if ($return_path) { $rand = '_=' . time(); if (strpos($return_path, '?')) { @@ -42,11 +41,11 @@ function starred_init(App $a) { $rand = "?$rand"; } - goaway(System::baseUrl() . "/" . $return_path . $rand); + $a->internalRedirect($return_path . $rand); } // the json doesn't really matter, it will either be 0 or 1 echo json_encode($starred); - killme(); + exit(); }