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

some changes from r34

Browse Source 
git-svn-id: file:///home/shish/svn/shimmie2/trunk@979 7f39781d-f577-437e-ae19-be835c7a54ca
This commit is contained in:
shish 2008-08-12 00:04:10 +00:00
parent 12b02f155c
commit 4940e3cd6f
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ext/alias_editor/main.php
View File

@ -20,10 +20,15 @@ class AliasEditor extends Extension {
if($event->get_arg(0) == "add") {
if($event->user->is_admin()) {
if(isset($_POST['oldtag']) && isset($_POST['newtag'])) {
send_event(new AddAliasEvent($_POST['oldtag'], $_POST['newtag']));
$event->page->set_mode("redirect");
$event->page->set_redirect(make_link("alias/list"));
$aae = new AddAliasEvent($_POST['oldtag'], $_POST['newtag']);
send_event($aae);
if($aae->vetoed) {
$this->theme->display_error($event->page, "Error adding alias", $aae->veto_reason);
}
else {
$event->page->set_mode("redirect");
$event->page->set_redirect(make_link("alias/list"));
}
}
}
}
@ -73,8 +78,13 @@ class AliasEditor extends Extension {
if(is_a($event, 'AddAliasEvent')) {
global $database;
$database->Execute("INSERT INTO aliases(oldtag, newtag) VALUES(?, ?)",
array($event->oldtag, $event->newtag));
$pair = array($event->oldtag, $event->newtag);
if($database->db->GetRow("SELECT * FROM aliases WHERE oldtag=? AND lower(newtag)=lower(?)", $pair)) {
$event->veto("That alias already exists");
}
else {
$database->Execute("INSERT INTO aliases(oldtag, newtag) VALUES(?, ?)", $pair);
}
}
if(is_a($event, 'UserBlockBuildingEvent')) {

4
ext/tag_edit/main.php
View File

@ -99,8 +99,8 @@ class TagEdit extends Extension {
$database->Execute("
UPDATE tags
SET count=(SELECT COUNT(image_id) FROM image_tags WHERE tag_id=tags.id GROUP BY tag_id)
WHERE id=?
", array($replace_id));
WHERE id=? OR id=?
", array($search_id, $replace_id));
}
else if($search_id) {
$database->Execute("UPDATE tags SET tag=? WHERE tag=?", Array($replace, $search));