WoWInterface SVN MorgDKP

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /trunk/MorgDKP/plugins
    from Rev 25 to Rev 26
    ↔ Reverse comparison
  •

Rev 25 → Rev 26

morgdkp/Morgfunc.php
308,7 → 308,7
 
function CheckAlias($names, $eqdkp, $table_prefix) {
$aliases = FetchAllAliases($eqdkp, $table_prefix);
if (empty($aliases)) return $names;
if (empty($aliases) || empty($names) ) return $names;
foreach ($names as $num => $alt) {
$alt = rtrim($alt);
$alt = ucwords($alt);
morgdkp/Morgaction.php
40,8 → 40,13
if (!empty($changes)) {
foreach ($changes as $change) {
$name = stripslashes(restoretext($change['name']));
$change['members'] = CheckAlias($change['members'], $change['eqdkp'], $change['prefix']);
$needchanged[] = array('addtype'=>$change['addtype'], 'name'=>$name, 'value'=>$change['value'], 'eqdkp'=>$change['eqdkp'], 'prefix'=>$change['prefix'], 'event'=>$change['event'], 'members'=>$change['members']);
$members = array();
foreach ($change['members'] as $memberkey => $member) {
$members[$memberkey] = stripslashes(restoretext($member));
}
$members = CheckAlias($members, $change['eqdkp'], $change['prefix']);
restoretext_deep($members);
$needchanged[] = array('addtype'=>$change['addtype'], 'name'=>$name, 'value'=>$change['value'], 'eqdkp'=>$change['eqdkp'], 'prefix'=>$change['prefix'], 'event'=>$change['event'], 'members'=>$members);
}
}
if (!empty($needchanged)) {
72,10 → 77,12
$attend = restoretext_deep($boss['attendees']);
$attend = stripslashes_deep($attend);
$attend = CheckAlias($attend, $raid['eqdkp'], $raid['prefix']);
asort($attend);
$attend = array_unique($attend);
$RAID[$i]['events'][$eventindex] = array('name'=>$bossname, 'note'=>$bossnote,'value'=>$boss['value'], 'time'=>$boss['time'], 'attendees'=>$attend, 'trash'=>$boss['trash'], 'index'=>$eventindex);
$eventindex++;
if (! empty($attend)) {
asort($attend);
$attend = array_unique($attend);
$RAID[$i]['events'][$eventindex] = array('name'=>$bossname, 'note'=>$bossnote,'value'=>$boss['value'], 'time'=>$boss['time'], 'attendees'=>$attend, 'trash'=>$boss['trash'], 'index'=>$eventindex);
$eventindex++;
}
}
}
$trashdone = false;