[Php-blog-plugin-cvs] additional_plugins/serendipity_event_aggregator ChangeLog, 1.10, 1.11 serendipity_event_aggregator.php, 1.88, 1.89

[Serendipity C. <s9...@us...>]

Update of /cvsroot/php-blog/additional_plugins/serendipity_event_aggregator
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30998/serendipity_event_aggregator

Modified Files:
	ChangeLog serendipity_event_aggregator.php 
Log Message:
gitclone.sh autocommit

Index: ChangeLog
===================================================================
RCS file: /cvsroot/php-blog/additional_plugins/serendipity_event_aggregator/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ChangeLog	8 Jun 2014 00:32:20 -0000	1.10
+++ ChangeLog	23 Sep 2016 20:35:31 -0000	1.11
@@ -1,3 +1,11 @@
+0.33:
+-----
+    * Added serendipity_request_url API method
+
+0.32:
+-----
+    * Compatibility check for Serendipity 2+
+
 0.31:
 -----
     * Adapted backend markup for 2.0 backend (yellowled)

Index: serendipity_event_aggregator.php
===================================================================
RCS file: /cvsroot/php-blog/additional_plugins/serendipity_event_aggregator/serendipity_event_aggregator.php,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- serendipity_event_aggregator.php	30 Nov 2014 02:12:25 -0000	1.88
+++ serendipity_event_aggregator.php	23 Sep 2016 20:35:31 -0000	1.89
@@ -72,7 +72,7 @@
             'php'         => '4.1.0'
         ));
 
-        $propbag->add('version',       '0.31.1');
+        $propbag->add('version',       '0.33');
         $propbag->add('author',       'Evan Nemerson, Garvin Hicking, Kristian Koehntopp, Thomas Schulz, Claus Schmidt');
         $propbag->add('stackable',     false);
         $propbag->add('event_hooks',   array(
@@ -664,7 +664,7 @@
             'last_update'       => time()
         );
 
-        if ($serendipity['version'][0] == '2') {
+        if ($serendipity['version'][0] > 1) {
             echo '<span class="msg_notice"><span class="icon-info-circled"></span> ';
         }
             echo PLUGIN_AGGREGATOR_DESC;
@@ -673,7 +673,7 @@
         } else {
             echo '</span>';
         }
-        if ($serendipity['version'][0] == '2') {
+        if ($serendipity['version'][0] > 1) {
             echo '<span class="msg_hint"><span class="icon-help-circled"></span> ';
         }
             echo PLUGIN_AGGREGATOR_FEEDLIST;
@@ -912,24 +912,30 @@
         global $serendipity;
 
         $file = $serendipity['POST']['aggregatorOPML'];
-        require_once (defined('S9Y_PEAR_PATH') ? S9Y_PEAR_PATH : S9Y_INCLUDE_PATH . 'bundled-libs/') . 'HTTP/Request.php';
-        if (function_exists('serendipity_request_start')) {
-            serendipity_request_start();
-        }
-        $req = new HTTP_Request($file);
 
-        if (PEAR::isError($req->sendRequest()) || $req->getResponseCode() != '200') {
-            $data = file_get_contents($file);
-            if (empty($data)) {
-                return false;
-            }
+        if (function_exists('serendipity_request_url')) {
+            $data = serendipity_request_url($file);
+            if (empty($data)) return false;
         } else {
-            // Fetch file
-            $data = $req->getResponseBody();
-        }
+            require_once (defined('S9Y_PEAR_PATH') ? S9Y_PEAR_PATH : S9Y_INCLUDE_PATH . 'bundled-libs/') . 'HTTP/Request.php';
+            if (function_exists('serendipity_request_start')) {
+                serendipity_request_start();
+            }
+            $req = new HTTP_Request($file);
 
-        if (function_exists('serendipity_request_end')) {
-            serendipity_request_end();
+            if (PEAR::isError($req->sendRequest()) || $req->getResponseCode() != '200') {
+                $data = file_get_contents($file);
+                if (empty($data)) {
+                    return false;
+                }
+            } else {
+                // Fetch file
+                $data = $req->getResponseBody();
+            }
+
+            if (function_exists('serendipity_request_end')) {
+                serendipity_request_end();
+            }
         }
 
         // XML functions
@@ -1136,16 +1142,22 @@
     function checkCharset(&$feed)
     {
         global $serendipity;
-        require_once (defined('S9Y_PEAR_PATH') ? S9Y_PEAR_PATH : S9Y_INCLUDE_PATH . 'bundled-libs/') . 'HTTP/Request.php';
-        $req = new HTTP_Request($feed['feedurl']);
-        if (PEAR::isError($req->sendRequest()) || $req->getResponseCode() != '200') {
-            $data = file_get_contents($feed['feedurl']);
-            if (empty($data)) {
-                return false;
-            }
+
+        if (function_exists('serendipity_request_url')) {
+            $data = serendipity_request_url($feed['feedurl']);
+            if (empty($data)) return false;
         } else {
-            # Fetch file
-            $data = $req->getResponseBody();
+            require_once (defined('S9Y_PEAR_PATH') ? S9Y_PEAR_PATH : S9Y_INCLUDE_PATH . 'bundled-libs/') . 'HTTP/Request.php';
+            $req = new HTTP_Request($feed['feedurl']);
+            if (PEAR::isError($req->sendRequest()) || $req->getResponseCode() != '200') {
+                $data = file_get_contents($feed['feedurl']);
+                if (empty($data)) {
+                    return false;
+                }
+            } else {
+                # Fetch file
+                $data = $req->getResponseBody();
+            }
         }
         #XML functions
         $xml_string = '<' . '?xml version="1.0" encoding="UTF-8"?' . '>';