[5] Action Log: Block/Unblock user (#41377)

* log-user-block-unblock

* cs

* cs

* cs

* onUserAfterSave

* onUserAfterSave

* onUserAfterSave

* alreadythere

* simplify

* simplify

* cs

* add log msg when block/unblock on save

* lang

* cs

* Fix wrong Factory call

* Fix system test failing due to Factory call.

* Update plugins/actionlog/joomla/src/Extension/Joomla.php

Co-authored-by: Quy <[email protected]>

* Update plugins/actionlog/joomla/src/Extension/Joomla.php

Co-authored-by: Quy <[email protected]>

---------

Co-authored-by: Harald Leithner <[email protected]>
Co-authored-by: Richard Fath <[email protected]>
Co-authored-by: Quy <[email protected]>

Author: 4 people

administrator/language/en-GB/plg_actionlog_joomla.ini

@@ -52,6 +52,8 @@ PLG_ACTIONLOG_JOOMLA_USER_REMIND="User <a href='{accountlink}'>{username}</a> re
 PLG_ACTIONLOG_JOOMLA_USER_RESET_COMPLETE="User <a href='{accountlink}'>{username}</a> completed the password reset for their account"
 PLG_ACTIONLOG_JOOMLA_USER_RESET_REQUEST="User <a href='{accountlink}'>{username}</a> requested a password reset for their account"
 PLG_ACTIONLOG_JOOMLA_USER_UPDATE="User <a href='{accountlink}'>{username}</a> updated Joomla from {oldversion} to {version}"
+PLG_ACTIONLOG_JOOMLA_USER_BLOCK="User <a href='{accountlink}'>{username}</a> blocked user <a href='{itemlink}'>{title}</a>"
+PLG_ACTIONLOG_JOOMLA_USER_UNBLOCK="User <a href='{accountlink}'>{username}</a> unblocked user <a href='{itemlink}'>{title}</a>"
 ; Component
 PLG_ACTIONLOG_JOOMLA_APPLICATION_CONFIG_UPDATED="User <a href='{accountlink}'>{username}</a> changed settings of the application configuration"
 PLG_ACTIONLOG_JOOMLA_COMPONENT_CONFIG_UPDATED="User <a href='{accountlink}'>{username}</a> changed settings of the component {extension_name}"

plugins/actionlog/joomla/src/Extension/Joomla.php

@@ -619,7 +619,31 @@ public function onUserAfterSave($user, $isnew, $success, $msg): void
             'accountlink' => 'index.php?option=com_users&task=user.edit&id=' . $userId,
         ];
 
+        // Check if block / unblock comes from Actions on list
+        if ($task === 'block' || $task === 'unblock') {
+            $messageLanguageKey = $task === 'block' ? 'PLG_ACTIONLOG_JOOMLA_USER_BLOCK' : 'PLG_ACTIONLOG_JOOMLA_USER_UNBLOCK';
+            $message['action']  = $task;
+        }
+
         $this->addLog([$message], $messageLanguageKey, $context, $userId);
+
+        // Check if on save a block / unblock has changed
+        if ($action === 'update') {
+            $session = $this->getApplication()->getSession();
+            $data    = $session->get('block', null);
+
+            if ($data !== null) {
+                $messageLanguageKey = 'PLG_ACTIONLOG_JOOMLA_USER_UNBLOCK';
+                $action             = 'unblock';
+                if ($data === 'block') {
+                    $messageLanguageKey = 'PLG_ACTIONLOG_JOOMLA_USER_BLOCK';
+                    $action             = 'block';
+                }
+
+                $message['action'] = $action;
+                $this->addLog([$message], $messageLanguageKey, $context, $userId);
+            }
+        }
     }
 
     /**
@@ -1183,4 +1207,28 @@ public function onUserAfterResetComplete($user)
 
         $this->addLog([$message], 'PLG_ACTIONLOG_JOOMLA_USER_RESET_COMPLETE', $context, $user->id);
     }
+
+    /**
+     * Method is called before user data is stored in the database
+     *
+     * @param   array    $user   Holds the old user data.
+     * @param   boolean  $isNew  True if a new user is stored.
+     * @param   array    $data   Holds the new user data.
+     *
+     * @return  void
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function onUserBeforeSave($user, $isnew, $new): void
+    {
+        $session = $this->getApplication()->getSession();
+        $session->set('block', null);
+
+        if ($user['block'] !== (int) $new['block']) {
+            $blockunblock = $new['block'] === '1' ? 'block' : 'unblock';
+            $session->set('block', $blockunblock);
+        }
+
+        return;
+    }
 }