diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-01-12 21:51:48 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-01-12 21:51:48 +0000 |
| commit | a3bdc3148d924a3f1e8e2052572930bdf159829a (patch) | |
| tree | 308e7446edc7b82fc23a863b1cbadc43ee4771fb | |
| parent | 0b39cf3100870d54e13039a4e5d8635f121df4ab (diff) | |
| download | ampache-a3bdc3148d924a3f1e8e2052572930bdf159829a.tar.gz ampache-a3bdc3148d924a3f1e8e2052572930bdf159829a.tar.bz2 ampache-a3bdc3148d924a3f1e8e2052572930bdf159829a.zip | |
fixed tracking of user of flagged objects and allowed mass reject, approve
| -rw-r--r-- | admin/flag.php | 2 | ||||
| -rw-r--r-- | lib/class/flag.class.php | 5 | ||||
| -rw-r--r-- | templates/show_flagged.inc.php | 10 |
3 files changed, 12 insertions, 5 deletions
diff --git a/admin/flag.php b/admin/flag.php index a12a55e5..fc496615 100644 --- a/admin/flag.php +++ b/admin/flag.php @@ -260,7 +260,7 @@ switch ($action) { foreach ($flags as $flag_id) { $flag = new Flag($flag_id); - if ($flag->approved) { + if ($_REQUEST['update_action'] == 'reject') { $flag->delete_flag(); } else { diff --git a/lib/class/flag.class.php b/lib/class/flag.class.php index 0e86f643..fa7aa382 100644 --- a/lib/class/flag.class.php +++ b/lib/class/flag.class.php @@ -174,6 +174,7 @@ class Flag { $id = sql_escape($id); $type = sql_escape($type); $flag = sql_escape($flag); + $user = sql_escape($GLOBALS['user']->id); $comment = sql_escape($comment); $time = time(); $approved = '0'; @@ -181,8 +182,8 @@ class Flag { /* If they are an admin, it's auto approved */ if ($GLOBALS['user']->has_access('100')) { $approved = '1'; } - $sql = "INSERT INTO flagged (`object_id`,`object_type`,`flag`,`comment`,`date`,`approved`) VALUES " . - " ('$id','$type','$flag','$comment','$time','$approved')"; + $sql = "INSERT INTO flagged (`object_id`,`object_type`,`flag`,`comment`,`date`,`approved`,`user`) VALUES " . + " ('$id','$type','$flag','$comment','$time','$approved','$user')"; $db_results = mysql_query($sql, dbh()); return true; diff --git a/templates/show_flagged.inc.php b/templates/show_flagged.inc.php index 06873ecb..2324afd2 100644 --- a/templates/show_flagged.inc.php +++ b/templates/show_flagged.inc.php @@ -26,6 +26,7 @@ $web_path = conf('web_path'); <tr class="table-header"> <th><a href="#" onclick="check_songs(); return false;"><?php echo _('Select'); ?></a></th> <th><?php echo _('Object'); ?></th> + <th><?php echo _('User'); ?></th> <th><?php echo _('Flag'); ?></th> <th><?php echo _('Status'); ?></th> <th><?php echo _('Action'); ?></th> @@ -36,6 +37,7 @@ $web_path = conf('web_path'); <input type="checkbox" name="song[]" value="<?php echo $flag->id; ?>" id="song_<?php echo $flag->id; ?>" /> </td> <td><?php $flag->print_name(); ?></td> + <td><?php echo scrub_out($flag->user); ?></td> <td><?php $flag->print_flag(); ?></td> <td><?php $flag->print_status(); ?></td> <td align="center"> @@ -52,11 +54,15 @@ $web_path = conf('web_path'); </tr> <?php } if (!count($flagged)) { ?> <tr class="<?php echo flip_class(); ?>"> - <td colspan="5" class="error"><?php echo _('No Records Found'); ?></td> + <td colspan="6" class="error"><?php echo _('No Records Found'); ?></td> </tr> <?php } ?> <tr class="<?php echo flip_class(); ?>"> - <td colspan="5"> + <td colspan="6"> + <select name="update_action"> + <option value="reject"><?php echo _('Reject'); ?></option> + <option value="approve"><?php echo _('Approve'); ?></option> + </select> <input class="button" type="submit" value="<?php echo _('Update'); ?>" /> </td> </tr> |