Fixes for CodeStyle vol.2

[bookstack] / app / Entities / Tools / PageEditActivity.php

diff --git a/app/Entities/Tools/PageEditActivity.php b/app/Entities/Tools/PageEditActivity.php
index 79de5c827987e8d1f9a4041d70d2598839c2c87c..a88dea8307767b2afe5a770f30f60296271634e0 100644 (file)
--- a/app/Entities/Tools/PageEditActivity.php
+++ b/app/Entities/Tools/PageEditActivity.php
@@ -1,4 +1,6 @@
-<?php namespace BookStack\Entities\Tools;
+<?php
+
+namespace BookStack\Entities\Tools;

 
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Models\PageRevision;
 
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Models\PageRevision;


@@ -7,7 +9,6 @@ use Illuminate\Database\Eloquent\Builder;
 
 class PageEditActivity
 {
 
 class PageEditActivity
 {

-

     protected $page;
 
     /**
     protected $page;
 
     /**


@@ -20,6 +21,7 @@ class PageEditActivity
 
     /**
      * Check if there's active editing being performed on this page.
 
     /**
      * Check if there's active editing being performed on this page.

+     *

      * @return bool
      */
     public function hasActiveEditing(): bool
      * @return bool
      */
     public function hasActiveEditing(): bool


@@ -35,14 +37,17 @@ class PageEditActivity
         $pageDraftEdits = $this->activePageEditingQuery(60)->get();
         $count = $pageDraftEdits->count();
 
         $pageDraftEdits = $this->activePageEditingQuery(60)->get();
         $count = $pageDraftEdits->count();
 

-        $userMessage = $count > 1 ? trans('entities.pages_draft_edit_active.start_a', ['count' => $count]): trans('entities.pages_draft_edit_active.start_b', ['userName' => $pageDraftEdits->first()->createdBy->name]);
+        $userMessage = $count > 1 ? trans('entities.pages_draft_edit_active.start_a', ['count' => $count]) : trans('entities.pages_draft_edit_active.start_b', ['userName' => $pageDraftEdits->first()->createdBy->name]);

         $timeMessage = trans('entities.pages_draft_edit_active.time_b', ['minCount'=> 60]);
         $timeMessage = trans('entities.pages_draft_edit_active.time_b', ['minCount'=> 60]);

+

         return trans('entities.pages_draft_edit_active.message', ['start' => $userMessage, 'time' => $timeMessage]);
     }
 
     /**
      * Get the message to show when the user will be editing one of their drafts.
         return trans('entities.pages_draft_edit_active.message', ['start' => $userMessage, 'time' => $timeMessage]);
     }
 
     /**
      * Get the message to show when the user will be editing one of their drafts.

+     *

      * @param PageRevision $draft
      * @param PageRevision $draft

+     *

      * @return string
      */
     public function getEditingActiveDraftMessage(PageRevision $draft): string
      * @return string
      */
     public function getEditingActiveDraftMessage(PageRevision $draft): string


@@ -51,6 +56,7 @@ class PageEditActivity
         if ($draft->page->updated_at->timestamp <= $draft->updated_at->timestamp) {
             return $message;
         }
         if ($draft->page->updated_at->timestamp <= $draft->updated_at->timestamp) {
             return $message;
         }

+

         return $message . "\n" . trans('entities.pages_draft_edited_notification');
     }
 
         return $message . "\n" . trans('entities.pages_draft_edited_notification');
     }