Merge branch 'MDL-37217-master' of git://github.com/FMCorz/moodle

Conflicts:
    version.php
    repository/googledocs/version.php

diff --combined lib/filelib.php
index 6fb311d,4c1a27a..24aeab3
--- 1/lib/filelib.php
--- 2/lib/filelib.php
+++ b/lib/filelib.php
@@@ -1469,10 -1469,6 +1469,10 @@@ function &get_mimetypes_array() 
          'fdf'  => array ('type'=>'application/pdf', 'icon'=>'pdf'),
          'flv'  => array ('type'=>'video/x-flv', 'icon'=>'flash', 'groups'=>array('video','web_video'), 'string'=>'video'),
          'f4v'  => array ('type'=>'video/mp4', 'icon'=>'flash', 'groups'=>array('video','web_video'), 'string'=>'video'),
 +
 +        'gallery'           => array ('type'=>'application/x-smarttech-notebook', 'icon'=>'archive'),
 +        'galleryitem,'      => array ('type'=>'application/x-smarttech-notebook', 'icon'=>'archive'),
 +        'gallerycollection' => array ('type'=>'application/x-smarttech-notebook', 'icon'=>'archive'),
          'gif'  => array ('type'=>'image/gif', 'icon'=>'gif', 'groups'=>array('image', 'web_image'), 'string'=>'image'),
          'gtar' => array ('type'=>'application/x-gtar', 'icon'=>'archive', 'groups'=>array('archive'), 'string'=>'archive'),
          'tgz'  => array ('type'=>'application/g-zip', 'icon'=>'archive', 'groups'=>array('archive'), 'string'=>'archive'),
@@@ -1516,9 -1512,6 +1516,9 @@@
          'mpe'  => array ('type'=>'video/mpeg', 'icon'=>'mpeg', 'groups'=>array('video','web_video'), 'string'=>'video'),
          'mpg'  => array ('type'=>'video/mpeg', 'icon'=>'mpeg', 'groups'=>array('video','web_video'), 'string'=>'video'),
  
 +        'nbk'       => array ('type'=>'application/x-smarttech-notebook', 'icon'=>'archive'),
 +        'notebook'  => array ('type'=>'application/x-smarttech-notebook', 'icon'=>'archive'),
 +
          'odt'  => array ('type'=>'application/vnd.oasis.opendocument.text', 'icon'=>'writer', 'groups'=>array('document')),
          'ott'  => array ('type'=>'application/vnd.oasis.opendocument.text-template', 'icon'=>'writer', 'groups'=>array('document')),
          'oth'  => array ('type'=>'application/vnd.oasis.opendocument.text-web', 'icon'=>'oth', 'groups'=>array('document')),
@@@ -1598,8 -1591,6 +1598,8 @@@
          'webm'  => array ('type'=>'video/webm', 'icon'=>'video', 'groups'=>array('video'), 'string'=>'video'),
          'wmv'  => array ('type'=>'video/x-ms-wmv', 'icon'=>'wmv', 'groups'=>array('video'), 'string'=>'video'),
          'asf'  => array ('type'=>'video/x-ms-asf', 'icon'=>'wmv', 'groups'=>array('video'), 'string'=>'video'),
 +
 +        'xbk'  => array ('type'=>'application/x-smarttech-notebook', 'icon'=>'archive'),
          'xdp'  => array ('type'=>'application/pdf', 'icon'=>'pdf'),
          'xfd'  => array ('type'=>'application/pdf', 'icon'=>'pdf'),
          'xfdf' => array ('type'=>'application/pdf', 'icon'=>'pdf'),
@@@ -1614,7 -1605,6 +1614,7 @@@
  
          'xml'  => array ('type'=>'application/xml', 'icon'=>'markup'),
          'xsl'  => array ('type'=>'text/xml', 'icon'=>'markup'),
 +
          'zip'  => array ('type'=>'application/zip', 'icon'=>'archive', 'groups'=>array('archive'), 'string'=>'archive')
      );
      return $mimearray;
@@@ -2945,14 -2935,22 +2945,22 @@@ class curl 
      }
  
      /**
-      * Set curl options
+      * Set curl options.
       *
-      * @param array $options If array is null, this function will
-      * reset the options to default value.
+      * Do not use the curl constants to define the options, pass a string
+      * corresponding to that constant. Ie. to set CURLOPT_MAXREDIRS, pass
+      * array('CURLOPT_MAXREDIRS' => 10) or array('maxredirs' => 10) to this method.
+      *
+      * @param array $options If array is null, this function will reset the options to default value.
+      * @return void
+      * @throws coding_exception If an option uses constant value instead of option name.
       */
      public function setopt($options = array()) {
          if (is_array($options)) {
-             foreach($options as $name => $val){
+             foreach ($options as $name => $val){
+                 if (!is_string($name)) {
+                     throw new coding_exception('Curl options should be defined using strings, not constant values.');
+                 }
                  if (stripos($name, 'CURLOPT_') === false) {
                      $name = strtoupper('CURLOPT_'.$name);
                  }
@@@ -3077,11 -3075,9 +3085,9 @@@
              var_dump($this->header);
          }
  
-         // set options
+         // Set options.
          foreach($this->options as $name => $val) {
-             if (is_string($name)) {
-                 $name = constant(strtoupper($name));
-             }
+             $name = constant(strtoupper($name));
              curl_setopt($curl, $name, $val);
          }
          return $curl;

diff --combined repository/googledocs/version.php
index a2382a9,8d75c70..83a366c
--- 1/repository/googledocs/version.php
--- 2/repository/googledocs/version.php
+++ b/repository/googledocs/version.php
@@@ -25,6 -25,6 +25,6 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $plugin->version   = 2012112900;        // The current plugin version (Date: YYYYMMDDXX).
- $plugin->requires  = 2012112900;        // Requires this Moodle version.
 -$plugin->version   = 2013021200;        // The current plugin version (Date: YYYYMMDDXX).
 -$plugin->requires  = 2013021400;        // Requires this Moodle version.
++$plugin->version   = 2013021900;        // The current plugin version (Date: YYYYMMDDXX).
++$plugin->requires  = 2013021901;        // Requires this Moodle version.
  $plugin->component = 'repository_googledocs'; // Full name of the plugin (used for diagnostics).

diff --combined version.php
index 9c120f0,f665d29..36680f3
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -30,7 -30,7 +30,7 @@@
  defined('MOODLE_INTERNAL') || die();
  
  
- $version  = 2013021900.00;              // YYYYMMDD      = weekly release date of this DEV branch
 -$version  = 2013021400.01;              // YYYYMMDD      = weekly release date of this DEV branch
++$version  = 2013021901.00;              // YYYYMMDD      = weekly release date of this DEV branch
                                          //         RR    = release increments - 00 in DEV branches
                                          //           .XX = incremental changes