| @@ -4,92 +4,77 @@ | ||
| 4 | 4 | } |
| 5 | 5 | |
| 6 | 6 | class FrmField { |
| 7 | 7 | |
| 8 | - /** | |
| 9 | - * @var bool | |
| 10 | - */ | |
| 11 | - public static $use_cache = true; | |
| 12 | - | |
| 13 | - /** | |
| 14 | - * @var int | |
| 15 | - */ | |
| 8 | + public static $use_cache = true; | |
| 16 | 9 | public static $transient_size = 200; |
| 17 | 10 | |
| 18 | - /** | |
| 19 | - * @return array | |
| 20 | - */ | |
| 21 | 11 | public static function field_selection() { |
| 22 | 12 | $fields = array( |
| 23 | - 'text' => array( | |
| 13 | + 'text' => array( | |
| 24 | 14 | 'name' => __( 'Text', 'formidable' ), |
| 25 | - 'icon' => 'frmfont frm_text2_icon', | |
| 15 | + 'icon' => 'frm_icon_font frm_text2_icon', | |
| 26 | 16 | ), |
| 27 | - 'textarea' => array( | |
| 17 | + 'textarea' => array( | |
| 28 | 18 | 'name' => __( 'Paragraph', 'formidable' ), |
| 29 | - 'icon' => 'frmfont frm_paragraph_icon', | |
| 19 | + 'icon' => 'frm_icon_font frm_paragraph_icon', | |
| 30 | 20 | ), |
| 31 | - 'checkbox' => array( | |
| 21 | + 'checkbox' => array( | |
| 32 | 22 | 'name' => __( 'Checkboxes', 'formidable' ), |
| 33 | - 'icon' => 'frmfont frm_check_square_icon', | |
| 23 | + 'icon' => 'frm_icon_font frm_check_square_icon', | |
| 34 | 24 | ), |
| 35 | - 'radio' => array( | |
| 25 | + 'radio' => array( | |
| 36 | 26 | 'name' => __( 'Radio Buttons', 'formidable' ), |
| 37 | - 'icon' => 'frmfont frm_radio_checked_icon', | |
| 27 | + 'icon' => 'frm_icon_font frm_radio_checked_icon', | |
| 38 | 28 | ), |
| 39 | - 'select' => array( | |
| 29 | + 'select' => array( | |
| 40 | 30 | 'name' => __( 'Dropdown', 'formidable' ), |
| 41 | - 'icon' => 'frmfont frm_dropdown_icon', | |
| 31 | + 'icon' => 'frm_icon_font frm_caret_square_down_icon', | |
| 42 | 32 | ), |
| 43 | - 'email' => array( | |
| 33 | + 'email' => array( | |
| 44 | 34 | 'name' => __( 'Email', 'formidable' ), |
| 45 | - 'icon' => 'frmfont frm_email2_icon', | |
| 35 | + 'icon' => 'frm_icon_font frm_email_icon', | |
| 46 | 36 | ), |
| 47 | - 'url' => array( | |
| 37 | + 'url' => array( | |
| 48 | 38 | 'name' => __( 'Website/URL', 'formidable' ), |
| 49 | - 'icon' => 'frmfont frm_link2_icon', | |
| 39 | + 'icon' => 'frm_icon_font frm_link_icon', | |
| 50 | 40 | ), |
| 51 | - 'number' => array( | |
| 41 | + 'number' => array( | |
| 52 | 42 | 'name' => __( 'Number', 'formidable' ), |
| 53 | - 'icon' => 'frmfont frm_hashtag_icon', | |
| 43 | + 'icon' => 'frm_icon_font frm_hashtag_icon', | |
| 54 | 44 | ), |
| 55 | - 'name' => array( | |
| 45 | + 'name' => array( | |
| 56 | 46 | 'name' => __( 'Name', 'formidable' ), |
| 57 | - 'icon' => 'frmfont frm_user_name_icon', | |
| 47 | + 'icon' => 'frm_icon_font frm_user_name_icon', | |
| 58 | 48 | ), |
| 59 | - 'phone' => array( | |
| 49 | + 'phone' => array( | |
| 60 | 50 | 'name' => __( 'Phone', 'formidable' ), |
| 61 | - 'icon' => 'frmfont frm_phone_icon', | |
| 51 | + 'icon' => 'frm_icon_font frm_phone_icon', | |
| 62 | 52 | ), |
| 63 | - 'html' => array( | |
| 53 | + 'html' => array( | |
| 64 | 54 | 'name' => __( 'HTML', 'formidable' ), |
| 65 | - 'icon' => 'frmfont frm_code2_icon', | |
| 55 | + 'icon' => 'frm_icon_font frm_code_icon', | |
| 66 | 56 | ), |
| 67 | - 'hidden' => array( | |
| 57 | + 'hidden' => array( | |
| 68 | 58 | 'name' => __( 'Hidden', 'formidable' ), |
| 69 | - 'icon' => 'frmfont frm_eye_slash2_icon', | |
| 59 | + 'icon' => 'frm_icon_font frm_eye_slash_icon', | |
| 70 | 60 | ), |
| 71 | - 'user_id' => array( | |
| 61 | + 'user_id' => array( | |
| 72 | 62 | 'name' => __( 'User ID', 'formidable' ), |
| 73 | - 'icon' => 'frmfont frm_user2_icon', | |
| 63 | + 'icon' => 'frm_icon_font frm_user_icon', | |
| 74 | 64 | ), |
| 75 | - 'captcha' => array( | |
| 65 | + 'captcha' => array( | |
| 76 | 66 | 'name' => self::get_captcha_field_name(), |
| 77 | - 'icon' => 'frmfont frm_shield_check2_icon', | |
| 67 | + 'icon' => 'frm_icon_font frm_shield_check_icon', | |
| 78 | 68 | ), |
| 79 | - 'credit_card' => array( | |
| 69 | + 'credit_card' => array( | |
| 80 | 70 | 'name' => __( 'Payment', 'formidable' ), |
| 81 | - 'icon' => 'frmfont frm_credit_card2_icon', | |
| 71 | + 'icon' => 'frm_icon_font frm_credit_card_icon', | |
| 82 | 72 | ), |
| 83 | - FrmSubmitHelper::FIELD_TYPE => array( | |
| 73 | + FrmSubmitHelper::FIELD_TYPE => array( | |
| 84 | 74 | 'name' => __( 'Submit', 'formidable' ), |
| 85 | 75 | 'hide' => true, |
| 86 | 76 | ), |
| 87 | - FrmFieldGdprHelper::FIELD_TYPE => array( | |
| 88 | - 'name' => __( 'GDPR', 'formidable' ), | |
| 89 | - 'icon' => 'frmfont frm-gdpr-icon', | |
| 90 | - 'hide' => FrmFieldGdprHelper::hide_gdpr_field(), | |
| 91 | - ), | |
| 92 | 77 | ); |
| 93 | 78 | |
| 94 | 79 | /** |
| 95 | 80 | * @param array $fields |
| @@ -105,98 +90,60 @@ | ||
| 105 | 90 | private static function get_captcha_field_name() { |
| 106 | 91 | return 'Captcha'; |
| 107 | 92 | } |
| 108 | 93 | |
| 109 | - /** | |
| 110 | - * @return array | |
| 111 | - */ | |
| 112 | 94 | public static function pro_field_selection() { |
| 113 | - $upsell_images_url = FrmAppHelper::plugin_url() . '/images/upsell/'; | |
| 114 | - $fields = array( | |
| 95 | + $images_url = FrmAppHelper::plugin_url() . '/images/'; | |
| 96 | + $fields = array( | |
| 115 | 97 | 'file' => array( |
| 116 | - 'name' => __( 'File Upload', 'formidable' ), | |
| 117 | - 'icon' => 'frmfont frm_upload3_icon', | |
| 118 | - 'message' => __( 'Add file uploads to save time and cut down on back-and-forth. Upgrade to Pro to get Upload fields and more.', 'formidable' ), | |
| 119 | - 'upsell_image' => $upsell_images_url . 'file-upload-field-preview.webp', | |
| 120 | - 'learn-more' => 'features/wordpress-multiple-file-upload-form', | |
| 98 | + 'name' => __( 'File Upload', 'formidable' ), | |
| 99 | + 'icon' => 'frm_icon_font frm_upload_icon', | |
| 100 | + 'message' => 'Add file uploads to save time and cut down on back-and-forth. Upgrade to Pro to get Upload fields and more.', | |
| 121 | 101 | ), |
| 122 | - 'ranking' => array( | |
| 123 | - 'name' => __( 'Ranking', 'formidable' ), | |
| 124 | - 'icon' => 'frmfont frm_chart_bar_icon frm_show_upgrade', | |
| 125 | - 'message' => __( 'Now you can effortlessly gather insights, preferences, and opinions by allowing users to rank options.', 'formidable' ), | |
| 126 | - 'upsell_image' => $upsell_images_url . 'ranking-field-preview.webp', | |
| 127 | - 'addon' => 'surveys', | |
| 128 | - 'learn-more' => 'ranking-survey', | |
| 129 | - ), | |
| 102 | + 'ranking' => array(), | |
| 130 | 103 | 'rte' => array( |
| 131 | - 'name' => __( 'Rich Text', 'formidable' ), | |
| 132 | - 'icon' => 'frmfont frm_align_right_icon', | |
| 133 | - 'message' => __( 'Go beyond plain text, let your users format their content with bolding, italics, links, lists and more.', 'formidable' ), | |
| 134 | - 'upsell_image' => $upsell_images_url . 'rich-text-field-preview.webp', | |
| 135 | - 'learn-more' => 'rich-text', | |
| 104 | + 'name' => __( 'Rich Text', 'formidable' ), | |
| 105 | + 'icon' => 'frm_icon_font frm_align_right_icon', | |
| 136 | 106 | ), |
| 137 | 107 | 'date' => array( |
| 138 | - 'name' => __( 'Date', 'formidable' ), | |
| 139 | - 'icon' => 'frmfont frm_calendar2_icon', | |
| 140 | - 'message' => __( 'Capture exact calendar dates effortlessly with a sleek pop-up date picker, ensuring clarity and consistency for scheduling, tracking deadlines, and more.', 'formidable' ), // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 141 | - 'upsell_image' => $upsell_images_url . 'date-field-preview.webp', | |
| 142 | - 'learn-more' => 'date', | |
| 108 | + 'name' => __( 'Date', 'formidable' ), | |
| 109 | + 'icon' => 'frm_icon_font frm_calendar_icon', | |
| 143 | 110 | ), |
| 144 | 111 | 'time' => array( |
| 145 | - 'name' => __( 'Time', 'formidable' ), | |
| 146 | - 'icon' => 'frmfont frm_clock_icon', | |
| 147 | - 'message' => __( 'Precisely log important moments with an intuitive time selection tool, perfect for managing events, availability, or operational hours.', 'formidable' ), // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 148 | - 'upsell_image' => $upsell_images_url . 'time-field-preview.webp', | |
| 149 | - 'learn-more' => 'time', | |
| 112 | + 'name' => __( 'Time', 'formidable' ), | |
| 113 | + 'icon' => 'frm_icon_font frm_clock_icon', | |
| 150 | 114 | ), |
| 151 | 115 | 'scale' => array( |
| 152 | - 'name' => __( 'Scale', 'formidable' ), | |
| 153 | - 'icon' => 'frmfont frm_linear_scale_icon', | |
| 154 | - 'message' => esc_html__( 'Easily measure satisfaction or quantity using a simple, clear numerical scale, giving you fast, quantifiable insights into user feedback.', 'formidable' ), // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 155 | - 'upsell_image' => $upsell_images_url . 'scale-field-preview.webp', | |
| 156 | - 'learn-more' => 'scale', | |
| 116 | + 'name' => __( 'Scale', 'formidable' ), | |
| 117 | + 'icon' => 'frm_icon_font frm_linear_scale_icon', | |
| 118 | + 'message' => 'Add a set of radio buttons with whatever range you choose. <img src="' . esc_url( $images_url ) . 'scale_field.png" alt="Scale Field" />', | |
| 157 | 119 | ), |
| 158 | 120 | 'star' => array( |
| 159 | - 'name' => __( 'Star Rating', 'formidable' ), | |
| 160 | - 'icon' => 'frmfont frm_star2_icon', | |
| 161 | - 'message' => esc_html__( 'Capture instant, appealing feedback with a familiar visual star system, providing immediate and engaging quality assessments from your users.', 'formidable' ), // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 162 | - 'upsell_image' => $upsell_images_url . 'star-field-preview.webp', | |
| 163 | - 'learn-more' => 'star-ratings', | |
| 121 | + 'name' => __( 'Star Rating', 'formidable' ), | |
| 122 | + 'icon' => 'frm_icon_font frm_star_icon', | |
| 164 | 123 | ), |
| 165 | 124 | 'range' => array( |
| 166 | - 'name' => __( 'Slider', 'formidable' ), | |
| 167 | - 'icon' => 'frmfont frm_code_commit_icon', | |
| 168 | - 'message' => esc_html__( 'Let users quickly select values within a range using a dynamic, interactive slider, creating a modern and enjoyable data input experience.', 'formidable' ), // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 169 | - 'upsell_image' => $upsell_images_url . 'slider-field-preview.webp', | |
| 170 | - 'learn-more' => 'slider', | |
| 125 | + 'name' => __( 'Slider', 'formidable' ), | |
| 126 | + 'icon' => 'frm_icon_font frm_code_commit_icon', | |
| 171 | 127 | ), |
| 172 | 128 | 'toggle' => array( |
| 173 | - 'name' => __( 'Toggle', 'formidable' ), | |
| 174 | - 'icon' => 'frmfont frm_toggle_on_icon', | |
| 175 | - 'message' => esc_html__( 'Quickly and easily create cascading fields, populate fields by search and more.', 'formidable' ), | |
| 176 | - 'upsell_image' => $upsell_images_url . 'toggle-field-preview.webp', | |
| 177 | - 'learn-more' => 'toggle', | |
| 129 | + 'name' => __( 'Toggle', 'formidable' ), | |
| 130 | + 'icon' => 'frm_icon_font frm_toggle_on_icon', | |
| 178 | 131 | ), |
| 179 | 132 | 'data' => array( |
| 180 | - 'name' => __( 'Dynamic', 'formidable' ), | |
| 181 | - 'icon' => 'frmfont frm_dynamic_icon', | |
| 182 | - 'message' => __( 'Link entries together, dynamic display information, and even make selections from data entered on another form.', 'formidable' ), | |
| 183 | - 'upsell_image' => $upsell_images_url . 'dynamic-field-preview.webp', | |
| 184 | - 'learn-more' => 'dynamic', | |
| 133 | + 'name' => __( 'Dynamic', 'formidable' ), | |
| 134 | + 'icon' => 'frm_icon_font frm_sitemap_icon', | |
| 135 | + 'message' => 'Create relationships between multiple forms. You can link a member to a team, a rating to a product, a comment to a submission, and much more.', | |
| 185 | 136 | ), |
| 186 | 137 | 'lookup' => array( |
| 187 | - 'name' => __( 'Lookup', 'formidable' ), | |
| 188 | - 'icon' => 'frmfont frm_search_icon', | |
| 189 | - 'message' => esc_html__( 'Link entries together, dynamic display information, and even make selections from data entered on another form.', 'formidable' ), | |
| 190 | - 'upsell_image' => $upsell_images_url . 'lookup-field-preview.webp', | |
| 191 | - 'learn-more' => 'lookup', | |
| 138 | + 'name' => __( 'Lookup', 'formidable' ), | |
| 139 | + 'icon' => 'frm_icon_font frm_search_icon', | |
| 140 | + 'message' => 'Filter the options in the next field and automatically add values to other fields. Upgrade to Pro to get Lookup fields and more. <img src="' . esc_url( $images_url ) . 'look-up_year-make-model.gif" alt="cascading lookup fields" />', | |
| 192 | 141 | ), |
| 193 | 142 | 'divider|repeat' => array( |
| 194 | - 'name' => __( 'Repeater', 'formidable' ), | |
| 195 | - 'icon' => 'frmfont frm_refresh_icon', | |
| 196 | - 'message' => esc_html__( 'Allow users to add rows of fields dynamically as needed (like for multiple attendees or items), making complex data entry flexible and intuitive.', 'formidable' ), // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 197 | - 'upsell_image' => $upsell_images_url . 'repeater-field-preview.webp', | |
| 198 | - 'learn-more' => 'repeatable-section', | |
| 143 | + 'name' => __( 'Repeater', 'formidable' ), | |
| 144 | + 'icon' => 'frm_icon_font frm_repeater_icon', | |
| 145 | + 'message' => 'Allow your visitors to add new sets of fields while filling out forms. Increase conversions while saving building time and server resources. <img src="' . esc_url( $images_url ) . 'repeatable-section_frontend.gif" alt="Dynamically Add Form Fields with repeatable sections" />', | |
| 199 | 146 | ), |
| 200 | 147 | 'end_divider' => array( |
| 201 | 148 | 'name' => __( 'Section Buttons', 'formidable' ), |
| 202 | 149 | 'switch_from' => 'divider', |
| @@ -201,57 +148,37 @@ | ||
| 201 | 148 | 'name' => __( 'Section Buttons', 'formidable' ), |
| 202 | 149 | 'switch_from' => 'divider', |
| 203 | 150 | ), |
| 204 | 151 | 'divider' => array( |
| 205 | - 'name' => __( 'Section', 'formidable' ), | |
| 206 | - 'icon' => 'frmfont frm_header_icon', | |
| 207 | - 'message' => esc_html__( 'Enhance the user experience and improve completion rates by dividing long surveys into clean, manageable steps with distinct pages.', 'formidable' ), // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 208 | - 'upsell_image' => $upsell_images_url . 'section-field-preview.webp', | |
| 209 | - 'learn-more' => 'section-heading', | |
| 152 | + 'name' => __( 'Section', 'formidable' ), | |
| 153 | + 'icon' => 'frm_icon_font frm_header_icon', | |
| 210 | 154 | ), |
| 211 | 155 | 'break' => array( |
| 212 | - 'name' => __( 'Page Break', 'formidable' ), | |
| 213 | - 'icon' => 'frmfont frm_page_break_icon', | |
| 214 | - 'message' => esc_html__( 'Enhance the user experience and improve completion rates by dividing long surveys into clean, manageable steps with distinct pages.', 'formidable' ), // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 215 | - 'upsell_image' => $upsell_images_url . 'page-break-field-preview.webp', | |
| 216 | - 'learn-more' => 'page-breaks', | |
| 156 | + 'name' => __( 'Page Break', 'formidable' ), | |
| 157 | + 'icon' => 'frm_icon_font frm_page_break_icon', | |
| 158 | + 'message' => 'Get multi-paged forms with progress bars. Did you know you can upgrade to PRO to unlock multi-step forms with more awesome features?', | |
| 217 | 159 | ), |
| 218 | 160 | 'form' => array( |
| 219 | - 'name' => __( 'Embed Form', 'formidable' ), | |
| 220 | - 'icon' => 'frmfont frm_file_text2_icon', | |
| 221 | - 'message' => esc_html__( 'Seamlessly integrate other existing forms or external content directly inside your current form, creating powerful, interconnected workflows.', 'formidable' ), // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 222 | - 'upsell_image' => $upsell_images_url . 'embed-form-field-preview.webp', | |
| 223 | - 'learn-more' => 'embed-form', | |
| 161 | + 'name' => __( 'Embed Form', 'formidable' ), | |
| 162 | + 'icon' => 'frm_icon_font frm_file_text_icon', | |
| 224 | 163 | ), |
| 225 | 164 | 'likert' => array( |
| 226 | - 'name' => __( 'Likert Scale', 'formidable' ), | |
| 227 | - 'icon' => 'frmfont frm_likert_scale frm_show_upgrade', | |
| 228 | - 'addon' => 'surveys', | |
| 229 | - 'message' => esc_html__( 'Get nuanced, detailed opinions using standardized agreement scales, unlocking deeper insights beyond simple yes/no answers.', 'formidable' ), // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 230 | - 'upsell_image' => $upsell_images_url . 'likert-field-preview.webp', | |
| 231 | - 'learn-more' => 'likert-scale', | |
| 165 | + 'name' => __( 'Likert Scale', 'formidable' ), | |
| 166 | + 'icon' => 'frm_icon_font frm_likert_scale frm_show_upgrade', | |
| 167 | + 'addon' => 'surveys', | |
| 232 | 168 | ), |
| 233 | 169 | 'nps' => array( |
| 234 | - 'name' => __( 'NPS', 'formidable' ), | |
| 235 | - 'icon' => 'frmfont frm_nps frm_show_upgrade', | |
| 236 | - 'addon' => 'surveys', | |
| 237 | - 'message' => esc_html__( 'Directly measure customer loyalty with the industry-standard Net Promoter Score® field, giving you a single, vital metric for business growth.', 'formidable' ), // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 238 | - 'upsell_image' => $upsell_images_url . 'nps-field-preview.webp', | |
| 239 | - 'learn-more' => 'net-promoter-score', | |
| 170 | + 'name' => __( 'NPS', 'formidable' ), | |
| 171 | + 'icon' => 'frm_icon_font frm_nps frm_show_upgrade', | |
| 172 | + 'addon' => 'surveys', | |
| 240 | 173 | ), |
| 241 | 174 | 'password' => array( |
| 242 | - 'name' => __( 'Password', 'formidable' ), | |
| 243 | - 'icon' => 'frmfont frm_lock_closed2_icon', | |
| 244 | - 'message' => esc_html__( 'Confidently collect sensitive credentials or create secure sections with a dedicated field that masks input for privacy and security.', 'formidable' ), // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 245 | - 'upsell_image' => $upsell_images_url . 'password-field-preview.webp', | |
| 246 | - 'learn-more' => 'password-2', | |
| 175 | + 'name' => __( 'Password', 'formidable' ), | |
| 176 | + 'icon' => 'frm_icon_font frm_lock_open_icon', | |
| 247 | 177 | ), |
| 248 | 178 | 'tag' => array( |
| 249 | - 'name' => __( 'Tags', 'formidable' ), | |
| 250 | - 'icon' => 'frmfont frm_price_tags2_icon', | |
| 251 | - 'message' => esc_html__( 'Facilitate easy categorization and analysis by letting users select or create multiple relevant keywords or labels for their entry.', 'formidable' ), // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 252 | - 'upsell_image' => $upsell_images_url . 'tags-field-preview.webp', | |
| 253 | - 'learn-more' => 'tags', | |
| 179 | + 'name' => __( 'Tags', 'formidable' ), | |
| 180 | + 'icon' => 'frm_icon_font frm_price_tags_icon', | |
| 254 | 181 | ), |
| 255 | 182 | // This is no longer a Pro field, but without this here, Pro triggers "undefined index" notices. |
| 256 | 183 | // Right now it leaves a gap. Maybe we can skip anything without a name or something. |
| 257 | 184 | 'credit_card' => array( |
| @@ -258,95 +185,71 @@ | ||
| 258 | 185 | 'name' => '', |
| 259 | 186 | 'icon' => '', |
| 260 | 187 | ), |
| 261 | 188 | 'address' => array( |
| 262 | - 'name' => __( 'Address', 'formidable' ), | |
| 263 | - 'icon' => 'frmfont frm_location2_icon', | |
| 264 | - 'message' => esc_html__( 'Instantly capture location information, simplifying logistics and contact collection. (Or go further with our Geolocation add-on!)', 'formidable' ), // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 265 | - 'upsell_image' => $upsell_images_url . 'address-field-preview.webp', | |
| 266 | - 'learn-more' => 'address', | |
| 189 | + 'name' => __( 'Address', 'formidable' ), | |
| 190 | + 'icon' => 'frm_icon_font frm_location_icon', | |
| 267 | 191 | ), |
| 268 | 192 | 'summary' => array( |
| 269 | - 'name' => __( 'Summary', 'formidable' ), | |
| 270 | - 'icon' => 'frmfont frm_file_text3_icon', | |
| 271 | - 'message' => __( 'Provide users with a clean, final review of all their entered data before submission, reducing errors and improving data quality.', 'formidable' ), // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 272 | - 'upsell_image' => $upsell_images_url . 'summary-field-preview.webp', | |
| 273 | - 'learn-more' => 'summary-review-before-submit', | |
| 193 | + 'name' => __( 'Summary', 'formidable' ), | |
| 194 | + 'icon' => 'frm_icon_font frm_file_text_icon', | |
| 195 | + 'message' => 'Allow visitors to review their responses before a form is submitted. Upgrade to Pro to get Summary fields and more.', | |
| 274 | 196 | ), |
| 275 | 197 | 'signature' => array( |
| 276 | - 'name' => __( 'Signature', 'formidable' ), | |
| 277 | - 'icon' => 'frmfont frm_signature_icon frm_show_upgrade', | |
| 278 | - 'addon' => 'signature', | |
| 279 | - 'message' => __( 'Capture digital e-signatures directly within your form, making official agreements and authorizations straightforward.', 'formidable' ), | |
| 280 | - 'upsell_image' => $upsell_images_url . 'signature-field-preview.webp', | |
| 281 | - 'learn-more' => 'formidable-signature', | |
| 198 | + 'name' => __( 'Signature', 'formidable' ), | |
| 199 | + 'icon' => 'frm_icon_font frm_signature_icon frm_show_upgrade', | |
| 200 | + 'addon' => 'signature', | |
| 282 | 201 | ), |
| 283 | 202 | 'ai' => array( |
| 284 | - 'name' => __( 'AI', 'formidable' ), | |
| 285 | - 'icon' => 'frmfont frm-ai-icon frm_show_upgrade', | |
| 286 | - 'addon' => 'ai', | |
| 287 | - 'message' => __( 'Harness artificial intelligence by taking user input and let the model of your choice create an output, quickly and easily.', 'formidable' ), | |
| 288 | - 'upsell_image' => $upsell_images_url . 'ai-field-preview.webp', | |
| 289 | - 'learn-more' => 'form-ai', | |
| 203 | + 'name' => __( 'AI', 'formidable' ), | |
| 204 | + 'icon' => 'frm_icon_font frm_eye_icon frm_show_upgrade', | |
| 205 | + 'addon' => 'ai', | |
| 206 | + 'message' => 'Streamline workflows and reclaim valuable time with the power of AI. You can effortlessly respond to your visitors in real-time with ChatGPT as your automated assistant. Upgrade to Pro and unlock AI-powered fields.', | |
| 290 | 207 | ), |
| 291 | 208 | 'ssa-appointment' => array( |
| 292 | - 'name' => __( 'Appointment', 'formidable' ), | |
| 293 | - 'icon' => 'frmfont frm_schedule_icon frm_show_upgrade', | |
| 294 | - 'require' => 'Simply Schedule Appointments', | |
| 295 | - 'message' => sprintf( | |
| 296 | - /* translators: %1$s: Link opening HTML, %2$s: Link tag closing */ | |
| 297 | - esc_html__( 'Appointment fields are an integration with %1$sSimply Schedule Appointments%2$s. Get started now to schedule appointments directly from your forms.', 'formidable' ), // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 298 | - '<a class="frm-inline-flex" href="https://simplyscheduleappointments.com/meet/formidable/" target="_blank" rel="noopener">', | |
| 299 | - '</a>' | |
| 300 | - ), | |
| 301 | - 'link' => 'https://simplyscheduleappointments.com/meet/formidable/', | |
| 302 | - 'upsell_image' => $upsell_images_url . 'appointment-field-preview.webp', | |
| 303 | - 'learn-more' => 'simply-schedule-appointments-forms', | |
| 209 | + 'name' => __( 'Appointment', 'formidable' ), | |
| 210 | + 'icon' => 'frm_icon_font frm_calendar_icon frm_show_upgrade', | |
| 211 | + 'require' => 'Simply Schedule Appointments', | |
| 212 | + 'message' => 'Appointment fields are an integration with <a href="https://simplyscheduleappointments.com/meet/formidable/">Simply Schedule Appointments</a>. Get started now to schedule appointments directly from your forms. | |
| 213 | + <img src="' . esc_url( $images_url ) . 'appointments.png" alt="Scheduling" />', | |
| 214 | + 'link' => 'https://simplyscheduleappointments.com/meet/formidable/', | |
| 304 | 215 | ), |
| 305 | - 'virtual' => array( | |
| 306 | - 'name' => __( 'Virtual', 'formidable' ), | |
| 307 | - 'icon' => 'frmfont frm-virtual-field-icon', | |
| 308 | - 'message' => esc_html__( 'Protect sensitive data by storing field values server-side only, preventing users from viewing or manipulating them in their browser.', 'formidable' ), // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 309 | - 'upsell_image' => $upsell_images_url . 'virtual-field-preview.webp', | |
| 310 | - 'learn-more' => '/virtual', | |
| 311 | - ), | |
| 312 | 216 | 'product' => array( |
| 313 | - 'name' => __( 'Product', 'formidable' ), | |
| 314 | - 'icon' => 'frmfont frm_product2_icon', | |
| 315 | - 'section' => 'pricing', | |
| 316 | - 'message' => __( 'Turn your form into a simple storefront by adding fields to list products, choose quantities, and calculate totals, enabling direct sales.', 'formidable' ), // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 317 | - 'upsell_image' => $upsell_images_url . 'product-field-preview.webp', | |
| 318 | - 'learn-more' => 'features/pricing-fields', | |
| 217 | + 'name' => __( 'Product', 'formidable' ), | |
| 218 | + 'icon' => 'frm_icon_font frm_product_icon', | |
| 219 | + 'section' => 'pricing', | |
| 319 | 220 | ), |
| 320 | 221 | 'quantity' => array( |
| 321 | - 'name' => __( 'Quantity', 'formidable' ), | |
| 322 | - 'icon' => 'frmfont frm_quantity_icon', | |
| 323 | - 'section' => 'pricing', | |
| 324 | - 'message' => __( 'Turn your form into a simple storefront by adding fields to list products, choose quantities, and calculate totals, enabling direct sales.', 'formidable' ), // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 325 | - 'upsell_image' => $upsell_images_url . 'quantity-field-preview.webp', | |
| 326 | - 'learn-more' => 'features/pricing-fields', | |
| 222 | + 'name' => __( 'Quantity', 'formidable' ), | |
| 223 | + 'icon' => 'frm_icon_font frm_quantity_icon', | |
| 224 | + 'section' => 'pricing', | |
| 327 | 225 | ), |
| 328 | 226 | 'total' => array( |
| 329 | - 'name' => __( 'Total', 'formidable' ), | |
| 330 | - 'icon' => 'frmfont frm_total2_icon', | |
| 331 | - 'section' => 'pricing', | |
| 332 | - 'message' => __( 'Turn your form into a simple storefront by adding fields to list products, choose quantities, and calculate totals, enabling direct sales.', 'formidable' ), // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 333 | - 'upsell_image' => $upsell_images_url . 'total-field-preview.webp', | |
| 334 | - 'learn-more' => 'features/pricing-fields', | |
| 335 | - ), | |
| 336 | - 'coupon' => array( | |
| 337 | - 'name' => __( 'Coupon', 'formidable' ), | |
| 338 | - 'icon' => 'frm_icon_font frm_coupon_icon frm_show_upgrade', | |
| 339 | - 'addon' => 'coupons', | |
| 227 | + 'name' => __( 'Total', 'formidable' ), | |
| 228 | + 'icon' => 'frm_icon_font frm_total_icon', | |
| 340 | 229 | 'section' => 'pricing', |
| 341 | - 'limit' => 1, | |
| 342 | - 'is_new' => self::field_is_new( 'coupon' ), | |
| 343 | 230 | ), |
| 344 | 231 | ); |
| 345 | 232 | |
| 233 | + if ( self::include_ranking_fields() ) { | |
| 234 | + $fields['ranking'] = array( | |
| 235 | + 'name' => __( 'Ranking', 'formidable' ), | |
| 236 | + 'icon' => 'frm_icon_font frm_chart_bar_icon frm_show_upgrade', | |
| 237 | + 'message' => 'Now you can effortlessly gather insights, preferences, and opinions by allowing users to rank options.', | |
| 238 | + 'upsell_image' => $images_url . 'ranking-field.svg', | |
| 239 | + 'addon' => 'surveys', | |
| 240 | + 'is_new' => self::field_is_new( 'ranking' ), | |
| 241 | + ); | |
| 242 | + } else { | |
| 243 | + unset( $fields['ranking'] ); | |
| 244 | + } | |
| 245 | + | |
| 246 | + if ( ! FrmAppHelper::show_new_feature( 'ai' ) ) { | |
| 247 | + unset( $fields['ai'] ); | |
| 248 | + } | |
| 249 | + | |
| 346 | 250 | // Since the signature field may be in a different section, don't show it twice. |
| 347 | 251 | $lite_fields = self::field_selection(); |
| 348 | - | |
| 349 | 252 | if ( isset( $lite_fields['signature'] ) ) { |
| 350 | 253 | unset( $fields['signature'] ); |
| 351 | 254 | } |
| 352 | 255 | |
| @@ -353,22 +256,79 @@ | ||
| 353 | 256 | return apply_filters( 'frm_pro_available_fields', $fields ); |
| 354 | 257 | } |
| 355 | 258 | |
| 356 | 259 | /** |
| 357 | - * Flag Pro field types that require a newer Pro version with frm_show_update. | |
| 260 | + * Check if we should show ranking fields in the builder. | |
| 261 | + * This is based on the active version coming from our API data. | |
| 262 | + * If Surveys v1.1 is not released yet, we don't want to display ranking fields yet. | |
| 358 | 263 | * |
| 359 | - * @since 6.29 | |
| 264 | + * @since 6.8.3 | |
| 360 | 265 | * |
| 361 | - * @param array $fields Available Pro field types. | |
| 266 | + * @return bool | |
| 267 | + */ | |
| 268 | + private static function include_ranking_fields() { | |
| 269 | + if ( class_exists( 'FrmSurveys\models\fields\Ranking' ) ) { | |
| 270 | + // Always return true if Ranking fields exist. | |
| 271 | + return true; | |
| 272 | + } | |
| 273 | + | |
| 274 | + $plugin = 'formidable-surveys/formidable-surveys.php'; | |
| 275 | + $expected_version = '1.1'; | |
| 276 | + | |
| 277 | + return self::installed_plugin_meets_version( $plugin, $expected_version ) || self::api_meets_version( $plugin, $expected_version ); | |
| 278 | + } | |
| 279 | + | |
| 280 | + /** | |
| 281 | + * @since 6.8.3 | |
| 362 | 282 | * |
| 363 | - * @return array | |
| 283 | + * @param string $plugin | |
| 284 | + * @param string $expected_version | |
| 285 | + * @return bool | |
| 364 | 286 | */ |
| 365 | - public static function show_update_for_pro_fields( $fields ) { | |
| 366 | - if ( FrmAppHelper::pro_is_installed() && ! class_exists( 'FrmProVirtualFieldController', false ) ) { | |
| 367 | - $fields['virtual']['icon'] .= ' frm_show_update'; | |
| 287 | + private static function installed_plugin_meets_version( $plugin, $expected_version ) { | |
| 288 | + $installed_version = self::get_installed_version( $plugin ); | |
| 289 | + return $installed_version && version_compare( $installed_version, $expected_version, '>=' ); | |
| 290 | + } | |
| 291 | + | |
| 292 | + /** | |
| 293 | + * @since 6.8.3 | |
| 294 | + * | |
| 295 | + * @param string $plugin | |
| 296 | + * @return false|string String version. False if the plugin is not installed. | |
| 297 | + */ | |
| 298 | + private static function get_installed_version( $plugin ) { | |
| 299 | + if ( ! function_exists( 'get_plugins' ) ) { | |
| 300 | + require_once ABSPATH . 'wp-admin/includes/plugin.php'; | |
| 368 | 301 | } |
| 302 | + $plugins = get_plugins(); | |
| 303 | + if ( isset( $plugins[ $plugin ] ) && ! empty( $plugins[ $plugin ]['Version'] ) ) { | |
| 304 | + return $plugins[ $plugin ]['Version']; | |
| 305 | + } | |
| 306 | + return false; | |
| 307 | + } | |
| 369 | 308 | |
| 370 | - return $fields; | |
| 309 | + /** | |
| 310 | + * @since 6.8.3 | |
| 311 | + * | |
| 312 | + * @param string $plugin | |
| 313 | + * @param string $expected_version | |
| 314 | + * @return bool | |
| 315 | + */ | |
| 316 | + private static function api_meets_version( $plugin, $expected_version ) { | |
| 317 | + $api = new FrmFormApi(); | |
| 318 | + $addons = $api->get_api_info(); | |
| 319 | + $matches = wp_list_filter( $addons, array( 'plugin' => $plugin ) ); | |
| 320 | + if ( ! $matches ) { | |
| 321 | + return false; | |
| 322 | + } | |
| 323 | + | |
| 324 | + $match = reset( $matches ); | |
| 325 | + if ( empty( $match['new_version'] ) ) { | |
| 326 | + return false; | |
| 327 | + } | |
| 328 | + | |
| 329 | + $api_version = $match['new_version']; | |
| 330 | + return version_compare( $api_version, $expected_version, '>=' ); | |
| 371 | 331 | } |
| 372 | 332 | |
| 373 | 333 | /** |
| 374 | 334 | * Consider a field new for 90 days after the release date. |
| @@ -375,23 +335,17 @@ | ||
| 375 | 335 | * |
| 376 | 336 | * @since 6.8.3 |
| 377 | 337 | * |
| 378 | 338 | * @param string $type |
| 379 | - * | |
| 380 | 339 | * @return bool |
| 381 | 340 | */ |
| 382 | 341 | private static function field_is_new( $type ) { |
| 383 | - $release_dates = array( | |
| 384 | - 'coupon' => '2026-01-13', | |
| 385 | - ); | |
| 386 | - | |
| 387 | - if ( ! isset( $release_dates[ $type ] ) ) { | |
| 388 | - return false; | |
| 342 | + if ( 'ranking' === $type ) { | |
| 343 | + $ranking_release_date = '2024-03-12'; | |
| 344 | + $three_months_after_release = gmdate( 'Y-m-d', strtotime( $ranking_release_date . ' + 90 days' ) ); | |
| 345 | + return gmdate( 'Y-m-d' ) < $three_months_after_release; | |
| 389 | 346 | } |
| 390 | - | |
| 391 | - $release_date = $release_dates[ $type ]; | |
| 392 | - $three_months_after_release = gmdate( 'Y-m-d', strtotime( $release_date . ' + 90 days' ) ); | |
| 393 | - return gmdate( 'Y-m-d' ) < $three_months_after_release; | |
| 347 | + return false; | |
| 394 | 348 | } |
| 395 | 349 | |
| 396 | 350 | /** |
| 397 | 351 | * @since 4.0 |
| @@ -407,9 +361,8 @@ | ||
| 407 | 361 | * Create a field. |
| 408 | 362 | * |
| 409 | 363 | * @param array $values |
| 410 | 364 | * @param bool $return |
| 411 | - * | |
| 412 | 365 | * @return false|int |
| 413 | 366 | */ |
| 414 | 367 | public static function create( $values, $return = true ) { |
| 415 | 368 | global $wpdb, $frm_duplicate_ids; |
| @@ -414,17 +367,15 @@ | ||
| 414 | 367 | public static function create( $values, $return = true ) { |
| 415 | 368 | global $wpdb, $frm_duplicate_ids; |
| 416 | 369 | |
| 417 | 370 | $new_values = array(); |
| 418 | - $key = $values['field_key'] ?? $values['name']; | |
| 371 | + $key = isset( $values['field_key'] ) ? $values['field_key'] : $values['name']; | |
| 419 | 372 | $new_values['field_key'] = FrmAppHelper::get_unique_key( $key, $wpdb->prefix . 'frm_fields', 'field_key' ); |
| 420 | 373 | |
| 421 | 374 | $values = FrmAppHelper::maybe_filter_array( $values, array( 'name', 'description' ) ); |
| 422 | 375 | |
| 423 | 376 | foreach ( array( 'name', 'description', 'type', 'default_value' ) as $col ) { |
| 424 | - if ( isset( $values[ $col ] ) ) { | |
| 425 | - $new_values[ $col ] = $values[ $col ]; | |
| 426 | - } | |
| 377 | + $new_values[ $col ] = $values[ $col ]; | |
| 427 | 378 | } |
| 428 | 379 | |
| 429 | 380 | $new_values['options'] = self::maybe_filter_options( $values['options'] ); |
| 430 | 381 | $new_values['field_order'] = isset( $values['field_order'] ) ? (int) $values['field_order'] : null; |
| @@ -441,9 +392,13 @@ | ||
| 441 | 392 | self::preserve_format_option_backslashes( $new_values ); |
| 442 | 393 | |
| 443 | 394 | foreach ( $new_values as $k => $v ) { |
| 444 | 395 | if ( is_array( $v ) ) { |
| 445 | - $new_values[ $k ] = $k === 'default_value' ? FrmAppHelper::maybe_json_encode( $v ) : serialize( $v ); | |
| 396 | + if ( $k === 'default_value' ) { | |
| 397 | + $new_values[ $k ] = FrmAppHelper::maybe_json_encode( $v ); | |
| 398 | + } else { | |
| 399 | + $new_values[ $k ] = serialize( $v ); | |
| 400 | + } | |
| 446 | 401 | } |
| 447 | 402 | unset( $k, $v ); |
| 448 | 403 | } |
| 449 | 404 | |
| @@ -453,15 +408,14 @@ | ||
| 453 | 408 | return false; |
| 454 | 409 | } |
| 455 | 410 | |
| 456 | 411 | self::delete_form_transient( $new_values['form_id'] ); |
| 412 | + $new_id = $wpdb->insert_id; | |
| 457 | 413 | |
| 458 | 414 | if ( ! $return ) { |
| 459 | 415 | return false; |
| 460 | 416 | } |
| 461 | 417 | |
| 462 | - $new_id = $wpdb->insert_id; | |
| 463 | - | |
| 464 | 418 | if ( isset( $values['id'] ) ) { |
| 465 | 419 | $frm_duplicate_ids[ $values['id'] ] = $new_id; |
| 466 | 420 | } |
| 467 | 421 | |
| @@ -468,110 +422,24 @@ | ||
| 468 | 422 | return $new_id; |
| 469 | 423 | } |
| 470 | 424 | |
| 471 | 425 | /** |
| 472 | - * Maybe filter HTML in field options data. | |
| 473 | - * HTML is only filtered when unsafe HTML is disallowed. | |
| 474 | - * See FrmAppHelper::allow_unfiltered_html. | |
| 475 | - * | |
| 476 | 426 | * @since 5.0.08 |
| 477 | 427 | * |
| 478 | 428 | * @param array $options |
| 479 | - * | |
| 480 | 429 | * @return array |
| 481 | 430 | */ |
| 482 | 431 | private static function maybe_filter_options( $options ) { |
| 483 | - $options = FrmAppHelper::maybe_filter_array( $options, array( 'custom_html' ) ); | |
| 484 | - | |
| 485 | - if ( ! empty( $options['custom_html'] ) ) { | |
| 486 | - $options['custom_html'] = self::maybe_filter_custom_html_input_attributes( $options['custom_html'] ); | |
| 487 | - } | |
| 488 | - | |
| 489 | - if ( ! empty( $options['classes'] ) ) { | |
| 490 | - $options['classes'] = implode( ' ', array_map( 'FrmFormsHelper::sanitize_layout_class', explode( ' ', $options['classes'] ) ) ); | |
| 491 | - } | |
| 492 | - | |
| 493 | - return $options; | |
| 432 | + return FrmAppHelper::maybe_filter_array( $options, array( 'custom_html' ) ); | |
| 494 | 433 | } |
| 495 | 434 | |
| 496 | 435 | /** |
| 497 | - * Prevent users who do not have permission to insert JavaScript attributes in input elements. | |
| 498 | - * This is triggered when a field is updated. | |
| 499 | - * | |
| 500 | - * @since 6.11.2 | |
| 501 | - * | |
| 502 | - * @param string $html | |
| 503 | - * | |
| 504 | - * @return string | |
| 505 | - */ | |
| 506 | - private static function maybe_filter_custom_html_input_attributes( $html ) { | |
| 507 | - if ( FrmAppHelper::allow_unfiltered_html() ) { | |
| 508 | - return $html; | |
| 509 | - } | |
| 510 | - | |
| 511 | - $pattern = get_shortcode_regex( array( 'input' ) ); | |
| 512 | - return preg_replace_callback( | |
| 513 | - "/$pattern/", | |
| 514 | - /** | |
| 515 | - * @param array $match Shortcode data. | |
| 516 | - * | |
| 517 | - * @return string | |
| 518 | - */ | |
| 519 | - function ( $match ) { | |
| 520 | - $attr = shortcode_parse_atts( $match[3] ); | |
| 521 | - | |
| 522 | - if ( ! is_array( $attr ) ) { | |
| 523 | - // In old versions of WordPress (older than 6.5), this might not be an array. | |
| 524 | - return '[input]'; | |
| 525 | - } | |
| 526 | - | |
| 527 | - $safe_atts = array(); | |
| 528 | - | |
| 529 | - foreach ( $attr as $attr_key => $att ) { | |
| 530 | - if ( is_numeric( $attr_key ) ) { | |
| 531 | - // Some data is mapped like 0 => 'placeholder="Placeholder"'. | |
| 532 | - $split = explode( '=', $att, 2 ); | |
| 533 | - | |
| 534 | - if ( 2 !== count( $split ) ) { | |
| 535 | - continue; | |
| 536 | - } | |
| 537 | - | |
| 538 | - $key = trim( $split[0] ); | |
| 539 | - $value = trim( $split[1], '"' ); | |
| 540 | - } else { | |
| 541 | - // opt=1 without parentheses for example is mapped like 'opt' => 1. | |
| 542 | - $key = $attr_key; | |
| 543 | - $value = $att; | |
| 544 | - } | |
| 545 | - | |
| 546 | - if ( FrmAppHelper::input_key_is_safe( $key, 'update' ) ) { | |
| 547 | - $safe_atts[ $key ] = $value; | |
| 548 | - } | |
| 549 | - }//end foreach | |
| 550 | - | |
| 551 | - if ( ! $safe_atts ) { | |
| 552 | - return '[input]'; | |
| 553 | - } | |
| 554 | - | |
| 555 | - return '[input ' . FrmAppHelper::array_to_html_params( $safe_atts ) . ']'; | |
| 556 | - }, | |
| 557 | - $html | |
| 558 | - ); | |
| 559 | - } | |
| 560 | - | |
| 561 | - /** | |
| 562 | 436 | * Process the field duplication. |
| 563 | 437 | * |
| 564 | 438 | * @since 5.0.05 |
| 565 | - * | |
| 566 | - * @param int|string $field_id Field ID. | |
| 567 | - * @param int|string $form_id Form ID. | |
| 568 | - * | |
| 569 | - * @return array|false | |
| 570 | 439 | */ |
| 571 | 440 | public static function duplicate_single_field( $field_id, $form_id ) { |
| 572 | 441 | $copy_field = self::getOne( $field_id ); |
| 573 | - | |
| 574 | 442 | if ( ! $copy_field ) { |
| 575 | 443 | return false; |
| 576 | 444 | } |
| 577 | 445 | |
| @@ -581,9 +449,10 @@ | ||
| 581 | 449 | $values = array( |
| 582 | 450 | 'id' => $copy_field->id, |
| 583 | 451 | ); |
| 584 | 452 | FrmFieldsHelper::fill_field( $values, $copy_field, $copy_field->form_id ); |
| 585 | - $values = apply_filters( 'frm_prepare_single_field_for_duplication', $values ); | |
| 453 | + $values = apply_filters( 'frm_prepare_single_field_for_duplication', $values ); | |
| 454 | + | |
| 586 | 455 | $field_id = self::create( $values ); |
| 587 | 456 | |
| 588 | 457 | /** |
| 589 | 458 | * Fires after duplicating a field. |
| @@ -603,16 +472,8 @@ | ||
| 603 | 472 | |
| 604 | 473 | return compact( 'field_id', 'values' ); |
| 605 | 474 | } |
| 606 | 475 | |
| 607 | - /** | |
| 608 | - * @param int|string $old_form_id | |
| 609 | - * @param int|string $form_id | |
| 610 | - * @param bool $copy_keys | |
| 611 | - * @param false|int $blog_id | |
| 612 | - * | |
| 613 | - * @return void | |
| 614 | - */ | |
| 615 | 476 | public static function duplicate( $old_form_id, $form_id, $copy_keys = false, $blog_id = false ) { |
| 616 | 477 | global $frm_duplicate_ids; |
| 617 | 478 | |
| 618 | 479 | $where = array( |
| @@ -625,10 +486,8 @@ | ||
| 625 | 486 | $fields = self::getAll( $where, 'field_order', '', $blog_id ); |
| 626 | 487 | |
| 627 | 488 | foreach ( (array) $fields as $field ) { |
| 628 | 489 | $new_key = $copy_keys ? $field->field_key : ''; |
| 629 | - | |
| 630 | - // phpcs:ignore Universal.Operators.StrictComparisons | |
| 631 | 490 | if ( $copy_keys && substr( $field->field_key, - 1 ) == 2 ) { |
| 632 | 491 | $new_key = rtrim( $new_key, 2 ); |
| 633 | 492 | } |
| 634 | 493 | |
| @@ -636,9 +495,9 @@ | ||
| 636 | 495 | FrmFieldsHelper::fill_field( $values, $field, $form_id, $new_key ); |
| 637 | 496 | |
| 638 | 497 | // If this is a repeating section, create new form |
| 639 | 498 | if ( self::is_repeating_field( $field ) ) { |
| 640 | - // Create the repeatable form | |
| 499 | + // create the repeatable form | |
| 641 | 500 | $new_repeat_form_id = apply_filters( |
| 642 | 501 | 'frm_create_repeat_form', |
| 643 | 502 | 0, |
| 644 | 503 | array( |
| @@ -654,9 +513,9 @@ | ||
| 654 | 513 | $values['field_options']['form_select'] = $new_repeat_form_id; |
| 655 | 514 | } |
| 656 | 515 | |
| 657 | 516 | // If this is a field inside of a repeating section, associate it with the correct form |
| 658 | - if ( (int) $field->form_id !== (int) $old_form_id && isset( $old_repeat_form_id ) && isset( $new_repeat_form_id ) && (int) $field->form_id === (int) $old_repeat_form_id ) { // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 517 | + if ( $field->form_id != $old_form_id && isset( $old_repeat_form_id ) && isset( $new_repeat_form_id ) && $field->form_id == $old_repeat_form_id ) { | |
| 659 | 518 | $values['form_id'] = $new_repeat_form_id; |
| 660 | 519 | } |
| 661 | 520 | |
| 662 | 521 | $values['description'] = FrmFieldsHelper::switch_field_ids( $values['description'] ); |
| @@ -671,9 +530,8 @@ | ||
| 671 | 530 | |
| 672 | 531 | /** |
| 673 | 532 | * @param int|string $id |
| 674 | 533 | * @param array $values |
| 675 | - * | |
| 676 | 534 | * @return false|int |
| 677 | 535 | */ |
| 678 | 536 | public static function update( $id, $values ) { |
| 679 | 537 | global $wpdb; |
| @@ -706,38 +564,33 @@ | ||
| 706 | 564 | */ |
| 707 | 565 | $values = apply_filters( 'frm_clean_' . $values['type'] . '_field_options_before_update', $values, $id ); |
| 708 | 566 | |
| 709 | 567 | if ( $values['type'] === 'hidden' && isset( $values['field_options'] ) && isset( $values['field_options']['clear_on_focus'] ) ) { |
| 710 | - // Don't keep the old placeholder setting for hidden fields | |
| 568 | + // don't keep the old placeholder setting for hidden fields | |
| 711 | 569 | $values['field_options']['clear_on_focus'] = 0; |
| 712 | 570 | } |
| 713 | 571 | } |
| 714 | 572 | |
| 715 | - // Serialize array values | |
| 573 | + // serialize array values | |
| 716 | 574 | foreach ( array( 'field_options', 'options' ) as $opt ) { |
| 717 | - if ( ! isset( $values[ $opt ] ) || ! is_array( $values[ $opt ] ) ) { | |
| 718 | - continue; | |
| 575 | + if ( isset( $values[ $opt ] ) && is_array( $values[ $opt ] ) ) { | |
| 576 | + if ( 'field_options' === $opt ) { | |
| 577 | + $values[ $opt ] = self::maybe_filter_options( $values[ $opt ] ); | |
| 578 | + } | |
| 579 | + $values[ $opt ] = serialize( $values[ $opt ] ); | |
| 719 | 580 | } |
| 720 | - | |
| 721 | - if ( 'field_options' === $opt ) { | |
| 722 | - $values[ $opt ] = self::maybe_filter_options( $values[ $opt ] ); | |
| 723 | - } | |
| 724 | - | |
| 725 | - $values[ $opt ] = serialize( $values[ $opt ] ); | |
| 726 | 581 | } |
| 727 | - | |
| 728 | 582 | if ( isset( $values['default_value'] ) && is_array( $values['default_value'] ) ) { |
| 729 | 583 | $values['default_value'] = json_encode( $values['default_value'] ); |
| 730 | 584 | } |
| 731 | 585 | |
| 732 | 586 | $query_results = $wpdb->update( $wpdb->prefix . 'frm_fields', $values, array( 'id' => $id ) ); |
| 733 | - $form_id = 0; | |
| 734 | 587 | |
| 588 | + $form_id = 0; | |
| 735 | 589 | if ( isset( $values['form_id'] ) ) { |
| 736 | 590 | $form_id = absint( $values['form_id'] ); |
| 737 | 591 | } else { |
| 738 | 592 | $field = self::getOne( $id ); |
| 739 | - | |
| 740 | 593 | if ( $field ) { |
| 741 | 594 | $form_id = $field->form_id; |
| 742 | 595 | } |
| 743 | 596 | unset( $field ); |
| @@ -745,9 +598,8 @@ | ||
| 745 | 598 | unset( $values ); |
| 746 | 599 | |
| 747 | 600 | if ( $query_results ) { |
| 748 | 601 | wp_cache_delete( $id, 'frm_field' ); |
| 749 | - | |
| 750 | 602 | if ( $form_id ) { |
| 751 | 603 | self::delete_form_transient( $form_id ); |
| 752 | 604 | } |
| 753 | 605 | } |
| @@ -760,10 +612,8 @@ | ||
| 760 | 612 | * |
| 761 | 613 | * @since 2.0.8 |
| 762 | 614 | * |
| 763 | 615 | * @param array $values Pass by reference. |
| 764 | - * | |
| 765 | - * @return void | |
| 766 | 616 | */ |
| 767 | 617 | private static function preserve_format_option_backslashes( &$values ) { |
| 768 | 618 | if ( isset( $values['field_options']['format'] ) ) { |
| 769 | 619 | $values['field_options']['format'] = FrmAppHelper::preserve_backslashes( $values['field_options']['format'] ); |
| @@ -769,13 +619,8 @@ | ||
| 769 | 619 | $values['field_options']['format'] = FrmAppHelper::preserve_backslashes( $values['field_options']['format'] ); |
| 770 | 620 | } |
| 771 | 621 | } |
| 772 | 622 | |
| 773 | - /** | |
| 774 | - * @param int|string $id | |
| 775 | - * | |
| 776 | - * @return bool|int | |
| 777 | - */ | |
| 778 | 623 | public static function destroy( $id ) { |
| 779 | 624 | global $wpdb; |
| 780 | 625 | |
| 781 | 626 | do_action( 'frm_before_destroy_field', $id ); |
| @@ -781,9 +626,8 @@ | ||
| 781 | 626 | do_action( 'frm_before_destroy_field', $id ); |
| 782 | 627 | |
| 783 | 628 | wp_cache_delete( $id, 'frm_field' ); |
| 784 | 629 | $field = self::getOne( $id ); |
| 785 | - | |
| 786 | 630 | if ( ! $field ) { |
| 787 | 631 | return false; |
| 788 | 632 | } |
| 789 | 633 | |
| @@ -793,13 +637,8 @@ | ||
| 793 | 637 | |
| 794 | 638 | return $wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_fields WHERE id=%d', $id ) ); |
| 795 | 639 | } |
| 796 | 640 | |
| 797 | - /** | |
| 798 | - * @param int|string $form_id | |
| 799 | - * | |
| 800 | - * @return void | |
| 801 | - */ | |
| 802 | 641 | public static function delete_form_transient( $form_id ) { |
| 803 | 642 | $form_id = absint( $form_id ); |
| 804 | 643 | delete_transient( 'frm_form_fields_' . $form_id . 'excludeinclude' ); |
| 805 | 644 | delete_transient( 'frm_form_fields_' . $form_id . 'includeinclude' ); |
| @@ -806,15 +645,14 @@ | ||
| 806 | 645 | delete_transient( 'frm_form_fields_' . $form_id . 'includeexclude' ); |
| 807 | 646 | delete_transient( 'frm_form_fields_' . $form_id . 'excludeexclude' ); |
| 808 | 647 | |
| 809 | 648 | global $wpdb; |
| 810 | - $wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->options . ' WHERE option_name LIKE %s OR option_name LIKE %s OR option_name LIKE %s OR option_name LIKE %s', '_transient_timeout_frm_form_fields_' . $form_id . 'ex%', '_transient_frm_form_fields_' . $form_id . 'ex%', '_transient_timeout_frm_form_fields_' . $form_id . 'in%', '_transient_frm_form_fields_' . $form_id . 'in%' ) ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 649 | + $wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->options . ' WHERE option_name LIKE %s OR option_name LIKE %s OR option_name LIKE %s OR option_name LIKE %s', '_transient_timeout_frm_form_fields_' . $form_id . 'ex%', '_transient_frm_form_fields_' . $form_id . 'ex%', '_transient_timeout_frm_form_fields_' . $form_id . 'in%', '_transient_frm_form_fields_' . $form_id . 'in%' ) ); | |
| 811 | 650 | |
| 812 | 651 | FrmDb::cache_delete_group( 'frm_field' ); |
| 813 | 652 | |
| 814 | 653 | $form = FrmForm::getOne( $form_id ); |
| 815 | - | |
| 816 | - if ( $form && $form->parent_form_id && (int) $form->parent_form_id !== $form_id ) { | |
| 654 | + if ( $form && $form->parent_form_id && $form->parent_form_id != $form_id ) { | |
| 817 | 655 | self::delete_form_transient( $form->parent_form_id ); |
| 818 | 656 | } |
| 819 | 657 | } |
| 820 | 658 | |
| @@ -821,9 +659,8 @@ | ||
| 821 | 659 | /** |
| 822 | 660 | * If $field is numeric, get the field object |
| 823 | 661 | * |
| 824 | 662 | * @param int|object|string $field |
| 825 | - * | |
| 826 | 663 | * @return void |
| 827 | 664 | */ |
| 828 | 665 | public static function maybe_get_field( &$field ) { |
| 829 | 666 | if ( ! is_object( $field ) ) { |
| @@ -833,13 +670,11 @@ | ||
| 833 | 670 | |
| 834 | 671 | /** |
| 835 | 672 | * @param int|string $id The field id or key. |
| 836 | 673 | * @param bool $filter When true, run the frm_field filter. |
| 837 | - * | |
| 838 | - * @return object|null | |
| 839 | 674 | */ |
| 840 | 675 | public static function getOne( $id, $filter = false ) { |
| 841 | - if ( ! $id ) { | |
| 676 | + if ( empty( $id ) ) { | |
| 842 | 677 | return null; |
| 843 | 678 | } |
| 844 | 679 | |
| 845 | 680 | global $wpdb; |
| @@ -848,9 +683,9 @@ | ||
| 848 | 683 | $query = $wpdb->prepare( 'SELECT * FROM ' . $wpdb->prefix . 'frm_fields WHERE ' . $where, $id ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared |
| 849 | 684 | |
| 850 | 685 | $results = FrmDb::check_cache( $id, 'frm_field', $query, 'get_row', 0 ); |
| 851 | 686 | |
| 852 | - if ( ! $results ) { | |
| 687 | + if ( empty( $results ) ) { | |
| 853 | 688 | self::filter_field( $filter, $results ); |
| 854 | 689 | return $results; |
| 855 | 690 | } |
| 856 | 691 | |
| @@ -867,13 +702,10 @@ | ||
| 867 | 702 | } |
| 868 | 703 | |
| 869 | 704 | /** |
| 870 | 705 | * @since 3.06.01 |
| 871 | - * | |
| 872 | 706 | * @param bool $filter When true, run the frm_field filter. |
| 873 | 707 | * @param object $results |
| 874 | - * | |
| 875 | - * @return void | |
| 876 | 708 | */ |
| 877 | 709 | private static function filter_field( $filter, &$results ) { |
| 878 | 710 | if ( $filter ) { |
| 879 | 711 | /** |
| @@ -887,21 +719,23 @@ | ||
| 887 | 719 | * Get the field type by key or id |
| 888 | 720 | * |
| 889 | 721 | * @param int|string $id The field id or key. |
| 890 | 722 | * @param mixed $col The name of the column in the fields database table. |
| 891 | - * | |
| 892 | - * @return mixed | |
| 893 | 723 | */ |
| 894 | 724 | public static function get_type( $id, $col = 'type' ) { |
| 895 | 725 | $field = FrmDb::check_cache( $id, 'frm_field' ); |
| 896 | - | |
| 897 | 726 | if ( $field ) { |
| 898 | - return $field->{$col}; | |
| 727 | + $type = $field->{$col}; | |
| 728 | + } else { | |
| 729 | + $where = array( | |
| 730 | + 'or' => 1, | |
| 731 | + 'id' => $id, | |
| 732 | + 'field_key' => $id, | |
| 733 | + ); | |
| 734 | + $type = FrmDb::get_var( 'frm_fields', $where, $col ); | |
| 899 | 735 | } |
| 900 | 736 | |
| 901 | - $where = is_numeric( $id ) ? array( 'id' => $id ) : array( 'field_key' => $id ); | |
| 902 | - | |
| 903 | - return FrmDb::get_var( 'frm_fields', $where, $col ); | |
| 737 | + return $type; | |
| 904 | 738 | } |
| 905 | 739 | |
| 906 | 740 | /** |
| 907 | 741 | * @param int|string $form_id |
| @@ -907,10 +741,8 @@ | ||
| 907 | 741 | * @param int|string $form_id |
| 908 | 742 | * @param string $type |
| 909 | 743 | * @param int|string $limit |
| 910 | 744 | * @param string $inc_sub |
| 911 | - * | |
| 912 | - * @return array|object | |
| 913 | 745 | */ |
| 914 | 746 | public static function get_all_types_in_form( $form_id, $type, $limit = '', $inc_sub = 'exclude' ) { |
| 915 | 747 | if ( ! $form_id ) { |
| 916 | 748 | return array(); |
| @@ -922,28 +754,24 @@ | ||
| 922 | 754 | 'inc_embed' => $inc_sub, |
| 923 | 755 | 'inc_repeat' => $inc_sub, |
| 924 | 756 | ) |
| 925 | 757 | ); |
| 926 | - | |
| 927 | - if ( $results ) { | |
| 758 | + if ( ! empty( $results ) ) { | |
| 928 | 759 | $fields = array(); |
| 929 | 760 | $count = 0; |
| 930 | - | |
| 931 | 761 | foreach ( $results as $result ) { |
| 932 | - if ( $type !== $result->type ) { | |
| 762 | + if ( $type != $result->type ) { | |
| 933 | 763 | continue; |
| 934 | 764 | } |
| 935 | 765 | |
| 936 | 766 | $fields[ $result->id ] = $result; |
| 937 | 767 | ++$count; |
| 938 | - | |
| 939 | - // phpcs:ignore Universal.Operators.StrictComparisons | |
| 940 | 768 | if ( $limit == 1 ) { |
| 941 | 769 | $fields = $result; |
| 942 | 770 | break; |
| 943 | 771 | } |
| 944 | 772 | |
| 945 | - if ( $limit && $count >= $limit ) { | |
| 773 | + if ( ! empty( $limit ) && $count >= $limit ) { | |
| 946 | 774 | break; |
| 947 | 775 | } |
| 948 | 776 | |
| 949 | 777 | unset( $result ); |
| @@ -970,9 +798,8 @@ | ||
| 970 | 798 | * @param int|string $form_id |
| 971 | 799 | * @param int|string $limit |
| 972 | 800 | * @param string $inc_embed |
| 973 | 801 | * @param string $inc_repeat |
| 974 | - * | |
| 975 | 802 | * @return array |
| 976 | 803 | */ |
| 977 | 804 | public static function get_all_for_form( $form_id, $limit = '', $inc_embed = 'exclude', $inc_repeat = 'include' ) { |
| 978 | 805 | if ( ! (int) $form_id ) { |
| @@ -979,22 +806,19 @@ | ||
| 979 | 806 | return array(); |
| 980 | 807 | } |
| 981 | 808 | |
| 982 | 809 | $results = self::get_fields_from_transients( $form_id, compact( 'inc_embed', 'inc_repeat' ) ); |
| 983 | - | |
| 984 | - if ( $results ) { | |
| 985 | - if ( ! $limit ) { | |
| 810 | + if ( ! empty( $results ) ) { | |
| 811 | + if ( empty( $limit ) ) { | |
| 986 | 812 | return $results; |
| 987 | 813 | } |
| 988 | 814 | |
| 989 | 815 | $fields = array(); |
| 990 | 816 | $count = 0; |
| 991 | - | |
| 992 | 817 | foreach ( $results as $result ) { |
| 993 | 818 | ++$count; |
| 994 | 819 | $fields[ $result->id ] = $result; |
| 995 | - | |
| 996 | - if ( $limit && $count >= $limit ) { | |
| 820 | + if ( ! empty( $limit ) && $count >= $limit ) { | |
| 997 | 821 | break; |
| 998 | 822 | } |
| 999 | 823 | } |
| 1000 | 824 | |
| @@ -1010,9 +834,9 @@ | ||
| 1010 | 834 | self::$use_cache = true; |
| 1011 | 835 | |
| 1012 | 836 | self::include_sub_fields( $results, $inc_embed, 'all', $form_id ); |
| 1013 | 837 | |
| 1014 | - if ( ! $limit ) { | |
| 838 | + if ( empty( $limit ) ) { | |
| 1015 | 839 | self::set_field_transient( $results, $form_id, 0, compact( 'inc_embed', 'inc_repeat' ) ); |
| 1016 | 840 | } |
| 1017 | 841 | |
| 1018 | 842 | return $results; |
| @@ -1022,51 +846,36 @@ | ||
| 1022 | 846 | * If repeating fields should be included, adjust $where accordingly |
| 1023 | 847 | * |
| 1024 | 848 | * @param string $inc_repeat |
| 1025 | 849 | * @param array $where Pass by reference. |
| 1026 | - * | |
| 1027 | - * @return void | |
| 1028 | 850 | */ |
| 1029 | 851 | private static function maybe_include_repeating_fields( $inc_repeat, &$where ) { |
| 1030 | - if ( $inc_repeat !== 'include' ) { | |
| 1031 | - return; | |
| 852 | + if ( $inc_repeat === 'include' ) { | |
| 853 | + $form_id = $where['fi.form_id']; | |
| 854 | + $where[] = array( | |
| 855 | + 'or' => 1, | |
| 856 | + 'fi.form_id' => $form_id, | |
| 857 | + 'fr.parent_form_id' => $form_id, | |
| 858 | + ); | |
| 859 | + unset( $where['fi.form_id'] ); | |
| 1032 | 860 | } |
| 1033 | - | |
| 1034 | - $form_id = $where['fi.form_id']; | |
| 1035 | - $where[] = array( | |
| 1036 | - 'or' => 1, | |
| 1037 | - 'fi.form_id' => $form_id, | |
| 1038 | - 'fr.parent_form_id' => $form_id, | |
| 1039 | - ); | |
| 1040 | - unset( $where['fi.form_id'] ); | |
| 1041 | 861 | } |
| 1042 | 862 | |
| 1043 | - /** | |
| 1044 | - * @param array $results | |
| 1045 | - * @param string $inc_embed | |
| 1046 | - * @param string $type | |
| 1047 | - * @param int|string $form_id | |
| 1048 | - * | |
| 1049 | - * @return void | |
| 1050 | - */ | |
| 1051 | 863 | public static function include_sub_fields( &$results, $inc_embed, $type = 'all', $form_id = '' ) { |
| 1052 | - $no_sub_forms = ! $results && $type === 'all'; | |
| 1053 | - | |
| 1054 | - if ( 'include' !== $inc_embed || $no_sub_forms ) { | |
| 864 | + $no_sub_forms = empty( $results ) && $type === 'all'; | |
| 865 | + if ( 'include' != $inc_embed || $no_sub_forms ) { | |
| 1055 | 866 | return; |
| 1056 | 867 | } |
| 1057 | 868 | |
| 1058 | 869 | $form_fields = $results; |
| 1059 | - $should_get_subforms = $type !== 'all' && $type !== 'form' && $form_id; | |
| 1060 | - | |
| 870 | + $should_get_subforms = ( $type !== 'all' && $type !== 'form' && ! empty( $form_id ) ); | |
| 1061 | 871 | if ( $should_get_subforms ) { |
| 1062 | 872 | $form_fields = self::get_all_types_in_form( $form_id, 'form' ); |
| 1063 | 873 | } |
| 1064 | 874 | |
| 1065 | 875 | $index_offset = 1; |
| 1066 | - | |
| 1067 | 876 | foreach ( $form_fields as $k => $field ) { |
| 1068 | - if ( 'form' !== $field->type || ! isset( $field->field_options['form_select'] ) ) { | |
| 877 | + if ( 'form' != $field->type || ! isset( $field->field_options['form_select'] ) ) { | |
| 1069 | 878 | continue; |
| 1070 | 879 | } |
| 1071 | 880 | |
| 1072 | 881 | if ( $type === 'all' ) { |
| @@ -1083,23 +892,13 @@ | ||
| 1083 | 892 | unset( $field, $sub_fields ); |
| 1084 | 893 | } |
| 1085 | 894 | } |
| 1086 | 895 | |
| 1087 | - /** | |
| 1088 | - * @param array|string $where | |
| 1089 | - * @param string $order_by | |
| 1090 | - * @param string $limit | |
| 1091 | - * @param false|int $blog_id | |
| 1092 | - * | |
| 1093 | - * @return array|object|null | |
| 1094 | - */ | |
| 1095 | 896 | public static function getAll( $where = array(), $order_by = '', $limit = '', $blog_id = false ) { |
| 1096 | 897 | $cache_key = FrmAppHelper::maybe_json_encode( $where ) . $order_by . 'l' . $limit . 'b' . $blog_id; |
| 1097 | - | |
| 1098 | 898 | if ( self::$use_cache ) { |
| 1099 | - // Make sure old cache doesn't get saved as a transient | |
| 899 | + // make sure old cache doesn't get saved as a transient | |
| 1100 | 900 | $results = wp_cache_get( $cache_key, 'frm_field' ); |
| 1101 | - | |
| 1102 | 901 | if ( false !== $results ) { |
| 1103 | 902 | return wp_unslash( $results ); |
| 1104 | 903 | } |
| 1105 | 904 | } |
| @@ -1106,9 +905,15 @@ | ||
| 1106 | 905 | |
| 1107 | 906 | global $wpdb; |
| 1108 | 907 | |
| 1109 | 908 | if ( $blog_id && is_multisite() ) { |
| 1110 | - $prefix = $wpdb->get_blog_prefix( $blog_id ); | |
| 909 | + global $wpmuBaseTablePrefix; | |
| 910 | + if ( $wpmuBaseTablePrefix ) { | |
| 911 | + $prefix = $wpmuBaseTablePrefix . $blog_id . '_'; | |
| 912 | + } else { | |
| 913 | + $prefix = $wpdb->get_blog_prefix( $blog_id ); | |
| 914 | + } | |
| 915 | + | |
| 1111 | 916 | $table_name = $prefix . 'frm_fields'; |
| 1112 | 917 | $form_table_name = $prefix . 'frm_forms'; |
| 1113 | 918 | } else { |
| 1114 | 919 | $table_name = $wpdb->prefix . 'frm_fields'; |
| @@ -1114,24 +919,25 @@ | ||
| 1114 | 919 | $table_name = $wpdb->prefix . 'frm_fields'; |
| 1115 | 920 | $form_table_name = $wpdb->prefix . 'frm_forms'; |
| 1116 | 921 | } |
| 1117 | 922 | |
| 1118 | - if ( $order_by && ! str_contains( $order_by, 'ORDER BY' ) ) { | |
| 923 | + if ( ! empty( $order_by ) && strpos( $order_by, 'ORDER BY' ) === false ) { | |
| 1119 | 924 | $order_by = ' ORDER BY ' . $order_by; |
| 1120 | 925 | } |
| 1121 | 926 | |
| 1122 | - $limit = FrmDb::esc_limit( $limit ); | |
| 1123 | - $query = "SELECT fi.*, fr.name as form_name FROM {$table_name} fi JOIN {$form_table_name} fr ON fi.form_id=fr.id"; | |
| 1124 | - $query_type = $limit === ' LIMIT 1' || $limit == 1 ? 'row' : 'results'; // phpcs:ignore Universal.Operators.StrictComparisons | |
| 927 | + $limit = FrmDb::esc_limit( $limit ); | |
| 1125 | 928 | |
| 929 | + $query = "SELECT fi.*, fr.name as form_name FROM {$table_name} fi LEFT OUTER JOIN {$form_table_name} fr ON fi.form_id=fr.id"; | |
| 930 | + $query_type = $limit === ' LIMIT 1' || $limit == 1 ? 'row' : 'results'; | |
| 931 | + | |
| 1126 | 932 | if ( is_array( $where ) ) { |
| 1127 | 933 | $args = array( |
| 1128 | 934 | 'order_by' => $order_by, |
| 1129 | 935 | 'limit' => $limit, |
| 1130 | 936 | ); |
| 1131 | - $results = FrmDb::get_var( $table_name . ' fi JOIN ' . $form_table_name . ' fr ON fi.form_id=fr.id', $where, 'fi.*, fr.name as form_name', $args, '', $query_type ); | |
| 937 | + $results = FrmDb::get_var( $table_name . ' fi LEFT OUTER JOIN ' . $form_table_name . ' fr ON fi.form_id=fr.id', $where, 'fi.*, fr.name as form_name', $args, '', $query_type ); | |
| 1132 | 938 | } else { |
| 1133 | - // If the query is not an array, then it has already been prepared | |
| 939 | + // if the query is not an array, then it has already been prepared | |
| 1134 | 940 | $query .= FrmDb::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit; |
| 1135 | 941 | |
| 1136 | 942 | $function_name = $query_type === 'row' ? 'get_row' : 'get_results'; |
| 1137 | 943 | $results = $wpdb->$function_name( $query ); |
| @@ -1146,18 +952,12 @@ | ||
| 1146 | 952 | } |
| 1147 | 953 | |
| 1148 | 954 | /** |
| 1149 | 955 | * @since 2.0.8 |
| 1150 | - * | |
| 1151 | - * @param array|object|null $results Results. | |
| 1152 | - * | |
| 1153 | - * @return void | |
| 1154 | 956 | */ |
| 1155 | 957 | private static function format_field_results( &$results ) { |
| 1156 | 958 | if ( is_array( $results ) ) { |
| 1157 | 959 | foreach ( $results as $r_key => $result ) { |
| 1158 | - self::add_slashes_to_format_before_setting_field_cache( $result ); | |
| 1159 | - | |
| 1160 | 960 | FrmDb::set_cache( $result->id, $result, 'frm_field' ); |
| 1161 | 961 | FrmDb::set_cache( $result->field_key, $result, 'frm_field' ); |
| 1162 | 962 | |
| 1163 | 963 | self::prepare_options( $result ); |
| @@ -1175,34 +975,11 @@ | ||
| 1175 | 975 | } |
| 1176 | 976 | } |
| 1177 | 977 | |
| 1178 | 978 | /** |
| 1179 | - * When $result->field_options is an array and not a serialized string there is only a single backslash. | |
| 1180 | - * Cached results are unslashed in FrmField::getAll, so we need to make sure that the cached object has an extra backslash. | |
| 1181 | - * Otherwise the backslash is stripped away on load. | |
| 1182 | - * | |
| 1183 | - * @since 6.15 | |
| 1184 | - * | |
| 1185 | - * @param stdClass $result | |
| 1186 | - * | |
| 1187 | - * @return void | |
| 1188 | - */ | |
| 1189 | - private static function add_slashes_to_format_before_setting_field_cache( $result ) { | |
| 1190 | - if ( ! isset( $result->field_options ) || ! is_array( $result->field_options ) || empty( $result->field_options['format'] ) ) { | |
| 1191 | - return; | |
| 1192 | - } | |
| 1193 | - | |
| 1194 | - $result->field_options['format'] = addslashes( $result->field_options['format'] ); | |
| 1195 | - } | |
| 1196 | - | |
| 1197 | - /** | |
| 1198 | 979 | * Unserialize all the serialized field data |
| 1199 | 980 | * |
| 1200 | 981 | * @since 2.0 |
| 1201 | - * | |
| 1202 | - * @param object $results | |
| 1203 | - * | |
| 1204 | - * @return void | |
| 1205 | 982 | */ |
| 1206 | 983 | private static function prepare_options( &$results ) { |
| 1207 | 984 | FrmAppHelper::unserialize_or_decode( $results->field_options ); |
| 1208 | 985 | FrmAppHelper::unserialize_or_decode( $results->options ); |
| @@ -1208,32 +985,19 @@ | ||
| 1208 | 985 | FrmAppHelper::unserialize_or_decode( $results->options ); |
| 1209 | 986 | |
| 1210 | 987 | // Allow a single box to be checked for the default value. |
| 1211 | 988 | $before = $results->default_value; |
| 1212 | - | |
| 1213 | - $field_object = FrmFieldFactory::get_field_type( $results->type ); | |
| 1214 | - | |
| 1215 | - if ( ! $field_object->should_unserialize_value() ) { | |
| 1216 | - return; | |
| 1217 | - } | |
| 1218 | - | |
| 1219 | 989 | FrmAppHelper::unserialize_or_decode( $results->default_value ); |
| 1220 | - | |
| 1221 | - if ( $before === $results->default_value && is_string( $before ) && str_starts_with( $before, '["' ) ) { | |
| 990 | + if ( $before === $results->default_value && ! is_array( $before ) && strpos( $before, '["' ) === 0 ) { | |
| 1222 | 991 | $results->default_value = FrmAppHelper::maybe_json_decode( $results->default_value ); |
| 1223 | 992 | } |
| 1224 | 993 | } |
| 1225 | 994 | |
| 1226 | 995 | /** |
| 1227 | - * If a form has too many fields, they won't all save into a single transient. | |
| 996 | + * If a form has too many fields, thay won't all save into a single transient. | |
| 1228 | 997 | * We'll break them into groups of 200 |
| 1229 | 998 | * |
| 1230 | 999 | * @since 2.0.1 |
| 1231 | - * | |
| 1232 | - * @param int|string $form_id Form ID. | |
| 1233 | - * @param array $args Additional arguments. | |
| 1234 | - * | |
| 1235 | - * @return array | |
| 1236 | 1000 | */ |
| 1237 | 1001 | private static function get_fields_from_transients( $form_id, $args ) { |
| 1238 | 1002 | $fields = array(); |
| 1239 | 1003 | self::get_next_transient( $fields, 'frm_form_fields_' . $form_id . $args['inc_embed'] . $args['inc_repeat'] ); |
| @@ -1244,32 +1008,22 @@ | ||
| 1244 | 1008 | /** |
| 1245 | 1009 | * Called by get_fields_from_transients |
| 1246 | 1010 | * |
| 1247 | 1011 | * @since 2.0.1 |
| 1248 | - * | |
| 1249 | - * @param array $fields Array of fields. | |
| 1250 | - * @param string $base_name Base name. | |
| 1251 | - * @param int $next Next transient number. | |
| 1252 | - * | |
| 1253 | - * @return void | |
| 1254 | 1012 | */ |
| 1255 | 1013 | private static function get_next_transient( &$fields, $base_name, $next = 0 ) { |
| 1256 | 1014 | $name = $next ? $base_name . $next : $base_name; |
| 1257 | 1015 | $next_fields = get_transient( $name ); |
| 1258 | 1016 | |
| 1259 | - if ( ! $next_fields ) { | |
| 1260 | - return; | |
| 1261 | - } | |
| 1017 | + if ( $next_fields ) { | |
| 1018 | + $fields = array_merge( $fields, $next_fields ); | |
| 1262 | 1019 | |
| 1263 | - $fields = array_merge( $fields, $next_fields ); | |
| 1264 | - | |
| 1265 | - if ( count( $next_fields ) < self::$transient_size ) { | |
| 1266 | - return; | |
| 1020 | + if ( count( $next_fields ) >= self::$transient_size ) { | |
| 1021 | + // if this transient is full, check for another | |
| 1022 | + ++$next; | |
| 1023 | + self::get_next_transient( $fields, $base_name, $next ); | |
| 1024 | + } | |
| 1267 | 1025 | } |
| 1268 | - | |
| 1269 | - // If this transient is full, check for another | |
| 1270 | - ++$next; | |
| 1271 | - self::get_next_transient( $fields, $base_name, $next ); | |
| 1272 | 1026 | } |
| 1273 | 1027 | |
| 1274 | 1028 | /** |
| 1275 | 1029 | * Save the transients in chunks for large forms |
| @@ -1274,15 +1028,8 @@ | ||
| 1274 | 1028 | /** |
| 1275 | 1029 | * Save the transients in chunks for large forms |
| 1276 | 1030 | * |
| 1277 | 1031 | * @since 2.0.1 |
| 1278 | - * | |
| 1279 | - * @param array $fields Array of fields. | |
| 1280 | - * @param int|string $form_id Form ID. | |
| 1281 | - * @param int $next Next transient number. | |
| 1282 | - * @param array $args Additional arguments. | |
| 1283 | - * | |
| 1284 | - * @return void | |
| 1285 | 1032 | */ |
| 1286 | 1033 | private static function set_field_transient( &$fields, $form_id, $next = 0, $args = array() ) { |
| 1287 | 1034 | $base_name = 'frm_form_fields_' . $form_id . $args['inc_embed'] . $args['inc_repeat']; |
| 1288 | 1035 | $field_chunks = array_chunk( $fields, self::$transient_size ); |
| @@ -1289,13 +1036,12 @@ | ||
| 1289 | 1036 | |
| 1290 | 1037 | foreach ( $field_chunks as $field ) { |
| 1291 | 1038 | $name = $next ? $base_name . $next : $base_name; |
| 1292 | 1039 | $set = set_transient( $name, $field, 60 * 60 * 6 ); |
| 1293 | - | |
| 1294 | 1040 | if ( ! $set ) { |
| 1295 | - // The transient didn't save | |
| 1296 | - if ( $name !== $base_name ) { | |
| 1297 | - // If the first saved an others fail, this will show an incomplete form | |
| 1041 | + // the transient didn't save | |
| 1042 | + if ( $name != $base_name ) { | |
| 1043 | + // if the first saved an others fail, this will show an incmoplete form | |
| 1298 | 1044 | self::delete_form_transient( $form_id ); |
| 1299 | 1045 | } |
| 1300 | 1046 | |
| 1301 | 1047 | return; |
| @@ -1306,9 +1052,8 @@ | ||
| 1306 | 1052 | } |
| 1307 | 1053 | |
| 1308 | 1054 | /** |
| 1309 | 1055 | * @param string $type |
| 1310 | - * | |
| 1311 | 1056 | * @return bool |
| 1312 | 1057 | */ |
| 1313 | 1058 | public static function is_no_save_field( $type ) { |
| 1314 | 1059 | return in_array( $type, self::no_save_fields(), true ); |
| @@ -1336,16 +1081,20 @@ | ||
| 1336 | 1081 | } |
| 1337 | 1082 | |
| 1338 | 1083 | $field_type = self::get_original_field_type( $field ); |
| 1339 | 1084 | |
| 1340 | - return self::is_checkbox( $field ) || $field_type === 'address' || self::is_multiple_select( $field ); | |
| 1085 | + $is_multi_value_field = ( | |
| 1086 | + self::is_checkbox( $field ) || | |
| 1087 | + $field_type === 'address' || | |
| 1088 | + self::is_multiple_select( $field ) | |
| 1089 | + ); | |
| 1090 | + | |
| 1091 | + return $is_multi_value_field; | |
| 1341 | 1092 | } |
| 1342 | 1093 | |
| 1343 | 1094 | /** |
| 1344 | 1095 | * @since 3.0 |
| 1345 | - * | |
| 1346 | 1096 | * @param array|object $field |
| 1347 | - * | |
| 1348 | 1097 | * @return string |
| 1349 | 1098 | */ |
| 1350 | 1099 | public static function get_field_type( $field ) { |
| 1351 | 1100 | return is_array( $field ) ? $field['type'] : $field->type; |
| @@ -1352,11 +1101,8 @@ | ||
| 1352 | 1101 | } |
| 1353 | 1102 | |
| 1354 | 1103 | /** |
| 1355 | 1104 | * @since 3.0 |
| 1356 | - * | |
| 1357 | - * @param array|object $field | |
| 1358 | - * | |
| 1359 | 1105 | * @return string |
| 1360 | 1106 | */ |
| 1361 | 1107 | public static function get_original_field_type( $field ) { |
| 1362 | 1108 | $field_type = self::get_field_type( $field ); |
| @@ -1361,11 +1107,11 @@ | ||
| 1361 | 1107 | public static function get_original_field_type( $field ) { |
| 1362 | 1108 | $field_type = self::get_field_type( $field ); |
| 1363 | 1109 | $original_type = self::get_option( $field, 'original_type' ); |
| 1364 | 1110 | |
| 1365 | - if ( $original_type && $original_type !== $field_type ) { | |
| 1111 | + if ( ! empty( $original_type ) && $original_type != $field_type ) { | |
| 1366 | 1112 | // Check the original type for arrays. |
| 1367 | - return $original_type; | |
| 1113 | + $field_type = $original_type; | |
| 1368 | 1114 | } |
| 1369 | 1115 | |
| 1370 | 1116 | return $field_type; |
| 1371 | 1117 | } |
| @@ -1373,11 +1119,8 @@ | ||
| 1373 | 1119 | /** |
| 1374 | 1120 | * Check if this is a multiselect dropdown field |
| 1375 | 1121 | * |
| 1376 | 1122 | * @since 2.0.9 |
| 1377 | - * | |
| 1378 | - * @param array|object $field Field object. | |
| 1379 | - * | |
| 1380 | 1123 | * @return bool |
| 1381 | 1124 | */ |
| 1382 | 1125 | public static function is_multiple_select( $field ) { |
| 1383 | 1126 | $field_type = self::get_field_type( $field ); |
| @@ -1392,9 +1135,8 @@ | ||
| 1392 | 1135 | * |
| 1393 | 1136 | * @since 2.0.9 |
| 1394 | 1137 | * |
| 1395 | 1138 | * @param array|object $field |
| 1396 | - * | |
| 1397 | 1139 | * @return bool |
| 1398 | 1140 | */ |
| 1399 | 1141 | public static function is_read_only( $field ) { |
| 1400 | 1142 | global $frm_vars; |
| @@ -1404,19 +1146,20 @@ | ||
| 1404 | 1146 | /** |
| 1405 | 1147 | * @since 2.0.9 |
| 1406 | 1148 | * |
| 1407 | 1149 | * @param array $field |
| 1408 | - * | |
| 1409 | 1150 | * @return bool |
| 1410 | 1151 | */ |
| 1411 | 1152 | public static function is_required( $field ) { |
| 1412 | - $required = $field['required'] != '0'; // phpcs:ignore Universal.Operators.StrictComparisons | |
| 1153 | + $required = $field['required'] != '0'; | |
| 1413 | 1154 | |
| 1414 | 1155 | /** |
| 1415 | 1156 | * @param bool $required |
| 1416 | 1157 | * @param array $field |
| 1417 | 1158 | */ |
| 1418 | - return (bool) apply_filters( 'frm_is_field_required', $required, $field ); | |
| 1159 | + $required = (bool) apply_filters( 'frm_is_field_required', $required, $field ); | |
| 1160 | + | |
| 1161 | + return $required; | |
| 1419 | 1162 | } |
| 1420 | 1163 | |
| 1421 | 1164 | /** |
| 1422 | 1165 | * @since 2.0.9 |
| @@ -1422,9 +1165,8 @@ | ||
| 1422 | 1165 | * @since 2.0.9 |
| 1423 | 1166 | * |
| 1424 | 1167 | * @param array|object $field |
| 1425 | 1168 | * @param string $option |
| 1426 | - * | |
| 1427 | 1169 | * @return bool |
| 1428 | 1170 | */ |
| 1429 | 1171 | public static function is_option_true( $field, $option ) { |
| 1430 | 1172 | if ( is_array( $field ) ) { |
| @@ -1437,9 +1179,8 @@ | ||
| 1437 | 1179 | * @since 2.0.9 |
| 1438 | 1180 | * |
| 1439 | 1181 | * @param array|object $field |
| 1440 | 1182 | * @param string $option |
| 1441 | - * | |
| 1442 | 1183 | * @return bool |
| 1443 | 1184 | */ |
| 1444 | 1185 | public static function is_option_empty( $field, $option ) { |
| 1445 | 1186 | if ( is_array( $field ) ) { |
| @@ -1450,9 +1191,8 @@ | ||
| 1450 | 1191 | |
| 1451 | 1192 | /** |
| 1452 | 1193 | * @param array $field |
| 1453 | 1194 | * @param string $option |
| 1454 | - * | |
| 1455 | 1195 | * @return bool |
| 1456 | 1196 | */ |
| 1457 | 1197 | public static function is_option_true_in_array( $field, $option ) { |
| 1458 | 1198 | return ! empty( $field[ $option ] ); |
| @@ -1460,19 +1200,17 @@ | ||
| 1460 | 1200 | |
| 1461 | 1201 | /** |
| 1462 | 1202 | * @param object $field |
| 1463 | 1203 | * @param string $option |
| 1464 | - * | |
| 1465 | 1204 | * @return bool |
| 1466 | 1205 | */ |
| 1467 | 1206 | public static function is_option_true_in_object( $field, $option ) { |
| 1468 | - return ! empty( $field->field_options[ $option ] ); | |
| 1207 | + return isset( $field->field_options[ $option ] ) && $field->field_options[ $option ]; | |
| 1469 | 1208 | } |
| 1470 | 1209 | |
| 1471 | 1210 | /** |
| 1472 | 1211 | * @param array $field |
| 1473 | 1212 | * @param string $option |
| 1474 | - * | |
| 1475 | 1213 | * @return bool |
| 1476 | 1214 | */ |
| 1477 | 1215 | public static function is_option_empty_in_array( $field, $option ) { |
| 1478 | 1216 | return empty( $field[ $option ] ); |
| @@ -1480,9 +1218,8 @@ | ||
| 1480 | 1218 | |
| 1481 | 1219 | /** |
| 1482 | 1220 | * @param object $field |
| 1483 | 1221 | * @param string $option |
| 1484 | - * | |
| 1485 | 1222 | * @return bool |
| 1486 | 1223 | */ |
| 1487 | 1224 | public static function is_option_empty_in_object( $field, $option ) { |
| 1488 | 1225 | return empty( $field->field_options[ $option ] ); |
| @@ -1490,13 +1227,12 @@ | ||
| 1490 | 1227 | |
| 1491 | 1228 | /** |
| 1492 | 1229 | * @param stdClass $field |
| 1493 | 1230 | * @param string $option |
| 1494 | - * | |
| 1495 | 1231 | * @return bool |
| 1496 | 1232 | */ |
| 1497 | 1233 | public static function is_option_value_in_object( $field, $option ) { |
| 1498 | - return isset( $field->field_options[ $option ] ) && $field->field_options[ $option ] != ''; // phpcs:ignore Universal.Operators.StrictComparisons | |
| 1234 | + return isset( $field->field_options[ $option ] ) && $field->field_options[ $option ] != ''; | |
| 1499 | 1235 | } |
| 1500 | 1236 | |
| 1501 | 1237 | /** |
| 1502 | 1238 | * @since 2.0.18 |
| @@ -1502,19 +1238,23 @@ | ||
| 1502 | 1238 | * @since 2.0.18 |
| 1503 | 1239 | * |
| 1504 | 1240 | * @param array|object $field |
| 1505 | 1241 | * @param string $option |
| 1506 | - * | |
| 1507 | 1242 | * @return mixed |
| 1508 | 1243 | */ |
| 1509 | 1244 | public static function get_option( $field, $option ) { |
| 1510 | - return is_array( $field ) ? self::get_option_in_array( $field, $option ) : self::get_option_in_object( $field, $option ); | |
| 1245 | + if ( is_array( $field ) ) { | |
| 1246 | + $option = self::get_option_in_array( $field, $option ); | |
| 1247 | + } else { | |
| 1248 | + $option = self::get_option_in_object( $field, $option ); | |
| 1249 | + } | |
| 1250 | + | |
| 1251 | + return $option; | |
| 1511 | 1252 | } |
| 1512 | 1253 | |
| 1513 | 1254 | /** |
| 1514 | 1255 | * @param array $field |
| 1515 | 1256 | * @param string $option |
| 1516 | - * | |
| 1517 | 1257 | * @return mixed |
| 1518 | 1258 | */ |
| 1519 | 1259 | public static function get_option_in_array( $field, $option ) { |
| 1520 | 1260 | if ( isset( $field[ $option ] ) ) { |
| @@ -1530,13 +1270,12 @@ | ||
| 1530 | 1270 | |
| 1531 | 1271 | /** |
| 1532 | 1272 | * @param object $field |
| 1533 | 1273 | * @param string $option |
| 1534 | - * | |
| 1535 | 1274 | * @return mixed |
| 1536 | 1275 | */ |
| 1537 | 1276 | public static function get_option_in_object( $field, $option ) { |
| 1538 | - return $field->field_options[ $option ] ?? ''; | |
| 1277 | + return isset( $field->field_options[ $option ] ) ? $field->field_options[ $option ] : ''; | |
| 1539 | 1278 | } |
| 1540 | 1279 | |
| 1541 | 1280 | /** |
| 1542 | 1281 | * @since 2.0.09 |
| @@ -1541,13 +1280,17 @@ | ||
| 1541 | 1280 | /** |
| 1542 | 1281 | * @since 2.0.09 |
| 1543 | 1282 | * |
| 1544 | 1283 | * @param array|object $field |
| 1545 | - * | |
| 1546 | 1284 | * @return bool |
| 1547 | 1285 | */ |
| 1548 | 1286 | public static function is_repeating_field( $field ) { |
| 1549 | - $is_repeating_field = is_array( $field ) ? 'divider' === $field['type'] : 'divider' === $field->type; | |
| 1287 | + if ( is_array( $field ) ) { | |
| 1288 | + $is_repeating_field = ( 'divider' === $field['type'] ); | |
| 1289 | + } else { | |
| 1290 | + $is_repeating_field = ( 'divider' === $field->type ); | |
| 1291 | + } | |
| 1292 | + | |
| 1550 | 1293 | return $is_repeating_field && self::is_option_true( $field, 'repeat' ); |
| 1551 | 1294 | } |
| 1552 | 1295 | |
| 1553 | 1296 | /** |
| @@ -1556,8 +1299,9 @@ | ||
| 1556 | 1299 | * @return int field id |
| 1557 | 1300 | */ |
| 1558 | 1301 | public static function get_id_by_key( $key ) { |
| 1559 | 1302 | $id = FrmDb::get_var( 'frm_fields', array( 'field_key' => sanitize_title( $key ) ) ); |
| 1303 | + | |
| 1560 | 1304 | return (int) $id; |
| 1561 | 1305 | } |
| 1562 | 1306 | |
| 1563 | 1307 | /** |
| @@ -1568,16 +1312,12 @@ | ||
| 1568 | 1312 | public static function get_key_by_id( $id ) { |
| 1569 | 1313 | return FrmDb::get_var( 'frm_fields', array( 'id' => $id ), 'field_key' ); |
| 1570 | 1314 | } |
| 1571 | 1315 | |
| 1572 | - /** | |
| 1573 | - * @param array|object $field | |
| 1574 | - * | |
| 1575 | - * @return bool | |
| 1576 | - */ | |
| 1577 | 1316 | public static function is_image( $field ) { |
| 1578 | 1317 | $type = self::get_field_type( $field ); |
| 1579 | - return $type === 'url' && self::get_option( $field, 'show_image' ); | |
| 1318 | + | |
| 1319 | + return ( $type === 'url' && self::get_option( $field, 'show_image' ) ); | |
| 1580 | 1320 | } |
| 1581 | 1321 | |
| 1582 | 1322 | /** |
| 1583 | 1323 | * Check if field is radio or Dynamic radio |
| @@ -1615,12 +1355,18 @@ | ||
| 1615 | 1355 | * |
| 1616 | 1356 | * @return bool true if field type is checkbox or Dynamic checkbox |
| 1617 | 1357 | */ |
| 1618 | 1358 | public static function is_field_type( $field, $is_type ) { |
| 1619 | - $field_type = self::get_original_field_type( $field ); | |
| 1620 | - $data_type = self::get_option( $field, 'data_type' ); | |
| 1621 | - $is_field_type = $is_type === $field_type || ( 'data' === $field_type && $is_type === $data_type ) || ( 'lookup' === $field_type && $is_type === $data_type ) || ( 'product' === $field_type && $is_type === $data_type ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 1359 | + $field_type = self::get_original_field_type( $field ); | |
| 1360 | + $data_type = self::get_option( $field, 'data_type' ); | |
| 1622 | 1361 | |
| 1362 | + $is_field_type = ( | |
| 1363 | + $is_type === $field_type || | |
| 1364 | + ( 'data' === $field_type && $is_type === $data_type ) || | |
| 1365 | + ( 'lookup' === $field_type && $is_type === $data_type ) || | |
| 1366 | + ( 'product' === $field_type && $is_type === $data_type ) | |
| 1367 | + ); | |
| 1368 | + | |
| 1623 | 1369 | /** |
| 1624 | 1370 | * When a field type is checked, allow individual fields |
| 1625 | 1371 | * to set the type. |
| 1626 | 1372 | * |
| @@ -1634,12 +1380,12 @@ | ||
| 1634 | 1380 | * |
| 1635 | 1381 | * @since 4.10.02 |
| 1636 | 1382 | * |
| 1637 | 1383 | * @param array $field Field array. |
| 1638 | - * | |
| 1639 | 1384 | * @return bool |
| 1640 | 1385 | */ |
| 1641 | 1386 | public static function is_combo_field( $field ) { |
| 1642 | 1387 | $field_type_obj = FrmFieldFactory::get_field_factory( $field ); |
| 1388 | + | |
| 1643 | 1389 | return ! empty( $field_type_obj->is_combo_field ); |
| 1644 | 1390 | } |
| 1645 | 1391 | } |
