| @@ -1,5 +1,6 @@ | ||
| 1 | 1 | <?php |
| 2 | + | |
| 2 | 3 | // +----------------------------------------------------------------------+ |
| 3 | 4 | // | Copyright 2013 Madpixels (email : visualizer@madpixels.net) | |
| 4 | 5 | // +----------------------------------------------------------------------+ |
| 5 | 6 | // | This program is free software; you can redistribute it and/or modify | |
| @@ -17,8 +18,9 @@ | ||
| 17 | 18 | // | MA 02110-1301 USA | |
| 18 | 19 | // +----------------------------------------------------------------------+ |
| 19 | 20 | // | Author: Eugene Manuilov <eugene@manuilov.org> | |
| 20 | 21 | // +----------------------------------------------------------------------+ |
| 22 | + | |
| 21 | 23 | /** |
| 22 | 24 | * The module for all stuff related to getting, editing, creating and deleting charts. |
| 23 | 25 | * |
| 24 | 26 | * @category Visualizer |
| @@ -45,13 +47,13 @@ | ||
| 45 | 47 | * |
| 46 | 48 | * @since 1.0.0 |
| 47 | 49 | * |
| 48 | 50 | * @access public |
| 49 | - * | |
| 50 | 51 | * @param Visualizer_Plugin $plugin The instance of the plugin. |
| 51 | 52 | */ |
| 52 | 53 | public function __construct( Visualizer_Plugin $plugin ) { |
| 53 | 54 | parent::__construct( $plugin ); |
| 55 | + | |
| 54 | 56 | $this->_addAjaxAction( Visualizer_Plugin::ACTION_GET_CHARTS, 'getCharts' ); |
| 55 | 57 | $this->_addAjaxAction( Visualizer_Plugin::ACTION_DELETE_CHART, 'deleteChart' ); |
| 56 | 58 | $this->_addAjaxAction( Visualizer_Plugin::ACTION_CREATE_CHART, 'renderChartPages' ); |
| 57 | 59 | $this->_addAjaxAction( Visualizer_Plugin::ACTION_EDIT_CHART, 'renderChartPages' ); |
| @@ -56,63 +58,24 @@ | ||
| 56 | 58 | $this->_addAjaxAction( Visualizer_Plugin::ACTION_CREATE_CHART, 'renderChartPages' ); |
| 57 | 59 | $this->_addAjaxAction( Visualizer_Plugin::ACTION_EDIT_CHART, 'renderChartPages' ); |
| 58 | 60 | $this->_addAjaxAction( Visualizer_Plugin::ACTION_UPLOAD_DATA, 'uploadData' ); |
| 59 | 61 | $this->_addAjaxAction( Visualizer_Plugin::ACTION_CLONE_CHART, 'cloneChart' ); |
| 60 | - // Added by Ash/Upwork | |
| 61 | - $this->_addAjaxAction( Visualizer_Plugin::ACTION_EXPORT_DATA, 'exportData' ); | |
| 62 | - // Added by Ash/Upwork | |
| 63 | 62 | } |
| 64 | 63 | |
| 65 | 64 | /** |
| 66 | - * Fetches charts from database. | |
| 65 | + * Sends json response. | |
| 67 | 66 | * |
| 68 | 67 | * @since 1.0.0 |
| 69 | 68 | * |
| 70 | - * @access public | |
| 69 | + * @access private | |
| 70 | + * @param array $results The response array. | |
| 71 | 71 | */ |
| 72 | - public function getCharts() { | |
| 73 | - $query_args = array( | |
| 74 | - 'post_type' => Visualizer_Plugin::CPT_VISUALIZER, | |
| 75 | - 'posts_per_page' => 9, | |
| 76 | - 'paged' => filter_input( | |
| 77 | - INPUT_GET, 'page', FILTER_VALIDATE_INT, array( | |
| 78 | - 'options' => array( | |
| 79 | - 'min_range' => 1, | |
| 80 | - 'default' => 1, | |
| 81 | - ), | |
| 82 | - ) | |
| 83 | - ), | |
| 84 | - ); | |
| 85 | - $filter = filter_input( INPUT_GET, 's', FILTER_SANITIZE_STRING ); | |
| 86 | - if ( empty( $filter ) ) { | |
| 87 | - // 'filter' is from the modal from the add media button. | |
| 88 | - $filter = filter_input( INPUT_GET, 'filter', FILTER_SANITIZE_STRING ); | |
| 89 | - } | |
| 72 | + private function _sendResponse( $results ) { | |
| 73 | + header( 'Content-type: application/json' ); | |
| 74 | + nocache_headers(); | |
| 90 | 75 | |
| 91 | - if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) { | |
| 92 | - $query_args['meta_query'] = array( | |
| 93 | - array( | |
| 94 | - 'key' => Visualizer_Plugin::CF_CHART_TYPE, | |
| 95 | - 'value' => $filter, | |
| 96 | - 'compare' => '=', | |
| 97 | - ), | |
| 98 | - ); | |
| 99 | - } | |
| 100 | - $query = new WP_Query( $query_args ); | |
| 101 | - $charts = array(); | |
| 102 | - while ( $query->have_posts() ) { | |
| 103 | - $chart = $query->next_post(); | |
| 104 | - $chart_data = $this->_getChartArray( $chart ); | |
| 105 | - $chart_data['id'] = $chart->ID; | |
| 106 | - $charts[] = $chart_data; | |
| 107 | - } | |
| 108 | - self::_sendResponse( | |
| 109 | - array( | |
| 110 | - 'success' => true, | |
| 111 | - 'data' => $charts, | |
| 112 | - 'total' => $query->max_num_pages, | |
| 113 | - ) | |
| 114 | - ); | |
| 76 | + echo json_encode( $results ); | |
| 77 | + exit; | |
| 115 | 78 | } |
| 116 | 79 | |
| 117 | 80 | /** |
| 118 | 81 | * Returns chart data required for rendering. |
| @@ -119,11 +82,9 @@ | ||
| 119 | 82 | * |
| 120 | 83 | * @since 1.0.0 |
| 121 | 84 | * |
| 122 | 85 | * @access private |
| 123 | - * | |
| 124 | 86 | * @param WP_Post $chart The chart object. |
| 125 | - * | |
| 126 | 87 | * @return array The array of chart data. |
| 127 | 88 | */ |
| 128 | 89 | private function _getChartArray( WP_Post $chart = null ) { |
| 129 | 90 | if ( is_null( $chart ) ) { |
| @@ -128,34 +89,64 @@ | ||
| 128 | 89 | private function _getChartArray( WP_Post $chart = null ) { |
| 129 | 90 | if ( is_null( $chart ) ) { |
| 130 | 91 | $chart = $this->_chart; |
| 131 | 92 | } |
| 132 | - $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true ); | |
| 133 | - $series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type ); | |
| 134 | - $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( $chart->post_content ), $chart->ID, $type ); | |
| 135 | 93 | |
| 136 | 94 | return array( |
| 137 | - 'type' => $type, | |
| 138 | - 'series' => $series, | |
| 95 | + 'type' => get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true ), | |
| 96 | + 'series' => get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), | |
| 139 | 97 | 'settings' => get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true ), |
| 140 | - 'data' => $data, | |
| 98 | + 'data' => unserialize( $chart->post_content ), | |
| 141 | 99 | ); |
| 142 | 100 | } |
| 143 | 101 | |
| 144 | 102 | /** |
| 145 | - * Sends json response. | |
| 103 | + * Fetches charts from database. | |
| 146 | 104 | * |
| 147 | 105 | * @since 1.0.0 |
| 148 | 106 | * |
| 149 | - * @access private | |
| 150 | - * | |
| 151 | - * @param array $results The response array. | |
| 107 | + * @access public | |
| 152 | 108 | */ |
| 153 | - public static function _sendResponse( $results ) { | |
| 154 | - header( 'Content-type: application/json' ); | |
| 155 | - nocache_headers(); | |
| 156 | - echo json_encode( $results ); | |
| 157 | - defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit(); | |
| 109 | + public function getCharts() { | |
| 110 | + $query_args = array( | |
| 111 | + 'post_type' => Visualizer_Plugin::CPT_VISUALIZER, | |
| 112 | + 'posts_per_page' => 9, | |
| 113 | + 'paged' => filter_input( INPUT_GET, 'page', FILTER_VALIDATE_INT, array( | |
| 114 | + 'options' => array( | |
| 115 | + 'min_range' => 1, | |
| 116 | + 'default' => 1, | |
| 117 | + ) | |
| 118 | + ) ) | |
| 119 | + ); | |
| 120 | + | |
| 121 | + $filter = filter_input( INPUT_GET, 'filter' ); | |
| 122 | + if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) { | |
| 123 | + $query_args['meta_query'] = array( | |
| 124 | + array( | |
| 125 | + 'key' => Visualizer_Plugin::CF_CHART_TYPE, | |
| 126 | + 'value' => $filter, | |
| 127 | + 'compare' => '=', | |
| 128 | + ), | |
| 129 | + ); | |
| 130 | + } | |
| 131 | + | |
| 132 | + $query = new WP_Query( $query_args ); | |
| 133 | + | |
| 134 | + $charts = array(); | |
| 135 | + while( $query->have_posts() ) { | |
| 136 | + $chart = $query->next_post(); | |
| 137 | + | |
| 138 | + $chart_data = $this->_getChartArray( $chart ); | |
| 139 | + $chart_data['id'] = $chart->ID; | |
| 140 | + | |
| 141 | + $charts[] = $chart_data; | |
| 142 | + } | |
| 143 | + | |
| 144 | + $this->_sendResponse( array( | |
| 145 | + 'success' => true, | |
| 146 | + 'data' => $charts, | |
| 147 | + 'total' => $query->max_num_pages, | |
| 148 | + ) ); | |
| 158 | 149 | } |
| 159 | 150 | |
| 160 | 151 | /** |
| 161 | 152 | * Deletes a chart from database. |
| @@ -165,36 +156,30 @@ | ||
| 165 | 156 | * |
| 166 | 157 | * @access public |
| 167 | 158 | */ |
| 168 | 159 | public function deleteChart() { |
| 169 | - $is_post = $_SERVER['REQUEST_METHOD'] == 'POST'; | |
| 160 | + $is_post = $_SERVER['REQUEST_METHOD'] == 'POST'; | |
| 170 | 161 | $input_method = $is_post ? INPUT_POST : INPUT_GET; |
| 171 | - $chart_id = $success = false; | |
| 172 | - $nonce = wp_verify_nonce( filter_input( $input_method, 'nonce' ) ); | |
| 173 | - $capable = current_user_can( 'delete_posts' ); | |
| 162 | + | |
| 163 | + $chart_id = $success = false; | |
| 164 | + $nonce = Visualizer_Security::verifyNonce( filter_input( $input_method, 'nonce' ) ); | |
| 165 | + $capable = current_user_can( 'delete_posts' ); | |
| 174 | 166 | if ( $nonce && $capable ) { |
| 175 | - $chart_id = filter_input( | |
| 176 | - $input_method, 'chart', FILTER_VALIDATE_INT, array( | |
| 177 | - 'options' => array( | |
| 178 | - 'min_range' => 1, | |
| 179 | - ), | |
| 180 | - ) | |
| 181 | - ); | |
| 167 | + $chart_id = filter_input( $input_method, 'chart', FILTER_VALIDATE_INT, array( 'options' => array( 'min_range' => 1 ) ) ); | |
| 182 | 168 | if ( $chart_id ) { |
| 183 | - $chart = get_post( $chart_id ); | |
| 169 | + $chart = get_post( $chart_id ); | |
| 184 | 170 | $success = $chart && $chart->post_type == Visualizer_Plugin::CPT_VISUALIZER; |
| 185 | 171 | } |
| 186 | 172 | } |
| 173 | + | |
| 187 | 174 | if ( $success ) { |
| 188 | 175 | wp_delete_post( $chart_id, true ); |
| 189 | 176 | } |
| 177 | + | |
| 190 | 178 | if ( $is_post ) { |
| 191 | - self::_sendResponse( | |
| 192 | - array( | |
| 193 | - 'success' => $success, | |
| 194 | - ) | |
| 195 | - ); | |
| 179 | + $this->_sendResponse( array( 'success' => $success ) ); | |
| 196 | 180 | } |
| 181 | + | |
| 197 | 182 | wp_redirect( wp_get_referer() ); |
| 198 | 183 | exit; |
| 199 | 184 | } |
| 200 | 185 | |
| @@ -206,166 +191,60 @@ | ||
| 206 | 191 | * |
| 207 | 192 | * @access public |
| 208 | 193 | */ |
| 209 | 194 | public function renderChartPages() { |
| 210 | - defined( 'IFRAME_REQUEST' ) || define( 'IFRAME_REQUEST', 1 ); | |
| 211 | 195 | // check chart, if chart not exists, will create new one and redirects to the same page with proper chart id |
| 212 | - $chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : ''; | |
| 213 | - if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type != Visualizer_Plugin::CPT_VISUALIZER ) { | |
| 196 | + $chart_id = filter_input( INPUT_GET, 'chart', FILTER_VALIDATE_INT ); | |
| 197 | + if ( !$chart_id || !( $chart = get_post( $chart_id ) ) || $chart->post_type != Visualizer_Plugin::CPT_VISUALIZER ) { | |
| 214 | 198 | $default_type = 'line'; |
| 215 | - $source = new Visualizer_Source_Csv( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . $default_type . '.csv' ); | |
| 199 | + | |
| 200 | + $source = new Visualizer_Source_Csv( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . $default_type . '.csv' ); | |
| 216 | 201 | $source->fetch(); |
| 217 | - $chart_id = wp_insert_post( | |
| 218 | - array( | |
| 219 | - 'post_type' => Visualizer_Plugin::CPT_VISUALIZER, | |
| 220 | - 'post_title' => 'Visualization', | |
| 221 | - 'post_author' => get_current_user_id(), | |
| 222 | - 'post_status' => 'auto-draft', | |
| 223 | - 'post_content' => $source->getData(), | |
| 224 | - ) | |
| 225 | - ); | |
| 226 | - if ( $chart_id && ! is_wp_error( $chart_id ) ) { | |
| 202 | + | |
| 203 | + $chart_id = wp_insert_post( array( | |
| 204 | + 'post_type' => Visualizer_Plugin::CPT_VISUALIZER, | |
| 205 | + 'post_title' => 'Visualization', | |
| 206 | + 'post_author' => get_current_user_id(), | |
| 207 | + 'post_status' => 'auto-draft', | |
| 208 | + 'post_content' => $source->getData(), | |
| 209 | + ) ); | |
| 210 | + | |
| 211 | + if ( $chart_id && !is_wp_error( $chart_id ) ) { | |
| 227 | 212 | add_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, $default_type ); |
| 228 | 213 | add_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, 1 ); |
| 229 | 214 | add_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() ); |
| 230 | 215 | add_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() ); |
| 231 | - add_post_meta( | |
| 232 | - $chart_id, Visualizer_Plugin::CF_SETTINGS, array( | |
| 233 | - 'focusTarget' => 'datum', | |
| 234 | - ) | |
| 235 | - ); | |
| 236 | - do_action( 'visualizer_pro_new_chart_defaults', $chart_id ); | |
| 216 | + add_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS, array() ); | |
| 237 | 217 | } |
| 238 | - wp_redirect( add_query_arg( 'chart', (int) $chart_id ) ); | |
| 239 | - defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit(); | |
| 218 | + | |
| 219 | + wp_redirect( add_query_arg( 'chart', (int)$chart_id ) ); | |
| 220 | + exit; | |
| 240 | 221 | } |
| 222 | + | |
| 241 | 223 | // enqueue and register scripts and styles |
| 242 | - wp_register_script( 'visualizer-chosen', VISUALIZER_ABSURL . 'js/lib/chosen.jquery.min.js', array( 'jquery' ), Visualizer_Plugin::VERSION ); | |
| 243 | - wp_register_style( 'visualizer-chosen', VISUALIZER_ABSURL . 'css/lib/chosen.min.css', array(), Visualizer_Plugin::VERSION ); | |
| 224 | + wp_register_style( 'visualizer-frame', VISUALIZER_ABSURL . 'css/frame.css', array(), Visualizer_Plugin::VERSION ); | |
| 244 | 225 | |
| 245 | - wp_register_style( 'visualizer-frame', VISUALIZER_ABSURL . 'css/frame.css', array( 'visualizer-chosen' ), Visualizer_Plugin::VERSION ); | |
| 246 | - wp_register_script( 'visualizer-frame', VISUALIZER_ABSURL . 'js/frame.js', array( 'visualizer-chosen' ), Visualizer_Plugin::VERSION, true ); | |
| 247 | - wp_register_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true ); | |
| 248 | - wp_register_script( 'google-jsapi-old', '//www.google.com/jsapi', array( 'google-jsapi-new' ), null, true ); | |
| 249 | - wp_register_script( | |
| 250 | - 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array( | |
| 251 | - 'google-jsapi-old', | |
| 252 | - 'google-jsapi-new', | |
| 253 | - 'visualizer-frame', | |
| 254 | - ), Visualizer_Plugin::VERSION, true | |
| 255 | - ); | |
| 256 | - wp_register_script( | |
| 257 | - 'visualizer-preview', VISUALIZER_ABSURL . 'js/preview.js', array( | |
| 258 | - 'wp-color-picker', | |
| 259 | - 'visualizer-render', | |
| 260 | - ), Visualizer_Plugin::VERSION, true | |
| 261 | - ); | |
| 262 | - // added by Ash/Upwork | |
| 263 | - if ( VISUALIZER_PRO ) { | |
| 264 | - global $Visualizer_Pro; | |
| 265 | - $Visualizer_Pro->_addScriptsAndStyles(); | |
| 266 | - } | |
| 226 | + wp_register_script( 'visualizer-frame', VISUALIZER_ABSURL . 'js/frame.js', array( 'jquery' ), Visualizer_Plugin::VERSION, true ); | |
| 227 | + wp_register_script( 'google-jsapi', '//www.google.com/jsapi', array(), null, true ); | |
| 228 | + wp_register_script( 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array( 'google-jsapi', 'visualizer-frame' ), Visualizer_Plugin::VERSION, true ); | |
| 229 | + wp_register_script( 'visualizer-preview', VISUALIZER_ABSURL . 'js/preview.js', array( 'wp-color-picker', 'visualizer-render' ), Visualizer_Plugin::VERSION, true ); | |
| 230 | + | |
| 267 | 231 | // dispatch pages |
| 268 | - $this->_chart = get_post( $chart_id ); | |
| 269 | - $tab = isset( $_GET['tab'] ) && ! empty( $_GET['tab'] ) ? $_GET['tab'] : 'visualizer'; | |
| 270 | - | |
| 271 | - // skip chart type pages only for existing charts. | |
| 272 | - if ( VISUALIZER_SKIP_CHART_TYPE_PAGE && 'auto-draft' !== $this->_chart->post_status ) { | |
| 273 | - $tab = 'settings'; | |
| 274 | - } | |
| 275 | - | |
| 276 | - switch ( $tab ) { | |
| 232 | + $this->_chart = $chart; | |
| 233 | + switch ( filter_input( INPUT_GET, 'tab' ) ) { | |
| 234 | + case 'data': | |
| 235 | + $this->_handleDataPage(); | |
| 236 | + break; | |
| 277 | 237 | case 'settings': |
| 278 | - $this->_handleDataAndSettingsPage(); | |
| 238 | + $this->_handleSettingsPage(); | |
| 279 | 239 | break; |
| 280 | - case 'type': // fall through. | |
| 281 | - case 'visualizer': // fall through. | |
| 240 | + case 'type': | |
| 241 | + default: | |
| 282 | 242 | $this->_handleTypesPage(); |
| 283 | 243 | break; |
| 284 | - default: | |
| 285 | - do_action( 'visualizer_pro_handle_tab', $tab, $this->_chart ); | |
| 286 | - break; | |
| 287 | 244 | } |
| 288 | - defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit(); | |
| 289 | - } | |
| 290 | 245 | |
| 291 | - /** | |
| 292 | - * Handle data and settings page | |
| 293 | - */ | |
| 294 | - private function _handleDataAndSettingsPage() { | |
| 295 | - if ( isset( $_POST['map_api_key'] ) ) { | |
| 296 | - update_option( 'visualizer-map-api-key', $_POST['map_api_key'] ); | |
| 297 | - } | |
| 298 | - if ( $_SERVER['REQUEST_METHOD'] == 'POST' && isset( $_GET['nonce'] ) && wp_verify_nonce( $_GET['nonce'] ) ) { | |
| 299 | - if ( $this->_chart->post_status == 'auto-draft' ) { | |
| 300 | - $this->_chart->post_status = 'publish'; | |
| 301 | - wp_update_post( $this->_chart->to_array() ); | |
| 302 | - } | |
| 303 | - update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $_POST ); | |
| 304 | - $render = new Visualizer_Render_Page_Send(); | |
| 305 | - $render->text = sprintf( '[visualizer id="%d"]', $this->_chart->ID ); | |
| 306 | - wp_iframe( array( $render, 'render' ) ); | |
| 307 | - | |
| 308 | - return; | |
| 309 | - } | |
| 310 | - $data = $this->_getChartArray(); | |
| 311 | - $sidebar = ''; | |
| 312 | - $sidebar_class = 'Visualizer_Render_Sidebar_Type_' . ucfirst( $data['type'] ); | |
| 313 | - if ( class_exists( $sidebar_class, true ) ) { | |
| 314 | - $sidebar = new $sidebar_class( $data['settings'] ); | |
| 315 | - $sidebar->__series = $data['series']; | |
| 316 | - $sidebar->__data = $data['data']; | |
| 317 | - } else { | |
| 318 | - $sidebar = apply_filters( 'visualizer_pro_chart_type_sidebar', '', $data ); | |
| 319 | - if ( $sidebar != '' ) { | |
| 320 | - $sidebar->__series = $data['series']; | |
| 321 | - $sidebar->__data = $data['data']; | |
| 322 | - } | |
| 323 | - } | |
| 324 | - unset( $data['settings']['width'], $data['settings']['height'] ); | |
| 325 | - wp_enqueue_style( 'visualizer-frame' ); | |
| 326 | - wp_enqueue_style( 'wp-color-picker' ); | |
| 327 | - wp_enqueue_style( 'visualizer-frame' ); | |
| 328 | - wp_enqueue_script( 'visualizer-preview' ); | |
| 329 | - wp_enqueue_script( 'visualizer-render' ); | |
| 330 | - wp_localize_script( | |
| 331 | - 'visualizer-render', 'visualizer', array( | |
| 332 | - 'l10n' => array( | |
| 333 | - 'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ), | |
| 334 | - 'loading' => esc_html__( 'Loading...', 'visualizer' ), | |
| 335 | - ), | |
| 336 | - 'charts' => array( | |
| 337 | - 'canvas' => $data, | |
| 338 | - ), | |
| 339 | - 'map_api_key' => get_option( 'visualizer-map-api-key' ), | |
| 340 | - 'ajax' => array( | |
| 341 | - 'url' => admin_url( 'admin-ajax.php' ), | |
| 342 | - 'nonces' => array( | |
| 343 | - 'permissions' => wp_create_nonce( Visualizer_Plugin::ACTION_FETCH_PERMISSIONS_DATA ), | |
| 344 | - ), | |
| 345 | - 'actions' => array( | |
| 346 | - 'permissions' => Visualizer_Plugin::ACTION_FETCH_PERMISSIONS_DATA, | |
| 347 | - ), | |
| 348 | - ), | |
| 349 | - ) | |
| 350 | - ); | |
| 351 | - $render = new Visualizer_Render_Page_Data(); | |
| 352 | - $render->chart = $this->_chart; | |
| 353 | - $render->type = $data['type']; | |
| 354 | - $render->sidebar = $sidebar; | |
| 355 | - if ( filter_input( INPUT_GET, 'library', FILTER_VALIDATE_BOOLEAN ) ) { | |
| 356 | - $render->button = filter_input( INPUT_GET, 'action' ) == Visualizer_Plugin::ACTION_EDIT_CHART | |
| 357 | - ? esc_html__( 'Save Chart', 'visualizer' ) | |
| 358 | - : esc_html__( 'Create Chart', 'visualizer' ); | |
| 359 | - } else { | |
| 360 | - $render->button = esc_attr__( 'Insert Chart', 'visualizer' ); | |
| 361 | - } | |
| 362 | - if ( VISUALIZER_PRO ) { | |
| 363 | - global $Visualizer_Pro; | |
| 364 | - $Visualizer_Pro->_enqueueScriptsAndStyles( $data ); | |
| 365 | - } | |
| 366 | - $this->_addAction( 'admin_head', 'renderFlattrScript' ); | |
| 367 | - wp_iframe( array( $render, 'render' ) ); | |
| 246 | + exit; | |
| 368 | 247 | } |
| 369 | 248 | |
| 370 | 249 | /** |
| 371 | 250 | * Handles chart type selection page. |
| @@ -375,50 +254,129 @@ | ||
| 375 | 254 | * @access private |
| 376 | 255 | */ |
| 377 | 256 | private function _handleTypesPage() { |
| 378 | 257 | // process post request |
| 379 | - if ( $_SERVER['REQUEST_METHOD'] == 'POST' && wp_verify_nonce( filter_input( INPUT_POST, 'nonce' ) ) ) { | |
| 258 | + if ( $_SERVER['REQUEST_METHOD'] == 'POST' && Visualizer_Security::verifyNonce( filter_input( INPUT_POST, 'nonce' ) ) ) { | |
| 380 | 259 | $type = filter_input( INPUT_POST, 'type' ); |
| 381 | 260 | if ( in_array( $type, Visualizer_Plugin::getChartTypes() ) ) { |
| 382 | 261 | // save new chart type |
| 383 | 262 | update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_CHART_TYPE, $type ); |
| 263 | + | |
| 384 | 264 | // if the chart has default data, update it with appropriate default data for new type |
| 385 | 265 | if ( filter_var( get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, true ), FILTER_VALIDATE_BOOLEAN ) ) { |
| 386 | 266 | $source = new Visualizer_Source_Csv( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . $type . '.csv' ); |
| 387 | 267 | $source->fetch(); |
| 268 | + | |
| 388 | 269 | $this->_chart->post_content = $source->getData(); |
| 389 | 270 | wp_update_post( $this->_chart->to_array() ); |
| 271 | + | |
| 390 | 272 | update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() ); |
| 391 | 273 | } |
| 274 | + | |
| 392 | 275 | // redirect to next tab |
| 393 | - // changed by Ash/Upwork | |
| 394 | - wp_redirect( add_query_arg( 'tab', 'settings' ) ); | |
| 395 | - | |
| 276 | + wp_redirect( add_query_arg( 'tab', 'data' ) ); | |
| 396 | 277 | return; |
| 397 | 278 | } |
| 398 | 279 | } |
| 399 | - $render = new Visualizer_Render_Page_Types(); | |
| 400 | - $render->type = get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true ); | |
| 401 | - $render->types = Visualizer_Module_Admin::_getChartTypesLocalized(); | |
| 280 | + | |
| 281 | + $render = new Visualizer_Render_Page_Types(); | |
| 282 | + $render->type = get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true ); | |
| 283 | + $render->types = Visualizer_Plugin::getChartTypes(); | |
| 402 | 284 | $render->chart = $this->_chart; |
| 285 | + | |
| 403 | 286 | wp_enqueue_style( 'visualizer-frame' ); |
| 404 | 287 | wp_enqueue_script( 'visualizer-frame' ); |
| 405 | - wp_iframe( array( $render, 'render' ) ); | |
| 288 | + | |
| 289 | + wp_iframe( array( $render, 'render') ); | |
| 406 | 290 | } |
| 407 | 291 | |
| 408 | 292 | /** |
| 409 | - * Renders flattr script in the iframe <head> | |
| 293 | + * Handles chart data page. | |
| 410 | 294 | * |
| 411 | - * @since 1.4.2 | |
| 412 | - * @action admin_head | |
| 295 | + * @since 1.0.0 | |
| 413 | 296 | * |
| 414 | - * @access public | |
| 297 | + * @access private | |
| 415 | 298 | */ |
| 416 | - public function renderFlattrScript() { | |
| 417 | - echo ''; | |
| 299 | + private function _handleDataPage() { | |
| 300 | + $data = $this->_getChartArray(); | |
| 301 | + | |
| 302 | + $render = new Visualizer_Render_Page_Data(); | |
| 303 | + $render->chart = $this->_chart; | |
| 304 | + $render->type = $data['type']; | |
| 305 | + | |
| 306 | + unset( $data['settings']['width'], $data['settings']['height'] ); | |
| 307 | + | |
| 308 | + wp_enqueue_style( 'visualizer-frame' ); | |
| 309 | + wp_enqueue_script( 'visualizer-render' ); | |
| 310 | + wp_localize_script( 'visualizer-render', 'visualizer', array( | |
| 311 | + 'charts' => array( | |
| 312 | + 'canvas' => $data, | |
| 313 | + ), | |
| 314 | + ) ); | |
| 315 | + | |
| 316 | + wp_iframe( array( $render, 'render') ); | |
| 418 | 317 | } |
| 419 | - // changed by Ash/Upwork | |
| 318 | + | |
| 420 | 319 | /** |
| 320 | + * Handles chart settigns page. | |
| 321 | + * | |
| 322 | + * @since 1.0.0 | |
| 323 | + * | |
| 324 | + * @access private | |
| 325 | + */ | |
| 326 | + private function _handleSettingsPage() { | |
| 327 | + if ( $_SERVER['REQUEST_METHOD'] == 'POST' && Visualizer_Security::verifyNonce( filter_input( INPUT_GET, 'nonce' ) ) ) { | |
| 328 | + if ( $this->_chart->post_status == 'auto-draft' ) { | |
| 329 | + $this->_chart->post_status = 'publish'; | |
| 330 | + wp_update_post( $this->_chart->to_array() ); | |
| 331 | + } | |
| 332 | + | |
| 333 | + update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $_POST ); | |
| 334 | + | |
| 335 | + $render = new Visualizer_Render_Page_Send(); | |
| 336 | + $render->text = sprintf( '[visualizer id="%d"]', $this->_chart->ID ); | |
| 337 | + | |
| 338 | + wp_iframe( array( $render, 'render') ); | |
| 339 | + return; | |
| 340 | + } | |
| 341 | + | |
| 342 | + $data = $this->_getChartArray(); | |
| 343 | + | |
| 344 | + $sidebar = ''; | |
| 345 | + $sidebar_class = 'Visualizer_Render_Sidebar_Type_' . ucfirst( $data['type'] ); | |
| 346 | + if ( class_exists( $sidebar_class, true ) ) { | |
| 347 | + $sidebar = new $sidebar_class( $data['settings'] ); | |
| 348 | + $sidebar->__series = $data['series']; | |
| 349 | + $sidebar->__data = $data['data']; | |
| 350 | + } | |
| 351 | + | |
| 352 | + unset( $data['settings']['width'], $data['settings']['height'] ); | |
| 353 | + | |
| 354 | + wp_enqueue_style( 'wp-color-picker' ); | |
| 355 | + wp_enqueue_style( 'visualizer-frame' ); | |
| 356 | + | |
| 357 | + wp_enqueue_script( 'visualizer-preview' ); | |
| 358 | + wp_localize_script( 'visualizer-render', 'visualizer', array( | |
| 359 | + 'charts' => array( | |
| 360 | + 'canvas' => $data, | |
| 361 | + ), | |
| 362 | + ) ); | |
| 363 | + | |
| 364 | + $render = new Visualizer_Render_Page_Settings(); | |
| 365 | + | |
| 366 | + $render->sidebar = $sidebar; | |
| 367 | + if ( filter_input( INPUT_GET, 'library', FILTER_VALIDATE_BOOLEAN ) ) { | |
| 368 | + $render->button = filter_input( INPUT_GET, 'action' ) == Visualizer_Plugin::ACTION_EDIT_CHART | |
| 369 | + ? esc_html__( 'Save Chart', Visualizer_Plugin::NAME ) | |
| 370 | + : esc_html__( 'Create Chart', Visualizer_Plugin::NAME ); | |
| 371 | + } else { | |
| 372 | + $render->button = esc_attr__( 'Insert Chart', Visualizer_Plugin::NAME ); | |
| 373 | + } | |
| 374 | + | |
| 375 | + wp_iframe( array( $render, 'render') ); | |
| 376 | + } | |
| 377 | + | |
| 378 | + /** | |
| 421 | 379 | * Parses uploaded CSV file and saves new data for the chart. |
| 422 | 380 | * |
| 423 | 381 | * @since 1.0.0 |
| 424 | 382 | * |
| @@ -425,61 +383,42 @@ | ||
| 425 | 383 | * @access public |
| 426 | 384 | */ |
| 427 | 385 | public function uploadData() { |
| 428 | 386 | // validate nonce |
| 429 | - // do not use filter_input as it does not work for phpunit test cases, use filter_var instead | |
| 430 | - if ( ! isset( $_GET['nonce'] ) || ! wp_verify_nonce( $_GET['nonce'] ) ) { | |
| 387 | + if ( !Visualizer_Security::verifyNonce( filter_input( INPUT_GET, 'nonce' ) ) ) { | |
| 431 | 388 | status_header( 403 ); |
| 432 | 389 | exit; |
| 433 | 390 | } |
| 391 | + | |
| 434 | 392 | // check chart, if chart exists |
| 435 | - $chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : ''; | |
| 436 | - if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type != Visualizer_Plugin::CPT_VISUALIZER ) { | |
| 393 | + $chart_id = filter_input( INPUT_GET, 'chart', FILTER_VALIDATE_INT ); | |
| 394 | + if ( !$chart_id || !( $chart = get_post( $chart_id ) ) || $chart->post_type != Visualizer_Plugin::CPT_VISUALIZER ) { | |
| 437 | 395 | status_header( 400 ); |
| 438 | 396 | exit; |
| 439 | 397 | } |
| 440 | - if ( ! isset( $_POST['vz-import-time'] ) ) { | |
| 441 | - apply_filters( 'visualizer_pro_remove_schedule', $chart_id ); | |
| 442 | - } | |
| 443 | 398 | |
| 444 | - if ( ! isset( $_POST['chart_data_src'] ) || Visualizer_Plugin::CF_SOURCE_FILTER !== $_POST['chart_data_src'] ) { | |
| 445 | - // delete the filters in case this chart is being uploaded from other data sources | |
| 446 | - delete_post_meta( $chart_id, 'visualizer-filter-config' ); | |
| 447 | - } | |
| 448 | - | |
| 449 | - $source = null; | |
| 450 | 399 | $render = new Visualizer_Render_Page_Update(); |
| 451 | - if ( isset( $_POST['remote_data'] ) && filter_var( $_POST['remote_data'], FILTER_VALIDATE_URL ) ) { | |
| 452 | - $source = new Visualizer_Source_Csv_Remote( $_POST['remote_data'] ); | |
| 453 | - if ( isset( $_POST['vz-import-time'] ) ) { | |
| 454 | - apply_filters( 'visualizer_pro_chart_schedule', $chart_id, $_POST['remote_data'], $_POST['vz-import-time'] ); | |
| 455 | - } | |
| 456 | - } elseif ( isset( $_FILES['local_data'] ) && $_FILES['local_data']['error'] == 0 ) { | |
| 457 | - $source = new Visualizer_Source_Csv( $_FILES['local_data']['tmp_name'] ); | |
| 458 | - // Added by Ash/Upwork | |
| 459 | - } elseif ( isset( $_POST['chart_data'] ) && strlen( $_POST['chart_data'] ) > 0 ) { | |
| 460 | - $source = apply_filters( 'visualizer_pro_handle_chart_data', $_POST['chart_data'], '' ); | |
| 461 | - // Added by Ash/Upwork | |
| 400 | + if ( !isset( $_FILES['data'] ) || $_FILES['data']['error'] != 0 ) { | |
| 401 | + $render->message = esc_html__( "CSV file with chart data was not uploaded. Please, try again.", Visualizer_Plugin::NAME ); | |
| 462 | 402 | } else { |
| 463 | - $render->message = esc_html__( 'CSV file with chart data was not uploaded. Please, try again.', 'visualizer' ); | |
| 464 | - } | |
| 465 | - if ( $source ) { | |
| 403 | + $source = new Visualizer_Source_Csv( $_FILES['data']['tmp_name'] ); | |
| 466 | 404 | if ( $source->fetch() ) { |
| 467 | 405 | $chart->post_content = $source->getData(); |
| 468 | 406 | wp_update_post( $chart->to_array() ); |
| 407 | + | |
| 469 | 408 | update_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() ); |
| 470 | 409 | update_post_meta( $chart->ID, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() ); |
| 471 | 410 | update_post_meta( $chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, 0 ); |
| 472 | - $render->data = json_encode( $source->getRawData() ); | |
| 411 | + | |
| 412 | + $render->data = json_encode( unserialize( $source->getData() ) ); | |
| 473 | 413 | $render->series = json_encode( $source->getSeries() ); |
| 474 | 414 | } else { |
| 475 | - $render->message = esc_html__( 'CSV file is broken or invalid. Please, try again.', 'visualizer' ); | |
| 415 | + $render->message = esc_html__( "CSV file is broken or incorrect. Please, try again.", Visualizer_Plugin::NAME ); | |
| 476 | 416 | } |
| 477 | 417 | } |
| 418 | + | |
| 478 | 419 | $render->render(); |
| 479 | - if ( ! ( defined( 'VISUALIZER_DO_NOT_DIE' ) && VISUALIZER_DO_NOT_DIE ) ) { | |
| 480 | - defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit(); | |
| 481 | - } | |
| 420 | + exit; | |
| 482 | 421 | } |
| 483 | 422 | |
| 484 | 423 | /** |
| 485 | 424 | * Clones the chart. |
| @@ -489,113 +428,43 @@ | ||
| 489 | 428 | * @access public |
| 490 | 429 | */ |
| 491 | 430 | public function cloneChart() { |
| 492 | 431 | $chart_id = $success = false; |
| 493 | - $nonce = wp_verify_nonce( filter_input( INPUT_GET, 'nonce' ), Visualizer_Plugin::ACTION_CLONE_CHART ); | |
| 494 | - $capable = current_user_can( 'edit_posts' ); | |
| 432 | + $nonce = Visualizer_Security::verifyNonce( filter_input( INPUT_GET, 'nonce' ), Visualizer_Plugin::ACTION_CLONE_CHART ); | |
| 433 | + $capable = current_user_can( 'edit_posts' ); | |
| 495 | 434 | if ( $nonce && $capable ) { |
| 496 | - $chart_id = filter_input( | |
| 497 | - INPUT_GET, 'chart', FILTER_VALIDATE_INT, array( | |
| 498 | - 'options' => array( | |
| 499 | - 'min_range' => 1, | |
| 500 | - ), | |
| 501 | - ) | |
| 502 | - ); | |
| 435 | + $chart_id = filter_input( INPUT_GET, 'chart', FILTER_VALIDATE_INT, array( 'options' => array( 'min_range' => 1 ) ) ); | |
| 503 | 436 | if ( $chart_id ) { |
| 504 | - $chart = get_post( $chart_id ); | |
| 437 | + $chart = get_post( $chart_id ); | |
| 505 | 438 | $success = $chart && $chart->post_type == Visualizer_Plugin::CPT_VISUALIZER; |
| 506 | 439 | } |
| 507 | 440 | } |
| 441 | + | |
| 508 | 442 | $redirect = wp_get_referer(); |
| 509 | 443 | if ( $success ) { |
| 510 | - $new_chart_id = wp_insert_post( | |
| 511 | - array( | |
| 512 | - 'post_type' => Visualizer_Plugin::CPT_VISUALIZER, | |
| 513 | - 'post_title' => 'Visualization', | |
| 514 | - 'post_author' => get_current_user_id(), | |
| 515 | - 'post_status' => $chart->post_status, | |
| 516 | - 'post_content' => $chart->post_content, | |
| 517 | - ) | |
| 518 | - ); | |
| 519 | - if ( $new_chart_id && ! is_wp_error( $new_chart_id ) ) { | |
| 444 | + $new_chart_id = wp_insert_post( array( | |
| 445 | + 'post_type' => Visualizer_Plugin::CPT_VISUALIZER, | |
| 446 | + 'post_title' => 'Visualization', | |
| 447 | + 'post_author' => get_current_user_id(), | |
| 448 | + 'post_status' => $chart->post_status, | |
| 449 | + 'post_content' => $chart->post_content, | |
| 450 | + ) ); | |
| 451 | + | |
| 452 | + if ( $new_chart_id && !is_wp_error( $new_chart_id ) ) { | |
| 520 | 453 | add_post_meta( $new_chart_id, Visualizer_Plugin::CF_CHART_TYPE, get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, true ) ); |
| 521 | 454 | add_post_meta( $new_chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, get_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, true ) ); |
| 522 | 455 | add_post_meta( $new_chart_id, Visualizer_Plugin::CF_SOURCE, get_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, true ) ); |
| 523 | 456 | add_post_meta( $new_chart_id, Visualizer_Plugin::CF_SERIES, get_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, true ) ); |
| 524 | 457 | add_post_meta( $new_chart_id, Visualizer_Plugin::CF_SETTINGS, get_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS, true ) ); |
| 525 | - $redirect = add_query_arg( | |
| 526 | - array( | |
| 527 | - 'page' => 'visualizer', | |
| 528 | - 'type' => filter_input( INPUT_GET, 'type' ), | |
| 529 | - ), admin_url( 'upload.php' ) | |
| 530 | - ); | |
| 458 | + | |
| 459 | + $redirect = add_query_arg( array( | |
| 460 | + 'page' => 'visualizer', | |
| 461 | + 'type' => filter_input( INPUT_GET, 'type' ), | |
| 462 | + ), admin_url( 'upload.php' ) ); | |
| 531 | 463 | } |
| 532 | 464 | } |
| 465 | + | |
| 533 | 466 | wp_redirect( $redirect ); |
| 534 | 467 | exit; |
| 535 | 468 | } |
| 536 | 469 | |
| 537 | - /** | |
| 538 | - * Exports the chart data | |
| 539 | - * | |
| 540 | - * @since 1.0.0 | |
| 541 | - * | |
| 542 | - * @access public | |
| 543 | - */ | |
| 544 | - public function exportData() { | |
| 545 | - check_ajax_referer( Visualizer_Plugin::ACTION_EXPORT_DATA . Visualizer_Plugin::VERSION, 'security' ); | |
| 546 | - $capable = current_user_can( 'edit_posts' ); | |
| 547 | - if ( $capable ) { | |
| 548 | - $chart_id = isset( $_GET['chart'] ) ? filter_var( | |
| 549 | - $_GET['chart'], FILTER_VALIDATE_INT, array( | |
| 550 | - 'options' => array( | |
| 551 | - 'min_range' => 1, | |
| 552 | - ), | |
| 553 | - ) | |
| 554 | - ) : ''; | |
| 555 | - if ( $chart_id ) { | |
| 556 | - $data = $this->_getDataAs( $chart_id, 'csv' ); | |
| 557 | - if ( $data ) { | |
| 558 | - echo wp_send_json_success( $data ); | |
| 559 | - } | |
| 560 | - } | |
| 561 | - } | |
| 562 | - | |
| 563 | - defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit(); | |
| 564 | - } | |
| 565 | - | |
| 566 | - /** | |
| 567 | - * Handles chart data page. | |
| 568 | - * | |
| 569 | - * @since 1.0.0 | |
| 570 | - * | |
| 571 | - * @access private | |
| 572 | - */ | |
| 573 | - private function _handleDataPage() { | |
| 574 | - $data = $this->_getChartArray(); | |
| 575 | - $render = new Visualizer_Render_Page_Data(); | |
| 576 | - $render->chart = $this->_chart; | |
| 577 | - $render->type = $data['type']; | |
| 578 | - unset( $data['settings']['width'], $data['settings']['height'] ); | |
| 579 | - wp_enqueue_style( 'visualizer-frame' ); | |
| 580 | - wp_enqueue_script( 'visualizer-render' ); | |
| 581 | - wp_localize_script( | |
| 582 | - 'visualizer-render', 'visualizer', array( | |
| 583 | - 'l10n' => array( | |
| 584 | - 'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ), | |
| 585 | - 'loading' => esc_html__( 'Loading...', 'visualizer' ), | |
| 586 | - ), | |
| 587 | - 'charts' => array( | |
| 588 | - 'canvas' => $data, | |
| 589 | - ), | |
| 590 | - ) | |
| 591 | - ); | |
| 592 | - // Added by Ash/Upwork | |
| 593 | - if ( VISUALIZER_PRO ) { | |
| 594 | - global $Visualizer_Pro; | |
| 595 | - $Visualizer_Pro->_enqueueScriptsAndStyles( $data ); | |
| 596 | - } | |
| 597 | - // Added by Ash/Upwork | |
| 598 | - $this->_addAction( 'admin_head', 'renderFlattrScript' ); | |
| 599 | - wp_iframe( array( $render, 'render' ) ); | |
| 600 | - } | |
| 601 | -} | |
| 470 | +} | |
