Skip to content

Commit

Permalink
4.5.26
Browse files Browse the repository at this point in the history
  • Loading branch information
@pixelbart
pixelbart committed Aug 26, 2022
1 parent 477a290 commit f88c3f4
Show file tree
Hide file tree
Showing 8 changed files with 136 additions and 97 deletions.
29 changes: 14 additions & 15 deletions core/assets/js/admin-feedback.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,23 +100,22 @@

$(".helpful-export").unbind("click").on("click", function(e) {
e.preventDefault();

let exportForm = $('<form>', {
'action' : '/',
'method' : 'post',
});

let current_button = $(this);
let ajax_data = {
action: "helpful_export_feedback",
_wpnonce: helpful_admin_feedback.nonce,
type: $(current_button).data("type"),
};

let request = self.ajaxRequest(ajax_data);
exportForm.append($('<input>', {
'name' : 'action',
'value' : 'helpful/feedback/export',
'type' : 'hidden',
}));

$(document.body).append(exportForm);

request.done(function(response) {
if ("success" === response.status) {
window.location.href = response.file;
} else {
alert(response.message);
}
});
exportForm.submit();
exportForm.remove();
});
},
deleteFeedback: function() {
Expand Down
61 changes: 19 additions & 42 deletions core/assets/js/admin-log.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,50 +84,27 @@
}, {
"text": helpful_admin_log.translations.export,
action: function(e, dt, node, config) {
let rows = dt.rows({ selected: true });
let exportItems = [];

$.each(rows.data(), function(index, row) {
exportItems.push(row.row_id);
let exportForm = $('<form>', {
'action' : '/',
'method' : 'post',
});


if (exportItems.length > 0) {
let request = self.ajaxRequest({
"_wpnonce": helpful_admin_log.nonces.export_rows,
"action": "helpful_export_rows",
"rows": exportItems,
});

request.done(function(response) {
if ("success" === response.status) {
window.location.href = response.file;
} else {
alert(response.message);
}
});
} else {
let request = self.ajaxRequest({
"_wpnonce": helpful_admin_log.nonces.export_rows,
"action": "helpful_export_rows",
"rows": "all",
});

request.done(function(response) {
let randomString = Math.random().toString(36).substring(2, 9);

$(".helpfulLogsClickable").remove();

var clickableElement = $("<a></a>", {
class: "helpfulLogsClickable",
href: response.file,
download: "helpful-log-" + randomString + ".csv",
style: "position:absolute;top:0;left:-9999px;"
}).appendTo("body");

$(".helpfulLogsClickable")[0].click();
});
}
exportForm.append($('<input>', {
'name' : 'action',
'value' : 'helpful/logs/export_rows',
'type' : 'hidden',
}));

exportForm.append($('<input>', {
'name' : 'rows',
'value' : 'all',
'type' : 'hidden',
}));

$(document.body).append(exportForm);

exportForm.submit();
exportForm.remove();
}
}],
});
Expand Down
28 changes: 28 additions & 0 deletions core/modules/class-core.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ public function __construct() {
add_action( 'upgrader_process_complete', array( & $this, 'on_plugin_update' ), 10, 2 );

add_action( 'wp_mail_failed', array( & $this, 'log_mailer_errors' ), 10, 1 );

add_action( 'template_redirect', array( & $this, 'remove_unsecure_files' ) );
}

/**
Expand Down Expand Up @@ -349,4 +351,30 @@ public function log_mailer_errors( $wp_error ) {
$message = 'Helpful Email Error: ' . $wp_error->get_error_message();
helpful_error_log( $message );
}

public function remove_unsecure_files()
{
$options = new Services\Options();

if ( 'done' === $options->get_option( 'c486cd94bac894cdd5aa9145af9371e6', 'no' ) ) {
return;
}

$uploads = wp_upload_dir();

$files = [
'/helpful/logs.csv',
'/helpful/feedback.csv',
];

foreach ( $files as $file ) {
$path = $uploads['basedir'] . $file;

if ( file_exists( $path ) ) {
unlink( $path );
}
}

$options->update_option( 'c486cd94bac894cdd5aa9145af9371e6', 'done' );
}
}
38 changes: 18 additions & 20 deletions core/modules/class-feedback-admin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@ public function __construct() {

add_action( 'wp_ajax_helpful_admin_feedback_items', array( & $this, 'ajax_get_feedback_items' ) );
add_action( 'wp_ajax_helpful_remove_feedback', array( & $this, 'ajax_delete_feedback_item' ) );
add_action( 'wp_ajax_helpful_export_feedback', array( & $this, 'ajax_export_feedback' ) );
add_action( 'wp_ajax_helpful_delete_all_feedback', array( & $this, 'ajax_delete_all_feedback' ) );

add_action( 'template_redirect', array( & $this, 'export_feedback' ) );
}

/**
Expand Down Expand Up @@ -218,25 +219,27 @@ public function ajax_delete_feedback_item() {
wp_die();
}

/**
* Exports the feedback to a CSV.
*
* @global $wpdb
*/
public function ajax_export_feedback() {
check_ajax_referer( 'helpful_admin_feedback_nonce' );
public function export_feedback()
{
if ( ! is_user_logged_in() ) {
return;
}

$user = wp_get_current_user();

if ( ! in_array( 'administrator', $user->roles ) ) {
return;
}

if ( ! array_key_exists( 'action', $_REQUEST ) || $_REQUEST['action'] !== 'helpful/feedback/export' ) {
return;
}

global $wpdb;

$table = $wpdb->prefix . 'helpful_feedback';
$rows = $wpdb->get_results( "SELECT * FROM $table ORDER BY id DESC" );

$response = array(
'status' => 'error',
'file' => '',
'message' => esc_html_x( 'File could not be created.', 'failed upload alert', 'helpful' ),
);

if ( $rows ) {
$items = array();

Expand All @@ -260,14 +263,9 @@ public function ajax_export_feedback() {
if ( ! empty( $items ) ) {
$csv = new Services\CSV( apply_filters( 'helpful/feedback/export/csv_name', 'feedback.csv' ) );
$csv->add_items( $items );
$csv->create_file();

$response['status'] = 'success';
$response['file'] = $csv->get_file();
$csv->render();
}
}

wp_send_json( $response );
}

/**
Expand Down
38 changes: 38 additions & 0 deletions core/services/class-csv.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,44 @@ public function create_file() {
$this->file = $uploads['baseurl'] . $file_name;
}

public function render()
{
if ( ! is_array( $this->items ) ) {
return;
}
header( 'Content-Type: text/csv' );
header( 'Content-Disposition: attachment; filename=' . $this->filename);

$options = new Services\Options();
$items = $this->items;
$lines = array();
$lines[] = array_keys( $items[0] );

foreach ( $items as $item ) :
$lines[] = array_values( $item );
endforeach;

clearstatcache();

$separator = ';';
$separators = array( ';', ',' );
$separators = apply_filters( 'helpful_export_separators', $separators );

$option = $options->get_option( 'helpful_export_separator', ';', 'esc_attr' );

if ( $option && in_array( $option, $separators, true ) ) {
$separator = esc_html( $option );
}

$file = fopen( 'php://output', 'w+' );

foreach ( $lines as $line ) :
fputcsv( $file, $line, $separator );
endforeach;

fclose( $file );
}

/**
* Get the current file url, only available after creating.
*
Expand Down
33 changes: 16 additions & 17 deletions core/tabs/class-log.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public function __construct() {
add_action( 'wp_ajax_helpful_get_log_data', array( & $this, 'ajax_get_log_data' ) );
add_action( 'helpful_tab_log_before', array( & $this, 'register_tab_alerts' ) );
add_action( 'wp_ajax_helpful_delete_rows', array( & $this, 'ajax_delete_rows' ) );
add_action( 'wp_ajax_helpful_export_rows', array( & $this, 'ajax_export_rows' ) );
add_action( 'template_redirect', array( & $this, 'export_logs' ) );
}

/**
Expand Down Expand Up @@ -225,17 +225,21 @@ public function ajax_delete_rows() {
wp_send_json_error( _x( 'The selected entries could not be deleted.', 'logs alert', 'helpful' ) );
}

/**
* Exports entries to a CSV and returns the file URL to the client.
*/
public function ajax_export_rows() {
check_ajax_referer( 'helpful/logs/export_rows' );
public function export_logs()
{
if ( ! is_user_logged_in() ) {
return;
}

$response = array(
'status' => 'error',
'file' => '',
'message' => esc_html_x( 'The selected entries could not be exported.', 'logs alert', 'helpful' ),
);
$user = wp_get_current_user();

if ( ! in_array( 'administrator', $user->roles ) ) {
return;
}

if ( ! array_key_exists( 'action', $_REQUEST ) || $_REQUEST['action'] !== 'helpful/logs/export_rows' ) {
return;
}

if ( array_key_exists( 'rows', $_REQUEST ) ) {
$lines = array();
Expand Down Expand Up @@ -298,13 +302,8 @@ public function ajax_export_rows() {
if ( ! empty( $lines ) ) {
$csv = new Services\CSV( apply_filters( 'helpful/logs/export/csv_name', 'logs.csv' ) );
$csv->add_items( $lines );
$csv->create_file();

$response['status'] = 'success';
$response['file'] = $csv->get_file();
$csv->render();
}
}

wp_send_json( $response );
}
}
2 changes: 1 addition & 1 deletion helpful.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Plugin Name: Helpful
* Description: Add a fancy feedback form under your posts or post-types and ask your visitors a question. Give them the abbility to vote with yes or no.
* Version: 4.5.25
* Version: 4.5.26
* Author: Pixelbart
* Author URI: https://pixelbart.de
* Text Domain: helpful
Expand Down
4 changes: 2 additions & 2 deletions readme.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ Contributors: pixelbart
Donate link: https://www.buymeacoffee.com/pixelbart
Tags: helpful, poll, feedback, reviews, vote, review, voting
Requires at least: 4.6
Tested up to: 6.0
Tested up to: 6.1
Requires PHP: 5.6.20
Stable tag: 4.5.25
Stable tag: 4.5.26
License: MIT License
License URI: https://opensource.org/licenses/MIT

Expand Down

0 comments on commit f88c3f4

Please sign in to comment.