diff --git a/src/Controller/Action.php b/src/Controller/Action.php index 9c72537..9d5753f 100644 --- a/src/Controller/Action.php +++ b/src/Controller/Action.php @@ -211,7 +211,8 @@ class Controller_Action public function nUrl($name, array $param = array()) { /*.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 null; diff --git a/src/Controller/Installer.php b/src/Controller/Installer.php index f7f5147..0b4a6ce 100644 --- a/src/Controller/Installer.php +++ b/src/Controller/Installer.php @@ -70,6 +70,7 @@ class Controller_Installer { $result = array(); $setup = $this->getSetupFile($name); + if (file_exists($setup) && ($this->isChanged($name) || $force)) { $registry = $this->_registry; $settings = new Settings($setup); @@ -93,14 +94,15 @@ class Controller_Installer $result[]=$res; } } - } - // Обновление версии меню - $registry->removeKey($name); - $registry->writeKey(array($name), $settings->get('settings')); - $registry->writeKey(array($name), + // Обновление версии меню + $registry->removeKey($name); + $registry->writeKey(array($name), $settings->get('settings')); + $registry->writeKey(array($name), array('version' => $version_new, 'time' => filemtime($setup))); + } + $registry->write(); } return $result; diff --git a/src/Database/JsonInstall.php b/src/Database/JsonInstall.php index ee62cf3..54a7d6f 100644 --- a/src/Database/JsonInstall.php +++ b/src/Database/JsonInstall.php @@ -14,11 +14,11 @@ class Database_JsonInstall { if (is_string($dbinit_file)) { $initActions = json_decode($dbinit_file, true); if (!$initActions) { - echo "Invalid dbinit.json ".$dbinit_file; + echo "Invalid ".$dbinit_path; return 0; } } else { - echo "No dbinit.json"; + echo "No ".$dbinit_path; return 0; } diff --git a/src/Excel/Document.php b/src/Excel/Document.php index e46ff31..365dba3 100644 --- a/src/Excel/Document.php +++ b/src/Excel/Document.php @@ -76,7 +76,9 @@ class Excel_Document { function save($filename) { $doc = new XMLWriter(); - $doc->openURI($filename); + if (!$doc->openURI($filename)) { + throw new Exception("unknown file " . $filename); + } $doc->setIndent(false); $doc->startDocument('1.0','utf-8'); $doc->startElement('Workbook'); diff --git a/src/MailAlt.php b/src/MailAlt.php index 43160cf..f8761f6 100644 --- a/src/MailAlt.php +++ b/src/MailAlt.php @@ -2,10 +2,11 @@ class MailAlt { - protected $mailer; + public $mailer; function __construct() { $this->mailer = new PHPMailer(); + $this->mailer->CharSet = 'UTF-8'; } /** diff --git a/src/Validator/Rule/Code.php b/src/Validator/Rule/Code.php index 54514e2..2bcfbf8 100644 --- a/src/Validator/Rule/Code.php +++ b/src/Validator/Rule/Code.php @@ -3,7 +3,7 @@ /** * Проверка формата электронной почты */ -class Validator_Rule_Code extends Rule_Abstract +class Validator_Rule_Code extends Validator_Rule_Abstract { public function getErrorMsg() { diff --git a/src/Validator/Rule/Count.php b/src/Validator/Rule/Count.php index f8c1800..2afd612 100644 --- a/src/Validator/Rule/Count.php +++ b/src/Validator/Rule/Count.php @@ -3,7 +3,7 @@ /** * Проверка формата даты */ -class Validator_Rule_Count extends Rule_Abstract +class Validator_Rule_Count extends Validator_Rule_Abstract { public $size = 1; public $max = false;