Skip to content

Commit

Permalink
Merge branch 'MDL-50790-master' of git://github.com/cameron1729/moodle
Browse files Browse the repository at this point in the history
  • Loading branch information
@andrewnicols
andrewnicols committed Sep 21, 2015
2 parents 28eca8c + c052d84 commit f19aaed
Show file tree
Hide file tree
Showing 4 changed files with 151 additions and 34 deletions.
32 changes: 2 additions & 30 deletions lib/classes/message/inbound/handler.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,6 @@ public function get_success_message(\stdClass $messagedata, $handlerresult) {
* @return array message and message format to use.
*/
protected static function remove_quoted_text($messagedata) {
$linecount = self::get_linecount_to_remove($messagedata);
if (!empty($messagedata->plain)) {
$text = $messagedata->plain;
} else {
Expand All @@ -258,8 +257,6 @@ protected static function remove_quoted_text($messagedata) {
return array($text, $messageformat);
}

// Remove extra line. "Xyz wrote on...".
$count = 0;
$i = 0;
$flag = false;
foreach ($splitted as $i => $element) {
Expand All @@ -271,9 +268,6 @@ protected static function remove_quoted_text($messagedata) {
$element = $splitted[$j];
if (!empty($element)) {
unset($splitted[$j]);
$count++;
}
if ($count == $linecount) {
break;
}
}
Expand All @@ -282,10 +276,8 @@ protected static function remove_quoted_text($messagedata) {
}
if ($flag) {
// Quoted text was found.
$k = $i - $linecount; // Where to start the chopping process.

// Remove quoted text.
$splitted = array_slice($splitted, 0, $k);
// Retrieve everything from the start until the line before the quoted text.
$splitted = array_slice($splitted, 0, $i-1);

// Strip out empty lines towards the end, since a lot of clients add a huge chunk of empty lines.
$reverse = array_reverse($splitted);
Expand All @@ -311,24 +303,4 @@ protected static function remove_quoted_text($messagedata) {
}
return array($message, $messageformat);
}

/**
* Try to guess how many lines to remove from the email to delete "xyz wrote on" text. Hard coded numbers for various email
* clients.
* Gmail uses two
* Evolution uses one
* Thunderbird uses one
*
* @param \stdClass $messagedata The Inbound Message record
*
* @return int number of lines to chop off before the start of quoted text.
*/
protected static function get_linecount_to_remove($messagedata) {
$linecount = 1;
if (!empty($messagedata->html) && stripos($messagedata->html, 'gmail_quote') !== false) {
// Gmail uses two lines.
$linecount = 2;
}
return $linecount;
}
}
148 changes: 148 additions & 0 deletions lib/tests/fixtures/messageinbound/gmail.test
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
----CLIENT----
Gmail
----EXPECTEDPLAIN----
This is a test response
----EXPECTEDHTML----
This is a test response
----FULLSOURCE----
Delivered-To: nxtmorg+aaaaaaaaaaiaaaaaaaaaagaaaaaaaaahbfpyofgjbkpkwpeh@gmail.com
Received: by 10.202.174.212 with SMTP id x203csp2773063oie;
Wed, 8 Jul 2015 03:45:49 -0700 (PDT)
X-Received: by 10.194.2.161 with SMTP id 1mr17755340wjv.143.1436352348859;
Wed, 08 Jul 2015 03:45:48 -0700 (PDT)
Return-Path: <[email protected]>
Received: from mail-wg0-x22d.google.com (mail-wg0-x22d.google.com. [2a00:1450:400c:c00::22d])
by mx.google.com with ESMTPS id hf10si1873428wib.2.2015.07.08.03.45.48
for <nxtmorg+AAAAAAAAAAIAAAAAAAAAAgAAAAAAAAAhBfpyofgjbKpKWPeH@gmail.com>
(version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
Wed, 08 Jul 2015 03:45:48 -0700 (PDT)
Received-SPF: pass (google.com: domain of [email protected] designates 2a00:1450:400c:c00::22d as permitted sender) client-ip=2a00:1450:400c:c00::22d;
Authentication-Results: mx.google.com;
spf=pass (google.com: domain of [email protected] designates 2a00:1450:400c:c00::22d as permitted sender) [email protected];
dkim=pass [email protected];
dmarc=pass (p=QUARANTINE dis=NONE) header.from=moodle.com
Received: by mail-wg0-x22d.google.com with SMTP id x7so186242655wgj.2
for <nxtmorg+AAAAAAAAAAIAAAAAAAAAAgAAAAAAAAAhBfpyofgjbKpKWPeH@gmail.com>; Wed, 08 Jul 2015 03:45:48 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=moodle.com; s=google;
h=mime-version:references:in-reply-to:from:date:message-id:subject:to
:content-type;
bh=jBsUlzIsNVo/9X0XRyhQfQKdI8jqA6v/XM5yi08CpW4=;
b=oyncjzbEuLnDDSZ4v7AbfMV8rlNClygbSabhxlhdgiUsZEORCGL83ZmjMencwF/MLm
a20Eh1Tho/5gGU3ZsacTgV8phNAp0yBl59mzZUVF4wabIQBMbQQlyBJsqn7RbIRky+DA
FpneKKLreS29B0BMr+95VGSJ/XRohQZSjw7nY=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20130820;
h=x-gm-message-state:mime-version:references:in-reply-to:from:date
:message-id:subject:to:content-type;
bh=jBsUlzIsNVo/9X0XRyhQfQKdI8jqA6v/XM5yi08CpW4=;
b=GXbTXInSb7VhTCe7uIdixAgUNh0tusJkfgc606jk8ZD5xy89IjLcCDaKBY4wPT/xgH
KqELVFnwUsAJRBv0ZiflgzvUQ7SC2znVbkfQK8idswgc7p3iaWxXLT/m3HwVrnn0Aord
uRlEW1eBraBdOD/as24aCbzBGFPjFDkynfK0dIyCVmXN05p8QE09bYqkOVSh3lDxeZfX
AIDjlfC8DmvKZQN68Con86SyzQ6epzs2A3yrQ3oMYxG5yAHFqoXbmQPZLyjWMqx0uJ4L
lRnq7wSSLsSA8a9q8RBO8JltmZHa1AShqMkHghh/RISISXyriFezN71F7lt303fDJLvw
5Z9g==
X-Gm-Message-State: ALoCoQk4VlKEKkaqy6MLYzq2ZN82v3a64TLQZJo0b26DUbmmS8UDpT8tstQh2kodndsV2GgB/bpT
X-Received: by 10.180.102.74 with SMTP id fm10mr112402988wib.25.1436352348167;
Wed, 08 Jul 2015 03:45:48 -0700 (PDT)
MIME-Version: 1.0
References: <665442d32a4d85d3ac239d88a146ffdf9becf154c78bf8394bf3bfdbb4c312f6@dan.moodle.local>
<b287e7e4769857e7e31675e9b6141ca71b147210ce28f8a4eadd77aef458ddea@dan.moodle.local>
In-Reply-To: <b287e7e4769857e7e31675e9b6141ca71b147210ce28f8a4eadd77aef458ddea@dan.moodle.local>
From: Dan Poltawski <[email protected]>
Date: Wed, 08 Jul 2015 10:45:38 +0000
Message-ID: <CAOieoNi=VqpcPjhQNwGsw4m-3ATr03CgkriQ4ivgeKQpQtjKqA@mail.gmail.com>
Subject: Re: Using Moodle Test: Re: A test
To: nxtmorg+AAAAAAAAAAIAAAAAAAAAAgAAAAAAAAAhBfpyofgjbKpKWPeH@gmail.com
Content-Type: multipart/alternative; boundary=f46d0444812b7c332b051a5ad7d1

--f46d0444812b7c332b051a5ad7d1
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

This is a test response

On Wed, Jul 8, 2015 at 11:45 AM Admin User <[email protected]> wrote:

> Using Moodle Test <http://dan.moodle.local/sites/course/view.php?id=3D3>=
=C2=BB
> Forums <http://dan.moodle.local/sites/mod/forum/index.php?id=3D3> =C2=BB =
Discussion
> forum <http://dan.moodle.local/sites/mod/forum/view.php?f=3D5> =C2=BB A t=
est
> <http://dan.moodle.local/sites/mod/forum/discuss.php?d=3D24>
> [image: Picture of Admin User]
> <http://dan.moodle.local/sites/user/view.php?id=3D2&course=3D3>
> Re: A test
> by Admin User <http://dan.moodle.local/sites/user/view.php?id=3D2&course=
=3D3>
> - Wednesday, 8 July 2015, 11:45 am
>
>
> test 123
> Show parent
> <http://dan.moodle.local/sites/mod/forum/discuss.php?d=3D24&parent=3D27> =
|
> Reply <http://dan.moodle.local/sites/mod/forum/post.php?reply=3D33>
> See this post in context
> <http://dan.moodle.local/sites/mod/forum/discuss.php?d=3D24#p33>
> ------------------------------
> Unsubscribe from this forum
> <http://dan.moodle.local/sites/mod/forum/subscribe.php?id=3D5> Unsubscrib=
e
> from this discussion
> <http://dan.moodle.local/sites/mod/forum/subscribe.php?id=3D5&d=3D24> Uns=
ubscribe
> from all forums
> <http://dan.moodle.local/sites/mod/forum/unsubscribeall.php> Change your
> forum digest preferences
> <http://dan.moodle.local/sites/mod/forum/index.php?id=3D3>
>
> You can reply to this via email.
>

--f46d0444812b7c332b051a5ad7d1
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr">This is a test response</div><br><div class=3D"gmail_quote=
"><div dir=3D"ltr">On Wed, Jul 8, 2015 at 11:45 AM Admin User &lt;<a href=
=3D"mailto:[email protected]">[email protected]</a>&gt; wrote:<br></div><bl=
ockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px #=
ccc solid;padding-left:1ex">
<div>

<div><a href=3D"http://dan.moodle.local/sites/course/view.php?id=3D3" targe=
t=3D"_blank">Using Moodle Test</a> =C2=BB <a href=3D"http://dan.moodle.loca=
l/sites/mod/forum/index.php?id=3D3" target=3D"_blank">Forums</a> =C2=BB <a =
href=3D"http://dan.moodle.local/sites/mod/forum/view.php?f=3D5" target=3D"_=
blank">Discussion forum</a> =C2=BB <a href=3D"http://dan.moodle.local/sites=
/mod/forum/discuss.php?d=3D24" target=3D"_blank">A test</a></div><table bor=
der=3D"0" cellpadding=3D"3" cellspacing=3D"0"><tr><td width=3D"35" valign=
=3D"top"><a href=3D"http://dan.moodle.local/sites/user/view.php?id=3D2&amp;=
course=3D3" target=3D"_blank"><img src=3D"http://dan.moodle.local/sites/the=
me/image.php?theme=3Dmoodleorgcleaned_moodleorg&amp;component=3Dcore&amp;im=
age=3Du%2Ff2&amp;svg=3D0" alt=3D"Picture of Admin User" title=3D"Picture of=
Admin User" width=3D"35" height=3D"35"></a></td><td><div>Re: A test</div><=
div>by <a href=3D"http://dan.moodle.local/sites/user/view.php?id=3D2&amp;co=
urse=3D3" target=3D"_blank">Admin User</a> - Wednesday, 8 July 2015, 11:45 =
am</div></td></tr><tr><td valign=3D"top">=C2=A0</td><td><p>test 123</p><div=
><a href=3D"http://dan.moodle.local/sites/mod/forum/discuss.php?d=3D24&amp;=
parent=3D27" target=3D"_blank">Show parent</a> | <a href=3D"http://dan.mood=
le.local/sites/mod/forum/post.php?reply=3D33" target=3D"_blank">Reply</a></=
div><div><a href=3D"http://dan.moodle.local/sites/mod/forum/discuss.php?d=
=3D24#p33" target=3D"_blank">See this post in context</a></div></td></tr></=
table>

<hr><div><a href=3D"http://dan.moodle.local/sites/mod/forum/subscribe.php?i=
d=3D5" target=3D"_blank">Unsubscribe from this forum</a>=C2=A0<a href=3D"ht=
tp://dan.moodle.local/sites/mod/forum/subscribe.php?id=3D5&amp;d=3D24" targ=
et=3D"_blank">Unsubscribe from this discussion</a>=C2=A0<a href=3D"http://d=
an.moodle.local/sites/mod/forum/unsubscribeall.php" target=3D"_blank">Unsub=
scribe from all forums</a>=C2=A0<a href=3D"http://dan.moodle.local/sites/mo=
d/forum/index.php?id=3D3" target=3D"_blank">Change your forum digest prefer=
ences</a></div></div><p>You can reply to this via email.</p>

</blockquote></div>

--f46d0444812b7c332b051a5ad7d1--
1 change: 1 addition & 0 deletions lib/tests/fixtures/messageinbound/outlook.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Sending mail via clent and it seems to go all good...
Havent tried this before and it is awesome....

Cheers
Rajesh

----FULLSOURCE----
Delivered-To: moodlehqtest+aaaaaaaaaaiaaaaaaaaabqaaaaaaaaazd63zvl6kcy04ioh+@example.com
Expand Down
4 changes: 0 additions & 4 deletions lib/tests/messageinbound_test.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,6 @@ public static function remove_quoted_text($messagedata) {
return parent::remove_quoted_text($messagedata);
}

public static function get_linecount_to_remove($messagedata) {
return parent::get_linecount_to_remove($messagedata);
}

public function get_name() {}

public function get_description() {}
Expand Down

0 comments on commit f19aaed

Please sign in to comment.