Commit 851bf10f authored by Donal McMullan's avatar Donal McMullan

Replace tabs with spaces in introduced code

parent ae72ad34
......@@ -55,10 +55,10 @@ class Dispatcher {
if ($payload_signed && $payload_encrypted) {
// The remote server's credentials checked out.
// You might want to enable some methods for unsigned/unencrypted
// transport
// You might want to enable some methods for unsigned/unencrypted
// transport
} else {
// For now, we throw an exception
// For now, we throw an exception
throw new XmlrpcServerException('The signature on your message was not valid', 6005);
}
......
......@@ -285,7 +285,7 @@ function get_service_providers($instance) {
'.$dbprefix.'application a
WHERE
((aic.value = 1 AND
aic.field = \'theyautocreateusers\' ) OR
aic.field = \'theyautocreateusers\' ) OR
(aic.value = ? AND
aic.field = \'parent\')) AND
......
......@@ -381,14 +381,14 @@ class LiveUser extends User {
if ($username == 'admin' && $institution == 'mahara') {
// it's our Admin. Do the new auth tables exist yet?
if (get_config('version') < 2007062900) {
// Get the user - be picky about what we accept, i.e. username, id and institution
// must all match
$user = get_record('usr', 'institution','mahara','username','admin','id','1');
// Get the user - be picky about what we accept, i.e. username, id and institution
// must all match
$user = get_record('usr', 'institution','mahara','username','admin','id','1');
if ($user->salt == null) {
// This allows "plaintext" passwords, which are eaiser for an admin to
// create by hacking in the database directly. The application does not
// create passwords in this form.
$this->authenticate($user);
$this->authenticate($user);
return $password == $user->password;
}
......@@ -405,7 +405,7 @@ class LiveUser extends User {
return true;
}
return false;
}
}
}
$users = get_records_select_array('usr', 'LOWER(username) = ? AND institution = ?', array($username, $institution), 'authinstance', '*');
......
......@@ -121,8 +121,8 @@
</TABLE>
<TABLE NAME="sso_session">
<FIELDS>
<FIELD NAME="userid" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false" />
<FIELD NAME="instanceid" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false" />
<FIELD NAME="userid" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false" />
<FIELD NAME="instanceid" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false" />
<FIELD NAME="username" TYPE="char" LENGTH="30" NOTNULL="true"/>
<FIELD NAME="useragent" TYPE="char" LENGTH="40" NOTNULL="true"/>
<FIELD NAME="token" TYPE="char" LENGTH="40" NOTNULL="true"/>
......@@ -214,7 +214,7 @@
</TABLE>
<TABLE NAME="auth_instance_config">
<FIELDS>
<FIELD NAME="instance" TYPE="int" LENGTH="10" NOTNULL="true" />
<FIELD NAME="instance" TYPE="int" LENGTH="10" NOTNULL="true" />
<FIELD NAME="field" TYPE="char" LENGTH="100" NOTNULL="true" />
<FIELD NAME="value" TYPE="text" LENGTH="small" NOTNULL="true" />
</FIELDS>
......
{include file="microheader.tpl"}
<h2>{str tag="adminauthorities" section="admin"}</h2>
<h2>{str tag="adminauthorities" section="admin"}</h2>
{$auth_imap_form}
{$auth_imap_form}
......
......@@ -51,7 +51,7 @@
displayArray[i].childNodes[3].innerHTML += '<a href="" onclick="move_down('+outputArray[i]+'); return false;">[&darr;]</a>'+"\n";
}
if(i != 0) {
displayArray[i].childNodes[3].innerHTML += '<a href="" onclick="move_up('+outputArray[i]+'); return false;">[&uarr;]</a>'+"\n";
displayArray[i].childNodes[3].innerHTML += '<a href="" onclick="move_up('+outputArray[i]+'); return false;">[&uarr;]</a>'+"\n";
}
}
displayArray[i].childNodes[3].innerHTML += '<a href="" onclick="removeAuth('+outputArray[i]+'); return false;">[x]</a>'+"\n";
......@@ -107,11 +107,11 @@
function addinstance() {
var selectedPlugin = document.getElementById('dummySelect').value;
var institution = '{{$institution}}';
if (institution.length == 0) {
alert('Please save the institution details before configuring authentication plugins.');
return false;
}
var institution = '{{$institution}}';
if (institution.length == 0) {
alert('Please save the institution details before configuring authentication plugins.');
return false;
}
if (requiresConfig(selectedPlugin) == 1) {
window.open('addauthority.php?add=1&i={{$institution}}&p=' + selectedPlugin, 'addinstance', 'height=520,width=550,screenx=250,screenY=200,scrollbars=1');
......
</div>
</div>
</div>
<div id="footer" class="micro_footer">
<div class="footerright"><img src="{theme_path location='images/footer_navbg_right.gif'}" border="0" alt=""></div>
</div>
</div>
</div>
</div>
</div>
<div id="footer" class="micro_footer">
<div class="footerright"><img src="{theme_path location='images/footer_navbg_right.gif'}" border="0" alt=""></div>
</div>
</div>
{mahara_performance_info}
</div>
</div>
</body>
</html>
......@@ -27,20 +27,20 @@
<link rel="stylesheet" type="text/css" href="{theme_path location='style/dev.css'}">
<link rel="stylesheet" type="text/css" href="{theme_path location='style/print.css'}" media="print">
<meta http-equiv="Content-type" content="text/html; charset=UTF-8">
<style type="text/css">
{literal}
body { background: white; }
.micro_footer { position: fixed; bottom: 3px; }
{/literal}
</style>
<style type="text/css">
{literal}
body { background: white; }
.micro_footer { position: fixed; bottom: 3px; }
{/literal}
</style>
</head>
<body>
<div id="containerX">
<div id="containerX">
<div id="loading_box" style="display: none;"></div>
<div id="topwrapperX">
<div id="header">
<div class="frX"></div>
<div class="frX"></div>
<div id="logo"><a href="{$WWWROOT}"><img src="{theme_path location='images/logo_mahara.gif'}" border="0" alt=""></a></div>
<h1 class="hiddenStructure"><a href="{$WWWROOT}">{$heading|default:"Mahara"|escape}</a></h1>
</div>
......
......@@ -3,7 +3,7 @@
<ul id="sitemenu">
{foreach from=$data item=peer}
{if $peer.instance != $userauthinstance}
<li class="{cycle values=r0,r1}"><a href="/auth/xmlrpc/jump.php?wr={$peer.wwwroot|escape}&ins={$peer.instance|escape}">{$peer.name}</a></li>
<li class="{cycle values=r0,r1}"><a href="/auth/xmlrpc/jump.php?wr={$peer.wwwroot|escape}&ins={$peer.instance|escape}">{$peer.name}</a></li>
{else}
<li class="{cycle values=r0,r1}"><a href="{$peer.wwwroot}">{$peer.name}</a></li>
{/if}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment