Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .7zignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
node_modules/
cleantalk_backups/
backups/
tests/
spec/
vendor/
js/src
css/src
package.json
package-lock.json
gulpfile.js
README.md
LICENSE
psalm.xml
composer.json
composer.lock
webpack.config.js
.*
60 changes: 39 additions & 21 deletions .github/workflows/dev-fix-zip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,26 +23,40 @@ jobs:
- name: Set plugin name
run: echo "PLUGIN_NAME=security-malware-firewall" >> $GITHUB_ENV

- name: Create .7zignore
- name: Check if .7zignore exists
id: check_ignore
run: |
echo "node_modules/" > .7zignore
echo "cleantalk_backups/" > .7zignore
echo "backups/" > .7zignore
echo "package.json" >> .7zignore
echo "package-lock.json" >> .7zignore
echo "gulpfile.js" >> .7zignore
echo "tests/" >> .7zignore
echo "spec/" >> .7zignore
echo "README.md" >> .7zignore
echo "LICENSE" >> .7zignore
echo "psalm.xml" >> .7zignore
echo "composer.json" >> .7zignore
echo "composer.lock" >> .7zignore
echo "vendor/" >> .7zignore
echo "js/src" >> .7zignore
echo "css/src" >> .7zignore
echo ".*" >> .7zignore
echo "webpack.config.js" >> .7zignore
if [ -f ".7zignore" ]; then
echo "Using existing .7zignore file"
echo "ignore_exists=true" >> $GITHUB_OUTPUT
else
echo "::warning::.7zignore file not found, creating default one"
echo "ignore_exists=false" >> $GITHUB_OUTPUT
fi

- name: Create default .7zignore if missing
if: steps.check_ignore.outputs.ignore_exists == 'false'
run: |
cat > .7zignore << EOF
node_modules/
cleantalk_backups/
backups/
package.json
package-lock.json
gulpfile.js
tests/
spec/
README.md
LICENSE
psalm.xml
composer.json
composer.lock
vendor/
js/src
css/src
.*
webpack.config.js
EOF

- name: Create ZIP archive with 7z
run: 7z a -tzip "${PLUGIN_NAME}.zip" . [email protected]
Expand All @@ -52,7 +66,7 @@ jobs:
with:
tag_name: ${{ github.ref_name }}-version
name: ${{ github.ref_name }} version
body: "Prebuil version from ${{ github.ref_name }} branch"
body: "Prebuilt version from ${{ github.ref_name }} branch"
draft: false
prerelease: true
files: |
Expand All @@ -62,4 +76,8 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Clean up
run: rm -f "${PLUGIN_NAME}.zip" .7zignore
run: |
rm -f "${PLUGIN_NAME}.zip"
if [ "${{ steps.check_ignore.outputs.ignore_exists }}" = "false" ]; then
rm -f .7zignore
fi
2 changes: 1 addition & 1 deletion css/spbc-settings.min.css

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions css/src/spbc-settings.css
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,6 @@ div.pagination{

/* Log button */
.spbc__wrapper--center{margin: 10px 0 10px 0; text-align: center;}
.spbc__show_more_logs{display: none;}
#spbc_show_more_button{}

/* Settings banners */
.spbc_settings_banner{
Expand Down
6 changes: 5 additions & 1 deletion inc/spbc-admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use CleantalkSP\SpbctWP\Escape;
use CleantalkSP\SpbctWP\Scanner\DBTrigger\DBTriggerService;
use CleantalkSP\SpbctWP\VulnerabilityAlarm\Dto\PluginReport;
use CleantalkSP\SpbctWP\Firewall\View as FirewallView;
use CleantalkSP\SpbctWP\VulnerabilityAlarm\Dto\ThemeReport;
use CleantalkSP\SpbctWP\VulnerabilityAlarm\VulnerabilityAlarmService;
use CleantalkSP\Variables\Post;
Expand Down Expand Up @@ -83,7 +84,7 @@ function spbc_admin_init()
// Logs
add_action('wp_ajax_spbc_show_more_security_logs', 'spbc_show_more_security_logs_callback');
add_action('wp_ajax_spbc_show_hostname_security_logs', 'spbc_show_hostname_security_logs_callback');
add_action('wp_ajax_spbc_show_more_security_firewall_logs', 'spbc_show_more_security_firewall_logs_callback');
add_action('wp_ajax_spbc_show_more_security_firewall_logs', [FirewallView::class, 'showMoreFirewallLogs']);
add_action('wp_ajax_spbc_tc__filter_ip', 'spbc_tc__filter_ip');

// Scanner
Expand Down Expand Up @@ -222,6 +223,9 @@ function spbct_get_tab_data()
case 'fswatcher':
wp_send_json(\CleantalkSP\SpbctWP\FSWatcher\View\View::getReactData($data));
break;
case 'traffic_control':
wp_send_json(FirewallView::getReactData($data));
break;
default:
wp_send_json_error('Unknown tab');
}
Expand Down
Loading