X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/76aea3697c6043c1613370f172395b4f65ee71f0..245e789b234afa4525862e7a6e5e3c2e7a52ef20:/wp-admin/widgets.php?ds=inline diff --git a/wp-admin/widgets.php b/wp-admin/widgets.php index 74922767..9383d743 100644 --- a/wp-admin/widgets.php +++ b/wp-admin/widgets.php @@ -1,327 +1,442 @@ - -
-

-
- -
-

follow these instructions.' ); /* TODO: article on codex */; ?>

-
+get_current_screen()->add_help_tab( array( +'id' => 'overview', +'title' => __('Overview'), +'content' => + '

' . __('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.') . '

' +) ); +get_current_screen()->add_help_tab( array( +'id' => 'removing-reusing', +'title' => __('Removing and Reusing'), +'content' => + '

' . __('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.') . '

' +) ); +get_current_screen()->add_help_tab( array( +'id' => 'missing-widgets', +'title' => __('Missing Widgets'), +'content' => + '

' . __('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.') . '

' . + '

' . __('When changing themes, there is often some variation in the number and setup of widget areas/sidebars and sometimes these conflicts make the transition a bit less smooth. If you changed themes and seem to be missing widgets, scroll down on this screen to the Inactive Widgets area, where all of your widgets and their settings will have been saved.') . '

' +) ); + +get_current_screen()->set_help_sidebar( + '

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

' . + '

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

' . + '

' . __('Support Forums') . '

' +); -follow these instructions.' ) ); } // These are the widgets grouped by sidebar $sidebars_widgets = wp_get_sidebars_widgets(); + if ( empty( $sidebars_widgets ) ) $sidebars_widgets = wp_get_widget_defaults(); -// for the sake of PHP warnings -if ( empty( $sidebars_widgets[$sidebar] ) ) - $sidebars_widgets[$sidebar] = array(); - -$http_post = 'post' == strtolower($_SERVER['REQUEST_METHOD']); - -// We're updating a sidebar -if ( $http_post && isset($sidebars_widgets[$_POST['sidebar']]) ) { - check_admin_referer( 'edit-sidebar_' . $_POST['sidebar'] ); - - /* Hack #1 - * The widget_control is overloaded. It updates the widget's options AND echoes out the widget's HTML form. - * Since we want to update before sending out any headers, we have to catch it with an output buffer, - */ - ob_start(); - /* There can be multiple widgets of the same type, but the widget_control for that - * widget type needs only be called once if it's a multi-widget. - */ - $already_done = array(); - - foreach ( $wp_registered_widget_controls as $name => $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']; - } - - ob_clean(); +foreach ( $sidebars_widgets as $sidebar_id => $widgets ) { + if ( 'wp_inactive_widgets' == $sidebar_id ) + continue; + + if ( !isset( $wp_registered_sidebars[ $sidebar_id ] ) ) { + if ( ! empty( $widgets ) ) { // register the inactive_widgets area as sidebar + register_sidebar(array( + 'name' => __( 'Inactive Sidebar (not used)' ), + 'id' => $sidebar_id, + 'class' => 'inactive-sidebar orphan-sidebar', + 'description' => __( 'This sidebar is no longer available and does not show anywhere on your site. Remove each of the widgets below to fully remove this inactive sidebar.' ), + 'before_widget' => '', + 'after_widget' => '', + 'before_title' => '', + 'after_title' => '', + )); + } else { + unset( $sidebars_widgets[ $sidebar_id ] ); } - ob_end_clean(); - - // Prophylactic. Take out empty ids. - foreach ( (array) $_POST['widget-id'] as $key => $val ) - if ( !$val ) - unset($_POST['widget-id'][$key]); - - // 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 ); - - wp_redirect( add_query_arg( 'message', 'updated' ) ); - exit; + } } +// register the inactive_widgets area as sidebar +register_sidebar(array( + 'name' => __('Inactive Widgets'), + 'id' => 'wp_inactive_widgets', + 'class' => 'inactive-sidebar', + 'description' => __( 'Drag widgets here to remove them from the sidebar but keep their settings.' ), + 'before_widget' => '', + 'after_widget' => '', + 'before_title' => '', + 'after_title' => '', +)); +retrieve_widgets(); +// We're saving a widget without js +if ( isset($_POST['savewidget']) || isset($_POST['removewidget']) ) { + $widget_id = $_POST['widget-id']; + check_admin_referer("save-delete-widget-$widget_id"); -// 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']; + $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; } } } - // 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'); + } -$sidebar_info_text = sprintf( wp_specialchars( $sidebar_info_text ), "$sidebar_widget_count", $wp_registered_sidebars[$sidebar]['name'] ); + $_POST['widget-id'] = $sidebar; -$page = isset($_GET['apage']) ? abs( (int) $_GET['apage'] ) : 1; + foreach ( (array) $wp_registered_widget_updates as $name => $control ) { + if ( $name != $id_base || !is_callable($control['callback']) ) + continue; -/* TODO: Paginate widgets list -$page_links = paginate_links( array( - 'base' => add_query_arg( 'apage', '%#%' ), - 'format' => '', - 'total' => ceil(($total = 105 )/ 10), - 'current' => $page -)); -*/ -$page_links = ' '; + ob_start(); + call_user_func_array( $control['callback'], $control['params'] ); + ob_end_clean(); -// Unsanitized! -$widget_search = isset($_GET['s']) ? $_GET['s'] : false; + 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' ) -); + $sidebars_widgets[$sidebar_id] = $sidebar; -$show = isset($_GET['show']) && isset($show_values[$_GET['show']]) ? attribute_escape( $_GET['show'] ) : false; + // 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; +} -$messages = array( - 'updated' => __('Changes saved.') -); +// 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 + $keys = array_keys( $wp_registered_sidebars ); + $sidebar = array_shift( $keys ); + + 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; + } + } + } + } -require_once( 'admin-header.php' ); + 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']) ); + } -if ( isset($_GET['message']) && isset($messages[$_GET['message']]) ) : ?> + if ( !isset($name) ) + $name = esc_html( strip_tags($control['name']) ); -

+ if ( !isset($sidebar) ) + $sidebar = isset($_GET['sidebar']) ? $_GET['sidebar'] : 'wp_inactive_widgets'; - + 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( ABSPATH . 'wp-admin/admin-header.php' ); ?> +
+

+
> +

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

\n"; ?> +
+

+
+ + $sbvalue ) { + echo "\t\t\n"; + } ?> +
"; + if ( 'wp_inactive_widgets' == $sbname || 'orphaned_widgets' == substr( $sbname, 0, 16 ) ) { + 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 "
+
+ + + + + + + +
+
+
+
+ +$errors = array( + __('Error while saving.'), + __('Error in displaying the widget settings form.') +); + +require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?> -
+
+

- + +

+ + +

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