james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

<form> -> make_form(), or add auth token manually

Browse Source
This commit is contained in:
Shish 2010-09-22 12:56:19 +01:00
parent 18403a3fa6
commit 1e04df7765
29 changed files with 113 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/admin/theme.php
View File

@ -20,8 +20,7 @@ class AdminPageTheme extends Themelet {
global $user; global $user;
$html = " $html = "
<p><form action='".make_link("admin_utils")."' method='POST'> ".make_form(make_link("admin_utils"))."
".$user->get_auth_html()."
<select name='action'> <select name='action'>
<option value='lowercase all tags'>All tags to lowercase</option> <option value='lowercase all tags'>All tags to lowercase</option>
<option value='recount tag use'>Recount tag use</option> <option value='recount tag use'>Recount tag use</option>

15
contrib/artists/theme.php
View File

@ -21,38 +21,45 @@ class ArtistsTheme extends Themelet {
if($mode == "neutral"){ if($mode == "neutral"){
$html = "<form method='post' action='".make_link("artist/new_artist")."'> $html = "<form method='post' action='".make_link("artist/new_artist")."'>
".$user->get_auth_html()."
<input type='submit' name='edit' id='edit' value='New Artist'/> <input type='submit' name='edit' id='edit' value='New Artist'/>
</form>"; </form>";
} }
if($mode == "editor"){ if($mode == "editor"){
$html = "<form method='post' action='".make_link("artist/new_artist")."'> $html = "<form method='post' action='".make_link("artist/new_artist")."'>
".$user->get_auth_html()."
<input type='submit' name='edit' id='edit' value='New Artist'/> <input type='submit' name='edit' id='edit' value='New Artist'/>
</form> </form>
<form method='post' action='".make_link("artist/edit_artist")."'> <form method='post' action='".make_link("artist/edit_artist")."'>
".$user->get_auth_html()."
<input type='submit' name='edit' id='edit' value='Edit Artist'/> <input type='submit' name='edit' id='edit' value='Edit Artist'/>
<input type='hidden' name='artist_id' value='".$artistID."'> <input type='hidden' name='artist_id' value='".$artistID."'>
</form>"; </form>";
if($is_admin){ if($is_admin){
$html .= "<form method='post' action='".make_link("artist/nuke_artist")."'> $html .= "<form method='post' action='".make_link("artist/nuke_artist")."'>
".$user->get_auth_html()."
<input type='submit' name='edit' id='edit' value='Delete Artist'/> <input type='submit' name='edit' id='edit' value='Delete Artist'/>
<input type='hidden' name='artist_id' value='".$artistID."'> <input type='hidden' name='artist_id' value='".$artistID."'>
</form>"; </form>";
} }
$html .= "<form method='post' action='".make_link("artist/add_alias")."'> $html .= "<form method='post' action='".make_link("artist/add_alias")."'>
".$user->get_auth_html()."
<input type='submit' name='edit' id='edit' value='Add Alias'/> <input type='submit' name='edit' id='edit' value='Add Alias'/>
<input type='hidden' name='artist_id' value='".$artistID."'> <input type='hidden' name='artist_id' value='".$artistID."'>
</form> </form>
<form method='post' action='".make_link("artist/add_member")."'> <form method='post' action='".make_link("artist/add_member")."'>
".$user->get_auth_html()."
<input type='submit' name='edit' id='edit' value='Add Member'/> <input type='submit' name='edit' id='edit' value='Add Member'/>
<input type='hidden' name='artist_id' value='".$artistID."'> <input type='hidden' name='artist_id' value='".$artistID."'>
</form> </form>
<form method='post' action='".make_link("artist/add_url")."'> <form method='post' action='".make_link("artist/add_url")."'>
".$user->get_auth_html()."
<input type='submit' name='edit' id='edit' value='Add Url'/> <input type='submit' name='edit' id='edit' value='Add Url'/>
<input type='hidden' name='artist_id' value='".$artistID."'> <input type='hidden' name='artist_id' value='".$artistID."'>
</form>"; </form>";
@ -102,6 +109,7 @@ class ArtistsTheme extends Themelet {
$html = $html =
' '
<form method="POST" action="'.make_link("artist/edited/".$artist['id']).'"> <form method="POST" action="'.make_link("artist/edited/".$artist['id']).'">
'.$user->get_auth_html().'
<table> <table>
<tr><td>Name:</td><td><input type="text" name="name" value="'.$artistName.'" /> <tr><td>Name:</td><td><input type="text" name="name" value="'.$artistName.'" />
<input type="hidden" name="id" value="'.$artistID.'" /></td></tr> <input type="hidden" name="id" value="'.$artistID.'" /></td></tr>
@ -127,6 +135,7 @@ class ArtistsTheme extends Themelet {
global $page; global $page;
$html = "<form action=".make_link("artist/create")." method='POST'> $html = "<form action=".make_link("artist/create")." method='POST'>
".$user->get_auth_html()."
<table> <table>
<tr><td>Name:</td><td><input type='text' name='name' /></td></tr> <tr><td>Name:</td><td><input type='text' name='name' /></td></tr>
<tr><td>Aliases:</td><td><input type='text' name='aliases' /></td></tr> <tr><td>Aliases:</td><td><input type='text' name='aliases' /></td></tr>
@ -223,6 +232,7 @@ class ArtistsTheme extends Themelet {
{ {
$html = $html =
'<form method="POST" action='.make_link("artist/alias/add").'> '<form method="POST" action='.make_link("artist/alias/add").'>
'.$user->get_auth_html().'
<table> <table>
<tr><td>Alias:</td><td><input type="text" name="aliases" /> <tr><td>Alias:</td><td><input type="text" name="aliases" />
<input type="hidden" name="artistID" value='.$artistID.' /></td></tr> <input type="hidden" name="artistID" value='.$artistID.' /></td></tr>
@ -238,6 +248,7 @@ class ArtistsTheme extends Themelet {
{ {
$html = $html =
' <form method="POST" action='.make_link("artist/member/add").'> ' <form method="POST" action='.make_link("artist/member/add").'>
'.$user->get_auth_html().'
<table> <table>
<tr><td>Members:</td><td><input type="text" name="members" /> <tr><td>Members:</td><td><input type="text" name="members" />
<input type="hidden" name="artistID" value='.$artistID.' /></td></tr> <input type="hidden" name="artistID" value='.$artistID.' /></td></tr>
@ -254,6 +265,7 @@ class ArtistsTheme extends Themelet {
{ {
$html = $html =
' <form method="POST" action='.make_link("artist/url/add").'> ' <form method="POST" action='.make_link("artist/url/add").'>
'.$user->get_auth_html().'
<table> <table>
<tr><td>URL:</td><td><textarea name="urls"></textarea> <tr><td>URL:</td><td><textarea name="urls"></textarea>
<input type="hidden" name="artistID" value='.$artistID.' /></td></tr> <input type="hidden" name="artistID" value='.$artistID.' /></td></tr>
@ -271,6 +283,7 @@ class ArtistsTheme extends Themelet {
$html = $html =
' '
<form method="POST" action="'.make_link("artist/alias/edited/".$alias['id']).'"> <form method="POST" action="'.make_link("artist/alias/edited/".$alias['id']).'">
'.$user->get_auth_html().'
<label for="alias">Alias:</label> <label for="alias">Alias:</label>
<input type="text" name="alias" value="'.$alias['alias'].'" /> <input type="text" name="alias" value="'.$alias['alias'].'" />
<input type="hidden" name="aliasID" value="'.$alias['id'].'" /> <input type="hidden" name="aliasID" value="'.$alias['id'].'" />
@ -287,6 +300,7 @@ class ArtistsTheme extends Themelet {
$html = $html =
' '
<form method="POST" action="'.make_link("artist/url/edited/".$url['id']).'"> <form method="POST" action="'.make_link("artist/url/edited/".$url['id']).'">
'.$user->get_auth_html().'
<label for="url">URL:</label> <label for="url">URL:</label>
<input type="text" name="url" value="'.$url['url'].'" /> <input type="text" name="url" value="'.$url['url'].'" />
<input type="hidden" name="urlID" value="'.$url['id'].'" /> <input type="hidden" name="urlID" value="'.$url['id'].'" />
@ -303,6 +317,7 @@ class ArtistsTheme extends Themelet {
$html = $html =
' '
<form method="POST" action="'.make_link("artist/member/edited/".$member['id']).'"> <form method="POST" action="'.make_link("artist/member/edited/".$member['id']).'">
'.$user->get_auth_html().'
<label for="member">Member name:</label> <label for="member">Member name:</label>
<input type="text" name="name" value="'.$member['name'].'" /> <input type="text" name="name" value="'.$member['name'].'" />
<input type="hidden" name="memberID" value="'.$member['id'].'" /> <input type="hidden" name="memberID" value="'.$member['id'].'" />

3
contrib/blotter/theme.php
View File

@ -45,8 +45,7 @@ class BlotterTheme extends Themelet {
</tr>"; </tr>";
$add_new = " $add_new = "
<tr class='even'> <tr class='even'>
<form action='".make_link("blotter/add")."' method='POST'> ".make_form(make_link("blotter/add"))."
".$user->get_auth_html()."
<td colspan='2'><textarea style='text-align:left;' name='entry_text' rows='2' /></textarea></td> <td colspan='2'><textarea style='text-align:left;' name='entry_text' rows='2' /></textarea></td>
<td><input type='checkbox' name='important' /></td> <td><input type='checkbox' name='important' /></td>
<td><input type='submit' value='Add'></td> <td><input type='submit' value='Add'></td>

3
contrib/bulk_add/theme.php
View File

@ -28,8 +28,7 @@ class BulkAddTheme extends Themelet {
<br>Note: this is the folder as seen by the server -- you need to <br>Note: this is the folder as seen by the server -- you need to
upload via FTP or something first. upload via FTP or something first.
<p><form action='".make_link("bulk_add")."' method='POST'> <p>".make_form(make_link("bulk_add"))."
".$user->get_auth_html()."
Directory to add: <input type='text' name='dir' size='40'> Directory to add: <input type='text' name='dir' size='40'>
<input type='submit' value='Add'> <input type='submit' value='Add'>
</form> </form>

2
contrib/downtime/theme.php
View File

@ -19,6 +19,7 @@ class DowntimeTheme extends Themelet {
$login_link = make_link("user_admin/login"); $login_link = make_link("user_admin/login");
header("HTTP/1.0 503 Service Temporarily Unavailable"); header("HTTP/1.0 503 Service Temporarily Unavailable");
$auth = $user->get_auth_html();
print <<<EOD print <<<EOD
<html> <html>
<head> <head>
@ -34,6 +35,7 @@ class DowntimeTheme extends Themelet {
<h3>Admin Login</h3> <h3>Admin Login</h3>
<div id="login"> <div id="login">
<form action="$login_link" method="POST"> <form action="$login_link" method="POST">
$auth
<table id="login_table" summary="Login Form"> <table id="login_table" summary="Login Form">
<tr> <tr>
<td width="70"><label for="user">Name</label></td> <td width="70"><label for="user">Name</label></td>

2
contrib/et/theme.php
View File

@ -38,8 +38,10 @@ Tags: {$info['stat_tags']}
Applications: {$info['stat_image_tags']} Applications: {$info['stat_image_tags']}
Extensions: {$info['sys_extensions']} Extensions: {$info['sys_extensions']}
EOD; EOD;
$auth = $user->get_auth_html();
$html = <<<EOD $html = <<<EOD
<form action='http://shimmie.shishnet.org/register.php' method='POST'> <form action='http://shimmie.shishnet.org/register.php' method='POST'>
$auth
<input type='hidden' name='registration_api' value='1'> <input type='hidden' name='registration_api' value='1'>
<textarea name='data' rows='20' cols='80'>$data</textarea> <textarea name='data' rows='20' cols='80'>$data</textarea>
<br><input type='submit' value='Click to send to Shish'> <br><input type='submit' value='Click to send to Shish'>

4
contrib/favorites/theme.php
View File

@ -7,8 +7,8 @@ class FavoritesTheme extends Themelet {
$i_image_id = int_escape($image->id); $i_image_id = int_escape($image->id);
$name = $is_favorited ? "unset" : "set"; $name = $is_favorited ? "unset" : "set";
$label = $is_favorited ? "Un-Favorite" : "Favorite"; $label = $is_favorited ? "Un-Favorite" : "Favorite";
$html = "<form action='".make_link("change_favorite")."' method='POST'> $html = "
".$user->get_auth_html()." ".make_form(make_link("change_favorite"))."
<input type='hidden' name='image_id' value='$i_image_id'> <input type='hidden' name='image_id' value='$i_image_id'>
<input type='hidden' name='favorite_action' value='$name'> <input type='hidden' name='favorite_action' value='$name'>
<input type='submit' value='$label'> <input type='submit' value='$label'>

3
contrib/featured/theme.php
View File

@ -11,8 +11,7 @@ class FeaturedTheme extends Themelet {
public function get_buttons_html($image_id) { public function get_buttons_html($image_id) {
global $user; global $user;
return " return "
<form action='".make_link("featured_image/set")."' method='POST'> ".make_form(make_link("featured_image/set"))."
".$user->get_auth_html()."
<input type='hidden' name='image_id' value='$image_id'> <input type='hidden' name='image_id' value='$image_id'>
<input type='submit' value='Feature This'> <input type='submit' value='Feature This'>
</form> </form>

6
contrib/forum/theme.php
View File

@ -21,8 +21,7 @@ class ForumTheme extends Themelet {
{ {
global $config, $user; global $config, $user;
$max_characters = $config->get_int('forumMaxCharsPerPost'); $max_characters = $config->get_int('forumMaxCharsPerPost');
$postUrl = make_link("forum/create"); $html = make_form(make_link("forum/create"));
$html = '<form action="'.$postUrl.'" method="POST">';
if (!is_null($threadTitle)) if (!is_null($threadTitle))
@ -58,8 +57,7 @@ class ForumTheme extends Themelet {
$max_characters = $config->get_int('forumMaxCharsPerPost'); $max_characters = $config->get_int('forumMaxCharsPerPost');
$postUrl = make_link("forum/answer"); $html = make_form(make_link("forum/answer"));
$html = '<form action="'.$postUrl.'" method="POST">';
$html .= '<input type="hidden" name="threadID" value="'.$threadID.'" />'; $html .= '<input type="hidden" name="threadID" value="'.$threadID.'" />';

6
contrib/image_hash_ban/theme.php
View File

@ -30,7 +30,7 @@ class ImageBanTheme extends Themelet {
<td width='30%'>{$ban['hash']}</td> <td width='30%'>{$ban['hash']}</td>
<td>{$ban['reason']}</td> <td>{$ban['reason']}</td>
<td width='10%'> <td width='10%'>
<form action='".make_link("image_hash_ban/remove")."' method='POST'> ".make_form(make_link("image_hash_ban/remove"))."
<input type='hidden' name='hash' value='{$ban['hash']}'> <input type='hidden' name='hash' value='{$ban['hash']}'>
<input type='submit' value='Remove'> <input type='submit' value='Remove'>
</form> </form>
@ -48,7 +48,7 @@ class ImageBanTheme extends Themelet {
<thead><th>Hash</th><th>Reason</th><th>Action</th></thead> <thead><th>Hash</th><th>Reason</th><th>Action</th></thead>
$h_bans $h_bans
<tfoot><tr> <tfoot><tr>
<form action='".make_link("image_hash_ban/add")."' method='POST'> ".make_form(make_link("image_hash_ban/add"))."
<td><input type='text' name='hash'></td> <td><input type='text' name='hash'></td>
<td><input type='text' name='reason'></td> <td><input type='text' name='reason'></td>
<td><input type='submit' value='Ban'></td> <td><input type='submit' value='Ban'></td>
@ -80,7 +80,7 @@ class ImageBanTheme extends Themelet {
*/ */
public function get_buttons_html(Image $image) { public function get_buttons_html(Image $image) {
$html = " $html = "
<form action='".make_link("image_hash_ban/add")."' method='POST'> ".make_form(make_link("image_hash_ban/add"))."
<input type='hidden' name='hash' value='{$image->hash}'> <input type='hidden' name='hash' value='{$image->hash}'>
<input type='hidden' name='image_id' value='{$image->id}'> <input type='hidden' name='image_id' value='{$image->id}'>
<input type='text' name='reason'> <input type='text' name='reason'>

6
contrib/ipban/theme.php
View File

@ -27,8 +27,7 @@ class IPBanTheme extends Themelet {
<td width='10%'>{$ban['banner_name']}</td> <td width='10%'>{$ban['banner_name']}</td>
<td width='15%'>{$end_human}</td> <td width='15%'>{$end_human}</td>
<td width='10%'> <td width='10%'>
<form action='".make_link("ip_ban/remove")."' method='POST'> ".make_form(make_link("ip_ban/remove"))."
".$user->get_auth_html()."
<input type='hidden' name='id' value='{$ban[$prefix.'id']}'> <input type='hidden' name='id' value='{$ban[$prefix.'id']}'>
<input type='submit' value='Remove'> <input type='submit' value='Remove'>
</form> </form>
@ -47,8 +46,7 @@ class IPBanTheme extends Themelet {
<thead><tr><th>IP</th><th>Reason</th><th>By</th><th>Until</th><th>Action</th></tr></thead> <thead><tr><th>IP</th><th>Reason</th><th>By</th><th>Until</th><th>Action</th></tr></thead>
$h_bans $h_bans
<tfoot><tr> <tfoot><tr>
<form action='".make_link("ip_ban/add")."' method='POST'> ".make_form(make_link("ip_ban/add"))."
".$user->get_auth_html()."
<td><input type='text' name='ip'></td> <td><input type='text' name='ip'></td>
<td><input type='text' name='reason'></td> <td><input type='text' name='reason'></td>
<td>{$user->name}</td> <td>{$user->name}</td>

17
contrib/notes/theme.php
View File

@ -23,26 +23,21 @@ class NotesTheme extends Themelet {
'; ';
} }
public function request_button($image_id) { public function request_button($image_id) {
return ' return make_form(make_link("note/add_request")) . '
<form action="'.make_link("note/add_request").'" method="POST">
<input id="noterequest" type="submit" value="Add Note Request"> <input id="noterequest" type="submit" value="Add Note Request">
<input type="hidden" name="image_id" value="'.$image_id.'"> <input type="hidden" name="image_id" value="'.$image_id.'">
</form> </form>
'; ';
} }
public function nuke_notes_button($image_id) { public function nuke_notes_button($image_id) {
return ' return make_form(make_link("note/nuke_notes")) . '
<form action="'.make_link("note/nuke_notes").'" method="POST" ">
<input id="noterequest" type="submit" value="Nuke Notes" onclick="return confirm_action()"> <input id="noterequest" type="submit" value="Nuke Notes" onclick="return confirm_action()">
<input type="hidden" name="image_id" value="'.$image_id.'"> <input type="hidden" name="image_id" value="'.$image_id.'">
</form> </form>
'; ';
} }
public function nuke_requests_button($image_id) { public function nuke_requests_button($image_id) {
return ' return make_form(make_link("note/nuke_requests")) . '
<form action="'.make_link("note/nuke_requests").'" method="POST">
<input id="noterequest" type="submit" value="Nuke Requests" onclick="return confirm_action()"> <input id="noterequest" type="submit" value="Nuke Requests" onclick="return confirm_action()">
<input type="hidden" name="image_id" value="'.$image_id.'"> <input type="hidden" name="image_id" value="'.$image_id.'">
</form> </form>
@ -167,7 +162,7 @@ class NotesTheme extends Themelet {
</script> </script>
<div id='noteform'> <div id='noteform'>
<form id='NoteAddForm' action='".make_link("note/add_note")."' method='POST'> ".make_form(make_link("note/add_note"))."
<input type='hidden' name='image_id' value='".$image_id."' /> <input type='hidden' name='image_id' value='".$image_id."' />
<input name='note_x1' type='hidden' value='' id='NoteX1' /> <input name='note_x1' type='hidden' value='' id='NoteX1' />
<input name='note_y1' type='hidden' value='' id='NoteY1' /> <input name='note_y1' type='hidden' value='' id='NoteY1' />
@ -189,7 +184,7 @@ class NotesTheme extends Themelet {
</form> </form>
</div> </div>
<div id='noteEditForm'> <div id='noteEditForm'>
<form id='NoteEditForm' action='".make_link("note/edit_note")."' method='POST'> ".make_form(make_link("note/edit_note"))."
<input type='hidden' name='image_id' value='".$image_id."' /> <input type='hidden' name='image_id' value='".$image_id."' />
<input type='hidden' name='note_id' id='EditNoteID' value='' /> <input type='hidden' name='note_id' id='EditNoteID' value='' />
<input name='note_x1' type='hidden' value='' id='EditNoteX1' /> <input name='note_x1' type='hidden' value='' id='EditNoteX1' />
@ -211,7 +206,7 @@ class NotesTheme extends Themelet {
if($adminOptions) if($adminOptions)
$html .= " $html .= "
<form id='NoteDeleteForm' action='".make_link("note/delete_note")."' method='POST'> ".make_form(make_link("note/delete_note"))."
<input type='hidden' name='image_id' value='".$image_id."' /> <input type='hidden' name='image_id' value='".$image_id."' />
<input type='hidden' name='note_id' value='' id='DeleteNoteNoteID' /> <input type='hidden' name='note_id' value='' id='DeleteNoteNoteID' />
<table> <table>

23
contrib/pools/theme.php
View File

@ -17,7 +17,7 @@ class PoolsTheme extends Themelet {
$h .= "<option value='".$pool['id']."'>".html_escape($pool['title'])."</option>"; $h .= "<option value='".$pool['id']."'>".html_escape($pool['title'])."</option>";
} }
$editor = " $editor = "
<form method='POST' action='".make_link("pool/add_post")."'> ".make_form(make_link("pool/add_post"))."
<select name='pool_id'> <select name='pool_id'>
$h $h
</select> </select>
@ -81,13 +81,15 @@ class PoolsTheme extends Themelet {
* HERE WE DISPLAY THE NEW POOL COMPOSER * HERE WE DISPLAY THE NEW POOL COMPOSER
*/ */
public function new_pool_composer(Page $page) { public function new_pool_composer(Page $page) {
$create_html = "<form action=".make_link("pool/create")." method='POST'> $create_html = "
<table> ".make_form(make_link("pool/create"))."
<tr><td>Title:</td><td><input type='text' name='title'></td></tr> <table>
<tr><td>Public?</td><td><input name='public' type='checkbox' value='Y' checked='checked'/></td></tr> <tr><td>Title:</td><td><input type='text' name='title'></td></tr>
<tr><td>Description:</td><td><textarea name='description'></textarea></td></tr> <tr><td>Public?</td><td><input name='public' type='checkbox' value='Y' checked='checked'/></td></tr>
<tr><td colspan='2'><input type='submit' value='Create' /></td></tr> <tr><td>Description:</td><td><textarea name='description'></textarea></td></tr>
</table> <tr><td colspan='2'><input type='submit' value='Create' /></td></tr>
</table>
</form>
"; ";
$blockTitle = "Create Pool"; $blockTitle = "Create Pool";
@ -168,7 +170,8 @@ class PoolsTheme extends Themelet {
public function sidebar_options(Page $page, $pool, $check_all) { public function sidebar_options(Page $page, $pool, $check_all) {
global $user; global $user;
$editor = " <form action='".make_link("pool/import")."' method='POST'> $editor = "
".make_form(make_link("pool/import"))."
<input type='text' name='pool_tag' id='edit' value='Please enter a tag' onclick='this.value=\"\";'/> <input type='text' name='pool_tag' id='edit' value='Please enter a tag' onclick='this.value=\"\";'/>
<input type='submit' name='edit' id='edit' value='Import'/> <input type='submit' name='edit' id='edit' value='Import'/>
<input type='hidden' name='pool_id' value='".$pool['id']."'> <input type='hidden' name='pool_id' value='".$pool['id']."'>
@ -191,7 +194,7 @@ class PoolsTheme extends Themelet {
} }
</script> </script>
<form action='".make_link("pool/nuke")."' method='POST'> ".make_form(make_link("pool/nuke"))."
<input type='submit' name='delete' id='delete' value='Delete Pool' onclick='return confirm_action()' /> <input type='submit' name='delete' id='delete' value='Delete Pool' onclick='return confirm_action()' />
<input type='hidden' name='pool_id' value='".$pool['id']."'> <input type='hidden' name='pool_id' value='".$pool['id']."'>
</form> </form>

2
contrib/rating/theme.php
View File

@ -22,7 +22,7 @@ class RatingsTheme extends Themelet {
public function display_bulk_rater() { public function display_bulk_rater() {
global $page; global $page;
$html = " $html = "
<form action='".make_link("admin/bulk_rate")."' method='POST'> ".make_form(make_link("admin/bulk_rate"))."
<table style='width: 300px'> <table style='width: 300px'>
<tr> <tr>
<td>Search</td> <td>Search</td>

2
contrib/regen_thumb/theme.php
View File

@ -6,7 +6,7 @@ class RegenThumbTheme extends Themelet {
*/ */
public function get_buttons_html($image_id) { public function get_buttons_html($image_id) {
return " return "
<form action='".make_link("regen_thumb")."' method='POST'> ".make_form(make_link("regen_thumb"))."
<input type='hidden' name='image_id' value='$image_id'> <input type='hidden' name='image_id' value='$image_id'>
<input type='submit' value='Regenerate'> <input type='submit' value='Regenerate'>
</form> </form>

4
contrib/report_image/theme.php
View File

@ -42,7 +42,7 @@ class ReportImageTheme extends Themelet {
<td>{$image_link}</td> <td>{$image_link}</td>
<td>Report by $userlink: $h_reason</td> <td>Report by $userlink: $h_reason</td>
<td class='formstretch'> <td class='formstretch'>
<form action='".make_link("image_report/remove")."' method='POST'> ".make_form(make_link("image_report/remove"))."
<input type='hidden' name='id' value='{$report['id']}'> <input type='hidden' name='id' value='{$report['id']}'>
<input type='submit' value='Remove Report'> <input type='submit' value='Remove Report'>
</form> </form>
@ -73,7 +73,7 @@ class ReportImageTheme extends Themelet {
$i_image = int_escape($image->id); $i_image = int_escape($image->id);
$html = " $html = "
<form action='".make_link("image_report/add")."' method='POST'> ".make_form(make_link("image_report/add"))."
<input type='hidden' name='image_id' value='$i_image'> <input type='hidden' name='image_id' value='$i_image'>
<input type='text' name='reason' value='Please enter a reason' onclick='this.value=\"\";'> <input type='text' name='reason' value='Please enter a reason' onclick='this.value=\"\";'>
<input type='submit' value='Report'> <input type='submit' value='Report'>

4
contrib/tag_history/theme.php
View File

@ -5,7 +5,7 @@ class Tag_HistoryTheme extends Themelet {
global $user; global $user;
$start_string = " $start_string = "
<div style='text-align: left'> <div style='text-align: left'>
<form enctype='multipart/form-data' action='".make_link("tag_history/revert")."' method='POST'> ".make_form(make_link("tag_history/revert"))."
<ul style='list-style-type:none;'> <ul style='list-style-type:none;'>
"; ";
@ -46,7 +46,7 @@ class Tag_HistoryTheme extends Themelet {
public function display_global_page(Page $page, $history) { public function display_global_page(Page $page, $history) {
$start_string = " $start_string = "
<div style='text-align: left'> <div style='text-align: left'>
<form enctype='multipart/form-data' action='".make_link("tag_history/revert")."' method='POST'> ".make_form(make_link("tag_history/revert"))."
<ul style='list-style-type:none;'> <ul style='list-style-type:none;'>
"; ";
$end_string = " $end_string = "

3
contrib/tips/theme.php
View File

@ -11,8 +11,7 @@ class TipsTheme extends Themelet {
$select .= "</select>"; $select .= "</select>";
$html = " $html = "
<form action='".make_link("tips/save")."' method='POST'> ".make_form(make_link("tips/save"))."
".$user->get_auth_html()."
<table> <table>
<tr> <tr>
<td>Enable:</td> <td>Enable:</td>

8
contrib/wiki/theme.php
View File

@ -51,7 +51,7 @@ class WikiTheme extends Themelet {
$lock = ""; $lock = "";
} }
return " return "
<form action='".make_link("wiki_admin/save")."' method='POST'> ".make_form(make_link("wiki_admin/save"))."
<input type='hidden' name='title' value='$h_title'> <input type='hidden' name='title' value='$h_title'>
<input type='hidden' name='revision' value='$i_revision'> <input type='hidden' name='revision' value='$i_revision'>
<textarea name='body' style='width: 100%' rows='20'>".html_escape($page->body)."</textarea> <textarea name='body' style='width: 100%' rows='20'>".html_escape($page->body)."</textarea>
@ -71,7 +71,7 @@ class WikiTheme extends Themelet {
$edit = "<table><tr>"; $edit = "<table><tr>";
$edit .= Wiki::can_edit($user, $page) ? $edit .= Wiki::can_edit($user, $page) ?
" "
<td><form action='".make_link("wiki_admin/edit")."' method='POST'> <td>".make_form(make_link("wiki_admin/edit"))."
<input type='hidden' name='title' value='".html_escape($page->title)."'> <input type='hidden' name='title' value='".html_escape($page->title)."'>
<input type='hidden' name='revision' value='".int_escape($page->revision)."'> <input type='hidden' name='revision' value='".int_escape($page->revision)."'>
<input type='submit' value='Edit'> <input type='submit' value='Edit'>
@ -80,12 +80,12 @@ class WikiTheme extends Themelet {
""; "";
if($user->is_admin()) { if($user->is_admin()) {
$edit .= " $edit .= "
<td><form action='".make_link("wiki_admin/delete_revision")."' method='POST'> <td>".make_form(make_link("wiki_admin/delete_revision"))."
<input type='hidden' name='title' value='".html_escape($page->title)."'> <input type='hidden' name='title' value='".html_escape($page->title)."'>
<input type='hidden' name='revision' value='".int_escape($page->revision)."'> <input type='hidden' name='revision' value='".int_escape($page->revision)."'>
<input type='submit' value='Delete This Version'> <input type='submit' value='Delete This Version'>
</form></td> </form></td>
<td><form action='".make_link("wiki_admin/delete_all")."' method='POST'> <td>".make_form(make_link("wiki_admin/delete_all"))."
<input type='hidden' name='title' value='".html_escape($page->title)."'> <input type='hidden' name='title' value='".html_escape($page->title)."'>
<input type='submit' value='Delete All'> <input type='submit' value='Delete All'>
</form></td> </form></td>

15
core/util.inc.php
View File

@ -216,6 +216,21 @@ function make_http($link) {
return $link; return $link;
} }
/**
* Make a form tag with relevant auth token and stuff
*
* @retval string
*/
function make_form($target, $method="POST", $multipart=False) {
global $user;
$auth = $user->get_auth_html();
$extra = "";
if($multipart) {
$extra .= " enctype='multipart/form-data'"
}
return "<form action='$target' method='$method'$extra>$auth";
}
/** /**
* Make a link to a static file in the current theme's * Make a link to a static file in the current theme's
* directory * directory

6
ext/alias_editor/theme.php
View File

@ -12,7 +12,7 @@ class AliasEditorTheme extends Themelet {
$action = "<th width='10%'>Action</th>"; $action = "<th width='10%'>Action</th>";
$add = " $add = "
<tr> <tr>
<form action='".make_link("alias/add")."' method='POST'> ".make_form(make_link("alias/add"))."
<td><input type='text' name='oldtag'></td> <td><input type='text' name='oldtag'></td>
<td><input type='text' name='newtag'></td> <td><input type='text' name='newtag'></td>
<td><input type='submit' value='Add'></td> <td><input type='submit' value='Add'></td>
@ -36,7 +36,7 @@ class AliasEditorTheme extends Themelet {
if($is_admin) { if($is_admin) {
$h_aliases .= " $h_aliases .= "
<td> <td>
<form action='".make_link("alias/remove")."' method='POST'> ".make_form(make_link("alias/remove"))."
<input type='hidden' name='oldtag' value='$h_old'> <input type='hidden' name='oldtag' value='$h_old'>
<input type='submit' value='Remove'> <input type='submit' value='Remove'>
</form> </form>
@ -60,7 +60,7 @@ class AliasEditorTheme extends Themelet {
"; ";
$bulk_html = " $bulk_html = "
<form enctype='multipart/form-data' action='".make_link("alias/import")."' method='POST'> ".make_form(make_link("alias/import"), multipart=True)."
<input type='file' name='alias_file'> <input type='file' name='alias_file'>
<input type='submit' value='Upload List'> <input type='submit' value='Upload List'>
</form> </form>

2
ext/comment/theme.php
View File

@ -173,7 +173,7 @@ class CommentListTheme extends Themelet {
$captcha = $config->get_bool("comment_captcha") ? captcha_get_html() : ""; $captcha = $config->get_bool("comment_captcha") ? captcha_get_html() : "";
return " return "
<form name='comment_form' action='".make_link("comment/add")."' method='POST'> ".make_form(make_link("comment/add"))."
<input type='hidden' name='image_id' value='$i_image_id' /> <input type='hidden' name='image_id' value='$i_image_id' />
<input type='hidden' name='hash' value='$hash' /> <input type='hidden' name='hash' value='$hash' />
<textarea name='comment' rows='5' cols='50'></textarea> <textarea name='comment' rows='5' cols='50'></textarea>

5
ext/ext_manager/theme.php
View File

@ -5,8 +5,7 @@ class ExtManagerTheme extends Themelet {
global $user; global $user;
$en = $editable ? "<th>Enabled</th>" : ""; $en = $editable ? "<th>Enabled</th>" : "";
$html = " $html = "
<form action='".make_link("ext_manager/set")."' method='POST'> ".make_form(make_link("ext_manager/set"))."
".$user->get_auth_html()."
<script> <script>
$(document).ready(function() { $(document).ready(function() {
$(\"#extensions\").tablesorter(); $(\"#extensions\").tablesorter();
@ -96,7 +95,7 @@ class ExtManagerTheme extends Themelet {
} }
} }
$html = " $html = "
<form action='".make_link("ext_manager/set")."' method='POST'> ".make_form(make_link("ext_manager/set"))."
".$user->get_auth_html()." ".$user->get_auth_html()."
<table border='0'> <table border='0'>
<tr><td width='50%'>$col_1</td><td>$col_2</td></tr> <tr><td width='50%'>$col_1</td><td>$col_2</td></tr>

3
ext/image/theme.php
View File

@ -10,9 +10,8 @@ class ImageIOTheme {
$i_image_id = int_escape($image_id); $i_image_id = int_escape($image_id);
$html = " $html = "
<form action='".make_link("image_admin/delete")."' method='POST'> ".make_form(make_link("image_admin/delete"))."
<input type='hidden' name='image_id' value='$i_image_id'> <input type='hidden' name='image_id' value='$i_image_id'>
".$user->get_auth_html()."
<input type='submit' value='Delete'> <input type='submit' value='Delete'>
</form> </form>
"; ";

24
ext/setup/theme.php
View File

@ -42,11 +42,12 @@ class SetupTheme extends Themelet {
} }
$table = " $table = "
<form action='".make_link("setup/save")."' method='POST'><table> ".make_form(make_link("setup/save"))."
".$user->get_auth_html()." <table>
<tr><td>$setupblock_html1</td><td>$setupblock_html2</td></tr> <tr><td>$setupblock_html1</td><td>$setupblock_html2</td></tr>
<tr><td colspan='2'><input type='submit' value='Save Settings'></td></tr> <tr><td colspan='2'><input type='submit' value='Save Settings'></td></tr>
</table></form> </table>
</form>
"; ";
$page->set_title("Shimmie Setup"); $page->set_title("Shimmie Setup");
@ -83,12 +84,13 @@ class SetupTheme extends Themelet {
$(\"#settings\").tablesorter(); $(\"#settings\").tablesorter();
}); });
</script> </script>
<form action='".make_link("setup/save")."' method='POST'><table id='settings' class='zebra'> ".make_form(make_link("setup/save"))."
".$user->get_auth_html()." <table id='settings' class='zebra'>
<thead><tr><th width='25%'>Name</th><th>Value</th></tr></thead> <thead><tr><th width='25%'>Name</th><th>Value</th></tr></thead>
<tbody>$rows</tbody> <tbody>$rows</tbody>
<tfoot><tr><td colspan='2'><input type='submit' value='Save Settings'></td></tr></tfoot> <tfoot><tr><td colspan='2'><input type='submit' value='Save Settings'></td></tr></tfoot>
</table></form> </table>
</form>
"; ";
$page->set_title("Shimmie Setup"); $page->set_title("Shimmie Setup");

2
ext/tag_edit/theme.php
View File

@ -7,7 +7,7 @@ class TagEditTheme extends Themelet {
*/ */
public function display_mass_editor(Page $page) { public function display_mass_editor(Page $page) {
$html = " $html = "
<form action='".make_link("tag_edit/replace")."' method='POST'> ".make_form(make_link("tag_edit/replace"))."
<table style='width: 300px;'> <table style='width: 300px;'>
<tr><td>Search</td><td><input type='text' name='search'></tr> <tr><td>Search</td><td><input type='text' name='search'></tr>
<tr><td>Replace</td><td><input type='text' name='replace'></td></tr> <tr><td>Replace</td><td><input type='text' name='replace'></td></tr>

4
ext/upload/theme.php
View File

@ -50,7 +50,7 @@ class UploadTheme extends Themelet {
}); });
}); });
</script> </script>
<form enctype='multipart/form-data' action='".make_link("upload")."' method='POST'> ".make_form(make_link("upload"), multipart=True)."
<table id='large_upload_form'> <table id='large_upload_form'>
$upload_list $upload_list
<tr><td>Tags</td><td colspan='3'><input id='tag_box' name='tags' type='text'></td></tr> <tr><td>Tags</td><td colspan='3'><input id='tag_box' name='tags' type='text'></td></tr>
@ -120,7 +120,7 @@ class UploadTheme extends Themelet {
}); });
}); });
</script> </script>
<form enctype='multipart/form-data' action='".make_link("upload")."' method='POST'> ".make_form(make_link("upload"), multipart=True)."
$upload_list $upload_list
<input id='tag_input' name='tags' type='text' autocomplete='off'> <input id='tag_input' name='tags' type='text' autocomplete='off'>
<input type='submit' value='Post'> <input type='submit' value='Post'>

20
ext/user/theme.php
View File

@ -53,7 +53,7 @@ class UserPageTheme extends Themelet {
$reca = "<tr><td colspan='2'>".captcha_get_html()."</td></tr>"; $reca = "<tr><td colspan='2'>".captcha_get_html()."</td></tr>";
$html .= " $html .= "
<form action='".make_link("user_admin/create")."' method='POST'> ".make_form(make_link("user_admin/create"))."
<table style='width: 300px;'> <table style='width: 300px;'>
<tr><td>Name</td><td><input type='text' name='name'></td></tr> <tr><td>Name</td><td><input type='text' name='name'></td></tr>
<tr><td>Password</td><td><input type='password' name='pass1'></td></tr> <tr><td>Password</td><td><input type='password' name='pass1'></td></tr>
@ -82,7 +82,7 @@ class UserPageTheme extends Themelet {
public function display_login_block(Page $page) { public function display_login_block(Page $page) {
global $config; global $config;
$html = " $html = "
<form action='".make_link("user_admin/login")."' method='POST'> ".make_form(make_link("user_admin/login"))."
<table summary='Login Form'> <table summary='Login Form'>
<tr> <tr>
<td width='70'><label for='user'>Name</label></td> <td width='70'><label for='user'>Name</label></td>
@ -150,10 +150,8 @@ class UserPageTheme extends Themelet {
protected function build_options(User $duser) { protected function build_options(User $duser) {
global $config, $database, $user; global $config, $database, $user;
$html = ""; $html = "
".make_form(make_link("user_admin/change_pass"))."
$html .= "
<form action='".make_link("user_admin/change_pass")."' method='POST'>
<input type='hidden' name='id' value='{$duser->id}'> <input type='hidden' name='id' value='{$duser->id}'>
<table style='width: 300px;'> <table style='width: 300px;'>
<tr><th colspan='2'>Change Password</th></tr> <tr><th colspan='2'>Change Password</th></tr>
@ -163,7 +161,7 @@ class UserPageTheme extends Themelet {
</table> </table>
</form> </form>
<p><form action='".make_link("user_admin/change_email")."' method='POST'> <p>".make_form(make_link("user_admin/change_email"))."
<input type='hidden' name='id' value='{$duser->id}'> <input type='hidden' name='id' value='{$duser->id}'>
<table style='width: 300px;'> <table style='width: 300px;'>
<tr><th colspan='2'>Change Email</th></tr> <tr><th colspan='2'>Change Email</th></tr>
@ -177,10 +175,10 @@ class UserPageTheme extends Themelet {
$i_user_id = int_escape($duser->id); $i_user_id = int_escape($duser->id);
$h_is_admin = $duser->is_admin() ? " checked" : ""; $h_is_admin = $duser->is_admin() ? " checked" : "";
$html .= " $html .= "
<p><form action='".make_link("user_admin/set_more")."' method='POST'> <p>".make_form(make_link("user_admin/set_more"))."
<input type='hidden' name='id' value='$i_user_id'> <input type='hidden' name='id' value='$i_user_id'>
Admin: <input name='admin' type='checkbox'$h_is_admin> Admin: <input name='admin' type='checkbox'$h_is_admin>
<input type='submit' value='Set'> <input type='submit' value='Set'>
</form> </form>
"; ";
} }

2
ext/view/theme.php
View File

@ -112,7 +112,7 @@ class ViewImageTheme extends Themelet {
$html = " (<a href=\"javascript: toggle('imgdata')\">edit info</a>)"; $html = " (<a href=\"javascript: toggle('imgdata')\">edit info</a>)";
$html .= " $html .= "
<div id='imgdata'> <div id='imgdata'>
<form action='".make_link("post/set")."' method='POST'> ".make_form(make_link("post/set"))."
<input type='hidden' name='image_id' value='{$image->id}'> <input type='hidden' name='image_id' value='{$image->id}'>
<input type='hidden' name='query' value='$h_query'> <input type='hidden' name='query' value='$h_query'>
<table style='width: 500px;'> <table style='width: 500px;'>