| @@ -63,140 +63,70 @@ | ||
| 63 | 63 | add_filter( 'rest_visualizer_query', array( $this, 'add_rest_query_vars' ), 9, 2 ); |
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | /** |
| 67 | - * Enqueue Gutenberg block assets. | |
| 67 | + * Enqueue front end and editor JavaScript and CSS | |
| 68 | 68 | */ |
| 69 | 69 | public function enqueue_gutenberg_scripts() { |
| 70 | - global $pagenow; | |
| 70 | + global $wp_version; | |
| 71 | 71 | |
| 72 | - $blockPath = VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/index.js'; | |
| 73 | - $stylePath = VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/style-index.css'; | |
| 74 | - $asset_path = VISUALIZER_ABSPATH . '/classes/Visualizer/Gutenberg/build/index.asset.php'; | |
| 75 | - if ( file_exists( $asset_path ) ) { | |
| 76 | - // @phpstan-ignore-next-line | |
| 77 | - $asset = require $asset_path; | |
| 72 | + $blockPath = VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/block.js'; | |
| 73 | + $handsontableJS = VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/handsontable.js'; | |
| 74 | + $stylePath = VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/block.css'; | |
| 75 | + $handsontableCSS = VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/handsontable.css'; | |
| 76 | + | |
| 77 | + if ( VISUALIZER_TEST_JS_CUSTOMIZATION ) { | |
| 78 | + $version = filemtime( VISUALIZER_ABSPATH . '/classes/Visualizer/Gutenberg/build/block.js' ); | |
| 78 | 79 | } else { |
| 79 | - $asset = array( | |
| 80 | - 'dependencies' => array(), | |
| 81 | - 'version' => $this->version, | |
| 82 | - ); | |
| 80 | + $version = $this->version; | |
| 83 | 81 | } |
| 84 | 82 | |
| 85 | - if ( VISUALIZER_TEST_JS_CUSTOMIZATION ) { | |
| 86 | - $asset['version'] = filemtime( VISUALIZER_ABSPATH . '/classes/Visualizer/Gutenberg/build/index.js' ); | |
| 87 | - } | |
| 83 | + // Enqueue the bundled block JS file | |
| 84 | + wp_enqueue_script( 'handsontable', $handsontableJS ); | |
| 85 | + wp_enqueue_script( 'visualizer-gutenberg-block', $blockPath, array( 'wp-api', 'handsontable', 'visualizer-datatables', 'moment' ), $version, true ); | |
| 88 | 86 | |
| 89 | - if ( ! wp_script_is( 'visualizer-datatables', 'registered' ) ) { | |
| 90 | - wp_register_script( 'visualizer-datatables', VISUALIZER_ABSURL . 'js/lib/datatables.min.js', array( 'jquery-ui-core' ), Visualizer_Plugin::VERSION ); | |
| 91 | - } | |
| 87 | + $type = 'community'; | |
| 92 | 88 | |
| 93 | - if ( ! wp_style_is( 'visualizer-datatables', 'registered' ) ) { | |
| 94 | - wp_register_style( 'visualizer-datatables', VISUALIZER_ABSURL . 'css/lib/datatables.min.css', array(), Visualizer_Plugin::VERSION ); | |
| 89 | + if ( Visualizer_Module::is_pro() ) { | |
| 90 | + $type = 'pro'; | |
| 91 | + if ( apply_filters( 'visualizer_is_business', false ) ) { | |
| 92 | + $type = 'business'; | |
| 93 | + } | |
| 95 | 94 | } |
| 96 | 95 | |
| 97 | - // Enqueue the bundled block JS file | |
| 98 | - $script_deps = array( | |
| 99 | - 'wp-api', | |
| 100 | - 'wp-blocks', | |
| 101 | - 'wp-block-editor', | |
| 102 | - 'wp-components', | |
| 103 | - 'wp-editor', | |
| 104 | - 'wp-element', | |
| 105 | - 'wp-i18n', | |
| 106 | - 'lodash', | |
| 107 | - 'moment', | |
| 108 | - 'react', | |
| 109 | - 'visualizer-datatables', | |
| 110 | - ); | |
| 111 | - if ( isset( $asset['dependencies'] ) && is_array( $asset['dependencies'] ) ) { | |
| 112 | - $script_deps = array_merge( $script_deps, $asset['dependencies'] ); | |
| 113 | - } | |
| 114 | - $script_deps = array_values( array_unique( $script_deps ) ); | |
| 115 | - wp_enqueue_script( 'visualizer-gutenberg-block', $blockPath, $script_deps, $asset['version'], true ); | |
| 96 | + $table_col_mapping = Visualizer_Source_Query_Params::get_all_db_tables_column_mapping( null, false ); | |
| 116 | 97 | |
| 117 | 98 | $translation_array = array( |
| 99 | + 'isPro' => $type, | |
| 100 | + 'proTeaser' => Visualizer_Plugin::PRO_TEASER_URL, | |
| 101 | + 'absurl' => VISUALIZER_ABSURL, | |
| 102 | + 'charts' => Visualizer_Module_Admin::_getChartTypesLocalized(), | |
| 118 | 103 | 'adminPage' => menu_page_url( 'visualizer', false ), |
| 119 | - 'createChart' => add_query_arg( array( 'action' => 'visualizer-create-chart', 'library' => 'yes', 'type' => '', 'chart-library' => '', 'tab' => 'visualizer' ), admin_url( 'admin-ajax.php' ) ), | |
| 120 | - 'chartsPerPage' => defined( 'TI_E2E_TESTING' ) ? 20 : 6, | |
| 121 | - 'isFullSiteEditor' => 'site-editor.php' === $pagenow, | |
| 122 | - /* translators: %1$s: opening tag, %2$s: closing tag */ | |
| 123 | - 'chartEditUrl' => admin_url( 'admin-ajax.php' ), | |
| 104 | + 'sqlTable' => $table_col_mapping, | |
| 105 | + 'chartsPerPage' => defined( 'TI_CYPRESS_TESTING' ) ? 20 : 6, | |
| 124 | 106 | ); |
| 125 | 107 | wp_localize_script( 'visualizer-gutenberg-block', 'visualizerLocalize', $translation_array ); |
| 126 | 108 | |
| 127 | - $d3_renderer_asset = VISUALIZER_ABSPATH . '/classes/Visualizer/D3Renderer/build/index.asset.php'; | |
| 128 | - if ( file_exists( $d3_renderer_asset ) && ! wp_script_is( 'visualizer-d3-renderer', 'registered' ) ) { | |
| 129 | - // @phpstan-ignore-next-line | |
| 130 | - $d3_asset = include $d3_renderer_asset; | |
| 131 | - wp_register_script( | |
| 132 | - 'visualizer-d3-renderer', | |
| 133 | - VISUALIZER_ABSURL . 'classes/Visualizer/D3Renderer/build/index.js', | |
| 134 | - array_merge( $d3_asset['dependencies'], array( 'jquery' ) ), | |
| 135 | - $d3_asset['version'], | |
| 136 | - true | |
| 137 | - ); | |
| 138 | - } | |
| 139 | - if ( wp_script_is( 'visualizer-d3-renderer', 'registered' ) ) { | |
| 140 | - wp_enqueue_script( 'visualizer-d3-renderer' ); | |
| 141 | - wp_localize_script( | |
| 142 | - 'visualizer-d3-renderer', | |
| 143 | - 'vizD3Renderer', | |
| 144 | - array( | |
| 145 | - 'iframeJsUrl' => VISUALIZER_ABSURL . 'classes/Visualizer/D3Renderer/build/iframe.js', | |
| 146 | - ) | |
| 147 | - ); | |
| 148 | - } | |
| 109 | + // Enqueue frontend and editor block styles | |
| 110 | + wp_enqueue_style( 'handsontable', $handsontableCSS ); | |
| 111 | + wp_enqueue_style( 'visualizer-gutenberg-block', $stylePath, array( 'visualizer-datatables' ), $version ); | |
| 149 | 112 | |
| 150 | - // Enqueue frontend and editor block styles | |
| 151 | - wp_enqueue_style( 'visualizer-gutenberg-block', $stylePath, array( 'visualizer-datatables' ), $asset['version'] ); | |
| 113 | + if ( version_compare( $wp_version, '4.9.0', '>' ) ) { | |
| 152 | 114 | |
| 153 | - // Enqueue ChartBuilder (AI Builder) so the D3 edit modal is available in the block editor. | |
| 154 | - $chart_builder_asset = VISUALIZER_ABSPATH . '/classes/Visualizer/ChartBuilder/build/index.asset.php'; | |
| 155 | - if ( file_exists( $chart_builder_asset ) && ! wp_script_is( 'visualizer-chart-builder', 'enqueued' ) ) { | |
| 156 | - /** | |
| 157 | - * Ignore missing build asset in source checkout. | |
| 158 | - * | |
| 159 | - * @phpstan-ignore-next-line | |
| 160 | - */ | |
| 161 | - $cb_asset = include $chart_builder_asset; | |
| 162 | - wp_enqueue_script( | |
| 163 | - 'visualizer-chart-builder', | |
| 164 | - VISUALIZER_ABSURL . 'classes/Visualizer/ChartBuilder/build/index.js', | |
| 165 | - $cb_asset['dependencies'], | |
| 166 | - $cb_asset['version'], | |
| 167 | - true | |
| 168 | - ); | |
| 169 | - wp_enqueue_style( | |
| 170 | - 'visualizer-chart-builder', | |
| 171 | - VISUALIZER_ABSURL . 'classes/Visualizer/ChartBuilder/build/style-index.css', | |
| 172 | - array(), | |
| 173 | - $cb_asset['version'] | |
| 174 | - ); | |
| 175 | - $chart_builder_css = VISUALIZER_ABSPATH . '/classes/Visualizer/ChartBuilder/build/index.css'; | |
| 176 | - if ( file_exists( $chart_builder_css ) ) { | |
| 177 | - wp_enqueue_style( | |
| 178 | - 'visualizer-chart-builder-runtime', | |
| 179 | - VISUALIZER_ABSURL . 'classes/Visualizer/ChartBuilder/build/index.css', | |
| 180 | - array( 'visualizer-chart-builder' ), | |
| 181 | - $cb_asset['version'] | |
| 182 | - ); | |
| 183 | - } | |
| 184 | - wp_localize_script( | |
| 185 | - 'visualizer-chart-builder', | |
| 186 | - 'vizAIBuilder', | |
| 115 | + wp_enqueue_code_editor( | |
| 187 | 116 | array( |
| 188 | - 'ajaxUrl' => admin_url( 'admin-ajax.php' ), | |
| 189 | - 'nonce' => wp_create_nonce( 'visualizer-ai-builder' ), | |
| 190 | - 'isPro' => Visualizer_Module::is_pro(), | |
| 117 | + 'type' => 'sql', | |
| 118 | + 'codemirror' => array( | |
| 119 | + 'autofocus' => true, | |
| 120 | + 'lineWrapping' => true, | |
| 121 | + 'dragDrop' => false, | |
| 122 | + 'matchBrackets' => true, | |
| 123 | + 'autoCloseBrackets' => true, | |
| 124 | + 'extraKeys' => array( 'Ctrl-Space' => 'autocomplete' ), | |
| 125 | + 'hintOptions' => array( 'tables' => $table_col_mapping ), | |
| 126 | + ), | |
| 191 | 127 | ) |
| 192 | 128 | ); |
| 193 | - // Inject the mount point the ChartBuilder React app needs. | |
| 194 | - wp_add_inline_script( | |
| 195 | - 'visualizer-chart-builder', | |
| 196 | - 'document.body.insertAdjacentHTML("beforeend","<div id=\"viz-chart-builder-root\"></div>");', | |
| 197 | - 'before' | |
| 198 | - ); | |
| 199 | 129 | } |
| 200 | 130 | } |
| 201 | 131 | /** |
| 202 | 132 | * Hook server side rendering into render callback |
| @@ -201,35 +131,15 @@ | ||
| 201 | 131 | /** |
| 202 | 132 | * Hook server side rendering into render callback |
| 203 | 133 | */ |
| 204 | 134 | public function register_block_type() { |
| 205 | - $asset_path = VISUALIZER_ABSPATH . '/classes/Visualizer/Gutenberg/build/index.asset.php'; | |
| 206 | - $version = $this->version; | |
| 207 | - if ( file_exists( $asset_path ) ) { | |
| 208 | - // @phpstan-ignore-next-line | |
| 209 | - $asset = require $asset_path; | |
| 210 | - $version = isset( $asset['version'] ) ? $asset['version'] : $version; | |
| 211 | - } | |
| 212 | - if ( ! wp_style_is( 'visualizer-datatables', 'registered' ) ) { | |
| 213 | - wp_register_style( 'visualizer-datatables', VISUALIZER_ABSURL . 'css/lib/datatables.min.css', array(), Visualizer_Plugin::VERSION ); | |
| 214 | - } | |
| 215 | - if ( ! wp_style_is( 'visualizer-gutenberg-block', 'registered' ) ) { | |
| 216 | - wp_register_style( 'visualizer-gutenberg-block', VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/style-index.css', array( 'visualizer-datatables' ), $version ); | |
| 217 | - } | |
| 218 | 135 | register_block_type( |
| 219 | 136 | 'visualizer/chart', array( |
| 220 | - // The editor_style registration is what gets the stylesheet into the | |
| 221 | - // iframed editor canvas; styles enqueued via enqueue_block_editor_assets | |
| 222 | - // only reach the parent document. | |
| 223 | - 'editor_style' => 'visualizer-gutenberg-block', | |
| 224 | 137 | 'render_callback' => array( $this, 'gutenberg_block_callback' ), |
| 225 | 138 | 'attributes' => array( |
| 226 | 139 | 'id' => array( |
| 227 | 140 | 'type' => 'number', |
| 228 | 141 | ), |
| 229 | - 'lazy' => array( | |
| 230 | - 'type' => 'string', | |
| 231 | - ), | |
| 232 | 142 | ), |
| 233 | 143 | ) |
| 234 | 144 | ); |
| 235 | 145 | } |
| @@ -236,45 +146,16 @@ | ||
| 236 | 146 | |
| 237 | 147 | /** |
| 238 | 148 | * Gutenberg Block Callback Function |
| 239 | 149 | */ |
| 240 | - public function gutenberg_block_callback( $atts ) { | |
| 241 | - // no id, no fun. | |
| 242 | - if ( ! isset( $atts['id'] ) ) { | |
| 243 | - return ''; | |
| 150 | + public function gutenberg_block_callback( $attr ) { | |
| 151 | + if ( isset( $attr['id'] ) ) { | |
| 152 | + $id = $attr['id']; | |
| 153 | + if ( empty( $id ) || $id === 'none' ) { | |
| 154 | + return ''; // no id = no fun | |
| 155 | + } | |
| 156 | + return '[visualizer id="' . $id . '"]'; | |
| 244 | 157 | } |
| 245 | - | |
| 246 | - $atts = shortcode_atts( | |
| 247 | - array( | |
| 248 | - 'id' => false, | |
| 249 | - 'lazy' => apply_filters( 'visualizer_lazy_by_default', false, $atts['id'] ), | |
| 250 | - // we are deliberating excluding the class attribute from here | |
| 251 | - // as this will be handled by the custom class in Gutenberg | |
| 252 | - ), | |
| 253 | - $atts | |
| 254 | - ); | |
| 255 | - | |
| 256 | - // no id, no fun. | |
| 257 | - if ( ! $atts['id'] ) { | |
| 258 | - return ''; | |
| 259 | - } | |
| 260 | - | |
| 261 | - if ( $atts['lazy'] === '-1' || $atts['lazy'] === false ) { | |
| 262 | - $atts['lazy'] = 'no'; | |
| 263 | - } | |
| 264 | - | |
| 265 | - // we don't want the chart in the editor lazy-loading. | |
| 266 | - if ( is_admin() ) { | |
| 267 | - unset( $atts['lazy'] ); | |
| 268 | - } | |
| 269 | - | |
| 270 | - $shortcode = '[visualizer'; | |
| 271 | - foreach ( $atts as $name => $value ) { | |
| 272 | - $shortcode .= sprintf( ' %s="%s"', $name, $value ); | |
| 273 | - } | |
| 274 | - $shortcode .= ']'; | |
| 275 | - | |
| 276 | - return $shortcode; | |
| 277 | 158 | } |
| 278 | 159 | |
| 279 | 160 | /** |
| 280 | 161 | * Hook server side rendering into render callback |
| @@ -286,8 +167,125 @@ | ||
| 286 | 167 | array( |
| 287 | 168 | 'get_callback' => array( $this, 'get_visualizer_data' ), |
| 288 | 169 | ) |
| 289 | 170 | ); |
| 171 | + | |
| 172 | + register_rest_route( | |
| 173 | + 'visualizer/v' . VISUALIZER_REST_VERSION, | |
| 174 | + '/get-query-data', | |
| 175 | + array( | |
| 176 | + 'methods' => 'GET', | |
| 177 | + 'callback' => array( $this, 'get_query_data' ), | |
| 178 | + 'permission_callback' => function () { | |
| 179 | + return current_user_can( 'edit_posts' ); | |
| 180 | + }, | |
| 181 | + ) | |
| 182 | + ); | |
| 183 | + | |
| 184 | + register_rest_route( | |
| 185 | + 'visualizer/v' . VISUALIZER_REST_VERSION, | |
| 186 | + '/get-json-root', | |
| 187 | + array( | |
| 188 | + 'methods' => 'GET', | |
| 189 | + 'callback' => array( $this, 'get_json_root_data' ), | |
| 190 | + 'args' => array( | |
| 191 | + 'url' => array( | |
| 192 | + 'sanitize_callback' => 'esc_url_raw', | |
| 193 | + ), | |
| 194 | + ), | |
| 195 | + 'permission_callback' => function () { | |
| 196 | + return current_user_can( 'edit_posts' ); | |
| 197 | + }, | |
| 198 | + ) | |
| 199 | + ); | |
| 200 | + | |
| 201 | + register_rest_route( | |
| 202 | + 'visualizer/v' . VISUALIZER_REST_VERSION, | |
| 203 | + '/get-json-data', | |
| 204 | + array( | |
| 205 | + 'methods' => 'GET', | |
| 206 | + 'callback' => array( $this, 'get_json_data' ), | |
| 207 | + 'args' => array( | |
| 208 | + 'url' => array( | |
| 209 | + 'sanitize_callback' => 'esc_url_raw', | |
| 210 | + ), | |
| 211 | + 'chart' => array( | |
| 212 | + 'sanitize_callback' => 'absint', | |
| 213 | + ), | |
| 214 | + ), | |
| 215 | + 'permission_callback' => function () { | |
| 216 | + return current_user_can( 'edit_posts' ); | |
| 217 | + }, | |
| 218 | + ) | |
| 219 | + ); | |
| 220 | + | |
| 221 | + register_rest_route( | |
| 222 | + 'visualizer/v' . VISUALIZER_REST_VERSION, | |
| 223 | + '/set-json-data', | |
| 224 | + array( | |
| 225 | + 'methods' => 'GET', | |
| 226 | + 'callback' => array( $this, 'set_json_data' ), | |
| 227 | + 'args' => array( | |
| 228 | + 'url' => array( | |
| 229 | + 'sanitize_callback' => 'esc_url_raw', | |
| 230 | + ), | |
| 231 | + ), | |
| 232 | + 'permission_callback' => function () { | |
| 233 | + return current_user_can( 'edit_posts' ); | |
| 234 | + }, | |
| 235 | + ) | |
| 236 | + ); | |
| 237 | + | |
| 238 | + register_rest_route( | |
| 239 | + 'visualizer/v' . VISUALIZER_REST_VERSION, | |
| 240 | + '/update-chart', | |
| 241 | + array( | |
| 242 | + 'methods' => 'POST', | |
| 243 | + 'callback' => array( $this, 'update_chart_data' ), | |
| 244 | + 'args' => array( | |
| 245 | + 'id' => array( | |
| 246 | + 'sanitize_callback' => 'absint', | |
| 247 | + ), | |
| 248 | + ), | |
| 249 | + 'permission_callback' => function () { | |
| 250 | + return current_user_can( 'edit_posts' ); | |
| 251 | + }, | |
| 252 | + ) | |
| 253 | + ); | |
| 254 | + | |
| 255 | + register_rest_route( | |
| 256 | + 'visualizer/v' . VISUALIZER_REST_VERSION, | |
| 257 | + '/upload-data', | |
| 258 | + array( | |
| 259 | + 'methods' => 'POST', | |
| 260 | + 'callback' => array( $this, 'upload_csv_data' ), | |
| 261 | + 'args' => array( | |
| 262 | + 'url' => array( | |
| 263 | + 'sanitize_callback' => 'esc_url_raw', | |
| 264 | + ), | |
| 265 | + ), | |
| 266 | + 'permission_callback' => function () { | |
| 267 | + return current_user_can( 'edit_posts' ); | |
| 268 | + }, | |
| 269 | + ) | |
| 270 | + ); | |
| 271 | + | |
| 272 | + register_rest_route( | |
| 273 | + 'visualizer/v' . VISUALIZER_REST_VERSION, | |
| 274 | + '/get-permission-data', | |
| 275 | + array( | |
| 276 | + 'methods' => 'GET', | |
| 277 | + 'callback' => array( $this, 'get_permission_data' ), | |
| 278 | + 'args' => array( | |
| 279 | + 'type' => array( | |
| 280 | + 'sanitize_callback' => 'sanitize_text_field', | |
| 281 | + ), | |
| 282 | + ), | |
| 283 | + 'permission_callback' => function () { | |
| 284 | + return current_user_can( 'edit_posts' ); | |
| 285 | + }, | |
| 286 | + ) | |
| 287 | + ); | |
| 290 | 288 | } |
| 291 | 289 | |
| 292 | 290 | /** |
| 293 | 291 | * Get Post Meta Fields |
| @@ -292,9 +290,9 @@ | ||
| 292 | 290 | /** |
| 293 | 291 | * Get Post Meta Fields |
| 294 | 292 | */ |
| 295 | 293 | public function get_visualizer_data( $post ) { |
| 296 | - if ( ! Visualizer_Module::can_edit_chart( $post['id'] ) ) { | |
| 294 | + if ( ! current_user_can( 'edit_posts' ) ) { | |
| 297 | 295 | return false; |
| 298 | 296 | } |
| 299 | 297 | |
| 300 | 298 | $data = array(); |
| @@ -303,11 +301,8 @@ | ||
| 303 | 301 | $data['visualizer-chart-type'] = get_post_meta( $post_id, Visualizer_Plugin::CF_CHART_TYPE, true ); |
| 304 | 302 | |
| 305 | 303 | $library = get_post_meta( $post_id, Visualizer_Plugin::CF_CHART_LIBRARY, true ); |
| 306 | 304 | $data['visualizer-chart-library'] = $library; |
| 307 | - if ( 'd3' === $library ) { | |
| 308 | - $data['visualizer-d3-code'] = get_post_meta( $post_id, Visualizer_Module_AIBuilder::CF_D3_CODE, true ); | |
| 309 | - } | |
| 310 | 305 | |
| 311 | 306 | $data['visualizer-source'] = get_post_meta( $post_id, Visualizer_Plugin::CF_SOURCE, true ); |
| 312 | 307 | |
| 313 | 308 | $data['visualizer-default-data'] = get_post_meta( $post_id, Visualizer_Plugin::CF_DEFAULT_DATA, true ); |
| @@ -313,14 +308,9 @@ | ||
| 313 | 308 | $data['visualizer-default-data'] = get_post_meta( $post_id, Visualizer_Plugin::CF_DEFAULT_DATA, true ); |
| 314 | 309 | |
| 315 | 310 | // faetch and update settings |
| 316 | 311 | $data['visualizer-settings'] = get_post_meta( $post_id, Visualizer_Plugin::CF_SETTINGS, true ); |
| 317 | - if ( ! is_array( $data['visualizer-settings'] ) ) { | |
| 318 | - $data['visualizer-settings'] = array(); | |
| 319 | - } | |
| 320 | - if ( empty( $data['visualizer-settings']['pagination'] ) ) { | |
| 321 | - $data['visualizer-settings']['pageSize'] = ''; | |
| 322 | - } | |
| 312 | + | |
| 323 | 313 | // handle series filter hooks |
| 324 | 314 | $data['visualizer-series'] = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $post_id, Visualizer_Plugin::CF_SERIES, true ), $post_id, $data['visualizer-chart-type'] ); |
| 325 | 315 | |
| 326 | 316 | // handle settings filter hooks |
| @@ -326,20 +316,10 @@ | ||
| 326 | 316 | // handle settings filter hooks |
| 327 | 317 | $data['visualizer-settings'] = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SETTINGS, $data['visualizer-settings'], $post_id, $data['visualizer-chart-type'] ); |
| 328 | 318 | |
| 329 | 319 | // handle data filter hooks |
| 330 | - $data['visualizer-data'] = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, Visualizer_Module::decode_content( html_entity_decode( get_post_field( 'post_content', $post_id, 'raw' ) ) ), $post_id, $data['visualizer-chart-type'] ); | |
| 320 | + $data['visualizer-data'] = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( html_entity_decode( get_the_content( $post_id ) ) ), $post_id, $data['visualizer-chart-type'] ); | |
| 331 | 321 | |
| 332 | - // we are going to format only for tabular charts, because we are not sure of the effect on others. | |
| 333 | - // this is to solve the case where boolean data shows up as all-ticks on gutenberg. | |
| 334 | - if ( in_array( $data['visualizer-chart-type'], array( 'tabular' ), true ) ) { | |
| 335 | - $data['visualizer-data'] = $this->format_chart_data( $data['visualizer-data'], $data['visualizer-series'] ); | |
| 336 | - } | |
| 337 | - | |
| 338 | - if ( ! isset( $data['visualizer-settings']['hAxis']['format'] ) ) { | |
| 339 | - $data['visualizer-settings']['hAxis']['format'] = ''; | |
| 340 | - } | |
| 341 | - | |
| 342 | 322 | $data['visualizer-data-exploded'] = ''; |
| 343 | 323 | // handle annotations for google charts |
| 344 | 324 | if ( 'GoogleCharts' === $library ) { |
| 345 | 325 | // this will contain the data of both axis. |
| @@ -356,12 +336,8 @@ | ||
| 356 | 336 | if ( ! empty( $serie['role'] ) ) { |
| 357 | 337 | // this series is some kind of annotation, so let's collect its index. |
| 358 | 338 | // the index will be +1 because the X axis value is index 0, which is being ignored. |
| 359 | 339 | $annotations[ 'role' . ( intval( $index ) + 1 ) ] = $serie['role']; |
| 360 | - | |
| 361 | - if ( isset( $data['visualizer-series'][ intval( $index ) + 1 ] ) ) { | |
| 362 | - $data['visualizer-series'][ intval( $index ) + 1 ]['role'] = $serie['role']; | |
| 363 | - } | |
| 364 | 340 | } |
| 365 | 341 | } |
| 366 | 342 | } |
| 367 | 343 | if ( ! empty( $annotations ) ) { |
| @@ -406,10 +382,10 @@ | ||
| 406 | 382 | $json_root = get_post_meta( $post_id, Visualizer_Plugin::CF_JSON_ROOT, true ); |
| 407 | 383 | |
| 408 | 384 | $json_paging = get_post_meta( $post_id, Visualizer_Plugin::CF_JSON_PAGING, true ); |
| 409 | 385 | |
| 410 | - if ( ! empty( $import ) && $schedule >= 0 ) { | |
| 411 | - $data['visualizer-chart-url'] = $import; | |
| 386 | + if ( ! empty( $import ) && ! empty( $schedule ) ) { | |
| 387 | + $data['visualizer-chart-url'] = $import; | |
| 412 | 388 | $data['visualizer-chart-schedule'] = $schedule; |
| 413 | 389 | } |
| 414 | 390 | |
| 415 | 391 | if ( ! empty( $db_schedule ) && ! empty( $db_query ) ) { |
| @@ -428,34 +404,218 @@ | ||
| 428 | 404 | } |
| 429 | 405 | } |
| 430 | 406 | |
| 431 | 407 | if ( Visualizer_Module::is_pro() ) { |
| 432 | - $permissions = get_post_meta( $post_id, Visualizer_Pro::CF_PERMISSIONS, true ); | |
| 408 | + $permissions = get_post_meta( $post_id, Visualizer_PRO::CF_PERMISSIONS, true ); | |
| 433 | 409 | |
| 434 | - if ( empty( $permissions ) ) { | |
| 435 | - $permissions = array( | |
| 436 | - 'permissions' => array( | |
| 437 | - 'read' => 'all', | |
| 438 | - 'edit' => 'roles', | |
| 439 | - 'edit-specific' => array( 'administrator' ), | |
| 440 | - ), | |
| 441 | - ); | |
| 410 | + if ( ! empty( $permissions ) ) { | |
| 411 | + $data['visualizer-permissions'] = $permissions; | |
| 442 | 412 | } |
| 413 | + } | |
| 443 | 414 | |
| 444 | - $data['visualizer-permissions'] = $permissions; | |
| 415 | + return $data; | |
| 416 | + } | |
| 417 | + | |
| 418 | + /** | |
| 419 | + * Returns the data for the query. | |
| 420 | + * | |
| 421 | + * @access public | |
| 422 | + */ | |
| 423 | + public function get_query_data( $data ) { | |
| 424 | + if ( ! current_user_can( 'edit_posts' ) ) { | |
| 425 | + return false; | |
| 445 | 426 | } |
| 446 | 427 | |
| 447 | - return $data; | |
| 428 | + $source = new Visualizer_Source_Query( stripslashes( $data['query'] ) ); | |
| 429 | + $html = $source->fetch( true ); | |
| 430 | + $source->fetch( false ); | |
| 431 | + $name = $source->getSourceName(); | |
| 432 | + $series = $source->getSeries(); | |
| 433 | + $data = $source->getRawData(); | |
| 434 | + $error = ''; | |
| 435 | + if ( empty( $html ) ) { | |
| 436 | + $error = $source->get_error(); | |
| 437 | + wp_send_json_error( array( 'msg' => $error ) ); | |
| 438 | + } | |
| 439 | + wp_send_json_success( array( 'table' => $html, 'name' => $name, 'series' => $series, 'data' => $data ) ); | |
| 448 | 440 | } |
| 449 | 441 | |
| 450 | 442 | /** |
| 443 | + * Returns the JSON root. | |
| 444 | + * | |
| 445 | + * @access public | |
| 446 | + */ | |
| 447 | + public function get_json_root_data( $data ) { | |
| 448 | + if ( ! current_user_can( 'edit_posts' ) ) { | |
| 449 | + return false; | |
| 450 | + } | |
| 451 | + | |
| 452 | + $source = new Visualizer_Source_Json( $data ); | |
| 453 | + | |
| 454 | + $roots = $source->fetchRoots(); | |
| 455 | + if ( empty( $roots ) ) { | |
| 456 | + wp_send_json_error( array( 'msg' => $source->get_error() ) ); | |
| 457 | + } | |
| 458 | + | |
| 459 | + wp_send_json_success( array( 'url' => $data['url'], 'roots' => $roots ) ); | |
| 460 | + } | |
| 461 | + | |
| 462 | + /** | |
| 463 | + * Returns the JSON data. | |
| 464 | + * | |
| 465 | + * @access public | |
| 466 | + */ | |
| 467 | + public function get_json_data( $data ) { | |
| 468 | + if ( ! current_user_can( 'edit_posts' ) ) { | |
| 469 | + return false; | |
| 470 | + } | |
| 471 | + | |
| 472 | + $chart_id = $data['chart']; | |
| 473 | + | |
| 474 | + if ( empty( $chart_id ) ) { | |
| 475 | + wp_die(); | |
| 476 | + } | |
| 477 | + | |
| 478 | + $source = new Visualizer_Source_Json( $data ); | |
| 479 | + $source->fetch(); | |
| 480 | + $table = $source->getRawData(); | |
| 481 | + | |
| 482 | + if ( empty( $table ) ) { | |
| 483 | + wp_send_json_error( array( 'msg' => esc_html__( 'Unable to fetch data from the endpoint. Please try again.', 'visualizer' ) ) ); | |
| 484 | + } | |
| 485 | + | |
| 486 | + $table = Visualizer_Render_Layout::show( 'editor-table', $table, $chart_id, 'viz-json-table', false, false ); | |
| 487 | + wp_send_json_success( array( 'table' => $table, 'root' => $data['root'], 'url' => $data['url'], 'paging' => $source->getPaginationElements() ) ); | |
| 488 | + } | |
| 489 | + | |
| 490 | + /** | |
| 491 | + * Set the JSON data. | |
| 492 | + * | |
| 493 | + * @access public | |
| 494 | + */ | |
| 495 | + public function set_json_data( $data ) { | |
| 496 | + if ( ! current_user_can( 'edit_posts' ) ) { | |
| 497 | + return false; | |
| 498 | + } | |
| 499 | + | |
| 500 | + $source = new Visualizer_Source_Json( $data ); | |
| 501 | + | |
| 502 | + $table = $source->fetch(); | |
| 503 | + if ( empty( $table ) ) { | |
| 504 | + wp_send_json_error( array( 'msg' => esc_html__( 'Unable to fetch data from the endpoint. Please try again.', 'visualizer' ) ) ); | |
| 505 | + } | |
| 506 | + | |
| 507 | + $source->fetchFromEditableTable(); | |
| 508 | + $name = $source->getSourceName(); | |
| 509 | + $series = json_encode( $source->getSeries() ); | |
| 510 | + $data = json_encode( $source->getRawData() ); | |
| 511 | + wp_send_json_success( array( 'name' => $name, 'series' => $series, 'data' => $data ) ); | |
| 512 | + } | |
| 513 | + | |
| 514 | + /** | |
| 515 | + * Rest Callback Method | |
| 516 | + */ | |
| 517 | + public function update_chart_data( $data ) { | |
| 518 | + if ( ! current_user_can( 'edit_posts' ) ) { | |
| 519 | + return false; | |
| 520 | + } | |
| 521 | + | |
| 522 | + if ( $data['id'] && ! is_wp_error( $data['id'] ) ) { | |
| 523 | + | |
| 524 | + $chart_type = sanitize_text_field( $data['visualizer-chart-type'] ); | |
| 525 | + $source_type = sanitize_text_field( $data['visualizer-source'] ); | |
| 526 | + | |
| 527 | + update_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_TYPE, $chart_type ); | |
| 528 | + update_post_meta( $data['id'], Visualizer_Plugin::CF_SOURCE, $source_type ); | |
| 529 | + update_post_meta( $data['id'], Visualizer_Plugin::CF_DEFAULT_DATA, $data['visualizer-default-data'] ); | |
| 530 | + update_post_meta( $data['id'], Visualizer_Plugin::CF_SERIES, $data['visualizer-series'] ); | |
| 531 | + update_post_meta( $data['id'], Visualizer_Plugin::CF_SETTINGS, $data['visualizer-settings'] ); | |
| 532 | + | |
| 533 | + if ( $data['visualizer-chart-url'] && $data['visualizer-chart-schedule'] ) { | |
| 534 | + $chart_url = esc_url_raw( $data['visualizer-chart-url'] ); | |
| 535 | + $chart_schedule = intval( $data['visualizer-chart-schedule'] ); | |
| 536 | + update_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_URL, $chart_url ); | |
| 537 | + apply_filters( 'visualizer_pro_chart_schedule', $data['id'], $chart_url, $chart_schedule ); | |
| 538 | + } else { | |
| 539 | + delete_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_URL ); | |
| 540 | + apply_filters( 'visualizer_pro_remove_schedule', $data['id'] ); | |
| 541 | + } | |
| 542 | + | |
| 543 | + if ( $source_type === 'Visualizer_Source_Query' ) { | |
| 544 | + $db_schedule = intval( $data['visualizer-db-schedule'] ); | |
| 545 | + $db_query = $data['visualizer-db-query']; | |
| 546 | + update_post_meta( $data['id'], Visualizer_Plugin::CF_DB_SCHEDULE, $db_schedule ); | |
| 547 | + update_post_meta( $data['id'], Visualizer_Plugin::CF_DB_QUERY, stripslashes( $db_query ) ); | |
| 548 | + } else { | |
| 549 | + delete_post_meta( $data['id'], Visualizer_Plugin::CF_DB_SCHEDULE ); | |
| 550 | + delete_post_meta( $data['id'], Visualizer_Plugin::CF_DB_QUERY ); | |
| 551 | + } | |
| 552 | + | |
| 553 | + if ( $source_type === 'Visualizer_Source_Json' ) { | |
| 554 | + $json_schedule = intval( $data['visualizer-json-schedule'] ); | |
| 555 | + $json_url = esc_url_raw( $data['visualizer-json-url'] ); | |
| 556 | + $json_headers = esc_url_raw( $data['visualizer-json-headers'] ); | |
| 557 | + $json_root = $data['visualizer-json-root']; | |
| 558 | + $json_paging = $data['visualizer-json-paging']; | |
| 559 | + | |
| 560 | + update_post_meta( $data['id'], Visualizer_Plugin::CF_JSON_SCHEDULE, $json_schedule ); | |
| 561 | + update_post_meta( $data['id'], Visualizer_Plugin::CF_JSON_URL, $json_url ); | |
| 562 | + update_post_meta( $data['id'], Visualizer_Plugin::CF_JSON_HEADERS, $json_headers ); | |
| 563 | + update_post_meta( $data['id'], Visualizer_Plugin::CF_JSON_ROOT, $json_root ); | |
| 564 | + | |
| 565 | + if ( ! empty( $json_paging ) ) { | |
| 566 | + update_post_meta( $data['id'], Visualizer_Plugin::CF_JSON_PAGING, $json_paging ); | |
| 567 | + } else { | |
| 568 | + delete_post_meta( $data['id'], Visualizer_Plugin::CF_JSON_PAGING ); | |
| 569 | + } | |
| 570 | + } else { | |
| 571 | + delete_post_meta( $data['id'], Visualizer_Plugin::CF_JSON_SCHEDULE ); | |
| 572 | + delete_post_meta( $data['id'], Visualizer_Plugin::CF_JSON_URL ); | |
| 573 | + delete_post_meta( $data['id'], Visualizer_Plugin::CF_JSON_HEADERS ); | |
| 574 | + delete_post_meta( $data['id'], Visualizer_Plugin::CF_JSON_ROOT ); | |
| 575 | + delete_post_meta( $data['id'], Visualizer_Plugin::CF_JSON_PAGING ); | |
| 576 | + } | |
| 577 | + | |
| 578 | + if ( Visualizer_Module::is_pro() ) { | |
| 579 | + update_post_meta( $data['id'], Visualizer_PRO::CF_PERMISSIONS, $data['visualizer-permissions'] ); | |
| 580 | + } | |
| 581 | + | |
| 582 | + if ( $data['visualizer-chart-url'] ) { | |
| 583 | + $chart_url = esc_url_raw( $data['visualizer-chart-url'] ); | |
| 584 | + $content['source'] = $chart_url; | |
| 585 | + $content['data'] = $this->format_chart_data( $data['visualizer-data'], $data['visualizer-series'] ); | |
| 586 | + } else { | |
| 587 | + $content = $this->format_chart_data( $data['visualizer-data'], $data['visualizer-series'] ); | |
| 588 | + } | |
| 589 | + | |
| 590 | + $chart = array( | |
| 591 | + 'ID' => $data['id'], | |
| 592 | + 'post_content' => serialize( $content ), | |
| 593 | + ); | |
| 594 | + | |
| 595 | + wp_update_post( $chart ); | |
| 596 | + | |
| 597 | + $revisions = wp_get_post_revisions( $data['id'], array( 'order' => 'ASC' ) ); | |
| 598 | + | |
| 599 | + if ( count( $revisions ) > 1 ) { | |
| 600 | + $revision_ids = array_keys( $revisions ); | |
| 601 | + | |
| 602 | + // delete all revisions. | |
| 603 | + foreach ( $revision_ids as $id ) { | |
| 604 | + wp_delete_post_revision( $id ); | |
| 605 | + } | |
| 606 | + } | |
| 607 | + | |
| 608 | + return new \WP_REST_Response( array( 'success' => sprintf( 'Chart updated' ) ) ); | |
| 609 | + } | |
| 610 | + } | |
| 611 | + | |
| 612 | + /** | |
| 451 | 613 | * Format chart data. |
| 452 | - * | |
| 453 | - * Note: No matter how tempted, don't use the similar method from Visualizer_Source. That works on a different structure. | |
| 454 | 614 | */ |
| 455 | 615 | public function format_chart_data( $data, $series ) { |
| 456 | 616 | foreach ( $series as $i => $row ) { |
| 457 | - // if no value exists for the series, then add null | |
| 617 | + // if no value exists for the seires, then add null | |
| 458 | 618 | if ( ! isset( $series[ $i ] ) ) { |
| 459 | 619 | $series[ $i ] = null; |
| 460 | 620 | } |
| 461 | 621 | |
| @@ -462,38 +622,39 @@ | ||
| 462 | 622 | if ( is_null( $series[ $i ] ) ) { |
| 463 | 623 | continue; |
| 464 | 624 | } |
| 465 | 625 | |
| 466 | - switch ( $row['type'] ) { | |
| 467 | - case 'number': | |
| 468 | - foreach ( $data as $o => $col ) { | |
| 469 | - $data[ $o ][ $i ] = ( is_numeric( $col[ $i ] ) ) ? floatval( $col[ $i ] ) : ( is_numeric( str_replace( ',', '', $col[ $i ] ) ) ? floatval( str_replace( ',', '', $col[ $i ] ) ) : null ); | |
| 626 | + if ( $row['type'] === 'number' ) { | |
| 627 | + foreach ( $data as $o => $col ) { | |
| 628 | + $data[ $o ][ $i ] = ( is_numeric( $col[ $i ] ) ) ? floatval( $col[ $i ] ) : ( is_numeric( str_replace( ',', '', $col[ $i ] ) ) ? floatval( str_replace( ',', '', $col[ $i ] ) ) : null ); | |
| 629 | + } | |
| 630 | + } | |
| 631 | + | |
| 632 | + if ( $row['type'] === 'boolean' ) { | |
| 633 | + foreach ( $data as $o => $col ) { | |
| 634 | + $data[ $o ][ $i ] = ! empty( $col[ $i ] ) ? filter_validate( $col[ $i ], FILTER_VALIDATE_BOOLEAN ) : null; | |
| 635 | + } | |
| 636 | + } | |
| 637 | + | |
| 638 | + if ( $row['type'] === 'timeofday' ) { | |
| 639 | + foreach ( $data as $o => $col ) { | |
| 640 | + $date = new DateTime( '1984-03-16T' . $col[ $i ] ); | |
| 641 | + if ( $date ) { | |
| 642 | + $data[ $o ][ $i ] = array( | |
| 643 | + intval( $date->format( 'H' ) ), | |
| 644 | + intval( $date->format( 'i' ) ), | |
| 645 | + intval( $date->format( 's' ) ), | |
| 646 | + 0, | |
| 647 | + ); | |
| 470 | 648 | } |
| 471 | - break; | |
| 472 | - case 'boolean': | |
| 473 | - foreach ( $data as $o => $col ) { | |
| 474 | - $data[ $o ][ $i ] = ! empty( $col[ $i ] ) ? filter_var( $col[ $i ], FILTER_VALIDATE_BOOLEAN ) : false; | |
| 475 | - } | |
| 476 | - break; | |
| 477 | - case 'timeofday': | |
| 478 | - foreach ( $data as $o => $col ) { | |
| 479 | - $date = new DateTime( '1984-03-16T' . $col[ $i ] ); | |
| 480 | - if ( $date ) { | |
| 481 | - $data[ $o ][ $i ] = array( | |
| 482 | - intval( $date->format( 'H' ) ), | |
| 483 | - intval( $date->format( 'i' ) ), | |
| 484 | - intval( $date->format( 's' ) ), | |
| 485 | - 0, | |
| 486 | - ); | |
| 487 | - } | |
| 488 | - } | |
| 489 | - break; | |
| 490 | - case 'string': | |
| 491 | - foreach ( $data as $o => $col ) { | |
| 492 | - $data[ $o ][ $i ] = $this->toUTF8( $col[ $i ] ); | |
| 493 | - } | |
| 494 | - break; | |
| 649 | + } | |
| 495 | 650 | } |
| 651 | + | |
| 652 | + if ( $row['type'] === 'string' ) { | |
| 653 | + foreach ( $data as $o => $col ) { | |
| 654 | + $data[ $o ][ $i ] = $this->toUTF8( $col[ $i ] ); | |
| 655 | + } | |
| 656 | + } | |
| 496 | 657 | } |
| 497 | 658 | |
| 498 | 659 | return $data; |
| 499 | 660 | } |
| @@ -505,8 +666,82 @@ | ||
| 505 | 666 | if ( ! function_exists( 'mb_detect_encoding' ) || mb_detect_encoding( $datum ) !== 'ASCII' ) { |
| 506 | 667 | $datum = \ForceUTF8\Encoding::toUTF8( $datum ); |
| 507 | 668 | } |
| 508 | 669 | return $datum; |
| 670 | + } | |
| 671 | + | |
| 672 | + /** | |
| 673 | + * Handle remote CSV data | |
| 674 | + */ | |
| 675 | + public function upload_csv_data( $data ) { | |
| 676 | + if ( ! current_user_can( 'edit_posts' ) ) { | |
| 677 | + return false; | |
| 678 | + } | |
| 679 | + | |
| 680 | + if ( $data['url'] && ! is_wp_error( $data['url'] ) && filter_var( $data['url'], FILTER_VALIDATE_URL ) ) { | |
| 681 | + $source = new Visualizer_Source_Csv_Remote( $data['url'] ); | |
| 682 | + if ( $source->fetch() ) { | |
| 683 | + $temp = $source->getData(); | |
| 684 | + if ( is_string( $temp ) && is_array( unserialize( $temp ) ) ) { | |
| 685 | + $content['series'] = $source->getSeries(); | |
| 686 | + $content['data'] = $source->getRawData(); | |
| 687 | + return $content; | |
| 688 | + } else { | |
| 689 | + return new \WP_REST_Response( array( 'failed' => sprintf( 'Invalid CSV URL' ) ) ); | |
| 690 | + } | |
| 691 | + } else { | |
| 692 | + return new \WP_REST_Response( array( 'failed' => sprintf( 'Invalid CSV URL' ) ) ); | |
| 693 | + } | |
| 694 | + } else { | |
| 695 | + return new \WP_REST_Response( array( 'failed' => sprintf( 'Invalid CSV URL' ) ) ); | |
| 696 | + } | |
| 697 | + } | |
| 698 | + | |
| 699 | + /** | |
| 700 | + * Get permission data | |
| 701 | + */ | |
| 702 | + public function get_permission_data( $data ) { | |
| 703 | + if ( ! current_user_can( 'edit_posts' ) ) { | |
| 704 | + return false; | |
| 705 | + } | |
| 706 | + | |
| 707 | + $options = array(); | |
| 708 | + switch ( $data['type'] ) { | |
| 709 | + case 'users': | |
| 710 | + $query = new WP_User_Query( | |
| 711 | + array( | |
| 712 | + 'number' => 1000, | |
| 713 | + 'orderby' => 'display_name', | |
| 714 | + 'fields' => array( 'ID', 'display_name' ), | |
| 715 | + 'count_total' => false, | |
| 716 | + ) | |
| 717 | + ); | |
| 718 | + $users = $query->get_results(); | |
| 719 | + if ( ! empty( $users ) ) { | |
| 720 | + $i = 0; | |
| 721 | + foreach ( $users as $user ) { | |
| 722 | + $options[ $i ]['value'] = $user->ID; | |
| 723 | + $options[ $i ]['label'] = $user->display_name; | |
| 724 | + $i++; | |
| 725 | + } | |
| 726 | + } | |
| 727 | + break; | |
| 728 | + case 'roles': | |
| 729 | + if ( ! function_exists( 'get_editable_roles' ) ) { | |
| 730 | + require_once ABSPATH . 'wp-admin/includes/user.php'; | |
| 731 | + } | |
| 732 | + $roles = get_editable_roles(); | |
| 733 | + if ( ! empty( $roles ) ) { | |
| 734 | + $i = 0; | |
| 735 | + foreach ( get_editable_roles() as $name => $info ) { | |
| 736 | + $options[ $i ]['value'] = $name; | |
| 737 | + $options[ $i ]['label'] = $name; | |
| 738 | + $i++; | |
| 739 | + } | |
| 740 | + } | |
| 741 | + break; | |
| 742 | + } | |
| 743 | + return $options; | |
| 509 | 744 | } |
| 510 | 745 | |
| 511 | 746 | /** |
| 512 | 747 | * Filter Rest Query |
