Added parameter to rawContent

diff --git a/src/BaseModule.php b/src/BaseModule.php
index 5185771d1c51294f0f921c1e13a4cc36bf29a991..e049e9a944f8f12bb59edb8ae81976f07b669e79 100644 (file)
--- a/src/BaseModule.php
+++ b/src/BaseModule.php
@@ -32,7 +32,7 @@ abstract class BaseModule extends BaseObject
         * Extend this method if the module is supposed to return communication data,
         * e.g. from protocol implementations.
         */
-       public static function rawContent()
+       public static function rawContent($parameters)
        {
                // echo '';
                // exit;

diff --git a/src/Module/AccountManagementControlDocument.php b/src/Module/AccountManagementControlDocument.php
index 2e2a9e496d85ac5bbf9810f40429ed57058d1747..0cf1de6f15c5d43093f9ac85ea48d87fe6079f24 100644 (file)
--- a/src/Module/AccountManagementControlDocument.php
+++ b/src/Module/AccountManagementControlDocument.php
@@ -11,7 +11,7 @@ use Friendica\BaseModule;
  */
 class AccountManagementControlDocument extends BaseModule
 {
-       public static function rawContent()
+       public static function rawContent($parameters)
        {
                $output = [
                        'version' => 1,

diff --git a/src/Module/Admin/PhpInfo.php b/src/Module/Admin/PhpInfo.php
index b912117dc1446aff732bf5430f904048f5ebaa27..9c7b597514fcec4bc3ccdc60a33db5103245769e 100644 (file)
--- a/src/Module/Admin/PhpInfo.php
+++ b/src/Module/Admin/PhpInfo.php
@@ -6,9 +6,9 @@ use Friendica\Module\BaseAdminModule;
 
 class PhpInfo extends BaseAdminModule
 {
-       public static function rawContent()
+       public static function rawContent($parameters)
        {
-               parent::rawContent();
+               parent::rawContent($parameters);
 
                phpinfo();
                exit();

diff --git a/src/Module/Attach.php b/src/Module/Attach.php
index e9af90facc3fb1b0cc053acb93909e238c962e91..fe0e063b023b093867496f91b5aa68fb53ae7046 100644 (file)
--- a/src/Module/Attach.php
+++ b/src/Module/Attach.php
@@ -20,7 +20,7 @@ class Attach extends BaseModule
        /**
         * @brief Return to user an attached file given the id
         */
-       public static function rawContent()
+       public static function rawContent($parameters)
        {
                $a = self::getApp();
                if ($a->argc != 2) {

diff --git a/src/Module/BaseAdminModule.php b/src/Module/BaseAdminModule.php
index 6802d09c18b89f516b7ab0233ad391bcb100bd9d..61b3b4ff9fbabf3a53472f4fb04c28fc96c25a13 100644 (file)
--- a/src/Module/BaseAdminModule.php
+++ b/src/Module/BaseAdminModule.php
@@ -35,7 +35,7 @@ abstract class BaseAdminModule extends BaseModule
                }
        }
 
-       public static function rawContent()
+       public static function rawContent($parameters)
        {
                if (!is_site_admin()) {
                        return '';

diff --git a/src/Module/Contact/Hovercard.php b/src/Module/Contact/Hovercard.php
index 20290e0acae8c5ca0ff558b19162a88fb71d8452..7f314d361a0c3fbf9ac3e24343e84e66a3011059 100644 (file)
--- a/src/Module/Contact/Hovercard.php
+++ b/src/Module/Contact/Hovercard.php
@@ -18,7 +18,7 @@ use Friendica\Util\Proxy;
  */
 class Hovercard extends BaseModule
 {
-       public static function rawContent()
+       public static function rawContent($parameters)
        {
                $contact_url = $_REQUEST['url'] ?? '';
 

diff --git a/src/Module/Diaspora/Fetch.php b/src/Module/Diaspora/Fetch.php
index 467d64566b769048d1f5a106866afcfa7c49754d..b69cd1f12b21536cce97f5f28116d67f6cfdaaf8 100644 (file)
--- a/src/Module/Diaspora/Fetch.php
+++ b/src/Module/Diaspora/Fetch.php
@@ -17,7 +17,7 @@ use Friendica\Util\Strings;
  */
 class Fetch extends BaseModule
 {
-       public static function rawContent()
+       public static function rawContent($parameters)
        {
                $app = self::getApp();
 

diff --git a/src/Module/Filer/SaveTag.php b/src/Module/Filer/SaveTag.php
index e8e311268149575843312fe9ed6e6bd88d22e386..14eb368baab3f1cd902cfdf68e62c78051cbceba 100644 (file)
--- a/src/Module/Filer/SaveTag.php
+++ b/src/Module/Filer/SaveTag.php
@@ -22,7 +22,7 @@ class SaveTag extends BaseModule
                }
        }
 
-       public static function rawContent()
+       public static function rawContent($parameters)
        {
                $a = self::getApp();
                $logger = $a->getLogger();

diff --git a/src/Module/Followers.php b/src/Module/Followers.php
index 5bd3fe0ce2ef238b165fa52999c491400ecf4bc8..34cb0cdbf9e405c214ea170663e7b9a5ab2e2d8c 100644 (file)
--- a/src/Module/Followers.php
+++ b/src/Module/Followers.php
@@ -14,7 +14,7 @@ use Friendica\Protocol\ActivityPub;
  */
 class Followers extends BaseModule
 {
-       public static function rawContent()
+       public static function rawContent($parameters)
        {
                $a = self::getApp();
 

diff --git a/src/Module/Following.php b/src/Module/Following.php
index 5b5f4dc986d491d5c086f1f459ffef8bf5645e1e..cbf33d50f0d8df284ea3e74d0070d594361b6b79 100644 (file)
--- a/src/Module/Following.php
+++ b/src/Module/Following.php
@@ -14,7 +14,7 @@ use Friendica\Protocol\ActivityPub;
  */
 class Following extends BaseModule
 {
-       public static function rawContent()
+       public static function rawContent($parameters)
        {
                $a = self::getApp();
 

diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php
index ae8ea1496831699ec1df175bbcc3b5da4ae818cf..cadacb48b38dbad869d958d506e19a18426b940a 100644 (file)
--- a/src/Module/Friendica.php
+++ b/src/Module/Friendica.php
@@ -88,7 +88,7 @@ class Friendica extends BaseModule
                ]);
        }
 
-       public static function rawContent()
+       public static function rawContent($parameters)
        {
                $app = self::getApp();
 

diff --git a/src/Module/Inbox.php b/src/Module/Inbox.php
index 2cc273b139910c647a141b42bcf484fcdcd58fee..ac993277351d847fc2f2e1694e398d7911f01909 100644 (file)
--- a/src/Module/Inbox.php
+++ b/src/Module/Inbox.php
@@ -19,7 +19,7 @@ use Friendica\Util\Network;
  */
 class Inbox extends BaseModule
 {
-       public static function rawContent()
+       public static function rawContent($parameters)
        {
                $a = self::getApp();
 

diff --git a/src/Module/Item/Ignore.php b/src/Module/Item/Ignore.php
index 6a28310b401146e8a4db4f5c749575d8b244a7c5..662148076ca6d32eefdde1f82607cd2c9902e754 100644 (file)
--- a/src/Module/Item/Ignore.php
+++ b/src/Module/Item/Ignore.php
@@ -16,7 +16,7 @@ use Friendica\Network\HTTPException;
  */
 class Ignore extends BaseModule
 {
-       public static function rawContent()
+       public static function rawContent($parameters)
        {
                /** @var L10n $l10n */
                $l10n = self::getClass(L10n::class);

diff --git a/src/Module/Like.php b/src/Module/Like.php
index cc450dd9d0d381e2f7c2df211eb04ff1cc727135..3243a12cb9682b248092adec5050d83a089737df 100644 (file)
--- a/src/Module/Like.php
+++ b/src/Module/Like.php
@@ -13,7 +13,7 @@ use Friendica\Util\Strings;
  */
 class Like extends BaseModule
 {
-       public static function rawContent()
+       public static function rawContent($parameters)
        {
                if (!Session::isAuthenticated()) {
                        throw new HTTPException\ForbiddenException();

diff --git a/src/Module/Manifest.php b/src/Module/Manifest.php
index 9dadcf0f76206fa10dc3166939de27b3d92352d2..2fe432a5f4f4ab58f3f788c7c1bf0f53b75d14a5 100644 (file)
--- a/src/Module/Manifest.php
+++ b/src/Module/Manifest.php
@@ -7,7 +7,7 @@ use Friendica\Core\Renderer;
 
 class Manifest extends BaseModule
 {
-       public static function rawContent()
+       public static function rawContent($parameters)
        {
                $app = self::getApp();
                $config = $app->getConfig();

diff --git a/src/Module/NodeInfo.php b/src/Module/NodeInfo.php
index 3261ef690241b33ddbd47696fb2265c11a1b2a0b..f4ecc5da6879f166807e8ef04c76bb237ffeac80 100644 (file)
--- a/src/Module/NodeInfo.php
+++ b/src/Module/NodeInfo.php
@@ -22,7 +22,7 @@ class NodeInfo extends BaseModule
                }
        }
 
-       public static function rawContent()
+       public static function rawContent($parameters)
        {
                $app = self::getApp();
 

diff --git a/src/Module/Notifications/Notify.php b/src/Module/Notifications/Notify.php
index bad0900ea2540ba65bb4542f0a576fc3d9164c69..360204d94bf2d30eaafc604eb468eaf100b25ffc 100644 (file)
--- a/src/Module/Notifications/Notify.php
+++ b/src/Module/Notifications/Notify.php
@@ -21,7 +21,7 @@ class Notify extends BaseModule
                }
        }
 
-       public static function rawContent()
+       public static function rawContent($parameters)
        {
                $a = self::getApp();
 

diff --git a/src/Module/Objects.php b/src/Module/Objects.php
index 2104e8042fd98e3c2cc9f7bc57eb9782a7627826..528b20a86cc3ed7e123ac741e6f30e3acf556e02 100644 (file)
--- a/src/Module/Objects.php
+++ b/src/Module/Objects.php
@@ -15,7 +15,7 @@ use Friendica\Protocol\ActivityPub;
  */
 class Objects extends BaseModule
 {
-       public static function rawContent()
+       public static function rawContent($parameters)
        {
                $a = self::getApp();
 

diff --git a/src/Module/OpenSearch.php b/src/Module/OpenSearch.php
index ff005bd56b6d4a9c31743464e16ed86112ac8a67..89cf53055d1d2f6b90efb99ec22d88950e2c48b5 100644 (file)
--- a/src/Module/OpenSearch.php
+++ b/src/Module/OpenSearch.php
@@ -16,7 +16,7 @@ class OpenSearch extends BaseModule
        /**
         * @throws \Exception
         */
-       public static function rawContent()
+       public static function rawContent($parameters)
        {
                header('Content-type: application/opensearchdescription+xml');
 

diff --git a/src/Module/Outbox.php b/src/Module/Outbox.php
index 4fc05076310ad2593fb6dff4d469b9c243eb6da1..334e7af7181e9b441cb3e558a64e1341c4412d65 100644 (file)
--- a/src/Module/Outbox.php
+++ b/src/Module/Outbox.php
@@ -14,7 +14,7 @@ use Friendica\Protocol\ActivityPub;
  */
 class Outbox extends BaseModule
 {
-       public static function rawContent()
+       public static function rawContent($parameters)
        {
                $a = self::getApp();
 

diff --git a/src/Module/Profile.php b/src/Module/Profile.php
index f38c77f2cdcb5d8ba79d8484af15f8325da4e7e9..ab2fad2e2f88a0b7286ae81a3a2241c4164e13b7 100644 (file)
--- a/src/Module/Profile.php
+++ b/src/Module/Profile.php
@@ -51,7 +51,7 @@ class Profile extends BaseModule
                }
        }
 
-       public static function rawContent()
+       public static function rawContent($parameters)
        {
                if (ActivityPub::isRequest()) {
                        $user = DBA::selectFirst('user', ['uid'], ['nickname' => self::$which]);

diff --git a/src/Module/PublicRSAKey.php b/src/Module/PublicRSAKey.php
index ed099616ad41126a69ec0b41a11e92edbf888ec4..36502cc86bf442dfe730b5cac8034303a810cfd5 100644 (file)
--- a/src/Module/PublicRSAKey.php
+++ b/src/Module/PublicRSAKey.php
@@ -12,7 +12,7 @@ use Friendica\Network\HTTPException\BadRequestException;
  */
 class PublicRSAKey extends BaseModule
 {
-       public static function rawContent()
+       public static function rawContent($parameters)
        {
                $app = self::getApp();
 

diff --git a/src/Module/ReallySimpleDiscovery.php b/src/Module/ReallySimpleDiscovery.php
index 515285dbfcd070b1ba2417b9021d73c55c1ad35d..838843fbf0f2374dedf8ebdb52153f59ab73762b 100644 (file)
--- a/src/Module/ReallySimpleDiscovery.php
+++ b/src/Module/ReallySimpleDiscovery.php
@@ -11,7 +11,7 @@ use Friendica\Util\XML;
  */
 class ReallySimpleDiscovery extends BaseModule
 {
-       public static function rawContent()
+       public static function rawContent($parameters)
        {
                header('Content-Type: text/xml');
 

diff --git a/src/Module/RobotsTxt.php b/src/Module/RobotsTxt.php
index 635056a0ad999348483233daa23ad3d46d57288a..47e11201d9575e8f58eb91d18892e880ccad5bcb 100644 (file)
--- a/src/Module/RobotsTxt.php
+++ b/src/Module/RobotsTxt.php
@@ -9,7 +9,7 @@ use Friendica\BaseModule;
  */
 class RobotsTxt extends BaseModule
 {
-       public static function rawContent()
+       public static function rawContent($parameters)
        {
                $allDisalloweds = [
                        '/settings/',

diff --git a/src/Module/Search/Acl.php b/src/Module/Search/Acl.php
index 1016756008973291dca02bba042ac73454f950fe..e886a8fdb976085b23fe54b507a4b0c5142f0b08 100644 (file)
--- a/src/Module/Search/Acl.php
+++ b/src/Module/Search/Acl.php
@@ -31,7 +31,7 @@ class Acl extends BaseModule
        const TYPE_PRIVATE_MESSAGE       = 'm';
        const TYPE_ANY_CONTACT           = 'a';
 
-       public static function rawContent()
+       public static function rawContent($parameters)
        {
                if (!local_user()) {
                        throw new HTTPException\UnauthorizedException(L10n::t('You must be logged in to use this module.'));

diff --git a/src/Module/Settings/UserExport.php b/src/Module/Settings/UserExport.php
index d5b8f88ec1b3727a0c10b05609404324842ced24..9c4e4913cfdfdedbbcb4cb3418733ca64eb893ae 100644 (file)
--- a/src/Module/Settings/UserExport.php
+++ b/src/Module/Settings/UserExport.php
@@ -59,7 +59,7 @@ class UserExport extends BaseSettingsModule
         * to the browser which then offers a save / open dialog
         * to the user.
         **/
-       public static function rawContent()
+       public static function rawContent($parameters)
        {
                $args = self::getClass(Arguments::class);
                if ($args->getArgc() == 3) {

diff --git a/src/Module/Smilies.php b/src/Module/Smilies.php
index ded58768fe347cf7f6913eb4a00c3c8e66637abf..9a81a888e907840fffda24840dcb8788dc825479 100644 (file)
--- a/src/Module/Smilies.php
+++ b/src/Module/Smilies.php
@@ -12,7 +12,7 @@ use Friendica\Core\System;
  */
 class Smilies extends BaseModule
 {
-       public static function rawContent()
+       public static function rawContent($parameters)
        {
                $app = self::getApp();
 

diff --git a/src/Module/Starred.php b/src/Module/Starred.php
index 70cd3973518a81584604b2ef68439701a5fcfb7e..5c79c4fac87344cb99ac0a9686260dc9cd8101e9 100644 (file)
--- a/src/Module/Starred.php
+++ b/src/Module/Starred.php
@@ -4,29 +4,23 @@ namespace Friendica\Module;
 
 use Friendica\BaseModule;
 use Friendica\Model\Item;
+use Friendica\Core\System;
 
 /**
  * Toggle starred items
  */
 class Starred extends BaseModule
 {
-       public static function rawContent()
+       public static function rawContent($parameters)
        {
-               $a = self::getApp();
-               $starred = 0;
-               $itemId = null;
-
                if (!local_user()) {
                        exit();
                }
 
-               // @TODO: Replace with parameter from router
-               if ($a->argc > 1) {
-                       $itemId = intval($a->argv[1]);
-               }
-
-               if (!$itemId) {
-                       exit();
+               if (empty($parameters['item'])) {
+                       exit;
+               } else {
+                       $itemId = intval($parameters['item']);
                }
 
                $item = Item::selectFirstForUser(local_user(), ['starred'], ['uid' => local_user(), 'id' => $itemId]);
@@ -34,27 +28,18 @@ class Starred extends BaseModule
                        exit();
                }
 
-               if (!intval($item['starred'])) {
-                       $starred = 1;
-               }
+               $starred = !$item['starred'];
 
                Item::update(['starred' => $starred], ['id' => $itemId]);
 
                // See if we've been passed a return path to redirect to
                $returnPath = $_REQUEST['return'] ?? '';
-               if ($returnPath) {
-                       $rand = '_=' . time();
-                       if (strpos($returnPath, '?')) {
-                               $rand = "&$rand";
-                       } else {
-                               $rand = "?$rand";
-                       }
-
-                       $a->internalRedirect($returnPath . $rand);
+               if (!empty($returnPath)) {
+                       $rand = '_=' . time() . (strpos($returnPath, '?') ? '&' : '?') . 'rand';
+                       self::getApp()->internalRedirect($returnPath . $rand);
                }
 
                // the json doesn't really matter, it will either be 0 or 1
-               echo json_encode($starred);
-               exit();
+               System::jsonExit($starred);
        }
 }

diff --git a/src/Module/Statistics.php b/src/Module/Statistics.php
index 3e64828e7b64b3dfe33897d9dad3dd85e703b4f7..7400943237b558e368caafa4b17c20bf77d35708 100644 (file)
--- a/src/Module/Statistics.php
+++ b/src/Module/Statistics.php
@@ -17,7 +17,7 @@ class Statistics extends BaseModule
                }
        }
 
-       public static function rawContent()
+       public static function rawContent($parameters)
        {
                $config = self::getApp()->getConfig();
                $logger = self::getApp()->getLogger();

diff --git a/src/Module/Theme.php b/src/Module/Theme.php
index 0540267af71787ab759b487ea5576bd8aeca3406..762e398556f0cc2726db227ff070b94f62f384c9 100644 (file)
--- a/src/Module/Theme.php
+++ b/src/Module/Theme.php
@@ -10,7 +10,7 @@ use Friendica\Util\Strings;
  */
 class Theme extends BaseModule
 {
-       public static function rawContent()
+       public static function rawContent($parameters)
        {
                header("Content-Type: text/css");
 

diff --git a/src/Module/ThemeDetails.php b/src/Module/ThemeDetails.php
index 9a2e913bcad00e7cd58144b226eb65ddbcc95f89..611134d638139ca0058f32f72ae1cdcc2ac3f799 100644 (file)
--- a/src/Module/ThemeDetails.php
+++ b/src/Module/ThemeDetails.php
@@ -10,7 +10,7 @@ use Friendica\Core\Theme;
  */
 class ThemeDetails extends BaseModule
 {
-       public static function rawContent()
+       public static function rawContent($parameters)
        {
                if (!empty($_REQUEST['theme'])) {
                        $theme = $_REQUEST['theme'];

diff --git a/src/Module/WellKnown/HostMeta.php b/src/Module/WellKnown/HostMeta.php
index fd04467f7536816a50f3c93e21d4dc99f66062f3..acf2cca8663b767854f6d3734904bc713505caff 100644 (file)
--- a/src/Module/WellKnown/HostMeta.php
+++ b/src/Module/WellKnown/HostMeta.php
@@ -13,7 +13,7 @@ use Friendica\Util\Crypto;
  */
 class HostMeta extends BaseModule
 {
-       public static function rawContent()
+       public static function rawContent($parameters)
        {
                $app = self::getApp();
                $config = $app->getConfig();

diff --git a/src/Module/WellKnown/XSocialRelay.php b/src/Module/WellKnown/XSocialRelay.php
index a1bbeb78aacbe9fdb880e818e1dcecb3c7ef8ddb..bbd51069d9fa67ff88b6791370be355dce138c4f 100644 (file)
--- a/src/Module/WellKnown/XSocialRelay.php
+++ b/src/Module/WellKnown/XSocialRelay.php
@@ -11,7 +11,7 @@ use Friendica\Model\Search;
  */
 class XSocialRelay extends BaseModule
 {
-       public static function rawContent()
+       public static function rawContent($parameters)
        {
                $app = self::getApp();
                $config = $app->getConfig();

diff --git a/src/Module/Xrd.php b/src/Module/Xrd.php
index 1028bfd531f3054265d677c1eef698d00445d997..4bad558a4eba00ebcf3de5db8e1a7217fe466468 100644 (file)
--- a/src/Module/Xrd.php
+++ b/src/Module/Xrd.php
@@ -17,7 +17,7 @@ use Friendica\Util\Strings;
  */
 class Xrd extends BaseModule
 {
-       public static function rawContent()
+       public static function rawContent($parameters)
        {
                $app = self::getApp();
 

diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php
index 53f8a8ed44b8b1a3a36b8e057ec5bfcadedb5b7a..65e0b26a6a4bafb1951015f275d50bc450b41cbb 100755 (executable)
--- a/static/dbstructure.config.php
+++ b/static/dbstructure.config.php
@@ -34,7 +34,7 @@
 use Friendica\Database\DBA;
 
 if (!defined('DB_UPDATE_VERSION')) {
-       define('DB_UPDATE_VERSION', 1323);
+       define('DB_UPDATE_VERSION', 1324);
 }
 
 return [
@@ -1384,7 +1384,8 @@ return [
                        "iid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "primary" => "1", "relation" => ["item" => "id"], "comment" => "Item id"],
                        "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "primary" => "1", "relation" => ["user" => "uid"], "comment" => "User id"],
                        "hidden" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Marker to hide an item from the user"],
-                       "ignored" => ["type" => "boolean", "comment" => "Ignore this thread if set"]
+                       "ignored" => ["type" => "boolean", "comment" => "Ignore this thread if set"],
+                       "pinned" => ["type" => "boolean", "comment" => "The item is pinned on the profile page"]
                ],
                "indexes" => [
                        "PRIMARY" => ["uid", "iid"]

diff --git a/static/routes.config.php b/static/routes.config.php
index 1f2fe0ad1b98727e4bf1a58d5e8e2656b2cf38ef..339860afe636588723491aca074d94b0fa5dea39 100644 (file)
--- a/static/routes.config.php
+++ b/static/routes.config.php
@@ -179,8 +179,9 @@ return [
                '/{type}/{customize}/{name}' => [Module\Photo::class, [R::GET]],
        ],
 
-       '/pretheme' => [Module\ThemeDetails::class, [R::GET]],
-       '/probe'    => [Module\Debug\Probe::class,  [R::GET]],
+       '/pinned/{item:\d+}' => [Module\Pinned::class,       [R::GET]],
+       '/pretheme'          => [Module\ThemeDetails::class, [R::GET]],
+       '/probe'             => [Module\Debug\Probe::class,  [R::GET]],
 
        '/profile' => [
                '/{nickname}'                                                 => [Module\Profile::class,          [R::GET]],