fix: some ui issues and removed unnecessary fields. gh action updated

Author: abdul-kaioum

.github/workflows/deploy.yml

@@ -97,7 +97,6 @@ jobs:
           SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
           BUILD_DIR: '${{ github.workspace }}/build/${{ env.PLUGIN_SLUG }}'
           SLUG: ${{ env.PLUGIN_SLUG }}
-          ASSETS_DIR: '${{ github.workspace }}/svn-assets'
 
       - name: Upload release asset
         if: steps.build-plugin.outputs.free_exists == 'true'

.gitignore

@@ -1,8 +1,8 @@
 vendor/
 assets/
 languages/
-node_modules
-dist
+node_modules/
+dist/
 frontend/yarn-error.log
 frontend/coverage/*
 frontend/src/coverage/*
@@ -17,4 +17,5 @@ eslint-cache/
 locale.pot
 .vscode/settings.json
 package-lock.json
-port
+port
+build/

backend/app/Config.php

@@ -210,7 +210,7 @@ private static function pluginPageLinks()
     {
         return [
             'Home' => [
-                'title' => __('Home', 'bit-smtp'),
+                'title' => __('Settings', 'bit-smtp'),
                 'url'   => self::get('ADMIN_URL') . 'admin.php?page=' . self::SLUG,
             ]
         ];

backend/app/HTTP/Services/LogService.php

@@ -18,11 +18,7 @@ class LogService
     public function __construct()
     {
         if (\defined('DOING_CRON') && DOING_CRON) {
-            $currentTime  = time();
-            $logDeletedAt = Config::getOption('log_deleted_at', ($currentTime - (DAY_IN_SECONDS * 30)));
-            if ((abs($logDeletedAt - $currentTime) / DAY_IN_SECONDS) > 30) {
-                $this->deleteOlder();
-            }
+            $this->maybeDeleteOlder();
         }
     }
 
@@ -84,7 +80,6 @@ public function save($status, $details, $message = null)
 
         $log->subject      = Arr::get($details, 'subject', '');
         $log->to_addr      = Arr::get($details, 'to', '');
-        $log->from_addr    = Arr::get($details, 'from', '');
 
         unset($details['subject'], $details['to'], $details['from'], $details['phpmailer_exception_code']);
         $log->details    = $details;
@@ -109,7 +104,6 @@ public function update($id, $status, $details, $message = null)
         // Don't need to update these fields again....
             $log->subject     = Arr::get($details, 'subject', '');
             $log->to_addr    = Arr::get($details, 'to', '');
-            $log->from_addr    = Arr::get($details, 'from', '');
 
             unset($details['subject'], $details['to'], $details['from'], $details['phpmailer_exception_code']);
             $log->details    = $details;
@@ -124,6 +118,15 @@ public function delete(array $ids)
         return Connection::prop('last_error') ? false : true;
     }
 
+    public function maybeDeleteOlder()
+    {
+        $currentTime  = time();
+        $logDeletedAt = Config::getOption('log_deleted_at', ($currentTime - (DAY_IN_SECONDS * 30)));
+        if ((abs($logDeletedAt - $currentTime) / DAY_IN_SECONDS) > 30) {
+            $this->deleteOlder();
+        }
+    }
+
     public function deleteOlder()
     {
         $logRetention = Config::getOption('log_retention', 30);
@@ -161,7 +164,7 @@ public function updateRetention($days)
      */
     public function isEnabled()
     {
-        return (bool) Config::getOption('logging_enabled', false);
+        return (bool) Config::getOption('logging_enabled', true);
     }
 
     /**
@@ -189,6 +192,12 @@ public function bulkInsert(array $logs)
             return false;
         }
 
+        /**
+         * This is fallback to delete older log. as we only invoke deleteOlder in cron,
+         * site may not have working cron.
+         */
+        $this->maybeDeleteOlder();
+
         $records = [];
         foreach ($logs as $log) {
             if (!isset($log['status']) || !isset($log['data'])) {
@@ -209,7 +218,6 @@ public function bulkInsert(array $logs)
 
             $record['subject']   = Arr::get($details, 'subject', '');
             $record['to_addr']   = wp_json_encode(Arr::get($details, 'to', []));
-            $record['from_addr'] = Arr::get($details, 'from', '');
 
             unset(
                 $details['subject'],

backend/app/Model/Log.php

@@ -10,7 +10,6 @@
  * @property int    $status
  * @property string $subject
  * @property array  $to_addr
- * @property string $from_addr
  * @property array  $details
  * @property array  $debug_info
  * @property int    $retry_count
@@ -27,7 +26,6 @@ class Log extends Model
         'status'          => 'int',
         'subject'         => 'string',
         'to_addr'         => 'array',
-        'from_addr'       => 'string',
         'details'         => 'array',
         'debug_info'      => 'array',
         'retry_count'     => 'int',

backend/app/Providers/HookProvider.php

@@ -19,6 +19,7 @@ public function __construct()
         $this->loadAppHooks();
         Hooks::addAction('rest_api_init', [$this, 'loadApi']);
         Hooks::addFilter(Config::VAR_PREFIX . 'telemetry_additional_data', [new TelemetryPopupController(), 'filterTrackingData']);
+        Hooks::addFilter(Config::withPrefix('deactivate_reasons'), [$this, 'deactivateReasons']);
     }
 
     /**
@@ -37,6 +38,15 @@ public function loadApi()
         }
     }
 
+    public function deactivateReasons($reasons)
+    {
+        if (isset($reasons[Config::withPrefix('pro')])) {
+            unset($reasons[Config::withPrefix('pro')]);
+        }
+
+        return $reasons;
+    }
+
     /**
      * Helps to register App hooks.
      */

backend/db/Migrations/BitSmtpLogsTableMigration.php

@@ -21,7 +21,6 @@ function (Blueprint $table) {
                 $table->tinyint('status');
                 $table->longtext('subject');
                 $table->varchar('to_addr', 320);
-                $table->varchar('from_addr', 320)->nullable();
                 $table->longtext('details')->nullable();
                 $table->text('debug_info')->nullable();
                 $table->tinyint('retry_count')->defaultValue(0);

bit_smtp.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Plugin Name: BIT SMTP
+ * Plugin Name: Bit SMTP
  * Plugin URI:  https://www.bitapps.pro/bit-smtp
  * Description: Send email via SMTP using BIT SMTP plugin by Bit Apps
  * Version:     1.2