Skip to content

Commit

Permalink
Accept Timestamps for MLDKP format
Browse files Browse the repository at this point in the history
  • Loading branch information
GodMod committed Oct 23, 2019
1 parent 2a76abf commit 0ee59ce
Show file tree
Hide file tree
Showing 2 changed files with 114 additions and 106 deletions.
218 changes: 113 additions & 105 deletions includes/parser/eqdkp_format.parser.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,134 +27,142 @@
}

if(!class_exists('eqdkp_format')) {
class eqdkp_format extends rli_parser {

public static $name = 'MLDKP 1.1 / EQdkp Plugin';

public static function check($xml) {
$back[1] = true;
if(!isset($xml->start)) {
$back[1] = false;
$back[2][] = 'start';
} else {
if(!(stristr($xml->start, ':'))) {
class eqdkp_format extends rli_parser {

public static $name = 'MLDKP 1.1 / EQdkp Plugin';

public static function check($xml) {
$back[1] = true;
if(!isset($xml->start)) {
$back[1] = false;
$back[2][] = 'start in format: MM/DD/YY HH:MM:SS';
$back[2][] = 'start';
} else {
if(!is_numeric((string)$xml->start[0]) && !(stristr($xml->start, ':'))) {
$back[1] = false;
$back[2][] = 'start in format: MM/DD/YY HH:MM:SS';
}
}
}
if(!isset($xml->end)) {
$back[1] = false;
$back[2][] = 'end';
} else {
if(!(stristr($xml->start, ':'))) {
if(!isset($xml->end)) {
$back[1] = false;
$back[2][] = 'end in format: MM/DD/YY HH:MM:SS';
$back[2][] = 'end';
} else {
if(!is_numeric((string)$xml->end[0]) && !(stristr($xml->end, ':'))) {
$back[1] = false;
$back[2][] = 'end in format: MM/DD/YY HH:MM:SS';
}
}
}
if(!isset($xml->BossKills)) {
$back[1] = false;
$back[2][] = 'BossKills';
} else {
foreach($xml->BossKills->children() as $bosskill) {
if($bosskill) {
if(!isset($bosskill->name)) {
$back[1] = false;
$back[2][] = 'BossKills->name';
if(!isset($xml->BossKills)) {
$back[1] = false;
$back[2][] = 'BossKills';
} else {
foreach($xml->BossKills->children() as $bosskill) {
if($bosskill) {
if(!isset($bosskill->name)) {
$back[1] = false;
$back[2][] = 'BossKills->name';
}
if(!isset($bosskill->time)) {
$back[1] = false;
$back[2][] = 'BossKills->time';
}
}
if(!isset($bosskill->time)) {
$back[1] = false;
$back[2][] = 'BossKills->time';
}
}
if(!isset($xml->Loot)) {
$back[1] = false;
$back[2][] = 'Loot';
} else {
foreach($xml->Loot->children() as $loot) {
if($loot) {
if(!isset($loot->ItemName)) {
$back[1] = false;
$back[2][] = 'Loot->ItemName';
}
if(!isset($loot->Player)) {
$back[1] = false;
$back[2][] = 'Loot->Player';
}
if(!isset($loot->Time)) {
$back[1] = false;
$back[2] = 'Loot->Time';
}
}
}
}
}
if(!isset($xml->Loot)) {
$back[1] = false;
$back[2][] = 'Loot';
} else {
foreach($xml->Loot->children() as $loot) {
if($loot) {
if(!isset($loot->ItemName)) {
if(!isset($xml->PlayerInfos)) {
$back[1] = false;
$back[2][] = 'PlayerInfos';
} else {
foreach($xml->PlayerInfos->children() as $mem) {
if(!isset($mem->name)) {
$back[1] = false;
$back[2][] = 'Loot->ItemName';
$back[2][] = 'PlayerInfos->name';
}
if(!isset($loot->Player)) {
}
}
if(!isset($xml->Join)) {
$back[1] = false;
$back[2][] = 'Join';
} else {
foreach($xml->Join->children() as $join) {
if(!isset($join->player)) {
$back[1] = false;
$back[2][] = 'Loot->Player';
$back[2][] = 'Join->player';
}
if(!isset($loot->Time)) {
if(!isset($join->time)) {
$back[1] = false;
$back[2] = 'Loot->Time';
$back[2][] = 'Join->time';
}
}
}
}
if(!isset($xml->PlayerInfos)) {
$back[1] = false;
$back[2][] = 'PlayerInfos';
} else {
foreach($xml->PlayerInfos->children() as $mem) {
if(!isset($mem->name)) {
$back[1] = false;
$back[2][] = 'PlayerInfos->name';
if(!isset($xml->Leave)) {
$back[1] = false;
$back[2][] = 'Leave';
} else {
foreach($xml->Leave->children() as $leave) {
if(!isset($leave->player)) {
$back[1] = false;
$back[2][] = 'Leave->player';
}
if(!isset($leave->time)) {
$back[1] = false;
$back[2][] = 'Leave->time';
}
}
}
return $back;
}
if(!isset($xml->Join)) {
$back[1] = false;
$back[2][] = 'Join';
} else {
foreach($xml->Join->children() as $join) {
if(!isset($join->player)) {
$back[1] = false;
$back[2][] = 'Join->player';
}
if(!isset($join->time)) {
$back[1] = false;
$back[2][] = 'Join->time';
}

public static function parse($xml) {
$data = array();

$data['zones'][] = array(trim($xml->zone), self::convertTime($xml->start), self::convertTime($xml->end), trim($xml->difficulty));
foreach ($xml->BossKills->children() as $bosskill) {
$data['bosses'][] = array(trim($bosskill->name), self::convertTime($bosskill->time));
}
}
if(!isset($xml->Leave)) {
$back[1] = false;
$back[2][] = 'Leave';
} else {
foreach($xml->Leave->children() as $leave) {
if(!isset($leave->player)) {
$back[1] = false;
$back[2][] = 'Leave->player';
}
if(!isset($leave->time)) {
$back[1] = false;
$back[2][] = 'Leave->time';
}
foreach($xml->Loot->children() as $loot) {
$player = (trim($loot->Player));
$cost = (array_key_exists('Costs', $loot)) ? (int) $loot->Costs : (int) $loot->Note;
$itemid = trim($loot->ItemID);
$data['items'][] = array(trim($loot->ItemName), $player, $cost, $itemid, self::convertTime($loot->Time));
}
foreach($xml->PlayerInfos->children() as $xmember) {
$data['members'][] = array(trim($xmember->name), trim($xmember->class), trim($xmember->race), trim($xmember->level), trim($xmember->note));
}
foreach ($xml->Join->children() as $joiner) {
$data['times'][] = array(trim($joiner->player), self::convertTime($joiner->time), 'join');
}
foreach ($xml->Leave->children() as $leaver) {
$data['times'][] = array(trim($leaver->player), self::convertTime($leaver->time), 'leave');
}

return $data;
}
return $back;
}

public static function parse($xml) {
$data['zones'][] = array(trim($xml->zone), strtotime($xml->start), strtotime($xml->end), trim($xml->difficulty));
foreach ($xml->BossKills->children() as $bosskill) {
$data['bosses'][] = array(trim($bosskill->name), strtotime($bosskill->time));
}
foreach($xml->Loot->children() as $loot) {
$player = (trim($loot->Player));
$cost = (array_key_exists('Costs', $loot)) ? (int) $loot->Costs : (int) $loot->Note;
$itemid = trim($loot->ItemID);
$data['items'][] = array(trim($loot->ItemName), $player, $cost, $itemid, strtotime($loot->Time));
}
foreach($xml->PlayerInfos->children() as $xmember) {
$data['members'][] = array(trim($xmember->name), trim($xmember->class), trim($xmember->race), trim($xmember->level), trim($xmember->note));
}
foreach ($xml->Join->children() as $joiner) {
$data['times'][] = array(trim($joiner->player), strtotime($joiner->time), 'join');
}
foreach ($xml->Leave->children() as $leaver) {
$data['times'][] = array(trim($leaver->player), strtotime($leaver->time), 'leave');

private static function convertTime($str){
if(stristr($str, ':')) return strtotime($str);
if(is_numeric((string)$str)) return intval((string)$str);
}
return $data;
}
}
}
?>
2 changes: 1 addition & 1 deletion raidlogimport_plugin_class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public static function __shortcuts() {

public $vstatus = 'Stable';

public $version = '0.7.3.3'; //Version for EQdkp Plus 2.3
public $version = '0.7.3.4'; //Version for EQdkp Plus 2.3

protected static $apiLevel = 23;

Expand Down

0 comments on commit 0ee59ce

Please sign in to comment.