Changeset 1076088

Timestamp:

01/26/2015 04:26:50 PM (11 years ago)

Author:

VanillaForums

Message:

Fix webroot parsing.

Location:

vanilla-forums/trunk

Files:

• functions.php (modified) (1 diff)
• plugin.php (modified) (2 diffs)

vanilla-forums/trunk/functions.php

@@ -179 +179 @@
 function vf_validate_url($url) {
   $html = vf_rest($url);
-  $wr_pos = strpos($html, 'WebRoot" value="');
-  if ($wr_pos > 0) {
-     $webroot = substr($html, $wr_pos + 16);
-     $webroot = substr($webroot, 0, strpos($webroot, '"'));
-     return $webroot;
-  } else {
-     return FALSE;
+  $formats = array(
+     '"WebRoot":"',     // 2.2
+     '\'WebRoot\' : "', // 2.0.18.13+ and 2.1.1+
+     'WebRoot" value="' // legacy
+  );
+
+  foreach ($formats as $format) {
+     if ($chars = strpos($html, $format)) {
+       $offset = $chars + strlen(stripslashes($format));
+        return vf_parse_webroot($html, $offset);
+    }
   }
+
+  return FALSE;
+}
+
+/**
+ * Parse URL at start of HTML.
+ *
+ * @param string $html
+ * @param int $start
+ * @return string URL.
+ */
+function vf_parse_webroot($html, $start) {
+  $webroot = substr($html, $start);
+  $webroot = substr($webroot, 0, strpos($webroot, '"'));
+  $webroot = stripslashes($webroot);
+  return $webroot;
 }
 

vanilla-forums/trunk/plugin.php

@@ -4 +4 @@
 Plugin URI: http://vanillaforums.org/addons/
 Description: Integrates Vanilla Forums with Wordpress: embedded blog comments, embedded forum, single sign on, and Wordpress widgets.
-Version: 1.1.14
+Version: 1.1.16
 Author: Todd Burry
 Author URI: http://www.vanillaforums.org/
@@ -60 +60 @@
 1.1.15
 - Added the full role names to the list of roles sent on sso.
+1.1.16
+- Fixed webroot parsing in url vaidation function
 
 Copyright 2010 Vanilla Forums Inc