diff --git a/admin/core/um-admin-columns.php b/admin/core/um-admin-columns.php index 596d72fc..27699ee9 100644 --- a/admin/core/um-admin-columns.php +++ b/admin/core/um-admin-columns.php @@ -26,8 +26,6 @@ class UM_Admin_Columns { $new_columns['title'] = __('Title'); $new_columns['mode'] = __('Type') . $admin->_tooltip( 'This is the type of the form' ); $new_columns['shortcode'] = __('Shortcode') . $admin->_tooltip( 'Use this shortcode to display the form' ); - $new_columns['impressions'] = __('Impressions') . $admin->_tooltip( 'The total number of times this form has been viewed' ); - $new_columns['conversions'] = __('Conversions') . $admin->_tooltip( 'The total number of conversions. e.g. Successful sign-ups' ); $new_columns['date'] = __('Date'); return $new_columns; @@ -72,23 +70,6 @@ class UM_Admin_Columns { echo ''. $ultimatemember->form->display_form_type($mode, $id) . ''; break; - case 'impressions': - $impressions = $ultimatemember->query->get_attr('impressions', $id); - echo (!empty( $impressions )) ? $impressions : 'N/A'; - break; - - case 'conversions': - $impressions = $ultimatemember->query->get_attr('impressions', $id); - $conversions = $ultimatemember->query->get_attr('conversions', $id); - - if ($impressions && $conversions){ - $pct = ($conversions / $impressions) * 100; - $pct = round($pct, 2); - } - - echo (!empty( $conversions )) ? $conversions . '' . '(' . $pct . '%)' : 'N/A'; - break; - } } diff --git a/core/um-actions-register.php b/core/um-actions-register.php index 524d478d..b6a8b13e 100644 --- a/core/um-actions-register.php +++ b/core/um-actions-register.php @@ -87,6 +87,10 @@ um_fetch_user( $user_id ); + if ( !isset( $args['role'] ) ) { + $role = um_get_option('default_role'); + } + $ultimatemember->user->set_role( $role ); $ultimatemember->user->set_registration_details( $args['submitted'] ); @@ -205,6 +209,8 @@ global $ultimatemember; + if ( isset( $args['custom_fields']['role_select'] ) || isset( $args['custom_fields']['role_radio'] ) ) return; + if (isset($args['role']) && !empty($args['role'])){ echo ''; diff --git a/core/um-actions-tracking.php b/core/um-actions-tracking.php index 7222ea16..e69de29b 100644 --- a/core/um-actions-tracking.php +++ b/core/um-actions-tracking.php @@ -1,25 +0,0 @@ -form->add_pageview( $form_id, $impressions ); - } - } - - /*** - *** @track a successful event - ***/ - add_action('track_approved_user_login', 'um_add_conversion'); - add_action('track_approved_user_registration', 'um_add_conversion'); - function um_add_conversion($args){ - global $ultimatemember; - extract($args); - $ultimatemember->form->add_conversion( $form_id ); - } \ No newline at end of file diff --git a/core/um-fields.php b/core/um-fields.php index d1b31f6b..1c3fdad2 100644 --- a/core/um-fields.php +++ b/core/um-fields.php @@ -1279,6 +1279,9 @@ class UM_Fields { /* Select dropdown */ case 'select': + + $form_key = str_replace('role_select','role',$key); + $output .= '