Browse Source

Remove/replace killme() with *exit()

tags/2019.03^2
Hypolite Petovan 11 months ago
parent
commit
895b3abf32
75 changed files with 167 additions and 187 deletions
  1. 1
    1
      bin/worker.php
  2. 4
    4
      include/api.php
  3. 0
    3
      library/OAuth1.php
  4. 0
    1
      mod/_well_known.php
  5. 1
    2
      mod/admin.php
  6. 1
    1
      mod/amcd.php
  7. 3
    3
      mod/api.php
  8. 1
    1
      mod/attach.php
  9. 3
    3
      mod/cal.php
  10. 3
    3
      mod/contactgroup.php
  11. 3
    3
      mod/dfrn_notify.php
  12. 9
    9
      mod/dfrn_poll.php
  13. 1
    2
      mod/dfrn_request.php
  14. 1
    1
      mod/display.php
  15. 3
    3
      mod/events.php
  16. 3
    3
      mod/fbrowser.php
  17. 2
    2
      mod/fetch.php
  18. 2
    2
      mod/filer.php
  19. 2
    2
      mod/filerm.php
  20. 1
    1
      mod/friendica.php
  21. 1
    1
      mod/group.php
  22. 1
    1
      mod/hovercard.php
  23. 4
    4
      mod/ignored.php
  24. 9
    9
      mod/item.php
  25. 1
    3
      mod/like.php
  26. 6
    6
      mod/lockview.php
  27. 1
    1
      mod/manifest.php
  28. 3
    3
      mod/modexp.php
  29. 1
    1
      mod/network.php
  30. 0
    3
      mod/nodeinfo.php
  31. 1
    1
      mod/noscrape.php
  32. 1
    1
      mod/notify.php
  33. 1
    1
      mod/oexchange.php
  34. 1
    1
      mod/opensearch.php
  35. 4
    4
      mod/photos.php
  36. 1
    1
      mod/phpinfo.php
  37. 2
    2
      mod/ping.php
  38. 3
    3
      mod/poco.php
  39. 1
    1
      mod/pretheme.php
  40. 1
    1
      mod/probe.php
  41. 2
    2
      mod/profiles.php
  42. 1
    1
      mod/profperm.php
  43. 1
    1
      mod/pubsub.php
  44. 1
    1
      mod/pubsubhubbub.php
  45. 1
    1
      mod/robots_txt.php
  46. 1
    1
      mod/rsd_xml.php
  47. 2
    2
      mod/search.php
  48. 3
    3
      mod/share.php
  49. 4
    4
      mod/starred.php
  50. 1
    2
      mod/statistics_json.php
  51. 1
    1
      mod/subthread.php
  52. 1
    3
      mod/tagger.php
  53. 4
    6
      mod/uexport.php
  54. 1
    1
      mod/update_community.php
  55. 1
    1
      mod/update_contact.php
  56. 1
    1
      mod/update_display.php
  57. 2
    2
      mod/update_network.php
  58. 1
    1
      mod/update_notes.php
  59. 1
    1
      mod/update_profile.php
  60. 1
    1
      mod/view.php
  61. 1
    1
      mod/viewsrc.php
  62. 11
    11
      mod/wall_attach.php
  63. 14
    14
      mod/wall_upload.php
  64. 1
    1
      mod/webfinger.php
  65. 1
    1
      mod/worker.php
  66. 2
    2
      mod/xrd.php
  67. 2
    2
      src/BaseModule.php
  68. 1
    1
      src/Core/Renderer.php
  69. 2
    2
      src/Core/System.php
  70. 3
    3
      src/Module/Oembed.php
  71. 2
    7
      src/Module/Photo.php
  72. 5
    5
      src/Protocol/DFRN.php
  73. 1
    1
      src/Render/FriendicaSmartyEngine.php
  74. 2
    1
      src/Util/Emailer.php
  75. 1
    1
      src/Worker/Cron.php

+ 1
- 1
bin/worker.php View File

@@ -44,7 +44,7 @@ $spawn = array_key_exists('s', $options) || array_key_exists('spawn', $options);

if ($spawn) {
Worker::spawnWorker();
killme();
exit();
}

$run_cron = !array_key_exists('n', $options) && !array_key_exists('no_cron', $options);

+ 4
- 4
include/api.php View File

@@ -3928,10 +3928,10 @@ function api_oauth_request_token()
$r = $oauth1->fetch_request_token(OAuthRequest::from_request());
} catch (Exception $e) {
echo "error=" . OAuthUtil::urlencode_rfc3986($e->getMessage());
killme();
exit();
}
echo $r;
killme();
exit();
}

/**
@@ -3947,10 +3947,10 @@ function api_oauth_access_token()
$r = $oauth1->fetch_access_token(OAuthRequest::from_request());
} catch (Exception $e) {
echo "error=". OAuthUtil::urlencode_rfc3986($e->getMessage());
killme();
exit();
}
echo $r;
killme();
exit();
}

/// @TODO move to top of file or somewhere better

+ 0
- 3
library/OAuth1.php View File

@@ -91,7 +91,6 @@ abstract class OAuthSignatureMethod {
*/
public function check_signature($request, $consumer, $token, $signature) {
$built = $this->build_signature($request, $consumer, $token);
//echo "<pre>"; var_dump($signature, $built, ($built == $signature)); killme();
return ($built == $signature);
}
}
@@ -296,7 +295,6 @@ class OAuthRequest {
$http_url = substr($http_url, 0, strpos($http_url,$parameters['pagename'])+strlen($parameters['pagename']));
unset( $parameters['pagename'] );
//echo "<pre>".__function__."\n"; var_dump($http_method, $http_url, $parameters, $_SERVER['REQUEST_URI']); killme();
return new OAuthRequest($http_method, $http_url, $parameters);
}

@@ -561,7 +559,6 @@ class OAuthServer {
public function verify_request(&$request) {
$this->get_version($request);
$consumer = $this->get_consumer($request);
//echo __file__.__line__.__function__."<pre>"; var_dump($consumer); die();
$token = $this->get_token($request, $consumer, "access");
$this->check_signature($request, $consumer, $token);
return array($consumer, $token);

+ 0
- 1
mod/_well_known.php View File

@@ -27,7 +27,6 @@ function _well_known_init(App $a)
}
}
System::httpExit(404);
killme();
}

function wk_social_relay()

+ 1
- 2
mod/admin.php View File

@@ -301,8 +301,7 @@ function admin_content(App $a)

if ($a->isAjax()) {
echo $o;
killme();
return '';
exit();
} else {
return $o;
}

+ 1
- 1
mod/amcd.php View File

@@ -47,5 +47,5 @@ function amcd_content()
}
}
JSON;
killme();
exit();
}

+ 3
- 3
mod/api.php View File

@@ -59,7 +59,7 @@ function api_content(App $a)
} catch (Exception $e) {
echo "<pre>";
var_dump($e);
killme();
exit();
}

if (!empty($_POST['oauth_yes'])) {
@@ -79,7 +79,7 @@ function api_content(App $a)
$glue = "?";
}
$a->internalRedirect($consumer->callback_url . $glue . 'oauth_token=' . OAuthUtil::urlencode_rfc3986($params['oauth_token']) . '&oauth_verifier=' . OAuthUtil::urlencode_rfc3986($verifier));
killme();
exit();
}

$tpl = Renderer::getMarkupTemplate("oauth_authorize_done.tpl");
@@ -117,5 +117,5 @@ function api_content(App $a)
}

echo api_call($a);
killme();
exit();
}

+ 1
- 1
mod/attach.php View File

@@ -49,6 +49,6 @@ function attach_init(App $a)
}

echo $r[0]['data'];
killme();
exit();
// NOTREACHED
}

+ 3
- 3
mod/cal.php View File

@@ -244,7 +244,7 @@ function cal_content(App $a)

if (!empty($a->argv[2]) && ($a->argv[2] === 'json')) {
echo json_encode($events);
killme();
exit();
}

// links: array('href', 'text', 'extra css classes', 'title')
@@ -286,7 +286,7 @@ function cal_content(App $a)

if (!empty($_GET['id'])) {
echo $o;
killme();
exit();
}

return $o;
@@ -331,7 +331,7 @@ function cal_content(App $a)
header('Content-type: text/calendar');
header('content-disposition: attachment; filename="' . L10n::t('calendar') . '-' . $nick . '.' . $evexport["extension"] . '"');
echo $evexport["content"];
killme();
exit();
}

return;

+ 3
- 3
mod/contactgroup.php View File

@@ -8,7 +8,7 @@ use Friendica\Model\Group;
function contactgroup_content(App $a)
{
if (!local_user()) {
killme();
exit();
}

$change = null;
@@ -28,7 +28,7 @@ function contactgroup_content(App $a)
intval(local_user())
);
if (!DBA::isResult($r)) {
killme();
exit();
}

$group = $r[0];
@@ -49,5 +49,5 @@ function contactgroup_content(App $a)
}
}

killme();
exit();
}

+ 3
- 3
mod/dfrn_notify.php View File

@@ -281,7 +281,7 @@ function dfrn_notify_content(App $a) {
$user = DBA::selectFirst('user', ['uid'], ['nickname' => $a->argv[1]]);
if (!DBA::isResult($user)) {
Logger::log('User not found for nickname ' . $a->argv[1]);
killme();
exit();
}

$condition = [];
@@ -313,7 +313,7 @@ function dfrn_notify_content(App $a) {
$importer = DFRN::getImporter($contact['id'], $user['uid']);
if (empty($importer)) {
Logger::log('No importer data found for user ' . $a->argv[1] . ' and contact ' . $dfrn_id);
killme();
exit();
}

Logger::log("Remote rino version: ".$rino_remote." for ".$importer["url"], Logger::DATA);
@@ -370,6 +370,6 @@ function dfrn_notify_content(App $a) {
. "\t" . '<challenge>' . $challenge . '</challenge>' . "\r\n"
. '</dfrn_notify>' . "\r\n";

killme();
exit();
}
}

+ 9
- 9
mod/dfrn_poll.php View File

@@ -37,7 +37,7 @@ function dfrn_poll_init(App $a)
$nickname = $a->argv[1];
header("Content-type: application/atom+xml");
echo OStatus::feed($nickname, $last_update, 10);
killme();
exit();
}

$direction = -1;
@@ -71,7 +71,7 @@ function dfrn_poll_init(App $a)
Logger::log('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $user);
header("Content-type: application/atom+xml");
echo DFRN::feed('', $user, $last_update, 0, $hidewall);
killme();
exit();
}

if (($type === 'profile') && (!strlen($sec))) {
@@ -198,7 +198,7 @@ function dfrn_poll_init(App $a)

header("Content-type: text/xml");
echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?><dfrn_poll><status>0</status><challenge>$decoded_challenge</challenge><sec>$sec</sec></dfrn_poll>";
killme();
exit();
// NOTREACHED
} else {
// old protocol
@@ -290,7 +290,7 @@ function dfrn_poll_post(App $a)

header("Content-type: text/xml");
echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?><dfrn_poll><status>0</status><challenge>$decoded_challenge</challenge><sec>$sec</sec></dfrn_poll>";
killme();
exit();
// NOTREACHED
}
}
@@ -307,7 +307,7 @@ function dfrn_poll_post(App $a)
);

if (!DBA::isResult($r)) {
killme();
exit();
}

$type = $r[0]['type'];
@@ -336,7 +336,7 @@ function dfrn_poll_post(App $a)

$r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 $sql_extra LIMIT 1");
if (!DBA::isResult($r)) {
killme();
exit();
}

$contact = $r[0];
@@ -368,7 +368,7 @@ function dfrn_poll_post(App $a)
<description>$text</description>
</reputation>
";
killme();
exit();
// NOTREACHED
} else {
// Update the writable flag if it changed
@@ -391,7 +391,7 @@ function dfrn_poll_post(App $a)
header("Content-type: application/atom+xml");
$o = DFRN::feed($dfrn_id, $a->argv[1], $last_update, $direction);
echo $o;
killme();
exit();
}
}

@@ -573,7 +573,7 @@ function dfrn_poll_content(App $a)
. "\t" . '<dfrn_id>' . $encrypted_id . '</dfrn_id>' . "\r\n"
. "\t" . '<challenge>' . $challenge . '</challenge>' . "\r\n"
. '</dfrn_poll>' . "\r\n";
killme();
exit();
// NOTREACHED
}
}

+ 1
- 2
mod/dfrn_request.php View File

@@ -589,8 +589,7 @@ function dfrn_request_content(App $a)
}
}

killme();
return; // NOTREACHED
exit();
} else {
// Normal web request. Display our user's introduction form.
if ((Config::get('system', 'block_public')) && (!local_user()) && (!remote_user())) {

+ 1
- 1
mod/display.php View File

@@ -426,5 +426,5 @@ function displayShowFeed($item_id, $conversation)
}
header("Content-type: application/atom+xml");
echo $xml;
killme();
exit();
}

+ 3
- 3
mod/events.php View File

@@ -117,7 +117,7 @@ function events_post(App $a)
notice(L10n::t('Event can not end before it has started.') . EOL);
if (intval($_REQUEST['preview'])) {
echo L10n::t('Event can not end before it has started.');
killme();
exit();
}
$a->internalRedirect($onerror_path);
}
@@ -126,7 +126,7 @@ function events_post(App $a)
notice(L10n::t('Event title and start time are required.') . EOL);
if (intval($_REQUEST['preview'])) {
echo L10n::t('Event title and start time are required.');
killme();
exit();
}
$a->internalRedirect($onerror_path);
}
@@ -414,7 +414,7 @@ function events_content(App $a)

if (!empty($_GET['id'])) {
echo $o;
killme();
exit();
}

return $o;

+ 3
- 3
mod/fbrowser.php View File

@@ -18,11 +18,11 @@ use Friendica\Object\Image;
function fbrowser_content(App $a)
{
if (!local_user()) {
killme();
exit();
}

if ($a->argc == 1) {
killme();
exit();
}

$template_file = "filebrowser.tpl";
@@ -146,6 +146,6 @@ function fbrowser_content(App $a)
return $o;
} else {
echo $o;
killme();
exit();
}
}

+ 2
- 2
mod/fetch.php View File

@@ -40,7 +40,7 @@ function fetch_init(App $a)

header("HTTP/1.1 301 Moved Permanently");
header("Location:".$location);
killme();
exit();
}
}

@@ -60,5 +60,5 @@ function fetch_init(App $a)
header("Content-Type: application/magic-envelope+xml; charset=utf-8");
echo Diaspora::buildMagicEnvelope($xml, $user);

killme();
exit();
}

+ 2
- 2
mod/filer.php View File

@@ -13,7 +13,7 @@ use Friendica\Util\XML;
function filer_content(App $a)
{
if (! local_user()) {
killme();
exit();
}

$term = XML::unescape(trim(defaults($_GET, 'term', '')));
@@ -38,5 +38,5 @@ function filer_content(App $a)

echo $o;
}
killme();
exit();
}

+ 2
- 2
mod/filerm.php View File

@@ -10,7 +10,7 @@ function filerm_content(App $a)
{
if (! local_user())
{
killme();
exit();
}

$term = XML::unescape(trim($_GET['term']));
@@ -37,5 +37,5 @@ function filerm_content(App $a)
}

$a->internalRedirect('/network?f=&file=' . rawurlencode($term));
killme();
exit();
}

+ 1
- 1
mod/friendica.php View File

@@ -68,7 +68,7 @@ function friendica_init(App $a)

header('Content-type: application/json; charset=utf-8');
echo json_encode($data);
killme();
exit();
}
}


+ 1
- 1
mod/group.php View File

@@ -307,7 +307,7 @@ function group_content(App $a) {
if ($change) {
$tpl = Renderer::getMarkupTemplate('groupeditor.tpl');
echo Renderer::replaceMacros($tpl, $context);
killme();
exit();
}

return Renderer::replaceMacros($tpl, $context);

+ 1
- 1
mod/hovercard.php View File

@@ -41,7 +41,7 @@ function hovercard_content()
if ($datatype == 'tpl') {
$templatecontent = get_template_content('hovercard.tpl');
echo $templatecontent;
killme();
exit();
}

// If a contact is connected the url is internally changed to 'redir/CID'. We need the pure url to search for

+ 4
- 4
mod/ignored.php View File

@@ -8,7 +8,7 @@ use Friendica\Model\Item;
function ignored_init(App $a)
{
if (!local_user()) {
killme();
exit();
}

if ($a->argc > 1) {
@@ -16,12 +16,12 @@ function ignored_init(App $a)
}

if (!$message_id) {
killme();
exit();
}

$thread = Item::selectFirstThreadForUser(local_user(), ['uid', 'ignored'], ['iid' => $message_id]);
if (!DBA::isResult($thread)) {
killme();
exit();
}

// Numeric values are needed for the json output further below
@@ -49,5 +49,5 @@ function ignored_init(App $a)
// the json doesn't really matter, it will either be 0 or 1

echo json_encode($ignored);
killme();
exit();
}

+ 9
- 9
mod/item.php View File

@@ -51,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);
@@ -118,7 +118,7 @@ function item_post(App $a) {
if (!empty($_REQUEST['return'])) {
$a->internalRedirect($return_path);
}
killme();
exit();
}

$parent = $parent_item['id'];
@@ -169,7 +169,7 @@ function item_post(App $a) {
$a->internalRedirect($return_path);
}

killme();
exit();
}

// Init post instance
@@ -280,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();
}
}

@@ -693,7 +693,7 @@ function item_post(App $a) {
}

echo json_encode($json);
killme();
exit();
}

if ($orig_post) {
@@ -721,7 +721,7 @@ function item_post(App $a) {
Logger::log('return: ' . $return_path);
$a->internalRedirect($return_path);
}
killme();
exit();
} else {
$post_id = 0;
}
@@ -874,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)
@@ -900,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();
}
}


+ 1
- 3
mod/like.php View File

@@ -28,7 +28,7 @@ function like_content(App $a) {
$return_path = defaults($_REQUEST, 'return', '');

like_content_return($a, $return_path);
killme(); // NOTREACHED
exit();
}


@@ -46,6 +46,4 @@ function like_content_return(App $a, $return_path) {

$a->internalRedirect($return_path . $rand);
}

killme();
}

+ 6
- 6
mod/lockview.php View File

@@ -19,11 +19,11 @@ function lockview_content(App $a)
}

if (!$item_id) {
killme();
exit();
}

if (!in_array($type, ['item','photo','event'])) {
killme();
exit();
}

$fields = ['uid', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid'];
@@ -37,14 +37,14 @@ function lockview_content(App $a)
}

if (!DBA::isResult($item)) {
killme();
exit();
}

Addon::callHooks('lockview_content', $item);

if ($item['uid'] != local_user()) {
echo L10n::t('Remote privacy information not available.') . '<br />';
killme();
exit();
}

if (isset($item['private'])
@@ -55,7 +55,7 @@ function lockview_content(App $a)
&& empty($item['deny_gid']))
{
echo L10n::t('Remote privacy information not available.') . '<br />';
killme();
exit();
}

$allowed_users = expand_acl($item['allow_cid']);
@@ -111,6 +111,6 @@ function lockview_content(App $a)
}

echo $o . implode(', ', $l);
killme();
exit();

}

+ 1
- 1
mod/manifest.php View File

@@ -24,5 +24,5 @@ function manifest_content(App $a) {

echo $o;

killme();
exit();
}

+ 3
- 3
mod/modexp.php View File

@@ -6,7 +6,7 @@ use Friendica\Database\DBA;
function modexp_init(App $a) {

if($a->argc != 2)
killme();
exit();

$nick = $a->argv[1];
$r = q("SELECT `spubkey` FROM `user` WHERE `nickname` = '%s' LIMIT 1",
@@ -14,7 +14,7 @@ function modexp_init(App $a) {
);

if (! DBA::isResult($r)) {
killme();
exit();
}

$lines = explode("\n",$r[0]['spubkey']);
@@ -30,7 +30,7 @@ function modexp_init(App $a) {
header("Content-type: application/magic-public-key");
echo 'RSA' . '.' . $m . '.' . $e;

killme();
exit();

}


+ 1
- 1
mod/network.php View File

@@ -625,7 +625,7 @@ function networkThreadedView(App $a, $update, $parent)
$group = DBA::selectFirst('group', ['name'], ['id' => $gid, 'uid' => local_user()]);
if (!DBA::isResult($group)) {
if ($update) {
killme();
exit();
}
notice(L10n::t('No such group') . EOL);
$a->internalRedirect('network/0');

+ 0
- 3
mod/nodeinfo.php View File

@@ -24,12 +24,10 @@ function nodeinfo_wellknown(App $a) {
function nodeinfo_init(App $a) {
if (!Config::get('system', 'nodeinfo')) {
System::httpExit(404);
killme();
}

if (($a->argc != 2) || ($a->argv[1] != '1.0')) {
System::httpExit(404);
killme();
}

$smtp = (function_exists('imap_open') && !Config::get('system', 'imap_disabled') && !Config::get('system', 'dfrn_only'));
@@ -149,7 +147,6 @@ function nodeinfo_cron() {

$addon = 'statistics_json';
$addons = Config::get('system', 'addon');
$addons_arr = [];

if ($addons) {
$addons_arr = explode(',',str_replace(' ', '',$addons));

+ 1
- 1
mod/noscrape.php View File

@@ -15,7 +15,7 @@ function noscrape_init(App $a)
if ($a->argc > 1) {
$which = $a->argv[1];
} else {
killme();
exit();
}

$profile = 0;

+ 1
- 1
mod/notify.php View File

@@ -48,7 +48,7 @@ function notify_init(App $a)
$r = $nm->setAllSeen();
$j = json_encode(['result' => ($r) ? 'success' : 'fail']);
echo $j;
killme();
exit();
}
}


+ 1
- 1
mod/oexchange.php View File

@@ -17,7 +17,7 @@ function oexchange_init(App $a) {

$o = Renderer::replaceMacros($tpl, ['$base' => System::baseUrl()]);
echo $o;
killme();
exit();
}
}


+ 1
- 1
mod/opensearch.php View File

@@ -17,5 +17,5 @@ function opensearch_content(App $a) {

echo $o;

killme();
exit();
}

+ 4
- 4
mod/photos.php View File

@@ -185,7 +185,7 @@ function photos_post(App $a)

if (!$can_post) {
notice(L10n::t('Permission denied.') . EOL);
killme();
exit();
}

$owner_record = User::getOwnerDataById($page_owner_uid);
@@ -193,7 +193,7 @@ function photos_post(App $a)
if (!$owner_record) {
notice(L10n::t('Contact information unavailable') . EOL);
Logger::log('photos_post: unable to locate contact record for page owner. uid=' . $page_owner_uid);
killme();
exit();
}

if ($a->argc > 3 && $a->argv[2] === 'album') {
@@ -794,7 +794,7 @@ function photos_post(App $a)
@unlink($src);
$foo = 0;
Addon::callHooks('photo_post_end',$foo);
killme();
exit();
}

$exif = $image->orient($src);
@@ -820,7 +820,7 @@ function photos_post(App $a)
if (!$r) {
Logger::log('mod/photos.php: photos_post(): image store failed', Logger::DEBUG);
notice(L10n::t('Image upload failed.') . EOL);
killme();
exit();
}

if ($width > 640 || $height > 640) {

+ 1
- 1
mod/phpinfo.php View File

@@ -10,5 +10,5 @@ function phpinfo_content()
}

phpinfo();
killme();
exit();
}

+ 2
- 2
mod/ping.php View File

@@ -115,7 +115,7 @@ function ping_init(App $a)
header("Content-type: text/xml");
echo XML::fromArray($data, $xml);
}
killme();
exit();
}

$notifs = ping_get_notifications(local_user());
@@ -386,7 +386,7 @@ function ping_init(App $a)
echo XML::fromArray(["result" => $data], $xml);
}

killme();
exit();
}

/**

+ 3
- 3
mod/poco.php View File

@@ -46,7 +46,7 @@ function poco_init(App $a) {
$ret = PortableContact::serverlist();
header('Content-type: application/json');
echo json_encode($ret);
killme();
exit();
}

if ($a->argc > 1 && $a->argv[1] === '@global') {
@@ -378,12 +378,12 @@ function poco_init(App $a) {
if ($format === 'xml') {
header('Content-type: text/xml');
echo Renderer::replaceMacros(Renderer::getMarkupTemplate('poco_xml.tpl'), XML::arrayEscape(['$response' => $ret]));
killme();
exit();
}
if ($format === 'json') {
header('Content-type: application/json');
echo json_encode($ret);
killme();
exit();
} else {
System::httpExit(500);
}

+ 1
- 1
mod/pretheme.php View File

@@ -21,5 +21,5 @@ function pretheme_init(App $a) {
echo json_encode(['img' => Theme::getScreenshot($theme), 'desc' => $desc, 'version' => $version, 'credits' => $credits]);
}

killme();
exit();
}

+ 1
- 1
mod/probe.php View File

@@ -12,7 +12,7 @@ function probe_content(App $a)
if (!local_user()) {
System::httpExit(403, ["title" => L10n::t("Public access denied."),
"description" => L10n::t("Only logged in users are permitted to perform a probing.")]);
killme();
exit();
}

$o = '<div class="generic-page-wrapper">';

+ 2
- 2
mod/profiles.php View File

@@ -117,7 +117,7 @@ function profiles_init(App $a) {
);
if(! DBA::isResult($r1)) {
notice(L10n::t('Profile unavailable to clone.') . EOL);
killme();
exit();
return;
}
unset($r1[0]['id']);
@@ -150,7 +150,7 @@ function profiles_init(App $a) {
);
if (! DBA::isResult($r)) {
notice(L10n::t('Profile not found.') . EOL);
killme();
exit();
return;
}


+ 1
- 1
mod/profperm.php View File

@@ -165,7 +165,7 @@ function profperm_content(App $a) {

if (!empty($change)) {
echo $o;
killme();
exit();
}
$o .= '</div>';
return $o;

+ 1
- 1
mod/pubsub.php View File

@@ -17,7 +17,7 @@ function hub_return($valid, $body)
} else {
System::httpExit(404);
}
killme();
exit();
}

// when receiving an XML feed, always return OK

+ 1
- 1
mod/pubsubhubbub.php View File

@@ -136,5 +136,5 @@ function pubsubhubbub_init(App $a) {

System::httpExit(202);
}
killme();
exit();
}

+ 1
- 1
mod/robots_txt.php View File

@@ -26,5 +26,5 @@ function robots_txt_init(App $a)
foreach ($allDisalloweds as $disallowed) {
echo 'Disallow: ' . $disallowed . PHP_EOL;
}
killme();
exit();
}

+ 1
- 1
mod/rsd_xml.php View File

@@ -22,5 +22,5 @@ function rsd_xml_content(App $a)
</service>
</rsd>';

killme();
exit();
}

+ 2
- 2
mod/search.php View File

@@ -102,7 +102,7 @@ function search_content(App $a) {
System::httpExit(403,
["title" => L10n::t("Public access denied."),
"description" => L10n::t("Only logged in users are permitted to perform a search.")]);
killme();
exit();
//notice(L10n::t('Public access denied.').EOL);
//return;
}
@@ -127,7 +127,7 @@ function search_content(App $a) {
System::httpExit(429,
["title" => L10n::t("Too Many Requests"),
"description" => L10n::t("Only one search per minute is permitted for not logged in users.")]);
killme();
exit();
}
Cache::set("remote_search:".$remote, json_encode(["time" => time(), "accesses" => $resultdata->accesses + 1]), Cache::HOUR);
} else

+ 3
- 3
mod/share.php View File

@@ -8,7 +8,7 @@ function share_init(App $a) {
$post_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);

if (!$post_id || !local_user()) {
killme();
exit();
}

$fields = ['private', 'body', 'author-name', 'author-link', 'author-avatar',
@@ -16,7 +16,7 @@ function share_init(App $a) {
$item = Item::selectFirst($fields, ['id' => $post_id]);

if (!DBA::isResult($item) || $item['private'] == 1) {
killme();
exit();
}

if (strpos($item['body'], "[/share]") !== false) {
@@ -34,7 +34,7 @@ function share_init(App $a) {
}

echo $o;
killme();
exit();
}

/// @TODO Rewrite to handle over whole record array

+ 4
- 4
mod/starred.php View File

@@ -12,18 +12,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::selectFirstForUser(local_user(), ['starred'], ['uid' => local_user(), 'id' => $message_id]);
if (!DBA::isResult($item)) {
killme();
exit();
}

if (!intval($item['starred'])) {
@@ -48,5 +48,5 @@ function starred_init(App $a) {
// the json doesn't really matter, it will either be 0 or 1

echo json_encode($starred);
killme();
exit();
}

+ 1
- 2
mod/statistics_json.php View File

@@ -14,7 +14,6 @@ function statistics_json_init(App $a) {

if (!Config::get("system", "nodeinfo")) {
System::httpExit(404);
killme();
}

$statistics = [
@@ -56,5 +55,5 @@ function statistics_json_init(App $a) {
header("Content-Type: application/json");
echo json_encode($statistics, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
Logger::log("statistics_init: printed " . print_r($statistics, true), Logger::DATA);
killme();
exit();
}

+ 1
- 1
mod/subthread.php View File

@@ -151,6 +151,6 @@ EOT;

Addon::callHooks('post_local_end', $arr);

killme();
exit();

}

+ 1
- 3
mod/tagger.php View File

@@ -203,7 +203,5 @@ EOT;

Worker::add(PRIORITY_HIGH, "Notifier", "tag", $post_id);

killme();

return; // NOTREACHED
exit();
}

+ 4
- 6
mod/uexport.php View File

@@ -11,7 +11,7 @@ use Friendica\Database\DBA;

function uexport_init(App $a) {
if (!local_user()) {
killme();
exit();
}

require_once("mod/settings.php");
@@ -26,14 +26,14 @@ function uexport_content(App $a) {
switch ($a->argv[1]) {
case "backup":
uexport_all($a);
killme();
exit();
break;
case "account":
uexport_account($a);
killme();
exit();
break;
default:
killme();
exit();
}
}

@@ -130,7 +130,6 @@ function uexport_account($a) {
'group_member' => $group_member,
];

//echo "<pre>"; var_dump(json_encode($output)); killme();
echo json_encode($output, JSON_PARTIAL_OUTPUT_ON_ERROR);
}

@@ -152,7 +151,6 @@ function uexport_all(App $a) {
// chunk the output to avoid exhausting memory

for ($x = 0; $x < $total; $x += 500) {
$item = [];
$r = q("SELECT * FROM `item` WHERE `uid` = %d LIMIT %d, %d",
intval(local_user()),
intval($x),

+ 1
- 1
mod/update_community.php View File

@@ -34,5 +34,5 @@ function update_community_content(App $a) {
echo str_replace("\t", " ", $text);
echo "</section>";
echo "</body></html>\r\n";
killme();
exit();
}

+ 1
- 1
mod/update_contact.php View File

@@ -34,5 +34,5 @@ function update_contact_content(App $a)
echo str_replace("\t", " ", $text);
echo "</section>";
echo "</body></html>\r\n";
killme();
exit();
}

+ 1
- 1
mod/update_display.php View File

@@ -35,5 +35,5 @@ function update_display_content(App $a)
echo str_replace("\t", " ", $text);
echo "</section>";
echo "</body></html>\r\n";
killme();
exit();
}

+ 2
- 2
mod/update_network.php View File

@@ -13,7 +13,7 @@ require_once "mod/network.php";
function update_network_content(App $a)
{
if (!isset($_GET['p']) || !isset($_GET['item'])) {
killme();
exit();
}

$profile_uid = intval($_GET['p']);
@@ -44,5 +44,5 @@ function update_network_content(App $a)
echo str_replace("\t", " ", $text);
echo "</section>";
echo "</body></html>\r\n";
killme();
exit();
}

+ 1
- 1
mod/update_notes.php View File

@@ -48,5 +48,5 @@ function update_notes_content(App $a) {
echo str_replace("\t", " ", $text);
echo "</section>";
echo "</body></html>\r\n";
killme();
exit();
}

+ 1
- 1
mod/update_profile.php View File

@@ -47,5 +47,5 @@ function update_profile_content(App $a) {
echo str_replace("\t", " ", $text);
echo "</section>";
echo "</body></html>\r\n";
killme();
exit();
}

+ 1
- 1
mod/view.php View File

@@ -13,5 +13,5 @@ function view_init($a){
require_once("view/theme/$theme/style.php");
}
killme();
exit();
}

+ 1
- 1
mod/viewsrc.php View File

@@ -28,7 +28,7 @@ function viewsrc_content(App $a)
if (DBA::isResult($item)) {
if ($a->isAjax()) {
echo str_replace("\n", '<br />', $item['body']);
killme();
exit();
} else {
$o .= str_replace("\n", '<br />', $item['body']);
}

+ 11
- 11
mod/wall_attach.php View File

@@ -26,14 +26,14 @@ function wall_attach_post(App $a) {
if (! DBA::isResult($r)) {
if ($r_json) {
echo json_encode(['error' => L10n::t('Invalid request.')]);
killme();
exit();
}
return;
}
} else {
if ($r_json) {
echo json_encode(['error' => L10n::t('Invalid request.')]);
killme();
exit();
}

return;
@@ -79,17 +79,17 @@ function wall_attach_post(App $a) {
if (! $can_post) {
if ($r_json) {
echo json_encode(['error' => L10n::t('Permission denied.')]);
killme();
exit();
}
notice(L10n::t('Permission denied.') . EOL );
killme();
exit();
}

if (empty($_FILES['userfile'])) {
if ($r_json) {
echo json_encode(['error' => L10n::t('Invalid request.')]);
}
killme();
exit();
}

$src = $_FILES['userfile']['tmp_name'];
@@ -112,7 +112,7 @@ function wall_attach_post(App $a) {
notice($msg . EOL);
}
@unlink($src);
killme();
exit();
}

if ($maxfilesize && $filesize > $maxfilesize) {
@@ -123,7 +123,7 @@ function wall_attach_post(App $a) {
echo $msg . EOL;
}
@unlink($src);
killme();
exit();
}

$filedata = @file_get_contents($src);
@@ -146,7 +146,7 @@ function wall_attach_post(App $a) {
} else {
echo $msg . EOL;
}
killme();
exit();
}

$r = q("SELECT `id` FROM `attach` WHERE `uid` = %d AND `created` = '%s' AND `hash` = '%s' LIMIT 1",
@@ -162,18 +162,18 @@ function wall_attach_post(App $a) {
} else {
echo $msg . EOL;
}
killme();
exit();
}

if ($r_json) {
echo json_encode(['ok' => true]);
killme();
exit();
}

$lf = "\n";

echo $lf . $lf . '[attachment]' . $r[0]['id'] . '[/attachment]' . $lf;

killme();
exit();
// NOTREACHED
}

+ 14
- 14
mod/wall_upload.php View File

@@ -39,7 +39,7 @@ function wall_upload_post(App $a, $desktopmode = true)
if (!DBA::isResult($r)) {
if ($r_json) {
echo json_encode(['error' => L10n::t('Invalid request.')]);
killme();
exit();
}
return;
}
@@ -55,7 +55,7 @@ function wall_upload_post(App $a, $desktopmode = true)
} else {
if ($r_json) {
echo json_encode(['error' => L10n::t('Invalid request.')]);
killme();
exit();
}
return;
}
@@ -104,17 +104,17 @@ function wall_upload_post(App $a, $desktopmode = true)
if (!$can_post) {
if ($r_json) {
echo json_encode(['error' => L10n::t('Permission denied.')]);
killme();
exit();
}
notice(L10n::t('Permission denied.') . EOL);
killme();
exit();
}

if (empty($_FILES['userfile']) && empty($_FILES['media'])) {
if ($r_json) {
echo json_encode(['error' => L10n::t('Invalid request.')]);
}
killme();
exit();
}

$src = '';
@@ -164,10 +164,10 @@ function wall_upload_post(App $a, $desktopmode = true)
if ($src == "") {
if ($r_json) {
echo json_encode(['error' => L10n::t('Invalid request.')]);
killme();
exit();
}
notice(L10n::t('Invalid request.').EOL);
killme();
exit();
}

// This is a special treatment for picture upload from Twidere
@@ -201,7 +201,7 @@ function wall_upload_post(App $a, $desktopmode = true)
echo $msg. EOL;
}
@unlink($src);
killme();
exit();
}

$imagedata = @file_get_contents($src);
@@ -215,7 +215,7 @@ function wall_upload_post(App $a, $desktopmode = true)
echo $msg. EOL;
}
@unlink($src);
killme();
exit();
}

$Image->orient($src);
@@ -253,7 +253,7 @@ function wall_upload_post(App $a, $desktopmode = true)
} else {
echo $msg. EOL;
}
killme();
exit();
}

if ($width > 640 || $height > 640) {
@@ -283,7 +283,7 @@ function wall_upload_post(App $a, $desktopmode = true)
if (!$r) {
if ($r_json) {
echo json_encode(['error' => '']);
killme();
exit();
}
return false;
}
@@ -300,7 +300,7 @@ function wall_upload_post(App $a, $desktopmode = true)

if ($r_json) {
echo json_encode(['picture' => $picture]);
killme();
exit();
}
Logger::log("upload done", Logger::DEBUG);
return $picture;
@@ -310,10 +310,10 @@ function wall_upload_post(App $a, $desktopmode = true)

if ($r_json) {
echo json_encode(['ok' => true]);
killme();
exit();
}

echo "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . System::baseUrl() . "/photo/{$hash}-{$smallest}.".$Image->getExt()."[/img][/url]\n\n";
killme();
exit();
// NOTREACHED
}

+ 1
- 1
mod/webfinger.php View File

@@ -17,7 +17,7 @@ function webfinger_content(App $a)
"description" => L10n::t("Only logged in users are permitted to perform a probing.")
]
);
killme();
exit();
}

$o = '<div class="generic-page-wrapper">';

+ 1
- 1
mod/worker.php View File

@@ -58,5 +58,5 @@ function worker_init()

Logger::log("Front end worker ended: ".getmypid());

killme();
exit();
}

+ 2
- 2
mod/xrd.php View File

@@ -97,7 +97,7 @@ function xrd_json($a, $uri, $alias, $profile_url, $r)
];

echo json_encode($json);
killme();
exit();
}

function xrd_xml($a, $uri, $alias, $profile_url, $r)
@@ -130,5 +130,5 @@ function xrd_xml($a, $uri, $alias, $profile_url, $r)
Addon::callHooks('personal_xrd', $arr);

echo $arr['xml'];
killme();
exit();
}

+ 2
- 2
src/BaseModule.php View File

@@ -150,8 +150,8 @@ abstract class BaseModule extends BaseObject
$a = \get_app();
Logger::log('checkFormSecurityToken failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
Logger::log('checkFormSecurityToken failed: _REQUEST data: ' . print_r($_REQUEST, true), Logger::DATA);
header('HTTP/1.1 403 Forbidden');
killme();
System::httpExit(403);
}
}
}

+ 1
- 1
src/Core/Renderer.php View File

@@ -96,7 +96,7 @@ class Renderer extends BaseObject
$template = $t->getTemplateFile($s, $root);
} catch (Exception $e) {
echo "<pre><b>" . __FUNCTION__ . "</b>: " . $e->getMessage() . "</pre>";
killme();
exit();
}

$a->saveTimestamp($stamp1, "file");

+ 2
- 2
src/Core/System.php View File

@@ -111,7 +111,7 @@ class System extends BaseObject

echo XML::fromArray($xmldata, $xml);

killme();
exit();
}

/**
@@ -185,7 +185,7 @@ class System extends BaseObject
public static function jsonExit($x, $content_type = 'application/json') {
header("Content-type: $content_type");
echo json_encode($x);
killme();
exit();
}

/**

+ 3
- 3
src/Module/Oembed.php View File

@@ -25,14 +25,14 @@ class Oembed extends BaseModule
if ($a->argv[1] == 'b2h') {
$url = ["", trim(hex2bin($_REQUEST['url']))];
echo Content\OEmbed::replaceCallback($url);
killme();
exit();
}

// Unused form: /oembed/h2b?text=...
if ($a->argv[1] == 'h2b') {
$text = trim(hex2bin($_REQUEST['text']));
echo Content\OEmbed::HTML2BBCode($text);
killme();
exit();
}

if ($a->argc == 2) {
@@ -49,6 +49,6 @@ class Oembed extends BaseModule
echo $j->html;
echo '</body></html>';
}
killme();
exit();
}
}

+ 2
- 7
src/Module/Photo.php View File

@@ -20,7 +20,6 @@ use Friendica\Network\HTTPException\InternalServerErrorException;
*/
class Photo extends BaseModule
{

/**
* @brief Module initializer
*
@@ -78,7 +77,7 @@ class Photo extends BaseModule
if ($photo === false) {
// not using System::httpExit() because we don't want html here.
header($_SERVER["SERVER_PROTOCOL"] . " 404 Not Found" , true, 404);
killme();
exit();
}

$cacheable = ($photo["allow_cid"] . $photo["allow_gid"] . $photo["deny_cid"] . $photo["deny_gid"] === "") && (isset($photo["cacheable"]) ? $photo["cacheable"] : true);
@@ -90,13 +89,11 @@ class Photo extends BaseModule
System::httpExit(500, ["description" => "Invalid photo with id {$photo["id"]}."]);
}


// if customsize is set and image is not a gif, resize it
if ($img->getType() !== "image/gif" && $customsize > 0 && $customsize < 501) {
$img->scaleToSquare($customsize);
}


if (function_exists("header_remove")) {
header_remove("Pragma");
header_remove("pragma");
@@ -117,11 +114,9 @@ class Photo extends BaseModule
header("Cache-Control: max-age=31536000");
}


echo $img->asString();


killme();
exit();
}

private static function stripExtension($name)

+ 5
- 5
src/Protocol/DFRN.php View File

@@ -171,7 +171,7 @@ class DFRN

if (! DBA::isResult($r)) {
Logger::log(sprintf('No contact found for nickname=%d', $owner_nick), Logger::WARNING);
killme();
exit();
}

$owner = $r[0];
@@ -207,7 +207,7 @@ class DFRN

if (! DBA::isResult($r)) {
Logger::log(sprintf('No contact found for uid=%d', $owner_id), Logger::WARNING);
killme();
exit();
}

$contact = $r[0];
@@ -353,7 +353,7 @@ class DFRN
$ret = Item::select(Item::DELIVER_FIELDLIST, $condition);
$items = Item::inArray($ret);
if (!DBA::isResult($items)) {
killme();
exit();
}

$item = $items[0];
@@ -361,7 +361,7 @@ class DFRN
if ($item['uid'] != 0) {
$owner = User::getOwnerDataById($item['uid']);
if (!$owner) {
killme();
exit();
}
} else {
$owner = ['uid' => 0, 'nick' => 'feed-item'];
@@ -1962,7 +1962,7 @@ class DFRN
*/
if (!DBA::isResult($fcontact)) {
// Database record did not get created. Quietly give up.
killme();
exit();
}

$fid = $r[0]["id"];

+ 1
- 1
src/Render/FriendicaSmartyEngine.php View File

@@ -19,7 +19,7 @@ class FriendicaSmartyEngine implements ITemplateEngine
{
if (!is_writable('view/smarty3/')) {
echo "<b>ERROR:</b> folder <tt>view/smarty3/</tt> must be writable by webserver.";
killme();
exit();
}
}


+ 2
- 1
src/Util/Emailer.php View File

@@ -88,8 +88,9 @@ class Emailer
'headers' => $messageHeader,
'parameters' => $sendmail_params
];
//echo "<pre>"; var_dump($hookdata); killme();
Addon::callHooks("emailer_send", $hookdata);

$res = mail(
$hookdata['to'],
$hookdata['subject'],

+ 1
- 1
src/Worker/Cron.php View File

@@ -151,7 +151,7 @@ class Cron
$restart = true;
$generation = intval($generation);
if (!$generation) {
killme();
exit();
}
}


Loading…
Cancel
Save