Skip to content

Commit

Permalink
INT-13488: Fixed PHP styling, optimised code and upgrade.
Browse files Browse the repository at this point in the history
  • Loading branch information
David Castro committed Aug 4, 2018
1 parent 36b0252 commit b26d001
Show file tree
Hide file tree
Showing 70 changed files with 348 additions and 343 deletions.
4 changes: 2 additions & 2 deletions autoconfigws.php
View file
Expand Up @@ -16,8 +16,8 @@

/**
* Web service auto configuration page
* @author Guy Thomas <gthomas@moodlerooms.com>
* @copyright Copyright (c) 2017 Blackboard Inc.
* @author Guy Thomas <citricity@gmail.com>
* @copyright Copyright (c) 2017 Blackboard Inc. (http://www.blackboard.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

Expand Down
4 changes: 2 additions & 2 deletions classes/adminsetting/ally_config_link.php
View file
Expand Up @@ -16,8 +16,8 @@

/**
* Admin setting for auto configuration.
* @author Guy Thomas <gthomas@moodlerooms.com>
* @copyright Copyright (c) 2017 Blackboard Inc.
* @author Guy Thomas <citricity@gmail.com>
* @copyright Copyright (c) 2017 Blackboard Inc. (http://www.blackboard.com)
* @package tool_ally
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
Expand Down
4 changes: 2 additions & 2 deletions classes/adminsetting/ally_configpasswordunmask.php
View file
Expand Up @@ -16,8 +16,8 @@

/**
* Admin setting for auto configuration.
* @author Guy Thomas <gthomas@moodlerooms.com>
* @copyright Copyright (c) 2017 Blackboard Inc.
* @author Guy Thomas <citricity@gmail.com>
* @copyright Copyright (c) 2017 Blackboard Inc. (http://www.blackboard.com)
* @package tool_ally
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
Expand Down
6 changes: 3 additions & 3 deletions classes/adminsetting/ally_pickroles.php
View file
Expand Up @@ -17,7 +17,7 @@
/**
* Admin setting for picking roles available for ally configuration.
* @author David Castro <david.castro@blackboard.com>
* @copyright Copyright (c) 2017 Blackboard Inc.
* @copyright Copyright (c) 2017 Blackboard Inc. (http://www.blackboard.com)
* @package tool_ally
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
Expand All @@ -29,9 +29,9 @@
/**
* Class admin_setting_ally_pickroles
*
* @package tool_ally
* @package tool_ally
* @author David Castro <david.castro@blackboard.com>
* @copyright Copyright (c) 2017 Moodlerooms Inc. (http://www.moodlerooms.com)
* @copyright Copyright (c) 2017 Blackboard Inc. (http://www.blackboard.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class ally_pickroles extends \admin_setting_pickroles {
Expand Down
4 changes: 2 additions & 2 deletions classes/adminsetting/ally_trim.php
View file
Expand Up @@ -16,8 +16,8 @@

/**
* Admin setting for auto configuration.
* @author Guy Thomas <gthomas@moodlerooms.com>
* @copyright Copyright (c) 2017 Blackboard Inc.
* @author Guy Thomas <citricity@gmail.com>
* @copyright Copyright (c) 2017 Blackboard Inc. (http://www.blackboard.com)
* @package tool_ally
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
Expand Down
4 changes: 2 additions & 2 deletions classes/auto_config.php
View file
Expand Up @@ -16,8 +16,8 @@

/**
* Web service auto configuration tool.
* @author Guy Thomas <gthomas@moodlerooms.com>
* @copyright Copyright (c) 2017 Blackboard Inc.
* @author Guy Thomas <citricity@gmail.com>
* @copyright Copyright (c) 2017 Blackboard Inc. (http://www.blackboard.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

Expand Down
14 changes: 7 additions & 7 deletions classes/auto_config_resolver.php
View file
Expand Up @@ -17,10 +17,10 @@
/**
* Class responsible for resolving Ally tool configurations for the CLI script.
*
* @package tool_ally
* @author Sam Chaffee
* @copyright Copyright (c) 2017 Blackboard Inc. (http://www.blackboard.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @package tool_ally
* @author Sam Chaffee
* @copyright Copyright (c) 2017 Blackboard Inc. (http://www.blackboard.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

namespace tool_ally;
Expand All @@ -30,9 +30,9 @@
/**
* Class responsible for resolving Ally tool configurations for the CLI script.
*
* @package tool_ally
* @copyright Copyright (c) 2017 Blackboard Inc. (http://www.blackboard.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @package tool_ally
* @copyright Copyright (c) 2017 Blackboard Inc. (http://www.blackboard.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class auto_config_resolver {

Expand Down
14 changes: 7 additions & 7 deletions classes/auto_configurator.php
View file
Expand Up @@ -17,10 +17,10 @@
/**
* Class responsible for executing auto configuration for ally settings and web services.
*
* @package tool_ally
* @author Sam Chaffee
* @copyright Copyright (c) 2017 Blackboard Inc. (http://www.blackboard.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @package tool_ally
* @author Sam Chaffee
* @copyright Copyright (c) 2017 Blackboard Inc. (http://www.blackboard.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

namespace tool_ally;
Expand All @@ -32,9 +32,9 @@
/**
* Class responsible for executing auto configuration for ally settings and web services.
*
* @package tool_ally
* @copyright Copyright (c) 2017 Blackboard Inc. (http://www.blackboard.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @package tool_ally
* @copyright Copyright (c) 2017 Blackboard Inc. (http://www.blackboard.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class auto_configurator {

Expand Down
4 changes: 2 additions & 2 deletions classes/componentsupport/assign_component.php
View file
Expand Up @@ -17,7 +17,7 @@
/**
* Html content support for assignments.
* @author Guy Thomas
* @copyright Copyright (c) 2018 Blackboard Inc.
* @copyright Copyright (c) 2018 Blackboard Inc. (http://www.blackboard.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

Expand All @@ -31,7 +31,7 @@

/**
* Html content support for assignments.
* @copyright Copyright (c) 2018 Blackboard Inc.
* @copyright Copyright (c) 2018 Blackboard Inc. (http://www.blackboard.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class assign_component extends component_base implements iface_html_content {
Expand Down
8 changes: 4 additions & 4 deletions classes/componentsupport/component_base.php
View file
Expand Up @@ -16,8 +16,8 @@

/**
* Base class for processing module html.
* @author Guy Thomas <gthomas@moodlerooms.com>
* @copyright Copyright (c) 2017 Blackboard Inc.
* @author Guy Thomas <citricity@gmail.com>
* @copyright Copyright (c) 2017 Blackboard Inc. (http://www.blackboard.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

Expand All @@ -31,8 +31,8 @@

/**
* Base class for processing module html.
* @author Guy Thomas <gthomas@moodlerooms.com>
* @copyright Copyright (c) 2017 Blackboard Inc.
* @author Guy Thomas <citricity@gmail.com>
* @copyright Copyright (c) 2017 Blackboard Inc. (http://www.blackboard.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

Expand Down
4 changes: 2 additions & 2 deletions classes/componentsupport/course_component.php
View file
Expand Up @@ -16,7 +16,7 @@

/**
* Html content support for courses.
* @copyright Copyright (c) 2018 Blackboard Inc.
* @copyright Copyright (c) 2018 Blackboard Inc. (http://www.blackboard.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

Expand All @@ -31,7 +31,7 @@

/**
* Html content support for courses.
* @copyright Copyright (c) 2018 Blackboard Inc.
* @copyright Copyright (c) 2018 Blackboard Inc. (http://www.blackboard.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class course_component extends component_base implements iface_html_content {
Expand Down
8 changes: 4 additions & 4 deletions classes/componentsupport/file_component_base.php
View file
Expand Up @@ -16,8 +16,8 @@

/**
* Base class for processing module html.
* @author Guy Thomas <gthomas@moodlerooms.com>
* @copyright Copyright (c) 2017 Blackboard Inc.
* @author Guy Thomas <citricity@gmail.com>
* @copyright Copyright (c) 2017 Blackboard Inc. (http://www.blackboard.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

Expand All @@ -27,8 +27,8 @@

/**
* Base class for processing module html.
* @author Guy Thomas <gthomas@moodlerooms.com>
* @copyright Copyright (c) 2017 Blackboard Inc.
* @author Guy Thomas <citricity@gmail.com>
* @copyright Copyright (c) 2017 Blackboard Inc. (http://www.blackboard.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

Expand Down
8 changes: 4 additions & 4 deletions classes/componentsupport/forum_component.php
View file
Expand Up @@ -16,8 +16,8 @@

/**
* Html file replacement support for core forum module
* @author Guy Thomas <gthomas@moodlerooms.com>
* @copyright Copyright (c) 2018 Blackboard Inc.
* @author Guy Thomas <citricity@gmail.com>
* @copyright Copyright (c) 2018 Blackboard Inc. (http://www.blackboard.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

Expand All @@ -40,8 +40,8 @@

/**
* Html file / content replacement support for core forum module
* @author Guy Thomas <gthomas@moodlerooms.com>
* @copyright Copyright (c) 2017 / 2018 Blackboard Inc.
* @author Guy Thomas <citricity@gmail.com>
* @copyright Copyright (c) 2017 Blackboard Inc. (http://www.blackboard.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class forum_component extends file_component_base implements
Expand Down
11 changes: 5 additions & 6 deletions classes/componentsupport/glossary_component.php
View file
Expand Up @@ -17,8 +17,8 @@
/**
* Html file replacement support for glossary.
* @package tool_ally
* @author Guy Thomas <gthomas@moodlerooms.com>
* @copyright Copyright (c) 2017 Blackboard Inc.
* @author Guy Thomas <citricity@gmail.com>
* @copyright Copyright (c) 2017 Blackboard Inc. (http://www.blackboard.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

Expand All @@ -38,8 +38,8 @@
/**
* Html file replacement support for glossary.
* @package tool_ally
* @author Guy Thomas <gthomas@moodlerooms.com>
* @copyright Copyright (c) 2017 Blackboard Inc.
* @author Guy Thomas <citricity@gmail.com>
* @copyright Copyright (c) 2017 Blackboard Inc. (http://www.blackboard.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class glossary_component extends file_component_base implements
Expand Down Expand Up @@ -122,7 +122,7 @@ private function get_entry_html_content_items($courseid, $glossaryid = null) {
SELECT ge.*
FROM {glossary} g
JOIN {glossary_entries} ge
ON ge.glossaryid = g.id
ON ge.glossaryid = g.id
WHERE g.course = ? AND ge.definitionformat = ?
AND ge.userid $userinsql
$idfilter
Expand Down Expand Up @@ -182,7 +182,6 @@ public function get_all_html_content($id) {
$main = $this->get_html_content($id, 'glossary', 'intro');
$entries = $this->get_entry_html_content_items($course->id, $id);
return array_merge([$main], $entries);

}

/**
Expand Down
8 changes: 4 additions & 4 deletions classes/componentsupport/hsuforum_component.php
View file
Expand Up @@ -16,8 +16,8 @@

/**
* Html file replacement support for Moodlerooms forum module.
* @author Guy Thomas <gthomas@moodlerooms.com>
* @copyright Copyright (c) 2017 Blackboard Inc.
* @author Guy Thomas <citricity@gmail.com>
* @copyright Copyright (c) 2017 Blackboard Inc. (http://www.blackboard.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

Expand All @@ -29,8 +29,8 @@

/**
* Html file replacement support for Moodlerooms forum module.
* @author Guy Thomas <gthomas@moodlerooms.com>
* @copyright Copyright (c) 2017 Blackboard Inc.
* @author Guy Thomas <citricity@gmail.com>
* @copyright Copyright (c) 2017 Blackboard Inc. (http://www.blackboard.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class hsuforum_component extends forum_component {
Expand Down
4 changes: 2 additions & 2 deletions classes/componentsupport/interfaces/annotation_map.php
View file
Expand Up @@ -16,8 +16,8 @@

/**
* Interface for supporting html content annotation mapping.
* @author Guy Thomas <gthomas@moodlerooms.com>
* @copyright Copyright (c) 2018 Blackboard Inc.
* @author Guy Thomas <citricity@gmail.com>
* @copyright Copyright (c) 2018 Blackboard Inc. (http://www.blackboard.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

Expand Down
2 changes: 1 addition & 1 deletion classes/componentsupport/interfaces/content_sub_tables.php
View file
Expand Up @@ -17,7 +17,7 @@
/**
* Interface for supporting modules with content stored in sub tables.
* @author Guy Thomas <citricity@gmail.com>
* @copyright Copyright (c) 2018 Blackboard Inc.
* @copyright Copyright (c) 2018 Blackboard Inc. (http://www.blackboard.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

Expand Down
4 changes: 2 additions & 2 deletions classes/componentsupport/interfaces/html_content.php
View file
Expand Up @@ -16,8 +16,8 @@

/**
* Interface for supporting html content.
* @author Guy Thomas <gthomas@moodlerooms.com>
* @copyright Copyright (c) 2018 Blackboard Inc.
* @author Guy Thomas <citricity@gmail.com>
* @copyright Copyright (c) 2018 Blackboard Inc. (http://www.blackboard.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

Expand Down
4 changes: 2 additions & 2 deletions classes/componentsupport/label_component.php
View file
Expand Up @@ -16,7 +16,7 @@

/**
* Support for course content
* @copyright Copyright (c) 2018 Blackboard Inc.
* @copyright Copyright (c) 2018 Blackboard Inc. (http://www.blackboard.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

Expand All @@ -30,7 +30,7 @@

/**
* Html content support for labels.
* @copyright Copyright (c) 2018 Blackboard Inc.
* @copyright Copyright (c) 2018 Blackboard Inc. (http://www.blackboard.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class label_component extends component_base implements iface_html_content {
Expand Down
4 changes: 2 additions & 2 deletions classes/componentsupport/lesson_component.php
View file
Expand Up @@ -18,7 +18,7 @@
* Html file replacement support for core lessons.
* @package tool_ally
* @author David Castro <david.castro@blackboard.com>
* @copyright Copyright (c) 2017 Blackboard Inc.
* @copyright Copyright (c) 2017 Blackboard Inc. (http://www.blackboard.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

Expand All @@ -33,7 +33,7 @@
* Html file replacement support for core lessons.
* @package tool_ally
* @author David Castro <david.castro@blackboard.com>
* @copyright Copyright (c) 2017 Blackboard Inc.
* @copyright Copyright (c) 2017 Blackboard Inc. (http://www.blackboard.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class lesson_component extends file_component_base {
Expand Down
8 changes: 4 additions & 4 deletions classes/componentsupport/qtype_ddmatch_component.php
View file
Expand Up @@ -17,8 +17,8 @@
/**
* Html file replacement support for sub question type qtype_ddmatch
* @package tool_ally
* @author Guy Thomas <gthomas@moodlerooms.com>
* @copyright Copyright (c) 2017 Blackboard Inc.
* @author Guy Thomas <citricity@gmail.com>
* @copyright Copyright (c) 2017 Blackboard Inc. (http://www.blackboard.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace tool_ally\componentsupport;
Expand All @@ -32,8 +32,8 @@
/**
* Html file replacement support for sub question type qtype_ddmatch
* @package tool_ally
* @author Guy Thomas <gthomas@moodlerooms.com>
* @copyright Copyright (c) 2017 Blackboard Inc.
* @author Guy Thomas <citricity@gmail.com>
* @copyright Copyright (c) 2017 Blackboard Inc. (http://www.blackboard.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class qtype_ddmatch_component extends question_component {
Expand Down

0 comments on commit b26d001

Please sign in to comment.