Skip to content

Commit

Permalink
Merge pull request #1201 from RotherOSS/issue-#1013-more_references
Browse files Browse the repository at this point in the history
Issue #1013 more references
  • Loading branch information
bschmalhofer authored Aug 28, 2021
2 parents 51ac28c + befefa0 commit 90b1545
Show file tree
Hide file tree
Showing 15 changed files with 45 additions and 56 deletions.
7 changes: 2 additions & 5 deletions scripts/test/Frontend/PictureUpload.t
Original file line number Diff line number Diff line change
Expand Up @@ -154,26 +154,23 @@ $Self->True(
'Response check for CKEditor error handler',
);

## nofilter(TidyAll::Plugin::OTRS::Whitespace::Tabs)
my $ContentSVG = <<'EOF',
my $ContentSVG = <<'EOF';
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" baseProfile="full" xmlns="http://www.w3.org/2000/svg">
<polygon id="triangle" points="0,0 0,50 50,0" fill="#009900" stroke="#004400"/>
<script type="text/javascript">alert(document.domain);</script></svg>
EOF
;

my $EscapedContentSVG = <<'EOF',
my $EscapedContentSVG = <<'EOF';
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" baseProfile="full" xmlns="http://www.w3.org/2000/svg">
<polygon id="triangle" points="0,0 0,50 50,0" fill="#009900" stroke="#004400"/>
</svg>
EOF
;

# Upload svg image with png file and script element.
$Response = $UserAgent->post(
Expand Down
4 changes: 2 additions & 2 deletions scripts/test/PostMaster.t
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ for my $TicketSubjectConfig ( 'Right', 'Left' ) {
}

# follow up check
my @ContentNew = ();
my @ContentNew;
for my $Line (@Content) {
push @ContentNew, $Line;
}
Expand Down Expand Up @@ -579,7 +579,7 @@ for my $TicketSubjectConfig ( 'Right', 'Left' ) {
my $MD5 = $MainObject->MD5sum( String => $Article{Body} ) || '';
$Self->Is(
$MD5,
'c2aa129ff25272a00a305668f0d9e0c2',
'44da7f29cd0cca31532f6acd50b42da8',
$NamePrefix . ' md5 body check',
);

Expand Down
8 changes: 4 additions & 4 deletions scripts/test/PostMaster/Attachments.t
Original file line number Diff line number Diff line change
Expand Up @@ -214,21 +214,21 @@ my @Tests = (
Name => '#3 - With Inline Images',
Match => [
{
Key => 'X-OTRS-AttachmentExists',
Key => 'X-OTOBO-AttachmentExists',
Value => 'yes',
},
{
Key => 'X-OTRS-AttachmentCount',
Key => 'X-OTOBO-AttachmentCount',
Value => 1,
}
],
Set => [
{
Key => 'X-OTRS-DynamicField-TicketFreeText1',
Key => 'X-OTOBO-DynamicField-TicketFreeText1',
Value => 'This should not be set',
},
{
Key => 'X-OTRS-DynamicField-TicketFreeText2',
Key => 'X-OTOBO-DynamicField-TicketFreeText2',
Value => 'This should not be set',
},
],
Expand Down
16 changes: 8 additions & 8 deletions scripts/test/TemplateGenerator/Replace.t
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ mailto-Link <a href="mailto:skywalker@otobo.org?subject=From%3A%20test%40home.co
mailto-Link <a href="mailto:skywalker@otobo.org?body=From%3A%20test%40home.com">E-Mail mit Body</a><br />',
},
{
Name => 'OTRS AGENT + CUSTOMER FROM', # <OTOBO_TICKET_DynamicField_*_Value>
Name => 'OTOBO AGENT + CUSTOMER FROM', # <OTOBO_TICKET_DynamicField_*_Value>
Data => {
From => 'testcustomer@home.com',
},
Expand All @@ -544,7 +544,7 @@ mailto-Link <a href="mailto:skywalker@otobo.org?body=From%3A%20test%40home.com">
},
{
Name =>
'OTRS AGENT + CUSTOMER BODY', # this is an special case, it sets the Body as it is since is the Data param
'OTOBO AGENT + CUSTOMER BODY', # this is an special case, it sets the Body as it is since is the Data param
Data => {
Body => "Line1\nLine2\nLine3",
},
Expand All @@ -557,7 +557,7 @@ mailto-Link <a href="mailto:skywalker@otobo.org?body=From%3A%20test%40home.com">
},
{
Name =>
'OTRS AGENT + CUSTOMER BODY With RichText enabled'
'OTOBO AGENT + CUSTOMER BODY With RichText enabled'
, # this is an special case, it sets the Body as it is since is the Data param
Data => {
Body => "Line1\nLine2\nLine3",
Expand All @@ -574,7 +574,7 @@ Line2<br/>
Line3",
},
{
Name => 'OTRS AGENT + CUSTOMER BODY[2]',
Name => 'OTOBO AGENT + CUSTOMER BODY[2]',
Data => {
Body => "Line1\nLine2\nLine3",
},
Expand All @@ -586,7 +586,7 @@ Line3",
Result => "Test > Line1\n> Line2 - > Line1\n> Line2",
},
{
Name => 'OTRS AGENT + CUSTOMER BODY[7] with RichText enabled',
Name => 'OTOBO AGENT + CUSTOMER BODY[7] with RichText enabled',
Data => {
Body => "Line1\nLine2\nLine3\nLine4\nLine5\nLine6\nLine7\nLine8\nLine9",
},
Expand All @@ -611,7 +611,7 @@ Line6<br/>
Line7</div>',
},
{
Name => 'OTRS AGENT + CUSTOMER EMAIL', # EMAIL without [ ] does not exists
Name => 'OTOBO AGENT + CUSTOMER EMAIL', # EMAIL without [ ] does not exists
Data => {
Body => "Line1\nLine2\nLine3",
},
Expand All @@ -623,7 +623,7 @@ Line7</div>',
Result => "Test Line1\nLine2\nLine3 - Line1\nLine2\nLine3",
},
{
Name => 'OTRS AGENT + CUSTOMER EMAIL[2]',
Name => 'OTOBO AGENT + CUSTOMER EMAIL[2]',
Data => {
Body => "Line1\nLine2\nLine3",
},
Expand Down Expand Up @@ -654,7 +654,7 @@ Line7</div>',
Result => "Test > Line1\n> Line2",
},
{
Name => 'OTRS AGENT + CUSTOMER SUBJECT[2]',
Name => 'OTOBO AGENT + CUSTOMER SUBJECT[2]',
Data => {
Subject => '0123456789'
},
Expand Down
25 changes: 12 additions & 13 deletions scripts/test/sample/EmailParser/PostMaster-Test5.box
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ Subject: 2nd try: Again some stuff =?iso-8859-1?B?aPxi?=
Message-ID: <20070412132542.GB29977@tuxbrett.hq.otobo.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="J/dobhs11T7y2rNN"
X-OTRS-TicketKey1: Test
X-OTRS-TicketValue1: ABC
X-OTRS-TicketKey2: Test2
X-OTRS-TicketValue2: ABC2
X-OTRS-TicketTime1: 2008-01-12 13:14:15
X-OTRS-TicketTime2: 2008-01-12 13:15:16
X-OTRS-TicketTime3: 2008-01-12 13:16:17
X-OTRS-TicketTime4: 2008-01-12 13:17:18
X-OTRS-TicketTime5: 2008-01-12 13:18:19
X-OTRS-TicketTime6: 2008-01-12 13:19:20
X-OTOBO-TicketKey1: Test
X-OTOBO-TicketValue1: ABC
X-OTOBO-TicketKey2: Test2
X-OTOBO-TicketValue2: ABC2
X-OTOBO-TicketTime1: 2008-01-12 13:14:15
X-OTOBO-TicketTime2: 2008-01-12 13:15:16
X-OTOBO-TicketTime3: 2008-01-12 13:16:17
X-OTOBO-TicketTime4: 2008-01-12 13:17:18
X-OTOBO-TicketTime5: 2008-01-12 13:18:19
X-OTOBO-TicketTime6: 2008-01-12 13:19:20
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
User-Agent: mutt-ng/devel-r804 (Debian)
Expand All @@ -42,9 +42,8 @@ Sie m�chten �mlaute, sie kr�gen �mlaute.

--
Han Solo
((otrs)) :: OTRS GmbH :: Europaring 4 :: D - 94315 Straubing
Fon: +49 (0) 9421 56818-0 :: Fax: +49 (0) 9421 56818-18
http://www.otobo.org/ :: Communication with success!
OTOBO :: RotherOSS Open Source Services :: Oberwalting 31 :: 94335 Leiblfing
http://www.otobo.org/ :: open source for real

--J/dobhs11T7y2rNN
Content-Type: text/plain; charset=iso-8859-1
Expand Down
5 changes: 2 additions & 3 deletions scripts/test/sample/EmailParser/PostMaster-Test6.box
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,8 @@ N=C3=BCcht mal vor Anh=C3=A4ngen machen Umlaute halt:
Mit freundlichen Gr=C3=BC=C3=9Fen
R2 D2
=20
((otobo)) :: OTOBO GmbH :: Europaring 4 :: D - 94315 Straubing
Fon: +49 (0)9421 56818 0 :: Fax: +49 (0)9421 56818 18
http://www.otobo.org/ :: Communication with success!
OTOBO :: RotherOSS Open Source Services :: Oberwalting 31 :: 94335 Leiblfing
http://www.otobo.org/ :: open source for real

------=_NextPart_000_005D_01C77D1C.01CD8170
Content-Type: application/pdf;
Expand Down
5 changes: 2 additions & 3 deletions scripts/test/sample/EmailParser/PostMaster-Test7.box
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,8 @@ N=FCcht mal vor Anh=E4ngen machen Umlaute halt:
Mit freundlichen Gr=FC=DFen
R2 D2
=20
((otobo)) :: OTOBO GmbH :: Europaring 4 :: D - 94315 Straubing
Fon: +49 (0)9421 56818 0 :: Fax: +49 (0)9421 56818 18
http://www.otobo.org/ :: Communication with success!
OTOBO :: RotherOSS Open Source Services :: Oberwalting 31 :: 94335 Leiblfing
http://www.otobo.org/ :: open source for real

------=_NextPart_000_0061_01C77D1C.2012AE80
Content-Type: application/pdf;
Expand Down
2 changes: 1 addition & 1 deletion scripts/test/sample/EmailParser/PostMaster-Test9.box
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Message-ID: 000000B9
X-Mailer: Novell GroupWise Internet Agent 7.0.2 HP
Date: Tue, 13 Nov 2007 09:04:10 +0100
From: "Hans Huber" <hans@otobo.org>
To: "OTRS" <skywalker@otobo.org>
To: "OTOBO" <skywalker@otobo.org>
Subject: Some message with .pdf as only MIME attachment (without text for body)
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=__Part2600556A.0__="
Expand Down
2 changes: 1 addition & 1 deletion scripts/test/sample/PostMaster/PostMaster-Test10.box
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Content-Disposition: inline
Content-Transfer-Encoding: base64
MIME-Version: 1.0
Subject: [Ticket#2007070610001801] test mail
X-Powered-BY: OTRS - Open Ticket Request System (http://otobo.org/)
X-Powered-BY: OTOBO - (http://otobo.org/)
X-Mailer: OTOBO Mail Service (2.1.7)
Date: Fri, 6 Jul 2007 12:17:31 +0200
Message-ID: <1183717051.586927.929001308.97809.36@otobo.otobo.org>
Expand Down
5 changes: 2 additions & 3 deletions scripts/test/sample/PostMaster/PostMaster-Test22.box
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,8 @@ N=FCcht mal vor Anh=E4ngen machen Umlaute halt:
Mit freundlichen Gr=FC=DFen
R2 D2
=20
((otobo)) :: OTOBO GmbH :: Europaring 4 :: D - 94315 Straubing
Fon: +49 (0)9421 56818 0 :: Fax: +49 (0)9421 56818 18
http://www.otobo.org/ :: Communication with success!
OTOBO :: RotherOSS Open Source Services :: Oberwalting 31 :: 94335 Leiblfing
http://www.otobo.org/ :: open source for real

------=_NextPart_000_0061_01C77D1C.2012AE80
Content-Type: application/pdf;
Expand Down
5 changes: 2 additions & 3 deletions scripts/test/sample/PostMaster/PostMaster-Test23.box
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,8 @@ N=FCcht mal vor Anh=E4ngen machen Umlaute halt:
Mit freundlichen Gr=FC=DFen
R2 D2
=20
((otobo)) :: OTOBO GmbH :: Europaring 4 :: D - 94315 Straubing
Fon: +49 (0)9421 56818 0 :: Fax: +49 (0)9421 56818 18
http://www.otobo.org/ :: Communication with success!
OTOBO :: RotherOSS Open Source Services :: Oberwalting 31 :: 94335 Leiblfing
http://www.otobo.org/ :: open source for real

------=_NextPart_000_0061_01C77D1C.2012AE80
Content-Type: application/pdf;
Expand Down
5 changes: 2 additions & 3 deletions scripts/test/sample/PostMaster/PostMaster-Test5.box
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,8 @@ Sie m�chten �mlaute, sie kr�gen �mlaute.

--
Han Solo
((otobo)) :: OTOBO GmbH :: Europaring 4 :: D - 94315 Straubing
Fon: +49 (0) 9421 56818-0 :: Fax: +49 (0) 9421 56818-18
http://www.otobo.org/ :: Communication with success!
OTOBO :: RotherOSS Open Source Services :: Oberwalting 31 :: 94335 Leiblfing
http://www.otobo.org/ :: open source for real

--J/dobhs11T7y2rNN
Content-Type: text/plain; charset=iso-8859-1
Expand Down
5 changes: 2 additions & 3 deletions scripts/test/sample/PostMaster/PostMaster-Test6.box
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,8 @@ N=C3=BCcht mal vor Anh=C3=A4ngen machen Umlaute halt:
Mit freundlichen Gr=C3=BC=C3=9Fen
R2 D2
=20
((otrs)) :: OTRS GmbH :: Europaring 4 :: D - 94315 Straubing
Fon: +49 (0)9421 56818 0 :: Fax: +49 (0)9421 56818 18
http://www.otobo.org/ :: Communication with success!
OTOBO :: RotherOSS Open Source Services :: Oberwalting 31 :: 94335 Leiblfing
http://www.otobo.org/ :: open source for real

------=_NextPart_000_005D_01C77D1C.01CD8170
Content-Type: application/pdf;
Expand Down
5 changes: 2 additions & 3 deletions scripts/test/sample/PostMaster/PostMaster-Test7.box
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,8 @@ N=FCcht mal vor Anh=E4ngen machen Umlaute halt:
Mit freundlichen Gr=FC=DFen
R2 D2
=20
((otobo)) :: OTOBO GmbH :: Europaring 4 :: D - 94315 Straubing
Fon: +49 (0)9421 56818 0 :: Fax: +49 (0)9421 56818 18
http://www.otobo.org/ :: Communication with success!
OTOBO :: RotherOSS Open Source Services :: Oberwalting 31 :: 94335 Leiblfing
http://www.otobo.org/ :: open source for real

------=_NextPart_000_0061_01C77D1C.2012AE80
Content-Type: application/pdf;
Expand Down
2 changes: 1 addition & 1 deletion scripts/test/sample/PostMaster/PostMaster-Test9.box
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Message-ID: 000000B9
X-Mailer: Novell GroupWise Internet Agent 7.0.2 HP
Date: Tue, 13 Nov 2007 09:04:10 +0100
From: "Hans Huber" <hans@otobo.org>
To: "OTRS" <skywalker@otobo.org>
To: "OTOBO" <skywalker@otobo.org>
Subject: Some message with .pdf as only MIME attachment (without text for body)
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=__Part2600556A.0__="
Expand Down

0 comments on commit 90b1545

Please sign in to comment.