Changeset 1426867

Timestamp:

05/30/2016 01:57:41 PM (10 years ago)

Author:

VanillaForums

Message:

Webroot and URL construction bugfixes

Location:

vanilla-forums/trunk

Files:

• admin.php (modified) (1 diff)
• embed.php (modified) (1 diff)
• functions.php (modified) (1 diff)
• plugin.php (modified) (4 diffs)
• readme.txt (modified) (5 diffs)
• widgets.php (modified) (4 diffs)

vanilla-forums/trunk/admin.php

@@ -115 +115 @@
           url: '<?php echo site_url('wp-admin/admin.php?page=vf-admin-handle&vanillavalidate='); ?>'+validateUrl,
           success: function(data) {
-             if (data.indexOf('http://') == 0) {
+             if (data.indexOf('http://') == 0 || data.indexOf('https://') == 0) {
                 $('input.InputBox').val(data);
                 $('.Validated').show();

vanilla-forums/trunk/embed.php

@@ -133 +133 @@
   
   $resturl = vf_get_value('url', $options, '');
-  $resturl = vf_combine_paths(array($resturl, '?p=categories/all.json'), '/');
+  $resturl = vf_combine_paths(array($resturl, '/categories/all.json'), '/');
   $categoryid = vf_get_value('embed-categoryid', $options, '0');
   $matchCategories = vf_get_value('embed-matchcategories', $options, '0');

vanilla-forums/trunk/functions.php

@@ -180 +180 @@
   $html = vf_rest($url);
   $formats = array(
+     '"WebRoot": "',     // 2.2 // BUGFIX 
      '"WebRoot":"',     // 2.2
      '\'WebRoot\' : "', // 2.0.18.13+ and 2.1.1+

vanilla-forums/trunk/plugin.php

@@ -3 +3 @@
 Plugin Name: Vanilla Forums
 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.16
+Description: Integrates Vanilla Forums with WordPress: embedded blog comments, embedded forum, single sign on, and WordPress widgets.
+Version: 1.1.17
 Author: Todd Burry
 Author URI: http://www.vanillaforums.org/
@@ -39 +39 @@
 - Fixed a bug that caused the forum url input to fill with garbage when the input is blank or an incorrect url is used.
 1.1.5
-- Added fix so that the forum's domain is on the trusted domain whitelist in wordpress and redirects will function properly between wordpress and vanilla.
+- Added fix so that the forum's domain is on the trusted domain whitelist in WordPress and redirects will function properly between wordpress and vanilla.
 1.1.6
 - Incorrect version saved before push.
@@ -51 +51 @@
 - Fixed sso admin page.
 1.1.11
-- Added the ability to match categories with Wordpress.
+- Added the ability to match categories with WordPress.
 1.1.12
 - Fixed typo where {Redirect} should have been {Target}.
@@ -61 +61 @@
 - Added the full role names to the list of roles sent on sso.
 1.1.16
-- Fixed webroot parsing in url vaidation function
+- Fixed webroot parsing in url validation function.
+1.1.17
+- Added link to video and version.
+- Fixed webroot parsing.
+- Fixed Vanilla URL endpoints to not use 'p' parameter.
 
-Copyright 2010 Vanilla Forums Inc
+Copyright 2010-2016 Vanilla Forums Inc
 This file is part of the Vanilla Forums plugin for WordPress.
 The Vanilla Forums plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.

vanilla-forums/trunk/readme.txt

@@ -3 +3 @@
 Tags: forum, forums, community, vanilla, vanilla forums, single sign-on, sso, widgets, widget, embed, embedded forum
 Requires at least: 3
-Tested up to: 3.3.1
-Stable tag: 1.1.12
+Tested up to: 4.2.2
+Stable tag: 1.1.17
 
 == Description ==
@@ -38 +38 @@
 3. Configure the plugin in the WordPress Settings > Vanilla Forum menu
 
+See our handy installation video <a href="https://www.youtube.com/playlist?list=PLEdMTbLR4h8zZ_odA15w4dJg6mcWMDOiC">here</a>
+
 == Frequently Asked Questions ==
 
@@ -56 +58 @@
 = Q. How do Vanilla Comments work? =
 
-Embedding Vanilla Comments into your blog will insert a comment window at the bottom of each article. If the reader is not signed in, they will be prompted to do so using the Vanilla login form as you've configured it (SSO, Facebook, Google, Twitter, and OpenID options available). The comments are displayed below the article and simultaneously a new discussion thread is created in the forum.
+Embedding Vanilla Comments into your blog will insert a comment window at the bottom of each article. If the reader is not signed in, they will be prompted to do so using the Vanilla login form as you've configured it (SSO, Facebook, Google, Twitter, and OpenID options available). The comments are displayed below the article and simultaneously a new discussion thread is created in the forum. Hosted customer also have the option of Disqus sign-in integration.
 
 = Q. What about my existing comments? =
@@ -70 +72 @@
 We don’t have all the features that stand alone commenting systems have but we are working on many that we see as important such as pre-moderation, integration into blogging software dashboards and automated imports of legacy comments.   
 
+= Q. Can I see use this with Vanilla Forums self-hosted? =
+Yes, you can use this with your self-hosted Vanilla Forums install.
+
 = Q. Can I see some examples of Vanilla Comment implementations? =
 
@@ -76 +81 @@
 * http://unknownworlds.com/
 * http://battlebears.com/
+* https://blog.vanillaforums.com/

vanilla-forums/trunk/widgets.php

@@ -48 +48 @@
         $url = vf_get_value('url', $options, '');
         $link_url = vf_get_link_url($options);
-        $resturl = array($url, '?p=discussions.json');
+        $resturl = array($url, '/discussions.json');
         if ($categoryid > 0)
-            $resturl = array($url, '?p=categories/'.$categoryid.'.json');
+            $resturl = array($url, '/categories/'.$categoryid.'.json');
             
 //      $DataName = $categoryid > 0 ? 'DiscussionData' : 'Discussions';
@@ -111 +111 @@
         // Retrieve & build the category dropdown
         $resturl = vf_get_value('url', $options, '');
-        $resturl = vf_combine_paths(array($resturl, '?p=categories/all.json'), '/');
+        $resturl = vf_combine_paths(array($resturl, '/categories/all.json'), '/');
         $category_data = json_decode(vf_rest($resturl));
         $select_options = vf_get_select_option('All Categories', '0', $categoryid);
@@ -150 +150 @@
         $url = vf_get_value('url', $options, '');
         $link_url = vf_get_link_url($options);
-        $resturl = array($url, '?p=activity.json');
+        $resturl = array($url, '/activity.json');
         // if ($roleid > 0)
         //  $resturl = array($url, 'activities/'.$roleid.'.json');
@@ -249 +249 @@
         $url = vf_get_value('url', $options, '');
         $link_url = vf_get_link_url($options);
-        $resturl = array($url, '?p=user/summary.json');
+        $resturl = array($url, '/user/summary.json');
             
         // Retrieve the latest discussions from the Vanilla API