badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #37 from Madoushi90/master

Browse source 
Fix for Issue #35
This commit is contained in:
Shish Moom 2011-09-17 01:29:14 -07:00
commit 189b8192e0
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
contrib/tag_history/main.php
View file

@ -130,9 +130,9 @@ class Tag_History implements Extension {
} }
// lets get the values out of the result // lets get the values out of the result
$stored_result_id = $result->fields['id']; $stored_result_id = $result['id'];
$stored_image_id = $result->fields['image_id']; $stored_image_id = $result['image_id'];
$stored_tags = $result->fields['tags']; $stored_tags = $result['tags'];
log_debug("tag_history", "Reverting tags of $stored_image_id to [$stored_tags]"); log_debug("tag_history", "Reverting tags of $stored_image_id to [$stored_tags]");
// all should be ok so we can revert by firing the SetUserTags event. // all should be ok so we can revert by firing the SetUserTags event.
@ -146,7 +146,7 @@ class Tag_History implements Extension {
public function get_tag_history_from_revert($revert_id) public function get_tag_history_from_revert($revert_id)
{ {
global $database; global $database;
$row = $database->execute(" $row = $database->get_row("
SELECT tag_histories.*, users.name SELECT tag_histories.*, users.name
FROM tag_histories FROM tag_histories
JOIN users ON tag_histories.user_id = users.id JOIN users ON tag_histories.user_id = users.id
@ -201,19 +201,28 @@ class Tag_History implements Extension {
$old_tags = Tag::implode($image->get_tag_array()); $old_tags = Tag::implode($image->get_tag_array());
log_debug("tag_history", "adding tag history: [$old_tags] -> [$new_tags]"); log_debug("tag_history", "adding tag history: [$old_tags] -> [$new_tags]");
if($new_tags == $old_tags) return; if($new_tags == $old_tags) return;
// add a history entry
$allowed = $config->get_int("history_limit"); $allowed = $config->get_int("history_limit");
if($allowed == 0) return; if($allowed == 0) return;
// if the image has no history, make one with the old tags
$entries = $database->get_one("SELECT COUNT(*) FROM tag_histories WHERE image_id = ?", array($image->id));
if($entries == 0){
$database->execute("
INSERT INTO tag_histories(image_id, tags, user_id, user_ip, date_set)
VALUES (?, ?, ?, ?, now())",
array($image->id, $old_tags, 1, '127.0.0.1')); // TODO: Pick appropriate user id
$entries++;
}
// add a history entry
$row = $database->execute(" $row = $database->execute("
INSERT INTO tag_histories(image_id, tags, user_id, user_ip, date_set) INSERT INTO tag_histories(image_id, tags, user_id, user_ip, date_set)
VALUES (?, ?, ?, ?, now())", VALUES (?, ?, ?, ?, now())",
array($image->id, $new_tags, $user->id, $_SERVER['REMOTE_ADDR'])); array($image->id, $new_tags, $user->id, $_SERVER['REMOTE_ADDR']));
$entries++;
// if needed remove oldest one // if needed remove oldest one
if($allowed == -1) return; if($allowed == -1) return;
$entries = $database->get_one("SELECT COUNT(*) FROM tag_histories WHERE image_id = ?", array($image->id));
if($entries > $allowed) if($entries > $allowed)
{ {
// TODO: Make these queries better // TODO: Make these queries better