X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/11be8dc178e77d0b46189bbd8e33a216a9b90942..fef8173b8c3bad08f495551e43cfdeac1cae6021:/wp-admin/widgets.php diff --git a/wp-admin/widgets.php b/wp-admin/widgets.php index 95e82814..4ae5478f 100644 --- a/wp-admin/widgets.php +++ b/wp-admin/widgets.php @@ -7,36 +7,138 @@ */ /** WordPress Administration Bootstrap */ -require_once( 'admin.php' ); +require_once( './admin.php' ); /** WordPress Administration Widgets API */ require_once(ABSPATH . 'wp-admin/includes/widgets.php'); -if ( ! current_user_can('switch_themes') ) +if ( ! current_user_can('edit_theme_options') ) wp_die( __( 'Cheatin’ uh?' )); -wp_enqueue_script( array( 'wp-lists', 'admin-widgets' ) ); wp_admin_css( 'widgets' ); +$widgets_access = get_user_setting( 'widgets_access' ); +if ( isset($_GET['widgets-access']) ) { + $widgets_access = 'on' == $_GET['widgets-access'] ? 'on' : 'off'; + set_user_setting( 'widgets_access', $widgets_access ); +} + +if ( 'on' == $widgets_access ) + add_filter( 'admin_body_class', create_function('', '{return " widgets_access ";}') ); +else + wp_enqueue_script('admin-widgets'); + do_action( 'sidebar_admin_setup' ); $title = __( 'Widgets' ); $parent_file = 'themes.php'; -// $sidebar = What sidebar are we editing? -if ( isset($_GET['sidebar']) && isset($wp_registered_sidebars[$_GET['sidebar']]) ) { - $sidebar = attribute_escape( $_GET['sidebar'] ); -} elseif ( is_array($wp_registered_sidebars) && !empty($wp_registered_sidebars) ) { - // By default we look at the first defined sidebar - $sidebar = array_shift( $keys = array_keys($wp_registered_sidebars) ); -} else { - // If no sidebars, die. - require_once( 'admin-header.php' ); +$help = ' +

' . __('Widgets are independent sections of content that can be placed into any widgetized area provided by your theme (commonly called sidebars). To populate your sidebars/widget areas with individual widgets, drag and drop the title bars into the desired area. By default, only the first widget area is expanded. To populate additional widget areas, click on their title bars to expand them.') . '

+

' . __('The Available Widgets section contains all the widgets you can choose from. Once you drag a widget into a sidebar, it will open to allow you to configure its settings. When you are happy with the widget settings, click the Save button and the widget will go live on your site. If you click Delete, it will remove the widget.') . '

+

' . __('If you want to remove the widget but save its setting for possible future use, just drag it into the Inactive Widgets area. You can add them back anytime from there. This is especially helpful when you switch to a theme with fewer or different widget areas.') . '

+

' . __('Widgets may be used multiple times. You can give each widget a title, to display on your site, but it’s not required.') . '

+

' . __('Enabling Accessibility Mode, via Screen Options, allows you to use Add and Edit buttons instead of using drag and drop.') . '

+

' . __('Many themes show some sidebar widgets by default until you edit your sidebars, but they are not automatically displayed in your sidebar management tool. After you make your first widget change, you can re-add the default widgets by adding them from the Available Widgets area.') . '

+'; +$help .= '

' . __('For more information:') . '

'; +$help .= '

' . __('Documentation on Widgets') . '

'; +$help .= '

' . __('Support Forums') . '

'; +add_contextual_help($current_screen, $help); + +// register the inactive_widgets area as sidebar +register_sidebar(array( + 'name' => __('Inactive Widgets'), + 'id' => 'wp_inactive_widgets', + 'description' => '', + 'before_widget' => '', + 'after_widget' => '', + 'before_title' => '', + 'after_title' => '', +)); + +// These are the widgets grouped by sidebar +$sidebars_widgets = wp_get_sidebars_widgets(); +if ( empty( $sidebars_widgets ) ) + $sidebars_widgets = wp_get_widget_defaults(); + +// look for "lost" widgets, this has to run at least on each theme change +function retrieve_widgets() { + global $wp_registered_widget_updates, $wp_registered_sidebars, $sidebars_widgets, $wp_registered_widgets; + + $_sidebars_widgets = array(); + $sidebars = array_keys($wp_registered_sidebars); + + unset( $sidebars_widgets['array_version'] ); + + $old = array_keys($sidebars_widgets); + sort($old); + sort($sidebars); + + if ( $old == $sidebars ) + return; + + // Move the known-good ones first + foreach ( $sidebars as $id ) { + if ( array_key_exists( $id, $sidebars_widgets ) ) { + $_sidebars_widgets[$id] = $sidebars_widgets[$id]; + unset($sidebars_widgets[$id], $sidebars[$id]); + } + } + + // if new theme has less sidebars than the old theme + if ( !empty($sidebars_widgets) ) { + foreach ( $sidebars_widgets as $lost => $val ) { + if ( is_array($val) ) + $_sidebars_widgets['wp_inactive_widgets'] = array_merge( (array) $_sidebars_widgets['wp_inactive_widgets'], $val ); + } + } + + // discard invalid, theme-specific widgets from sidebars + $shown_widgets = array(); + foreach ( $_sidebars_widgets as $sidebar => $widgets ) { + if ( !is_array($widgets) ) + continue; + + $_widgets = array(); + foreach ( $widgets as $widget ) { + if ( isset($wp_registered_widgets[$widget]) ) + $_widgets[] = $widget; + } + $_sidebars_widgets[$sidebar] = $_widgets; + $shown_widgets = array_merge($shown_widgets, $_widgets); + } + + $sidebars_widgets = $_sidebars_widgets; + unset($_sidebars_widgets, $_widgets); + + // find hidden/lost multi-widget instances + $lost_widgets = array(); + foreach ( $wp_registered_widgets as $key => $val ) { + if ( in_array($key, $shown_widgets, true) ) + continue; + + $number = preg_replace('/.+?-([0-9]+)$/', '$1', $key); + + if ( 2 > (int) $number ) + continue; + + $lost_widgets[] = $key; + } + + $sidebars_widgets['wp_inactive_widgets'] = array_merge($lost_widgets, (array) $sidebars_widgets['wp_inactive_widgets']); + wp_set_sidebars_widgets($sidebars_widgets); +} +retrieve_widgets(); + +if ( count($wp_registered_sidebars) == 1 ) { + // If only "wp_inactive_widgets" is defined the theme has no sidebars, die. + require_once( './admin-header.php' ); ?>
-

+

@@ -44,283 +146,268 @@ if ( isset($_GET['sidebar']) && isset($wp_registered_sidebars[$_GET['sidebar']])
$control ) { - if ( in_array( $control['callback'], $already_done ) ) - continue; - - if ( is_callable( $control['callback'] ) ) { - call_user_func_array( $control['callback'], $control['params'] ); - $control_output = ob_get_contents(); - if ( false !== strpos( $control_output, '%i%' ) ) // if it's a multi-widget, only call control function once. - $already_done[] = $control['callback']; + $number = isset($_POST['multi_number']) ? (int) $_POST['multi_number'] : ''; + if ( $number ) { + foreach ( $_POST as $key => $val ) { + if ( is_array($val) && preg_match('/__i__|%i%/', key($val)) ) { + $_POST[$key] = array( $number => array_shift($val) ); + break; } - - ob_clean(); } - ob_end_clean(); + } - // Prophylactic. Take out empty ids. - foreach ( (array) $_POST['widget-id'] as $key => $val ) - if ( !$val ) - unset($_POST['widget-id'][$key]); + $sidebar_id = $_POST['sidebar']; + $position = isset($_POST[$sidebar_id . '_position']) ? (int) $_POST[$sidebar_id . '_position'] - 1 : 0; - // Reset the key numbering and store - $new_sidebar = isset( $_POST['widget-id'] ) && is_array( $_POST['widget-id'] ) ? array_values( $_POST['widget-id'] ) : array(); - $sidebars_widgets[$_POST['sidebar']] = $new_sidebar; - wp_set_sidebars_widgets( $sidebars_widgets ); + $id_base = $_POST['id_base']; + $sidebar = isset($sidebars_widgets[$sidebar_id]) ? $sidebars_widgets[$sidebar_id] : array(); - wp_redirect( add_query_arg( 'message', 'updated' ) ); - exit; -} + // delete + if ( isset($_POST['removewidget']) && $_POST['removewidget'] ) { -// What widget (if any) are we editing -$edit_widget = -1; - -$query_args = array('add', 'remove', 'key', 'edit', '_wpnonce', 'message', 'base' ); - -if ( isset($_GET['add']) && $_GET['add'] ) { - // Add to the end of the sidebar - $control_callback; - if ( isset($wp_registered_widgets[$_GET['add']]) ) { - check_admin_referer( "add-widget_$_GET[add]" ); - $sidebars_widgets[$sidebar][] = $_GET['add']; - wp_set_sidebars_widgets( $sidebars_widgets ); - } elseif ( isset($_GET['base']) && isset($_GET['key']) ) { // It's a multi-widget - check_admin_referer( "add-widget_$_GET[add]" ); - // Copy minimal info from an existing instance of this widget to a new instance - foreach ( $wp_registered_widget_controls as $control ) { - if ( $_GET['base'] === $control['id_base'] ) { - $control_callback = $control['callback']; - $num = (int) $_GET['key']; - $control['params'][0]['number'] = $num; - $control['id'] = $control['id_base'] . '-' . $num; - $wp_registered_widget_controls[$control['id']] = $control; - $sidebars_widgets[$sidebar][] = $control['id']; - break; - } + if ( !in_array($widget_id, $sidebar, true) ) { + wp_redirect( admin_url('widgets.php?error=0') ); + exit; } - } - - // it's a multi-widget. The only way to add multi-widgets without JS is to actually submit POST content... - // so here we go - if ( is_callable( $control_callback ) ) { - require_once( 'admin-header.php' ); - ?> -
-

-
-
- - -
-
- $sidebar_id, 'widget-' . $id_base => array(), 'the-widget-id' => $widget_id, 'delete_widget' => '1'); } - wp_redirect( remove_query_arg( $query_args ) ); - exit; -} elseif ( isset($_GET['remove']) && $_GET['remove'] && isset($_GET['key']) && is_numeric($_GET['key']) ) { - // Remove from sidebar the widget of type $_GET['remove'] and in position $_GET['key'] - $key = (int) $_GET['key']; - if ( -1 < $key && ( $keys = array_keys($sidebars_widgets[$sidebar], $_GET['remove']) ) && in_array($key, $keys) ) { - check_admin_referer( "remove-widget_$_GET[remove]" ); - unset($sidebars_widgets[$sidebar][$key]); - $sidebars_widgets[$sidebar] = array_values($sidebars_widgets[$sidebar]); - wp_set_sidebars_widgets( $sidebars_widgets ); - } - wp_redirect( remove_query_arg( $query_args ) ); - exit; -} elseif ( isset($_GET['edit']) && $_GET['edit'] && isset($_GET['key']) && is_numeric($_GET['key']) ) { - // Edit widget of type $_GET['edit'] and position $_GET['key'] - $key = (int) $_GET['key']; - if ( -1 < $key && ( $keys = array_keys($sidebars_widgets[$sidebar], $_GET['edit']) ) && in_array($key, $keys) ) - $edit_widget = $key; -} -// Total number of registered sidebars -$sidebar_widget_count = count($sidebars_widgets[$sidebar]); + $_POST['widget-id'] = $sidebar; -// This is sort of lame since "widget" won't be converted to "widgets" in the JS -if ( 1 < $sidebars_count = count($wp_registered_sidebars) ) - $sidebar_info_text = __ngettext( 'You are using %1$s widget in the "%2$s" sidebar.', 'You are using %1$s widgets in the "%2$s" sidebar.', $sidebar_widget_count ); -else - $sidebar_info_text = __ngettext( 'You are using %1$s widget in the sidebar.', 'You are using %1$s widgets in the sidebar.', $sidebar_widget_count ); + foreach ( (array) $wp_registered_widget_updates as $name => $control ) { + if ( $name != $id_base || !is_callable($control['callback']) ) + continue; + ob_start(); + call_user_func_array( $control['callback'], $control['params'] ); + ob_end_clean(); -$sidebar_info_text = sprintf( wp_specialchars( $sidebar_info_text ), "$sidebar_widget_count", $wp_registered_sidebars[$sidebar]['name'] ); + break; + } -$page = isset($_GET['apage']) ? abs( (int) $_GET['apage'] ) : 1; + $sidebars_widgets[$sidebar_id] = $sidebar; -/* TODO: Paginate widgets list -$page_links = paginate_links( array( - 'base' => add_query_arg( 'apage', '%#%' ), - 'format' => '', - 'total' => ceil(($total = 105 )/ 10), - 'current' => $page -)); -*/ -$page_links = ' '; + // remove old position + if ( !isset($_POST['delete_widget']) ) { + foreach ( $sidebars_widgets as $key => $sb ) { + if ( is_array($sb) ) + $sidebars_widgets[$key] = array_diff( $sb, array($widget_id) ); + } + array_splice( $sidebars_widgets[$sidebar_id], $position, 0, $widget_id ); + } + + wp_set_sidebars_widgets($sidebars_widgets); + wp_redirect( admin_url('widgets.php?message=0') ); + exit; +} -// Unsanitized! -$widget_search = isset($_GET['s']) ? $_GET['s'] : false; +// Output the widget form without js +if ( isset($_GET['editwidget']) && $_GET['editwidget'] ) { + $widget_id = $_GET['editwidget']; + + if ( isset($_GET['addnew']) ) { + // Default to the first sidebar + $sidebar = array_shift( $keys = array_keys($wp_registered_sidebars) ); + + if ( isset($_GET['base']) && isset($_GET['num']) ) { // multi-widget + // Copy minimal info from an existing instance of this widget to a new instance + foreach ( $wp_registered_widget_controls as $control ) { + if ( $_GET['base'] === $control['id_base'] ) { + $control_callback = $control['callback']; + $multi_number = (int) $_GET['num']; + $control['params'][0]['number'] = -1; + $widget_id = $control['id'] = $control['id_base'] . '-' . $multi_number; + $wp_registered_widget_controls[$control['id']] = $control; + break; + } + } + } + } -// Not entirely sure what all should be here -$show_values = array( - '' => $widget_search ? __( 'Show any widgets' ) : __( 'Show all widgets' ), - 'unused' => __( 'Show unused widgets' ), - 'used' => __( 'Show used widgets' ) -); + if ( isset($wp_registered_widget_controls[$widget_id]) && !isset($control) ) { + $control = $wp_registered_widget_controls[$widget_id]; + $control_callback = $control['callback']; + } elseif ( !isset($wp_registered_widget_controls[$widget_id]) && isset($wp_registered_widgets[$widget_id]) ) { + $name = esc_html( strip_tags($wp_registered_widgets[$widget_id]['name']) ); + } -$show = isset($_GET['show']) && isset($show_values[$_GET['show']]) ? attribute_escape( $_GET['show'] ) : false; + if ( !isset($name) ) + $name = esc_html( strip_tags($control['name']) ); -$messages = array( - 'updated' => __('Changes saved.') -); + if ( !isset($sidebar) ) + $sidebar = isset($_GET['sidebar']) ? $_GET['sidebar'] : 'wp_inactive_widgets'; -require_once( 'admin-header.php' ); ?> + if ( !isset($multi_number) ) + $multi_number = isset($control['params'][0]['number']) ? $control['params'][0]['number'] : ''; - -

- + $id_base = isset($control['id_base']) ? $control['id_base'] : $control['id']; -
- -

- -
- -
-
-

-
- - -

- -

-
-
-
+ // show the widget form + $width = ' style="width:' . max($control['width'], 350) . 'px"'; + $key = isset($_GET['key']) ? (int) $_GET['key'] : 0; -
-

+ require_once( './admin-header.php' ); ?> +
+ +

+
> +

-
- - -
+ +
+' . __('There are no options for this widget.') . "

\n"; ?> +
+

+
+ + $sbvalue ) { + echo "\t\t\n"; + } ?> +
"; + if ( 'wp_inactive_widgets' == $sbname ) { + echo ' '; + } else { + if ( !isset($sidebars_widgets[$sbname]) || !is_array($sidebars_widgets[$sbname]) ) { + $j = 1; + $sidebars_widgets[$sbname] = array(); + } else { + $j = count($sidebars_widgets[$sbname]); + if ( isset($_GET['addnew']) || !in_array($widget_id, $sidebars_widgets[$sbname], true) ) + $j++; + } + $selected = ''; + echo "\t\t\n"; + } + echo "
+
+ + + + + + + +
+
+
+
+ +$messages = array( + __('Changes saved.') +); -
+$errors = array( + __('Error while saving.'), + __('Error in displaying the widget settings form.') +); - +require_once( './admin-header.php' ); ?> -
-

- -

-
+
+ +

+ + +

+ + +

+ + + + +
+
+
+
+

+

+
+

+
+
-
- -
- -
- - - +
-
-
- - - +
+
+

+

+

+
+

+ +
+
+
+
-

- - - +

+
-

+$i = 0; +foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) { + if ( 'wp_inactive_widgets' == $sidebar ) + continue; + $closed = $i ? ' closed' : ''; ?> +
+
+

+

+

+
- - -
- + +
+
+
+ +
+
- - - - - +