| @@ -34,8 +34,9 @@ | ||
| 34 | 34 | if ( function_exists( 'current_user_can' ) && current_user_can( 'manage_options' ) ) { |
| 35 | 35 | check_admin_referer( 'mw_adminimize_nonce' ); |
| 36 | 36 | |
| 37 | 37 | _mw_adminimize_update(); |
| 38 | + | |
| 38 | 39 | } else { |
| 39 | 40 | $myErrors = new _mw_adminimize_message_class(); |
| 40 | 41 | $myErrors = '<div id="message" class="error"><p>' . $myErrors->get_error( |
| 41 | 42 | '_mw_adminimize_access_denied' |
| @@ -54,33 +55,33 @@ | ||
| 54 | 55 | } |
| 55 | 56 | |
| 56 | 57 | // Uninstall options |
| 57 | 58 | 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 ) | |
| 59 | + && $_POST[ '_mw_adminimize_action' ] === '_mw_adminimize_deinstall' ) | |
| 60 | + && ! array_key_exists( '_mw_adminimize_deinstall_yes', $_POST ) | |
| 60 | 61 | |
| 61 | 62 | ) { |
| 62 | 63 | $myErrors = new _mw_adminimize_message_class(); |
| 63 | 64 | $myErrors = '<div id="message" class="error"><p>' . $myErrors->get_error( |
| 64 | - '_mw_adminimize_uninstall_yes' | |
| 65 | + '_mw_adminimize_deinstall_yes' | |
| 65 | 66 | ) . '</p></div>'; |
| 66 | 67 | wp_die( $myErrors ); |
| 67 | 68 | } |
| 68 | 69 | |
| 69 | 70 | 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' | |
| 71 | + && array_key_exists( '_mw_adminimize_deinstall_yes', $_POST ) | |
| 72 | + && $_POST[ '_mw_adminimize_action' ] === '_mw_adminimize_deinstall' ) | |
| 73 | + && $_POST[ '_mw_adminimize_deinstall' ] | |
| 74 | + && $_POST[ '_mw_adminimize_deinstall_yes' ] === '_mw_adminimize_deinstall' | |
| 74 | 75 | ) { |
| 75 | 76 | if ( function_exists( 'current_user_can' ) && current_user_can( 'manage_options' ) ) { |
| 76 | 77 | check_admin_referer( 'mw_adminimize_nonce' ); |
| 77 | 78 | |
| 78 | - _mw_adminimize_uninstall(); | |
| 79 | + _mw_adminimize_deinstall(); | |
| 79 | 80 | |
| 80 | 81 | $myErrors = new _mw_adminimize_message_class(); |
| 81 | 82 | $myErrors = '<div id="message" class="updated fade"><p>' . $myErrors->get_error( |
| 82 | - '_mw_adminimize_uninstall' | |
| 83 | + '_mw_adminimize_deinstall' | |
| 83 | 84 | ) . '</p></div>'; |
| 84 | 85 | echo $myErrors; |
| 85 | 86 | } else { |
| 86 | 87 | $myErrors = new _mw_adminimize_message_class(); |
| @@ -138,9 +139,8 @@ | ||
| 138 | 139 | ?> |
| 139 | 140 | <div class="wrap"> |
| 140 | 141 | <?php |
| 141 | 142 | do_action( 'mw_adminimize_before_settings_form' ); |
| 142 | - | |
| 143 | 143 | // Backend Options for all roles |
| 144 | 144 | require_once 'inc-options/minimenu.php'; |
| 145 | 145 | ?> |
| 146 | 146 | <form name="backend_option" method="post" id="_mw_adminimize_options" action="?page=<?php echo esc_attr( |
| @@ -146,11 +146,8 @@ | ||
| 146 | 146 | <form name="backend_option" method="post" id="_mw_adminimize_options" action="?page=<?php echo esc_attr( |
| 147 | 147 | $_GET[ 'page' ] |
| 148 | 148 | ); ?>"> |
| 149 | 149 | <?php |
| 150 | - // Adminimize Settings for the plugin. | |
| 151 | - require_once 'inc-options/self_settings.php'; | |
| 152 | - | |
| 153 | 150 | // Admin Bar options |
| 154 | 151 | require_once 'inc-options/admin_bar.php'; |
| 155 | 152 | |
| 156 | 153 | // Admin Bar items frontend |
