forked from moodle/moodle
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MDL-58280 fileconverter_googledrive: Fix cibot complaints
- Loading branch information
Damyon Wiese
committed
Apr 20, 2017
1 parent
9fe3363
commit 32f01c5
Showing
4 changed files
with
9 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,9 +15,9 @@ | |
// along with Moodle. If not, see <http://www.gnu.org/licenses/>. | ||
|
||
/** | ||
* Test that unoconv is configured correctly | ||
* Test that googledrive is configured correctly | ||
* | ||
* @package fileconverter_unoconv | ||
* @package fileconverter_googledrive | ||
* @copyright 2017 Andrew Nicols <[email protected]> | ||
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later | ||
*/ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3607,7 +3607,7 @@ public function put($url, $params = array(), $options = array()) { | |
$fp = false; | ||
if (isset($params['file'])) { | ||
$file = $params['file']; | ||
if(is_file($file)) { | ||
if (is_file($file)) { | ||
$fp = fopen($file, 'r'); | ||
$size = filesize($file); | ||
$options['CURLOPT_PUT'] = 1; | ||
|
@@ -3617,7 +3617,7 @@ public function put($url, $params = array(), $options = array()) { | |
return null; | ||
} | ||
if (!isset($this->options['CURLOPT_USERPWD'])) { | ||
$this->setopt(array('CURLOPT_USERPWD'=>'anonymous: [email protected]')); | ||
$this->setopt(array('CURLOPT_USERPWD' => 'anonymous: [email protected]')); | ||
} | ||
} else { | ||
$options['CURLOPT_CUSTOMREQUEST'] = 'PUT'; | ||
|