| @@ -1,5 +1,5 @@ | ||
| 1 | -<?php if (!defined('WPO_VERSION')) die('No direct access allowed'); ?> | |
| 1 | +<?php if (!defined('ABSPATH')) die('No direct access allowed'); ?> | |
| 2 | 2 | <div id="wpo_logging_settings"> |
| 3 | 3 | <h3><?php esc_html_e('Logging settings', 'wp-optimize'); ?></h3> |
| 4 | 4 | |
| 5 | 5 | <div id="wp-optimize-logger-settings" class="wpo-fieldgroup"> |
| @@ -7,14 +7,14 @@ | ||
| 7 | 7 | <a href="#" id="wpo_add_logger_link" class="wpo-repeater__add"><span class="dashicons dashicons-plus"></span> <?php esc_html_e('Add logging destination', 'wp-optimize'); ?></a> |
| 8 | 8 | |
| 9 | 9 | </p> |
| 10 | 10 | |
| 11 | - <div class="save_settings_reminder"><?php esc_html_e('Remember to save your settings so that your changes take effect.', 'wp-optimize');?></div> | |
| 11 | + <div class="save_settings_reminder"><?php esc_html_e('Remember to save your settings so that your changes take effect.', 'wp-optimize'); ?></div> | |
| 12 | 12 | |
| 13 | 13 | <?php |
| 14 | - | |
| 15 | - $loggers = $wp_optimize->wpo_loggers(); | |
| 16 | 14 | |
| 15 | + $loggers = $loggers_data['existing_loggers']; | |
| 16 | + | |
| 17 | 17 | if (count($loggers) > 0) { |
| 18 | 18 | |
| 19 | 19 | ?> |
| 20 | 20 | <div id="wp-optimize-logging-options"> |
| @@ -26,23 +26,19 @@ | ||
| 26 | 26 | </div> |
| 27 | 27 | <?php |
| 28 | 28 | |
| 29 | 29 | foreach ($loggers as $logger) { |
| 30 | - $logger_id = strtolower(get_class($logger)); | |
| 30 | + $logger_id = $logger['id']; | |
| 31 | 31 | |
| 32 | - ?> | |
| 32 | + ?> | |
| 33 | 33 | |
| 34 | 34 | <div class="wpo_logging_row" data-id="<?php echo esc_attr($logger_id); ?>"> |
| 35 | 35 | <div class="wpo_logging_logger_row"><span |
| 36 | - class="dashicons dashicons-arrow-right"></span><?php echo esc_html($logger->get_description()); ?> | |
| 36 | + class="dashicons dashicons-arrow-right"></span><?php echo esc_html($logger['description']); ?> | |
| 37 | 37 | </div> |
| 38 | - <div class="wpo_logging_options_row"><?php echo esc_html($logger->get_options_text()); ?></div> | |
| 39 | - <?php | |
| 40 | - $status = ''; | |
| 41 | - $status = ($logger->is_enabled() && $logger->is_available()) ? 'active' : 'inactive'; | |
| 42 | - $status_text = ($logger->is_enabled() && $logger->is_available()) ? __('Active', 'wp-optimize') : __('Inactive', 'wp-optimize'); | |
| 43 | - ?> | |
| 44 | - <div class="wpo_logging_status_row <?php echo esc_attr($status); ?>"><?php echo esc_html($status_text); ?></div> | |
| 38 | + <div class="wpo_logging_options_row"><?php echo esc_html($logger['options_text']); ?></div> | |
| 39 | + | |
| 40 | + <div class="wpo_logging_status_row <?php echo esc_attr($logger['status']); ?>"><?php echo esc_html($logger['status_text']); ?></div> | |
| 45 | 41 | |
| 46 | 42 | <div class="wpo_logging_actions_row"> |
| 47 | 43 | <span class="wpo_edit_logger" title="<?php esc_attr_e('Edit', 'wp-optimize'); ?>"><?php esc_html_e('Edit', 'wp-optimize'); ?></span> |
| 48 | 44 | <span class="wpo_delete_logger" title="<?php esc_attr_e('Delete', 'wp-optimize'); ?>"><?php esc_html_e('Delete', 'wp-optimize'); ?></span> |
| @@ -54,51 +50,42 @@ | ||
| 54 | 50 | </div> |
| 55 | 51 | |
| 56 | 52 | <div class="wpo_additional_logger_options wpo_hidden"> |
| 57 | 53 | <input class="wpo_hidden" type="hidden" name="wpo-logger-type[]" |
| 58 | - value="<?php echo esc_attr($logger_id); ?>"/> | |
| 59 | - | |
| 54 | + value="<?php echo esc_attr($logger_id); ?>" /> | |
| 55 | + | |
| 60 | 56 | <?php |
| 61 | - $options_list = $logger->get_options_list(); | |
| 62 | - $options_values = $logger->get_options_values(); | |
| 57 | + $options_list = $logger['options_list']; | |
| 63 | 58 | |
| 64 | 59 | if (!empty($options_list)) { |
| 65 | - foreach ($options_list as $option_name => $placeholder) { | |
| 66 | - // check if settings item defined as array. | |
| 67 | - if (is_array($placeholder)) { | |
| 68 | - $validate = $placeholder[1]; | |
| 69 | - $placeholder = $placeholder[0]; | |
| 70 | - } else { | |
| 71 | - $validate = ''; | |
| 72 | - } | |
| 60 | + foreach ($options_list as $option) { | |
| 73 | 61 | |
| 74 | - $data_validate_attr = ('' !== $validate ? 'data-validate="'.esc_attr($validate).'"' : ''); | |
| 75 | - | |
| 76 | - ?> | |
| 62 | + ?> | |
| 77 | 63 | <input class="wpo_logger_addition_option" type="text" |
| 78 | - name="wpo-logger-options[<?php echo esc_attr($option_name); ?>][]" | |
| 79 | - value="<?php echo esc_attr($options_values[$option_name]); ?>" | |
| 80 | - placeholder="<?php echo esc_attr($placeholder); ?>" | |
| 81 | - <?php echo $data_validate_attr; ?> "/> | |
| 64 | + name="wpo-logger-options[<?php echo esc_attr($option['name']); ?>][]" | |
| 65 | + value="<?php echo esc_attr($option['value']); ?>" | |
| 66 | + placeholder="<?php echo esc_attr($option['placeholder']); ?>" | |
| 67 | + <?php echo $option['data_validate_attr']; // phpcs:ignore WordPress.Security.EscapeOutput -- Output is already escaped | |
| 68 | + ?>/> | |
| 82 | 69 | <?php |
| 83 | 70 | } |
| 84 | 71 | } |
| 85 | - ?> | |
| 72 | + ?> | |
| 86 | 73 | <label> |
| 87 | - <input class="wpo_logger_active_checkbox" | |
| 88 | - type="checkbox" <?php checked($logger->is_enabled() && $logger->is_available()); ?> <?php disabled($logger->is_available(), false); ?>> | |
| 89 | - <input type="hidden" name="wpo-logger-options[active][]" | |
| 90 | - value="<?php echo $logger->is_enabled() ? '1' : '0'; ?>"/> | |
| 91 | - <?php esc_html_e('Active', 'wp-optimize'); ?> | |
| 92 | - </label> | |
| 74 | + <input class=" wpo_logger_active_checkbox" | |
| 75 | + type="checkbox" <?php checked($logger['is_enabled'] && $logger['is_available']); ?> <?php disabled($logger['is_available'], false); ?>> | |
| 76 | + <input type="hidden" name="wpo-logger-options[active][]" | |
| 77 | + value="<?php echo $logger['is_enabled'] ? '1' : '0'; ?>" /> | |
| 78 | + <?php esc_html_e('Active', 'wp-optimize'); ?> | |
| 79 | + </label> | |
| 93 | 80 | </div> |
| 94 | 81 | |
| 95 | 82 | </div> |
| 96 | - <?php | |
| 83 | + <?php | |
| 97 | 84 | } |
| 98 | 85 | ?> |
| 99 | - </div><!-- End #wp-optimize-logging-options --> | |
| 100 | - <?php | |
| 86 | + </div><!-- End #wp-optimize-logging-options --> | |
| 87 | + <?php | |
| 101 | 88 | } |
| 102 | - ?> | |
| 89 | + ?> | |
| 103 | 90 | </div><!-- End #wp-optimize-logger-settings --> |
| 104 | 91 | </div> |