| @@ -4,342 +4,216 @@ | ||
| 4 | 4 | } |
| 5 | 5 | |
| 6 | 6 | class FrmField { |
| 7 | 7 | |
| 8 | - /** | |
| 9 | - * @var bool | |
| 10 | - */ | |
| 11 | 8 | public static $use_cache = true; |
| 12 | - | |
| 13 | - /** | |
| 14 | - * @var int | |
| 15 | - */ | |
| 16 | 9 | public static $transient_size = 200; |
| 17 | 10 | |
| 18 | - /** | |
| 19 | - * @return array | |
| 20 | - */ | |
| 21 | 11 | public static function field_selection() { |
| 12 | + $frm_settings = FrmAppHelper::get_settings(); | |
| 13 | + $active_captcha = $frm_settings->active_captcha; | |
| 14 | + if ( ! FrmFieldCaptcha::should_show_captcha() ) { | |
| 15 | + $captcha_name = 'Captcha'; | |
| 16 | + } elseif ( $active_captcha === 'recaptcha' ) { | |
| 17 | + $captcha_name = 'reCAPTCHA'; | |
| 18 | + } else { | |
| 19 | + $captcha_name = 'hCaptcha'; | |
| 20 | + } | |
| 22 | 21 | $fields = array( |
| 23 | - 'text' => array( | |
| 22 | + 'text' => array( | |
| 24 | 23 | 'name' => __( 'Text', 'formidable' ), |
| 25 | - 'icon' => 'frmfont frm_text2_icon', | |
| 24 | + 'icon' => 'frm_icon_font frm_text2_icon', | |
| 26 | 25 | ), |
| 27 | - 'textarea' => array( | |
| 26 | + 'textarea' => array( | |
| 28 | 27 | 'name' => __( 'Paragraph', 'formidable' ), |
| 29 | - 'icon' => 'frmfont frm_paragraph_icon', | |
| 28 | + 'icon' => 'frm_icon_font frm_paragraph_icon', | |
| 30 | 29 | ), |
| 31 | - 'checkbox' => array( | |
| 30 | + 'checkbox' => array( | |
| 32 | 31 | 'name' => __( 'Checkboxes', 'formidable' ), |
| 33 | - 'icon' => 'frmfont frm_check_square_icon', | |
| 32 | + 'icon' => 'frm_icon_font frm_check_square_icon', | |
| 34 | 33 | ), |
| 35 | - 'radio' => array( | |
| 34 | + 'radio' => array( | |
| 36 | 35 | 'name' => __( 'Radio Buttons', 'formidable' ), |
| 37 | - 'icon' => 'frmfont frm_radio_checked_icon', | |
| 36 | + 'icon' => 'frm_icon_font frm_radio_checked_icon', | |
| 38 | 37 | ), |
| 39 | - 'select' => array( | |
| 38 | + 'select' => array( | |
| 40 | 39 | 'name' => __( 'Dropdown', 'formidable' ), |
| 41 | - 'icon' => 'frmfont frm_dropdown_icon', | |
| 40 | + 'icon' => 'frm_icon_font frm_caret_square_down_icon', | |
| 42 | 41 | ), |
| 43 | - 'email' => array( | |
| 42 | + 'email' => array( | |
| 44 | 43 | 'name' => __( 'Email', 'formidable' ), |
| 45 | - 'icon' => 'frmfont frm_email2_icon', | |
| 44 | + 'icon' => 'frm_icon_font frm_email_icon', | |
| 46 | 45 | ), |
| 47 | - 'url' => array( | |
| 46 | + 'url' => array( | |
| 48 | 47 | 'name' => __( 'Website/URL', 'formidable' ), |
| 49 | - 'icon' => 'frmfont frm_link2_icon', | |
| 48 | + 'icon' => 'frm_icon_font frm_link_icon', | |
| 50 | 49 | ), |
| 51 | - 'number' => array( | |
| 50 | + 'number' => array( | |
| 52 | 51 | 'name' => __( 'Number', 'formidable' ), |
| 53 | - 'icon' => 'frmfont frm_hashtag_icon', | |
| 52 | + 'icon' => 'frm_icon_font frm_hashtag_icon', | |
| 54 | 53 | ), |
| 55 | - 'name' => array( | |
| 54 | + 'name' => array( | |
| 56 | 55 | 'name' => __( 'Name', 'formidable' ), |
| 57 | - 'icon' => 'frmfont frm_user_name_icon', | |
| 56 | + 'icon' => 'frm_icon_font frm_user_name_icon', | |
| 58 | 57 | ), |
| 59 | - 'phone' => array( | |
| 58 | + 'phone' => array( | |
| 60 | 59 | 'name' => __( 'Phone', 'formidable' ), |
| 61 | - 'icon' => 'frmfont frm_phone_icon', | |
| 60 | + 'icon' => 'frm_icon_font frm_phone_icon', | |
| 62 | 61 | ), |
| 63 | - 'html' => array( | |
| 62 | + 'html' => array( | |
| 64 | 63 | 'name' => __( 'HTML', 'formidable' ), |
| 65 | - 'icon' => 'frmfont frm_code2_icon', | |
| 64 | + 'icon' => 'frm_icon_font frm_code_icon', | |
| 66 | 65 | ), |
| 67 | - 'hidden' => array( | |
| 66 | + 'hidden' => array( | |
| 68 | 67 | 'name' => __( 'Hidden', 'formidable' ), |
| 69 | - 'icon' => 'frmfont frm_eye_slash2_icon', | |
| 68 | + 'icon' => 'frm_icon_font frm_eye_slash_icon', | |
| 70 | 69 | ), |
| 71 | - 'user_id' => array( | |
| 70 | + 'user_id' => array( | |
| 72 | 71 | 'name' => __( 'User ID', 'formidable' ), |
| 73 | - 'icon' => 'frmfont frm_user2_icon', | |
| 72 | + 'icon' => 'frm_icon_font frm_user_icon', | |
| 74 | 73 | ), |
| 75 | - 'captcha' => array( | |
| 76 | - 'name' => self::get_captcha_field_name(), | |
| 77 | - 'icon' => 'frmfont frm_shield_check2_icon', | |
| 74 | + 'captcha' => array( | |
| 75 | + 'name' => $captcha_name, | |
| 76 | + 'icon' => 'frm_icon_font frm_shield_check_icon', | |
| 78 | 77 | ), |
| 79 | - 'credit_card' => array( | |
| 80 | - 'name' => __( 'Payment', 'formidable' ), | |
| 81 | - 'icon' => 'frmfont frm_credit_card2_icon', | |
| 82 | - ), | |
| 83 | - FrmSubmitHelper::FIELD_TYPE => array( | |
| 84 | - 'name' => __( 'Submit', 'formidable' ), | |
| 85 | - 'hide' => true, | |
| 86 | - ), | |
| 87 | - FrmFieldGdprHelper::FIELD_TYPE => array( | |
| 88 | - 'name' => __( 'GDPR', 'formidable' ), | |
| 89 | - 'icon' => 'frmfont frm-gdpr-icon', | |
| 90 | - 'hide' => FrmFieldGdprHelper::hide_gdpr_field(), | |
| 91 | - ), | |
| 92 | 78 | ); |
| 93 | 79 | |
| 94 | - /** | |
| 95 | - * @param array $fields | |
| 96 | - */ | |
| 97 | 80 | return apply_filters( 'frm_available_fields', $fields ); |
| 98 | 81 | } |
| 99 | 82 | |
| 100 | - /** | |
| 101 | - * Get the name of the Captcha field based on the global Captcha setting. | |
| 102 | - * | |
| 103 | - * @return string | |
| 104 | - */ | |
| 105 | - private static function get_captcha_field_name() { | |
| 106 | - return 'Captcha'; | |
| 107 | - } | |
| 108 | - | |
| 109 | - /** | |
| 110 | - * @return array | |
| 111 | - */ | |
| 112 | 83 | public static function pro_field_selection() { |
| 113 | - $upsell_images_url = FrmAppHelper::plugin_url() . '/images/upsell/'; | |
| 114 | - $fields = array( | |
| 115 | - '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', | |
| 84 | + $images_url = FrmAppHelper::plugin_url() . '/images/'; | |
| 85 | + $fields = array( | |
| 86 | + 'file' => array( | |
| 87 | + 'name' => __( 'File Upload', 'formidable' ), | |
| 88 | + 'icon' => 'frm_icon_font frm_upload_icon', | |
| 89 | + 'message' => 'Add file uploads to save time and cut down on back-and-forth. Upgrade to Pro to get Upload fields and more.', | |
| 121 | 90 | ), |
| 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', | |
| 91 | + 'rte' => array( | |
| 92 | + 'name' => __( 'Rich Text', 'formidable' ), | |
| 93 | + 'icon' => 'frm_icon_font frm_align_right_icon', | |
| 129 | 94 | ), |
| 130 | - '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', | |
| 95 | + 'date' => array( | |
| 96 | + 'name' => __( 'Date', 'formidable' ), | |
| 97 | + 'icon' => 'frm_icon_font frm_calendar_icon', | |
| 136 | 98 | ), |
| 137 | - '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', | |
| 99 | + 'time' => array( | |
| 100 | + 'name' => __( 'Time', 'formidable' ), | |
| 101 | + 'icon' => 'frm_icon_font frm_clock_icon', | |
| 143 | 102 | ), |
| 144 | - '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', | |
| 103 | + 'scale' => array( | |
| 104 | + 'name' => __( 'Scale', 'formidable' ), | |
| 105 | + 'icon' => 'frm_icon_font frm_linear_scale_icon', | |
| 106 | + 'message' => 'Add a set of radio buttons with whatever range you choose. <img src="' . esc_attr( $images_url ) . 'scale_field.png" alt="Scale Field" />', | |
| 150 | 107 | ), |
| 151 | - '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', | |
| 108 | + 'star' => array( | |
| 109 | + 'name' => __( 'Star Rating', 'formidable' ), | |
| 110 | + 'icon' => 'frm_icon_font frm_star_icon', | |
| 157 | 111 | ), |
| 158 | - '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', | |
| 112 | + 'range' => array( | |
| 113 | + 'name' => __( 'Slider', 'formidable' ), | |
| 114 | + 'icon' => 'frm_icon_font frm_code_commit_icon', | |
| 164 | 115 | ), |
| 165 | - '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', | |
| 116 | + 'toggle' => array( | |
| 117 | + 'name' => __( 'Toggle', 'formidable' ), | |
| 118 | + 'icon' => 'frm_icon_font frm_toggle_on_icon', | |
| 171 | 119 | ), |
| 172 | - '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', | |
| 120 | + 'data' => array( | |
| 121 | + 'name' => __( 'Dynamic', 'formidable' ), | |
| 122 | + 'icon' => 'frm_icon_font frm_sitemap_icon', | |
| 123 | + '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.', | |
| 178 | 124 | ), |
| 179 | - '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', | |
| 125 | + 'lookup' => array( | |
| 126 | + 'name' => __( 'Lookup', 'formidable' ), | |
| 127 | + 'icon' => 'frm_icon_font frm_search_icon', | |
| 128 | + '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_attr( $images_url ) . 'look-up_year-make-model.gif" alt="cascading lookup fields" />', | |
| 185 | 129 | ), |
| 186 | - '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', | |
| 130 | + 'divider|repeat' => array( | |
| 131 | + 'name' => __( 'Repeater', 'formidable' ), | |
| 132 | + 'icon' => 'frm_icon_font frm_repeater_icon', | |
| 133 | + '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_attr( $images_url ) . 'repeatable-section_frontend.gif" alt="Dynamically Add Form Fields with repeatable sections" />', | |
| 192 | 134 | ), |
| 193 | - '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', | |
| 199 | - ), | |
| 200 | - 'end_divider' => array( | |
| 135 | + 'end_divider' => array( | |
| 201 | 136 | 'name' => __( 'Section Buttons', 'formidable' ), |
| 202 | 137 | 'switch_from' => 'divider', |
| 203 | 138 | ), |
| 204 | - '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', | |
| 139 | + 'divider' => array( | |
| 140 | + 'name' => __( 'Section', 'formidable' ), | |
| 141 | + 'icon' => 'frm_icon_font frm_header_icon', | |
| 210 | 142 | ), |
| 211 | - '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', | |
| 143 | + 'break' => array( | |
| 144 | + 'name' => __( 'Page Break', 'formidable' ), | |
| 145 | + 'icon' => 'frm_icon_font frm_page_break_icon', | |
| 146 | + '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 | 147 | ), |
| 218 | - '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', | |
| 148 | + 'form' => array( | |
| 149 | + 'name' => __( 'Embed Form', 'formidable' ), | |
| 150 | + 'icon' => 'frm_icon_font frm_file_text_icon', | |
| 224 | 151 | ), |
| 225 | - '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', | |
| 152 | + 'likert' => array( | |
| 153 | + 'name' => __( 'Likert Scale', 'formidable' ), | |
| 154 | + 'icon' => 'frm_icon_font frm_likert_scale frm_show_upgrade', | |
| 155 | + 'addon' => 'surveys', | |
| 232 | 156 | ), |
| 233 | - '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', | |
| 157 | + 'nps' => array( | |
| 158 | + 'name' => __( 'NPS', 'formidable' ), | |
| 159 | + 'icon' => 'frm_icon_font frm_nps frm_show_upgrade', | |
| 160 | + 'addon' => 'surveys', | |
| 240 | 161 | ), |
| 241 | - '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', | |
| 162 | + 'password' => array( | |
| 163 | + 'name' => __( 'Password', 'formidable' ), | |
| 164 | + 'icon' => 'frm_icon_font frm_lock_open_icon', | |
| 247 | 165 | ), |
| 248 | - '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', | |
| 166 | + 'tag' => array( | |
| 167 | + 'name' => __( 'Tags', 'formidable' ), | |
| 168 | + 'icon' => 'frm_icon_font frm_price_tags_icon', | |
| 254 | 169 | ), |
| 255 | - // This is no longer a Pro field, but without this here, Pro triggers "undefined index" notices. | |
| 256 | - // Right now it leaves a gap. Maybe we can skip anything without a name or something. | |
| 257 | - 'credit_card' => array( | |
| 258 | - 'name' => '', | |
| 259 | - 'icon' => '', | |
| 170 | + 'credit_card' => array( | |
| 171 | + 'name' => __( 'Credit Card', 'formidable' ), | |
| 172 | + 'icon' => 'frm_icon_font frm_credit_card_icon frm_show_upgrade', | |
| 173 | + 'addon' => 'stripe', | |
| 260 | 174 | ), |
| 261 | - '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', | |
| 175 | + 'address' => array( | |
| 176 | + 'name' => __( 'Address', 'formidable' ), | |
| 177 | + 'icon' => 'frm_icon_font frm_location_icon', | |
| 267 | 178 | ), |
| 268 | - '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', | |
| 179 | + 'summary' => array( | |
| 180 | + 'name' => __( 'Summary', 'formidable' ), | |
| 181 | + 'icon' => 'frm_icon_font frm_file_text_icon', | |
| 182 | + 'message' => 'Allow visitors to review their responses before a form is submitted. Upgrade to Pro to get Summary fields and more.', | |
| 274 | 183 | ), |
| 275 | - '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', | |
| 184 | + 'signature' => array( | |
| 185 | + 'name' => __( 'Signature', 'formidable' ), | |
| 186 | + 'icon' => 'frm_icon_font frm_signature_icon frm_show_upgrade', | |
| 187 | + 'addon' => 'signature', | |
| 282 | 188 | ), |
| 283 | - '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', | |
| 290 | - ), | |
| 291 | 189 | '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', | |
| 190 | + 'name' => __( 'Appointment', 'formidable' ), | |
| 191 | + 'icon' => 'frm_icon_font frm_calendar_icon frm_show_upgrade', | |
| 192 | + 'require' => 'Simply Schedule Appointments', | |
| 193 | + '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. | |
| 194 | + <img src="' . esc_attr( $images_url ) . 'appointments.png" alt="Scheduling" />', | |
| 195 | + 'link' => 'https://simplyscheduleappointments.com/meet/formidable/', | |
| 304 | 196 | ), |
| 305 | - 'product' => array( | |
| 306 | - 'name' => __( 'Product', 'formidable' ), | |
| 307 | - 'icon' => 'frmfont frm_product2_icon', | |
| 308 | - 'section' => 'pricing', | |
| 309 | - '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 | |
| 310 | - 'upsell_image' => $upsell_images_url . 'product-field-preview.webp', | |
| 311 | - 'learn-more' => 'features/pricing-fields', | |
| 197 | + 'product' => array( | |
| 198 | + 'name' => __( 'Product', 'formidable' ), | |
| 199 | + 'icon' => 'frm_icon_font frm_product_icon', | |
| 200 | + 'section' => 'pricing', | |
| 312 | 201 | ), |
| 313 | - 'quantity' => array( | |
| 314 | - 'name' => __( 'Quantity', 'formidable' ), | |
| 315 | - 'icon' => 'frmfont frm_quantity_icon', | |
| 316 | - 'section' => 'pricing', | |
| 317 | - '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 | |
| 318 | - 'upsell_image' => $upsell_images_url . 'quantity-field-preview.webp', | |
| 319 | - 'learn-more' => 'features/pricing-fields', | |
| 202 | + 'quantity' => array( | |
| 203 | + 'name' => __( 'Quantity', 'formidable' ), | |
| 204 | + 'icon' => 'frm_icon_font frm_quantity_icon', | |
| 205 | + 'section' => 'pricing', | |
| 320 | 206 | ), |
| 321 | - 'total' => array( | |
| 322 | - 'name' => __( 'Total', 'formidable' ), | |
| 323 | - 'icon' => 'frmfont frm_total2_icon', | |
| 324 | - 'section' => 'pricing', | |
| 325 | - '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 | |
| 326 | - 'upsell_image' => $upsell_images_url . 'total-field-preview.webp', | |
| 327 | - 'learn-more' => 'features/pricing-fields', | |
| 328 | - ), | |
| 329 | - 'coupon' => array( | |
| 330 | - 'name' => __( 'Coupon', 'formidable' ), | |
| 331 | - 'icon' => 'frm_icon_font frm_coupon_icon frm_show_upgrade', | |
| 332 | - 'addon' => 'coupons', | |
| 207 | + 'total' => array( | |
| 208 | + 'name' => __( 'Total', 'formidable' ), | |
| 209 | + 'icon' => 'frm_icon_font frm_total_icon', | |
| 333 | 210 | 'section' => 'pricing', |
| 334 | - 'limit' => 1, | |
| 335 | - 'is_new' => self::field_is_new( 'coupon' ), | |
| 336 | 211 | ), |
| 337 | 212 | ); |
| 338 | 213 | |
| 339 | 214 | // Since the signature field may be in a different section, don't show it twice. |
| 340 | 215 | $lite_fields = self::field_selection(); |
| 341 | - | |
| 342 | 216 | if ( isset( $lite_fields['signature'] ) ) { |
| 343 | 217 | unset( $fields['signature'] ); |
| 344 | 218 | } |
| 345 | 219 | |
| @@ -346,34 +220,9 @@ | ||
| 346 | 220 | return apply_filters( 'frm_pro_available_fields', $fields ); |
| 347 | 221 | } |
| 348 | 222 | |
| 349 | 223 | /** |
| 350 | - * Consider a field new for 90 days after the release date. | |
| 351 | - * | |
| 352 | - * @since 6.8.3 | |
| 353 | - * | |
| 354 | - * @param string $type | |
| 355 | - * | |
| 356 | - * @return bool | |
| 357 | - */ | |
| 358 | - private static function field_is_new( $type ) { | |
| 359 | - $release_dates = array( | |
| 360 | - 'coupon' => '2026-01-13', | |
| 361 | - ); | |
| 362 | - | |
| 363 | - if ( ! isset( $release_dates[ $type ] ) ) { | |
| 364 | - return false; | |
| 365 | - } | |
| 366 | - | |
| 367 | - $release_date = $release_dates[ $type ]; | |
| 368 | - $three_months_after_release = gmdate( 'Y-m-d', strtotime( $release_date . ' + 90 days' ) ); | |
| 369 | - return gmdate( 'Y-m-d' ) < $three_months_after_release; | |
| 370 | - } | |
| 371 | - | |
| 372 | - /** | |
| 373 | 224 | * @since 4.0 |
| 374 | - * | |
| 375 | - * @return array | |
| 376 | 225 | */ |
| 377 | 226 | public static function all_field_selection() { |
| 378 | 227 | $pro_field_selection = self::pro_field_selection(); |
| 379 | 228 | return array_merge( $pro_field_selection, self::field_selection() ); |
| @@ -378,29 +227,19 @@ | ||
| 378 | 227 | $pro_field_selection = self::pro_field_selection(); |
| 379 | 228 | return array_merge( $pro_field_selection, self::field_selection() ); |
| 380 | 229 | } |
| 381 | 230 | |
| 382 | - /** | |
| 383 | - * Create a field. | |
| 384 | - * | |
| 385 | - * @param array $values | |
| 386 | - * @param bool $return | |
| 387 | - * | |
| 388 | - * @return false|int | |
| 389 | - */ | |
| 390 | 231 | public static function create( $values, $return = true ) { |
| 391 | 232 | global $wpdb, $frm_duplicate_ids; |
| 392 | 233 | |
| 393 | 234 | $new_values = array(); |
| 394 | - $key = $values['field_key'] ?? $values['name']; | |
| 235 | + $key = isset( $values['field_key'] ) ? $values['field_key'] : $values['name']; | |
| 395 | 236 | $new_values['field_key'] = FrmAppHelper::get_unique_key( $key, $wpdb->prefix . 'frm_fields', 'field_key' ); |
| 396 | 237 | |
| 397 | 238 | $values = FrmAppHelper::maybe_filter_array( $values, array( 'name', 'description' ) ); |
| 398 | 239 | |
| 399 | 240 | foreach ( array( 'name', 'description', 'type', 'default_value' ) as $col ) { |
| 400 | - if ( isset( $values[ $col ] ) ) { | |
| 401 | - $new_values[ $col ] = $values[ $col ]; | |
| 402 | - } | |
| 241 | + $new_values[ $col ] = $values[ $col ]; | |
| 403 | 242 | } |
| 404 | 243 | |
| 405 | 244 | $new_values['options'] = self::maybe_filter_options( $values['options'] ); |
| 406 | 245 | $new_values['field_order'] = isset( $values['field_order'] ) ? (int) $values['field_order'] : null; |
| @@ -417,137 +256,56 @@ | ||
| 417 | 256 | self::preserve_format_option_backslashes( $new_values ); |
| 418 | 257 | |
| 419 | 258 | foreach ( $new_values as $k => $v ) { |
| 420 | 259 | if ( is_array( $v ) ) { |
| 421 | - $new_values[ $k ] = $k === 'default_value' ? FrmAppHelper::maybe_json_encode( $v ) : serialize( $v ); | |
| 260 | + if ( $k === 'default_value' ) { | |
| 261 | + $new_values[ $k ] = FrmAppHelper::maybe_json_encode( $v ); | |
| 262 | + } else { | |
| 263 | + $new_values[ $k ] = serialize( $v ); | |
| 264 | + } | |
| 422 | 265 | } |
| 423 | 266 | unset( $k, $v ); |
| 424 | 267 | } |
| 425 | 268 | |
| 426 | 269 | $query_results = $wpdb->insert( $wpdb->prefix . 'frm_fields', $new_values ); |
| 427 | - | |
| 428 | - if ( ! $query_results ) { | |
| 429 | - return false; | |
| 270 | + $new_id = 0; | |
| 271 | + if ( $query_results ) { | |
| 272 | + self::delete_form_transient( $new_values['form_id'] ); | |
| 273 | + $new_id = $wpdb->insert_id; | |
| 430 | 274 | } |
| 431 | 275 | |
| 432 | - self::delete_form_transient( $new_values['form_id'] ); | |
| 433 | - | |
| 434 | 276 | if ( ! $return ) { |
| 435 | 277 | return false; |
| 436 | 278 | } |
| 437 | 279 | |
| 438 | - $new_id = $wpdb->insert_id; | |
| 280 | + if ( $query_results ) { | |
| 281 | + if ( isset( $values['id'] ) ) { | |
| 282 | + $frm_duplicate_ids[ $values['id'] ] = $new_id; | |
| 283 | + } | |
| 439 | 284 | |
| 440 | - if ( isset( $values['id'] ) ) { | |
| 441 | - $frm_duplicate_ids[ $values['id'] ] = $new_id; | |
| 285 | + return $new_id; | |
| 286 | + } else { | |
| 287 | + return false; | |
| 442 | 288 | } |
| 443 | - | |
| 444 | - return $new_id; | |
| 445 | 289 | } |
| 446 | 290 | |
| 447 | 291 | /** |
| 448 | - * Maybe filter HTML in field options data. | |
| 449 | - * HTML is only filtered when unsafe HTML is disallowed. | |
| 450 | - * See FrmAppHelper::allow_unfiltered_html. | |
| 451 | - * | |
| 452 | 292 | * @since 5.0.08 |
| 453 | 293 | * |
| 454 | 294 | * @param array $options |
| 455 | - * | |
| 456 | 295 | * @return array |
| 457 | 296 | */ |
| 458 | 297 | private static function maybe_filter_options( $options ) { |
| 459 | - $options = FrmAppHelper::maybe_filter_array( $options, array( 'custom_html' ) ); | |
| 460 | - | |
| 461 | - if ( ! empty( $options['custom_html'] ) ) { | |
| 462 | - $options['custom_html'] = self::maybe_filter_custom_html_input_attributes( $options['custom_html'] ); | |
| 463 | - } | |
| 464 | - | |
| 465 | - if ( ! empty( $options['classes'] ) ) { | |
| 466 | - $options['classes'] = implode( ' ', array_map( 'FrmFormsHelper::sanitize_layout_class', explode( ' ', $options['classes'] ) ) ); | |
| 467 | - } | |
| 468 | - | |
| 469 | - return $options; | |
| 298 | + return FrmAppHelper::maybe_filter_array( $options, array( 'custom_html' ) ); | |
| 470 | 299 | } |
| 471 | 300 | |
| 472 | 301 | /** |
| 473 | - * Prevent users who do not have permission to insert JavaScript attributes in input elements. | |
| 474 | - * This is triggered when a field is updated. | |
| 475 | - * | |
| 476 | - * @since 6.11.2 | |
| 477 | - * | |
| 478 | - * @param string $html | |
| 479 | - * | |
| 480 | - * @return string | |
| 481 | - */ | |
| 482 | - private static function maybe_filter_custom_html_input_attributes( $html ) { | |
| 483 | - if ( FrmAppHelper::allow_unfiltered_html() ) { | |
| 484 | - return $html; | |
| 485 | - } | |
| 486 | - | |
| 487 | - $pattern = get_shortcode_regex( array( 'input' ) ); | |
| 488 | - return preg_replace_callback( | |
| 489 | - "/$pattern/", | |
| 490 | - /** | |
| 491 | - * @param array $match Shortcode data. | |
| 492 | - * | |
| 493 | - * @return string | |
| 494 | - */ | |
| 495 | - function ( $match ) { | |
| 496 | - $attr = shortcode_parse_atts( $match[3] ); | |
| 497 | - | |
| 498 | - if ( ! is_array( $attr ) ) { | |
| 499 | - // In old versions of WordPress (older than 6.5), this might not be an array. | |
| 500 | - return '[input]'; | |
| 501 | - } | |
| 502 | - | |
| 503 | - $safe_atts = array(); | |
| 504 | - | |
| 505 | - foreach ( $attr as $attr_key => $att ) { | |
| 506 | - if ( ! is_numeric( $attr_key ) ) { | |
| 507 | - // opt=1 without parentheses for example is mapped like 'opt' => 1. | |
| 508 | - $key = $attr_key; | |
| 509 | - $value = $att; | |
| 510 | - } else { | |
| 511 | - // Some data is mapped like 0 => 'placeholder="Placeholder"'. | |
| 512 | - $split = explode( '=', $att, 2 ); | |
| 513 | - | |
| 514 | - if ( 2 !== count( $split ) ) { | |
| 515 | - continue; | |
| 516 | - } | |
| 517 | - | |
| 518 | - $key = trim( $split[0] ); | |
| 519 | - $value = trim( $split[1], '"' ); | |
| 520 | - } | |
| 521 | - | |
| 522 | - if ( FrmAppHelper::input_key_is_safe( $key, 'update' ) ) { | |
| 523 | - $safe_atts[ $key ] = $value; | |
| 524 | - } | |
| 525 | - }//end foreach | |
| 526 | - | |
| 527 | - if ( ! $safe_atts ) { | |
| 528 | - return '[input]'; | |
| 529 | - } | |
| 530 | - | |
| 531 | - return '[input ' . FrmAppHelper::array_to_html_params( $safe_atts ) . ']'; | |
| 532 | - }, | |
| 533 | - $html | |
| 534 | - ); | |
| 535 | - } | |
| 536 | - | |
| 537 | - /** | |
| 538 | 302 | * Process the field duplication. |
| 539 | 303 | * |
| 540 | 304 | * @since 5.0.05 |
| 541 | - * | |
| 542 | - * @param int|string $field_id Field ID. | |
| 543 | - * @param int|string $form_id Form ID. | |
| 544 | - * | |
| 545 | - * @return array|false | |
| 546 | 305 | */ |
| 547 | 306 | public static function duplicate_single_field( $field_id, $form_id ) { |
| 548 | 307 | $copy_field = self::getOne( $field_id ); |
| 549 | - | |
| 550 | 308 | if ( ! $copy_field ) { |
| 551 | 309 | return false; |
| 552 | 310 | } |
| 553 | 311 | |
| @@ -557,9 +315,10 @@ | ||
| 557 | 315 | $values = array( |
| 558 | 316 | 'id' => $copy_field->id, |
| 559 | 317 | ); |
| 560 | 318 | FrmFieldsHelper::fill_field( $values, $copy_field, $copy_field->form_id ); |
| 561 | - $values = apply_filters( 'frm_prepare_single_field_for_duplication', $values ); | |
| 319 | + $values = apply_filters( 'frm_prepare_single_field_for_duplication', $values ); | |
| 320 | + | |
| 562 | 321 | $field_id = self::create( $values ); |
| 563 | 322 | |
| 564 | 323 | /** |
| 565 | 324 | * Fires after duplicating a field. |
| @@ -579,16 +338,8 @@ | ||
| 579 | 338 | |
| 580 | 339 | return compact( 'field_id', 'values' ); |
| 581 | 340 | } |
| 582 | 341 | |
| 583 | - /** | |
| 584 | - * @param int|string $old_form_id | |
| 585 | - * @param int|string $form_id | |
| 586 | - * @param bool $copy_keys | |
| 587 | - * @param false|int $blog_id | |
| 588 | - * | |
| 589 | - * @return void | |
| 590 | - */ | |
| 591 | 342 | public static function duplicate( $old_form_id, $form_id, $copy_keys = false, $blog_id = false ) { |
| 592 | 343 | global $frm_duplicate_ids; |
| 593 | 344 | |
| 594 | 345 | $where = array( |
| @@ -601,10 +352,8 @@ | ||
| 601 | 352 | $fields = self::getAll( $where, 'field_order', '', $blog_id ); |
| 602 | 353 | |
| 603 | 354 | foreach ( (array) $fields as $field ) { |
| 604 | 355 | $new_key = $copy_keys ? $field->field_key : ''; |
| 605 | - | |
| 606 | - // phpcs:ignore Universal.Operators.StrictComparisons | |
| 607 | 356 | if ( $copy_keys && substr( $field->field_key, - 1 ) == 2 ) { |
| 608 | 357 | $new_key = rtrim( $new_key, 2 ); |
| 609 | 358 | } |
| 610 | 359 | |
| @@ -612,9 +361,9 @@ | ||
| 612 | 361 | FrmFieldsHelper::fill_field( $values, $field, $form_id, $new_key ); |
| 613 | 362 | |
| 614 | 363 | // If this is a repeating section, create new form |
| 615 | 364 | if ( self::is_repeating_field( $field ) ) { |
| 616 | - // Create the repeatable form | |
| 365 | + // create the repeatable form | |
| 617 | 366 | $new_repeat_form_id = apply_filters( |
| 618 | 367 | 'frm_create_repeat_form', |
| 619 | 368 | 0, |
| 620 | 369 | array( |
| @@ -630,9 +379,9 @@ | ||
| 630 | 379 | $values['field_options']['form_select'] = $new_repeat_form_id; |
| 631 | 380 | } |
| 632 | 381 | |
| 633 | 382 | // If this is a field inside of a repeating section, associate it with the correct form |
| 634 | - 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 | |
| 383 | + if ( $field->form_id != $old_form_id && isset( $old_repeat_form_id ) && isset( $new_repeat_form_id ) && $field->form_id == $old_repeat_form_id ) { | |
| 635 | 384 | $values['form_id'] = $new_repeat_form_id; |
| 636 | 385 | } |
| 637 | 386 | |
| 638 | 387 | $values['description'] = FrmFieldsHelper::switch_field_ids( $values['description'] ); |
| @@ -641,17 +390,11 @@ | ||
| 641 | 390 | $new_id = self::create( $values ); |
| 642 | 391 | $frm_duplicate_ids[ $field->id ] = $new_id; |
| 643 | 392 | $frm_duplicate_ids[ $field->field_key ] = $new_id; |
| 644 | 393 | unset( $field ); |
| 645 | - }//end foreach | |
| 394 | + } | |
| 646 | 395 | } |
| 647 | 396 | |
| 648 | - /** | |
| 649 | - * @param int|string $id | |
| 650 | - * @param array $values | |
| 651 | - * | |
| 652 | - * @return false|int | |
| 653 | - */ | |
| 654 | 397 | public static function update( $id, $values ) { |
| 655 | 398 | global $wpdb; |
| 656 | 399 | |
| 657 | 400 | $id = absint( $id ); |
| @@ -667,51 +410,36 @@ | ||
| 667 | 410 | |
| 668 | 411 | self::preserve_format_option_backslashes( $values ); |
| 669 | 412 | |
| 670 | 413 | if ( isset( $values['type'] ) ) { |
| 671 | - if ( 'dropdown' === $values['type'] ) { | |
| 672 | - // To avoid conflicts with security plugins the value "dropdown" is sent for select fields. | |
| 673 | - // This is because "select" gets matched for SQL injection attempts. | |
| 674 | - $values['type'] = 'select'; | |
| 675 | - } | |
| 414 | + $values = apply_filters( 'frm_clean_' . $values['type'] . '_field_options_before_update', $values ); | |
| 676 | 415 | |
| 677 | - /** | |
| 678 | - * @since 6.9 The Field ID param was added. | |
| 679 | - * | |
| 680 | - * @param array $values | |
| 681 | - * @param int $id Field ID. | |
| 682 | - */ | |
| 683 | - $values = apply_filters( 'frm_clean_' . $values['type'] . '_field_options_before_update', $values, $id ); | |
| 684 | - | |
| 685 | 416 | if ( $values['type'] === 'hidden' && isset( $values['field_options'] ) && isset( $values['field_options']['clear_on_focus'] ) ) { |
| 686 | - // Don't keep the old placeholder setting for hidden fields | |
| 417 | + // don't keep the old placeholder setting for hidden fields | |
| 687 | 418 | $values['field_options']['clear_on_focus'] = 0; |
| 688 | 419 | } |
| 689 | 420 | } |
| 690 | 421 | |
| 691 | - // Serialize array values | |
| 422 | + // serialize array values | |
| 692 | 423 | foreach ( array( 'field_options', 'options' ) as $opt ) { |
| 693 | 424 | if ( isset( $values[ $opt ] ) && is_array( $values[ $opt ] ) ) { |
| 694 | 425 | if ( 'field_options' === $opt ) { |
| 695 | 426 | $values[ $opt ] = self::maybe_filter_options( $values[ $opt ] ); |
| 696 | 427 | } |
| 697 | - | |
| 698 | 428 | $values[ $opt ] = serialize( $values[ $opt ] ); |
| 699 | 429 | } |
| 700 | 430 | } |
| 701 | - | |
| 702 | 431 | if ( isset( $values['default_value'] ) && is_array( $values['default_value'] ) ) { |
| 703 | 432 | $values['default_value'] = json_encode( $values['default_value'] ); |
| 704 | 433 | } |
| 705 | 434 | |
| 706 | 435 | $query_results = $wpdb->update( $wpdb->prefix . 'frm_fields', $values, array( 'id' => $id ) ); |
| 707 | - $form_id = 0; | |
| 708 | 436 | |
| 437 | + $form_id = 0; | |
| 709 | 438 | if ( isset( $values['form_id'] ) ) { |
| 710 | 439 | $form_id = absint( $values['form_id'] ); |
| 711 | 440 | } else { |
| 712 | 441 | $field = self::getOne( $id ); |
| 713 | - | |
| 714 | 442 | if ( $field ) { |
| 715 | 443 | $form_id = $field->form_id; |
| 716 | 444 | } |
| 717 | 445 | unset( $field ); |
| @@ -719,9 +447,8 @@ | ||
| 719 | 447 | unset( $values ); |
| 720 | 448 | |
| 721 | 449 | if ( $query_results ) { |
| 722 | 450 | wp_cache_delete( $id, 'frm_field' ); |
| 723 | - | |
| 724 | 451 | if ( $form_id ) { |
| 725 | 452 | self::delete_form_transient( $form_id ); |
| 726 | 453 | } |
| 727 | 454 | } |
| @@ -733,11 +460,9 @@ | ||
| 733 | 460 | * Keep backslashes in the phone format option |
| 734 | 461 | * |
| 735 | 462 | * @since 2.0.8 |
| 736 | 463 | * |
| 737 | - * @param array $values Pass by reference. | |
| 738 | - * | |
| 739 | - * @return void | |
| 464 | + * @param $values array - pass by reference | |
| 740 | 465 | */ |
| 741 | 466 | private static function preserve_format_option_backslashes( &$values ) { |
| 742 | 467 | if ( isset( $values['field_options']['format'] ) ) { |
| 743 | 468 | $values['field_options']['format'] = FrmAppHelper::preserve_backslashes( $values['field_options']['format'] ); |
| @@ -743,13 +468,8 @@ | ||
| 743 | 468 | $values['field_options']['format'] = FrmAppHelper::preserve_backslashes( $values['field_options']['format'] ); |
| 744 | 469 | } |
| 745 | 470 | } |
| 746 | 471 | |
| 747 | - /** | |
| 748 | - * @param int|string $id | |
| 749 | - * | |
| 750 | - * @return bool|int | |
| 751 | - */ | |
| 752 | 472 | public static function destroy( $id ) { |
| 753 | 473 | global $wpdb; |
| 754 | 474 | |
| 755 | 475 | do_action( 'frm_before_destroy_field', $id ); |
| @@ -755,9 +475,8 @@ | ||
| 755 | 475 | do_action( 'frm_before_destroy_field', $id ); |
| 756 | 476 | |
| 757 | 477 | wp_cache_delete( $id, 'frm_field' ); |
| 758 | 478 | $field = self::getOne( $id ); |
| 759 | - | |
| 760 | 479 | if ( ! $field ) { |
| 761 | 480 | return false; |
| 762 | 481 | } |
| 763 | 482 | |
| @@ -767,13 +486,8 @@ | ||
| 767 | 486 | |
| 768 | 487 | return $wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_fields WHERE id=%d', $id ) ); |
| 769 | 488 | } |
| 770 | 489 | |
| 771 | - /** | |
| 772 | - * @param int|string $form_id | |
| 773 | - * | |
| 774 | - * @return void | |
| 775 | - */ | |
| 776 | 490 | public static function delete_form_transient( $form_id ) { |
| 777 | 491 | $form_id = absint( $form_id ); |
| 778 | 492 | delete_transient( 'frm_form_fields_' . $form_id . 'excludeinclude' ); |
| 779 | 493 | delete_transient( 'frm_form_fields_' . $form_id . 'includeinclude' ); |
| @@ -780,15 +494,14 @@ | ||
| 780 | 494 | delete_transient( 'frm_form_fields_' . $form_id . 'includeexclude' ); |
| 781 | 495 | delete_transient( 'frm_form_fields_' . $form_id . 'excludeexclude' ); |
| 782 | 496 | |
| 783 | 497 | global $wpdb; |
| 784 | - $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 | |
| 498 | + $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%' ) ); | |
| 785 | 499 | |
| 786 | 500 | FrmDb::cache_delete_group( 'frm_field' ); |
| 787 | 501 | |
| 788 | 502 | $form = FrmForm::getOne( $form_id ); |
| 789 | - | |
| 790 | - if ( $form && $form->parent_form_id && (int) $form->parent_form_id !== $form_id ) { | |
| 503 | + if ( $form && $form->parent_form_id && $form->parent_form_id != $form_id ) { | |
| 791 | 504 | self::delete_form_transient( $form->parent_form_id ); |
| 792 | 505 | } |
| 793 | 506 | } |
| 794 | 507 | |
| @@ -793,12 +506,8 @@ | ||
| 793 | 506 | } |
| 794 | 507 | |
| 795 | 508 | /** |
| 796 | 509 | * If $field is numeric, get the field object |
| 797 | - * | |
| 798 | - * @param int|object|string $field | |
| 799 | - * | |
| 800 | - * @return void | |
| 801 | 510 | */ |
| 802 | 511 | public static function maybe_get_field( &$field ) { |
| 803 | 512 | if ( ! is_object( $field ) ) { |
| 804 | 513 | $field = self::getOne( $field ); |
| @@ -805,15 +514,13 @@ | ||
| 805 | 514 | } |
| 806 | 515 | } |
| 807 | 516 | |
| 808 | 517 | /** |
| 809 | - * @param int|string $id The field id or key. | |
| 810 | - * @param bool $filter When true, run the frm_field filter. | |
| 811 | - * | |
| 812 | - * @return object|null | |
| 518 | + * @param string|int $id The field id or key. | |
| 519 | + * @param bool $filter When true, run the frm_field filter. | |
| 813 | 520 | */ |
| 814 | 521 | public static function getOne( $id, $filter = false ) { |
| 815 | - if ( ! $id ) { | |
| 522 | + if ( empty( $id ) ) { | |
| 816 | 523 | return null; |
| 817 | 524 | } |
| 818 | 525 | |
| 819 | 526 | global $wpdb; |
| @@ -822,9 +529,9 @@ | ||
| 822 | 529 | $query = $wpdb->prepare( 'SELECT * FROM ' . $wpdb->prefix . 'frm_fields WHERE ' . $where, $id ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared |
| 823 | 530 | |
| 824 | 531 | $results = FrmDb::check_cache( $id, 'frm_field', $query, 'get_row', 0 ); |
| 825 | 532 | |
| 826 | - if ( ! $results ) { | |
| 533 | + if ( empty( $results ) ) { | |
| 827 | 534 | self::filter_field( $filter, $results ); |
| 828 | 535 | return $results; |
| 829 | 536 | } |
| 830 | 537 | |
| @@ -841,13 +548,10 @@ | ||
| 841 | 548 | } |
| 842 | 549 | |
| 843 | 550 | /** |
| 844 | 551 | * @since 3.06.01 |
| 845 | - * | |
| 846 | 552 | * @param bool $filter When true, run the frm_field filter. |
| 847 | 553 | * @param object $results |
| 848 | - * | |
| 849 | - * @return void | |
| 850 | 554 | */ |
| 851 | 555 | private static function filter_field( $filter, &$results ) { |
| 852 | 556 | if ( $filter ) { |
| 853 | 557 | /** |
| @@ -859,33 +563,27 @@ | ||
| 859 | 563 | |
| 860 | 564 | /** |
| 861 | 565 | * Get the field type by key or id |
| 862 | 566 | * |
| 863 | - * @param int|string $id The field id or key. | |
| 864 | - * @param mixed $col The name of the column in the fields database table. | |
| 865 | - * | |
| 866 | - * @return mixed | |
| 567 | + * @param int|string The field id or key | |
| 568 | + * @param mixed $col The name of the column in the fields database table | |
| 867 | 569 | */ |
| 868 | 570 | public static function get_type( $id, $col = 'type' ) { |
| 869 | 571 | $field = FrmDb::check_cache( $id, 'frm_field' ); |
| 870 | - | |
| 871 | 572 | if ( $field ) { |
| 872 | - return $field->{$col}; | |
| 573 | + $type = $field->{$col}; | |
| 574 | + } else { | |
| 575 | + $where = array( | |
| 576 | + 'or' => 1, | |
| 577 | + 'id' => $id, | |
| 578 | + 'field_key' => $id, | |
| 579 | + ); | |
| 580 | + $type = FrmDb::get_var( 'frm_fields', $where, $col ); | |
| 873 | 581 | } |
| 874 | 582 | |
| 875 | - $where = is_numeric( $id ) ? array( 'id' => $id ) : array( 'field_key' => $id ); | |
| 876 | - | |
| 877 | - return FrmDb::get_var( 'frm_fields', $where, $col ); | |
| 583 | + return $type; | |
| 878 | 584 | } |
| 879 | 585 | |
| 880 | - /** | |
| 881 | - * @param int|string $form_id | |
| 882 | - * @param string $type | |
| 883 | - * @param int|string $limit | |
| 884 | - * @param string $inc_sub | |
| 885 | - * | |
| 886 | - * @return array|object | |
| 887 | - */ | |
| 888 | 586 | public static function get_all_types_in_form( $form_id, $type, $limit = '', $inc_sub = 'exclude' ) { |
| 889 | 587 | if ( ! $form_id ) { |
| 890 | 588 | return array(); |
| 891 | 589 | } |
| @@ -896,28 +594,24 @@ | ||
| 896 | 594 | 'inc_embed' => $inc_sub, |
| 897 | 595 | 'inc_repeat' => $inc_sub, |
| 898 | 596 | ) |
| 899 | 597 | ); |
| 900 | - | |
| 901 | - if ( $results ) { | |
| 598 | + if ( ! empty( $results ) ) { | |
| 902 | 599 | $fields = array(); |
| 903 | 600 | $count = 0; |
| 904 | - | |
| 905 | 601 | foreach ( $results as $result ) { |
| 906 | - if ( $type !== $result->type ) { | |
| 602 | + if ( $type != $result->type ) { | |
| 907 | 603 | continue; |
| 908 | 604 | } |
| 909 | 605 | |
| 910 | 606 | $fields[ $result->id ] = $result; |
| 911 | - ++$count; | |
| 912 | - | |
| 913 | - // phpcs:ignore Universal.Operators.StrictComparisons | |
| 607 | + $count ++; | |
| 914 | 608 | if ( $limit == 1 ) { |
| 915 | 609 | $fields = $result; |
| 916 | 610 | break; |
| 917 | 611 | } |
| 918 | 612 | |
| 919 | - if ( $limit && $count >= $limit ) { | |
| 613 | + if ( ! empty( $limit ) && $count >= $limit ) { | |
| 920 | 614 | break; |
| 921 | 615 | } |
| 922 | 616 | |
| 923 | 617 | unset( $result ); |
| @@ -923,9 +617,9 @@ | ||
| 923 | 617 | unset( $result ); |
| 924 | 618 | } |
| 925 | 619 | |
| 926 | 620 | return wp_unslash( $fields ); |
| 927 | - }//end if | |
| 621 | + } | |
| 928 | 622 | |
| 929 | 623 | self::$use_cache = false; |
| 930 | 624 | |
| 931 | 625 | $where = array( |
| @@ -939,16 +633,8 @@ | ||
| 939 | 633 | |
| 940 | 634 | return $results; |
| 941 | 635 | } |
| 942 | 636 | |
| 943 | - /** | |
| 944 | - * @param int|string $form_id | |
| 945 | - * @param int|string $limit | |
| 946 | - * @param string $inc_embed | |
| 947 | - * @param string $inc_repeat | |
| 948 | - * | |
| 949 | - * @return array | |
| 950 | - */ | |
| 951 | 637 | public static function get_all_for_form( $form_id, $limit = '', $inc_embed = 'exclude', $inc_repeat = 'include' ) { |
| 952 | 638 | if ( ! (int) $form_id ) { |
| 953 | 639 | return array(); |
| 954 | 640 | } |
| @@ -953,22 +639,19 @@ | ||
| 953 | 639 | return array(); |
| 954 | 640 | } |
| 955 | 641 | |
| 956 | 642 | $results = self::get_fields_from_transients( $form_id, compact( 'inc_embed', 'inc_repeat' ) ); |
| 957 | - | |
| 958 | - if ( $results ) { | |
| 959 | - if ( ! $limit ) { | |
| 643 | + if ( ! empty( $results ) ) { | |
| 644 | + if ( empty( $limit ) ) { | |
| 960 | 645 | return $results; |
| 961 | 646 | } |
| 962 | 647 | |
| 963 | 648 | $fields = array(); |
| 964 | 649 | $count = 0; |
| 965 | - | |
| 966 | 650 | foreach ( $results as $result ) { |
| 967 | - ++$count; | |
| 651 | + $count ++; | |
| 968 | 652 | $fields[ $result->id ] = $result; |
| 969 | - | |
| 970 | - if ( $limit && $count >= $limit ) { | |
| 653 | + if ( ! empty( $limit ) && $count >= $limit ) { | |
| 971 | 654 | break; |
| 972 | 655 | } |
| 973 | 656 | } |
| 974 | 657 | |
| @@ -984,9 +667,9 @@ | ||
| 984 | 667 | self::$use_cache = true; |
| 985 | 668 | |
| 986 | 669 | self::include_sub_fields( $results, $inc_embed, 'all', $form_id ); |
| 987 | 670 | |
| 988 | - if ( ! $limit ) { | |
| 671 | + if ( empty( $limit ) ) { | |
| 989 | 672 | self::set_field_transient( $results, $form_id, 0, compact( 'inc_embed', 'inc_repeat' ) ); |
| 990 | 673 | } |
| 991 | 674 | |
| 992 | 675 | return $results; |
| @@ -995,14 +678,12 @@ | ||
| 995 | 678 | /** |
| 996 | 679 | * If repeating fields should be included, adjust $where accordingly |
| 997 | 680 | * |
| 998 | 681 | * @param string $inc_repeat |
| 999 | - * @param array $where Pass by reference. | |
| 1000 | - * | |
| 1001 | - * @return void | |
| 682 | + * @param array $where - pass by reference | |
| 1002 | 683 | */ |
| 1003 | 684 | private static function maybe_include_repeating_fields( $inc_repeat, &$where ) { |
| 1004 | - if ( $inc_repeat === 'include' ) { | |
| 685 | + if ( $inc_repeat == 'include' ) { | |
| 1005 | 686 | $form_id = $where['fi.form_id']; |
| 1006 | 687 | $where[] = array( |
| 1007 | 688 | 'or' => 1, |
| 1008 | 689 | 'fi.form_id' => $form_id, |
| @@ -1011,38 +692,27 @@ | ||
| 1011 | 692 | unset( $where['fi.form_id'] ); |
| 1012 | 693 | } |
| 1013 | 694 | } |
| 1014 | 695 | |
| 1015 | - /** | |
| 1016 | - * @param array $results | |
| 1017 | - * @param string $inc_embed | |
| 1018 | - * @param string $type | |
| 1019 | - * @param int|string $form_id | |
| 1020 | - * | |
| 1021 | - * @return void | |
| 1022 | - */ | |
| 1023 | 696 | public static function include_sub_fields( &$results, $inc_embed, $type = 'all', $form_id = '' ) { |
| 1024 | - $no_sub_forms = ! $results && $type === 'all'; | |
| 1025 | - | |
| 1026 | - if ( 'include' !== $inc_embed || $no_sub_forms ) { | |
| 697 | + $no_sub_forms = empty( $results ) && $type === 'all'; | |
| 698 | + if ( 'include' != $inc_embed || $no_sub_forms ) { | |
| 1027 | 699 | return; |
| 1028 | 700 | } |
| 1029 | 701 | |
| 1030 | - $form_fields = $results; | |
| 1031 | - $should_get_subforms = $type !== 'all' && $type !== 'form' && $form_id; | |
| 1032 | - | |
| 702 | + $form_fields = $results; | |
| 703 | + $should_get_subforms = ( $type !== 'all' && $type !== 'form' && ! empty( $form_id ) ); | |
| 1033 | 704 | if ( $should_get_subforms ) { |
| 1034 | 705 | $form_fields = self::get_all_types_in_form( $form_id, 'form' ); |
| 1035 | 706 | } |
| 1036 | 707 | |
| 1037 | 708 | $index_offset = 1; |
| 1038 | - | |
| 1039 | 709 | foreach ( $form_fields as $k => $field ) { |
| 1040 | - if ( 'form' !== $field->type || ! isset( $field->field_options['form_select'] ) ) { | |
| 710 | + if ( 'form' != $field->type || ! isset( $field->field_options['form_select'] ) ) { | |
| 1041 | 711 | continue; |
| 1042 | 712 | } |
| 1043 | 713 | |
| 1044 | - if ( $type === 'all' ) { | |
| 714 | + if ( $type == 'all' ) { | |
| 1045 | 715 | $sub_fields = self::get_all_for_form( $field->field_options['form_select'] ); |
| 1046 | 716 | } else { |
| 1047 | 717 | $sub_fields = self::get_all_types_in_form( $field->field_options['form_select'], $type ); |
| 1048 | 718 | } |
| @@ -1047,9 +717,9 @@ | ||
| 1047 | 717 | $sub_fields = self::get_all_types_in_form( $field->field_options['form_select'], $type ); |
| 1048 | 718 | } |
| 1049 | 719 | |
| 1050 | 720 | if ( ! empty( $sub_fields ) ) { |
| 1051 | - $index = $k + $index_offset; | |
| 721 | + $index = $k + $index_offset; | |
| 1052 | 722 | $index_offset += count( $sub_fields ); |
| 1053 | 723 | array_splice( $results, $index, 0, $sub_fields ); |
| 1054 | 724 | } |
| 1055 | 725 | unset( $field, $sub_fields ); |
| @@ -1055,23 +725,13 @@ | ||
| 1055 | 725 | unset( $field, $sub_fields ); |
| 1056 | 726 | } |
| 1057 | 727 | } |
| 1058 | 728 | |
| 1059 | - /** | |
| 1060 | - * @param array|string $where | |
| 1061 | - * @param string $order_by | |
| 1062 | - * @param string $limit | |
| 1063 | - * @param false|int $blog_id | |
| 1064 | - * | |
| 1065 | - * @return array|object|null | |
| 1066 | - */ | |
| 1067 | 729 | public static function getAll( $where = array(), $order_by = '', $limit = '', $blog_id = false ) { |
| 1068 | 730 | $cache_key = FrmAppHelper::maybe_json_encode( $where ) . $order_by . 'l' . $limit . 'b' . $blog_id; |
| 1069 | - | |
| 1070 | 731 | if ( self::$use_cache ) { |
| 1071 | - // Make sure old cache doesn't get saved as a transient | |
| 732 | + // make sure old cache doesn't get saved as a transient | |
| 1072 | 733 | $results = wp_cache_get( $cache_key, 'frm_field' ); |
| 1073 | - | |
| 1074 | 734 | if ( false !== $results ) { |
| 1075 | 735 | return wp_unslash( $results ); |
| 1076 | 736 | } |
| 1077 | 737 | } |
| @@ -1078,9 +738,15 @@ | ||
| 1078 | 738 | |
| 1079 | 739 | global $wpdb; |
| 1080 | 740 | |
| 1081 | 741 | if ( $blog_id && is_multisite() ) { |
| 1082 | - $prefix = $wpdb->get_blog_prefix( $blog_id ); | |
| 742 | + global $wpmuBaseTablePrefix; | |
| 743 | + if ( $wpmuBaseTablePrefix ) { | |
| 744 | + $prefix = $wpmuBaseTablePrefix . $blog_id . '_'; | |
| 745 | + } else { | |
| 746 | + $prefix = $wpdb->get_blog_prefix( $blog_id ); | |
| 747 | + } | |
| 748 | + | |
| 1083 | 749 | $table_name = $prefix . 'frm_fields'; |
| 1084 | 750 | $form_table_name = $prefix . 'frm_forms'; |
| 1085 | 751 | } else { |
| 1086 | 752 | $table_name = $wpdb->prefix . 'frm_fields'; |
| @@ -1086,27 +752,28 @@ | ||
| 1086 | 752 | $table_name = $wpdb->prefix . 'frm_fields'; |
| 1087 | 753 | $form_table_name = $wpdb->prefix . 'frm_forms'; |
| 1088 | 754 | } |
| 1089 | 755 | |
| 1090 | - if ( $order_by && ! str_contains( $order_by, 'ORDER BY' ) ) { | |
| 756 | + if ( ! empty( $order_by ) && strpos( $order_by, 'ORDER BY' ) === false ) { | |
| 1091 | 757 | $order_by = ' ORDER BY ' . $order_by; |
| 1092 | 758 | } |
| 1093 | 759 | |
| 1094 | - $limit = FrmDb::esc_limit( $limit ); | |
| 1095 | - $query = "SELECT fi.*, fr.name as form_name FROM {$table_name} fi JOIN {$form_table_name} fr ON fi.form_id=fr.id"; | |
| 1096 | - $query_type = $limit === ' LIMIT 1' || $limit == 1 ? 'row' : 'results'; // phpcs:ignore Universal.Operators.StrictComparisons | |
| 760 | + $limit = FrmDb::esc_limit( $limit ); | |
| 1097 | 761 | |
| 762 | + $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"; | |
| 763 | + $query_type = ( $limit == ' LIMIT 1' || $limit == 1 ) ? 'row' : 'results'; | |
| 764 | + | |
| 1098 | 765 | if ( is_array( $where ) ) { |
| 1099 | 766 | $args = array( |
| 1100 | 767 | 'order_by' => $order_by, |
| 1101 | 768 | 'limit' => $limit, |
| 1102 | 769 | ); |
| 1103 | - $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 ); | |
| 770 | + $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 ); | |
| 1104 | 771 | } else { |
| 1105 | - // If the query is not an array, then it has already been prepared | |
| 772 | + // if the query is not an array, then it has already been prepared | |
| 1106 | 773 | $query .= FrmDb::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit; |
| 1107 | 774 | |
| 1108 | - $function_name = $query_type === 'row' ? 'get_row' : 'get_results'; | |
| 775 | + $function_name = ( $query_type == 'row' ) ? 'get_row' : 'get_results'; | |
| 1109 | 776 | $results = $wpdb->$function_name( $query ); |
| 1110 | 777 | } |
| 1111 | 778 | unset( $where ); |
| 1112 | 779 | |
| @@ -1118,18 +785,12 @@ | ||
| 1118 | 785 | } |
| 1119 | 786 | |
| 1120 | 787 | /** |
| 1121 | 788 | * @since 2.0.8 |
| 1122 | - * | |
| 1123 | - * @param array|object|null $results Results. | |
| 1124 | - * | |
| 1125 | - * @return void | |
| 1126 | 789 | */ |
| 1127 | 790 | private static function format_field_results( &$results ) { |
| 1128 | 791 | if ( is_array( $results ) ) { |
| 1129 | 792 | foreach ( $results as $r_key => $result ) { |
| 1130 | - self::add_slashes_to_format_before_setting_field_cache( $result ); | |
| 1131 | - | |
| 1132 | 793 | FrmDb::set_cache( $result->id, $result, 'frm_field' ); |
| 1133 | 794 | FrmDb::set_cache( $result->field_key, $result, 'frm_field' ); |
| 1134 | 795 | |
| 1135 | 796 | self::prepare_options( $result ); |
| @@ -1147,34 +808,11 @@ | ||
| 1147 | 808 | } |
| 1148 | 809 | } |
| 1149 | 810 | |
| 1150 | 811 | /** |
| 1151 | - * When $result->field_options is an array and not a serialized string there is only a single backslash. | |
| 1152 | - * Cached results are unslashed in FrmField::getAll, so we need to make sure that the cached object has an extra backslash. | |
| 1153 | - * Otherwise the backslash is stripped away on load. | |
| 1154 | - * | |
| 1155 | - * @since 6.15 | |
| 1156 | - * | |
| 1157 | - * @param stdClass $result | |
| 1158 | - * | |
| 1159 | - * @return void | |
| 1160 | - */ | |
| 1161 | - private static function add_slashes_to_format_before_setting_field_cache( $result ) { | |
| 1162 | - if ( ! isset( $result->field_options ) || ! is_array( $result->field_options ) || empty( $result->field_options['format'] ) ) { | |
| 1163 | - return; | |
| 1164 | - } | |
| 1165 | - | |
| 1166 | - $result->field_options['format'] = addslashes( $result->field_options['format'] ); | |
| 1167 | - } | |
| 1168 | - | |
| 1169 | - /** | |
| 1170 | 812 | * Unserialize all the serialized field data |
| 1171 | 813 | * |
| 1172 | 814 | * @since 2.0 |
| 1173 | - * | |
| 1174 | - * @param object $results | |
| 1175 | - * | |
| 1176 | - * @return void | |
| 1177 | 815 | */ |
| 1178 | 816 | private static function prepare_options( &$results ) { |
| 1179 | 817 | FrmAppHelper::unserialize_or_decode( $results->field_options ); |
| 1180 | 818 | FrmAppHelper::unserialize_or_decode( $results->options ); |
| @@ -1180,32 +818,19 @@ | ||
| 1180 | 818 | FrmAppHelper::unserialize_or_decode( $results->options ); |
| 1181 | 819 | |
| 1182 | 820 | // Allow a single box to be checked for the default value. |
| 1183 | 821 | $before = $results->default_value; |
| 1184 | - | |
| 1185 | - $field_object = FrmFieldFactory::get_field_type( $results->type ); | |
| 1186 | - | |
| 1187 | - if ( ! $field_object->should_unserialize_value() ) { | |
| 1188 | - return; | |
| 1189 | - } | |
| 1190 | - | |
| 1191 | 822 | FrmAppHelper::unserialize_or_decode( $results->default_value ); |
| 1192 | - | |
| 1193 | - if ( $before === $results->default_value && is_string( $before ) && str_starts_with( $before, '["' ) ) { | |
| 823 | + if ( $before === $results->default_value && ! is_array( $before ) && strpos( $before, '["' ) === 0 ) { | |
| 1194 | 824 | $results->default_value = FrmAppHelper::maybe_json_decode( $results->default_value ); |
| 1195 | 825 | } |
| 1196 | 826 | } |
| 1197 | 827 | |
| 1198 | 828 | /** |
| 1199 | - * If a form has too many fields, they won't all save into a single transient. | |
| 829 | + * If a form has too many fields, thay won't all save into a single transient. | |
| 1200 | 830 | * We'll break them into groups of 200 |
| 1201 | 831 | * |
| 1202 | 832 | * @since 2.0.1 |
| 1203 | - * | |
| 1204 | - * @param int|string $form_id Form ID. | |
| 1205 | - * @param array $args Additional arguments. | |
| 1206 | - * | |
| 1207 | - * @return array | |
| 1208 | 833 | */ |
| 1209 | 834 | private static function get_fields_from_transients( $form_id, $args ) { |
| 1210 | 835 | $fields = array(); |
| 1211 | 836 | self::get_next_transient( $fields, 'frm_form_fields_' . $form_id . $args['inc_embed'] . $args['inc_repeat'] ); |
| @@ -1216,32 +841,22 @@ | ||
| 1216 | 841 | /** |
| 1217 | 842 | * Called by get_fields_from_transients |
| 1218 | 843 | * |
| 1219 | 844 | * @since 2.0.1 |
| 1220 | - * | |
| 1221 | - * @param array $fields Array of fields. | |
| 1222 | - * @param string $base_name Base name. | |
| 1223 | - * @param int $next Next transient number. | |
| 1224 | - * | |
| 1225 | - * @return void | |
| 1226 | 845 | */ |
| 1227 | 846 | private static function get_next_transient( &$fields, $base_name, $next = 0 ) { |
| 1228 | 847 | $name = $next ? $base_name . $next : $base_name; |
| 1229 | 848 | $next_fields = get_transient( $name ); |
| 1230 | 849 | |
| 1231 | - if ( ! $next_fields ) { | |
| 1232 | - return; | |
| 1233 | - } | |
| 850 | + if ( $next_fields ) { | |
| 851 | + $fields = array_merge( $fields, $next_fields ); | |
| 1234 | 852 | |
| 1235 | - $fields = array_merge( $fields, $next_fields ); | |
| 1236 | - | |
| 1237 | - if ( count( $next_fields ) < self::$transient_size ) { | |
| 1238 | - return; | |
| 853 | + if ( count( $next_fields ) >= self::$transient_size ) { | |
| 854 | + // if this transient is full, check for another | |
| 855 | + $next ++; | |
| 856 | + self::get_next_transient( $fields, $base_name, $next ); | |
| 857 | + } | |
| 1239 | 858 | } |
| 1240 | - | |
| 1241 | - // If this transient is full, check for another | |
| 1242 | - ++$next; | |
| 1243 | - self::get_next_transient( $fields, $base_name, $next ); | |
| 1244 | 859 | } |
| 1245 | 860 | |
| 1246 | 861 | /** |
| 1247 | 862 | * Save the transients in chunks for large forms |
| @@ -1246,15 +861,8 @@ | ||
| 1246 | 861 | /** |
| 1247 | 862 | * Save the transients in chunks for large forms |
| 1248 | 863 | * |
| 1249 | 864 | * @since 2.0.1 |
| 1250 | - * | |
| 1251 | - * @param array $fields Array of fields. | |
| 1252 | - * @param int|string $form_id Form ID. | |
| 1253 | - * @param int $next Next transient number. | |
| 1254 | - * @param array $args Additional arguments. | |
| 1255 | - * | |
| 1256 | - * @return void | |
| 1257 | 865 | */ |
| 1258 | 866 | private static function set_field_transient( &$fields, $form_id, $next = 0, $args = array() ) { |
| 1259 | 867 | $base_name = 'frm_form_fields_' . $form_id . $args['inc_embed'] . $args['inc_repeat']; |
| 1260 | 868 | $field_chunks = array_chunk( $fields, self::$transient_size ); |
| @@ -1261,13 +869,12 @@ | ||
| 1261 | 869 | |
| 1262 | 870 | foreach ( $field_chunks as $field ) { |
| 1263 | 871 | $name = $next ? $base_name . $next : $base_name; |
| 1264 | 872 | $set = set_transient( $name, $field, 60 * 60 * 6 ); |
| 1265 | - | |
| 1266 | 873 | if ( ! $set ) { |
| 1267 | - // The transient didn't save | |
| 1268 | - if ( $name !== $base_name ) { | |
| 1269 | - // If the first saved an others fail, this will show an incomplete form | |
| 874 | + // the transient didn't save | |
| 875 | + if ( $name != $base_name ) { | |
| 876 | + // if the first saved an others fail, this will show an incmoplete form | |
| 1270 | 877 | self::delete_form_transient( $form_id ); |
| 1271 | 878 | } |
| 1272 | 879 | |
| 1273 | 880 | return; |
| @@ -1272,26 +879,18 @@ | ||
| 1272 | 879 | |
| 1273 | 880 | return; |
| 1274 | 881 | } |
| 1275 | 882 | |
| 1276 | - ++$next; | |
| 883 | + $next ++; | |
| 1277 | 884 | } |
| 1278 | 885 | } |
| 1279 | 886 | |
| 1280 | - /** | |
| 1281 | - * @param string $type | |
| 1282 | - * | |
| 1283 | - * @return bool | |
| 1284 | - */ | |
| 1285 | 887 | public static function is_no_save_field( $type ) { |
| 1286 | - return in_array( $type, self::no_save_fields(), true ); | |
| 888 | + return in_array( $type, self::no_save_fields() ); | |
| 1287 | 889 | } |
| 1288 | 890 | |
| 1289 | - /** | |
| 1290 | - * @return string[] | |
| 1291 | - */ | |
| 1292 | 891 | public static function no_save_fields() { |
| 1293 | - return array( 'divider', 'end_divider', 'captcha', 'break', 'html', 'form', 'summary', FrmSubmitHelper::FIELD_TYPE ); | |
| 892 | + return array( 'divider', 'end_divider', 'captcha', 'break', 'html', 'form', 'summary' ); | |
| 1294 | 893 | } |
| 1295 | 894 | |
| 1296 | 895 | /** |
| 1297 | 896 | * Check if this field can hold an array of values |
| @@ -1299,9 +898,9 @@ | ||
| 1299 | 898 | * @since 2.0.9 |
| 1300 | 899 | * |
| 1301 | 900 | * @param array|object $field |
| 1302 | 901 | * |
| 1303 | - * @return bool | |
| 902 | + * @return boolean | |
| 1304 | 903 | */ |
| 1305 | 904 | public static function is_field_with_multiple_values( $field ) { |
| 1306 | 905 | if ( ! $field ) { |
| 1307 | 906 | return false; |
| @@ -1308,16 +907,19 @@ | ||
| 1308 | 907 | } |
| 1309 | 908 | |
| 1310 | 909 | $field_type = self::get_original_field_type( $field ); |
| 1311 | 910 | |
| 1312 | - return self::is_checkbox( $field ) || $field_type === 'address' || self::is_multiple_select( $field ); | |
| 911 | + $is_multi_value_field = ( | |
| 912 | + self::is_checkbox( $field ) || | |
| 913 | + $field_type == 'address' || | |
| 914 | + self::is_multiple_select( $field ) | |
| 915 | + ); | |
| 916 | + | |
| 917 | + return $is_multi_value_field; | |
| 1313 | 918 | } |
| 1314 | 919 | |
| 1315 | 920 | /** |
| 1316 | 921 | * @since 3.0 |
| 1317 | - * | |
| 1318 | - * @param array|object $field | |
| 1319 | - * | |
| 1320 | 922 | * @return string |
| 1321 | 923 | */ |
| 1322 | 924 | public static function get_field_type( $field ) { |
| 1323 | 925 | return is_array( $field ) ? $field['type'] : $field->type; |
| @@ -1324,11 +926,8 @@ | ||
| 1324 | 926 | } |
| 1325 | 927 | |
| 1326 | 928 | /** |
| 1327 | 929 | * @since 3.0 |
| 1328 | - * | |
| 1329 | - * @param array|object $field | |
| 1330 | - * | |
| 1331 | 930 | * @return string |
| 1332 | 931 | */ |
| 1333 | 932 | public static function get_original_field_type( $field ) { |
| 1334 | 933 | $field_type = self::get_field_type( $field ); |
| @@ -1333,11 +932,10 @@ | ||
| 1333 | 932 | public static function get_original_field_type( $field ) { |
| 1334 | 933 | $field_type = self::get_field_type( $field ); |
| 1335 | 934 | $original_type = self::get_option( $field, 'original_type' ); |
| 1336 | 935 | |
| 1337 | - if ( $original_type && $original_type !== $field_type ) { | |
| 1338 | - // Check the original type for arrays. | |
| 1339 | - return $original_type; | |
| 936 | + if ( ! empty( $original_type ) && $original_type != $field_type ) { | |
| 937 | + $field_type = $original_type; // check the original type for arrays | |
| 1340 | 938 | } |
| 1341 | 939 | |
| 1342 | 940 | return $field_type; |
| 1343 | 941 | } |
| @@ -1345,12 +943,9 @@ | ||
| 1345 | 943 | /** |
| 1346 | 944 | * Check if this is a multiselect dropdown field |
| 1347 | 945 | * |
| 1348 | 946 | * @since 2.0.9 |
| 1349 | - * | |
| 1350 | - * @param array|object $field Field object. | |
| 1351 | - * | |
| 1352 | - * @return bool | |
| 947 | + * @return boolean | |
| 1353 | 948 | */ |
| 1354 | 949 | public static function is_multiple_select( $field ) { |
| 1355 | 950 | $field_type = self::get_field_type( $field ); |
| 1356 | 951 | $is_multiple = self::is_option_true( $field, 'multiple' ) && self::is_field_type( $field, 'select' ) && $field_type !== 'hidden'; |
| @@ -1362,134 +957,82 @@ | ||
| 1362 | 957 | * Check if a field is read only. Read only can be set in the field options, |
| 1363 | 958 | * but disabled with the shortcode options |
| 1364 | 959 | * |
| 1365 | 960 | * @since 2.0.9 |
| 1366 | - * | |
| 1367 | - * @param array|object $field | |
| 1368 | - * | |
| 1369 | - * @return bool | |
| 1370 | 961 | */ |
| 1371 | 962 | public static function is_read_only( $field ) { |
| 1372 | 963 | global $frm_vars; |
| 1373 | - return self::is_option_true( $field, 'read_only' ) && ( ! isset( $frm_vars['readonly'] ) || $frm_vars['readonly'] !== 'disabled' ); | |
| 964 | + | |
| 965 | + return ( self::is_option_true( $field, 'read_only' ) && ( ! isset( $frm_vars['readonly'] ) || $frm_vars['readonly'] != 'disabled' ) ); | |
| 1374 | 966 | } |
| 1375 | 967 | |
| 1376 | 968 | /** |
| 1377 | 969 | * @since 2.0.9 |
| 1378 | - * | |
| 1379 | - * @param array $field | |
| 1380 | - * | |
| 1381 | - * @return bool | |
| 1382 | 970 | */ |
| 1383 | 971 | public static function is_required( $field ) { |
| 1384 | - $required = $field['required'] != '0'; // phpcs:ignore Universal.Operators.StrictComparisons | |
| 972 | + $required = ( $field['required'] != '0' ); | |
| 973 | + $required = apply_filters( 'frm_is_field_required', $required, $field ); | |
| 1385 | 974 | |
| 1386 | - /** | |
| 1387 | - * @param bool $required | |
| 1388 | - * @param array $field | |
| 1389 | - */ | |
| 1390 | - return (bool) apply_filters( 'frm_is_field_required', $required, $field ); | |
| 975 | + return $required; | |
| 1391 | 976 | } |
| 1392 | 977 | |
| 1393 | 978 | /** |
| 1394 | 979 | * @since 2.0.9 |
| 1395 | - * | |
| 1396 | - * @param array|object $field | |
| 1397 | - * @param string $option | |
| 1398 | - * | |
| 1399 | - * @return bool | |
| 1400 | 980 | */ |
| 1401 | 981 | public static function is_option_true( $field, $option ) { |
| 1402 | 982 | if ( is_array( $field ) ) { |
| 1403 | 983 | return self::is_option_true_in_array( $field, $option ); |
| 984 | + } else { | |
| 985 | + return self::is_option_true_in_object( $field, $option ); | |
| 1404 | 986 | } |
| 1405 | - return self::is_option_true_in_object( $field, $option ); | |
| 1406 | 987 | } |
| 1407 | 988 | |
| 1408 | 989 | /** |
| 1409 | 990 | * @since 2.0.9 |
| 1410 | - * | |
| 1411 | - * @param array|object $field | |
| 1412 | - * @param string $option | |
| 1413 | - * | |
| 1414 | - * @return bool | |
| 1415 | 991 | */ |
| 1416 | 992 | public static function is_option_empty( $field, $option ) { |
| 1417 | 993 | if ( is_array( $field ) ) { |
| 1418 | 994 | return self::is_option_empty_in_array( $field, $option ); |
| 995 | + } else { | |
| 996 | + return self::is_option_empty_in_object( $field, $option ); | |
| 1419 | 997 | } |
| 1420 | - return self::is_option_empty_in_object( $field, $option ); | |
| 1421 | 998 | } |
| 1422 | 999 | |
| 1423 | - /** | |
| 1424 | - * @param array $field | |
| 1425 | - * @param string $option | |
| 1426 | - * | |
| 1427 | - * @return bool | |
| 1428 | - */ | |
| 1429 | 1000 | public static function is_option_true_in_array( $field, $option ) { |
| 1430 | - return ! empty( $field[ $option ] ); | |
| 1001 | + return isset( $field[ $option ] ) && $field[ $option ]; | |
| 1431 | 1002 | } |
| 1432 | 1003 | |
| 1433 | - /** | |
| 1434 | - * @param object $field | |
| 1435 | - * @param string $option | |
| 1436 | - * | |
| 1437 | - * @return bool | |
| 1438 | - */ | |
| 1439 | 1004 | public static function is_option_true_in_object( $field, $option ) { |
| 1440 | - return ! empty( $field->field_options[ $option ] ); | |
| 1005 | + return isset( $field->field_options[ $option ] ) && $field->field_options[ $option ]; | |
| 1441 | 1006 | } |
| 1442 | 1007 | |
| 1443 | - /** | |
| 1444 | - * @param array $field | |
| 1445 | - * @param string $option | |
| 1446 | - * | |
| 1447 | - * @return bool | |
| 1448 | - */ | |
| 1449 | 1008 | public static function is_option_empty_in_array( $field, $option ) { |
| 1450 | - return empty( $field[ $option ] ); | |
| 1009 | + return ! isset( $field[ $option ] ) || empty( $field[ $option ] ); | |
| 1451 | 1010 | } |
| 1452 | 1011 | |
| 1453 | - /** | |
| 1454 | - * @param object $field | |
| 1455 | - * @param string $option | |
| 1456 | - * | |
| 1457 | - * @return bool | |
| 1458 | - */ | |
| 1459 | 1012 | public static function is_option_empty_in_object( $field, $option ) { |
| 1460 | - return empty( $field->field_options[ $option ] ); | |
| 1013 | + return ! isset( $field->field_options[ $option ] ) || empty( $field->field_options[ $option ] ); | |
| 1461 | 1014 | } |
| 1462 | 1015 | |
| 1463 | - /** | |
| 1464 | - * @param stdClass $field | |
| 1465 | - * @param string $option | |
| 1466 | - * | |
| 1467 | - * @return bool | |
| 1468 | - */ | |
| 1469 | 1016 | public static function is_option_value_in_object( $field, $option ) { |
| 1470 | - return isset( $field->field_options[ $option ] ) && $field->field_options[ $option ] != ''; // phpcs:ignore Universal.Operators.StrictComparisons | |
| 1017 | + return isset( $field->field_options[ $option ] ) && $field->field_options[ $option ] != ''; | |
| 1471 | 1018 | } |
| 1472 | 1019 | |
| 1473 | 1020 | /** |
| 1474 | 1021 | * @since 2.0.18 |
| 1475 | - * | |
| 1476 | - * @param array|object $field | |
| 1477 | - * @param string $option | |
| 1478 | - * | |
| 1479 | - * @return mixed | |
| 1480 | 1022 | */ |
| 1481 | 1023 | public static function get_option( $field, $option ) { |
| 1482 | - return is_array( $field ) ? self::get_option_in_array( $field, $option ) : self::get_option_in_object( $field, $option ); | |
| 1024 | + if ( is_array( $field ) ) { | |
| 1025 | + $option = self::get_option_in_array( $field, $option ); | |
| 1026 | + } else { | |
| 1027 | + $option = self::get_option_in_object( $field, $option ); | |
| 1028 | + } | |
| 1029 | + | |
| 1030 | + return $option; | |
| 1483 | 1031 | } |
| 1484 | 1032 | |
| 1485 | - /** | |
| 1486 | - * @param array $field | |
| 1487 | - * @param string $option | |
| 1488 | - * | |
| 1489 | - * @return mixed | |
| 1490 | - */ | |
| 1491 | 1033 | public static function get_option_in_array( $field, $option ) { |
| 1034 | + | |
| 1492 | 1035 | if ( isset( $field[ $option ] ) ) { |
| 1493 | 1036 | $this_option = $field[ $option ]; |
| 1494 | 1037 | } elseif ( isset( $field['field_options'] ) && is_array( $field['field_options'] ) && isset( $field['field_options'][ $option ] ) ) { |
| 1495 | 1038 | $this_option = $field['field_options'][ $option ]; |
| @@ -1499,28 +1042,23 @@ | ||
| 1499 | 1042 | |
| 1500 | 1043 | return $this_option; |
| 1501 | 1044 | } |
| 1502 | 1045 | |
| 1503 | - /** | |
| 1504 | - * @param object $field | |
| 1505 | - * @param string $option | |
| 1506 | - * | |
| 1507 | - * @return mixed | |
| 1508 | - */ | |
| 1509 | 1046 | public static function get_option_in_object( $field, $option ) { |
| 1510 | - return $field->field_options[ $option ] ?? ''; | |
| 1047 | + return isset( $field->field_options[ $option ] ) ? $field->field_options[ $option ] : ''; | |
| 1511 | 1048 | } |
| 1512 | 1049 | |
| 1513 | 1050 | /** |
| 1514 | 1051 | * @since 2.0.09 |
| 1515 | - * | |
| 1516 | - * @param array|object $field | |
| 1517 | - * | |
| 1518 | - * @return bool | |
| 1519 | 1052 | */ |
| 1520 | 1053 | public static function is_repeating_field( $field ) { |
| 1521 | - $is_repeating_field = is_array( $field ) ? 'divider' === $field['type'] : 'divider' === $field->type; | |
| 1522 | - return $is_repeating_field && self::is_option_true( $field, 'repeat' ); | |
| 1054 | + if ( is_array( $field ) ) { | |
| 1055 | + $is_repeating_field = ( 'divider' == $field['type'] ); | |
| 1056 | + } else { | |
| 1057 | + $is_repeating_field = ( 'divider' == $field->type ); | |
| 1058 | + } | |
| 1059 | + | |
| 1060 | + return ( $is_repeating_field && self::is_option_true( $field, 'repeat' ) ); | |
| 1523 | 1061 | } |
| 1524 | 1062 | |
| 1525 | 1063 | /** |
| 1526 | 1064 | * @param string $key |
| @@ -1528,8 +1066,9 @@ | ||
| 1528 | 1066 | * @return int field id |
| 1529 | 1067 | */ |
| 1530 | 1068 | public static function get_id_by_key( $key ) { |
| 1531 | 1069 | $id = FrmDb::get_var( 'frm_fields', array( 'field_key' => sanitize_title( $key ) ) ); |
| 1070 | + | |
| 1532 | 1071 | return (int) $id; |
| 1533 | 1072 | } |
| 1534 | 1073 | |
| 1535 | 1074 | /** |
| @@ -1534,22 +1073,18 @@ | ||
| 1534 | 1073 | |
| 1535 | 1074 | /** |
| 1536 | 1075 | * @param string $id |
| 1537 | 1076 | * |
| 1538 | - * @return string|null | |
| 1077 | + * @return string | |
| 1539 | 1078 | */ |
| 1540 | 1079 | public static function get_key_by_id( $id ) { |
| 1541 | 1080 | return FrmDb::get_var( 'frm_fields', array( 'id' => $id ), 'field_key' ); |
| 1542 | 1081 | } |
| 1543 | 1082 | |
| 1544 | - /** | |
| 1545 | - * @param array|object $field | |
| 1546 | - * | |
| 1547 | - * @return bool | |
| 1548 | - */ | |
| 1549 | 1083 | public static function is_image( $field ) { |
| 1550 | 1084 | $type = self::get_field_type( $field ); |
| 1551 | - return $type === 'url' && self::get_option( $field, 'show_image' ); | |
| 1085 | + | |
| 1086 | + return ( $type == 'url' && self::get_option( $field, 'show_image' ) ); | |
| 1552 | 1087 | } |
| 1553 | 1088 | |
| 1554 | 1089 | /** |
| 1555 | 1090 | * Check if field is radio or Dynamic radio |
| @@ -1557,9 +1092,9 @@ | ||
| 1557 | 1092 | * @since 3.0 |
| 1558 | 1093 | * |
| 1559 | 1094 | * @param array|object $field |
| 1560 | 1095 | * |
| 1561 | - * @return bool true if field type is radio or Dynamic radio | |
| 1096 | + * @return boolean true if field type is radio or Dynamic radio | |
| 1562 | 1097 | */ |
| 1563 | 1098 | public static function is_radio( $field ) { |
| 1564 | 1099 | return self::is_field_type( $field, 'radio' ); |
| 1565 | 1100 | } |
| @@ -1570,9 +1105,9 @@ | ||
| 1570 | 1105 | * @since 3.0 |
| 1571 | 1106 | * |
| 1572 | 1107 | * @param array|object $field |
| 1573 | 1108 | * |
| 1574 | - * @return bool true if field type is checkbox or Dynamic checkbox | |
| 1109 | + * @return boolean true if field type is checkbox or Dynamic checkbox | |
| 1575 | 1110 | */ |
| 1576 | 1111 | public static function is_checkbox( $field ) { |
| 1577 | 1112 | return self::is_field_type( $field, 'checkbox' ); |
| 1578 | 1113 | } |
| @@ -1582,17 +1117,23 @@ | ||
| 1582 | 1117 | * |
| 1583 | 1118 | * @since 3.0 |
| 1584 | 1119 | * |
| 1585 | 1120 | * @param array|object $field |
| 1586 | - * @param string $is_type Options include radio, checkbox, text. | |
| 1121 | + * @param string $is_type Options include radio, checkbox, text | |
| 1587 | 1122 | * |
| 1588 | - * @return bool true if field type is checkbox or Dynamic checkbox | |
| 1123 | + * @return boolean true if field type is checkbox or Dynamic checkbox | |
| 1589 | 1124 | */ |
| 1590 | 1125 | public static function is_field_type( $field, $is_type ) { |
| 1591 | - $field_type = self::get_original_field_type( $field ); | |
| 1592 | - $data_type = self::get_option( $field, 'data_type' ); | |
| 1593 | - $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 | |
| 1126 | + $field_type = self::get_original_field_type( $field ); | |
| 1127 | + $data_type = self::get_option( $field, 'data_type' ); | |
| 1594 | 1128 | |
| 1129 | + $is_field_type = ( | |
| 1130 | + $is_type === $field_type || | |
| 1131 | + ( 'data' === $field_type && $is_type === $data_type ) || | |
| 1132 | + ( 'lookup' === $field_type && $is_type === $data_type ) || | |
| 1133 | + ( 'product' === $field_type && $is_type === $data_type ) | |
| 1134 | + ); | |
| 1135 | + | |
| 1595 | 1136 | /** |
| 1596 | 1137 | * When a field type is checked, allow individual fields |
| 1597 | 1138 | * to set the type. |
| 1598 | 1139 | * |
| @@ -1606,12 +1147,12 @@ | ||
| 1606 | 1147 | * |
| 1607 | 1148 | * @since 4.10.02 |
| 1608 | 1149 | * |
| 1609 | 1150 | * @param array $field Field array. |
| 1610 | - * | |
| 1611 | 1151 | * @return bool |
| 1612 | 1152 | */ |
| 1613 | 1153 | public static function is_combo_field( $field ) { |
| 1614 | 1154 | $field_type_obj = FrmFieldFactory::get_field_factory( $field ); |
| 1155 | + | |
| 1615 | 1156 | return ! empty( $field_type_obj->is_combo_field ); |
| 1616 | 1157 | } |
| 1617 | 1158 | } |
