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 73834efdd03d6e723328c4815d634f633516fa4f..8c68f85f9dca6c688c15a7e7fe7611b04e4bb7b1 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 03e8215d3e4b9f51c13547df9d752de24e240cdd..c8879c9267cd3407e28a133f6e6dcc6303862f78 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 ee55311e5fcea3f2f5fe248bb63851d581df1b1b..82b6841240095100d8c3b2a9c0b9f7e52cba228a 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']);