Changeset 939310

Timestamp:

06/26/2014 08:46:36 PM (12 years ago)

Author:

perfect-web

Message:

Vwersion 1.1.0 - Fixed redirect URL for new Windows Live applications

Location:

pwebonedrive/trunk

Files:

• admin-buttons.php (modified) (2 diffs)
• admin.php (modified) (3 diffs)
• callback.php (added)
• js/onedrive.js (modified) (3 diffs)
• languages/pwebonedrive-en_GB.pot (modified) (5 diffs)
• liveconnect.php (modified) (3 diffs)
• pwebonedrive.php (modified) (1 diff)
• readme.txt (modified) (7 diffs)

pwebonedrive/trunk/admin-buttons.php

@@ -1 +1 @@
 <?php
 /**
- * @version 1.0.0
+ * @version 1.1.0
  * @package OneDrive
  * @copyright © 2014 Perfect Web sp. z o.o., All rights reserved. http://www.perfect-web.co
@@ -56 +56 @@
         'client_id:"'.get_option('pweb_onedrive_client_id').'"',
         'task_url:"'.admin_url( 'admin-ajax.php?action=pweb_onedrive_' ).'"',
+        'redirect_url:"'.plugins_url( 'callback.php', __FILE__ ).'"',
         'spinner_url:"'.includes_url().'images/wpspin-2x.gif"'
     );

pwebonedrive/trunk/admin.php

@@ -1 +1 @@
 <?php
 /**
- * @version 1.0.2
+ * @version 1.1.0
  * @package OneDrive
  * @copyright © 2014 Perfect Web sp. z o.o., All rights reserved. http://www.perfect-web.co
@@ -113 +113 @@
                             <?php _e('Register your site in', 'pwebonedrive'); ?>
                             <a target="_blank" href="https://account.live.com/developers/applications/index"><?php _e('Windows Live application management', 'pwebonedrive'); ?></a>.<br>
-                            <?php _e('Remember to set', 'pwebonedrive'); ?> <strong><?php _e('Redirect domain', 'pwebonedrive'); ?></strong>: 
-                            <script>document.write('<a href="'+document.location.protocol+'//'+document.location.host+'" target="_blank">'+document.location.protocol+'//'+document.location.host+'<'+'/a>')</script> 
-                            <?php _e('and', 'pwebonedrive'); ?> <strong><?php _e('Mobile client app: No', 'pwebonedrive'); ?></strong>,
-                            <strong><?php _e('Enhanced redirection security: Disabled', 'pwebonedrive'); ?></strong>.<br>
+                            <?php _e('Remember to set', 'pwebonedrive'); ?> <strong><?php _e('Redirect URL', 'pwebonedrive'); ?></strong>: 
+                            <a href="<?php echo plugins_url( 'callback.php', __FILE__ ); ?>" target="_blank"><?php echo plugins_url( 'callback.php', __FILE__ ); ?></a><br>
+                            <?php _e('and', 'pwebonedrive'); ?> <strong><?php _e('Mobile client app: No', 'pwebonedrive'); ?></strong><br>
+                            <?php _e('and if available', 'pwebonedrive'); ?> <strong><?php _e('Enhanced redirection security: Enabled', 'pwebonedrive'); ?></strong> <?php _e('(for applications created before June 2014)', 'pwebonedrive'); ?><br>
                             <?php _e('Read how to', 'pwebonedrive'); ?> <a target="_blank" href="http://msdn.microsoft.com/library/cc287659.aspx"><?php _e('get your Client ID', 'pwebonedrive'); ?></a>.
                         </p>
@@ -164 +164 @@
 
 
-add_action('wp_ajax_pweb_onedrive_callback', 'pweb_onedrive_ajax_callback');
-add_action('wp_ajax_nopriv_pweb_onedrive_callback', 'pweb_onedrive_ajax_callback');
-
-function pweb_onedrive_ajax_callback() 
-{
-    $client = LiveConnectClient::getInstance();
-    $client->log(__FUNCTION__);
-    
-    echo $client->handlePageRequest();
-    
-    $client->log(__FUNCTION__.'. Die');
-    
-    die();
-}
-
 function pweb_onedrive_get_version() {
     

pwebonedrive/trunk/js/onedrive.js

@@ -1 +1 @@
 /**
- * @version 1.0.3
+ * @version 1.1.0
  * @package OneDrive
  * @copyright © 2014 Perfect Web sp. z o.o., All rights reserved. http://www.perfect-web.co
@@ -13 +13 @@
         client_id: null,
         task_url: null,
+        redirect_url: null,
         spinner_url: null,
         token: false,
@@ -50 +51 @@
             WL.init({
                 client_id: this.options.client_id, 
-                redirect_uri: this.options.task_url + "callback", 
+                redirect_uri: this.options.redirect_url, 
                 response_type: "code", 
                 logging: this.options.debug > 0 

pwebonedrive/trunk/languages/pwebonedrive-en_GB.pot

@@ -2 +2 @@
 msgstr ""
 "Project-Id-Version: Perfect OneDrive\n"
-"POT-Creation-Date: 2014-04-15 15:52+0100\n"
-"PO-Revision-Date: 2014-04-15 15:55+0100\n"
+"POT-Creation-Date: 2014-06-26 22:37+0100\n"
+"PO-Revision-Date: 2014-06-26 22:38+0100\n"
 "Last-Translator: Piotr Moćko <[email protected]>\n"
 "Language-Team: Perfect-Web.co <[email protected]>\n"
@@ -10 +10 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
+"X-Generator: Poedit 1.6.5\n"
 "X-Poedit-Basepath: ../\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -37 +37 @@
 msgstr ""
 
-#: admin-buttons.php:105
+#: admin-buttons.php:106
 msgid "Error while saving selected resource. Try again."
 msgstr ""
 
-#: admin-buttons.php:107
+#: admin-buttons.php:108
 msgid ""
 "Access token for current OneDrive session was not saved. Logout from "
@@ -118 +118 @@
 
 #: admin.php:115
-msgid "Redirect domain"
+msgid "Redirect URL"
 msgstr ""
 
@@ -130 +130 @@
 
 #: admin.php:118
-msgid "Enhanced redirection security: Disabled"
+msgid "and if available"
+msgstr ""
+
+#: admin.php:118
+msgid "Enhanced redirection security: Enabled"
+msgstr ""
+
+#: admin.php:118
+msgid "(for applications created before June 2014)"
 msgstr ""
 

pwebonedrive/trunk/liveconnect.php

@@ -1 +1 @@
 <?php
 /**
- * @version 1.0.5
+ * @version 1.1.0
  * @package OneDrive
  * @copyright © 2014 Perfect Web sp. z o.o., All rights reserved. http://www.perfect-web.co
@@ -33 +33 @@
             'authurl'       => 'https://login.live.com/oauth20_token.srf', 
             'tokenurl'      => 'https://login.live.com/oauth20_token.srf', 
-            'redirecturi'   => admin_url( 'admin-ajax.php?action=pweb_onedrive_callback' ), 
+            'redirecturi'   => plugins_url( 'callback.php', __FILE__ ), 
             'userefresh'    => true,
             'storetoken'    => true,
@@ -48 +48 @@
     }
     
-    public static function getInstance()
+    public static function getInstance($options = null)
     {
         // Automatically instantiate the singleton object if not already done.
         if (empty(self::$instance))
         {
-            self::setInstance(new LiveConnectClient);
+            self::setInstance(new LiveConnectClient($options));
         }
         return self::$instance;

pwebonedrive/trunk/pwebonedrive.php

@@ -4 +4 @@
  * Plugin URI: http://www.perfect-web.co/wordpress/microsoft-onedrive-gallery-file
  * Description: Share easily your photos and files stored on Microsoft OneDrive. You can display a gallery with your photos or a link to a file for download.
- * Version: 1.0.5
+ * Version: 1.1.0
  * Author: Piotr Moćko
  * Author URI: http://www.perfect-web.co

pwebonedrive/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 2.8.0
 Tested up to: 3.9.1
-Stable tag: 1.0.5
+Stable tag: 1.1.0
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -12 +12 @@
 
 == Description ==
-
-**Warning! OneDrvie plugin is not working with Windwos Live Applications created after 1st of June 2014. We are waiting for update of Microsoft OneDrive API documentation to make necessary changes in our software.**
-
 
 ![OneDrive](http://www.perfect-web.co/media/com_skydrive/images/onedrive-logo.png)
@@ -60 +57 @@
 1. Create **Windows Live ID** account for [OneDrive](https://onedrive.live.com/) if you do not have already
 1. **Register your site** in [Windows Live application management](https://account.live.com/developers/applications/index) that WordPress could connect to your OneDrive.
-Remember to set your site URL as **Redirect domain** and **Mobile client app: No**, **Enhanced redirection security: Disabled**.
+Remember to set **Redirect URL** *http://yourdomain.com/wp-content/plugins/pwebonedrive/callback.php*
+and **Mobile client app: No** 
+and if available **Enhanced redirection security: Enabled** (for applications created before June 2014).
 [Read how to get your Client ID](http://msdn.microsoft.com/library/cc287659.aspx).
 1. Go to **plugin configuration** panel and set all details from **Windows Live application management**.
@@ -70 +69 @@
 
 [Visit full documentation page](http://www.perfect-web.co/wordpress/microsoft-onedrive-gallery-file/documentation)
-
-
-**Warning! OneDrvie plugin is not working with Windwos Live Applications created after 1st of June 2014. We are waiting for update of Microsoft OneDrive API documentation to make necessary changes in our software.**
-
 
 = First use of OneDrive buttons =
@@ -89 +84 @@
 = Error in Microsoft popup =
 
+Since plugin version 1.1.0 there is a new Redirect URL. Make sure you have updated it! You can also enable **Enhanced redirection security** in old Windows Live applications - created before June 2014.
+
 If you got message: *Microsoft account is experiencing technical problems* in popup window then check **error_description** of URL in address bar.
 
 If you have following error description:
 *The provided value for the input parameter 'redirect_uri' is not valid. The expected value is 'https://login.live.com/oauth20_desktop.srf' or a URL which matches the redirect URI registered for this client application*
-then go to Windows Live application management and set in your application **Enhanced redirection security: Disabled**.
+then make sure that you have plugin version 1.1.0 or newer 
+and you have set the same **Redirect URL** in Windows Live application management as in plugin configuration.
+
+Make sure that if you have set in Windows Live application management **redirect URL with www** then you access back-end and front-end site also with www otherwise it would not work.
+If it is possible to access your site with and without www then you should correct it in .htaccess file and allow only one way.
 
 If you have other error description then send it to our support.
@@ -123 +124 @@
 == Changelog ==
 
+= 1.1.0 / 26-06-2014 =
+* Fixed redirect URL for new Windows Live applications
+
 = 1.0.5 / 11-06-2014 =
 * Fixed hook where wp_register_style is used
@@ -144 +148 @@
 == Upgrade Notice ==
 
-N/A
+= 1.1.0 =
+New redirect URL for Windows Live applications! See configuration of plugin after upgrade.