From fb95ef9ecd43d5791fac3eccae3ae84d0ff9fc86 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Wed, 4 Jan 2012 16:24:16 +0100 Subject: [PATCH] MDL-31017 whitespace clean - take1 --- auth/ldap/config.html | 2 +- auth/shibboleth/README.txt | 10 +++++----- auth/shibboleth/login.php | 8 ++++---- backup/util/settings/backup_setting.class.php | 2 +- backup/util/settings/simpletest/testsettings.php | 4 ++-- backup/util/structure/backup_optigroup.class.php | 2 +- backup/util/ui/backup_ui.class.php | 4 ++-- backup/util/ui/module.js | 22 +++++++++++----------- backup/util/ui/yui/confirmcancel/confirmcancel.js | 4 ++-- 9 files changed, 29 insertions(+), 29 deletions(-) diff --git a/auth/ldap/config.html b/auth/ldap/config.html index 43e4d0ab27c..25c6786b2ba 100644 --- a/auth/ldap/config.html +++ b/auth/ldap/config.html @@ -520,7 +520,7 @@ $yesno = array(get_string('no'), get_string('yes')); ntlmsso_ie_fastpath, false); ?> - + diff --git a/auth/shibboleth/README.txt b/auth/shibboleth/README.txt index 57af63c9871..a343c850e4c 100644 --- a/auth/shibboleth/README.txt +++ b/auth/shibboleth/README.txt @@ -278,8 +278,8 @@ just before the element. -- + Channel="back" + Location="https://#YOUR_MOODLE_HOSTNAME#/moodle/auth/shibboleth/logout.php" /> -- Then restart the Shibboleth daemon and check the log file for errors. If there @@ -300,9 +300,9 @@ Requirements: -- - AuthType shibboleth - ShibRequireSession Off - require shibboleth + AuthType shibboleth + ShibRequireSession Off + require shibboleth -- When using IIS, the same can be achieved by something like: diff --git a/auth/shibboleth/login.php b/auth/shibboleth/login.php index 1591c243e57..0b635acbc9d 100644 --- a/auth/shibboleth/login.php +++ b/auth/shibboleth/login.php @@ -42,12 +42,12 @@ $PAGE->https_required(); set_saml_cookie($selectedIdP); // Redirect to SessionInitiator with entityID as argument - if (isset($IdPs[$selectedIdP][1]) && !empty($IdPs[$selectedIdP][1])){ + if (isset($IdPs[$selectedIdP][1]) && !empty($IdPs[$selectedIdP][1])) { // For Shibbolet 1.x Service Providers - header('Location: '.$IdPs[$selectedIdP][1].'?providerId='. urlencode($selectedIdP) .'&target='. urlencode($CFG->wwwroot.'/auth/shibboleth/index.php')); + header('Location: '.$IdPs[$selectedIdP][1].'?providerId='. urlencode($selectedIdP) .'&target='. urlencode($CFG->wwwroot.'/auth/shibboleth/index.php')); - // For Shibbolet 2.x Service Providers - // header('Location: '.$IdPs[$selectedIdP][1].'?entityID='. urlencode($selectedIdP) .'&target='. urlencode($CFG->wwwroot.'/auth/shibboleth/index.php')); + // For Shibbolet 2.x Service Providers + // header('Location: '.$IdPs[$selectedIdP][1].'?entityID='. urlencode($selectedIdP) .'&target='. urlencode($CFG->wwwroot.'/auth/shibboleth/index.php')); } else { // For Shibbolet 1.x Service Providers diff --git a/backup/util/settings/backup_setting.class.php b/backup/util/settings/backup_setting.class.php index 90de0e1a5bd..2d19245fda7 100644 --- a/backup/util/settings/backup_setting.class.php +++ b/backup/util/settings/backup_setting.class.php @@ -49,7 +49,7 @@ abstract class backup_setting extends base_setting implements checksumable { /** * Returns the level of the setting - * + * * @return {int} One of the above constants */ public function get_level() { diff --git a/backup/util/settings/simpletest/testsettings.php b/backup/util/settings/simpletest/testsettings.php index 7bc9e65bac1..fd079cc62c9 100644 --- a/backup/util/settings/simpletest/testsettings.php +++ b/backup/util/settings/simpletest/testsettings.php @@ -145,7 +145,7 @@ class setting_test extends UnitTestCase { $this->assertEqual($e->errorcode, 'incorrect_object_passed'); } restore_error_handler(); - + // Try to change value of locked setting by permission $bs = new mock_base_setting('test', base_setting::IS_BOOLEAN, null, null, base_setting::LOCKED_BY_PERMISSION); try { @@ -448,4 +448,4 @@ function backup_setting_error_handler($errno, $errstr, $errfile, $errline, $errc return false; } throw new backup_setting_exception('incorrect_object_passed'); -} \ No newline at end of file +} diff --git a/backup/util/structure/backup_optigroup.class.php b/backup/util/structure/backup_optigroup.class.php index e4ee2c9ff4f..2469d51d221 100644 --- a/backup/util/structure/backup_optigroup.class.php +++ b/backup/util/structure/backup_optigroup.class.php @@ -47,7 +47,7 @@ class backup_optigroup extends base_optigroup implements processable { public function add_child($element) { if (!($element instanceof backup_optigroup_element)) { // parameter must be backup_optigroup_element if (is_object($element)) { - $found = get_class($element); + $found = get_class($element); } else { $found = 'non object'; } diff --git a/backup/util/ui/backup_ui.class.php b/backup/util/ui/backup_ui.class.php index 91c412f7f7f..d906d7c9fbd 100644 --- a/backup/util/ui/backup_ui.class.php +++ b/backup/util/ui/backup_ui.class.php @@ -137,7 +137,7 @@ class backup_ui extends base_ui { */ public function get_progress_bar() { global $PAGE; - + $stage = self::STAGE_COMPLETE; $currentstage = $this->stage->get_stage(); $items = array(); @@ -190,4 +190,4 @@ class backup_ui extends base_ui { /** * Backup user interface exception. Modelled off the backup_exception class */ -class backup_ui_exception extends base_ui_exception {} \ No newline at end of file +class backup_ui_exception extends base_ui_exception {} diff --git a/backup/util/ui/module.js b/backup/util/ui/module.js index b6cd3140a98..c6dac65e0e7 100644 --- a/backup/util/ui/module.js +++ b/backup/util/ui/module.js @@ -16,7 +16,7 @@ M.core_backup_files_tree = { // XXX: the id in params['contextid'] is current context // request file list, so should be user context params['contextid'] = this.usercontextid; - } + } var scope = this; params['sesskey']=M.cfg.sesskey; var cfg = { @@ -38,14 +38,14 @@ M.core_backup_files_tree = { var n = new YAHOO.widget.TextNode(info, node, false); YAHOO.util.Event.addListener(n.labelElId, "click", function(e) { YAHOO.util.Event.preventDefault(e); - }); + }); n.isLeaf = false; } else { var params = data[i].params; if (params['filearea'] == 'backup' && params['component'] == 'user') { // XXX: display the restore link, so should be context id params['contextid'] = scope.currentcontextid; - } + } params.action = 'choosebackupfile'; var restoreurl = M.cfg.wwwroot+'/backup/restorefile.php?'+build_querystring(params); var info = {label: data[i].filename, 'href': data[i].url, 'restoreurl': restoreurl}; @@ -89,14 +89,14 @@ M.core_backup_files_tree = { // prevent link YAHOO.util.Event.addListener(node.labelElId, "click", function(e) { YAHOO.util.Event.preventDefault(e); - }); + }); } else { node.isLeaf = true; } } tree.render(); this.y3 = Y; - }, + }, dynload: function(node, oncompletecb) { M.core_backup_files_tree.request(node.href, node, oncompletecb); }, @@ -115,7 +115,7 @@ M.core_backup_files_tree = { YAHOO.widget.RestoreNode = function(oData, oParent, expanded) { - if (oData) { + if (oData) { if (YAHOO.lang.isString(oData)) { oData = { label: oData }; } @@ -132,10 +132,10 @@ YAHOO.extend(YAHOO.widget.RestoreNode, YAHOO.widget.TextNode, { href: null, target: "_blank", _type: "RestoreNode", - setUpLabel: function(oData) { + setUpLabel: function(oData) { if (YAHOO.lang.isString(oData)) { - oData = { - label: oData + oData = { + label: oData }; } else { if (oData.style) { @@ -147,7 +147,7 @@ YAHOO.extend(YAHOO.widget.RestoreNode, YAHOO.widget.TextNode, { this.restoreurl = oData.restoreurl; this.labelElId = "ygtvlabelel" + this.index; }, - getContentHtml: function() { + getContentHtml: function() { var sb = []; sb[sb.length] = '