Move drop_items and drop_item out of include/items

[friendica.git] / mod / oexchange.php

diff --git a/mod/oexchange.php b/mod/oexchange.php
index a55ee56d21d90bb74f8cc460208f5049ac4b6267..97367c3ea5f964ff0b9c25c5912770e90825caf5 100644 (file)
--- a/mod/oexchange.php
+++ b/mod/oexchange.php
@@ -1,11 +1,27 @@
 <?php
 /**
- * @file mod/oexchange.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 use Friendica\App;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
+use Friendica\DI;
 use Friendica\Module\Security\Login;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
@@ -15,7 +31,7 @@ function oexchange_init(App $a) {
        if (($a->argc > 1) && ($a->argv[1] === 'xrd')) {
                $tpl = Renderer::getMarkupTemplate('oexchange_xrd.tpl');
 
-               $o = Renderer::replaceMacros($tpl, ['$base' => System::baseUrl()]);
+               $o = Renderer::replaceMacros($tpl, ['$base' => DI::baseUrl()]);
                echo $o;
                exit();
        }
@@ -29,7 +45,7 @@ function oexchange_content(App $a) {
        }
 
        if (($a->argc > 1) && $a->argv[1] === 'done') {
-               info(L10n::t('Post successful.') . EOL);
+               info(DI::l10n()->t('Post successful.') . EOL);
                return;
        }
 
@@ -42,7 +58,7 @@ function oexchange_content(App $a) {
        $tags = ((!empty($_REQUEST['tags']))
                ? '&tags=' . urlencode(Strings::escapeTags(trim($_REQUEST['tags']))) : '');
 
-       $s = Network::fetchUrl(System::baseUrl() . '/parse_url?f=&url=' . $url . $title . $description . $tags);
+       $s = Network::fetchUrl(DI::baseUrl() . '/parse_url?url=' . $url . $title . $description . $tags);
 
        if (!strlen($s)) {
                return;