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