Changeset 3175163

Timestamp:

10/24/2024 04:47:55 PM (16 months ago)

Author:

bibleup

Message:

Upload stable v1.1.0 to trunk

Location:

bibleup/trunk

Files:

• bibleup.php (modified) (12 diffs)
• readme.txt (modified) (5 diffs)
• settings/settings-general.php (modified) (8 diffs)
• wp-settings-framework/wp-settings-framework.php (modified) (77 diffs)

bibleup/trunk/bibleup.php

@@ -1 +1 @@
 <?php
 /*
-   Plugin Name: BibleUp
-   Plugin URI: https://bibleup.netlify.com
-   description: BibleUp transforms Bible References on a webpage into flexible, and highly customisable popovers.
-   Version: 1.0.1
-   Author: BibleUp
-   Author URI: https://bibleup.netlify.com
-   License: GPLv3
-   License URI: https://www.gnu.org/licenses/gpl-3.0.html
-   */
+ * Plugin Name: BibleUp
+ * Plugin URI: https://bibleup.netlify.app
+ * description: BibleUp transforms Bible References on a webpage into flexible, and highly customisable popovers.
+ * Version: 1.1.0
+ * Requires at least: 5.6
+ * Requires PHP: 7.0
+ * Author: BibleUp
+ * Author URI: https://bibleup.netlify.app
+ * License: GPLv3
+ * License URI: https://www.gnu.org/licenses/gpl-3.0.html
+ */
 
-class BibleUp {
+class BibleUp
+{
 
     private $plugin_path; // @var string
@@ -19 +22 @@
 
     // BibleUp constructor.
-    function __construct() {
-        $this->plugin_path = plugin_dir_path( __FILE__ );
+    function __construct()
+    {
+        $this->plugin_path = plugin_dir_path(__FILE__);
         //this service is documented and delivery is pegged to major version @1
         $this->script = 'https://cdn.jsdelivr.net/npm/@bibleup/bibleup@1/dist/umd/bibleup-core.min.js';
@@ -26 +30 @@
 
         // Include and create a new Bibleup_WordPressSettingsFramework
-        require_once( $this->plugin_path . 'wp-settings-framework/wp-settings-framework.php' );
-        $this->wpsf = new Bibleup_WordPressSettingsFramework( $this->plugin_path . 'settings/settings-general.php', 'bibleup' );
+        require_once($this->plugin_path . 'wp-settings-framework/wp-settings-framework.php');
+        $this->wpsf = new Bibleup_WordPressSettingsFramework($this->plugin_path . 'settings/settings-general.php', 'bibleup');
 
         // Add admin menu
-        add_action( 'admin_menu', array( $this, 'add_settings_page' ), 20 );
+        add_action('admin_menu', array($this, 'add_settings_page'), 20);
 
         // Add an optional settings validation filter (recommended)
-        add_filter( $this->wpsf->get_option_group() . '_settings_validate', array( &$this, 'validate_settings' ) );
+        add_filter($this->wpsf->get_option_group() . '_settings_validate', array(&$this, 'validate_settings'));
     }
 
@@ -39 +43 @@
      * Add settings page.
      */
-    function add_settings_page() {
-        $this->wpsf->add_settings_page( array(
+    function add_settings_page()
+    {
+        $this->wpsf->add_settings_page(array(
             'parent_slug' => 'options-general.php',
-            'page_title'  => __( 'BibleUp', 'bibleup' ),
-            'menu_title'  => __( 'BibleUp', 'bibleup' ),
-            'capability'  => 'manage_options',
+            'page_title' => __('BibleUp', 'bibleup'),
+            'menu_title' => __('BibleUp', 'bibleup'),
+            'capability' => 'manage_options',
         ));
     }
@@ -53 +58 @@
      * @return mixed
      */
-    function validate_settings( $input ) {
+    function validate_settings($input)
+    {
         // Do your settings validation here
         // Same as $sanitize_callback from http://codex.wordpress.org/Function_Reference/register_setting
@@ -60 +66 @@
     }
 
-    function start() {
-        add_action( 'wp_enqueue_scripts', array( $this, 'handle_scripts' ) );
+    function start()
+    {
+        add_action('wp_enqueue_scripts', array($this, 'handle_scripts'));
     }
 
-    function handle_scripts() {
-        $raw_options = wpsf_get_setting_bibleup( 'bibleup', 'tab_2_paste_config', 'raw_options' );
-        $custom_css = wpsf_get_setting_bibleup( 'bibleup', 'tab_2_custom_css', 'custom_css' );
-        wp_enqueue_script('bibleup-core', $this->script, null, 'v1', true );
+    function handle_scripts()
+    {
+        $raw_options = wpsf_get_setting_bibleup('bibleup', 'tab_2_paste_config', 'raw_options');
+        $custom_css = wpsf_get_setting_bibleup('bibleup', 'tab_2_custom_css', 'custom_css');
+        wp_enqueue_script('bibleup-core', $this->script, null, 'v1', true);
         wp_enqueue_style('bibleup-style', $this->style, null, 'v1');
 
@@ -84 +92 @@
     }
 
-    function get_custom_css() {
-        $custom_css = wpsf_get_setting_bibleup( 'bibleup', 'tab_2_paste_config', 'custom_css' );
-        return $custom_css;
-    }
+    function get_select_options()
+    {
+        // tab_1 section ID - select_options
+        $popup = wpsf_get_setting_bibleup('bibleup', 'tab_1_select_options', 'popup');
+        $version = wpsf_get_setting_bibleup('bibleup', 'tab_1_select_options', 'version');
+        $dark_theme = wpsf_get_setting_bibleup('bibleup', 'tab_1_select_options', 'dark_theme');
+        // tab_1 section ID - popup_style
+        $primary = wpsf_get_setting_bibleup('bibleup', 'tab_1_popup_style', 'primary');
+        $secondary = wpsf_get_setting_bibleup('bibleup', 'tab_1_popup_style', 'secondary');
+        $tertiary = wpsf_get_setting_bibleup('bibleup', 'tab_1_popup_style', 'tertiary');
+        $header_color = wpsf_get_setting_bibleup('bibleup', 'tab_1_popup_style', 'header_color');
+        $font_color = wpsf_get_setting_bibleup('bibleup', 'tab_1_popup_style', 'font_color');
+        $version_color = wpsf_get_setting_bibleup('bibleup', 'tab_1_popup_style', 'version_color');
+        $close_color = wpsf_get_setting_bibleup('bibleup', 'tab_1_popup_style', 'close_color');
+        $border_radius = wpsf_get_setting_bibleup('bibleup', 'tab_1_popup_style', 'border_radius');
+        $box_shadow = wpsf_get_setting_bibleup('bibleup', 'tab_1_popup_style', 'box_shadow');
+        $font_size = wpsf_get_setting_bibleup('bibleup', 'tab_1_popup_style', 'font_size');
+        // tab_1 section ID - additional
+        $ignoreCase = wpsf_get_setting_bibleup('bibleup', 'tab_1_additional', 'ignoreCase');
+        $bu_allow = wpsf_get_setting_bibleup('bibleup', 'tab_1_additional', 'bu_allow');
+        $bu_ignore = wpsf_get_setting_bibleup('bibleup', 'tab_1_additional', 'bu_ignore');
+        $buid = wpsf_get_setting_bibleup('bibleup', 'tab_1_additional', 'buid');
 
-    function get_select_options() {
-        // tab_1 section ID - select_options
-        $popup = wpsf_get_setting_bibleup( 'bibleup', 'tab_1_select_options', 'popup' );
-        $version = wpsf_get_setting_bibleup( 'bibleup', 'tab_1_select_options', 'version' );
-        $dark_theme = wpsf_get_setting_bibleup( 'bibleup', 'tab_1_select_options', 'dark_theme' );
-        // tab_1 section ID - popup_style
-        $primary = wpsf_get_setting_bibleup( 'bibleup', 'tab_1_popup_style', 'primary' );
-        $secondary = wpsf_get_setting_bibleup( 'bibleup', 'tab_1_popup_style', 'secondary' );
-        $tertiary = wpsf_get_setting_bibleup( 'bibleup', 'tab_1_popup_style', 'tertiary' );
-        $header_color = wpsf_get_setting_bibleup( 'bibleup', 'tab_1_popup_style', 'header_color' );
-        $font_color = wpsf_get_setting_bibleup( 'bibleup', 'tab_1_popup_style', 'font_color' );
-        $version_color = wpsf_get_setting_bibleup( 'bibleup', 'tab_1_popup_style', 'version_color' );
-        $close_color = wpsf_get_setting_bibleup( 'bibleup', 'tab_1_popup_style', 'close_color' );
-        $border_radius = wpsf_get_setting_bibleup( 'bibleup', 'tab_1_popup_style', 'border_radius' );
-        $box_shadow = wpsf_get_setting_bibleup( 'bibleup', 'tab_1_popup_style', 'box_shadow' );
-        $font_size = wpsf_get_setting_bibleup( 'bibleup', 'tab_1_popup_style', 'font_size' );
-        // tab_1 section ID - additional
-        $ignoreCase = wpsf_get_setting_bibleup( 'bibleup', 'tab_1_additional', 'ignoreCase' );
-        $bu_allow = wpsf_get_setting_bibleup( 'bibleup', 'tab_1_additional', 'bu_allow' );
-        $bu_ignore = wpsf_get_setting_bibleup( 'bibleup', 'tab_1_additional', 'bu_ignore' );
-        $buid = wpsf_get_setting_bibleup( 'bibleup', 'tab_1_additional', 'buid' );
-
-        $call = function($prop, $default, $isArray=false) {
-            if ($prop == 'false' || empty($prop) ) {
+        $call = function ($prop, $default, $isArray = false) {
+            if ($prop == 'false' || empty($prop)) {
                 return ($isArray) ? $default : "'$default'";
             } else if ($prop == 'true') {
@@ -118 +122 @@
             } else {
                 $prop = esc_js($prop);
-                return "'${prop}'";
+                return "'{$prop}'";
             }
         };
@@ -124 +128 @@
         $r = "
             let b = new BibleUp(document.body, {
-                popup: ". $call($popup, 'classic') .",
-                version: ". $call($version, 'KJV') .",
-                darkTheme: ". $call($dark_theme, 'false') .",
-                ignoreCase: ". $call($ignoreCase, 'false') .",
-                bu_ignore: ". $call($bu_ignore, '["H1", "H2", "H3", "H4", "H5", "H6", "A"]', true) .",
-                bu_allow: ". $call($bu_allow, '[]', true) .",
-                buid: ". $call($buid, 'false') .",
+                popup: " . $call($popup, 'classic') . ",
+                version: " . $call($version, 'KJV') . ",
+                darkTheme: " . $call($dark_theme, 'false') . ",
+                ignoreCase: " . $call($ignoreCase, 'false') . ",
+                bu_ignore: " . $call($bu_ignore, '["H1", "H2", "H3", "H4", "H5", "H6", "A"]', true) . ",
+                bu_allow: " . $call($bu_allow, '[]', true) . ",
+                buid: " . $call($buid, 'false') . ",
                 styles: {
-                    primary: ". $call($primary, 'false') .",
-                    secondary: ". $call($secondary, 'false') .",
-                    tertiary: ". $call($tertiary, 'false') .",
-                    headerColor: ". $call($header_color, 'false') .",
-                    fontColor: ". $call($font_color, 'false') .",
-                    versionColor: ". $call($version_color, 'false') .",
-                    closeColor: ". $call($close_color, 'false') .",
-                    borderRadius: ". $call($border_radius, 'false') .",
-                    boxShadow: ". $call($box_shadow, 'false') .",
-                    fontSize: ". $call($font_size, 'false') .",
+                    primary: " . $call($primary, 'false') . ",
+                    secondary: " . $call($secondary, 'false') . ",
+                    tertiary: " . $call($tertiary, 'false') . ",
+                    headerColor: " . $call($header_color, 'false') . ",
+                    fontColor: " . $call($font_color, 'false') . ",
+                    versionColor: " . $call($version_color, 'false') . ",
+                    closeColor: " . $call($close_color, 'false') . ",
+                    borderRadius: " . $call($border_radius, 'false') . ",
+                    boxShadow: " . $call($box_shadow, 'false') . ",
+                    fontSize: " . $call($font_size, 'false') . ",
                 }
             })
@@ -149 +153 @@
     }
 
-    function get_raw_options() {
-        $raw_options = wpsf_get_setting_bibleup( 'bibleup', 'tab_2_paste_config', 'raw_options' );
+    function get_raw_options()
+    {
+        $raw_options = wpsf_get_setting_bibleup('bibleup', 'tab_2_paste_config', 'raw_options');
 
         $r = "
-            let b = new BibleUp(document.body, ".$raw_options.");
+            let b = new BibleUp(document.body, " . $raw_options . ");
             b.create();";
 
@@ -159 +164 @@
     }
 
-    function bibleup_deactivate() {
+    public static function bibleup_deactivate()
+    {
         // Delete all saved settings from option group - bibleup
-        wpsf_delete_settings_bibleup( 'bibleup' );
+        wpsf_delete_settings_bibleup('bibleup');
     }
 
@@ -168 +174 @@
 $bibleup = new BibleUp();
 $bibleup->start();
-register_deactivation_hook( __FILE__, array( 'BibleUp', 'bibleup_deactivate' ) );
+register_deactivation_hook(__FILE__, array('BibleUp', 'bibleup_deactivate'));

bibleup/trunk/readme.txt

@@ -3 +3 @@
 Tags: bible, references, reftagging, christian, scripture, popup
 Requires at least: 5.6
-Tested up to: 6.3
+Tested up to: 6.6
 Requires PHP: 7.0
-Stable tag: 1.0.1
+Stable tag: 1.1.0
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
@@ -23 +23 @@
 ## Features 💡
 
-- **Smart tagging:** BibleUp can safely recognize and tag references in multiple, different ways. Abbreviated and standard names will be tagged correctly as well as multiple verse range. BibleUp also supports version tagging.
+- **Smart tagging:** BibleUp can recognize and tag references in multiple, different ways. Abbreviated or standard names, as well as multiple verse ranges, will be tagged correctly. BibleUp also supports version tagging.
 
-- **Flexible and highly customizable:** BibleUp comes with different popover types and can be thoroughly customized to fit your site\'s theme. Customization can be done through the provided options.
+- **Flexible and highly customizable:** BibleUp comes with different popover types and can be thoroughly customized to fit your site\'s theme.
 
 - **Performant:** Make your readers enjoy fast Bible references look-up without bloating your site. BibleUp also follows the WAI-ARAI accessibility guidelines for screen readers and keyboard navigation.
 
-- **Agile development and contributions:** BibleUp is free and open-sourced, contributions can be made by anyone. Issues and requests will also be attended to faster.
+- **Agile development and contributions:** BibleUp is free and open-sourced, contributions can be made by anyone. Issues and requests will be attended to faster.
 
 ## Demo 🛸
@@ -38 +38 @@
 
 == Frequently Asked Questions ==
-= How many versions does BibleUp supports =
-BibleUp currently supports 4 Bible versions with much more to come. These versions are the Authorized King James Version (KJV), Authorized Standard Version (ASV), Literal Standard Version (LSV) and the World English Bible (WEB).
+= How many versions does BibleUp support =
+BibleUp currently supports 10 Bible versions, including modern versions you can use. See [all versions](https://bibleup.netlify.app/docs/guide/options.html#version)
+
+
+= Will BibleUp support other languages =
+We are currently working to include other translations apart from English. If there is any language/translation you would like to use or help with, send us a message and let us know.
 
 = How to report an issue or submit feature requests =
@@ -46 +50 @@
 
  1. [Github](https://github.com/bibleup/wordpress/issues) (all issues, requests and contributions)
- 2. [General support Forum](https://groups.google.com/g/bibleup)
- 3. WordPress Support forum (for WordPress)
-
-= How is the development going =
-BibleUp recently launched v1.0.0 and there is so much more to come!<br>
-We plan to roll out more Bible versions, change versions on popovers and lots more before the next major release.<br><br>
-The best way to participate in development is by following us on [Github](https://github.com/bibleup), making contributions and giving us a star.
+ 2. [General support Forum](https://groups.google.com/g/bibleup) or 
+ 3. [Website contact form](https://bibleup.netlify.app)
+ 4. WordPress Support forum (for WordPress issues)
 
 = How can I help support =
@@ -81 +81 @@
 3) Click on the 'Upload Plugin' button at the top left corner to reveal the file picker.
 4) Select and upload the downloaded zip file.
-5) Install the Plugin and activate once done. Configure the options as you want!
+5) Install the Plugin and activate it once done. Configure the options as you want!
 
-You can find the settings page at **settings >> BibleUp** after activating the plugin.
+After activating the plugin, you can find the settings page at **settings > BibleUp**
 
 == Changelog ==
+= 1.1.0 =
+* Added support for five more versions*
+* Performance and bug fixes *
+
 = 1.0.0 =
 * Initial Release

bibleup/trunk/settings/settings-general.php

@@ -21 +21 @@
  */
 
-add_filter( 'wpsf_register_settings_bibleup', 'wpsf_tabbed_settings' );
+add_filter('wpsf_register_settings_bibleup', 'wpsf_tabbed_settings');
 
 /**
@@ -32 +32 @@
  * @param array $wpsf_settings settings.
  */
-function wpsf_tabbed_settings( $wpsf_settings ) {
+function wpsf_tabbed_settings($wpsf_settings)
+{
     // Tabs.
     $wpsf_settings['tabs'] = array(
         array(
-            'id'    => 'tab_1',
-            'title' => esc_html__( 'Select Options', 'bibleup' ),
-        ),
-        array(
-            'id'    => 'tab_2',
-            'title' => esc_html__( 'Paste Config', 'bibleup' ),
+            'id' => 'tab_1',
+            'title' => esc_html__('Select Options', 'bibleup'),
+        ),
+        array(
+            'id' => 'tab_2',
+            'title' => esc_html__('Paste Config', 'bibleup'),
         ),
     );
@@ -48 +49 @@
     $wpsf_settings['sections'] = array(
         array(
-            'tab_id'        => 'tab_1',
-            'section_id'    => 'note',
+            'tab_id' => 'tab_1',
+            'section_id' => 'note',
             'section_description' => '<b>Please read the following before you begin to configure BibleUp</b><br>
             There are two methods you can use to configure BibleUp - <b>select Options</b> or <b>Paste Config</b><br>
@@ -59 +60 @@
         ),
         array(
-            'tab_id'        => 'tab_1',
-            'section_id'    => 'select_options',
+            'tab_id' => 'tab_1',
+            'section_id' => 'select_options',
             'section_title' => 'Select Options',
             'section_order' => 10,
-            'fields'        => array(
-                array(
-                    'id'      => 'popup',
-                    'title'   => 'Popup Type',
-                    'desc'    => 'The preferred popup type.',
-                    'type'    => 'select',
+            'fields' => array(
+                array(
+                    'id' => 'popup',
+                    'title' => 'Popup Type',
+                    'desc' => 'The preferred popup type.',
+                    'type' => 'select',
                     'default' => 'classic',
                     'choices' => array(
-                        'classic'   => 'classic',
+                        'classic' => 'classic',
                         'inline' => 'inline',
-                        'wiki'  => 'wiki',
-                    ),
-                ),
-                array(
-                    'id'      => 'version',
-                    'title'   => 'Version',
-                    'desc'    => 'The default Bible translation for references.',
-                    'type'    => 'select',
+                        'wiki' => 'wiki',
+                    ),
+                ),
+                array(
+                    'id' => 'version',
+                    'title' => 'Version',
+                    'desc' => 'The default Bible translation for references.',
+                    'type' => 'select',
                     'default' => 'KJV',
                     'choices' => array(
-                        'KJV'   => 'King James Version (KJV)',
+                        'KJV' => 'King James Version (KJV)',
                         'ASV' => 'American Standard Version (ASV)',
-                        'LSV'  => 'Literal Standard Version (LSV)',
-                        'WEB'  => 'World English Bible (WEB)',
-                    ),
-                ),
-                array(
-                    'id'      => 'dark_theme',
-                    'title'   => 'Dark Theme',
-                    'desc'    => 'Enable dark theme on popup.<br>
+                        'LSV' => 'Literal Standard Version (LSV)',
+                        'WEB' => 'World English Bible (WEB)',
+                        'ESV' => 'English Standard Version (ESV)',
+                        'NIV' => 'New International Version (NIV)',
+                        'MSG' => 'The Message Translation (MSG)',
+                        'AMP' => 'The Amplified Bible (AMP)',
+                        'NLT' => 'New Living Translation (NLT)',
+                        'NASB' => 'New American Standard Bible (NASB)'
+                    ),
+                ),
+                array(
+                    'id' => 'dark_theme',
+                    'title' => 'Dark Theme',
+                    'desc' => 'Enable dark theme on popup.<br>
                     This can be overriden by the background and font color set by other options, to preserve the default dark theme you must set other color options to false.',
-                    'type'    => 'radio',
+                    'type' => 'radio',
                     'default' => 'false',
                     'choices' => array(
-                        'true'   => 'True',
+                        'true' => 'True',
                         'false' => 'False',
                     ),
@@ -105 +112 @@
 
         array(
-            'tab_id'        => 'tab_1',
-            'section_id'    => 'popup_style',
+            'tab_id' => 'tab_1',
+            'section_id' => 'popup_style',
             'section_title' => 'Popup Style',
             'section_description' => 'Set popup background and font colors.',
             'section_order' => 10,
-            'fields'        => array(
-                array(
-                    'id'      => 'primary',
-                    'title'   => 'Primary',
-                    'desc'    => 'Set color for overall popup background',
-                    'type'    => 'color',
-                    'default' => 'false',
-                ),
-                array(
-                    'id'      => 'secondary',
-                    'title'   => 'Secondary',
-                    'desc'    => 'Set background color for popup header (if it exists)',
-                    'type'    => 'color',
-                    'default' => 'false',
-                ),
-                array(
-                    'id'      => 'tertiary',
-                    'title'   => 'Tertiary',
-                    'desc'    => 'Set background color for popup version (if it exists)',
-                    'type'    => 'color',
-                    'default' => 'false',
-                ),
-                array(
-                    'id'      => 'header_color',
-                    'title'   => 'Header Color',
-                    'desc'    => 'Font color for popup header (if it exists).<br>
+            'fields' => array(
+                array(
+                    'id' => 'primary',
+                    'title' => 'Primary',
+                    'desc' => 'Set color for overall popup background',
+                    'type' => 'color',
+                    'default' => 'false',
+                ),
+                array(
+                    'id' => 'secondary',
+                    'title' => 'Secondary',
+                    'desc' => 'Set background color for popup header (if it exists)',
+                    'type' => 'color',
+                    'default' => 'false',
+                ),
+                array(
+                    'id' => 'tertiary',
+                    'title' => 'Tertiary',
+                    'desc' => 'Set background color for popup version (if it exists)',
+                    'type' => 'color',
+                    'default' => 'false',
+                ),
+                array(
+                    'id' => 'header_color',
+                    'title' => 'Header Color',
+                    'desc' => 'Font color for popup header (if it exists).<br>
                     This will override the default font color for text in the header only',
-                    'type'    => 'color',
-                    'default' => 'false',
-                ),
-                array(
-                    'id'      => 'font_color',
-                    'title'   => 'Font Color',
-                    'desc'    => 'The default font color for the popup',
-                    'type'    => 'color',
-                    'default' => 'false',
-                ),
-                array(
-                    'id'      => 'version_color',
-                    'title'   => 'Version Color',
-                    'desc'    => 'Font color for popup version (if it exists).<br>
+                    'type' => 'color',
+                    'default' => 'false',
+                ),
+                array(
+                    'id' => 'font_color',
+                    'title' => 'Font Color',
+                    'desc' => 'The default font color for the popup',
+                    'type' => 'color',
+                    'default' => 'false',
+                ),
+                array(
+                    'id' => 'version_color',
+                    'title' => 'Version Color',
+                    'desc' => 'Font color for popup version (if it exists).<br>
                     This will override the default font color for text in the version box only',
-                    'type'    => 'color',
-                    'default' => 'false',
-                ),
-                array(
-                    'id'      => 'close_color',
-                    'title'   => 'Close Color',
-                    'desc'    => 'Set color for close button (if it exists).<br>
+                    'type' => 'color',
+                    'default' => 'false',
+                ),
+                array(
+                    'id' => 'close_color',
+                    'title' => 'Close Color',
+                    'desc' => 'Set color for close button (if it exists).<br>
                     The close button only exists on popup type "wiki" ',
-                    'type'    => 'color',
-                    'default' => 'false',
-                ),
-                array(
-                    'id'      => 'border_radius',
-                    'title'   => 'Border Radius',
-                    'desc'    => 'Set border radius for popup (in units)',
-                    'type'    => 'text',
+                    'type' => 'color',
+                    'default' => 'false',
+                ),
+                array(
+                    'id' => 'border_radius',
+                    'title' => 'Border Radius',
+                    'desc' => 'Set border radius for popup (in units)',
+                    'type' => 'text',
                     'placeholder' => '5px',
                     'default' => 'false',
                 ),
                 array(
-                    'id'      => 'box_shadow',
-                    'title'   => 'Box Shadow',
-                    'desc'    => 'Set a drop shadow for the popup (using CSS syntax)',
-                    'type'    => 'text',
+                    'id' => 'box_shadow',
+                    'title' => 'Box Shadow',
+                    'desc' => 'Set a drop shadow for the popup (using CSS syntax)',
+                    'type' => 'text',
                     'placeholder' => '2px 6px 10px #404040',
                     'default' => 'false',
                 ),
                 array(
-                    'id'      => 'font_size',
-                    'title'   => 'Font Size',
-                    'desc'    => 'Set font size for all popup (text in units)',
-                    'type'    => 'text',
+                    'id' => 'font_size',
+                    'title' => 'Font Size',
+                    'desc' => 'Set font size for all popup (text in units)',
+                    'type' => 'text',
                     'placeholder' => '16px',
                     'default' => 'false',
@@ -190 +197 @@
         ),
 
-        array(
-            'tab_id'        => 'tab_1',
-            'section_id'    => 'additional',
+        array(
+            'tab_id' => 'tab_1',
+            'section_id' => 'additional',
             'section_title' => 'Additional Settings',
             'section_description' => 'Use these options to configure BibleUp behaviour.',
             'section_order' => 10,
-            'fields'        => array(
-                array(
-                    'id'      => 'ignoreCase',
-                    'title'   => 'Ignore letter case when tagging references',
-                    'desc'    => "Allow BibleUp match references in any letter case.",
-                    'type'    => 'radio',
+            'fields' => array(
+                array(
+                    'id' => 'ignoreCase',
+                    'title' => 'Ignore letter case when tagging references',
+                    'desc' => "Allow BibleUp match references in any letter case.",
+                    'type' => 'radio',
                     'default' => 'false',
                     'choices' => array(
-                        'true'   => 'True',
+                        'true' => 'True',
                         'false' => 'False',
                     ),
                 ),
                 array(
-                    'id'      => 'bu_ignore',
-                    'title'   => 'Ignore Specific HTML Elements',
-                    'desc'    => "BibleUp won't tag element listed here.<br>
+                    'id' => 'bu_ignore',
+                    'title' => 'Ignore Specific HTML Elements',
+                    'subtitle' => 'bu_ignore',
+                    'desc' => "BibleUp won't tag element listed here.<br>
                     Seperate these elements using a comma and put inside a square bracket.",
-                    'type'    => 'text',
-                    'placeholder'    => "['H1', 'H2', 'H3', 'H4', 'H5', 'H6', 'IMG', 'A']",
-                    'default' => 'false',
-                    'link'     => array(
-                        'url'      => esc_url( 'https://bibleup.netlify.app/docs/guide/options.html#bu-ignore' ),
-                        'type'     => 'link', // Can be 'tooltip' or 'link'. Default is 'tooltip'.
-                        'text'     => 'Learn More',
+                    'type' => 'text',
+                    'placeholder' => "['H1', 'H2', 'H3', 'H4', 'H5', 'H6', 'IMG', 'A']",
+                    'default' => 'false',
+                    'link' => array(
+                        'url' => esc_url('https://bibleup.netlify.app/docs/guide/options.html#bu-ignore'),
+                        'type' => 'link', // Can be 'tooltip' or 'link'. Default is 'tooltip'.
+                        'text' => 'Learn More',
                         'external' => true,
                     ),
                 ),
                 array(
-                    'id'      => 'bu_allow',
-                    'title'   => 'Allow Specific HTML Elements',
-                    'desc'    => "Override the default elements ignored by BibleUp by placing them here.<br>
+                    'id' => 'bu_allow',
+                    'title' => 'Allow Specific HTML Elements',
+                    'subtitle' => 'bu_allow',
+                    'desc' => "Override the default elements ignored by BibleUp by placing them here.<br>
                     Seperate these elements using a comma and put inside a square bracket.",
-                    'type'    => 'text',
-                    'placeholder'    => "['H1', 'H2']",
-                    'default' => 'false',
-                    'link'     => array(
-                        'url'      => esc_url( 'https://bibleup.netlify.app/docs/guide/options.html#bu-allow' ),
-                        'type'     => 'link', // Can be 'tooltip' or 'link'. Default is 'tooltip'.
-                        'text'     => 'Learn More',
+                    'type' => 'text',
+                    'placeholder' => "['H1', 'H2']",
+                    'default' => 'false',
+                    'link' => array(
+                        'url' => esc_url('https://bibleup.netlify.app/docs/guide/options.html#bu-allow'),
+                        'type' => 'link', // Can be 'tooltip' or 'link'. Default is 'tooltip'.
+                        'text' => 'Learn More',
                         'external' => true,
                     ),
                 ),
                 array(
-                    'id'      => 'buid',
-                    'title'   => 'BibleUp ID (buid)',
-                    'desc'    => "Attach a specific HTML ID attribute to popovers and links",
-                    'type'    => 'text',
-                    'placeholder'    => "buid string",
-                    'default' => 'false',
-                    'link'     => array(
-                        'url'      => esc_url( 'https://bibleup.netlify.app/docs/customisation/#buid' ),
-                        'type'     => 'link', // Can be 'tooltip' or 'link'. Default is 'tooltip'.
-                        'text'     => 'Learn More',
+                    'id' => 'buid',
+                    'title' => 'BibleUp ID (buid)',
+                    'subtitle' => 'buid',
+                    'desc' => "Attach a specific HTML ID attribute to popovers and links",
+                    'type' => 'text',
+                    'placeholder' => "buid string",
+                    'default' => 'false',
+                    'link' => array(
+                        'url' => esc_url('https://bibleup.netlify.app/docs/customisation/#buid'),
+                        'type' => 'link', // Can be 'tooltip' or 'link'. Default is 'tooltip'.
+                        'text' => 'Learn More',
                         'external' => true,
                     ),
                 ),
             ),
-        ),
-
-        array(
-            'tab_id'        => 'tab_2',
-            'section_id'    => 'paste_config',
+        ),
+
+        array(
+            'tab_id' => 'tab_2',
+            'section_id' => 'paste_config',
             'section_title' => 'Paste Config',
             'section_description' => 'Use the instant <a target="_blank" href="https://bibleup.netlify.app/demo/editor">editor</a> to style popup in real-time, then copy and paste the generated config options.<br>
@@ -263 +273 @@
             Leave the editor blank if you want to manually seclect options instead.',
             'section_order' => 10,
-            'fields'        => array(
-                array(
-                    'id'      => 'raw_options',
-                    'title'   => 'Raw Options',
-                    'desc'    => 'Paste the raw config options here',
-                    'type'        => 'code_editor',
+            'fields' => array(
+                array(
+                    'id' => 'raw_options',
+                    'title' => 'Raw Options',
+                    'desc' => 'Paste the raw config options here',
+                    'type' => 'code_editor',
                     'mimetype' => 'application/json',
                     'default' => '',
@@ -276 +286 @@
 
         array(
-            'tab_id'        => 'tab_2',
-            'section_id'    => 'custom_css',
+            'tab_id' => 'tab_2',
+            'section_id' => 'custom_css',
             'section_title' => 'Custom CSS',
             'section_description' => 'Enter any custom CSS here to extensively style popup and links. <br>You can also re-define BibleUp CSS variables using the <b>:root</b> selector.<br> Check the guide <a href="">here</a> for how to style using the <b>buid</b> property.',
             'section_order' => 10,
-            'fields'        => array(
-                array(
-                    'id'      => 'custom_css',
-                    'title'   => 'Custom CSS',
-                    'desc'    => 'Enter custom CSS',
-                    'type'        => 'code_editor',
+            'fields' => array(
+                array(
+                    'id' => 'custom_css',
+                    'title' => 'Custom CSS',
+                    'subtitle' => 'customisation',
+                    'desc' => 'Enter custom CSS',
+                    'type' => 'code_editor',
                     'mimetype' => 'text/css',
                     'default' => '',
-                    'link'     => array(
-                        'url'      => esc_url( 'https://bibleup.netlify.app/docs/customisation/' ),
-                        'type'     => 'link', // Can be 'tooltip' or 'link'. Default is 'tooltip'.
-                        'text'     => 'Learn More',
+                    'link' => array(
+                        'url' => esc_url('https://bibleup.netlify.app/docs/customisation/'),
+                        'type' => 'link', // Can be 'tooltip' or 'link'. Default is 'tooltip'.
+                        'text' => 'Learn More',
                         'external' => true,
                     ),

bibleup/trunk/wp-settings-framework/wp-settings-framework.php

@@ -9 +9 @@
  */
 
-if ( ! class_exists( 'Bibleup_WordPressSettingsFramework' ) ) {
+if (!class_exists('Bibleup_WordPressSettingsFramework')) {
     /**
      * Bibleup_WordPressSettingsFramework class
      */
-    class Bibleup_WordPressSettingsFramework {
+    class Bibleup_WordPressSettingsFramework
+    {
         /**
          * @access private
@@ -61 +62 @@
          */
         protected $setting_defaults = array(
-            'id'          => 'default_field',
-            'title'       => 'Default Field',
-            'desc'        => '',
-            'std'         => '',
-            'type'        => 'text',
+            'id' => 'default_field',
+            'title' => 'Default Field',
+            'desc' => '',
+            'std' => '',
+            'type' => 'text',
             'placeholder' => '',
-            'choices'     => array(),
-            'class'       => '',
-            'subfields'   => array(),
+            'choices' => array(),
+            'class' => '',
+            'subfields' => array(),
         );
 
@@ -78 +79 @@
          * @param bool|string $option_group  Option group name, usually a short slug.
          */
-        public function __construct( $settings_file = null, $option_group = false ) {
+        public function __construct($settings_file = null, $option_group = false)
+        {
             $this->option_group = $option_group;
 
-            if ( $settings_file ) {
-                if ( ! is_file( $settings_file ) ) {
+            if ($settings_file) {
+                if (!is_file($settings_file)) {
                     return;
                 }
@@ -88 +90 @@
                 require_once $settings_file;
 
-                if ( ! $this->option_group ) {
-                    $this->option_group = preg_replace( '/[^a-z0-9]+/i', '', basename( $settings_file, '.php' ) );
+                if (!$this->option_group) {
+                    $this->option_group = preg_replace('/[^a-z0-9]+/i', '', basename($settings_file, '.php'));
                 }
             }
 
-            if ( empty( $this->option_group ) ) {
+            if (empty($this->option_group)) {
                 return;
             }
 
-            $this->options_path = plugin_dir_path( __FILE__ );
-            $this->options_url  = plugin_dir_url( __FILE__ );
+            $this->options_path = plugin_dir_path(__FILE__);
+            $this->options_url = plugin_dir_url(__FILE__);
 
             $this->construct_settings();
 
-            if ( is_admin() ) {
+            if (is_admin()) {
                 global $pagenow;
 
-                add_action( 'admin_init', array( $this, 'admin_init' ) );
-                add_action( 'wpsf_do_settings_sections_' . $this->option_group, array( $this, 'do_tabless_settings_sections' ), 10 );
-
-                if ( isset( $_GET['page'] ) && $_GET['page'] === $this->settings_page['slug'] ) {
-                    if ( $pagenow !== 'options-general.php' ) {
-                        add_action( 'admin_notices', array( $this, 'admin_notices' ) );
+                add_action('admin_init', array($this, 'admin_init'));
+                add_action('wpsf_do_settings_sections_' . $this->option_group, array($this, 'do_tabless_settings_sections'), 10);
+
+                if (isset($_GET['page']) && $_GET['page'] === $this->settings_page['slug']) {
+                    if ($pagenow !== 'options-general.php') {
+                        add_action('admin_notices', array($this, 'admin_notices'));
                     }
-                    add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts' ) );
+                    add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_scripts'));
                 }
 
-                if ( $this->has_tabs() ) {
-                    add_action( 'wpsf_before_settings_' . $this->option_group, array( $this, 'tab_links' ) );
-
-                    remove_action( 'wpsf_do_settings_sections_' . $this->option_group, array( $this, 'do_tabless_settings_sections' ), 10 );
-                    add_action( 'wpsf_do_settings_sections_' . $this->option_group, array( $this, 'do_tabbed_settings_sections' ), 10 );
+                if ($this->has_tabs()) {
+                    add_action('wpsf_before_settings_' . $this->option_group, array($this, 'tab_links'));
+
+                    remove_action('wpsf_do_settings_sections_' . $this->option_group, array($this, 'do_tabless_settings_sections'), 10);
+                    add_action('wpsf_do_settings_sections_' . $this->option_group, array($this, 'do_tabbed_settings_sections'), 10);
                 }
 
-                add_action( 'wp_ajax_wpsf_export_settings', array( $this, 'export_settings' ) );
-                add_action( 'wp_ajax_wpsf_import_settings', array( $this, 'import_settings' ) );
+                add_action('wp_ajax_wpsf_export_settings', array($this, 'export_settings'));
+                add_action('wp_ajax_wpsf_import_settings', array($this, 'import_settings'));
             }
         }
@@ -130 +132 @@
          * Construct Settings.
          */
-        public function construct_settings() {
-            $this->settings_wrapper = apply_filters( 'wpsf_register_settings_' . $this->option_group, array() );
-
-            if ( ! is_array( $this->settings_wrapper ) ) {
-                return new WP_Error( 'broke', esc_html__( 'WPSF settings must be an array', 'wpsf' ) );
+        public function construct_settings()
+        {
+            $this->settings_wrapper = apply_filters('wpsf_register_settings_' . $this->option_group, array());
+
+            if (!is_array($this->settings_wrapper)) {
+                return new WP_Error('broke', esc_html__('WPSF settings must be an array', 'wpsf'));
             }
 
             // If "sections" is set, this settings group probably has tabs
-            if ( isset( $this->settings_wrapper['sections'] ) ) {
-                $this->tabs     = ( isset( $this->settings_wrapper['tabs'] ) ) ? $this->settings_wrapper['tabs'] : array();
+            if (isset($this->settings_wrapper['sections'])) {
+                $this->tabs = (isset($this->settings_wrapper['tabs'])) ? $this->settings_wrapper['tabs'] : array();
                 $this->settings = $this->settings_wrapper['sections'];
                 // If not, it's probably just an array of settings
@@ -146 +149 @@
             }
 
-            $this->settings_page['slug'] = sprintf( '%s-settings', str_replace( '_', '-', $this->option_group ) );
+            $this->settings_page['slug'] = sprintf('%s-settings', str_replace('_', '-', $this->option_group));
         }
 
@@ -154 +157 @@
          * @return string the "option_group"
          */
-        public function get_option_group() {
+        public function get_option_group()
+        {
             return $this->option_group;
         }
@@ -161 +165 @@
          * Registers the internal WordPress settings
          */
-        public function admin_init() {
-            register_setting( $this->option_group, $this->option_group . '_settings', array( $this, 'settings_validate' ) );
+        public function admin_init()
+        {
+            register_setting($this->option_group, $this->option_group . '_settings', array($this, 'settings_validate'));
             $this->process_settings();
         }
@@ -171 +176 @@
          * @param array $args
          */
-        public function add_settings_page( $args ) {
+        public function add_settings_page($args)
+        {
             $defaults = array(
                 'parent_slug' => false,
-                'page_slug'   => '',
-                'page_title'  => '',
-                'menu_title'  => '',
-                'capability'  => 'manage_options',
+                'page_slug' => '',
+                'page_title' => '',
+                'menu_title' => '',
+                'capability' => 'manage_options',
             );
 
-            $args = wp_parse_args( $args, $defaults );
-
-            $this->settings_page['title']      = $args['page_title'];
+            $args = wp_parse_args($args, $defaults);
+
+            $this->settings_page['title'] = $args['page_title'];
             $this->settings_page['capability'] = $args['capability'];
 
-            if ( $args['parent_slug'] ) {
+            if ($args['parent_slug']) {
                 add_submenu_page(
                     $args['parent_slug'],
@@ -192 +198 @@
                     $args['capability'],
                     $this->settings_page['slug'],
-                    array( $this, 'settings_page_content' )
+                    array($this, 'settings_page_content')
                 );
             } else {
@@ -200 +206 @@
                     $args['capability'],
                     $this->settings_page['slug'],
-                    array( $this, 'settings_page_content' ),
-                    apply_filters( 'wpsf_menu_icon_url_' . $this->option_group, '' ),
-                    apply_filters( 'wpsf_menu_position_' . $this->option_group, null )
+                    array($this, 'settings_page_content'),
+                    apply_filters('wpsf_menu_icon_url_' . $this->option_group, ''),
+                    apply_filters('wpsf_menu_position_' . $this->option_group, null)
                 );
             }
@@ -211 +217 @@
          */
 
-        public function settings_page_content() {
-            if ( ! current_user_can( $this->settings_page['capability'] ) ) {
-                wp_die( esc_html__( 'You do not have sufficient permissions to access this page.', 'wpsf' ) );
+        public function settings_page_content()
+        {
+            if (!current_user_can($this->settings_page['capability'])) {
+                wp_die(esc_html__('You do not have sufficient permissions to access this page.', 'wpsf'));
             }
             ?>
-            <div class="wpsf-settings wpsf-settings--<?php echo esc_attr( $this->option_group ); ?>">
+            <div class="wpsf-settings wpsf-settings--<?php echo esc_attr($this->option_group); ?>">
                 <?php $this->settings_header(); ?>
                 <div class="wpsf-settings__content">
@@ -228 +235 @@
          * Settings Header.
          */
-        public function settings_header() {
+        public function settings_header()
+        {
             ?>
             <div class="wpsf-settings__header">
-                <img src="<?php echo plugin_dir_url( __FILE__ ) . 'assets/img/logo.png'; ?>" width="50" height="50" alt="BibleUp Logo"/>
-                <h1><?php echo apply_filters( 'wpsf_title_' . $this->option_group, $this->settings_page['title'] ); ?></h1>
-                <?php do_action( 'wpsf_after_title_' . $this->option_group ); ?>
+                <img src="<?php echo plugin_dir_url(__FILE__) . 'assets/img/logo.png'; ?>" width="50" height="50"
+                    alt="BibleUp Logo" />
+                <h1><?php echo apply_filters('wpsf_title_' . $this->option_group, $this->settings_page['title']); ?></h1>
+                <?php do_action('wpsf_after_title_' . $this->option_group); ?>
             </div>
             <?php
@@ -241 +250 @@
          * Displays any errors from the WordPress settings API
          */
-        public function admin_notices() {
+        public function admin_notices()
+        {
             settings_errors();
         }
@@ -248 +258 @@
          * Enqueue scripts and styles
          */
-        public function admin_enqueue_scripts() {
+        public function admin_enqueue_scripts()
+        {
             // scripts
-            wp_register_script( 'wpsf', $this->options_url . 'assets/js/main.js', array( 'jquery' ), false, true );
-
-            wp_enqueue_script( 'jquery' );
-            wp_enqueue_script( 'farbtastic' );
-            wp_enqueue_script( 'media-upload' );
-            wp_enqueue_script( 'thickbox' );
-            wp_enqueue_script( 'jquery-ui-core' );
-            wp_enqueue_script( 'jquery-ui-datepicker' );
-            wp_enqueue_script( 'wpsf' );
+            wp_register_script('wpsf', $this->options_url . 'assets/js/main.js', array('jquery'), false, true);
+
+            wp_enqueue_script('jquery');
+            wp_enqueue_script('farbtastic');
+            wp_enqueue_script('media-upload');
+            wp_enqueue_script('thickbox');
+            wp_enqueue_script('jquery-ui-core');
+            wp_enqueue_script('jquery-ui-datepicker');
+            wp_enqueue_script('wpsf');
 
             $data = array(
-                'select_file'          => esc_html__( 'Please select a file to import', 'wpsf' ),
-                'invalid_file'         => esc_html__( 'Invalid file', 'wpsf' ),
-                'something_went_wrong' => esc_html__( 'Something went wrong', 'wpsf' ),
+                'select_file' => esc_html__('Please select a file to import', 'wpsf'),
+                'invalid_file' => esc_html__('Invalid file', 'wpsf'),
+                'something_went_wrong' => esc_html__('Something went wrong', 'wpsf'),
             );
-            wp_localize_script( 'wpsf', 'wpsf_vars', $data );
+            wp_localize_script('wpsf', 'wpsf_vars', $data);
 
             // styles
-            wp_register_style( 'wpsf', $this->options_url . 'assets/css/main.css' );
-            wp_register_style( 'jquery-ui-css', 'assets/css/jquery-ui-css.css' );
-
-            wp_enqueue_style( 'farbtastic' );
-            wp_enqueue_style( 'thickbox' );
-            wp_enqueue_style( 'jquery-ui-css' );
-            wp_enqueue_style( 'wpsf' );
+            wp_register_style('wpsf', $this->options_url . 'assets/css/main.css');
+            wp_register_style('jquery-ui-css', 'assets/css/jquery-ui-css.css');
+
+            wp_enqueue_style('farbtastic');
+            wp_enqueue_style('thickbox');
+            wp_enqueue_style('jquery-ui-css');
+            wp_enqueue_style('wpsf');
         }
 
@@ -284 +295 @@
          * @return array
          */
-        public function settings_validate( $input ) {
-            return apply_filters( $this->option_group . '_settings_validate', $input );
+        public function settings_validate($input)
+        {
+            return apply_filters($this->option_group . '_settings_validate', $input);
         }
 
@@ -293 +305 @@
          * @param array callback args from add_settings_section()
          */
-        public function section_intro( $args ) {
-            if ( ! empty( $this->settings ) ) {
-                foreach ( $this->settings as $section ) {
-                    if ( $section['section_id'] == $args['id'] ) {
+        public function section_intro($args)
+        {
+            if (!empty($this->settings)) {
+                foreach ($this->settings as $section) {
+                    if ($section['section_id'] == $args['id']) {
                         $renderClass = '';
 
-                        $renderClass .= self::add_show_hide_classes( $section );
-
-                        if ( $renderClass ) {
-                            echo '<span class="' . esc_attr( $renderClass ) . '"></span>';
+                        $renderClass .= self::add_show_hide_classes($section);
+
+                        if ($renderClass) {
+                            echo '<span class="' . esc_attr($renderClass) . '"></span>';
                         }
-                        if ( isset( $section['section_description'] ) && $section['section_description'] ) {
-                            echo '<div class="wpsf-section-description wpsf-section-description--' . esc_attr( $section['section_id'] ) . '">' . $section['section_description'] . '</div>';
+                        if (isset($section['section_description']) && $section['section_description']) {
+                            echo '<div class="wpsf-section-description wpsf-section-description--' . esc_attr($section['section_id']) . '">' . $section['section_description'] . '</div>';
                         }
                         break;
@@ -316 +329 @@
          * Processes $this->settings and adds the sections and fields via the WordPress settings API
          */
-        private function process_settings() {
-            if ( ! empty( $this->settings ) ) {
-                usort( $this->settings, array( $this, 'sort_array' ) );
-
-                foreach ( $this->settings as $section ) {
-                    if ( isset( $section['section_id'] ) && $section['section_id'] && isset( $section['section_title'] ) ) {
-                        $page_name = ( $this->has_tabs() ) ? sprintf( '%s_%s', $this->option_group, $section['tab_id'] ) : $this->option_group;
-
-                        add_settings_section( $section['section_id'], $section['section_title'], array( $this, 'section_intro' ), $page_name );
-
-                        if ( isset( $section['fields'] ) && is_array( $section['fields'] ) && ! empty( $section['fields'] ) ) {
-                            foreach ( $section['fields'] as $field ) {
-                                if ( isset( $field['id'] ) && $field['id'] && isset( $field['title'] ) ) {
-                                    $tooltip     = '';
-
-                                    if ( isset( $field['link'] ) && is_array( $field['link'] ) ) {
-                                        $link_url      = ( isset( $field['link']['url'] ) ) ? esc_html( $field['link']['url'] ) : '';
-                                        $link_text     = ( isset( $field['link']['text'] ) ) ? esc_html( $field['link']['text'] ) : esc_html__( 'Learn More', 'wpsf' );
-                                        $link_external = ( isset( $field['link']['external'] ) ) ? (bool) $field['link']['external'] : true;
-                                        $link_type     = ( isset( $field['link']['type'] ) ) ? esc_attr( $field['link']['type'] ) : 'tooltip';
-                                        $link_target   = ( $link_external ) ? ' target="_blank"' : '';
-
-                                        if ( 'tooltip' === $link_type ) {
-                                            $link_text = sprintf( '<i class="dashicons dashicons-info wpsf-link-icon" title="%s"><span class="screen-reader-text">%s</span></i>', $link_text, $link_text );
+        private function process_settings()
+        {
+            if (!empty($this->settings)) {
+                usort($this->settings, array($this, 'sort_array'));
+
+                foreach ($this->settings as $section) {
+                    if (isset($section['section_id']) && $section['section_id'] && isset($section['section_title'])) {
+                        $page_name = ($this->has_tabs()) ? sprintf('%s_%s', $this->option_group, $section['tab_id']) : $this->option_group;
+
+                        add_settings_section($section['section_id'], $section['section_title'], array($this, 'section_intro'), $page_name);
+
+                        if (isset($section['fields']) && is_array($section['fields']) && !empty($section['fields'])) {
+                            foreach ($section['fields'] as $field) {
+                                if (isset($field['id']) && $field['id'] && isset($field['title'])) {
+                                    $tooltip = '';
+
+                                    if (isset($field['link']) && is_array($field['link'])) {
+                                        $link_url = (isset($field['link']['url'])) ? esc_html($field['link']['url']) : '';
+                                        $link_text = (isset($field['link']['text'])) ? esc_html($field['link']['text']) : esc_html__('Learn More', 'wpsf');
+                                        $link_external = (isset($field['link']['external'])) ? (bool) $field['link']['external'] : true;
+                                        $link_type = (isset($field['link']['type'])) ? esc_attr($field['link']['type']) : 'tooltip';
+                                        $link_target = ($link_external) ? ' target="_blank"' : '';
+
+                                        if ('tooltip' === $link_type) {
+                                            $link_text = sprintf('<i class="dashicons dashicons-info wpsf-link-icon" title="%s"><span class="screen-reader-text">%s</span></i>', $link_text, $link_text);
                                         }
 
-                                        $link = ( $link_url ) ? sprintf( '<a class="wpsf-link" href="%s"%s>%s</a>', $link_url, $link_target, $link_text ) : '';
-
-                                        if ( $link && 'tooltip' === $link_type ) {
+                                        $link = ($link_url) ? sprintf('<a class="wpsf-link" href="%s"%s>%s</a>', $link_url, $link_target, $link_text) : '';
+
+                                        if ($link && 'tooltip' === $link_type) {
                                             $tooltip = $link;
-                                        } elseif ( $link ) {
-                                            $field['subtitle'] .= ( empty( $field['subtitle'] ) ) ? $link : sprintf( '<br/><br/>%s', $link );
+                                        } elseif ($link) {
+                                            $field['subtitle'] .= (empty($field['subtitle'])) ? $link : sprintf('<br/><br/>%s', $link);
                                         }
                                     }
 
-                                    $title = ( ! empty( $field['subtitle'] ) ) ? sprintf( '%s %s<span class="wpsf-subtitle">%s</span>', $field['title'], $tooltip, $field['subtitle'] ) : sprintf( '%s %s', $field['title'], $tooltip );
+                                    $title = sprintf('<span class="wpsf-label">%s %s</span>', $field['title'], $tooltip);
+
+                                    if (!empty($field['subtitle'])) {
+                                        $title .= sprintf('<span class="wpsf-subtitle">%s</span>', $field['subtitle']);
+                                    }
 
                                     add_settings_field(
                                         $field['id'],
                                         $title,
-                                        array( $this, 'generate_setting' ),
+                                        array($this, 'generate_setting'),
                                         $page_name,
                                         $section['section_id'],
                                         array(
                                             'section' => $section,
-                                            'field'   => $field,
+                                            'field' => $field,
                                         )
                                     );
@@ -380 +398 @@
          * @return array
          */
-        public function sort_array( $a, $b ) {
-            if ( ! isset( $a['section_order'] ) ) {
+        public function sort_array($a, $b)
+        {
+            if (!isset($a['section_order'])) {
                 return 0;
             }
 
-            return ( $a['section_order'] > $b['section_order'] ) ? 1 : 0;
+            return ($a['section_order'] > $b['section_order']) ? 1 : 0;
         }
 
@@ -393 +412 @@
          * @param array $args callback args from add_settings_field()
          */
-        public function generate_setting( $args ) {
-            $section                = $args['section'];
-            $this->setting_defaults = apply_filters( 'wpsf_defaults_' . $this->option_group, $this->setting_defaults );
-
-            $args = wp_parse_args( $args['field'], $this->setting_defaults );
-
-            $options = get_option( $this->option_group . '_settings' );
-
-            $args['id']    = ( $this->has_tabs() ) ? sprintf( '%s_%s_%s', $section['tab_id'], $section['section_id'], $args['id'] ) : sprintf( '%s_%s', $section['section_id'], $args['id'] );
-            $args['value'] = ( isset( $options[ $args['id'] ] ) ) ? $options[ $args['id'] ] : ( isset( $args['default'] ) ? $args['default'] : '' );
-            $args['name']  = $this->generate_field_name( $args['id'] );
-
-            $args['class'] .= self::add_show_hide_classes( $args );
-
-            do_action( 'wpsf_before_field_' . $this->option_group );
-            do_action( 'wpsf_before_field_' . $this->option_group . '_' . $args['id'] );
-
-            $this->do_field_method( $args );
-
-            do_action( 'wpsf_after_field_' . $this->option_group );
-            do_action( 'wpsf_after_field_' . $this->option_group . '_' . $args['id'] );
+        public function generate_setting($args)
+        {
+            $section = $args['section'];
+            $this->setting_defaults = apply_filters('wpsf_defaults_' . $this->option_group, $this->setting_defaults);
+
+            $args = wp_parse_args($args['field'], $this->setting_defaults);
+
+            $options = get_option($this->option_group . '_settings');
+
+            $args['id'] = ($this->has_tabs()) ? sprintf('%s_%s_%s', $section['tab_id'], $section['section_id'], $args['id']) : sprintf('%s_%s', $section['section_id'], $args['id']);
+            $args['value'] = (isset($options[$args['id']])) ? $options[$args['id']] : (isset($args['default']) ? $args['default'] : '');
+            $args['name'] = $this->generate_field_name($args['id']);
+
+            $args['class'] .= self::add_show_hide_classes($args);
+
+            do_action('wpsf_before_field_' . $this->option_group);
+            do_action('wpsf_before_field_' . $this->option_group . '_' . $args['id']);
+
+            $this->do_field_method($args);
+
+            do_action('wpsf_after_field_' . $this->option_group);
+            do_action('wpsf_after_field_' . $this->option_group . '_' . $args['id']);
         }
 
@@ -421 +441 @@
          * @param array $args
          */
-        public function do_field_method( $args ) {
-            $generate_field_method = sprintf( 'generate_%s_field', $args['type'] );
-
-            if ( method_exists( $this, $generate_field_method ) ) {
-                $this->$generate_field_method( $args );
+        public function do_field_method($args)
+        {
+            $generate_field_method = sprintf('generate_%s_field', $args['type']);
+
+            if (method_exists($this, $generate_field_method)) {
+                $this->$generate_field_method($args);
             }
         }
@@ -434 +455 @@
          * @param array $args
          */
-        public function generate_text_field( $args ) {
-            $args['value'] = esc_attr( stripslashes( $args['value'] ) );
-
-            echo '<input type="text" name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( $args['id'] ) . '" value="' . $args['value'] . '" placeholder="' . esc_attr( $args['placeholder'] ) . '" class="regular-text ' . esc_attr( $args['class'] ) . '" />';
-
-            $this->generate_description( $args['desc'] );
+        public function generate_text_field($args)
+        {
+            $args['value'] = esc_attr(stripslashes($args['value']));
+
+            echo '<input type="text" name="' . esc_attr($args['name']) . '" id="' . esc_attr($args['id']) . '" value="' . $args['value'] . '" placeholder="' . esc_attr($args['placeholder']) . '" class="regular-text ' . esc_attr($args['class']) . '" />';
+
+            $this->generate_description($args['desc']);
         }
 
@@ -447 +469 @@
          * @param array $args
          */
-        public function generate_hidden_field( $args ) {
-            $args['value'] = esc_attr( stripslashes( $args['value'] ) );
-
-            echo '<input type="hidden" name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( $args['id'] ) . '" value="' . $args['value'] . '"  class="hidden-field ' . esc_attr( $args['class'] ) . '" />';
+        public function generate_hidden_field($args)
+        {
+            $args['value'] = esc_attr(stripslashes($args['value']));
+
+            echo '<input type="hidden" name="' . esc_attr($args['name']) . '" id="' . esc_attr($args['id']) . '" value="' . $args['value'] . '"  class="hidden-field ' . esc_attr($args['class']) . '" />';
         }
 
@@ -458 +481 @@
          * @param array $args
          */
-        public function generate_number_field( $args ) {
-            $args['value'] = esc_attr( stripslashes( $args['value'] ) );
-
-            echo '<input type="number" name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( $args['id'] ) . '" value="' . $args['value'] . '" placeholder="' . esc_attr( $args['placeholder'] ) . '" class="regular-text ' . esc_attr( $args['class'] ) . '" />';
-
-            $this->generate_description( $args['desc'] );
+        public function generate_number_field($args)
+        {
+            $args['value'] = esc_attr(stripslashes($args['value']));
+
+            echo '<input type="number" name="' . esc_attr($args['name']) . '" id="' . esc_attr($args['id']) . '" value="' . $args['value'] . '" placeholder="' . esc_attr($args['placeholder']) . '" class="regular-text ' . esc_attr($args['class']) . '" />';
+
+            $this->generate_description($args['desc']);
         }
 
@@ -471 +495 @@
          * @param array $args
          */
-        public function generate_date_field( $args ) {
-            $args['value'] = esc_attr( stripslashes( $args['value'] ) );
-
-            $datepicker = ( ! empty( $args['datepicker'] ) ) ? htmlentities( json_encode( $args['datepicker'] ) ) : null;
-
-            echo '<input type="text" name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( $args['id'] ) . '" value="' . $args['value'] . '" class="datepicker regular-text ' . esc_attr( $args['class'] ) . '" data-datepicker="' . $datepicker . '" />';
-
-            $this->generate_description( $args['desc'] );
+        public function generate_date_field($args)
+        {
+            $args['value'] = esc_attr(stripslashes($args['value']));
+
+            $datepicker = (!empty($args['datepicker'])) ? htmlentities(json_encode($args['datepicker'])) : null;
+
+            echo '<input type="text" name="' . esc_attr($args['name']) . '" id="' . esc_attr($args['id']) . '" value="' . $args['value'] . '" class="datepicker regular-text ' . esc_attr($args['class']) . '" data-datepicker="' . $datepicker . '" />';
+
+            $this->generate_description($args['desc']);
         }
 
@@ -486 +511 @@
          * @param array $args Arguments.
          */
-        public function generate_export_field( $args ) {
-            $args['value'] = esc_attr( stripslashes( $args['value'] ) );
-            $args['value'] = empty( $args['value'] ) ? esc_html__( 'Export Settings', 'wpsf' ) : $args['value'];
-            $option_group  = $this->option_group;
-            $export_url    = site_url() . '/wp-admin/admin-ajax.php?action=wpsf_export_settings&_wpnonce=' . wp_create_nonce( 'wpsf_export_settings' ) . '&option_group=' . $option_group;
-
-            echo '<a target=_blank href="' . $export_url . '" class="button" name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( $args['id'] ) . '">' . $args['value'] . '</a>';
-
-            $options = get_option( $option_group . '_settings' );
-            $this->generate_description( $args['desc'] );
+        public function generate_export_field($args)
+        {
+            $args['value'] = esc_attr(stripslashes($args['value']));
+            $args['value'] = empty($args['value']) ? esc_html__('Export Settings', 'wpsf') : $args['value'];
+            $option_group = $this->option_group;
+            $export_url = site_url() . '/wp-admin/admin-ajax.php?action=wpsf_export_settings&_wpnonce=' . wp_create_nonce('wpsf_export_settings') . '&option_group=' . $option_group;
+
+            echo '<a target=_blank href="' . $export_url . '" class="button" name="' . esc_attr($args['name']) . '" id="' . esc_attr($args['id']) . '">' . $args['value'] . '</a>';
+
+            $options = get_option($option_group . '_settings');
+            $this->generate_description($args['desc']);
         }
 
@@ -503 +529 @@
          * @param array $args Arguments.
          */
-        public function generate_import_field( $args ) {
-            $args['value'] = esc_attr( stripslashes( $args['value'] ) );
-            $args['value'] = empty( $args['value'] ) ? esc_html__( 'Import Settings', 'wpsf' ) : $args['value'];
-            $option_group  = $this->option_group;
+        public function generate_import_field($args)
+        {
+            $args['value'] = esc_attr(stripslashes($args['value']));
+            $args['value'] = empty($args['value']) ? esc_html__('Import Settings', 'wpsf') : $args['value'];
+            $option_group = $this->option_group;
 
             echo sprintf(
@@ -519 +546 @@
                     <span class="spinner"></span>
                 </div>',
-                esc_attr( $args['id'] ),
-                esc_attr( $args['id'] ),
-                esc_attr( $args['value'] ),
-                esc_attr( wp_create_nonce( 'wpsf_import_settings' ) ),
-                esc_attr( $this->option_group )
+                esc_attr($args['id']),
+                esc_attr($args['id']),
+                esc_attr($args['value']),
+                esc_attr(wp_create_nonce('wpsf_import_settings')),
+                esc_attr($this->option_group)
             );
 
-            $this->generate_description( $args['desc'] );
+            $this->generate_description($args['desc']);
         }
 
@@ -536 +563 @@
          * @param array $args
          */
-        public function generate_group_field( $args ) {
-            $value     = (array) $args['value'];
-            $row_count = ( ! empty( $value ) ) ? count( $value ) : 1;
+        public function generate_group_field($args)
+        {
+            $value = (array) $args['value'];
+            $row_count = (!empty($value)) ? count($value) : 1;
 
             echo '<table class="widefat wpsf-group" cellspacing="0">';
@@ -544 +572 @@
             echo '<tbody>';
 
-            for ( $row = 0; $row < $row_count; $row ++ ) {
-                echo $this->generate_group_row_template( $args, false, $row );
+            for ($row = 0; $row < $row_count; $row++) {
+                echo $this->generate_group_row_template($args, false, $row);
             }
 
@@ -551 +579 @@
             echo '</table>';
 
-            printf( '<script type="text/html" id="%s_template">%s</script>', esc_attr( $args['id'] ), $this->generate_group_row_template( $args, true ) );
-
-            $this->generate_description( $args['desc'] );
+            printf('<script type="text/html" id="%s_template">%s</script>', esc_attr($args['id']), $this->generate_group_row_template($args, true));
+
+            $this->generate_description($args['desc']);
         }
 
@@ -564 +592 @@
          * @return void
          */
-        public function generate_image_checkboxes_field( $args ) {
-
-            echo '<input type="hidden" name="' . esc_attr( $args['name'] ) . '" value="0" />';
+        public function generate_image_checkboxes_field($args)
+        {
+
+            echo '<input type="hidden" name="' . esc_attr($args['name']) . '" value="0" />';
 
             echo '<ul class="wpsf-visual-field wpsf-visual-field--image-checkboxes wpsf-visual-field--grid wpsf-visual-field--cols">';
 
-            foreach ( $args['choices'] as $value => $choice ) {
-                $field_id      = sprintf( '%s_%s', esc_attr( $args['id'] ), $value );
-                $is_checked    = is_array( $args['value'] ) && in_array( $value, $args['value'] );
+            foreach ($args['choices'] as $value => $choice) {
+                $field_id = sprintf('%s_%s', esc_attr($args['id']), $value);
+                $is_checked = is_array($args['value']) && in_array($value, $args['value']);
                 $checked_class = $is_checked ? 'wpsf-visual-field__item--checked' : '';
 
@@ -587 +616 @@
                         </label>
                     </li>',
-                    esc_attr( $checked_class ),
-                    esc_url( $choice['image'] ),
-                    esc_attr( $args['name'] ),
-                    esc_attr( $field_id ),
-                    esc_attr( $value ),
-                    esc_attr( $args['class'] ),
-                    checked( true, $is_checked, false ),
-                    esc_attr( $choice['text'] )
+                    esc_attr($checked_class),
+                    esc_url($choice['image']),
+                    esc_attr($args['name']),
+                    esc_attr($field_id),
+                    esc_attr($value),
+                    esc_attr($args['class']),
+                    checked(true, $is_checked, false),
+                    esc_attr($choice['text'])
                 );
             }
@@ -600 +629 @@
             echo '</ul>';
 
-            $this->generate_description( $args['desc'] );
+            $this->generate_description($args['desc']);
         }
 
@@ -608 +637 @@
          * @param array $args Arguments.
          */
-        public function generate_image_radio_field( $args ) {
-            $args['value'] = esc_html( esc_attr( $args['value'] ) );
-            $count         = count( $args['choices'] );
-
-            echo sprintf( '<ul class="wpsf-visual-field wpsf-visual-field--image-radio wpsf-visual-field--grid wpsf-visual-field--cols wpsf-visual-field--col-%s ">', esc_attr( $count ) );
-
-            foreach ( $args['choices'] as $value => $choice ) {
-                $field_id = sprintf( '%s_%s', esc_attr( $args['id'] ), $value );
-                $checked  = $value == $args['value'] ? 'checked="checked"' : '';
+        public function generate_image_radio_field($args)
+        {
+            $args['value'] = esc_html(esc_attr($args['value']));
+            $count = count($args['choices']);
+
+            echo sprintf('<ul class="wpsf-visual-field wpsf-visual-field--image-radio wpsf-visual-field--grid wpsf-visual-field--cols wpsf-visual-field--col-%s ">', esc_attr($count));
+
+            foreach ($args['choices'] as $value => $choice) {
+                $field_id = sprintf('%s_%s', esc_attr($args['id']), $value);
+                $checked = $value == $args['value'] ? 'checked="checked"' : '';
 
                 echo sprintf(
@@ -630 +660 @@
                         </label>
                     </li>',
-                    ( $checked ? 'wpsf-visual-field__item--checked' : '' ),
-                    esc_attr( $choice['image'] ),
-                    esc_attr( $args['name'] ),
-                    esc_attr( $field_id ),
-                    esc_attr( $value ),
-                    esc_attr( $args['class'] ),
-                    esc_attr( $checked ),
-                    esc_attr( $choice['text'] )
+                    ($checked ? 'wpsf-visual-field__item--checked' : ''),
+                    esc_attr($choice['image']),
+                    esc_attr($args['name']),
+                    esc_attr($field_id),
+                    esc_attr($value),
+                    esc_attr($args['class']),
+                    esc_attr($checked),
+                    esc_attr($choice['text'])
                 );
             }
             echo '</ul>';
 
-            $this->generate_description( $args['desc'] );
+            $this->generate_description($args['desc']);
         }
 
@@ -654 +684 @@
          * @return string|bool
          */
-        public function generate_group_row_template( $args, $blank = false, $row = 0 ) {
+        public function generate_group_row_template($args, $blank = false, $row = 0)
+        {
             $row_template = false;
-            $row_id       = ( ! empty( $args['value'][ $row ]['row_id'] ) ) ? $args['value'][ $row ]['row_id'] : $row;
-            $row_id_value = ( $blank ) ? '' : $row_id;
-
-            if ( $args['subfields'] ) {
-                $row_class = ( $row % 2 == 0 ) ? 'alternate' : '';
-
-                $row_template .= sprintf( '<tr class="wpsf-group__row %s">', $row_class );
-
-                $row_template .= sprintf( '<td class="wpsf-group__row-index"><span>%d</span></td>', $row );
+            $row_id = (!empty($args['value'][$row]['row_id'])) ? $args['value'][$row]['row_id'] : $row;
+            $row_id_value = ($blank) ? '' : $row_id;
+
+            if ($args['subfields']) {
+                $row_class = ($row % 2 == 0) ? 'alternate' : '';
+
+                $row_template .= sprintf('<tr class="wpsf-group__row %s">', $row_class);
+
+                $row_template .= sprintf('<td class="wpsf-group__row-index"><span>%d</span></td>', $row);
 
                 $row_template .= '<td class="wpsf-group__row-fields">';
 
-                $row_template .= '<input type="hidden" class="wpsf-group__row-id" name="' . sprintf( '%s[%d][row_id]', esc_attr( $args['name'] ), esc_attr( $row ) ) . '" value="' . esc_attr( $row_id_value ) . '" />';
-
-                foreach ( $args['subfields'] as $subfield ) {
-                    $subfield = wp_parse_args( $subfield, $this->setting_defaults );
-
-                    $subfield['value'] = ( $blank ) ? '' : ( isset( $args['value'][ $row ][ $subfield['id'] ] ) ? $args['value'][ $row ][ $subfield['id'] ] : '' );
-                    $subfield['name']  = sprintf( '%s[%d][%s]', esc_attr( $args['name'] ), $row, $subfield['id'] );
-                    $subfield['id']    = sprintf( '%s_%d_%s', esc_attr( $args['id'] ), $row, $subfield['id'] );
-
-                    $class = sprintf( 'wpsf-group__field-wrapper--%s', $subfield['type'] );
-
-                    $row_template .= sprintf( '<div class="wpsf-group__field-wrapper %s">', $class );
-                    $row_template .= sprintf( '<label for="%s" class="wpsf-group__field-label">%s</label>', $subfield['id'], $subfield['title'] );
+                $row_template .= '<input type="hidden" class="wpsf-group__row-id" name="' . sprintf('%s[%d][row_id]', esc_attr($args['name']), esc_attr($row)) . '" value="' . esc_attr($row_id_value) . '" />';
+
+                foreach ($args['subfields'] as $subfield) {
+                    $subfield = wp_parse_args($subfield, $this->setting_defaults);
+
+                    $subfield['value'] = ($blank) ? '' : (isset($args['value'][$row][$subfield['id']]) ? $args['value'][$row][$subfield['id']] : '');
+                    $subfield['name'] = sprintf('%s[%d][%s]', esc_attr($args['name']), $row, $subfield['id']);
+                    $subfield['id'] = sprintf('%s_%d_%s', esc_attr($args['id']), $row, $subfield['id']);
+
+                    $class = sprintf('wpsf-group__field-wrapper--%s', $subfield['type']);
+
+                    $row_template .= sprintf('<div class="wpsf-group__field-wrapper %s">', $class);
+                    $row_template .= sprintf('<label for="%s" class="wpsf-group__field-label">%s</label>', $subfield['id'], $subfield['title']);
 
                     ob_start();
-                    $this->do_field_method( $subfield );
+                    $this->do_field_method($subfield);
                     $row_template .= ob_get_clean();
 
@@ -693 +724 @@
                 $row_template .= '<td class="wpsf-group__row-actions">';
 
-                $row_template .= sprintf( '<a href="javascript: void(0);" class="wpsf-group__row-add" data-template="%s_template"><span class="dashicons dashicons-plus-alt"></span></a>', esc_attr( $args['id'] ) );
+                $row_template .= sprintf('<a href="javascript: void(0);" class="wpsf-group__row-add" data-template="%s_template"><span class="dashicons dashicons-plus-alt"></span></a>', esc_attr($args['id']));
                 $row_template .= '<a href="javascript: void(0);" class="wpsf-group__row-remove"><span class="dashicons dashicons-trash"></span></a>';
 
@@ -709 +740 @@
          * @param array $args Arguments.
          */
-        public function generate_select_field( $args ) {
-            $args['value'] = esc_html( esc_attr( $args['value'] ) );
-
-            echo '<select name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( $args['id'] ) . '" class="' . esc_attr( $args['class'] ) . '">';
-
-            foreach ( $args['choices'] as $value => $text ) {
-                if ( is_array( $text ) ) {
-                    echo sprintf( '<optgroup label="%s">', esc_html( $value ) );
-                    foreach ( $text as $group_value => $group_text ) {
-                        $selected = ( $group_value === $args['value'] ) ? 'selected="selected"' : '';
-                        echo sprintf( '<option value="%s" %s>%s</option>', esc_attr( $group_value ), esc_html( $selected ), esc_html( $group_text ) );
+        public function generate_select_field($args)
+        {
+            $args['value'] = esc_html(esc_attr($args['value']));
+
+            echo '<select name="' . esc_attr($args['name']) . '" id="' . esc_attr($args['id']) . '" class="' . esc_attr($args['class']) . '">';
+
+            foreach ($args['choices'] as $value => $text) {
+                if (is_array($text)) {
+                    echo sprintf('<optgroup label="%s">', esc_html($value));
+                    foreach ($text as $group_value => $group_text) {
+                        $selected = ($group_value === $args['value']) ? 'selected="selected"' : '';
+                        echo sprintf('<option value="%s" %s>%s</option>', esc_attr($group_value), esc_html($selected), esc_html($group_text));
                     }
                     echo '</optgroup>';
@@ -725 +757 @@
                 }
 
-                $selected = ( strval( $value ) === $args['value'] ) ? 'selected="selected"' : '';
-
-                echo sprintf( '<option value="%s" %s>%s</option>', esc_attr( $value ), esc_html( $selected ), esc_html( $text ) );
+                $selected = (strval($value) === $args['value']) ? 'selected="selected"' : '';
+
+                echo sprintf('<option value="%s" %s>%s</option>', esc_attr($value), esc_html($selected), esc_html($text));
             }
 
             echo '</select>';
 
-            $this->generate_description( $args['desc'] );
+            $this->generate_description($args['desc']);
         }
 
@@ -740 +772 @@
          * @param array $args
          */
-        public function generate_password_field( $args ) {
-            $args['value'] = esc_attr( stripslashes( $args['value'] ) );
-
-            echo '<input type="password" name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( $args['id'] ) . '" value="' . $args['value'] . '" placeholder="' . esc_attr( $args['placeholder'] ) . '" class="regular-text ' . esc_attr( $args['class'] ) . '" />';
-
-            $this->generate_description( $args['desc'] );
+        public function generate_password_field($args)
+        {
+            $args['value'] = esc_attr(stripslashes($args['value']));
+
+            echo '<input type="password" name="' . esc_attr($args['name']) . '" id="' . esc_attr($args['id']) . '" value="' . $args['value'] . '" placeholder="' . esc_attr($args['placeholder']) . '" class="regular-text ' . esc_attr($args['class']) . '" />';
+
+            $this->generate_description($args['desc']);
         }
 
@@ -753 +786 @@
          * @param array $args
          */
-        public function generate_textarea_field( $args ) {
-            $args['value'] = esc_html( esc_attr( $args['value'] ) );
-
-            echo '<textarea name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( $args['id'] ) . '" placeholder="' . esc_attr( $args['placeholder'] ) . '" rows="15" cols="60" class="' . esc_attr( $args['class'] ) . '">' . $args['value'] . '</textarea>';
-
-            $this->generate_description( $args['desc'] );
+        public function generate_textarea_field($args)
+        {
+            $args['value'] = esc_html(esc_attr($args['value']));
+
+            echo '<textarea name="' . esc_attr($args['name']) . '" id="' . esc_attr($args['id']) . '" placeholder="' . esc_attr($args['placeholder']) . '" rows="15" cols="60" class="' . esc_attr($args['class']) . '">' . $args['value'] . '</textarea>';
+
+            $this->generate_description($args['desc']);
         }
 
@@ -766 +800 @@
          * @param array $args
          */
-        public function generate_radio_field( $args ) {
-            $args['value'] = esc_html( esc_attr( $args['value'] ) );
-
-            foreach ( $args['choices'] as $value => $text ) {
-                $field_id = sprintf( '%s_%s', esc_attr( $args['id'] ), $value );
-                $checked  = ( $value == $args['value'] ) ? 'checked="checked"' : '';
-
-                echo sprintf( '<label><input type="radio" name="%s" id="%s" value="%s" class="%s" %s> %s</label><br />', esc_attr( $args['name'] ), $field_id, $value, $args['class'], $checked, $text );
-            }
-
-            $this->generate_description( $args['desc'] );
+        public function generate_radio_field($args)
+        {
+            $args['value'] = esc_html(esc_attr($args['value']));
+
+            foreach ($args['choices'] as $value => $text) {
+                $field_id = sprintf('%s_%s', esc_attr($args['id']), $value);
+                $checked = ($value == $args['value']) ? 'checked="checked"' : '';
+
+                echo sprintf('<label><input type="radio" name="%s" id="%s" value="%s" class="%s" %s> %s</label><br />', esc_attr($args['name']), $field_id, $value, $args['class'], $checked, $text);
+            }
+
+            $this->generate_description($args['desc']);
         }
 
@@ -784 +819 @@
          * @param array $args
          */
-        public function generate_checkbox_field( $args ) {
-            $args['value'] = esc_attr( stripslashes( $args['value'] ) );
-            $checked       = ( $args['value'] ) ? 'checked="checked"' : '';
-
-            echo '<input type="hidden" name="' . esc_attr( $args['name'] ) . '" value="0" />';
-            echo '<label><input type="checkbox" name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( $args['id'] ) . '" value="1" class="' . esc_attr( $args['class'] ) . '" ' . $checked . '> ' . esc_attr( $args['desc'] ) . '</label>';
+        public function generate_checkbox_field($args)
+        {
+            $args['value'] = esc_attr(stripslashes($args['value']));
+            $checked = ($args['value']) ? 'checked="checked"' : '';
+
+            echo '<input type="hidden" name="' . esc_attr($args['name']) . '" value="0" />';
+            echo '<label><input type="checkbox" name="' . esc_attr($args['name']) . '" id="' . esc_attr($args['id']) . '" value="1" class="' . esc_attr($args['class']) . '" ' . $checked . '> ' . esc_attr($args['desc']) . '</label>';
         }
 
@@ -797 +833 @@
          * @param array $args
          */
-        public function generate_toggle_field( $args ) {
-            $args['value'] = esc_attr( stripslashes( $args['value'] ) );
-            $checked       = ( $args['value'] ) ? 'checked="checked"' : '';
-
-            echo '<input type="hidden" name="' . esc_attr( $args['name'] ) . '" value="0" />';
-            echo '<label class="switch"><input type="checkbox" name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( $args['id'] ) . '" value="1" class="' . esc_attr( $args['class'] ) . '" ' . $checked . '> ' . esc_attr( $args['desc'] ) . '<span class="slider"></span></label>';
+        public function generate_toggle_field($args)
+        {
+            $args['value'] = esc_attr(stripslashes($args['value']));
+            $checked = ($args['value']) ? 'checked="checked"' : '';
+
+            echo '<input type="hidden" name="' . esc_attr($args['name']) . '" value="0" />';
+            echo '<label class="switch"><input type="checkbox" name="' . esc_attr($args['name']) . '" id="' . esc_attr($args['id']) . '" value="1" class="' . esc_attr($args['class']) . '" ' . $checked . '> ' . esc_attr($args['desc']) . '<span class="slider"></span></label>';
         }
 
@@ -810 +847 @@
          * @param array $args
          */
-        public function generate_checkboxes_field( $args ) {
-            echo '<input type="hidden" name="' . esc_attr( $args['name'] ) . '" value="0" />';
+        public function generate_checkboxes_field($args)
+        {
+            echo '<input type="hidden" name="' . esc_attr($args['name']) . '" value="0" />';
 
             echo '<ul class="wpsf-list wpsf-list--checkboxes">';
 
-            foreach ( $args['choices'] as $value => $text ) {
-                $checked  = ( is_array( $args['value'] ) && in_array( strval( $value ), array_map( 'strval', $args['value'] ), true ) ) ? 'checked="checked"' : '';
-                $field_id = sprintf( '%s_%s', esc_attr( $args['id'] ), $value );
-
-                echo sprintf( '<li><label><input type="checkbox" name="%s[]" id="%s" value="%s" class="%s" %s> %s</label></li>', esc_attr( $args['name'] ), $field_id, $value, esc_attr($args['class']), $checked, $text );
+            foreach ($args['choices'] as $value => $text) {
+                $checked = (is_array($args['value']) && in_array(strval($value), array_map('strval', $args['value']), true)) ? 'checked="checked"' : '';
+                $field_id = sprintf('%s_%s', esc_attr($args['id']), $value);
+
+                echo sprintf('<li><label><input type="checkbox" name="%s[]" id="%s" value="%s" class="%s" %s> %s</label></li>', esc_attr($args['name']), $field_id, $value, esc_attr($args['class']), $checked, $text);
             }
 
             echo '</ul>';
 
-            $this->generate_description( $args['desc'] );
+            $this->generate_description($args['desc']);
         }
 
@@ -832 +870 @@
          * @param array $args
          */
-        public function generate_color_field( $args ) {
-            $color_picker_id = sprintf( '%s_cp', esc_attr( $args['id'] ) );
-            $args['value']   = esc_attr( stripslashes( $args['value'] ) );
+        public function generate_color_field($args)
+        {
+            $color_picker_id = sprintf('%s_cp', esc_attr($args['id']));
+            $args['value'] = esc_attr(stripslashes($args['value']));
 
             echo '<div style="position:relative;">';
 
-            echo sprintf( '<input type="text" name="%s" id="%s" value="%s" class="%s">', esc_attr( $args['name'] ), esc_attr( $args['id'] ), $args['value'], esc_attr( $args['class'] ) );
-
-            echo sprintf( '<div id="%s" style="position:absolute;top:0;left:190px;background:#fff;z-index:9999;"></div>', $color_picker_id );
-
-            $this->generate_description( $args['desc'] );
+            echo sprintf('<input type="text" name="%s" id="%s" value="%s" class="%s">', esc_attr($args['name']), esc_attr($args['id']), $args['value'], esc_attr($args['class']));
+
+            echo sprintf('<div id="%s" style="position:absolute;top:0;left:190px;background:#fff;z-index:9999;"></div>', $color_picker_id);
+
+            $this->generate_description($args['desc']);
 
             echo '<script type="text/javascript">
                 jQuery(document).ready(function($){
                     var colorPicker = $("#' . $color_picker_id . '");
-                    colorPicker.farbtastic("#' . esc_attr( $args['id'] ) . '");
+                    colorPicker.farbtastic("#' . esc_attr($args['id']) . '");
                     colorPicker.hide();
-                    $("#' . esc_attr( $args['id'] ) . '").on("focus", function(){
+                    $("#' . esc_attr($args['id']) . '").on("focus", function(){
                         colorPicker.show();
                     });
-                    $("#' . esc_attr( $args['id'] ) . '").on("blur", function(){
+                    $("#' . esc_attr($args['id']) . '").on("blur", function(){
                         colorPicker.hide();
                         if($(this).val() == "") $(this).val("#");
@@ -867 +906 @@
          * @param array $args
          */
-        public function generate_file_field( $args ) {
-            $args['value'] = esc_attr( $args['value'] );
-            $button_id     = sprintf( '%s_button', esc_attr( $args['id'] ) );
-
-            echo sprintf( '<input type="text" name="%s" id="%s" value="%s" class="regular-text %s"> ', esc_attr( $args['name'] ), esc_attr( $args['id'] ), $args['value'], esc_attr( $args['class'] ) );
-
-            echo sprintf( '<input type="button" class="button wpsf-browse" id="%s" value="Browse" />', $button_id );
+        public function generate_file_field($args)
+        {
+            $args['value'] = esc_attr($args['value']);
+            $button_id = sprintf('%s_button', esc_attr($args['id']));
+
+            echo sprintf('<input type="text" name="%s" id="%s" value="%s" class="regular-text %s"> ', esc_attr($args['name']), esc_attr($args['id']), $args['value'], esc_attr($args['class']));
+
+            echo sprintf('<input type="button" class="button wpsf-browse" id="%s" value="Browse" />', $button_id);
 
             ?>
             <script type='text/javascript'>
-                jQuery( document ).ready( function( $ ) {
+                jQuery(document).ready(function ($) {
 
                     // Uploading files
@@ -884 +924 @@
                     var set_to_post_id = 0;
 
-                    jQuery( document.body ).on('click', '#<?php echo esc_attr( $button_id );?>', function( event ){
+                    jQuery(document.body).on('click', '#<?php echo esc_attr($button_id); ?>', function (event) {
 
                         event.preventDefault();
 
                         // If the media frame already exists, reopen it.
-                        if ( file_frame ) {
+                        if (file_frame) {
                             // Set the post ID to what we want
-                            file_frame.uploader.uploader.param( 'post_id', set_to_post_id );
+                            file_frame.uploader.uploader.param('post_id', set_to_post_id);
                             // Open frame
                             file_frame.open();
@@ -902 +942 @@
                         // Create the media frame.
                         file_frame = wp.media.frames.file_frame = wp.media({
-                            title: '<?php echo esc_html__( 'Select a image to upload', 'wpsf' ); ?>',
+                            title: '<?php echo esc_html__('Select a image to upload', 'wpsf'); ?>',
                             button: {
-                                text: '<?php echo esc_html__( 'Use this image', 'wpsf' ); ?>',
+                                text: '<?php echo esc_html__('Use this image', 'wpsf'); ?>',
                             },
                             multiple: false // Set to true to allow multiple files to be selected
@@ -910 +950 @@
 
                         // When an image is selected, run a callback.
-                        file_frame.on( 'select', function() {
+                        file_frame.on('select', function () {
                             // We set multiple to false so only get one image from the uploader
                             attachment = file_frame.state().get('selection').first().toJSON();
 
                             // Do something with attachment.id and/or attachment.url here
-                            $( '#image-preview' ).attr( 'src', attachment.url ).css( 'width', 'auto' );
-                            $( '#image_attachment_id' ).val( attachment.id );
-                            $( '#<?php echo esc_attr( $args['id']) ;?>' ).val( attachment.url );
+                            $('#image-preview').attr('src', attachment.url).css('width', 'auto');
+                            $('#image_attachment_id').val(attachment.id);
+                            $('#<?php echo esc_attr($args['id']); ?>').val(attachment.url);
 
                             // Restore the main post ID
@@ -928 +968 @@
 
                     // Restore the main ID when the add media button is pressed
-                    jQuery( 'a.add_media' ).on( 'click', function() {
+                    jQuery('a.add_media').on('click', function () {
                         wp.media.model.settings.post.id = wp_media_post_id;
                     });
                 });
-                </script>
+            </script>
             <?php
         }
@@ -941 +981 @@
          * @param array $args
          */
-        public function generate_editor_field( $args ) {
-            wp_editor( esc_attr( $args['value'] ), esc_attr( $args['id'] ), array( 'textarea_name' => esc_attr( $args['name'] ) ) );
-
-            $this->generate_description( $args['desc'] );
+        public function generate_editor_field($args)
+        {
+            wp_editor(esc_attr($args['value']), esc_attr($args['id']), array('textarea_name' => esc_attr($args['name'])));
+
+            $this->generate_description($args['desc']);
         }
 
@@ -952 +993 @@
          * @param array $args
          */
-        public function generate_code_editor_field( $args ) {
-
-            $this->generate_description( $args['desc'] );
+        public function generate_code_editor_field($args)
+        {
+
+            $this->generate_description($args['desc']);
             printf(
                 '<textarea
@@ -964 +1006 @@
                     class="%s"
                 >%s</textarea>',
-                esc_attr( $args['name'] ),
-                esc_attr( $args['id'] ),
-                esc_attr( $args['placeholder'] ),
-                esc_attr( $args['class'] ),
-                esc_html( $args['value'] )
+                esc_attr($args['name']),
+                esc_attr($args['id']),
+                esc_attr($args['placeholder']),
+                esc_attr($args['class']),
+                esc_html($args['value'])
             );
 
-            $settings = wp_enqueue_code_editor( array( 'type' => esc_attr( $args['mimetype'] ) ) );
+            $settings = wp_enqueue_code_editor(array('type' => esc_attr($args['mimetype'])));
             $css = ".CodeMirror {
                 margin: 10px;
@@ -982 +1024 @@
                 sprintf(
                     'jQuery( function() { wp.codeEditor.initialize( "%s", %s ); } );',
-                    esc_attr( $args['id'] ),
-                    wp_json_encode( $settings )
+                    esc_attr($args['id']),
+                    wp_json_encode($settings)
                 )
             );
@@ -995 +1037 @@
          * @param array $args
          */
-        public function generate_custom_field( $args ) {
-            if ( isset( $args['output'] ) && is_callable( $args['output'] ) ) {
-                call_user_func( $args['output'], $args );
+        public function generate_custom_field($args)
+        {
+            if (isset($args['output']) && is_callable($args['output'])) {
+                call_user_func($args['output'], $args);
                 return;
             }
 
-            echo ( isset( $args['output'] ) ) ? $args['output'] : $args['default'];
+            echo (isset($args['output'])) ? $args['output'] : $args['default'];
         }
 
@@ -1009 +1052 @@
          * @param array $args
          */
-        public function generate_multiinputs_field( $args ) {
-            $field_titles = array_keys( $args['default'] );
-            $values       = array_values( $args['value'] );
+        public function generate_multiinputs_field($args)
+        {
+            $field_titles = array_keys($args['default']);
+            $values = array_values($args['value']);
 
             echo '<div class="wpsf-multifields">';
 
             $i = 0;
-            while ( $i < count( $values ) ) :
-
-                $field_id = sprintf( '%s_%s', esc_attr( $args['id'] ), $i );
-                $value    = esc_attr( stripslashes( $values[ $i ] ) );
+            while ($i < count($values)):
+
+                $field_id = sprintf('%s_%s', esc_attr($args['id']), $i);
+                $value = esc_attr(stripslashes($values[$i]));
 
                 echo '<div class="wpsf-multifields__field">';
-                echo '<input type="text" name="' . esc_attr( $args['name'] ) . '[]" id="' . $field_id . '" value="' . $value . '" class="regular-text ' . esc_attr( $args['class'] ) . '" placeholder="' . esc_attr( $args['placeholder'] ) . '" />';
-                echo '<br><span>' . $field_titles[ $i ] . '</span>';
+                echo '<input type="text" name="' . esc_attr($args['name']) . '[]" id="' . $field_id . '" value="' . $value . '" class="regular-text ' . esc_attr($args['class']) . '" placeholder="' . esc_attr($args['placeholder']) . '" />';
+                echo '<br><span>' . $field_titles[$i] . '</span>';
                 echo '</div>';
 
-                $i ++;
-endwhile;
+                $i++;
+            endwhile;
 
             echo '</div>';
 
-            $this->generate_description( $args['desc'] );
+            $this->generate_description($args['desc']);
         }
 
@@ -1041 +1085 @@
          * @return string
          */
-        public function generate_field_name( $id ) {
-            return sprintf( '%s_settings[%s]', $this->option_group, $id );
+        public function generate_field_name($id)
+        {
+            return sprintf('%s_settings[%s]', $this->option_group, $id);
         }
 
@@ -1050 +1095 @@
          * @param mixed $description
          */
-        public function generate_description( $description ) {
-            if ( $description && $description !== '' ) {
+        public function generate_description($description)
+        {
+            if ($description && $description !== '') {
                 echo '<p class="description">' . $description . '</p>';
             }
@@ -1059 +1105 @@
          * Output the settings form
          */
-        public function settings() {
-            do_action( 'wpsf_before_settings_' . $this->option_group );
+        public function settings()
+        {
+            do_action('wpsf_before_settings_' . $this->option_group);
             ?>
             <form action="options.php" method="post" novalidate enctype="multipart/form-data">
-                <?php do_action( 'wpsf_before_settings_fields_' . $this->option_group ); ?>
-                <?php settings_fields( $this->option_group ); ?>
-
-                <?php do_action( 'wpsf_do_settings_sections_' . $this->option_group ); ?>
-
-                <?php if ( apply_filters( 'wpsf_show_save_changes_button_' . $this->option_group, true ) ) { ?>
+                <?php do_action('wpsf_before_settings_fields_' . $this->option_group); ?>
+                <?php settings_fields($this->option_group); ?>
+
+                <?php do_action('wpsf_do_settings_sections_' . $this->option_group); ?>
+
+                <?php if (apply_filters('wpsf_show_save_changes_button_' . $this->option_group, true)) { ?>
                     <p class="submit">
-                        <input type="submit" class="button-primary" value="<?php _e( 'Save Changes' ); ?>" />
+                        <input type="submit" class="button-primary" value="<?php _e('Save Changes'); ?>" />
                     </p>
                 <?php } ?>
             </form>
             <?php
-            do_action( 'wpsf_after_settings_' . $this->option_group );
+            do_action('wpsf_after_settings_' . $this->option_group);
         }
 
@@ -1083 +1130 @@
          * @return array
          */
-        public function get_settings() {
+        public function get_settings()
+        {
             $settings_name = $this->option_group . '_settings';
 
             static $settings = array();
 
-            if ( isset( $settings[ $settings_name ] ) ) {
-                return $settings[ $settings_name ];
-            }
-
-            $saved_settings             = get_option( $this->option_group . '_settings' );
-            $settings[ $settings_name ] = array();
-
-            foreach ( $this->settings as $section ) {
-                if ( empty( $section['fields'] ) ) {
+            if (isset($settings[$settings_name])) {
+                return $settings[$settings_name];
+            }
+
+            $saved_settings = get_option($this->option_group . '_settings');
+            $settings[$settings_name] = array();
+
+            foreach ($this->settings as $section) {
+                if (empty($section['fields'])) {
                     continue;
                 }
 
-                foreach ( $section['fields'] as $field ) {
-                    if ( ! empty( $field['default'] ) && is_array( $field['default'] ) ) {
-                        $field['default'] = array_values( $field['default'] );
+                foreach ($section['fields'] as $field) {
+                    if (!empty($field['default']) && is_array($field['default'])) {
+                        $field['default'] = array_values($field['default']);
                     }
 
-                    $setting_key = ( $this->has_tabs() ) ? sprintf( '%s_%s_%s', $section['tab_id'], $section['section_id'], $field['id'] ) : sprintf( '%s_%s', $section['section_id'], $field['id'] );
-
-                    if ( isset( $saved_settings[ $setting_key ] ) ) {
-                        $settings[ $settings_name ][ $setting_key ] = $saved_settings[ $setting_key ];
+                    $setting_key = ($this->has_tabs()) ? sprintf('%s_%s_%s', $section['tab_id'], $section['section_id'], $field['id']) : sprintf('%s_%s', $section['section_id'], $field['id']);
+
+                    if (isset($saved_settings[$setting_key])) {
+                        $settings[$settings_name][$setting_key] = $saved_settings[$setting_key];
                     } else {
-                        $settings[ $settings_name ][ $setting_key ] = ( isset( $field['default'] ) ) ? $field['default'] : false;
+                        $settings[$settings_name][$setting_key] = (isset($field['default'])) ? $field['default'] : false;
                     }
                 }
             }
 
-            return $settings[ $settings_name ];
+            return $settings[$settings_name];
         }
 
@@ -1121 +1169 @@
          * Tabless Settings sections
          */
-        public function do_tabless_settings_sections() {
+        public function do_tabless_settings_sections()
+        {
             ?>
             <div class="wpsf-section wpsf-tabless">
-                <?php do_settings_sections( $this->option_group ); ?>
+                <?php do_settings_sections($this->option_group); ?>
             </div>
             <?php
@@ -1132 +1181 @@
          * Tabbed Settings sections
          */
-        public function do_tabbed_settings_sections() {
+        public function do_tabbed_settings_sections()
+        {
             $i = 0;
-            foreach ( $this->tabs as $tab_data ) {
+            foreach ($this->tabs as $tab_data) {
                 ?>
                 <div id="tab-<?php echo $tab_data['id']; ?>" class="wpsf-section wpsf-tab wpsf-tab--<?php echo $tab_data['id']; ?> <?php
-                if ( $i == 0 ) {
-                    echo 'wpsf-tab--active';
-                }
-                ?>
+                       if ($i == 0) {
+                           echo 'wpsf-tab--active';
+                       }
+                       ?>
                 ">
                     <div class="postbox">
-                        <?php do_settings_sections( sprintf( '%s_%s', $this->option_group, $tab_data['id'] ) ); ?>
+                        <?php do_settings_sections(sprintf('%s_%s', $this->option_group, $tab_data['id'])); ?>
                     </div>
                 </div>
                 <?php
-                $i ++;
+                $i++;
             }
         }
@@ -1154 +1204 @@
          * Output the tab links
          */
-        public function tab_links() {
-            if ( ! apply_filters( 'wpsf_show_tab_links_' . $this->option_group, true ) ) {
+        public function tab_links()
+        {
+            if (!apply_filters('wpsf_show_tab_links_' . $this->option_group, true)) {
                 return;
             }
 
-            do_action( 'wpsf_before_tab_links_' . $this->option_group );
+            do_action('wpsf_before_tab_links_' . $this->option_group);
             ?>
             <ul class="wpsf-nav">
                 <?php
                 $i = 0;
-                foreach ( $this->tabs as $tab_data ) {
-                    if ( ! $this->tab_has_settings( $tab_data['id'] ) ) {
+                foreach ($this->tabs as $tab_data) {
+                    if (!$this->tab_has_settings($tab_data['id'])) {
                         continue;
                     }
 
-                    if ( ! isset( $tab_data['class'] ) ) {
+                    if (!isset($tab_data['class'])) {
                         $tab_data['class'] = '';
                     }
 
-                    $tab_data['class'] .= self::add_show_hide_classes( $tab_data );
-
-                    $active = ( $i == 0 ) ? 'wpsf-nav__item--active' : '';
+                    $tab_data['class'] .= self::add_show_hide_classes($tab_data);
+
+                    $active = ($i == 0) ? 'wpsf-nav__item--active' : '';
                     ?>
                     <li class="wpsf-nav__item <?php echo $active; ?>">
-                        <a class="wpsf-nav__item-link <?php echo esc_attr( $tab_data['class'] ); ?>" href="#tab-<?php echo $tab_data['id']; ?>"><?php echo $tab_data['title']; ?></a>
+                        <a class="wpsf-nav__item-link <?php echo esc_attr($tab_data['class']); ?>"
+                            href="#tab-<?php echo $tab_data['id']; ?>"><?php echo $tab_data['title']; ?></a>
                     </li>
                     <?php
-                    $i ++;
+                    $i++;
                 }
                 ?>
                 <li class="wpsf-nav__item wpsf-nav__item--last">
-                    <input type="submit" class="button-primary wpsf-button-submit" value="<?php esc_attr_e( 'Save Changes' ); ?>">
+                    <input type="submit" class="button-primary wpsf-button-submit" value="<?php esc_attr_e('Save Changes'); ?>">
                 </li>
             </ul>
 
             <?php // Add this here so notices are moved. ?>
-            <div class="wrap wpsf-notices"><h2>&nbsp;</h2></div>
+            <div class="wrap wpsf-notices">
+                <h2>&nbsp;</h2>
+            </div>
             <?php
-            do_action( 'wpsf_after_tab_links_' . $this->option_group );
+            do_action('wpsf_after_tab_links_' . $this->option_group);
         }
 
@@ -1202 +1256 @@
          * @return bool
          */
-        public function tab_has_settings( $tab_id ) {
-            if ( empty( $this->settings ) ) {
+        public function tab_has_settings($tab_id)
+        {
+            if (empty($this->settings)) {
                 return false;
             }
 
-            foreach ( $this->settings as $settings_section ) {
-                if ( $tab_id !== $settings_section['tab_id'] ) {
+            foreach ($this->settings as $settings_section) {
+                if ($tab_id !== $settings_section['tab_id']) {
                     continue;
                 }
@@ -1221 +1276 @@
          * Check if this settings instance has tabs
          */
-        public function has_tabs() {
-            if ( ! empty( $this->tabs ) ) {
+        public function has_tabs()
+        {
+            if (!empty($this->tabs)) {
                 return true;
             }
@@ -1232 +1288 @@
          * Add Show Hide Classes.
          */
-        public static function add_show_hide_classes( $args, $type = 'show_if' ) {
+        public static function add_show_hide_classes($args, $type = 'show_if')
+        {
             $class = '';
-            $slug  = ' ' . str_replace( '_', '-', $type );
-            if ( isset( $args[ $type ] ) && is_array( $args[ $type ] ) ) {
+            $slug = ' ' . str_replace('_', '-', $type);
+            if (isset($args[$type]) && is_array($args[$type])) {
                 $class .= $slug;
-                foreach ( $args[ $type ] as $condition ) {
-                    if ( isset( $condition['field'] ) && $condition['value'] ) {
+                foreach ($args[$type] as $condition) {
+                    if (isset($condition['field']) && $condition['value']) {
                         $value_string = '';
-                        foreach ( $condition['value'] as $value ) {
-                            if ( ! empty( $value_string ) ) {
+                        foreach ($condition['value'] as $value) {
+                            if (!empty($value_string)) {
                                 $value_string .= '||';
                             }
@@ -1247 +1304 @@
                         }
 
-                        if ( ! empty( $value_string ) ) {
+                        if (!empty($value_string)) {
                             $class .= $slug . '--' . $condition['field'] . '===' . $value_string;
                         }
                     } else {
                         $and_string = '';
-                        foreach( $condition as $and_condition ) {
-                            if ( ! isset( $and_condition['field'] ) || ! isset( $and_condition['value'] ) ) {
+                        foreach ($condition as $and_condition) {
+                            if (!isset($and_condition['field']) || !isset($and_condition['value'])) {
                                 continue;
                             }
 
-                            if ( ! empty( $and_string ) ) {
+                            if (!empty($and_string)) {
                                 $and_string .= '&&';
                             }
 
                             $value_string = '';
-                            foreach ( $and_condition['value'] as $value ) {
-                                if ( ! empty( $value_string ) ) {
+                            foreach ($and_condition['value'] as $value) {
+                                if (!empty($value_string)) {
                                     $value_string .= '||';
                                 }
@@ -1269 +1326 @@
                             }
 
-                            if ( ! empty( $value_string ) ) {
+                            if (!empty($value_string)) {
                                 $and_string .= $and_condition['field'] . '===' . $value_string;
                             }
                         }
 
-                        if ( ! empty( $and_string ) ) {
+                        if (!empty($and_string)) {
                             $class .= $slug . '--' . $and_string;
                         }
@@ -1282 +1339 @@
 
             // Run the function again with hide if.
-            if ( 'hide_if' !== $type ) {
-                $class .= self::add_show_hide_classes( $args, 'hide_if' );
+            if ('hide_if' !== $type) {
+                $class .= self::add_show_hide_classes($args, 'hide_if');
             }
 
@@ -1292 +1349 @@
          * Handle export settings action.
          */
-        public static function export_settings() {
-            $_wpnonce     = filter_input( INPUT_GET, '_wpnonce' );
-            $option_group = filter_input( INPUT_GET, 'option_group' );
-
-            if ( empty( $_wpnonce ) || ! wp_verify_nonce( $_wpnonce, 'wpsf_export_settings' ) ) {
-                wp_die( esc_html__( 'Action failed.', 'wpsf' ) );
-            }
-
-            if ( empty( $option_group ) ) {
-                wp_die( esc_html__( 'No option group specified.', 'wpsf' ) );
-            }
-
-            $options = get_option( $option_group . '_settings' );
-            $options = wp_json_encode( $options );
+        public static function export_settings()
+        {
+            $_wpnonce = filter_input(INPUT_GET, '_wpnonce');
+            $option_group = filter_input(INPUT_GET, 'option_group');
+
+            if (empty($_wpnonce) || !wp_verify_nonce($_wpnonce, 'wpsf_export_settings')) {
+                wp_die(esc_html__('Action failed.', 'wpsf'));
+            }
+
+            if (empty($option_group)) {
+                wp_die(esc_html__('No option group specified.', 'wpsf'));
+            }
+
+            $options = get_option($option_group . '_settings');
+            $options = wp_json_encode($options);
 
             // output the file contents to the browser.
-            header( 'Content-Type: text/json; charset=utf-8' );
-            header( 'Content-Disposition: attachment; filename=wpsf-settings-' . $option_group . '.json' );
+            header('Content-Type: text/json; charset=utf-8');
+            header('Content-Disposition: attachment; filename=wpsf-settings-' . $option_group . '.json');
             echo $options;
             exit;
@@ -1317 +1375 @@
          * Import settings.
          */
-        public function import_settings() {
-            $_wpnonce     = filter_input( INPUT_POST, '_wpnonce' );
-            $option_group = filter_input( INPUT_POST, 'option_group' );
-            $settings     = filter_input( INPUT_POST, 'settings' );
-
-            if ( $option_group !== $this->option_group ) {
+        public function import_settings()
+        {
+            $_wpnonce = filter_input(INPUT_POST, '_wpnonce');
+            $option_group = filter_input(INPUT_POST, 'option_group');
+            $settings = filter_input(INPUT_POST, 'settings');
+
+            if ($option_group !== $this->option_group) {
                 return;
             }
 
             // verify nonce.
-            if ( empty( $_wpnonce ) || ! wp_verify_nonce( $_wpnonce, 'wpsf_import_settings' ) ) {
+            if (empty($_wpnonce) || !wp_verify_nonce($_wpnonce, 'wpsf_import_settings')) {
                 wp_send_json_error();
             }
 
             // check if $settings is a valid json.
-            if ( ! is_string( $settings ) || ! is_array( json_decode( $settings, true ) ) ) {
+            if (!is_string($settings) || !is_array(json_decode($settings, true))) {
                 wp_send_json_error();
             }
 
-            $settings_data = json_decode( $settings, true );
-            update_option( $option_group . '_settings', $settings_data );
+            $settings_data = json_decode($settings, true);
+            update_option($option_group . '_settings', $settings_data);
 
             wp_send_json_success();
@@ -1344 +1403 @@
 }
 
-if ( ! function_exists( 'wpsf_get_setting_bibleup' ) ) {
+if (!function_exists('wpsf_get_setting_bibleup')) {
     /**
      * Get a setting from an option group
@@ -1354 +1413 @@
      * @return mixed
      */
-    function wpsf_get_setting_bibleup( $option_group, $section_id, $field_id ) {
-        $options = get_option( $option_group . '_settings' );
-        if ( isset( $options[ $section_id . '_' . $field_id ] ) ) {
-            return $options[ $section_id . '_' . $field_id ];
+    function wpsf_get_setting_bibleup($option_group, $section_id, $field_id)
+    {
+        $options = get_option($option_group . '_settings');
+        if (isset($options[$section_id . '_' . $field_id])) {
+            return $options[$section_id . '_' . $field_id];
         }
 
@@ -1364 +1424 @@
 }
 
-if ( ! function_exists( 'wpsf_delete_settings_bibleup' ) ) {
+if (!function_exists('wpsf_delete_settings_bibleup')) {
     /**
      * Delete all the saved settings from a settings file/option group
@@ -1370 +1430 @@
      * @param string $option_group
      */
-    function wpsf_delete_settings_bibleup( $option_group ) {
-        delete_option( $option_group . '_settings' );
+    function wpsf_delete_settings_bibleup($option_group)
+    {
+        delete_option($option_group . '_settings');
     }
 }