Changeset 2626359

Timestamp:

11/08/2021 10:29:27 PM (4 years ago)

Author:

elukacs

Message:

Tested on Wordpress 5.8

Location:

igefilter/trunk

Files:

• igefilter.php (modified) (5 diffs)
• readme.txt (modified) (2 diffs)
• readme_en.txt (modified) (2 diffs)

igefilter/trunk/igefilter.php

@@ -2 +2 @@
 /*
  * Plugin Name: Igefilter
- * Version: 1.0
+ * Version: 1.1
  * Plugin URI: http://dev.wp-plugins.org/wiki/igefilter
  * Description: Changes Bible references to hyperlinks.
@@ -35 +35 @@
 
 define('IGEFILTER_DEFAULT_BIBLE_TRANSLATION', '4');
-
-// you can pick any translation supported by the Bible Gateway, as well as the NRSV, the NET, and the ESV
-// should we add Blue Letter Bible and http://www.zhubert.com/greek as original language options somehow? ....
-// http://www.blueletterbible.org/cgi-bin/tools/printer-friendly.pl?book=Gen&chapter=1&version=heb
-// http://www.blueletterbible.org/cgi-bin/tools/printer-friendly.pl?book=Mat&chapter=1&version=grk
-// the interface on zhubert.com is weird - the NT books are numbered instead of named
-// we should also take a look at the New American Bible - http://www.nccbuscc.com/nab/bible/index.htm
 
 /**
@@ -266 +259 @@
     $verse_regex="\d{1,3}(?:[:,]\d{1,3})?(?:[-,]?\d+)*[-:\d]*"; // felismeri a kovetkezoket: Mt. 5:2, Jn 5,6, 1Kor. 1:12-2:11
 
-    $translation_regex = 'NIV|NASB|AMP|NLT|KJV|ESV|CEV|NET|NKJV|KJ21|ASV|WE|YLT|DARBY|WYC|NIV-UK|TNIV|MSG|NIRV';
-    // non Bible Gateway translations are all together at the end to make it easier to maintain the list
-    //$translation_regex = implode('|',array_keys($igefilter_translations)); // makes it look like 'NIV|KJV|ESV' etc
-
-    // note that this will be executed as PHP code after substitution thanks to the /e at the end!
-//    $passage_regex = '/(?:('.$volume_regex.')\s?)?('.$book_regex.')\s('.$verse_regex.')(?:\s?[,-]?\s?((?:'.$translation_regex.')|\s?\((?:'.$translation_regex.')\)))?/e';
-    $passage_regex = '/(?:('.$volume_regex.')\s?)?('.$book_regex.')\s('.$verse_regex.')(?:\s?[,-]?\s?((?:'.$translation_regex.')|\s?\((?:'.$translation_regex.')\)))?/e';
-
-    $replacement_regex = "igefilter_scripturizeLinkReference('\\0','\\1','\\2','\\3','\\4','$bible')";
-
-    $text = preg_replace( $passage_regex, $replacement_regex, $text );
+//    $translation_regex = 'NIV|NASB|AMP|NLT|KJV|ESV|CEV|NET|NKJV|KJ21|ASV|WE|YLT|DARBY|WYC|NIV-UK|TNIV|MSG|NIRV';
+//    $passage_regex = '/(?:('.$volume_regex.')\s?)?('.$book_regex.')\s('.$verse_regex.')(?:\s?[,-]?\s?((?:'.$translation_regex.')|\s?\((?:'.$translation_regex.')\)))?/';
+    $passage_regex = '/(?:('.$volume_regex.')\s?)?('.$book_regex.')\s('.$verse_regex.')(?:\s?[,-]?\s?((?:NIV|KJV)|\s?\((?:NIV|KJV)\)))?/';
+
+//    $replacement_regex = "igefilter_scripturizeLinkReference('\\0','\\1','\\2','\\3','\\4','$bible')";
+
+//    $text = preg_replace_callback( $passage_regex, $replacement_regex, $text );
+  $wrapper = new IgeFilterCallbackWrapper();
+  $wrapper->bible = $bible;
+  $text = preg_replace_callback($passage_regex,
+    array(
+      &$wrapper,
+      "igefilterCallback",
+    ),
+     $text);
 
     return $text; // TODO: make this an array, to return text, plus OT/NT (for original languages)
 }
 
-function igefilter_scripturizeLinkReference( $reference='', $volume='', $book='', $verse='', $translation='', $user_translation='' ) {
-    global $igefilter_options;
-//echo $reference .'|'. $book .'|' . $volume .'|'. $verse .'|'. $translation .'|';
+
+/**
+ * A simple class to wrap our callback function.
+ *
+ * We need this because we need to pass the Bible parameter in.
+ * The preg_replace callback is only passed the matched groups.
+ */
+class IgeFilterCallbackWrapper {
+
+  /**
+   * A function just to work on a Bible reference, and turn into a link.
+   *
+   * It is passed the details of the incoming Bible reference to, and also the
+   * original reference, so that the reference can be surrounded by an anchor
+   * linking to the relevant site which has the text for that verse. It then
+   * passes the transformed reference back out so that it can be replaced in the
+   * wider body of text from which it came.
+   * Two arguments for book; the first will be populated if no volume is given.
+   * The second will be populated if there's a volume number.
+   */
+//function scripturizeLinkReference($reference='',$volume='',$book='',$verse='',$translation='',$user_translation='') {
+
+  public function igefilterCallback($matches) {
+    $reference = $matches[0];
+    $book1 = $matches[2];
+    $volume = $matches[1];
+//    $book2 = $matches[3];
+    $verse = $matches[3];
+    $translation = isset($matches[5]) ? $matches[5] : NULL;
+    $user_translation = $this->bible;
+
+   global $igefilter_options;
+   //echo $reference .'|'. $book .'|' . $volume .'|'. $verse .'|'. $translation .'|';
 
    $link_target = ( $igefilter_options['link_target_blank'] ? ' target="_blank"' : '' );
 
+    $book = ($book1 == '') ? $book2 : $book1;
     if ($volume) {
        $volume = str_replace('IV','4',$volume);
@@ -305 +333 @@
         }
    }
-
    //if necessary, just choose part of the verse reference to pass to the web interfaces
    //they wouldn't know what to do with John 5:1-2, 5, 10-13 so I just give them John 5:1-2
@@ -337 +364 @@
     // $link = sprintf('<a href="%s/%s/%s/%s#v%s" class="reform" title="%s">%s</a>',$link,htmlentities(urlencode($book)),$chapter,$verses,$verses,$title,trim($reference));
     $link = sprintf('<a class="%s"%s href="%s/%s/%s#v%s" class="reform" title="%s">%s</a>',$igefilter_options['link_css_class'], $link_target,$link,htmlentities(urlencode($book)),$chapter,$verses,$title,trim($reference));
-    
-return $link;
+
+    return $link;
+}
 }
 

igefilter/trunk/readme.txt

@@ -4 +4 @@
 Tags: bible, biblia, scripture, szentiras, ige
 Requires at least: 3.1
-Tested up to: 5.1
-Stable tag: 1.0
+Tested up to: 5.8
+Stable tag: 1.1
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -68 +68 @@
 == Changelog ==
 
+= 1.1 =
+* Added compatibility with PHP 7.
+
 = 1.0 =
 * Original release.

igefilter/trunk/readme_en.txt

@@ -4 +4 @@
 Tags: bible, biblia, scripture, szentiras
 Requires at least: 3.1
-Tested up to: 5.1
-Stable tag: 1.0
+Tested up to: 5.8
+Stable tag: 1.1
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -74 +74 @@
 == Changelog ==
 
+= 1.1 =
+* Added compatibility with PHP 7.
+
 = 1.0 =
 * Original release.