Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
mahara
mahara
Commits
b7192af4
Commit
b7192af4
authored
Jun 29, 2007
by
Donal McMullan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow roaming to non-canonical (promiscuous) remote hosts.
parent
de4c4500
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
29 additions
and
11 deletions
+29
-11
htdocs/api/xmlrpc/lib.php
htdocs/api/xmlrpc/lib.php
+8
-3
htdocs/auth/xmlrpc/lang/en.utf8/help/forms/auth_config.theyautocreateusers.html
...g/en.utf8/help/forms/auth_config.theyautocreateusers.html
+2
-0
htdocs/auth/xmlrpc/lang/en.utf8/help/forms/auth_config.weautocreateusers.html
...ang/en.utf8/help/forms/auth_config.weautocreateusers.html
+0
-0
htdocs/auth/xmlrpc/lib.php
htdocs/auth/xmlrpc/lib.php
+17
-7
htdocs/lang/en.utf8/auth.php
htdocs/lang/en.utf8/auth.php
+2
-1
No files found.
htdocs/api/xmlrpc/lib.php
View file @
b7192af4
...
...
@@ -284,8 +284,10 @@ function get_service_providers($instance) {
'
.
$dbprefix
.
'host h,
'
.
$dbprefix
.
'application a
WHERE
aic.value = ? AND
aic.field = \'parent\' AND
((aic.value = 1 AND
aic.field = \'theyautocreateusers\' ) OR
(aic.value = ? AND
aic.field = \'parent\')) AND
aic.instance = aic2.instance AND
aic2.field = \'wwwroot\' AND
...
...
@@ -447,6 +449,9 @@ function get_peer($wwwroot) {
return
$peers
[
$wwwroot
];
}
/**
* Check that the signature has been signed by the remote host.
*/
function
xmldsig_envelope_strip
(
&
$xml
)
{
$signature
=
base64_decode
(
$xml
->
Signature
->
SignatureValue
);
...
...
@@ -668,7 +673,7 @@ class OpenSslRepo {
}
/**
* Sing
e
lton function keeps us from generating multiple instances of this
* Singl
e
ton function keeps us from generating multiple instances of this
* class
*
* @return object The class instance
...
...
htdocs/auth/xmlrpc/lang/en.utf8/help/forms/auth_config.theyautocreateusers.html
0 → 100644
View file @
b7192af4
<h3>
Auto-create users
</h3>
<p>
If a user jumps over to the remote site, will that site automatically create a new user record for our user?
</p>
\ No newline at end of file
htdocs/auth/xmlrpc/lang/en.utf8/help/forms/auth_config.autocreateusers.html
→
htdocs/auth/xmlrpc/lang/en.utf8/help/forms/auth_config.
we
autocreateusers.html
View file @
b7192af4
File moved
htdocs/auth/xmlrpc/lib.php
View file @
b7192af4
...
...
@@ -58,7 +58,8 @@ class AuthXmlrpc extends Auth {
$this
->
config
[
'xmlrpcserverurl'
]
=
''
;
$this
->
config
[
'changepasswordurl'
]
=
''
;
$this
->
config
[
'updateuserinfoonlogin'
]
=
1
;
$this
->
config
[
'autocreateusers'
]
=
0
;
$this
->
config
[
'weautocreateusers'
]
=
0
;
$this
->
config
[
'theyautocreateusers'
]
=
0
;
$this
->
config
[
'wessoout'
]
=
1
;
$this
->
config
[
'theyssoin'
]
=
0
;
$this
->
config
[
'parent'
]
=
null
;
...
...
@@ -134,7 +135,7 @@ class AuthXmlrpc extends Auth {
$update
=
true
;
}
}
catch
(
Exception
$e
)
{
if
(
!
empty
(
$this
->
config
[
'autocreateusers'
]))
{
if
(
!
empty
(
$this
->
config
[
'
we
autocreateusers'
]))
{
$user
=
new
User
;
$create
=
true
;
}
else
{
...
...
@@ -350,7 +351,8 @@ class PluginAuthXmlrpc extends PluginAuth {
'appname'
=>
''
,
'portno'
=>
80
,
'updateuserinfoonlogin'
=>
0
,
'autocreateusers'
=>
0
,
'weautocreateusers'
=>
0
,
'theyautocreateusers'
=>
0
,
'wessoout'
=>
0
,
'theyssoin'
=>
0
,
'parent'
=>
null
...
...
@@ -547,13 +549,20 @@ class PluginAuthXmlrpc extends PluginAuth {
'help'
=>
true
);
$elements
[
'autocreateusers'
]
=
array
(
$elements
[
'
we
autocreateusers'
]
=
array
(
'type'
=>
'checkbox'
,
'title'
=>
get_string
(
'autocreateusers'
,
'auth'
),
'defaultvalue'
=>
self
::
$default_config
[
'autocreateusers'
],
'title'
=>
get_string
(
'
we
autocreateusers'
,
'auth'
),
'defaultvalue'
=>
self
::
$default_config
[
'
we
autocreateusers'
],
'help'
=>
true
);
$elements
[
'theyautocreateusers'
]
=
array
(
'type'
=>
'checkbox'
,
'title'
=>
get_string
(
'theyautocreateusers'
,
'auth'
),
'defaultvalue'
=>
self
::
$default_config
[
'theyautocreateusers'
],
'help'
=>
true
);
return
array
(
'elements'
=>
$elements
,
'renderer'
=>
'table'
...
...
@@ -635,7 +644,8 @@ class PluginAuthXmlrpc extends PluginAuth {
self
::
$default_config
=
array
(
'wwwroot'
=>
$values
[
'wwwroot'
],
'updateuserinfoonlogin'
=>
$values
[
'updateuserinfoonlogin'
],
'autocreateusers'
=>
$values
[
'autocreateusers'
],
'weautocreateusers'
=>
$values
[
'weautocreateusers'
],
'theyautocreateusers'
=>
$values
[
'theyautocreateusers'
],
'parent'
=>
$values
[
'parent'
],
'wessoout'
=>
$values
[
'wessoout'
],
'theyssoin'
=>
$values
[
'theyssoin'
]
...
...
htdocs/lang/en.utf8/auth.php
View file @
b7192af4
...
...
@@ -47,7 +47,8 @@ $string['shortname'] = 'Short name for your site';
$string
[
'name'
]
=
'Site name'
;
$string
[
'nodataforinstance'
]
=
'Could not find data for auth instance '
;
$string
[
'authname'
]
=
'Authority name'
;
$string
[
'autocreateusers'
]
=
'Auto-create users'
;
$string
[
'weautocreateusers'
]
=
'We auto-create users'
;
$string
[
'theyautocreateusers'
]
=
'They auto-create users'
;
$string
[
'parent'
]
=
'Parent authority'
;
$string
[
'wessoout'
]
=
'We SSO out'
;
$string
[
'theyssoin'
]
=
'They SSO in'
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment