Тип письма. Экранирование ковычек в запросе

This commit is contained in:
origami11 2017-01-23 17:30:04 +03:00
parent 5dac5a6e19
commit e2f5ecdbca
2 changed files with 9 additions and 3 deletions

View file

@ -72,7 +72,7 @@ class Database extends PDO
return $sth->fetch(); return $sth->fetch();
} }
private static function assignQuote($x, $y) private function assignQuote($x, $y)
{ {
return $x . "=" . $this->quote($y); return $x . "=" . $this->quote($y);
} }
@ -92,7 +92,7 @@ class Database extends PDO
function updateQuery($table, array $values, $cond) function updateQuery($table, array $values, $cond)
{ {
return $this->query("UPDATE $table SET " . implode(",", return $this->query("UPDATE $table SET " . implode(",",
array_map(array('self', 'assignQuote'), array_keys($values), array_values($values))) . " WHERE $cond"); array_map(array($this, 'assignQuote'), array_keys($values), array_values($values))) . " WHERE $cond");
} }
function getIdGenerator() { function getIdGenerator() {

View file

@ -17,6 +17,7 @@ class Mail
protected $attachment = array (); protected $attachment = array ();
protected $uniqid; protected $uniqid;
protected $type = "text/plain";
function __construct() { function __construct() {
$this->setEncoding("UTF-8"); $this->setEncoding("UTF-8");
@ -70,6 +71,11 @@ class Mail
$this->content = $text; $this->content = $text;
} }
function setType($type)
{
$this->type = $type;
}
/** /**
* Кодировка текста в письме * Кодировка текста в письме
*/ */
@ -134,7 +140,7 @@ class Mail
function getMessage() function getMessage()
{ {
$message = "--".$this->uniqid . PHP_EOL; $message = "--".$this->uniqid . PHP_EOL;
$message .= $this->mimeTag("Content-Type", "text/plain", array ('charset' => $this->encoding)); $message .= $this->mimeTag("Content-Type", $this->type, array ('charset' => $this->encoding));
$message .= $this->mimeTag("Content-Transfer-Encoding", "8bit"); $message .= $this->mimeTag("Content-Transfer-Encoding", "8bit");
$message .= PHP_EOL . $this->content . PHP_EOL . PHP_EOL; $message .= PHP_EOL . $this->content . PHP_EOL . PHP_EOL;