WoWInterface SVN MorgDKP

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /
    from Rev 24 to Rev 25
    ↔ Reverse comparison
  •

Rev 24 → Rev 25

trunk/MorgDKP/MorgDKP.toc
1,6 → 1,6
## Interface: 20400
## Author: Morg & Fryguy
## Title: MorgDKP - |cffffffffv|r|cff00ff006.90|r
## Author: Morgalm & Fryguy
## Title: MorgDKP - |cffffffffv|r|cff00ff006.91|r
## Notes: Inspects all members of raid and saves in database, as well as lists people's dkp values
## DefaultState: 1
## SavedVariables: MorgDKPDB, MorgDKPFuBarDB
trunk/MorgDKP/Points.lua
226,6 → 226,7
else diff = old end
local counter = 0
for _, name in pairs(attendees) do
self:PlayerinDB(name)
self.db.account.info[name][pool].points = self.db.account.info[name][pool].points + diff
self.db.account.info[name][pool].earned = self.db.account.info[name][pool].earned + diff
self.db.account.info[name].lastupdate = update
trunk/MorgDKP/plugins/morgdkp/Morgexport.php
103,11 → 103,12
$pools = array();
$eventlist = FetchAllEvents($dbname, $table_prefix);
$aliaslist = FetchAliasSimple($dbname, $table_prefix);
$resultmulti = mysql_query("SHOW TABLES FROM $dbname LIKE '" . $table_prefix . "plus_config'");
$eqdkpplus = mysql_fetch_array($resultmulti);
if ($eqdkpplus[0]) {
$result = mysql_query("SELECT * FROM " . $table_prefix . 'multidkp');
if ($result) {
$eqdkpplus = mysql_query("SELECT * FROM " . $table_prefix . "plus_config WHERE config_name = 'pk_multidkp'");
if ($eqdkpplus) {
$multipool = mysql_fetch_array($eqdkpplus);
$singlepool = 0;
if ($multipool['config_value'] == 1) {
$result = mysql_query("SELECT * FROM " . $table_prefix . 'multidkp');
while ($row = mysql_fetch_array($result)) {
$pools[$row['multidkp_id']] = $row['multidkp_name'];
}
117,8 → 118,10
'value'=>$eventlist[$row['multidkp2event_eventname']]['event_value']);
}
} else {
$pools[1] = $DBName[1] or "DKP";
$events[1] = $DBName[1] or "DKP";
if (!$DBName[1]) $DBName[1] = "DKP";
$pools[1] = $DBName[1];
$events[1] = $DBName[1];
$singlepool = true;
}
$offset += count($pools) - 1;
foreach ($pools as $pluspoolnum => $poolname) {
138,7 → 141,7
$earnedresult = mysql_query($sql);
$earned = 0;
while ($earnedrow = mysql_fetch_array($earnedresult)) {
if ($events[$earnedrow['raid_name']]['pool'] == $poolname) $earned += $earnedrow[1];
if ($singlepool or $events[$earnedrow['raid_name']]['pool'] == $poolname) $earned += $earnedrow[1];
}
$sql = "SELECT ". $table_prefix . 'raids' . ".raid_name, SUM(". $table_prefix . 'items' .".item_value) FROM " .
$table_prefix . 'items' . " LEFT JOIN " . $table_prefix . 'raids' . " ON " . $table_prefix . 'items' . ".raid_id=" .
147,14 → 150,14
$spentresult = mysql_query($sql);
$spent = 0;
while ($spentrow = mysql_fetch_array($spentresult)) {
if ($events[$spentrow['raid_name']]['pool'] == $poolname) $spent += $spentrow[1];
if ($singlepool or $events[$spentrow['raid_name']]['pool'] == $poolname) $spent += $spentrow[1];
}
$adjust = 0;
$sql = "SELECT adjustment_reason, adjustment_value, raid_name FROM " . $table_prefix . 'adjustments' .
" WHERE member_name = '" . $member . "';";
$adjresult = mysql_query($sql);
while ($adjrow = mysql_fetch_array($adjresult)) {
if ($events[$adjrow['raid_name']]['pool'] == $poolname) $adjust += $adjrow['adjustment_value'];
if ($singlepool or $events[$adjrow['raid_name']]['pool'] == $poolname) $adjust += $adjrow['adjustment_value'];
}
$balance = $earned - $spent + $adjust;
$added = 0;
201,7 → 204,7
<form method="post">
<input type="hidden" name="retrieve" value="1">
<h1><a href="<?php echo $admin_path?>" target="_self" style="color: #FDFDFD;">Return to eqDKP Admin</a></h1>
<b><u>MorgDKP Export</b></u>
<b><u>MorgDKP Export v2.0</b></u>
<br>
<br>
<?php if ($php_version > 5) {?>
trunk/MorgDKP/MorgDKP.lua
16,7 → 16,7
 
MorgDKP = AceLibrary("AceAddon-2.0"):new("AceEvent-2.0", "AceHook-2.1", "AceConsole-2.0","AceComm-2.0", "AceDB-2.0")
 
MorgDKP.version = "6.90"
MorgDKP.version = "6.91"
MorgDKP.commPrefix = "MorgDKP"
MorgDKP.commVersion = 6.2