From 699d617edaf23da71a137cc68e4bd92ecf875362 Mon Sep 17 00:00:00 2001
From: nuxsmin <nuxsmin@syspass.org>
Date: Mon, 10 Sep 2018 01:19:13 +0200
Subject: [PATCH] * [MOD] Improve file handling * [MOD] Remove email pattern
 restriction when setting mail auth. Related #778. Thanks to @matthgyver for
 the feedback. * [MOD] Removed unused config attribute

Signed-off-by: nuxsmin <nuxsmin@syspass.org>
---
 .../web/Controllers/AccountFileController.php |  6 +++--
 .../material-blue/views/config/mail.inc       |  2 +-
 lib/SP/Config/ConfigData.php                  | 24 -------------------
 3 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/app/modules/web/Controllers/AccountFileController.php b/app/modules/web/Controllers/AccountFileController.php
index 1ca164b6..e49c8a25 100644
--- a/app/modules/web/Controllers/AccountFileController.php
+++ b/app/modules/web/Controllers/AccountFileController.php
@@ -37,6 +37,7 @@ use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\CrudControllerInterface;
 use SP\Services\Account\AccountFileService;
 use SP\Services\Account\AccountService;
+use SP\Storage\File\FileHandler;
 use SP\Util\ErrorUtil;
 use SP\Util\FileUtil;
 use SP\Util\Util;
@@ -166,6 +167,8 @@ final class AccountFileController extends ControllerBase implements CrudControll
                 throw new SPException(__u('No hay extensiones permitidas'), SPException::ERROR);
             }
 
+            $fileHandler = new FileHandler($file['tmp_name']);
+
             $fileData = new FileData();
             $fileData->setAccountId($accountId);
             $fileData->setName(Html::sanitize($file['name']));
@@ -210,8 +213,7 @@ final class AccountFileController extends ControllerBase implements CrudControll
                 );
             }
 
-            // Leemos el archivo a una variable
-            $fileData->setContent(file_get_contents($file['tmp_name']));
+            $fileData->setContent($fileHandler->readToString());
 
             if ($fileData->getContent() === false) {
                 throw new SPException(__u('Error interno al leer el archivo'));
diff --git a/app/modules/web/themes/material-blue/views/config/mail.inc b/app/modules/web/themes/material-blue/views/config/mail.inc
index 91ef4f3c..1ba9a39a 100644
--- a/app/modules/web/themes/material-blue/views/config/mail.inc
+++ b/app/modules/web/themes/material-blue/views/config/mail.inc
@@ -105,7 +105,7 @@
             </td>
             <td class="valField">
                 <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
-                    <input id="mail_user" name="mail_user" type="email"
+                    <input id="mail_user" name="mail_user" type="text"
                            class="mdl-textfield__input mdl-color-text--indigo-400"
                            maxlength="50" value="<?php echo $configData->getMailUser(); ?>"/>
                     <label class="mdl-textfield__label" for="mail_user"><?php echo __('Usuario'); ?></label>
diff --git a/lib/SP/Config/ConfigData.php b/lib/SP/Config/ConfigData.php
index 9111d45b..90a33d96 100644
--- a/lib/SP/Config/ConfigData.php
+++ b/lib/SP/Config/ConfigData.php
@@ -205,10 +205,6 @@ final class ConfigData implements JsonSerializable
      * @var string
      */
     private $ldapServer;
-    /**
-     * @var string
-     */
-    private $ldapUserattr;
     /**
      * @var bool
      */
@@ -1249,26 +1245,6 @@ final class ConfigData implements JsonSerializable
         return $this;
     }
 
-    /**
-     * @return string
-     */
-    public function getLdapUserattr()
-    {
-        return $this->ldapUserattr;
-    }
-
-    /**
-     * @param string $ldapUserattr
-     *
-     * @return $this
-     */
-    public function setLdapUserattr($ldapUserattr)
-    {
-        $this->ldapUserattr = $ldapUserattr;
-
-        return $this;
-    }
-
     /**
      * @return boolean
      */