Skip to content

Commit

Permalink
Cloud plugin release 2017061700
Browse files Browse the repository at this point in the history
  • Loading branch information
@anzeljg
anzeljg committed Jun 21, 2017
1 parent 2e37b72 commit 7f64b36
Show file tree
Hide file tree
Showing 92 changed files with 1,481 additions and 76 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ for an API key on each service.

## License and copyright

Copyright (C) 2012-2016 Gregor Anzelj, and others including:
Copyright (C) 2012-2017 Gregor Anzelj, and others including:
* Aaron Wells at Catalyst IT

This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion blocktype/box/account.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @subpackage blocktype-box
* @author Gregor Anzelj
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL
* @copyright (C) 2012-2016 Gregor Anzelj, [email protected]
* @copyright (C) 2012-2017 Gregor Anzelj, [email protected]
*
*/

Expand Down
2 changes: 1 addition & 1 deletion blocktype/box/callback.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @subpackage blocktype-box
* @author Gregor Anzelj
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL
* @copyright (C) 2012-2016 Gregor Anzelj, [email protected]
* @copyright (C) 2012-2017 Gregor Anzelj, [email protected]
*
*/

Expand Down
2 changes: 1 addition & 1 deletion blocktype/box/details.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @subpackage blocktype-box
* @author Gregor Anzelj
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL
* @copyright (C) 2012-2016 Gregor Anzelj, [email protected]
* @copyright (C) 2012-2017 Gregor Anzelj, [email protected]
*
*/

Expand Down
2 changes: 1 addition & 1 deletion blocktype/box/download.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @subpackage blocktype-box
* @author Gregor Anzelj
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL
* @copyright (C) 2012-2016 Gregor Anzelj, [email protected]
* @copyright (C) 2012-2017 Gregor Anzelj, [email protected]
*
*/

Expand Down
2 changes: 1 addition & 1 deletion blocktype/box/lang/en.utf8/blocktype.box.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @subpackage blocktype-box
* @author Gregor Anzelj
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL
* @copyright (C) 2012-2016 Gregor Anzelj, [email protected]
* @copyright (C) 2012-2017 Gregor Anzelj, [email protected]
*
*/

Expand Down
2 changes: 1 addition & 1 deletion blocktype/box/lib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @subpackage blocktype-box
* @author Gregor Anzelj
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL
* @copyright (C) 2012-2016 Gregor Anzelj, [email protected]
* @copyright (C) 2012-2017 Gregor Anzelj, [email protected]
*
*/

Expand Down
2 changes: 1 addition & 1 deletion blocktype/box/manage.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @subpackage blocktype-box
* @author Gregor Anzelj
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL
* @copyright (C) 2012-2016 Gregor Anzelj, [email protected]
* @copyright (C) 2012-2017 Gregor Anzelj, [email protected]
*
*/

Expand Down
2 changes: 1 addition & 1 deletion blocktype/box/version.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @subpackage blocktype-box
* @author Gregor Anzelj
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL
* @copyright (C) 2012-2016 Gregor Anzelj, [email protected]
* @copyright (C) 2012-2017 Gregor Anzelj, [email protected]
*
*/

Expand Down
2 changes: 1 addition & 1 deletion blocktype/dropbox/version.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
defined('INTERNAL') || die();

$config = new StdClass;
$config->version = 2017060600;
$config->version = 2017061700;
$config->release = '17.06.1';
$config->auth = 'OAuth 2.0';
2 changes: 1 addition & 1 deletion blocktype/googledrive/account.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @subpackage blocktype-googledrive
* @author Gregor Anzelj
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL
* @copyright (C) 2012-2016 Gregor Anzelj, [email protected]
* @copyright (C) 2012-2017 Gregor Anzelj, [email protected]
*
*/

Expand Down
2 changes: 1 addition & 1 deletion blocktype/googledrive/callback.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @subpackage blocktype-googledrive
* @author Gregor Anzelj
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL
* @copyright (C) 2012-2016 Gregor Anzelj, [email protected]
* @copyright (C) 2012-2017 Gregor Anzelj, [email protected]
*
*/

Expand Down
2 changes: 1 addition & 1 deletion blocktype/googledrive/details.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @subpackage blocktype-googledrive
* @author Gregor Anzelj
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL
* @copyright (C) 2012-2016 Gregor Anzelj, [email protected]
* @copyright (C) 2012-2017 Gregor Anzelj, [email protected]
*
*/

Expand Down
2 changes: 1 addition & 1 deletion blocktype/googledrive/download.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @subpackage blocktype-googledrive
* @author Gregor Anzelj
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL
* @copyright (C) 2012-2016 Gregor Anzelj, [email protected]
* @copyright (C) 2012-2017 Gregor Anzelj, [email protected]
*
*/

Expand Down
2 changes: 1 addition & 1 deletion blocktype/googledrive/export.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @subpackage blocktype-googledrive
* @author Gregor Anzelj
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL
* @copyright (C) 2012-2016 Gregor Anzelj, [email protected]
* @copyright (C) 2012-2017 Gregor Anzelj, [email protected]
*
*/

Expand Down
2 changes: 1 addition & 1 deletion blocktype/googledrive/lang/en.utf8/blocktype.googledrive.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @subpackage blocktype-googledrive
* @author Gregor Anzelj
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL
* @copyright (C) 2012-2016 Gregor Anzelj, [email protected]
* @copyright (C) 2012-2017 Gregor Anzelj, [email protected]
*
*/

Expand Down
2 changes: 1 addition & 1 deletion blocktype/googledrive/lib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @subpackage blocktype-googledrive
* @author Gregor Anzelj
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL
* @copyright (C) 2012-2016 Gregor Anzelj, [email protected]
* @copyright (C) 2012-2017 Gregor Anzelj, [email protected]
*
*/

Expand Down
2 changes: 1 addition & 1 deletion blocktype/googledrive/manage.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @subpackage blocktype-googledrive
* @author Gregor Anzelj
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL
* @copyright (C) 2012-2016 Gregor Anzelj, [email protected]
* @copyright (C) 2012-2017 Gregor Anzelj, [email protected]
*
*/

Expand Down
2 changes: 1 addition & 1 deletion blocktype/googledrive/version.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @subpackage blocktype-googledrive
* @author Gregor Anzelj
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL
* @copyright (C) 2012-2016 Gregor Anzelj, [email protected]
* @copyright (C) 2012-2017 Gregor Anzelj, [email protected]
*
*/

Expand Down
2 changes: 1 addition & 1 deletion blocktype/microsoftdrive/account.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @subpackage blocktype-microsoftdrive
* @author Gregor Anzelj
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL
* @copyright (C) 2012-2016 Gregor Anzelj, [email protected]
* @copyright (C) 2012-2017 Gregor Anzelj, [email protected]
*
*/

Expand Down
2 changes: 1 addition & 1 deletion blocktype/microsoftdrive/callback.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @subpackage blocktype-microsoftdrive
* @author Gregor Anzelj
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL
* @copyright (C) 2012-2016 Gregor Anzelj, [email protected]
* @copyright (C) 2012-2017 Gregor Anzelj, [email protected]
*
*/

Expand Down
2 changes: 1 addition & 1 deletion blocktype/microsoftdrive/details.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @subpackage blocktype-microsoftdrive
* @author Gregor Anzelj
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL
* @copyright (C) 2012-2016 Gregor Anzelj, [email protected]
* @copyright (C) 2012-2017 Gregor Anzelj, [email protected]
*
*/

Expand Down
2 changes: 1 addition & 1 deletion blocktype/microsoftdrive/download.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @subpackage blocktype-microsoftdrive
* @author Gregor Anzelj
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL
* @copyright (C) 2012-2016 Gregor Anzelj, [email protected]
* @copyright (C) 2012-2017 Gregor Anzelj, [email protected]
*
*/

Expand Down
3 changes: 2 additions & 1 deletion blocktype/microsoftdrive/lang/en.utf8/blocktype.microsoftdrive.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @subpackage blocktype-microsoftdrive
* @author Gregor Anzelj
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL
* @copyright (C) 2012-2016 Gregor Anzelj, [email protected]
* @copyright (C) 2012-2017 Gregor Anzelj, [email protected]
*
*/

Expand All @@ -19,6 +19,7 @@

$string['basicinformation'] = 'Basic Information';
$string['applicationdesc'] = 'You must create %san application%s, if you wish to access and use OneDrive API. When you will create the application, the <code>Client ID</code> and <code>Client secret</code> will be generated. Copy and paste them here. Then copy <code>Redirect URL</code> and paste it into application settings. Save application settings and this plugin settings.';
$string['applicationdesc2'] = 'You have to create your application in <b>Live SDK applications</b> section.';
$string['applicationname'] = 'Application name';
$string['applicationnamedesc'] = 'You must provide unique application name, e.g. the name of this site.';
$string['applicationicon'] = 'Application logo';
Expand Down
32 changes: 18 additions & 14 deletions blocktype/microsoftdrive/lib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @subpackage blocktype-microsoftdrive
* @author Gregor Anzelj
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL
* @copyright (C) 2012-2016 Gregor Anzelj, [email protected]
* @copyright (C) 2012-2017 Gregor Anzelj, [email protected]
*
*/

Expand Down Expand Up @@ -184,6 +184,11 @@ public static function get_config_options() {
'type' => 'html',
'value' => get_string('applicationdesc', 'blocktype.cloud/microsoftdrive', '<a href="https://account.live.com/developers/applications">', '</a>'),
);
$elements['applicationdesc2'] = array(
'type' => 'html',
'class' => 'bg-danger text-danger',
'value' => '<div style="padding:0 10px">' . get_string('applicationdesc2', 'blocktype.cloud/microsoftdrive') . '</div>',
);
$elements['basicinformation'] = array(
'type' => 'fieldset',
'class' => 'first',
Expand Down Expand Up @@ -308,7 +313,7 @@ public function service_list() {
}
else {
$service->pending = true;
$SESSION->add_error_msg('Can\'t find Live consumer key and/or consumer secret.');
$SESSION->add_error_msg('Can\'t find Microsoft Live consumer key and/or consumer secret.');
}
return $service;
}
Expand All @@ -332,7 +337,7 @@ public function request_token() {
redirect($request_url);
}
else {
$SESSION->add_error_msg('Can\'t find Live consumer key and/or consumer secret.');
$SESSION->add_error_msg('Can\'t find Microsoft Live consumer key and/or consumer secret.');
}
}

Expand Down Expand Up @@ -381,7 +386,7 @@ public function access_token($oauth_code) {
}
}
else {
$SESSION->add_error_msg('Can\'t find Live consumer key and/or consumer secret.');
$SESSION->add_error_msg('Can\'t find Microsoft Live consumer key and/or consumer secret.');
}
}

Expand Down Expand Up @@ -448,7 +453,7 @@ public function check_access_token($owner=null) {
}
}
else {
$SESSION->add_error_msg('Can\'t find Live consumer key and/or consumer secret.');
$SESSION->add_error_msg('Can\'t find Microsoft Live consumer key and/or consumer secret.');
}
}

Expand All @@ -472,7 +477,7 @@ public function revoke_access() {
redirect($request_url);
}
else {
$SESSION->add_error_msg('Can\'t find Live consumer key and/or consumer secret.');
$SESSION->add_error_msg('Can\'t find Microsoft Live consumer key and/or consumer secret.');
}
}

Expand Down Expand Up @@ -543,7 +548,7 @@ public function account_info() {
}
}
else {
$SESSION->add_error_msg('Can\'t find Live consumer key and/or consumer secret.');
$SESSION->add_error_msg('Can\'t find Microsoft Live consumer key and/or consumer secret.');
}
}

Expand Down Expand Up @@ -627,7 +632,7 @@ public function get_filelist($folder_id='0', $selected=array(), $owner=null) {
}
}
else {
$SESSION->add_error_msg('Can\'t find Live consumer key and/or consumer secret.');
$SESSION->add_error_msg('Can\'t find Microsoft Live consumer key and/or consumer secret.');
}
}

Expand Down Expand Up @@ -715,7 +720,6 @@ public function get_folder_content($folder_id=0, $options, $block=0) {
foreach($data['data'] as $artefact) {
$id = $artefact['id'];
$type = ($artefact['type'] == 'folder' ? 'folder' : 'file');
// Get artefactname by removing parent path from beginning...
$artefactname = $artefact['name'];
if ($artefact['type'] == 'folder') {
$icon = '<span class="icon-folder-open icon icon-lg"></span>';
Expand Down Expand Up @@ -756,7 +760,7 @@ public function get_folder_content($folder_id=0, $options, $block=0) {
}
}
else {
$SESSION->add_error_msg('Can\'t find Live consumer key and/or consumer secret.');
$SESSION->add_error_msg('Can\'t find Microsoft Live consumer key and/or consumer secret.');
}
}

Expand Down Expand Up @@ -802,7 +806,7 @@ public function get_folder_info($folder_id=0, $owner=null) {
}
}
else {
$SESSION->add_error_msg('Can\'t find Live consumer key and/or consumer secret.');
$SESSION->add_error_msg('Can\'t find Microsoft Live consumer key and/or consumer secret.');
}
}

Expand Down Expand Up @@ -848,7 +852,7 @@ public function get_file_info($file_id=0, $owner=null) {
}
}
else {
$SESSION->add_error_msg('Can\'t find Live consumer key and/or consumer secret.');
$SESSION->add_error_msg('Can\'t find Microsoft Live consumer key and/or consumer secret.');
}
}

Expand Down Expand Up @@ -882,7 +886,7 @@ public function download_file($file_id=0, $owner=null) {
return $result;
}
else {
$SESSION->add_error_msg('Can\'t find Live consumer key and/or consumer secret.');
$SESSION->add_error_msg('Can\'t find Microsoft Live consumer key and/or consumer secret.');
}
}

Expand Down Expand Up @@ -920,7 +924,7 @@ public function embed_file($file_id=0, $options=array(), $owner=null) {
}
}
else {
$SESSION->add_error_msg('Can\'t find Live consumer key and/or consumer secret.');
$SESSION->add_error_msg('Can\'t find Microsoft Live consumer key and/or consumer secret.');
}
}

Expand Down
2 changes: 1 addition & 1 deletion blocktype/microsoftdrive/manage.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @subpackage blocktype-microsoftdrive
* @author Gregor Anzelj
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL
* @copyright (C) 2012-2016 Gregor Anzelj, [email protected]
* @copyright (C) 2012-2017 Gregor Anzelj, [email protected]
*
*/

Expand Down
6 changes: 3 additions & 3 deletions blocktype/microsoftdrive/version.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
* @subpackage blocktype-microsoftdrive
* @author Gregor Anzelj
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL
* @copyright (C) 2012-2016 Gregor Anzelj, [email protected]
* @copyright (C) 2012-2017 Gregor Anzelj, [email protected]
*
*/

defined('INTERNAL') || die();

$config = new StdClass;
$config->version = 2016022600;
$config->release = '16.02.1';
$config->version = 2017061700;
$config->release = '17.06.1';
$config->auth = 'OAuth 2.0';
Loading

0 comments on commit 7f64b36

Please sign in to comment.