Adds sanitizer to render text correctly

Sanitized the text, which is displayed, to show formatting like
centering, bold etc.

Sanitized the text for projectors
This commit is contained in:
GabrielMeyer 2019-02-22 10:41:27 +01:00
parent 497a3ec71d
commit efe8f3e862
6 changed files with 47 additions and 8 deletions

View File

@ -31,7 +31,7 @@
<div> <div>
<span *ngIf="!editTopic"> <span *ngIf="!editTopic">
<!-- Render topic text as HTML --> <!-- Render topic text as HTML -->
<div [innerHTML]="topic.text"></div> <div [innerHTML]="sanitizedText(topic.text)"></div>
</span> </span>
</div> </div>

View File

@ -1,7 +1,7 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { FormGroup, Validators, FormBuilder } from '@angular/forms'; import { FormGroup, Validators, FormBuilder } from '@angular/forms';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { Title } from '@angular/platform-browser'; import { Title, DomSanitizer, SafeHtml } from '@angular/platform-browser';
import { MatSnackBar } from '@angular/material'; import { MatSnackBar } from '@angular/material';
import { TranslateService } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core';
@ -89,7 +89,8 @@ export class TopicDetailComponent extends BaseViewComponent {
private promptService: PromptService, private promptService: PromptService,
private operator: OperatorService, private operator: OperatorService,
private mediafileRepo: MediafileRepositoryService, private mediafileRepo: MediafileRepositoryService,
private itemRepo: ItemRepositoryService private itemRepo: ItemRepositoryService,
private sanitizer: DomSanitizer
) { ) {
super(title, translate, matSnackBar); super(title, translate, matSnackBar);
this.getTopicByUrl(); this.getTopicByUrl();
@ -256,4 +257,16 @@ export class TopicDetailComponent extends BaseViewComponent {
this.setEditMode(false); this.setEditMode(false);
} }
} }
/**
* Function to sanitize text.
* Necessary to render styles etc. correctly.
*
* @param text which will be sanitized.
*
* @returns safeHtml which can be displayed whithout loss.
*/
public sanitizedText(text: string): SafeHtml {
return this.sanitizer.bypassSecurityTrustHtml(text);
}
} }

View File

@ -177,7 +177,7 @@
<!-- The HTML Editor --> <!-- The HTML Editor -->
<h4 translate *ngIf="user.about_me || editUser">About me</h4> <h4 translate *ngIf="user.about_me || editUser">About me</h4>
<editor formControlName="about_me" [init]="tinyMceSettings" *ngIf="editUser"></editor> <editor formControlName="about_me" [init]="tinyMceSettings" *ngIf="editUser"></editor>
<div *ngIf="user.about_me && !editUser" [innerHTML]="user.about_me"></div> <div *ngIf="user.about_me && !editUser" [innerHTML]="sanitizedText(user.about_me)"></div>
</div> </div>
<div *ngIf="isAllowed('seePersonal')"> <div *ngIf="isAllowed('seePersonal')">

View File

@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { FormGroup, FormBuilder, Validators } from '@angular/forms'; import { FormGroup, FormBuilder, Validators } from '@angular/forms';
import { MatSnackBar } from '@angular/material'; import { MatSnackBar } from '@angular/material';
import { Title } from '@angular/platform-browser'; import { Title, SafeHtml, DomSanitizer } from '@angular/platform-browser';
import { TranslateService } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core';
@ -96,7 +96,8 @@ export class UserDetailComponent extends BaseViewComponent implements OnInit {
private operator: OperatorService, private operator: OperatorService,
private promptService: PromptService, private promptService: PromptService,
private pdfService: UserPdfExportService, private pdfService: UserPdfExportService,
private groupRepo: GroupRepositoryService private groupRepo: GroupRepositoryService,
private sanitizer: DomSanitizer
) { ) {
super(title, translate, matSnackBar); super(title, translate, matSnackBar);
// prevent 'undefined' to appear in the ui // prevent 'undefined' to appear in the ui
@ -394,4 +395,16 @@ export class UserDetailComponent extends BaseViewComponent implements OnInit {
public onDownloadPdf(): void { public onDownloadPdf(): void {
this.pdfService.exportSingleUserAccessPDF(this.user); this.pdfService.exportSingleUserAccessPDF(this.user);
} }
/**
* Function to sanitize the text.
* Necessary to render text etc. correctly.
*
* @param text which should be sanitized.
*
* @returns safeHtml which can be displayed.
*/
public sanitizedText(text: string): SafeHtml {
return this.sanitizer.bypassSecurityTrustHtml(text);
}
} }

View File

@ -1,5 +1,5 @@
<div *ngIf="data"> <div *ngIf="data">
<h1>{{ data.data.title }}</h1> <h1>{{ data.data.title }}</h1>
<div [innerHTML]="data.data.text"></div> <div [innerHTML]="sanitizedText(data.data.text)"></div>
</div> </div>

View File

@ -1,6 +1,7 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { BaseSlideComponent } from 'app/slides/base-slide-component'; import { BaseSlideComponent } from 'app/slides/base-slide-component';
import { TopicSlideData } from './topic-slide-data'; import { TopicSlideData } from './topic-slide-data';
import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
@Component({ @Component({
selector: 'os-topic-slide', selector: 'os-topic-slide',
@ -8,7 +9,19 @@ import { TopicSlideData } from './topic-slide-data';
styleUrls: ['./topic-slide.component.scss'] styleUrls: ['./topic-slide.component.scss']
}) })
export class TopicSlideComponent extends BaseSlideComponent<TopicSlideData> { export class TopicSlideComponent extends BaseSlideComponent<TopicSlideData> {
public constructor() { public constructor(private sanitizer: DomSanitizer) {
super(); super();
} }
/**
* Function to sanitize text.
* Necessary to render the text correctly.
*
* @param text which should be displayed.
*
* @returns safeHtml which can be displayed.
*/
public sanitizedText(text: string): SafeHtml {
return this.sanitizer.bypassSecurityTrustHtml(text);
}
} }