Changeset 767

Timestamp:

12/21/06 11:58:05 (2 years ago)

Author:

sven

Message:

RSS: add SSL feed reading support. Had to modify Snoopy a bit, and Snoopy requires curl for SSL, and I made it ignore bad certificates.

Files:

• devel/config-dist.php (modified) (1 diff)
• devel/lib/setup.php (modified) (1 diff)
• devel/lib/snoopy/Snoopy.class.inc (modified) (8 diffs)
• devel/units/magpie/function_actions.php (modified) (2 diffs)
• devel/units/magpie/function_init.php (modified) (1 diff)

devel/config-dist.php

@@ -179 +179 @@
-// and provide the lms with the username for that user. 
-// This user needs write access to {$CFG->dataroot}lms/incoming/ as that is where the incoming files will end up.
+
+
+// For SSL feed *reading* support, Snoopy needs to know where the curl executable is.
+// To disable, or if curl is not available (e.g. on Windows), set to false
+//$CFG->curlpath = "/usr/bin/curl";
+$CFG->curlpath = false;
-
-

devel/lib/setup.php

@@ -64 +64 @@
-if (empty($CFG->disable_publiccomments)) {
-    $CFG->disable_publiccomments = false;
+}
+
+if (empty($CFG->curlpath)) {
+    $CFG->curlpath = false;
-}
-

devel/lib/snoopy/Snoopy.class.inc

@@ -43 +43 @@
-
-        var $host                       =       "www.php.net";          // host name we are connecting to
-80
+""
-        var $proxy_host         =       "";                                     // proxy host to use
-        var $proxy_port         =       "";                                     // proxy port to use
@@ -71 +71 @@
-        
-        // http accept types
-image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
-        
-        var $results            =       "";                                     // where the content is put
@@ -117 +117 @@
-        var $_isproxy           =       false;                          // set if using a proxy server
-        var $_fp_timeout        =       30;                                     // timeout for socket connection
+        
+        
+        // CHANGE FROM UPSTREAM - added constructor
+        function Snoopy () {
+                global $CFG;
+                $this->curl_path = $CFG->curlpath;
+        }
-
-/*======================================================================*\
@@ -145 +152 @@
-                        case "http":
-                                $this->host = $URI_PARTS["host"];
-
+ {
-                                        $this->port = $URI_PARTS["port"];
+                                } else { // CHANGE FROM UPSTREAM
+                                        $this->port = 80;
+                                }
-                                if($this->_connect($fp))
-                                {
@@ -209 +219 @@
-                                        return false;
-                                $this->host = $URI_PARTS["host"];
-
+ {
-                                        $this->port = $URI_PARTS["port"];
+                                } else { // CHANGE FROM UPSTREAM
+                                        $this->port = 443;
+                                }
-                                if($this->_isproxy)
-                                {
@@ -1000 +1013 @@
-                        $headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass);
-                        
+                $cmdline_params = '';
+                
-                for($curr_header = 0; $curr_header < count($headers); $curr_header++) {
-                        $safer_header = strtr( $headers[$curr_header], "\"", " " );
@@ -1011 +1026 @@
-                        $cmdline_params .= " -m ".$this->read_timeout;
-                
-
+
+
+
-
-                $safer_URI = strtr( $URI, "\"", " " ); // strip quotes from the URI to avoid shell access
@@ -1053 +1070 @@
-                        }
-                
-
+
+
+
+
+
-                                $this->response_code = $result_headers[$currentHeader];
+                        }
-
-                        $this->headers[] = $result_headers[$currentHeader];

devel/units/magpie/function_actions.php

@@ -74 +74 @@
-            $url = trim(optional_param('url'));
-            if (!empty($url)) {
-substr($url,0,7) != "http://"
+!preg_match('#https?://#', $url)
-                    $url = "http://" . $url;
-                }
@@ -93 +93 @@
-                    require_once($CFG->dirroot . 'lib/snoopy/Snoopy.class.inc');
-                    $client = new Snoopy();
-
+
+
+
-                        if (substr_count($client->results,"<channel") > 0 || substr_count($client->results,"<feed") > 0) {
-                            $feed = new StdClass;

devel/units/magpie/function_init.php

@@ -13 +13 @@
-define('rss','true');
-define('MAGPIE_DIR', $CFG->dirroot . "units/magpie/");
-utf
+UTF-
-define('MAGPIE_USER_AGENT', "Elgg's furrepticiouf feed fetcher");
-require_once(MAGPIE_DIR . 'rss_fetch.inc');