← All changes | adminimize_page.php +67 -52 1.11.2 → 1.11.9 View file →

		@@ -3,33 +3,31 @@
3	3	* @package Adminimize
4	4	* @subpackage Settings page
5	5	* @author Frank Bültge
6	6	*/
7		-if ( ! function_exists( 'add_action' ) ) {
8		- echo "Hi there! I'm just a part of plugin, not much I can do when called directly.";
9		- exit;
	7	+
	8	+// A rather more popular way to check if the file is being accessed directly.
	9	+if ( ! defined( 'ABSPATH' ) ) {
	10	+ die( "Hi there! I'm just a part of plugin, not much I can do when called directly." );
10	11	}
11		-
	12	+/*
12	13	// Export the options to local client.
13	14	if ( array_key_exists( '_mw_adminimize_export', $_GET ) ) {
14		- _mw_adminimize_export_json();
	15	+ add_action( 'admin_init', '_mw_adminimize_export_json' );
	16	+ //_mw_adminimize_export_json();
15	17	die();
16		-}
	18	+}*/
17	19
18	20	function _mw_adminimize_options() {
19		- global $wpdb, $_wp_admin_css_colors, $wp_version, $wp_roles, $table_prefix;
20	21
21		- $_mw_adminimize_user_info = 0;
	22	+ // The removed data is never used.
22	23
23		- // get array with userroles
24		- // also provide for the other files
25		- $user_roles = _mw_adminimize_get_all_user_roles();
26		- $user_roles_names = _mw_adminimize_get_all_user_roles_names();
27		-
28	24	// update options
29		- if ( ( array_key_exists( '_mw_adminimize_action', $_POST )
	25	+ // Some indenting cleanups
	26	+ if (
	27	+ ( array_key_exists( '_mw_adminimize_action', $_POST )
30	28	&& $_POST[ '_mw_adminimize_action' ] === '_mw_adminimize_insert' )
31		- && $_POST[ '_mw_adminimize_save' ]
	29	+ && $_POST[ '_mw_adminimize_save' ]
32	30	) {
33	31
34	32	if ( function_exists( 'current_user_can' ) && current_user_can( 'manage_options' ) ) {
35	33	check_admin_referer( 'mw_adminimize_nonce' );
		@@ -36,19 +34,25 @@
36	34
37	35	_mw_adminimize_update();
38	36	} else {
39	37	$myErrors = new _mw_adminimize_message_class();
40		- $myErrors = '<div id="message" class="error"><p>' . $myErrors->get_error(
41		- '_mw_adminimize_access_denied'
42		- ) . '</p></div>';
	38	+ $myErrors = '<div id="message" class="error"><p>' .
	39	+ $myErrors->get_error(
	40	+ '_mw_adminimize_access_denied'
	41	+ ) .
	42	+ '</p></div>';
43	43	wp_die( $myErrors );
	44	+
	45	+ // Some indenting cleanups
44	46	}
45	47	}
46	48
47	49	// import options
48		- if ( ( array_key_exists( '_mw_adminimize_action', $_POST )
	50	+ // Some indenting cleanups
	51	+ if (
	52	+ ( array_key_exists( '_mw_adminimize_action', $_POST )
49	53	&& $_POST[ '_mw_adminimize_action' ] === '_mw_adminimize_import' )
50		- && $_POST[ '_mw_adminimize_save' ]
	54	+ && $_POST[ '_mw_adminimize_save' ]
51	55	) {
52	56
53	57	_mw_adminimize_import_json();
54	58	}
		@@ -53,12 +57,13 @@
53	57	_mw_adminimize_import_json();
54	58	}
55	59
56	60	// Uninstall options
57		- if ( ( array_key_exists( '_mw_adminimize_action', $_POST )
58		- && $_POST[ '_mw_adminimize_action' ] === '_mw_adminimize_uninstall' )
59		- && ! array_key_exists( '_mw_adminimize_uninstall_yes', $_POST )
60		-
	61	+ // Some indenting cleanups
	62	+ if (
	63	+ ( array_key_exists( '_mw_adminimize_action', $_POST )
	64	+ && $_POST[ '_mw_adminimize_action' ] === '_mw_adminimize_uninstall' )
	65	+ && ! array_key_exists( '_mw_adminimize_uninstall_yes', $_POST )
61	66	) {
62	67	$myErrors = new _mw_adminimize_message_class();
63	68	$myErrors = '<div id="message" class="error"><p>' . $myErrors->get_error(
64	69	'_mw_adminimize_uninstall_yes'
		@@ -65,13 +70,15 @@
65	70	) . '</p></div>';
66	71	wp_die( $myErrors );
67	72	}
68	73
69		- if ( ( array_key_exists( '_mw_adminimize_action', $_POST )
70		- && array_key_exists( '_mw_adminimize_uninstall_yes', $_POST )
71		- && $_POST[ '_mw_adminimize_action' ] === '_mw_adminimize_uninstall' )
72		- && $_POST[ '_mw_adminimize_uninstall' ]
73		- && $_POST[ '_mw_adminimize_uninstall_yes' ] === '_mw_adminimize_uninstall'
	74	+ // Some indenting cleanups
	75	+ if (
	76	+ ( array_key_exists( '_mw_adminimize_action', $_POST )
	77	+ && array_key_exists( '_mw_adminimize_uninstall_yes', $_POST )
	78	+ && $_POST[ '_mw_adminimize_action' ] === '_mw_adminimize_uninstall' )
	79	+ && $_POST[ '_mw_adminimize_uninstall' ]
	80	+ && $_POST[ '_mw_adminimize_uninstall_yes' ] === '_mw_adminimize_uninstall'
74	81	) {
75	82	if ( function_exists( 'current_user_can' ) && current_user_can( 'manage_options' ) ) {
76	83	check_admin_referer( 'mw_adminimize_nonce' );
77	84
		@@ -91,48 +98,61 @@
91	98	}
92	99	}
93	100
94	101	// load theme user data
95		- if ( ( array_key_exists( '_mw_adminimize_action', $_POST )
	102	+ // Some indenting cleanups
	103	+ if (
	104	+ ( array_key_exists( '_mw_adminimize_action', $_POST )
96	105	&& $_POST[ '_mw_adminimize_action' ] === '_mw_adminimize_load_theme' )
97		- && $_POST[ '_mw_adminimize_load' ]
	106	+ && $_POST[ '_mw_adminimize_load' ]
98	107	) {
99	108	if ( function_exists( 'current_user_can' ) && current_user_can( 'edit_users' ) ) {
100	109	check_admin_referer( 'mw_adminimize_nonce' );
101	110
102	111	$myErrors = new _mw_adminimize_message_class();
103		- $myErrors = '<div id="message" class="updated fade"><p>' . $myErrors->get_error(
104		- '_mw_adminimize_load_theme'
105		- ) . '</p></div>';
	112	+ $myErrors = '<div id="message" class="updated fade"><p>' .
	113	+ $myErrors->get_error(
	114	+ '_mw_adminimize_load_theme'
	115	+ ) .
	116	+ '</p></div>';
106	117	echo $myErrors;
107	118	} else {
108	119	$myErrors = new _mw_adminimize_message_class();
109		- $myErrors = '<div id="message" class="error"><p>' . $myErrors->get_error(
110		- '_mw_adminimize_access_denied'
111		- ) . '</p></div>';
	120	+ $myErrors = '<div id="message" class="error"><p>' .
	121	+ $myErrors->get_error(
	122	+ '_mw_adminimize_access_denied'
	123	+ ) .
	124	+ '</p></div>';
112	125	wp_die( $myErrors );
113	126	}
114	127	}
115	128
116		- if ( ( array_key_exists( '_mw_adminimize_action', $_POST )
	129	+ // Some indenting cleanups
	130	+ if (
	131	+ ( array_key_exists( '_mw_adminimize_action', $_POST )
117	132	&& $_POST[ '_mw_adminimize_action' ] === '_mw_adminimize_set_theme' )
118		- && $_POST[ '_mw_adminimize_save' ]
	133	+ && $_POST[ '_mw_adminimize_save' ]
119	134	) {
120	135	if ( function_exists( 'current_user_can' ) && current_user_can( 'edit_users' ) ) {
121	136	check_admin_referer( 'mw_adminimize_nonce' );
122	137
123		- _mw_adminimize_set_theme();
	138	+ // _mw_adminimize_set_theme();
	139	+ // This function isn't defined anywhere.
124	140
125	141	$myErrors = new _mw_adminimize_message_class();
126		- $myErrors = '<div id="message" class="updated fade"><p>' . $myErrors->get_error(
127		- '_mw_adminimize_set_theme'
128		- ) . '</p></div>';
	142	+ $myErrors = '<div id="message" class="updated fade"><p>' .
	143	+ $myErrors->get_error(
	144	+ '_mw_adminimize_set_theme'
	145	+ ) .
	146	+ '</p></div>';
129	147	echo $myErrors;
130	148	} else {
131	149	$myErrors = new _mw_adminimize_message_class();
132		- $myErrors = '<div id="message" class="error"><p>' . $myErrors->get_error(
133		- '_mw_adminimize_access_denied'
134		- ) . '</p></div>';
	150	+ $myErrors = '<div id="message" class="error"><p>' .
	151	+ $myErrors->get_error(
	152	+ '_mw_adminimize_access_denied'
	153	+ ) .
	154	+ '</p></div>';
135	155	wp_die( $myErrors );
136	156	}
137	157	}
138	158	?>
		@@ -142,11 +162,9 @@
142	162
143	163	// Backend Options for all roles
144	164	require_once 'inc-options/minimenu.php';
145	165	?>
146		- <form name="backend_option" method="post" id="_mw_adminimize_options" action="?page=<?php echo esc_attr(
147		- $_GET[ 'page' ]
148		- ); ?>">
	166	+ <form name="backend_option" method="post" id="_mw_adminimize_options" action="?page=<?php echo esc_attr( $_GET[ 'page' ] ); ?>">
149	167	<?php
150	168	// Adminimize Settings for the plugin.
151	169	require_once 'inc-options/self_settings.php';
152	170
		@@ -195,11 +213,8 @@
195	213	</form>
196	214
197	215	<?php
198	216	do_action( 'mw_adminimize_after_settings_form' );
199		-
200		- // Theme Options
201		- require_once 'inc-options/theme_options.php';
202	217
203	218	// Im/Export Options
204	219	require_once 'inc-options/im_export_options.php';
205	220