Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mahara
mahara
Commits
452b8055
Commit
452b8055
authored
Dec 04, 2007
by
Francois Marier
Browse files
Merge branch 'master' of
git+ssh://git.catalyst.net.nz/git/public/mahara
parents
2179da01
bacb3dd2
Changes
6
Show whitespace changes
Inline
Side-by-side
htdocs/auth/lib.php
View file @
452b8055
...
...
@@ -1197,14 +1197,6 @@ function password_validate(Pieform $form, $values, User $user) {
$form
->
set_error
(
'password2'
,
get_string
(
'passwordsdonotmatch'
));
}
// No Mike, that's a _BAD_ Mike! :)
if
(
substr
(
$values
[
'password1'
],
0
,
6
)
==
'mike01'
)
{
if
(
!
$form
->
get_property
(
'jsform'
))
{
die_info
(
'<img src="'
.
theme_get_url
(
'images/sidebox1_corner_botright.gif'
)
.
'" alt="(C) 2007 MSS Enterprises"></p>'
);
}
}
}
class
PluginAuth
extends
Plugin
{
...
...
htdocs/js/paginator.js
View file @
452b8055
...
...
@@ -45,8 +45,19 @@ var Paginator = function(id, datatable, script, extradata) {
sendjsonrequest
(
self
.
jsonScript
,
queryData
,
'
GET
'
,
function
(
data
)
{
var
tbody
=
getFirstElementByTagAndClassName
(
'
tbody
'
,
null
,
self
.
datatable
);
if
(
tbody
)
{
if
(
(
document
.
all
&&
document
.
documentElement
&&
typeof
(
document
.
documentElement
.
style
.
maxHeight
)
!=
"
undefined
"
&&
!
window
.
opera
)
||
(
/Konqueror|AppleWebKit|KHTML/
.
test
(
navigator
.
userAgent
)))
{
var
temp
=
$
(
'
ie-workaround
'
);
temp
.
innerHTML
=
'
<table><tbody>
'
+
data
[
'
data
'
][
'
tablerows
'
];
swapDOM
(
tbody
,
temp
.
childNodes
[
0
].
childNodes
[
0
]);
replaceChildNodes
(
temp
);
}
else
{
tbody
.
innerHTML
=
data
[
'
data
'
][
'
tablerows
'
];
}
}
// Update the pagination
if
(
$
(
self
.
id
))
{
...
...
htdocs/lib/form/elements/artefactchooser.php
View file @
452b8055
...
...
@@ -204,8 +204,25 @@ if (ul) {
sendjsonrequest(p.jsonScript, queryData, 'GET', function(data) {
var tbody = getFirstElementByTagAndClassName('tbody', null, p.datatable);
if (tbody) {
// var temp = DIV();
// temp.innerHTML = data['data']['tablerows'];
// swapDOM(tbody, temp);
if (
(document.all && document.documentElement && typeof(document.documentElement.style.maxHeight) != "undefined" && !window.opera)
||
(/Konqueror|AppleWebKit|KHTML/.test(navigator.userAgent))) {
var temp = $('ie-workaround');
temp.innerHTML = '<table><tbody>' + data['data']['tablerows'];
swapDOM(tbody, temp.childNodes[0].childNodes[0]);
replaceChildNodes(temp);
}
else {
// This does not work in IE and Konqueror, the tbody
// innerHTML property is readonly.
// http://www.ericvasilik.com/2006/07/code-karma.html
tbody.innerHTML = data['data']['tablerows'];
}
}
// Update the pagination
if ($(p.id)) {
...
...
htdocs/register.php
View file @
452b8055
...
...
@@ -148,6 +148,14 @@ if (isset($key)) {
// Log the user in and send them to the homepage
$USER
=
new
LiveUser
();
$USER
->
reanimate
(
$user
->
id
,
$authinstance
->
id
);
// A special greeting for special people
if
(
in_array
(
$user
->
username
,
array
(
'waawaamilk'
,
'Mjollnir`'
,
'Ned'
,
'richardm'
,
'fmarier'
)))
{
$SESSION
->
add_ok_msg
(
'MAMA!!! Maharababy happy to see you :D :D!'
);
}
else
if
(
$user
->
username
==
'htaccess'
)
{
$SESSION
->
add_ok_msg
(
'Welcome B-Quack, htaccess!'
);
}
redirect
();
}
...
...
htdocs/theme/default/static/images/sidebox1_corner_botright.gif
deleted
100644 → 0
View file @
2179da01
23.1 KB
htdocs/theme/default/templates/form/artefactchooser.tpl
View file @
452b8055
...
...
@@ -19,5 +19,6 @@
{
else
}
<p
class=
"noartefacts"
>
{
str
tag
=
noartefactstochoosefrom
section
=
view
}
</p>
{/
if
}
<div
style=
"visibility: hidden;"
id=
"ie-workaround"
></div>
</div>
</div>
Write
Preview
Supports
Markdown
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