Skip to content

Commit

Permalink
smaller left part. global translator
Browse files Browse the repository at this point in the history
  • Loading branch information
Praesidiarius committed Mar 27, 2021
1 parent de1df3f commit 62dd82b
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 3 deletions.
16 changes: 15 additions & 1 deletion module/Application/src/Controller/CoreController.php
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,14 @@ class CoreController extends AbstractActionController {
*/
public static $oServiceManager;

/**
* Laminas Translation Service
*
* @var $oTranslator
* @since 1.0.33
*/
public static $oTranslator;

/**
* CoreController constructor.
*
Expand Down Expand Up @@ -787,9 +795,11 @@ protected function rutime($ru, $rus, $index) {
* @param $sToMail E-Mail address of receiver
* @param $sToName Name of receiver
* @param $sSubject e-mail subject
* @param string $sFrom
* @param MimePart $oAttachment
* @since 1.0.4
*/
protected function sendEmail($sTemplate,$aTemplateData,$sToMail,$sToName,$sSubject,$sFrom = '') {
protected function sendEmail($sTemplate,$aTemplateData,$sToMail,$sToName,$sSubject,$sFrom = '',MimePart $oAttachment = NULL) {
$viewRenderer = CoreController::$oServiceManager->get('ViewRenderer');

$sFromLabel = CoreController::$aGlobalSettings['noreply-from'];
Expand All @@ -810,6 +820,10 @@ protected function sendEmail($sTemplate,$aTemplateData,$sToMail,$sToName,$sSubje
$oBody = new MimeMessage();
$oBody->addPart($oHtml);

if($oAttachment != NULL) {
$oBody->addPart($oAttachment);
}

# Build Message
$oMail = new Mail\Message();
//$oMail->setEncoding('UTF-8');
Expand Down
4 changes: 2 additions & 2 deletions module/Application/view/partial/viewform.phtml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="plc-core-basic-view">
<div class="row">
<div class="col-md-2">
<div class="col-md-3 col-lg-2">
<div class="card">
<div class="card-body text-center">
<?php if($oItem->hasFeaturedImage()) { ?>
Expand Down Expand Up @@ -37,7 +37,7 @@
</div>
</div>
</div>
<div class="col-md-10">
<div class="col-md-9 col-lg-10">
<div class="card px-0">
<div class="card-body px-0 py-2">
<?= $this->partial('partial/basictabs', ['sFormName'=>$this->sFormName]); ?>
Expand Down

0 comments on commit 62dd82b

Please sign in to comment.