Merge branch 'master' into develop

CHANGELOG.md

@@ -1,11 +1,22 @@
 HumHub Changelog
 ================
 
-1.15.3 (Unreleased)
--------------------
+1.15.3 (February 8, 2024)
+-------------------------
+- Fix #6713: Keep class option for Pjax Widget
 - Enh #6779: Added Twig Sandbox Extension for Statistic Tracking Codes
 - Fix #6791: Fix number of filtered modules on Marketplace
+- Fix #6744: Make sure to call `humhub\components\Module::update()` on Module updates
 - Fix #6796: Files in the RichText doesn't open as new tab
+- Fix #6800: Fix missed domain of profile url in email notifications
+- Fix #6801: Add missed twemoji images
+- Fix: Iso3166Codes class calls
+- Fix #6813: Fix for displaying whether I follow a user
+- Fix #6126: `Session::$timeout` takes effect before configured `User::$authTimeout`
+- Fix #6795: Fix searching of disabled users in Administration
+- Fix #6834: Fix notification switcher in wall stream entry context menu
+- Fix #6836: Fix check permission of changing content to public from context menu
+- Fix #6837: Fix saving of public content
 
 1.15.2 (December 19, 2023)
 --------------------------

protected/humhub/components/Module.php

@@ -342,15 +342,10 @@ class Module extends \yii\base\Module
      */
     public function update()
     {
-        if (!$this->beforeUpdate()) {
-            return null;
+        if ($this->beforeUpdate() !== false) {
+            $this->migrate();
+            $this->afterUpdate();
         }
-
-        $result = $this->getMigrationService()->migrateUp();
-
-        $this->afterUpdate();
-
-        return $result;
     }
 
     /**
@@ -359,6 +354,8 @@ class Module extends \yii\base\Module
      * The update will cancel if this function does return false;
      *
      * @return bool
+     * @deprecated
+     *
      */
     public function beforeUpdate()
     {
@@ -367,6 +364,8 @@ class Module extends \yii\base\Module
 
     /**
      * Called right after the module update.
+     *
+     * @deprecated
      */
     public function afterUpdate()
     {

protected/humhub/components/SocialActivity.php

@@ -243,6 +243,7 @@ abstract class SocialActivity extends BaseObject implements rendering\Viewable
     /**
      * Url of the origin of this notification
      * If source is a Content / ContentAddon / ContentContainer this will automatically generated.
+     * NOTE: Returned URL must be absolute with scheme
      *
      * @return string
      */
@@ -252,10 +253,10 @@ abstract class SocialActivity extends BaseObject implements rendering\Viewable
 
         if ($this->source instanceof Comment) {
             $url = $this->source->getUrl();
-        } elseif ($this->hasContent()) {
-            $url = $this->getContent()->getUrl();
+        } else if ($this->hasContent()) {
+            $url = $this->getContent()->getUrl(true);
         } elseif ($this->source instanceof ContentContainerActiveRecord) {
-            $url = $this->source->getUrl();
+            $url = $this->source->getUrl(true);
         }
 
         // Create absolute URL, for E-Mails

protected/humhub/modules/admin/models/UserSearch.php

@@ -113,7 +113,7 @@ class UserSearch extends User
                 ['like', 'concat(profile.lastname, " ", profile.firstname)', $this->freeText],
             ]);
 
-            if (!empty($this->status)) {
+            if (isset($this->status) && in_array($this->status, [User::STATUS_ENABLED, User::STATUS_DISABLED, User::STATUS_SOFT_DELETED])) {
                 $query->andFilterWhere(['user.status' => $this->status]);
             }
             return $dataProvider;

protected/humhub/modules/content/controllers/ContentController.php

@@ -208,7 +208,7 @@ class ContentController extends Controller
 
         if (!$content) {
             throw new NotFoundHttpException(Yii::t('ContentModule.base', 'Invalid content id given!'));
-        } elseif (!$content->canEdit()) {
+        } elseif (!$content->canEdit() || (!$content->visibility && !$content->container->visibility)) {
             throw new ForbiddenHttpException();
         } elseif ($content->isPrivate() && !$content->container->permissionManager->can(new CreatePublicContent())) {
             throw new ForbiddenHttpException();

protected/humhub/modules/content/models/Content.php

@@ -229,10 +229,20 @@ class Content extends ActiveRecord implements Movable, ContentOwner, Archiveable
         }
 
         $this->archived ??= 0;
-        $this->visibility ??= self::VISIBILITY_PRIVATE;
         $this->pinned ??= 0;
         $this->state ??= Content::STATE_PUBLISHED;
 
+        $this->visibility ??= self::VISIBILITY_PRIVATE;
+        // Force to private content for private space or if user has no permission to create public content
+        if ($this->container instanceof Space &&
+            $this->container->visibility !== Space::VISIBILITY_ALL &&
+            $this->visibility === self::VISIBILITY_PUBLIC) {
+            if ($this->container->visibility === Space::VISIBILITY_NONE ||
+                !$this->container->can(CreatePublicContent::class)) {
+                $this->visibility = self::VISIBILITY_PRIVATE;
+            }
+        }
+
         if ($insert) {
             $this->created_by ??= Yii::$app->user->id;
         }

protected/humhub/modules/content/resources/js/humhub.content.container.js

@@ -102,8 +102,8 @@ humhub.module('content.container', function (module, require, $) {
             if (response.success) {
                 const contentId = event.$trigger.data('content-id');
 
-                $('#notification_off_' + contentId).hide();
-                $('#notification_on_' + contentId).show();
+                $('#notification_on_' + contentId).hide();
+                $('#notification_off_' + contentId).show();
             }
         });
     }
@@ -113,8 +113,8 @@ humhub.module('content.container', function (module, require, $) {
             if (response.success) {
                 const contentId = event.$trigger.data('content-id');
 
-                $('#notification_on_' + contentId).hide();
-                $('#notification_off_' + contentId).show();
+                $('#notification_off_' + contentId).hide();
+                $('#notification_on_' + contentId).show();
             }
         });
     };

protected/humhub/modules/content/tests/codeception/unit/models/ContentVisibilityTest.php

@@ -70,6 +70,7 @@ class ContentVisibilityTest extends ContentModelTest
 
     public function testCreatePublicContentOnProtectedSpace()
     {
+        $this->space->addMember(Yii::$app->user->id);
         $this->space->visibility = Space::VISIBILITY_REGISTERED_ONLY;
 
         $newModel = new TestContent($this->space, Content::VISIBILITY_PUBLIC, [

protected/humhub/modules/content/widgets/views/notificationSwitchLink.php

@@ -45,6 +45,7 @@ ContentContainerAsset::register($this);
             'data' => [
                 'action-click' => 'content.container.turnOnNotifications',
                 'action-url' => Url::to(['/content/content/notification-switch', 'id' => $content->id, 'switch' => 1]),
+                'content-id' => $content->id,
             ]
         ]
     ); ?>

protected/humhub/modules/dashboard/tests/codeception/unit/DashboardMemberStreamQueryTest.php

@@ -163,7 +163,7 @@ class DashboardMemberStreamQueryTest extends DashboardStreamTest
 
     public function testSpaceFollowerDoesNotSeePublicContentOnPrivateSpace()
     {
-        $this->assertSpaceFollowerDoesSee(Space::VISIBILITY_NONE, Content::VISIBILITY_PUBLIC);
+        $this->assertSpaceFollowerDoesNotSee(Space::VISIBILITY_NONE, Content::VISIBILITY_PUBLIC);
     }
 
     public function testSpaceFollowerDoesNotSeePrivateContentOnPrivateSpace()

protected/humhub/modules/friendship/notifications/Request.php

@@ -39,7 +39,7 @@ class Request extends BaseNotification
      */
     public function getUrl()
     {
-        return $this->originator->getUrl();
+        return $this->originator->getUrl(true);
     }
 
     /**

protected/humhub/modules/friendship/notifications/RequestApproved.php

@@ -47,7 +47,7 @@ class RequestApproved extends BaseNotification
      */
     public function getUrl()
     {
-        return $this->originator->getUrl();
+        return $this->originator->getUrl(true);
     }
 
     /**

protected/humhub/modules/friendship/notifications/RequestDeclined.php

@@ -52,7 +52,7 @@ class RequestDeclined extends BaseNotification
      */
     public function getUrl()
     {
-        return $this->originator->getUrl();
+        return $this->originator->getUrl(true);
     }
 
     public function getMailSubject()

protected/humhub/modules/marketplace/components/OnlineModuleManager.php

@@ -179,6 +179,7 @@ class OnlineModuleManager extends Component
 
         $updatedModule = Yii::$app->moduleManager->getModule($moduleId);
         $updatedModule->getMigrationService()->migrateUp();
+        $updatedModule->update();
 
         (new MarketplaceService())->refreshPendingModuleUpdateCount();
 

protected/humhub/modules/space/activities/MemberAdded.php

@@ -42,7 +42,7 @@ class MemberAdded extends BaseActivity implements ConfigurableActivityInterface
     public function getUrl()
     {
         if ($this->originator) {
-            return $this->originator->getUrl();
+            return $this->originator->getUrl(true);
         }
 
         return parent::getUrl();

protected/humhub/modules/ui/form/widgets/ContentVisibilitySelect.php

@@ -11,6 +11,7 @@ namespace humhub\modules\ui\form\widgets;
 use humhub\modules\content\components\ContentActiveRecord;
 use humhub\modules\content\components\ContentContainerActiveRecord;
 use humhub\modules\content\models\Content;
+use humhub\modules\content\permissions\CreatePublicContent;
 use humhub\modules\space\models\Space;
 use Yii;
 use yii\bootstrap\InputWidget;
@@ -115,9 +116,11 @@ class ContentVisibilitySelect extends InputWidget
         $contentContainer = $this->getContentContainer();
 
         // Should hide on private spaces (Only provide private content visibility option)
-        if ($contentContainer instanceof Space) {
+        // or if user has no permission to create public content
+        if ($contentContainer instanceof Space && $contentContainer->visibility !== Space::VISIBILITY_ALL) {
             /** @var Space $contentContainer */
-            if ($contentContainer->visibility == Space::VISIBILITY_NONE) {
+            if ($contentContainer->visibility === Space::VISIBILITY_NONE ||
+                !$contentContainer->can(CreatePublicContent::class)) {
                 return true;
             }
         }

protected/humhub/modules/user/behaviors/Followable.php

@@ -43,7 +43,7 @@ class Followable extends Behavior
     public function getFollowRecord($userId)
     {
         $userId = ($userId instanceof User) ? $userId->id : $userId;
-        return Yii::$app->runtimeCache->getOrSet(__METHOD__ . $userId, function () use ($userId) {
+        return Yii::$app->runtimeCache->getOrSet(__METHOD__ . $this->owner->getPrimaryKey() . '-' . $userId, function () use ($userId) {
             return Follow::find()
                 ->where([
                     'object_model' => get_class($this->owner),

protected/humhub/modules/user/components/Session.php

@@ -39,6 +39,14 @@ class Session extends DbSession
         return $query;
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function getTimeout()
+    {
+        return (int) Yii::$app->user->authTimeout;
+    }
+
     /**
      * @inheritDoc
      */

protected/humhub/modules/user/models/fieldtype/CountrySelect.php

@@ -11,13 +11,14 @@ namespace humhub\modules\user\models\fieldtype;
 use Collator;
 use humhub\libs\Iso3166Codes;
 use humhub\modules\user\models\User;
+use humhub\libs\Html;
 use Yii;
 use yii\helpers\Html;
 
 /**
  * ProfileFieldTypeSelect handles numeric profile fields.
  *
- * @package humhub.modules_core.user.models
+ * @package humhub\modules\user\models\fieldtype
  * @since 0.5
  */
 class CountrySelect extends Select
@@ -56,17 +57,17 @@ class CountrySelect extends Select
 
         // if no options set basically return a translated map of all defined countries
         if (empty($this->options) || trim($this->options) == false) {
-            $items = iso3166Codes::$countries;
-            foreach ($items as $code => $value) {
-                $items[$code] = iso3166Codes::country($code);
+            $isoCodes = Iso3166Codes::$countries;
+
+            foreach ($isoCodes as $code => $value) {
+                $items[Iso3166Codes::country($code)] = Iso3166Codes::country($code);
             }
         } else {
             foreach (explode(",", $this->options) as $code) {
-
                 $key = trim($code);
-                $value = iso3166Codes::country($key, true);
+                $value = Iso3166Codes::country($key, true);
                 if (!empty($key) && $key !== $value) {
-                    $items[trim($key)] = trim($value);
+                    $items[$key] = trim($value);
                 }
             }
         }
@@ -87,7 +88,7 @@ class CountrySelect extends Select
         $value = $user->profile->$internalName;
 
         if (!$raw) {
-            return Html::encode(iso3166Codes::country($value));
+            return Html::encode(Iso3166Codes::country($value));
         }
 
         return $value;

protected/humhub/modules/user/notifications/Followed.php

@@ -47,7 +47,7 @@ class Followed extends BaseNotification
             throw new IntegrityException('Originator cannot be null.');
         }
 
-        return $this->originator->getUrl();
+        return $this->originator->getUrl(true);
     }
 
     /**