Merge branch 'master' of https://github.com/Zeticon/drupal-media-medi…

…ahaven

README.md

@@ -7,36 +7,37 @@ For more information please visit [www.zeticon.com](http://www.zeticon.com) or c
 Required Modules
 ---------------------
 Upload the following required modules into the folder "sites/all/modules", some modules require additional modules to operate!
-*   Media
-*   File_entity
-*   Views
-*   Ctools
-*   Styles
-*   Plupload
+*   [Media 2.x] (https://drupal.org/project/media)
+*   [File_entity](https://drupal.org/project/file_entity)
+*   [Views](https://drupal.org/project/views)
+*   [Ctools](https://drupal.org/project/ctools)
+*   [Styles](https://drupal.org/project/styles)
+*   [Plupload](https://drupal.org/project/plupload)
 
 Go to the "Modules" panel in your admin view and enable the listed modules.
 
 Required Library
 ---------------------
 Additionally to the module "plupload", the plupload library is required.
-Download the plupload package from [www.plupload.com/download](http://www.plupload.com/download/)
-Create a new folder "libraries" under "sites/all/" and upload the upload package to this folder. The folder should be named 'plupload' so you have a folder structure: "sites/all/plupload". It is important to note that the current php plupload module only does not work with the 2+ version of the library. You will need to download version 1.8.x.
+Download the plupload package from: [www.plupload.com/download](http://www.plupload.com/download/). It is important to note that the current php plupload module does not work with the 2+ version of the library. You will need to download version 1.5.x.
+
+Create a new folder "libraries" under "sites/all/" and upload the upload package to this folder. The folder should be named 'plupload' so you have a folder structure: "sites/all/plupload". 
 
 Mediahaven Configuration Settings
 ---------------------
 <h3>MediaHaven API</h3>
-*MediaHaven login:* The login to be used by the module to communicate with MediaHaven.
-*MediaHaven password:* The password to be used by the module to communicate with MediaHaven.
-*MediaHaven url:* The MediaHaven url.
+*MediaHaven login:* The login to be used by the module to communicate with MediaHaven.  
+*MediaHaven password:* The password to be used by the module to communicate with MediaHaven.   
+*MediaHaven url:* The MediaHaven url.   
 
 <h3>MediaHaven Upload settings</h3>
-*Ingestspace id:* The MediaHaven ingestspace that will be used to upload files to.
-*Auto publish:* When enabled files will be automatically published after processing. If disabled a user will have to manually publish them using the mediahaven media management software.
-*Department id:* The default department where uploaded files will belong to. This will be used when autopublishing is enabled.
+*Ingestspace id:* The MediaHaven ingestspace that will be used to upload files to.  
+*Auto publish:* When enabled files will be automatically published after processing. If disabled a user will have to manually publish them using the mediahaven media management software.  
+*Department id:* The default department where uploaded files will belong to. This will be used when autopublishing is enabled.  
 
 <h3>MediaHaven Thumbnail settings</h3>
-*Thumbnail width:* Width of the thumbnails (in pixels), standard is 150px
-*Thumbnail height:* Height of the thumbnails (in pixels), standard is 150px
+*Thumbnail width:* Width of the thumbnails (in pixels), standard is 150px  
+*Thumbnail height:* Height of the thumbnails (in pixels), standard is 150px  
 
 These settings require a Mediahaven account, for more information please visit [www.zeticon.com](http://www.zeticon.com)
 
@@ -46,7 +47,10 @@ WYSIWYG
 ---------------------
 <h3>ckeditor</h3>
 https://drupal.org/comment/6814058#comment-6814058
-Media Browser
+
+###Media Browser
+
+To enable MediaHaven file selection form within the media browser: go to "configuration/media browser settings" and check MediaHaven.
 
 ---------------------
 

includes/MediaHavenRestClient.inc

@@ -14,7 +14,8 @@ class MediaHavenRestClient {
         CURLOPT_USERPWD => $login .  ":" . $password,
         CURLOPT_RETURNTRANSFER => 1,
         CURLOPT_COOKIEJAR => "/tmp/cookie.txt",
-        CURLOPT_SSL_VERIFYPEER => false
+        CURLOPT_SSL_VERIFYPEER => false,
+ 	CURLOPT_SSLVERSION => 3
     );
 
   }