Replace killme() by exit()

pull/784/head
Hypolite Petovan 2018-12-26 00:39:53 -05:00
parent 9845edb8d9
commit aa5fbb4994
7 changed files with 19 additions and 19 deletions

View File

@ -243,5 +243,5 @@ function blockem_init(App $a)
PConfig::set(local_user(), 'blockem', 'words', $words); PConfig::set(local_user(), 'blockem', 'words', $words);
info(L10n::t('blockem settings updated') . EOL); info(L10n::t('blockem settings updated') . EOL);
killme(); exit();
} }

View File

@ -193,14 +193,14 @@ function jappixmini_init()
// of local users // of local users
$dfrn_id = $_REQUEST["dfrn_id"]; $dfrn_id = $_REQUEST["dfrn_id"];
if (!$dfrn_id) { if (!$dfrn_id) {
killme(); exit();
} }
$role = $_REQUEST["role"]; $role = $_REQUEST["role"];
if ($role == "pub") { if ($role == "pub") {
$r = q("SELECT * FROM `contact` WHERE LENGTH(`pubkey`) AND `dfrn-id`='%s' LIMIT 1", DBA::escape($dfrn_id)); $r = q("SELECT * FROM `contact` WHERE LENGTH(`pubkey`) AND `dfrn-id`='%s' LIMIT 1", DBA::escape($dfrn_id));
if (!count($r)) { if (!count($r)) {
killme(); exit();
} }
$encrypt_func = openssl_public_encrypt; $encrypt_func = openssl_public_encrypt;
@ -209,14 +209,14 @@ function jappixmini_init()
} else if ($role == "prv") { } else if ($role == "prv") {
$r = q("SELECT * FROM `contact` WHERE LENGTH(`prvkey`) AND `issued-id`='%s' LIMIT 1", DBA::escape($dfrn_id)); $r = q("SELECT * FROM `contact` WHERE LENGTH(`prvkey`) AND `issued-id`='%s' LIMIT 1", DBA::escape($dfrn_id));
if (!count($r)) { if (!count($r)) {
killme(); exit();
} }
$encrypt_func = openssl_private_encrypt; $encrypt_func = openssl_private_encrypt;
$decrypt_func = openssl_private_decrypt; $decrypt_func = openssl_private_decrypt;
$key = $r[0]["prvkey"]; $key = $r[0]["prvkey"];
} else { } else {
killme(); exit();
} }
$uid = $r[0]["uid"]; $uid = $r[0]["uid"];
@ -238,7 +238,7 @@ function jappixmini_init()
// do not return an address if user deactivated addon // do not return an address if user deactivated addon
$activated = PConfig::get($uid, 'jappixmini', 'activate'); $activated = PConfig::get($uid, 'jappixmini', 'activate');
if (!$activated) { if (!$activated) {
killme(); exit();
} }
// return the requested Jabber address // return the requested Jabber address
@ -259,9 +259,9 @@ function jappixmini_init()
$answer_json = json_encode($answer); $answer_json = json_encode($answer);
echo $answer_json; echo $answer_json;
killme(); exit();
} catch (Exception $e) { } catch (Exception $e) {
killme(); exit();
} }
} }

View File

@ -162,7 +162,7 @@ function js_upload_post_init(&$a,&$b) {
if(isset($result['error'])) { if(isset($result['error'])) {
Logger::log('mod/photos.php: photos_post(): error uploading photo: ' . $result['error'] , Logger::DEBUG); Logger::log('mod/photos.php: photos_post(): error uploading photo: ' . $result['error'] , Logger::DEBUG);
echo json_encode($result); echo json_encode($result);
killme(); exit();
} }
$a->data['upload_result'] = $result; $a->data['upload_result'] = $result;
@ -185,7 +185,7 @@ function js_upload_post_end(&$a,&$b) {
Logger::log('upload_post_end'); Logger::log('upload_post_end');
if(!empty($a->data['upload_jsonresponse'])) { if(!empty($a->data['upload_jsonresponse'])) {
echo $a->data['upload_jsonresponse']; echo $a->data['upload_jsonresponse'];
killme(); exit();
} }
} }

View File

@ -191,7 +191,7 @@ function remote_permissions_content($a, $item_copy) {
// Sort the names alphabetically, case-insensitive // Sort the names alphabetically, case-insensitive
natcasesort($allow_names); natcasesort($allow_names);
echo $o . implode(', ', $allow_names); echo $o . implode(', ', $allow_names);
killme(); exit();
} }
return; return;

View File

@ -164,5 +164,5 @@ function superblock_init(&$a)
PConfig::set(local_user(), 'system', 'blocked', $words); PConfig::set(local_user(), 'system', 'blocked', $words);
info(L10n::t('superblock settings updated') . EOL ); info(L10n::t('superblock settings updated') . EOL );
killme(); exit();
} }

View File

@ -89,7 +89,7 @@ function _randomAlphaNum($length){
function widgets_content(&$a) { function widgets_content(&$a) {
if (!isset($_GET['k'])) { if (!isset($_GET['k'])) {
if($a->argv[2]=="cb"){header('HTTP/1.0 400 Bad Request'); killme();} if($a->argv[2]=="cb"){header('HTTP/1.0 400 Bad Request'); exit();}
return; return;
} }
@ -97,7 +97,7 @@ function widgets_content(&$a) {
DBA::escape($_GET['k']) DBA::escape($_GET['k'])
); );
if (!count($r)){ if (!count($r)){
if($a->argv[2]=="cb"){header('HTTP/1.0 400 Bad Request'); killme();} if($a->argv[2]=="cb"){header('HTTP/1.0 400 Bad Request'); exit();}
return; return;
} }
$conf = []; $conf = [];
@ -110,7 +110,7 @@ function widgets_content(&$a) {
if (file_exists($widgetfile)){ if (file_exists($widgetfile)){
require_once($widgetfile); require_once($widgetfile);
} else { } else {
if($a->argv[2]=="cb"){header('HTTP/1.0 400 Bad Request'); killme();} if($a->argv[2]=="cb"){header('HTTP/1.0 400 Bad Request'); exit();}
return; return;
} }
@ -176,5 +176,5 @@ function widgets_content(&$a) {
} }
echo $o; echo $o;
killme(); exit();
} }

View File

@ -338,19 +338,19 @@ function windowsphonepush_content(App $a)
switch ($path2) { switch ($path2) {
case "show_settings": case "show_settings":
windowsphonepush_showsettings($a); windowsphonepush_showsettings($a);
killme(); exit();
break; break;
case "update_settings": case "update_settings":
$ret = windowsphonepush_updatesettings($a); $ret = windowsphonepush_updatesettings($a);
header("Content-Type: application/json; charset=utf-8"); header("Content-Type: application/json; charset=utf-8");
echo json_encode(['status' => $ret]); echo json_encode(['status' => $ret]);
killme(); exit();
break; break;
case "update_counterunseen": case "update_counterunseen":
$ret = windowsphonepush_updatecounterunseen(); $ret = windowsphonepush_updatecounterunseen();
header("Content-Type: application/json; charset=utf-8"); header("Content-Type: application/json; charset=utf-8");
echo json_encode(['status' => $ret]); echo json_encode(['status' => $ret]);
killme(); exit();
break; break;
default: default:
echo "Fehler"; echo "Fehler";