Update missing namespace uses in mod/

- Update missing constant moves in mod/

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index ac62d745342b8322ee0b8d0900b0c81b865c125d..e42f18e76b6fcc656c7ecfc2e0c5ebd9e6f40911 100644 (file)
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -12,6 +12,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
+use Friendica\Model\User;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\Diaspora;
 use Friendica\Util\Strings;

diff --git a/mod/hcard.php b/mod/hcard.php
index 9a0c969ae49e2dd3af615c725a069e6fa1aec0f9..cbaebc8ff4819f558a42983c380dddf9cf39d37e 100644 (file)
--- a/mod/hcard.php
+++ b/mod/hcard.php
@@ -8,6 +8,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
+use Friendica\Model\User;
 
 function hcard_init(App $a)
 {

diff --git a/mod/profile.php b/mod/profile.php
index e6b7f453c3e5a6f6f933e8ff830ee7d73ad51f4f..f93e45984b9ab3e65db6f25ed7e4228c8b37f341 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -19,6 +19,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
+use Friendica\Model\User;
 use Friendica\Module\Login;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\DFRN;

diff --git a/mod/profiles.php b/mod/profiles.php
index add9d50852b6f8e02dfead7e21474fdfe58f4c9e..bc41718c544f9ce9b9600b9c12b3663b03fab7f1 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -19,6 +19,7 @@ use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Profile;
+use Friendica\Model\User;
 use Friendica\Module\Login;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;

diff --git a/mod/settings.php b/mod/settings.php
index 8aba6809f23618c421d79870e8c930e2d2c5fd17..b1be28f8c908d11471a435358025b2a072679d21 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -474,13 +474,13 @@ function settings_post(App $a)
        }
 
        // Adjust the page flag if the account type doesn't fit to the page flag.
-       if (($account_type == Contact::ACCOUNT_TYPE_PERSON) && !in_array($page_flags, [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_SOAPBOX, User::PAGE_FLAGS_FREELOVE])) {
+       if (($account_type == User::ACCOUNT_TYPE_PERSON) && !in_array($page_flags, [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_SOAPBOX, User::PAGE_FLAGS_FREELOVE])) {
                $page_flags = User::PAGE_FLAGS_NORMAL;
-       } elseif (($account_type == Contact::ACCOUNT_TYPE_ORGANISATION) && !in_array($page_flags, [User::PAGE_FLAGS_SOAPBOX])) {
+       } elseif (($account_type == User::ACCOUNT_TYPE_ORGANISATION) && !in_array($page_flags, [User::PAGE_FLAGS_SOAPBOX])) {
                $page_flags = User::PAGE_FLAGS_SOAPBOX;
-       } elseif (($account_type == Contact::ACCOUNT_TYPE_NEWS) && !in_array($page_flags, [User::PAGE_FLAGS_SOAPBOX])) {
+       } elseif (($account_type == User::ACCOUNT_TYPE_NEWS) && !in_array($page_flags, [User::PAGE_FLAGS_SOAPBOX])) {
                $page_flags = User::PAGE_FLAGS_SOAPBOX;
-       } elseif (($account_type == Contact::ACCOUNT_TYPE_COMMUNITY) && !in_array($page_flags, [User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_PRVGROUP])) {
+       } elseif (($account_type == User::ACCOUNT_TYPE_COMMUNITY) && !in_array($page_flags, [User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_PRVGROUP])) {
                $page_flags = User::PAGE_FLAGS_COMMUNITY;
        }
 
@@ -1015,8 +1015,8 @@ function settings_content(App $a)
        // Set the account type to "Community" when the page is a community page but the account type doesn't fit
        // This is only happening on the first visit after the update
        if (in_array($a->user['page-flags'], [User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_PRVGROUP]) &&
-               ($a->user['account-type'] != Contact::ACCOUNT_TYPE_COMMUNITY))
-               $a->user['account-type'] = Contact::ACCOUNT_TYPE_COMMUNITY;
+               ($a->user['account-type'] != User::ACCOUNT_TYPE_COMMUNITY))
+               $a->user['account-type'] = User::ACCOUNT_TYPE_COMMUNITY;
 
        $pageset_tpl = Renderer::getMarkupTemplate('settings/pagetypes.tpl');
 
@@ -1025,26 +1025,26 @@ function settings_content(App $a)
                '$user'                 => L10n::t("Personal Page Subtypes"),
                '$community'            => L10n::t("Community Forum Subtypes"),
                '$account_type'         => $a->user['account-type'],
-               '$type_person'          => Contact::ACCOUNT_TYPE_PERSON,
-               '$type_organisation'    => Contact::ACCOUNT_TYPE_ORGANISATION,
-               '$type_news'            => Contact::ACCOUNT_TYPE_NEWS,
-               '$type_community'       => Contact::ACCOUNT_TYPE_COMMUNITY,
+               '$type_person'          => User::ACCOUNT_TYPE_PERSON,
+               '$type_organisation'    => User::ACCOUNT_TYPE_ORGANISATION,
+               '$type_news'            => User::ACCOUNT_TYPE_NEWS,
+               '$type_community'       => User::ACCOUNT_TYPE_COMMUNITY,
 
-               '$account_person'       => ['account-type', L10n::t('Personal Page'), Contact::ACCOUNT_TYPE_PERSON,
+               '$account_person'       => ['account-type', L10n::t('Personal Page'), User::ACCOUNT_TYPE_PERSON,
                                                                        L10n::t('Account for a personal profile.'),
-                                                                       ($a->user['account-type'] == Contact::ACCOUNT_TYPE_PERSON)],
+                                                                       ($a->user['account-type'] == User::ACCOUNT_TYPE_PERSON)],
 
-               '$account_organisation' => ['account-type', L10n::t('Organisation Page'), Contact::ACCOUNT_TYPE_ORGANISATION,
+               '$account_organisation' => ['account-type', L10n::t('Organisation Page'), User::ACCOUNT_TYPE_ORGANISATION,
                                                                        L10n::t('Account for an organisation that automatically approves contact requests as "Followers".'),
-                                                                       ($a->user['account-type'] == Contact::ACCOUNT_TYPE_ORGANISATION)],
+                                                                       ($a->user['account-type'] == User::ACCOUNT_TYPE_ORGANISATION)],
 
-               '$account_news'         => ['account-type', L10n::t('News Page'), Contact::ACCOUNT_TYPE_NEWS,
+               '$account_news'         => ['account-type', L10n::t('News Page'), User::ACCOUNT_TYPE_NEWS,
                                                                        L10n::t('Account for a news reflector that automatically approves contact requests as "Followers".'),
-                                                                       ($a->user['account-type'] == Contact::ACCOUNT_TYPE_NEWS)],
+                                                                       ($a->user['account-type'] == User::ACCOUNT_TYPE_NEWS)],
 
-               '$account_community'    => ['account-type', L10n::t('Community Forum'), Contact::ACCOUNT_TYPE_COMMUNITY,
+               '$account_community'    => ['account-type', L10n::t('Community Forum'), User::ACCOUNT_TYPE_COMMUNITY,
                                                                        L10n::t('Account for community discussions.'),
-                                                                       ($a->user['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY)],
+                                                                       ($a->user['account-type'] == User::ACCOUNT_TYPE_COMMUNITY)],
 
                '$page_normal'          => ['page-flags', L10n::t('Normal Account Page'), User::PAGE_FLAGS_NORMAL,
                                                                        L10n::t('Account for a regular personal profile that requires manual approval of "Friends" and "Followers".'),

diff --git a/mod/videos.php b/mod/videos.php
index 1d37b76bd6d3397e8bd8ff6e87540846e80ef580..4120c136f177c009562fe385047b6ea82d59549c 100644 (file)
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -16,6 +16,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
+use Friendica\Model\User;
 use Friendica\Protocol\DFRN;
 use Friendica\Util\Security;
 

diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index 4a4d1edc532af179de370093112c58ca408cf0c8..c4ee33bd18f97468b614bc5c598db8fad5091688 100644 (file)
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -8,7 +8,7 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Database\DBA;
 use Friendica\Model\Attach;
-use Friendica\Model\Contact;
+use Friendica\Model\User;
 use Friendica\Util\Strings;
 
 function wall_attach_post(App $a) {

diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index 84da85598490ebbe8dbfbc62cd219a34d873ac7c..a245ca739cdb80b39acbab56d2e06fc96bf51840 100644 (file)
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -16,6 +16,7 @@ use Friendica\Core\Config;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Photo;
+use Friendica\Model\User;
 use Friendica\Object\Image;
 use Friendica\Util\Strings;
 

diff --git a/update.php b/update.php
index 4b0b2f2b6ad8cf715f900595fc4c7411b9516987..e619ec89dd9bbb569c3ecb4db27c863c16fdcab2 100644 (file)
--- a/update.php
+++ b/update.php
@@ -161,7 +161,7 @@ function update_1191()
 function update_1203()
 {
        $r = q("UPDATE `user` SET `account-type` = %d WHERE `page-flags` IN (%d, %d)",
-               DBA::escape(Contact::ACCOUNT_TYPE_COMMUNITY),
+               DBA::escape(User::ACCOUNT_TYPE_COMMUNITY),
                DBA::escape(User::PAGE_FLAGS_COMMUNITY),
                DBA::escape(User::PAGE_FLAGS_PRVGROUP)
        );