| @@ -17,23 +17,30 @@ | ||
| 17 | 17 | if ( ! $this->tracking_allowed() ) { |
| 18 | 18 | return; |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | - $ep = 'aHR0cHM6Ly9mcm0tdXNlci10cmFja2luZy5oZXJva3VhcHAuY29tL3NuYXBzaG90'; | |
| 21 | + $ep = 'aHR0cHM6Ly91c2FnZTIuZm9ybWlkYWJsZWZvcm1zLmNvbS9zbmFwc2hvdA=='; | |
| 22 | 22 | // $ep = base64_encode( 'http://localhost:4567/snapshot' ); // Uncomment for testing |
| 23 | 23 | $body = json_encode( $this->snapshot() ); |
| 24 | 24 | |
| 25 | 25 | // Setup variable for wp_remote_request. |
| 26 | 26 | $post = array( |
| 27 | - 'method' => 'POST', | |
| 28 | - 'headers' => array( | |
| 27 | + 'method' => 'POST', | |
| 28 | + 'headers' => array( | |
| 29 | 29 | 'Accept' => 'application/json', |
| 30 | 30 | 'Content-Type' => 'application/json', |
| 31 | 31 | 'Content-Length' => strlen( $body ), |
| 32 | 32 | ), |
| 33 | - 'body' => $body, | |
| 33 | + 'body' => $body, | |
| 34 | + // Without this, Debug Log catches the `http_request_failed` error. | |
| 35 | + 'timeout' => 45, | |
| 34 | 36 | ); |
| 35 | 37 | |
| 38 | + // Remove time limit to execute this function. | |
| 39 | + if ( function_exists( 'set_time_limit' ) ) { | |
| 40 | + set_time_limit( 0 ); | |
| 41 | + } | |
| 42 | + | |
| 36 | 43 | wp_remote_request( base64_decode( $ep ), $post ); |
| 37 | 44 | } |
| 38 | 45 | |
| 39 | 46 | /** |
| @@ -64,35 +71,108 @@ | ||
| 64 | 71 | $theme_data = wp_get_theme(); |
| 65 | 72 | $form_counts = FrmForm::get_count(); |
| 66 | 73 | |
| 67 | 74 | $snap = array( |
| 68 | - 'uuid' => $this->uuid(), | |
| 69 | - 'admin_email' => '', // Let's keep it anonymous. | |
| 70 | - 'wp_version' => $wp_version, | |
| 71 | - 'php_version' => phpversion(), | |
| 72 | - 'mysql_version' => $wpdb->db_version(), | |
| 73 | - 'os' => FrmAppHelper::get_server_os(), | |
| 74 | - 'locale' => get_locale(), | |
| 75 | + 'uuid' => $this->uuid(), | |
| 76 | + // Let's keep it anonymous. | |
| 77 | + 'admin_email' => '', | |
| 78 | + 'wp_version' => $wp_version, | |
| 79 | + 'php_version' => phpversion(), | |
| 80 | + 'mysql_version' => $wpdb->db_version(), | |
| 81 | + 'os' => FrmAppHelper::get_server_os(), | |
| 82 | + 'locale' => get_locale(), | |
| 75 | 83 | |
| 76 | - 'active_license' => FrmAppHelper::pro_is_installed(), | |
| 77 | - 'form_count' => $form_counts->published, | |
| 78 | - 'entry_count' => FrmEntry::getRecordCount(), | |
| 79 | - 'timestamp' => gmdate( 'c' ), | |
| 84 | + 'active_license' => FrmAppHelper::pro_is_installed(), | |
| 85 | + 'form_count' => $form_counts->published, | |
| 86 | + 'entry_count' => FrmEntry::getRecordCount(), | |
| 87 | + 'timestamp' => gmdate( 'c' ), | |
| 80 | 88 | |
| 81 | - 'theme_name' => is_object( $theme_data ) ? $theme_data->Name : '', // phpcs:ignore WordPress.NamingConventions | |
| 82 | - 'plugins' => $this->plugins(), | |
| 83 | - 'settings' => array( | |
| 89 | + 'theme_name' => is_object( $theme_data ) ? $theme_data->Name : '', // phpcs:ignore WordPress.NamingConventions | |
| 90 | + 'plugins' => $this->plugins(), | |
| 91 | + 'settings' => array( | |
| 84 | 92 | $this->settings(), |
| 85 | 93 | ), |
| 86 | - 'forms' => $this->forms(), | |
| 87 | - 'fields' => $this->fields(), | |
| 88 | - 'actions' => $this->actions(), | |
| 94 | + 'forms' => $this->forms(), | |
| 95 | + 'fields' => $this->fields(), | |
| 96 | + 'actions' => $this->actions(), | |
| 97 | + | |
| 98 | + 'onboarding-wizard' => $this->onboarding_wizard(), | |
| 99 | + 'flows' => FrmUsageController::get_flows_data(), | |
| 100 | + 'payments' => $this->payments(), | |
| 101 | + 'subscriptions' => $this->payments( 'frm_subscriptions' ), | |
| 89 | 102 | ); |
| 90 | 103 | |
| 104 | + if ( method_exists( 'FrmProAddonsController', 'get_readable_license_type' ) ) { | |
| 105 | + $snap['active_license'] = FrmProAddonsController::get_readable_license_type(); | |
| 106 | + } | |
| 107 | + | |
| 91 | 108 | return apply_filters( 'frm_usage_snapshot', $snap ); |
| 92 | 109 | } |
| 93 | 110 | |
| 94 | 111 | /** |
| 112 | + * Gets onboarding wizard data. | |
| 113 | + * | |
| 114 | + * @since 6.16.1 | |
| 115 | + * | |
| 116 | + * @return array | |
| 117 | + */ | |
| 118 | + private function onboarding_wizard() { | |
| 119 | + $data = FrmOnboardingWizardController::get_usage_data(); | |
| 120 | + $skipped_keys = array( | |
| 121 | + 'default_email', | |
| 122 | + 'is_subscribed', | |
| 123 | + 'allows_tracking', | |
| 124 | + 'summary_emails', | |
| 125 | + 'installed_addons', | |
| 126 | + ); | |
| 127 | + | |
| 128 | + foreach ( $skipped_keys as $skipped_key ) { | |
| 129 | + unset( $data[ $skipped_key ] ); | |
| 130 | + } | |
| 131 | + | |
| 132 | + return $data; | |
| 133 | + } | |
| 134 | + | |
| 135 | + /** | |
| 136 | + * Gets payments data. | |
| 137 | + * | |
| 138 | + * @since 6.16.1 | |
| 139 | + * | |
| 140 | + * @param string $table Database table name. | |
| 141 | + * @return array | |
| 142 | + */ | |
| 143 | + private function payments( $table = 'frm_payments' ) { | |
| 144 | + $allowed_tables = array( 'frm_payments', 'frm_subscriptions' ); | |
| 145 | + if ( ! in_array( $table, $allowed_tables, true ) ) { | |
| 146 | + return array(); | |
| 147 | + } | |
| 148 | + | |
| 149 | + if ( ! FrmTransLiteAppHelper::payments_table_exists() ) { | |
| 150 | + return array(); | |
| 151 | + } | |
| 152 | + | |
| 153 | + global $wpdb; | |
| 154 | + $rows = $wpdb->get_results( | |
| 155 | + $wpdb->prepare( | |
| 156 | + 'SELECT amount, status, paysys, created_at FROM %1$s', | |
| 157 | + $wpdb->prefix . $table | |
| 158 | + ) | |
| 159 | + ); | |
| 160 | + | |
| 161 | + $payments = array(); | |
| 162 | + foreach ( $rows as $row ) { | |
| 163 | + $payments[] = array( | |
| 164 | + 'amount' => (float) $row->amount, | |
| 165 | + 'status' => $row->status, | |
| 166 | + 'gateway' => $row->paysys, | |
| 167 | + 'created_at' => $row->created_at, | |
| 168 | + ); | |
| 169 | + } | |
| 170 | + | |
| 171 | + return $payments; | |
| 172 | + } | |
| 173 | + | |
| 174 | + /** | |
| 95 | 175 | * @since 3.06.04 |
| 96 | 176 | * @return array |
| 97 | 177 | */ |
| 98 | 178 | private function plugins() { |
| @@ -100,12 +180,12 @@ | ||
| 100 | 180 | |
| 101 | 181 | $plugins = array(); |
| 102 | 182 | foreach ( $plugin_list as $slug => $info ) { |
| 103 | 183 | $plugins[] = array( |
| 104 | - 'name' => $info['Name'], | |
| 105 | - 'slug' => $slug, | |
| 106 | - 'version' => $info['Version'], | |
| 107 | - 'active' => is_plugin_active( $slug ), | |
| 184 | + 'name' => $info['Name'], | |
| 185 | + 'slug' => $slug, | |
| 186 | + 'version' => $info['Version'], | |
| 187 | + 'active' => is_plugin_active( $slug ), | |
| 108 | 188 | ); |
| 109 | 189 | } |
| 110 | 190 | |
| 111 | 191 | return $plugins; |
| @@ -117,18 +197,16 @@ | ||
| 117 | 197 | * @since 3.06.04 |
| 118 | 198 | * @return array |
| 119 | 199 | */ |
| 120 | 200 | private function settings() { |
| 121 | - $settings_list = FrmAppHelper::get_settings(); | |
| 122 | - $settings = array( | |
| 201 | + $settings_list = FrmAppHelper::get_settings(); | |
| 202 | + $settings = array( | |
| 123 | 203 | 'messages' => $this->messages( $settings_list ), |
| 124 | 204 | 'permissions' => $this->permissions( $settings_list ), |
| 125 | 205 | ); |
| 126 | 206 | $pass_settings = array( |
| 127 | 207 | 'load_style', |
| 128 | - 'use_html', | |
| 129 | 208 | 'fade_form', |
| 130 | - 'jquery_css', | |
| 131 | 209 | 're_type', |
| 132 | 210 | 're_lang', |
| 133 | 211 | 're_multi', |
| 134 | 212 | 'menu', |
| @@ -133,11 +211,19 @@ | ||
| 133 | 211 | 're_multi', |
| 134 | 212 | 'menu', |
| 135 | 213 | 'mu_menu', |
| 136 | 214 | 'no_ips', |
| 215 | + 'custom_header_ip', | |
| 216 | + 'enable_gdpr', | |
| 217 | + 'no_gdpr_cookies', | |
| 137 | 218 | 'btsp_css', |
| 138 | - 'btsp_errors', | |
| 219 | + 'btsp_version', | |
| 139 | 220 | 'admin_bar', |
| 221 | + 'summary_emails', | |
| 222 | + 'active_captcha', | |
| 223 | + 'honeypot', | |
| 224 | + 'wp_spam_check', | |
| 225 | + 'denylist_check', | |
| 140 | 226 | ); |
| 141 | 227 | |
| 142 | 228 | foreach ( $pass_settings as $setting ) { |
| 143 | 229 | if ( isset( $settings_list->$setting ) ) { |
| @@ -157,10 +243,8 @@ | ||
| 157 | 243 | * Include the permissions settings for each capability. |
| 158 | 244 | * |
| 159 | 245 | * @since 3.06.04 |
| 160 | 246 | * |
| 161 | - * @return array | |
| 162 | - * | |
| 163 | 247 | * @param FrmSettings $settings_list |
| 164 | 248 | * @return array |
| 165 | 249 | */ |
| 166 | 250 | private function messages( $settings_list ) { |
| @@ -174,11 +258,13 @@ | ||
| 174 | 258 | 'login_msg', |
| 175 | 259 | 'admin_permission', |
| 176 | 260 | ); |
| 177 | 261 | |
| 262 | + $default = $settings_list->default_options(); | |
| 263 | + | |
| 178 | 264 | $message_settings = array(); |
| 179 | 265 | foreach ( $messages as $message ) { |
| 180 | - $message_settings[ $message ] = $settings_list->$message; | |
| 266 | + $message_settings[ 'changed-' . $message ] = $settings_list->$message === $default[ $message ] ? 0 : 1; | |
| 181 | 267 | } |
| 182 | 268 | |
| 183 | 269 | return $message_settings; |
| 184 | 270 | } |
| @@ -210,10 +296,10 @@ | ||
| 210 | 296 | */ |
| 211 | 297 | private function forms() { |
| 212 | 298 | $s_query = array( |
| 213 | 299 | array( |
| 214 | - 'or' => 1, | |
| 215 | - 'parent_form_id' => null, | |
| 300 | + 'or' => 1, | |
| 301 | + 'parent_form_id' => null, | |
| 216 | 302 | 'parent_form_id <' => 1, |
| 217 | 303 | ), |
| 218 | 304 | ); |
| 219 | 305 | |
| @@ -221,10 +307,10 @@ | ||
| 221 | 307 | $forms = array(); |
| 222 | 308 | $settings = array( |
| 223 | 309 | 'form_class', |
| 224 | 310 | 'akismet', |
| 225 | - 'honeypot', | |
| 226 | 311 | 'antispam', |
| 312 | + 'stopforumspam', | |
| 227 | 313 | 'custom_style', |
| 228 | 314 | 'success_action', |
| 229 | 315 | 'show_form', |
| 230 | 316 | 'no_save', |
| @@ -253,28 +339,44 @@ | ||
| 253 | 339 | 'prev_value', |
| 254 | 340 | 'submit_conditions', |
| 255 | 341 | ); |
| 256 | 342 | |
| 343 | + $style = new FrmStyle(); | |
| 257 | 344 | foreach ( $saved_forms as $form ) { |
| 258 | 345 | $new_form = array( |
| 259 | - 'form_id' => $form->id, | |
| 260 | - 'description' => $form->description, | |
| 261 | - 'logged_in' => $form->logged_in, | |
| 262 | - 'editable' => $form->editable, | |
| 263 | - 'is_template' => $form->is_template, | |
| 264 | - 'entry_count' => FrmEntry::getRecordCount( $form->id ), | |
| 265 | - 'field_count' => $this->form_field_count( $form->id ), | |
| 346 | + 'form_id' => $form->id, | |
| 347 | + 'description' => $form->description, | |
| 348 | + 'logged_in' => $form->logged_in, | |
| 349 | + 'editable' => $form->editable, | |
| 350 | + 'is_template' => $form->is_template, | |
| 351 | + 'entry_count' => FrmEntry::getRecordCount( $form->id ), | |
| 352 | + 'field_count' => $this->form_field_count( $form->id ), | |
| 266 | 353 | 'form_action_count' => $this->form_action_count( $form->id ), |
| 267 | 354 | ); |
| 268 | 355 | |
| 269 | 356 | foreach ( $settings as $setting ) { |
| 270 | 357 | if ( isset( $form->options[ $setting ] ) ) { |
| 271 | - $new_form[ $setting ] = $this->maybe_json( $form->options[ $setting ] ); | |
| 358 | + if ( 'custom_style' === $setting ) { | |
| 359 | + $style->id = $form->options[ $setting ]; | |
| 360 | + | |
| 361 | + if ( ! $style->id ) { | |
| 362 | + $style_name = 0; | |
| 363 | + } elseif ( 1 === intval( $style->id ) ) { | |
| 364 | + $style_name = 'formidable-style'; | |
| 365 | + } else { | |
| 366 | + $style_post = $style->get_one(); | |
| 367 | + $style_name = $style_post ? $style_post->post_name : 'formidable-style'; | |
| 368 | + } | |
| 369 | + | |
| 370 | + $new_form[ $setting ] = $style_name; | |
| 371 | + } else { | |
| 372 | + $new_form[ $setting ] = $this->maybe_json( $form->options[ $setting ] ); | |
| 373 | + } | |
| 272 | 374 | } |
| 273 | 375 | } |
| 274 | 376 | |
| 275 | 377 | $forms[] = apply_filters( 'frm_usage_form', $new_form, compact( 'form' ) ); |
| 276 | - } | |
| 378 | + }//end foreach | |
| 277 | 379 | |
| 278 | 380 | // If the array uses numeric keys, reset them. |
| 279 | 381 | return $forms; |
| 280 | 382 | } |
| @@ -285,9 +387,9 @@ | ||
| 285 | 387 | */ |
| 286 | 388 | private function form_field_count( $form_id ) { |
| 287 | 389 | global $wpdb; |
| 288 | 390 | |
| 289 | - $join = $wpdb->prefix . 'frm_fields fi LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_forms fo ON (fi.form_id=fo.id)'; | |
| 391 | + $join = $wpdb->prefix . 'frm_fields fi JOIN ' . $wpdb->prefix . 'frm_forms fo ON (fi.form_id=fo.id)'; | |
| 290 | 392 | |
| 291 | 393 | $field_query = array( |
| 292 | 394 | 'or' => 1, |
| 293 | 395 | 'fi.form_id' => $form_id, |
| @@ -318,14 +420,14 @@ | ||
| 318 | 420 | * @since 3.06.04 |
| 319 | 421 | * @return array |
| 320 | 422 | */ |
| 321 | 423 | private function fields() { |
| 322 | - $args = array( | |
| 424 | + $args = array( | |
| 323 | 425 | 'limit' => 50, |
| 324 | 426 | 'order_by' => 'id DESC', |
| 325 | 427 | ); |
| 326 | 428 | |
| 327 | - $fields = FrmDb::get_results( 'frm_fields', array(), 'form_id, name, type, field_options', $args ); | |
| 429 | + $fields = FrmDb::get_results( 'frm_fields', array(), 'id, form_id, name, type, field_options', $args ); | |
| 328 | 430 | foreach ( $fields as $k => $field ) { |
| 329 | 431 | FrmAppHelper::unserialize_or_decode( $field->field_options ); |
| 330 | 432 | $fields[ $k ]->field_options = json_encode( $field->field_options ); |
| 331 | 433 | } |
| @@ -361,10 +463,9 @@ | ||
| 361 | 463 | * @since 3.06.04 |
| 362 | 464 | * @return bool |
| 363 | 465 | */ |
| 364 | 466 | private function tracking_allowed() { |
| 365 | - $settings = FrmAppHelper::get_settings(); | |
| 366 | - return $settings->tracking; | |
| 467 | + return FrmUsageController::tracking_allowed(); | |
| 367 | 468 | } |
| 368 | 469 | |
| 369 | 470 | /** |
| 370 | 471 | * @since 3.06.04 |
| @@ -373,5 +474,4 @@ | ||
| 373 | 474 | private function maybe_json( $value ) { |
| 374 | 475 | return is_array( $value ) ? json_encode( $value ) : $value; |
| 375 | 476 | } |
| 376 | 477 | } |
| 377 | - | |