Changeset 3335490

logtivity/tags/3.2.0/Admin/Logtivity_Log_Index_Controller.php

-                      r3294349
+                      r3335490
+    {
         if (current_user_can(Logtivity::ACCESS_LOGS)) {
+            $response = (new Logtivity_Api())
+                ->get(
+                    '/logs',
+                    [
+                        'page'        => $this->getInput('page'),
+                        'action'      => $this->getInput('search_action'),
+                        'context'     => $this->getInput('search_context'),
+                        'action_user' => $this->getInput('action_user'),
+                    ]
+                );
+            $api = Logtivity::log();
+            if ($response) {
+                $this->successResponse(json_decode(json_encode($response)));
+            if ($api->getOption()->getApiKey()) {
+                $response = $api
+                    ->get(
+                        '/logs',
+                        [
+                            'page'        => $this->getInput('page'),
+                            'action'      => $this->getInput('search_action'),
+                            'context'     => $this->getInput('search_context'),
+                            'action_user' => $this->getInput('action_user'),
+                        ]
+                    );
+            } elseif ((new Logtivity_Options())->getApiKey() == false) {
+                $this->welcomeResponse();
+                if ($response) {
+                    $response = json_decode(json_encode($response));
+                    $this->renderView([
+                        'message'     => $response->error,
+                        'logs'        => $response->body->data ?? [],
+                        'meta'        => $response->body->meta ?? null,
+                        'hasNextPage' => $response->body->links->next ?? null,
+                    ]);
+                } else {
+                    $this->renderView($api->getConnectionMessage());
+                }
             } else {
                 $this->errorResponse((new Logtivity_Api())->getConnectionMessage());
+                $this->welcomeResponse();
+            }
         } else {
             $this->errorResponse(__('You do not have sufficient permissions to access this page.'));
+            $this->renderView(__('You do not have sufficient permissions to access this page.'));
+        }
+    }
     /**
+     * @param object $response
+     * @param string $field
+     *
+     * @return ?string
+     */
+    protected function getInput(string $field): ?string
+    {
+        return sanitize_text_field($_GET[$field] ?? null);
+    }
+    /**
+     * @param string|array $response
+     *
      * @return void
      */
     private function successResponse(object $response): void
+    protected function renderView($viewData): void
+    {
+        if (is_string($viewData)) {
+            $viewData = ['message' => $viewData];
+        }
+        $viewData = array_merge(
+            [
+                'message'     => null,
+                'logs'        => [],
+                'meta'        => null,
+                'hasNextPage' => null,
+            ],
+            $viewData
+        );
         wp_send_json([
+            'view' => logtivity_view('_logs-loop', [
+                'logs'        => $response->data,
+                'meta'        => $response->meta,
+                'hasNextPage' => $response->links->next,
+            ]),
+        ]);
+    }
+    /**
+     * @param string $message
+     *
+     * @return void
+     */
+    private function errorResponse(string $message): void
+    {
+        wp_send_json([
+            'view' => logtivity_view('_logs-loop', [
+                'message' => $message,
+                'logs'    => [],
+            ]),
+            'view' => logtivity_view('_logs-loop', $viewData),
         ]);
+    }
 …
      * @return void
      */
     private function welcomeResponse()
+    protected function welcomeResponse()
+    {
         wp_send_json([
 …
         ]);
+    }
-    /**
-     * @param string $field
+     *
-     * @return ?string
-     */
-    private function getInput(string $field): ?string
+    {
-        return sanitize_text_field($_GET[$field] ?? null);
+    }
+}

logtivity/tags/3.2.0/Admin/Logtivity_Options.php

-                      r3306623
+                      r3335490
 class Logtivity_Options
+{
+    /**
+     * Checkin for settings updates in designated minutes
+     *
+     * @var int
+     */
+    protected int $checkinDelay = 10;
     /**
      * The option keys that we can save to the options table
 …
             if ($lastCheckin) {
                 return time() - strtotime($lastCheckin) > 10 * MINUTE_IN_SECONDS;
+                return time() - strtotime($lastCheckin) > ($this->checkinDelay * MINUTE_IN_SECONDS);
+            }
+        }
 …
     public function update(array $data = [], bool $checkApiKey = true): void
+    {
+        if (count($data)) {
+            foreach ($this->settings as $setting => $default) {
+                if (array_key_exists($setting, $data) && $this->validateSetting($setting, $data[$setting])) {
+                    update_option($setting, $data[$setting]);
+                }
+            }
+        } else {
+            foreach ($this->settings as $setting => $default) {
+                if (array_key_exists($setting, $_POST) && $this->validateSetting($setting, $_POST[$setting])) {
+                    update_option($setting, $_POST[$setting]);
+                }
+        $settings = array_intersect_key($data ?: $_POST, $this->settings);
+        foreach ($settings as $key => $value) {
+            if ($this->validateSetting($key, $value)) {
+                update_option($key, $value);
+            }
+        }
 …
             $this->checkApiKey($data['logtivity_site_api_key'] ?? $_POST['logtivity_site_api_key'] ?? null);
+        }
+    }
+    /**
+     * Validate that the passed parameters are in the correct format
+     *
+     * @param string $key
+     * @param mixed  $value
+     *
+     * @return bool
+     */
+    protected function validateSetting(string $key, $value): bool
+    {
+        $setting = $this->settings[$key] ?? null;
+        if ($setting) {
+            $method = $setting['rule'] ?? null;
+            if ($method == 'is_bool') {
+                return $method((bool)$value);
+            }
+            return $method($value);
+        }
+        return true;
+    }
 …
                 ->setAction('Settings Updated')
                 ->setContext('Logtivity')
-                ->ignoreStatus()
                 ->waitForResponse()
                 ->send();
+        }
+    }
-    /**
-     * Validate that the passed parameters are in the correct format
+     *
-     * @param string $key
-     * @param mixed  $value
+     *
-     * @return bool
-     */
-    protected function validateSetting(string $key, $value): bool
+    {
-        $setting = $this->settings[$key] ?? null;
-        if ($setting) {
-            $method = $setting['rule'] ?? null;
-            if ($method == 'is_bool') {
-                return $method((bool)$value);
+            }
-            return $method($value);
+        }
-        return true;
+    }
+}

logtivity/tags/3.2.0/Errors/Logtivity_Error_Logger.php

r3272661	r3335490
70	70	* @return ?array
71	71	*/
72		public function send(): ~~?array~~
	72	public function send(): void
73	73	{
74	74	$message = $this->error['message'] ?? '';
…	…
79	79
80	80	if ($this->active) {
81		$~~response = $~~this->makeRequest('/errors/store', $this->getData());
	81	$this->makeRequest('/errors/store', $this->getData());
82	82	}
83	83	}
84
85		~~return $response ?? null;~~
86	84	}
87	85

logtivity/tags/3.2.0/Helpers/Helpers.php

r3272661	r3335490
51	51	{
52	52	extract($vars);
	53	unset($vars);
53	54
54	55	ob_start();

logtivity/tags/3.2.0/Helpers/Logtivity_Log_Global_Function.php

r3290027	r3335490
33	33	* @deprecated v3.1.8 - use Logtivity::log() instead
34	34	*/
35		function logtivity_log(?string $action = null, ?string $meta = null, ?string $user_id = null)
	35	function logtivity_log(?string $action = null, ?string $meta = null, ?string $user_id = null): void
36	36	{
37		~~return~~ Logtivity::log($action, $meta, $user_id)->send();
	37	Logtivity::log($action, $meta, $user_id)->send();
38	38	}

logtivity/tags/3.2.0/Logs/Core/Logtivity_Core.php

r3290027	r3335490
197	197	->setAction('Settings Updated')
198	198	->setContext('Core:' . $optionPage)
199		~~->ignoreStatus()~~
200	199	->send();
201	200	}

logtivity/tags/3.2.0/Logs/Core/Logtivity_User.php

-                      r3272661
+                      r3335490
 class Logtivity_User extends Logtivity_Abstract_Logger
+{
     protected static $loggedUserlogin = false;
+    protected static bool $loggedUserlogin = false;
     /**
+     * @inheritDoc
+     * @param string  $username
+     * @param WP_User $user
+     *
+     * @return void
      */
     protected function registerHooks(): void
+    public function userLoggedIn(string $username, WP_User $user)
+    {
+        add_action('wp_login', [$this, 'wpLogin'], 10, 2);
+        add_action('wp_logout', [$this, 'userLoggedOut'], 10, 1);
+        add_action('user_register', [$this, 'userCreated'], 10, 1);
+        add_action('delete_user', [$this, 'userDeleted']);
+        add_action('profile_update', [$this, 'profileUpdated'], 10, 2);
+        if (static::$loggedUserlogin == false) {
+            static::$loggedUserlogin = true;
+            $logger = Logtivity::log()->setUser($user->ID);
+            $logger->setAction('User Logged In')
+                ->setContext($logger->user->getRole())
+                ->send();
+        }
+    }
+    public function wpLogin($user_login, $user)
+    /**
+     * @param int $userId
+     *
+     * @return void
+     */
+    public function userLoggedOut(int $userId): void
+    {
+        if (self::$loggedUserlogin) {
+            return;
+        if ($userId) {
+            $logger = Logtivity::log()->setUser($userId);
+            $logger
+                ->setAction('User Logged Out')
+                ->setContext($logger->user->getRole())
+                ->send();
+        }
-        return $this->userLoggedIn($user->ID);
+    }
+    public function userLoggedIn($user_id)
+    {
+        self::$loggedUserlogin = true;
+        $logtivityUser = new Logtivity_WP_User($user_id);
+        return (new Logtivity_Logger($user_id))
+            ->setAction('User Logged In')
+            ->setContext($logtivityUser->getRole())
+            ->send();
+    }
+    public function userLoggedOut($user_id)
+    {
+        if ($user_id == 0) {
+            return;
+        }
+        $user = new Logtivity_WP_User($user_id);
+        return (new Logtivity_Logger($user_id))
+            ->setAction('User Logged Out')
+            ->setContext($user->getRole())
+            ->send();
+    }
+    public function userCreated($user_id)
+    /**
+     * @param int $userId
+     *
+     * @return void
+     */
+    public function userCreated(int $userId): void
+    {
         $log = Logtivity::log();
+        if (!is_user_logged_in()) {
+            $log->setUser($user_id);
+        if (is_user_logged_in() == false) {
+            $log->setUser($userId);
+            $user = $log->user;
+        } else {
+            $user = new Logtivity_WP_User($userId);
+        }
-        $user = new Logtivity_WP_User($user_id);
         $log->setAction('User Created')
 …
+    }
+    public function userDeleted($user_id)
+    /**
+     * @param int $userId
+     *
+     * @return void
+     */
+    public function userDeleted(int $userId): void
+    {
         $user = new Logtivity_WP_User($user_id);
+        $user = new Logtivity_WP_User($userId);
         Logtivity::log()
 …
+    }
     public function profileUpdated($user_id, $old_user_data)
+    public function profileUpdated($userId)
+    {
         $user = new Logtivity_WP_User($user_id);
+        $user = new Logtivity_WP_User($userId);
         Logtivity::log()
 …
             ->send();
+    }
+    /**
+     * @inheritDoc
+     */
+    protected function registerHooks(): void
+    {
+        add_action('wp_login', [$this, 'userLoggedIn'], 10, 2);
+        add_action('wp_logout', [$this, 'userLoggedOut'], 10, 1);
+        add_action('user_register', [$this, 'userCreated'], 10, 1);
+        add_action('delete_user', [$this, 'userDeleted']);
+        add_action('profile_update', [$this, 'profileUpdated'], 10, 1);
+    }
+}

logtivity/tags/3.2.0/Logs/Memberpress/Logtivity_Memberpress.php

-                      r3272661
+                      r3335490
 class Logtivity_Memberpress extends Logtivity_Abstract_Logger
+{
+    /**
+     * @inheritDoc
+     */
+    protected function registerHooks(): void
+    {
+        add_action('mepr-event-member-signup-completed', [$this, 'freeSubscriptionCreated']);
+        add_action('mepr-event-subscription-created', [$this, 'subscriptionCreated']);
+        add_action('mepr-event-subscription-paused', [$this, 'subscriptionPaused']);
+        add_action('mepr-event-subscription-resumed', [$this, 'subscriptionResumed']);
+        add_action('mepr-event-subscription-stopped', [$this, 'subscriptionStopped']);
+        add_action('init', [$this, 'profileUpdated']);
+        add_filter('mepr_create_transaction', [$this, 'transactionCreated'], 10, 3);
+        add_filter('mepr_update_transaction', [$this, 'transactionUpdated'], 10, 3);
+        add_action('mepr_email_sent', [$this, 'emailSent'], 10, 3);
+        add_action('mepr-process-options', [$this, 'settingsUpdated'], 10, 1);
+    }
+    public function freeSubscriptionCreated($event)
+    public function freeSubscriptionCreated($event): void
+    {
         $user         = $event->get_data();
         $subscription = $this->getSubscription($user);
+        if (!$subscription) {
+            return;
+        if ($subscription && $subscription->gateway == 'free') {
+            $product = $subscription->product();
+            Logtivity::log(
+                'Free Subscription Created',
+                [
+                    'Subscription ID' => $subscription->id,
+                ]
+            )
+                ->setContext($product->post_title)
+                ->send();
+        }
-        if ($subscription->gateway != 'free') {
-            return;
+        }
-        $product = $subscription->product();
-        return (new Logtivity_Logger($user->ID))
-            ->setAction('Free Subscription Created')
-            ->setContext($product->post_title)
-            ->addMeta('Subscription ID', $subscription->id)
-            ->send();
+    }
 …
+    }
+    public function subscriptionCreated($event)
+    /**
+     * @param $event
+     *
+     * @return void
+     */
+    public function subscriptionCreated($event): void
+    {
         $subscription  = $event->get_data();
 …
         $paymentMethod = $subscription->payment_method();
+        return (new Logtivity_Logger($user->ID))
+            ->setAction('Subscription Created')
+        Logtivity::log(
+            'Subscription Created',
+            [
+                'Transaction Total' => $subscription->total,
+                'Payment Method'    => $paymentMethod->name,
+                'Subscription ID'   => $subscription->id,
+            ],
+            $user->ID
+        )
             ->setContext($product->post_title)
-            ->addMeta('Transaction Total', $subscription->total)
-            ->addMeta('Payment Method', $paymentMethod->name)
-            ->addMeta('Subscription ID', $subscription->id)
             ->send();
+    }
 …
             ->send();
+    }
+    /**
+     * @inheritDoc
+     */
+    protected function registerHooks(): void
+    {
+        add_action('mepr-event-member-signup-completed', [$this, 'freeSubscriptionCreated']);
+        add_action('mepr-event-subscription-created', [$this, 'subscriptionCreated']);
+        add_action('mepr-event-subscription-paused', [$this, 'subscriptionPaused']);
+        add_action('mepr-event-subscription-resumed', [$this, 'subscriptionResumed']);
+        add_action('mepr-event-subscription-stopped', [$this, 'subscriptionStopped']);
+        add_action('init', [$this, 'profileUpdated']);
+        add_filter('mepr_create_transaction', [$this, 'transactionCreated'], 10, 3);
+        add_filter('mepr_update_transaction', [$this, 'transactionUpdated'], 10, 3);
+        add_action('mepr_email_sent', [$this, 'emailSent'], 10, 3);
+        add_action('mepr-process-options', [$this, 'settingsUpdated'], 10, 1);
+    }
+}

logtivity/tags/3.2.0/Services/Logtivity_Api.php

-                      r3306623
+                      r3335490
 class Logtivity_Api
+{
+    public const CURL_TIMEOUT = 28;
+    /**
+     * @var array
+     */
+    protected static $responseData = [
+        'code'    => null,
+        'message' => null,
+        'error'   => null,
+        'body'    => null,
+    ];
     /**
      * Option class to access the plugin settings
 …
      * @return $this
      */
     public function waitForResponse(): self
+    {
         $this->waitForResponse = true;
+    public function ignoreStatus(): self
+    {
+        $this->ignoreStatus = true;
         return $this;
+    }
-    /**
-     * @return $this
-     */
-    public function ignoreStatus(): self
+    {
-        $this->ignoreStatus = true;
-        return $this;
+    }
-    /**
-     * @param string $endpoint
+     *
-     * @return string
-     */
-    public function getEndpoint(string $endpoint): string
+    {
-        return logtivity_get_api_url() . $endpoint;
+    }
 …
+    {
         return $this->makeRequest($url, $body);
+    }
-    /**
-     * @param string $url
-     * @param ?array $body
+     *
-     * @return ?array
-     */
-    public function get(string $url, ?array $body = null): ?array
+    {
-        return $this->waitForResponse()->makeRequest($url, $body, 'GET');
+    }
-    /**
-     * @return ?string
-     */
-    public function getApiKey(): ?string
+    {
-        if ($this->api_key == false) {
-            $this->api_key = $this->options->getApiKey();
+        }
-        return $this->api_key;
+    }
-    /**
-     * @param string $apikey
+     *
-     * @return $this
-     */
-    public function setApiKey(string $apikey): self
+    {
-        $this->api_key = $apikey;
-        return $this;
+    }
 …
         if ($this->ready()) {
             if ($this->options->getOption('logtivity_app_verify_url')) {
+            if ($this->getOption('logtivity_app_verify_url')) {
                 $body = array_merge(
                     $body ?: [],
 …
             // @TODO: Switch to Logtivity_Response class to get standardized responses
             $response = wp_remote_request($this->getEndpoint($url), $request);
             if ($this->notUpdatingWidgetInCustomizer()) {
+            if ($waitForResponse && $this->notUpdatingWidgetInCustomizer()) {
                 // We waited and received a response
                 if ($response instanceof WP_Error) {
                     $responseData = [
+                    $responseData = array_merge(static::$responseData, [
                         'code'    => 500,
                         'message' => $response->get_error_code(),
                         'error'   => $response->get_error_message() ?: $response->get_error_code(),
                         'body'    => get_object_vars($response),
                     ];
+                    ]);
                 } else {
 …
                         $responseError   = $responseMessage;
                         $responseMessage = (($responseBody['message'] ?? $responseMessage) ?: 'Unknown error');
+                    }
                     $responseData = [
 …
+                }
+                $newStatus = 'success';
                 if ($responseData['code']) {
                     if ($responseData['code'] < 400) {
                         // Successful request, check if api is telling us to pause
+                        $newStatus = $responseData['error'] ? 'paused' : 'success';
+                        $this->updateSettings($response['body']);
+                        if ($responseData['error']) {
+                            $newStatus = 'paused';
+                        }
+                        $body = json_decode($response['body'] ?? 'null', true);
+                        $this->updateSettings($body['settings'] ?? []);
                     } else {
+                        // Something went wrong submitting the api request
+                        $newStatus = 'fail';
+                        update_option('logtivity_last_settings_check_in_at', ['date' => date('Y-m-d H:i:s')]);
+                        if ($this->getCurlError($responseData['error']) != static::CURL_TIMEOUT) {
+                            // Something other than a timeout went wrong with the request
+                            $newStatus = 'fail';
+                        }
+                        $this->updateLastCheckin();
+                    }
 …
                     );
                     return $responseData['body'];
+                    return $responseData;
+                }
+            }
 …
     /**
+     * @return bool
+     */
+    protected function ready(): bool
+    {
+        return ($this->getApiKey())
+            && logtivity_has_site_url_changed() == false
+            && (
+                $this->ignoreStatus
+                || $this->getOption('logtivity_api_key_check') == 'success'
+                || $this->options->shouldCheckInWithApi()
+            );
+    }
+    /**
+     * @return ?string
+     */
+    public function getApiKey(): ?string
+    {
+        if ($this->api_key == false) {
+            $this->api_key = $this->options->getApiKey();
+        }
+        return $this->api_key;
+    }
+    /**
+     * @param string $apikey
+     *
+     * @return $this
+     */
+    public function setApiKey(string $apikey): self
+    {
+        $this->api_key = $apikey;
+        return $this;
+    }
+    /**
+     * @param ?string $key
+     *
+     * @return Logtivity_Options|mixed
+     */
+    public function getOption(?string $key = null)
+    {
+        if ($key) {
+            return $this->options->getOption($key);
+        }
+        return $this->options;
+    }
+    /**
+     * @param string $endpoint
+     *
+     * @return string
+     */
+    public function getEndpoint(string $endpoint): string
+    {
+        return logtivity_get_api_url() . $endpoint;
+    }
+    /**
+     * You cannot call an extra update_option during a widget update so we make
+     * sure not to log the most recent log response in this case.
+     *
+     * @return bool
+     */
+    protected function notUpdatingWidgetInCustomizer(): bool
+    {
+        $customize = sanitize_text_field($_POST['wp_customize'] ?? null);
+        $action    = sanitize_text_field($_POST['action'] ?? null);
+        return ($action == 'update-widget' && $customize == 'on') == false;
+    }
+    /**
      * @param array|object $body
+     *
      * @return void
      */
+    public function updateSettings($body): void
+    {
+        $settings = (object)($body->settings ?? $body['settings'] ?? null);
+    public function updateSettings(array $settings): void
+    {
         if ($settings) {
+            $this->options->update(
+                [
+                    'logtivity_global_disabled_logs'         => $settings->disabled_logs ?? null,
+                    'logtivity_enable_white_label_mode'      => $settings->enable_white_label_mode ?? null,
+                    'logtivity_disabled_error_levels'        => $settings->disabled_error_levels ?? null,
+                    'logtivity_disable_error_logging'        => $settings->disable_error_logging ?? null,
+                    'logtivity_hide_plugin_from_ui'          => $settings->hide_plugin_from_ui ?? null,
+                    'logtivity_disable_default_logging'      => $settings->disable_default_logging ?? null,
+                    'logtivity_enable_options_table_logging' => $settings->enable_options_table_logging ?? null,
+                    'logtivity_enable_post_meta_logging'     => $settings->enable_post_meta_logging ?? null,
+                    'logtivity_custom_plugin_name'           => $settings->custom_plugin_name ?? null,
+                ],
+                false
+            );
+            update_option('logtivity_last_settings_check_in_at', ['date' => date('Y-m-d H:i:s')]);
+        }
+            $verifiedSettings = [];
+            foreach ($settings as $key => $value) {
+                if ($key == 'disabled_logs') {
+                    $key = 'global_' . $key;
+                }
+                $verifiedSettings['logtivity_' . $key] = is_null($value) ? '' : $value;
+            }
+            $this->options->update($verifiedSettings, false);
+        }
+        $this->updateLastCheckin();
+    }
+    /**
+     * @return void
+     */
+    protected function updateLastCheckin(): void
+    {
+        update_option('logtivity_last_settings_check_in_at', ['date' => date('Y-m-d H:i:s')]);
+    }
+    /**
+     * @param ?string $message
+     *
+     * @return int
+     */
+    protected function getCurlError(?string $message): ?int
+    {
+        preg_match('/curl\s+error\s+(\d+)/i', $message, $matches);
+        return $matches[1] ?? null;
+    }
 …
     public function getLatestResponse(): ?array
+    {
         $response = $this->options->getOption('logtivity_latest_response');
+        $response = $this->getOption('logtivity_latest_response');
         return $response ?: null;
 …
     /**
+     * @return ?string
+     */
+    public function getConnectionStatus(): ?string
+    {
+        $status = null;
+        $apiKey = $this->getApiKey();
+        if ($apiKey) {
+            $status = $this->options->getOption('logtivity_api_key_check');
+        }
+        return $status;
+     * @param string $url
+     * @param ?array $body
+     *
+     * @return ?array
+     */
+    public function get(string $url, ?array $body = null): ?array
+    {
+        return $this->waitForResponse()->makeRequest($url, $body, 'GET');
+    }
+    /**
+     * @return $this
+     */
+    public function waitForResponse(): self
+    {
+        $this->waitForResponse = true;
+        return $this;
+    }
 …
                 $error   = $this->getLatestResponse();
                 $code    = $error['code'] ?? null;
                 $message = $error['message'] ?? null;
+                $message = $error['error'] ?? $error['message'] ?? null;
                 if ($code && $message) {
 …
     /**
+     * You cannot call an extra update_option during a widget update so we make
+     * sure not to log the most recent log response in this case.
+     *
+     * @return bool
+     */
+    private function notUpdatingWidgetInCustomizer(): bool
+    {
+        $customize = sanitize_text_field($_POST['wp_customize'] ?? null);
+        $action    = sanitize_text_field($_POST['action'] ?? null);
+        return ($action == 'update-widget' && $customize == 'on') == false;
+    }
+    /**
+     * @return bool
+     */
+    private function ready(): bool
+    {
+        //var_dump($this->ignoreStatus);
+        return ($this->getApiKey())
+            && logtivity_has_site_url_changed() == false
+            && (
+                $this->ignoreStatus
+                || $this->options->getOption('logtivity_api_key_check') == 'success'
+                || $this->options->shouldCheckInWithApi()
+            );
+     * @return ?string
+     */
+    public function getConnectionStatus(): ?string
+    {
+        $status = null;
+        $apiKey = $this->getApiKey();
+        if ($apiKey) {
+            $status = $this->getOption('logtivity_api_key_check');
+        }
+        return $status;
+    }
+}

logtivity/tags/3.2.0/Services/Logtivity_Check_For_Disabled_Individual_Logs.php

-                      r3246625
+                      r3335490
 class Logtivity_Check_For_Disabled_Individual_Logs
+{
+    public function __construct()
+    {
+        add_action('wp_logtivity_instance', [$this, 'handle'], 10, 999);
+    }
+    /**
+     * @var Logtivity_Options
+     */
+    protected Logtivity_Options $options;
+    public function handle($Logtivity_Logger)
+    {
+        foreach ($this->getLogsToExclude() as $log) {
+            if ($this->check($Logtivity_Logger, $log)) {
+                $Logtivity_Logger->stop();
+            }
+        }
+    public function __construct()
+    {
+        add_action('wp_logtivity_instance', [$this, 'handle'], 10, 2);
+    }
+        foreach ($this->globalLogsToExclude() as $log) {
+            if ($this->check($Logtivity_Logger, $log)) {
+                $Logtivity_Logger->stop();
+            }
+        }
+    }
+    /**
+     * @param Logtivity_Logger $logger
+     *
+     * @return void
+     */
+    public function handle(Logtivity_Logger $logger): void
+    {
+        // Refresh options whenever invoked
+        $this->options = new Logtivity_Options();
+    public function check($Logtivity_Logger, $log)
+    {
+        $array = explode('&&', $log);
+        $exclusions = array_unique(
+            array_merge(
+                $this->parseExcludeEntries('logtivity_disable_individual_logs'),
+                $this->parseExcludeEntries('logtivity_global_disabled_logs')
+            )
+        );
+        if (isset($array[0]) && isset($array[1])) {
+            if (trim($array[0]) === '*' && trim($array[1]) === '*') {
+                return;
+            }
+            if ($this->matches($Logtivity_Logger->action, $array[0]) && $this->matches($Logtivity_Logger->context, $array[1])) {
+                return true;
+            }
+        } elseif(isset($array[0])) {
+            if (trim($array[0]) === '*') {
+                return;
+            }
+            if ($this->matches($Logtivity_Logger->action, $array[0])) {
+                return true;
+            }
+        }
+        return false;
+    }
+        foreach ($exclusions as $exclusion) {
+            if ($this->isDisabled($logger, $exclusion)) {
+                $logger->stop();
+    private function matches($keyword, $disabledKeyword)
+    {
+        // @TODO: this may not be the best way to check the arguments
+        if (is_string($keyword) && is_string($disabledKeyword)) {
+            $keyword = trim(strtolower($keyword));
+            $disabledKeyword = trim(strtolower($disabledKeyword));
+                return;
+            }
+        }
+    }
+            if ($disabledKeyword === '*') {
+                return true;
+            }
+    /**
+     * @param string $option
+     *
+     * @return array
+     */
+    protected function parseExcludeEntries(string $option): array
+    {
+        $value = (string)$this->options->getOption($option);
+            if (strpos($disabledKeyword, '*') !== false) {
+                return strpos($keyword, str_replace('*', '', $disabledKeyword)) !== false;
+            }
+        $entries = preg_split("/\\r\\n|\\r|\\n/", $value);
             return $keyword == $disabledKeyword;
+        }
+        return array_unique(array_filter($entries));
+    }
+        return false;
+    }
+    /**
+     * @param Logtivity_Logger $logger
+     * @param string           $exclusion
+     *
+     * @return bool
+     */
+    protected function isDisabled(Logtivity_Logger $logger, string $exclusion): bool
+    {
+        $array   = explode('&&', $exclusion);
+        $action  = strtolower(trim((string)array_shift($array)));
+        $context = strtolower(trim((string)array_shift($array)));
+    private function getLogsToExclude()
+    {
+        $value = (new Logtivity_Options)->getOption('logtivity_disable_individual_logs');
+        if ($action == '*' && $context == '*') {
+            return false;
+        } elseif ($this->matches($logger->action, $action) && $this->matches($logger->context, $context)) {
+            return true;
+        } elseif ($action == '*') {
+            return false;
+        } elseif ($this->matches($logger->action, $action)) {
+            return true;
+        }
+        if ($value == '') {
+            return [];
+        }
+        return false;
+    }
+        return preg_split("/\\r\\n|\\r|\\n/", $value);
+    }
+    /**
+     * @param ?string $keywordTarget
+     * @param ?string $keywordCheck
+     *
+     * @return bool
+     */
+    protected function matches(?string $keywordTarget, ?string $keywordCheck): bool
+    {
+        $keywordTarget = strtolower(trim((string)$keywordTarget));
+        $keywordCheck  = strtolower(trim((string)$keywordCheck));
+    public function globalLogsToExclude()
+    {
+        $value = (new Logtivity_Options)->getOption('logtivity_global_disabled_logs');
+        if ($keywordTarget && $keywordCheck) {
+            if ($keywordCheck == '*') {
+                return true;
+            }
+        if ($value == '') {
+            return [];
+        }
+            if (strpos($keywordCheck, '*') !== false) {
+                $regex = str_replace(['*', '/'], ['.*?', '\/'], $keywordCheck);
+                return preg_match('/' . $regex . '/', $keywordTarget);
+            }
+        return preg_split("/\\r\\n|\\r|\\n/", $value);
+    }
+            return $keywordCheck == $keywordTarget;
+        }
+        return false;
+    }
+}
 $CheckForDisabledIndividualLogs = new Logtivity_Check_For_Disabled_Individual_Logs;
+new Logtivity_Check_For_Disabled_Individual_Logs();

logtivity/tags/3.2.0/Services/Logtivity_Check_For_New_Settings.php

-                      r3290027
+                      r3335490
     /**
+     * @return bool
+     */
+    public function shouldCheckInWithApi(): bool
+    {
+        return (new Logtivity_Options())->shouldCheckInWithApi();
+    }
+    /**
      * @return void
      */
 …
         try {
-            $api = new Logtivity_Api();
             $theme = wp_get_theme();
 …
             $latestMinMySqlVersion = $coreUpdates[0]->mysql_version ?? null;
+            $response = $api->ignoreStatus()->post('/settings-check', [
+                'php_version'                 => phpversion(),
+                'plugins'                     => $this->getPluginsWithStatuses(),
+                'theme_name'                  => $theme ? $theme->name : null,
+                'theme_version'               => $theme ? $theme->version : null,
+                'themes'                      => $this->getThemesListWithStatuses(),
+                'wordpress_version'           => $wp_version,
+                'latest_wp_version'           => $latestWPVersion,
+                'latest_wp_min_php_version'   => $latestMinPhpVersion,
+                'latest_wp_min_mysql_version' => $latestMinMySqlVersion,
+            ]);
+            $api = new Logtivity_Api();
+            if ($response) {
+                $api->updateSettings($response);
+            $response = $api
+                ->ignoreStatus()
+                ->waitForResponse()
+                ->makeRequest(
+                    '/settings-check',
+                    [
+                        'php_version'                 => phpversion(),
+                        'plugins'                     => $this->getPluginsWithStatuses(),
+                        'theme_name'                  => $theme ? $theme->name : null,
+                        'theme_version'               => $theme ? $theme->version : null,
+                        'themes'                      => $this->getThemesListWithStatuses(),
+                        'wordpress_version'           => $wp_version,
+                        'latest_wp_version'           => $latestWPVersion,
+                        'latest_wp_min_php_version'   => $latestMinPhpVersion,
+                        'latest_wp_min_mysql_version' => $latestMinMySqlVersion,
+                    ]);
+            if ($settings = $response['body']['settings'] ?? null) {
+                $api->updateSettings($settings);
+            }
 …
             // Ignore
+        }
+    }
-    /**
-     * @return array[]
-     */
-    private function getThemesListWithStatuses(): array
+    {
-        $themes = wp_get_themes();
-        $themesDetails = [];
-        foreach ($themes as $theme) {
-            $themesDetails[] = [
-                'name'    => $theme->name,
-                'version' => $theme->version,
-            ];
+        }
-        return $themesDetails;
+    }
 …
     /**
      * @return bool
+     * @return array[]
      */
     public function shouldCheckInWithApi(): bool
+    private function getThemesListWithStatuses(): array
+    {
+        return (new Logtivity_Options())->shouldCheckInWithApi();
+        $themes = wp_get_themes();
+        $themesDetails = [];
+        foreach ($themes as $theme) {
+            $themesDetails[] = [
+                'name'    => $theme->name,
+                'version' => $theme->version,
+            ];
+        }
+        return $themesDetails;
+    }
+}

logtivity/tags/3.2.0/Services/Logtivity_Logger.php

-                      r3290027
+                      r3335490
      * Send the logged data to Logtivity
+     *
      * @return ?array
      */
     public function send(): ?array
+     * @return void
+     */
+    public function send(): void
+    {
         $this->maybeAddProfileLink();
 …
         if ($this->active) {
+            return $this->makeRequest('/logs/store', $this->getData());
+        }
+        return null;
+            $this->makeRequest('/logs/store', $this->getData());
+        }
+    }

logtivity/tags/3.2.0/assets/app.js

-                      r3306623
+                      r3335490
             this.container = $('#logtivity-log-index');
+            if (!this.container.length) {
+                return;
+            if (this.container.length) {
+                this.form = $('#logtivity-log-index-search-form');
+                this.listenForPagination();
+                this.listenForChange();
+                this.filter();
+                this.listenForViewLog()
+                this.listenForCloseModal();
+            }
-            this.form = $('#logtivity-log-index-search-form');
-            this.listenForPagination();
-            this.listenForChange();
-            this.filter();
-            this.listenForViewLog()
-            this.listenForCloseModal();
         },
 …
             let listenForCloseModal = this;
             $("body").on("click", ".js-logtivity-notice-dismiss", function(e) {
+            $('body').on('click', '.js-logtivity-notice-dismiss', function(e) {
                 e.preventDefault();
 …
             $(document).on('keyup', function(e) {
                 if (e.key === "Escape") {
+                if (e.key === 'Escape') {
                     listenForCloseModal.hideModal();
+                }
 …
             let listenForViewLog = this;
             $("body").on("click", ".js-logtivity-view-log", function(e) {
+            $('body').on('click', '.js-logtivity-view-log', function(e) {
                 e.preventDefault();
 …
                 timeout         = null;
             $("body").on("input", "#logtivity-log-index-search-form input", function(e) {
+            $('body').on('input', '#logtivity-log-index-search-form input', function(e) {
                 e.preventDefault();
 …
         loading: function() {
             this.container.html(
+                '<div style="text-align: center; padding-bottom: 20px"><div class="spinner is-active" style="float:none;width:auto;height:auto;padding:10px 0 10px 50px;background-position:20px 0;"></div></div>'
+                '<div style="text-align: center; padding-bottom: 20px">'
+                + '<div class="spinner is-active" style="float:none;width:auto;height:auto;padding:10px 0 10px 50px;background-position:20px 0;"></div>'
+                + '</div>'
             );
         },
 …
             let listenForPagination = this;
             $("body").on("click", ".js-logtivity-pagination", function(e) {
+            $('body').on('click', '.js-logtivity-pagination', function(e) {
                 e.preventDefault();

logtivity/tags/3.2.0/composer.json

r3290027	r3335490
25	25	},
26	26	"require": {
27		"php": ">=7.4",
	27	"php" : ">=7.4",
28	28	"ext-json": "*"
29	29	},

logtivity/tags/3.2.0/logtivity.php

-                      r3306623
+                      r3335490
  * Description:       Record activity logs and errors logs across all your WordPress sites.
  * Author:            Logtivity
  * Version:           3.1.12
+ * Version:           3.2.0
  * Text Domain:       logtivity
  * Requires at least: 4.7
 …
      * @var string
      */
     protected string $version = '3.1.12';
+    protected string $version = '3.2.0';
     /**
      * List all classes here with their file paths. Keep class names the same as filenames.
      * Ordering of this list matters!
      * @TODO: Implement pst-0 autoloading
+     * @TODO: Implement psr-0 autoloading
+     *
      * @var string[]
 …
         'Services/Logtivity_Check_For_Disabled_Individual_Logs',
         'Services/Logtivity_Check_For_New_Settings',
+        'Services/Logtivity_Rest_Endpoints',
         /**
          * Error logging
 …
         'Errors/Logtivity_Error_Log',
     ];
     /**
      * @var string[]
 …
         'Logs/Core/Logtivity_Meta',
     ];
     /**
      * List all integration dependencies
 …
+    {
         require_once plugin_dir_path(__FILE__) . $filePath . '.php';
+    }
+    /**
+     * Review updates based on version
+     *
+     * @return void
+     */
+    public function updateCheck(): void
+    {
+        $currentVersion = get_option('logtivity_version');
+        if (version_compare($currentVersion, '3.1.6', '<=')) {
+            static::checkCapabilities();
+        }
+        if ($currentVersion && version_compare($currentVersion, '3.1.7', '<=')) {
+            // Default for updating sites should be no behavior change
+            update_option('logtivity_app_verify_url', 0);
+        }
+        update_option('logtivity_version', $this->version);
+    }
+    /**
+     * Custom capabilities added prior to v3.1.7
+     *
+     * @return void
+     */
+    public static function checkCapabilities(): void
+    {
+        $capabilities = array_filter(
+            array_keys(logtivity_get_capabilities()),
+            function (string $capability): bool {
+                return in_array($capability, [Logtivity::ACCESS_LOGS, Logtivity::ACCESS_SETTINGS]);
+            }
+        );
+        if ($capabilities == false) {
+            // Make sure at least admins can access us
+            if ($role = get_role('administrator')) {
+                if ($role->has_cap(Logtivity::ACCESS_LOGS) == false) {
+                    $role->add_cap(Logtivity::ACCESS_LOGS);
+                }
+                if ($role->has_cap(Logtivity::ACCESS_SETTINGS) == false) {
+                    $role->add_cap(Logtivity::ACCESS_SETTINGS);
+                }
+            }
+        }
+    }
 …
                         if ($created) {
                             $createdTimestamp = strtotime($created);
                             $creationText = sprintf(
+                            $creationText     = sprintf(
                                 'It was created on %s at %s ',
                                 wp_date(get_option('date_format'), $createdTimestamp),
 …
+        }
         return $response ?? null;
+        return $response;
+    }
 …
+    {
         return new Logtivity_Error_Logger($error);
+    }
-    /**
-     * Review updates based on version
+     *
-     * @return void
-     */
-    public function updateCheck(): void
+    {
-        $currentVersion = get_option('logtivity_version');
-        if (version_compare($currentVersion, '3.1.6', '<=')) {
-            static::checkCapabilities();
+        }
-        if ($currentVersion && version_compare($currentVersion, '3.1.7', '<=')) {
-            // Default for updating sites should be no behavior change
-            update_option('logtivity_app_verify_url', 0);
+        }
-        update_option('logtivity_version', $this->version);
+    }
 …
     /**
-     * Custom capabilities added prior to v3.1.7
+     *
-     * @return void
-     */
-    public static function checkCapabilities(): void
+    {
-        $capabilities = array_filter(
-            array_keys(logtivity_get_capabilities()),
-            function (string $capability): bool {
-                return in_array($capability, [Logtivity::ACCESS_LOGS, Logtivity::ACCESS_SETTINGS]);
+            }
-        );
-        if ($capabilities == false) {
-            // Make sure at least admins can access us
-            if ($role = get_role('administrator')) {
-                if ($role->has_cap(Logtivity::ACCESS_LOGS) == false) {
-                    $role->add_cap(Logtivity::ACCESS_LOGS);
+                }
-                if ($role->has_cap(Logtivity::ACCESS_SETTINGS) == false) {
-                    $role->add_cap(Logtivity::ACCESS_SETTINGS);
+                }
+            }
+        }
+    }
-    /**
      * @return void
      */
 …
             current_user_can(static::ACCESS_SETTINGS)
             && logtivity_has_site_url_changed()
+            && (new Logtivity_Options())->isWhiteLabelMode() == false
             && !get_transient('dismissed-logtivity-site-url-has-changed-notice')
         ) {

logtivity/tags/3.2.0/readme.txt

-                      r3306623
+                      r3335490
 Requires at least: 6.6
 Tested up to: 6.8
 Stable tag: 3.1.12
+Stable tag: 3.2.0
 Requires PHP: 7.4
 License: GPLv2 or later
 …
 == Changelog ==
+= 3.2.0 =
+* Add JSON Web Token halper class
+* Add REST api listener
+* Retrieve more detailed error information on connection fails
+* Normalize response data
+* Fix automatic settings checkin
+* Prevent disconnect on timeout errors
+_Release Date - Monday, July 28, 2025_
 = 3.1.12 =

logtivity/tags/3.2.0/views/_logs-loop.php

-                      r3272661
+                      r3335490
 /**
+ * @var string   $fileName
+ * @var ?string  $message
  * @var object[] $logs
+ * @var ?string  $hasNextPage
+ * @var object   $meta
+ * @var string   $hasNextPage
  */

logtivity/trunk/Admin/Logtivity_Log_Index_Controller.php

-                      r3294349
+                      r3335490
+    {
         if (current_user_can(Logtivity::ACCESS_LOGS)) {
+            $response = (new Logtivity_Api())
+                ->get(
+                    '/logs',
+                    [
+                        'page'        => $this->getInput('page'),
+                        'action'      => $this->getInput('search_action'),
+                        'context'     => $this->getInput('search_context'),
+                        'action_user' => $this->getInput('action_user'),
+                    ]
+                );
+            $api = Logtivity::log();
+            if ($response) {
+                $this->successResponse(json_decode(json_encode($response)));
+            if ($api->getOption()->getApiKey()) {
+                $response = $api
+                    ->get(
+                        '/logs',
+                        [
+                            'page'        => $this->getInput('page'),
+                            'action'      => $this->getInput('search_action'),
+                            'context'     => $this->getInput('search_context'),
+                            'action_user' => $this->getInput('action_user'),
+                        ]
+                    );
+            } elseif ((new Logtivity_Options())->getApiKey() == false) {
+                $this->welcomeResponse();
+                if ($response) {
+                    $response = json_decode(json_encode($response));
+                    $this->renderView([
+                        'message'     => $response->error,
+                        'logs'        => $response->body->data ?? [],
+                        'meta'        => $response->body->meta ?? null,
+                        'hasNextPage' => $response->body->links->next ?? null,
+                    ]);
+                } else {
+                    $this->renderView($api->getConnectionMessage());
+                }
             } else {
                 $this->errorResponse((new Logtivity_Api())->getConnectionMessage());
+                $this->welcomeResponse();
+            }
         } else {
             $this->errorResponse(__('You do not have sufficient permissions to access this page.'));
+            $this->renderView(__('You do not have sufficient permissions to access this page.'));
+        }
+    }
     /**
+     * @param object $response
+     * @param string $field
+     *
+     * @return ?string
+     */
+    protected function getInput(string $field): ?string
+    {
+        return sanitize_text_field($_GET[$field] ?? null);
+    }
+    /**
+     * @param string|array $response
+     *
      * @return void
      */
     private function successResponse(object $response): void
+    protected function renderView($viewData): void
+    {
+        if (is_string($viewData)) {
+            $viewData = ['message' => $viewData];
+        }
+        $viewData = array_merge(
+            [
+                'message'     => null,
+                'logs'        => [],
+                'meta'        => null,
+                'hasNextPage' => null,
+            ],
+            $viewData
+        );
         wp_send_json([
+            'view' => logtivity_view('_logs-loop', [
+                'logs'        => $response->data,
+                'meta'        => $response->meta,
+                'hasNextPage' => $response->links->next,
+            ]),
+        ]);
+    }
+    /**
+     * @param string $message
+     *
+     * @return void
+     */
+    private function errorResponse(string $message): void
+    {
+        wp_send_json([
+            'view' => logtivity_view('_logs-loop', [
+                'message' => $message,
+                'logs'    => [],
+            ]),
+            'view' => logtivity_view('_logs-loop', $viewData),
         ]);
+    }
 …
      * @return void
      */
     private function welcomeResponse()
+    protected function welcomeResponse()
+    {
         wp_send_json([
 …
         ]);
+    }
-    /**
-     * @param string $field
+     *
-     * @return ?string
-     */
-    private function getInput(string $field): ?string
+    {
-        return sanitize_text_field($_GET[$field] ?? null);
+    }
+}

logtivity/trunk/Admin/Logtivity_Options.php

-                      r3306623
+                      r3335490
 class Logtivity_Options
+{
+    /**
+     * Checkin for settings updates in designated minutes
+     *
+     * @var int
+     */
+    protected int $checkinDelay = 10;
     /**
      * The option keys that we can save to the options table
 …
             if ($lastCheckin) {
                 return time() - strtotime($lastCheckin) > 10 * MINUTE_IN_SECONDS;
+                return time() - strtotime($lastCheckin) > ($this->checkinDelay * MINUTE_IN_SECONDS);
+            }
+        }
 …
     public function update(array $data = [], bool $checkApiKey = true): void
+    {
+        if (count($data)) {
+            foreach ($this->settings as $setting => $default) {
+                if (array_key_exists($setting, $data) && $this->validateSetting($setting, $data[$setting])) {
+                    update_option($setting, $data[$setting]);
+                }
+            }
+        } else {
+            foreach ($this->settings as $setting => $default) {
+                if (array_key_exists($setting, $_POST) && $this->validateSetting($setting, $_POST[$setting])) {
+                    update_option($setting, $_POST[$setting]);
+                }
+        $settings = array_intersect_key($data ?: $_POST, $this->settings);
+        foreach ($settings as $key => $value) {
+            if ($this->validateSetting($key, $value)) {
+                update_option($key, $value);
+            }
+        }
 …
             $this->checkApiKey($data['logtivity_site_api_key'] ?? $_POST['logtivity_site_api_key'] ?? null);
+        }
+    }
+    /**
+     * Validate that the passed parameters are in the correct format
+     *
+     * @param string $key
+     * @param mixed  $value
+     *
+     * @return bool
+     */
+    protected function validateSetting(string $key, $value): bool
+    {
+        $setting = $this->settings[$key] ?? null;
+        if ($setting) {
+            $method = $setting['rule'] ?? null;
+            if ($method == 'is_bool') {
+                return $method((bool)$value);
+            }
+            return $method($value);
+        }
+        return true;
+    }
 …
                 ->setAction('Settings Updated')
                 ->setContext('Logtivity')
-                ->ignoreStatus()
                 ->waitForResponse()
                 ->send();
+        }
+    }
-    /**
-     * Validate that the passed parameters are in the correct format
+     *
-     * @param string $key
-     * @param mixed  $value
+     *
-     * @return bool
-     */
-    protected function validateSetting(string $key, $value): bool
+    {
-        $setting = $this->settings[$key] ?? null;
-        if ($setting) {
-            $method = $setting['rule'] ?? null;
-            if ($method == 'is_bool') {
-                return $method((bool)$value);
+            }
-            return $method($value);
+        }
-        return true;
+    }
+}

logtivity/trunk/Errors/Logtivity_Error_Logger.php

r3272661	r3335490
70	70	* @return ?array
71	71	*/
72		public function send(): ~~?array~~
	72	public function send(): void
73	73	{
74	74	$message = $this->error['message'] ?? '';
…	…
79	79
80	80	if ($this->active) {
81		$~~response = $~~this->makeRequest('/errors/store', $this->getData());
	81	$this->makeRequest('/errors/store', $this->getData());
82	82	}
83	83	}
84
85		~~return $response ?? null;~~
86	84	}
87	85

logtivity/trunk/Helpers/Helpers.php

r3272661	r3335490
51	51	{
52	52	extract($vars);
	53	unset($vars);
53	54
54	55	ob_start();

logtivity/trunk/Helpers/Logtivity_Log_Global_Function.php

r3290027	r3335490
33	33	* @deprecated v3.1.8 - use Logtivity::log() instead
34	34	*/
35		function logtivity_log(?string $action = null, ?string $meta = null, ?string $user_id = null)
	35	function logtivity_log(?string $action = null, ?string $meta = null, ?string $user_id = null): void
36	36	{
37		~~return~~ Logtivity::log($action, $meta, $user_id)->send();
	37	Logtivity::log($action, $meta, $user_id)->send();
38	38	}

logtivity/trunk/Logs/Core/Logtivity_Core.php

r3290027	r3335490
197	197	->setAction('Settings Updated')
198	198	->setContext('Core:' . $optionPage)
199		~~->ignoreStatus()~~
200	199	->send();
201	200	}

logtivity/trunk/Logs/Core/Logtivity_User.php

-                      r3272661
+                      r3335490
 class Logtivity_User extends Logtivity_Abstract_Logger
+{
     protected static $loggedUserlogin = false;
+    protected static bool $loggedUserlogin = false;
     /**
+     * @inheritDoc
+     * @param string  $username
+     * @param WP_User $user
+     *
+     * @return void
      */
     protected function registerHooks(): void
+    public function userLoggedIn(string $username, WP_User $user)
+    {
+        add_action('wp_login', [$this, 'wpLogin'], 10, 2);
+        add_action('wp_logout', [$this, 'userLoggedOut'], 10, 1);
+        add_action('user_register', [$this, 'userCreated'], 10, 1);
+        add_action('delete_user', [$this, 'userDeleted']);
+        add_action('profile_update', [$this, 'profileUpdated'], 10, 2);
+        if (static::$loggedUserlogin == false) {
+            static::$loggedUserlogin = true;
+            $logger = Logtivity::log()->setUser($user->ID);
+            $logger->setAction('User Logged In')
+                ->setContext($logger->user->getRole())
+                ->send();
+        }
+    }
+    public function wpLogin($user_login, $user)
+    /**
+     * @param int $userId
+     *
+     * @return void
+     */
+    public function userLoggedOut(int $userId): void
+    {
+        if (self::$loggedUserlogin) {
+            return;
+        if ($userId) {
+            $logger = Logtivity::log()->setUser($userId);
+            $logger
+                ->setAction('User Logged Out')
+                ->setContext($logger->user->getRole())
+                ->send();
+        }
-        return $this->userLoggedIn($user->ID);
+    }
+    public function userLoggedIn($user_id)
+    {
+        self::$loggedUserlogin = true;
+        $logtivityUser = new Logtivity_WP_User($user_id);
+        return (new Logtivity_Logger($user_id))
+            ->setAction('User Logged In')
+            ->setContext($logtivityUser->getRole())
+            ->send();
+    }
+    public function userLoggedOut($user_id)
+    {
+        if ($user_id == 0) {
+            return;
+        }
+        $user = new Logtivity_WP_User($user_id);
+        return (new Logtivity_Logger($user_id))
+            ->setAction('User Logged Out')
+            ->setContext($user->getRole())
+            ->send();
+    }
+    public function userCreated($user_id)
+    /**
+     * @param int $userId
+     *
+     * @return void
+     */
+    public function userCreated(int $userId): void
+    {
         $log = Logtivity::log();
+        if (!is_user_logged_in()) {
+            $log->setUser($user_id);
+        if (is_user_logged_in() == false) {
+            $log->setUser($userId);
+            $user = $log->user;
+        } else {
+            $user = new Logtivity_WP_User($userId);
+        }
-        $user = new Logtivity_WP_User($user_id);
         $log->setAction('User Created')
 …
+    }
+    public function userDeleted($user_id)
+    /**
+     * @param int $userId
+     *
+     * @return void
+     */
+    public function userDeleted(int $userId): void
+    {
         $user = new Logtivity_WP_User($user_id);
+        $user = new Logtivity_WP_User($userId);
         Logtivity::log()
 …
+    }
     public function profileUpdated($user_id, $old_user_data)
+    public function profileUpdated($userId)
+    {
         $user = new Logtivity_WP_User($user_id);
+        $user = new Logtivity_WP_User($userId);
         Logtivity::log()
 …
             ->send();
+    }
+    /**
+     * @inheritDoc
+     */
+    protected function registerHooks(): void
+    {
+        add_action('wp_login', [$this, 'userLoggedIn'], 10, 2);
+        add_action('wp_logout', [$this, 'userLoggedOut'], 10, 1);
+        add_action('user_register', [$this, 'userCreated'], 10, 1);
+        add_action('delete_user', [$this, 'userDeleted']);
+        add_action('profile_update', [$this, 'profileUpdated'], 10, 1);
+    }
+}

logtivity/trunk/Logs/Memberpress/Logtivity_Memberpress.php

-                      r3272661
+                      r3335490
 class Logtivity_Memberpress extends Logtivity_Abstract_Logger
+{
+    /**
+     * @inheritDoc
+     */
+    protected function registerHooks(): void
+    {
+        add_action('mepr-event-member-signup-completed', [$this, 'freeSubscriptionCreated']);
+        add_action('mepr-event-subscription-created', [$this, 'subscriptionCreated']);
+        add_action('mepr-event-subscription-paused', [$this, 'subscriptionPaused']);
+        add_action('mepr-event-subscription-resumed', [$this, 'subscriptionResumed']);
+        add_action('mepr-event-subscription-stopped', [$this, 'subscriptionStopped']);
+        add_action('init', [$this, 'profileUpdated']);
+        add_filter('mepr_create_transaction', [$this, 'transactionCreated'], 10, 3);
+        add_filter('mepr_update_transaction', [$this, 'transactionUpdated'], 10, 3);
+        add_action('mepr_email_sent', [$this, 'emailSent'], 10, 3);
+        add_action('mepr-process-options', [$this, 'settingsUpdated'], 10, 1);
+    }
+    public function freeSubscriptionCreated($event)
+    public function freeSubscriptionCreated($event): void
+    {
         $user         = $event->get_data();
         $subscription = $this->getSubscription($user);
+        if (!$subscription) {
+            return;
+        if ($subscription && $subscription->gateway == 'free') {
+            $product = $subscription->product();
+            Logtivity::log(
+                'Free Subscription Created',
+                [
+                    'Subscription ID' => $subscription->id,
+                ]
+            )
+                ->setContext($product->post_title)
+                ->send();
+        }
-        if ($subscription->gateway != 'free') {
-            return;
+        }
-        $product = $subscription->product();
-        return (new Logtivity_Logger($user->ID))
-            ->setAction('Free Subscription Created')
-            ->setContext($product->post_title)
-            ->addMeta('Subscription ID', $subscription->id)
-            ->send();
+    }
 …
+    }
+    public function subscriptionCreated($event)
+    /**
+     * @param $event
+     *
+     * @return void
+     */
+    public function subscriptionCreated($event): void
+    {
         $subscription  = $event->get_data();
 …
         $paymentMethod = $subscription->payment_method();
+        return (new Logtivity_Logger($user->ID))
+            ->setAction('Subscription Created')
+        Logtivity::log(
+            'Subscription Created',
+            [
+                'Transaction Total' => $subscription->total,
+                'Payment Method'    => $paymentMethod->name,
+                'Subscription ID'   => $subscription->id,
+            ],
+            $user->ID
+        )
             ->setContext($product->post_title)
-            ->addMeta('Transaction Total', $subscription->total)
-            ->addMeta('Payment Method', $paymentMethod->name)
-            ->addMeta('Subscription ID', $subscription->id)
             ->send();
+    }
 …
             ->send();
+    }
+    /**
+     * @inheritDoc
+     */
+    protected function registerHooks(): void
+    {
+        add_action('mepr-event-member-signup-completed', [$this, 'freeSubscriptionCreated']);
+        add_action('mepr-event-subscription-created', [$this, 'subscriptionCreated']);
+        add_action('mepr-event-subscription-paused', [$this, 'subscriptionPaused']);
+        add_action('mepr-event-subscription-resumed', [$this, 'subscriptionResumed']);
+        add_action('mepr-event-subscription-stopped', [$this, 'subscriptionStopped']);
+        add_action('init', [$this, 'profileUpdated']);
+        add_filter('mepr_create_transaction', [$this, 'transactionCreated'], 10, 3);
+        add_filter('mepr_update_transaction', [$this, 'transactionUpdated'], 10, 3);
+        add_action('mepr_email_sent', [$this, 'emailSent'], 10, 3);
+        add_action('mepr-process-options', [$this, 'settingsUpdated'], 10, 1);
+    }
+}

logtivity/trunk/Services/Logtivity_Api.php

-                      r3306623
+                      r3335490
 class Logtivity_Api
+{
+    public const CURL_TIMEOUT = 28;
+    /**
+     * @var array
+     */
+    protected static $responseData = [
+        'code'    => null,
+        'message' => null,
+        'error'   => null,
+        'body'    => null,
+    ];
     /**
      * Option class to access the plugin settings
 …
      * @return $this
      */
     public function waitForResponse(): self
+    {
         $this->waitForResponse = true;
+    public function ignoreStatus(): self
+    {
+        $this->ignoreStatus = true;
         return $this;
+    }
-    /**
-     * @return $this
-     */
-    public function ignoreStatus(): self
+    {
-        $this->ignoreStatus = true;
-        return $this;
+    }
-    /**
-     * @param string $endpoint
+     *
-     * @return string
-     */
-    public function getEndpoint(string $endpoint): string
+    {
-        return logtivity_get_api_url() . $endpoint;
+    }
 …
+    {
         return $this->makeRequest($url, $body);
+    }
-    /**
-     * @param string $url
-     * @param ?array $body
+     *
-     * @return ?array
-     */
-    public function get(string $url, ?array $body = null): ?array
+    {
-        return $this->waitForResponse()->makeRequest($url, $body, 'GET');
+    }
-    /**
-     * @return ?string
-     */
-    public function getApiKey(): ?string
+    {
-        if ($this->api_key == false) {
-            $this->api_key = $this->options->getApiKey();
+        }
-        return $this->api_key;
+    }
-    /**
-     * @param string $apikey
+     *
-     * @return $this
-     */
-    public function setApiKey(string $apikey): self
+    {
-        $this->api_key = $apikey;
-        return $this;
+    }
 …
         if ($this->ready()) {
             if ($this->options->getOption('logtivity_app_verify_url')) {
+            if ($this->getOption('logtivity_app_verify_url')) {
                 $body = array_merge(
                     $body ?: [],
 …
             // @TODO: Switch to Logtivity_Response class to get standardized responses
             $response = wp_remote_request($this->getEndpoint($url), $request);
             if ($this->notUpdatingWidgetInCustomizer()) {
+            if ($waitForResponse && $this->notUpdatingWidgetInCustomizer()) {
                 // We waited and received a response
                 if ($response instanceof WP_Error) {
                     $responseData = [
+                    $responseData = array_merge(static::$responseData, [
                         'code'    => 500,
                         'message' => $response->get_error_code(),
                         'error'   => $response->get_error_message() ?: $response->get_error_code(),
                         'body'    => get_object_vars($response),
                     ];
+                    ]);
                 } else {
 …
                         $responseError   = $responseMessage;
                         $responseMessage = (($responseBody['message'] ?? $responseMessage) ?: 'Unknown error');
+                    }
                     $responseData = [
 …
+                }
+                $newStatus = 'success';
                 if ($responseData['code']) {
                     if ($responseData['code'] < 400) {
                         // Successful request, check if api is telling us to pause
+                        $newStatus = $responseData['error'] ? 'paused' : 'success';
+                        $this->updateSettings($response['body']);
+                        if ($responseData['error']) {
+                            $newStatus = 'paused';
+                        }
+                        $body = json_decode($response['body'] ?? 'null', true);
+                        $this->updateSettings($body['settings'] ?? []);
                     } else {
+                        // Something went wrong submitting the api request
+                        $newStatus = 'fail';
+                        update_option('logtivity_last_settings_check_in_at', ['date' => date('Y-m-d H:i:s')]);
+                        if ($this->getCurlError($responseData['error']) != static::CURL_TIMEOUT) {
+                            // Something other than a timeout went wrong with the request
+                            $newStatus = 'fail';
+                        }
+                        $this->updateLastCheckin();
+                    }
 …
                     );
                     return $responseData['body'];
+                    return $responseData;
+                }
+            }
 …
     /**
+     * @return bool
+     */
+    protected function ready(): bool
+    {
+        return ($this->getApiKey())
+            && logtivity_has_site_url_changed() == false
+            && (
+                $this->ignoreStatus
+                || $this->getOption('logtivity_api_key_check') == 'success'
+                || $this->options->shouldCheckInWithApi()
+            );
+    }
+    /**
+     * @return ?string
+     */
+    public function getApiKey(): ?string
+    {
+        if ($this->api_key == false) {
+            $this->api_key = $this->options->getApiKey();
+        }
+        return $this->api_key;
+    }
+    /**
+     * @param string $apikey
+     *
+     * @return $this
+     */
+    public function setApiKey(string $apikey): self
+    {
+        $this->api_key = $apikey;
+        return $this;
+    }
+    /**
+     * @param ?string $key
+     *
+     * @return Logtivity_Options|mixed
+     */
+    public function getOption(?string $key = null)
+    {
+        if ($key) {
+            return $this->options->getOption($key);
+        }
+        return $this->options;
+    }
+    /**
+     * @param string $endpoint
+     *
+     * @return string
+     */
+    public function getEndpoint(string $endpoint): string
+    {
+        return logtivity_get_api_url() . $endpoint;
+    }
+    /**
+     * You cannot call an extra update_option during a widget update so we make
+     * sure not to log the most recent log response in this case.
+     *
+     * @return bool
+     */
+    protected function notUpdatingWidgetInCustomizer(): bool
+    {
+        $customize = sanitize_text_field($_POST['wp_customize'] ?? null);
+        $action    = sanitize_text_field($_POST['action'] ?? null);
+        return ($action == 'update-widget' && $customize == 'on') == false;
+    }
+    /**
      * @param array|object $body
+     *
      * @return void
      */
+    public function updateSettings($body): void
+    {
+        $settings = (object)($body->settings ?? $body['settings'] ?? null);
+    public function updateSettings(array $settings): void
+    {
         if ($settings) {
+            $this->options->update(
+                [
+                    'logtivity_global_disabled_logs'         => $settings->disabled_logs ?? null,
+                    'logtivity_enable_white_label_mode'      => $settings->enable_white_label_mode ?? null,
+                    'logtivity_disabled_error_levels'        => $settings->disabled_error_levels ?? null,
+                    'logtivity_disable_error_logging'        => $settings->disable_error_logging ?? null,
+                    'logtivity_hide_plugin_from_ui'          => $settings->hide_plugin_from_ui ?? null,
+                    'logtivity_disable_default_logging'      => $settings->disable_default_logging ?? null,
+                    'logtivity_enable_options_table_logging' => $settings->enable_options_table_logging ?? null,
+                    'logtivity_enable_post_meta_logging'     => $settings->enable_post_meta_logging ?? null,
+                    'logtivity_custom_plugin_name'           => $settings->custom_plugin_name ?? null,
+                ],
+                false
+            );
+            update_option('logtivity_last_settings_check_in_at', ['date' => date('Y-m-d H:i:s')]);
+        }
+            $verifiedSettings = [];
+            foreach ($settings as $key => $value) {
+                if ($key == 'disabled_logs') {
+                    $key = 'global_' . $key;
+                }
+                $verifiedSettings['logtivity_' . $key] = is_null($value) ? '' : $value;
+            }
+            $this->options->update($verifiedSettings, false);
+        }
+        $this->updateLastCheckin();
+    }
+    /**
+     * @return void
+     */
+    protected function updateLastCheckin(): void
+    {
+        update_option('logtivity_last_settings_check_in_at', ['date' => date('Y-m-d H:i:s')]);
+    }
+    /**
+     * @param ?string $message
+     *
+     * @return int
+     */
+    protected function getCurlError(?string $message): ?int
+    {
+        preg_match('/curl\s+error\s+(\d+)/i', $message, $matches);
+        return $matches[1] ?? null;
+    }
 …
     public function getLatestResponse(): ?array
+    {
         $response = $this->options->getOption('logtivity_latest_response');
+        $response = $this->getOption('logtivity_latest_response');
         return $response ?: null;
 …
     /**
+     * @return ?string
+     */
+    public function getConnectionStatus(): ?string
+    {
+        $status = null;
+        $apiKey = $this->getApiKey();
+        if ($apiKey) {
+            $status = $this->options->getOption('logtivity_api_key_check');
+        }
+        return $status;
+     * @param string $url
+     * @param ?array $body
+     *
+     * @return ?array
+     */
+    public function get(string $url, ?array $body = null): ?array
+    {
+        return $this->waitForResponse()->makeRequest($url, $body, 'GET');
+    }
+    /**
+     * @return $this
+     */
+    public function waitForResponse(): self
+    {
+        $this->waitForResponse = true;
+        return $this;
+    }
 …
                 $error   = $this->getLatestResponse();
                 $code    = $error['code'] ?? null;
                 $message = $error['message'] ?? null;
+                $message = $error['error'] ?? $error['message'] ?? null;
                 if ($code && $message) {
 …
     /**
+     * You cannot call an extra update_option during a widget update so we make
+     * sure not to log the most recent log response in this case.
+     *
+     * @return bool
+     */
+    private function notUpdatingWidgetInCustomizer(): bool
+    {
+        $customize = sanitize_text_field($_POST['wp_customize'] ?? null);
+        $action    = sanitize_text_field($_POST['action'] ?? null);
+        return ($action == 'update-widget' && $customize == 'on') == false;
+    }
+    /**
+     * @return bool
+     */
+    private function ready(): bool
+    {
+        //var_dump($this->ignoreStatus);
+        return ($this->getApiKey())
+            && logtivity_has_site_url_changed() == false
+            && (
+                $this->ignoreStatus
+                || $this->options->getOption('logtivity_api_key_check') == 'success'
+                || $this->options->shouldCheckInWithApi()
+            );
+     * @return ?string
+     */
+    public function getConnectionStatus(): ?string
+    {
+        $status = null;
+        $apiKey = $this->getApiKey();
+        if ($apiKey) {
+            $status = $this->getOption('logtivity_api_key_check');
+        }
+        return $status;
+    }
+}

logtivity/trunk/Services/Logtivity_Check_For_Disabled_Individual_Logs.php

-                      r3246625
+                      r3335490
 class Logtivity_Check_For_Disabled_Individual_Logs
+{
+    public function __construct()
+    {
+        add_action('wp_logtivity_instance', [$this, 'handle'], 10, 999);
+    }
+    /**
+     * @var Logtivity_Options
+     */
+    protected Logtivity_Options $options;
+    public function handle($Logtivity_Logger)
+    {
+        foreach ($this->getLogsToExclude() as $log) {
+            if ($this->check($Logtivity_Logger, $log)) {
+                $Logtivity_Logger->stop();
+            }
+        }
+    public function __construct()
+    {
+        add_action('wp_logtivity_instance', [$this, 'handle'], 10, 2);
+    }
+        foreach ($this->globalLogsToExclude() as $log) {
+            if ($this->check($Logtivity_Logger, $log)) {
+                $Logtivity_Logger->stop();
+            }
+        }
+    }
+    /**
+     * @param Logtivity_Logger $logger
+     *
+     * @return void
+     */
+    public function handle(Logtivity_Logger $logger): void
+    {
+        // Refresh options whenever invoked
+        $this->options = new Logtivity_Options();
+    public function check($Logtivity_Logger, $log)
+    {
+        $array = explode('&&', $log);
+        $exclusions = array_unique(
+            array_merge(
+                $this->parseExcludeEntries('logtivity_disable_individual_logs'),
+                $this->parseExcludeEntries('logtivity_global_disabled_logs')
+            )
+        );
+        if (isset($array[0]) && isset($array[1])) {
+            if (trim($array[0]) === '*' && trim($array[1]) === '*') {
+                return;
+            }
+            if ($this->matches($Logtivity_Logger->action, $array[0]) && $this->matches($Logtivity_Logger->context, $array[1])) {
+                return true;
+            }
+        } elseif(isset($array[0])) {
+            if (trim($array[0]) === '*') {
+                return;
+            }
+            if ($this->matches($Logtivity_Logger->action, $array[0])) {
+                return true;
+            }
+        }
+        return false;
+    }
+        foreach ($exclusions as $exclusion) {
+            if ($this->isDisabled($logger, $exclusion)) {
+                $logger->stop();
+    private function matches($keyword, $disabledKeyword)
+    {
+        // @TODO: this may not be the best way to check the arguments
+        if (is_string($keyword) && is_string($disabledKeyword)) {
+            $keyword = trim(strtolower($keyword));
+            $disabledKeyword = trim(strtolower($disabledKeyword));
+                return;
+            }
+        }
+    }
+            if ($disabledKeyword === '*') {
+                return true;
+            }
+    /**
+     * @param string $option
+     *
+     * @return array
+     */
+    protected function parseExcludeEntries(string $option): array
+    {
+        $value = (string)$this->options->getOption($option);
+            if (strpos($disabledKeyword, '*') !== false) {
+                return strpos($keyword, str_replace('*', '', $disabledKeyword)) !== false;
+            }
+        $entries = preg_split("/\\r\\n|\\r|\\n/", $value);
             return $keyword == $disabledKeyword;
+        }
+        return array_unique(array_filter($entries));
+    }
+        return false;
+    }
+    /**
+     * @param Logtivity_Logger $logger
+     * @param string           $exclusion
+     *
+     * @return bool
+     */
+    protected function isDisabled(Logtivity_Logger $logger, string $exclusion): bool
+    {
+        $array   = explode('&&', $exclusion);
+        $action  = strtolower(trim((string)array_shift($array)));
+        $context = strtolower(trim((string)array_shift($array)));
+    private function getLogsToExclude()
+    {
+        $value = (new Logtivity_Options)->getOption('logtivity_disable_individual_logs');
+        if ($action == '*' && $context == '*') {
+            return false;
+        } elseif ($this->matches($logger->action, $action) && $this->matches($logger->context, $context)) {
+            return true;
+        } elseif ($action == '*') {
+            return false;
+        } elseif ($this->matches($logger->action, $action)) {
+            return true;
+        }
+        if ($value == '') {
+            return [];
+        }
+        return false;
+    }
+        return preg_split("/\\r\\n|\\r|\\n/", $value);
+    }
+    /**
+     * @param ?string $keywordTarget
+     * @param ?string $keywordCheck
+     *
+     * @return bool
+     */
+    protected function matches(?string $keywordTarget, ?string $keywordCheck): bool
+    {
+        $keywordTarget = strtolower(trim((string)$keywordTarget));
+        $keywordCheck  = strtolower(trim((string)$keywordCheck));
+    public function globalLogsToExclude()
+    {
+        $value = (new Logtivity_Options)->getOption('logtivity_global_disabled_logs');
+        if ($keywordTarget && $keywordCheck) {
+            if ($keywordCheck == '*') {
+                return true;
+            }
+        if ($value == '') {
+            return [];
+        }
+            if (strpos($keywordCheck, '*') !== false) {
+                $regex = str_replace(['*', '/'], ['.*?', '\/'], $keywordCheck);
+                return preg_match('/' . $regex . '/', $keywordTarget);
+            }
+        return preg_split("/\\r\\n|\\r|\\n/", $value);
+    }
+            return $keywordCheck == $keywordTarget;
+        }
+        return false;
+    }
+}
 $CheckForDisabledIndividualLogs = new Logtivity_Check_For_Disabled_Individual_Logs;
+new Logtivity_Check_For_Disabled_Individual_Logs();

logtivity/trunk/Services/Logtivity_Check_For_New_Settings.php

-                      r3290027
+                      r3335490
     /**
+     * @return bool
+     */
+    public function shouldCheckInWithApi(): bool
+    {
+        return (new Logtivity_Options())->shouldCheckInWithApi();
+    }
+    /**
      * @return void
      */
 …
         try {
-            $api = new Logtivity_Api();
             $theme = wp_get_theme();
 …
             $latestMinMySqlVersion = $coreUpdates[0]->mysql_version ?? null;
+            $response = $api->ignoreStatus()->post('/settings-check', [
+                'php_version'                 => phpversion(),
+                'plugins'                     => $this->getPluginsWithStatuses(),
+                'theme_name'                  => $theme ? $theme->name : null,
+                'theme_version'               => $theme ? $theme->version : null,
+                'themes'                      => $this->getThemesListWithStatuses(),
+                'wordpress_version'           => $wp_version,
+                'latest_wp_version'           => $latestWPVersion,
+                'latest_wp_min_php_version'   => $latestMinPhpVersion,
+                'latest_wp_min_mysql_version' => $latestMinMySqlVersion,
+            ]);
+            $api = new Logtivity_Api();
+            if ($response) {
+                $api->updateSettings($response);
+            $response = $api
+                ->ignoreStatus()
+                ->waitForResponse()
+                ->makeRequest(
+                    '/settings-check',
+                    [
+                        'php_version'                 => phpversion(),
+                        'plugins'                     => $this->getPluginsWithStatuses(),
+                        'theme_name'                  => $theme ? $theme->name : null,
+                        'theme_version'               => $theme ? $theme->version : null,
+                        'themes'                      => $this->getThemesListWithStatuses(),
+                        'wordpress_version'           => $wp_version,
+                        'latest_wp_version'           => $latestWPVersion,
+                        'latest_wp_min_php_version'   => $latestMinPhpVersion,
+                        'latest_wp_min_mysql_version' => $latestMinMySqlVersion,
+                    ]);
+            if ($settings = $response['body']['settings'] ?? null) {
+                $api->updateSettings($settings);
+            }
 …
             // Ignore
+        }
+    }
-    /**
-     * @return array[]
-     */
-    private function getThemesListWithStatuses(): array
+    {
-        $themes = wp_get_themes();
-        $themesDetails = [];
-        foreach ($themes as $theme) {
-            $themesDetails[] = [
-                'name'    => $theme->name,
-                'version' => $theme->version,
-            ];
+        }
-        return $themesDetails;
+    }
 …
     /**
      * @return bool
+     * @return array[]
      */
     public function shouldCheckInWithApi(): bool
+    private function getThemesListWithStatuses(): array
+    {
+        return (new Logtivity_Options())->shouldCheckInWithApi();
+        $themes = wp_get_themes();
+        $themesDetails = [];
+        foreach ($themes as $theme) {
+            $themesDetails[] = [
+                'name'    => $theme->name,
+                'version' => $theme->version,
+            ];
+        }
+        return $themesDetails;
+    }
+}

logtivity/trunk/Services/Logtivity_Logger.php

-                      r3290027
+                      r3335490
      * Send the logged data to Logtivity
+     *
      * @return ?array
      */
     public function send(): ?array
+     * @return void
+     */
+    public function send(): void
+    {
         $this->maybeAddProfileLink();
 …
         if ($this->active) {
+            return $this->makeRequest('/logs/store', $this->getData());
+        }
+        return null;
+            $this->makeRequest('/logs/store', $this->getData());
+        }
+    }

logtivity/trunk/assets/app.js

-                      r3306623
+                      r3335490
             this.container = $('#logtivity-log-index');
+            if (!this.container.length) {
+                return;
+            if (this.container.length) {
+                this.form = $('#logtivity-log-index-search-form');
+                this.listenForPagination();
+                this.listenForChange();
+                this.filter();
+                this.listenForViewLog()
+                this.listenForCloseModal();
+            }
-            this.form = $('#logtivity-log-index-search-form');
-            this.listenForPagination();
-            this.listenForChange();
-            this.filter();
-            this.listenForViewLog()
-            this.listenForCloseModal();
         },
 …
             let listenForCloseModal = this;
             $("body").on("click", ".js-logtivity-notice-dismiss", function(e) {
+            $('body').on('click', '.js-logtivity-notice-dismiss', function(e) {
                 e.preventDefault();
 …
             $(document).on('keyup', function(e) {
                 if (e.key === "Escape") {
+                if (e.key === 'Escape') {
                     listenForCloseModal.hideModal();
+                }
 …
             let listenForViewLog = this;
             $("body").on("click", ".js-logtivity-view-log", function(e) {
+            $('body').on('click', '.js-logtivity-view-log', function(e) {
                 e.preventDefault();
 …
                 timeout         = null;
             $("body").on("input", "#logtivity-log-index-search-form input", function(e) {
+            $('body').on('input', '#logtivity-log-index-search-form input', function(e) {
                 e.preventDefault();
 …
         loading: function() {
             this.container.html(
+                '<div style="text-align: center; padding-bottom: 20px"><div class="spinner is-active" style="float:none;width:auto;height:auto;padding:10px 0 10px 50px;background-position:20px 0;"></div></div>'
+                '<div style="text-align: center; padding-bottom: 20px">'
+                + '<div class="spinner is-active" style="float:none;width:auto;height:auto;padding:10px 0 10px 50px;background-position:20px 0;"></div>'
+                + '</div>'
             );
         },
 …
             let listenForPagination = this;
             $("body").on("click", ".js-logtivity-pagination", function(e) {
+            $('body').on('click', '.js-logtivity-pagination', function(e) {
                 e.preventDefault();

logtivity/trunk/composer.json

r3290027	r3335490
25	25	},
26	26	"require": {
27		"php": ">=7.4",
	27	"php" : ">=7.4",
28	28	"ext-json": "*"
29	29	},

logtivity/trunk/logtivity.php

-                      r3306623
+                      r3335490
  * Description:       Record activity logs and errors logs across all your WordPress sites.
  * Author:            Logtivity
  * Version:           3.1.12
+ * Version:           3.2.0
  * Text Domain:       logtivity
  * Requires at least: 4.7
 …
      * @var string
      */
     protected string $version = '3.1.12';
+    protected string $version = '3.2.0';
     /**
      * List all classes here with their file paths. Keep class names the same as filenames.
      * Ordering of this list matters!
      * @TODO: Implement pst-0 autoloading
+     * @TODO: Implement psr-0 autoloading
+     *
      * @var string[]
 …
         'Services/Logtivity_Check_For_Disabled_Individual_Logs',
         'Services/Logtivity_Check_For_New_Settings',
+        'Services/Logtivity_Rest_Endpoints',
         /**
          * Error logging
 …
         'Errors/Logtivity_Error_Log',
     ];
     /**
      * @var string[]
 …
         'Logs/Core/Logtivity_Meta',
     ];
     /**
      * List all integration dependencies
 …
+    {
         require_once plugin_dir_path(__FILE__) . $filePath . '.php';
+    }
+    /**
+     * Review updates based on version
+     *
+     * @return void
+     */
+    public function updateCheck(): void
+    {
+        $currentVersion = get_option('logtivity_version');
+        if (version_compare($currentVersion, '3.1.6', '<=')) {
+            static::checkCapabilities();
+        }
+        if ($currentVersion && version_compare($currentVersion, '3.1.7', '<=')) {
+            // Default for updating sites should be no behavior change
+            update_option('logtivity_app_verify_url', 0);
+        }
+        update_option('logtivity_version', $this->version);
+    }
+    /**
+     * Custom capabilities added prior to v3.1.7
+     *
+     * @return void
+     */
+    public static function checkCapabilities(): void
+    {
+        $capabilities = array_filter(
+            array_keys(logtivity_get_capabilities()),
+            function (string $capability): bool {
+                return in_array($capability, [Logtivity::ACCESS_LOGS, Logtivity::ACCESS_SETTINGS]);
+            }
+        );
+        if ($capabilities == false) {
+            // Make sure at least admins can access us
+            if ($role = get_role('administrator')) {
+                if ($role->has_cap(Logtivity::ACCESS_LOGS) == false) {
+                    $role->add_cap(Logtivity::ACCESS_LOGS);
+                }
+                if ($role->has_cap(Logtivity::ACCESS_SETTINGS) == false) {
+                    $role->add_cap(Logtivity::ACCESS_SETTINGS);
+                }
+            }
+        }
+    }
 …
                         if ($created) {
                             $createdTimestamp = strtotime($created);
                             $creationText = sprintf(
+                            $creationText     = sprintf(
                                 'It was created on %s at %s ',
                                 wp_date(get_option('date_format'), $createdTimestamp),
 …
+        }
         return $response ?? null;
+        return $response;
+    }
 …
+    {
         return new Logtivity_Error_Logger($error);
+    }
-    /**
-     * Review updates based on version
+     *
-     * @return void
-     */
-    public function updateCheck(): void
+    {
-        $currentVersion = get_option('logtivity_version');
-        if (version_compare($currentVersion, '3.1.6', '<=')) {
-            static::checkCapabilities();
+        }
-        if ($currentVersion && version_compare($currentVersion, '3.1.7', '<=')) {
-            // Default for updating sites should be no behavior change
-            update_option('logtivity_app_verify_url', 0);
+        }
-        update_option('logtivity_version', $this->version);
+    }
 …
     /**
-     * Custom capabilities added prior to v3.1.7
+     *
-     * @return void
-     */
-    public static function checkCapabilities(): void
+    {
-        $capabilities = array_filter(
-            array_keys(logtivity_get_capabilities()),
-            function (string $capability): bool {
-                return in_array($capability, [Logtivity::ACCESS_LOGS, Logtivity::ACCESS_SETTINGS]);
+            }
-        );
-        if ($capabilities == false) {
-            // Make sure at least admins can access us
-            if ($role = get_role('administrator')) {
-                if ($role->has_cap(Logtivity::ACCESS_LOGS) == false) {
-                    $role->add_cap(Logtivity::ACCESS_LOGS);
+                }
-                if ($role->has_cap(Logtivity::ACCESS_SETTINGS) == false) {
-                    $role->add_cap(Logtivity::ACCESS_SETTINGS);
+                }
+            }
+        }
+    }
-    /**
      * @return void
      */
 …
             current_user_can(static::ACCESS_SETTINGS)
             && logtivity_has_site_url_changed()
+            && (new Logtivity_Options())->isWhiteLabelMode() == false
             && !get_transient('dismissed-logtivity-site-url-has-changed-notice')
         ) {

logtivity/trunk/readme.txt

-                      r3306623
+                      r3335490
 Requires at least: 6.6
 Tested up to: 6.8
 Stable tag: 3.1.12
+Stable tag: 3.2.0
 Requires PHP: 7.4
 License: GPLv2 or later
 …
 == Changelog ==
+= 3.2.0 =
+* Add JSON Web Token halper class
+* Add REST api listener
+* Retrieve more detailed error information on connection fails
+* Normalize response data
+* Fix automatic settings checkin
+* Prevent disconnect on timeout errors
+_Release Date - Monday, July 28, 2025_
 = 3.1.12 =

logtivity/trunk/views/_logs-loop.php

-                      r3272661
+                      r3335490
 /**
+ * @var string   $fileName
+ * @var ?string  $message
  * @var object[] $logs
+ * @var ?string  $hasNextPage
+ * @var object   $meta
+ * @var string   $hasNextPage
  */

Plugin Directory

Context Navigation

Legend:

logtivity/tags/3.2.0/Admin/Logtivity_Log_Index_Controller.php

logtivity/tags/3.2.0/Admin/Logtivity_Options.php

logtivity/tags/3.2.0/Errors/Logtivity_Error_Logger.php

logtivity/tags/3.2.0/Helpers/Helpers.php

logtivity/tags/3.2.0/Helpers/Logtivity_Log_Global_Function.php

logtivity/tags/3.2.0/Logs/Core/Logtivity_Core.php

logtivity/tags/3.2.0/Logs/Core/Logtivity_User.php

logtivity/tags/3.2.0/Logs/Memberpress/Logtivity_Memberpress.php

logtivity/tags/3.2.0/Services/Logtivity_Api.php

logtivity/tags/3.2.0/Services/Logtivity_Check_For_Disabled_Individual_Logs.php

logtivity/tags/3.2.0/Services/Logtivity_Check_For_New_Settings.php

logtivity/tags/3.2.0/Services/Logtivity_Logger.php

logtivity/tags/3.2.0/assets/app.js

logtivity/tags/3.2.0/composer.json

logtivity/tags/3.2.0/logtivity.php

logtivity/tags/3.2.0/readme.txt

logtivity/tags/3.2.0/views/_logs-loop.php

logtivity/trunk/Admin/Logtivity_Log_Index_Controller.php

logtivity/trunk/Admin/Logtivity_Options.php

logtivity/trunk/Errors/Logtivity_Error_Logger.php

logtivity/trunk/Helpers/Helpers.php

logtivity/trunk/Helpers/Logtivity_Log_Global_Function.php

logtivity/trunk/Logs/Core/Logtivity_Core.php

logtivity/trunk/Logs/Core/Logtivity_User.php

logtivity/trunk/Logs/Memberpress/Logtivity_Memberpress.php

logtivity/trunk/Services/Logtivity_Api.php

logtivity/trunk/Services/Logtivity_Check_For_Disabled_Individual_Logs.php

logtivity/trunk/Services/Logtivity_Check_For_New_Settings.php

logtivity/trunk/Services/Logtivity_Logger.php

logtivity/trunk/assets/app.js

logtivity/trunk/composer.json

logtivity/trunk/logtivity.php

logtivity/trunk/readme.txt

logtivity/trunk/views/_logs-loop.php

Download in other formats: