From aa5fbb4994dbd39ee97b3c8ca9f9529b48d5efc7 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 26 Dec 2018 00:39:53 -0500 Subject: [PATCH] Replace killme() by exit() --- blockem/blockem.php | 2 +- jappixmini/jappixmini.php | 14 +++++++------- js_upload/js_upload.php | 4 ++-- remote_permissions/remote_permissions.php | 2 +- superblock/superblock.php | 2 +- widgets/widgets.php | 8 ++++---- windowsphonepush/windowsphonepush.php | 6 +++--- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/blockem/blockem.php b/blockem/blockem.php index fbba29f4..c8b6c907 100644 --- a/blockem/blockem.php +++ b/blockem/blockem.php @@ -243,5 +243,5 @@ function blockem_init(App $a) PConfig::set(local_user(), 'blockem', 'words', $words); info(L10n::t('blockem settings updated') . EOL); - killme(); + exit(); } diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php index e2ef01d2..45305565 100644 --- a/jappixmini/jappixmini.php +++ b/jappixmini/jappixmini.php @@ -193,14 +193,14 @@ function jappixmini_init() // of local users $dfrn_id = $_REQUEST["dfrn_id"]; if (!$dfrn_id) { - killme(); + exit(); } $role = $_REQUEST["role"]; if ($role == "pub") { $r = q("SELECT * FROM `contact` WHERE LENGTH(`pubkey`) AND `dfrn-id`='%s' LIMIT 1", DBA::escape($dfrn_id)); if (!count($r)) { - killme(); + exit(); } $encrypt_func = openssl_public_encrypt; @@ -209,14 +209,14 @@ function jappixmini_init() } else if ($role == "prv") { $r = q("SELECT * FROM `contact` WHERE LENGTH(`prvkey`) AND `issued-id`='%s' LIMIT 1", DBA::escape($dfrn_id)); if (!count($r)) { - killme(); + exit(); } $encrypt_func = openssl_private_encrypt; $decrypt_func = openssl_private_decrypt; $key = $r[0]["prvkey"]; } else { - killme(); + exit(); } $uid = $r[0]["uid"]; @@ -238,7 +238,7 @@ function jappixmini_init() // do not return an address if user deactivated addon $activated = PConfig::get($uid, 'jappixmini', 'activate'); if (!$activated) { - killme(); + exit(); } // return the requested Jabber address @@ -259,9 +259,9 @@ function jappixmini_init() $answer_json = json_encode($answer); echo $answer_json; - killme(); + exit(); } catch (Exception $e) { - killme(); + exit(); } } diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php index 2203c9bf..705d47d9 100644 --- a/js_upload/js_upload.php +++ b/js_upload/js_upload.php @@ -162,7 +162,7 @@ function js_upload_post_init(&$a,&$b) { if(isset($result['error'])) { Logger::log('mod/photos.php: photos_post(): error uploading photo: ' . $result['error'] , Logger::DEBUG); echo json_encode($result); - killme(); + exit(); } $a->data['upload_result'] = $result; @@ -185,7 +185,7 @@ function js_upload_post_end(&$a,&$b) { Logger::log('upload_post_end'); if(!empty($a->data['upload_jsonresponse'])) { echo $a->data['upload_jsonresponse']; - killme(); + exit(); } } diff --git a/remote_permissions/remote_permissions.php b/remote_permissions/remote_permissions.php index 623d4172..093053e4 100644 --- a/remote_permissions/remote_permissions.php +++ b/remote_permissions/remote_permissions.php @@ -191,7 +191,7 @@ function remote_permissions_content($a, $item_copy) { // Sort the names alphabetically, case-insensitive natcasesort($allow_names); echo $o . implode(', ', $allow_names); - killme(); + exit(); } return; diff --git a/superblock/superblock.php b/superblock/superblock.php index 895f1ec6..9d40509e 100644 --- a/superblock/superblock.php +++ b/superblock/superblock.php @@ -164,5 +164,5 @@ function superblock_init(&$a) PConfig::set(local_user(), 'system', 'blocked', $words); info(L10n::t('superblock settings updated') . EOL ); - killme(); + exit(); } diff --git a/widgets/widgets.php b/widgets/widgets.php index 927d6746..48d32653 100644 --- a/widgets/widgets.php +++ b/widgets/widgets.php @@ -89,7 +89,7 @@ function _randomAlphaNum($length){ function widgets_content(&$a) { 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; } @@ -97,7 +97,7 @@ function widgets_content(&$a) { DBA::escape($_GET['k']) ); 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; } $conf = []; @@ -110,7 +110,7 @@ function widgets_content(&$a) { if (file_exists($widgetfile)){ require_once($widgetfile); } 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; } @@ -176,5 +176,5 @@ function widgets_content(&$a) { } echo $o; - killme(); + exit(); } diff --git a/windowsphonepush/windowsphonepush.php b/windowsphonepush/windowsphonepush.php index a6c9aa9b..bd1d3a38 100644 --- a/windowsphonepush/windowsphonepush.php +++ b/windowsphonepush/windowsphonepush.php @@ -338,19 +338,19 @@ function windowsphonepush_content(App $a) switch ($path2) { case "show_settings": windowsphonepush_showsettings($a); - killme(); + exit(); break; case "update_settings": $ret = windowsphonepush_updatesettings($a); header("Content-Type: application/json; charset=utf-8"); echo json_encode(['status' => $ret]); - killme(); + exit(); break; case "update_counterunseen": $ret = windowsphonepush_updatecounterunseen(); header("Content-Type: application/json; charset=utf-8"); echo json_encode(['status' => $ret]); - killme(); + exit(); break; default: echo "Fehler";