| @@ -240,12 +240,14 @@ | ||
| 240 | 240 | } |
| 241 | 241 | } |
| 242 | 242 | } |
| 243 | 243 | |
| 244 | - $survey_current_page_link = isset( $data['ays_'.$valid_name_prefix.'_current_page_link'] ) && $data['ays_'.$valid_name_prefix.'_current_page_link'] != '' ? sanitize_url( $data['ays_'.$valid_name_prefix.'_current_page_link'] ) : ""; | |
| 244 | + $survey_current_page_link = isset( $data['ays-survey-current_page_link'] ) && $data['ays-survey-current_page_link'] != '' ? sanitize_url( $data['ays-survey-current_page_link'] ) : ""; | |
| 245 | 245 | |
| 246 | - $survey_current_page_link_html = "<a href='". esc_sql( $survey_current_page_link ) ."' target='_blank' class='ays-survey-current-page-link-a-tag'>". __( "Survey link", "survey-maker" ) ."</a>"; | |
| 246 | + $survey_current_page_title = isset( $data['ays-survey-current_page_title'] ) && $data['ays-survey-current_page_title'] != '' ? sanitize_text_field( $data['ays-survey-current_page_title'] ) : ""; | |
| 247 | 247 | |
| 248 | + $survey_current_page_link_html = "<a href='". esc_sql( $survey_current_page_link ) ."' target='_blank' class='ays-survey-current-page-link-a-tag'>". __( "Survey link", "survey-maker" ) ."</a>"; | |
| 249 | + | |
| 248 | 250 | // Survey modified date |
| 249 | 251 | $survey_modified_date = (isset($survey->date_modified) && $survey->date_modified != '') ? esc_attr( $survey->date_modified ) : ""; |
| 250 | 252 | if( $survey_modified_date != "" ){ |
| 251 | 253 | $survey_modified_date = date_i18n( get_option( 'date_format' ), strtotime( $survey_modified_date ) ); |
| @@ -471,68 +473,69 @@ | ||
| 471 | 473 | |
| 472 | 474 | $detectedDevice = Survey_Maker_Data::ays_survey_detected_device_chart(); |
| 473 | 475 | |
| 474 | 476 | $message_data = array( |
| 475 | - 'survey_title' => stripslashes($survey->title), | |
| 476 | - 'survey_category_title' => $survey_category_title, | |
| 477 | - 'survey_id' => stripslashes($survey->id), | |
| 478 | - 'post_id' => $survey_current_post_id, | |
| 479 | - 'user_name' => $user_name, | |
| 480 | - 'user_email' => $user_email, | |
| 481 | - 'user_wordpress_email' => $user_wordpress_email, | |
| 482 | - 'user_id' => $user_id, | |
| 483 | - 'user_registered' => $user_registered, | |
| 484 | - 'questions_count' => $survey_question_count, | |
| 485 | - 'current_date' => $survey_current_date, | |
| 486 | - 'current_time' => $survey_current_time_only, | |
| 487 | - 'current_day' => $survey_current_day, | |
| 488 | - 'current_month' => $survey_current_month, | |
| 489 | - 'unique_code' => $result_unique_code, | |
| 490 | - 'sections_count' => $survey_sections_count, | |
| 491 | - 'users_count' => $survey_passed_users_count, | |
| 492 | - 'users_first_name' => $user_first_name, | |
| 493 | - 'users_last_name' => $user_last_name, | |
| 494 | - 'users_nick_name' => $user_nick_name, | |
| 495 | - 'users_display_name' => $user_display_name, | |
| 496 | - 'users_ip_address' => $user_ip_address, | |
| 497 | - 'user_wordpress_roles' => $user_wordpress_roles, | |
| 498 | - 'user_website_url' => $user_website_url, | |
| 499 | - 'creation_date' => date_i18n( get_option( 'date_format' ), strtotime( sanitize_text_field( $survey->date_created ) ) ), | |
| 500 | - 'modified_date' => $survey_modified_date, | |
| 501 | - 'current_survey_author' => $current_survey_author, | |
| 502 | - 'current_survey_author_email' => $current_survey_author_email, | |
| 503 | - 'current_survey_author_nickname' => $current_survey_author_nickname, | |
| 504 | - 'current_survey_author_display_name' => $current_survey_author_display_name, | |
| 505 | - 'current_survey_author_website_url' => $current_survey_author_website_url, | |
| 506 | - 'current_survey_author_registered' => $current_survey_author_registered, | |
| 507 | - 'current_survey_page_link' => $survey_current_page_link_html, | |
| 508 | - 'admin_email' => $super_admin_email, | |
| 509 | - 'home_page_url' => $wp_home_page_url, | |
| 510 | - 'post_author_email' => $survey_current_post_author_email, | |
| 511 | - 'post_author_nickname' => $survey_current_post_author_nickname, | |
| 512 | - 'post_author_display_name' => $survey_current_post_author_display_name, | |
| 513 | - 'post_author_first_name' => $survey_current_post_author_first_name, | |
| 514 | - 'post_author_last_name' => $survey_current_post_author_last_name, | |
| 515 | - 'post_author_website_url' => $survey_current_post_author_website_url, | |
| 516 | - 'post_author_roles' => $survey_current_post_author_roles, | |
| 517 | - 'post_title' => $survey_current_post_title, | |
| 518 | - 'site_title' => $get_site_title, | |
| 519 | - 'site_description' => $get_site_description, | |
| 477 | + 'survey_title' => stripslashes($survey->title), | |
| 478 | + 'survey_category_title' => $survey_category_title, | |
| 479 | + 'survey_id' => stripslashes($survey->id), | |
| 480 | + 'post_id' => $survey_current_post_id, | |
| 481 | + 'user_name' => $user_name, | |
| 482 | + 'user_email' => $user_email, | |
| 483 | + 'user_wordpress_email' => $user_wordpress_email, | |
| 484 | + 'user_id' => $user_id, | |
| 485 | + 'user_registered' => $user_registered, | |
| 486 | + 'questions_count' => $survey_question_count, | |
| 487 | + 'current_date' => $survey_current_date, | |
| 488 | + 'current_time' => $survey_current_time_only, | |
| 489 | + 'current_day' => $survey_current_day, | |
| 490 | + 'current_month' => $survey_current_month, | |
| 491 | + 'unique_code' => $result_unique_code, | |
| 492 | + 'sections_count' => $survey_sections_count, | |
| 493 | + 'users_count' => $survey_passed_users_count, | |
| 494 | + 'users_first_name' => $user_first_name, | |
| 495 | + 'users_last_name' => $user_last_name, | |
| 496 | + 'users_nick_name' => $user_nick_name, | |
| 497 | + 'users_display_name' => $user_display_name, | |
| 498 | + 'users_ip_address' => $user_ip_address, | |
| 499 | + 'user_wordpress_roles' => $user_wordpress_roles, | |
| 500 | + 'user_website_url' => $user_website_url, | |
| 501 | + 'creation_date' => date_i18n( get_option( 'date_format' ), strtotime( sanitize_text_field( $survey->date_created ) ) ), | |
| 502 | + 'modified_date' => $survey_modified_date, | |
| 503 | + 'current_survey_author' => $current_survey_author, | |
| 504 | + 'current_survey_author_email' => $current_survey_author_email, | |
| 505 | + 'current_survey_author_nickname' => $current_survey_author_nickname, | |
| 506 | + 'current_survey_author_display_name' => $current_survey_author_display_name, | |
| 507 | + 'current_survey_author_website_url' => $current_survey_author_website_url, | |
| 508 | + 'current_survey_author_registered' => $current_survey_author_registered, | |
| 509 | + 'current_survey_page_link' => $survey_current_page_link_html, | |
| 510 | + 'current_survey_page_title' => $survey_current_page_title, | |
| 511 | + 'admin_email' => $super_admin_email, | |
| 512 | + 'home_page_url' => $wp_home_page_url, | |
| 513 | + 'post_author_email' => $survey_current_post_author_email, | |
| 514 | + 'post_author_nickname' => $survey_current_post_author_nickname, | |
| 515 | + 'post_author_display_name' => $survey_current_post_author_display_name, | |
| 516 | + 'post_author_first_name' => $survey_current_post_author_first_name, | |
| 517 | + 'post_author_last_name' => $survey_current_post_author_last_name, | |
| 518 | + 'post_author_website_url' => $survey_current_post_author_website_url, | |
| 519 | + 'post_author_roles' => $survey_current_post_author_roles, | |
| 520 | + 'post_title' => $survey_current_post_title, | |
| 521 | + 'site_title' => $get_site_title, | |
| 522 | + 'site_description' => $get_site_description, | |
| 520 | 523 | ); |
| 521 | 524 | |
| 522 | 525 | $send_data = array( |
| 523 | - 'questions_data' => $questions_data, | |
| 524 | - 'answered_questions' => $answered_questions, | |
| 525 | - 'survey' => $survey, | |
| 526 | - 'questions_ids' => $survey->question_ids, | |
| 527 | - 'user_id' => $user_id, | |
| 528 | - 'user_ip' => $user_ip, | |
| 529 | - 'user_name' => $user_name, | |
| 530 | - 'user_email' => $user_email, | |
| 531 | - 'start_date' => current_time( 'mysql' ), | |
| 532 | - 'end_date' => current_time( 'mysql' ), | |
| 533 | - 'unique_code' => $result_unique_code, | |
| 534 | - 'detectedDevice' => $detectedDevice, | |
| 526 | + 'questions_data' => $questions_data, | |
| 527 | + 'answered_questions' => $answered_questions, | |
| 528 | + 'survey' => $survey, | |
| 529 | + 'questions_ids' => $survey->question_ids, | |
| 530 | + 'user_id' => $user_id, | |
| 531 | + 'user_ip' => $user_ip, | |
| 532 | + 'user_name' => $user_name, | |
| 533 | + 'user_email' => $user_email, | |
| 534 | + 'start_date' => current_time( 'mysql' ), | |
| 535 | + 'end_date' => current_time( 'mysql' ), | |
| 536 | + 'unique_code' => $result_unique_code, | |
| 537 | + 'detectedDevice' => $detectedDevice, | |
| 535 | 538 | ); |
| 536 | 539 | $check_limitations = false; |
| 537 | 540 | if(isset($options['survey_limit_users']) && $options['survey_limit_users']){ |
| 538 | 541 | $limit_users_by = isset($options['survey_limit_users_by']) && $options['survey_limit_users_by'] != "" ? $options['survey_limit_users_by'] : ""; |
| @@ -1292,8 +1295,11 @@ | ||
| 1292 | 1295 | // Get survey current page |
| 1293 | 1296 | $ays_survey_protocol = ((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off') || $_SERVER['SERVER_PORT'] == 443) ? "https://" : "http://"; |
| 1294 | 1297 | $current_survey_page_link = esc_url( $ays_survey_protocol . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] ); |
| 1295 | 1298 | $content[] = '<input type="hidden" name="'. $this->html_name_prefix .'current_page_link" value="'. $current_survey_page_link .'">'; |
| 1299 | + | |
| 1300 | + $current_survey_page_title = get_the_title(); | |
| 1301 | + $content[] = '<input type="hidden" name="'. $this->html_name_prefix .'current_page_title" value="'. $current_survey_page_title .'">'; | |
| 1296 | 1302 | |
| 1297 | 1303 | if( !$limit && !$is_expired ){ |
| 1298 | 1304 | $content[] = $this->create_sections( $sections ); |
| 1299 | 1305 | }else{ |
