Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix settings reset on save; Fix warnings on save #74

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+27 −19
Open

Fix settings reset on save; Fix warnings on save #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

.DS_Store
.idea
upthemes_framework_git.esproj/Project.espressostorage

upthemes_framework_git.esproj/user.chriswallace.espressostorage
42 changes: 25 additions & 17 deletions library/options-sanitize.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ function upfw_options_validate( $input ) {
global $up_tabs;

// This is the "whitelist": current settings
$valid_input = (array) upfw_get_options();
$actual_options = (array) upfw_get_options();
// Get the array of Theme settings, by Settings Page tab
$settingsbytab = upfw_get_settings_by_tab();
// Get the array of option parameters
Expand All @@ -45,24 +45,33 @@ function upfw_options_validate( $input ) {
}

// Determine what tab was input
global $wp_customize;

$submittab = '';
foreach ( $up_tabs as $tab ) {
$submitname = 'submit-' . $tab['name'];
$resetname = 'reset-' . $tab['name'];
if ( ! empty( $input[$submitname] ) || ! empty($input[$resetname] ) ) {
$submittab = $tab['name'];
if ( isset( $wp_customize ) ) {
$submittab = 'all';
} else {
foreach ( $up_tabs as $tab ) {
$submitname = 'submit-' . $tab['name'];
$resetname = 'reset-' . $tab['name'];
if ( ! empty( $input[$submitname] ) || ! empty($input[$resetname] ) ) {
$submittab = $tab['name'];
}
}
}

global $wp_customize;
// Get settings by tab
$tabsettings = ( isset ( $wp_customize ) ? $settingsbytab['all'] : $settingsbytab[$submittab] );
if ( ! isset( $settingsbytab[$submittab] ) ) {
return $actual_options;
}

$tabsettings = $settingsbytab[$submittab];

$clean = $actual_options;

// Loop through each tab setting
foreach ( $tabsettings as $setting ) {

// If no option is selected, set the default
$valid_input[$setting] = ( ! isset( $input[$setting] ) ? $option_defaults[$setting] : $input[$setting] );
$clean[$setting] = ( ! isset( $input[$setting] ) ? $option_defaults[$setting] : $input[$setting] );

// If submit, validate/sanitize $input
if ( 'submit' == $submittype ) {
Expand All @@ -84,22 +93,21 @@ function upfw_options_validate( $input ) {
$setting = preg_replace( '/[^a-zA-Z0-9._\-]/', '', strtolower( $option['name'] ) );

// Set checkbox to false if it wasn't sent in the $_POST
if ( 'checkbox' == $option['type'] && ! isset( $input[$setting] ) ) {
$input[$setting] = false;
if ( 'checkbox' == $option['type'] && ! isset( $clean[$setting] ) ) {
$clean[$setting] = false;
}

// Set each item in the multicheck to false if it wasn't sent in the $_POST
if ( ( 'multicheck' == $option['type'] ) && ! isset( $input[$setting] ) ) {
if ( ( 'multicheck' == $option['type'] ) && ! isset( $clean[$setting] ) ) {
foreach ( $option['valid_options'] as $key => $value ) {
$input[$setting][$key] = false;
$clean[$setting][$key] = false;
}
}

// For a value to be submitted to database it must pass through a sanitization filter
if ( has_filter( 'upfw_sanitize_' . $option['type'] ) ) {
$clean[$setting] = apply_filters( 'upfw_sanitize_' . $option['type'], $input[$setting], $option );
$clean[$setting] = apply_filters( 'upfw_sanitize_' . $option['type'], $clean[$setting], $option );
}

}
// If reset, reset defaults
elseif ( 'reset' == $submittype ) {
Expand Down