Updates to Message, Remove updated_at/mid from echomails/netmails, not used
This commit is contained in:
@@ -697,9 +697,14 @@ class Message extends FTNBase
|
||||
}
|
||||
|
||||
// Catch any kludges we need to process here
|
||||
if (array_key_exists($m[1],self::kludges))
|
||||
if (array_key_exists($m[1],self::kludges)) {
|
||||
// Some earlier mystic message had a blank value for TZUTC
|
||||
if ((($m[1]) === 'TZUTC:') && (! $m[2]))
|
||||
$m[2] = '0000';
|
||||
|
||||
$this->{self::kludges[$m[1]]} = $m[2];
|
||||
else
|
||||
|
||||
} else
|
||||
$o->kludges = [$m[1],$m[2]];
|
||||
}
|
||||
|
||||
@@ -714,7 +719,7 @@ class Message extends FTNBase
|
||||
throw new InvalidPacketException('Couldnt find the end of the origin');
|
||||
|
||||
} elseif (! $ptr_end=strpos($message,"\r\x01",$ptr_start)) {
|
||||
throw new InvalidPacketException('Couldnt parse the end of the content');
|
||||
$ptr_end = strlen($message);
|
||||
}
|
||||
|
||||
$remaining = substr($message,$ptr_end+1);
|
||||
@@ -800,8 +805,10 @@ class Message extends FTNBase
|
||||
$o->msg = rtrim($o->msg,"\r");
|
||||
|
||||
// Quick validation that we are done
|
||||
if ($ptr_content_start !== strlen($content))
|
||||
throw new InvalidPacketException('There is more data in the message content?');
|
||||
if ($ptr_content_start !== strlen($content)) {
|
||||
Log::alert(sprintf('%s:! We failed parsing the message.',self::LOGKEY));
|
||||
$o->msg = substr($message,0,$ptr_end);
|
||||
}
|
||||
}
|
||||
|
||||
$ptr_start = $ptr_end+1;
|
||||
|
Reference in New Issue
Block a user