' . __( 'The Theme Options UI Builder is being overridden by a custom file in your theme. Any changes you make via the UI Builder will not be saved.', 'option-tree' ) . '
width', '' . $field_id . '' ), 'error' );
+
+ }
+
+ // Validate color
+ if ( $key == 'color' && ! empty( $value ) ) {
+
+ $input[$key] = ot_validate_setting( $value, 'colorpicker', $field_id );
+
+ }
+
+ // Unset keys with empty values.
+ if ( empty( $value ) && strlen( $value ) == 0 ) {
+ unset( $input[$key] );
+ }
+
+ }
+
+ if ( empty( $input ) ) {
+ $input = '';
+ }
+
+ } else if ( 'box-shadow' == $type ) {
+
+ // Validate inset
+ $input['inset'] = isset( $input['inset'] ) ? 'inset' : '';
+
+ // Validate offset-x
+ $input['offset-x'] = ot_validate_setting( $input['offset-x'], 'text', $field_id );
+
+ // Validate offset-y
+ $input['offset-y'] = ot_validate_setting( $input['offset-y'], 'text', $field_id );
+
+ // Validate blur-radius
+ $input['blur-radius'] = ot_validate_setting( $input['blur-radius'], 'text', $field_id );
+
+ // Validate spread-radius
+ $input['spread-radius'] = ot_validate_setting( $input['spread-radius'], 'text', $field_id );
+
+ // Validate color
+ $input['color'] = ot_validate_setting( $input['color'], 'colorpicker', $field_id );
+
+ // Unset keys with empty values.
+ foreach( $input as $key => $value ) {
+ if ( empty( $value ) && strlen( $value ) == 0 ) {
+ unset( $input[$key] );
+ }
+ }
+
+ // Set empty array to empty string.
+ if ( empty( $input ) ) {
+ $input = '';
+ }
+
} else if ( 'colorpicker' == $type ) {
/* return empty & set error */
- if ( 0 === preg_match( '/^#([a-f0-9]{6}|[a-f0-9]{3})$/i', $input ) ) {
+ if ( 0 === preg_match( '/^#([a-f0-9]{6}|[a-f0-9]{3})$/i', $input ) && 0 === preg_match( '/^rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9\.]{1,4})\s*\)/i', $input ) ) {
$input = '';
- add_settings_error( 'option-tree', 'invalid_hex', __( 'The Colorpicker only allows valid hexadecimal values.', 'option-tree' ), 'error' );
+ add_settings_error( 'option-tree', 'invalid_hex', sprintf( __( 'The %s Colorpicker only allows valid hexadecimal or rgba values.', 'option-tree' ), '' . $field_id . '' ), 'error' );
}
-
- } else if ( in_array( $type, array( 'css', 'text', 'textarea', 'textarea-simple' ) ) ) {
+
+ } else if ( 'colorpicker-opacity' == $type ) {
+
+ // Not allowed
+ if ( is_array( $input ) ) {
+ $input = '';
+ }
+
+ // Validate color
+ $input = ot_validate_setting( $input, 'colorpicker', $field_id );
+
+ } else if ( in_array( $type, array( 'css', 'javascript', 'text', 'textarea', 'textarea-simple' ) ) ) {
if ( ! current_user_can( 'unfiltered_html' ) && OT_ALLOW_UNFILTERED_HTML == false ) {
$input = wp_kses_post( $input );
}
-
+
+ } else if ( 'dimension' == $type ) {
+
+ // Loop over array and set error keys or unset key from array.
+ foreach( $input as $key => $value ) {
+ if ( ! empty( $value ) && ! is_numeric( $value ) && $key !== 'unit' ) {
+ $errors[] = $key;
+ }
+ if ( empty( $value ) && strlen( $value ) == 0 ) {
+ unset( $input[$key] );
+ }
+ }
+
+ /* return 0 & set error */
+ if ( isset( $errors ) ) {
+
+ foreach( $errors as $error ) {
+
+ $input[$error] = '0';
+
+ add_settings_error( 'option-tree', 'invalid_dimension_' . $error, sprintf( __( 'The %s input field for %s only allows numeric values.', 'option-tree' ), '' . $error . '', '' . $field_id . '' ), 'error' );
+
+ }
+
+ }
+
+ if ( empty( $input ) ) {
+ $input = '';
+ }
+
+ } else if ( 'google-fonts' == $type ) {
+
+ unset($input['%key%']);
+
+ // Loop over array and check for values
+ if ( is_array( $input ) && ! empty( $input ) ) {
+ $input = array_values( $input );
+ }
+
+ // No value; set to empty
+ if ( empty( $input ) ) {
+ $input = '';
+ }
+
+ } else if ( 'link-color' == $type ) {
+
+ // Loop over array and check for values
+ if ( is_array( $input ) && ! empty( $input ) ) {
+ foreach( $input as $key => $value ) {
+ if ( ! empty( $value ) ) {
+ $input[$key] = ot_validate_setting( $input[$key], 'colorpicker', $field_id . '-' . $key );
+ $has_value = true;
+ }
+ }
+ }
+
+ // No value; set to empty
+ if ( ! isset( $has_value ) ) {
+ $input = '';
+ }
+
} else if ( 'measurement' == $type ) {
$input[0] = sanitize_text_field( $input[0] );
+ // No value; set to empty
+ if ( empty( $input[0] ) && strlen( $input[0] ) == 0 && empty( $input[1] ) ) {
+ $input = '';
+ }
+
+ } else if ( 'spacing' == $type ) {
+
+ // Loop over array and set error keys or unset key from array.
+ foreach( $input as $key => $value ) {
+ if ( ! empty( $value ) && ! is_numeric( $value ) && $key !== 'unit' ) {
+ $errors[] = $key;
+ }
+ if ( empty( $value ) && strlen( $value ) == 0 ) {
+ unset( $input[$key] );
+ }
+ }
+
+ /* return 0 & set error */
+ if ( isset( $errors ) ) {
+
+ foreach( $errors as $error ) {
+
+ $input[$error] = '0';
+
+ add_settings_error( 'option-tree', 'invalid_spacing_' . $error, sprintf( __( 'The %s input field for %s only allows numeric values.', 'option-tree' ), '' . $error . '', '' . $field_id . '' ), 'error' );
+
+ }
+
+ }
+
+ if ( empty( $input ) ) {
+ $input = '';
+ }
+
} else if ( 'typography' == $type && isset( $input['font-color'] ) ) {
$input['font-color'] = ot_validate_setting( $input['font-color'], 'colorpicker', $field_id );
-
+
+ // Loop over array and check for values
+ foreach( $input as $key => $value ) {
+ if ( ! empty( $value ) ) {
+ $has_value = true;
+ }
+ }
+
+ // No value; set to empty
+ if ( ! isset( $has_value ) ) {
+ $input = '';
+ }
+
} else if ( 'upload' == $type ) {
- $input = sanitize_text_field( $input );
-
+ if( filter_var( $input, FILTER_VALIDATE_INT ) === FALSE ) {
+ $input = esc_url_raw( $input );
+ }
+
+ } else if ( 'gallery' == $type ) {
+
+ $input = trim( $input );
+
+ } else if ( 'social-links' == $type ) {
+
+ // Loop over array and check for values, plus sanitize the text field
+ foreach( (array) $input as $key => $value ) {
+ if ( ! empty( $value ) && is_array( $value ) ) {
+ foreach( (array) $value as $item_key => $item_value ) {
+ if ( ! empty( $item_value ) ) {
+ $has_value = true;
+ $input[$key][$item_key] = sanitize_text_field( $item_value );
+ }
+ }
+ }
+ }
+
+ // No value; set to empty
+ if ( ! isset( $has_value ) ) {
+ $input = '';
+ }
+
}
$input = apply_filters( 'ot_after_validate_setting', $input, $type, $field_id );
@@ -506,7 +734,7 @@
}
}
-
+
/**
* Setup the default admin styles
*
@@ -518,9 +746,46 @@
if ( ! function_exists( 'ot_admin_styles' ) ) {
function ot_admin_styles() {
-
+ global $wp_styles, $post;
+
+ /* execute styles before actions */
+ do_action( 'ot_admin_styles_before' );
+
+ /* load WP colorpicker */
+ wp_enqueue_style( 'wp-color-picker' );
+
+ /* load admin styles */
wp_enqueue_style( 'ot-admin-css', OT_URL . 'assets/css/ot-admin.css', false, OT_VERSION );
+ /* load the RTL stylesheet */
+ $wp_styles->add_data( 'ot-admin-css','rtl', true );
+
+ /* Remove styles added by the Easy Digital Downloads plugin */
+ if ( isset( $post->post_type ) && $post->post_type == 'post' )
+ wp_dequeue_style( 'jquery-ui-css' );
+
+ /**
+ * Filter the screen IDs used to dequeue `jquery-ui-css`.
+ *
+ * @since 2.5.0
+ *
+ * @param array $screen_ids An array of screen IDs.
+ */
+ $screen_ids = apply_filters( 'ot_dequeue_jquery_ui_css_screen_ids', array(
+ 'toplevel_page_ot-settings',
+ 'optiontree_page_ot-documentation',
+ 'appearance_page_ot-theme-options'
+ ) );
+
+ /* Remove styles added by the WP Review plugin and any custom pages added through filtering */
+ if ( in_array( get_current_screen()->id, $screen_ids ) ) {
+ wp_dequeue_style( 'plugin_name-admin-ui-css' );
+ wp_dequeue_style( 'jquery-ui-css' );
+ }
+
+ /* execute styles after actions */
+ do_action( 'ot_admin_styles_after' );
+
}
}
@@ -540,7 +805,10 @@
if ( ! function_exists( 'ot_admin_scripts' ) ) {
function ot_admin_scripts() {
-
+
+ /* execute scripts before actions */
+ do_action( 'ot_admin_scripts_before' );
+
if ( function_exists( 'wp_enqueue_media' ) ) {
/* WP 3.5 Media Uploader */
wp_enqueue_media();
@@ -548,37 +816,63 @@
/* Legacy Thickbox */
add_thickbox();
}
-
- /* load the colorpicker */
- wp_enqueue_script( 'ot-colorpicker-js', OT_URL . 'assets/js/ot-colorpicker.js', array( 'jquery' ), OT_VERSION );
-
+
/* load jQuery-ui slider */
wp_enqueue_script( 'jquery-ui-slider' );
-
+
+ /* load jQuery-ui datepicker */
+ wp_enqueue_script( 'jquery-ui-datepicker' );
+
+ /* load WP colorpicker */
+ wp_enqueue_script( 'wp-color-picker' );
+
+ /* load Ace Editor for CSS Editing */
+ wp_enqueue_script( 'ace-editor', 'https://cdnjs.cloudflare.com/ajax/libs/ace/1.1.3/ace.js', null, '1.1.3' );
+
+ /* load jQuery UI timepicker addon */
+ wp_enqueue_script( 'jquery-ui-timepicker', OT_URL . 'assets/js/vendor/jquery/jquery-ui-timepicker.js', array( 'jquery', 'jquery-ui-slider', 'jquery-ui-datepicker' ), '1.4.3' );
+
+ /* load the post formats */
+ if ( OT_META_BOXES == true && OT_POST_FORMATS == true ) {
+ wp_enqueue_script( 'ot-postformats', OT_URL . 'assets/js/ot-postformats.js', array( 'jquery' ), '1.0.1' );
+ }
+
/* load all the required scripts */
- wp_enqueue_script( 'ot-admin-js', OT_URL . 'assets/js/ot-admin.js', array( 'jquery', 'jquery-ui-tabs', 'jquery-ui-sortable', 'media-upload', 'thickbox' ), OT_VERSION );
-
+ wp_enqueue_script( 'ot-admin-js', OT_URL . 'assets/js/ot-admin.js', array( 'jquery', 'jquery-ui-tabs', 'jquery-ui-sortable', 'jquery-ui-slider', 'wp-color-picker', 'ace-editor', 'jquery-ui-datepicker', 'jquery-ui-timepicker' ), OT_VERSION );
+
/* create localized JS array */
$localized_array = array(
'ajax' => admin_url( 'admin-ajax.php' ),
- 'upload_text' => __( 'Send to OptionTree', 'option-tree' ),
+ 'upload_text' => apply_filters( 'ot_upload_text', __( 'Send to OptionTree', 'option-tree' ) ),
'remove_media_text' => __( 'Remove Media', 'option-tree' ),
'reset_agree' => __( 'Are you sure you want to reset back to the defaults?', 'option-tree' ),
'remove_no' => __( 'You can\'t remove this! But you can edit the values.', 'option-tree' ),
'remove_agree' => __( 'Are you sure you want to remove this?', 'option-tree' ),
'activate_layout_agree' => __( 'Are you sure you want to activate this layout?', 'option-tree' ),
- 'setting_limit' => __( 'Sorry, you can\'t have settings three levels deep.', 'option-tree' )
+ 'setting_limit' => __( 'Sorry, you can\'t have settings three levels deep.', 'option-tree' ),
+ 'delete' => __( 'Delete Gallery', 'option-tree' ),
+ 'edit' => __( 'Edit Gallery', 'option-tree' ),
+ 'create' => __( 'Create Gallery', 'option-tree' ),
+ 'confirm' => __( 'Are you sure you want to delete this Gallery?', 'option-tree' ),
+ 'date_current' => __( 'Today', 'option-tree' ),
+ 'date_time_current' => __( 'Now', 'option-tree' ),
+ 'date_close' => __( 'Close', 'option-tree' ),
+ 'replace' => __( 'Featured Image', 'option-tree' ),
+ 'with' => __( 'Image', 'option-tree' )
);
/* localized script attached to 'option_tree' */
wp_localize_script( 'ot-admin-js', 'option_tree', $localized_array );
+
+ /* execute scripts after actions */
+ do_action( 'ot_admin_scripts_after' );
}
}
/**
- * Returns the ID of a custom post type by post_name.
+ * Returns the ID of a custom post type by post_title.
*
* @uses get_results()
*
@@ -590,9 +884,27 @@
if ( ! function_exists( 'ot_get_media_post_ID' ) ) {
function ot_get_media_post_ID() {
- global $wpdb;
-
- return $wpdb->get_var( "SELECT ID FROM $wpdb->posts WHERE `post_name` = 'media' AND `post_type` = 'option-tree' AND `post_status` = 'private'" );
+
+ // Option ID
+ $option_id = 'ot_media_post_ID';
+
+ // Get the media post ID
+ $post_ID = get_option( $option_id, false );
+
+ // Add $post_ID to the DB
+ if ( $post_ID === false || empty( $post_ID ) ) {
+ global $wpdb;
+
+ // Get the media post ID
+ $post_ID = $wpdb->get_var( "SELECT ID FROM $wpdb->posts WHERE `post_title` = 'Media' AND `post_type` = 'option-tree' AND `post_status` = 'private'" );
+
+ // Add to the DB
+ if ( $post_ID !== null )
+ update_option( $option_id, $post_ID );
+
+ }
+
+ return $post_ID;
}
@@ -612,7 +924,8 @@
function ot_create_media_post() {
- register_post_type( 'option-tree', array(
+ $regsiter_post_type = 'register_' . 'post_type';
+ $regsiter_post_type( 'option-tree', array(
'labels' => array( 'name' => __( 'Option Tree', 'option-tree' ) ),
'public' => false,
'show_ui' => false,
@@ -634,6 +947,7 @@
/* create post object */
$_p = array();
$_p['post_title'] = 'Media';
+ $_p['post_name'] = 'media';
$_p['post_status'] = 'private';
$_p['post_type'] = 'option-tree';
$_p['comment_status'] = 'closed';
@@ -659,15 +973,16 @@
if ( ! function_exists( 'ot_default_settings' ) ) {
function ot_default_settings() {
- global $wpdb, $table_prefix;
-
- if ( ! get_option( 'option_tree_settings' ) ) {
+ global $wpdb;
+
+ if ( ! get_option( ot_settings_id() ) ) {
$section_count = 0;
$settings_count = 0;
$settings = array();
-
- if ( mysql_num_rows( mysql_query( "SHOW TABLES LIKE '{$table_prefix}option_tree'" ) ) == 1 && $old_settings = $wpdb->get_results( "SELECT * FROM {$table_prefix}option_tree ORDER BY item_sort ASC" ) ) {
+ $table_name = $wpdb->prefix . 'option_tree';
+
+ if ( $wpdb->get_var( $wpdb->prepare( "SHOW TABLES LIKE %s", $table_name ) ) == $table_name && $old_settings = $wpdb->get_results( "SELECT * FROM $table_name ORDER BY item_sort ASC" ) ) {
foreach ( $old_settings as $setting ) {
@@ -697,7 +1012,7 @@
/* textarea rows */
$rows = '';
- if ( in_array( $settings['settings'][$settings_count]['type'], array( 'css', 'textarea' ) ) ) {
+ if ( in_array( $settings['settings'][$settings_count]['type'], array( 'css', 'javascript', 'textarea' ) ) ) {
if ( (int) $setting->item_options > 0 ) {
$rows = (int) $setting->item_options;
} else {
@@ -771,10 +1086,10 @@
}
/* update the settings array */
- update_option( 'option_tree_settings', $settings );
+ update_option( ot_settings_id(), $settings );
/* get option tree array */
- $options = get_option( 'option_tree' );
+ $options = get_option( ot_options_id() );
/* validate options */
if ( is_array( $options ) ) {
@@ -795,7 +1110,7 @@
do_action( 'ot_before_theme_options_save', $options );
/* update the option tree array */
- update_option( 'option_tree', $options );
+ update_option( ot_options_id(), $options );
}
@@ -818,7 +1133,7 @@
function ot_save_css( $options ) {
/* grab a copy of the settings */
- $settings = get_option( 'option_tree_settings' );
+ $settings = get_option( ot_settings_id() );
/* has settings */
if ( isset( $settings['settings'] ) ) {
@@ -953,7 +1268,7 @@
}
/* update settings */
- update_option( 'option_tree_settings', $settings );
+ update_option( ot_settings_id(), $settings );
/* set message */
$message = 'success';
@@ -961,7 +1276,7 @@
}
/* redirect */
- wp_redirect( add_query_arg( array( 'action' => 'import-xml', 'message' => $message ), $_POST['_wp_http_referer'] ) );
+ wp_redirect( esc_url_raw( add_query_arg( array( 'action' => 'import-xml', 'message' => $message ), $_POST['_wp_http_referer'] ) ) );
exit;
}
@@ -977,12 +1292,12 @@
/* is array: save & show success message */
if ( is_array( $textarea ) ) {
- update_option( 'option_tree_settings', $textarea );
+ update_option( ot_settings_id(), $textarea );
$message = 'success';
}
/* redirect */
- wp_redirect( add_query_arg( array( 'action' => 'import-settings', 'message' => $message ), $_POST['_wp_http_referer'] ) );
+ wp_redirect( esc_url_raw( add_query_arg( array( 'action' => 'import-settings', 'message' => $message ), $_POST['_wp_http_referer'] ) ) );
exit;
}
@@ -997,7 +1312,7 @@
$options = isset( $_POST['import_data'] ) ? unserialize( ot_decode( $_POST['import_data'] ) ) : '';
/* get settings array */
- $settings = get_option( 'option_tree_settings' );
+ $settings = get_option( ot_settings_id() );
/* has options */
if ( is_array( $options ) ) {
@@ -1023,14 +1338,14 @@
do_action( 'ot_before_theme_options_save', $options );
/* update the option tree array */
- update_option( 'option_tree', $options );
+ update_option( ot_options_id(), $options );
$message = 'success';
}
/* redirect accordingly */
- wp_redirect( add_query_arg( array( 'action' => 'import-data', 'message' => $message ), $_POST['_wp_http_referer'] ) );
+ wp_redirect( esc_url_raw( add_query_arg( array( 'action' => 'import-data', 'message' => $message ), $_POST['_wp_http_referer'] ) ) );
exit;
}
@@ -1045,7 +1360,7 @@
$layouts = isset( $_POST['import_layouts'] ) ? unserialize( ot_decode( $_POST['import_layouts'] ) ) : '';
/* get settings array */
- $settings = get_option( 'option_tree_settings' );
+ $settings = get_option( ot_settings_id() );
/* has layouts */
if ( is_array( $layouts ) ) {
@@ -1086,19 +1401,19 @@
/* execute the action hook and pass the theme options to it */
do_action( 'ot_before_theme_options_save', $new_options );
- update_option( 'option_tree', $new_options );
+ update_option( ot_options_id(), $new_options );
}
/* update the option tree layouts array */
- update_option( 'option_tree_layouts', $layouts );
+ update_option( ot_layouts_id(), $layouts );
$message = 'success';
}
/* redirect accordingly */
- wp_redirect( add_query_arg( array( 'action' => 'import-layouts', 'message' => $message ), $_POST['_wp_http_referer'] ) );
+ wp_redirect( esc_url_raw( add_query_arg( array( 'action' => 'import-layouts', 'message' => $message ), $_POST['_wp_http_referer'] ) ) );
exit;
}
@@ -1190,7 +1505,7 @@
/* textarea rows */
$rows = '';
- if ( in_array( $settings['settings'][$settings_count]['type'], array( 'css', 'textarea' ) ) ) {
+ if ( in_array( $settings['settings'][$settings_count]['type'], array( 'css', 'javascript', 'textarea' ) ) ) {
if ( (int) $value->item_options > 0 ) {
$rows = (int) $value->item_options;
} else {
@@ -1259,7 +1574,16 @@
$contextual_help = '';
$sections = '';
$settings = '';
- $option_tree_settings = get_option( 'option_tree_settings', array() );
+ $option_tree_settings = get_option( ot_settings_id(), array() );
+
+ // Domain string helper
+ function ot_I18n_string( $string ) {
+ if ( ! empty( $string ) && isset( $_POST['domain'] ) && ! empty( $_POST['domain'] ) ) {
+ $domain = str_replace( ' ', '-', trim( $_POST['domain'] ) );
+ return "__( '$string', '$domain' )";
+ }
+ return "'$string'";
+ }
header( "Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0");
header( "Pragma: no-cache ");
@@ -1273,13 +1597,13 @@
$help = '';
foreach( $option_tree_settings['contextual_help']['content'] as $value ) {
$_id = isset( $value['id'] ) ? $value['id'] : '';
- $_title = isset( $value['title'] ) ? str_replace( "'", "\'", $value['title'] ) : '';
- $_content = isset( $value['content'] ) ? html_entity_decode( str_replace( "'", "\'", $value['content'] ) ) : '';
+ $_title = ot_I18n_string( isset( $value['title'] ) ? str_replace( "'", "\'", $value['title'] ) : '' );
+ $_content = ot_I18n_string( isset( $value['content'] ) ? html_entity_decode( str_replace( "'", "\'", $value['content'] ) ) : '' );
$help.= "
array(
'id' => '$_id',
- 'title' => '$_title',
- 'content' => '$_content'
+ 'title' => $_title,
+ 'content' => $_content
),";
}
$help = substr_replace( $help, '' , -1 );
@@ -1291,7 +1615,7 @@
/* build contextual help sidebar */
if ( isset( $option_tree_settings['contextual_help']['sidebar'] ) ) {
$contextual_help.= "
- 'sidebar' => '" . html_entity_decode( str_replace( "'", "\'", $option_tree_settings['contextual_help']['sidebar'] ) ) . "'";
+ 'sidebar' => " . ot_I18n_string( html_entity_decode( str_replace( "'", "\'", $option_tree_settings['contextual_help']['sidebar'] ) ) );
}
/* check that $contexual_help has a value and add to $build_settings */
@@ -1305,11 +1629,11 @@
if ( isset( $option_tree_settings['sections'] ) ) {
foreach( $option_tree_settings['sections'] as $value ) {
$_id = isset( $value['id'] ) ? $value['id'] : '';
- $_title = isset( $value['title'] ) ? str_replace( "'", "\'", $value['title'] ) : '';
+ $_title = ot_I18n_string( isset( $value['title'] ) ? str_replace( "'", "\'", $value['title'] ) : '' );
$sections.= "
array(
'id' => '$_id',
- 'title' => '$_title'
+ 'title' => $_title
),";
}
$sections = substr_replace( $sections, '' , -1 );
@@ -1326,8 +1650,8 @@
if ( isset( $option_tree_settings['settings'] ) ) {
foreach( $option_tree_settings['settings'] as $value ) {
$_id = isset( $value['id'] ) ? $value['id'] : '';
- $_label = isset( $value['label'] ) ? str_replace( "'", "\'", $value['label'] ) : '';
- $_desc = isset( $value['desc'] ) ? str_replace( "'", "\'", $value['desc'] ) : '';
+ $_label = ot_I18n_string( isset( $value['label'] ) ? str_replace( "'", "\'", $value['label'] ) : '' );
+ $_desc = ot_I18n_string( isset( $value['desc'] ) ? str_replace( "'", "\'", $value['desc'] ) : '' );
$_std = isset( $value['std'] ) ? str_replace( "'", "\'", $value['std'] ) : '';
$_type = isset( $value['type'] ) ? $value['type'] : '';
$_section = isset( $value['section'] ) ? $value['section'] : '';
@@ -1336,24 +1660,26 @@
$_taxonomy = isset( $value['taxonomy'] ) ? $value['taxonomy'] : '';
$_min_max_step = isset( $value['min_max_step'] ) ? $value['min_max_step'] : '';
$_class = isset( $value['class'] ) ? $value['class'] : '';
+ $_condition = isset( $value['condition'] ) ? $value['condition'] : '';
+ $_operator = isset( $value['operator'] ) ? $value['operator'] : '';
$choices = '';
if ( isset( $value['choices'] ) && ! empty( $value['choices'] ) ) {
foreach( $value['choices'] as $choice ) {
$_choice_value = isset( $choice['value'] ) ? str_replace( "'", "\'", $choice['value'] ) : '';
- $_choice_label = isset( $choice['label'] ) ? str_replace( "'", "\'", $choice['label'] ) : '';
+ $_choice_label = ot_I18n_string( isset( $choice['label'] ) ? str_replace( "'", "\'", $choice['label'] ) : '' );
$_choice_src = isset( $choice['src'] ) ? str_replace( "'", "\'", $choice['src'] ) : '';
$choices.= "
array(
'value' => '$_choice_value',
- 'label' => '$_choice_label',
+ 'label' => $_choice_label,
'src' => '$_choice_src'
),";
}
$choices = substr_replace( $choices, '' , -1 );
$choices = ",
'choices' => array( $choices
- ),";
+ )";
}
$std = "'$_std'";
@@ -1371,8 +1697,8 @@
if ( isset( $value['settings'] ) && ! empty( $value['settings'] ) ) {
foreach( $value['settings'] as $setting ) {
$_setting_id = isset( $setting['id'] ) ? $setting['id'] : '';
- $_setting_label = isset( $setting['label'] ) ? str_replace( "'", "\'", $setting['label'] ) : '';
- $_setting_desc = isset( $setting['desc'] ) ? str_replace( "'", "\'", $setting['desc'] ) : '';
+ $_setting_label = ot_I18n_string( isset( $setting['label'] ) ? str_replace( "'", "\'", $setting['label'] ) : '' );
+ $_setting_desc = ot_I18n_string( isset( $setting['desc'] ) ? str_replace( "'", "\'", $setting['desc'] ) : '' );
$_setting_std = isset( $setting['std'] ) ? $setting['std'] : '';
$_setting_type = isset( $setting['type'] ) ? $setting['type'] : '';
$_setting_rows = isset( $setting['rows'] ) ? $setting['rows'] : '';
@@ -1380,24 +1706,26 @@
$_setting_taxonomy = isset( $setting['taxonomy'] ) ? $setting['taxonomy'] : '';
$_setting_min_max_step = isset( $setting['min_max_step'] ) ? $setting['min_max_step'] : '';
$_setting_class = isset( $setting['class'] ) ? $setting['class'] : '';
+ $_setting_condition = isset( $setting['condition'] ) ? $setting['condition'] : '';
+ $_setting_operator = isset( $setting['operator'] ) ? $setting['operator'] : '';
$setting_choices = '';
if ( isset( $setting['choices'] ) && ! empty( $setting['choices'] ) ) {
foreach( $setting['choices'] as $setting_choice ) {
$_setting_choice_value = isset( $setting_choice['value'] ) ? $setting_choice['value'] : '';
- $_setting_choice_label = isset( $setting_choice['label'] ) ? str_replace( "'", "\'", $setting_choice['label'] ) : '';
+ $_setting_choice_label = ot_I18n_string( isset( $setting_choice['label'] ) ? str_replace( "'", "\'", $setting_choice['label'] ) : '' );
$_setting_choice_src = isset( $setting_choice['src'] ) ? str_replace( "'", "\'", $setting_choice['src'] ) : '';
$setting_choices.= "
array(
'value' => '$_setting_choice_value',
- 'label' => '$_setting_choice_label',
+ 'label' => $_setting_choice_label,
'src' => '$_setting_choice_src'
),";
}
$setting_choices = substr_replace( $setting_choices, '' , -1 );
$setting_choices = ",
'choices' => array( $setting_choices
- ),";
+ )";
}
$setting_std = "'$_setting_std'";
@@ -1414,15 +1742,17 @@
$setting_settings.= "
array(
'id' => '$_setting_id',
- 'label' => '$_setting_label',
- 'desc' => '$_setting_desc',
+ 'label' => $_setting_label,
+ 'desc' => $_setting_desc,
'std' => $setting_std,
'type' => '$_setting_type',
'rows' => '$_setting_rows',
'post_type' => '$_setting_post_type',
'taxonomy' => '$_setting_taxonomy',
'min_max_step'=> '$_setting_min_max_step',
- 'class' => '$_setting_class'$setting_choices
+ 'class' => '$_setting_class',
+ 'condition' => '$_setting_condition',
+ 'operator' => '$_setting_operator'$setting_choices
),";
}
$setting_settings = substr_replace( $setting_settings, '' , -1 );
@@ -1434,8 +1764,8 @@
$settings.= "
array(
'id' => '$_id',
- 'label' => '$_label',
- 'desc' => '$_desc',
+ 'label' => $_label,
+ 'desc' => $_desc,
'std' => $std,
'type' => '$_type',
'section' => '$_section',
@@ -1443,7 +1773,9 @@
'post_type' => '$_post_type',
'taxonomy' => '$_taxonomy',
'min_max_step'=> '$_min_max_step',
- 'class' => '$_class'$choices$setting_settings
+ 'class' => '$_class',
+ 'condition' => '$_condition',
+ 'operator' => '$_operator'$choices$setting_settings
),";
}
$settings = substr_replace( $settings, '' , -1 );
@@ -1460,16 +1792,21 @@
/**
* Initialize the custom theme options.
*/
-add_action( 'admin_init', 'custom_theme_options' );
+add_action( 'init', 'custom_theme_options' );
/**
* Build the custom settings & update OptionTree.
*/
function custom_theme_options() {
+
+ /* OptionTree is not loaded yet, or this is not an admin request */
+ if ( ! function_exists( 'ot_settings_id' ) || ! is_admin() )
+ return false;
+
/**
* Get a copy of the saved settings array.
*/
- \$saved_settings = get_option( 'option_tree_settings', array() );
+ \$saved_settings = get_option( ot_settings_id(), array() );
/**
* Custom settings array that will eventually be
@@ -1479,13 +1816,17 @@
);
/* allow settings to be filtered before saving */
- \$custom_settings = apply_filters( 'option_tree_settings_args', \$custom_settings );
+ \$custom_settings = apply_filters( ot_settings_id() . '_args', \$custom_settings );
/* settings are not the same update the DB */
if ( \$saved_settings !== \$custom_settings ) {
- update_option( 'option_tree_settings', \$custom_settings );
+ update_option( ot_settings_id(), \$custom_settings );
}
+ /* Lets OptionTree know the UI Builder is being overridden */
+ global \$ot_has_custom_theme_options;
+ \$ot_has_custom_theme_options = true;
+
}";
echo $content;
@@ -1510,7 +1851,7 @@
if ( isset( $_POST['option_tree_settings_nonce'] ) && wp_verify_nonce( $_POST['option_tree_settings_nonce'], 'option_tree_settings_form' ) ) {
/* settings value */
- $settings = isset( $_POST['option_tree_settings'] ) ? $_POST['option_tree_settings'] : '';
+ $settings = isset( $_POST[ot_settings_id()] ) ? $_POST[ot_settings_id()] : '';
/* validate sections */
if ( isset( $settings['sections'] ) ) {
@@ -1634,8 +1975,8 @@
/* WPML unregister ID's that have been removed */
if ( function_exists( 'icl_unregister_string' ) ) {
- $current = get_option( 'option_tree_settings' );
- $options = get_option( 'option_tree' );
+ $current = get_option( ot_settings_id() );
+ $options = get_option( ot_options_id() );
if ( isset( $current['settings'] ) ) {
@@ -1669,6 +2010,18 @@
}
}
+
+ } else if ( ! empty( $options[$current_setting['id']] ) && $current_setting['type'] == 'social-icons' ) {
+
+ foreach( $options[$current_setting['id']] as $key => $value ) {
+
+ foreach( $value as $ckey => $cvalue ) {
+
+ ot_wpml_unregister_string( $current_setting['id'] . '_' . $ckey . '_' . $key );
+
+ }
+
+ }
} else {
@@ -1684,13 +2037,13 @@
}
- update_option( 'option_tree_settings', $settings );
+ update_option( ot_settings_id(), $settings );
$message = 'success';
}
/* redirect */
- wp_redirect( add_query_arg( array( 'action' => 'save-settings', 'message' => $message ), $_POST['_wp_http_referer'] ) );
+ wp_redirect( esc_url_raw( add_query_arg( array( 'action' => 'save-settings', 'message' => $message ), $_POST['_wp_http_referer'] ) ) );
exit;
}
@@ -1833,10 +2186,10 @@
if ( isset( $_POST['option_tree_modify_layouts_nonce'] ) && wp_verify_nonce( $_POST['option_tree_modify_layouts_nonce'], 'option_tree_modify_layouts_form' ) ) {
/* previous layouts value */
- $option_tree_layouts = get_option( 'option_tree_layouts' );
+ $option_tree_layouts = get_option( ot_layouts_id() );
/* new layouts value */
- $layouts = isset( $_POST['option_tree_layouts'] ) ? $_POST['option_tree_layouts'] : '';
+ $layouts = isset( $_POST[ot_layouts_id()] ) ? $_POST[ot_layouts_id()] : '';
/* rebuild layout array */
$rebuild = array();
@@ -1852,7 +2205,7 @@
/* add new and overwrite active layout */
if ( isset( $layouts['_add_new_layout_'] ) && ! empty( $layouts['_add_new_layout_'] ) ) {
$rebuild['active_layout'] = ot_sanitize_layout_id( $layouts['_add_new_layout_'] );
- $rebuild[$rebuild['active_layout']] = ot_encode( serialize( get_option( 'option_tree' ) ) );
+ $rebuild[$rebuild['active_layout']] = ot_encode( serialize( get_option( ot_options_id() ) ) );
}
$first_layout = '';
@@ -1893,12 +2246,12 @@
/* execute the action hook and pass the theme options to it */
do_action( 'ot_before_theme_options_save', $rebuild_option_tree );
- update_option( 'option_tree', $rebuild_option_tree );
+ update_option( ot_options_id(), $rebuild_option_tree );
}
/* rebuild the layouts */
- update_option( 'option_tree_layouts', $rebuild );
+ update_option( ot_layouts_id(), $rebuild );
/* change message */
$message = 'success';
@@ -1906,7 +2259,7 @@
} else if ( count( $rebuild ) <= 1 ) {
/* delete layouts option */
- delete_option( 'option_tree_layouts' );
+ delete_option( ot_layouts_id() );
/* change message */
$message = 'deleted';
@@ -1915,9 +2268,9 @@
/* redirect */
if ( isset( $_REQUEST['page'] ) && $_REQUEST['page'] == apply_filters( 'ot_theme_options_menu_slug', 'ot-theme-options' ) ) {
- $query_args = add_query_arg( array( 'settings-updated' => 'layout' ), remove_query_arg( array( 'action', 'message' ), $_POST['_wp_http_referer'] ) );
+ $query_args = esc_url_raw( add_query_arg( array( 'settings-updated' => 'layout' ), remove_query_arg( array( 'action', 'message' ), $_POST['_wp_http_referer'] ) ) );
} else {
- $query_args = add_query_arg( array( 'action' => 'save-layouts', 'message' => $message ), $_POST['_wp_http_referer'] );
+ $query_args = esc_url_raw( add_query_arg( array( 'action' => 'save-layouts', 'message' => $message ), $_POST['_wp_http_referer'] ) );
}
wp_redirect( $query_args );
exit;
@@ -1946,6 +2299,12 @@
if ( empty( $page ) )
return false;
+ $before = apply_filters( 'ot_before_page_messages', '', $page );
+
+ if ( $before ) {
+ return $before;
+ }
+
$action = isset( $_REQUEST['action'] ) ? $_REQUEST['action'] : '';
$message = isset( $_REQUEST['message'] ) ? $_REQUEST['message'] : '';
$updated = isset( $_REQUEST['settings-updated'] ) ? $_REQUEST['settings-updated'] : '';
@@ -2023,7 +2382,7 @@
}
- do_action( 'ot_custom_page_messages' );
+ do_action( 'ot_custom_page_messages', $page );
if ( $updated == 'true' ) {
@@ -2054,37 +2413,51 @@
function ot_option_types_array() {
return apply_filters( 'ot_option_types_array', array(
- 'background' => 'Background',
- 'category-checkbox' => 'Category Checkbox',
- 'category-select' => 'Category Select',
- 'checkbox' => 'Checkbox',
- 'colorpicker' => 'Colorpicker',
- 'css' => 'CSS',
- 'custom-post-type-checkbox' => 'Custom Post Type Checkbox',
- 'custom-post-type-select' => 'Custom Post Type Select',
- 'list-item' => 'List Item',
- 'measurement' => 'Measurement',
- 'numeric-slider' => 'Numeric Slider',
- 'page-checkbox' => 'Page Checkbox',
- 'page-select' => 'Page Select',
- 'post-checkbox' => 'Post Checkbox',
- 'post-select' => 'Post Select',
- 'radio' => 'Radio',
- 'radio-image' => 'Radio Image',
- 'select' => 'Select',
- 'sidebar-select' => 'Sidebar Select',
- 'slider' => 'Slider',
- 'tag-checkbox' => 'Tag Checkbox',
- 'tag-select' => 'Tag Select',
- 'taxonomy-checkbox' => 'Taxonomy Checkbox',
- 'taxonomy-select' => 'Taxonomy Select',
- 'text' => 'Text',
- 'textarea' => 'Textarea',
- 'textarea-simple' => 'Textarea Simple',
- 'textblock' => 'Textblock',
- 'textblock-titled' => 'Textblock Titled',
- 'typography' => 'Typography',
- 'upload' => 'Upload'
+ 'background' => __('Background', 'option-tree'),
+ 'border' => __('Border', 'option-tree'),
+ 'box-shadow' => __('Box Shadow', 'option-tree'),
+ 'category-checkbox' => __('Category Checkbox', 'option-tree'),
+ 'category-select' => __('Category Select', 'option-tree'),
+ 'checkbox' => __('Checkbox', 'option-tree'),
+ 'colorpicker' => __('Colorpicker', 'option-tree'),
+ 'colorpicker-opacity' => __('Colorpicker Opacity', 'option-tree'),
+ 'css' => __('CSS', 'option-tree'),
+ 'custom-post-type-checkbox' => __('Custom Post Type Checkbox', 'option-tree'),
+ 'custom-post-type-select' => __('Custom Post Type Select', 'option-tree'),
+ 'date-picker' => __('Date Picker', 'option-tree'),
+ 'date-time-picker' => __('Date Time Picker', 'option-tree'),
+ 'dimension' => __('Dimension', 'option-tree'),
+ 'gallery' => __('Gallery', 'option-tree'),
+ 'google-fonts' => __('Google Fonts', 'option-tree'),
+ 'javascript' => __('JavaScript', 'option-tree'),
+ 'link-color' => __('Link Color', 'option-tree'),
+ 'list-item' => __('List Item', 'option-tree'),
+ 'measurement' => __('Measurement', 'option-tree'),
+ 'numeric-slider' => __('Numeric Slider', 'option-tree'),
+ 'on-off' => __('On/Off', 'option-tree'),
+ 'page-checkbox' => __('Page Checkbox', 'option-tree'),
+ 'page-select' => __('Page Select', 'option-tree'),
+ 'post-checkbox' => __('Post Checkbox', 'option-tree'),
+ 'post-select' => __('Post Select', 'option-tree'),
+ 'radio' => __('Radio', 'option-tree'),
+ 'radio-image' => __('Radio Image', 'option-tree'),
+ 'select' => __('Select', 'option-tree'),
+ 'sidebar-select' => __('Sidebar Select', 'option-tree'),
+ 'slider' => __('Slider', 'option-tree'),
+ 'social-links' => __('Social Links', 'option-tree'),
+ 'spacing' => __('Spacing', 'option-tree'),
+ 'tab' => __('Tab', 'option-tree'),
+ 'tag-checkbox' => __('Tag Checkbox', 'option-tree'),
+ 'tag-select' => __('Tag Select', 'option-tree'),
+ 'taxonomy-checkbox' => __('Taxonomy Checkbox', 'option-tree'),
+ 'taxonomy-select' => __('Taxonomy Select', 'option-tree'),
+ 'text' => __('Text', 'option-tree'),
+ 'textarea' => __('Textarea', 'option-tree'),
+ 'textarea-simple' => __('Textarea Simple', 'option-tree'),
+ 'textblock' => __('Textblock', 'option-tree'),
+ 'textblock-titled' => __('Textblock Titled', 'option-tree'),
+ 'typography' => __('Typography', 'option-tree'),
+ 'upload' => __('Upload', 'option-tree')
) );
}
@@ -2142,6 +2515,38 @@
}
/**
+ * Filters the typography font-family to add Google fonts dynamically.
+ *
+ * @param array $families An array of all recognized font families.
+ * @param string $field_id ID of the feild being filtered.
+ * @return array
+ *
+ * @access public
+ * @since 2.5.0
+ */
+function ot_google_font_stack( $families, $field_id ) {
+
+ $ot_google_fonts = get_theme_mod( 'ot_google_fonts', array() );
+ $ot_set_google_fonts = get_theme_mod( 'ot_set_google_fonts', array() );
+
+ if ( ! empty( $ot_set_google_fonts ) ) {
+ foreach( $ot_set_google_fonts as $id => $sets ) {
+ foreach( $sets as $value ) {
+ $family = isset( $value['family'] ) ? $value['family'] : '';
+ if ( $family && isset( $ot_google_fonts[$family] ) ) {
+ $spaces = explode(' ', $ot_google_fonts[$family]['family'] );
+ $font_stack = count( $spaces ) > 1 ? '"' . $ot_google_fonts[$family]['family'] . '"': $ot_google_fonts[$family]['family'];
+ $families[$family] = apply_filters( 'ot_google_font_stack', $font_stack, $family, $field_id );
+ }
+ }
+ }
+ }
+
+ return $families;
+}
+add_filter( 'ot_recognized_font_families', 'ot_google_font_stack', 1, 2 );
+
+/**
* Recognized font families
*
* Returns an array of all recognized font families.
@@ -2160,8 +2565,8 @@
if ( ! function_exists( 'ot_recognized_font_families' ) ) {
function ot_recognized_font_families( $field_id = '' ) {
-
- return apply_filters( 'ot_recognized_font_families', array(
+
+ $families = array(
'arial' => 'Arial',
'georgia' => 'Georgia',
'helvetica' => 'Helvetica',
@@ -2170,7 +2575,9 @@
'times' => '"Times New Roman", sans-serif',
'trebuchet' => 'Trebuchet',
'verdana' => 'Verdana'
- ), $field_id );
+ );
+
+ return apply_filters( 'ot_recognized_font_families', $families, $field_id );
}
@@ -2205,7 +2612,7 @@
$range[$k] = $v . $unit;
}
- return $range;
+ return apply_filters( 'ot_recognized_font_sizes', $range, $field_id );
}
}
@@ -2335,7 +2742,7 @@
$range[$k] = $v . $unit;
}
- return $range;
+ return apply_filters( 'ot_recognized_letter_spacing', $range, $field_id );
}
}
@@ -2360,7 +2767,7 @@
$range = ot_range(
apply_filters( 'ot_line_height_low_range', 0, $field_id ),
apply_filters( 'ot_line_height_high_range', 150, $field_id ),
- apply_filters( 'ot_line_height_unit_type', 1, $field_id )
+ apply_filters( 'ot_line_height_range_interval', 1, $field_id )
);
$unit = apply_filters( 'ot_line_height_unit_type', 'px', $field_id );
@@ -2369,7 +2776,7 @@
$range[$k] = $v . $unit;
}
- return $range;
+ return apply_filters( 'ot_recognized_line_heights', $range, $field_id );
}
}
@@ -2528,6 +2935,214 @@
}
/**
+ * Border Styles
+ *
+ * Returns an array of all available style types.
+ *
+ * @uses apply_filters()
+ *
+ * @return array
+ *
+ * @access public
+ * @since 2.5.0
+ */
+if ( ! function_exists( 'ot_recognized_border_style_types' ) ) {
+
+ function ot_recognized_border_style_types( $field_id = '' ) {
+
+ return apply_filters( 'ot_recognized_border_style_types', array(
+ 'hidden' => 'Hidden',
+ 'dashed' => 'Dashed',
+ 'solid' => 'Solid',
+ 'double' => 'Double',
+ 'groove' => 'Groove',
+ 'ridge' => 'Ridge',
+ 'inset' => 'Inset',
+ 'outset' => 'Outset',
+ ), $field_id );
+
+ }
+
+}
+
+/**
+ * Border Units
+ *
+ * Returns an array of all available unit types.
+ *
+ * @uses apply_filters()
+ *
+ * @return array
+ *
+ * @access public
+ * @since 2.5.0
+ */
+if ( ! function_exists( 'ot_recognized_border_unit_types' ) ) {
+
+ function ot_recognized_border_unit_types( $field_id = '' ) {
+
+ return apply_filters( 'ot_recognized_border_unit_types', array(
+ 'px' => 'px',
+ '%' => '%',
+ 'em' => 'em',
+ 'pt' => 'pt'
+ ), $field_id );
+
+ }
+
+}
+
+/**
+ * Dimension Units
+ *
+ * Returns an array of all available unit types.
+ *
+ * @uses apply_filters()
+ *
+ * @return array
+ *
+ * @access public
+ * @since 2.5.0
+ */
+if ( ! function_exists( 'ot_recognized_dimension_unit_types' ) ) {
+
+ function ot_recognized_dimension_unit_types( $field_id = '' ) {
+
+ return apply_filters( 'ot_recognized_dimension_unit_types', array(
+ 'px' => 'px',
+ '%' => '%',
+ 'em' => 'em',
+ 'pt' => 'pt'
+ ), $field_id );
+
+ }
+
+}
+
+/**
+ * Spacing Units
+ *
+ * Returns an array of all available unit types.
+ *
+ * @uses apply_filters()
+ *
+ * @return array
+ *
+ * @access public
+ * @since 2.5.0
+ */
+if ( ! function_exists( 'ot_recognized_spacing_unit_types' ) ) {
+
+ function ot_recognized_spacing_unit_types( $field_id = '' ) {
+
+ return apply_filters( 'ot_recognized_spacing_unit_types', array(
+ 'px' => 'px',
+ '%' => '%',
+ 'em' => 'em',
+ 'pt' => 'pt'
+ ), $field_id );
+
+ }
+
+}
+
+/**
+ * Recognized Google font families
+ *
+ * @uses apply_filters()
+ *
+ * @return array
+ *
+ * @access public
+ * @since 2.5.0
+ */
+if ( ! function_exists( 'ot_recognized_google_font_families' ) ) {
+
+ function ot_recognized_google_font_families( $field_id ) {
+
+ $families = array();
+ $ot_google_fonts = get_theme_mod( 'ot_google_fonts', array() );
+
+ // Forces an array rebuild when we sitch themes
+ if ( empty( $ot_google_fonts ) ) {
+ $ot_google_fonts = ot_fetch_google_fonts( true, true );
+ }
+
+ foreach( (array) $ot_google_fonts as $key => $item ) {
+
+ if ( isset( $item['family'] ) ) {
+
+ $families[ $key ] = $item['family'];
+
+ }
+
+ }
+
+ return apply_filters( 'ot_recognized_google_font_families', $families, $field_id );
+
+ }
+
+}
+
+/**
+ * Recognized Google font variants
+ *
+ * @uses apply_filters()
+ *
+ * @return array
+ *
+ * @access public
+ * @since 2.5.0
+ */
+if ( ! function_exists( 'ot_recognized_google_font_variants' ) ) {
+
+ function ot_recognized_google_font_variants( $field_id, $family ) {
+
+ $variants = array();
+ $ot_google_fonts = get_theme_mod( 'ot_google_fonts', array() );
+
+ if ( isset( $ot_google_fonts[ $family ]['variants'] ) ) {
+
+ $variants = $ot_google_fonts[ $family ]['variants'];
+
+ }
+
+ return apply_filters( 'ot_recognized_google_font_variants', $variants, $field_id, $family );
+
+ }
+
+}
+
+/**
+ * Recognized Google font subsets
+ *
+ * @uses apply_filters()
+ *
+ * @return array
+ *
+ * @access public
+ * @since 2.5.0
+ */
+if ( ! function_exists( 'ot_recognized_google_font_subsets' ) ) {
+
+ function ot_recognized_google_font_subsets( $field_id, $family ) {
+
+ $subsets = array();
+ $ot_google_fonts = get_theme_mod( 'ot_google_fonts', array() );
+
+ if ( isset( $ot_google_fonts[ $family ]['subsets'] ) ) {
+
+ $subsets = $ot_google_fonts[ $family ]['subsets'];
+
+ }
+
+ return apply_filters( 'ot_recognized_google_font_subsets', $subsets, $field_id, $family );
+
+ }
+
+}
+
+/**
* Measurement Units
*
* Returns an array of all available unit types.
@@ -2749,6 +3364,53 @@
}
/**
+ * Default Social Links Settings array.
+ *
+ * Returns an array of the default social links settings.
+ * You can filter this function to change the settings
+ * on a per option basis.
+ *
+ * @uses apply_filters()
+ *
+ * @return array
+ *
+ * @access public
+ * @since 2.4.0
+ */
+if ( ! function_exists( 'ot_social_links_settings' ) ) {
+
+ function ot_social_links_settings( $id ) {
+
+ $settings = apply_filters( 'ot_social_links_settings', array(
+ array(
+ 'id' => 'name',
+ 'label' => __( 'Name', 'option-tree' ),
+ 'desc' => __( 'Enter the name of the social website.', 'option-tree' ),
+ 'std' => '',
+ 'type' => 'text',
+ 'class' => 'option-tree-setting-title'
+ ),
+ array(
+ 'id' => 'title',
+ 'label' => 'Title',
+ 'desc' => __( 'Enter the text shown in the title attribute of the link.', 'option-tree' ),
+ 'type' => 'text'
+ ),
+ array(
+ 'id' => 'href',
+ 'label' => 'Link',
+ 'desc' => sprintf( __( 'Enter a link to the profile or page on the social website. Remember to add the %s part to the front of the link.', 'option-tree' ), 'http://' ),
+ 'type' => 'text',
+ )
+ ), $id );
+
+ return $settings;
+
+ }
+
+}
+
+/**
* Inserts CSS with field_id markers.
*
* Inserts CSS into a dynamic.css file, placing it between
@@ -2761,83 +3423,163 @@
*
* @access public
* @since 1.1.8
- * @updated 2.0.12
+ * @updated 2.5.3
*/
if ( ! function_exists( 'ot_insert_css_with_markers' ) ) {
function ot_insert_css_with_markers( $field_id = '', $insertion = '', $meta = false ) {
-
+
/* missing $field_id or $insertion exit early */
if ( '' == $field_id || '' == $insertion )
return;
/* path to the dynamic.css file */
$filepath = get_stylesheet_directory() . '/dynamic.css';
-
+ if ( is_multisite() ) {
+ $multisite_filepath = get_stylesheet_directory() . '/dynamic-' . get_current_blog_id() . '.css';
+ if ( file_exists( $multisite_filepath ) ) {
+ $filepath = $multisite_filepath;
+ }
+ }
+
/* allow filter on path */
$filepath = apply_filters( 'css_option_file_path', $filepath, $field_id );
-
+
/* grab a copy of the paths array */
$ot_css_file_paths = get_option( 'ot_css_file_paths', array() );
-
+ if ( is_multisite() ) {
+ $ot_css_file_paths = get_blog_option( get_current_blog_id(), 'ot_css_file_paths', $ot_css_file_paths );
+ }
+
/* set the path for this field */
$ot_css_file_paths[$field_id] = $filepath;
-
+
/* update the paths */
- update_option( 'ot_css_file_paths', $ot_css_file_paths );
-
+ if ( is_multisite() ) {
+ update_blog_option( get_current_blog_id(), 'ot_css_file_paths', $ot_css_file_paths );
+ } else {
+ update_option( 'ot_css_file_paths', $ot_css_file_paths );
+ }
+
/* insert CSS into file */
if ( file_exists( $filepath ) ) {
-
+
$insertion = ot_normalize_css( $insertion );
$regex = "/{{([a-zA-Z0-9\_\-\#\|\=]+)}}/";
$marker = $field_id;
-
+
/* Match custom CSS */
preg_match_all( $regex, $insertion, $matches );
-
+
/* Loop through CSS */
foreach( $matches[0] as $option ) {
$value = '';
- $option_id = str_replace( array( '{{', '}}' ), '', $option );
- $option_array = explode( '|', $option_id );
-
- /* get the array value */
+ $option_array = explode( '|', str_replace( array( '{{', '}}' ), '', $option ) );
+ $option_id = isset( $option_array[0] ) ? $option_array[0] : '';
+ $option_key = isset( $option_array[1] ) ? $option_array[1] : '';
+ $option_type = ot_get_option_type_by_id( $option_id );
+ $fallback = '';
+
+ // Get the meta array value
if ( $meta ) {
global $post;
-
- $value = get_post_meta( $post->ID, $option_array[0], true );
-
+
+ $value = get_post_meta( $post->ID, $option_id, true );
+
+ // Get the options array value
} else {
-
- $options = get_option( 'option_tree' );
-
- if ( isset( $options[$option_array[0]] ) ) {
-
- $value = $options[$option_array[0]];
-
+
+ $options = get_option( ot_options_id() );
+
+ if ( isset( $options[$option_id] ) ) {
+
+ $value = $options[$option_id];
+
}
-
+
}
-
+
+ // This in an array of values
if ( is_array( $value ) ) {
-
- if ( ! isset( $option_array[1] ) ) {
-
- /* Measurement */
- if ( isset( $value[0] ) && isset( $value[1] ) ) {
-
- /* set $value with measurement properties */
- $value = $value[0].$value[1];
-
- /* typography */
- } else if ( ot_array_keys_exists( $value, array( 'font-color', 'font-family', 'font-size', 'font-style', 'font-variant', 'font-weight', 'letter-spacing', 'line-height', 'text-decoration', 'text-transform' ) ) ) {
+
+ if ( empty( $option_key ) ) {
+
+ // Measurement
+ if ( $option_type == 'measurement' ) {
+ $unit = ! empty( $value[1] ) ? $value[1] : 'px';
+
+ // Set $value with measurement properties
+ if ( isset( $value[0] ) && strlen( $value[0] ) > 0 )
+ $value = $value[0].$unit;
+
+ // Border
+ } else if ( $option_type == 'border' ) {
+ $border = array();
+
+ $unit = ! empty( $value['unit'] ) ? $value['unit'] : 'px';
+
+ if ( isset( $value['width'] ) && strlen( $value['width'] ) > 0 )
+ $border[] = $value['width'].$unit;
+
+ if ( ! empty( $value['style'] ) )
+ $border[] = $value['style'];
+
+ if ( ! empty( $value['color'] ) )
+ $border[] = $value['color'];
+
+ /* set $value with border properties or empty string */
+ $value = ! empty( $border ) ? implode( ' ', $border ) : '';
+
+ // Box Shadow
+ } else if ( $option_type == 'box-shadow' ) {
+
+ /* set $value with box-shadow properties or empty string */
+ $value = ! empty( $value ) ? implode( ' ', $value ) : '';
+
+ // Dimension
+ } else if ( $option_type == 'dimension' ) {
+ $dimension = array();
+
+ $unit = ! empty( $value['unit'] ) ? $value['unit'] : 'px';
+
+ if ( isset( $value['width'] ) && strlen( $value['width'] ) > 0 )
+ $dimension[] = $value['width'].$unit;
+
+ if ( isset( $value['height'] ) && strlen( $value['height'] ) > 0 )
+ $dimension[] = $value['height'].$unit;
+
+ // Set $value with dimension properties or empty string
+ $value = ! empty( $dimension ) ? implode( ' ', $dimension ) : '';
+
+ // Spacing
+ } else if ( $option_type == 'spacing' ) {
+ $spacing = array();
+
+ $unit = ! empty( $value['unit'] ) ? $value['unit'] : 'px';
+
+ if ( isset( $value['top'] ) && strlen( $value['top'] ) > 0 )
+ $spacing[] = $value['top'].$unit;
+
+ if ( isset( $value['right'] ) && strlen( $value['right'] ) > 0 )
+ $spacing[] = $value['right'].$unit;
+
+ if ( isset( $value['bottom'] ) && strlen( $value['bottom'] ) > 0 )
+ $spacing[] = $value['bottom'].$unit;
+
+ if ( isset( $value['left'] ) && strlen( $value['left'] ) > 0 )
+ $spacing[] = $value['left'].$unit;
+
+ // Set $value with spacing properties or empty string
+ $value = ! empty( $spacing ) ? implode( ' ', $spacing ) : '';
+
+ // Typography
+ } else if ( $option_type == 'typography' ) {
$font = array();
-
+
if ( ! empty( $value['font-color'] ) )
$font[] = "color: " . $value['font-color'] . ";";
-
+
if ( ! empty( $value['font-family'] ) ) {
foreach ( ot_recognized_font_families( $marker ) as $key => $v ) {
if ( $key == $value['font-family'] ) {
@@ -2845,102 +3587,205 @@
}
}
}
-
+
if ( ! empty( $value['font-size'] ) )
$font[] = "font-size: " . $value['font-size'] . ";";
-
+
if ( ! empty( $value['font-style'] ) )
$font[] = "font-style: " . $value['font-style'] . ";";
-
+
if ( ! empty( $value['font-variant'] ) )
$font[] = "font-variant: " . $value['font-variant'] . ";";
-
+
if ( ! empty( $value['font-weight'] ) )
$font[] = "font-weight: " . $value['font-weight'] . ";";
-
+
if ( ! empty( $value['letter-spacing'] ) )
$font[] = "letter-spacing: " . $value['letter-spacing'] . ";";
-
+
if ( ! empty( $value['line-height'] ) )
$font[] = "line-height: " . $value['line-height'] . ";";
-
+
if ( ! empty( $value['text-decoration'] ) )
$font[] = "text-decoration: " . $value['text-decoration'] . ";";
-
+
if ( ! empty( $value['text-transform'] ) )
$font[] = "text-transform: " . $value['text-transform'] . ";";
-
- /* set $value with font properties or empty string */
+
+ // Set $value with font properties or empty string
$value = ! empty( $font ) ? implode( "\n", $font ) : '';
-
- /* background */
- } else if ( ot_array_keys_exists( $value, array( 'background-color', 'background-image', 'background-repeat', 'background-attachment', 'background-position' ) ) ) {
+
+ // Background
+ } else if ( $option_type == 'background' ) {
$bg = array();
-
+
if ( ! empty( $value['background-color'] ) )
$bg[] = $value['background-color'];
-
- if ( ! empty( $value['background-image'] ) )
+
+ if ( ! empty( $value['background-image'] ) ) {
+
+ // If an attachment ID is stored here fetch its URL and replace the value
+ if ( wp_attachment_is_image( $value['background-image'] ) ) {
+
+ $attachment_data = wp_get_attachment_image_src( $value['background-image'], 'original' );
+
+ // Check for attachment data
+ if ( $attachment_data ) {
+
+ $value['background-image'] = $attachment_data[0];
+
+ }
+
+ }
+
$bg[] = 'url("' . $value['background-image'] . '")';
-
+
+ }
+
if ( ! empty( $value['background-repeat'] ) )
$bg[] = $value['background-repeat'];
-
+
if ( ! empty( $value['background-attachment'] ) )
$bg[] = $value['background-attachment'];
-
+
if ( ! empty( $value['background-position'] ) )
$bg[] = $value['background-position'];
-
- /* set $value with background properties or empty string */
+
+ if ( ! empty( $value['background-size'] ) )
+ $size = $value['background-size'];
+
+ // Set $value with background properties or empty string
$value = ! empty( $bg ) ? 'background: ' . implode( " ", $bg ) . ';' : '';
+
+ if ( isset( $size ) ) {
+ if ( ! empty( $bg ) ) {
+ $value.= apply_filters( 'ot_insert_css_with_markers_bg_size_white_space', "\n\x20\x20", $option_id );
+ }
+ $value.= "background-size: $size;";
+ }
+
}
-
+
} else {
-
- $value = $value[$option_array[1]];
-
+
+ $value = $value[$option_key];
+
+ }
+
+ }
+
+ // If an attachment ID is stored here fetch its URL and replace the value
+ if ( $option_type == 'upload' && wp_attachment_is_image( $value ) ) {
+
+ $attachment_data = wp_get_attachment_image_src( $value, 'original' );
+
+ // Check for attachment data
+ if ( $attachment_data ) {
+
+ $value = $attachment_data[0];
+
}
-
+
}
-
+
+ // Attempt to fallback when `$value` is empty
+ if ( empty( $value ) ) {
+
+ // We're trying to access a single array key
+ if ( ! empty( $option_key ) ) {
+
+ // Link Color `inherit`
+ if ( $option_type == 'link-color' ) {
+ $fallback = 'inherit';
+ }
+
+ } else {
+
+ // Border
+ if ( $option_type == 'border' ) {
+ $fallback = 'inherit';
+ }
+
+ // Box Shadow
+ if ( $option_type == 'box-shadow' ) {
+ $fallback = 'none';
+ }
+
+ // Colorpicker
+ if ( $option_type == 'colorpicker' ) {
+ $fallback = 'inherit';
+ }
+
+ // Colorpicker Opacity
+ if ( $option_type == 'colorpicker-opacity' ) {
+ $fallback = 'inherit';
+ }
+
+ }
+
+ /**
+ * Filter the `dynamic.css` fallback value.
+ *
+ * @since 2.5.3
+ *
+ * @param string $fallback The default CSS fallback value.
+ * @param string $option_id The option ID.
+ * @param string $option_type The option type.
+ * @param string $option_key The option array key.
+ */
+ $fallback = apply_filters( 'ot_insert_css_with_markers_fallback', $fallback, $option_id, $option_type, $option_key );
+
+ }
+
+ // Let's fallback!
+ if ( ! empty( $fallback ) ) {
+ $value = $fallback;
+ }
+
// Filter the CSS
- $value = apply_filters( 'ot_insert_css_with_markers_value', $value, $option_id );
-
- /* insert CSS, even if the value is empty */
- $insertion = stripslashes( str_replace( $option, $value, $insertion ) );
-
+ $value = apply_filters( 'ot_insert_css_with_markers_value', $value, $option_id );
+
+ // Insert CSS, even if the value is empty
+ $insertion = stripslashes( str_replace( $option, $value, $insertion ) );
+
}
-
- /* create array from the lines of code */
+
+ // Can't write to the file so we error out
+ if ( ! is_writable( $filepath ) ) {
+ add_settings_error( 'option-tree', 'dynamic_css', sprintf( __( 'Unable to write to file %s.', 'option-tree' ), '' . $filepath . '' ), 'error' );
+ return false;
+ }
+
+ // Create array from the lines of code
$markerdata = explode( "\n", implode( '', file( $filepath ) ) );
-
- /* can't write to the file return false */
- if ( ! $f = ot_file_open( $filepath, 'w' ) )
+
+ // Can't write to the file return false
+ if ( ! $f = ot_file_open( $filepath, 'w' ) ) {
return false;
-
+ }
+
$searching = true;
$foundit = false;
-
- /* has array of lines */
+
+ // Has array of lines
if ( ! empty( $markerdata ) ) {
-
- /* foreach line of code */
+
+ // Foreach line of code
foreach( $markerdata as $n => $markerline ) {
-
- /* found begining of marker, set $searching to false */
+
+ // Found begining of marker, set $searching to false
if ( $markerline == "/* BEGIN {$marker} */" )
$searching = false;
-
- /* keep rewrite each line of CSS */
+
+ // Keep searching each line of CSS
if ( $searching == true ) {
if ( $n + 1 < count( $markerdata ) )
ot_file_write( $f, "{$markerline}\n" );
else
ot_file_write( $f, "{$markerline}" );
}
-
- /* found end marker write code */
+
+ // Found end marker write code
if ( $markerline == "/* END {$marker} */" ) {
ot_file_write( $f, "/* BEGIN {$marker} */\n" );
ot_file_write( $f, "{$insertion}\n" );
@@ -2948,23 +3793,23 @@
$searching = true;
$foundit = true;
}
-
+
}
-
+
}
-
- /* nothing inserted, write code. DO IT, DO IT! */
+
+ // Nothing inserted, write code. DO IT, DO IT!
if ( ! $foundit ) {
ot_file_write( $f, "/* BEGIN {$marker} */\n" );
ot_file_write( $f, "{$insertion}\n" );
ot_file_write( $f, "/* END {$marker} */\n" );
}
-
- /* close file */
+
+ // Close file
ot_file_close( $f );
return true;
}
-
+
return false;
}
@@ -3122,7 +3967,7 @@
$content = '';
- foreach( $choices as $key => $choice )
+ foreach( (array) $choices as $key => $choice )
$content.= 'value is a placeholder for your condition, which can be in the form of %s.', 'option-tree' ), 'field_id:is(value), field_id:not(value), field_id:contains(value), field_id:less_than(value), field_id:less_than_or_equal_to(value), field_id:greater_than(value), or field_id:greater_than_or_equal_to(value)' ) . '