Trying to fix ajax calls

diff --git a/functions.php b/functions.php
index a8c9a6a..dafa140 100755 (executable)
--- a/functions.php
+++ b/functions.php
@@ -130,11 +130,11 @@ add_filter( 'loop_shop_per_page', create_function( '$cols', 'return 48;' ), 20 )
 
 function redirect_user_on_role()
 {
-    if(isset($_REQUEST['action']) && $_REQUEST['action']=='AJAXfunctionCall'):
+    if(isset($_REQUEST['action']) && $_REQUEST['action']=='redirect_user_on_role'):
         do_action( 'wp_ajax_' . $_REQUEST['action'] );
         do_action( 'wp_ajax_nopriv_' . $_REQUEST['action'] );
     endif;
-    if (!current_user_can('publish_pages') && $_REQUEST['action']!='AJAXfunctionCall') {
+    if (!current_user_can('publish_pages') && $_REQUEST['action']!='redirect_user_on_role') {
         /* A non-admin, non-editor */
         wp_redirect( home_url() ); exit;
     }
@@ -147,9 +147,7 @@ function redirect_user_on_role()
     // if ($current_user->user_level > 8)
     
 }
-add_action('admin_init', 'redirect_user_on_role');
-add_action( 'wp_ajax_AJAXfunctionCall', 'JavascriptFunctionName' );
-add_action( 'wp_ajax_nopriv_AJAXfunctionCall', 'JavascriptFunctionName');   
+add_action('admin_init', 'redirect_user_on_role');   
 add_action( 'wp_ajax_AJAXfunctionCall', 'redirect_user_on_role' );
 add_action( 'wp_ajax_nopriv_AJAXfunctionCall', 'redirect_user_on_role');   
 ?>