Reverting some parts because wouldn't work

diff --git a/bin/auth_ejabberd.php b/bin/auth_ejabberd.php
index fd1b40cc848e0783a0c402735ec2fc1f3e3859d8..22087ed017479efd3c092da826ca95d04528e9f2 100755 (executable)
--- a/bin/auth_ejabberd.php
+++ b/bin/auth_ejabberd.php
@@ -54,7 +54,8 @@
 use Friendica\Network\HTTPException\ForbiddenException;
 
 if (php_sapi_name() !== 'cli') {
-       throw new ForbiddenException();
+       header($_SERVER["SERVER_PROTOCOL"] . ' 403 Forbidden');
+       exit();
 }
 
 use Dice\Dice;

diff --git a/bin/console.php b/bin/console.php
index edfb8cd285f9c9f1194788c4994c4e5edd3170a8..8305176157661a4dc5f5e345d95a97d9094a2dc8 100755 (executable)
--- a/bin/console.php
+++ b/bin/console.php
@@ -23,7 +23,8 @@
 use Friendica\Network\HTTPException\ForbiddenException;
 
 if (php_sapi_name() !== 'cli') {
-       throw new ForbiddenException();
+       header($_SERVER["SERVER_PROTOCOL"] . ' 403 Forbidden');
+       exit();
 }
 
 use Dice\Dice;

diff --git a/bin/daemon.php b/bin/daemon.php
index 965c495ecdbc5af9cf0961cb15319ea93c28fa85..78eb74001d1726ae7bc5f56ef6b84d772f060772 100755 (executable)
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -26,7 +26,8 @@
 use Friendica\Network\HTTPException\ForbiddenException;
 
 if (php_sapi_name() !== 'cli') {
-       throw new ForbiddenException();
+       header($_SERVER["SERVER_PROTOCOL"] . ' 403 Forbidden');
+       exit();
 }
 
 use Dice\Dice;

diff --git a/bin/testargs.php b/bin/testargs.php
index 05826f2e4271211e4923249135f5c4ea947ad2b0..dbfd05a13070c098cbbe9cf850794feb95672d5f 100644 (file)
--- a/bin/testargs.php
+++ b/bin/testargs.php
@@ -29,7 +29,8 @@
 use Friendica\Network\HTTPException\ForbiddenException;
 
 if (php_sapi_name() !== 'cli') {
-       throw new ForbiddenException();
+       header($_SERVER["SERVER_PROTOCOL"] . ' 403 Forbidden');
+       exit();
 }
 
 if (($_SERVER["argc"] > 1) && isset($_SERVER["argv"][1])) {

diff --git a/bin/worker.php b/bin/worker.php
index a39d04963222ff61bd3d61dc5f295a7301f06823..ad70bb176a2a4efd39a8a1b76b0e55a2af031052 100755 (executable)
--- a/bin/worker.php
+++ b/bin/worker.php
@@ -24,7 +24,8 @@
 use Friendica\Network\HTTPException\ForbiddenException;
 
 if (php_sapi_name() !== 'cli') {
-       throw new ForbiddenException();
+       header($_SERVER["SERVER_PROTOCOL"] . ' 403 Forbidden');
+       exit();
 }
 
 use Dice\Dice;

diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php
index 08e463bd409587e2b334540d1895f6bedb64dfab..95a319a41a962ec699da798e249951a3a728d6c4 100644 (file)
--- a/src/Module/Friendica.php
+++ b/src/Module/Friendica.php
@@ -30,7 +30,6 @@ use Friendica\Database\PostUpdate;
 use Friendica\DI;
 use Friendica\Model\User;
 use Friendica\Network\HTTPException;
-use Friendica\Network\HTTPException\ImATeapotException;
 use Friendica\Protocol\ActivityPub;
 
 /**