From b8022166ba72d3e71421c7f9a587be244036d3ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20D?= <nuxsmin@syspass.org>
Date: Sat, 27 Apr 2019 00:34:13 +0200
Subject: [PATCH] * [FIX] Wrong behavior when disabling remote syslog * [MOD]
 Increase account's name length up to 100 characters long. Related #1071
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rubén D <nuxsmin@syspass.org>
---
 app/modules/web/Controllers/ConfigGeneralController.php    | 2 +-
 .../web/themes/material-blue/views/account/account.inc     | 2 +-
 lib/SP/Services/Install/Installer.php                      | 6 +++---
 lib/SP/Services/Upgrade/UpgradeDatabaseService.php         | 7 ++-----
 schemas/{30119012201.sql => 31019012201.sql}               | 0
 schemas/31019042701.sql                                    | 4 ++++
 schemas/dbstructure.sql                                    | 2 +-
 7 files changed, 12 insertions(+), 11 deletions(-)
 rename schemas/{30119012201.sql => 31019012201.sql} (100%)
 create mode 100644 schemas/31019042701.sql

diff --git a/app/modules/web/Controllers/ConfigGeneralController.php b/app/modules/web/Controllers/ConfigGeneralController.php
index 3de6c4b3..080a3d66 100644
--- a/app/modules/web/Controllers/ConfigGeneralController.php
+++ b/app/modules/web/Controllers/ConfigGeneralController.php
@@ -109,7 +109,7 @@ final class ConfigGeneralController extends SimpleControllerBase
             if ($configData->isSyslogRemoteEnabled() === false) {
                 $eventMessage->addDescription(__u('Remote syslog enabled'));
             }
-        } elseif ($remoteSyslogEnabled === false && $configData->isSyslogEnabled()) {
+        } elseif ($remoteSyslogEnabled === false && $configData->isSyslogRemoteEnabled()) {
             $configData->setSyslogRemoteEnabled(false);
 
             $eventMessage->addDescription(__u('Remote syslog disabled'));
diff --git a/app/modules/web/themes/material-blue/views/account/account.inc b/app/modules/web/themes/material-blue/views/account/account.inc
index 00c5d906..d7576dc8 100644
--- a/app/modules/web/themes/material-blue/views/account/account.inc
+++ b/app/modules/web/themes/material-blue/views/account/account.inc
@@ -75,7 +75,7 @@ $showCustomFields = count($_getvar('customFields', 0)) > 0;
                                 <input id="name" name="name" type="text"
                                        required
                                        class="mdl-textfield__input mdl-color-text--indigo-400"
-                                       maxlength="50"
+                                       maxlength="100"
                                        value="<?php echo $gotData ? htmlentities($accountData->getName()) : ''; ?>"
                                     <?php echo $_getvar('readonly'); ?>>
                                 <label class="mdl-textfield__label"
diff --git a/lib/SP/Services/Install/Installer.php b/lib/SP/Services/Install/Installer.php
index aadf7111..a5d75438 100644
--- a/lib/SP/Services/Install/Installer.php
+++ b/lib/SP/Services/Install/Installer.php
@@ -60,9 +60,9 @@ final class Installer extends Service
     /**
      * sysPass' version and build number
      */
-    const VERSION = [3, 0, 1];
-    const VERSION_TEXT = '3.0';
-    const BUILD = 19012201;
+    const VERSION = [3, 1, 0];
+    const VERSION_TEXT = '3.1';
+    const BUILD = 19042701;
 
     /**
      * @var DatabaseSetupInterface
diff --git a/lib/SP/Services/Upgrade/UpgradeDatabaseService.php b/lib/SP/Services/Upgrade/UpgradeDatabaseService.php
index ee469c0f..cca20cbc 100644
--- a/lib/SP/Services/Upgrade/UpgradeDatabaseService.php
+++ b/lib/SP/Services/Upgrade/UpgradeDatabaseService.php
@@ -24,8 +24,6 @@
 
 namespace SP\Services\Upgrade;
 
-use DI\DependencyException;
-use DI\NotFoundException;
 use Exception;
 use SP\Config\ConfigData;
 use SP\Core\Events\Event;
@@ -58,7 +56,8 @@ final class UpgradeDatabaseService extends Service implements UpgradeInterface
         '300.18092401',
         '300.18093001',
         '300.18111801',
-        '300.18111901'
+        '300.18111901',
+        '310.19042701'
     ];
 
     /**
@@ -87,8 +86,6 @@ final class UpgradeDatabaseService extends Service implements UpgradeInterface
      * @return bool
      * @throws FileException
      * @throws UpgradeException
-     * @throws DependencyException
-     * @throws NotFoundException
      */
     public function upgrade($version, ConfigData $configData)
     {
diff --git a/schemas/30119012201.sql b/schemas/31019012201.sql
similarity index 100%
rename from schemas/30119012201.sql
rename to schemas/31019012201.sql
diff --git a/schemas/31019042701.sql b/schemas/31019042701.sql
new file mode 100644
index 00000000..27e76955
--- /dev/null
+++ b/schemas/31019042701.sql
@@ -0,0 +1,4 @@
+DELIMITER $$
+
+alter table Account
+    modify name varchar(100) not null $$
diff --git a/schemas/dbstructure.sql b/schemas/dbstructure.sql
index 60b304bb..ef7ba7ed 100644
--- a/schemas/dbstructure.sql
+++ b/schemas/dbstructure.sql
@@ -18,7 +18,7 @@ CREATE TABLE `Account`
   `userId`             smallint(5) unsigned  NOT NULL,
   `userEditId`         smallint(5) unsigned  NOT NULL,
   `clientId`           mediumint(8) unsigned NOT NULL,
-  `name`               varchar(50)           NOT NULL,
+  `name`               varchar(100)           NOT NULL,
   `categoryId`         mediumint(8) unsigned NOT NULL,
   `login`              varchar(50)                    DEFAULT NULL,
   `url`                varchar(255)                   DEFAULT NULL,