Merge branch 'master' of http://gitlab.edu.yar.ru/composer/PHP_Library

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;

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->removeKey($name);
-            $registry->writeKey(array($name), $settings->get('settings'));
+                $registry->writeKey(array($name), $settings->get('settings'));
-            $registry->writeKey(array($name), 
+                $registry->writeKey(array($name), 
                                       array('version' => $version_new, 
                                             'time' => filemtime($setup)));
+            }   
+
             $registry->write();
         }
         return $result;

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;
 		}
 

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');

src/MailAlt.php

@@ -2,10 +2,11 @@
 
 class MailAlt
 {
-    protected $mailer;
+    public $mailer;
 
     function __construct() {
         $this->mailer = new PHPMailer();
+        $this->mailer->CharSet = 'UTF-8';
     }
 
     /**

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()
     { 

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;