X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fwall_attach.php;h=43f4681df336e226c346f559f22bbf5ba66157d5;hb=28e2eab7aee3ab5dac11fcc62be595b9a1c2df8b;hp=e9591c228bc56e1985407100aaa15c163cf34be7;hpb=dc3c8f915d2c5a4246e4edda6c565a5a03570834;p=friendica.git diff --git a/mod/wall_attach.php b/mod/wall_attach.php index e9591c228b..43f4681df3 100644 --- a/mod/wall_attach.php +++ b/mod/wall_attach.php @@ -1,6 +1,6 @@ DI::l10n()->t('Invalid request.')]); - exit(); + System::jsonExit(['error' => DI::l10n()->t('Invalid request.')]); } return; } } else { if ($r_json) { - echo json_encode(['error' => DI::l10n()->t('Invalid request.')]); - exit(); + System::jsonExit(['error' => DI::l10n()->t('Invalid request.')]); } return; @@ -65,18 +64,17 @@ function wall_attach_post(App $a) { if (!$can_post) { if ($r_json) { - echo json_encode(['error' => DI::l10n()->t('Permission denied.')]); - exit(); + System::jsonExit(['error' => DI::l10n()->t('Permission denied.')]); } notice(DI::l10n()->t('Permission denied.') . EOL ); - exit(); + System::exit(); } if (empty($_FILES['userfile'])) { if ($r_json) { - echo json_encode(['error' => DI::l10n()->t('Invalid request.')]); + System::jsonExit(['error' => DI::l10n()->t('Invalid request.')]); } - exit(); + System::exit(); } $src = $_FILES['userfile']['tmp_name']; @@ -93,24 +91,24 @@ function wall_attach_post(App $a) { if ($filesize <= 0) { $msg = DI::l10n()->t('Sorry, maybe your upload is bigger than the PHP configuration allows') . EOL .(DI::l10n()->t('Or - did you try to upload an empty file?')); + @unlink($src); if ($r_json) { - echo json_encode(['error' => $msg]); + System::jsonExit(['error' => $msg]); } else { notice($msg); } - @unlink($src); - exit(); + System::exit(); } if ($maxfilesize && $filesize > $maxfilesize) { $msg = DI::l10n()->t('File exceeds size limit of %s', Strings::formatBytes($maxfilesize)); + @unlink($src); if ($r_json) { - echo json_encode(['error' => $msg]); + System::jsonExit(['error' => $msg]); } else { echo $msg . EOL; } - @unlink($src); - exit(); + System::exit(); } $newid = Attach::storeFile($src, $page_owner_uid, $filename, '<' . $page_owner_cid . '>'); @@ -120,22 +118,20 @@ function wall_attach_post(App $a) { if ($newid === false) { $msg = DI::l10n()->t('File upload failed.'); if ($r_json) { - echo json_encode(['error' => $msg]); + System::jsonExit(['error' => $msg]); } else { echo $msg . EOL; } - exit(); + System::exit(); } if ($r_json) { - echo json_encode(['ok' => true, 'id' => $newid]); - exit(); + System::jsonExit(['ok' => true, 'id' => $newid]); } $lf = "\n"; echo $lf . $lf . '[attachment]' . $newid . '[/attachment]' . $lf; - - exit(); + System::exit(); // NOTREACHED }