Баг с определением доступа. Альтернативная почта. Выбор документов

This commit is contained in:
origami11 2017-07-25 11:02:11 +03:00
parent a48bce8552
commit a3c988b2c3
4 changed files with 94 additions and 1 deletions

View file

@ -211,7 +211,8 @@ class Controller_Action
public function nUrl($name, array $param = array()) public function nUrl($name, array $param = array())
{ {
/*.Filter_ActionAccess.*/$access = $this->access; /*.Filter_ActionAccess.*/$access = $this->access;
if ($access != null || $access->checkAction($name)) {
if ($access == null || $access->checkAction($name)) {
return lcurry(array($this, 'postUrl'), $name, $param); return lcurry(array($this, 'postUrl'), $name, $param);
} }
return null; return null;

View file

@ -302,6 +302,7 @@ class Form_Form extends View_View {
'hidden' => 'THidden', 'hidden' => 'THidden',
'radio' => 'TSelectOne', 'radio' => 'TSelectOne',
'filebrowser' => 'TComponentBrowserInput', 'filebrowser' => 'TComponentBrowserInput',
'documents' => 'TComponentBrowserInput',
); );
} }

90
src/MailAlt.php Normal file
View file

@ -0,0 +1,90 @@
<?php
class MailAlt
{
public $mailer;
function __construct() {
$this->mailer = new PHPMailer();
$this->mailer->CharSet = 'UTF-8';
}
/**
* Установка отправителя
*/
function from($name)
{
$this->mailer->setFrom($name);
}
/**
* Установка получателя
*/
function to($name) // recipient
{
$this->mailer->addAddress($name);
}
function replyTo($name) // recipient
{
$this->mailer->AddReplyTo($name);
}
/**
* Установка получателей копии
*/
function copy($name) // recipient cc
{
$this->addCC($name);
}
function notify($notify)
{
$this->_notify = $notify;
}
/**
* Тема письма
*/
function subject($subject)
{
$this->mailer->Subject = $subject;
}
/**
* Текст письма
*/
function setContent($text)
{
$this->mailer->Body = $text;
}
function setType($text)
{
$this->mailer->isHTML($text == 'text/html');
}
/**
* Кодировка текста в письме
*/
function setEncoding($encoding)
{
$this->encoding = $encoding;
}
/**
* Добавление вложения из файла
*/
function addAttachment($filename, $name = false)
{
$this->mailer->addAttachment($filename, $name);
}
/**
* Отправка почты
*/
function send()
{
return $this->mailer->send();
}
}

View file

@ -44,6 +44,7 @@ class Validator_Validator
// Список правил // Список правил
if (! isset($value['validate'])) continue; if (! isset($value['validate'])) continue;
$rules = explode("|", $value['validate']); $rules = explode("|", $value['validate']);
foreach ($rules as $rule) { foreach ($rules as $rule) {
// Список параметров правила // Список параметров правила
$rule_param = explode(",", $rule); $rule_param = explode(",", $rule);