Changeset 2181143

truth/tags/2.3/class-truth-admin.php

-                      r1917073
+                      r2181143
 <?php
 /**
  * The admin Truth class
  */
+* The admin Truth class
+*/
 if ( ! class_exists( 'Truth_Admin' ) ) {
     /**
      * lets get started
      */
+    * lets get started
+    */
     class Truth_Admin {
         /**
          * Static property to hold our singleton instance
          * @var $instance
          */
+        * Static property to hold our singleton instance
+        * @var $instance
+        */
         static $instance = false;
         /**
          * Static property to hold our singleton instance
          * @var $instance
          */
+        /**
+        * Static property to hold our singleton instance
+        * @var $instance
+        */
         public $options = array();
         /**
          * this is our constructor.
          * there are many like it, but this one is mine
          */
+        * this is our constructor.
+        * there are many like it, but this one is mine
+        */
         private function __construct() {
             $this->options = get_option( 'truth_settings' );
             register_activation_hook( TRUTH_FILE, array( $this, 'initialize_plugin' ) );
             require_once( TRUTH_DIR . 'class-truth-notice.php' );
             // Load the administrative Stylesheets and JavaScript
             add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_styles' ) );
+            $this->options = get_option( 'truth_settings' );
+            register_activation_hook( TRUTH_FILE, array( $this, 'initialize_plugin' ) );
+            require_once( TRUTH_DIR . 'class-truth-notice.php' );
+            // Load the administrative Stylesheets and JavaScript
+            add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_styles' ) );
             add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
             if ( TRUTH_AUTH_ALL ) {
                 update_option( 'truth_authorization', true );
             } else {
                 add_action( 'admin_init', array( $this, 'check_authorization' ) );
+            }
             add_action( 'admin_init', array( $this, 'register_settings' ) );
+        }
         /**
          * If an instance exists, this returns it.  If not, it creates one and
          * returns it.
+         *
          * @return $instance
          */
+            if ( TRUTH_AUTH_ALL ) {
+                update_option( 'truth_authorization', true );
+            } else {
+                add_action( 'admin_init', array( $this, 'check_authorization' ) );
+            }
+            add_action( 'admin_init', array( $this, 'register_settings' ) );
+        }
+        /**
+        * If an instance exists, this returns it.  If not, it creates one and
+        * returns it.
+        *
+        * @return $instance
+        */
         public static function get_instance() {
             if ( ! self::$instance ) {
 …
+        }
         /**
          * Register the stylesheets.
+         *
          * @since    0.0.1
          */
         public function enqueue_styles() {
             wp_enqueue_style( 'truth', plugin_dir_url( __FILE__ ) . 'css/truth-admin.css', array(), TRUTH_VERSION, 'all' );
+        }
         /**
          * Register the JavaScript for the dashboard.
+         *
          * @since    0.0.1
          */
         public function enqueue_scripts() {
             wp_enqueue_script( 'truth', plugin_dir_url( __FILE__ ) . 'js/truth-admin.js', array( 'jquery' ), TRUTH_VERSION, false );
             wp_localize_script( 'truth', 'TRUTH', array( 'ajaxurl' => admin_url( 'admin-ajax.php' ) ) );
+        }
         public function check_authorization() {
             if ( ! get_option( 'truth_authorization' ) ) {
                 $args = array(
                     'notice'  => 'truth-authorization',
                     'class'   => 'update-nag',
                     'message' => 'The <code>Truth</code> plugin needs authorization to link scripture references to an external site. Click <a href="#" id="authorize-truth" data-security="' . wp_create_nonce( 'authorize-truth' ) . '">here</a> to permit this action.',
                     'echo'    => true,
                 );
                 $notice = new Truth_Notice( $args );
                 $notice->show();
+            }
+        }
         public function register_settings() {
             register_setting( 'reading', 'truth_settings' );
             add_settings_field( 'truth_settings', 'Biblical References', array( $this, 'display_settings' ), 'reading', 'default' );
+        }
         public function display_settings() {
             $sources = Truth::get_sources();
+        /**
+        * Register the stylesheets.
+        *
+        * @since    0.0.1
+        */
+        public function enqueue_styles() {
+            wp_enqueue_style( 'truth', plugin_dir_url( __FILE__ ) . 'css/truth-admin.css', array(), TRUTH_VERSION, 'all' );
+        }
+        /**
+        * Register the JavaScript for the dashboard.
+        *
+        * @since    0.0.1
+        */
+        public function enqueue_scripts() {
+            wp_enqueue_script( 'truth', plugin_dir_url( __FILE__ ) . 'js/truth-admin.js', array( 'jquery' ), TRUTH_VERSION, false );
+            wp_localize_script( 'truth', 'TRUTH', array( 'ajaxurl' => admin_url( 'admin-ajax.php' ) ) );
+        }
+        public function check_authorization() {
+            if ( ! get_option( 'truth_authorization' ) ) {
+                $args = array(
+                    'notice'  => 'truth-authorization',
+                    'class'   => 'update-nag',
+                    'message' => 'The <code>Truth</code> plugin needs authorization to link scripture references to an external site. Click <a href="#" id="authorize-truth" data-security="' . wp_create_nonce( 'authorize-truth' ) . '">here</a> to permit this action.',
+                    'echo'    => true,
+                );
+                $notice = new Truth_Notice( $args );
+                $notice->show();
+            }
+        }
+        public function register_settings() {
+            register_setting( 'reading', 'truth_settings' );
+            add_settings_field( 'truth_settings', 'Biblical References', array( $this, 'display_settings' ), 'reading', 'default' );
+        }
+        public function display_settings() {
+            $sources = Truth::get_sources();
             foreach ( $sources as $source => $data ) {
 …
+            }
             ?>
             <fieldset id="truth-general-settings">
                 <label>Bible Service: <select id="truth-engine" name="truth_settings[engine]"></label>
                     <option value="biblesorg_highlighter" <?php selected( $this->options['engine'], 'biblesorg_highlighter' ); ?>>Bibles.org Highlighter</option>
                     <option value="youversion" <?php selected( $this->options['engine'], 'youversion' ); ?>>YouVersion</option>
                 </select></label>
                 <span id="description-engine-biblesorg_highlighter" class="description" <?php echo 'biblesorg_highlighter' == $this->options['engine'] ? '' : 'style="display:none;"'; ?>>(allows display of verses via modal when verses are clicked)</span>
                 <span id="description-engine-youversion" class="description" <?php echo 'youversion' == $this->options['engine'] ? '' : 'style="display:none;"'; ?>>(directs users to YouVersion.com upon click)</span>
                 </p>
             </fieldset>
             <fieldset id="truth-biblesorg_highlighter-settings" <?php echo ( ! isset( $this->options['engine'] ) || 'biblesorg_highlighter' == $this->options['engine'] ) ? '' : 'style="display:none;"'; ?>>
                 <h2>Bibles.org Highlighter Settings</h2>
                 <label>Version: <select id="bible-version" name="truth_settings[biblesorg_highlighter][bible_version]">
                     <?php foreach( $versions['biblesorg_highlighter'] as $languageGroup => $languageVersions ): ?>
                         <optgroup label="<?php echo $languageGroup?>">
                             <?php foreach( $languageVersions as $versionID => $versionInfo ): ?>
                                 <option value="<?php echo $versionID; ?>" <?php selected( $this->options['biblesorg_highlighter']['bible_version'], $versionID ); ?>><?php echo $versionInfo['name'] . ' (' . strtoupper( $versionInfo['abbr'] ). ')'; ?></option> <?php
                             endforeach; ?>
                         </optgroup>
                     <?php endforeach; ?>
                 </select></label><br />
                 <label>Overwrite Highlighter Targeting: <input name="truth_settings[biblesorg_highlighter][target_ids]" value="<?php echo ! isset( $this->options['biblesorg_highlighter']['target_ids'] ) ? '' : $this->options['biblesorg_highlighter']['target_ids']; ?>" style="width: 40%"></label><span id="description-biblesorg-target-ids" class="description">(comma-separated list of DOM element ids, overrides default search for verse references)
             </fieldset>
+            ?>
+            <fieldset id="truth-general-settings">
+                <label>Bible Service: <select id="truth-engine" name="truth_settings[engine]"></label>
+                    <option value="biblesorg_highlighter" <?php selected( $this->options['engine'], 'biblesorg_highlighter' ); ?>>Bibles.org Highlighter</option>
+                    <option value="youversion" <?php selected( $this->options['engine'], 'youversion' ); ?>>YouVersion</option>
+                </select></label>
+                <span id="description-engine-biblesorg_highlighter" class="description" <?php echo 'biblesorg_highlighter' == $this->options['engine'] ? '' : 'style="display:none;"'; ?>>(allows display of verses via modal when verses are clicked)</span>
+                <span id="description-engine-youversion" class="description" <?php echo 'youversion' == $this->options['engine'] ? '' : 'style="display:none;"'; ?>>(directs users to YouVersion.com upon click)</span>
+            </p>
+        </fieldset>
+        <fieldset id="truth-biblesorg_highlighter-settings" <?php echo ( ! isset( $this->options['engine'] ) || 'biblesorg_highlighter' == $this->options['engine'] ) ? '' : 'style="display:none;"'; ?>>
+            <h2>Bibles.org Highlighter Settings</h2>
+            <label>Version: <select id="bible-version" name="truth_settings[biblesorg_highlighter][bible_version]">
+                <?php foreach( $versions['biblesorg_highlighter'] as $languageGroup => $languageVersions ): ?>
+                    <optgroup label="<?php echo $languageGroup?>">
+                        <?php foreach( $languageVersions as $versionID => $versionInfo ): ?>
+                            <option value="<?php echo $versionID; ?>" <?php selected( $this->options['biblesorg_highlighter']['bible_version'], $versionID ); ?>><?php echo $versionInfo['name'] . ' (' . strtoupper( $versionInfo['abbr'] ). ')'; ?></option> <?php
+                        endforeach; ?>
+                    </optgroup>
+                <?php endforeach; ?>
+            </select></label><br />
+            <label>Overwrite Highlighter Targeting: <input name="truth_settings[biblesorg_highlighter][target_ids]" value="<?php echo ! isset( $this->options['biblesorg_highlighter']['target_ids'] ) ? '' : $this->options['biblesorg_highlighter']['target_ids']; ?>" style="width: 40%"></label><span id="description-biblesorg-target-ids" class="description">(comma-separated list of DOM element ids, overrides default search for verse references)
+            </fieldset>
             <fieldset id="truth-youversion-settings" <?php echo 'youversion' == $this->options['engine'] ? '' : 'style="display:none;"'; ?>>
 …
                 <p><input type="checkbox" id="link_in_new_tab" name="truth_settings[link_in_new_tab]" value="1" <?php checked( $this->options['link_in_new_tab'], 1 ); ?>> <label for="link_in_new_tab">Open links in new tab.</label></input></p>
                 <p><input type="checkbox" id="disable_auto_links" name="truth_settings[disable_auto_links]" value="1" <?php checked( $this->options['disable_auto_links'], 1 ); ?>> <label for="disable_auto_links">Disable auto-generation of links.</label></input> <span class="description">(maintains use of [truth] shortcode)</span></p>
                 <p><label> Append Version to Shortcode Text: <select id="append_version" name="truth_settings[append_version]">
                     <option value="none" <?php selected( $this->options['append_version'], 'none' ); ?>>No (Disabled)</option>
                     <option value="abbr" <?php selected( $this->options['append_version'], 'abbr' ); ?>>Abbreviation</option>
                     <option value="full" <?php selected( $this->options['append_version'], 'full' ); ?>>Full Name</option>
                 </select></label>
                 </p>
             </fieldset>
             <?php
+        }
+    }
+                <p><label> Append Version to Shortcode Text: <select id="append_version" name="truth_settings[append_version]">
+                    <option value="none" <?php selected( $this->options['append_version'], 'none' ); ?>>No (Disabled)</option>
+                    <option value="abbr" <?php selected( $this->options['append_version'], 'abbr' ); ?>>Abbreviation</option>
+                    <option value="full" <?php selected( $this->options['append_version'], 'full' ); ?>>Full Name</option>
+                </select></label>
+            </p>
+        </fieldset>
+        <?php
+    }
+}
+}
 …
     add_action( 'admin_notices', 'typewheel_truth_notices' );
     /**
      * Displays a plugin notices
+     *
      * @since    1.0
      */
+    * Displays a plugin notices
+    *
+    * @since    1.0
+    */
     function typewheel_truth_notices() {
         $prefix = str_replace( '-', '_', dirname( plugin_basename(__FILE__) ) );
+            // Notice to show on plugin activation
+            $activation_notice = array(
+            );
+            // Define the notices
+            $typewheel_notices = array(
+                // $prefix . '-tutorial' => array(
+                //  'trigger' => true,
+                //  'time' => time() - 5,
+                //  'dismiss' => array(),
+                //  'type' => '',
+                //  'content' => '<h2 style="margin:0;"><i class="dashicons dashicons-welcome-learn-more"></i> Glance That Tutorial</h2><br />Allow me to give you a brief run down on your <strong>Glance That</strong> options. You can hover over the <i class="dashicons dashicons-admin-settings"></i> settings icon at the top-right of <strong>At A Glance</strong> to reveal your controls. Clicking the <i class="dashicons dashicons-filter"></i> filter will allow you to add and remove items. You can also control <i class="dashicons dashicons-visibility"></i> visibility of available statuses for each item. Rearrange items by <i class="dashicons dashicons-move"></i> dragging them. Then, you can <i class="dashicons dashicons-migrate"></i> push your setup to other users. Let me know if you have any questions. Thanks! <a href="https://twitter.com/uamv/">@uamv</a>',
+                //  // 'icon' => 'heart',
+                //  'style' => array( 'background-image' => 'linear-gradient( to bottom right, rgb(215, 215, 215), rgb(231, 211, 186) )', 'border-left-color' => '#3F3F3F', 'max-width' => '700px', 'padding' => '.5em 2em' ),
+                //  'location' => array( 'index.php' ),
+                //  'capability' => GT_ADMIN_GLANCES,
+                // ),
+                // $prefix . '-review' => array(
+                //  'trigger' => true,
+                //  'time' => time() + 604800,
+                //  'dismiss' => array( 'month' ),
+                //  'type' => '',
+                //  'content' => 'How are you liking the <strong>Glance That</strong> plugin? Help spread the word by <a href="https://wordpress.org/support/plugin/glance-that/reviews/?rate=5#new-post" target="_blank"><i class="dashicons dashicons-star-filled"></i> giving a review</a> or <a href="https://twitter.com/intent/tweet/?url=https%3A%2F%2Fwordpress.org%2Fplugins%2Fglance-that%2F" target="_blank"><i class="dashicons dashicons-twitter"></i> tweeting your support</a>. Thanks! <a href="https://twitter.com/uamv/">@uamv</a>',
+                //  'icon' => 'share-alt',
+                //  'style' => array( 'background-image' => 'linear-gradient( to bottom right, rgb(215, 215, 215), rgb(231, 211, 186) )', 'border-left-color' => '#3F3F3F' ),
+                //  'location' => array( 'index.php' ),
+                //  'capability' => GT_ADMIN_GLANCES,
+                // ),
+                $prefix . '-give' => array(
+                    'trigger' => true,
+                    'time' => time() + 2592000,
+                    'dismiss' => array( 'month' ),
+                    'type' => '',
+                    'content' => 'Is the <strong>Truth</strong> plugin working well for you? Please consider giving <a href="https://wordpress.org/support/plugin/truth/reviews/?rate=5#new-post" target="_blank"><i class="dashicons dashicons-star-filled"></i> a review</a>, <a href="https://twitter.com/intent/tweet/?url=https%3A%2F%2Fwordpress.org%2Fplugins%2Ftruth%2F" target="_blank"><i class="dashicons dashicons-twitter"></i> a tweet</a> or <a href="https://typewheel.xyz/give/?ref=Truth" target="_blank"><i class="dashicons dashicons-heart"></i> a donation</a> to encourage further development. Thanks! <a href="https://twitter.com/uamv/">@uamv</a>',
+        // Notice to show on plugin activation
+        $activation_notice = array(
+        );
+        // Define the notices
+        $typewheel_notices = array(
+            $prefix . '-give' => array(
+                'trigger' => true,
+                'time' => time() + 2592000,
+                'dismiss' => array( 'month' ),
+                'type' => '',
+                'content' => 'Is the <strong>Truth</strong> plugin working well for you? Please consider giving <a href="https://wordpress.org/support/plugin/truth/reviews/?rate=5#new-post" target="_blank"><i class="dashicons dashicons-star-filled"></i> a review</a>, <a href="https://twitter.com/intent/tweet/?url=https%3A%2F%2Fwordpress.org%2Fplugins%2Ftruth%2F" target="_blank"><i class="dashicons dashicons-twitter"></i> a tweet</a> or <a href="https://typewheel.xyz/give/?ref=Truth" target="_blank"><i class="dashicons dashicons-heart"></i> a donation</a> to encourage further development. Thanks! <a href="https://twitter.com/uamv/">@uamv</a>',
                     'icon' => 'heart',
                     'style' => array( 'background-image' => 'linear-gradient( to bottom right, rgb(215, 215, 215), rgb(231, 211, 186) )', 'border-left-color' => '#3F3F3F' ),
+                    'style' => array( 'background-image' => 'linear-gradient( to left, rgb(215, 215, 215), rgb(220, 213, 206) )', 'border-left-color' => '#3F3F3F' ),
                     'location' => array( 'options-reading.php' ),
                     'capability' => 'manage_options',
 …
             new Typewheel_Notice( $prefix, $typewheel_notices, $activation_notice );
     } // end display_plugin_notices
+}
 /**
  * Deletes activation marker so it can be displayed when the plugin is reinstalled or reactivated
+ *
  * @since    1.0
  */
 function typewheel_truth_remove_activation_marker() {
     $prefix = str_replace( '-', '_', dirname( plugin_basename(__FILE__) ) );
     delete_option( $prefix . '_activated' );
+}
 register_deactivation_hook( dirname(__FILE__) . '/truth.php', 'typewheel_truth_remove_activation_marker' );
+        } // end display_plugin_notices
+    }
+    /**
+    * Deletes activation marker so it can be displayed when the plugin is reinstalled or reactivated
+    *
+    * @since    1.0
+    */
+    function typewheel_truth_remove_activation_marker() {
+        $prefix = str_replace( '-', '_', dirname( plugin_basename(__FILE__) ) );
+        delete_option( $prefix . '_activated' );
+    }
+    register_deactivation_hook( dirname(__FILE__) . '/truth.php', 'typewheel_truth_remove_activation_marker' );

truth/tags/2.3/class-truth-notice.php

-                      r1468222
+                      r2181143
 <?php
 /**
  * The public Truth class
  */
+* The public Truth class
+*/
 if ( ! class_exists( 'Truth_Notice' ) ) {
     /**
      * lets get started
      */
+    * lets get started
+    */
     class Truth_Notice {
         /**
          * Static property to hold our singleton instance
          * @var $instance
          */
+        * Static property to hold our singleton instance
+        * @var $instance
+        */
         public $notice = array();
         /**
          * this is our constructor.
          * there are many like it, but this one is mine
          */
+        * this is our constructor.
+        * there are many like it, but this one is mine
+        */
         public function __construct( $notice ) {
 …
         /**
          * AJAX action target that authorizes plugin
+         *
          * @since    0.0.1
          */
+        * AJAX action target that authorizes plugin
+        *
+        * @since    0.0.1
+        */
         public function authorize_truth() {
 …
                 $authorize = add_option( 'truth_authorization', true );
                     if ( $authorize ) {
+                if ( $authorize ) {
                         $args = array(
                             'notice'  => 'truth-authorization-success',
                             'class'   => 'updated fade',
                             'message' => '<p>Thank you! Visit <code><a href="' . admin_url( 'options-reading.php#truth-engine' ) . '" data-security="' . wp_create_nonce( 'authorized-truth' ) . '">Settings > Reading</a></code> to customize <strong>(and save)</strong> your plugin settings.</p>',
                             'echo'    => false
                         );
+                    $args = array(
+                        'notice'  => 'truth-authorization-success',
+                        'class'   => 'updated fade',
+                        'message' => '<p>Thank you! Visit <code><a href="' . admin_url( 'options-reading.php#truth-engine' ) . '" data-security="' . wp_create_nonce( 'authorized-truth' ) . '">Settings > Reading</a></code> to customize <strong>(and save)</strong> your plugin settings.</p>',
+                        'echo'    => false
+                    );
                         $success = new Truth_Notice( $args );
+                    $success = new Truth_Notice( $args );
                         $response['notice'] = $success->get();
                         $response['success'] = true;
+                    $response['notice'] = $success->get();
+                    $response['success'] = true;
                     } else {
+                } else {
                         $args = array(
                             'notice'  => 'truth-authorization-failure',
                             'class'   => 'error',
                             'message' => 'Failed to authorize the Truth plugin. Please try again.',
                             'echo'    => false
                         );
+                    $args = array(
+                        'notice'  => 'truth-authorization-failure',
+                        'class'   => 'error',
+                        'message' => 'Failed to authorize the Truth plugin. Please try again.',
+                        'echo'    => false
+                    );
                         $failure = new Truth_Notice( $args );
                         $response['notice'] = $failure->get();
                         $response['success'] = false;
+                    $failure = new Truth_Notice( $args );
+                    $response['notice'] = $failure->get();
+                    $response['success'] = false;
+                    }
+                }
             } else {
 …
+        }
+    }
+    }
+}

truth/tags/2.3/class-truth-public.php

-                      r1917073
+                      r2181143
 <?php
 /**
  * The public Truth class
  */
+* The public Truth class
+*/
 if ( ! class_exists( 'Truth_Public' ) ) {
     /**
      * lets get started
      */
+    * lets get started
+    */
     class Truth_Public {
         /**
          * Static property to hold our singleton instance
          * @var $instance
          */
+        * Static property to hold our singleton instance
+        * @var $instance
+        */
         static $instance = false;
         /**
          * Static property to hold our singleton instance
          * @var $instance
          */
         public $options = array();
         /**
          * Indexes all book names
          * @var $instance
          */
         public $index = array();
         /**
          * this is our constructor.
          * there are many like it, but this one is mine
          */
+        /**
+        * Static property to hold our singleton instance
+        * @var $instance
+        */
+        public $options = array();
+        /**
+        * Indexes all book names
+        * @var $instance
+        */
+        public $index = array();
+        /**
+        * this is our constructor.
+        * there are many like it, but this one is mine
+        */
         private function __construct() {
             $this->options = get_option( 'truth_settings' );
+            $this->options = get_option( 'truth_settings' );
             add_action( 'wp_head', array( $this, 'insert_scripts' ) );
             if ( get_option('truth_authorization') && ! $this->options['disable_auto_links'] && 'youversion' == $this->options['engine'] ) {
+            if ( get_option('truth_authorization') && ! $this->options['disable_auto_links'] && 'youversion' == $this->options['engine'] ) {
                 add_action( 'init', array( $this, 'create_index' ) );
                 add_filter( 'the_content', array( $this, 'search_content' ), 99, 2 );
                 add_filter( 'comment_text', array( $this, 'search_content' ), 99, 2 );
                 add_filter( 'widget_text', array( $this, 'search_content' ), 99, 2 );
+            }
+                add_filter( 'the_content', array( $this, 'search_content' ), 99, 2 );
+                add_filter( 'comment_text', array( $this, 'search_content' ), 99, 2 );
+                add_filter( 'widget_text', array( $this, 'search_content' ), 99, 2 );
+            }
             add_shortcode( 'truth', array( $this, 'shortcode' ) );
 …
         /**
          * If an instance exists, this returns it.  If not, it creates one and
          * returns it.
+         *
          * @return $instance
          */
+        * If an instance exists, this returns it.  If not, it creates one and
+        * returns it.
+        *
+        * @return $instance
+        */
         public static function get_instance() {
             if ( ! self::$instance ) {
 …
         /**
          * Register the JavaScript for the front-end.
+         *
          * @since    0.0.1
          */
         public function insert_scripts() {
+        * Register the JavaScript for the front-end.
+        *
+        * @since    0.0.1
+        */
+        public function insert_scripts() {
             if ( 'biblesorg_highlighter' == $this->options['engine'] ) {
 …
                 $targetIDs = explode( ',', $this->options['biblesorg_highlighter']['target_ids'] );
                  ?>
+                ?>
                 <script id="bw-highlighter-config" data-version="<?php echo $versionInfo['abbr']; ?>">
                 (function(w, d, s, e, id) {
                   w._bhparse = w._bhparse || [];
                   function l() {
                     if (d.getElementById(id)) return;
                     var n = d.createElement(s), x = d.getElementsByTagName(s)[0];
                     n.id = id; n.async = true; n.src = '//bibles.org/linker/js/client.js';
                     x.parentNode.insertBefore(n, x);
+                  }
                   (w.attachEvent) ? w.attachEvent('on' + e, l) : w.addEventListener(e, l, false);
                 })(window, document, 'script', 'load', 'bw-highlighter-src');
+                    (function(w, d, s, e, id) {
+                        w._bhparse = w._bhparse || [];
+                        function l() {
+                            if (d.getElementById(id)) return;
+                            var n = d.createElement(s), x = d.getElementsByTagName(s)[0];
+                            n.id = id; n.async = true; n.src = '//bibles.org/linker/js/client.js';
+                            x.parentNode.insertBefore(n, x);
+                        }
+                        (w.attachEvent) ? w.attachEvent('on' + e, l) : w.addEventListener(e, l, false);
+                    })(window, document, 'script', 'load', 'bw-highlighter-src');
                 </script>
                 <?php if ( isset( $this->options['biblesorg_highlighter']['target_ids'] ) && '' != $this->options['biblesorg_highlighter']['target_ids'] ) { ?>
                     <script>
                         _bhparse.push(
                             <?php foreach ($targetIDs as $targetID) {
                                 echo "'" . $targetID . "',";
                             } ?>
                         );
                     </script>
+                <script>
+                    _bhparse.push(
+                        <?php foreach ($targetIDs as $targetID) {
+                            echo "'" . $targetID . "',";
+                        } ?>
+                    );
+                </script>
                 <?php }
+            }
+        }
+        }
         public function shortcode( $atts, $content = '' ) {
 …
                 extract( shortcode_atts( array(
                         'version' => '',
                     ), $atts ) );
+                    'version' => '',
+                ), $atts ) );
                 $reference = $this->parse_verse( $content );
 …
                     switch ( $this->options['append_version'] ) {
                         case 'none':
                             break;
+                        break;
                         case 'abbr':
                             $content .= ', ' . strtoupper( $bibleVersion['abbr'] );
                             break;
+                        $content .= ', ' . strtoupper( $bibleVersion['abbr'] );
+                        break;
                         case 'full':
                             $content .= ', ' . $bibleVersion['name'];
                             break;
+                        $content .= ', ' . $bibleVersion['name'];
+                        break;
                         default:
                             break;
+                        break;
+                    }
                     $truth_target = $this->options['link_in_new_tab'] ? ' target="_blank"' : '';
 …
         /**
          * Searches content for matches to reference regex
          * @param  string $content The content to be searched
          * @return string          The content after links have been added
          */
         public function search_content( $content ) {
             $pattern = apply_filters( 'truth_regex_pattern', '/([0-3Ii]{0,3}|Song of|First|Second|Third|1st|2nd|3rd|Primero|Segundo|Tercero|Segunda|Tercera)[ ]{0,1}[\p{L}.]{1,20} \\d{1,3}(?!\\d):{0,1}[\\d,]*-{0,1}\\d{1,3}(?!\\d):{0,1}[\\d,]*/u' );
             preg_match_all( $pattern, $content, $matches, PREG_OFFSET_CAPTURE );
             $content = $this->insert_links( $content, $matches );
             return $content;
+        }
         public function insert_links( $content, $matches ) {
+        * Searches content for matches to reference regex
+        * @param  string $content The content to be searched
+        * @return string          The content after links have been added
+        */
+        public function search_content( $content ) {
+            $pattern = apply_filters( 'truth_regex_pattern', '/([0-3Ii]{0,3}|Song of|First|Second|Third|1st|2nd|3rd|Primero|Segundo|Tercero|Segunda|Tercera)[ ]{0,1}[\p{L}.]{1,20} \\d{1,3}(?!\\d):{0,1}[\\d,]*-{0,1}\\d{1,3}(?!\\d):{0,1}[\\d,]*/u' );
+            preg_match_all( $pattern, $content, $matches, PREG_OFFSET_CAPTURE );
+            $content = $this->insert_links( $content, $matches );
+            return $content;
+        }
+        public function insert_links( $content, $matches ) {
             // Loop through matches, beginning at last match and working forward in order to use position of match for replacement in string.
             for ( $i = count( $matches[0] ) - 1; $i >= 0 ; $i-- ) {
+            for ( $i = count( $matches[0] ) - 1; $i >= 0 ; $i-- ) {
                 // Grab the matched string and position of the match
                 $match = $matches[0][ $i ][0];
                 $idx = $matches[0][ $i ][1];
+                $match = $matches[0][ $i ][0];
+                $idx = $matches[0][ $i ][1];
                 // Parse the match into [0] bookNumber, [1] chapterNumber, [2] verseNumber, [3] endChapterNumber, [4] endVerseNumber
                 $reference = $this->parse_verse( $match );
                 $truth_url = $this->get_verse_url( $reference );
                 if ( $truth_url != '' ) {
                     substr( $match, 0, 1) == ' ' ? $idx++ : FALSE;  //Make sure the $idx isn't thrown off when it trims
                     $match = trim( $match );
                     $before = substr( $content, 0, $idx );
                     $after = substr( $content, $idx + strlen( $match ), strlen( $content ) - $idx - strlen( $match ) );
                     $closeAnchor = strpos( $after, '</a' );
                     $openAnchor = strpos( $after, '<a' );
                     // is the following needed?
                     $insertLink = FALSE;
                     if ( $closeAnchor === FALSE && $openAnchor === FALSE ) {
                         $insertLink = TRUE;
                     } elseif ( $closeAnchor !== FALSE && $openAnchor !== FALSE && $closeAnchor > $openAnchor ) {
                         $insertLink = TRUE;
+                    }
                     if ( $insertLink === TRUE ) {
                         $truth_target = $this->options['link_in_new_tab'] ? ' target="_blank"' : '';
                         $content = $before . '<a href="' . $truth_url . '" class="verseLink"' . $truth_target . '>' . $match . "</a>" . $after;
+                    }
+                }
+            }
             return $content;
+        }
+                $reference = $this->parse_verse( $match );
+                $truth_url = $this->get_verse_url( $reference );
+                if ( $truth_url != '' ) {
+                    substr( $match, 0, 1) == ' ' ? $idx++ : FALSE;  //Make sure the $idx isn't thrown off when it trims
+                    $match = trim( $match );
+                    $before = substr( $content, 0, $idx );
+                    $after = substr( $content, $idx + strlen( $match ), strlen( $content ) - $idx - strlen( $match ) );
+                    $closeAnchor = strpos( $after, '</a' );
+                    $openAnchor = strpos( $after, '<a' );
+                    // is the following needed?
+                    $insertLink = FALSE;
+                    if ( $closeAnchor === FALSE && $openAnchor === FALSE ) {
+                        $insertLink = TRUE;
+                    } elseif ( $closeAnchor !== FALSE && $openAnchor !== FALSE && $closeAnchor > $openAnchor ) {
+                        $insertLink = TRUE;
+                    }
+                    if ( $insertLink === TRUE ) {
+                        $truth_target = $this->options['link_in_new_tab'] ? ' target="_blank"' : '';
+                        $content = $before . '<a href="' . $truth_url . '" class="verseLink"' . $truth_target . '>' . $match . "</a>" . $after;
+                    }
+                }
+            }
+            return $content;
+        }
         public function get_bible_version( $bibleVersionID = '' ) {
 …
                 'è'=>'e', 'é'=>'e', 'ê'=>'e', 'ë'=>'e', 'ì'=>'i', 'í'=>'i', 'î'=>'i', 'ï'=>'i', 'ð'=>'o', 'ñ'=>'n', 'ò'=>'o', 'ó'=>'o', 'ô'=>'o', 'õ'=>'o',
                 'ö'=>'o', 'ø'=>'o', 'ù'=>'u', 'ú'=>'u', 'û'=>'u', 'ý'=>'y', 'ý'=>'y', 'þ'=>'b', 'ÿ'=>'y' );
             $bookPart = strtr( $bookPart, $replacement_array );
             $bookNumber = isset( $this->index[ $bookPart ] ) ? $this->index[ $bookPart ] : NULL;
             // Get Verses Part
             $versesPart = str_replace( $initialBookPart, '', $match );
             $versesPart = str_replace( ';', ',', $versesPart );
             $versesParts = explode( ',', $versesPart );
             $chapterNumber = (int) trim( substr( $firstSplit[0], $idx, strlen( $firstSplit[0] ) - $idx ) );
             $verseNumber = $endChapterNumber = $endVerseNumber = 0;
             $verseSplit = explode( '-', $firstSplit[1] );
             $verseNumber = $verseSplit[0];
             if ( count( $verseSplit ) > 1 ) {
                 $endSplit = explode( ':', $verseSplit[1] );
                 if (count( $endSplit ) == 1 ) {
                   $endVerseNumber = $endSplit[0];
                 } else {
                   $endChapterNumber = (int) $endSplit[0];
                   $endVerseNumber = (int) $endSplit[1];
+                }
+            }
             return array(
                 'bookNumber'       => $bookNumber,
                 'chapterNumber'    => $chapterNumber,
                 'verseNumber'      => $verseNumber,
                 'endChapterNumber' => $endChapterNumber,
                 'endVerseNumber'   => $endVerseNumber
             );
+        }
         public function create_index() {
             $books = array(
                 array(),
                 array('genesis','gen','ge','gn'),
                 array('exodus','exo','ex','exod','exodo'),
                 array('leviticus','lev','le','lv','levitico'),
                 array('numbers','num', 'nu', 'nm', 'nb'),
                 array('deuteronomy','deut','dt','deuteronomio'),
                 array('joshua','josh','jos','jsh','josue'),
                 array('judges','judg','jdg','jg','jdgs','jueces','jue','jc'),
                 array('ruth','rth','ru'),
                 array('1 samuel','1 sam','1 sa','1samuel','1s','i sa','1 sm','1sa','i sam','1sam','i samuel','1st samuel','first samuel'),
                 array('2 samuel','2 sam','2 sa','2s','ii sa','2 sm','2sa','ii sam','2sam','ii samuel','2samuel','2nd samuel','second samuel'),
                 array('1 kings','1 kgs','1 ki','1k','i kgs','1kgs','i ki','1ki','i kings','1kings','1st kgs','1st kings','first kings','first kgs','1kin','1 reyes','1 rey','1 re'),
                 array('2 kings','2 kgs','2 ki','2k','ii kgs','2kgs','ii ki','2ki','ii kings','2kings','2nd kgs','2nd kings','second kings','second kgs','2kin','2 reyes','2 rey','2 re'),
                 array('1 chronicles','1 chron','1 ch','i ch','1ch','1 chr','i chr','1chr','i chron','1chron','i chronicles','1chronicles','1st chronicles','first chronicles','1 cronicas','1 cro','1cr'),
                 array('2 chronicles','2 chron','2 ch','ii ch','2ch','ii chr','2chr','ii chron','2chron','ii chronicles','2chronicles','2nd chronicles','second chronicles','2 cronicas','2 cro','2cr'),
                 array('ezra','ezr','esdras','esd','es'),
                 array('nehemiah','neh','ne','nehemias'),
                 array('esther','esth','es','ester','est'),
                 array('job','jb'),
                 array('psalms','pslm','ps','psalm','psa','psm','pss','salmos','sal'),
                 array('proverbs','prov','pr','prv','pro','proverbios'),
                 array('ecclesiastes','eccles','ec','ecc','eclesiastes','ecl'),
                 array('song of solomon','song','so','song of songs','sos','son','cantar de los cantares','cant'),
                 array('isaiah','isa','is','isaias'),
                 array('jeremiah','jer','je','jr','jeremias'),
                 array('lamentations','lam','la','lamentaciones'),
                 array('ezekiel','ezek','eze','ezk','ezequiel','ezeq','ez'),
                 array('daniel','dan','da','dn'),
                 array('hosea','hos','ho','oseas','os'),
                 array('joel','joe','jl'),
                 array('amos','am'),
                 array('obadiah','obad','ob','abdias','abd'),
                 array('jonah','jnh','jon','jonas'),
                 array('micah','mic','miqueas','miq'),
                 array('nahum','nah','na','nahun'),
                 array('habakkuk','hab','habacuc'),
                 array('zephaniah','zeph','zep','zp','sofonias','sof'),
                 array('haggai','hag','hg','ageo','ag'),
                 array('zechariah','zech','zec','zc','zacarias','zac','za'),
                 array('malachi','mal','ml','malaquias'),
                 array('matthew','matt','mt','mat','mateo'),
                 array('mark','mrk','mk','mr','marcos','mc'),
                 array('luke','luk','lk','lucas','luc','lc'),
                 array('john','jn','jhn','juan'),
                 array('acts','ac','hechos de los apostoles','hech','hch'),
                 array('romans','rom','ro','rm','romanos'),
                 array('1 corinthians','1 cor','1 co','i co','1co','i cor','1cor','i corinthians','1corinthians','1st corinthians','first corinthians','1 corin','1 corintios'),
                 array('2 corinthians','2 cor','2 co','ii co','2co','ii cor','2cor','ii corinthians','2corinthians','2nd corinthians','second corinthians','2 corin','2 corintios'),
                 array('galatians','gal','ga','galatas'),
                 array('ephesians','ephes','eph','efesios','efes','ef'),
                 array('philippians','phil','php','filipenses','fil','flp'),
                 array('colossians','col','colosenses'),
                 array('1 thessalonians','1 thess','1 th','i th','1th','i thes','1thes','i thess','1thess','i thessalonians','1thessalonians','1st thessalonians','first thessalonians','1ts','1 tesalonicenses'),
                 array('2 thessalonians','2 thess','2 th','ii th','2th','ii thes','2thes','ii thess','2thess','ii thessalonians','2thessalonians','2nd thessalonians','second thessalonians','2ts','2 tesalonicenses'),
                 array('1 timothy','1 tim','1 ti','i ti','1ti','i tim','1tim','i timothy','1timothy','1st timothy','first timothy','1 timoteo'),
                 array('2 timothy','2 tim','2 ti','ii ti','2ti','ii tim','2tim','ii timothy','2timothy','2nd timothy','second timothy','2 timoteo'),
                 array('titus','tit','tito'),
                 array('philemon','philem','phm','filemon','filem','flm'),
                 array('hebrews','heb','hebreos'),
                 array('james','jas','jm','santiago','sant','stgo','st'),
                 array('1 peter','1 pet','1 pe','i pe','1pe','i pet','1pet','i pt','1 pt','1pt','i peter','1peter','1st peter','first peter','1 pedro'),
                 array('2 peter','2 pet','2 pe','ii pe','2pe','ii pet','2pet','ii pt','2 pt','2pt','ii peter','2peter','2nd peter','second peter','2 pedro'),
                 array('1 john','1 jn','i jn','1jn','i jo','1jo','i joh','1joh','i jhn','1 jhn','1jhn','i john','1john','1st john','first john','1 juan'),
                 array('2 john','2 jn','ii jn','2jn','ii jo','2jo','ii joh','2joh','ii jhn','2 jhn','2jhn','ii john','2john','2nd john','second john','2 juan'),
                 array('3 john','3 jn','iii jn','3jn','iii jo','3jo','iii joh','3joh','iii jhn','3 jhn','3jhn','iii john','3john','3rd john','third john','3 juan'),
                 array('jude','jud','judas','jds'),
                 array('revelation','rev','re','apocalipsis','apocalipsis (de juan)','apoc','ap'),
             );
             // Re-key array to start at 1
             unset( $books[0] );
             foreach ( $books as $key => $names ) {
                 foreach ( $names as $name ) {
                     $this->index[ $name ] = $key;
+                }
+            }
+        }
+    }
+}
+                $bookPart = strtr( $bookPart, $replacement_array );
+                $bookNumber = isset( $this->index[ $bookPart ] ) ? $this->index[ $bookPart ] : NULL;
+                // Get Verses Part
+                $versesPart = str_replace( $initialBookPart, '', $match );
+                $versesPart = str_replace( ';', ',', $versesPart );
+                $versesParts = explode( ',', $versesPart );
+                $chapterNumber = (int) trim( substr( $firstSplit[0], $idx, strlen( $firstSplit[0] ) - $idx ) );
+                $verseNumber = $endChapterNumber = $endVerseNumber = 0;
+                $verseSplit = explode( '-', $firstSplit[1] );
+                $verseNumber = $verseSplit[0];
+                if ( count( $verseSplit ) > 1 ) {
+                    $endSplit = explode( ':', $verseSplit[1] );
+                    if (count( $endSplit ) == 1 ) {
+                        $endVerseNumber = $endSplit[0];
+                    } else {
+                        $endChapterNumber = (int) $endSplit[0];
+                        $endVerseNumber = (int) $endSplit[1];
+                    }
+                }
+                return array(
+                    'bookNumber'       => $bookNumber,
+                    'chapterNumber'    => $chapterNumber,
+                    'verseNumber'      => $verseNumber,
+                    'endChapterNumber' => $endChapterNumber,
+                    'endVerseNumber'   => $endVerseNumber
+                );
+            }
+            public function create_index() {
+                $books = array(
+                    array(),
+                    array('genesis','gen','ge','gn'),
+                    array('exodus','exo','ex','exod','exodo'),
+                    array('leviticus','lev','le','lv','levitico'),
+                    array('numbers','num', 'nu', 'nm', 'nb'),
+                    array('deuteronomy','deut','dt','deuteronomio'),
+                    array('joshua','josh','jos','jsh','josue'),
+                    array('judges','judg','jdg','jg','jdgs','jueces','jue','jc'),
+                    array('ruth','rth','ru'),
+                    array('1 samuel','1 sam','1 sa','1samuel','1s','i sa','1 sm','1sa','i sam','1sam','i samuel','1st samuel','first samuel'),
+                    array('2 samuel','2 sam','2 sa','2s','ii sa','2 sm','2sa','ii sam','2sam','ii samuel','2samuel','2nd samuel','second samuel'),
+                    array('1 kings','1 kgs','1 ki','1k','i kgs','1kgs','i ki','1ki','i kings','1kings','1st kgs','1st kings','first kings','first kgs','1kin','1 reyes','1 rey','1 re'),
+                    array('2 kings','2 kgs','2 ki','2k','ii kgs','2kgs','ii ki','2ki','ii kings','2kings','2nd kgs','2nd kings','second kings','second kgs','2kin','2 reyes','2 rey','2 re'),
+                    array('1 chronicles','1 chron','1 ch','i ch','1ch','1 chr','i chr','1chr','i chron','1chron','i chronicles','1chronicles','1st chronicles','first chronicles','1 cronicas','1 cro','1cr'),
+                    array('2 chronicles','2 chron','2 ch','ii ch','2ch','ii chr','2chr','ii chron','2chron','ii chronicles','2chronicles','2nd chronicles','second chronicles','2 cronicas','2 cro','2cr'),
+                    array('ezra','ezr','esdras','esd','es'),
+                    array('nehemiah','neh','ne','nehemias'),
+                    array('esther','esth','es','ester','est'),
+                    array('job','jb'),
+                    array('psalms','pslm','ps','psalm','psa','psm','pss','salmos','sal'),
+                    array('proverbs','prov','pr','prv','pro','proverbios'),
+                    array('ecclesiastes','eccles','ec','ecc','eclesiastes','ecl'),
+                    array('song of solomon','song','so','song of songs','sos','son','cantar de los cantares','cant'),
+                    array('isaiah','isa','is','isaias'),
+                    array('jeremiah','jer','je','jr','jeremias'),
+                    array('lamentations','lam','la','lamentaciones'),
+                    array('ezekiel','ezek','eze','ezk','ezequiel','ezeq','ez'),
+                    array('daniel','dan','da','dn'),
+                    array('hosea','hos','ho','oseas','os'),
+                    array('joel','joe','jl'),
+                    array('amos','am'),
+                    array('obadiah','obad','ob','abdias','abd'),
+                    array('jonah','jnh','jon','jonas'),
+                    array('micah','mic','miqueas','miq'),
+                    array('nahum','nah','na','nahun'),
+                    array('habakkuk','hab','habacuc'),
+                    array('zephaniah','zeph','zep','zp','sofonias','sof'),
+                    array('haggai','hag','hg','ageo','ag'),
+                    array('zechariah','zech','zec','zc','zacarias','zac','za'),
+                    array('malachi','mal','ml','malaquias'),
+                    array('matthew','matt','mt','mat','mateo'),
+                    array('mark','mrk','mk','mr','marcos','mc'),
+                    array('luke','luk','lk','lucas','luc','lc'),
+                    array('john','jn','jhn','juan'),
+                    array('acts','ac','hechos de los apostoles','hech','hch'),
+                    array('romans','rom','ro','rm','romanos'),
+                    array('1 corinthians','1 cor','1 co','i co','1co','i cor','1cor','i corinthians','1corinthians','1st corinthians','first corinthians','1 corin','1 corintios'),
+                    array('2 corinthians','2 cor','2 co','ii co','2co','ii cor','2cor','ii corinthians','2corinthians','2nd corinthians','second corinthians','2 corin','2 corintios'),
+                    array('galatians','gal','ga','galatas'),
+                    array('ephesians','ephes','eph','efesios','efes','ef'),
+                    array('philippians','phil','php','filipenses','fil','flp'),
+                    array('colossians','col','colosenses'),
+                    array('1 thessalonians','1 thess','1 th','i th','1th','i thes','1thes','i thess','1thess','i thessalonians','1thessalonians','1st thessalonians','first thessalonians','1ts','1 tesalonicenses'),
+                    array('2 thessalonians','2 thess','2 th','ii th','2th','ii thes','2thes','ii thess','2thess','ii thessalonians','2thessalonians','2nd thessalonians','second thessalonians','2ts','2 tesalonicenses'),
+                    array('1 timothy','1 tim','1 ti','i ti','1ti','i tim','1tim','i timothy','1timothy','1st timothy','first timothy','1 timoteo'),
+                    array('2 timothy','2 tim','2 ti','ii ti','2ti','ii tim','2tim','ii timothy','2timothy','2nd timothy','second timothy','2 timoteo'),
+                    array('titus','tit','tito'),
+                    array('philemon','philem','phm','filemon','filem','flm'),
+                    array('hebrews','heb','hebreos'),
+                    array('james','jas','jm','santiago','sant','stgo','st'),
+                    array('1 peter','1 pet','1 pe','i pe','1pe','i pet','1pet','i pt','1 pt','1pt','i peter','1peter','1st peter','first peter','1 pedro'),
+                    array('2 peter','2 pet','2 pe','ii pe','2pe','ii pet','2pet','ii pt','2 pt','2pt','ii peter','2peter','2nd peter','second peter','2 pedro'),
+                    array('1 john','1 jn','i jn','1jn','i jo','1jo','i joh','1joh','i jhn','1 jhn','1jhn','i john','1john','1st john','first john','1 juan'),
+                    array('2 john','2 jn','ii jn','2jn','ii jo','2jo','ii joh','2joh','ii jhn','2 jhn','2jhn','ii john','2john','2nd john','second john','2 juan'),
+                    array('3 john','3 jn','iii jn','3jn','iii jo','3jo','iii joh','3joh','iii jhn','3 jhn','3jhn','iii john','3john','3rd john','third john','3 juan'),
+                    array('jude','jud','judas','jds'),
+                    array('revelation','rev','re','apocalipsis','apocalipsis (de juan)','apoc','ap'),
+                );
+                // Re-key array to start at 1
+                unset( $books[0] );
+                foreach ( $books as $key => $names ) {
+                    foreach ( $names as $name ) {
+                        $this->index[ $name ] = $key;
+                    }
+                }
+            }
+        }
+    }

truth/tags/2.3/class-truth.php

-                      r1468222
+                      r2181143
 <?php
 /**
  * The core Truth class
  */
+* The core Truth class
+*/
 if ( ! class_exists( 'Truth' ) ) {
     /**
      * lets get started
      */
+    * lets get started
+    */
     class Truth {
         /**
          * Static property to hold our singleton instance
          * @var $instance
          */
+        * Static property to hold our singleton instance
+        * @var $instance
+        */
         static $instance = false;
         /**
          * this is our constructor.
          * there are many like it, but this one is mine
          */
+        * this is our constructor.
+        * there are many like it, but this one is mine
+        */
         private function __construct() {
 …
         /**
          * If an instance exists, this returns it.  If not, it creates one and
          * returns it.
+         *
          * @return $instance
          */
+        * If an instance exists, this returns it.  If not, it creates one and
+        * returns it.
+        *
+        * @return $instance
+        */
         public static function get_instance() {
             if ( ! self::$instance ) {
 …
         /**
          * Return supported version for Truth plugin
          * @return [type] [description]
          */
+        * Return supported version for Truth plugin
+        * @return [type] [description]
+        */
         public function get_sources() {
 …
                             'DHH' => array( 'name' => 'Biblia Dios Habla Hoy (sin notas ni ayudas)', 'abbr' => 'DHH' ),
                             'RVR1960' => array( 'name' => 'Biblia Reina Valera 1960', 'abbr' => 'RVR1960' ),
                         ),
+                        ),
+                    )
                 ),
                 'youversion' => array(
                     'URLSingleVerse'  => 'http://bible.us/[id]/[book].[chapter].[verse].[version]',
                     'URLVerseRange'   => 'http://bible.us/[id]/[book].[chapter].[verse]-[endverse].[version]',
                     'URLSingleChapter'=> 'http://bible.us/[id]/[book].[chapter].[version]',
+                    'URLSingleVerse'  => 'https://my.bible.com/[id]/[book].[chapter].[verse]',
+                    'URLVerseRange'   => 'https://my.bible.com/[id]/[book].[chapter].[verse]-[endverse]',
+                    'URLSingleChapter'=> 'https://my.bible.com/[id]/[book].[chapter]',
                     'URLChapterRange' => '',
                     'bookFind'        => array( 'song_of_solomon', ' ' ),
 …
                             '314' => array( 'name' => 'Tree of Life Bible', 'abbr' => 'tlv', 'id' => '314' ),
                             '206' => array( 'name' => 'World English Bible', 'abbr' => 'web', 'id' => '206' ),
                             ),
+                        ),
                         'Español' => array(
                             '28' => array( 'name' => 'La Palabra', 'abbr' => 'blph', 'id' => '28'),
 …
+        }
+    }
+    }
+}

truth/tags/2.3/js/truth-admin.js

-                      r1468222
+                      r2181143
     /**
      * All of the code for your Dashboard-specific JavaScript source
      * should reside in this file.
+     *
      * Note that this assume you're going to use jQuery, so it prepares
      * the $ function reference to be used within the scope of this
      * function.
+     *
      * From here, you're able to define handlers for when the DOM is
      * ready:
+     *
      * $(function() {
+     *
      * });
+     *
      * Or when the window is loaded:
+     *
      * $( window ).load(function() {
+     *
      * });
+     *
      * ...and so on.
+     *
      * Remember that ideally, we should not attach any more than a single DOM-ready or window-load handler
      * for any particular page. Though other scripts in WordPress core, other plugins, and other themes may
      * be doing this, we should try to minimize doing that in our own work.
      */
+    * All of the code for your Dashboard-specific JavaScript source
+    * should reside in this file.
+    *
+    * Note that this assume you're going to use jQuery, so it prepares
+    * the $ function reference to be used within the scope of this
+    * function.
+    *
+    * From here, you're able to define handlers for when the DOM is
+    * ready:
+    *
+    * $(function() {
+        *
+        * });
+        *
+        * Or when the window is loaded:
+        *
+        * $( window ).load(function() {
+            *
+            * });
+            *
+            * ...and so on.
+            *
+            * Remember that ideally, we should not attach any more than a single DOM-ready or window-load handler
+            * for any particular page. Though other scripts in WordPress core, other plugins, and other themes may
+            * be doing this, we should try to minimize doing that in our own work.
+            */
     // Toggle internal lable for site URL input
     $( document ).ready( function() {
+            // Toggle internal lable for site URL input
+            $( document ).ready( function() {
         /* Send ajax after add site click */
         $( document ).on( 'click', '#authorize-truth', function(){
+                /* Send ajax after add site click */
+                $( document ).on( 'click', '#authorize-truth', function(){
             $.post( TRUTH.ajaxurl, {
+                    $.post( TRUTH.ajaxurl, {
                 action: 'authorize_truth',
                 truth_security: $(this).data('security'),
+                        action: 'authorize_truth',
+                        truth_security: $(this).data('security'),
             }, function (response) {
+                    }, function (response) {
                 if ( response.success ) {
+                        if ( response.success ) {
                     $('#truth-authorization').hide();
                     $('#truth-authorization').after(response.notice);
+                            $('#truth-authorization').hide();
+                            $('#truth-authorization').after(response.notice);
                 } else {
+                        } else {
                     $('#truth-authorization').after(response.notice);
                     $('#truth-authorization-failure').delay(4000).slideUp();
+                            $('#truth-authorization').after(response.notice);
+                            $('#truth-authorization-failure').delay(4000).slideUp();
+                }
+                        }
+                    });
+                });
+                // Modify UI on engine selection
+                $('#truth-engine').change(function() {
+                    // Show/hide engine descriptors
+                    $('span[id^="description-engine"]:not([id="description-engine-'+$(this).find(':selected').val()+'"])').hide();
+                    $('span[id="description-engine-'+$(this).find(':selected').val()+'"]').show();
+                    // Change UI of engine options
+                    $('fieldset[id^="truth-"][id$="-settings"]:not([id="truth-'+$(this).find(':selected').val()+'-settings"]):not([id="truth-general-settings"])').hide();
+                    $('fieldset[id="truth-'+$(this).find(':selected').val()+'-settings"]').show();
+                });
             });
+        });
+        // Modify UI on engine selection
+        $('#truth-engine').change(function() {
+            // Show/hide engine descriptors
+            $('span[id^="description-engine"]:not([id="description-engine-'+$(this).find(':selected').val()+'"])').hide();
+            $('span[id="description-engine-'+$(this).find(':selected').val()+'"]').show();
+            // Change UI of engine options
+            $('fieldset[id^="truth-"][id$="-settings"]:not([id="truth-'+$(this).find(':selected').val()+'-settings"]):not([id="truth-general-settings"])').hide();
+            $('fieldset[id="truth-'+$(this).find(':selected').val()+'-settings"]').show();
+        });
+    });
+})( jQuery );
+        })( jQuery );

truth/tags/2.3/readme.txt

-                      r1917073
+                      r2181143
 Tags: bible, scripture, truth, verse, version, youversion, passage, christian
 Requires at least: 3.1
 Tested up to: 4.9
 Stable tag: trunk
+Tested up to: 5.3
+Stable tag: 2.3
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 …
 == Changelog ==
+= 2.3 =
+* URL fix for YouVersion links
 = 2.2 =
 * Added Bible Highlighter option to target specific DOM ids for instances when reference is not identified.

truth/tags/2.3/truth.php

-                      r1917073
+                      r2181143
 Description: Generates YouVersion links for Biblical scripture references
 Author: Joshua Vandercar
 Version: 2.2
+Version: 2.3
 Requires WP: 3.6
 Author URI: http://vandercar.net
 …
 */
 define( 'TRUTH_VERSION', '2.2' );
+define( 'TRUTH_VERSION', '2.3' );
 define( 'TRUTH_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
 define( 'TRUTH_DIR', plugin_dir_path( __FILE__ ) );

truth/tags/2.3/typewheel-notice/class-typewheel-notice.php

-                      r1917073
+                      r2181143
 if ( ! class_exists( 'Typewheel_Notice' ) ) {
     /**
      * Typewheel Notice Class
+     *
      * Adds Typewheel notices to the WP admin
+     *
      * @package Typewheel Notice
      * @author  UaMV
      */
+    * Typewheel Notice Class
+    *
+    * Adds Typewheel notices to the WP admin
+    *
+    * @package Typewheel Notice
+    * @author  UaMV
+    */
     class Typewheel_Notice {
         /*---------------------------------------------------------------------------------*
          * Attributes
          *---------------------------------------------------------------------------------*/
         /**
          * Notices.
+         *
          * @since    1.0
+         *
          * @var      array
          */
+        * Attributes
+        *---------------------------------------------------------------------------------*/
+        /**
+        * Notices.
+        *
+        * @since    1.0
+        *
+        * @var      array
+        */
         public $notices;
         /**
          * User.
+         *
          * @since    1.0
+         *
          * @var      array
          */
+        * User.
+        *
+        * @since    1.0
+        *
+        * @var      array
+        */
         public $user;
         /**
          * Notices.
+         *
          * @since    1.0
+         *
          * @var      array
          */
+        * Notices.
+        *
+        * @since    1.0
+        *
+        * @var      array
+        */
         public $prefix;
         /*---------------------------------------------------------------------------------*
          * Constructor
          *---------------------------------------------------------------------------------*/
         /**
          * Initialize the plugin by setting localization, filters, and administration functions.
+         *
          * @since     1.0
          */
+        * Constructor
+        *---------------------------------------------------------------------------------*/
+        /**
+        * Initialize the plugin by setting localization, filters, and administration functions.
+        *
+        * @since     1.0
+        */
         public function __construct( $prefix, $notices = array(), $activation = array() ) {
 …
         /*---------------------------------------------------------------------------------*
          * Public Functions
          *---------------------------------------------------------------------------------*/
          /**
          * Check user and set/get notices
+         *
          * @since    1.0
          */
         public function process_user() {
             $current_user = wp_get_current_user();
+        * Public Functions
+        *---------------------------------------------------------------------------------*/
+        /**
+        * Check user and set/get notices
+        *
+        * @since    1.0
+        */
+        public function process_user() {
+            $current_user = wp_get_current_user();
             $this->user['ID'] = $current_user->ID;
             // Get the notice options from the user
             $this->user['notices'] = get_user_meta( $this->user['ID'], $this->prefix . '_typewheel_notices', true );
             // If not yet set, then set the usermeta as an array
+            // Get the notice options from the user
+            $this->user['notices'] = get_user_meta( $this->user['ID'], $this->prefix . '_typewheel_notices', true );
+            // If not yet set, then set the usermeta as an array
             if ( '' == $this->user['notices'] ) {
                 add_user_meta( $this->user['ID'], $this->prefix . '_typewheel_notices', array(), true );
 …
+            }
             // Create specific notices if they do not exist, otherwise set to current notice state
             foreach ( $this->notices as $notice => $args ) {
                 if ( ! isset( $this->user['notices'][ $notice ] ) ) {
                     $this->user['notices'][ $notice ] = array(
                         'trigger' => $args['trigger'],
                         'time'    => $args['time'],
                         );
+                }
+            }
             // Update the user meta
             update_user_meta( $this->user['ID'], $this->prefix . '_typewheel_notices', $this->user['notices'] );
+            // Create specific notices if they do not exist, otherwise set to current notice state
+            foreach ( $this->notices as $notice => $args ) {
+                if ( ! isset( $this->user['notices'][ $notice ] ) ) {
+                    $this->user['notices'][ $notice ] = array(
+                        'trigger' => $args['trigger'],
+                        'time'    => $args['time'],
+                    );
+                }
+            }
+            // Update the user meta
+            update_user_meta( $this->user['ID'], $this->prefix . '_typewheel_notices', $this->user['notices'] );
+        }
         /**
          * Displays active plugin notices.
+         *
          * @since    1.0
          */
+        * Displays active plugin notices.
+        *
+        * @since    1.0
+        */
         public function display() {
 …
                     // Assemble the notice
                     $html .= '<div id="' . $notice . '-typewheel-notice" class="notice notice-' . $args['type'] . ' typewheel-notice' . '" style="' . esc_attr( $this->styles( $args['style'] ) ) . '">';
                         $html .= '<p>';
                             $html .= $this->get_dismissals( $notice, $args['dismiss'] );
                             $html .= isset( $args['icon'] ) && '' != $args['icon'] ? '<i class="dashicons dashicons-' . $args['icon'] . ' featured-icon"></i>' : '';
                             $html .= apply_filters( $notice . '_typewheel_notice_content', $args['content'], $notice );
                         $html .= '</p>';
+                    $html .= '<p>';
+                    $html .= $this->get_dismissals( $notice, $args['dismiss'] );
+                    $html .= isset( $args['icon'] ) && '' != $args['icon'] ? '<i class="dashicons dashicons-' . $args['icon'] . ' featured-icon"></i>' : '';
+                    $html .= apply_filters( $notice . '_typewheel_notice_content', $args['content'], $notice );
+                    $html .= '</p>';
                     $html .= '</div>';
 …
         /**
          * Displays activation notice.
+         *
          * @since    1.0
          */
+        * Displays activation notice.
+        *
+        * @since    1.0
+        */
         public function display_activation() {
 …
                 // Assemble notice
                 $html = '<div id="activation-typewheel-notice" class="notice notice-info typewheel-notice' . '" style="' . esc_attr( $this->styles( $this->activation['style'] ) ) . '">';
                     $html .= '<p>';
                         $html .= isset( $this->activation['icon'] ) && '' != $this->activation['icon'] ? '<i class="dashicons dashicons-' . $this->activation['icon'] . ' featured-icon"></i>' : '';
                         $html .= apply_filters( 'activation_typewheel_notice_content', $this->activation['content'] );
                     $html .= '</p>';
+                $html .= '<p>';
+                $html .= isset( $this->activation['icon'] ) && '' != $this->activation['icon'] ? '<i class="dashicons dashicons-' . $this->activation['icon'] . ' featured-icon"></i>' : '';
+                $html .= apply_filters( 'activation_typewheel_notice_content', $this->activation['content'] );
+                $html .= '</p>';
                 $html .= '</div>';
 …
         /**
          * Assemble the styles from array or string
+         *
          * @since    1.0
          */
+        * Assemble the styles from array or string
+        *
+        * @since    1.0
+        */
         private function styles( $styles ) {
 …
         /**
          * Assemble and return any assigned dismissal notices
+         *
          * @since    1.0
          */
+        * Assemble and return any assigned dismissal notices
+        *
+        * @since    1.0
+        */
         public function get_dismissals( $notice, $dismiss ) {
 …
         switch ( $duration ) {
             case 'week':
                 $user[ $notice ]['time'] = time() + 604800;
                 break;
+            $user[ $notice ]['time'] = time() + 604800;
+            break;
             case 'month':
                 $user[ $notice ]['time'] = time() + 2592000;
                 break;
+            $user[ $notice ]['time'] = time() + 2592000;
+            break;
             case 'forever':
                 $user[ $notice ]['trigger'] = FALSE;
                 break;
             case 'undismiss':
+                case 'undismiss':
                 foreach ( $user as $name => $args ) {
                     $user[ $name ]['trigger'] = TRUE;
 …
+                }
                 break;
             default:
+                default:
                 break;
+            }
+            // Update the user meta
+            update_user_meta( $userid, $plugin . '_typewheel_notices', $user );
+            $response = array( 'success' => true, 'notice' => $notice, 'plugin' => $plugin );
+            wp_send_json( $response );
+        }
-        // Update the user meta
-        update_user_meta( $userid, $plugin . '_typewheel_notices', $user );
-        $response = array( 'success' => true, 'notice' => $notice, 'plugin' => $plugin );
-        wp_send_json( $response );
+    }
+}

truth/tags/2.3/typewheel-notice/typewheel-notice.js

-                      r1917073
+                      r2181143
 /**
  * Handles Typewheel Notice Dismissals
  */
  jQuery(document).ready(function($) {
+* Handles Typewheel Notice Dismissals
+*/
+jQuery(document).ready(function($) {
      $('span[id$="-typewheel-notice-dismissals"] i').click(
          function() {
              $.post(TypewheelNotice.ajaxurl, {
                  action: 'dismiss_notice',
                  typewheel_notice_duration: $(this).data('dismissal-duration'),
                  typewheel_notice: $(this).data('notice'),
                  typewheel_notice_plugin: $(this).data('plugin'),
                  typewheel_user: $(this).data('user'),
+   $('span[id$="-typewheel-notice-dismissals"] i').click(
+      function() {
+         $.post(TypewheelNotice.ajaxurl, {
+            action: 'dismiss_notice',
+            typewheel_notice_duration: $(this).data('dismissal-duration'),
+            typewheel_notice: $(this).data('notice'),
+            typewheel_notice_plugin: $(this).data('plugin'),
+            typewheel_user: $(this).data('user'),
              }, function (response) {
+         }, function (response) {
                  if ( response.success ) {
+            if ( response.success ) {
                      $('div#'+response.notice+'-typewheel-notice').slideUp();
+               $('div#'+response.notice+'-typewheel-notice').slideUp();
+                 }
+             }
      )});
+            }
+         }
+      )});
  });
+   });

truth/trunk/class-truth-admin.php

-                      r1917073
+                      r2181143
 <?php
 /**
  * The admin Truth class
  */
+* The admin Truth class
+*/
 if ( ! class_exists( 'Truth_Admin' ) ) {
     /**
      * lets get started
      */
+    * lets get started
+    */
     class Truth_Admin {
         /**
          * Static property to hold our singleton instance
          * @var $instance
          */
+        * Static property to hold our singleton instance
+        * @var $instance
+        */
         static $instance = false;
         /**
          * Static property to hold our singleton instance
          * @var $instance
          */
+        /**
+        * Static property to hold our singleton instance
+        * @var $instance
+        */
         public $options = array();
         /**
          * this is our constructor.
          * there are many like it, but this one is mine
          */
+        * this is our constructor.
+        * there are many like it, but this one is mine
+        */
         private function __construct() {
             $this->options = get_option( 'truth_settings' );
             register_activation_hook( TRUTH_FILE, array( $this, 'initialize_plugin' ) );
             require_once( TRUTH_DIR . 'class-truth-notice.php' );
             // Load the administrative Stylesheets and JavaScript
             add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_styles' ) );
+            $this->options = get_option( 'truth_settings' );
+            register_activation_hook( TRUTH_FILE, array( $this, 'initialize_plugin' ) );
+            require_once( TRUTH_DIR . 'class-truth-notice.php' );
+            // Load the administrative Stylesheets and JavaScript
+            add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_styles' ) );
             add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
             if ( TRUTH_AUTH_ALL ) {
                 update_option( 'truth_authorization', true );
             } else {
                 add_action( 'admin_init', array( $this, 'check_authorization' ) );
+            }
             add_action( 'admin_init', array( $this, 'register_settings' ) );
+        }
         /**
          * If an instance exists, this returns it.  If not, it creates one and
          * returns it.
+         *
          * @return $instance
          */
+            if ( TRUTH_AUTH_ALL ) {
+                update_option( 'truth_authorization', true );
+            } else {
+                add_action( 'admin_init', array( $this, 'check_authorization' ) );
+            }
+            add_action( 'admin_init', array( $this, 'register_settings' ) );
+        }
+        /**
+        * If an instance exists, this returns it.  If not, it creates one and
+        * returns it.
+        *
+        * @return $instance
+        */
         public static function get_instance() {
             if ( ! self::$instance ) {
 …
+        }
         /**
          * Register the stylesheets.
+         *
          * @since    0.0.1
          */
         public function enqueue_styles() {
             wp_enqueue_style( 'truth', plugin_dir_url( __FILE__ ) . 'css/truth-admin.css', array(), TRUTH_VERSION, 'all' );
+        }
         /**
          * Register the JavaScript for the dashboard.
+         *
          * @since    0.0.1
          */
         public function enqueue_scripts() {
             wp_enqueue_script( 'truth', plugin_dir_url( __FILE__ ) . 'js/truth-admin.js', array( 'jquery' ), TRUTH_VERSION, false );
             wp_localize_script( 'truth', 'TRUTH', array( 'ajaxurl' => admin_url( 'admin-ajax.php' ) ) );
+        }
         public function check_authorization() {
             if ( ! get_option( 'truth_authorization' ) ) {
                 $args = array(
                     'notice'  => 'truth-authorization',
                     'class'   => 'update-nag',
                     'message' => 'The <code>Truth</code> plugin needs authorization to link scripture references to an external site. Click <a href="#" id="authorize-truth" data-security="' . wp_create_nonce( 'authorize-truth' ) . '">here</a> to permit this action.',
                     'echo'    => true,
                 );
                 $notice = new Truth_Notice( $args );
                 $notice->show();
+            }
+        }
         public function register_settings() {
             register_setting( 'reading', 'truth_settings' );
             add_settings_field( 'truth_settings', 'Biblical References', array( $this, 'display_settings' ), 'reading', 'default' );
+        }
         public function display_settings() {
             $sources = Truth::get_sources();
+        /**
+        * Register the stylesheets.
+        *
+        * @since    0.0.1
+        */
+        public function enqueue_styles() {
+            wp_enqueue_style( 'truth', plugin_dir_url( __FILE__ ) . 'css/truth-admin.css', array(), TRUTH_VERSION, 'all' );
+        }
+        /**
+        * Register the JavaScript for the dashboard.
+        *
+        * @since    0.0.1
+        */
+        public function enqueue_scripts() {
+            wp_enqueue_script( 'truth', plugin_dir_url( __FILE__ ) . 'js/truth-admin.js', array( 'jquery' ), TRUTH_VERSION, false );
+            wp_localize_script( 'truth', 'TRUTH', array( 'ajaxurl' => admin_url( 'admin-ajax.php' ) ) );
+        }
+        public function check_authorization() {
+            if ( ! get_option( 'truth_authorization' ) ) {
+                $args = array(
+                    'notice'  => 'truth-authorization',
+                    'class'   => 'update-nag',
+                    'message' => 'The <code>Truth</code> plugin needs authorization to link scripture references to an external site. Click <a href="#" id="authorize-truth" data-security="' . wp_create_nonce( 'authorize-truth' ) . '">here</a> to permit this action.',
+                    'echo'    => true,
+                );
+                $notice = new Truth_Notice( $args );
+                $notice->show();
+            }
+        }
+        public function register_settings() {
+            register_setting( 'reading', 'truth_settings' );
+            add_settings_field( 'truth_settings', 'Biblical References', array( $this, 'display_settings' ), 'reading', 'default' );
+        }
+        public function display_settings() {
+            $sources = Truth::get_sources();
             foreach ( $sources as $source => $data ) {
 …
+            }
             ?>
             <fieldset id="truth-general-settings">
                 <label>Bible Service: <select id="truth-engine" name="truth_settings[engine]"></label>
                     <option value="biblesorg_highlighter" <?php selected( $this->options['engine'], 'biblesorg_highlighter' ); ?>>Bibles.org Highlighter</option>
                     <option value="youversion" <?php selected( $this->options['engine'], 'youversion' ); ?>>YouVersion</option>
                 </select></label>
                 <span id="description-engine-biblesorg_highlighter" class="description" <?php echo 'biblesorg_highlighter' == $this->options['engine'] ? '' : 'style="display:none;"'; ?>>(allows display of verses via modal when verses are clicked)</span>
                 <span id="description-engine-youversion" class="description" <?php echo 'youversion' == $this->options['engine'] ? '' : 'style="display:none;"'; ?>>(directs users to YouVersion.com upon click)</span>
                 </p>
             </fieldset>
             <fieldset id="truth-biblesorg_highlighter-settings" <?php echo ( ! isset( $this->options['engine'] ) || 'biblesorg_highlighter' == $this->options['engine'] ) ? '' : 'style="display:none;"'; ?>>
                 <h2>Bibles.org Highlighter Settings</h2>
                 <label>Version: <select id="bible-version" name="truth_settings[biblesorg_highlighter][bible_version]">
                     <?php foreach( $versions['biblesorg_highlighter'] as $languageGroup => $languageVersions ): ?>
                         <optgroup label="<?php echo $languageGroup?>">
                             <?php foreach( $languageVersions as $versionID => $versionInfo ): ?>
                                 <option value="<?php echo $versionID; ?>" <?php selected( $this->options['biblesorg_highlighter']['bible_version'], $versionID ); ?>><?php echo $versionInfo['name'] . ' (' . strtoupper( $versionInfo['abbr'] ). ')'; ?></option> <?php
                             endforeach; ?>
                         </optgroup>
                     <?php endforeach; ?>
                 </select></label><br />
                 <label>Overwrite Highlighter Targeting: <input name="truth_settings[biblesorg_highlighter][target_ids]" value="<?php echo ! isset( $this->options['biblesorg_highlighter']['target_ids'] ) ? '' : $this->options['biblesorg_highlighter']['target_ids']; ?>" style="width: 40%"></label><span id="description-biblesorg-target-ids" class="description">(comma-separated list of DOM element ids, overrides default search for verse references)
             </fieldset>
+            ?>
+            <fieldset id="truth-general-settings">
+                <label>Bible Service: <select id="truth-engine" name="truth_settings[engine]"></label>
+                    <option value="biblesorg_highlighter" <?php selected( $this->options['engine'], 'biblesorg_highlighter' ); ?>>Bibles.org Highlighter</option>
+                    <option value="youversion" <?php selected( $this->options['engine'], 'youversion' ); ?>>YouVersion</option>
+                </select></label>
+                <span id="description-engine-biblesorg_highlighter" class="description" <?php echo 'biblesorg_highlighter' == $this->options['engine'] ? '' : 'style="display:none;"'; ?>>(allows display of verses via modal when verses are clicked)</span>
+                <span id="description-engine-youversion" class="description" <?php echo 'youversion' == $this->options['engine'] ? '' : 'style="display:none;"'; ?>>(directs users to YouVersion.com upon click)</span>
+            </p>
+        </fieldset>
+        <fieldset id="truth-biblesorg_highlighter-settings" <?php echo ( ! isset( $this->options['engine'] ) || 'biblesorg_highlighter' == $this->options['engine'] ) ? '' : 'style="display:none;"'; ?>>
+            <h2>Bibles.org Highlighter Settings</h2>
+            <label>Version: <select id="bible-version" name="truth_settings[biblesorg_highlighter][bible_version]">
+                <?php foreach( $versions['biblesorg_highlighter'] as $languageGroup => $languageVersions ): ?>
+                    <optgroup label="<?php echo $languageGroup?>">
+                        <?php foreach( $languageVersions as $versionID => $versionInfo ): ?>
+                            <option value="<?php echo $versionID; ?>" <?php selected( $this->options['biblesorg_highlighter']['bible_version'], $versionID ); ?>><?php echo $versionInfo['name'] . ' (' . strtoupper( $versionInfo['abbr'] ). ')'; ?></option> <?php
+                        endforeach; ?>
+                    </optgroup>
+                <?php endforeach; ?>
+            </select></label><br />
+            <label>Overwrite Highlighter Targeting: <input name="truth_settings[biblesorg_highlighter][target_ids]" value="<?php echo ! isset( $this->options['biblesorg_highlighter']['target_ids'] ) ? '' : $this->options['biblesorg_highlighter']['target_ids']; ?>" style="width: 40%"></label><span id="description-biblesorg-target-ids" class="description">(comma-separated list of DOM element ids, overrides default search for verse references)
+            </fieldset>
             <fieldset id="truth-youversion-settings" <?php echo 'youversion' == $this->options['engine'] ? '' : 'style="display:none;"'; ?>>
 …
                 <p><input type="checkbox" id="link_in_new_tab" name="truth_settings[link_in_new_tab]" value="1" <?php checked( $this->options['link_in_new_tab'], 1 ); ?>> <label for="link_in_new_tab">Open links in new tab.</label></input></p>
                 <p><input type="checkbox" id="disable_auto_links" name="truth_settings[disable_auto_links]" value="1" <?php checked( $this->options['disable_auto_links'], 1 ); ?>> <label for="disable_auto_links">Disable auto-generation of links.</label></input> <span class="description">(maintains use of [truth] shortcode)</span></p>
                 <p><label> Append Version to Shortcode Text: <select id="append_version" name="truth_settings[append_version]">
                     <option value="none" <?php selected( $this->options['append_version'], 'none' ); ?>>No (Disabled)</option>
                     <option value="abbr" <?php selected( $this->options['append_version'], 'abbr' ); ?>>Abbreviation</option>
                     <option value="full" <?php selected( $this->options['append_version'], 'full' ); ?>>Full Name</option>
                 </select></label>
                 </p>
             </fieldset>
             <?php
+        }
+    }
+                <p><label> Append Version to Shortcode Text: <select id="append_version" name="truth_settings[append_version]">
+                    <option value="none" <?php selected( $this->options['append_version'], 'none' ); ?>>No (Disabled)</option>
+                    <option value="abbr" <?php selected( $this->options['append_version'], 'abbr' ); ?>>Abbreviation</option>
+                    <option value="full" <?php selected( $this->options['append_version'], 'full' ); ?>>Full Name</option>
+                </select></label>
+            </p>
+        </fieldset>
+        <?php
+    }
+}
+}
 …
     add_action( 'admin_notices', 'typewheel_truth_notices' );
     /**
      * Displays a plugin notices
+     *
      * @since    1.0
      */
+    * Displays a plugin notices
+    *
+    * @since    1.0
+    */
     function typewheel_truth_notices() {
         $prefix = str_replace( '-', '_', dirname( plugin_basename(__FILE__) ) );
+            // Notice to show on plugin activation
+            $activation_notice = array(
+            );
+            // Define the notices
+            $typewheel_notices = array(
+                // $prefix . '-tutorial' => array(
+                //  'trigger' => true,
+                //  'time' => time() - 5,
+                //  'dismiss' => array(),
+                //  'type' => '',
+                //  'content' => '<h2 style="margin:0;"><i class="dashicons dashicons-welcome-learn-more"></i> Glance That Tutorial</h2><br />Allow me to give you a brief run down on your <strong>Glance That</strong> options. You can hover over the <i class="dashicons dashicons-admin-settings"></i> settings icon at the top-right of <strong>At A Glance</strong> to reveal your controls. Clicking the <i class="dashicons dashicons-filter"></i> filter will allow you to add and remove items. You can also control <i class="dashicons dashicons-visibility"></i> visibility of available statuses for each item. Rearrange items by <i class="dashicons dashicons-move"></i> dragging them. Then, you can <i class="dashicons dashicons-migrate"></i> push your setup to other users. Let me know if you have any questions. Thanks! <a href="https://twitter.com/uamv/">@uamv</a>',
+                //  // 'icon' => 'heart',
+                //  'style' => array( 'background-image' => 'linear-gradient( to bottom right, rgb(215, 215, 215), rgb(231, 211, 186) )', 'border-left-color' => '#3F3F3F', 'max-width' => '700px', 'padding' => '.5em 2em' ),
+                //  'location' => array( 'index.php' ),
+                //  'capability' => GT_ADMIN_GLANCES,
+                // ),
+                // $prefix . '-review' => array(
+                //  'trigger' => true,
+                //  'time' => time() + 604800,
+                //  'dismiss' => array( 'month' ),
+                //  'type' => '',
+                //  'content' => 'How are you liking the <strong>Glance That</strong> plugin? Help spread the word by <a href="https://wordpress.org/support/plugin/glance-that/reviews/?rate=5#new-post" target="_blank"><i class="dashicons dashicons-star-filled"></i> giving a review</a> or <a href="https://twitter.com/intent/tweet/?url=https%3A%2F%2Fwordpress.org%2Fplugins%2Fglance-that%2F" target="_blank"><i class="dashicons dashicons-twitter"></i> tweeting your support</a>. Thanks! <a href="https://twitter.com/uamv/">@uamv</a>',
+                //  'icon' => 'share-alt',
+                //  'style' => array( 'background-image' => 'linear-gradient( to bottom right, rgb(215, 215, 215), rgb(231, 211, 186) )', 'border-left-color' => '#3F3F3F' ),
+                //  'location' => array( 'index.php' ),
+                //  'capability' => GT_ADMIN_GLANCES,
+                // ),
+                $prefix . '-give' => array(
+                    'trigger' => true,
+                    'time' => time() + 2592000,
+                    'dismiss' => array( 'month' ),
+                    'type' => '',
+                    'content' => 'Is the <strong>Truth</strong> plugin working well for you? Please consider giving <a href="https://wordpress.org/support/plugin/truth/reviews/?rate=5#new-post" target="_blank"><i class="dashicons dashicons-star-filled"></i> a review</a>, <a href="https://twitter.com/intent/tweet/?url=https%3A%2F%2Fwordpress.org%2Fplugins%2Ftruth%2F" target="_blank"><i class="dashicons dashicons-twitter"></i> a tweet</a> or <a href="https://typewheel.xyz/give/?ref=Truth" target="_blank"><i class="dashicons dashicons-heart"></i> a donation</a> to encourage further development. Thanks! <a href="https://twitter.com/uamv/">@uamv</a>',
+        // Notice to show on plugin activation
+        $activation_notice = array(
+        );
+        // Define the notices
+        $typewheel_notices = array(
+            $prefix . '-give' => array(
+                'trigger' => true,
+                'time' => time() + 2592000,
+                'dismiss' => array( 'month' ),
+                'type' => '',
+                'content' => 'Is the <strong>Truth</strong> plugin working well for you? Please consider giving <a href="https://wordpress.org/support/plugin/truth/reviews/?rate=5#new-post" target="_blank"><i class="dashicons dashicons-star-filled"></i> a review</a>, <a href="https://twitter.com/intent/tweet/?url=https%3A%2F%2Fwordpress.org%2Fplugins%2Ftruth%2F" target="_blank"><i class="dashicons dashicons-twitter"></i> a tweet</a> or <a href="https://typewheel.xyz/give/?ref=Truth" target="_blank"><i class="dashicons dashicons-heart"></i> a donation</a> to encourage further development. Thanks! <a href="https://twitter.com/uamv/">@uamv</a>',
                     'icon' => 'heart',
                     'style' => array( 'background-image' => 'linear-gradient( to bottom right, rgb(215, 215, 215), rgb(231, 211, 186) )', 'border-left-color' => '#3F3F3F' ),
+                    'style' => array( 'background-image' => 'linear-gradient( to left, rgb(215, 215, 215), rgb(220, 213, 206) )', 'border-left-color' => '#3F3F3F' ),
                     'location' => array( 'options-reading.php' ),
                     'capability' => 'manage_options',
 …
             new Typewheel_Notice( $prefix, $typewheel_notices, $activation_notice );
     } // end display_plugin_notices
+}
 /**
  * Deletes activation marker so it can be displayed when the plugin is reinstalled or reactivated
+ *
  * @since    1.0
  */
 function typewheel_truth_remove_activation_marker() {
     $prefix = str_replace( '-', '_', dirname( plugin_basename(__FILE__) ) );
     delete_option( $prefix . '_activated' );
+}
 register_deactivation_hook( dirname(__FILE__) . '/truth.php', 'typewheel_truth_remove_activation_marker' );
+        } // end display_plugin_notices
+    }
+    /**
+    * Deletes activation marker so it can be displayed when the plugin is reinstalled or reactivated
+    *
+    * @since    1.0
+    */
+    function typewheel_truth_remove_activation_marker() {
+        $prefix = str_replace( '-', '_', dirname( plugin_basename(__FILE__) ) );
+        delete_option( $prefix . '_activated' );
+    }
+    register_deactivation_hook( dirname(__FILE__) . '/truth.php', 'typewheel_truth_remove_activation_marker' );

truth/trunk/class-truth-notice.php

-                      r1468222
+                      r2181143
 <?php
 /**
  * The public Truth class
  */
+* The public Truth class
+*/
 if ( ! class_exists( 'Truth_Notice' ) ) {
     /**
      * lets get started
      */
+    * lets get started
+    */
     class Truth_Notice {
         /**
          * Static property to hold our singleton instance
          * @var $instance
          */
+        * Static property to hold our singleton instance
+        * @var $instance
+        */
         public $notice = array();
         /**
          * this is our constructor.
          * there are many like it, but this one is mine
          */
+        * this is our constructor.
+        * there are many like it, but this one is mine
+        */
         public function __construct( $notice ) {
 …
         /**
          * AJAX action target that authorizes plugin
+         *
          * @since    0.0.1
          */
+        * AJAX action target that authorizes plugin
+        *
+        * @since    0.0.1
+        */
         public function authorize_truth() {
 …
                 $authorize = add_option( 'truth_authorization', true );
                     if ( $authorize ) {
+                if ( $authorize ) {
                         $args = array(
                             'notice'  => 'truth-authorization-success',
                             'class'   => 'updated fade',
                             'message' => '<p>Thank you! Visit <code><a href="' . admin_url( 'options-reading.php#truth-engine' ) . '" data-security="' . wp_create_nonce( 'authorized-truth' ) . '">Settings > Reading</a></code> to customize <strong>(and save)</strong> your plugin settings.</p>',
                             'echo'    => false
                         );
+                    $args = array(
+                        'notice'  => 'truth-authorization-success',
+                        'class'   => 'updated fade',
+                        'message' => '<p>Thank you! Visit <code><a href="' . admin_url( 'options-reading.php#truth-engine' ) . '" data-security="' . wp_create_nonce( 'authorized-truth' ) . '">Settings > Reading</a></code> to customize <strong>(and save)</strong> your plugin settings.</p>',
+                        'echo'    => false
+                    );
                         $success = new Truth_Notice( $args );
+                    $success = new Truth_Notice( $args );
                         $response['notice'] = $success->get();
                         $response['success'] = true;
+                    $response['notice'] = $success->get();
+                    $response['success'] = true;
                     } else {
+                } else {
                         $args = array(
                             'notice'  => 'truth-authorization-failure',
                             'class'   => 'error',
                             'message' => 'Failed to authorize the Truth plugin. Please try again.',
                             'echo'    => false
                         );
+                    $args = array(
+                        'notice'  => 'truth-authorization-failure',
+                        'class'   => 'error',
+                        'message' => 'Failed to authorize the Truth plugin. Please try again.',
+                        'echo'    => false
+                    );
                         $failure = new Truth_Notice( $args );
                         $response['notice'] = $failure->get();
                         $response['success'] = false;
+                    $failure = new Truth_Notice( $args );
+                    $response['notice'] = $failure->get();
+                    $response['success'] = false;
+                    }
+                }
             } else {
 …
+        }
+    }
+    }
+}

truth/trunk/class-truth-public.php

-                      r1917073
+                      r2181143
 <?php
 /**
  * The public Truth class
  */
+* The public Truth class
+*/
 if ( ! class_exists( 'Truth_Public' ) ) {
     /**
      * lets get started
      */
+    * lets get started
+    */
     class Truth_Public {
         /**
          * Static property to hold our singleton instance
          * @var $instance
          */
+        * Static property to hold our singleton instance
+        * @var $instance
+        */
         static $instance = false;
         /**
          * Static property to hold our singleton instance
          * @var $instance
          */
         public $options = array();
         /**
          * Indexes all book names
          * @var $instance
          */
         public $index = array();
         /**
          * this is our constructor.
          * there are many like it, but this one is mine
          */
+        /**
+        * Static property to hold our singleton instance
+        * @var $instance
+        */
+        public $options = array();
+        /**
+        * Indexes all book names
+        * @var $instance
+        */
+        public $index = array();
+        /**
+        * this is our constructor.
+        * there are many like it, but this one is mine
+        */
         private function __construct() {
             $this->options = get_option( 'truth_settings' );
+            $this->options = get_option( 'truth_settings' );
             add_action( 'wp_head', array( $this, 'insert_scripts' ) );
             if ( get_option('truth_authorization') && ! $this->options['disable_auto_links'] && 'youversion' == $this->options['engine'] ) {
+            if ( get_option('truth_authorization') && ! $this->options['disable_auto_links'] && 'youversion' == $this->options['engine'] ) {
                 add_action( 'init', array( $this, 'create_index' ) );
                 add_filter( 'the_content', array( $this, 'search_content' ), 99, 2 );
                 add_filter( 'comment_text', array( $this, 'search_content' ), 99, 2 );
                 add_filter( 'widget_text', array( $this, 'search_content' ), 99, 2 );
+            }
+                add_filter( 'the_content', array( $this, 'search_content' ), 99, 2 );
+                add_filter( 'comment_text', array( $this, 'search_content' ), 99, 2 );
+                add_filter( 'widget_text', array( $this, 'search_content' ), 99, 2 );
+            }
             add_shortcode( 'truth', array( $this, 'shortcode' ) );
 …
         /**
          * If an instance exists, this returns it.  If not, it creates one and
          * returns it.
+         *
          * @return $instance
          */
+        * If an instance exists, this returns it.  If not, it creates one and
+        * returns it.
+        *
+        * @return $instance
+        */
         public static function get_instance() {
             if ( ! self::$instance ) {
 …
         /**
          * Register the JavaScript for the front-end.
+         *
          * @since    0.0.1
          */
         public function insert_scripts() {
+        * Register the JavaScript for the front-end.
+        *
+        * @since    0.0.1
+        */
+        public function insert_scripts() {
             if ( 'biblesorg_highlighter' == $this->options['engine'] ) {
 …
                 $targetIDs = explode( ',', $this->options['biblesorg_highlighter']['target_ids'] );
                  ?>
+                ?>
                 <script id="bw-highlighter-config" data-version="<?php echo $versionInfo['abbr']; ?>">
                 (function(w, d, s, e, id) {
                   w._bhparse = w._bhparse || [];
                   function l() {
                     if (d.getElementById(id)) return;
                     var n = d.createElement(s), x = d.getElementsByTagName(s)[0];
                     n.id = id; n.async = true; n.src = '//bibles.org/linker/js/client.js';
                     x.parentNode.insertBefore(n, x);
+                  }
                   (w.attachEvent) ? w.attachEvent('on' + e, l) : w.addEventListener(e, l, false);
                 })(window, document, 'script', 'load', 'bw-highlighter-src');
+                    (function(w, d, s, e, id) {
+                        w._bhparse = w._bhparse || [];
+                        function l() {
+                            if (d.getElementById(id)) return;
+                            var n = d.createElement(s), x = d.getElementsByTagName(s)[0];
+                            n.id = id; n.async = true; n.src = '//bibles.org/linker/js/client.js';
+                            x.parentNode.insertBefore(n, x);
+                        }
+                        (w.attachEvent) ? w.attachEvent('on' + e, l) : w.addEventListener(e, l, false);
+                    })(window, document, 'script', 'load', 'bw-highlighter-src');
                 </script>
                 <?php if ( isset( $this->options['biblesorg_highlighter']['target_ids'] ) && '' != $this->options['biblesorg_highlighter']['target_ids'] ) { ?>
                     <script>
                         _bhparse.push(
                             <?php foreach ($targetIDs as $targetID) {
                                 echo "'" . $targetID . "',";
                             } ?>
                         );
                     </script>
+                <script>
+                    _bhparse.push(
+                        <?php foreach ($targetIDs as $targetID) {
+                            echo "'" . $targetID . "',";
+                        } ?>
+                    );
+                </script>
                 <?php }
+            }
+        }
+        }
         public function shortcode( $atts, $content = '' ) {
 …
                 extract( shortcode_atts( array(
                         'version' => '',
                     ), $atts ) );
+                    'version' => '',
+                ), $atts ) );
                 $reference = $this->parse_verse( $content );
 …
                     switch ( $this->options['append_version'] ) {
                         case 'none':
                             break;
+                        break;
                         case 'abbr':
                             $content .= ', ' . strtoupper( $bibleVersion['abbr'] );
                             break;
+                        $content .= ', ' . strtoupper( $bibleVersion['abbr'] );
+                        break;
                         case 'full':
                             $content .= ', ' . $bibleVersion['name'];
                             break;
+                        $content .= ', ' . $bibleVersion['name'];
+                        break;
                         default:
                             break;
+                        break;
+                    }
                     $truth_target = $this->options['link_in_new_tab'] ? ' target="_blank"' : '';
 …
         /**
          * Searches content for matches to reference regex
          * @param  string $content The content to be searched
          * @return string          The content after links have been added
          */
         public function search_content( $content ) {
             $pattern = apply_filters( 'truth_regex_pattern', '/([0-3Ii]{0,3}|Song of|First|Second|Third|1st|2nd|3rd|Primero|Segundo|Tercero|Segunda|Tercera)[ ]{0,1}[\p{L}.]{1,20} \\d{1,3}(?!\\d):{0,1}[\\d,]*-{0,1}\\d{1,3}(?!\\d):{0,1}[\\d,]*/u' );
             preg_match_all( $pattern, $content, $matches, PREG_OFFSET_CAPTURE );
             $content = $this->insert_links( $content, $matches );
             return $content;
+        }
         public function insert_links( $content, $matches ) {
+        * Searches content for matches to reference regex
+        * @param  string $content The content to be searched
+        * @return string          The content after links have been added
+        */
+        public function search_content( $content ) {
+            $pattern = apply_filters( 'truth_regex_pattern', '/([0-3Ii]{0,3}|Song of|First|Second|Third|1st|2nd|3rd|Primero|Segundo|Tercero|Segunda|Tercera)[ ]{0,1}[\p{L}.]{1,20} \\d{1,3}(?!\\d):{0,1}[\\d,]*-{0,1}\\d{1,3}(?!\\d):{0,1}[\\d,]*/u' );
+            preg_match_all( $pattern, $content, $matches, PREG_OFFSET_CAPTURE );
+            $content = $this->insert_links( $content, $matches );
+            return $content;
+        }
+        public function insert_links( $content, $matches ) {
             // Loop through matches, beginning at last match and working forward in order to use position of match for replacement in string.
             for ( $i = count( $matches[0] ) - 1; $i >= 0 ; $i-- ) {
+            for ( $i = count( $matches[0] ) - 1; $i >= 0 ; $i-- ) {
                 // Grab the matched string and position of the match
                 $match = $matches[0][ $i ][0];
                 $idx = $matches[0][ $i ][1];
+                $match = $matches[0][ $i ][0];
+                $idx = $matches[0][ $i ][1];
                 // Parse the match into [0] bookNumber, [1] chapterNumber, [2] verseNumber, [3] endChapterNumber, [4] endVerseNumber
                 $reference = $this->parse_verse( $match );
                 $truth_url = $this->get_verse_url( $reference );
                 if ( $truth_url != '' ) {
                     substr( $match, 0, 1) == ' ' ? $idx++ : FALSE;  //Make sure the $idx isn't thrown off when it trims
                     $match = trim( $match );
                     $before = substr( $content, 0, $idx );
                     $after = substr( $content, $idx + strlen( $match ), strlen( $content ) - $idx - strlen( $match ) );
                     $closeAnchor = strpos( $after, '</a' );
                     $openAnchor = strpos( $after, '<a' );
                     // is the following needed?
                     $insertLink = FALSE;
                     if ( $closeAnchor === FALSE && $openAnchor === FALSE ) {
                         $insertLink = TRUE;
                     } elseif ( $closeAnchor !== FALSE && $openAnchor !== FALSE && $closeAnchor > $openAnchor ) {
                         $insertLink = TRUE;
+                    }
                     if ( $insertLink === TRUE ) {
                         $truth_target = $this->options['link_in_new_tab'] ? ' target="_blank"' : '';
                         $content = $before . '<a href="' . $truth_url . '" class="verseLink"' . $truth_target . '>' . $match . "</a>" . $after;
+                    }
+                }
+            }
             return $content;
+        }
+                $reference = $this->parse_verse( $match );
+                $truth_url = $this->get_verse_url( $reference );
+                if ( $truth_url != '' ) {
+                    substr( $match, 0, 1) == ' ' ? $idx++ : FALSE;  //Make sure the $idx isn't thrown off when it trims
+                    $match = trim( $match );
+                    $before = substr( $content, 0, $idx );
+                    $after = substr( $content, $idx + strlen( $match ), strlen( $content ) - $idx - strlen( $match ) );
+                    $closeAnchor = strpos( $after, '</a' );
+                    $openAnchor = strpos( $after, '<a' );
+                    // is the following needed?
+                    $insertLink = FALSE;
+                    if ( $closeAnchor === FALSE && $openAnchor === FALSE ) {
+                        $insertLink = TRUE;
+                    } elseif ( $closeAnchor !== FALSE && $openAnchor !== FALSE && $closeAnchor > $openAnchor ) {
+                        $insertLink = TRUE;
+                    }
+                    if ( $insertLink === TRUE ) {
+                        $truth_target = $this->options['link_in_new_tab'] ? ' target="_blank"' : '';
+                        $content = $before . '<a href="' . $truth_url . '" class="verseLink"' . $truth_target . '>' . $match . "</a>" . $after;
+                    }
+                }
+            }
+            return $content;
+        }
         public function get_bible_version( $bibleVersionID = '' ) {
 …
                 'è'=>'e', 'é'=>'e', 'ê'=>'e', 'ë'=>'e', 'ì'=>'i', 'í'=>'i', 'î'=>'i', 'ï'=>'i', 'ð'=>'o', 'ñ'=>'n', 'ò'=>'o', 'ó'=>'o', 'ô'=>'o', 'õ'=>'o',
                 'ö'=>'o', 'ø'=>'o', 'ù'=>'u', 'ú'=>'u', 'û'=>'u', 'ý'=>'y', 'ý'=>'y', 'þ'=>'b', 'ÿ'=>'y' );
             $bookPart = strtr( $bookPart, $replacement_array );
             $bookNumber = isset( $this->index[ $bookPart ] ) ? $this->index[ $bookPart ] : NULL;
             // Get Verses Part
             $versesPart = str_replace( $initialBookPart, '', $match );
             $versesPart = str_replace( ';', ',', $versesPart );
             $versesParts = explode( ',', $versesPart );
             $chapterNumber = (int) trim( substr( $firstSplit[0], $idx, strlen( $firstSplit[0] ) - $idx ) );
             $verseNumber = $endChapterNumber = $endVerseNumber = 0;
             $verseSplit = explode( '-', $firstSplit[1] );
             $verseNumber = $verseSplit[0];
             if ( count( $verseSplit ) > 1 ) {
                 $endSplit = explode( ':', $verseSplit[1] );
                 if (count( $endSplit ) == 1 ) {
                   $endVerseNumber = $endSplit[0];
                 } else {
                   $endChapterNumber = (int) $endSplit[0];
                   $endVerseNumber = (int) $endSplit[1];
+                }
+            }
             return array(
                 'bookNumber'       => $bookNumber,
                 'chapterNumber'    => $chapterNumber,
                 'verseNumber'      => $verseNumber,
                 'endChapterNumber' => $endChapterNumber,
                 'endVerseNumber'   => $endVerseNumber
             );
+        }
         public function create_index() {
             $books = array(
                 array(),
                 array('genesis','gen','ge','gn'),
                 array('exodus','exo','ex','exod','exodo'),
                 array('leviticus','lev','le','lv','levitico'),
                 array('numbers','num', 'nu', 'nm', 'nb'),
                 array('deuteronomy','deut','dt','deuteronomio'),
                 array('joshua','josh','jos','jsh','josue'),
                 array('judges','judg','jdg','jg','jdgs','jueces','jue','jc'),
                 array('ruth','rth','ru'),
                 array('1 samuel','1 sam','1 sa','1samuel','1s','i sa','1 sm','1sa','i sam','1sam','i samuel','1st samuel','first samuel'),
                 array('2 samuel','2 sam','2 sa','2s','ii sa','2 sm','2sa','ii sam','2sam','ii samuel','2samuel','2nd samuel','second samuel'),
                 array('1 kings','1 kgs','1 ki','1k','i kgs','1kgs','i ki','1ki','i kings','1kings','1st kgs','1st kings','first kings','first kgs','1kin','1 reyes','1 rey','1 re'),
                 array('2 kings','2 kgs','2 ki','2k','ii kgs','2kgs','ii ki','2ki','ii kings','2kings','2nd kgs','2nd kings','second kings','second kgs','2kin','2 reyes','2 rey','2 re'),
                 array('1 chronicles','1 chron','1 ch','i ch','1ch','1 chr','i chr','1chr','i chron','1chron','i chronicles','1chronicles','1st chronicles','first chronicles','1 cronicas','1 cro','1cr'),
                 array('2 chronicles','2 chron','2 ch','ii ch','2ch','ii chr','2chr','ii chron','2chron','ii chronicles','2chronicles','2nd chronicles','second chronicles','2 cronicas','2 cro','2cr'),
                 array('ezra','ezr','esdras','esd','es'),
                 array('nehemiah','neh','ne','nehemias'),
                 array('esther','esth','es','ester','est'),
                 array('job','jb'),
                 array('psalms','pslm','ps','psalm','psa','psm','pss','salmos','sal'),
                 array('proverbs','prov','pr','prv','pro','proverbios'),
                 array('ecclesiastes','eccles','ec','ecc','eclesiastes','ecl'),
                 array('song of solomon','song','so','song of songs','sos','son','cantar de los cantares','cant'),
                 array('isaiah','isa','is','isaias'),
                 array('jeremiah','jer','je','jr','jeremias'),
                 array('lamentations','lam','la','lamentaciones'),
                 array('ezekiel','ezek','eze','ezk','ezequiel','ezeq','ez'),
                 array('daniel','dan','da','dn'),
                 array('hosea','hos','ho','oseas','os'),
                 array('joel','joe','jl'),
                 array('amos','am'),
                 array('obadiah','obad','ob','abdias','abd'),
                 array('jonah','jnh','jon','jonas'),
                 array('micah','mic','miqueas','miq'),
                 array('nahum','nah','na','nahun'),
                 array('habakkuk','hab','habacuc'),
                 array('zephaniah','zeph','zep','zp','sofonias','sof'),
                 array('haggai','hag','hg','ageo','ag'),
                 array('zechariah','zech','zec','zc','zacarias','zac','za'),
                 array('malachi','mal','ml','malaquias'),
                 array('matthew','matt','mt','mat','mateo'),
                 array('mark','mrk','mk','mr','marcos','mc'),
                 array('luke','luk','lk','lucas','luc','lc'),
                 array('john','jn','jhn','juan'),
                 array('acts','ac','hechos de los apostoles','hech','hch'),
                 array('romans','rom','ro','rm','romanos'),
                 array('1 corinthians','1 cor','1 co','i co','1co','i cor','1cor','i corinthians','1corinthians','1st corinthians','first corinthians','1 corin','1 corintios'),
                 array('2 corinthians','2 cor','2 co','ii co','2co','ii cor','2cor','ii corinthians','2corinthians','2nd corinthians','second corinthians','2 corin','2 corintios'),
                 array('galatians','gal','ga','galatas'),
                 array('ephesians','ephes','eph','efesios','efes','ef'),
                 array('philippians','phil','php','filipenses','fil','flp'),
                 array('colossians','col','colosenses'),
                 array('1 thessalonians','1 thess','1 th','i th','1th','i thes','1thes','i thess','1thess','i thessalonians','1thessalonians','1st thessalonians','first thessalonians','1ts','1 tesalonicenses'),
                 array('2 thessalonians','2 thess','2 th','ii th','2th','ii thes','2thes','ii thess','2thess','ii thessalonians','2thessalonians','2nd thessalonians','second thessalonians','2ts','2 tesalonicenses'),
                 array('1 timothy','1 tim','1 ti','i ti','1ti','i tim','1tim','i timothy','1timothy','1st timothy','first timothy','1 timoteo'),
                 array('2 timothy','2 tim','2 ti','ii ti','2ti','ii tim','2tim','ii timothy','2timothy','2nd timothy','second timothy','2 timoteo'),
                 array('titus','tit','tito'),
                 array('philemon','philem','phm','filemon','filem','flm'),
                 array('hebrews','heb','hebreos'),
                 array('james','jas','jm','santiago','sant','stgo','st'),
                 array('1 peter','1 pet','1 pe','i pe','1pe','i pet','1pet','i pt','1 pt','1pt','i peter','1peter','1st peter','first peter','1 pedro'),
                 array('2 peter','2 pet','2 pe','ii pe','2pe','ii pet','2pet','ii pt','2 pt','2pt','ii peter','2peter','2nd peter','second peter','2 pedro'),
                 array('1 john','1 jn','i jn','1jn','i jo','1jo','i joh','1joh','i jhn','1 jhn','1jhn','i john','1john','1st john','first john','1 juan'),
                 array('2 john','2 jn','ii jn','2jn','ii jo','2jo','ii joh','2joh','ii jhn','2 jhn','2jhn','ii john','2john','2nd john','second john','2 juan'),
                 array('3 john','3 jn','iii jn','3jn','iii jo','3jo','iii joh','3joh','iii jhn','3 jhn','3jhn','iii john','3john','3rd john','third john','3 juan'),
                 array('jude','jud','judas','jds'),
                 array('revelation','rev','re','apocalipsis','apocalipsis (de juan)','apoc','ap'),
             );
             // Re-key array to start at 1
             unset( $books[0] );
             foreach ( $books as $key => $names ) {
                 foreach ( $names as $name ) {
                     $this->index[ $name ] = $key;
+                }
+            }
+        }
+    }
+}
+                $bookPart = strtr( $bookPart, $replacement_array );
+                $bookNumber = isset( $this->index[ $bookPart ] ) ? $this->index[ $bookPart ] : NULL;
+                // Get Verses Part
+                $versesPart = str_replace( $initialBookPart, '', $match );
+                $versesPart = str_replace( ';', ',', $versesPart );
+                $versesParts = explode( ',', $versesPart );
+                $chapterNumber = (int) trim( substr( $firstSplit[0], $idx, strlen( $firstSplit[0] ) - $idx ) );
+                $verseNumber = $endChapterNumber = $endVerseNumber = 0;
+                $verseSplit = explode( '-', $firstSplit[1] );
+                $verseNumber = $verseSplit[0];
+                if ( count( $verseSplit ) > 1 ) {
+                    $endSplit = explode( ':', $verseSplit[1] );
+                    if (count( $endSplit ) == 1 ) {
+                        $endVerseNumber = $endSplit[0];
+                    } else {
+                        $endChapterNumber = (int) $endSplit[0];
+                        $endVerseNumber = (int) $endSplit[1];
+                    }
+                }
+                return array(
+                    'bookNumber'       => $bookNumber,
+                    'chapterNumber'    => $chapterNumber,
+                    'verseNumber'      => $verseNumber,
+                    'endChapterNumber' => $endChapterNumber,
+                    'endVerseNumber'   => $endVerseNumber
+                );
+            }
+            public function create_index() {
+                $books = array(
+                    array(),
+                    array('genesis','gen','ge','gn'),
+                    array('exodus','exo','ex','exod','exodo'),
+                    array('leviticus','lev','le','lv','levitico'),
+                    array('numbers','num', 'nu', 'nm', 'nb'),
+                    array('deuteronomy','deut','dt','deuteronomio'),
+                    array('joshua','josh','jos','jsh','josue'),
+                    array('judges','judg','jdg','jg','jdgs','jueces','jue','jc'),
+                    array('ruth','rth','ru'),
+                    array('1 samuel','1 sam','1 sa','1samuel','1s','i sa','1 sm','1sa','i sam','1sam','i samuel','1st samuel','first samuel'),
+                    array('2 samuel','2 sam','2 sa','2s','ii sa','2 sm','2sa','ii sam','2sam','ii samuel','2samuel','2nd samuel','second samuel'),
+                    array('1 kings','1 kgs','1 ki','1k','i kgs','1kgs','i ki','1ki','i kings','1kings','1st kgs','1st kings','first kings','first kgs','1kin','1 reyes','1 rey','1 re'),
+                    array('2 kings','2 kgs','2 ki','2k','ii kgs','2kgs','ii ki','2ki','ii kings','2kings','2nd kgs','2nd kings','second kings','second kgs','2kin','2 reyes','2 rey','2 re'),
+                    array('1 chronicles','1 chron','1 ch','i ch','1ch','1 chr','i chr','1chr','i chron','1chron','i chronicles','1chronicles','1st chronicles','first chronicles','1 cronicas','1 cro','1cr'),
+                    array('2 chronicles','2 chron','2 ch','ii ch','2ch','ii chr','2chr','ii chron','2chron','ii chronicles','2chronicles','2nd chronicles','second chronicles','2 cronicas','2 cro','2cr'),
+                    array('ezra','ezr','esdras','esd','es'),
+                    array('nehemiah','neh','ne','nehemias'),
+                    array('esther','esth','es','ester','est'),
+                    array('job','jb'),
+                    array('psalms','pslm','ps','psalm','psa','psm','pss','salmos','sal'),
+                    array('proverbs','prov','pr','prv','pro','proverbios'),
+                    array('ecclesiastes','eccles','ec','ecc','eclesiastes','ecl'),
+                    array('song of solomon','song','so','song of songs','sos','son','cantar de los cantares','cant'),
+                    array('isaiah','isa','is','isaias'),
+                    array('jeremiah','jer','je','jr','jeremias'),
+                    array('lamentations','lam','la','lamentaciones'),
+                    array('ezekiel','ezek','eze','ezk','ezequiel','ezeq','ez'),
+                    array('daniel','dan','da','dn'),
+                    array('hosea','hos','ho','oseas','os'),
+                    array('joel','joe','jl'),
+                    array('amos','am'),
+                    array('obadiah','obad','ob','abdias','abd'),
+                    array('jonah','jnh','jon','jonas'),
+                    array('micah','mic','miqueas','miq'),
+                    array('nahum','nah','na','nahun'),
+                    array('habakkuk','hab','habacuc'),
+                    array('zephaniah','zeph','zep','zp','sofonias','sof'),
+                    array('haggai','hag','hg','ageo','ag'),
+                    array('zechariah','zech','zec','zc','zacarias','zac','za'),
+                    array('malachi','mal','ml','malaquias'),
+                    array('matthew','matt','mt','mat','mateo'),
+                    array('mark','mrk','mk','mr','marcos','mc'),
+                    array('luke','luk','lk','lucas','luc','lc'),
+                    array('john','jn','jhn','juan'),
+                    array('acts','ac','hechos de los apostoles','hech','hch'),
+                    array('romans','rom','ro','rm','romanos'),
+                    array('1 corinthians','1 cor','1 co','i co','1co','i cor','1cor','i corinthians','1corinthians','1st corinthians','first corinthians','1 corin','1 corintios'),
+                    array('2 corinthians','2 cor','2 co','ii co','2co','ii cor','2cor','ii corinthians','2corinthians','2nd corinthians','second corinthians','2 corin','2 corintios'),
+                    array('galatians','gal','ga','galatas'),
+                    array('ephesians','ephes','eph','efesios','efes','ef'),
+                    array('philippians','phil','php','filipenses','fil','flp'),
+                    array('colossians','col','colosenses'),
+                    array('1 thessalonians','1 thess','1 th','i th','1th','i thes','1thes','i thess','1thess','i thessalonians','1thessalonians','1st thessalonians','first thessalonians','1ts','1 tesalonicenses'),
+                    array('2 thessalonians','2 thess','2 th','ii th','2th','ii thes','2thes','ii thess','2thess','ii thessalonians','2thessalonians','2nd thessalonians','second thessalonians','2ts','2 tesalonicenses'),
+                    array('1 timothy','1 tim','1 ti','i ti','1ti','i tim','1tim','i timothy','1timothy','1st timothy','first timothy','1 timoteo'),
+                    array('2 timothy','2 tim','2 ti','ii ti','2ti','ii tim','2tim','ii timothy','2timothy','2nd timothy','second timothy','2 timoteo'),
+                    array('titus','tit','tito'),
+                    array('philemon','philem','phm','filemon','filem','flm'),
+                    array('hebrews','heb','hebreos'),
+                    array('james','jas','jm','santiago','sant','stgo','st'),
+                    array('1 peter','1 pet','1 pe','i pe','1pe','i pet','1pet','i pt','1 pt','1pt','i peter','1peter','1st peter','first peter','1 pedro'),
+                    array('2 peter','2 pet','2 pe','ii pe','2pe','ii pet','2pet','ii pt','2 pt','2pt','ii peter','2peter','2nd peter','second peter','2 pedro'),
+                    array('1 john','1 jn','i jn','1jn','i jo','1jo','i joh','1joh','i jhn','1 jhn','1jhn','i john','1john','1st john','first john','1 juan'),
+                    array('2 john','2 jn','ii jn','2jn','ii jo','2jo','ii joh','2joh','ii jhn','2 jhn','2jhn','ii john','2john','2nd john','second john','2 juan'),
+                    array('3 john','3 jn','iii jn','3jn','iii jo','3jo','iii joh','3joh','iii jhn','3 jhn','3jhn','iii john','3john','3rd john','third john','3 juan'),
+                    array('jude','jud','judas','jds'),
+                    array('revelation','rev','re','apocalipsis','apocalipsis (de juan)','apoc','ap'),
+                );
+                // Re-key array to start at 1
+                unset( $books[0] );
+                foreach ( $books as $key => $names ) {
+                    foreach ( $names as $name ) {
+                        $this->index[ $name ] = $key;
+                    }
+                }
+            }
+        }
+    }

truth/trunk/class-truth.php

-                      r1468222
+                      r2181143
 <?php
 /**
  * The core Truth class
  */
+* The core Truth class
+*/
 if ( ! class_exists( 'Truth' ) ) {
     /**
      * lets get started
      */
+    * lets get started
+    */
     class Truth {
         /**
          * Static property to hold our singleton instance
          * @var $instance
          */
+        * Static property to hold our singleton instance
+        * @var $instance
+        */
         static $instance = false;
         /**
          * this is our constructor.
          * there are many like it, but this one is mine
          */
+        * this is our constructor.
+        * there are many like it, but this one is mine
+        */
         private function __construct() {
 …
         /**
          * If an instance exists, this returns it.  If not, it creates one and
          * returns it.
+         *
          * @return $instance
          */
+        * If an instance exists, this returns it.  If not, it creates one and
+        * returns it.
+        *
+        * @return $instance
+        */
         public static function get_instance() {
             if ( ! self::$instance ) {
 …
         /**
          * Return supported version for Truth plugin
          * @return [type] [description]
          */
+        * Return supported version for Truth plugin
+        * @return [type] [description]
+        */
         public function get_sources() {
 …
                             'DHH' => array( 'name' => 'Biblia Dios Habla Hoy (sin notas ni ayudas)', 'abbr' => 'DHH' ),
                             'RVR1960' => array( 'name' => 'Biblia Reina Valera 1960', 'abbr' => 'RVR1960' ),
                         ),
+                        ),
+                    )
                 ),
                 'youversion' => array(
                     'URLSingleVerse'  => 'http://bible.us/[id]/[book].[chapter].[verse].[version]',
                     'URLVerseRange'   => 'http://bible.us/[id]/[book].[chapter].[verse]-[endverse].[version]',
                     'URLSingleChapter'=> 'http://bible.us/[id]/[book].[chapter].[version]',
+                    'URLSingleVerse'  => 'https://my.bible.com/[id]/[book].[chapter].[verse]',
+                    'URLVerseRange'   => 'https://my.bible.com/[id]/[book].[chapter].[verse]-[endverse]',
+                    'URLSingleChapter'=> 'https://my.bible.com/[id]/[book].[chapter]',
                     'URLChapterRange' => '',
                     'bookFind'        => array( 'song_of_solomon', ' ' ),
 …
                             '314' => array( 'name' => 'Tree of Life Bible', 'abbr' => 'tlv', 'id' => '314' ),
                             '206' => array( 'name' => 'World English Bible', 'abbr' => 'web', 'id' => '206' ),
                             ),
+                        ),
                         'Español' => array(
                             '28' => array( 'name' => 'La Palabra', 'abbr' => 'blph', 'id' => '28'),
 …
+        }
+    }
+    }
+}

truth/trunk/js/truth-admin.js

-                      r1468222
+                      r2181143
     /**
      * All of the code for your Dashboard-specific JavaScript source
      * should reside in this file.
+     *
      * Note that this assume you're going to use jQuery, so it prepares
      * the $ function reference to be used within the scope of this
      * function.
+     *
      * From here, you're able to define handlers for when the DOM is
      * ready:
+     *
      * $(function() {
+     *
      * });
+     *
      * Or when the window is loaded:
+     *
      * $( window ).load(function() {
+     *
      * });
+     *
      * ...and so on.
+     *
      * Remember that ideally, we should not attach any more than a single DOM-ready or window-load handler
      * for any particular page. Though other scripts in WordPress core, other plugins, and other themes may
      * be doing this, we should try to minimize doing that in our own work.
      */
+    * All of the code for your Dashboard-specific JavaScript source
+    * should reside in this file.
+    *
+    * Note that this assume you're going to use jQuery, so it prepares
+    * the $ function reference to be used within the scope of this
+    * function.
+    *
+    * From here, you're able to define handlers for when the DOM is
+    * ready:
+    *
+    * $(function() {
+        *
+        * });
+        *
+        * Or when the window is loaded:
+        *
+        * $( window ).load(function() {
+            *
+            * });
+            *
+            * ...and so on.
+            *
+            * Remember that ideally, we should not attach any more than a single DOM-ready or window-load handler
+            * for any particular page. Though other scripts in WordPress core, other plugins, and other themes may
+            * be doing this, we should try to minimize doing that in our own work.
+            */
     // Toggle internal lable for site URL input
     $( document ).ready( function() {
+            // Toggle internal lable for site URL input
+            $( document ).ready( function() {
         /* Send ajax after add site click */
         $( document ).on( 'click', '#authorize-truth', function(){
+                /* Send ajax after add site click */
+                $( document ).on( 'click', '#authorize-truth', function(){
             $.post( TRUTH.ajaxurl, {
+                    $.post( TRUTH.ajaxurl, {
                 action: 'authorize_truth',
                 truth_security: $(this).data('security'),
+                        action: 'authorize_truth',
+                        truth_security: $(this).data('security'),
             }, function (response) {
+                    }, function (response) {
                 if ( response.success ) {
+                        if ( response.success ) {
                     $('#truth-authorization').hide();
                     $('#truth-authorization').after(response.notice);
+                            $('#truth-authorization').hide();
+                            $('#truth-authorization').after(response.notice);
                 } else {
+                        } else {
                     $('#truth-authorization').after(response.notice);
                     $('#truth-authorization-failure').delay(4000).slideUp();
+                            $('#truth-authorization').after(response.notice);
+                            $('#truth-authorization-failure').delay(4000).slideUp();
+                }
+                        }
+                    });
+                });
+                // Modify UI on engine selection
+                $('#truth-engine').change(function() {
+                    // Show/hide engine descriptors
+                    $('span[id^="description-engine"]:not([id="description-engine-'+$(this).find(':selected').val()+'"])').hide();
+                    $('span[id="description-engine-'+$(this).find(':selected').val()+'"]').show();
+                    // Change UI of engine options
+                    $('fieldset[id^="truth-"][id$="-settings"]:not([id="truth-'+$(this).find(':selected').val()+'-settings"]):not([id="truth-general-settings"])').hide();
+                    $('fieldset[id="truth-'+$(this).find(':selected').val()+'-settings"]').show();
+                });
             });
+        });
+        // Modify UI on engine selection
+        $('#truth-engine').change(function() {
+            // Show/hide engine descriptors
+            $('span[id^="description-engine"]:not([id="description-engine-'+$(this).find(':selected').val()+'"])').hide();
+            $('span[id="description-engine-'+$(this).find(':selected').val()+'"]').show();
+            // Change UI of engine options
+            $('fieldset[id^="truth-"][id$="-settings"]:not([id="truth-'+$(this).find(':selected').val()+'-settings"]):not([id="truth-general-settings"])').hide();
+            $('fieldset[id="truth-'+$(this).find(':selected').val()+'-settings"]').show();
+        });
+    });
+})( jQuery );
+        })( jQuery );

truth/trunk/readme.txt

-                      r1917073
+                      r2181143
 Tags: bible, scripture, truth, verse, version, youversion, passage, christian
 Requires at least: 3.1
 Tested up to: 4.9
 Stable tag: trunk
+Tested up to: 5.3
+Stable tag: 2.3
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 …
 == Changelog ==
+= 2.3 =
+* URL fix for YouVersion links
 = 2.2 =
 * Added Bible Highlighter option to target specific DOM ids for instances when reference is not identified.

truth/trunk/truth.php

-                      r1917073
+                      r2181143
 Description: Generates YouVersion links for Biblical scripture references
 Author: Joshua Vandercar
 Version: 2.2
+Version: 2.3
 Requires WP: 3.6
 Author URI: http://vandercar.net
 …
 */
 define( 'TRUTH_VERSION', '2.2' );
+define( 'TRUTH_VERSION', '2.3' );
 define( 'TRUTH_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
 define( 'TRUTH_DIR', plugin_dir_path( __FILE__ ) );

truth/trunk/typewheel-notice/class-typewheel-notice.php

-                      r1917073
+                      r2181143
 if ( ! class_exists( 'Typewheel_Notice' ) ) {
     /**
      * Typewheel Notice Class
+     *
      * Adds Typewheel notices to the WP admin
+     *
      * @package Typewheel Notice
      * @author  UaMV
      */
+    * Typewheel Notice Class
+    *
+    * Adds Typewheel notices to the WP admin
+    *
+    * @package Typewheel Notice
+    * @author  UaMV
+    */
     class Typewheel_Notice {
         /*---------------------------------------------------------------------------------*
          * Attributes
          *---------------------------------------------------------------------------------*/
         /**
          * Notices.
+         *
          * @since    1.0
+         *
          * @var      array
          */
+        * Attributes
+        *---------------------------------------------------------------------------------*/
+        /**
+        * Notices.
+        *
+        * @since    1.0
+        *
+        * @var      array
+        */
         public $notices;
         /**
          * User.
+         *
          * @since    1.0
+         *
          * @var      array
          */
+        * User.
+        *
+        * @since    1.0
+        *
+        * @var      array
+        */
         public $user;
         /**
          * Notices.
+         *
          * @since    1.0
+         *
          * @var      array
          */
+        * Notices.
+        *
+        * @since    1.0
+        *
+        * @var      array
+        */
         public $prefix;
         /*---------------------------------------------------------------------------------*
          * Constructor
          *---------------------------------------------------------------------------------*/
         /**
          * Initialize the plugin by setting localization, filters, and administration functions.
+         *
          * @since     1.0
          */
+        * Constructor
+        *---------------------------------------------------------------------------------*/
+        /**
+        * Initialize the plugin by setting localization, filters, and administration functions.
+        *
+        * @since     1.0
+        */
         public function __construct( $prefix, $notices = array(), $activation = array() ) {
 …
         /*---------------------------------------------------------------------------------*
          * Public Functions
          *---------------------------------------------------------------------------------*/
          /**
          * Check user and set/get notices
+         *
          * @since    1.0
          */
         public function process_user() {
             $current_user = wp_get_current_user();
+        * Public Functions
+        *---------------------------------------------------------------------------------*/
+        /**
+        * Check user and set/get notices
+        *
+        * @since    1.0
+        */
+        public function process_user() {
+            $current_user = wp_get_current_user();
             $this->user['ID'] = $current_user->ID;
             // Get the notice options from the user
             $this->user['notices'] = get_user_meta( $this->user['ID'], $this->prefix . '_typewheel_notices', true );
             // If not yet set, then set the usermeta as an array
+            // Get the notice options from the user
+            $this->user['notices'] = get_user_meta( $this->user['ID'], $this->prefix . '_typewheel_notices', true );
+            // If not yet set, then set the usermeta as an array
             if ( '' == $this->user['notices'] ) {
                 add_user_meta( $this->user['ID'], $this->prefix . '_typewheel_notices', array(), true );
 …
+            }
             // Create specific notices if they do not exist, otherwise set to current notice state
             foreach ( $this->notices as $notice => $args ) {
                 if ( ! isset( $this->user['notices'][ $notice ] ) ) {
                     $this->user['notices'][ $notice ] = array(
                         'trigger' => $args['trigger'],
                         'time'    => $args['time'],
                         );
+                }
+            }
             // Update the user meta
             update_user_meta( $this->user['ID'], $this->prefix . '_typewheel_notices', $this->user['notices'] );
+            // Create specific notices if they do not exist, otherwise set to current notice state
+            foreach ( $this->notices as $notice => $args ) {
+                if ( ! isset( $this->user['notices'][ $notice ] ) ) {
+                    $this->user['notices'][ $notice ] = array(
+                        'trigger' => $args['trigger'],
+                        'time'    => $args['time'],
+                    );
+                }
+            }
+            // Update the user meta
+            update_user_meta( $this->user['ID'], $this->prefix . '_typewheel_notices', $this->user['notices'] );
+        }
         /**
          * Displays active plugin notices.
+         *
          * @since    1.0
          */
+        * Displays active plugin notices.
+        *
+        * @since    1.0
+        */
         public function display() {
 …
                     // Assemble the notice
                     $html .= '<div id="' . $notice . '-typewheel-notice" class="notice notice-' . $args['type'] . ' typewheel-notice' . '" style="' . esc_attr( $this->styles( $args['style'] ) ) . '">';
                         $html .= '<p>';
                             $html .= $this->get_dismissals( $notice, $args['dismiss'] );
                             $html .= isset( $args['icon'] ) && '' != $args['icon'] ? '<i class="dashicons dashicons-' . $args['icon'] . ' featured-icon"></i>' : '';
                             $html .= apply_filters( $notice . '_typewheel_notice_content', $args['content'], $notice );
                         $html .= '</p>';
+                    $html .= '<p>';
+                    $html .= $this->get_dismissals( $notice, $args['dismiss'] );
+                    $html .= isset( $args['icon'] ) && '' != $args['icon'] ? '<i class="dashicons dashicons-' . $args['icon'] . ' featured-icon"></i>' : '';
+                    $html .= apply_filters( $notice . '_typewheel_notice_content', $args['content'], $notice );
+                    $html .= '</p>';
                     $html .= '</div>';
 …
         /**
          * Displays activation notice.
+         *
          * @since    1.0
          */
+        * Displays activation notice.
+        *
+        * @since    1.0
+        */
         public function display_activation() {
 …
                 // Assemble notice
                 $html = '<div id="activation-typewheel-notice" class="notice notice-info typewheel-notice' . '" style="' . esc_attr( $this->styles( $this->activation['style'] ) ) . '">';
                     $html .= '<p>';
                         $html .= isset( $this->activation['icon'] ) && '' != $this->activation['icon'] ? '<i class="dashicons dashicons-' . $this->activation['icon'] . ' featured-icon"></i>' : '';
                         $html .= apply_filters( 'activation_typewheel_notice_content', $this->activation['content'] );
                     $html .= '</p>';
+                $html .= '<p>';
+                $html .= isset( $this->activation['icon'] ) && '' != $this->activation['icon'] ? '<i class="dashicons dashicons-' . $this->activation['icon'] . ' featured-icon"></i>' : '';
+                $html .= apply_filters( 'activation_typewheel_notice_content', $this->activation['content'] );
+                $html .= '</p>';
                 $html .= '</div>';
 …
         /**
          * Assemble the styles from array or string
+         *
          * @since    1.0
          */
+        * Assemble the styles from array or string
+        *
+        * @since    1.0
+        */
         private function styles( $styles ) {
 …
         /**
          * Assemble and return any assigned dismissal notices
+         *
          * @since    1.0
          */
+        * Assemble and return any assigned dismissal notices
+        *
+        * @since    1.0
+        */
         public function get_dismissals( $notice, $dismiss ) {
 …
         switch ( $duration ) {
             case 'week':
                 $user[ $notice ]['time'] = time() + 604800;
                 break;
+            $user[ $notice ]['time'] = time() + 604800;
+            break;
             case 'month':
                 $user[ $notice ]['time'] = time() + 2592000;
                 break;
+            $user[ $notice ]['time'] = time() + 2592000;
+            break;
             case 'forever':
                 $user[ $notice ]['trigger'] = FALSE;
                 break;
             case 'undismiss':
+                case 'undismiss':
                 foreach ( $user as $name => $args ) {
                     $user[ $name ]['trigger'] = TRUE;
 …
+                }
                 break;
             default:
+                default:
                 break;
+            }
+            // Update the user meta
+            update_user_meta( $userid, $plugin . '_typewheel_notices', $user );
+            $response = array( 'success' => true, 'notice' => $notice, 'plugin' => $plugin );
+            wp_send_json( $response );
+        }
-        // Update the user meta
-        update_user_meta( $userid, $plugin . '_typewheel_notices', $user );
-        $response = array( 'success' => true, 'notice' => $notice, 'plugin' => $plugin );
-        wp_send_json( $response );
+    }
+}

truth/trunk/typewheel-notice/typewheel-notice.js

-                      r1917073
+                      r2181143
 /**
  * Handles Typewheel Notice Dismissals
  */
  jQuery(document).ready(function($) {
+* Handles Typewheel Notice Dismissals
+*/
+jQuery(document).ready(function($) {
      $('span[id$="-typewheel-notice-dismissals"] i').click(
          function() {
              $.post(TypewheelNotice.ajaxurl, {
                  action: 'dismiss_notice',
                  typewheel_notice_duration: $(this).data('dismissal-duration'),
                  typewheel_notice: $(this).data('notice'),
                  typewheel_notice_plugin: $(this).data('plugin'),
                  typewheel_user: $(this).data('user'),
+   $('span[id$="-typewheel-notice-dismissals"] i').click(
+      function() {
+         $.post(TypewheelNotice.ajaxurl, {
+            action: 'dismiss_notice',
+            typewheel_notice_duration: $(this).data('dismissal-duration'),
+            typewheel_notice: $(this).data('notice'),
+            typewheel_notice_plugin: $(this).data('plugin'),
+            typewheel_user: $(this).data('user'),
              }, function (response) {
+         }, function (response) {
                  if ( response.success ) {
+            if ( response.success ) {
                      $('div#'+response.notice+'-typewheel-notice').slideUp();
+               $('div#'+response.notice+'-typewheel-notice').slideUp();
+                 }
+             }
      )});
+            }
+         }
+      )});
  });
+   });

Plugin Directory

Context Navigation

Legend:

truth/tags/2.3/class-truth-admin.php

truth/tags/2.3/class-truth-notice.php

truth/tags/2.3/class-truth-public.php

truth/tags/2.3/class-truth.php

truth/tags/2.3/js/truth-admin.js

truth/tags/2.3/readme.txt

truth/tags/2.3/truth.php

truth/tags/2.3/typewheel-notice/class-typewheel-notice.php

truth/tags/2.3/typewheel-notice/typewheel-notice.js

truth/trunk/class-truth-admin.php

truth/trunk/class-truth-notice.php

truth/trunk/class-truth-public.php

truth/trunk/class-truth.php

truth/trunk/js/truth-admin.js

truth/trunk/readme.txt

truth/trunk/truth.php

truth/trunk/typewheel-notice/class-typewheel-notice.php

truth/trunk/typewheel-notice/typewheel-notice.js

Download in other formats: