function wfSpecialImagelist()
{
- global $wgUser, $wgOut, $wgLang, $sort;
- global $wpIlMatch, $wpIlSubmit;
-
- $fields = array( 'wpIlMatch' );
- wfCleanFormFields( $fields );
+ global $wgUser, $wgOut, $wgLang, $wgRequest;
+
+ $sort = $wgRequest->getVal( 'sort' );
+ $wpIlMatch = $wgRequest->getText( 'wpIlMatch' );
$sql = "SELECT img_size,img_name,img_user,img_user_text," .
"img_description,img_timestamp FROM image";
$lt = $wgLang->formatNum( "${limit}" );
$sql .= " LIMIT {$limit}";
}
- $wgOut->addHTML( "<p>" . wfMsg( "imglegend" ) . "\n" );
+ $wgOut->addHTML( "<p>" . wfMsg( "imglegend" ) . "</p>\n" );
$text = wfMsg( "imagelisttext",
"<strong>{$lt}</strong>", "<strong>{$st}</strong>" );
- $wgOut->addHTML( "<p>{$text}\n<p>" );
+ $wgOut->addHTML( "<p>{$text}\n</p>" );
$sk = $wgUser->getSkin();
$cap = wfMsg( "ilshowmatch" );
$sub = wfMsg( "ilsubmit" );
$titleObj = Title::makeTitle( NS_SPECIAL, "Imagelist" );
- $action = $titleObj->getURL( "sort=byname&limit={$limit}", true );
+ $action = $titleObj->escapeLocalURL( "sort=byname&limit={$limit}" );
$wgOut->addHTML( "<form id=\"imagesearch\" method=\"post\" action=\"" .
"{$action}\">" .
- "{$cap}: <input type=text size=8 name=\"wpIlMatch\" value=\"\"> " .
- "<input type=submit name=\"wpIlSubmit\" value=\"{$sub}\"></form>" );
-
+ "{$cap}: <input type='text' size='8' name=\"wpIlMatch\" value=\"\" /> " .
+ "<input type='submit' name=\"wpIlSubmit\" value=\"{$sub}\" /></form>" );
$nums = array( 50, 100, 250, 500 );
$here = $wgLang->specialPage( "Imagelist" );
"sort=bysize&limit={$num}" );
}
$text = wfMsg( "showlast", $fill, $bysize );
- $wgOut->addHTML( "{$text}<br>\n" );
+ $wgOut->addHTML( "<p>{$text}<br />\n" );
$fill = "";
$first = true;
"sort=bydate&limit={$num}" );
}
$text = wfMsg( "showlast", $fill, $bydate );
- $wgOut->addHTML( "{$text}<br>\n<p>" );
+ $wgOut->addHTML( "{$text}</p>\n<p>" );
$res = wfQuery( $sql, DB_READ, "wfSpecialImagelist" );
while ( $s = wfFetchObject( $res ) ) {
else { $ul = $sk->makeLink( $wgLang->getNsText(
Namespace::getUser() ) . ":{$ut}", $ut ); }
- $ilink = "<a href=\"" . wfImageUrl( $name ) .
+ $ilink = "<a href=\"" . Image::wfImageUrl( $name ) .
"\">{$name}</a>";
$nb = wfMsg( "nbytes", $wgLang->formatNum( $s->img_size ) );
if ( "" != $s->img_description ) {
$l .= " <em>({$s->img_description})</em>";
}
- $wgOut->addHTML( "{$l}<br>\n" );
+ $wgOut->addHTML( "{$l}<br />\n" );
}
+ $wgOut->addHTML( "</p>" );
wfFreeResult( $res );
}