summaryrefslogtreecommitdiffstats
path: root/listmembers.php
diff options
context:
space:
mode:
Diffstat (limited to 'listmembers.php')
-rw-r--r--listmembers.php28
1 files changed, 7 insertions, 21 deletions
diff --git a/listmembers.php b/listmembers.php
index 482d33e..ece98b6 100644
--- a/listmembers.php
+++ b/listmembers.php
@@ -47,14 +47,11 @@ elseif ( isset($_GET['compare']) )
$uri_addon = '';
$compare = validateCompareInput($_GET['compare']);
-
- // Find 30 days ago, then find how many raids occurred in those 30 days
- // Do the same for 60 and 90 days
- $thirty_days = mktime(0, 0, 0, date('m'), date('d')-30, date('Y'));
- $ninety_days = mktime(0, 0, 0, date('m'), date('d')-90, date('Y'));
-
- $raid_count_30 = $db->query_first('SELECT count(*) FROM ' . RAIDS_TABLE . ' WHERE raid_date BETWEEN '.$thirty_days.' AND '.time());
- $raid_count_90 = $db->query_first('SELECT count(*) FROM ' . RAIDS_TABLE . ' WHERE raid_date BETWEEN '.$ninety_days.' AND '.time());
+
+ $condition = "(raid_name = 'On time bonus' OR raid_name = 'Attendance Log')";
+
+ $raid_count_30 = $db->query_first('SELECT count(*) FROM ' . RAIDS_TABLE . ' WHERE raid_date >= (unix_timestamp() - (30*24*3600)) AND ' . $condition);
+ $raid_count_90 = $db->query_first('SELECT count(*) FROM ' . RAIDS_TABLE . ' WHERE raid_date >= (unix_timestamp() - (90*24*3600)) AND ' . $condition);
// Build an SQL query that includes each of the compare IDs
$sql = "SELECT *, (member_earned-member_spent+member_adjustment) AS member_current, c.class_name AS member_class
@@ -70,19 +67,8 @@ elseif ( isset($_GET['compare']) )
$individual_raid_count_30 = 0;
$individual_raid_count_90 = 0;
- $rc_sql = 'SELECT count(*)
- FROM ' . RAIDS_TABLE . ' r, ' . RAID_ATTENDEES_TABLE . " ra
- WHERE (ra.raid_id = r.raid_id)
- AND (ra.member_name='".$row['member_name']."')
- AND (r.raid_date BETWEEN ".$thirty_days.' AND '.time().')';
- $individual_raid_count_30 = $db->query_first($rc_sql);
-
- $rc_sql = 'SELECT count(*)
- FROM ' . RAIDS_TABLE . ' r, ' . RAID_ATTENDEES_TABLE . " ra
- WHERE (ra.raid_id = r.raid_id)
- AND (ra.member_name='".$row['member_name']."')
- AND (r.raid_date BETWEEN ".$ninety_days.' AND '.time().')';
- $individual_raid_count_90 = $db->query_first($rc_sql);
+ $individual_raid_count_30 = $db->query_first("SELECT raid_count_30 FROM R30 where member_name = '" . $row['member_name'] . "'");
+ $individual_raid_count_90 = $db->query_first("SELECT raid_count_90 FROM R90 where member_name = '" . $row['member_name'] . "'");
// Prevent division by 0
$percent_of_raids_30 = ( $raid_count_30 > 0 ) ? round(($individual_raid_count_30 / $raid_count_30) * 100) : 0;