Merge pull request #539 from Vitaliy-1/i8933_restore_original

pkp/pkp-lib#8933 refactor event log

classes/log/SubmissionEventLogEntry.php → classes/log/event/SubmissionEventLogEntry.php

@@ -1,24 +1,22 @@
 <?php
 
 /**
- * @file classes/log/SubmissionEventLogEntry.php
+ * @file classes/log/event/SubmissionEventLogEntry.php
  *
- * Copyright (c) 2014-2021 Simon Fraser University
- * Copyright (c) 2003-2021 John Willinsky
+ * Copyright (c) 2014-2023 Simon Fraser University
+ * Copyright (c) 2003-2023 John Willinsky
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
  * @class SubmissionEventLogEntry
  *
  * @ingroup log
  *
- * @see SubmissionEventLogDAO
- *
  * @brief Describes an entry in the submission history log.
  */
 
-namespace APP\log;
+namespace APP\log\event;
 
-use PKP\log\PKPSubmissionEventLogEntry;
+use PKP\log\event\PKPSubmissionEventLogEntry;
 
 // Log entry associative types. All types must be defined here
 
@@ -73,5 +71,5 @@ class SubmissionEventLogEntry extends PKPSubmissionEventLogEntry
 }
 
 if (!PKP_STRICT_MODE) {
-    class_alias('\APP\log\SubmissionEventLogEntry', '\SubmissionEventLogEntry');
+    class_alias('\APP\log\event\SubmissionEventLogEntry', '\SubmissionEventLogEntry');
 }

classes/migration/upgrade/v3_4_0/I8933_EventLogLocalized.php

@@ -0,0 +1,29 @@
+<?php
+
+
+/**
+ * @file classes/migration/upgrade/v3_4_0/I8933_EventLogLocalized.php
+ *
+ * Copyright (c) 2014-2023 Simon Fraser University
+ * Copyright (c) 2000-2023 John Willinsky
+ * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
+ *
+ * @class I8933_EventLogLocalized.php
+ *
+ * @brief Extends the event log migration with the correct table names for OPS.
+ */
+
+namespace APP\migration\upgrade\v3_4_0;
+
+class I8933_EventLogLocalized extends \PKP\migration\upgrade\v3_4_0\I8933_EventLogLocalized
+{
+    protected function getContextTable(): string
+    {
+        return 'servers';
+    }
+
+    protected function getContextIdColumn(): string
+    {
+        return 'server_id';
+    }
+}

classes/services/NavigationMenuService.php

@@ -71,7 +71,8 @@ public function getDisplayStatusCallback($hookName, $args)
         $templateMgr = TemplateManager::getManager(Application::get()->getRequest());
 
         $isUserLoggedIn = Validation::isLoggedIn();
-        $isUserLoggedInAs = Validation::isLoggedInAs();
+        $isUserLoggedInAs = (bool) Validation::loggedInAs();
+        ;
         $context = $request->getContext();
 
         $this->transformNavMenuItemTitle($templateMgr, $navigationMenuItem);

dbscripts/xml/upgrade.xml

@@ -90,6 +90,7 @@
 		<migration class="APP\migration\upgrade\v3_4_0\I8992_FixEmptyUrlPaths"/>
 		<migration class="APP\migration\upgrade\v3_4_0\I9040_DropSettingType"/>
 		<migration class="PKP\migration\upgrade\v3_4_0\I9039_DropDeprecatedFields"/>
+		<migration class="APP\migration\upgrade\v3_4_0\I8933_EventLogLocalized"/>
 		<note file="docs/release-notes/README-3.4.0" />
 	</upgrade>