mirror of
https://github.com/moodle/moodle.git
synced 2025-06-05 07:35:09 +02:00
MDL-31017 whitespace clean - take1
This commit is contained in:
Eloy Lafuente (stronk7)
parent
2117dcb591
commit
fb95ef9ecd
@ -520,7 +520,7 @@ $yesno = array(get_string('no'), get_string('yes'));
|
||||
<?php echo html_writer::select($yesno, 'ntlmsso_ie_fastpath', $config->ntlmsso_ie_fastpath, false); ?>
|
||||
</td>
|
||||
<td>
|
||||
<?php print_string('auth_ntlmsso_ie_fastpath', 'auth_ldap') ?>
|
||||
<?php print_string('auth_ntlmsso_ie_fastpath', 'auth_ldap') ?>
|
||||
</td>
|
||||
</tr>
|
||||
<tr valign="top">
|
||||
|
||||
@ -278,8 +278,8 @@ just before the <MetadataProvider> element.
|
||||
|
||||
--
|
||||
<Notify
|
||||
Channel="back"
|
||||
Location="https://#YOUR_MOODLE_HOSTNAME#/moodle/auth/shibboleth/logout.php" />
|
||||
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:
|
||||
|
||||
--
|
||||
<Directory /path/to/moodle/auth/shibboleth/logout.php>
|
||||
AuthType shibboleth
|
||||
ShibRequireSession Off
|
||||
require shibboleth
|
||||
AuthType shibboleth
|
||||
ShibRequireSession Off
|
||||
require shibboleth
|
||||
</Directory>
|
||||
--
|
||||
When using IIS, the same can be achieved by something like:
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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() {
|
||||
|
||||
@ -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');
|
||||
}
|
||||
}
|
||||
|
||||
@ -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';
|
||||
}
|
||||
|
||||
@ -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 {}
|
||||
class backup_ui_exception extends base_ui_exception {}
|
||||
|
||||
@ -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] = '<a';
|
||||
sb[sb.length] = ' id="' + this.labelElId + '"';
|
||||
@ -155,7 +155,7 @@ YAHOO.extend(YAHOO.widget.RestoreNode, YAHOO.widget.TextNode, {
|
||||
if (this.href) {
|
||||
sb[sb.length] = ' href="' + this.href + '"';
|
||||
sb[sb.length] = ' target="' + this.target + '"';
|
||||
}
|
||||
}
|
||||
if (this.title) {
|
||||
sb[sb.length] = ' title="' + this.title + '"';
|
||||
}
|
||||
|
||||
@ -4,7 +4,7 @@ YUI.add('moodle-backup-confirmcancel', function(Y) {
|
||||
M.core_backup = M.core_backup || {};
|
||||
/**
|
||||
* Adds confirmation dialogues to the cancel buttons on the page.
|
||||
*
|
||||
*
|
||||
* @param {object} config
|
||||
*/
|
||||
M.core_backup.watch_cancel_buttons = function(config) {
|
||||
@ -27,4 +27,4 @@ M.core_backup.watch_cancel_buttons = function(config) {
|
||||
});
|
||||
}
|
||||
|
||||
}, '@VERSION@', {'requires':['base','node','node-event-simulate','moodle-enrol-notification']});
|
||||
}, '@VERSION@', {'requires':['base','node','node-event-simulate','moodle-enrol-notification']});
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user