Move /profile_photo to Module\Settings\Profile\Photo

[friendica.git] / mod / profperm.php

diff --git a/mod/profperm.php b/mod/profperm.php
index ee5e2f23d7aef3746e1dae71ab271211c2b94394..f17d1d66b7bcccdf963fc4e0d4a454e5a47f5784 100644 (file)
--- a/mod/profperm.php
+++ b/mod/profperm.php
@@ -3,11 +3,10 @@
  * @file mod/profperm.php
  */
 use Friendica\App;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
+use Friendica\Content\Text\HTML;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Profile;
 
 function profperm_init(App $a)
@@ -26,13 +25,13 @@ function profperm_init(App $a)
 function profperm_content(App $a) {
 
        if (!local_user()) {
-               notice(L10n::t('Permission denied') . EOL);
+               notice(DI::l10n()->t('Permission denied') . EOL);
                return;
        }
 
 
        if ($a->argc < 2) {
-               notice(L10n::t('Invalid profile identifier.') . EOL );
+               notice(DI::l10n()->t('Invalid profile identifier.') . EOL );
                return;
        }
 
@@ -40,9 +39,9 @@ function profperm_content(App $a) {
 
        // Switch to text mod interface if we have more than 'n' contacts or group members
 
-       $switchtotext = PConfig::get(local_user(),'system','groupedit_image_limit');
+       $switchtotext = DI::pConfig()->get(local_user(),'system','groupedit_image_limit');
        if (is_null($switchtotext)) {
-               $switchtotext = Config::get('system','groupedit_image_limit', 400);
+               $switchtotext = DI::config()->get('system','groupedit_image_limit', 400);
        }
 
        if (($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) {
@@ -65,7 +64,7 @@ function profperm_content(App $a) {
                        intval(local_user())
                );
                if (!DBA::isResult($r)) {
-                       notice(L10n::t('Invalid profile identifier.') . EOL );
+                       notice(DI::l10n()->t('Invalid profile identifier.') . EOL );
                        return;
                }
                $profile = $r[0];
@@ -111,11 +110,11 @@ function profperm_content(App $a) {
                                        $ingroup[] = $member['id'];
                }
 
-               $o .= '<h2>' . L10n::t('Profile Visibility Editor') . '</h2>';
+               $o .= '<h2>' . DI::l10n()->t('Profile Visibility Editor') . '</h2>';
 
-               $o .= '<h3>' . L10n::t('Profile') . ' \'' . $profile['profile-name'] . '\'</h3>';
+               $o .= '<h3>' . DI::l10n()->t('Profile') . ' \'' . $profile['profile-name'] . '\'</h3>';
 
-               $o .= '<div id="prof-edit-desc">' . L10n::t('Click on a contact to add or remove.') . '</div>';
+               $o .= '<div id="prof-edit-desc">' . DI::l10n()->t('Click on a contact to add or remove.') . '</div>';
 
        }
 
@@ -124,7 +123,7 @@ function profperm_content(App $a) {
                $o = '';
 
        $o .= '<div id="prof-members-title">';
-       $o .= '<h3>' . L10n::t('Visible To') . '</h3>';
+       $o .= '<h3>' . DI::l10n()->t('Visible To') . '</h3>';
        $o .= '</div>';
        $o .= '<div id="prof-members">';
 
@@ -133,14 +132,14 @@ function profperm_content(App $a) {
        foreach($members as $member) {
                if ($member['url']) {
                        $member['click'] = 'profChangeMember(' . $profile['id'] . ',' . $member['id'] . '); return true;';
-                       $o .= micropro($member,true,'mpprof', $textmode);
+                       $o .= HTML::micropro($member,true,'mpprof', $textmode);
                }
        }
        $o .= '</div><div id="prof-members-end"></div>';
        $o .= '<hr id="prof-separator" />';
 
        $o .= '<div id="prof-all-contcts-title">';
-       $o .= '<h3>' . L10n::t("All Contacts \x28with secure profile access\x29") . '</h3>';
+       $o .= '<h3>' . DI::l10n()->t("All Contacts \x28with secure profile access\x29") . '</h3>';
        $o .= '</div>';
        $o .= '<div id="prof-all-contacts">';
 
@@ -155,7 +154,7 @@ function profperm_content(App $a) {
                        foreach($r as $member) {
                                if (!in_array($member['id'],$ingroup)) {
                                        $member['click'] = 'profChangeMember(' . $profile['id'] . ',' . $member['id'] . '); return true;';
-                                       $o .= micropro($member,true,'mpprof',$textmode);
+                                       $o .= HTML::micropro($member,true,'mpprof',$textmode);
                                }
                        }
                }
@@ -164,7 +163,7 @@ function profperm_content(App $a) {
 
        if (!empty($change)) {
                echo $o;
-               killme();
+               exit();
        }
        $o .= '</div>';
        return $o;