| @@ -8,9 +8,8 @@ | ||
| 8 | 8 | /** |
| 9 | 9 | * The meta name of default template style. |
| 10 | 10 | * |
| 11 | 11 | * @since 6.14 |
| 12 | - * | |
| 13 | 12 | * @var string |
| 14 | 13 | */ |
| 15 | 14 | private $default_template_style_meta_name = 'frm_style_default'; |
| 16 | 15 | |
| @@ -43,9 +42,9 @@ | ||
| 43 | 42 | |
| 44 | 43 | $max_slug_value = 2147483647; |
| 45 | 44 | // We want to have at least 2 characters in the slug. |
| 46 | 45 | $min_slug_value = 37; |
| 47 | - $key = base_convert( random_int( $min_slug_value, $max_slug_value ), 10, 36 ); | |
| 46 | + $key = base_convert( rand( $min_slug_value, $max_slug_value ), 10, 36 ); | |
| 48 | 47 | |
| 49 | 48 | $style = array( |
| 50 | 49 | 'post_type' => FrmStylesController::$post_type, |
| 51 | 50 | 'ID' => '', |
| @@ -60,9 +59,8 @@ | ||
| 60 | 59 | } |
| 61 | 60 | |
| 62 | 61 | /** |
| 63 | 62 | * @param array $settings |
| 64 | - * | |
| 65 | 63 | * @return int|WP_Error |
| 66 | 64 | */ |
| 67 | 65 | public function save( $settings ) { |
| 68 | 66 | return FrmDb::save_settings( $settings, 'frm_styles' ); |
| @@ -68,10 +66,8 @@ | ||
| 68 | 66 | return FrmDb::save_settings( $settings, 'frm_styles' ); |
| 69 | 67 | } |
| 70 | 68 | |
| 71 | 69 | /** |
| 72 | - * @param int|string $id The id of the stylesheet or 'default'. | |
| 73 | - * | |
| 74 | 70 | * @return void |
| 75 | 71 | */ |
| 76 | 72 | public function duplicate( $id ) { |
| 77 | 73 | // Duplicating is a pro feature. This is handled in FrmProStyle::duplicate instead. |
| @@ -80,17 +76,16 @@ | ||
| 80 | 76 | /** |
| 81 | 77 | * Handle save actions in the visual styler edit page. |
| 82 | 78 | * |
| 83 | 79 | * @param mixed $id |
| 84 | - * | |
| 85 | 80 | * @return array<int|WP_Error> |
| 86 | 81 | */ |
| 87 | 82 | public function update( $id = 'default' ) { |
| 88 | - $all_instances = $this->get_all(); | |
| 89 | - $css_scope_helper = new FrmCssScopeHelper(); | |
| 83 | + $all_instances = $this->get_all(); | |
| 90 | 84 | |
| 91 | 85 | if ( ! $id ) { |
| 92 | - $all_instances[] = (array) $this->get_new(); | |
| 86 | + $new_style = (array) $this->get_new(); | |
| 87 | + $all_instances[] = $new_style; | |
| 93 | 88 | } |
| 94 | 89 | |
| 95 | 90 | $action_ids = array(); |
| 96 | 91 | |
| @@ -97,10 +92,9 @@ | ||
| 97 | 92 | foreach ( $all_instances as $new_instance ) { |
| 98 | 93 | $new_instance = (array) $new_instance; |
| 99 | 94 | $this->id = $new_instance['ID']; |
| 100 | 95 | |
| 101 | - // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons | |
| 102 | - if ( $id != $this->id || ! $_POST || ! isset( $_POST['frm_style_setting'] ) ) { | |
| 96 | + if ( $id != $this->id || ! $_POST || ! isset( $_POST['frm_style_setting'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing | |
| 103 | 97 | // Don't continue if not saving this style. |
| 104 | 98 | continue; |
| 105 | 99 | } |
| 106 | 100 | |
| @@ -105,9 +99,9 @@ | ||
| 105 | 99 | } |
| 106 | 100 | |
| 107 | 101 | // Custom CSS is no longer used from the default style, but it is still checked if the Global Setting is missing. |
| 108 | 102 | // Preserve the previous value in case Custom CSS has not been saved as a Global Setting yet. |
| 109 | - $custom_css = $new_instance['post_content']['custom_css'] ?? ''; | |
| 103 | + $custom_css = isset( $new_instance['post_content']['custom_css'] ) ? $new_instance['post_content']['custom_css'] : ''; | |
| 110 | 104 | |
| 111 | 105 | // phpcs:ignore WordPress.Security.NonceVerification.Missing |
| 112 | 106 | if ( ! empty( $_POST['frm_style_setting']['post_title'] ) ) { |
| 113 | 107 | // The nonce check happens in FrmStylesController::save_style before this is called. |
| @@ -114,9 +108,9 @@ | ||
| 114 | 108 | // phpcs:ignore WordPress.Security.NonceVerification.Missing |
| 115 | 109 | $new_instance['post_title'] = sanitize_text_field( wp_unslash( $_POST['frm_style_setting']['post_title'] ) ); |
| 116 | 110 | } |
| 117 | 111 | |
| 118 | - $new_instance['post_content'] = isset( $_POST['frm_style_setting']['post_content'] ) ? $this->sanitize_post_content( wp_unslash( $_POST['frm_style_setting']['post_content'] ) ) : ''; // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing, SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 112 | + $new_instance['post_content'] = isset( $_POST['frm_style_setting']['post_content'] ) ? $this->sanitize_post_content( wp_unslash( $_POST['frm_style_setting']['post_content'] ) ) : ''; // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing | |
| 119 | 113 | $new_instance['post_content']['custom_css'] = $custom_css; |
| 120 | 114 | unset( $custom_css ); |
| 121 | 115 | |
| 122 | 116 | $new_instance['post_type'] = FrmStylesController::$post_type; |
| @@ -122,20 +116,11 @@ | ||
| 122 | 116 | $new_instance['post_type'] = FrmStylesController::$post_type; |
| 123 | 117 | $new_instance['post_status'] = 'publish'; |
| 124 | 118 | |
| 125 | 119 | if ( ! $id ) { |
| 126 | - // For a new style (including a duplicate), the post_name is derived from the title. | |
| 127 | - // Resolve slug uniqueness up front (WordPress appends -2, -3, etc. to duplicate slugs) | |
| 128 | - // so the CSS scope below matches the slug WordPress will actually store. | |
| 129 | - $slug = sanitize_title( $new_instance['post_title'] ); | |
| 130 | - $new_instance['post_name'] = wp_unique_post_slug( $slug, 0, $new_instance['post_status'], $new_instance['post_type'], 0 ); | |
| 120 | + $new_instance['post_name'] = $new_instance['post_title']; | |
| 131 | 121 | } |
| 132 | 122 | |
| 133 | - if ( ! empty( $new_instance['post_content']['single_style_custom_css'] ) ) { | |
| 134 | - $css_scope = 'frm_style_' . $new_instance['post_name']; | |
| 135 | - $new_instance['post_content']['single_style_custom_css'] = $css_scope_helper->nest( $new_instance['post_content']['single_style_custom_css'], $css_scope ); | |
| 136 | - } | |
| 137 | - | |
| 138 | 123 | $default_settings = $this->get_defaults(); |
| 139 | 124 | |
| 140 | 125 | foreach ( $default_settings as $setting => $default ) { |
| 141 | 126 | if ( ! isset( $new_instance['post_content'][ $setting ] ) ) { |
| @@ -143,10 +128,9 @@ | ||
| 143 | 128 | } |
| 144 | 129 | |
| 145 | 130 | if ( $this->is_color( $setting ) ) { |
| 146 | 131 | $color_val = $new_instance['post_content'][ $setting ]; |
| 147 | - | |
| 148 | - if ( $color_val !== '' && str_contains( $color_val, 'rgb' ) ) { | |
| 132 | + if ( $color_val !== '' && false !== strpos( $color_val, 'rgb' ) ) { | |
| 149 | 133 | // Maybe sanitize if invalid rgba value is entered. |
| 150 | 134 | $this->maybe_sanitize_rgba_value( $color_val ); |
| 151 | 135 | } |
| 152 | 136 | $new_instance['post_content'][ $setting ] = str_replace( '#', '', $color_val ); |
| @@ -157,9 +141,10 @@ | ||
| 157 | 141 | } |
| 158 | 142 | } |
| 159 | 143 | |
| 160 | 144 | $new_instance['post_content'] = FrmStylesHelper::update_base_font_size( $new_instance['post_content'], $this->get_defaults() ); |
| 161 | - $action_ids[] = $this->save( $new_instance ); | |
| 145 | + | |
| 146 | + $action_ids[] = $this->save( $new_instance ); | |
| 162 | 147 | }//end foreach |
| 163 | 148 | |
| 164 | 149 | $this->save_settings(); |
| 165 | 150 | |
| @@ -171,12 +156,11 @@ | ||
| 171 | 156 | * |
| 172 | 157 | * @since 5.3.2 |
| 173 | 158 | * |
| 174 | 159 | * @param string $color_val The color value, by reference. |
| 175 | - * | |
| 176 | 160 | * @return void |
| 177 | 161 | */ |
| 178 | - private function maybe_sanitize_rgba_value( &$color_val ) { // phpcs:ignore SlevomatCodingStandard.Complexity.Cognitive.ComplexityTooHigh | |
| 162 | + private function maybe_sanitize_rgba_value( &$color_val ) { | |
| 179 | 163 | if ( preg_match( '/(rgb|rgba)\(/', $color_val ) !== 1 ) { |
| 180 | 164 | return; |
| 181 | 165 | } |
| 182 | 166 | |
| @@ -183,9 +167,8 @@ | ||
| 183 | 167 | $color_val = trim( $color_val ); |
| 184 | 168 | // Remove leading braces so (rgba(1,1,1,1) doesn't cause inconsistent braces. |
| 185 | 169 | $color_val = ltrim( $color_val, '(' ); |
| 186 | 170 | $patterns = array( '/rgba\((\s*\d+\s*,){3}[[0-1]\.]+\)/', '/rgb\((\s*\d+\s*,){2}\s*[\d]+\)/' ); |
| 187 | - | |
| 188 | 171 | foreach ( $patterns as $pattern ) { |
| 189 | 172 | if ( preg_match( $pattern, $color_val ) === 1 ) { |
| 190 | 173 | return; |
| 191 | 174 | } |
| @@ -205,9 +188,9 @@ | ||
| 205 | 188 | foreach ( explode( ',', $color_rgba ) as $index => $value ) { |
| 206 | 189 | $new_value = null; |
| 207 | 190 | $value_is_empty_string = '' === trim( $value ) || '' === $value; |
| 208 | 191 | |
| 209 | - if ( 3 === $length_of_color_codes || $index !== $length_of_color_codes - 1 ) { | |
| 192 | + if ( 3 === $length_of_color_codes || ( $index !== $length_of_color_codes - 1 ) ) { | |
| 210 | 193 | // Insert a value for r, g, or b. |
| 211 | 194 | if ( $value < 0 ) { |
| 212 | 195 | $new_value = 0; |
| 213 | 196 | } elseif ( $value > 255 ) { |
| @@ -216,9 +199,9 @@ | ||
| 216 | 199 | $new_value = 0; |
| 217 | 200 | } else { |
| 218 | 201 | $new_value = absint( $value ); |
| 219 | 202 | } |
| 220 | - } else { // phpcs:ignore Universal.ControlStructures.DisallowLonelyIf.Found | |
| 203 | + } else { | |
| 221 | 204 | // Insert a value for alpha. |
| 222 | 205 | if ( $value_is_empty_string ) { |
| 223 | 206 | $new_value = 4 === $length_of_color_codes ? 1 : 0; |
| 224 | 207 | } elseif ( $value > 1 || $value < 0 ) { |
| @@ -227,14 +210,13 @@ | ||
| 227 | 210 | $new_value = floatval( $value ); |
| 228 | 211 | } |
| 229 | 212 | }//end if |
| 230 | 213 | |
| 231 | - $new_color_values[] = $new_value; | |
| 214 | + $new_color_values[] = null === $new_value ? $value : $new_value; | |
| 232 | 215 | }//end foreach |
| 233 | 216 | |
| 234 | 217 | // add more 0s and 1 (if alpha position) if needed. |
| 235 | 218 | $missing_values = $length_of_color_codes - count( $new_color_values ); |
| 236 | - | |
| 237 | 219 | if ( $missing_values > 1 ) { |
| 238 | 220 | $insert_values = array_fill( 0, $missing_values - 1, 0 ); |
| 239 | 221 | $last_value = 4 === $length_of_color_codes ? 1 : 0; |
| 240 | 222 | array_push( $insert_values, $last_value ); |
| @@ -240,9 +222,8 @@ | ||
| 240 | 222 | array_push( $insert_values, $last_value ); |
| 241 | 223 | } elseif ( $missing_values === 1 ) { |
| 242 | 224 | $insert_values = 4 === $length_of_color_codes ? array( 1 ) : array( 0 ); |
| 243 | 225 | } |
| 244 | - | |
| 245 | 226 | if ( ! empty( $insert_values ) ) { |
| 246 | 227 | $new_color_values = array_merge( $new_color_values, $insert_values ); |
| 247 | 228 | } |
| 248 | 229 | |
| @@ -250,8 +231,9 @@ | ||
| 250 | 231 | $prefix = substr( $color_val, 0, strpos( $color_val, '(' ) + 1 ); |
| 251 | 232 | // Limit the number of opening braces after rgb/rgba. There should only be one. |
| 252 | 233 | $prefix = rtrim( $prefix, '(' ) . '('; |
| 253 | 234 | $new_color = $prefix . $new_color . ')'; |
| 235 | + | |
| 254 | 236 | $color_val = $new_color; |
| 255 | 237 | } |
| 256 | 238 | |
| 257 | 239 | /** |
| @@ -257,9 +239,8 @@ | ||
| 257 | 239 | /** |
| 258 | 240 | * @since 5.0.13 |
| 259 | 241 | * |
| 260 | 242 | * @param array $settings |
| 261 | - * | |
| 262 | 243 | * @return array |
| 263 | 244 | */ |
| 264 | 245 | public function sanitize_post_content( $settings ) { |
| 265 | 246 | $defaults = $this->get_defaults(); |
| @@ -264,17 +245,19 @@ | ||
| 264 | 245 | public function sanitize_post_content( $settings ) { |
| 265 | 246 | $defaults = $this->get_defaults(); |
| 266 | 247 | $valid_keys = array_keys( $defaults ); |
| 267 | 248 | $sanitized_settings = array(); |
| 268 | - | |
| 269 | 249 | foreach ( $valid_keys as $key ) { |
| 270 | - $sanitized_settings[ $key ] = isset( $settings[ $key ] ) ? sanitize_textarea_field( $settings[ $key ] ) : $defaults[ $key ]; | |
| 250 | + if ( isset( $settings[ $key ] ) ) { | |
| 251 | + $sanitized_settings[ $key ] = sanitize_textarea_field( $settings[ $key ] ); | |
| 252 | + } else { | |
| 253 | + $sanitized_settings[ $key ] = $defaults[ $key ]; | |
| 254 | + } | |
| 271 | 255 | |
| 272 | - if ( 'custom_css' !== $key && 'single_style_custom_css' !== $key ) { | |
| 256 | + if ( 'custom_css' !== $key ) { | |
| 273 | 257 | $sanitized_settings[ $key ] = $this->strip_invalid_characters( $sanitized_settings[ $key ] ); |
| 274 | 258 | } |
| 275 | 259 | } |
| 276 | - | |
| 277 | 260 | return $sanitized_settings; |
| 278 | 261 | } |
| 279 | 262 | |
| 280 | 263 | /** |
| @@ -282,9 +265,8 @@ | ||
| 282 | 265 | * |
| 283 | 266 | * @since 6.2.3 |
| 284 | 267 | * |
| 285 | 268 | * @param string $setting |
| 286 | - * | |
| 287 | 269 | * @return string |
| 288 | 270 | */ |
| 289 | 271 | private function strip_invalid_characters( $setting ) { |
| 290 | 272 | $characters_to_remove = array( '{', '}', ';', '[', ']' ); |
| @@ -289,9 +271,9 @@ | ||
| 289 | 271 | private function strip_invalid_characters( $setting ) { |
| 290 | 272 | $characters_to_remove = array( '{', '}', ';', '[', ']' ); |
| 291 | 273 | |
| 292 | 274 | // RGB is handled instead in self::maybe_sanitize_rgba_value. |
| 293 | - if ( ! str_starts_with( $setting, 'rgb' ) ) { | |
| 275 | + if ( 0 !== strpos( $setting, 'rgb' ) ) { | |
| 294 | 276 | $setting = $this->maybe_fix_braces( $setting, $characters_to_remove ); |
| 295 | 277 | } |
| 296 | 278 | |
| 297 | 279 | return str_replace( $characters_to_remove, '', $setting ); |
| @@ -301,9 +283,8 @@ | ||
| 301 | 283 | * @since 6.2.3 |
| 302 | 284 | * |
| 303 | 285 | * @param string $setting |
| 304 | 286 | * @param array $characters_to_remove |
| 305 | - * | |
| 306 | 287 | * @return string |
| 307 | 288 | */ |
| 308 | 289 | private function maybe_fix_braces( $setting, &$characters_to_remove ) { |
| 309 | 290 | $number_of_opening_braces = substr_count( $setting, '(' ); |
| @@ -325,28 +306,23 @@ | ||
| 325 | 306 | /** |
| 326 | 307 | * @since 6.2.3 |
| 327 | 308 | * |
| 328 | 309 | * @param string $input |
| 329 | - * | |
| 330 | 310 | * @return string |
| 331 | 311 | */ |
| 332 | 312 | private function trim_braces( $input ) { |
| 333 | 313 | $output = $input; |
| 334 | - | |
| 335 | 314 | // Remove any ( from the start of the string as no CSS values expect at the first character. |
| 336 | 315 | if ( $output && in_array( $output[0], array( '(', ')' ), true ) ) { |
| 337 | 316 | $output = ltrim( $output, '()' ); |
| 338 | 317 | } |
| 339 | - | |
| 340 | 318 | // Remove extra braces from the end. |
| 341 | 319 | if ( in_array( substr( $output, -1 ), array( '(', ')' ), true ) ) { |
| 342 | 320 | $output = rtrim( $output, '()' ); |
| 343 | - | |
| 344 | - if ( str_contains( $output, '(' ) ) { | |
| 321 | + if ( false !== strpos( $output, '(' ) ) { | |
| 345 | 322 | $output .= ')'; |
| 346 | 323 | } |
| 347 | 324 | } |
| 348 | - | |
| 349 | 325 | return $output; |
| 350 | 326 | } |
| 351 | 327 | |
| 352 | 328 | /** |
| @@ -352,13 +328,12 @@ | ||
| 352 | 328 | /** |
| 353 | 329 | * @since 6.2.3 |
| 354 | 330 | * |
| 355 | 331 | * @param string $setting |
| 356 | - * | |
| 357 | 332 | * @return bool |
| 358 | 333 | */ |
| 359 | 334 | private function should_remove_every_brace( $setting ) { |
| 360 | - if ( str_starts_with( trim( $setting, '()' ), 'calc' ) ) { | |
| 335 | + if ( 0 === strpos( trim( $setting, '()' ), 'calc' ) ) { | |
| 361 | 336 | // Support calc() sizes. We do not want to remove all braces when calc is used. |
| 362 | 337 | return false; |
| 363 | 338 | } |
| 364 | 339 | |
| @@ -363,9 +338,8 @@ | ||
| 363 | 338 | } |
| 364 | 339 | |
| 365 | 340 | // Matches hex values but also checks for unexpected ( and ). |
| 366 | 341 | $looks_like_a_hex_value = preg_match( '/^(?:\()?(?!#?[a-fA-F0-9]*[^\(#\)\da-fA-F])[a-fA-F0-9\(\)]*(?:\))?$/', $setting ); |
| 367 | - | |
| 368 | 342 | if ( $looks_like_a_hex_value ) { |
| 369 | 343 | return true; |
| 370 | 344 | } |
| 371 | 345 | |
| @@ -371,9 +345,13 @@ | ||
| 371 | 345 | |
| 372 | 346 | // Matches size values but also checks for unexpected ( and ). |
| 373 | 347 | // This is case insensitive so it will catch PX, PT, etc, as well. |
| 374 | 348 | $looks_like_a_size = preg_match( '/\(?[+-]?\d*\.?\d+(?:px|%|em|rem|ex|pt|pc|mm|cm|in)\)?/i', $setting ); |
| 375 | - return (bool) $looks_like_a_size; | |
| 349 | + if ( $looks_like_a_size ) { | |
| 350 | + return true; | |
| 351 | + } | |
| 352 | + | |
| 353 | + return false; | |
| 376 | 354 | } |
| 377 | 355 | |
| 378 | 356 | /** |
| 379 | 357 | * @since 3.01.01 |
| @@ -378,17 +356,13 @@ | ||
| 378 | 356 | /** |
| 379 | 357 | * @since 3.01.01 |
| 380 | 358 | * |
| 381 | 359 | * @param string $setting |
| 382 | - * | |
| 383 | 360 | * @return bool |
| 384 | 361 | */ |
| 385 | 362 | private function is_color( $setting ) { |
| 386 | - if ( str_contains( $setting, 'color' ) ) { | |
| 387 | - return true; | |
| 388 | - } | |
| 389 | - | |
| 390 | - return in_array( $setting, array( 'error_bg', 'error_border', 'error_text' ), true ); | |
| 363 | + $extra_colors = array( 'error_bg', 'error_border', 'error_text' ); | |
| 364 | + return strpos( $setting, 'color' ) !== false || in_array( $setting, $extra_colors, true ); | |
| 391 | 365 | } |
| 392 | 366 | |
| 393 | 367 | /** |
| 394 | 368 | * @since 3.01.01 |
| @@ -395,9 +369,11 @@ | ||
| 395 | 369 | * |
| 396 | 370 | * @return array |
| 397 | 371 | */ |
| 398 | 372 | public function get_color_settings() { |
| 399 | - $settings = array_keys( $this->get_defaults() ); | |
| 373 | + $defaults = $this->get_defaults(); | |
| 374 | + $settings = array_keys( $defaults ); | |
| 375 | + | |
| 400 | 376 | return array_filter( $settings, array( $this, 'is_color' ) ); |
| 401 | 377 | } |
| 402 | 378 | |
| 403 | 379 | /** |
| @@ -415,95 +391,34 @@ | ||
| 415 | 391 | |
| 416 | 392 | $this->clear_cache(); |
| 417 | 393 | |
| 418 | 394 | $css = $this->get_css_content( $filename ); |
| 419 | - $create_file = new FrmCreateFile( self::get_create_style_file_args() ); | |
| 395 | + $create_file = new FrmCreateFile( | |
| 396 | + array( | |
| 397 | + 'file_name' => FrmStylesController::get_file_name(), | |
| 398 | + 'new_file_path' => FrmAppHelper::plugin_path() . '/css', | |
| 399 | + ) | |
| 400 | + ); | |
| 420 | 401 | $create_file->create_file( $css ); |
| 421 | 402 | |
| 422 | - update_option( 'frmpro_css', $css, false ); | |
| 403 | + update_option( 'frmpro_css', $css, 'no' ); | |
| 423 | 404 | set_transient( 'frmpro_css', $css, MONTH_IN_SECONDS ); |
| 424 | 405 | } |
| 425 | 406 | |
| 426 | 407 | /** |
| 427 | - * @since 6.32 | |
| 428 | - * | |
| 429 | - * @return array | |
| 430 | - */ | |
| 431 | - private static function get_create_style_file_args() { | |
| 432 | - $add_css_to_uploads_dir = self::add_css_to_uploads_dir(); | |
| 433 | - $create_file_args = array( | |
| 434 | - 'file_name' => FrmStylesController::get_file_name(), | |
| 435 | - 'new_file_path' => self::get_generated_css_file_path( $add_css_to_uploads_dir ), | |
| 436 | - ); | |
| 437 | - | |
| 438 | - if ( $add_css_to_uploads_dir ) { | |
| 439 | - $create_file_args['folder_name'] = 'formidable/css'; | |
| 440 | - } | |
| 441 | - | |
| 442 | - return $create_file_args; | |
| 443 | - } | |
| 444 | - | |
| 445 | - /** | |
| 446 | - * @since 6.32 | |
| 447 | - * | |
| 448 | - * @param bool $add_css_to_uploads_dir | |
| 449 | - * | |
| 450 | - * @return string | |
| 451 | - */ | |
| 452 | - public static function get_generated_css_file_path( $add_css_to_uploads_dir ) { | |
| 453 | - if ( $add_css_to_uploads_dir ) { | |
| 454 | - return self::target_css_uploads_dir(); | |
| 455 | - } | |
| 456 | - return self::target_css_plugin_dir(); | |
| 457 | - } | |
| 458 | - | |
| 459 | - /** | |
| 460 | - * Returns true if generated css file should be saved in the uploads directory. | |
| 461 | - * | |
| 462 | - * @since 6.32 | |
| 463 | - * | |
| 464 | - * @return bool | |
| 465 | - */ | |
| 466 | - public static function add_css_to_uploads_dir() { | |
| 467 | - /** | |
| 468 | - * @since 6.32 | |
| 469 | - * | |
| 470 | - * @param bool $add_css_to_uploads_dir | |
| 471 | - */ | |
| 472 | - return apply_filters( 'frm_add_css_to_uploads_dir', ! wp_is_file_mod_allowed( 'frm_save_css_to_plugin_folder' ) ); | |
| 473 | - } | |
| 474 | - | |
| 475 | - /** | |
| 476 | - * @since 6.32 | |
| 477 | - * | |
| 478 | - * @return string | |
| 479 | - */ | |
| 480 | - private static function target_css_uploads_dir() { | |
| 481 | - return wp_upload_dir()['basedir'] . '/formidable/css'; | |
| 482 | - } | |
| 483 | - | |
| 484 | - /** | |
| 485 | - * @since 6.32 | |
| 486 | - * | |
| 487 | - * @return string | |
| 488 | - */ | |
| 489 | - private static function target_css_plugin_dir() { | |
| 490 | - return FrmAppHelper::plugin_path() . '/css'; | |
| 491 | - } | |
| 492 | - | |
| 493 | - /** | |
| 494 | 408 | * @param string $filename |
| 495 | - * | |
| 496 | 409 | * @return string |
| 497 | 410 | */ |
| 498 | 411 | private function get_css_content( $filename ) { |
| 499 | - $css = '/* ' . __( 'WARNING: Any changes made to this file will be lost when your Formidable settings are updated', 'formidable' ) . ' */' . "\n"; | |
| 412 | + $css = '/* ' . __( 'WARNING: Any changes made to this file will be lost when your Formidable settings are updated', 'formidable' ) . ' */' . "\n"; | |
| 413 | + | |
| 500 | 414 | $saving = true; |
| 501 | 415 | $frm_style = $this; |
| 502 | 416 | |
| 503 | 417 | ob_start(); |
| 504 | 418 | include $filename; |
| 505 | - $css .= preg_replace( '/\/\*(.|\s)*?\*\//', '', str_replace( array( "\r\n", "\r", "\n", "\t", ' ' ), '', ob_get_clean() ) ); | |
| 419 | + $css .= preg_replace( '/\/\*(.|\s)*?\*\//', '', str_replace( array( "\r\n", "\r", "\n", "\t", ' ' ), '', ob_get_contents() ) ); | |
| 420 | + ob_end_clean(); | |
| 506 | 421 | |
| 507 | 422 | return FrmStylesController::replace_relative_url( $css ); |
| 508 | 423 | } |
| 509 | 424 | |
| @@ -527,9 +442,8 @@ | ||
| 527 | 442 | /** |
| 528 | 443 | * Delete a style by its post ID. |
| 529 | 444 | * |
| 530 | 445 | * @param int $id |
| 531 | - * | |
| 532 | 446 | * @return false|WP_Post|null |
| 533 | 447 | */ |
| 534 | 448 | public function destroy( $id ) { |
| 535 | 449 | if ( $id === $this->get_default_style()->ID ) { |
| @@ -543,11 +457,14 @@ | ||
| 543 | 457 | */ |
| 544 | 458 | public function get_one() { |
| 545 | 459 | if ( 'default' === $this->id ) { |
| 546 | 460 | $style = $this->get_default_style(); |
| 461 | + if ( $style ) { | |
| 462 | + $this->id = $style->ID; | |
| 463 | + } else { | |
| 464 | + $this->id = 0; | |
| 465 | + } | |
| 547 | 466 | |
| 548 | - $this->id = $style ? $style->ID : 0; | |
| 549 | - | |
| 550 | 467 | return $style; |
| 551 | 468 | } |
| 552 | 469 | |
| 553 | 470 | $style = get_post( $this->id ); |
| @@ -559,9 +476,9 @@ | ||
| 559 | 476 | $style->post_content = FrmAppHelper::maybe_json_decode( $style->post_content ); |
| 560 | 477 | |
| 561 | 478 | $default_values = $this->get_defaults(); |
| 562 | 479 | |
| 563 | - // Fill default values | |
| 480 | + // fill default values | |
| 564 | 481 | $style->post_content = $this->override_defaults( $style->post_content ); |
| 565 | 482 | $style->post_content = wp_parse_args( $style->post_content, $default_values ); |
| 566 | 483 | |
| 567 | 484 | return $style; |
| @@ -570,9 +487,8 @@ | ||
| 570 | 487 | /** |
| 571 | 488 | * @param string $orderby |
| 572 | 489 | * @param string $order |
| 573 | 490 | * @param int $limit |
| 574 | - * | |
| 575 | 491 | * @return array |
| 576 | 492 | */ |
| 577 | 493 | public function get_all( $orderby = 'title', $order = 'ASC', $limit = 99 ) { |
| 578 | 494 | $post_atts = array( |
| @@ -584,16 +500,16 @@ | ||
| 584 | 500 | ); |
| 585 | 501 | |
| 586 | 502 | $temp_styles = FrmDb::check_cache( json_encode( $post_atts ), 'frm_styles', $post_atts, 'get_posts' ); |
| 587 | 503 | |
| 588 | - if ( ! $temp_styles ) { | |
| 504 | + if ( empty( $temp_styles ) ) { | |
| 589 | 505 | global $wpdb; |
| 590 | - // Make sure there wasn't a conflict with the query | |
| 591 | - $query = $wpdb->prepare( 'SELECT * FROM ' . $wpdb->posts . ' WHERE post_type=%s AND post_status=%s ORDER BY post_title ASC LIMIT 99', FrmStylesController::$post_type, 'publish' ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 506 | + // make sure there wasn't a conflict with the query | |
| 507 | + $query = $wpdb->prepare( 'SELECT * FROM ' . $wpdb->posts . ' WHERE post_type=%s AND post_status=%s ORDER BY post_title ASC LIMIT 99', FrmStylesController::$post_type, 'publish' ); | |
| 592 | 508 | $temp_styles = FrmDb::check_cache( 'frm_backup_style_check', 'frm_styles', $query, 'get_results' ); |
| 593 | 509 | |
| 594 | - if ( ! $temp_styles ) { | |
| 595 | - // Create a new style if there are none | |
| 510 | + if ( empty( $temp_styles ) ) { | |
| 511 | + // create a new style if there are none | |
| 596 | 512 | $new = $this->get_new(); |
| 597 | 513 | $new->post_title = __( 'Formidable Style', 'formidable' ); |
| 598 | 514 | $new->post_name = $new->post_title; |
| 599 | 515 | $new->menu_order = 1; |
| @@ -600,25 +516,25 @@ | ||
| 600 | 516 | $new = $this->save( (array) $new ); |
| 601 | 517 | $this->update( 'default' ); |
| 602 | 518 | |
| 603 | 519 | $post_atts['include'] = $new; |
| 604 | - $temp_styles = get_posts( $post_atts ); | |
| 520 | + | |
| 521 | + $temp_styles = get_posts( $post_atts ); | |
| 605 | 522 | } |
| 606 | 523 | } |
| 607 | 524 | |
| 608 | 525 | $default_values = $this->get_defaults(); |
| 609 | 526 | $default_style = false; |
| 610 | - $styles = array(); | |
| 611 | 527 | |
| 528 | + $styles = array(); | |
| 612 | 529 | foreach ( $temp_styles as $style ) { |
| 613 | 530 | $this->id = $style->ID; |
| 614 | - | |
| 615 | 531 | if ( $style->menu_order ) { |
| 616 | 532 | if ( $default_style ) { |
| 617 | - // Only return one default | |
| 533 | + // only return one default | |
| 618 | 534 | $style->menu_order = 0; |
| 619 | 535 | } else { |
| 620 | - // Check for a default style | |
| 536 | + // check for a default style | |
| 621 | 537 | $default_style = $style->ID; |
| 622 | 538 | } |
| 623 | 539 | } |
| 624 | 540 | |
| @@ -623,17 +539,18 @@ | ||
| 623 | 539 | } |
| 624 | 540 | |
| 625 | 541 | $style->post_content = FrmAppHelper::maybe_json_decode( $style->post_content ); |
| 626 | 542 | |
| 627 | - // Fill default values | |
| 543 | + // fill default values | |
| 628 | 544 | $style->post_content = $this->override_defaults( $style->post_content ); |
| 629 | 545 | $style->post_content = wp_parse_args( $style->post_content, $default_values ); |
| 630 | 546 | |
| 631 | 547 | $styles[ $style->ID ] = $style; |
| 632 | - }//end foreach | |
| 548 | + } | |
| 633 | 549 | |
| 634 | 550 | if ( ! $default_style ) { |
| 635 | - $default_style = reset( $styles ); | |
| 551 | + $default_style = reset( $styles ); | |
| 552 | + | |
| 636 | 553 | $styles[ $default_style->ID ]->menu_order = 1; |
| 637 | 554 | } |
| 638 | 555 | |
| 639 | 556 | return $styles; |
| @@ -640,10 +557,8 @@ | ||
| 640 | 557 | } |
| 641 | 558 | |
| 642 | 559 | /** |
| 643 | 560 | * @param array|null $styles |
| 644 | - * | |
| 645 | - * @return object|null | |
| 646 | 561 | */ |
| 647 | 562 | public function get_default_style( $styles = null ) { |
| 648 | 563 | if ( ! isset( $styles ) ) { |
| 649 | 564 | $styles = $this->get_all( 'menu_order', 'DESC', 1 ); |
| @@ -653,15 +568,12 @@ | ||
| 653 | 568 | if ( $style->menu_order ) { |
| 654 | 569 | return $style; |
| 655 | 570 | } |
| 656 | 571 | } |
| 657 | - | |
| 658 | - return null; | |
| 659 | 572 | } |
| 660 | 573 | |
| 661 | 574 | /** |
| 662 | 575 | * @param mixed $settings |
| 663 | - * | |
| 664 | 576 | * @return mixed |
| 665 | 577 | */ |
| 666 | 578 | public function override_defaults( $settings ) { |
| 667 | 579 | if ( ! is_array( $settings ) ) { |
| @@ -667,9 +579,9 @@ | ||
| 667 | 579 | if ( ! is_array( $settings ) ) { |
| 668 | 580 | return $settings; |
| 669 | 581 | } |
| 670 | 582 | |
| 671 | - $settings['line_height'] = ! isset( $settings['field_height'] ) || $settings['field_height'] == '' || $settings['field_height'] === 'auto' ? 'normal' : $settings['field_height']; // phpcs:ignore Universal.Operators.StrictComparisons, SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 583 | + $settings['line_height'] = ! isset( $settings['field_height'] ) || $settings['field_height'] == '' || $settings['field_height'] === 'auto' ? 'normal' : $settings['field_height']; | |
| 672 | 584 | |
| 673 | 585 | if ( ! isset( $settings['form_desc_size'] ) && isset( $settings['description_font_size'] ) ) { |
| 674 | 586 | $settings['form_desc_size'] = $settings['description_font_size']; |
| 675 | 587 | $settings['form_desc_color'] = $settings['description_color']; |
| @@ -681,28 +593,14 @@ | ||
| 681 | 593 | $settings['section_border_color'] = $settings['border_color']; |
| 682 | 594 | } |
| 683 | 595 | |
| 684 | 596 | if ( ! isset( $settings['submit_hover_bg_color'] ) && isset( $settings['submit_bg_color'] ) ) { |
| 685 | - $settings['submit_hover_bg_color'] = $settings['submit_bg_color']; | |
| 686 | - } | |
| 687 | - | |
| 688 | - if ( ! isset( $settings['submit_hover_color'] ) && isset( $settings['submit_text_color'] ) ) { | |
| 689 | - $settings['submit_hover_color'] = $settings['submit_text_color']; | |
| 690 | - } | |
| 691 | - | |
| 692 | - if ( ! isset( $settings['submit_hover_border_color'] ) && isset( $settings['submit_border_color'] ) ) { | |
| 597 | + $settings['submit_hover_bg_color'] = $settings['submit_bg_color']; | |
| 598 | + $settings['submit_hover_color'] = $settings['submit_text_color']; | |
| 693 | 599 | $settings['submit_hover_border_color'] = $settings['submit_border_color']; |
| 694 | - } | |
| 695 | 600 | |
| 696 | - if ( ! isset( $settings['submit_active_bg_color'] ) && isset( $settings['submit_bg_color'] ) ) { | |
| 697 | - $settings['submit_active_bg_color'] = $settings['submit_bg_color']; | |
| 698 | - } | |
| 699 | - | |
| 700 | - if ( ! isset( $settings['submit_active_color'] ) && isset( $settings['submit_text_color'] ) ) { | |
| 701 | - $settings['submit_active_color'] = $settings['submit_text_color']; | |
| 702 | - } | |
| 703 | - | |
| 704 | - if ( ! isset( $settings['submit_active_border_color'] ) && isset( $settings['submit_border_color'] ) ) { | |
| 601 | + $settings['submit_active_bg_color'] = $settings['submit_bg_color']; | |
| 602 | + $settings['submit_active_color'] = $settings['submit_text_color']; | |
| 705 | 603 | $settings['submit_active_border_color'] = $settings['submit_border_color']; |
| 706 | 604 | } |
| 707 | 605 | |
| 708 | 606 | return apply_filters( 'frm_override_default_styles', $settings ); |
| @@ -848,11 +746,8 @@ | ||
| 848 | 746 | 'custom_css' => '', |
| 849 | 747 | 'use_base_font_size' => false, |
| 850 | 748 | 'base_font_size' => '15px', |
| 851 | 749 | 'field_shape_type' => 'rounded-corner', |
| 852 | - | |
| 853 | - 'enable_style_custom_css' => false, | |
| 854 | - 'single_style_custom_css' => '', | |
| 855 | 750 | ); |
| 856 | 751 | |
| 857 | 752 | return apply_filters( 'frm_default_style_settings', $defaults ); |
| 858 | 753 | } |
| @@ -861,13 +756,12 @@ | ||
| 861 | 756 | * Get a name attribute value for a style setting input. |
| 862 | 757 | * |
| 863 | 758 | * @param string $field_name |
| 864 | 759 | * @param string $post_field |
| 865 | - * | |
| 866 | 760 | * @return string |
| 867 | 761 | */ |
| 868 | 762 | public function get_field_name( $field_name, $post_field = 'post_content' ) { |
| 869 | - return 'frm_style_setting' . ( $post_field ? '[' . $post_field . ']' : '' ) . '[' . $field_name . ']'; | |
| 763 | + return 'frm_style_setting' . ( empty( $post_field ) ? '' : '[' . $post_field . ']' ) . '[' . $field_name . ']'; | |
| 870 | 764 | } |
| 871 | 765 | |
| 872 | 766 | /** |
| 873 | 767 | * @return array |
| @@ -889,17 +783,15 @@ | ||
| 889 | 783 | /** |
| 890 | 784 | * Don't let imbalanced font families ruin the whole stylesheet. |
| 891 | 785 | * |
| 892 | 786 | * @param string $value |
| 893 | - * | |
| 894 | 787 | * @return string |
| 895 | 788 | */ |
| 896 | 789 | public function force_balanced_quotation( $value ) { |
| 897 | 790 | $balanced_characters = array( '"', "'" ); |
| 898 | - | |
| 899 | 791 | foreach ( $balanced_characters as $char ) { |
| 900 | 792 | $char_count = substr_count( $value, $char ); |
| 901 | - $is_balanced = $char_count % 2 === 0; | |
| 793 | + $is_balanced = $char_count % 2 == 0; | |
| 902 | 794 | |
| 903 | 795 | if ( $is_balanced ) { |
| 904 | 796 | continue; |
| 905 | 797 | } |
| @@ -909,9 +801,8 @@ | ||
| 909 | 801 | } else { |
| 910 | 802 | $value .= $char; |
| 911 | 803 | } |
| 912 | 804 | } |
| 913 | - | |
| 914 | 805 | return $value; |
| 915 | 806 | } |
| 916 | 807 | |
| 917 | 808 | /** |
| @@ -917,19 +808,16 @@ | ||
| 917 | 808 | /** |
| 918 | 809 | * Get the default template style |
| 919 | 810 | * |
| 920 | 811 | * @since 6.14 |
| 812 | + * @param int $style_id The post type "frm_styles" ID. | |
| 921 | 813 | * |
| 922 | - * @param int|string $style_id The post type "frm_styles" ID. | |
| 923 | - * | |
| 924 | 814 | * @return string The json encoded template data |
| 925 | 815 | */ |
| 926 | 816 | public function get_default_template_style( $style_id ) { |
| 927 | 817 | $default_template = get_post_meta( (int) $style_id, $this->default_template_style_meta_name, true ); |
| 928 | - | |
| 929 | - if ( ! $default_template ) { | |
| 818 | + if ( empty( $default_template ) ) { | |
| 930 | 819 | return FrmAppHelper::prepare_and_encode( $this->get_defaults() ); |
| 931 | 820 | } |
| 932 | - | |
| 933 | 821 | return $default_template; |
| 934 | 822 | } |
| 935 | 823 | } |
