From f3bb1f630160ee4d52a570e710e304acba9cbbf7 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Wed, 11 Apr 2018 18:02:15 +0200
Subject: [PATCH] FEAT BAN referential
---
{ban => referential/ban}/indexBan.php | 4 ++--
{ban => referential/ban}/src/.gitkeep | 0
src/app/user/controllers/UserController.php | 2 +-
src/core/controllers/AutoCompleteController.php | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
rename {ban => referential/ban}/indexBan.php (95%)
rename {ban => referential/ban}/src/.gitkeep (100%)
diff --git a/ban/indexBan.php b/referential/ban/indexBan.php
similarity index 95%
rename from ban/indexBan.php
rename to referential/ban/indexBan.php
index 73834efdd03..8c68f85f9dc 100644
--- a/ban/indexBan.php
+++ b/referential/ban/indexBan.php
@@ -1,6 +1,6 @@
<?php
-require '../vendor/autoload.php';
+require '../../vendor/autoload.php';
$indexFileDirectory = __DIR__ . '/indexes/';
$banDirectory = __DIR__ . '/src/';
@@ -14,7 +14,7 @@ if (!is_dir($indexFileDirectory)) {
$index = Zend_Search_Lucene::open($indexFileDirectory);
}
}
-$index->setFormatVersion(Zend_Search_Lucene::FORMAT_2_3); // we set the lucene format to 2.3
+$index->setFormatVersion(Zend_Search_Lucene::FORMAT_2_3);
Zend_Search_Lucene_Analysis_Analyzer::setDefault(new Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8Num_CaseInsensitive());
$index->setMaxBufferedDocs(1000);
diff --git a/ban/src/.gitkeep b/referential/ban/src/.gitkeep
similarity index 100%
rename from ban/src/.gitkeep
rename to referential/ban/src/.gitkeep
diff --git a/src/app/user/controllers/UserController.php b/src/app/user/controllers/UserController.php
index 03e8215d3e4..c8879c9267c 100644
--- a/src/app/user/controllers/UserController.php
+++ b/src/app/user/controllers/UserController.php
@@ -98,7 +98,7 @@ class UserController
return $response->withStatus($error['status'])->withJson(['errors' => $error['error']]);
}
- $user = UserModel::getById(['id' => $aArgs['id'], 'select' => ['id', 'user_id', 'firstname', 'lastname', 'status', 'enabled', 'phone', 'mail', 'initials', 'thumbprint']]);
+ $user = UserModel::getById(['id' => $aArgs['id'], 'select' => ['id', 'user_id', 'firstname', 'lastname', 'status', 'enabled', 'phone', 'mail', 'initials', 'thumbprint', 'loginmode']]);
$user['signatures'] = UserModel::getSignaturesById(['id' => $aArgs['id']]);
$user['emailSignatures'] = UserModel::getEmailSignaturesById(['userId' => $user['user_id']]);
$user['groups'] = UserModel::getGroupsByUserId(['userId' => $user['user_id']]);
diff --git a/src/core/controllers/AutoCompleteController.php b/src/core/controllers/AutoCompleteController.php
index ee55311e5fc..82b68412400 100644
--- a/src/core/controllers/AutoCompleteController.php
+++ b/src/core/controllers/AutoCompleteController.php
@@ -131,7 +131,7 @@ class AutoCompleteController
\Zend_Search_Lucene_Search_QueryParser::setDefaultOperator(\Zend_Search_Lucene_Search_QueryParser::B_AND);
\Zend_Search_Lucene_Search_QueryParser::setDefaultEncoding('utf-8');
- $index = \Zend_Search_Lucene::open('ban/indexes');
+ $index = \Zend_Search_Lucene::open('referential/ban/indexes');
\Zend_Search_Lucene::setResultSetLimit(10);
$hits = $index->find($data['address']);
--
GitLab