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