| @@ -3,35 +3,14 @@ | ||
| 3 | 3 | die( 'You are not allowed to call this page directly.' ); |
| 4 | 4 | } |
| 5 | 5 | |
| 6 | 6 | class FrmStyle { |
| 7 | + public $number = false; // Unique ID number of the current instance. | |
| 8 | + public $id = 0; // the id of the post | |
| 7 | 9 | |
| 8 | 10 | /** |
| 9 | - * The meta name of default template style. | |
| 10 | - * | |
| 11 | - * @since 6.14 | |
| 12 | - * | |
| 13 | - * @var string | |
| 11 | + * @param int|string $id The id of the stylsheet or 'default' | |
| 14 | 12 | */ |
| 15 | - private $default_template_style_meta_name = 'frm_style_default'; | |
| 16 | - | |
| 17 | - /** | |
| 18 | - * Unique ID number of the current instance. | |
| 19 | - * | |
| 20 | - * @var int | |
| 21 | - */ | |
| 22 | - public $number = false; | |
| 23 | - | |
| 24 | - /** | |
| 25 | - * The id of the post. | |
| 26 | - * | |
| 27 | - * @var int|string | |
| 28 | - */ | |
| 29 | - public $id = 0; | |
| 30 | - | |
| 31 | - /** | |
| 32 | - * @param int|string $id The id of the stylesheet or 'default'. | |
| 33 | - */ | |
| 34 | 13 | public function __construct( $id = 0 ) { |
| 35 | 14 | $this->id = $id; |
| 36 | 15 | } |
| 37 | 16 | |
| @@ -41,11 +20,10 @@ | ||
| 41 | 20 | public function get_new() { |
| 42 | 21 | $this->id = 0; |
| 43 | 22 | |
| 44 | 23 | $max_slug_value = 2147483647; |
| 45 | - // We want to have at least 2 characters in the slug. | |
| 46 | - $min_slug_value = 37; | |
| 47 | - $key = base_convert( random_int( $min_slug_value, $max_slug_value ), 10, 36 ); | |
| 24 | + $min_slug_value = 37; // we want to have at least 2 characters in the slug | |
| 25 | + $key = base_convert( rand( $min_slug_value, $max_slug_value ), 10, 36 ); | |
| 48 | 26 | |
| 49 | 27 | $style = array( |
| 50 | 28 | 'post_type' => FrmStylesController::$post_type, |
| 51 | 29 | 'ID' => '', |
| @@ -60,9 +38,8 @@ | ||
| 60 | 38 | } |
| 61 | 39 | |
| 62 | 40 | /** |
| 63 | 41 | * @param array $settings |
| 64 | - * | |
| 65 | 42 | * @return int|WP_Error |
| 66 | 43 | */ |
| 67 | 44 | public function save( $settings ) { |
| 68 | 45 | return FrmDb::save_settings( $settings, 'frm_styles' ); |
| @@ -67,13 +44,8 @@ | ||
| 67 | 44 | public function save( $settings ) { |
| 68 | 45 | return FrmDb::save_settings( $settings, 'frm_styles' ); |
| 69 | 46 | } |
| 70 | 47 | |
| 71 | - /** | |
| 72 | - * @param int|string $id The id of the stylesheet or 'default'. | |
| 73 | - * | |
| 74 | - * @return void | |
| 75 | - */ | |
| 76 | 48 | public function duplicate( $id ) { |
| 77 | 49 | // Duplicating is a pro feature. This is handled in FrmProStyle::duplicate instead. |
| 78 | 50 | } |
| 79 | 51 | |
| @@ -80,27 +52,25 @@ | ||
| 80 | 52 | /** |
| 81 | 53 | * Handle save actions in the visual styler edit page. |
| 82 | 54 | * |
| 83 | 55 | * @param mixed $id |
| 84 | - * | |
| 85 | 56 | * @return array<int|WP_Error> |
| 86 | 57 | */ |
| 87 | 58 | public function update( $id = 'default' ) { |
| 88 | - $all_instances = $this->get_all(); | |
| 89 | - $css_scope_helper = new FrmCssScopeHelper(); | |
| 59 | + $all_instances = $this->get_all(); | |
| 90 | 60 | |
| 91 | 61 | if ( ! $id ) { |
| 92 | - $all_instances[] = (array) $this->get_new(); | |
| 62 | + $new_style = (array) $this->get_new(); | |
| 63 | + $all_instances[] = $new_style; | |
| 93 | 64 | } |
| 94 | 65 | |
| 95 | 66 | $action_ids = array(); |
| 96 | 67 | |
| 97 | - foreach ( $all_instances as $new_instance ) { | |
| 68 | + foreach ( $all_instances as $number => $new_instance ) { | |
| 98 | 69 | $new_instance = (array) $new_instance; |
| 99 | 70 | $this->id = $new_instance['ID']; |
| 100 | 71 | |
| 101 | - // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons | |
| 102 | - if ( $id != $this->id || ! $_POST || ! isset( $_POST['frm_style_setting'] ) ) { | |
| 72 | + if ( $id != $this->id || ! $_POST || ! isset( $_POST['frm_style_setting'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing | |
| 103 | 73 | // Don't continue if not saving this style. |
| 104 | 74 | continue; |
| 105 | 75 | } |
| 106 | 76 | |
| @@ -105,9 +75,9 @@ | ||
| 105 | 75 | } |
| 106 | 76 | |
| 107 | 77 | // Custom CSS is no longer used from the default style, but it is still checked if the Global Setting is missing. |
| 108 | 78 | // 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'] ?? ''; | |
| 79 | + $custom_css = isset( $new_instance['post_content']['custom_css'] ) ? $new_instance['post_content']['custom_css'] : ''; | |
| 110 | 80 | |
| 111 | 81 | // phpcs:ignore WordPress.Security.NonceVerification.Missing |
| 112 | 82 | if ( ! empty( $_POST['frm_style_setting']['post_title'] ) ) { |
| 113 | 83 | // The nonce check happens in FrmStylesController::save_style before this is called. |
| @@ -114,20 +84,15 @@ | ||
| 114 | 84 | // phpcs:ignore WordPress.Security.NonceVerification.Missing |
| 115 | 85 | $new_instance['post_title'] = sanitize_text_field( wp_unslash( $_POST['frm_style_setting']['post_title'] ) ); |
| 116 | 86 | } |
| 117 | 87 | |
| 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 | |
| 88 | + $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 | 89 | $new_instance['post_content']['custom_css'] = $custom_css; |
| 120 | 90 | unset( $custom_css ); |
| 121 | 91 | |
| 122 | - if ( ! empty( $new_instance['post_content']['single_style_custom_css'] ) ) { | |
| 123 | - $css_scope = 'frm_style_' . $new_instance['post_name']; | |
| 124 | - $new_instance['post_content']['single_style_custom_css'] = $css_scope_helper->nest( $new_instance['post_content']['single_style_custom_css'], $css_scope ); | |
| 125 | - } | |
| 92 | + $new_instance['post_type'] = FrmStylesController::$post_type; | |
| 93 | + $new_instance['post_status'] = 'publish'; | |
| 126 | 94 | |
| 127 | - $new_instance['post_type'] = FrmStylesController::$post_type; | |
| 128 | - $new_instance['post_status'] = 'publish'; | |
| 129 | - | |
| 130 | 95 | if ( ! $id ) { |
| 131 | 96 | $new_instance['post_name'] = $new_instance['post_title']; |
| 132 | 97 | } |
| 133 | 98 | |
| @@ -139,10 +104,9 @@ | ||
| 139 | 104 | } |
| 140 | 105 | |
| 141 | 106 | if ( $this->is_color( $setting ) ) { |
| 142 | 107 | $color_val = $new_instance['post_content'][ $setting ]; |
| 143 | - | |
| 144 | - if ( $color_val !== '' && str_contains( $color_val, 'rgb' ) ) { | |
| 108 | + if ( $color_val !== '' && false !== strpos( $color_val, 'rgb' ) ) { | |
| 145 | 109 | // Maybe sanitize if invalid rgba value is entered. |
| 146 | 110 | $this->maybe_sanitize_rgba_value( $color_val ); |
| 147 | 111 | } |
| 148 | 112 | $new_instance['post_content'][ $setting ] = str_replace( '#', '', $color_val ); |
| @@ -152,11 +116,10 @@ | ||
| 152 | 116 | $new_instance['post_content'][ $setting ] = $this->force_balanced_quotation( $new_instance['post_content'][ $setting ] ); |
| 153 | 117 | } |
| 154 | 118 | } |
| 155 | 119 | |
| 156 | - $new_instance['post_content'] = FrmStylesHelper::update_base_font_size( $new_instance['post_content'], $this->get_defaults() ); | |
| 157 | - $action_ids[] = $this->save( $new_instance ); | |
| 158 | - }//end foreach | |
| 120 | + $action_ids[] = $this->save( $new_instance ); | |
| 121 | + } | |
| 159 | 122 | |
| 160 | 123 | $this->save_settings(); |
| 161 | 124 | |
| 162 | 125 | return $action_ids; |
| @@ -166,22 +129,19 @@ | ||
| 166 | 129 | * Sanitize custom color values and convert it to valid one filling missing values. |
| 167 | 130 | * |
| 168 | 131 | * @since 5.3.2 |
| 169 | 132 | * |
| 170 | - * @param string $color_val The color value, by reference. | |
| 171 | - * | |
| 133 | + * @param string $color_val, The color value, by reference. | |
| 172 | 134 | * @return void |
| 173 | 135 | */ |
| 174 | - private function maybe_sanitize_rgba_value( &$color_val ) { // phpcs:ignore SlevomatCodingStandard.Complexity.Cognitive.ComplexityTooHigh | |
| 136 | + private function maybe_sanitize_rgba_value( &$color_val ) { | |
| 175 | 137 | if ( preg_match( '/(rgb|rgba)\(/', $color_val ) !== 1 ) { |
| 176 | 138 | return; |
| 177 | 139 | } |
| 178 | 140 | |
| 179 | 141 | $color_val = trim( $color_val ); |
| 180 | - // Remove leading braces so (rgba(1,1,1,1) doesn't cause inconsistent braces. | |
| 181 | - $color_val = ltrim( $color_val, '(' ); | |
| 142 | + $color_val = ltrim( $color_val, '(' ); // Remove leading braces so (rgba(1,1,1,1) doesn't cause inconsistent braces. | |
| 182 | 143 | $patterns = array( '/rgba\((\s*\d+\s*,){3}[[0-1]\.]+\)/', '/rgb\((\s*\d+\s*,){2}\s*[\d]+\)/' ); |
| 183 | - | |
| 184 | 144 | foreach ( $patterns as $pattern ) { |
| 185 | 145 | if ( preg_match( $pattern, $color_val ) === 1 ) { |
| 186 | 146 | return; |
| 187 | 147 | } |
| @@ -190,11 +150,10 @@ | ||
| 190 | 150 | // Remove all leading ')' braces, then add one back. This way there's always a single brace. |
| 191 | 151 | $color_val = rtrim( $color_val, ')' ); |
| 192 | 152 | $color_val .= ')'; |
| 193 | 153 | |
| 194 | - $color_rgba = substr( $color_val, strpos( $color_val, '(' ) + 1, strlen( $color_val ) - strpos( $color_val, '(' ) - 2 ); | |
| 195 | - // Remove any excessive braces from the rgba like rgba((. | |
| 196 | - $color_rgba = trim( $color_rgba, '()' ); | |
| 154 | + $color_rgba = substr( $color_val, strpos( $color_val, '(' ) + 1, strlen( $color_val ) - strpos( $color_val, '(' ) - 2 ); | |
| 155 | + $color_rgba = trim( $color_rgba, '()' ); // Remove any excessive braces from the rgba like rgba((. | |
| 197 | 156 | $length_of_color_codes = strpos( $color_val, '(' ); |
| 198 | 157 | $new_color_values = array(); |
| 199 | 158 | |
| 200 | 159 | // replace empty values by 0 or 1 (if alpha position). |
| @@ -201,9 +160,9 @@ | ||
| 201 | 160 | foreach ( explode( ',', $color_rgba ) as $index => $value ) { |
| 202 | 161 | $new_value = null; |
| 203 | 162 | $value_is_empty_string = '' === trim( $value ) || '' === $value; |
| 204 | 163 | |
| 205 | - if ( 3 === $length_of_color_codes || $index !== $length_of_color_codes - 1 ) { | |
| 164 | + if ( 3 === $length_of_color_codes || ( $index !== $length_of_color_codes - 1 ) ) { | |
| 206 | 165 | // Insert a value for r, g, or b. |
| 207 | 166 | if ( $value < 0 ) { |
| 208 | 167 | $new_value = 0; |
| 209 | 168 | } elseif ( $value > 255 ) { |
| @@ -212,9 +171,9 @@ | ||
| 212 | 171 | $new_value = 0; |
| 213 | 172 | } else { |
| 214 | 173 | $new_value = absint( $value ); |
| 215 | 174 | } |
| 216 | - } else { // phpcs:ignore Universal.ControlStructures.DisallowLonelyIf.Found | |
| 175 | + } else { | |
| 217 | 176 | // Insert a value for alpha. |
| 218 | 177 | if ( $value_is_empty_string ) { |
| 219 | 178 | $new_value = 4 === $length_of_color_codes ? 1 : 0; |
| 220 | 179 | } elseif ( $value > 1 || $value < 0 ) { |
| @@ -221,16 +180,15 @@ | ||
| 221 | 180 | $new_value = 1; |
| 222 | 181 | } else { |
| 223 | 182 | $new_value = floatval( $value ); |
| 224 | 183 | } |
| 225 | - }//end if | |
| 184 | + } | |
| 226 | 185 | |
| 227 | - $new_color_values[] = $new_value; | |
| 228 | - }//end foreach | |
| 186 | + $new_color_values[] = null === $new_value ? $value : $new_value; | |
| 187 | + } | |
| 229 | 188 | |
| 230 | 189 | // add more 0s and 1 (if alpha position) if needed. |
| 231 | 190 | $missing_values = $length_of_color_codes - count( $new_color_values ); |
| 232 | - | |
| 233 | 191 | if ( $missing_values > 1 ) { |
| 234 | 192 | $insert_values = array_fill( 0, $missing_values - 1, 0 ); |
| 235 | 193 | $last_value = 4 === $length_of_color_codes ? 1 : 0; |
| 236 | 194 | array_push( $insert_values, $last_value ); |
| @@ -236,9 +194,8 @@ | ||
| 236 | 194 | array_push( $insert_values, $last_value ); |
| 237 | 195 | } elseif ( $missing_values === 1 ) { |
| 238 | 196 | $insert_values = 4 === $length_of_color_codes ? array( 1 ) : array( 0 ); |
| 239 | 197 | } |
| 240 | - | |
| 241 | 198 | if ( ! empty( $insert_values ) ) { |
| 242 | 199 | $new_color_values = array_merge( $new_color_values, $insert_values ); |
| 243 | 200 | } |
| 244 | 201 | |
| @@ -243,19 +200,33 @@ | ||
| 243 | 200 | } |
| 244 | 201 | |
| 245 | 202 | $new_color = implode( ',', $new_color_values ); |
| 246 | 203 | $prefix = substr( $color_val, 0, strpos( $color_val, '(' ) + 1 ); |
| 247 | - // Limit the number of opening braces after rgb/rgba. There should only be one. | |
| 248 | - $prefix = rtrim( $prefix, '(' ) . '('; | |
| 204 | + $prefix = rtrim( $prefix, '(' ) . '('; // Limit the number of opening braces after rgb/rgba. There should only be one. | |
| 249 | 205 | $new_color = $prefix . $new_color . ')'; |
| 206 | + | |
| 250 | 207 | $color_val = $new_color; |
| 251 | 208 | } |
| 252 | 209 | |
| 253 | 210 | /** |
| 211 | + * Unslash everything in post_content but custom_css | |
| 212 | + * | |
| 254 | 213 | * @since 5.0.13 |
| 255 | 214 | * |
| 256 | 215 | * @param array $settings |
| 216 | + * @return array | |
| 217 | + */ | |
| 218 | + private function unslash_post_content( $settings ) { | |
| 219 | + $custom_css = isset( $settings['custom_css'] ) ? $settings['custom_css'] : ''; | |
| 220 | + $settings = wp_unslash( $settings ); | |
| 221 | + $settings['custom_css'] = $custom_css; | |
| 222 | + return $settings; | |
| 223 | + } | |
| 224 | + | |
| 225 | + /** | |
| 226 | + * @since 5.0.13 | |
| 257 | 227 | * |
| 228 | + * @param array $settings | |
| 258 | 229 | * @return array |
| 259 | 230 | */ |
| 260 | 231 | public function sanitize_post_content( $settings ) { |
| 261 | 232 | $defaults = $this->get_defaults(); |
| @@ -260,131 +231,25 @@ | ||
| 260 | 231 | public function sanitize_post_content( $settings ) { |
| 261 | 232 | $defaults = $this->get_defaults(); |
| 262 | 233 | $valid_keys = array_keys( $defaults ); |
| 263 | 234 | $sanitized_settings = array(); |
| 264 | - | |
| 265 | 235 | foreach ( $valid_keys as $key ) { |
| 266 | - $sanitized_settings[ $key ] = isset( $settings[ $key ] ) ? sanitize_textarea_field( $settings[ $key ] ) : $defaults[ $key ]; | |
| 267 | - | |
| 268 | - if ( 'custom_css' !== $key && 'single_style_custom_css' !== $key ) { | |
| 269 | - $sanitized_settings[ $key ] = $this->strip_invalid_characters( $sanitized_settings[ $key ] ); | |
| 236 | + if ( isset( $settings[ $key ] ) ) { | |
| 237 | + $sanitized_settings[ $key ] = sanitize_textarea_field( $settings[ $key ] ); | |
| 238 | + } else { | |
| 239 | + $sanitized_settings[ $key ] = $defaults[ $key ]; | |
| 270 | 240 | } |
| 271 | 241 | } |
| 272 | - | |
| 273 | 242 | return $sanitized_settings; |
| 274 | 243 | } |
| 275 | 244 | |
| 276 | 245 | /** |
| 277 | - * Remove any characters that should not be used in CSS. | |
| 278 | - * | |
| 279 | - * @since 6.2.3 | |
| 280 | - * | |
| 281 | - * @param string $setting | |
| 282 | - * | |
| 283 | - * @return string | |
| 284 | - */ | |
| 285 | - private function strip_invalid_characters( $setting ) { | |
| 286 | - $characters_to_remove = array( '{', '}', ';', '[', ']' ); | |
| 287 | - | |
| 288 | - // RGB is handled instead in self::maybe_sanitize_rgba_value. | |
| 289 | - if ( ! str_starts_with( $setting, 'rgb' ) ) { | |
| 290 | - $setting = $this->maybe_fix_braces( $setting, $characters_to_remove ); | |
| 291 | - } | |
| 292 | - | |
| 293 | - return str_replace( $characters_to_remove, '', $setting ); | |
| 294 | - } | |
| 295 | - | |
| 296 | - /** | |
| 297 | - * @since 6.2.3 | |
| 298 | - * | |
| 299 | - * @param string $setting | |
| 300 | - * @param array $characters_to_remove | |
| 301 | - * | |
| 302 | - * @return string | |
| 303 | - */ | |
| 304 | - private function maybe_fix_braces( $setting, &$characters_to_remove ) { | |
| 305 | - $number_of_opening_braces = substr_count( $setting, '(' ); | |
| 306 | - $number_of_closing_braces = substr_count( $setting, ')' ); | |
| 307 | - | |
| 308 | - if ( $number_of_opening_braces === $number_of_closing_braces ) { | |
| 309 | - return $this->trim_braces( $setting ); | |
| 310 | - } | |
| 311 | - | |
| 312 | - if ( $this->should_remove_every_brace( $setting ) ) { | |
| 313 | - // Add to $characters_to_remove to remove when str_replace is called. | |
| 314 | - array_push( $characters_to_remove, '(', ')' ); | |
| 315 | - return $setting; | |
| 316 | - } | |
| 317 | - | |
| 318 | - return $this->trim_braces( $setting ); | |
| 319 | - } | |
| 320 | - | |
| 321 | - /** | |
| 322 | - * @since 6.2.3 | |
| 323 | - * | |
| 324 | - * @param string $input | |
| 325 | - * | |
| 326 | - * @return string | |
| 327 | - */ | |
| 328 | - private function trim_braces( $input ) { | |
| 329 | - $output = $input; | |
| 330 | - | |
| 331 | - // Remove any ( from the start of the string as no CSS values expect at the first character. | |
| 332 | - if ( $output && in_array( $output[0], array( '(', ')' ), true ) ) { | |
| 333 | - $output = ltrim( $output, '()' ); | |
| 334 | - } | |
| 335 | - | |
| 336 | - // Remove extra braces from the end. | |
| 337 | - if ( in_array( substr( $output, -1 ), array( '(', ')' ), true ) ) { | |
| 338 | - $output = rtrim( $output, '()' ); | |
| 339 | - | |
| 340 | - if ( str_contains( $output, '(' ) ) { | |
| 341 | - $output .= ')'; | |
| 342 | - } | |
| 343 | - } | |
| 344 | - | |
| 345 | - return $output; | |
| 346 | - } | |
| 347 | - | |
| 348 | - /** | |
| 349 | - * @since 6.2.3 | |
| 350 | - * | |
| 351 | - * @param string $setting | |
| 352 | - * | |
| 353 | - * @return bool | |
| 354 | - */ | |
| 355 | - private function should_remove_every_brace( $setting ) { | |
| 356 | - if ( str_starts_with( trim( $setting, '()' ), 'calc' ) ) { | |
| 357 | - // Support calc() sizes. We do not want to remove all braces when calc is used. | |
| 358 | - return false; | |
| 359 | - } | |
| 360 | - | |
| 361 | - // Matches hex values but also checks for unexpected ( and ). | |
| 362 | - $looks_like_a_hex_value = preg_match( '/^(?:\()?(?!#?[a-fA-F0-9]*[^\(#\)\da-fA-F])[a-fA-F0-9\(\)]*(?:\))?$/', $setting ); | |
| 363 | - | |
| 364 | - if ( $looks_like_a_hex_value ) { | |
| 365 | - return true; | |
| 366 | - } | |
| 367 | - | |
| 368 | - // Matches size values but also checks for unexpected ( and ). | |
| 369 | - // This is case insensitive so it will catch PX, PT, etc, as well. | |
| 370 | - $looks_like_a_size = preg_match( '/\(?[+-]?\d*\.?\d+(?:px|%|em|rem|ex|pt|pc|mm|cm|in)\)?/i', $setting ); | |
| 371 | - return (bool) $looks_like_a_size; | |
| 372 | - } | |
| 373 | - | |
| 374 | - /** | |
| 375 | 246 | * @since 3.01.01 |
| 376 | - * | |
| 377 | - * @param string $setting | |
| 378 | - * | |
| 379 | - * @return bool | |
| 380 | 247 | */ |
| 381 | 248 | private function is_color( $setting ) { |
| 382 | - if ( str_contains( $setting, 'color' ) ) { | |
| 383 | - return true; | |
| 384 | - } | |
| 249 | + $extra_colors = array( 'error_bg', 'error_border', 'error_text' ); | |
| 385 | 250 | |
| 386 | - return in_array( $setting, array( 'error_bg', 'error_border', 'error_text' ), true ); | |
| 251 | + return strpos( $setting, 'color' ) !== false || in_array( $setting, $extra_colors ); | |
| 387 | 252 | } |
| 388 | 253 | |
| 389 | 254 | /** |
| 390 | 255 | * @since 3.01.01 |
| @@ -421,25 +286,26 @@ | ||
| 421 | 286 | ) |
| 422 | 287 | ); |
| 423 | 288 | $create_file->create_file( $css ); |
| 424 | 289 | |
| 425 | - update_option( 'frmpro_css', $css, false ); | |
| 290 | + update_option( 'frmpro_css', $css, 'no' ); | |
| 426 | 291 | set_transient( 'frmpro_css', $css, MONTH_IN_SECONDS ); |
| 427 | 292 | } |
| 428 | 293 | |
| 429 | 294 | /** |
| 430 | 295 | * @param string $filename |
| 431 | - * | |
| 432 | 296 | * @return string |
| 433 | 297 | */ |
| 434 | 298 | private function get_css_content( $filename ) { |
| 435 | - $css = '/* ' . __( 'WARNING: Any changes made to this file will be lost when your Formidable settings are updated', 'formidable' ) . ' */' . "\n"; | |
| 299 | + $css = '/* ' . __( 'WARNING: Any changes made to this file will be lost when your Formidable settings are updated', 'formidable' ) . ' */' . "\n"; | |
| 300 | + | |
| 436 | 301 | $saving = true; |
| 437 | 302 | $frm_style = $this; |
| 438 | 303 | |
| 439 | 304 | ob_start(); |
| 440 | 305 | include $filename; |
| 441 | - $css .= preg_replace( '/\/\*(.|\s)*?\*\//', '', str_replace( array( "\r\n", "\r", "\n", "\t", ' ' ), '', ob_get_clean() ) ); | |
| 306 | + $css .= preg_replace( '/\/\*(.|\s)*?\*\//', '', str_replace( array( "\r\n", "\r", "\n", "\t", ' ' ), '', ob_get_contents() ) ); | |
| 307 | + ob_end_clean(); | |
| 442 | 308 | |
| 443 | 309 | return FrmStylesController::replace_relative_url( $css ); |
| 444 | 310 | } |
| 445 | 311 | |
| @@ -463,10 +329,9 @@ | ||
| 463 | 329 | /** |
| 464 | 330 | * Delete a style by its post ID. |
| 465 | 331 | * |
| 466 | 332 | * @param int $id |
| 467 | - * | |
| 468 | - * @return false|WP_Post|null | |
| 333 | + * @return WP_Post|false|null | |
| 469 | 334 | */ |
| 470 | 335 | public function destroy( $id ) { |
| 471 | 336 | if ( $id === $this->get_default_style()->ID ) { |
| 472 | 337 | return false; |
| @@ -474,16 +339,19 @@ | ||
| 474 | 339 | return wp_delete_post( $id ); |
| 475 | 340 | } |
| 476 | 341 | |
| 477 | 342 | /** |
| 478 | - * @return stdClass|WP_Post | |
| 343 | + * @return WP_Post|stdClass | |
| 479 | 344 | */ |
| 480 | 345 | public function get_one() { |
| 481 | 346 | if ( 'default' === $this->id ) { |
| 482 | 347 | $style = $this->get_default_style(); |
| 348 | + if ( $style ) { | |
| 349 | + $this->id = $style->ID; | |
| 350 | + } else { | |
| 351 | + $this->id = 0; | |
| 352 | + } | |
| 483 | 353 | |
| 484 | - $this->id = $style ? $style->ID : 0; | |
| 485 | - | |
| 486 | 354 | return $style; |
| 487 | 355 | } |
| 488 | 356 | |
| 489 | 357 | $style = get_post( $this->id ); |
| @@ -495,9 +363,9 @@ | ||
| 495 | 363 | $style->post_content = FrmAppHelper::maybe_json_decode( $style->post_content ); |
| 496 | 364 | |
| 497 | 365 | $default_values = $this->get_defaults(); |
| 498 | 366 | |
| 499 | - // Fill default values | |
| 367 | + // fill default values | |
| 500 | 368 | $style->post_content = $this->override_defaults( $style->post_content ); |
| 501 | 369 | $style->post_content = wp_parse_args( $style->post_content, $default_values ); |
| 502 | 370 | |
| 503 | 371 | return $style; |
| @@ -506,9 +374,8 @@ | ||
| 506 | 374 | /** |
| 507 | 375 | * @param string $orderby |
| 508 | 376 | * @param string $order |
| 509 | 377 | * @param int $limit |
| 510 | - * | |
| 511 | 378 | * @return array |
| 512 | 379 | */ |
| 513 | 380 | public function get_all( $orderby = 'title', $order = 'ASC', $limit = 99 ) { |
| 514 | 381 | $post_atts = array( |
| @@ -520,16 +387,16 @@ | ||
| 520 | 387 | ); |
| 521 | 388 | |
| 522 | 389 | $temp_styles = FrmDb::check_cache( json_encode( $post_atts ), 'frm_styles', $post_atts, 'get_posts' ); |
| 523 | 390 | |
| 524 | - if ( ! $temp_styles ) { | |
| 391 | + if ( empty( $temp_styles ) ) { | |
| 525 | 392 | global $wpdb; |
| 526 | - // Make sure there wasn't a conflict with the query | |
| 527 | - $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 | |
| 393 | + // make sure there wasn't a conflict with the query | |
| 394 | + $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' ); | |
| 528 | 395 | $temp_styles = FrmDb::check_cache( 'frm_backup_style_check', 'frm_styles', $query, 'get_results' ); |
| 529 | 396 | |
| 530 | - if ( ! $temp_styles ) { | |
| 531 | - // Create a new style if there are none | |
| 397 | + if ( empty( $temp_styles ) ) { | |
| 398 | + // create a new style if there are none | |
| 532 | 399 | $new = $this->get_new(); |
| 533 | 400 | $new->post_title = __( 'Formidable Style', 'formidable' ); |
| 534 | 401 | $new->post_name = $new->post_title; |
| 535 | 402 | $new->menu_order = 1; |
| @@ -536,25 +403,25 @@ | ||
| 536 | 403 | $new = $this->save( (array) $new ); |
| 537 | 404 | $this->update( 'default' ); |
| 538 | 405 | |
| 539 | 406 | $post_atts['include'] = $new; |
| 540 | - $temp_styles = get_posts( $post_atts ); | |
| 407 | + | |
| 408 | + $temp_styles = get_posts( $post_atts ); | |
| 541 | 409 | } |
| 542 | 410 | } |
| 543 | 411 | |
| 544 | 412 | $default_values = $this->get_defaults(); |
| 545 | 413 | $default_style = false; |
| 546 | - $styles = array(); | |
| 547 | 414 | |
| 415 | + $styles = array(); | |
| 548 | 416 | foreach ( $temp_styles as $style ) { |
| 549 | 417 | $this->id = $style->ID; |
| 550 | - | |
| 551 | 418 | if ( $style->menu_order ) { |
| 552 | 419 | if ( $default_style ) { |
| 553 | - // Only return one default | |
| 420 | + // only return one default | |
| 554 | 421 | $style->menu_order = 0; |
| 555 | 422 | } else { |
| 556 | - // Check for a default style | |
| 423 | + // check for a default style | |
| 557 | 424 | $default_style = $style->ID; |
| 558 | 425 | } |
| 559 | 426 | } |
| 560 | 427 | |
| @@ -559,17 +426,18 @@ | ||
| 559 | 426 | } |
| 560 | 427 | |
| 561 | 428 | $style->post_content = FrmAppHelper::maybe_json_decode( $style->post_content ); |
| 562 | 429 | |
| 563 | - // Fill default values | |
| 430 | + // fill default values | |
| 564 | 431 | $style->post_content = $this->override_defaults( $style->post_content ); |
| 565 | 432 | $style->post_content = wp_parse_args( $style->post_content, $default_values ); |
| 566 | 433 | |
| 567 | 434 | $styles[ $style->ID ] = $style; |
| 568 | - }//end foreach | |
| 435 | + } | |
| 569 | 436 | |
| 570 | 437 | if ( ! $default_style ) { |
| 571 | - $default_style = reset( $styles ); | |
| 438 | + $default_style = reset( $styles ); | |
| 439 | + | |
| 572 | 440 | $styles[ $default_style->ID ]->menu_order = 1; |
| 573 | 441 | } |
| 574 | 442 | |
| 575 | 443 | return $styles; |
| @@ -574,13 +442,8 @@ | ||
| 574 | 442 | |
| 575 | 443 | return $styles; |
| 576 | 444 | } |
| 577 | 445 | |
| 578 | - /** | |
| 579 | - * @param array|null $styles | |
| 580 | - * | |
| 581 | - * @return object|null | |
| 582 | - */ | |
| 583 | 446 | public function get_default_style( $styles = null ) { |
| 584 | 447 | if ( ! isset( $styles ) ) { |
| 585 | 448 | $styles = $this->get_all( 'menu_order', 'DESC', 1 ); |
| 586 | 449 | } |
| @@ -589,15 +452,12 @@ | ||
| 589 | 452 | if ( $style->menu_order ) { |
| 590 | 453 | return $style; |
| 591 | 454 | } |
| 592 | 455 | } |
| 593 | - | |
| 594 | - return null; | |
| 595 | 456 | } |
| 596 | 457 | |
| 597 | 458 | /** |
| 598 | 459 | * @param mixed $settings |
| 599 | - * | |
| 600 | 460 | * @return mixed |
| 601 | 461 | */ |
| 602 | 462 | public function override_defaults( $settings ) { |
| 603 | 463 | if ( ! is_array( $settings ) ) { |
| @@ -603,9 +463,9 @@ | ||
| 603 | 463 | if ( ! is_array( $settings ) ) { |
| 604 | 464 | return $settings; |
| 605 | 465 | } |
| 606 | 466 | |
| 607 | - $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 | |
| 467 | + $settings['line_height'] = ( ! isset( $settings['field_height'] ) || $settings['field_height'] == '' || $settings['field_height'] == 'auto' ) ? 'normal' : $settings['field_height']; | |
| 608 | 468 | |
| 609 | 469 | if ( ! isset( $settings['form_desc_size'] ) && isset( $settings['description_font_size'] ) ) { |
| 610 | 470 | $settings['form_desc_size'] = $settings['description_font_size']; |
| 611 | 471 | $settings['form_desc_color'] = $settings['description_color']; |
| @@ -634,147 +494,142 @@ | ||
| 634 | 494 | * @return array |
| 635 | 495 | */ |
| 636 | 496 | public function get_defaults() { |
| 637 | 497 | $defaults = array( |
| 638 | - 'theme_css' => 'ui-lightness', | |
| 639 | - 'theme_name' => 'UI Lightness', | |
| 498 | + 'theme_css' => 'ui-lightness', | |
| 499 | + 'theme_name' => 'UI Lightness', | |
| 640 | 500 | |
| 641 | - 'center_form' => '', | |
| 642 | - 'form_width' => '100%', | |
| 643 | - 'form_align' => 'left', | |
| 644 | - 'direction' => is_rtl() ? 'rtl' : 'ltr', | |
| 645 | - 'fieldset' => '0px', | |
| 646 | - 'fieldset_color' => '000000', | |
| 647 | - 'fieldset_padding' => '0px 0px 15px 0px', | |
| 648 | - 'fieldset_bg_color' => '', | |
| 501 | + 'center_form' => '', | |
| 502 | + 'form_width' => '100%', | |
| 503 | + 'form_align' => 'left', | |
| 504 | + 'direction' => is_rtl() ? 'rtl' : 'ltr', | |
| 505 | + 'fieldset' => '0px', | |
| 506 | + 'fieldset_color' => '000000', | |
| 507 | + 'fieldset_padding' => '0 0 15px 0', | |
| 508 | + 'fieldset_bg_color' => '', | |
| 649 | 509 | |
| 650 | - 'title_size' => '40px', | |
| 651 | - 'title_color' => '444444', | |
| 652 | - 'title_margin_top' => '10px', | |
| 653 | - 'title_margin_bottom' => '60px', | |
| 654 | - 'form_desc_size' => '14px', | |
| 655 | - 'form_desc_color' => '98A2B3', | |
| 656 | - 'form_desc_margin_top' => '10px', | |
| 657 | - 'form_desc_margin_bottom' => '25px', | |
| 658 | - 'form_desc_padding' => '0px', | |
| 510 | + 'title_size' => '40px', | |
| 511 | + 'title_color' => '444444', | |
| 512 | + 'title_margin_top' => '10px', | |
| 513 | + 'title_margin_bottom' => '60px', | |
| 514 | + 'form_desc_size' => '14px', | |
| 515 | + 'form_desc_color' => '666666', | |
| 516 | + 'form_desc_margin_top' => '10px', | |
| 517 | + 'form_desc_margin_bottom' => '25px', | |
| 518 | + 'form_desc_padding' => '0', | |
| 659 | 519 | |
| 660 | - 'font' => '', | |
| 661 | - 'font_size' => '15px', | |
| 662 | - 'label_color' => '344054', | |
| 663 | - 'weight' => 'normal', | |
| 664 | - 'position' => 'none', | |
| 665 | - 'align' => 'left', | |
| 666 | - 'width' => '150px', | |
| 667 | - 'required_color' => 'F04438', | |
| 668 | - 'required_weight' => 'bold', | |
| 669 | - 'label_padding' => '0px 0px 5px 0px', | |
| 520 | + 'font' => '', | |
| 521 | + 'font_size' => '15px', | |
| 522 | + 'label_color' => '3f4b5b', | |
| 523 | + 'weight' => 'normal', | |
| 524 | + 'position' => 'none', | |
| 525 | + 'align' => 'left', | |
| 526 | + 'width' => '150px', | |
| 527 | + 'required_color' => 'B94A48', | |
| 528 | + 'required_weight' => 'bold', | |
| 529 | + 'label_padding' => '0 0 3px 0', | |
| 670 | 530 | |
| 671 | - 'description_font_size' => '12px', | |
| 672 | - 'description_color' => '667085', | |
| 673 | - 'description_weight' => 'normal', | |
| 674 | - 'description_style' => 'normal', | |
| 675 | - 'description_align' => 'left', | |
| 676 | - 'description_margin' => '0px', | |
| 531 | + 'description_font_size' => '12px', | |
| 532 | + 'description_color' => '666666', | |
| 533 | + 'description_weight' => 'normal', | |
| 534 | + 'description_style' => 'normal', | |
| 535 | + 'description_align' => 'left', | |
| 536 | + 'description_margin' => '0', | |
| 677 | 537 | |
| 678 | - 'field_font_size' => '14px', | |
| 679 | - 'field_height' => '36px', | |
| 680 | - 'line_height' => 'normal', | |
| 681 | - 'field_width' => '100%', | |
| 682 | - 'auto_width' => false, | |
| 683 | - 'field_pad' => '8px 12px', | |
| 684 | - 'field_margin' => '20px', | |
| 685 | - 'field_weight' => 'normal', | |
| 686 | - 'text_color' => '1D2939', | |
| 687 | - // 'border_color_hv' => 'cccccc', | |
| 688 | - 'border_color' => 'D0D5DD', | |
| 689 | - 'field_border_width' => '1px', | |
| 690 | - 'field_border_style' => 'solid', | |
| 538 | + 'field_font_size' => '14px', | |
| 539 | + 'field_height' => '32px', | |
| 540 | + 'line_height' => 'normal', | |
| 541 | + 'field_width' => '100%', | |
| 542 | + 'auto_width' => false, | |
| 543 | + 'field_pad' => '6px 10px', | |
| 544 | + 'field_margin' => '20px', | |
| 545 | + 'field_weight' => 'normal', | |
| 546 | + 'text_color' => '555555', | |
| 547 | + //'border_color_hv' => 'cccccc', | |
| 548 | + 'border_color' => 'BFC3C8', | |
| 549 | + 'field_border_width' => '1px', | |
| 550 | + 'field_border_style' => 'solid', | |
| 691 | 551 | |
| 692 | - 'bg_color' => 'ffffff', | |
| 693 | - // 'bg_color_hv' => 'ffffff', | |
| 694 | - 'remove_box_shadow' => '', | |
| 695 | - 'bg_color_active' => 'ffffff', | |
| 696 | - 'border_color_active' => '4199FD', | |
| 697 | - 'remove_box_shadow_active' => '', | |
| 698 | - 'text_color_error' => '444444', | |
| 699 | - 'bg_color_error' => 'ffffff', | |
| 700 | - 'border_color_error' => 'F04438', | |
| 701 | - 'border_width_error' => '1px', | |
| 702 | - 'border_style_error' => 'solid', | |
| 703 | - 'bg_color_disabled' => 'F9FAFB', | |
| 704 | - 'border_color_disabled' => 'D0D5DD', | |
| 705 | - 'text_color_disabled' => '667085', | |
| 552 | + 'bg_color' => 'ffffff', | |
| 553 | + //'bg_color_hv' => 'ffffff', | |
| 554 | + 'remove_box_shadow' => '', | |
| 555 | + 'bg_color_active' => 'ffffff', | |
| 556 | + 'border_color_active' => '66afe9', | |
| 557 | + 'remove_box_shadow_active' => '', | |
| 558 | + 'text_color_error' => '444444', | |
| 559 | + 'bg_color_error' => 'ffffff', | |
| 560 | + 'border_color_error' => 'B94A48', | |
| 561 | + 'border_width_error' => '1px', | |
| 562 | + 'border_style_error' => 'solid', | |
| 563 | + 'bg_color_disabled' => 'ffffff', | |
| 564 | + 'border_color_disabled' => 'E5E5E5', | |
| 565 | + 'text_color_disabled' => 'A1A1A1', | |
| 706 | 566 | |
| 707 | - 'radio_align' => 'block', | |
| 708 | - 'check_align' => 'block', | |
| 709 | - 'check_font_size' => '14px', | |
| 710 | - 'check_label_color' => '1D2939', | |
| 711 | - 'check_weight' => 'normal', | |
| 567 | + 'radio_align' => 'block', | |
| 568 | + 'check_align' => 'block', | |
| 569 | + 'check_font_size' => '13px', | |
| 570 | + 'check_label_color' => '444444', | |
| 571 | + 'check_weight' => 'normal', | |
| 712 | 572 | |
| 713 | - 'section_font_size' => '18px', | |
| 714 | - 'section_color' => '344054', | |
| 715 | - 'section_weight' => 'bold', | |
| 716 | - 'section_pad' => '32px 0px 3px 0px', | |
| 717 | - 'section_mar_top' => '30px', | |
| 718 | - 'section_mar_bottom' => '30px', | |
| 719 | - 'section_bg_color' => '', | |
| 720 | - 'section_border_color' => 'EAECF0', | |
| 721 | - 'section_border_width' => '1px', | |
| 722 | - 'section_border_style' => 'solid', | |
| 723 | - 'section_border_loc' => '-top', | |
| 724 | - 'collapse_icon' => '6', | |
| 725 | - 'collapse_pos' => 'after', | |
| 726 | - 'repeat_icon' => '1', | |
| 727 | - 'repeat_icon_color' => 'ffffff', | |
| 573 | + 'section_font_size' => '18px', | |
| 574 | + 'section_color' => '444444', | |
| 575 | + 'section_weight' => 'bold', | |
| 576 | + 'section_pad' => '15px 0 3px 0', | |
| 577 | + 'section_mar_top' => '15px', | |
| 578 | + 'section_mar_bottom' => '30px', | |
| 579 | + 'section_bg_color' => '', | |
| 580 | + 'section_border_color' => 'e8e8e8', | |
| 581 | + 'section_border_width' => '2px', | |
| 582 | + 'section_border_style' => 'solid', | |
| 583 | + 'section_border_loc' => '-top', | |
| 584 | + 'collapse_icon' => '6', | |
| 585 | + 'collapse_pos' => 'after', | |
| 586 | + 'repeat_icon' => '1', | |
| 587 | + 'repeat_icon_color' => 'ffffff', | |
| 728 | 588 | |
| 729 | 589 | 'submit_style' => false, |
| 730 | - 'submit_font_size' => '14px', | |
| 590 | + 'submit_font_size' => '15px', | |
| 731 | 591 | 'submit_width' => 'auto', |
| 732 | 592 | 'submit_height' => 'auto', |
| 733 | - 'submit_bg_color' => '4199FD', | |
| 734 | - 'submit_border_color' => '4199FD', | |
| 593 | + 'submit_bg_color' => '579AF6', | |
| 594 | + 'submit_border_color' => '579AF6', | |
| 735 | 595 | 'submit_border_width' => '1px', |
| 736 | 596 | 'submit_text_color' => 'ffffff', |
| 737 | 597 | 'submit_weight' => 'normal', |
| 738 | - 'submit_border_radius' => '8px', | |
| 598 | + 'submit_border_radius' => '4px', | |
| 739 | 599 | 'submit_bg_img' => '', |
| 740 | 600 | 'submit_margin' => '10px', |
| 741 | - 'submit_padding' => '8px 16px', | |
| 601 | + 'submit_padding' => '10px 20px', | |
| 742 | 602 | 'submit_shadow_color' => 'eeeeee', |
| 743 | - 'submit_hover_bg_color' => '3680D3', | |
| 744 | - 'submit_hover_color' => 'ffffff', | |
| 745 | - 'submit_hover_border_color' => '3680D3', | |
| 746 | - 'submit_active_bg_color' => '3680D3', | |
| 747 | - 'submit_active_color' => 'ffffff', | |
| 748 | - 'submit_active_border_color' => '3680D3', | |
| 603 | + 'submit_hover_bg_color' => 'efefef', | |
| 604 | + 'submit_hover_color' => '444444', | |
| 605 | + 'submit_hover_border_color' => 'cccccc', | |
| 606 | + 'submit_active_bg_color' => 'efefef', | |
| 607 | + 'submit_active_color' => '444444', | |
| 608 | + 'submit_active_border_color' => 'cccccc', | |
| 749 | 609 | |
| 750 | - 'border_radius' => '8px', | |
| 751 | - 'error_bg' => 'FEE4E2', | |
| 752 | - 'error_border' => 'F5B8AA', | |
| 753 | - 'error_text' => 'F04438', | |
| 754 | - 'error_font_size' => '14px', | |
| 610 | + 'border_radius' => '4px', | |
| 611 | + 'error_bg' => 'F2DEDE', | |
| 612 | + 'error_border' => 'EBCCD1', | |
| 613 | + 'error_text' => 'B94A48', | |
| 614 | + 'error_font_size' => '14px', | |
| 755 | 615 | |
| 756 | - 'success_bg_color' => 'DFF0D8', | |
| 757 | - 'success_border_color' => 'D6E9C6', | |
| 758 | - 'success_text_color' => '468847', | |
| 759 | - 'success_font_size' => '14px', | |
| 616 | + 'success_bg_color' => 'DFF0D8', | |
| 617 | + 'success_border_color' => 'D6E9C6', | |
| 618 | + 'success_text_color' => '468847', | |
| 619 | + 'success_font_size' => '14px', | |
| 760 | 620 | |
| 761 | - 'important_style' => false, | |
| 621 | + 'important_style' => false, | |
| 762 | 622 | |
| 763 | - 'progress_bg_color' => 'EAECF0', | |
| 764 | - 'progress_color' => '1D2939', | |
| 765 | - 'progress_active_bg_color' => '4199FD', | |
| 766 | - 'progress_active_color' => 'ffffff', | |
| 767 | - 'progress_border_color' => 'EAECF0', | |
| 768 | - 'progress_border_size' => '1px', | |
| 769 | - 'progress_size' => '30px', | |
| 770 | - 'custom_css' => '', | |
| 771 | - 'use_base_font_size' => false, | |
| 772 | - 'base_font_size' => '15px', | |
| 773 | - 'field_shape_type' => 'rounded-corner', | |
| 623 | + 'progress_bg_color' => 'eaeaea', | |
| 624 | + 'progress_active_color' => 'ffffff', | |
| 625 | + 'progress_active_bg_color' => '579AF6', | |
| 626 | + 'progress_color' => '3f4b5b', | |
| 627 | + 'progress_border_color' => 'E5E5E5', | |
| 628 | + 'progress_border_size' => '2px', | |
| 629 | + 'progress_size' => '24px', | |
| 774 | 630 | |
| 775 | - 'enable_style_custom_css' => false, | |
| 776 | - 'single_style_custom_css' => '', | |
| 631 | + 'custom_css' => '', | |
| 777 | 632 | ); |
| 778 | 633 | |
| 779 | 634 | return apply_filters( 'frm_default_style_settings', $defaults ); |
| 780 | 635 | } |
| @@ -783,13 +638,12 @@ | ||
| 783 | 638 | * Get a name attribute value for a style setting input. |
| 784 | 639 | * |
| 785 | 640 | * @param string $field_name |
| 786 | 641 | * @param string $post_field |
| 787 | - * | |
| 788 | 642 | * @return string |
| 789 | 643 | */ |
| 790 | 644 | public function get_field_name( $field_name, $post_field = 'post_content' ) { |
| 791 | - return 'frm_style_setting' . ( $post_field ? '[' . $post_field . ']' : '' ) . '[' . $field_name . ']'; | |
| 645 | + return 'frm_style_setting' . ( empty( $post_field ) ? '' : '[' . $post_field . ']' ) . '[' . $field_name . ']'; | |
| 792 | 646 | } |
| 793 | 647 | |
| 794 | 648 | /** |
| 795 | 649 | * @return array |
| @@ -795,63 +649,35 @@ | ||
| 795 | 649 | * @return array |
| 796 | 650 | */ |
| 797 | 651 | public static function get_bold_options() { |
| 798 | 652 | return array( |
| 799 | - 100 => __( 'Thin', 'formidable' ), | |
| 800 | - 200 => __( 'Extra Light', 'formidable' ), | |
| 801 | - 300 => __( 'Light', 'formidable' ), | |
| 802 | - 'normal' => __( 'Regular', 'formidable' ), | |
| 803 | - 500 => __( 'Medium', 'formidable' ), | |
| 804 | - 600 => __( 'Semi Bold', 'formidable' ), | |
| 805 | - 'bold' => __( 'Bold', 'formidable' ), | |
| 806 | - 800 => __( 'Extra Bold', 'formidable' ), | |
| 807 | - 900 => __( 'Black', 'formidable' ), | |
| 653 | + 100 => 100, | |
| 654 | + 200 => 200, | |
| 655 | + 300 => 300, | |
| 656 | + 'normal' => __( 'normal', 'formidable' ), | |
| 657 | + 500 => 500, | |
| 658 | + 600 => 600, | |
| 659 | + 'bold' => __( 'bold', 'formidable' ), | |
| 660 | + 800 => 800, | |
| 661 | + 900 => 900, | |
| 808 | 662 | ); |
| 809 | 663 | } |
| 810 | 664 | |
| 811 | 665 | /** |
| 812 | - * Don't let imbalanced font families ruin the whole stylesheet. | |
| 666 | + * Don't let imbalanced font families ruin the whole stylesheet | |
| 813 | 667 | * |
| 814 | 668 | * @param string $value |
| 815 | - * | |
| 816 | 669 | * @return string |
| 817 | 670 | */ |
| 818 | 671 | public function force_balanced_quotation( $value ) { |
| 819 | 672 | $balanced_characters = array( '"', "'" ); |
| 820 | - | |
| 821 | 673 | foreach ( $balanced_characters as $char ) { |
| 822 | 674 | $char_count = substr_count( $value, $char ); |
| 823 | - $is_balanced = $char_count % 2 === 0; | |
| 824 | - | |
| 825 | - if ( $is_balanced ) { | |
| 826 | - continue; | |
| 827 | - } | |
| 828 | - | |
| 829 | - if ( $value && $char === $value[ strlen( $value ) - 1 ] ) { | |
| 830 | - $value = $char . $value; | |
| 831 | - } else { | |
| 675 | + $is_balanced = $char_count % 2 == 0; | |
| 676 | + if ( ! $is_balanced ) { | |
| 832 | 677 | $value .= $char; |
| 833 | 678 | } |
| 834 | 679 | } |
| 835 | 680 | |
| 836 | 681 | return $value; |
| 837 | - } | |
| 838 | - | |
| 839 | - /** | |
| 840 | - * Get the default template style | |
| 841 | - * | |
| 842 | - * @since 6.14 | |
| 843 | - * | |
| 844 | - * @param int|string $style_id The post type "frm_styles" ID. | |
| 845 | - * | |
| 846 | - * @return string The json encoded template data | |
| 847 | - */ | |
| 848 | - public function get_default_template_style( $style_id ) { | |
| 849 | - $default_template = get_post_meta( (int) $style_id, $this->default_template_style_meta_name, true ); | |
| 850 | - | |
| 851 | - if ( ! $default_template ) { | |
| 852 | - return FrmAppHelper::prepare_and_encode( $this->get_defaults() ); | |
| 853 | - } | |
| 854 | - | |
| 855 | - return $default_template; | |
| 856 | 682 | } |
| 857 | 683 | } |
