Update to version 5.7.1

IrisCRM · Nov 1, 2018 · 456800f · 456800f
1 parent ac48713
commit 456800f
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+<a name="5.7.1"></a>
+# 5.7.1 (2018-11-01)
+
+### Основные изменения
+*  Оптимизация кода, исправление ошибок
+
 <a name="5.7.0"></a>
 # 5.7.0 (2018-10-22)
 

diff --git a/src/Iris/Storage/Storage.php b/src/Iris/Storage/Storage.php
@@ -22,6 +22,19 @@ public function __construct($storageAdapter)
         $this->storageAdapter = $storageAdapter;
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function getFileStream($sysName)
+    {
+        $file = $this->storageAdapter->readStream($sysName);
+        if ($file['stream'] === false) {
+            throw new StorageException(_('Запрашиваемый файл был удален'));
+        }
+
+        return $file['stream'];
+    }
+
     /**
      * @inheritdoc
      */
@@ -34,20 +47,26 @@ public function sendFile($sysName, $fileName)
             $fileExt = $fileNameParts[count($fileNameParts) - 1];
         }
 
-        $file = $this->storageAdapter->readStream($sysName);
-        $realFilePath = $this->storageAdapter->applyPathPrefix($file['path']);
-        if (!file_exists($realFilePath)) {
-            throw new StorageException(_('Запрашиваемый файл был удален'));
-        }
+        $stream = $this->getFileStream($sysName);
 
         header("Content-Type: application/download");
         if ($fileExt) {
             header('Content-Type: application/' . $fileExt);
         }
         header('content-disposition: attachment; filename="' . $fileName . '"');
-        header('Content-Length: ' . filesize($realFilePath));
+        header('Content-Length: ' . fstat($stream)['size']);
 
-        fpassthru($file['stream']);
+        fpassthru($stream);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function storeFile($sysName, $fileName)
+    {
+        $config = new Config();
+        $stream = fopen($fileName, 'r+');
+        $this->storageAdapter->writeStream($sysName, $stream, $config);
     }
 
     /**
@@ -56,12 +75,10 @@ public function sendFile($sysName, $fileName)
     public function storeUploadedFiles($files)
     {
         $res = null;
-        $config = new Config();
 
-        foreach ($_FILES as $key => $file) {
+        foreach ($files as $key => $file) {
             $sysName = create_guid();
-            $stream = fopen($file['tmp_name'], 'r+');
-            $this->storageAdapter->writeStream($sysName, $stream, $config);
+            $this->storeFile($sysName, $file['tmp_name']);
 
             $res[UtfEncode($key)] = [
                 'sysname' => $sysName,

diff --git a/src/Iris/Storage/StorageInterface.php b/src/Iris/Storage/StorageInterface.php
@@ -5,6 +5,13 @@
 interface StorageInterface
 {
 
+    /**
+     * Get file stream resource
+     * @param string $sysName File name with relative path, example: '000e927c-3b48-f266-07f0-86288b2ead42'
+     * @return resource
+     */
+    public function getFileStream($sysName);
+
     /**
      * Send file to client with headers
      * @param string $sysName File name with relative path, example: '000e927c-3b48-f266-07f0-86288b2ead42'
@@ -13,6 +20,13 @@ interface StorageInterface
      */
     public function sendFile($sysName, $fileName);
 
+    /**
+     * Send file to client with headers
+     * @param string $sysName File name, example: '000e927c-3b48-f266-07f0-86288b2ead42'
+     * @param string $fileName Full file name (with path) to store
+     */
+    public function storeFile($sysName, $fileName);
+
     /**
      * @param array $files
      * @return File[]

diff --git a/src/Iris/core/engine/js/controls/radiobutton.js b/src/Iris/core/engine/js/controls/radiobutton.js
@@ -37,6 +37,7 @@ function selectRadioButton(element, p_nochange_select) {
         */
         if (!label.hasClass('active')) {
           select.val(elemValue);
+          jQuery(select).trigger("field:edit");
           jQuery(select).trigger("field:edited");
         }
         else {

diff --git a/src/Iris/core/engine/js/index.js b/src/Iris/core/engine/js/index.js
diff --git a/src/Iris/core/version.xml b/src/Iris/core/version.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <VERSION_INFO>
-	<CURRENT_VERSION>5.7.0</CURRENT_VERSION>
+	<CURRENT_VERSION>5.7.1</CURRENT_VERSION>
 </VERSION_INFO>