← All changes | adminimize.php +579 -704 1.7.19 → 1.7.17 View file →

		@@ -1,8 +1,8 @@
1	1	<?php
2	2	/**
3	3	* @package Adminimize
4		- * @author Frank Bültge
	4	+ * @author Frank B&uuml;ltge
5	5	*/
6	6
7	7	/*
8	8	Plugin Name: Adminimize
		@@ -11,9 +11,9 @@
11	11	Domain Path: /languages
12	12	Description: Visually compresses the administratrive meta-boxes so that more admin page content can be initially seen. The plugin that lets you hide 'unnecessary' items from the WordPress administration menu, for alle roles of your install. You can also hide post meta controls on the edit-area to simplify the interface. It is possible to simplify the admin in different for all roles.
13	13	Author: Frank B&uuml;ltge
14	14	Author URI: http://bueltge.de/
15		-Version: 1.7.19
	15	+Version: 1.7.17
16	16	License: GPL
17	17	*/
18	18
19	19	/**
		@@ -23,51 +23,40 @@
23	23	*/
24	24
25	25
26	26	global $wp_version;
27		-if ( ! function_exists( 'add_action' ) || version_compare( $wp_version, "2.5alpha", "<") ) {
28		- if ( function_exists( 'add_action' ) )
	27	+if ( !function_exists ('add_action') || version_compare($wp_version, "2.5alpha", "<") ) {
	28	+ if ( function_exists ('add_action') )
29	29	$exit_msg = 'The plugin <em><a href="http://bueltge.de/wordpress-admin-theme-adminimize/674/">Adminimize</a></em> requires WordPress 2.5 or newer. <a href="http://codex.wordpress.org/Upgrading_WordPress">Please update WordPress</a> or delete the plugin.';
30	30	else
31	31	$exit_msg = '';
32	32
33		- header( 'Status: 403 Forbidden' );
34		- header( 'HTTP/1.1 403 Forbidden' );
35		- exit( $exit_msg );
	33	+ header('Status: 403 Forbidden');
	34	+ header('HTTP/1.1 403 Forbidden');
	35	+ exit($exit_msg);
36	36	}
37	37
38		-if ( function_exists( 'add_action' ) ) {
	38	+if ( function_exists('add_action') ) {
39	39
40	40	// Pre-2.6 compatibility
41		- if ( ! defined( 'WP_CONTENT_URL' ) )
	41	+ if ( !defined( 'WP_CONTENT_URL' ) )
42	42	define( 'WP_CONTENT_URL', get_option( 'siteurl' ) . '/wp-content' );
43		- if ( ! defined( 'WP_CONTENT_DIR' ) )
	43	+ if ( !defined( 'WP_CONTENT_DIR' ) )
44	44	define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' );
45		- if ( ! defined( 'WP_PLUGIN_URL' ) )
	45	+ if ( !defined( 'WP_PLUGIN_URL' ) )
46	46	define( 'WP_PLUGIN_URL', WP_CONTENT_URL. '/plugins' );
47		- if ( ! defined( 'WP_PLUGIN_DIR' ) )
	47	+ if ( !defined( 'WP_PLUGIN_DIR' ) )
48	48	define( 'WP_PLUGIN_DIR', WP_CONTENT_DIR . '/plugins' );
49	49
50	50	// plugin definitions
51	51	define( 'FB_ADMINIMIZE_BASENAME', plugin_basename( __FILE__ ) );
52	52	define( 'FB_ADMINIMIZE_BASEFOLDER', plugin_basename( dirname( __FILE__ ) ) );
53		- define( 'FB_ADMINIMIZE_TEXTDOMAIN', _mw_adminimize_get_plugin_data( 'TextDomain' ) );
	53	+ define( 'FB_ADMINIMIZE_TEXTDOMAIN', 'adminimize' );
54	54	}
55	55
56		-function _mw_adminimize_get_plugin_data( $value = 'Version' ) {
57		-
58		- if ( ! function_exists( 'get_plugin_data' ) )
59		- require_once( ABSPATH . '/wp-admin/includes/plugin.php' );
60		-
61		- $plugin_data = get_plugin_data( __FILE__ );
62		- $plugin_value = $plugin_data[$value];
63		-
64		- return $plugin_value;
65		-}
66		-
67	56	function _mw_adminimize_textdomain() {
68	57
69		- load_plugin_textdomain( FB_ADMINIMIZE_TEXTDOMAIN, FALSE, dirname( FB_ADMINIMIZE_BASENAME ) . '/languages' );
	58	+ load_plugin_textdomain( FB_ADMINIMIZE_TEXTDOMAIN, FALSE, dirname( FB_ADMINIMIZE_BASENAME ) . '/languages');
70	59	}
71	60
72	61
73	62	function _mw_adminimize_register_styles() {
		@@ -75,17 +64,13 @@
75	64	wp_register_style( 'adminimize-style', plugins_url( 'css/style.css', __FILE__ ) );
76	65	}
77	66
78	67
79		-function _mw_adminimize_recursive_in_array( $needle, $haystack ) {
	68	+function recursive_in_array($needle, $haystack) {
80	69
81	70	if ( '' != $haystack ) {
82		- foreach ( $haystack as $stalk ) {
83		- if ( $needle == $stalk ||
84		- ( is_array( $stalk) &&
85		- _mw_adminimize_recursive_in_array( $needle, $stalk )
86		- )
87		- ) {
	71	+ foreach ($haystack as $stalk) {
	72	+ if ( $needle == $stalk || ( is_array($stalk) && recursive_in_array($needle, $stalk) ) ) {
88	73	return TRUE;
89	74	}
90	75	}
91	76	return FALSE;
		@@ -101,10 +86,9 @@
101	86	/**
102	87	* constructor
103	88	*/
104	89	function _mw_adminimize_message_class() {
105		-
106		- $this->localizion_name = FB_ADMINIMIZE_TEXTDOMAIN;
	90	+ $this->localizionName = FB_ADMINIMIZE_TEXTDOMAIN;
107	91	$this->errors = new WP_Error();
108	92	$this->initialize_errors();
109	93	}
110	94
		@@ -112,15 +96,13 @@
112	96	* get_error - Returns an error message based on the passed code
113	97	* Parameters - $code (the error code as a string)
114	98	* @return Returns an error message
115	99	*/
116		- function get_error( $code = '' ) {
117		-
118		- $errorMessage = $this->errors->get_error_message( $code );
119		-
120		- if ( $errorMessage == NULL )
121		- return __( 'Unknown error.', $this->localizion_name );
122		-
	100	+ function get_error($code = '') {
	101	+ $errorMessage = $this->errors->get_error_message($code);
	102	+ if ($errorMessage == NULL) {
	103	+ return __("Unknown error.", $this->localizionName);
	104	+ }
123	105	return $errorMessage;
124	106	}
125	107
126	108	/**
		@@ -126,26 +108,25 @@
126	108	/**
127	109	* Initializes all the error messages
128	110	*/
129	111	function initialize_errors() {
130		- $this->errors->add( '_mw_adminimize_update', __( 'The updates were saved.', $this->localizion_name ) );
131		- $this->errors->add( '_mw_adminimize_access_denied', __( 'You have not enough rights to edit entries in the database.', $this->localizion_name ) );
132		- $this->errors->add( '_mw_adminimize_import', __( 'All entries in the database were imported.', $this->localizion_name ) );
133		- $this->errors->add( '_mw_adminimize_deinstall', __( 'All entries in the database were deleted.', $this->localizion_name ) );
134		- $this->errors->add( '_mw_adminimize_deinstall_yes', __( 'Set the checkbox on deinstall-button.', $this->localizion_name ) );
135		- $this->errors->add( '_mw_adminimize_get_option', __( 'Can\'t load menu and submenu.', $this->localizion_name ) );
136		- $this->errors->add( '_mw_adminimize_set_theme', __( 'Backend-Theme was activated!', $this->localizion_name ) );
137		- $this->errors->add( '_mw_adminimize_load_theme', __( 'Load user data to themes was successful.', $this->localizion_name ) );
	112	+ $this->errors->add('_mw_adminimize_update', __('The updates were saved.', $this->localizionName));
	113	+ $this->errors->add('_mw_adminimize_access_denied', __('You have not enough rights to edit entries in the database.', $this->localizionName));
	114	+ $this->errors->add('_mw_adminimize_import', __('All entries in the database were imported.', $this->localizionName));
	115	+ $this->errors->add('_mw_adminimize_deinstall', __('All entries in the database were deleted.', $this->localizionName));
	116	+ $this->errors->add('_mw_adminimize_deinstall_yes', __('Set the checkbox on deinstall-button.', $this->localizionName));
	117	+ $this->errors->add('_mw_adminimize_get_option', __('Can\'t load menu and submenu.', $this->localizionName));
	118	+ $this->errors->add('_mw_adminimize_set_theme', __('Backend-Theme was activated!', $this->localizionName));
	119	+ $this->errors->add('_mw_adminimize_load_theme', __('Load user data to themes was successful.', $this->localizionName));
138	120	}
	121	+}
139	122
140		-} // end class
141	123
142		-
143	124	function _mw_adminimize_exclude_super_admin() {
144	125	// exclude super admin
145		- if ( function_exists( 'is_super_admin' )
	126	+ if ( function_exists('is_super_admin')
146	127	&& is_super_admin()
147		- && 1 == _mw_adminimize_get_option_value( '_mw_adminimize_exclude_super_admin' )
	128	+ && 1 == _mw_adminimize_getOptionValue('_mw_adminimize_exclude_super_admin')
148	129	)
149	130	return TRUE;
150	131
151	132	return FALSE;
		@@ -152,22 +133,22 @@
152	133	}
153	134
154	135
155	136	/**
156		- * _mw_adminimize_get_all_user_roles() - Returns an array with all user roles(names) in it.
	137	+ * get_all_user_roles() - Returns an array with all user roles(names) in it.
157	138	* Inclusive self defined roles (for example with the 'Role Manager' plugin).
158	139	* code by Vincent Weber, www.webRtistik.nl
159	140	* @uses $wp_roles
160	141	* @return $user_roles
161	142	*/
162		-function _mw_adminimize_get_all_user_roles() {
	143	+function get_all_user_roles() {
163	144	global $wp_roles;
164	145
165	146	$user_roles = array();
166	147
167		- if ( isset( $wp_roles->roles) && is_array( $wp_roles->roles) ) {
168		- foreach ( $wp_roles->roles as $role => $data) {
169		- array_push( $user_roles, $role );
	148	+ if ( isset($wp_roles->roles) && is_array($wp_roles->roles) ) {
	149	+ foreach ($wp_roles->roles as $role => $data) {
	150	+ array_push($user_roles, $role);
170	151	//$data contains caps, maybe for later use..
171	152	}
172	153	}
173	154
		@@ -175,25 +156,25 @@
175	156	}
176	157
177	158
178	159	/**
179		- * _mw_adminimize_get_all_user_roles_names() - Returns an array with all user roles_names in it.
	160	+ * get_all_user_roles_names() - Returns an array with all user roles_names in it.
180	161	* Inclusive self defined roles (for example with the 'Role Manager' plugin).
181	162	* @uses $wp_roles
182	163	* @return $user_roles_names
183	164	*/
184		-function _mw_adminimize_get_all_user_roles_names() {
	165	+function get_all_user_roles_names() {
185	166	global $wp_roles;
186	167
187	168	$user_roles_names = array();
188	169
189		- foreach ( $wp_roles->role_names as $role_name => $data) {
190		- if ( function_exists( 'translate_user_role' ) )
	170	+ foreach ($wp_roles->role_names as $role_name => $data) {
	171	+ if ( function_exists('translate_user_role') )
191	172	$data = translate_user_role( $data );
192	173	else
193	174	$data = translate_with_context( $data );
194	175
195		- array_push( $user_roles_names, $data );
	176	+ array_push($user_roles_names, $data );
196	177	}
197	178
198	179	return $user_roles_names;
199	180	}
		@@ -204,11 +185,11 @@
204	185	* @return boolean
205	186	*/
206	187	function _mw_adminimize_control_flashloader() {
207	188
208		- $_mw_adminimize_control_flashloader = _mw_adminimize_get_option_value( '_mw_adminimize_control_flashloader' );
	189	+ $_mw_adminimize_control_flashloader = _mw_adminimize_getOptionValue('_mw_adminimize_control_flashloader');
209	190
210		- if ( $_mw_adminimize_control_flashloader == '1' ) {
	191	+ if ($_mw_adminimize_control_flashloader == '1') {
211	192	return FALSE;
212	193	} else {
213	194	return TRUE;
214	195	}
		@@ -219,160 +200,129 @@
219	200	* check user-option and add new style
220	201	* @uses $pagenow
221	202	*/
222	203	function _mw_adminimize_admin_init() {
223		- global $pagenow, $post_type, $menu, $submenu, $wp_version;
	204	+ global $pagenow, $menu, $submenu, $adminimizeoptions, $wp_version;
224	205
225		- if ( isset( $_GET['post'] ) )
226		- $post_id = (int) $_GET['post'];
227		- elseif ( isset( $_POST['post_ID'] ) )
228		- $post_id = (int) $_POST['post_ID'];
229		- else
230		- $post_id = 0;
	206	+ if ( function_exists('get_post_type_object') ) {
	207	+ if ( isset($_GET['post']) )
	208	+ $post_id = (int) $_GET['post'];
	209	+ elseif ( isset($_POST['post_ID']) )
	210	+ $post_id = (int) $_POST['post_ID'];
	211	+ else
	212	+ $post_id = 0;
	213	+ $post_ID = $post_id;
	214	+ $post = NULL;
	215	+ $post_type_object = NULL;
	216	+ $post_type = NULL;
	217	+ if ( $post_id ) {
	218	+ $post = get_post($post_id);
	219	+ if ( $post ) {
	220	+ $post_type_object = get_post_type_object($post->post_type);
	221	+ if ( $post_type_object ) {
	222	+ $post_type = $post->post_type;
	223	+ $current_screen->post_type = $post->post_type;
	224	+ $current_screen->id = $current_screen->post_type;
	225	+ }
	226	+ }
	227	+ } elseif ( isset($_POST['post_type']) ) {
	228	+ $post_type_object = get_post_type_object($_POST['post_type']);
	229	+ if ( $post_type_object ) {
	230	+ $post_type = $post_type_object->name;
	231	+ $current_screen->post_type = $post_type;
	232	+ $current_screen->id = $current_screen->post_type;
	233	+ }
	234	+ }
	235	+ } else {
	236	+ $post_type = '';
	237	+ }
231	238
232		- $current_post_type = $post_type;
233		- if ( ! isset( $current_post_type ) )
234		- $current_post_type = get_post_type( $post_id );
235		- if ( ! $current_post_type )
236		- $current_post_type = str_replace( 'post_type=', '', esc_attr( $_SERVER['QUERY_STRING'] ) );
237		- if ( ! $current_post_type ) // set hard to post
238		- $current_post_type = 'post';
	239	+ $user_roles = get_all_user_roles();
239	240
240		- $user_roles = _mw_adminimize_get_all_user_roles();
241		-
242		- $adminimizeoptions = get_option( 'mw_adminimize' );
243		- // pages for post type Post
244		- $def_post_pages = array( 'edit.php', 'post.php', 'post-new.php' );
245		- $def_post_types = array( 'post' );
	241	+ $adminimizeoptions = get_option('mw_adminimize');
	242	+
	243	+ foreach ($user_roles as $role) {
	244	+ $disabled_global_option_[$role] = _mw_adminimize_getOptionValue('mw_adminimize_disabled_global_option_'. $role .'_items');
	245	+ $disabled_metaboxes_post_[$role] = _mw_adminimize_getOptionValue('mw_adminimize_disabled_metaboxes_post_'. $role .'_items');
	246	+ $disabled_metaboxes_page_[$role] = _mw_adminimize_getOptionValue('mw_adminimize_disabled_metaboxes_page_'. $role .'_items');
	247	+ $disabled_link_option_[$role] = _mw_adminimize_getOptionValue('mw_adminimize_disabled_link_option_'. $role .'_items');
	248	+ $disabled_nav_menu_option_[$role] = _mw_adminimize_getOptionValue('mw_adminimize_disabled_nav_menu_option_'. $role .'_items');
	249	+ }
	250	+
246	251	$disabled_metaboxes_post_all = array();
247		- // pages for post type Page
248		- $def_page_pages = array_merge( $def_post_pages, array( 'page-new.php', 'page.php' ) );
249		- $def_page_types = array( 'page' );
250	252	$disabled_metaboxes_page_all = array();
251		- // pages for custom post types
252		- $def_custom_pages = $def_post_pages;
253		- $args = array( 'public' => TRUE, '_builtin' => FALSE );
254		- $def_custom_types = get_post_types( $args );
255		- // pages for link pages
256		- $link_pages = array( 'link.php', 'link-manager.php', 'link-add.php', 'edit-link-categories.php' );
257		- // pages for nav menu
258		- $nav_menu_pages = array( 'nav-menus.php' );
259		- // get admin color for current user
260		- $_mw_admin_color = get_user_option( 'admin_color' );
261		-
262		- foreach ( $user_roles as $role ) {
263		- $disabled_global_option_[$role] = _mw_adminimize_get_option_value(
264		- 'mw_adminimize_disabled_global_option_' . $role . '_items'
265		- );
266		- $disabled_metaboxes_post_[$role] = _mw_adminimize_get_option_value(
267		- 'mw_adminimize_disabled_metaboxes_post_' . $role . '_items'
268		- );
269		- $disabled_metaboxes_page_[$role] = _mw_adminimize_get_option_value(
270		- 'mw_adminimize_disabled_metaboxes_page_' . $role . '_items'
271		- );
272		- foreach ( $def_custom_types as $post_type ) {
273		- $disabled_metaboxes_[$post_type . '_' . $role] = _mw_adminimize_get_option_value(
274		- 'mw_adminimize_disabled_metaboxes_' . $post_type . '_' . $role . '_items'
275		- );
276		- }
277		- $disabled_link_option_[$role] = _mw_adminimize_get_option_value(
278		- 'mw_adminimize_disabled_link_option_' . $role . '_items'
279		- );
280		- $disabled_nav_menu_option_[$role] = _mw_adminimize_get_option_value(
281		- 'mw_adminimize_disabled_nav_menu_option_' . $role . '_items'
282		- );
283		- array_push( $disabled_metaboxes_post_all, $disabled_metaboxes_post_[$role] );
284		- array_push( $disabled_metaboxes_page_all, $disabled_metaboxes_page_[$role] );
	253	+
	254	+ foreach ($user_roles as $role) {
	255	+ array_push($disabled_metaboxes_post_all, $disabled_metaboxes_post_[$role]);
	256	+ array_push($disabled_metaboxes_page_all, $disabled_metaboxes_page_[$role]);
285	257	}
286	258
287		- // global options
	259	+ $_mw_admin_color = get_user_option('admin_color');
	260	+
	261	+ //global options
288	262	// exclude super admin
289	263	if ( ! _mw_adminimize_exclude_super_admin() ) {
290		- $_mw_adminimize_footer = _mw_adminimize_get_option_value( '_mw_adminimize_footer' );
291		- switch ( $_mw_adminimize_footer) {
	264	+ $_mw_adminimize_footer = _mw_adminimize_getOptionValue('_mw_adminimize_footer');
	265	+ switch ($_mw_adminimize_footer) {
292	266	case 1:
293		- wp_enqueue_script(
294		- '_mw_adminimize_remove_footer',
295		- WP_PLUGIN_URL . '/' . FB_ADMINIMIZE_BASEFOLDER . '/js/remove_footer.js',
296		- array( 'jquery' )
297		- );
	267	+ wp_enqueue_script( '_mw_adminimize_remove_footer', WP_PLUGIN_URL . '/' . FB_ADMINIMIZE_BASEFOLDER . '/js/remove_footer.js', array('jquery') );
298	268	break;
299	269	}
300	270
301		- $_mw_adminimize_header = _mw_adminimize_get_option_value( '_mw_adminimize_header' );
302		- switch ( $_mw_adminimize_header) {
	271	+ $_mw_adminimize_header = _mw_adminimize_getOptionValue('_mw_adminimize_header');
	272	+ switch ($_mw_adminimize_header) {
303	273	case 1:
304		- wp_enqueue_script(
305		- '_mw_adminimize_remove_header',
306		- WP_PLUGIN_URL . '/' . FB_ADMINIMIZE_BASEFOLDER . '/js/remove_header.js',
307		- array( 'jquery' )
308		- );
	274	+ wp_enqueue_script( '_mw_adminimize_remove_header', WP_PLUGIN_URL . '/' . FB_ADMINIMIZE_BASEFOLDER . '/js/remove_header.js', array('jquery') );
309	275	break;
310	276	}
311	277
312	278	//post-page options
313		- if ( in_array( $pagenow, $def_post_pages ) ) {
	279	+ $post_page_pages = array('post-new.php', 'post.php', 'page-new.php', 'page.php');
	280	+ if ( in_array( $pagenow, $post_page_pages ) ) {
314	281
315		- $_mw_adminimize_writescroll = _mw_adminimize_get_option_value( '_mw_adminimize_writescroll' );
316		- switch ( $_mw_adminimize_writescroll ) {
	282	+ $_mw_adminimize_writescroll = _mw_adminimize_getOptionValue('_mw_adminimize_writescroll');
	283	+ switch ($_mw_adminimize_writescroll) {
317	284	case 1:
318		- wp_enqueue_script( '_mw_adminimize_writescroll', WP_PLUGIN_URL . '/' . FB_ADMINIMIZE_BASEFOLDER . '/js/writescroll.js', array( 'jquery' ) );
	285	+ wp_enqueue_script( '_mw_adminimize_writescroll', WP_PLUGIN_URL . '/' . FB_ADMINIMIZE_BASEFOLDER . '/js/writescroll.js', array('jquery') );
319	286	break;
320	287	}
321		- $_mw_adminimize_tb_window = _mw_adminimize_get_option_value( '_mw_adminimize_tb_window' );
322		- switch ( $_mw_adminimize_tb_window) {
	288	+ $_mw_adminimize_tb_window = _mw_adminimize_getOptionValue('_mw_adminimize_tb_window');
	289	+ switch ($_mw_adminimize_tb_window) {
323	290	case 1:
324		- wp_deregister_script( 'media-upload' );
325		- wp_enqueue_script(
326		- 'media-upload',
327		- WP_PLUGIN_URL . '/' . FB_ADMINIMIZE_BASEFOLDER . '/js/tb_window.js',
328		- array( 'thickbox' )
329		- );
	291	+ wp_deregister_script('media-upload');
	292	+ wp_enqueue_script('media-upload', WP_PLUGIN_URL . '/' . FB_ADMINIMIZE_BASEFOLDER . '/js/tb_window.js', array('thickbox'));
330	293	break;
331	294	}
332		- $_mw_adminimize_timestamp = _mw_adminimize_get_option_value( '_mw_adminimize_timestamp' );
333		- switch ( $_mw_adminimize_timestamp) {
	295	+ $_mw_adminimize_timestamp = _mw_adminimize_getOptionValue('_mw_adminimize_timestamp');
	296	+ switch ($_mw_adminimize_timestamp) {
334	297	case 1:
335		- wp_enqueue_script(
336		- '_mw_adminimize_timestamp',
337		- WP_PLUGIN_URL . '/' . FB_ADMINIMIZE_BASEFOLDER . '/js/timestamp.js',
338		- array( 'jquery' )
339		- );
	298	+ wp_enqueue_script( '_mw_adminimize_timestamp', WP_PLUGIN_URL . '/' . FB_ADMINIMIZE_BASEFOLDER . '/js/timestamp.js', array('jquery') );
340	299	break;
341	300	}
342	301
343	302	//category options
344		- $_mw_adminimize_cat_full = _mw_adminimize_get_option_value( '_mw_adminimize_cat_full' );
345		- switch ( $_mw_adminimize_cat_full ) {
	303	+ $_mw_adminimize_cat_full = _mw_adminimize_getOptionValue('_mw_adminimize_cat_full');
	304	+ switch ($_mw_adminimize_cat_full) {
346	305	case 1:
347		- wp_enqueue_style(
348		- 'adminimize-ful-category',
349		- WP_PLUGIN_URL . '/' . FB_ADMINIMIZE_BASEFOLDER . '/css/mw_cat_full.css'
350		- );
	306	+ wp_enqueue_style( 'adminimize-ful-category', WP_PLUGIN_URL . '/' . FB_ADMINIMIZE_BASEFOLDER . '/css/mw_cat_full.css' );
351	307	break;
352	308	}
353	309
354	310	// set default editor tinymce
355		- if ( _mw_adminimize_recursive_in_array(
356		- '#editor-toolbar #edButtonHTML, #quicktags',
357		- $disabled_metaboxes_page_all
358		- )
359		- || _mw_adminimize_recursive_in_array(
360		- '#editor-toolbar #edButtonHTML, #quicktags',
361		- $disabled_metaboxes_post_all
362		- ) )
363		- add_filter( 'wp_default_editor', create_function( '', 'return "tinymce";' ) );
	311	+ if ( recursive_in_array('#editor-toolbar #edButtonHTML, #quicktags', $disabled_metaboxes_page_all)
	312	+ || recursive_in_array('#editor-toolbar #edButtonHTML, #quicktags', $disabled_metaboxes_post_all) )
	313	+ add_filter( 'wp_default_editor', create_function('', 'return "tinymce";') );
364	314
365	315	// remove media bottons
366		- if ( _mw_adminimize_recursive_in_array( 'media_buttons', $disabled_metaboxes_page_all )
367		- || _mw_adminimize_recursive_in_array( 'media_buttons', $disabled_metaboxes_post_all ) )
368		- remove_action( 'media_buttons', 'media_buttons' );
	316	+ if ( recursive_in_array('media_buttons', $disabled_metaboxes_page_all)
	317	+ || recursive_in_array('media_buttons', $disabled_metaboxes_post_all) )
	318	+ remove_action('media_buttons', 'media_buttons');
369	319
370		- //add_filter( 'image_downsize', '_mw_adminimize_image_downsize', 1, 3);
	320	+ //add_filter('image_downsize', '_mw_adminimize_image_downsize', 1, 3);
371	321	}
372	322
373		- $_mw_adminimize_control_flashloader = _mw_adminimize_get_option_value( '_mw_adminimize_control_flashloader' );
374		- switch ( $_mw_adminimize_control_flashloader) {
	323	+ $_mw_adminimize_control_flashloader = _mw_adminimize_getOptionValue('_mw_adminimize_control_flashloader');
	324	+ switch ($_mw_adminimize_control_flashloader) {
375	325	case 1:
376	326	add_filter( 'flash_uploader', '_mw_adminimize_control_flashloader', 1 );
377	327	break;
378	328	}
		@@ -377,101 +327,106 @@
377	327	break;
378	328	}
379	329	}
380	330
381		- // set menu option
382		- add_action( 'admin_head', '_mw_adminimize_set_menu_option', 1 );
383		- // global_options
384		- add_action( 'admin_head', '_mw_adminimize_set_global_option', 1 );
385		-
386		- // set metabox post option
387		- if ( in_array( $pagenow, $def_post_pages ) && in_array( $current_post_type, $def_post_types) )
388		- add_action( 'admin_head', '_mw_adminimize_set_metabox_post_option', 1 );
389		- // set metabox page option
390		- if ( in_array( $pagenow, $def_page_pages ) && in_array( $current_post_type, $def_page_types) )
391		- add_action( 'admin_head', '_mw_adminimize_set_metabox_page_option', 1 );
392		- // set custom post type options
393		- if ( function_exists( 'get_post_types' ) &&
394		- in_array( $pagenow, $def_custom_pages ) &&
395		- in_array( $current_post_type, $def_custom_types)
396		- )
397		- add_action( 'admin_head', '_mw_adminimize_set_metabox_cp_option', 1 );
398		- // set link option
399		- if ( in_array( $pagenow, $link_pages ) )
400		- add_action( 'admin_head', '_mw_adminimize_set_link_option', 1 );
401		- // set wp nav menu options
402		- if ( in_array( $pagenow, $nav_menu_pages ) )
403		- add_action( 'admin_head', '_mw_adminimize_set_nav_menu_option', 1 );
404		-
405		- add_action( 'in_admin_footer', '_mw_adminimize_admin_footer' );
406		-
407		- $adminimizeoptions['mw_adminimize_default_menu'] = $menu;
408		- $adminimizeoptions['mw_adminimize_default_submenu'] = $submenu;
409		-
410		- // if custom design of Adminimize; kill with version 1.7.18
411		- if ( ( $_mw_admin_color == 'mw_fresh' ) ||
412		- ( $_mw_admin_color == 'mw_classic' ) ||
413		- ( $_mw_admin_color == 'mw_colorblind' ) ||
414		- ( $_mw_admin_color == 'mw_grey' ) ||
415		- ( $_mw_admin_color == 'mw_fresh_ozh_am' ) ||
416		- ( $_mw_admin_color == 'mw_classic_ozh_am' ) ||
417		- ( $_mw_admin_color == 'mw_fresh_lm' ) ||
418		- ( $_mw_admin_color == 'mw_classic_lm' ) ||
419		- ( $_mw_admin_color == 'mw_wp23' )
420		- ) {
	331	+ if ( ($_mw_admin_color == 'mw_fresh') ||
	332	+ ($_mw_admin_color == 'mw_classic') ||
	333	+ ($_mw_admin_color == 'mw_colorblind') ||
	334	+ ($_mw_admin_color == 'mw_grey') ||
	335	+ ($_mw_admin_color == 'mw_fresh_ozh_am') ||
	336	+ ($_mw_admin_color == 'mw_classic_ozh_am') ||
	337	+ ($_mw_admin_color == 'mw_fresh_lm') ||
	338	+ ($_mw_admin_color == 'mw_classic_lm') ||
	339	+ ($_mw_admin_color == 'mw_wp23')
	340	+ ) {
421	341
422	342	// only posts
423		- if ( ( 'post-new.php' == $pagenow ) ||
424		- ( 'post.php' == $pagenow ) ||
425		- ( 'post' == $post_type )
426		- ) {
427		- if ( version_compare( substr( $wp_version, 0, 3), '2.7', '<' ) )
428		- add_action( 'admin_head', '_mw_adminimize_remove_box', 99 );
	343	+ if (
	344	+ ( 'post-new.php' == $pagenow ) ||
	345	+ ( 'post.php' == $pagenow ) ||
	346	+ ( 'post' == $post_type )
	347	+ ) {
	348	+ if ( version_compare( substr($wp_version, 0, 3), '2.7', '<' ) )
	349	+ add_action('admin_head', '_mw_adminimize_remove_box', 99);
429	350
430	351	// check for array empty
431		- if ( !isset( $disabled_metaboxes_post_['editor']['0'] ) )
	352	+ if ( !isset($disabled_metaboxes_post_['editor']['0']) )
432	353	$disabled_metaboxes_post_['editor']['0'] = '';
433		- if ( isset( $disabled_metaboxes_post_['administrator']['0'] ) )
	354	+ if ( isset($disabled_metaboxes_post_['administrator']['0']) )
434	355	$disabled_metaboxes_post_['administrator']['0'] = '';
435		- if ( version_compare(substr( $wp_version, 0, 3), '2.7', '<' ) ) {
436		- if ( !_mw_adminimize_recursive_in_array( '#categorydivsb', $disabled_metaboxes_post_all ) )
437		- add_action( 'submitpost_box', '_mw_adminimize_sidecat_list_category_box' );
438		- if ( !_mw_adminimize_recursive_in_array( '#tagsdivsb', $disabled_metaboxes_post_all ) )
439		- add_action( 'submitpost_box', '_mw_adminimize_sidecat_list_tag_box' );
	356	+ if ( version_compare(substr($wp_version, 0, 3), '2.7', '<') ) {
	357	+ if ( !recursive_in_array('#categorydivsb', $disabled_metaboxes_post_all) )
	358	+ add_action('submitpost_box', '_mw_adminimize_sidecat_list_category_box');
	359	+ if ( !recursive_in_array('#tagsdivsb', $disabled_metaboxes_post_all) )
	360	+ add_action('submitpost_box', '_mw_adminimize_sidecat_list_tag_box');
440	361	}
441	362	}
442	363
443	364	// only pages
444		- if ( ( 'page-new.php' == $pagenow ) ||
445		- ( 'page.php' == $pagenow ) ||
446		- ( 'post_type=page' == esc_attr( $_SERVER['QUERY_STRING'] ) ) ||
447		- ( 'page' == $post_type )
448		- ) {
	365	+ if (
	366	+ ( 'page-new.php' == $pagenow ) ||
	367	+ ( 'page.php' == $pagenow ) ||
	368	+ ( 'post_type=page' == esc_attr($_SERVER['QUERY_STRING']) ) ||
	369	+ ( 'page' == $post_type )
	370	+ ) {
	371	+
449	372	// check for array empty
450		- if ( !isset( $disabled_metaboxes_page_['editor']['0'] ) )
	373	+ if ( !isset($disabled_metaboxes_page_['editor']['0']) )
451	374	$disabled_metaboxes_page_['editor']['0'] = '';
452		- if ( isset( $disabled_metaboxes_page_['administrator']['0'] ) )
	375	+ if ( isset($disabled_metaboxes_page_['administrator']['0']) )
453	376	$disabled_metaboxes_page_['administrator']['0'] = '';
454	377	}
455	378
456	379	}
	380	+
	381	+ // set menu option
	382	+ add_action('admin_head', '_mw_adminimize_set_menu_option', 1);
	383	+
	384	+ // global_options
	385	+ add_action('admin_head', '_mw_adminimize_set_global_option', 1);
	386	+
	387	+ // set metabox post option
	388	+ $post_pages = array('post-new.php', 'post.php', 'post');
	389	+ if ( in_array( $pagenow, $post_pages ) || in_array($post_type, $post_pages) ) {
	390	+ if ( ( esc_attr($_SERVER['QUERY_STRING']) != 'post_type=page' ) && ($post_type != 'page') )
	391	+ add_action('admin_head', '_mw_adminimize_set_metabox_post_option', 1);
	392	+ }
	393	+
	394	+ // set metabox page option
	395	+ $page_pages = array( 'page-new.php', 'page.php', 'post_type=page', 'page' );
	396	+ if ( in_array( $pagenow, $page_pages ) || in_array($post_type, $page_pages) || in_array( esc_attr($_SERVER['QUERY_STRING']), $page_pages) )
	397	+ add_action('admin_head', '_mw_adminimize_set_metabox_page_option', 1);
	398	+
	399	+ // set link option
	400	+ $link_pages = array('link-manager.php', 'link-add.php', 'edit-link-categories.php');
	401	+ if ( in_array( $pagenow, $link_pages ) )
	402	+ add_action('admin_head', '_mw_adminimize_set_link_option', 1);
	403	+
	404	+ // set wp nav menu options
	405	+ $nav_menu_pages = array('nav-menus.php');
	406	+ if ( in_array( $pagenow, $nav_menu_pages ) )
	407	+ add_action('admin_head', '_mw_adminimize_set_nav_menu_option', 1);
	408	+
	409	+ add_action('in_admin_footer', '_mw_adminimize_admin_footer');
	410	+
	411	+ $adminimizeoptions['mw_adminimize_default_menu'] = $menu;
	412	+ $adminimizeoptions['mw_adminimize_default_submenu'] = $submenu;
457	413	}
458	414
459	415	// on init of WordPress
	416	+add_action( 'init', '_mw_adminimize_textdomain' );
	417	+add_action( 'init', '_mw_adminimize_register_styles' );
460	418	add_action( 'init', '_mw_adminimize_remove_admin_bar' );
461	419
462	420	// on admin init
463		-add_action( 'admin_init', '_mw_adminimize_textdomain' );
464		-add_action( 'admin_init', '_mw_adminimize_register_styles', 1 );
465		-add_action( 'admin_init', '_mw_adminimize_admin_init', 2 );
	421	+add_action( 'admin_init', '_mw_adminimize_admin_init', 1 );
466	422	add_action( 'admin_menu', '_mw_adminimize_add_settings_page' );
467	423	add_action( 'admin_menu', '_mw_adminimize_remove_dashboard' );
468		-if ( version_compare( $wp_version, '3.2alpha', '<=' ) )
469		- add_action( 'admin_init', '_mw_adminimize_admin_styles', 1 );
	424	+add_action( 'admin_init', '_mw_adminimize_admin_styles', 1 );
470	425
471	426	register_activation_hook( __FILE__, '_mw_adminimize_install' );
472	427	register_uninstall_hook( __FILE__, '_mw_adminimize_deinstall' );
473		-//register_deactivation_hook(__FILE__, '_mw_adminimize_deinstall' );
	428	+//register_deactivation_hook(__FILE__, '_mw_adminimize_deinstall');
474	429
475	430
476	431	/**
477	432	* Uses WordPress filter for image_downsize, kill wp-image-dimension
		@@ -478,27 +433,27 @@
478	433	* code by Andrew Rickmann
479	434	* http://www.wp-fun.co.uk/
480	435	* @param $value, $id, $size
481	436	*/
482		-function _mw_adminimize_image_downsize( $value = FALSE, $id = 0, $size = 'medium' ) {
	437	+function _mw_adminimize_image_downsize($value = FALSE, $id = 0, $size = "medium") {
483	438
484		- if ( ! wp_attachment_is_image( $id ) )
	439	+ if ( !wp_attachment_is_image($id) )
485	440	return FALSE;
486	441
487		- $img_url = wp_get_attachment_url( $id);
	442	+ $img_url = wp_get_attachment_url($id);
488	443
489	444	// Mimic functionality in image_downsize function in wp-includes/media.php
490		- if ( $intermediate = image_get_intermediate_size( $id, $size ) ) {
491		- $img_url = str_replace( basename( $img_url ), $intermediate['file'], $img_url );
	445	+ if ( $intermediate = image_get_intermediate_size($id, $size) ) {
	446	+ $img_url = str_replace( basename($img_url), $intermediate['file'], $img_url );
492	447	} elseif ( $size == 'thumbnail' ) {
493	448	// fall back to the old thumbnail
494		- if ( $thumb_file = wp_get_attachment_thumb_file() && $info = getimagesize( $thumb_file ) ) {
495		- $img_url = str_replace( basename( $img_url ), basename( $thumb_file ), $img_url );
	449	+ if ( $thumb_file = wp_get_attachment_thumb_file() && $info = getimagesize($thumb_file) ) {
	450	+ $img_url = str_replace( basename($img_url), basename($thumb_file), $img_url );
496	451	}
497	452	}
498	453
499		- if ( $img_url )
500		- return array( $img_url, 0, 0);
	454	+ if ( $img_url)
	455	+ return array($img_url, 0, 0);
501	456
502	457	return FALSE;
503	458	}
504	459
		@@ -513,16 +468,16 @@
513	468
514	469	<div class="inside" id="categorydivsb">
515	470	<p><strong><?php _e("Categories"); ?></strong></p>
516	471	<ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
517		- <?php wp_category_checklist( $post_ID); ?>
	472	+ <?php wp_category_checklist($post_ID); ?>
518	473	</ul>
519		- <?php if ( !defined( 'WP_PLUGIN_DIR' ) ) { // for wp <2.6 ?>
	474	+ <?php if ( !defined('WP_PLUGIN_DIR') ) { // for wp <2.6 ?>
520	475	<div id="category-adder" class="wp-hidden-children">
521	476	<h4><a id="category-add-toggle" href="#category-add" class="hide-if-no-js" tabindex="3"><?php _e( '+ Add New Category' ); ?></a></h4>
522	477	<p id="category-add" class="wp-hidden-child">
523	478	<input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php _e( 'New category name' ); ?>" tabindex="3" />
524		- <?php wp_dropdown_categories( array( 'hide_empty' => 0, 'name' => 'newcat_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __( 'Parent category' ), 'tab_index' => 3 ) ); ?>
	479	+ <?php wp_dropdown_categories( array( 'hide_empty' => 0, 'name' => 'newcat_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('Parent category'), 'tab_index' => 3 ) ); ?>
525	480	<input type="button" id="category-add-sumbit" class="add:categorychecklist:category-add button" value="<?php _e( 'Add' ); ?>" tabindex="3" />
526	481	<?php wp_nonce_field( 'add-category', '_ajax_nonce', FALSE ); ?>
527	482	<span id="category-ajax-response"></span>
528	483	</p>
		@@ -532,9 +487,9 @@
532	487	<h4><a id="category-add-toggle" href="#category-add" class="hide-if-no-js" tabindex="3"><?php _e( '+ Add New Category' ); ?></a></h4>
533	488	<p id="category-add" class="wp-hidden-child">
534	489	<label class="hidden" for="newcat"><?php _e( 'Add New Category' ); ?></label><input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php _e( 'New category name' ); ?>" tabindex="3" aria-required="TRUE"/>
535	490	<br />
536		- <label class="hidden" for="newcat_parent"><?php _e( 'Parent category' ); ?>:</label><?php wp_dropdown_categories( array( 'hide_empty' => 0, 'name' => 'newcat_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __( 'Parent category' ), 'tab_index' => 3 ) ); ?>
	491	+ <label class="hidden" for="newcat_parent"><?php _e('Parent category'); ?>:</label><?php wp_dropdown_categories( array( 'hide_empty' => 0, 'name' => 'newcat_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('Parent category'), 'tab_index' => 3 ) ); ?>
537	492	<input type="button" id="category-add-sumbit" class="add:categorychecklist:category-add button" value="<?php _e( 'Add' ); ?>" tabindex="3" />
538	493	<?php wp_nonce_field( 'add-category', '_ajax_nonce', FALSE ); ?>
539	494	<span id="category-ajax-response"></span>
540	495	</p>
		@@ -551,13 +506,13 @@
551	506	*/
552	507	function _mw_adminimize_sidecat_list_tag_box() {
553	508	global $post_ID;
554	509
555		- if ( !class_exists( 'SimpleTagsAdmin' ) ) {
	510	+ if ( !class_exists('SimpleTagsAdmin') ) {
556	511	?>
557	512	<div class="inside" id="tagsdivsb">
558		- <p><strong><?php _e( 'Tags' ); ?></strong></p>
559		- <p id="jaxtag"><label class="hidden" for="newtag"><?php _e( 'Tags' ); ?></label><input type="text" name="tags_input" class="tags-input" id="tags-input" size="40" tabindex="3" value="<?php echo get_tags_to_edit( $post_ID); ?>" /></p>
	513	+ <p><strong><?php _e('Tags'); ?></strong></p>
	514	+ <p id="jaxtag"><label class="hidden" for="newtag"><?php _e('Tags'); ?></label><input type="text" name="tags_input" class="tags-input" id="tags-input" size="40" tabindex="3" value="<?php echo get_tags_to_edit($post_ID); ?>" /></p>
560	515	<div id="tagchecklist"></div>
561	516	</div>
562	517	<?php
563	518	}
		@@ -569,17 +524,17 @@
569	524	* @echo script
570	525	*/
571	526	function _mw_adminimize_remove_box() {
572	527
573		- if ( function_exists( 'remove_meta_box' ) ) {
574		- if ( !class_exists( 'SimpleTagsAdmin' ) )
575		- remove_meta_box( 'tagsdiv', 'post', 'normal' );
	528	+ if ( function_exists('remove_meta_box') ) {
	529	+ if ( !class_exists('SimpleTagsAdmin') )
	530	+ remove_meta_box('tagsdiv', 'post', 'normal');
576	531
577		- remove_meta_box( 'categorydiv', 'post', 'normal' );
	532	+ remove_meta_box('categorydiv', 'post', 'normal');
578	533	} else {
579	534	$_mw_adminimize_sidecat_admin_head = "\n" . '<script type="text/javascript">' . "\n";
580		- $_mw_adminimize_sidecat_admin_head .= "\t" . 'jQuery(document).ready(function() { jQuery(\'#categorydiv\' ).remove(); });' . "\n";
581		- $_mw_adminimize_sidecat_admin_head .= "\t" . 'jQuery(document).ready(function() { jQuery(\'#tagsdiv\' ).remove(); });' . "\n";
	535	+ $_mw_adminimize_sidecat_admin_head .= "\t" . 'jQuery(document).ready(function() { jQuery(\'#categorydiv\').remove(); });' . "\n";
	536	+ $_mw_adminimize_sidecat_admin_head .= "\t" . 'jQuery(document).ready(function() { jQuery(\'#tagsdiv\').remove(); });' . "\n";
582	537	$_mw_adminimize_sidecat_admin_head .= '</script>' . "\n";
583	538
584	539	echo $_mw_adminimize_sidecat_admin_head;
585	540	}
		@@ -589,9 +544,9 @@
589	544	/**
590	545	* add new adminstyle to usersettings
591	546	* @param $file
592	547	*/
593		-function _mw_adminimize_admin_styles( $file ) {
	548	+function _mw_adminimize_admin_styles($file) {
594	549	global $wp_version;
595	550
596	551	$_mw_adminimize_path = WP_PLUGIN_URL . '/' . plugin_basename( dirname(__FILE__) ) . '/css/';
597	552
		@@ -597,19 +552,19 @@
597	552
598	553	if ( version_compare( $wp_version, '3.0alpha', '>=' ) ) {
599	554
600	555	// MW Adminimize Classic Tweak
601		- $styleName = 'Adminimize:' . ' Tweak ' . __( 'Blue' );
	556	+ $styleName = 'Adminimize:' . ' Tweak ' . __('Blue');
602	557	wp_admin_css_color (
603	558	'mw_classic_tweak', $styleName, $_mw_adminimize_path . 'mw_classic28_tweak.css',
604		- array( '#073447', '#21759b', '#eaf3fa', '#bbd8e7' )
	559	+ array('#073447', '#21759b', '#eaf3fa', '#bbd8e7')
605	560	);
606	561
607	562	// MW Adminimize Fresh Tweak
608		- $styleName = 'Adminimize:' . ' Tweak ' . __( 'Gray' );
	563	+ $styleName = 'Adminimize:' . ' Tweak ' . __('Gray');
609	564	wp_admin_css_color (
610	565	'mw_fresh_tweak', $styleName, $_mw_adminimize_path . 'mw_fresh28_tweak.css',
611		- array( '#464646', '#6d6d6d', '#f1f1f1', '#dfdfdf' )
	566	+ array('#464646', '#6d6d6d', '#f1f1f1', '#dfdfdf')
612	567	);
613	568
614	569	}
615	570
		@@ -614,83 +569,83 @@
614	569	}
615	570
616	571	if ( version_compare( $wp_version, '2.7alpha', '>=' ) && version_compare( $wp_version, '3.0alpha', '<' ) ) {
617	572	// MW Adminimize Classic
618		- $styleName = 'Adminimize:' . ' ' . __( 'Blue' );
	573	+ $styleName = 'Adminimize:' . ' ' . __('Blue');
619	574	wp_admin_css_color (
620	575	'mw_classic', $styleName, $_mw_adminimize_path . 'mw_classic27.css',
621		- array( '#073447', '#21759b', '#eaf3fa', '#bbd8e7' )
	576	+ array('#073447', '#21759b', '#eaf3fa', '#bbd8e7')
622	577	);
623	578
624	579	// MW Adminimize Fresh
625		- $styleName = 'Adminimize:' . ' ' . __( 'Gray' );
	580	+ $styleName = 'Adminimize:' . ' ' . __('Gray');
626	581	wp_admin_css_color (
627	582	'mw_fresh', $styleName, $_mw_adminimize_path . 'mw_fresh27.css',
628		- array( '#464646', '#6d6d6d', '#f1f1f1', '#dfdfdf' )
	583	+ array('#464646', '#6d6d6d', '#f1f1f1', '#dfdfdf')
629	584	);
630	585
631	586	// MW Adminimize Classic Fixed
632		- $styleName = 'Adminimize:' . ' Fixed ' . __( 'Blue' );
	587	+ $styleName = 'Adminimize:' . ' Fixed ' . __('Blue');
633	588	wp_admin_css_color (
634	589	'mw_classic_fixed', $styleName, $_mw_adminimize_path . 'mw_classic28_fixed.css',
635		- array( '#073447', '#21759b', '#eaf3fa', '#bbd8e7' )
	590	+ array('#073447', '#21759b', '#eaf3fa', '#bbd8e7')
636	591	);
637	592
638	593	// MW Adminimize Fresh Fixed
639		- $styleName = 'Adminimize:' . ' Fixed ' . __( 'Gray' );
	594	+ $styleName = 'Adminimize:' . ' Fixed ' . __('Gray');
640	595	wp_admin_css_color (
641	596	'mw_fresh_fixed', $styleName, $_mw_adminimize_path . 'mw_fresh28_fixed.css',
642		- array( '#464646', '#6d6d6d', '#f1f1f1', '#dfdfdf' )
	597	+ array('#464646', '#6d6d6d', '#f1f1f1', '#dfdfdf')
643	598	);
644	599
645	600	// MW Adminimize Classic Tweak
646		- $styleName = 'Adminimize:' . ' Tweak ' . __( 'Blue' );
	601	+ $styleName = 'Adminimize:' . ' Tweak ' . __('Blue');
647	602	wp_admin_css_color (
648	603	'mw_classic_tweak', $styleName, $_mw_adminimize_path . 'mw_classic28_tweak.css',
649		- array( '#073447', '#21759b', '#eaf3fa', '#bbd8e7' )
	604	+ array('#073447', '#21759b', '#eaf3fa', '#bbd8e7')
650	605	);
651	606
652	607	// MW Adminimize Fresh Tweak
653		- $styleName = 'Adminimize:' . ' Tweak ' . __( 'Gray' );
	608	+ $styleName = 'Adminimize:' . ' Tweak ' . __('Gray');
654	609	wp_admin_css_color (
655	610	'mw_fresh_tweak', $styleName, $_mw_adminimize_path . 'mw_fresh28_tweak.css',
656		- array( '#464646', '#6d6d6d', '#f1f1f1', '#dfdfdf' )
	611	+ array('#464646', '#6d6d6d', '#f1f1f1', '#dfdfdf')
657	612	);
658	613
659	614	} elseif ( version_compare( $wp_version, '2.7alpha', '<' ) ) {
660	615	// MW Adminimize Classic
661		- $styleName = 'MW Adminimize:' . ' ' . __( 'Classic' );
	616	+ $styleName = 'MW Adminimize:' . ' ' . __('Classic');
662	617	wp_admin_css_color (
663	618	'mw_classic', $styleName, $_mw_adminimize_path . 'mw_classic.css',
664		- array( '#07273E', '#14568A', '#D54E21', '#2683AE' )
	619	+ array('#07273E', '#14568A', '#D54E21', '#2683AE')
665	620	);
666	621
667	622	// MW Adminimize Fresh
668		- $styleName = 'MW Adminimize:' . ' ' . __( 'Fresh' );
	623	+ $styleName = 'MW Adminimize:' . ' ' . __('Fresh');
669	624	wp_admin_css_color (
670	625	'mw_fresh', $styleName, $_mw_adminimize_path . 'mw_fresh.css',
671		- array( '#464646', '#CEE1EF', '#D54E21', '#2683AE' )
	626	+ array('#464646', '#CEE1EF', '#D54E21', '#2683AE')
672	627	);
673	628
674	629	// MW Adminimize WordPress 2.3
675		- $styleName = 'MW Adminimize:' . ' ' . __( 'WordPress 2.3' );
	630	+ $styleName = 'MW Adminimize:' . ' ' . __('WordPress 2.3');
676	631	wp_admin_css_color (
677	632	'mw_wp23', $styleName, $_mw_adminimize_path . 'mw_wp23.css',
678		- array( '#000000', '#14568A', '#448ABD', '#83B4D8' )
	633	+ array('#000000', '#14568A', '#448ABD', '#83B4D8')
679	634	);
680	635
681	636	// MW Adminimize Colorblind
682		- $styleName = 'MW Adminimize:' . ' ' . __( 'Maybe i\'m colorblind' );
	637	+ $styleName = 'MW Adminimize:' . ' ' . __('Maybe i\'m colorblind');
683	638	wp_admin_css_color (
684	639	'mw_colorblind', $styleName, $_mw_adminimize_path . 'mw_colorblind.css',
685		- array( '#FF9419', '#F0720C', '#710001', '#550007', '#CF4529' )
	640	+ array('#FF9419', '#F0720C', '#710001', '#550007', '#CF4529')
686	641	);
687	642
688	643	// MW Adminimize Grey
689		- $styleName = 'MW Adminimize:' . ' ' . __( 'Grey' );
	644	+ $styleName = 'MW Adminimize:' . ' ' . __('Grey');
690	645	wp_admin_css_color (
691	646	'mw_grey', $styleName, $_mw_adminimize_path . 'mw_grey.css',
692		- array( '#000000', '#787878', '#F0F0F0', '#D8D8D8', '#909090' )
	647	+ array('#000000', '#787878', '#F0F0F0', '#D8D8D8', '#909090')
693	648	);
694	649	}
695	650	/**
696	651	* style and changes for plugin Admin Drop Down Menu
		@@ -696,22 +651,22 @@
696	651	* style and changes for plugin Admin Drop Down Menu
697	652	* by Ozh
698	653	* http://planetozh.com/blog/my-projects/wordpress-admin-menu-drop-down-css/
699	654	*/
700		- if ( function_exists( 'wp_ozh_adminmenu' ) ) {
	655	+ if ( function_exists('wp_ozh_adminmenu') ) {
701	656
702	657	// MW Adminimize Classic include ozh adminmenu
703		- $styleName = 'MW Adminimize inc. Admin Drop Down Menu' . ' ' . __( 'Classic' );
	658	+ $styleName = 'MW Adminimize inc. Admin Drop Down Menu' . ' ' . __('Classic');
704	659	wp_admin_css_color (
705	660	'mw_classic_ozh_am', $styleName, $_mw_adminimize_path . 'mw_classic_ozh_am.css',
706		- array( '#07273E', '#14568A', '#D54E21', '#2683AE' )
	661	+ array('#07273E', '#14568A', '#D54E21', '#2683AE')
707	662	);
708	663
709	664	// MW Adminimize Fresh include ozh adminmenu
710		- $styleName = 'MW Adminimize inc. Admin Drop Down Menu' . ' ' . __( 'Fresh' );
	665	+ $styleName = 'MW Adminimize inc. Admin Drop Down Menu' . ' ' . __('Fresh');
711	666	wp_admin_css_color (
712	667	'mw_fresh_ozh_am', $styleName, $_mw_adminimize_path . 'mw_fresh_ozh_am.css',
713		- array( '#464646', '#CEE1EF', '#D54E21', '#2683AE' )
	668	+ array('#464646', '#CEE1EF', '#D54E21', '#2683AE')
714	669	);
715	670
716	671	}
717	672
		@@ -719,22 +674,22 @@
719	674	* style and changes for plugin Lighter Menus
720	675	* by corpodibacco
721	676	* http://www.italyisfalling.com/lighter-menus
722	677	*/
723		- if ( function_exists( 'lm_build' ) ) {
	678	+ if ( function_exists('lm_build') ) {
724	679
725	680	// MW Adminimize Classic include Lighter Menus
726		- $styleName = 'MW Adminimize inc. Lighter Menus' . ' ' . __( 'Classic' );
	681	+ $styleName = 'MW Adminimize inc. Lighter Menus' . ' ' . __('Classic');
727	682	wp_admin_css_color (
728	683	'mw_classic_lm', $styleName, $_mw_adminimize_path . 'mw_classic_lm.css',
729		- array( '#07273E', '#14568A', '#D54E21', '#2683AE' )
	684	+ array('#07273E', '#14568A', '#D54E21', '#2683AE')
730	685	);
731	686
732	687	// MW Adminimize Fresh include Lighter Menus
733		- $styleName = 'MW Adminimize inc. Lighter Menus' . ' ' . __( 'Fresh' );
	688	+ $styleName = 'MW Adminimize inc. Lighter Menus' . ' ' . __('Fresh');
734	689	wp_admin_css_color (
735	690	'mw_fresh_lm', $styleName, $_mw_adminimize_path . 'mw_fresh_lm.css',
736		- array( '#464646', '#CEE1EF', '#D54E21', '#2683AE' )
	691	+ array('#464646', '#CEE1EF', '#D54E21', '#2683AE')
737	692	);
738	693
739	694	}
740	695	}
		@@ -747,30 +702,30 @@
747	702	*/
748	703	function _mw_adminimize_remove_dashboard() {
749	704	global $menu, $submenu, $user_ID, $wp_version;
750	705
751		- $user_roles = _mw_adminimize_get_all_user_roles();
	706	+ $user_roles = get_all_user_roles();
752	707
753		- foreach ( $user_roles as $role ) {
754		- $disabled_menu_[$role] = _mw_adminimize_get_option_value( 'mw_adminimize_disabled_menu_' . $role . '_items' );
755		- $disabled_submenu_[$role] = _mw_adminimize_get_option_value( 'mw_adminimize_disabled_submenu_' . $role . '_items' );
	708	+ foreach ($user_roles as $role) {
	709	+ $disabled_menu_[$role] = _mw_adminimize_getOptionValue('mw_adminimize_disabled_menu_'. $role .'_items');
	710	+ $disabled_submenu_[$role] = _mw_adminimize_getOptionValue('mw_adminimize_disabled_submenu_'. $role .'_items');
756	711	}
757	712
758	713	$disabled_menu_all = array();
759	714	$disabled_submenu_all = array();
760	715
761		- foreach ( $user_roles as $role ) {
762		- array_push( $disabled_menu_all, $disabled_menu_[$role] );
763		- array_push( $disabled_submenu_all, $disabled_submenu_[$role] );
	716	+ foreach ($user_roles as $role) {
	717	+ array_push($disabled_menu_all, $disabled_menu_[$role]);
	718	+ array_push($disabled_submenu_all, $disabled_submenu_[$role]);
764	719	}
765	720
766	721	// remove dashboard
767	722	if ( $disabled_menu_all != '' || $disabled_submenu_all != '' ) {
768	723
769		- foreach ( $user_roles as $role ) {
	724	+ foreach ($user_roles as $role) {
770	725
771		- if ( current_user_can( $role ) ) {
772		- if ( _mw_adminimize_recursive_in_array( 'index.php', $disabled_menu_[$role] ) || _mw_adminimize_recursive_in_array( 'index.php', $disabled_submenu_[$role] ) )
	726	+ if ( current_user_can($role) ) {
	727	+ if ( recursive_in_array('index.php', $disabled_menu_[$role]) || recursive_in_array('index.php', $disabled_submenu_[$role]) )
773	728	$redirect = TRUE;
774	729	else
775	730	$redirect = FALSE;
776	731	}
		@@ -776,11 +731,11 @@
776	731	}
777	732	}
778	733
779	734	if ( $redirect ) {
780		- $_mw_adminimize_db_redirect = _mw_adminimize_get_option_value( '_mw_adminimize_db_redirect' );
781		- $_mw_adminimize_db_redirect_admin_url = get_option( 'siteurl' ) . '/wp-admin/';
782		- switch ( $_mw_adminimize_db_redirect) {
	735	+ $_mw_adminimize_db_redirect = _mw_adminimize_getOptionValue('_mw_adminimize_db_redirect');
	736	+ $_mw_adminimize_db_redirect_admin_url = get_option('siteurl') . '/wp-admin/';
	737	+ switch ($_mw_adminimize_db_redirect) {
783	738	case 0:
784	739	$_mw_adminimize_db_redirect = $_mw_adminimize_db_redirect_admin_url . 'profile.php';
785	740	break;
786	741	case 1:
		@@ -798,31 +753,31 @@
798	753	case 5:
799	754	$_mw_adminimize_db_redirect = $_mw_adminimize_db_redirect_admin_url . 'edit-comments.php';
800	755	break;
801	756	case 6:
802		- $_mw_adminimize_db_redirect = _mw_adminimize_get_option_value( '_mw_adminimize_db_redirect_txt' );
	757	+ $_mw_adminimize_db_redirect = _mw_adminimize_getOptionValue('_mw_adminimize_db_redirect_txt');
803	758	break;
804	759	}
805	760
806	761	// fallback for WP smaller 3.0
807		- if ( version_compare( $wp_version, "3.0alpha", "<") && 'edit.php?post_type=page' == $_mw_adminimize_db_redirect )
	762	+ if ( version_compare($wp_version, "3.0alpha", "<") && 'edit.php?post_type=page' == $_mw_adminimize_db_redirect )
808	763	$_mw_adminimize_db_redirect = 'edit-pages.php';
809	764
810		- $the_user = new WP_User( $user_ID);
811		- reset( $menu);
812		- $page = key( $menu);
	765	+ $the_user = new WP_User($user_ID);
	766	+ reset($menu);
	767	+ $page = key($menu);
813	768
814		- while ( (__( 'Dashboard' ) != $menu[$page][0] ) && next( $menu) || (__( 'Dashboard' ) != $menu[$page][1] ) && next( $menu) )
815		- $page = key( $menu);
	769	+ while ( (__('Dashboard') != $menu[$page][0]) && next($menu) || (__('Dashboard') != $menu[$page][1]) && next($menu) )
	770	+ $page = key($menu);
816	771
817		- if (__( 'Dashboard' ) == $menu[$page][0] || __( 'Dashboard' ) == $menu[$page][1] )
818		- unset( $menu[$page] );
819		- reset( $menu); $page = key( $menu);
	772	+ if (__('Dashboard') == $menu[$page][0] || __('Dashboard') == $menu[$page][1])
	773	+ unset($menu[$page]);
	774	+ reset($menu); $page = key($menu);
820	775
821		- while ( !$the_user->has_cap( $menu[$page][1] ) && next( $menu) )
822		- $page = key( $menu);
	776	+ while ( !$the_user->has_cap($menu[$page][1]) && next($menu) )
	777	+ $page = key($menu);
823	778
824		- if ( preg_match( '#wp-admin/?(index.php)?$#', $_SERVER['REQUEST_URI'] ) ) {
	779	+ if ( preg_match('#wp-admin/?(index.php)?$#', $_SERVER['REQUEST_URI']) ) {
825	780	wp_redirect( $_mw_adminimize_db_redirect );
826	781	}
827	782	}
828	783	}
		@@ -847,68 +802,56 @@
847	802	// exclude super admin
848	803	if ( _mw_adminimize_exclude_super_admin() )
849	804	return NULL;
850	805
851		- $user_roles = _mw_adminimize_get_all_user_roles();
	806	+ $user_roles = get_all_user_roles();
852	807
853		- foreach ( $user_roles as $role ) {
854		- $disabled_menu_[$role] = _mw_adminimize_get_option_value( 'mw_adminimize_disabled_menu_' . $role . '_items' );
855		- $disabled_submenu_[$role] = _mw_adminimize_get_option_value( 'mw_adminimize_disabled_submenu_' . $role . '_items' );
	808	+ foreach ($user_roles as $role) {
	809	+ $disabled_menu_[$role] = _mw_adminimize_getOptionValue('mw_adminimize_disabled_menu_'. $role .'_items');
	810	+ $disabled_submenu_[$role] = _mw_adminimize_getOptionValue('mw_adminimize_disabled_submenu_'. $role .'_items');
856	811	}
857	812
858	813	$_mw_adminimize_admin_head = "\n";
859		- $_mw_adminimize_user_info = _mw_adminimize_get_option_value( '_mw_adminimize_user_info' );
860		- $_mw_adminimize_ui_redirect = _mw_adminimize_get_option_value( '_mw_adminimize_ui_redirect' );
	814	+ $_mw_adminimize_user_info = _mw_adminimize_getOptionValue('_mw_adminimize_user_info');
	815	+ $_mw_adminimize_ui_redirect = _mw_adminimize_getOptionValue('_mw_adminimize_ui_redirect');
861	816
862		- switch ( $_mw_adminimize_user_info) {
	817	+ switch ($_mw_adminimize_user_info) {
863	818	case 1:
864	819	$_mw_adminimize_admin_head .= '<script type="text/javascript">' . "\n";
865		- $_mw_adminimize_admin_head .= "\t" . 'jQuery(document).ready(function() { jQuery(\'#user_info\' ).remove(); });' . "\n";
	820	+ $_mw_adminimize_admin_head .= "\t" . 'jQuery(document).ready(function() { jQuery(\'#user_info\').remove(); });' . "\n";
866	821	$_mw_adminimize_admin_head .= '</script>' . "\n";
867	822	break;
868	823	case 2:
869		- if ( version_compare( $wp_version, "3.2alpha", ">=") ) {
870		- if ( function_exists( 'is_admin_bar_showing' ) && is_admin_bar_showing() )
871		- $_mw_adminimize_admin_head .= '<link rel="stylesheet" href="' . WP_PLUGIN_URL . '/' . plugin_basename( dirname(__FILE__) ) . '/css/mw_small_user_info31.css" type="text/css" />' . "\n";
872		- $_mw_adminimize_admin_head .= '<link rel="stylesheet" href="' . WP_PLUGIN_URL . '/' . plugin_basename( dirname(__FILE__) ) . '/css/mw_small_user_info32.css" type="text/css" />' . "\n";
873		- } elseif ( version_compare( $wp_version, "3.0alpha", ">=") ) {
874		- if ( function_exists( 'is_admin_bar_showing' ) && is_admin_bar_showing() )
875		- $_mw_adminimize_admin_head .= '<link rel="stylesheet" href="' . WP_PLUGIN_URL . '/' . plugin_basename( dirname(__FILE__) ) . '/css/mw_small_user_info31.css" type="text/css" />' . "\n";
	824	+ if ( version_compare($wp_version, "3.0alpha", ">=") ) {
876	825	$_mw_adminimize_admin_head .= '<link rel="stylesheet" href="' . WP_PLUGIN_URL . '/' . plugin_basename( dirname(__FILE__) ) . '/css/mw_small_user_info30.css" type="text/css" />' . "\n";
877		- } elseif ( version_compare(substr( $wp_version, 0, 3), '2.7', '>=' ) ) {
	826	+ } elseif ( version_compare(substr($wp_version, 0, 3), '2.7', '>=') ) {
878	827	$_mw_adminimize_admin_head .= '<link rel="stylesheet" href="' . WP_PLUGIN_URL . '/' . plugin_basename( dirname(__FILE__) ) . '/css/mw_small_user_info27.css" type="text/css" />' . "\n";
879	828	} else {
880	829	$_mw_adminimize_admin_head .= '<link rel="stylesheet" href="' . WP_PLUGIN_URL . '/' . plugin_basename( dirname(__FILE__) ) . '/css/mw_small_user_info.css" type="text/css" />' . "\n";
881	830	}
882	831	$_mw_adminimize_admin_head .= '<script type="text/javascript">' . "\n";
883		- $_mw_adminimize_admin_head .= "\t" . 'jQuery(document).ready(function() { jQuery(\'#user_info\' ).remove();';
884		- if ( $_mw_adminimize_ui_redirect == '1' ) {
885		- $_mw_adminimize_admin_head .= 'jQuery(\'div#wpcontent\' ).after(\'<div id="small_user_info"><p><a href="' . get_option( 'siteurl' ) . wp_nonce_url( ( '/wp-login.php?action=logout&amp;redirect_to=' ) . get_option( 'siteurl' ) , 'log-out' ) . '" title="' . __( 'Log Out' ) . '">' . __( 'Log Out' ) . '</a></p></div>\' ) });' . "\n";
	832	+ $_mw_adminimize_admin_head .= "\t" . 'jQuery(document).ready(function() { jQuery(\'#user_info\').remove();';
	833	+ if ($_mw_adminimize_ui_redirect == '1') {
	834	+ $_mw_adminimize_admin_head .= 'jQuery(\'div#wpcontent\').after(\'<div id="small_user_info"><p><a href="' . get_option('siteurl') . wp_nonce_url( ('/wp-login.php?action=logout&amp;redirect_to=') . get_option('siteurl') , 'log-out' ) . '" title="' . __('Log Out') . '">' . __('Log Out') . '</a></p></div>\') });' . "\n";
886	835	} else {
887		- $_mw_adminimize_admin_head .= 'jQuery(\'div#wpcontent\' ).after(\'<div id="small_user_info"><p><a href="' . get_option( 'siteurl' ) . wp_nonce_url( ( '/wp-login.php?action=logout' ) , 'log-out' ) . '" title="' . __( 'Log Out' ) . '">' . __( 'Log Out' ) . '</a></p></div>\' ) });' . "\n";
	836	+ $_mw_adminimize_admin_head .= 'jQuery(\'div#wpcontent\').after(\'<div id="small_user_info"><p><a href="' . get_option('siteurl') . wp_nonce_url( ('/wp-login.php?action=logout') , 'log-out' ) . '" title="' . __('Log Out') . '">' . __('Log Out') . '</a></p></div>\') });' . "\n";
888	837	}
889	838	$_mw_adminimize_admin_head .= '</script>' . "\n";
890	839	break;
891	840	case 3:
892		- if ( version_compare( $wp_version, "3.2alpha", ">=") ) {
893		- if ( function_exists( 'is_admin_bar_showing' ) && is_admin_bar_showing() )
894		- $_mw_adminimize_admin_head .= '<link rel="stylesheet" href="' . WP_PLUGIN_URL . '/' . plugin_basename( dirname(__FILE__) ) . '/css/mw_small_user_info31.css" type="text/css" />' . "\n";
895		- $_mw_adminimize_admin_head .= '<link rel="stylesheet" href="' . WP_PLUGIN_URL . '/' . plugin_basename( dirname(__FILE__) ) . '/css/mw_small_user_info32.css" type="text/css" />' . "\n";
896		- } elseif ( version_compare( $wp_version, "3.0alpha", ">=") ) {
897		- if ( function_exists( 'is_admin_bar_showing' ) && is_admin_bar_showing() )
898		- $_mw_adminimize_admin_head .= '<link rel="stylesheet" href="' . WP_PLUGIN_URL . '/' . plugin_basename( dirname(__FILE__) ) . '/css/mw_small_user_info31.css" type="text/css" />' . "\n";
	841	+ if ( version_compare($wp_version, "3.0alpha", ">=") ) {
899	842	$_mw_adminimize_admin_head .= '<link rel="stylesheet" href="' . WP_PLUGIN_URL . '/' . plugin_basename( dirname(__FILE__) ) . '/css/mw_small_user_info30.css" type="text/css" />' . "\n";
900		- } elseif ( version_compare(substr( $wp_version, 0, 3), '2.7', '>=' ) ) {
	843	+ } elseif ( version_compare(substr($wp_version, 0, 3), '2.7', '>=') ) {
901	844	$_mw_adminimize_admin_head .= '<link rel="stylesheet" href="' . WP_PLUGIN_URL . '/' . plugin_basename( dirname(__FILE__) ) . '/css/mw_small_user_info27.css" type="text/css" />' . "\n";
902	845	} else {
903	846	$_mw_adminimize_admin_head .= '<link rel="stylesheet" href="' . WP_PLUGIN_URL . '/' . plugin_basename( dirname(__FILE__) ) . '/css/mw_small_user_info.css" type="text/css" />' . "\n";
904	847	}
905	848	$_mw_adminimize_admin_head .= '<script type="text/javascript">' . "\n";
906		- $_mw_adminimize_admin_head .= "\t" . 'jQuery(document).ready(function() { jQuery(\'#user_info\' ).remove();';
907		- if ( $_mw_adminimize_ui_redirect == '1' ) {
908		- $_mw_adminimize_admin_head .= 'jQuery(\'div#wpcontent\' ).after(\'<div id="small_user_info"><p><a href="' . get_option( 'siteurl' ) . ( '/wp-admin/profile.php' ) . '">' . $user_identity . '</a> | <a href="' . get_option( 'siteurl' ) . wp_nonce_url( ( '/wp-login.php?action=logout&amp;redirect_to=' ) . get_option( 'siteurl' ), 'log-out' ) . '" title="' . __( 'Log Out' ) . '">' . __( 'Log Out' ) . '</a></p></div>\' ) });' . "\n";
	849	+ $_mw_adminimize_admin_head .= "\t" . 'jQuery(document).ready(function() { jQuery(\'#user_info\').remove();';
	850	+ if ($_mw_adminimize_ui_redirect == '1') {
	851	+ $_mw_adminimize_admin_head .= 'jQuery(\'div#wpcontent\').after(\'<div id="small_user_info"><p><a href="' . get_option('siteurl') . ('/wp-admin/profile.php') . '">' . $user_identity . '</a> | <a href="' . get_option('siteurl') . wp_nonce_url( ('/wp-login.php?action=logout&amp;redirect_to=') . get_option('siteurl'), 'log-out' ) . '" title="' . __('Log Out') . '">' . __('Log Out') . '</a></p></div>\') });' . "\n";
909	852	} else {
910		- $_mw_adminimize_admin_head .= 'jQuery(\'div#wpcontent\' ).after(\'<div id="small_user_info"><p><a href="' . get_option( 'siteurl' ) . ( '/wp-admin/profile.php' ) . '">' . $user_identity . '</a> | <a href="' . get_option( 'siteurl' ) . wp_nonce_url( ( '/wp-login.php?action=logout' ), 'log-out' ) . '" title="' . __( 'Log Out' ) . '">' . __( 'Log Out' ) . '</a></p></div>\' ) });' . "\n";
	853	+ $_mw_adminimize_admin_head .= 'jQuery(\'div#wpcontent\').after(\'<div id="small_user_info"><p><a href="' . get_option('siteurl') . ('/wp-admin/profile.php') . '">' . $user_identity . '</a> | <a href="' . get_option('siteurl') . wp_nonce_url( ('/wp-login.php?action=logout'), 'log-out' ) . '" title="' . __('Log Out') . '">' . __('Log Out') . '</a></p></div>\') });' . "\n";
911	854	}
912	855	$_mw_adminimize_admin_head .= '</script>' . "\n";
913	856	break;
914	857	}
		@@ -916,12 +859,12 @@
916	859	// set menu
917	860	if ( '' != $disabled_menu_['editor'] ) {
918	861
919	862	// set admin-menu
920		- foreach ( $user_roles as $role ) {
	863	+ foreach ($user_roles as $role) {
921	864	$user = wp_get_current_user();
922		- if ( is_array( $user->roles) && in_array( $role, $user->roles) ) {
923		- if ( current_user_can( $role ) ) {
	865	+ if ( in_array($role, $user->roles) ) {
	866	+ if ( current_user_can($role) ) {
924	867	$mw_adminimize_menu = $disabled_menu_[$role];
925	868	$mw_adminimize_submenu = $disabled_submenu_[$role];
926	869	}
927	870	}
		@@ -927,26 +870,26 @@
927	870	}
928	871	}
929	872
930	873	// fallback on users.php on all userroles smaller admin
931		- if ( is_array( $mw_adminimize_menu) && in_array( 'users.php', $mw_adminimize_menu) )
	874	+ if ( is_array($mw_adminimize_menu) && in_array('users.php', $mw_adminimize_menu) )
932	875	$mw_adminimize_menu[] = 'profile.php';
933	876
934		- if ( isset( $menu) && !empty( $menu) ) {
935		- foreach ( $menu as $index => $item) {
	877	+ if ( isset($menu) && !empty($menu) ) {
	878	+ foreach ($menu as $index => $item) {
936	879	if ( 'index.php' === $item )
937	880	continue;
938	881
939		- if ( isset( $mw_adminimize_menu) && in_array( $item[2], $mw_adminimize_menu) ) {
940		- unset( $menu[$index] );
	882	+ if ( isset($mw_adminimize_menu) && in_array($item[2], $mw_adminimize_menu) ) {
	883	+ unset($menu[$index]);
941	884	}
942	885
943		- if ( isset( $submenu) && !empty( $submenu[$item[2]] ) ) {
944		- foreach ( $submenu[$item[2]] as $subindex => $subitem) {
945		- if ( isset( $mw_adminimize_submenu) && in_array( $subitem[2], $mw_adminimize_submenu) )
946		- //if ( 'profile.php' === $subitem[2] )
947		- // unset( $menu[70] );
948		- unset( $submenu[$item[2]][$subindex] );
	886	+ if ( isset($submenu) && !empty($submenu[$item[2]]) ) {
	887	+ foreach ($submenu[$item[2]] as $subindex => $subitem) {
	888	+ if ( isset($mw_adminimize_submenu) && in_array($subitem[2], $mw_adminimize_submenu))
	889	+ //if ('profile.php' === $subitem[2])
	890	+ // unset($menu[70]);
	891	+ unset($submenu[$item[2]][$subindex]);
949	892	}
950	893	}
951	894	}
952	895	}
		@@ -966,41 +909,41 @@
966	909	// exclude super admin
967	910	if ( _mw_adminimize_exclude_super_admin() )
968	911	return NULL;
969	912
970		- $user_roles = _mw_adminimize_get_all_user_roles();
	913	+ $user_roles = get_all_user_roles();
971	914
972	915	$_mw_adminimize_admin_head = '';
973	916
974		- // remove_action( 'admin_head', 'index_js' );
	917	+ remove_action('admin_head', 'index_js');
975	918
976		- foreach ( $user_roles as $role ) {
977		- $disabled_global_option_[$role] = _mw_adminimize_get_option_value( 'mw_adminimize_disabled_global_option_' . $role . '_items' );
	919	+ foreach ($user_roles as $role) {
	920	+ $disabled_global_option_[$role] = _mw_adminimize_getOptionValue('mw_adminimize_disabled_global_option_'. $role .'_items');
978	921	}
979	922
980		- foreach ( $user_roles as $role ) {
981		- if ( !isset( $disabled_global_option_[$role]['0'] ) )
	923	+ foreach ($user_roles as $role) {
	924	+ if ( !isset($disabled_global_option_[$role]['0']) )
982	925	$disabled_global_option_[$role]['0'] = '';
983	926	}
984	927
985	928	$remove_adminbar = FALSE;
986	929	// new 1.7.8
987		- foreach ( $user_roles as $role ) {
	930	+ foreach ($user_roles as $role) {
988	931	$user = wp_get_current_user();
989		- if ( is_array( $user->roles) && in_array( $role, $user->roles) ) {
990		- if ( current_user_can( $role ) && is_array( $disabled_global_option_[$role] ) ) {
991		- $global_options = implode( ', ', $disabled_global_option_[$role] );
992		- if ( _mw_adminimize_recursive_in_array( '.show-admin-bar', $disabled_global_option_[$role] ) )
	932	+ if ( in_array($role, $user->roles) ) {
	933	+ if ( current_user_can($role) && is_array($disabled_global_option_[$role]) ) {
	934	+ $global_options = implode(', ', $disabled_global_option_[$role]);
	935	+ if ( recursive_in_array('.show-admin-bar', $disabled_global_option_[$role]) )
993	936	$remove_adminbar = TRUE;
994	937	}
995	938	}
996	939	}
997		- if ( 0 != strpos( $global_options, '#your-profile .form-table fieldset' ) )
	940	+ if ( 0 != strpos($global_options, '#your-profile .form-table fieldset') )
998	941	$_wp_admin_css_colors = 0;
999	942	$_mw_adminimize_admin_head .= '<!-- global options -->' . "\n";
1000	943	$_mw_adminimize_admin_head .= '<style type="text/css">' . $global_options . ' {display: none !important;}</style>' . "\n";
1001	944
1002		- if ( $global_options)
	945	+ if ($global_options)
1003	946	echo $_mw_adminimize_admin_head;
1004	947	}
1005	948
1006	949
		@@ -1009,29 +952,27 @@
1009	952	// exclude super admin
1010	953	if ( _mw_adminimize_exclude_super_admin() )
1011	954	return NULL;
1012	955
1013		- $user_roles = _mw_adminimize_get_all_user_roles();
	956	+ $user_roles = get_all_user_roles();
1014	957
1015		- foreach ( $user_roles as $role ) {
1016		- $disabled_global_option_[$role] = _mw_adminimize_get_option_value(
1017		- 'mw_adminimize_disabled_global_option_' . $role . '_items'
1018		- );
	958	+ foreach ($user_roles as $role) {
	959	+ $disabled_global_option_[$role] = _mw_adminimize_getOptionValue('mw_adminimize_disabled_global_option_'. $role .'_items');
1019	960	}
1020	961
1021		- foreach ( $user_roles as $role ) {
1022		- if ( !isset( $disabled_global_option_[$role]['0'] ) )
	962	+ foreach ($user_roles as $role) {
	963	+ if ( !isset($disabled_global_option_[$role]['0']) )
1023	964	$disabled_global_option_[$role]['0'] = '';
1024	965	}
1025	966
1026	967	$remove_adminbar = FALSE;
1027	968	// new 1.7.8
1028		- foreach ( $user_roles as $role ) {
	969	+ foreach ($user_roles as $role) {
1029	970	$user = wp_get_current_user();
1030		- if ( is_array( $user->roles) && in_array( $role, $user->roles) ) {
1031		- if ( current_user_can( $role ) && is_array( $disabled_global_option_[$role] ) ) {
1032		- $global_options = implode( ', ', $disabled_global_option_[$role] );
1033		- if ( _mw_adminimize_recursive_in_array( '.show-admin-bar', $disabled_global_option_[$role] ) )
	971	+ if ( in_array($role, $user->roles) ) {
	972	+ if ( current_user_can($role) && is_array($disabled_global_option_[$role]) ) {
	973	+ $global_options = implode(', ', $disabled_global_option_[$role]);
	974	+ if ( recursive_in_array('.show-admin-bar', $disabled_global_option_[$role]) )
1034	975	$remove_adminbar = TRUE;
1035	976	}
1036	977	}
1037	978	}
		@@ -1055,40 +996,34 @@
1055	996	// exclude super admin
1056	997	if ( _mw_adminimize_exclude_super_admin() )
1057	998	return NULL;
1058	999
1059		- $user_roles = _mw_adminimize_get_all_user_roles();
	1000	+ $user_roles = get_all_user_roles();
1060	1001
1061	1002	$_mw_adminimize_admin_head = '';
1062	1003
1063		- // remove_action( 'admin_head', 'index_js' );
	1004	+ remove_action('admin_head', 'index_js');
1064	1005
1065		- foreach ( $user_roles as $role ) {
1066		- $disabled_metaboxes_post_[$role] = _mw_adminimize_get_option_value(
1067		- 'mw_adminimize_disabled_metaboxes_post_' . $role . '_items'
1068		- );
	1006	+ foreach ($user_roles as $role) {
	1007	+ $disabled_metaboxes_post_[$role] = _mw_adminimize_getOptionValue('mw_adminimize_disabled_metaboxes_post_'. $role .'_items');
1069	1008
1070		- if ( !isset( $disabled_metaboxes_post_[$role]['0'] ) )
	1009	+ if ( !isset($disabled_metaboxes_post_[$role]['0']) )
1071	1010	$disabled_metaboxes_post_[$role]['0'] = '';
1072	1011
1073	1012	// new 1.7.8
1074		- foreach ( $user_roles as $role ) {
	1013	+ foreach ($user_roles as $role) {
1075	1014	$user = wp_get_current_user();
1076		- if ( is_array( $user->roles) && in_array( $role, $user->roles) ) {
1077		- if ( current_user_can( $role ) &&
1078		- isset( $disabled_metaboxes_post_[$role] ) &&
1079		- is_array( $disabled_metaboxes_post_[$role] )
1080		- ) {
1081		- $metaboxes = implode( ',', $disabled_metaboxes_post_[$role] );
	1015	+ if ( in_array($role, $user->roles) ) {
	1016	+ if ( current_user_can($role) && isset($disabled_metaboxes_post_[$role]) && is_array($disabled_metaboxes_post_[$role]) ) {
	1017	+ $metaboxes = implode(',', $disabled_metaboxes_post_[$role]);
1082	1018	}
1083	1019	}
1084	1020	}
1085	1021	}
1086	1022
1087		- $_mw_adminimize_admin_head .= '<style type="text/css">' .
1088		- $metaboxes . ' {display: none !important;}</style>' . "\n";
	1023	+ $_mw_adminimize_admin_head .= '<style type="text/css">' . $metaboxes . ' {display: none !important;}</style>' . "\n";
1089	1024
1090		- if ( $metaboxes)
	1025	+ if ($metaboxes)
1091	1026	echo $_mw_adminimize_admin_head;
1092	1027	}
1093	1028
1094	1029
		@@ -1100,101 +1035,39 @@
1100	1035	// exclude super admin
1101	1036	if ( _mw_adminimize_exclude_super_admin() )
1102	1037	return NULL;
1103	1038
1104		- $user_roles = _mw_adminimize_get_all_user_roles();
	1039	+ $user_roles = get_all_user_roles();
1105	1040
1106	1041	$_mw_adminimize_admin_head = '';
1107	1042
1108		- // remove_action( 'admin_head', 'index_js' );
	1043	+ remove_action('admin_head', 'index_js');
1109	1044
1110		- foreach ( $user_roles as $role ) {
1111		- $disabled_metaboxes_page_[$role] = _mw_adminimize_get_option_value(
1112		- 'mw_adminimize_disabled_metaboxes_page_' . $role . '_items'
1113		- );
	1045	+ foreach ($user_roles as $role) {
	1046	+ $disabled_metaboxes_page_[$role] = _mw_adminimize_getOptionValue('mw_adminimize_disabled_metaboxes_page_'. $role .'_items');
1114	1047
1115		- if ( !isset( $disabled_metaboxes_page_[$role]['0'] ) )
	1048	+ if ( !isset($disabled_metaboxes_page_[$role]['0']) )
1116	1049	$disabled_metaboxes_page_[$role]['0'] = '';
1117	1050
1118	1051	// new 1.7.8
1119		- foreach ( $user_roles as $role ) {
	1052	+ foreach ($user_roles as $role) {
1120	1053	$user = wp_get_current_user();
1121		- if ( is_array( $user->roles) && in_array( $role, $user->roles) ) {
1122		- if ( current_user_can( $role ) && is_array( $disabled_metaboxes_page_[$role] ) ) {
1123		- $metaboxes = implode( ',', $disabled_metaboxes_page_[$role] );
	1054	+ if ( in_array($role, $user->roles) ) {
	1055	+ if ( current_user_can($role) && is_array($disabled_metaboxes_page_[$role]) ) {
	1056	+ $metaboxes = implode(',', $disabled_metaboxes_page_[$role]);
1124	1057	}
1125	1058	}
1126	1059	}
1127	1060	}
1128	1061
1129		- $_mw_adminimize_admin_head .= '<style type="text/css">' .
1130		- $metaboxes . ' {display: none !important;}</style>' . "\n";
	1062	+ $_mw_adminimize_admin_head .= '<style type="text/css">' . $metaboxes . ' {display: none !important;}</style>' . "\n";
1131	1063
1132		- if ( $metaboxes)
	1064	+ if ($metaboxes)
1133	1065	echo $_mw_adminimize_admin_head;
1134	1066	}
1135	1067
1136	1068
1137	1069	/**
1138		- * set metabox options from database an area post
1139		- */
1140		-function _mw_adminimize_set_metabox_cp_option() {
1141		-
1142		- // exclude super admin
1143		- if ( _mw_adminimize_exclude_super_admin() )
1144		- return NULL;
1145		-
1146		- if ( isset( $_GET['post'] ) )
1147		- $post_id = (int) $_GET['post'];
1148		- elseif ( isset( $_POST['post_ID'] ) )
1149		- $post_id = (int) $_POST['post_ID'];
1150		- else
1151		- $post_id = 0;
1152		-
1153		- $current_post_type = $GLOBALS['post_type'];
1154		- if ( ! isset( $current_post_type ) )
1155		- $current_post_type = get_post_type( $post_id );
1156		- if ( ! isset($current_post_type) || ! $current_post_type )
1157		- $current_post_type = str_replace( 'post_type=', '', esc_attr( $_SERVER['QUERY_STRING'] ) );
1158		- if ( ! $current_post_type ) // set hard to post
1159		- $current_post_type = 'post';
1160		-
1161		- $user_roles = _mw_adminimize_get_all_user_roles();
1162		-
1163		- $_mw_adminimize_admin_head = '';
1164		-
1165		- // remove_action( 'admin_head', 'index_js' );
1166		-
1167		- foreach ( $user_roles as $role ) {
1168		- $disabled_metaboxes_[$current_post_type . '_' . $role] = _mw_adminimize_get_option_value(
1169		- 'mw_adminimize_disabled_metaboxes_' . $current_post_type . '_' . $role . '_items'
1170		- );
1171		-
1172		- if ( ! isset( $disabled_metaboxes_[$current_post_type . '_' . $role]['0'] ) )
1173		- $disabled_metaboxes_[$current_post_type . '_' . $role]['0'] = '';
1174		-
1175		- foreach ( $user_roles as $role ) {
1176		- $user = wp_get_current_user();
1177		- if ( is_array( $user->roles ) && in_array( $role, $user->roles ) ) {
1178		- if ( current_user_can( $role )
1179		- && isset( $disabled_metaboxes_[$current_post_type . '_' . $role] )
1180		- && is_array( $disabled_metaboxes_[$current_post_type . '_' . $role] )
1181		- ) {
1182		- $metaboxes = implode( ',', $disabled_metaboxes_[$current_post_type . '_' . $role] );
1183		- }
1184		- }
1185		- }
1186		- }
1187		-
1188		- $_mw_adminimize_admin_head .= '<style type="text/css">' .
1189		- $metaboxes . ' {display: none !important;}</style>' . "\n";
1190		-
1191		- if ( $metaboxes )
1192		- echo $_mw_adminimize_admin_head;
1193		-}
1194		-
1195		-
1196		-/**
1197	1070	* set link options in area Links of Backend
1198	1071	*/
1199	1072	function _mw_adminimize_set_link_option() {
1200	1073
		@@ -1201,38 +1074,35 @@
1201	1074	// exclude super admin
1202	1075	if ( _mw_adminimize_exclude_super_admin() )
1203	1076	return NULL;
1204	1077
1205		- $user_roles = _mw_adminimize_get_all_user_roles();
	1078	+ $user_roles = get_all_user_roles();
1206	1079
1207	1080	$_mw_adminimize_admin_head = '';
1208	1081
1209		- // remove_action( 'admin_head', 'index_js' );
	1082	+ remove_action('admin_head', 'index_js');
1210	1083
1211		- foreach ( $user_roles as $role ) {
1212		- $disabled_link_option_[$role] = _mw_adminimize_get_option_value(
1213		- 'mw_adminimize_disabled_link_option_' . $role . '_items'
1214		- );
	1084	+ foreach ($user_roles as $role) {
	1085	+ $disabled_link_option_[$role] = _mw_adminimize_getOptionValue('mw_adminimize_disabled_link_option_'. $role .'_items');
1215	1086	}
1216	1087
1217		- foreach ( $user_roles as $role ) {
1218		- if ( !isset( $disabled_link_option_[$role]['0'] ) )
	1088	+ foreach ($user_roles as $role) {
	1089	+ if ( !isset($disabled_link_option_[$role]['0']) )
1219	1090	$disabled_link_option_[$role]['0'] = '';
1220	1091	}
1221	1092
1222	1093	// new 1.7.8
1223		- foreach ( $user_roles as $role ) {
	1094	+ foreach ($user_roles as $role) {
1224	1095	$user = wp_get_current_user();
1225		- if ( is_array( $user->roles) && in_array( $role, $user->roles) ) {
1226		- if ( current_user_can( $role ) && is_array( $disabled_link_option_[$role] ) ) {
1227		- $link_options = implode( ',', $disabled_link_option_[$role] );
	1096	+ if ( in_array($role, $user->roles) ) {
	1097	+ if ( current_user_can($role) && is_array($disabled_link_option_[$role]) ) {
	1098	+ $link_options = implode(',', $disabled_link_option_[$role]);
1228	1099	}
1229	1100	}
1230	1101	}
1231		- $_mw_adminimize_admin_head .= '<style type="text/css">' .
1232		- $link_options . ' {display: none !important;}</style>' . "\n";
	1102	+ $_mw_adminimize_admin_head .= '<style type="text/css">' . $link_options . ' {display: none !important;}</style>' . "\n";
1233	1103
1234		- if ( $link_options)
	1104	+ if ($link_options)
1235	1105	echo $_mw_adminimize_admin_head;
1236	1106	}
1237	1107
1238	1108	/**
		@@ -1243,39 +1113,36 @@
1243	1113	// exclude super admin
1244	1114	if ( _mw_adminimize_exclude_super_admin() )
1245	1115	return NULL;
1246	1116
1247		- $user_roles = _mw_adminimize_get_all_user_roles();
	1117	+ $user_roles = get_all_user_roles();
1248	1118
1249	1119	$_mw_adminimize_admin_head = '';
1250	1120
1251		- // remove_action( 'admin_head', 'index_js' );
	1121	+ remove_action('admin_head', 'index_js');
1252	1122
1253		- foreach ( $user_roles as $role ) {
1254		- $disabled_nav_menu_option_[$role] = _mw_adminimize_get_option_value(
1255		- 'mw_adminimize_disabled_nav_menu_option_' . $role . '_items'
1256		- );
	1123	+ foreach ($user_roles as $role) {
	1124	+ $disabled_nav_menu_option_[$role] = _mw_adminimize_getOptionValue('mw_adminimize_disabled_nav_menu_option_'. $role .'_items');
1257	1125	}
1258	1126
1259		- foreach ( $user_roles as $role ) {
1260		- if ( !isset( $disabled_nav_menu_option_[$role]['0'] ) )
	1127	+ foreach ($user_roles as $role) {
	1128	+ if ( !isset($disabled_nav_menu_option_[$role]['0']) )
1261	1129	$disabled_nav_menu_option_[$role]['0'] = '';
1262	1130	}
1263	1131
1264	1132	// new 1.7.8
1265		- foreach ( $user_roles as $role ) {
	1133	+ foreach ($user_roles as $role) {
1266	1134	$user = wp_get_current_user();
1267		- if ( is_array( $user->roles) && in_array( $role, $user->roles) ) {
1268		- if ( current_user_can( $role ) && is_array( $disabled_nav_menu_option_[$role] ) ) {
1269		- $nav_menu_options = implode( ',', $disabled_nav_menu_option_[$role] );
	1135	+ if ( in_array($role, $user->roles) ) {
	1136	+ if ( current_user_can($role) && is_array($disabled_nav_menu_option_[$role]) ) {
	1137	+ $nav_menu_options = implode(',', $disabled_nav_menu_option_[$role]);
1270	1138	}
1271	1139	}
1272	1140	}
1273		- //remove_meta_box( $id, 'nav-menus', 'side' );
1274		- $_mw_adminimize_admin_head .= '<style type="text/css">' .
1275		- $nav_menu_options . ' {display: none !important;}</style>' . "\n";
	1141	+ //remove_meta_box($id, 'nav-menus', 'side');
	1142	+ $_mw_adminimize_admin_head .= '<style type="text/css">' . $nav_menu_options . ' {display: none !important;}</style>' . "\n";
1276	1143
1277		- if ( $nav_menu_options)
	1144	+ if ($nav_menu_options)
1278	1145	echo $_mw_adminimize_admin_head;
1279	1146	}
1280	1147
1281	1148
		@@ -1285,14 +1152,9 @@
1285	1152	*/
1286	1153	function _mw_adminimize_small_user_info() {
1287	1154	?>
1288	1155	<div id="small_user_info">
1289		- <p>
1290		- <a href="<?php echo wp_nonce_url(
1291		- site_url( 'wp-login.php?action=logout' ),
1292		- 'log-out' ) ?>"
1293		- title="<?php _e( 'Log Out' ) ?>"><?php _e( 'Log Out' ); ?></a>
1294		- </p>
	1156	+ <p><a href="<?php echo wp_nonce_url( site_url('wp-login.php?action=logout'), 'log-out' ) ?>" title="<?php _e('Log Out') ?>"><?php _e('Log Out'); ?></a></p>
1295	1157	</div>
1296	1158	<?php
1297	1159	}
1298	1160
		@@ -1299,9 +1161,9 @@
1299	1161
1300	1162	/**
1301	1163	* include options-page in wp-admin
1302	1164	*/
1303		-require_once( 'adminimize_page.php' );
	1165	+require_once('adminimize_page.php');
1304	1166
1305	1167
1306	1168	/**
1307	1169	* credit in wp-footer
		@@ -1310,17 +1172,17 @@
1310	1172
1311	1173	$plugin_data = get_plugin_data( __FILE__ );
1312	1174	$plugin_data['Title'] = $plugin_data['Name'];
1313	1175
1314		- if ( !empty( $plugin_data['PluginURI'] ) && !empty( $plugin_data['Name'] ) )
	1176	+ if ( !empty($plugin_data['PluginURI']) && !empty($plugin_data['Name']) )
1315	1177	$plugin_data['Title'] = '<a href="' . $plugin_data['PluginURI'] . '" title="'.__( 'Visit plugin homepage' ).'">' . $plugin_data['Name'] . '</a>';
1316	1178
1317		- if ( basename( $_SERVER['REQUEST_URI'] ) == 'adminimize.php' ) {
1318		- printf( '%1$s ' . __( 'plugin' ) . ' | ' . __( 'Version' ) . ' <a href="http://wordpress.org/extend/plugins/adminimize/changelog/" title="' . __( 'History', FB_ADMINIMIZE_TEXTDOMAIN ) . '">%2$s</a> | ' . __( 'Author' ) . ' %3$s<br />', $plugin_data['Title'], $plugin_data['Version'], $plugin_data['Author'] );
	1179	+ if ( basename($_SERVER['REQUEST_URI']) == 'adminimize.php') {
	1180	+ printf('%1$s ' . __('plugin') . ' | ' . __('Version') . ' <a href="http://wordpress.org/extend/plugins/adminimize/changelog/" title="' . __('History', FB_ADMINIMIZE_TEXTDOMAIN ) . '">%2$s</a> | ' . __('Author') . ' %3$s<br />', $plugin_data['Title'], $plugin_data['Version'], $plugin_data['Author']);
1319	1181	}
1320	1182
1321		- if ( _mw_adminimize_get_option_value( '_mw_adminimize_advice' ) == 1 && basename( $_SERVER['REQUEST_URI'] ) != 'adminimize.php' ) {
1322		- printf( '%1$s ' . __( 'plugin activate', FB_ADMINIMIZE_TEXTDOMAIN ) . ' | ' . stripslashes( _mw_adminimize_get_option_value( '_mw_adminimize_advice_txt' ) ) . '<br />', $plugin_data['Title'] );
	1183	+ if ( _mw_adminimize_getOptionValue('_mw_adminimize_advice') == 1 && basename($_SERVER['REQUEST_URI']) != 'adminimize.php' ) {
	1184	+ printf('%1$s ' . __('plugin activate', FB_ADMINIMIZE_TEXTDOMAIN ) . ' | ' . stripslashes( _mw_adminimize_getOptionValue('_mw_adminimize_advice_txt') ) . '<br />', $plugin_data['Title']);
1323	1185	}
1324	1186
1325	1187	}
1326	1188
		@@ -1333,15 +1195,15 @@
1333	1195	*
1334	1196	* @param $links, $file
1335	1197	* @return $links
1336	1198	*/
1337		-function _mw_adminimize_filter_plugin_meta( $links, $file ) {
	1199	+function _mw_adminimize_filter_plugin_meta($links, $file) {
1338	1200
1339	1201	/* create link */
1340	1202	if ( FB_ADMINIMIZE_BASENAME == $file ) {
1341	1203	array_unshift(
1342	1204	$links,
1343		- sprintf( '<a href="options-general.php?page=%s">%s</a>', FB_ADMINIMIZE_BASENAME, __( 'Settings' ) )
	1205	+ sprintf( '<a href="options-general.php?page=%s">%s</a>', FB_ADMINIMIZE_BASENAME, __('Settings') )
1344	1206	);
1345	1207	}
1346	1208
1347	1209	return $links;
		@@ -1348,18 +1210,65 @@
1348	1210	}
1349	1211
1350	1212
1351	1213	/**
	1214	+ * Images/ Icons in base64-encoding
	1215	+ * @use function _mw_adminimize_get_resource_url() for display
	1216	+ */
	1217	+if ( isset($_GET['resource']) && !empty($_GET['resource']) ) {
	1218	+
	1219	+ # base64 encoding performed by base64img.php from http://php.holtsmark.no
	1220	+ $resources = array(
	1221	+ 'adminimize.gif' =>
	1222	+ 'R0lGODlhCwALAKIEAPb29tTU1Kurq5SUlP///wAAAAAAAAAAAC'.
	1223	+ 'H5BAEAAAQALAAAAAALAAsAAAMlSErTuw1Ix4a8s4mYgxZbE4wf'.
	1224	+ 'OIzkAJqop64nWm7tULHu0+xLAgA7'.
	1225	+ '');
	1226	+
	1227	+ if (array_key_exists($_GET['resource'], $resources)) {
	1228	+
	1229	+ $content = base64_decode($resources[ $_GET['resource'] ]);
	1230	+
	1231	+ $lastMod = filemtime(__FILE__);
	1232	+ $client = ( isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) ? $_SERVER['HTTP_IF_MODIFIED_SINCE'] : FALSE );
	1233	+ // Checking if the client is validating his cache and if it is current.
	1234	+ if (isset($client) && (strtotime($client) == $lastMod)) {
	1235	+ // Client's cache IS current, so we just respond '304 Not Modified'.
	1236	+ header('Last-Modified: '.gmdate('D, d M Y H:i:s', $lastMod).' GMT', TRUE, 304);
	1237	+ exit;
	1238	+ } else {
	1239	+ // Image not cached or cache outdated, we respond '200 OK' and output the image.
	1240	+ header('Last-Modified: '.gmdate('D, d M Y H:i:s', $lastMod).' GMT', TRUE, 200);
	1241	+ header('Content-Length: '.strlen($content));
	1242	+ header('Content-Type: image/' . substr(strrchr($_GET['resource'], '.'), 1) );
	1243	+ echo $content;
	1244	+ exit;
	1245	+ }
	1246	+ }
	1247	+
	1248	+}
	1249	+
	1250	+
	1251	+/**
	1252	+ * Display Images/ Icons in base64-encoding
	1253	+ * @return $resourceID
	1254	+ */
	1255	+function _mw_adminimize_get_resource_url($resourceID) {
	1256	+
	1257	+ return trailingslashit( get_bloginfo('url') ) . '?resource=' . $resourceID;
	1258	+}
	1259	+
	1260	+
	1261	+/**
1352	1262	* content of help
	1263	+ *
	1264	+ * @package Secure WordPress
1353	1265	*/
1354		-function _mw_adminimize_contextual_help( $contextual_help, $screen_id, $screen ) {
	1266	+function _mw_adminimize_contextual_help() {
1355	1267
1356		- if ( 'settings_page_adminimize/adminimize' !== $screen_id )
1357		- return $contextual_help;
	1268	+ $content = __('<a href="http://wordpress.org/extend/plugins/adminimize/">Documentation</a>', FB_ADMINIMIZE_TEXTDOMAIN );
1358	1269
1359		- $contextual_help = __( '<a href="http://wordpress.org/extend/plugins/adminimize/">Documentation</a>', FB_ADMINIMIZE_TEXTDOMAIN );
1360		-
1361		- return $contextual_help;
	1270	+ return $content;
1362	1271	}
1363	1272
1364	1273
1365	1274	/**
		@@ -1367,18 +1276,17 @@
1367	1276	*/
1368	1277	function _mw_adminimize_add_settings_page() {
1369	1278	global $wp_version;
1370	1279
1371		- if ( current_user_can( 'manage_options' ) && function_exists( 'add_submenu_page' ) ) {
1372		-
1373		- $pagehook = add_submenu_page(
1374		- 'options-general.php',
1375		- __( 'Adminimize Options', FB_ADMINIMIZE_TEXTDOMAIN ),
1376		- __( 'Adminimize', FB_ADMINIMIZE_TEXTDOMAIN ),
1377		- 'manage_options',
1378		- __FILE__,
1379		- '_mw_adminimize_options'
1380		- );
	1280	+ if ( current_user_can('switch_themes') && function_exists('add_submenu_page') ) {
	1281	+
	1282	+ $menutitle = '';
	1283	+ if ( version_compare( $wp_version, '2.7alpha', '>' ) ) {
	1284	+ $menutitle = '<img src="' . _mw_adminimize_get_resource_url('adminimize.gif') . '" alt="" />';
	1285	+ }
	1286	+ $menutitle .= ' ' . __('Adminimize', FB_ADMINIMIZE_TEXTDOMAIN );
	1287	+
	1288	+ $pagehook = add_submenu_page('options-general.php', __('Adminimize Options', FB_ADMINIMIZE_TEXTDOMAIN ), $menutitle, 'unfiltered_html', __FILE__, '_mw_adminimize_options');
1381	1289	add_action( 'load-' . $pagehook, '_mw_adminimize_on_load_page' );
1382	1290	add_filter( 'plugin_action_links', '_mw_adminimize_filter_plugin_meta', 10, 2 );
1383	1291	}
1384	1292
		@@ -1386,9 +1294,9 @@
1386	1294
1387	1295
1388	1296	function _mw_adminimize_on_load_page() {
1389	1297
1390		- add_filter( 'contextual_help', '_mw_adminimize_contextual_help', 10, 3 );
	1298	+ add_filter( 'contextual_help', '_mw_adminimize_contextual_help' );
1391	1299
1392	1300	wp_enqueue_style( 'adminimize-style' );
1393	1301	}
1394	1302
		@@ -1394,23 +1302,22 @@
1394	1302
1395	1303
1396	1304	/**
1397	1305	* Set theme for users
1398		- * Kill with version 1.7.18
1399	1306	*/
1400	1307	function _mw_adminimize_set_theme() {
1401	1308
1402		- if ( ! current_user_can( 'edit_users' ) )
1403		- wp_die( __( 'Cheatin&#8217; uh?' ) );
	1309	+ if ( !current_user_can('edit_users') )
	1310	+ wp_die(__('Cheatin&#8217; uh?'));
1404	1311
1405	1312	$user_ids = $_POST[mw_adminimize_theme_items];
1406	1313	$admin_color = htmlspecialchars( stripslashes( $_POST[_mw_adminimize_set_theme] ) );
1407	1314
1408		- if ( ! $user_ids )
	1315	+ if ( !$user_ids )
1409	1316	return FALSE;
1410	1317
1411		- foreach( $user_ids as $user_id ) {
1412		- update_usermeta( $user_id, 'admin_color', $admin_color );
	1318	+ foreach( $user_ids as $user_id) {
	1319	+ update_usermeta($user_id, 'admin_color', $admin_color);
1413	1320	}
1414	1321
1415	1322	}
1416	1323
		@@ -1417,14 +1324,14 @@
1417	1324
1418	1325	/**
1419	1326	* read otpions
1420	1327	*/
1421		-function _mw_adminimize_get_option_value( $key) {
	1328	+function _mw_adminimize_getOptionValue($key) {
1422	1329
1423		- $adminimizeoptions = get_option( 'mw_adminimize' );
	1330	+ $adminimizeoptions = get_option('mw_adminimize');
1424	1331
1425		- if ( isset( $adminimizeoptions[$key] ) )
1426		- return ( $adminimizeoptions[$key] );
	1332	+ if ( isset($adminimizeoptions[$key]) )
	1333	+ return ($adminimizeoptions[$key]);
1427	1334	}
1428	1335
1429	1336
1430	1337	/**
		@@ -1430,249 +1337,222 @@
1430	1337	/**
1431	1338	* Update options in database
1432	1339	*/
1433	1340	function _mw_adminimize_update() {
	1341	+ global $menu, $submenu, $adminimizeoptions;
1434	1342
1435		- $user_roles = _mw_adminimize_get_all_user_roles();
1436		- $args = array( 'public' => TRUE, '_builtin' => FALSE );
1437		- $post_types = get_post_types( $args );
1438		-
1439		- if ( isset( $_POST['_mw_adminimize_user_info'] ) ) {
1440		- $adminimizeoptions['_mw_adminimize_user_info'] = strip_tags(stripslashes( $_POST['_mw_adminimize_user_info'] ) );
	1343	+ $user_roles = get_all_user_roles();
	1344	+
	1345	+ if (isset($_POST['_mw_adminimize_user_info'])) {
	1346	+ $adminimizeoptions['_mw_adminimize_user_info'] = strip_tags(stripslashes($_POST['_mw_adminimize_user_info']));
1441	1347	} else {
1442	1348	$adminimizeoptions['_mw_adminimize_user_info'] = 0;
1443	1349	}
1444	1350
1445		- if ( isset( $_POST['_mw_adminimize_dashmenu'] ) ) {
1446		- $adminimizeoptions['_mw_adminimize_dashmenu'] = strip_tags(stripslashes( $_POST['_mw_adminimize_dashmenu'] ) );
	1351	+ if (isset($_POST['_mw_adminimize_dashmenu'])) {
	1352	+ $adminimizeoptions['_mw_adminimize_dashmenu'] = strip_tags(stripslashes($_POST['_mw_adminimize_dashmenu']));
1447	1353	} else {
1448	1354	$adminimizeoptions['_mw_adminimize_dashmenu'] = 0;
1449	1355	}
1450	1356
1451		- if ( isset( $_POST['_mw_adminimize_footer'] ) ) {
1452		- $adminimizeoptions['_mw_adminimize_footer'] = strip_tags(stripslashes( $_POST['_mw_adminimize_footer'] ) );
	1357	+ if (isset($_POST['_mw_adminimize_footer'])) {
	1358	+ $adminimizeoptions['_mw_adminimize_footer'] = strip_tags(stripslashes($_POST['_mw_adminimize_footer']));
1453	1359	} else {
1454	1360	$adminimizeoptions['_mw_adminimize_footer'] = 0;
1455	1361	}
1456	1362
1457		- if ( isset( $_POST['_mw_adminimize_header'] ) ) {
1458		- $adminimizeoptions['_mw_adminimize_header'] = strip_tags(stripslashes( $_POST['_mw_adminimize_header'] ) );
	1363	+ if (isset($_POST['_mw_adminimize_header'])) {
	1364	+ $adminimizeoptions['_mw_adminimize_header'] = strip_tags(stripslashes($_POST['_mw_adminimize_header']));
1459	1365	} else {
1460	1366	$adminimizeoptions['_mw_adminimize_header'] = 0;
1461	1367	}
1462	1368
1463		- if ( isset( $_POST['_mw_adminimize_exclude_super_admin'] ) ) {
1464		- $adminimizeoptions['_mw_adminimize_exclude_super_admin'] = strip_tags(stripslashes( $_POST['_mw_adminimize_exclude_super_admin'] ) );
	1369	+ if (isset($_POST['_mw_adminimize_exclude_super_admin'])) {
	1370	+ $adminimizeoptions['_mw_adminimize_exclude_super_admin'] = strip_tags(stripslashes($_POST['_mw_adminimize_exclude_super_admin']));
1465	1371	} else {
1466	1372	$adminimizeoptions['_mw_adminimize_exclude_super_admin'] = 0;
1467	1373	}
1468	1374
1469		- if ( isset( $_POST['_mw_adminimize_writescroll'] ) ) {
1470		- $adminimizeoptions['_mw_adminimize_writescroll'] = strip_tags(stripslashes( $_POST['_mw_adminimize_writescroll'] ) );
	1375	+ if (isset($_POST['_mw_adminimize_writescroll'])) {
	1376	+ $adminimizeoptions['_mw_adminimize_writescroll'] = strip_tags(stripslashes($_POST['_mw_adminimize_writescroll']));
1471	1377	} else {
1472	1378	$adminimizeoptions['_mw_adminimize_writescroll'] = 0;
1473	1379	}
1474	1380
1475		- if ( isset( $_POST['_mw_adminimize_tb_window'] ) ) {
1476		- $adminimizeoptions['_mw_adminimize_tb_window'] = strip_tags(stripslashes( $_POST['_mw_adminimize_tb_window'] ) );
	1381	+ if (isset($_POST['_mw_adminimize_tb_window'])) {
	1382	+ $adminimizeoptions['_mw_adminimize_tb_window'] = strip_tags(stripslashes($_POST['_mw_adminimize_tb_window']));
1477	1383	} else {
1478	1384	$adminimizeoptions['_mw_adminimize_tb_window'] = 0;
1479	1385	}
1480	1386
1481		- if ( isset( $_POST['_mw_adminimize_cat_full'] ) ) {
1482		- $adminimizeoptions['_mw_adminimize_cat_full'] = strip_tags(stripslashes( $_POST['_mw_adminimize_cat_full'] ) );
	1387	+ if (isset($_POST['_mw_adminimize_cat_full'])) {
	1388	+ $adminimizeoptions['_mw_adminimize_cat_full'] = strip_tags(stripslashes($_POST['_mw_adminimize_cat_full']));
1483	1389	} else {
1484	1390	$adminimizeoptions['_mw_adminimize_cat_full'] = 0;
1485	1391	}
1486	1392
1487		- if ( isset( $_POST['_mw_adminimize_db_redirect'] ) ) {
1488		- $adminimizeoptions['_mw_adminimize_db_redirect'] = strip_tags(stripslashes( $_POST['_mw_adminimize_db_redirect'] ) );
	1393	+ if (isset($_POST['_mw_adminimize_db_redirect'])) {
	1394	+ $adminimizeoptions['_mw_adminimize_db_redirect'] = strip_tags(stripslashes($_POST['_mw_adminimize_db_redirect']));
1489	1395	} else {
1490	1396	$adminimizeoptions['_mw_adminimize_db_redirect'] = 0;
1491	1397	}
1492	1398
1493		- if ( isset( $_POST['_mw_adminimize_ui_redirect'] ) ) {
1494		- $adminimizeoptions['_mw_adminimize_ui_redirect'] = strip_tags(stripslashes( $_POST['_mw_adminimize_ui_redirect'] ) );
	1399	+ if (isset($_POST['_mw_adminimize_ui_redirect'])) {
	1400	+ $adminimizeoptions['_mw_adminimize_ui_redirect'] = strip_tags(stripslashes($_POST['_mw_adminimize_ui_redirect']));
1495	1401	} else {
1496	1402	$adminimizeoptions['_mw_adminimize_ui_redirect'] = 0;
1497	1403	}
1498	1404
1499		- if ( isset( $_POST['_mw_adminimize_advice'] ) ) {
1500		- $adminimizeoptions['_mw_adminimize_advice'] = strip_tags(stripslashes( $_POST['_mw_adminimize_advice'] ) );
	1405	+ if (isset($_POST['_mw_adminimize_advice'])) {
	1406	+ $adminimizeoptions['_mw_adminimize_advice'] = strip_tags(stripslashes($_POST['_mw_adminimize_advice']));
1501	1407	} else {
1502	1408	$adminimizeoptions['_mw_adminimize_advice'] = 0;
1503	1409	}
1504	1410
1505		- if ( isset( $_POST['_mw_adminimize_advice_txt'] ) ) {
1506		- $adminimizeoptions['_mw_adminimize_advice_txt'] = stripslashes( $_POST['_mw_adminimize_advice_txt'] );
	1411	+ if (isset($_POST['_mw_adminimize_advice_txt'])) {
	1412	+ $adminimizeoptions['_mw_adminimize_advice_txt'] = stripslashes($_POST['_mw_adminimize_advice_txt']);
1507	1413	} else {
1508	1414	$adminimizeoptions['_mw_adminimize_advice_txt'] = 0;
1509	1415	}
1510	1416
1511		- if ( isset( $_POST['_mw_adminimize_timestamp'] ) ) {
1512		- $adminimizeoptions['_mw_adminimize_timestamp'] = strip_tags(stripslashes( $_POST['_mw_adminimize_timestamp'] ) );
	1417	+ if (isset($_POST['_mw_adminimize_timestamp'])) {
	1418	+ $adminimizeoptions['_mw_adminimize_timestamp'] = strip_tags(stripslashes($_POST['_mw_adminimize_timestamp']));
1513	1419	} else {
1514	1420	$adminimizeoptions['_mw_adminimize_timestamp'] = 0;
1515	1421	}
1516	1422
1517		- if ( isset( $_POST['_mw_adminimize_control_flashloader'] ) ) {
1518		- $adminimizeoptions['_mw_adminimize_control_flashloader'] = strip_tags(stripslashes( $_POST['_mw_adminimize_control_flashloader'] ) );
	1423	+ if (isset($_POST['_mw_adminimize_control_flashloader'])) {
	1424	+ $adminimizeoptions['_mw_adminimize_control_flashloader'] = strip_tags(stripslashes($_POST['_mw_adminimize_control_flashloader']));
1519	1425	} else {
1520	1426	$adminimizeoptions['_mw_adminimize_control_flashloader'] = 0;
1521	1427	}
1522	1428
1523		- if ( isset( $_POST['_mw_adminimize_db_redirect_txt'] ) ) {
1524		- $adminimizeoptions['_mw_adminimize_db_redirect_txt'] = stripslashes( $_POST['_mw_adminimize_db_redirect_txt'] );
	1429	+ if (isset($_POST['_mw_adminimize_db_redirect_txt'])) {
	1430	+ $adminimizeoptions['_mw_adminimize_db_redirect_txt'] = stripslashes($_POST['_mw_adminimize_db_redirect_txt']);
1525	1431	} else {
1526	1432	$adminimizeoptions['_mw_adminimize_db_redirect_txt'] = 0;
1527	1433	}
1528	1434
1529	1435	// menu update
1530		- foreach ( $user_roles as $role ) {
1531		- if ( isset( $_POST['mw_adminimize_disabled_menu_' . $role . '_items'] ) ) {
1532		- $adminimizeoptions['mw_adminimize_disabled_menu_' . $role . '_items'] = $_POST['mw_adminimize_disabled_menu_' . $role . '_items'];
	1436	+ foreach ($user_roles as $role) {
	1437	+ if (isset($_POST['mw_adminimize_disabled_menu_'. $role .'_items'])) {
	1438	+ $adminimizeoptions['mw_adminimize_disabled_menu_'. $role .'_items'] = $_POST['mw_adminimize_disabled_menu_'. $role .'_items'];
1533	1439	} else {
1534		- $adminimizeoptions['mw_adminimize_disabled_menu_' . $role . '_items'] = array();
	1440	+ $adminimizeoptions['mw_adminimize_disabled_menu_'. $role .'_items'] = array();
1535	1441	}
1536	1442
1537		- if ( isset( $_POST['mw_adminimize_disabled_submenu_' . $role . '_items'] ) ) {
1538		- $adminimizeoptions['mw_adminimize_disabled_submenu_' . $role . '_items'] = $_POST['mw_adminimize_disabled_submenu_' . $role . '_items'];
	1443	+ if (isset($_POST['mw_adminimize_disabled_submenu_'. $role .'_items'])) {
	1444	+ $adminimizeoptions['mw_adminimize_disabled_submenu_'. $role .'_items'] = $_POST['mw_adminimize_disabled_submenu_'. $role .'_items'];
1539	1445	} else {
1540		- $adminimizeoptions['mw_adminimize_disabled_submenu_' . $role . '_items'] = array();
	1446	+ $adminimizeoptions['mw_adminimize_disabled_submenu_'. $role .'_items'] = array();
1541	1447	}
1542	1448	}
1543	1449
1544	1450	// global_options, metaboxes update
1545		- foreach ( $user_roles as $role ) {
1546		- if ( isset( $_POST['mw_adminimize_disabled_global_option_' . $role . '_items'] ) ) {
1547		- $adminimizeoptions['mw_adminimize_disabled_global_option_' . $role . '_items'] = $_POST['mw_adminimize_disabled_global_option_' . $role . '_items'];
	1451	+ foreach ($user_roles as $role) {
	1452	+ if (isset($_POST['mw_adminimize_disabled_global_option_'. $role . '_items'])) {
	1453	+ $adminimizeoptions['mw_adminimize_disabled_global_option_'. $role . '_items'] = $_POST['mw_adminimize_disabled_global_option_'. $role . '_items'];
1548	1454	} else {
1549		- $adminimizeoptions['mw_adminimize_disabled_global_option_' . $role . '_items'] = array();
	1455	+ $adminimizeoptions['mw_adminimize_disabled_global_option_'. $role . '_items'] = array();
1550	1456	}
1551	1457
1552		- if ( isset( $_POST['mw_adminimize_disabled_metaboxes_post_' . $role . '_items'] ) ) {
1553		- $adminimizeoptions['mw_adminimize_disabled_metaboxes_post_' . $role . '_items'] = $_POST['mw_adminimize_disabled_metaboxes_post_' . $role . '_items'];
	1458	+ if (isset($_POST['mw_adminimize_disabled_metaboxes_post_'. $role . '_items'])) {
	1459	+ $adminimizeoptions['mw_adminimize_disabled_metaboxes_post_'. $role . '_items'] = $_POST['mw_adminimize_disabled_metaboxes_post_'. $role . '_items'];
1554	1460	} else {
1555		- $adminimizeoptions['mw_adminimize_disabled_metaboxes_post_' . $role . '_items'] = array();
	1461	+ $adminimizeoptions['mw_adminimize_disabled_metaboxes_post_'. $role . '_items'] = array();
1556	1462	}
1557	1463
1558		- if ( isset( $_POST['mw_adminimize_disabled_metaboxes_page_' . $role . '_items'] ) ) {
1559		- $adminimizeoptions['mw_adminimize_disabled_metaboxes_page_' . $role . '_items'] = $_POST['mw_adminimize_disabled_metaboxes_page_' . $role . '_items'];
	1464	+ if (isset($_POST['mw_adminimize_disabled_metaboxes_page_'. $role . '_items'])) {
	1465	+ $adminimizeoptions['mw_adminimize_disabled_metaboxes_page_'. $role . '_items'] = $_POST['mw_adminimize_disabled_metaboxes_page_'. $role . '_items'];
1560	1466	} else {
1561		- $adminimizeoptions['mw_adminimize_disabled_metaboxes_page_' . $role . '_items'] = array();
	1467	+ $adminimizeoptions['mw_adminimize_disabled_metaboxes_page_'. $role . '_items'] = array();
1562	1468	}
1563	1469
1564		- foreach ( $post_types as $post_type ) {
1565		- if ( isset( $_POST['mw_adminimize_disabled_metaboxes_' . $post_type . '_' . $role . '_items'] ) ) {
1566		- $adminimizeoptions['mw_adminimize_disabled_metaboxes_' . $post_type . '_' . $role . '_items'] = $_POST['mw_adminimize_disabled_metaboxes_' . $post_type . '_' . $role . '_items'];
1567		- } else {
1568		- $adminimizeoptions['mw_adminimize_disabled_metaboxes_' . $post_type . '_' . $role . '_items'] = array();
1569		- }
1570		- }
1571		-
1572		- if ( isset( $_POST['mw_adminimize_disabled_link_option_' . $role . '_items'] ) ) {
1573		- $adminimizeoptions['mw_adminimize_disabled_link_option_' . $role . '_items'] = $_POST['mw_adminimize_disabled_link_option_' . $role . '_items'];
	1470	+ if (isset($_POST['mw_adminimize_disabled_link_option_'. $role . '_items'])) {
	1471	+ $adminimizeoptions['mw_adminimize_disabled_link_option_'. $role . '_items'] = $_POST['mw_adminimize_disabled_link_option_'. $role . '_items'];
1574	1472	} else {
1575		- $adminimizeoptions['mw_adminimize_disabled_link_option_' . $role . '_items'] = array();
	1473	+ $adminimizeoptions['mw_adminimize_disabled_link_option_'. $role . '_items'] = array();
1576	1474	}
1577	1475
1578	1476	// wp nav menu options
1579		- if ( isset( $_POST['mw_adminimize_disabled_nav_menu_option_' . $role . '_items'] ) ) {
1580		- $adminimizeoptions['mw_adminimize_disabled_nav_menu_option_' . $role . '_items'] = $_POST['mw_adminimize_disabled_nav_menu_option_' . $role . '_items'];
	1477	+ if (isset($_POST['mw_adminimize_disabled_nav_menu_option_'. $role . '_items'])) {
	1478	+ $adminimizeoptions['mw_adminimize_disabled_nav_menu_option_'. $role . '_items'] = $_POST['mw_adminimize_disabled_nav_menu_option_'. $role . '_items'];
1581	1479	} else {
1582		- $adminimizeoptions['mw_adminimize_disabled_nav_menu_option_' . $role . '_items'] = array();
	1480	+ $adminimizeoptions['mw_adminimize_disabled_nav_menu_option_'. $role . '_items'] = array();
1583	1481	}
1584	1482	}
1585	1483
1586	1484	// own options
1587		- if ( isset( $_POST['_mw_adminimize_own_values'] ) ) {
1588		- $adminimizeoptions['_mw_adminimize_own_values'] = stripslashes( $_POST['_mw_adminimize_own_values'] );
	1485	+ if (isset($_POST['_mw_adminimize_own_values'])) {
	1486	+ $adminimizeoptions['_mw_adminimize_own_values'] = stripslashes($_POST['_mw_adminimize_own_values']);
1589	1487	} else {
1590	1488	$adminimizeoptions['_mw_adminimize_own_values'] = 0;
1591	1489	}
1592	1490
1593		- if ( isset( $_POST['_mw_adminimize_own_options'] ) ) {
1594		- $adminimizeoptions['_mw_adminimize_own_options'] = stripslashes( $_POST['_mw_adminimize_own_options'] );
	1491	+ if (isset($_POST['_mw_adminimize_own_options'])) {
	1492	+ $adminimizeoptions['_mw_adminimize_own_options'] = stripslashes($_POST['_mw_adminimize_own_options']);
1595	1493	} else {
1596	1494	$adminimizeoptions['_mw_adminimize_own_options'] = 0;
1597	1495	}
1598	1496
1599	1497	// own post options
1600		- if ( isset( $_POST['_mw_adminimize_own_post_values'] ) ) {
1601		- $adminimizeoptions['_mw_adminimize_own_post_values'] = stripslashes( $_POST['_mw_adminimize_own_post_values'] );
	1498	+ if (isset($_POST['_mw_adminimize_own_post_values'])) {
	1499	+ $adminimizeoptions['_mw_adminimize_own_post_values'] = stripslashes($_POST['_mw_adminimize_own_post_values']);
1602	1500	} else {
1603	1501	$adminimizeoptions['_mw_adminimize_own_post_values'] = 0;
1604	1502	}
1605	1503
1606		- if ( isset( $_POST['_mw_adminimize_own_post_options'] ) ) {
1607		- $adminimizeoptions['_mw_adminimize_own_post_options'] = stripslashes( $_POST['_mw_adminimize_own_post_options'] );
	1504	+ if (isset($_POST['_mw_adminimize_own_post_options'])) {
	1505	+ $adminimizeoptions['_mw_adminimize_own_post_options'] = stripslashes($_POST['_mw_adminimize_own_post_options']);
1608	1506	} else {
1609	1507	$adminimizeoptions['_mw_adminimize_own_post_options'] = 0;
1610	1508	}
1611	1509
1612	1510	// own page options
1613		- if ( isset( $_POST['_mw_adminimize_own_page_values'] ) ) {
1614		- $adminimizeoptions['_mw_adminimize_own_page_values'] = stripslashes( $_POST['_mw_adminimize_own_page_values'] );
	1511	+ if (isset($_POST['_mw_adminimize_own_page_values'])) {
	1512	+ $adminimizeoptions['_mw_adminimize_own_page_values'] = stripslashes($_POST['_mw_adminimize_own_page_values']);
1615	1513	} else {
1616	1514	$adminimizeoptions['_mw_adminimize_own_page_values'] = 0;
1617	1515	}
1618	1516
1619		- if ( isset( $_POST['_mw_adminimize_own_page_options'] ) ) {
1620		- $adminimizeoptions['_mw_adminimize_own_page_options'] = stripslashes( $_POST['_mw_adminimize_own_page_options'] );
	1517	+ if (isset($_POST['_mw_adminimize_own_page_options'])) {
	1518	+ $adminimizeoptions['_mw_adminimize_own_page_options'] = stripslashes($_POST['_mw_adminimize_own_page_options']);
1621	1519	} else {
1622	1520	$adminimizeoptions['_mw_adminimize_own_page_options'] = 0;
1623	1521	}
1624	1522
1625		- // own custom post options
1626		- foreach ( $post_types as $post_type ) {
1627		- if ( isset( $_POST['_mw_adminimize_own_values_' . $post_type] ) ) {
1628		- $adminimizeoptions['_mw_adminimize_own_values_' . $post_type] = stripslashes( $_POST['_mw_adminimize_own_values_' . $post_type] );
1629		- } else {
1630		- $adminimizeoptions['_mw_adminimize_own_values_' . $post_type] = 0;
1631		- }
1632		-
1633		- if ( isset( $_POST['_mw_adminimize_own_options_' . $post_type] ) ) {
1634		- $adminimizeoptions['_mw_adminimize_own_options_' . $post_type ] = stripslashes( $_POST['_mw_adminimize_own_options_' . $post_type] );
1635		- } else {
1636		- $adminimizeoptions['_mw_adminimize_own_options_' . $post_type] = 0;
1637		- }
1638		- }
1639		-
1640	1523	// own link options
1641		- if ( isset( $_POST['_mw_adminimize_own_link_values'] ) ) {
1642		- $adminimizeoptions['_mw_adminimize_own_link_values'] = stripslashes( $_POST['_mw_adminimize_own_link_values'] );
	1524	+ if (isset($_POST['_mw_adminimize_own_link_values'])) {
	1525	+ $adminimizeoptions['_mw_adminimize_own_link_values'] = stripslashes($_POST['_mw_adminimize_own_link_values']);
1643	1526	} else {
1644	1527	$adminimizeoptions['_mw_adminimize_own_link_values'] = 0;
1645	1528	}
1646	1529
1647		- if ( isset( $_POST['_mw_adminimize_own_link_options'] ) ) {
1648		- $adminimizeoptions['_mw_adminimize_own_link_options'] = stripslashes( $_POST['_mw_adminimize_own_link_options'] );
	1530	+ if (isset($_POST['_mw_adminimize_own_link_options'])) {
	1531	+ $adminimizeoptions['_mw_adminimize_own_link_options'] = stripslashes($_POST['_mw_adminimize_own_link_options']);
1649	1532	} else {
1650	1533	$adminimizeoptions['_mw_adminimize_own_link_options'] = 0;
1651	1534	}
1652	1535
1653	1536	// wp nav menu options
1654		- if ( isset( $_POST['_mw_adminimize_own_nav_menu_values'] ) ) {
1655		- $adminimizeoptions['_mw_adminimize_own_nav_menu_values'] = stripslashes( $_POST['_mw_adminimize_own_nav_menu_values'] );
	1537	+ if (isset($_POST['_mw_adminimize_own_nav_menu_values'])) {
	1538	+ $adminimizeoptions['_mw_adminimize_own_nav_menu_values'] = stripslashes($_POST['_mw_adminimize_own_nav_menu_values']);
1656	1539	} else {
1657	1540	$adminimizeoptions['_mw_adminimize_own_nav_menu_values'] = 0;
1658	1541	}
1659	1542
1660		- if ( isset( $_POST['_mw_adminimize_own_nav_menu_options'] ) ) {
1661		- $adminimizeoptions['_mw_adminimize_own_nav_menu_options'] = stripslashes( $_POST['_mw_adminimize_own_nav_menu_options'] );
	1543	+ if (isset($_POST['_mw_adminimize_own_nav_menu_options'])) {
	1544	+ $adminimizeoptions['_mw_adminimize_own_nav_menu_options'] = stripslashes($_POST['_mw_adminimize_own_nav_menu_options']);
1662	1545	} else {
1663	1546	$adminimizeoptions['_mw_adminimize_own_nav_menu_options'] = 0;
1664	1547	}
1665	1548
1666		- $adminimizeoptions['mw_adminimize_default_menu'] = $GLOBALS['menu'];
1667		- $adminimizeoptions['mw_adminimize_default_submenu'] = $GLOBALS['submenu'];
1668		-
1669	1549	// update
1670		- update_option( 'mw_adminimize', $adminimizeoptions );
1671		- //$adminimizeoptions = get_option( 'mw_adminimize' );
1672		-
	1550	+ update_option('mw_adminimize', $adminimizeoptions);
	1551	+ $adminimizeoptions = get_option('mw_adminimize');
	1552	+
1673	1553	$myErrors = new _mw_adminimize_message_class();
1674		- $myErrors = '<div id="message" class="updated fade"><p>' . $myErrors->get_error( '_mw_adminimize_update' ) . '</p></div>';
	1554	+ $myErrors = '<div id="message" class="updated fade"><p>' . $myErrors->get_error('_mw_adminimize_update') . '</p></div>';
1675	1555	echo $myErrors;
1676	1556	}
1677	1557
1678	1558
		@@ -1680,9 +1560,9 @@
1680	1560	* Delete options in database
1681	1561	*/
1682	1562	function _mw_adminimize_deinstall() {
1683	1563
1684		- delete_option( 'mw_adminimize' );
	1564	+ delete_option('mw_adminimize');
1685	1565	}
1686	1566
1687	1567
1688	1568	/**
		@@ -1690,27 +1570,23 @@
1690	1570	*/
1691	1571	function _mw_adminimize_install() {
1692	1572	global $menu, $submenu;
1693	1573
1694		- $user_roles = _mw_adminimize_get_all_user_roles();
	1574	+ $user_roles = get_all_user_roles();
1695	1575	$adminimizeoptions = array();
1696	1576
1697		- foreach ( $user_roles as $role ) {
1698		- $adminimizeoptions['mw_adminimize_disabled_menu_' . $role . '_items'] = array();
1699		- $adminimizeoptions['mw_adminimize_disabled_submenu_' . $role . '_items'] = array();
1700		- $adminimizeoptions['mw_adminimize_disabled_global_option_' . $role . '_items'] = array();
1701		- $adminimizeoptions['mw_adminimize_disabled_metaboxes_post_' . $role . '_items'] = array();
1702		- $adminimizeoptions['mw_adminimize_disabled_metaboxes_page_' . $role . '_items'] = array();
1703		- $args = array( 'public' => TRUE, '_builtin' => FALSE );
1704		- foreach ( get_post_types( $args ) as $post_type ) {
1705		- $adminimizeoptions['mw_adminimize_disabled_metaboxes_' . $post_type . '_' . $role . '_items'] = array();
1706		- }
	1577	+ foreach ($user_roles as $role) {
	1578	+ $adminimizeoptions['mw_adminimize_disabled_menu_'. $role .'_items'] = array();
	1579	+ $adminimizeoptions['mw_adminimize_disabled_submenu_'. $role .'_items'] = array();
	1580	+ $adminimizeoptions['mw_adminimize_disabled_global_option_'. $role .'_items'] = array();
	1581	+ $adminimizeoptions['mw_adminimize_disabled_metaboxes_post_'. $role .'_items'] = array();
	1582	+ $adminimizeoptions['mw_adminimize_disabled_metaboxes_page_'. $role .'_items'] = array();
1707	1583	}
1708	1584
1709	1585	$adminimizeoptions['mw_adminimize_default_menu'] = $menu;
1710	1586	$adminimizeoptions['mw_adminimize_default_submenu'] = $submenu;
1711	1587
1712		- add_option( 'mw_adminimize', $adminimizeoptions );
	1588	+ add_option('mw_adminimize', $adminimizeoptions);
1713	1589	}
1714	1590
1715	1591	/**
1716	1592	* export options in file
		@@ -1717,20 +1593,20 @@
1717	1593	*/
1718	1594	function _mw_adminimize_export() {
1719	1595	global $wpdb;
1720	1596
1721		- $filename = 'adminimize_export-' . date( 'Y-m-d_G-i-s' ) . '.seq';
	1597	+ $filename = 'adminimize_export-' . date('Y-m-d_G-i-s') . '.seq';
1722	1598
1723		- header( "Content-Description: File Transfer");
1724		- header( "Content-Disposition: attachment; filename=" . urlencode( $filename ) );
1725		- header( "Content-Type: application/force-download");
1726		- header( "Content-Type: application/octet-stream");
1727		- header( "Content-Type: application/download");
1728		- header( 'Content-Type: text/seq; charset=' . get_option( 'blog_charset' ), TRUE );
	1599	+ header("Content-Description: File Transfer");
	1600	+ header("Content-Disposition: attachment; filename=" . urlencode($filename));
	1601	+ header("Content-Type: application/force-download");
	1602	+ header("Content-Type: application/octet-stream");
	1603	+ header("Content-Type: application/download");
	1604	+ header('Content-Type: text/seq; charset=' . get_option('blog_charset'), TRUE);
1729	1605	flush();
1730	1606
1731	1607	$export_data = mysql_query("SELECT option_value FROM $wpdb->options WHERE option_name = 'mw_adminimize'");
1732		- $export_data = mysql_result( $export_data, 0 );
	1608	+ $export_data = mysql_result($export_data, 0);
1733	1609	echo $export_data;
1734	1610	flush();
1735	1611	}
1736	1612
		@@ -1740,40 +1616,39 @@
1740	1616	function _mw_adminimize_import() {
1741	1617
1742	1618	// check file extension
1743	1619	$str_file_name = $_FILES['datei']['name'];
1744		- $str_file_ext = explode( ".", $str_file_name );
	1620	+ $str_file_ext = explode(".", $str_file_name);
1745	1621
1746		- if ( $str_file_ext[1] != 'seq' ) {
	1622	+ if ($str_file_ext[1] != 'seq') {
1747	1623	$addreferer = 'notexist';
1748		- } elseif ( file_exists( $_FILES['datei']['name'] ) ) {
	1624	+ } elseif (file_exists($_FILES['datei']['name'])) {
1749	1625	$addreferer = 'exist';
1750	1626	} else {
1751	1627	// path for file
1752	1628	$str_ziel = WP_CONTENT_DIR . '/' . $_FILES['datei']['name'];
1753	1629	// transfer
1754		- move_uploaded_file( $_FILES['datei']['tmp_name'], $str_ziel );
	1630	+ move_uploaded_file($_FILES['datei']['tmp_name'], $str_ziel);
1755	1631	// access authorisation
1756		- chmod( $str_ziel, 0644);
	1632	+ chmod($str_ziel, 0644);
1757	1633	// SQL import
1758		- ini_set( 'default_socket_timeout', 120);
1759		- $import_file = file_get_contents( $str_ziel );
	1634	+ ini_set('default_socket_timeout', 120);
	1635	+ $import_file = file_get_contents($str_ziel);
1760	1636
1761	1637	_mw_adminimize_deinstall();
1762		- $import_file = unserialize( $import_file );
	1638	+ $import_file = unserialize($import_file);
1763	1639
1764		- if ( file_exists( $str_ziel ) )
1765		- unlink( $str_ziel );
1766		- update_option( 'mw_adminimize', $import_file );
1767		- if ( file_exists( $str_ziel ) )
1768		- unlink( $str_ziel );
	1640	+ if ( file_exists($str_ziel) )
	1641	+ unlink($str_ziel);
	1642	+ update_option('mw_adminimize', $import_file);
	1643	+ if ( file_exists($str_ziel) )
	1644	+ unlink($str_ziel);
1769	1645
1770	1646	$addreferer = 'true';
1771	1647	}
1772	1648
1773	1649	$myErrors = new _mw_adminimize_message_class();
1774		- $myErrors = '<div id="message" class="updated fade"><p>' .
1775		- $myErrors->get_error( '_mw_adminimize_import' ) . '</p></div>';
	1650	+ $myErrors = '<div id="message" class="updated fade"><p>' . $myErrors->get_error('_mw_adminimize_import') . '</p></div>';
1776	1651	echo $myErrors;
1777	1652	}
1778	1653
1779	1654	?>