| @@ -4,82 +4,73 @@ | ||
| 4 | 4 | } |
| 5 | 5 | |
| 6 | 6 | class FrmField { |
| 7 | 7 | |
| 8 | - public static $use_cache = true; | |
| 8 | + public static $use_cache = true; | |
| 9 | 9 | public static $transient_size = 200; |
| 10 | 10 | |
| 11 | 11 | public static function field_selection() { |
| 12 | 12 | $fields = array( |
| 13 | - 'text' => array( | |
| 13 | + 'text' => array( | |
| 14 | 14 | 'name' => __( 'Text', 'formidable' ), |
| 15 | 15 | 'icon' => 'frm_icon_font frm_text2_icon', |
| 16 | 16 | ), |
| 17 | - 'textarea' => array( | |
| 17 | + 'textarea' => array( | |
| 18 | 18 | 'name' => __( 'Paragraph', 'formidable' ), |
| 19 | 19 | 'icon' => 'frm_icon_font frm_paragraph_icon', |
| 20 | 20 | ), |
| 21 | - 'checkbox' => array( | |
| 21 | + 'checkbox' => array( | |
| 22 | 22 | 'name' => __( 'Checkboxes', 'formidable' ), |
| 23 | 23 | 'icon' => 'frm_icon_font frm_check_square_icon', |
| 24 | 24 | ), |
| 25 | - 'radio' => array( | |
| 25 | + 'radio' => array( | |
| 26 | 26 | 'name' => __( 'Radio Buttons', 'formidable' ), |
| 27 | 27 | 'icon' => 'frm_icon_font frm_radio_checked_icon', |
| 28 | 28 | ), |
| 29 | - 'select' => array( | |
| 29 | + 'select' => array( | |
| 30 | 30 | 'name' => __( 'Dropdown', 'formidable' ), |
| 31 | - 'icon' => 'frm_icon_font frm_dropdown_icon', | |
| 31 | + 'icon' => 'frm_icon_font frm_caret_square_down_icon', | |
| 32 | 32 | ), |
| 33 | - 'email' => array( | |
| 33 | + 'email' => array( | |
| 34 | 34 | 'name' => __( 'Email', 'formidable' ), |
| 35 | - 'icon' => 'frm_icon_font frm_email2_icon', | |
| 35 | + 'icon' => 'frm_icon_font frm_email_icon', | |
| 36 | 36 | ), |
| 37 | - 'url' => array( | |
| 37 | + 'url' => array( | |
| 38 | 38 | 'name' => __( 'Website/URL', 'formidable' ), |
| 39 | - 'icon' => 'frm_icon_font frm_link2_icon', | |
| 39 | + 'icon' => 'frm_icon_font frm_link_icon', | |
| 40 | 40 | ), |
| 41 | - 'number' => array( | |
| 41 | + 'number' => array( | |
| 42 | 42 | 'name' => __( 'Number', 'formidable' ), |
| 43 | 43 | 'icon' => 'frm_icon_font frm_hashtag_icon', |
| 44 | 44 | ), |
| 45 | - 'name' => array( | |
| 45 | + 'name' => array( | |
| 46 | 46 | 'name' => __( 'Name', 'formidable' ), |
| 47 | 47 | 'icon' => 'frm_icon_font frm_user_name_icon', |
| 48 | 48 | ), |
| 49 | - 'phone' => array( | |
| 49 | + 'phone' => array( | |
| 50 | 50 | 'name' => __( 'Phone', 'formidable' ), |
| 51 | 51 | 'icon' => 'frm_icon_font frm_phone_icon', |
| 52 | 52 | ), |
| 53 | - 'html' => array( | |
| 53 | + 'html' => array( | |
| 54 | 54 | 'name' => __( 'HTML', 'formidable' ), |
| 55 | - 'icon' => 'frm_icon_font frm_code2_icon', | |
| 55 | + 'icon' => 'frm_icon_font frm_code_icon', | |
| 56 | 56 | ), |
| 57 | - 'hidden' => array( | |
| 57 | + 'hidden' => array( | |
| 58 | 58 | 'name' => __( 'Hidden', 'formidable' ), |
| 59 | - 'icon' => 'frm_icon_font frm_eye_slash2_icon', | |
| 59 | + 'icon' => 'frm_icon_font frm_eye_slash_icon', | |
| 60 | 60 | ), |
| 61 | - 'user_id' => array( | |
| 61 | + 'user_id' => array( | |
| 62 | 62 | 'name' => __( 'User ID', 'formidable' ), |
| 63 | - 'icon' => 'frm_icon_font frm_user2_icon', | |
| 63 | + 'icon' => 'frm_icon_font frm_user_icon', | |
| 64 | 64 | ), |
| 65 | - 'captcha' => array( | |
| 65 | + 'captcha' => array( | |
| 66 | 66 | 'name' => self::get_captcha_field_name(), |
| 67 | - 'icon' => 'frm_icon_font frm_shield_check2_icon', | |
| 67 | + 'icon' => 'frm_icon_font frm_shield_check_icon', | |
| 68 | 68 | ), |
| 69 | - 'credit_card' => array( | |
| 70 | - 'name' => __( 'Payment', 'formidable' ), | |
| 71 | - 'icon' => 'frm_icon_font frm_credit_card2_icon', | |
| 69 | + 'credit_card' => array( | |
| 70 | + 'name' => __( 'Payment', 'formidable' ), | |
| 71 | + 'icon' => 'frm_icon_font frm_credit_card_icon', | |
| 72 | 72 | ), |
| 73 | - FrmSubmitHelper::FIELD_TYPE => array( | |
| 74 | - 'name' => __( 'Submit', 'formidable' ), | |
| 75 | - 'hide' => true, | |
| 76 | - ), | |
| 77 | - FrmFieldGdprHelper::FIELD_TYPE => array( | |
| 78 | - 'name' => __( 'GDPR', 'formidable' ), | |
| 79 | - 'icon' => 'frm_icon_font frm-gdpr-icon', | |
| 80 | - 'hide' => FrmFieldGdprHelper::hide_gdpr_field(), | |
| 81 | - ), | |
| 82 | 73 | ); |
| 83 | 74 | |
| 84 | 75 | /** |
| 85 | 76 | * @param array $fields |
| @@ -92,167 +83,158 @@ | ||
| 92 | 83 | * |
| 93 | 84 | * @return string |
| 94 | 85 | */ |
| 95 | 86 | private static function get_captcha_field_name() { |
| 96 | - return 'Captcha'; | |
| 87 | + $frm_settings = FrmAppHelper::get_settings(); | |
| 88 | + $active_captcha = $frm_settings->active_captcha; | |
| 89 | + if ( ! FrmFieldCaptcha::should_show_captcha() ) { | |
| 90 | + $captcha_name = 'Captcha'; | |
| 91 | + } elseif ( $active_captcha === 'recaptcha' ) { | |
| 92 | + $captcha_name = 'reCAPTCHA'; | |
| 93 | + } else { | |
| 94 | + $captcha_name = 'hCaptcha'; | |
| 95 | + } | |
| 96 | + return $captcha_name; | |
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | public static function pro_field_selection() { |
| 100 | 100 | $images_url = FrmAppHelper::plugin_url() . '/images/'; |
| 101 | 101 | $fields = array( |
| 102 | - 'file' => array( | |
| 103 | - 'name' => __( 'File Upload', 'formidable' ), | |
| 104 | - 'icon' => 'frm_icon_font frm_upload3_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' ), | |
| 102 | + 'file' => array( | |
| 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.', | |
| 106 | 106 | ), |
| 107 | - 'ranking' => array(), | |
| 108 | - 'rte' => array( | |
| 107 | + 'rte' => array( | |
| 109 | 108 | 'name' => __( 'Rich Text', 'formidable' ), |
| 110 | 109 | 'icon' => 'frm_icon_font frm_align_right_icon', |
| 111 | 110 | ), |
| 112 | - 'date' => array( | |
| 111 | + 'date' => array( | |
| 113 | 112 | 'name' => __( 'Date', 'formidable' ), |
| 114 | - 'icon' => 'frm_icon_font frm_calendar2_icon', | |
| 113 | + 'icon' => 'frm_icon_font frm_calendar_icon', | |
| 115 | 114 | ), |
| 116 | - 'time' => array( | |
| 115 | + 'time' => array( | |
| 117 | 116 | 'name' => __( 'Time', 'formidable' ), |
| 118 | 117 | 'icon' => 'frm_icon_font frm_clock_icon', |
| 119 | 118 | ), |
| 120 | - 'scale' => array( | |
| 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' ) . '" />', | |
| 119 | + 'scale' => array( | |
| 120 | + 'name' => __( 'Scale', 'formidable' ), | |
| 121 | + 'icon' => 'frm_icon_font frm_linear_scale_icon', | |
| 122 | + 'message' => 'Add a set of radio buttons with whatever range you choose. <img src="' . esc_attr( $images_url ) . 'scale_field.png" alt="Scale Field" />', | |
| 124 | 123 | ), |
| 125 | - 'star' => array( | |
| 124 | + 'star' => array( | |
| 126 | 125 | 'name' => __( 'Star Rating', 'formidable' ), |
| 127 | - 'icon' => 'frm_icon_font frm_star2_icon', | |
| 126 | + 'icon' => 'frm_icon_font frm_star_icon', | |
| 128 | 127 | ), |
| 129 | - 'range' => array( | |
| 128 | + 'range' => array( | |
| 130 | 129 | 'name' => __( 'Slider', 'formidable' ), |
| 131 | 130 | 'icon' => 'frm_icon_font frm_code_commit_icon', |
| 132 | 131 | ), |
| 133 | - 'toggle' => array( | |
| 132 | + 'toggle' => array( | |
| 134 | 133 | 'name' => __( 'Toggle', 'formidable' ), |
| 135 | 134 | 'icon' => 'frm_icon_font frm_toggle_on_icon', |
| 136 | 135 | ), |
| 137 | - 'data' => array( | |
| 138 | - 'name' => __( 'Dynamic', 'formidable' ), | |
| 139 | - 'icon' => 'frm_icon_font frm_dynamic_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' ), | |
| 136 | + 'data' => array( | |
| 137 | + 'name' => __( 'Dynamic', 'formidable' ), | |
| 138 | + 'icon' => 'frm_icon_font frm_sitemap_icon', | |
| 139 | + '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.', | |
| 141 | 140 | ), |
| 142 | - 'lookup' => array( | |
| 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' ) . '" />', | |
| 141 | + 'lookup' => array( | |
| 142 | + 'name' => __( 'Lookup', 'formidable' ), | |
| 143 | + 'icon' => 'frm_icon_font frm_search_icon', | |
| 144 | + 'message' => 'Filter the options in the next field and automatically add values to other fields. Upgrade to Pro to get Lookup fields and more. <img src="' . esc_attr( $images_url ) . 'look-up_year-make-model.gif" alt="cascading lookup fields" />', | |
| 146 | 145 | ), |
| 147 | - 'divider|repeat' => array( | |
| 148 | - 'name' => __( 'Repeater', 'formidable' ), | |
| 149 | - 'icon' => 'frm_icon_font frm_refresh_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' ) . '" />', | |
| 146 | + 'divider|repeat' => array( | |
| 147 | + 'name' => __( 'Repeater', 'formidable' ), | |
| 148 | + 'icon' => 'frm_icon_font frm_repeater_icon', | |
| 149 | + 'message' => 'Allow your visitors to add new sets of fields while filling out forms. Increase conversions while saving building time and server resources. <img src="' . esc_attr( $images_url ) . 'repeatable-section_frontend.gif" alt="Dynamically Add Form Fields with repeatable sections" />', | |
| 151 | 150 | ), |
| 152 | - 'end_divider' => array( | |
| 151 | + 'end_divider' => array( | |
| 153 | 152 | 'name' => __( 'Section Buttons', 'formidable' ), |
| 154 | 153 | 'switch_from' => 'divider', |
| 155 | 154 | ), |
| 156 | - 'divider' => array( | |
| 155 | + 'divider' => array( | |
| 157 | 156 | 'name' => __( 'Section', 'formidable' ), |
| 158 | 157 | 'icon' => 'frm_icon_font frm_header_icon', |
| 159 | 158 | ), |
| 160 | - 'break' => array( | |
| 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' ), | |
| 159 | + 'break' => array( | |
| 160 | + 'name' => __( 'Page Break', 'formidable' ), | |
| 161 | + 'icon' => 'frm_icon_font frm_page_break_icon', | |
| 162 | + '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?', | |
| 164 | 163 | ), |
| 165 | - 'form' => array( | |
| 164 | + 'form' => array( | |
| 166 | 165 | 'name' => __( 'Embed Form', 'formidable' ), |
| 167 | - 'icon' => 'frm_icon_font frm_file_text2_icon', | |
| 166 | + 'icon' => 'frm_icon_font frm_file_text_icon', | |
| 168 | 167 | ), |
| 169 | - 'likert' => array( | |
| 168 | + 'likert' => array( | |
| 170 | 169 | 'name' => __( 'Likert Scale', 'formidable' ), |
| 171 | 170 | 'icon' => 'frm_icon_font frm_likert_scale frm_show_upgrade', |
| 172 | 171 | 'addon' => 'surveys', |
| 173 | 172 | ), |
| 174 | - 'nps' => array( | |
| 173 | + 'nps' => array( | |
| 175 | 174 | 'name' => __( 'NPS', 'formidable' ), |
| 176 | 175 | 'icon' => 'frm_icon_font frm_nps frm_show_upgrade', |
| 177 | 176 | 'addon' => 'surveys', |
| 178 | 177 | ), |
| 179 | - 'password' => array( | |
| 178 | + 'password' => array( | |
| 180 | 179 | 'name' => __( 'Password', 'formidable' ), |
| 181 | - 'icon' => 'frm_icon_font frm_lock_closed2_icon', | |
| 180 | + 'icon' => 'frm_icon_font frm_lock_open_icon', | |
| 182 | 181 | ), |
| 183 | - 'tag' => array( | |
| 182 | + 'tag' => array( | |
| 184 | 183 | 'name' => __( 'Tags', 'formidable' ), |
| 185 | - 'icon' => 'frm_icon_font frm_price_tags2_icon', | |
| 184 | + 'icon' => 'frm_icon_font frm_price_tags_icon', | |
| 186 | 185 | ), |
| 187 | 186 | // This is no longer a Pro field, but without this here, Pro triggers "undefined index" notices. |
| 188 | 187 | // Right now it leaves a gap. Maybe we can skip anything without a name or something. |
| 189 | - 'credit_card' => array( | |
| 190 | - 'name' => '', | |
| 191 | - 'icon' => '', | |
| 188 | + 'credit_card' => array( | |
| 189 | + 'name' => '', | |
| 190 | + 'icon' => '', | |
| 192 | 191 | ), |
| 193 | - 'address' => array( | |
| 192 | + 'address' => array( | |
| 194 | 193 | 'name' => __( 'Address', 'formidable' ), |
| 195 | - 'icon' => 'frm_icon_font frm_location2_icon', | |
| 194 | + 'icon' => 'frm_icon_font frm_location_icon', | |
| 196 | 195 | ), |
| 197 | - 'summary' => array( | |
| 198 | - 'name' => __( 'Summary', 'formidable' ), | |
| 199 | - 'icon' => 'frm_icon_font frm_file_text3_icon', | |
| 200 | - 'message' => __( 'Allow visitors to review their responses before a form is submitted. Upgrade to Pro to get Summary fields and more.', 'formidable' ), | |
| 196 | + 'summary' => array( | |
| 197 | + 'name' => __( 'Summary', 'formidable' ), | |
| 198 | + 'icon' => 'frm_icon_font frm_file_text_icon', | |
| 199 | + 'message' => 'Allow visitors to review their responses before a form is submitted. Upgrade to Pro to get Summary fields and more.', | |
| 201 | 200 | ), |
| 202 | - 'signature' => array( | |
| 201 | + 'signature' => array( | |
| 203 | 202 | 'name' => __( 'Signature', 'formidable' ), |
| 204 | 203 | 'icon' => 'frm_icon_font frm_signature_icon frm_show_upgrade', |
| 205 | 204 | 'addon' => 'signature', |
| 206 | 205 | ), |
| 207 | - 'ai' => array( | |
| 208 | - 'name' => __( 'AI', 'formidable' ), | |
| 209 | - 'icon' => 'frm_icon_font frm-ai-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' ), | |
| 206 | + 'ai' => array( | |
| 207 | + 'name' => __( 'AI', 'formidable' ), | |
| 208 | + 'icon' => 'frm_icon_font frm_eye_icon frm_show_upgrade', | |
| 209 | + 'addon' => 'ai', | |
| 210 | + '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.', | |
| 212 | 211 | ), |
| 213 | 212 | 'ssa-appointment' => array( |
| 214 | 213 | 'name' => __( 'Appointment', 'formidable' ), |
| 215 | - 'icon' => 'frm_icon_font frm_schedule_icon frm_show_upgrade', | |
| 214 | + 'icon' => 'frm_icon_font frm_calendar_icon frm_show_upgrade', | |
| 216 | 215 | 'require' => 'Simply Schedule Appointments', |
| 217 | - 'message' => sprintf( | |
| 218 | - /* translators: %1$s: Link opening HTML, %2$s: Link tag closing */ | |
| 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/">', | |
| 221 | - '</a>' | |
| 222 | - ) . '<img src="' . esc_url( $images_url ) . 'appointments.png" alt="' . esc_attr__( 'Scheduling', 'formidable' ) . '" />', | |
| 216 | + 'message' => 'Appointment fields are an integration with <a href="https://simplyscheduleappointments.com/meet/formidable/">Simply Schedule Appointments</a>. Get started now to schedule appointments directly from your forms. | |
| 217 | + <img src="' . esc_attr( $images_url ) . 'appointments.png" alt="Scheduling" />', | |
| 223 | 218 | 'link' => 'https://simplyscheduleappointments.com/meet/formidable/', |
| 224 | 219 | ), |
| 225 | - 'product' => array( | |
| 220 | + 'product' => array( | |
| 226 | 221 | 'name' => __( 'Product', 'formidable' ), |
| 227 | - 'icon' => 'frm_icon_font frm_product2_icon', | |
| 222 | + 'icon' => 'frm_icon_font frm_product_icon', | |
| 228 | 223 | 'section' => 'pricing', |
| 229 | 224 | ), |
| 230 | - 'quantity' => array( | |
| 225 | + 'quantity' => array( | |
| 231 | 226 | 'name' => __( 'Quantity', 'formidable' ), |
| 232 | 227 | 'icon' => 'frm_icon_font frm_quantity_icon', |
| 233 | 228 | 'section' => 'pricing', |
| 234 | 229 | ), |
| 235 | - 'total' => array( | |
| 230 | + 'total' => array( | |
| 236 | 231 | 'name' => __( 'Total', 'formidable' ), |
| 237 | - 'icon' => 'frm_icon_font frm_total2_icon', | |
| 232 | + 'icon' => 'frm_icon_font frm_total_icon', | |
| 238 | 233 | 'section' => 'pricing', |
| 239 | 234 | ), |
| 240 | 235 | ); |
| 241 | 236 | |
| 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 | 237 | if ( ! FrmAppHelper::show_new_feature( 'ai' ) ) { |
| 256 | 238 | unset( $fields['ai'] ); |
| 257 | 239 | } |
| 258 | 240 | |
| @@ -265,102 +247,9 @@ | ||
| 265 | 247 | return apply_filters( 'frm_pro_available_fields', $fields ); |
| 266 | 248 | } |
| 267 | 249 | |
| 268 | 250 | /** |
| 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. | |
| 272 | - * | |
| 273 | - * @since 6.8.3 | |
| 274 | - * | |
| 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 | |
| 291 | - * | |
| 292 | - * @param string $plugin | |
| 293 | - * @param string $expected_version | |
| 294 | - * @return bool | |
| 295 | - */ | |
| 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'; | |
| 310 | - } | |
| 311 | - $plugins = get_plugins(); | |
| 312 | - if ( isset( $plugins[ $plugin ] ) && ! empty( $plugins[ $plugin ]['Version'] ) ) { | |
| 313 | - return $plugins[ $plugin ]['Version']; | |
| 314 | - } | |
| 315 | - return false; | |
| 316 | - } | |
| 317 | - | |
| 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, '>=' ); | |
| 340 | - } | |
| 341 | - | |
| 342 | - /** | |
| 343 | - * Consider a field new for 90 days after the release date. | |
| 344 | - * | |
| 345 | - * @since 6.8.3 | |
| 346 | - * | |
| 347 | - * @param string $type | |
| 348 | - * @return bool | |
| 349 | - */ | |
| 350 | - private static function field_is_new( $type ) { | |
| 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; | |
| 355 | - } | |
| 356 | - return false; | |
| 357 | - } | |
| 358 | - | |
| 359 | - /** | |
| 360 | 251 | * @since 4.0 |
| 361 | - * | |
| 362 | - * @return array | |
| 363 | 252 | */ |
| 364 | 253 | public static function all_field_selection() { |
| 365 | 254 | $pro_field_selection = self::pro_field_selection(); |
| 366 | 255 | return array_merge( $pro_field_selection, self::field_selection() ); |
| @@ -370,23 +259,21 @@ | ||
| 370 | 259 | * Create a field. |
| 371 | 260 | * |
| 372 | 261 | * @param array $values |
| 373 | 262 | * @param bool $return |
| 374 | - * @return false|int | |
| 263 | + * @return int|false | |
| 375 | 264 | */ |
| 376 | 265 | public static function create( $values, $return = true ) { |
| 377 | 266 | global $wpdb, $frm_duplicate_ids; |
| 378 | 267 | |
| 379 | 268 | $new_values = array(); |
| 380 | - $key = $values['field_key'] ?? $values['name']; | |
| 269 | + $key = isset( $values['field_key'] ) ? $values['field_key'] : $values['name']; | |
| 381 | 270 | $new_values['field_key'] = FrmAppHelper::get_unique_key( $key, $wpdb->prefix . 'frm_fields', 'field_key' ); |
| 382 | 271 | |
| 383 | 272 | $values = FrmAppHelper::maybe_filter_array( $values, array( 'name', 'description' ) ); |
| 384 | 273 | |
| 385 | 274 | foreach ( array( 'name', 'description', 'type', 'default_value' ) as $col ) { |
| 386 | - if ( isset( $values[ $col ] ) ) { | |
| 387 | - $new_values[ $col ] = $values[ $col ]; | |
| 388 | - } | |
| 275 | + $new_values[ $col ] = $values[ $col ]; | |
| 389 | 276 | } |
| 390 | 277 | |
| 391 | 278 | $new_values['options'] = self::maybe_filter_options( $values['options'] ); |
| 392 | 279 | $new_values['field_order'] = isset( $values['field_order'] ) ? (int) $values['field_order'] : null; |
| @@ -433,12 +320,8 @@ | ||
| 433 | 320 | return $new_id; |
| 434 | 321 | } |
| 435 | 322 | |
| 436 | 323 | /** |
| 437 | - * Maybe filter HTML in field options data. | |
| 438 | - * HTML is only filtered when unsafe HTML is disallowed. | |
| 439 | - * See FrmAppHelper::allow_unfiltered_html. | |
| 440 | - * | |
| 441 | 324 | * @since 5.0.08 |
| 442 | 325 | * |
| 443 | 326 | * @param array $options |
| 444 | 327 | * @return array |
| @@ -443,82 +326,12 @@ | ||
| 443 | 326 | * @param array $options |
| 444 | 327 | * @return array |
| 445 | 328 | */ |
| 446 | 329 | private static function maybe_filter_options( $options ) { |
| 447 | - $options = FrmAppHelper::maybe_filter_array( $options, array( 'custom_html' ) ); | |
| 448 | - | |
| 449 | - if ( ! empty( $options['custom_html'] ) ) { | |
| 450 | - $options['custom_html'] = self::maybe_filter_custom_html_input_attributes( $options['custom_html'] ); | |
| 451 | - } | |
| 452 | - | |
| 453 | - if ( ! empty( $options['classes'] ) ) { | |
| 454 | - $options['classes'] = implode( ' ', array_map( 'FrmFormsHelper::sanitize_layout_class', explode( ' ', $options['classes'] ) ) ); | |
| 455 | - } | |
| 456 | - | |
| 457 | - return $options; | |
| 330 | + return FrmAppHelper::maybe_filter_array( $options, array( 'custom_html' ) ); | |
| 458 | 331 | } |
| 459 | 332 | |
| 460 | 333 | /** |
| 461 | - * Prevent users who do not have permission to insert JavaScript attributes in input elements. | |
| 462 | - * This is triggered when a field is updated. | |
| 463 | - * | |
| 464 | - * @since 6.11.2 | |
| 465 | - * | |
| 466 | - * @param string $html | |
| 467 | - * @return string | |
| 468 | - */ | |
| 469 | - private static function maybe_filter_custom_html_input_attributes( $html ) { | |
| 470 | - if ( FrmAppHelper::allow_unfiltered_html() ) { | |
| 471 | - return $html; | |
| 472 | - } | |
| 473 | - | |
| 474 | - $pattern = get_shortcode_regex( array( 'input' ) ); | |
| 475 | - return preg_replace_callback( | |
| 476 | - "/$pattern/", | |
| 477 | - /** | |
| 478 | - * @param array $match Shortcode data. | |
| 479 | - * @return string | |
| 480 | - */ | |
| 481 | - function ( $match ) { | |
| 482 | - $attr = shortcode_parse_atts( $match[3] ); | |
| 483 | - | |
| 484 | - if ( ! is_array( $attr ) ) { | |
| 485 | - // In old versions of WordPress (older than 6.5), this might not be an array. | |
| 486 | - return '[input]'; | |
| 487 | - } | |
| 488 | - | |
| 489 | - $safe_atts = array(); | |
| 490 | - foreach ( $attr as $attr_key => $att ) { | |
| 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 { | |
| 496 | - // Some data is mapped like 0 => 'placeholder="Placeholder"'. | |
| 497 | - $split = explode( '=', $att, 2 ); | |
| 498 | - if ( 2 !== count( $split ) ) { | |
| 499 | - continue; | |
| 500 | - } | |
| 501 | - $key = trim( $split[0] ); | |
| 502 | - $value = trim( $split[1], '"' ); | |
| 503 | - } | |
| 504 | - | |
| 505 | - if ( FrmAppHelper::input_key_is_safe( $key, 'update' ) ) { | |
| 506 | - $safe_atts[ $key ] = $value; | |
| 507 | - } | |
| 508 | - } | |
| 509 | - | |
| 510 | - if ( ! $safe_atts ) { | |
| 511 | - return '[input]'; | |
| 512 | - } | |
| 513 | - | |
| 514 | - return '[input ' . FrmAppHelper::array_to_html_params( $safe_atts ) . ']'; | |
| 515 | - }, | |
| 516 | - $html | |
| 517 | - ); | |
| 518 | - } | |
| 519 | - | |
| 520 | - /** | |
| 521 | 334 | * Process the field duplication. |
| 522 | 335 | * |
| 523 | 336 | * @since 5.0.05 |
| 524 | 337 | */ |
| @@ -612,13 +425,8 @@ | ||
| 612 | 425 | unset( $field ); |
| 613 | 426 | }//end foreach |
| 614 | 427 | } |
| 615 | 428 | |
| 616 | - /** | |
| 617 | - * @param int|string $id | |
| 618 | - * @param array $values | |
| 619 | - * @return false|int | |
| 620 | - */ | |
| 621 | 429 | public static function update( $id, $values ) { |
| 622 | 430 | global $wpdb; |
| 623 | 431 | |
| 624 | 432 | $id = absint( $id ); |
| @@ -640,15 +448,9 @@ | ||
| 640 | 448 | // This is because "select" gets matched for SQL injection attempts. |
| 641 | 449 | $values['type'] = 'select'; |
| 642 | 450 | } |
| 643 | 451 | |
| 644 | - /** | |
| 645 | - * @since 6.9 The Field ID param was added. | |
| 646 | - * | |
| 647 | - * @param array $values | |
| 648 | - * @param int $id Field ID. | |
| 649 | - */ | |
| 650 | - $values = apply_filters( 'frm_clean_' . $values['type'] . '_field_options_before_update', $values, $id ); | |
| 452 | + $values = apply_filters( 'frm_clean_' . $values['type'] . '_field_options_before_update', $values ); | |
| 651 | 453 | |
| 652 | 454 | if ( $values['type'] === 'hidden' && isset( $values['field_options'] ) && isset( $values['field_options']['clear_on_focus'] ) ) { |
| 653 | 455 | // don't keep the old placeholder setting for hidden fields |
| 654 | 456 | $values['field_options']['clear_on_focus'] = 0; |
| @@ -742,11 +544,8 @@ | ||
| 742 | 544 | } |
| 743 | 545 | |
| 744 | 546 | /** |
| 745 | 547 | * If $field is numeric, get the field object |
| 746 | - * | |
| 747 | - * @param int|object|string $field | |
| 748 | - * @return void | |
| 749 | 548 | */ |
| 750 | 549 | public static function maybe_get_field( &$field ) { |
| 751 | 550 | if ( ! is_object( $field ) ) { |
| 752 | 551 | $field = self::getOne( $field ); |
| @@ -753,9 +552,9 @@ | ||
| 753 | 552 | } |
| 754 | 553 | } |
| 755 | 554 | |
| 756 | 555 | /** |
| 757 | - * @param int|string $id The field id or key. | |
| 556 | + * @param string|int $id The field id or key. | |
| 758 | 557 | * @param bool $filter When true, run the frm_field filter. |
| 759 | 558 | */ |
| 760 | 559 | public static function getOne( $id, $filter = false ) { |
| 761 | 560 | if ( empty( $id ) ) { |
| @@ -810,25 +609,19 @@ | ||
| 810 | 609 | $field = FrmDb::check_cache( $id, 'frm_field' ); |
| 811 | 610 | if ( $field ) { |
| 812 | 611 | $type = $field->{$col}; |
| 813 | 612 | } 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 ); | |
| 613 | + $where = array( | |
| 614 | + 'or' => 1, | |
| 615 | + 'id' => $id, | |
| 616 | + 'field_key' => $id, | |
| 617 | + ); | |
| 618 | + $type = FrmDb::get_var( 'frm_fields', $where, $col ); | |
| 820 | 619 | } |
| 821 | 620 | |
| 822 | 621 | return $type; |
| 823 | 622 | } |
| 824 | 623 | |
| 825 | - /** | |
| 826 | - * @param int|string $form_id | |
| 827 | - * @param string $type | |
| 828 | - * @param int|string $limit | |
| 829 | - * @param string $inc_sub | |
| 830 | - */ | |
| 831 | 624 | public static function get_all_types_in_form( $form_id, $type, $limit = '', $inc_sub = 'exclude' ) { |
| 832 | 625 | if ( ! $form_id ) { |
| 833 | 626 | return array(); |
| 834 | 627 | } |
| @@ -848,9 +641,9 @@ | ||
| 848 | 641 | continue; |
| 849 | 642 | } |
| 850 | 643 | |
| 851 | 644 | $fields[ $result->id ] = $result; |
| 852 | - ++$count; | |
| 645 | + $count ++; | |
| 853 | 646 | if ( $limit == 1 ) { |
| 854 | 647 | $fields = $result; |
| 855 | 648 | break; |
| 856 | 649 | } |
| @@ -878,15 +671,8 @@ | ||
| 878 | 671 | |
| 879 | 672 | return $results; |
| 880 | 673 | } |
| 881 | 674 | |
| 882 | - /** | |
| 883 | - * @param int|string $form_id | |
| 884 | - * @param int|string $limit | |
| 885 | - * @param string $inc_embed | |
| 886 | - * @param string $inc_repeat | |
| 887 | - * @return array | |
| 888 | - */ | |
| 889 | 675 | public static function get_all_for_form( $form_id, $limit = '', $inc_embed = 'exclude', $inc_repeat = 'include' ) { |
| 890 | 676 | if ( ! (int) $form_id ) { |
| 891 | 677 | return array(); |
| 892 | 678 | } |
| @@ -899,9 +685,9 @@ | ||
| 899 | 685 | |
| 900 | 686 | $fields = array(); |
| 901 | 687 | $count = 0; |
| 902 | 688 | foreach ( $results as $result ) { |
| 903 | - ++$count; | |
| 689 | + $count ++; | |
| 904 | 690 | $fields[ $result->id ] = $result; |
| 905 | 691 | if ( ! empty( $limit ) && $count >= $limit ) { |
| 906 | 692 | break; |
| 907 | 693 | } |
| @@ -933,9 +719,9 @@ | ||
| 933 | 719 | * @param string $inc_repeat |
| 934 | 720 | * @param array $where Pass by reference. |
| 935 | 721 | */ |
| 936 | 722 | private static function maybe_include_repeating_fields( $inc_repeat, &$where ) { |
| 937 | - if ( $inc_repeat === 'include' ) { | |
| 723 | + if ( $inc_repeat == 'include' ) { | |
| 938 | 724 | $form_id = $where['fi.form_id']; |
| 939 | 725 | $where[] = array( |
| 940 | 726 | 'or' => 1, |
| 941 | 727 | 'fi.form_id' => $form_id, |
| @@ -950,9 +736,9 @@ | ||
| 950 | 736 | if ( 'include' != $inc_embed || $no_sub_forms ) { |
| 951 | 737 | return; |
| 952 | 738 | } |
| 953 | 739 | |
| 954 | - $form_fields = $results; | |
| 740 | + $form_fields = $results; | |
| 955 | 741 | $should_get_subforms = ( $type !== 'all' && $type !== 'form' && ! empty( $form_id ) ); |
| 956 | 742 | if ( $should_get_subforms ) { |
| 957 | 743 | $form_fields = self::get_all_types_in_form( $form_id, 'form' ); |
| 958 | 744 | } |
| @@ -962,9 +748,9 @@ | ||
| 962 | 748 | if ( 'form' != $field->type || ! isset( $field->field_options['form_select'] ) ) { |
| 963 | 749 | continue; |
| 964 | 750 | } |
| 965 | 751 | |
| 966 | - if ( $type === 'all' ) { | |
| 752 | + if ( $type == 'all' ) { | |
| 967 | 753 | $sub_fields = self::get_all_for_form( $field->field_options['form_select'] ); |
| 968 | 754 | } else { |
| 969 | 755 | $sub_fields = self::get_all_types_in_form( $field->field_options['form_select'], $type ); |
| 970 | 756 | } |
| @@ -969,9 +755,9 @@ | ||
| 969 | 755 | $sub_fields = self::get_all_types_in_form( $field->field_options['form_select'], $type ); |
| 970 | 756 | } |
| 971 | 757 | |
| 972 | 758 | if ( ! empty( $sub_fields ) ) { |
| 973 | - $index = $k + $index_offset; | |
| 759 | + $index = $k + $index_offset; | |
| 974 | 760 | $index_offset += count( $sub_fields ); |
| 975 | 761 | array_splice( $results, $index, 0, $sub_fields ); |
| 976 | 762 | } |
| 977 | 763 | unset( $field, $sub_fields ); |
| @@ -1010,10 +796,10 @@ | ||
| 1010 | 796 | } |
| 1011 | 797 | |
| 1012 | 798 | $limit = FrmDb::esc_limit( $limit ); |
| 1013 | 799 | |
| 1014 | - $query = "SELECT fi.*, fr.name as form_name FROM {$table_name} fi JOIN {$form_table_name} fr ON fi.form_id=fr.id"; | |
| 1015 | - $query_type = $limit === ' LIMIT 1' || $limit == 1 ? 'row' : 'results'; | |
| 800 | + $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"; | |
| 801 | + $query_type = ( $limit == ' LIMIT 1' || $limit == 1 ) ? 'row' : 'results'; | |
| 1016 | 802 | |
| 1017 | 803 | if ( is_array( $where ) ) { |
| 1018 | 804 | $args = array( |
| 1019 | 805 | 'order_by' => $order_by, |
| @@ -1018,14 +804,14 @@ | ||
| 1018 | 804 | $args = array( |
| 1019 | 805 | 'order_by' => $order_by, |
| 1020 | 806 | 'limit' => $limit, |
| 1021 | 807 | ); |
| 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 ); | |
| 808 | + $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 ); | |
| 1023 | 809 | } else { |
| 1024 | 810 | // if the query is not an array, then it has already been prepared |
| 1025 | 811 | $query .= FrmDb::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit; |
| 1026 | 812 | |
| 1027 | - $function_name = $query_type === 'row' ? 'get_row' : 'get_results'; | |
| 813 | + $function_name = ( $query_type == 'row' ) ? 'get_row' : 'get_results'; | |
| 1028 | 814 | $results = $wpdb->$function_name( $query ); |
| 1029 | 815 | } |
| 1030 | 816 | unset( $where ); |
| 1031 | 817 | |
| @@ -1041,10 +827,8 @@ | ||
| 1041 | 827 | */ |
| 1042 | 828 | private static function format_field_results( &$results ) { |
| 1043 | 829 | if ( is_array( $results ) ) { |
| 1044 | 830 | foreach ( $results as $r_key => $result ) { |
| 1045 | - self::add_slashes_to_format_before_setting_field_cache( $result ); | |
| 1046 | - | |
| 1047 | 831 | FrmDb::set_cache( $result->id, $result, 'frm_field' ); |
| 1048 | 832 | FrmDb::set_cache( $result->field_key, $result, 'frm_field' ); |
| 1049 | 833 | |
| 1050 | 834 | self::prepare_options( $result ); |
| @@ -1062,26 +846,8 @@ | ||
| 1062 | 846 | } |
| 1063 | 847 | } |
| 1064 | 848 | |
| 1065 | 849 | /** |
| 1066 | - * When $result->field_options is an array and not a serialized string there is only a single backslash. | |
| 1067 | - * Cached results are unslashed in FrmField::getAll, so we need to make sure that the cached object has an extra backslash. | |
| 1068 | - * Otherwise the backslash is stripped away on load. | |
| 1069 | - * | |
| 1070 | - * @since 6.15 | |
| 1071 | - * | |
| 1072 | - * @param stdClass $result | |
| 1073 | - * @return void | |
| 1074 | - */ | |
| 1075 | - private static function add_slashes_to_format_before_setting_field_cache( $result ) { | |
| 1076 | - if ( ! isset( $result->field_options ) || ! is_array( $result->field_options ) || empty( $result->field_options['format'] ) ) { | |
| 1077 | - return; | |
| 1078 | - } | |
| 1079 | - | |
| 1080 | - $result->field_options['format'] = addslashes( $result->field_options['format'] ); | |
| 1081 | - } | |
| 1082 | - | |
| 1083 | - /** | |
| 1084 | 850 | * Unserialize all the serialized field data |
| 1085 | 851 | * |
| 1086 | 852 | * @since 2.0 |
| 1087 | 853 | */ |
| @@ -1090,21 +856,16 @@ | ||
| 1090 | 856 | FrmAppHelper::unserialize_or_decode( $results->options ); |
| 1091 | 857 | |
| 1092 | 858 | // Allow a single box to be checked for the default value. |
| 1093 | 859 | $before = $results->default_value; |
| 1094 | - | |
| 1095 | - $field_object = FrmFieldFactory::get_field_type( $results->type ); | |
| 1096 | - | |
| 1097 | - if ( $field_object->should_unserialize_value() ) { | |
| 1098 | - FrmAppHelper::unserialize_or_decode( $results->default_value ); | |
| 1099 | - if ( $before === $results->default_value && is_string( $before ) && strpos( $before, '["' ) === 0 ) { | |
| 1100 | - $results->default_value = FrmAppHelper::maybe_json_decode( $results->default_value ); | |
| 1101 | - } | |
| 860 | + FrmAppHelper::unserialize_or_decode( $results->default_value ); | |
| 861 | + if ( $before === $results->default_value && ! is_array( $before ) && strpos( $before, '["' ) === 0 ) { | |
| 862 | + $results->default_value = FrmAppHelper::maybe_json_decode( $results->default_value ); | |
| 1102 | 863 | } |
| 1103 | 864 | } |
| 1104 | 865 | |
| 1105 | 866 | /** |
| 1106 | - * If a form has too many fields, they won't all save into a single transient. | |
| 867 | + * If a form has too many fields, thay won't all save into a single transient. | |
| 1107 | 868 | * We'll break them into groups of 200 |
| 1108 | 869 | * |
| 1109 | 870 | * @since 2.0.1 |
| 1110 | 871 | */ |
| @@ -1128,9 +889,9 @@ | ||
| 1128 | 889 | $fields = array_merge( $fields, $next_fields ); |
| 1129 | 890 | |
| 1130 | 891 | if ( count( $next_fields ) >= self::$transient_size ) { |
| 1131 | 892 | // if this transient is full, check for another |
| 1132 | - ++$next; | |
| 893 | + $next ++; | |
| 1133 | 894 | self::get_next_transient( $fields, $base_name, $next ); |
| 1134 | 895 | } |
| 1135 | 896 | } |
| 1136 | 897 | } |
| @@ -1149,9 +910,9 @@ | ||
| 1149 | 910 | $set = set_transient( $name, $field, 60 * 60 * 6 ); |
| 1150 | 911 | if ( ! $set ) { |
| 1151 | 912 | // the transient didn't save |
| 1152 | 913 | if ( $name != $base_name ) { |
| 1153 | - // if the first saved an others fail, this will show an incomplete form | |
| 914 | + // if the first saved an others fail, this will show an incmoplete form | |
| 1154 | 915 | self::delete_form_transient( $form_id ); |
| 1155 | 916 | } |
| 1156 | 917 | |
| 1157 | 918 | return; |
| @@ -1156,25 +917,18 @@ | ||
| 1156 | 917 | |
| 1157 | 918 | return; |
| 1158 | 919 | } |
| 1159 | 920 | |
| 1160 | - ++$next; | |
| 921 | + $next ++; | |
| 1161 | 922 | } |
| 1162 | 923 | } |
| 1163 | 924 | |
| 1164 | - /** | |
| 1165 | - * @param string $type | |
| 1166 | - * @return bool | |
| 1167 | - */ | |
| 1168 | 925 | public static function is_no_save_field( $type ) { |
| 1169 | - return in_array( $type, self::no_save_fields(), true ); | |
| 926 | + return in_array( $type, self::no_save_fields() ); | |
| 1170 | 927 | } |
| 1171 | 928 | |
| 1172 | - /** | |
| 1173 | - * @return string[] | |
| 1174 | - */ | |
| 1175 | 929 | public static function no_save_fields() { |
| 1176 | - return array( 'divider', 'end_divider', 'captcha', 'break', 'html', 'form', 'summary', FrmSubmitHelper::FIELD_TYPE ); | |
| 930 | + return array( 'divider', 'end_divider', 'captcha', 'break', 'html', 'form', 'summary' ); | |
| 1177 | 931 | } |
| 1178 | 932 | |
| 1179 | 933 | /** |
| 1180 | 934 | * Check if this field can hold an array of values |
| @@ -1182,9 +936,9 @@ | ||
| 1182 | 936 | * @since 2.0.9 |
| 1183 | 937 | * |
| 1184 | 938 | * @param array|object $field |
| 1185 | 939 | * |
| 1186 | - * @return bool | |
| 940 | + * @return boolean | |
| 1187 | 941 | */ |
| 1188 | 942 | public static function is_field_with_multiple_values( $field ) { |
| 1189 | 943 | if ( ! $field ) { |
| 1190 | 944 | return false; |
| @@ -1193,9 +947,9 @@ | ||
| 1193 | 947 | $field_type = self::get_original_field_type( $field ); |
| 1194 | 948 | |
| 1195 | 949 | $is_multi_value_field = ( |
| 1196 | 950 | self::is_checkbox( $field ) || |
| 1197 | - $field_type === 'address' || | |
| 951 | + $field_type == 'address' || | |
| 1198 | 952 | self::is_multiple_select( $field ) |
| 1199 | 953 | ); |
| 1200 | 954 | |
| 1201 | 955 | return $is_multi_value_field; |
| @@ -1202,9 +956,8 @@ | ||
| 1202 | 956 | } |
| 1203 | 957 | |
| 1204 | 958 | /** |
| 1205 | 959 | * @since 3.0 |
| 1206 | - * @param array|object $field | |
| 1207 | 960 | * @return string |
| 1208 | 961 | */ |
| 1209 | 962 | public static function get_field_type( $field ) { |
| 1210 | 963 | return is_array( $field ) ? $field['type'] : $field->type; |
| @@ -1229,9 +982,9 @@ | ||
| 1229 | 982 | /** |
| 1230 | 983 | * Check if this is a multiselect dropdown field |
| 1231 | 984 | * |
| 1232 | 985 | * @since 2.0.9 |
| 1233 | - * @return bool | |
| 986 | + * @return boolean | |
| 1234 | 987 | */ |
| 1235 | 988 | public static function is_multiple_select( $field ) { |
| 1236 | 989 | $field_type = self::get_field_type( $field ); |
| 1237 | 990 | $is_multiple = self::is_option_true( $field, 'multiple' ) && self::is_field_type( $field, 'select' ) && $field_type !== 'hidden'; |
| @@ -1243,104 +996,63 @@ | ||
| 1243 | 996 | * Check if a field is read only. Read only can be set in the field options, |
| 1244 | 997 | * but disabled with the shortcode options |
| 1245 | 998 | * |
| 1246 | 999 | * @since 2.0.9 |
| 1247 | - * | |
| 1248 | - * @param array|object $field | |
| 1249 | - * @return bool | |
| 1250 | 1000 | */ |
| 1251 | 1001 | public static function is_read_only( $field ) { |
| 1252 | 1002 | global $frm_vars; |
| 1253 | - return self::is_option_true( $field, 'read_only' ) && ( ! isset( $frm_vars['readonly'] ) || $frm_vars['readonly'] !== 'disabled' ); | |
| 1003 | + | |
| 1004 | + return ( self::is_option_true( $field, 'read_only' ) && ( ! isset( $frm_vars['readonly'] ) || $frm_vars['readonly'] != 'disabled' ) ); | |
| 1254 | 1005 | } |
| 1255 | 1006 | |
| 1256 | 1007 | /** |
| 1257 | 1008 | * @since 2.0.9 |
| 1258 | - * | |
| 1259 | - * @param array $field | |
| 1260 | - * @return bool | |
| 1261 | 1009 | */ |
| 1262 | 1010 | public static function is_required( $field ) { |
| 1263 | - $required = $field['required'] != '0'; | |
| 1011 | + $required = ( $field['required'] != '0' ); | |
| 1012 | + $required = apply_filters( 'frm_is_field_required', $required, $field ); | |
| 1264 | 1013 | |
| 1265 | - /** | |
| 1266 | - * @param bool $required | |
| 1267 | - * @param array $field | |
| 1268 | - */ | |
| 1269 | - $required = (bool) apply_filters( 'frm_is_field_required', $required, $field ); | |
| 1270 | - | |
| 1271 | 1014 | return $required; |
| 1272 | 1015 | } |
| 1273 | 1016 | |
| 1274 | 1017 | /** |
| 1275 | 1018 | * @since 2.0.9 |
| 1276 | - * | |
| 1277 | - * @param array|object $field | |
| 1278 | - * @param string $option | |
| 1279 | - * @return bool | |
| 1280 | 1019 | */ |
| 1281 | 1020 | public static function is_option_true( $field, $option ) { |
| 1282 | 1021 | if ( is_array( $field ) ) { |
| 1283 | 1022 | return self::is_option_true_in_array( $field, $option ); |
| 1023 | + } else { | |
| 1024 | + return self::is_option_true_in_object( $field, $option ); | |
| 1284 | 1025 | } |
| 1285 | - return self::is_option_true_in_object( $field, $option ); | |
| 1286 | 1026 | } |
| 1287 | 1027 | |
| 1288 | 1028 | /** |
| 1289 | 1029 | * @since 2.0.9 |
| 1290 | - * | |
| 1291 | - * @param array|object $field | |
| 1292 | - * @param string $option | |
| 1293 | - * @return bool | |
| 1294 | 1030 | */ |
| 1295 | 1031 | public static function is_option_empty( $field, $option ) { |
| 1296 | 1032 | if ( is_array( $field ) ) { |
| 1297 | 1033 | return self::is_option_empty_in_array( $field, $option ); |
| 1034 | + } else { | |
| 1035 | + return self::is_option_empty_in_object( $field, $option ); | |
| 1298 | 1036 | } |
| 1299 | - return self::is_option_empty_in_object( $field, $option ); | |
| 1300 | 1037 | } |
| 1301 | 1038 | |
| 1302 | - /** | |
| 1303 | - * @param array $field | |
| 1304 | - * @param string $option | |
| 1305 | - * @return bool | |
| 1306 | - */ | |
| 1307 | 1039 | public static function is_option_true_in_array( $field, $option ) { |
| 1308 | - return ! empty( $field[ $option ] ); | |
| 1040 | + return isset( $field[ $option ] ) && $field[ $option ]; | |
| 1309 | 1041 | } |
| 1310 | 1042 | |
| 1311 | - /** | |
| 1312 | - * @param object $field | |
| 1313 | - * @param string $option | |
| 1314 | - * @return bool | |
| 1315 | - */ | |
| 1316 | 1043 | public static function is_option_true_in_object( $field, $option ) { |
| 1317 | 1044 | return isset( $field->field_options[ $option ] ) && $field->field_options[ $option ]; |
| 1318 | 1045 | } |
| 1319 | 1046 | |
| 1320 | - /** | |
| 1321 | - * @param array $field | |
| 1322 | - * @param string $option | |
| 1323 | - * @return bool | |
| 1324 | - */ | |
| 1325 | 1047 | public static function is_option_empty_in_array( $field, $option ) { |
| 1326 | - return empty( $field[ $option ] ); | |
| 1048 | + return ! isset( $field[ $option ] ) || empty( $field[ $option ] ); | |
| 1327 | 1049 | } |
| 1328 | 1050 | |
| 1329 | - /** | |
| 1330 | - * @param object $field | |
| 1331 | - * @param string $option | |
| 1332 | - * @return bool | |
| 1333 | - */ | |
| 1334 | 1051 | public static function is_option_empty_in_object( $field, $option ) { |
| 1335 | - return empty( $field->field_options[ $option ] ); | |
| 1052 | + return ! isset( $field->field_options[ $option ] ) || empty( $field->field_options[ $option ] ); | |
| 1336 | 1053 | } |
| 1337 | 1054 | |
| 1338 | - /** | |
| 1339 | - * @param stdClass $field | |
| 1340 | - * @param string $option | |
| 1341 | - * @return bool | |
| 1342 | - */ | |
| 1343 | 1055 | public static function is_option_value_in_object( $field, $option ) { |
| 1344 | 1056 | return isset( $field->field_options[ $option ] ) && $field->field_options[ $option ] != ''; |
| 1345 | 1057 | } |
| 1346 | 1058 | |
| @@ -1345,12 +1057,8 @@ | ||
| 1345 | 1057 | } |
| 1346 | 1058 | |
| 1347 | 1059 | /** |
| 1348 | 1060 | * @since 2.0.18 |
| 1349 | - * | |
| 1350 | - * @param array|object $field | |
| 1351 | - * @param string $option | |
| 1352 | - * @return mixed | |
| 1353 | 1061 | */ |
| 1354 | 1062 | public static function get_option( $field, $option ) { |
| 1355 | 1063 | if ( is_array( $field ) ) { |
| 1356 | 1064 | $option = self::get_option_in_array( $field, $option ); |
| @@ -1360,14 +1068,10 @@ | ||
| 1360 | 1068 | |
| 1361 | 1069 | return $option; |
| 1362 | 1070 | } |
| 1363 | 1071 | |
| 1364 | - /** | |
| 1365 | - * @param array $field | |
| 1366 | - * @param string $option | |
| 1367 | - * @return mixed | |
| 1368 | - */ | |
| 1369 | 1072 | public static function get_option_in_array( $field, $option ) { |
| 1073 | + | |
| 1370 | 1074 | if ( isset( $field[ $option ] ) ) { |
| 1371 | 1075 | $this_option = $field[ $option ]; |
| 1372 | 1076 | } elseif ( isset( $field['field_options'] ) && is_array( $field['field_options'] ) && isset( $field['field_options'][ $option ] ) ) { |
| 1373 | 1077 | $this_option = $field['field_options'][ $option ]; |
| @@ -1377,31 +1081,23 @@ | ||
| 1377 | 1081 | |
| 1378 | 1082 | return $this_option; |
| 1379 | 1083 | } |
| 1380 | 1084 | |
| 1381 | - /** | |
| 1382 | - * @param object $field | |
| 1383 | - * @param string $option | |
| 1384 | - * @return mixed | |
| 1385 | - */ | |
| 1386 | 1085 | public static function get_option_in_object( $field, $option ) { |
| 1387 | - return $field->field_options[ $option ] ?? ''; | |
| 1086 | + return isset( $field->field_options[ $option ] ) ? $field->field_options[ $option ] : ''; | |
| 1388 | 1087 | } |
| 1389 | 1088 | |
| 1390 | 1089 | /** |
| 1391 | 1090 | * @since 2.0.09 |
| 1392 | - * | |
| 1393 | - * @param array|object $field | |
| 1394 | - * @return bool | |
| 1395 | 1091 | */ |
| 1396 | 1092 | public static function is_repeating_field( $field ) { |
| 1397 | 1093 | if ( is_array( $field ) ) { |
| 1398 | - $is_repeating_field = ( 'divider' === $field['type'] ); | |
| 1094 | + $is_repeating_field = ( 'divider' == $field['type'] ); | |
| 1399 | 1095 | } else { |
| 1400 | - $is_repeating_field = ( 'divider' === $field->type ); | |
| 1096 | + $is_repeating_field = ( 'divider' == $field->type ); | |
| 1401 | 1097 | } |
| 1402 | 1098 | |
| 1403 | - return $is_repeating_field && self::is_option_true( $field, 'repeat' ); | |
| 1099 | + return ( $is_repeating_field && self::is_option_true( $field, 'repeat' ) ); | |
| 1404 | 1100 | } |
| 1405 | 1101 | |
| 1406 | 1102 | /** |
| 1407 | 1103 | * @param string $key |
| @@ -1416,9 +1112,9 @@ | ||
| 1416 | 1112 | |
| 1417 | 1113 | /** |
| 1418 | 1114 | * @param string $id |
| 1419 | 1115 | * |
| 1420 | - * @return string|null | |
| 1116 | + * @return null|string | |
| 1421 | 1117 | */ |
| 1422 | 1118 | public static function get_key_by_id( $id ) { |
| 1423 | 1119 | return FrmDb::get_var( 'frm_fields', array( 'id' => $id ), 'field_key' ); |
| 1424 | 1120 | } |
| @@ -1425,9 +1121,9 @@ | ||
| 1425 | 1121 | |
| 1426 | 1122 | public static function is_image( $field ) { |
| 1427 | 1123 | $type = self::get_field_type( $field ); |
| 1428 | 1124 | |
| 1429 | - return ( $type === 'url' && self::get_option( $field, 'show_image' ) ); | |
| 1125 | + return ( $type == 'url' && self::get_option( $field, 'show_image' ) ); | |
| 1430 | 1126 | } |
| 1431 | 1127 | |
| 1432 | 1128 | /** |
| 1433 | 1129 | * Check if field is radio or Dynamic radio |
| @@ -1435,9 +1131,9 @@ | ||
| 1435 | 1131 | * @since 3.0 |
| 1436 | 1132 | * |
| 1437 | 1133 | * @param array|object $field |
| 1438 | 1134 | * |
| 1439 | - * @return bool true if field type is radio or Dynamic radio | |
| 1135 | + * @return boolean true if field type is radio or Dynamic radio | |
| 1440 | 1136 | */ |
| 1441 | 1137 | public static function is_radio( $field ) { |
| 1442 | 1138 | return self::is_field_type( $field, 'radio' ); |
| 1443 | 1139 | } |
| @@ -1448,9 +1144,9 @@ | ||
| 1448 | 1144 | * @since 3.0 |
| 1449 | 1145 | * |
| 1450 | 1146 | * @param array|object $field |
| 1451 | 1147 | * |
| 1452 | - * @return bool true if field type is checkbox or Dynamic checkbox | |
| 1148 | + * @return boolean true if field type is checkbox or Dynamic checkbox | |
| 1453 | 1149 | */ |
| 1454 | 1150 | public static function is_checkbox( $field ) { |
| 1455 | 1151 | return self::is_field_type( $field, 'checkbox' ); |
| 1456 | 1152 | } |
| @@ -1462,9 +1158,9 @@ | ||
| 1462 | 1158 | * |
| 1463 | 1159 | * @param array|object $field |
| 1464 | 1160 | * @param string $is_type Options include radio, checkbox, text. |
| 1465 | 1161 | * |
| 1466 | - * @return bool true if field type is checkbox or Dynamic checkbox | |
| 1162 | + * @return boolean true if field type is checkbox or Dynamic checkbox | |
| 1467 | 1163 | */ |
| 1468 | 1164 | public static function is_field_type( $field, $is_type ) { |
| 1469 | 1165 | $field_type = self::get_original_field_type( $field ); |
| 1470 | 1166 | $data_type = self::get_option( $field, 'data_type' ); |
