| @@ -11,17 +11,10 @@ | ||
| 11 | 11 | |
| 12 | 12 | add_submenu_page( 'formidable', 'Formidable | ' . __( 'Global Settings', 'formidable' ), __( 'Global Settings', 'formidable' ), 'frm_change_settings', 'formidable-settings', 'FrmSettingsController::route' ); |
| 13 | 13 | } |
| 14 | 14 | |
| 15 | - /** | |
| 16 | - * Include license box template on demand. | |
| 17 | - * | |
| 18 | - * @return void | |
| 19 | - */ | |
| 20 | 15 | public static function license_box() { |
| 21 | - if ( ! current_user_can( 'activate_plugins' ) ) { | |
| 22 | - return; | |
| 23 | - } | |
| 16 | + $a = FrmAppHelper::simple_get( 't', 'sanitize_title', 'general_settings' ); | |
| 24 | 17 | include( FrmAppHelper::plugin_path() . '/classes/views/frm-settings/license_box.php' ); |
| 25 | 18 | } |
| 26 | 19 | |
| 27 | 20 | public static function display_form( $errors = array(), $message = '' ) { |
| @@ -184,38 +177,17 @@ | ||
| 184 | 177 | wp_die(); |
| 185 | 178 | } |
| 186 | 179 | |
| 187 | 180 | /** |
| 188 | - * Render the general global settings section. | |
| 189 | - * | |
| 190 | 181 | * @since 4.0 |
| 191 | - * | |
| 192 | - * @return void | |
| 193 | 182 | */ |
| 194 | 183 | public static function general_settings() { |
| 195 | 184 | $frm_settings = FrmAppHelper::get_settings(); |
| 196 | - $uploads = wp_upload_dir(); | |
| 197 | - $target_path = $uploads['basedir'] . '/formidable/css'; | |
| 198 | 185 | |
| 199 | - include FrmAppHelper::plugin_path() . '/classes/views/frm-settings/general.php'; | |
| 200 | - } | |
| 186 | + $uploads = wp_upload_dir(); | |
| 187 | + $target_path = $uploads['basedir'] . '/formidable/css'; | |
| 201 | 188 | |
| 202 | - /** | |
| 203 | - * Render the global currency selector if Pro is up to date. | |
| 204 | - * | |
| 205 | - * @param FrmSettings $frm_settings | |
| 206 | - * @param string $more_html | |
| 207 | - * @return void | |
| 208 | - */ | |
| 209 | - public static function maybe_render_currency_selector( $frm_settings, $more_html ) { | |
| 210 | - if ( false !== strpos( $more_html, 'id="frm_currency"' ) ) { | |
| 211 | - // Avoid rendering the Currency setting if it gets rendered from the frm_settings_form hook. | |
| 212 | - // This is for backward compatibility. If Pro is outdated there won't be two currency dropdowns. | |
| 213 | - return; | |
| 214 | - } | |
| 215 | - | |
| 216 | - $currencies = FrmCurrencyHelper::get_currencies(); | |
| 217 | - include FrmAppHelper::plugin_path() . '/classes/views/frm-settings/_currency.php'; | |
| 189 | + include( FrmAppHelper::plugin_path() . '/classes/views/frm-settings/general.php' ); | |
| 218 | 190 | } |
| 219 | 191 | |
| 220 | 192 | /** |
| 221 | 193 | * @since 4.0 |
