Skip to content

Fix body truncation logic in Driver.php #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ralflang merged 2 commits into from
Mar 30, 2026
Merged

Fix body truncation logic in Driver.php #10

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e752e3f
Fix body truncation logic in Driver.php
TDannhauer Mar 30, 2026
e2c3fb6
refactor: use HordeString with named parameters
ralflang Mar 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions lib/Driver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
* @author Michael J. Rubinsky <mrubinsk@horde.org>
* @package Mnemo
*/

use Horde\Util\HordeString;

abstract class Mnemo_Driver
{
/**
Expand Down Expand Up @@ -62,24 +65,24 @@ public function listMemos()
*/
public function getMemoDescription($body)
{
if (!strstr($body, "\n") && Horde_String::length($body) <= 64) {
if (!strstr($body, "\n") && HordeString::length($body) <= 64) {
return trim($body);
}

$lines = explode("\n", $body);
if (!is_array($lines)) {
return trim(Horde_String::substr($body, 0, 64));
return trim(HordeString::substr(string: $body, start: 0, length: 64));
}

// Move to a line with more than spaces.
$i = 0;
while (isset($lines[$i]) && !preg_match('|[^\s]|', $lines[$i])) {
$i++;
}
if (Horde_String::length($lines[$i]) <= 64) {
if (HordeString::length($lines[$i]) <= 64) {
return trim($lines[$i]);
} else {
return trim(Horde_String::substr($lines[$i], 0, 64));
return trim(HordeString::substr(string: $lines[$i], start: 0, length: 64));
}
}

Expand Down Expand Up @@ -461,23 +464,31 @@ public function toASNote($memo, $options = array())
$body->type = Horde_ActiveSync::BODYPREF_TYPE_HTML;
$memo['body'] = Horde_Text_Filter::filter($memo['body'], 'Text2html', array('parselevel' => Horde_Text_Filter_Text2html::MICRO));
if (isset($bp[Horde_ActiveSync::BODYPREF_TYPE_HTML]['truncationsize']) &&
Horde_String::length($memo['body']) > $bp[Horde_ActiveSync::BODYPREF_TYPE_HTML]['truncationsize']) {
$body->data = Horde_String::substr($memo['body'], $bp[Horde_ActiveSync::BODYPREF_TYPE_HTML]['truncationsize']);
HordeString::length($memo['body']) > $bp[Horde_ActiveSync::BODYPREF_TYPE_HTML]['truncationsize']) {
$body->data = HordeString::substr(
string: $memo['body'],
start: 0,
length: $bp[Horde_ActiveSync::BODYPREF_TYPE_HTML]['truncationsize']
);
$body->truncated = 1;
} else {
$body->data = $memo['body'];
}
} else {
$body->type = Horde_ActiveSync::BODYPREF_TYPE_PLAIN;
if (isset($bp[Horde_ActiveSync::BODYPREF_TYPE_PLAIN]['truncationsize']) &&
Horde_String::length($memo['body']) > $bp[Horde_ActiveSync::BODYPREF_TYPE_PLAIN]['truncationsize']) {
$body->data = Horde_String::substr($memo['body'], 0, $bp[Horde_ActiveSync::BODYPREF_TYPE_PLAIN]['truncationsize']);
HordeString::length($memo['body']) > $bp[Horde_ActiveSync::BODYPREF_TYPE_PLAIN]['truncationsize']) {
$body->data = HordeString::substr(
string: $memo['body'],
start: 0,
length: $bp[Horde_ActiveSync::BODYPREF_TYPE_PLAIN]['truncationsize']
);
$body->truncated = 1;
} else {
$body->data = $memo['body'];
}
}
$body->estimateddatasize = Horde_String::length($memo['body']);
$body->estimateddatasize = HordeString::length($memo['body']);
$message->body = $body;
if (!empty($memo['tags'])) {
$message->categories = $memo['tags'];
Expand Down
Loading