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
cab7d129
Commit
cab7d129
authored
Dec 12, 2006
by
Nigel McNie
Committed by
Nigel McNie
Dec 12, 2006
Browse files
More munging in the step 4 replier.
parent
326c9f05
Changes
1
Hide whitespace changes
Inline
Side-by-side
htdocs/view/create4.json.php
View file @
cab7d129
...
@@ -48,11 +48,18 @@ switch ($type) {
...
@@ -48,11 +48,18 @@ switch ($type) {
$userdata
=
get_user_results
(
$query
,
$limit
,
$offset
);
$userdata
=
get_user_results
(
$query
,
$limit
,
$offset
);
$groupdata
=
get_group_results
(
$query
,
$limit
,
$offset
);
$groupdata
=
get_group_results
(
$query
,
$limit
,
$offset
);
$resultdata
=
array
();
$resultdata
=
array
();
$i
=
0
;
foreach
(
$userdata
[
'data'
]
as
$result
)
{
foreach
(
$userdata
[
'data'
]
as
$result
)
{
$i
++
;
$resultdata
[]
=
$result
;
$resultdata
[]
=
$result
;
}
}
foreach
(
$groupdata
[
'data'
]
as
$result
)
{
if
(
$groupdata
[
'data'
])
{
$resultdata
[]
=
$result
;
foreach
(
$groupdata
[
'data'
]
as
$result
)
{
if
(
$i
++
>=
$limit
)
{
break
;
}
$resultdata
[]
=
$result
;
}
}
}
$data
=
array
(
$data
=
array
(
'count'
=>
$userdata
[
'count'
]
+
$groupdata
[
'count'
],
'count'
=>
$userdata
[
'count'
]
+
$groupdata
[
'count'
],
...
@@ -88,11 +95,13 @@ function get_user_results($query, $limit, $offset) {
...
@@ -88,11 +95,13 @@ function get_user_results($query, $limit, $offset) {
function
get_group_results
(
$query
,
$limit
,
$offset
)
{
function
get_group_results
(
$query
,
$limit
,
$offset
)
{
$data
=
search_group
(
$query
,
$limit
,
$offset
);
$data
=
search_group
(
$query
,
$limit
,
$offset
);
foreach
(
$data
[
'data'
]
as
&
$result
)
{
if
(
$data
[
'data'
])
{
unset
(
$result
->
owner
);
foreach
(
$data
[
'data'
]
as
&
$result
)
{
unset
(
$result
->
description
);
unset
(
$result
->
owner
);
unset
(
$result
->
ctime
);
unset
(
$result
->
description
);
unset
(
$result
->
mtime
);
unset
(
$result
->
ctime
);
unset
(
$result
->
mtime
);
}
}
}
return
$data
;
return
$data
;
...
...
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