Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Marcus Andersson
aurweb
Commits
b18fb08d
Commit
b18fb08d
authored
May 30, 2010
by
Lukas Fleischer
Committed by
Loui Chang
Jun 04, 2010
Browse files
Add sorting by "Voted" and "Notify" fields
Signed-off-by:
Loui Chang
<
louipc.ist@gmail.com
>
parent
290c4360
Changes
3
Hide whitespace changes
Inline
Side-by-side
web/lib/pkgfuncs.inc
View file @
b18fb08d
...
...
@@ -515,32 +515,46 @@ function pkg_search_page($SID="") {
$order
=
$_GET
[
"SO"
]
==
'd'
?
'DESC'
:
'ASC'
;
$q_sort
=
"ORDER BY Name "
.
$order
.
", LocationID ASC, CategoryID DESC "
;
switch
(
$_GET
[
"SB"
])
{
case
'c'
:
$q
.
=
"ORDER BY CategoryID "
.
$order
.
", Name ASC, LocationID ASC "
;
$q
_sort
=
"ORDER BY CategoryID "
.
$order
.
", Name ASC, LocationID ASC "
;
$_GET
[
"SB"
]
=
'c'
;
break
;
case
'l'
:
$q
.
=
"ORDER BY LocationID "
.
$order
.
", Name ASC, CategoryID DESC "
;
$q
_sort
=
"ORDER BY LocationID "
.
$order
.
", Name ASC, CategoryID DESC "
;
$_GET
[
"SB"
]
=
'l'
;
break
;
case
'v'
:
$q
.
=
"ORDER BY NumVotes "
.
$order
.
", Name ASC, CategoryID DESC "
;
$q
_sort
=
"ORDER BY NumVotes "
.
$order
.
", Name ASC, CategoryID DESC "
;
$_GET
[
"SB"
]
=
'v'
;
break
;
case
'w'
:
if
(
$SID
)
{
$q_sort
=
"ORDER BY Voted "
.
$order
.
", Name ASC, CategoryID DESC "
;
}
$_GET
[
"SB"
]
=
'w'
;
break
;
case
'o'
:
if
(
$SID
)
{
$q_sort
=
"ORDER BY Notify "
.
$order
.
", Name ASC, CategoryID DESC "
;
}
$_GET
[
"SB"
]
=
'o'
;
break
;
case
'm'
:
$q
.
=
"ORDER BY Maintainer "
.
$order
.
", Name ASC, LocationID ASC "
;
$q
_sort
=
"ORDER BY Maintainer "
.
$order
.
", Name ASC, LocationID ASC "
;
$_GET
[
"SB"
]
=
'm'
;
break
;
case
'a'
:
$q
.
=
"ORDER BY GREATEST(SubmittedTS,ModifiedTS) "
.
$order
.
", Name ASC, LocationID ASC "
;
$q
_sort
=
"ORDER BY GREATEST(SubmittedTS,ModifiedTS) "
.
$order
.
", Name ASC, LocationID ASC "
;
$_GET
[
"SB"
]
=
'a'
;
break
;
default
:
$q
.
=
"ORDER BY Name "
.
$order
.
", LocationID ASC, CategoryID DESC "
;
break
;
}
$q
.
=
$q_sort
;
$q
.
=
"LIMIT "
.
$_GET
[
"O"
]
.
", "
.
$_GET
[
"PP"
];
$result
=
db_query
(
$q
,
$dbh
);
...
...
web/template/pkg_search_form.php
View file @
b18fb08d
...
...
@@ -56,7 +56,7 @@
<label>
<?php
print
__
(
"Sort by"
);
?>
</label>
<select
name=
'SB'
>
<?php
$sortby
=
array
(
'n'
=>
'Name'
,
'c'
=>
'Category'
,
'l'
=>
'Location'
,
'v'
=>
'Votes'
,
'm'
=>
'Maintainer'
,
'a'
=>
'Age'
);
$sortby
=
array
(
'n'
=>
'Name'
,
'c'
=>
'Category'
,
'l'
=>
'Location'
,
'v'
=>
'Votes'
,
'w'
=>
'Voted'
,
'o'
=>
'Notify'
,
'm'
=>
'Maintainer'
,
'a'
=>
'Age'
);
foreach
(
$sortby
as
$k
=>
$v
)
:
if
(
$_REQUEST
[
'SB'
]
==
$k
)
:
?>
...
...
web/template/pkg_search_results.php
View file @
b18fb08d
...
...
@@ -29,8 +29,12 @@
</span></th>
<?php
if
(
$SID
)
:
?>
<th
style=
'border-bottom: #666 1px solid; vertical-align: bottom'
><span
class=
'f2'
>
<?php
print
__
(
"Voted"
)
?>
</span></th>
<th
style=
'border-bottom: #666 1px solid; vertical-align: bottom'
><span
class=
'f2'
>
<?php
print
__
(
"Notify"
)
?>
</span></th>
<th
style=
'border-bottom: #666 1px solid; vertical-align: bottom'
><span
class=
'f2'
>
<a
href=
'?
<?php
print
mkurl
(
'SB=w&SO='
.
$SO_next
)
?>
'
>
<?php
print
__
(
"Voted"
)
?>
</a>
</span></th>
<th
style=
'border-bottom: #666 1px solid; vertical-align: bottom'
><span
class=
'f2'
>
<a
href=
'?
<?php
print
mkurl
(
'SB=o&SO='
.
$SO_next
)
?>
'
>
<?php
print
__
(
"Notify"
)
?>
</a>
</span></th>
<?php
endif
;
?>
<th
style=
'border-bottom: #666 1px solid; vertical-align: bottom'
><span
class=
'f2'
>
<?php
print
__
(
"Description"
)
?>
</span></th>
<th
style=
'border-bottom: #666 1px solid; vertical-align: bottom'
><span
class=
'f2'
>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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