use parameter name 'vaction'

Author: contactashish13

classes/Visualizer/Module/Admin.php

@@ -598,7 +598,7 @@ public function registerAdminMenu() {
 			__( 'Add New Chart', 'visualizer' ),
 			__( 'Add New Chart', 'visualizer' ),
 			'edit_posts',
-			admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME . '&addnew' )
+			admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME . '&vaction=addnew' )
 		);
 		add_submenu_page(
 			Visualizer_Plugin::NAME,
@@ -760,22 +760,22 @@ public function renderLibraryPage() {
 				'map_api_key' => get_option( 'visualizer-map-api-key' ),
 				'charts' => $charts,
 				'urls'   => array(
-					'base'   => add_query_arg( array( 'vpage' => false, 'addnew' => false ) ),
+					'base'   => add_query_arg( array( 'vpage' => false, 'vaction' => false ) ),
 					'create' => add_query_arg(
 						array(
 							'action'  => Visualizer_Plugin::ACTION_CREATE_CHART,
 							'library' => 'yes',
 							'type'      => isset( $_GET['type'] ) ? $_GET['type'] : '',
 							'chart-library'      => isset( $_GET['chart-library'] ) ? $_GET['chart-library'] : '',
-							'addnew' => false,
+							'vaction' => false,
 						),
 						$ajaxurl
 					),
 					'edit'   => add_query_arg(
 						array(
 							'action'  => Visualizer_Plugin::ACTION_EDIT_CHART,
 							'library' => 'yes',
-							'addnew' => false,
+							'vaction' => false,
 						),
 						$ajaxurl
 					),
@@ -792,7 +792,7 @@ public function renderLibraryPage() {
 		$render->custom_css     = $css;
 		$render->pagination = paginate_links(
 			array(
-				'base'    => add_query_arg( array( 'vpage' => '%#%', 'addnew' => false ) ),
+				'base'    => add_query_arg( array( 'vpage' => '%#%', 'vaction' => false ) ),
 				'format'  => '',
 				'current' => $page,
 				'total'   => $query->max_num_pages,

classes/Visualizer/Module/Chart.php

@@ -380,7 +380,7 @@ public function deleteChart() {
 				)
 			);
 		}
-		wp_redirect( remove_query_arg( 'addnew', wp_get_referer() ) );
+		wp_redirect( remove_query_arg( 'vaction', wp_get_referer() ) );
 		exit;
 	}
 
@@ -1040,7 +1040,7 @@ public function cloneChart() {
 				$success = $chart && $chart->post_type === Visualizer_Plugin::CPT_VISUALIZER;
 			}
 		}
-		$redirect = remove_query_arg( 'addnew', wp_get_referer() );
+		$redirect = remove_query_arg( 'vaction', wp_get_referer() );
 		if ( $success ) {
 			$new_chart_id = wp_insert_post(
 				array(
@@ -1061,7 +1061,7 @@ public function cloneChart() {
 					array(
 						'page' => 'visualizer',
 						'type' => filter_input( INPUT_GET, 'type' ),
-						'addnew' => false,
+						'vaction' => false,
 					),
 					admin_url( 'upload.php' )
 				);

js/library.js

@@ -75,9 +75,9 @@
 
             // remove the 'type' while refreshing the library page on creation of a new chart.
             // this is to avoid cases where users have filtered for chart type A and end up creating chart type B
-            // remove 'addnew' as well so that the popup doesnt keep popping up.
+            // remove 'vaction' as well so that additional actions are removed
             wnd.send_to_editor = function () {
-                wnd.location.href = vu.base.replace(/type=[a-zA-Z]*/, '').replace(/addnew/, '');
+                wnd.location.href = vu.base.replace(/type=[a-zA-Z]*/, '').replace(/vaction/, '');
             };
             view.open();
 
@@ -89,7 +89,7 @@
                 view = new vmv.Chart({action: vu.edit + '&chart=' + $(this).attr('data-chart')});
 
             wnd.send_to_editor = function () {
-                wnd.location.href = wnd.location.href.replace(/addnew/, '');
+                wnd.location.href = wnd.location.href.replace(/vaction/, '');
             };
 
             view.open();
@@ -118,8 +118,8 @@
             return false;
         });
 
-        // if addnew is found as a GET request parameter, show the modal.
-        if(location.href.indexOf('addnew') !== -1){
+        // if vaction=addnew is found as a GET request parameter, show the modal.
+        if(location.href.indexOf('vaction=addnew') !== -1){
             $('.add-new-chart').trigger('click');
         }