KminekMatej · KminekMatej · Sep 17, 2024 · Sep 16, 2024 · Sep 16, 2024 · Sep 16, 2024
diff --git a/app/module/admin/manager/AdminManager.php b/app/module/admin/manager/AdminManager.php
@@ -4,8 +4,6 @@
 
 /**
  * Description of AdminManager
- *
- * @author kminekmatej, 25. 10. 2021
  */
 class AdminManager
 {

diff --git a/app/module/admin/manager/MigrationManager.php b/app/module/admin/manager/MigrationManager.php
@@ -15,8 +15,6 @@
 
 /**
  * Description of MigrationManager
- *
- * @author Matěj Kmínek
  */
 class MigrationManager
 {
@@ -126,8 +124,9 @@ private function saveMigrationsCache(): void
     /**
      * Drop all comments from file and get just array of sql queries
      *
-     * @throws Exception When there are no commands
      * @return string[]
+     *
+     * @throws Exception When there are no commands
      */
     public function getCommands(string $contents): array
     {
@@ -168,9 +167,7 @@ private function removeRemarks(string $sql): string
         $lines = explode("\n", $sql);
 
         $output = [];
-        $i = 0;
         foreach ($lines as $line) {
-            $i++;
             $lineT = trim($line);
             $lineT = str_replace('&nbsp;', ' ', $lineT);
             if ($lineT === '') {
@@ -192,6 +189,7 @@ private function removeRemarks(string $sql): string
     /**
      * Split an uploaded sql file into single sql statements.
      * Note: expects trim() to have already been run on $sql.
+     *
      * @return string[]
      */
     private function splitSqlFile(string $sql, string $delimiter): array
@@ -207,14 +205,13 @@ private function splitSqlFile(string $sql, string $delimiter): array
         }
 
         // try to save mem.
-        $sql = "";
         $output = [];
 
         // we don't actually care about the matches preg gives us.
         $matches = [];
 
         // this is faster than calling count($oktens) every time thru the loop.
-        $token_count = is_countable($tokens) ? count($tokens) : 0;
+        $token_count = count($tokens);
         for ($i = 0; $i < $token_count; $i++) {
             // Don't wanna add an empty string as the last thing in the array.
             if (($i !== $token_count - 1) || (strlen($tokens[$i] > 0))) {
@@ -330,6 +327,7 @@ private function getAllMigrations(?string $latestMigration): array
 
     /**
      * Migrate database to latest version
+     *
      * @return array<string, mixed[]>
      */
     public function migrateUp(): array
@@ -375,11 +373,9 @@ private function migrateFromVersion1(): void
             return; //no tables exists - this is a new system, simply perform the base migration to fill it
         }
 
-        $migrationTableExists = in_array("migration", $tables);
-        if ($migrationTableExists) {
+        if (in_array("migration", $tables)) {
             if ($this->teamDatabase->table("migration")->where("result", "OK")->count("id") == 0) {   //migration table exists, but not containing any migration, so its some bloat, remove the table and continue
                 $this->teamDatabase->query("DROP TABLE IF EXISTS `migration`;")->fetch();
-                $migrationTableExists = false;
             } else {
                 return; //there is already migration table structure, no neeed to continue
             }

diff --git a/app/module/admin/model/Migration.php b/app/module/admin/model/Migration.php
@@ -6,8 +6,6 @@
 
 /**
  * Description of Migration
- *
- * @author Matěj Kmínek
  */
 class Migration
 {

diff --git a/app/module/admin/presenter/api/AdminSecuredPresenter.php b/app/module/admin/presenter/api/AdminSecuredPresenter.php
@@ -2,17 +2,16 @@
 
 namespace Tymy\Module\Admin\Presenter\Api;
 
+use Nette\DI\Attributes\Inject;
 use Tymy\Module\Admin\Manager\AdminManager;
 use Tymy\Module\Core\Presenter\Api\BasePresenter;
 
 /**
  * Description of AdminSecuredPresenter
- *
- * @author kminekmatej, 25. 10. 2021
  */
 class AdminSecuredPresenter extends BasePresenter
 {
-    #[\Nette\DI\Attributes\Inject]
+    #[Inject]
     public AdminManager $adminManager;
 
     protected function startup(): void
@@ -42,10 +41,10 @@ private function getTokenFromHeader(string $header): ?string
         }
 
         if ($this->user->isLoggedIn()) {
-            $this->user->logout(true); //
+            $this->user->logout(true);
         }
 
-        return is_string($headerContent) ? $headerContent : null;
+        return $headerContent;
     }
 
     /**
@@ -64,7 +63,7 @@ private function getTokenFromUrl(string $param): ?string
         }
 
         if ($this->user->isLoggedIn()) {
-            $this->user->logout(true); //
+            $this->user->logout(true);
         }
 
         return is_string($paramContent) ? $paramContent : null;

diff --git a/app/module/admin/presenter/api/MigratePresenter.php b/app/module/admin/presenter/api/MigratePresenter.php
@@ -6,8 +6,6 @@
 
 /**
  * Description of MigratePresenter
- *
- * @author kminekmatej, 25. 10. 2021
  */
 class MigratePresenter extends AdminSecuredPresenter
 {

diff --git a/app/module/attendance/manager/AttendanceManager.php b/app/module/attendance/manager/AttendanceManager.php
@@ -44,6 +44,7 @@ public function getByEventUserId(int $eventId, int $userId): ?Attendance
 
     /**
      * Get array of attendanced related to events
+     *
      * @return array<int|string, array<Attendance|null>>
      */
     public function getByEvents(array $eventIds): array
@@ -63,6 +64,7 @@ public function getByEvents(array $eventIds): array
 
     /**
      * Maps one active row to object
+     *
      * @param IRow|null $row
      * @param bool $force True to skip cache
      * @return Attendance|null
@@ -104,6 +106,7 @@ public function getScheme(): array
 
     /**
      * Check edit permission
+     *
      * @param Attendance $entity
      */
     public function canEdit($entity, int $userId): bool
@@ -113,6 +116,7 @@ public function canEdit($entity, int $userId): bool
 
     /**
      * Check read permission
+     *
      * @param Attendance $entity
      */
     public function canRead($entity, int $userId): bool
@@ -122,6 +126,7 @@ public function canRead($entity, int $userId): bool
 
     /**
      * Get user ids allowed to read given attendance
+     *
      * @param Attendance $record
      * @return int[]
      */
@@ -305,8 +310,8 @@ public function create(array $data, ?int $resourceId = null): Attendance
 
         $existingAttendance = $this->getByEventUserId($data["eventId"], $data["userId"]);
         if (!$existingAttendance instanceof Attendance) {
-            $created = $this->createByArray($data);
-            if ($created && isset($data["preStatusId"])) {
+            $this->createByArray($data);
+            if (isset($data["preStatusId"])) {
                 $this->createHistory($data["userId"], $data["eventId"], $data["preStatusId"], $data["preDescription"] ?? null);
             }
         } else {
@@ -330,6 +335,7 @@ public function create(array $data, ?int $resourceId = null): Attendance
      * @param array $updates Array of updates
      * @param string $idColumn Caption of primary key column
      * @return int number of affected rows
+     *
      * @throws Exception
      */
     protected function updateRecord(string $table, int $id, array $updates, string $idColumn = "id"): int

diff --git a/app/module/attendance/manager/HistoryManager.php b/app/module/attendance/manager/HistoryManager.php
@@ -28,7 +28,6 @@ public function __construct(ManagerFactory $managerFactory, private UserManager
     }
 
     /**
-     *
      * @param ActiveRow|null $row
      * @return History|null
      */
@@ -82,8 +81,9 @@ public function canEdit($entity, $userId): bool
      */
     public function canRead($entity, int $userId): bool
     {
-        assert($entity instanceof Event);
-        return $entity->getViewRightName() ? $this->user->isAllowed((string) $this->user->getId(), "USR:{$entity->getViewRightName()}") : true;
+        assert($entity instanceof History);
+        $eventRow = $this->database->table(Event::TABLE)->where("id", $entity->getEventId())->fetch();
+        return $eventRow->view_rights ? $this->user->isAllowed((string) $userId, "USR:{$eventRow->view_rights}") : true;
     }
 
     protected function allowRead(?int $recordId = null): void

diff --git a/app/module/attendance/manager/StatusManager.php b/app/module/attendance/manager/StatusManager.php
@@ -106,6 +106,7 @@ public function getStatusSetFolder(int $statusSetId): string
 
     /**
      * Get all status unique status codes
+     *
      * @return mixed[]
      */
     public function getAllStatusCodes(): array
@@ -115,6 +116,7 @@ public function getAllStatusCodes(): array
 
     /**
      * Get all pre and post statuses by corresponding event type id
+     *
      * @return array In the form of ["pre" => [..array of Status objects..], "post" => [..array of Status objects..]]
      */
     public function getByEventTypeId(int $eventTypeId): array
@@ -130,6 +132,7 @@ public function getByEventTypeId(int $eventTypeId): array
 
     /**
      * Map all rows to array of statuses where key is status code
+     *
      * @param ActiveRow[] $rows
      * @return Status[]
      */
@@ -144,6 +147,7 @@ public function mapAllWithCode(array $rows): array
 
     /**
      * Get all status unique status codes
+     *
      * @return Status[] where key is code
      */
     public function getByStatusCode(): array
@@ -157,6 +161,7 @@ public function getByStatusCode(): array
 
     /**
      * Get all statuses, which are used in any event_type for pre-status purposes
+     *
      * @return Status[] where key is code
      */
     public function getAllPreStatuses(): array
@@ -170,6 +175,7 @@ public function getAllPreStatuses(): array
 
     /**
      * Load status ids related to specific event types - first PRE then POST statuses
+     *
      * @param int $eventTypeId
      * @return int[]
      */

diff --git a/app/module/attendance/manager/StatusSetManager.php b/app/module/attendance/manager/StatusSetManager.php
@@ -130,9 +130,7 @@ public function create(array $data, ?int $resourceId = null): BaseModel
 
         $created = parent::createByArray($data);
 
-        if ($created) {
-            $this->createStatusSetDir($created->id);
-        }
+        $this->createStatusSetDir($created->id);
 
         return $this->map($created);
     }
@@ -159,6 +157,7 @@ public function read(int $resourceId, ?int $subResourceId = null): BaseModel
 
     /**
      * Get array of StatusSet objects which user is allowed to read
+     *
      * @return StatusSet[]
      */
     public function getListUserAllowed(int $userId): array

diff --git a/app/module/attendance/mapper/AttendanceMapper.php b/app/module/attendance/mapper/AttendanceMapper.php
@@ -7,8 +7,6 @@
 
 /**
  * Description of AttendanceMapper
- *
- * @author Matej Kminek <matej.kminek@attendees.eu>, 21. 9. 2020
  */
 class AttendanceMapper extends BaseMapper
 {

diff --git a/app/module/attendance/mapper/HistoryMapper.php b/app/module/attendance/mapper/HistoryMapper.php
@@ -7,8 +7,6 @@
 
 /**
  * Description of HistoryMapper
- *
- * @author Matej Kminek <matej.kminek@attendees.eu>, 19. 9. 2020
  */
 class HistoryMapper extends BaseMapper
 {

diff --git a/app/module/attendance/mapper/StatusMapper.php b/app/module/attendance/mapper/StatusMapper.php
@@ -7,8 +7,6 @@
 
 /**
  * Description of StatusMapper
- *
- * @author Matej Kminek <matej.kminek@attendees.eu>, 4. 11. 2020
  */
 class StatusMapper extends BaseMapper
 {

diff --git a/app/module/attendance/mapper/StatusSetMapper.php b/app/module/attendance/mapper/StatusSetMapper.php
@@ -7,8 +7,6 @@
 
 /**
  * Description of StatusSetMapper
- *
- * @author Matej Kminek <matej.kminek@attendees.eu>, 4. 11. 2020
  */
 class StatusSetMapper extends BaseMapper
 {

diff --git a/app/module/attendance/model/Attendance.php b/app/module/attendance/model/Attendance.php
@@ -10,8 +10,6 @@
 
 /**
  * Description of Attendance
- *
- * @author Matej Kminek <matej.kminek@attendees.eu>, 21. 9. 2020
  */
 class Attendance extends BaseModel implements JsonSerializable
 {

diff --git a/app/module/attendance/model/History.php b/app/module/attendance/model/History.php
@@ -9,8 +9,6 @@
 
 /**
  * Description of History
- *
- * @author Matej Kminek <matej.kminek@attendees.eu>, 9. 10. 2020
  */
 class History extends BaseModel
 {

diff --git a/app/module/attendance/model/Status.php b/app/module/attendance/model/Status.php
@@ -8,8 +8,6 @@
 
 /**
  * Description of Status
- *
- * @author Matej Kminek <matej.kminek@attendees.eu>, 4. 11. 2020
  */
 class Status extends BaseModel
 {

diff --git a/app/module/attendance/model/StatusSet.php b/app/module/attendance/model/StatusSet.php
@@ -7,8 +7,6 @@
 
 /**
  * Description of StatusSet
- *
- * @author Matej Kminek <matej.kminek@attendees.eu>, 4. 11. 2020
  */
 class StatusSet extends BaseModel
 {

diff --git a/app/module/attendance/presenter/api/DefaultPresenter.php b/app/module/attendance/presenter/api/DefaultPresenter.php
@@ -9,8 +9,6 @@
 
 /**
  * Description of DefaultPresenter
- *
- * @author Matej Kminek <matej.kminek@attendees.eu>, 13. 9. 2020
  */
 class DefaultPresenter extends SecuredPresenter
 {

diff --git a/app/module/attendance/presenter/api/StatusPresenter.php b/app/module/attendance/presenter/api/StatusPresenter.php
@@ -9,8 +9,6 @@
 
 /**
  * Description of StatusPresenter
- *
- * @author Matej Kminek <matej.kminek@attendees.eu>, 3. 11. 2020
  */
 class StatusPresenter extends SecuredPresenter
 {

diff --git a/app/module/attendance/router/Router.php b/app/module/attendance/router/Router.php
@@ -7,8 +7,6 @@
 
 /**
  * Description of Router
- *
- * @author Matej Kminek <matej.kminek@attendees.eu>, 03. 11. 2020
  */
 class Router implements RouterInterface
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,8 +4,6 @@ @@
     /**
      * Description of AdminManager
-     *
-     * @author kminekmatej, 25. 10. 2021
      */
     class AdminManager
     {
@@ Expand Down @@