lapervenche/ZwiiCampus
1
0
Fork 0
forked from ZwiiCMS-Team/ZwiiCampus
Code Pull Requests Activity

Ajoute le filtre dans la liste des membres

Browse Source
This commit is contained in:
Fred Tempez 2023-10-09 19:10:48 +02:00
parent a99341aa82
commit b97d796715
5 changed files with 193 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/core.php
View File

@ -146,24 +146,24 @@ class common
public static $groups = [ public static $groups = [
self::GROUP_BANNED => 'Banni', self::GROUP_BANNED => 'Banni',
self::GROUP_VISITOR => 'Visiteur', self::GROUP_VISITOR => 'Visiteur',
self::GROUP_MEMBER => 'Etudiant', self::GROUP_MEMBER => 'Étudiant',
self::GROUP_EDITOR => 'Enseignant', self::GROUP_EDITOR => 'Enseignant',
self::GROUP_ADMIN => 'Administrateur' self::GROUP_ADMIN => 'Administrateur'
]; ];
public static $groupEdits = [ public static $groupEdits = [
self::GROUP_BANNED => 'Banni', self::GROUP_BANNED => 'Banni',
self::GROUP_MEMBER => 'Etudiant', self::GROUP_MEMBER => 'Étudiant',
self::GROUP_EDITOR => 'Enseignant', self::GROUP_EDITOR => 'Enseignant',
self::GROUP_ADMIN => 'Administrateur' self::GROUP_ADMIN => 'Administrateur'
]; ];
public static $groupNews = [ public static $groupNews = [
self::GROUP_MEMBER => 'Etudiant', self::GROUP_MEMBER => 'Étudiant',
self::GROUP_EDITOR => 'Enseignant', self::GROUP_EDITOR => 'Enseignant',
self::GROUP_ADMIN => 'Administrateur' self::GROUP_ADMIN => 'Administrateur'
]; ];
public static $groupPublics = [ public static $groupPublics = [
self::GROUP_VISITOR => 'Visiteur', self::GROUP_VISITOR => 'Visiteur',
self::GROUP_MEMBER => 'Etudiant', self::GROUP_MEMBER => 'Étudiant',
self::GROUP_EDITOR => 'Enseignant', self::GROUP_EDITOR => 'Enseignant',
self::GROUP_ADMIN => 'Administrateur' self::GROUP_ADMIN => 'Administrateur'
]; ];

8
core/module/course/course.php
View File

@ -54,7 +54,7 @@ class course extends common
public static $alphabet = []; public static $alphabet = [];
public static $groups = [ public static $courseGroups = [
'all' => 'Tous' 'all' => 'Tous'
]; ];
@ -382,8 +382,8 @@ class course extends common
public function user() public function user()
{ {
// Liste des groupes et des profils // Liste des groupes et des profils
$groups = $this->getData(['profil']); $courseGroups = $this->getData(['profil']);
foreach ($groups as $groupId => $groupValue) { foreach ($courseGroups as $groupId => $groupValue) {
switch ($groupId) { switch ($groupId) {
case "-1": case "-1":
case "0": case "0":
@ -393,7 +393,7 @@ class course extends common
case "2": case "2":
foreach ($groupValue as $profilId => $profilValue) { foreach ($groupValue as $profilId => $profilValue) {
if ($profilId) { if ($profilId) {
self::$groups[$groupId . $profilId] = sprintf(helper::translate('Groupe %s - Profil %s'), self::$groupPublics[$groupId], $profilValue['name']); self::$courseGroups[$groupId . $profilId] = sprintf(helper::translate('Groupe %s - Profil %s'), self::$groupPublics[$groupId], $profilValue['name']);
} }
} }
} }

2
core/module/course/view/user/user.php
View File

@ -26,7 +26,7 @@
</h4> </h4>
<div class="row"> <div class="row">
<div class="col2"> <div class="col2">
<?php echo template::select('courseFilterGroup', $module::$groups, [ <?php echo template::select('courseFilterGroup', $module::$courseGroups, [
'label' => 'Groupes / Profils', 'label' => 'Groupes / Profils',
'selected' => isset($_POST['courseFilterGroup']) ? $_POST['courseFilterGroup'] : 'all', 'selected' => isset($_POST['courseFilterGroup']) ? $_POST['courseFilterGroup'] : 'all',
]); ?> ]); ?>

233
core/module/user/user.php
View File

@ -73,6 +73,12 @@ class user extends common
public static $profils = []; public static $profils = [];
public static $alphabet = [];
public static $courseGroups = [
'all' => 'Tous'
];
/** /**
* Ajout * Ajout
*/ */
@ -430,10 +436,59 @@ class user extends common
*/ */
public function index() public function index()
{ {
// Liste des groupes et des profils
$courseGroups = $this->getData(['profil']);
foreach ($courseGroups as $groupId => $groupValue) {
switch ($groupId) {
case "-1":
case "0":
case "3":
break;
case "1":
case "2":
foreach ($groupValue as $profilId => $profilValue) {
if ($profilId) {
self::$courseGroups[$groupId . $profilId] = sprintf(helper::translate('Groupe %s - Profil %s'), self::$groupPublics[$groupId], $profilValue['name']);
}
}
}
}
// Liste alphabétique
self::$alphabet = range('A', 'Z');
$alphabet = range('A', 'Z');
self::$alphabet = array_combine($alphabet, self::$alphabet);
self::$alphabet = array_merge(['all' => 'Toute'], self::$alphabet);
$userIdsFirstnames = helper::arrayColumn($this->getData(['user']), 'firstname'); $userIdsFirstnames = helper::arrayColumn($this->getData(['user']), 'firstname');
ksort($userIdsFirstnames); ksort($userIdsFirstnames);
foreach ($userIdsFirstnames as $userId => $userFirstname) { foreach ($userIdsFirstnames as $userId => $userFirstname) {
if ($this->getData(['user', $userId, 'group'])) { if ($this->getData(['user', $userId, 'group'])) {
// Filtres
if ($this->isPost()) {
// Groupe et profils
$group = (string) $this->getData(['user', $userId, 'group']);
$profil = (string) $this->getData(['user', $userId, 'profil']);
$firstName = $this->getData(['user', $userId, 'firstname']);
$lastName = $this->getData(['user', $userId, 'lastname']);
if (
$this->getInput('userFilterGroup', helper::FILTER_INT) > 0
&& $this->getInput('userFilterGroup', helper::FILTER_STRING_SHORT) !== $group . $profil
)
continue;
// Première lettre du prénom
if (
$this->getInput('userFilterFirstName', helper::FILTER_STRING_SHORT) !== 'all'
&& $this->getInput('userFilterFirstName', helper::FILTER_STRING_SHORT) !== strtoupper(substr($firstName, 0, 1))
)
continue;
// Première lettre du nom
if (
$this->getInput('userFilterLastName', helper::FILTER_STRING_SHORT) !== 'all'
&& $this->getInput('userFilterLastName', helper::FILTER_STRING_SHORT) !== strtoupper(substr($lastName, 0, 1))
)
continue;
}
// Formatage de la liste
$group = helper::translate(self::$groups[(int) $this->getData(['user', $userId, 'group'])]); $group = helper::translate(self::$groups[(int) $this->getData(['user', $userId, 'group'])]);
$profil = $this->getData(['profil', $this->getData(['user', $userId, 'group']), $this->getData(['user', $userId, 'profil']), 'name']); $profil = $this->getData(['profil', $this->getData(['user', $userId, 'group']), $this->getData(['user', $userId, 'profil']), 'name']);
self::$users[] = [ self::$users[] = [
@ -499,7 +554,7 @@ class user extends common
foreach ($groupData as $profilId => $profilData) { foreach ($groupData as $profilId => $profilData) {
self::$userGroups[$groupId . '.' . $profilId] = [ self::$userGroups[$groupId . '.' . $profilId] = [
$groupId . '-' . $profilId, $groupId . '-' . $profilId,
helper::translate(self::$groups[$groupId]). '<br />Profil : ' . helper::translate($profilData['name']), helper::translate(self::$groups[$groupId]) . '<br />Profil : ' . helper::translate($profilData['name']),
nl2br(helper::translate($profilData['comment'])), nl2br(helper::translate($profilData['comment'])),
template::button('profilEdit' . $groupId . $profilId, [ template::button('profilEdit' . $groupId . $profilId, [
'href' => helper::baseUrl() . 'user/profilEdit/' . $groupId . '/' . $profilId, 'href' => helper::baseUrl() . 'user/profilEdit/' . $groupId . '/' . $profilId,
@ -535,96 +590,97 @@ class user extends common
if ( if (
$this->getUser('permission', __CLASS__, __FUNCTION__) === true && $this->getUser('permission', __CLASS__, __FUNCTION__) === true &&
$this->isPost() $this->isPost()
) {
// Effacer les données du numéro de profil ancien
$group = $this->getInput('profilEditGroup', helper::FILTER_STRING_SHORT, true);
// Les profils 1 sont désactivés dans le formulaire
$profil = empty($this->getInput('profilEditProfil')) ? '1' : $this->getInput('profilEditProfil');
$oldProfil = $this->getInput('profilEditOldProfil', helper::FILTER_STRING_SHORT);
// Gère le chemin
$fileManager = $this->getInput('profilEditFileManager', helper::FILTER_BOOLEAN);
$path = $this->getInput('profilEditPath');
if (
$group <= self::GROUP_ADMIN
&& $fileManager
&& empty($path)
) { ) {
$fileManager = false;
}
if ($profil !== $profil) {
$this->deleteData(['profil', $group, $oldProfil]);
}
// Données du formulaire
$data = [
'name' => $this->getInput('profilEditName', helper::FILTER_STRING_SHORT, true),
'readonly' => false,
'permanent' => $group === '1' ? true : false,
'comment' => $this->getInput('profilEditComment', helper::FILTER_STRING_SHORT, true),
'filemanager' => $fileManager,
'file' => [
'download' => $this->getInput('profilEditDownload', helper::FILTER_BOOLEAN),
'edit' => $this->getInput('profilEditEdit', helper::FILTER_BOOLEAN),
'create' => $this->getInput('profilEditCreate', helper::FILTER_BOOLEAN),
'rename' => $this->getInput('profilEditRename', helper::FILTER_BOOLEAN),
'upload' => $this->getInput('profilEditUpload', helper::FILTER_BOOLEAN),
'delete' => $this->getInput('profilEditDelete', helper::FILTER_BOOLEAN),
'preview' => $this->getInput('profilEditPreview', helper::FILTER_BOOLEAN),
'duplicate' => $this->getInput('profilEditDuplicate', helper::FILTER_BOOLEAN),
'extract' => $this->getInput('profilEditExtract', helper::FILTER_BOOLEAN),
'copycut' => $this->getInput('profilEditCopycut', helper::FILTER_BOOLEAN),
'chmod' => $this->getInput('profilEditChmod', helper::FILTER_BOOLEAN),
],
'folder' => [
'create' => $this->getInput('profilEditFolderCreate', helper::FILTER_BOOLEAN),
'delete' => $this->getInput('profilEditFolderDelete', helper::FILTER_BOOLEAN),
'rename' => $this->getInput('profilEditFolderRename', helper::FILTER_BOOLEAN),
'copycut' => $this->getInput('profilEditFolderCopycut', helper::FILTER_BOOLEAN),
'chmod' => $this->getInput('profilEditFolderChmod', helper::FILTER_BOOLEAN),
'path' => $path,
],
'page' => [
'add' => $this->getInput('profilEditPageAdd', helper::FILTER_BOOLEAN),
'edit' => $this->getInput('profilEditPageEdit', helper::FILTER_BOOLEAN),
'delete' => $this->getInput('profilEditPageDelete', helper::FILTER_BOOLEAN),
'duplicate' => $this->getInput('profilEditPageDuplicate', helper::FILTER_BOOLEAN),
'module' => $this->getInput('profilEditPageModule', helper::FILTER_BOOLEAN),
'cssEditor' => $this->getInput('profilEditPagecssEditor', helper::FILTER_BOOLEAN),
'jsEditor' => $this->getInput('profilEditPagejsEditor', helper::FILTER_BOOLEAN),
],
'user' => [
'edit' => $this->getInput('profilEditUserEdit', helper::FILTER_BOOLEAN),
]
];
// Effacer les données du numéro de profil ancien // Données des modules
$group = $this->getInput('profilEditGroup', helper::FILTER_STRING_SHORT, true); $dataModules = helper::getModules();
// Les profils 1 sont désactivés dans le formulaire if (is_array($dataModules)) {
$profil = empty($this->getInput('profilEditProfil')) ? '1' : $this->getInput('profilEditProfil') ; foreach ($dataModules as $moduleId => $moduleValue) {
$oldProfil = $this->getInput('profilEditOldProfil', helper::FILTER_STRING_SHORT); if (file_exists('module/' . $moduleId . '/profil/main/edit.inc.php')) {
// Gère le chemin include('module/' . $moduleId . '/profil/main/edit.inc.php');
$fileManager = $this->getInput('profilEditFileManager', helper::FILTER_BOOLEAN); if (is_array($moduleData[$moduleId])) {
$path = $this->getInput('profilEditPath'); $data = array_merge($data, [$moduleId => $moduleData[$moduleId]]);
if ($group <= self::GROUP_ADMIN
&& $fileManager
&& empty($path)
) {
$fileManager = false;
}
if ($profil !== $profil) {
$this->deleteData(['profil', $group, $oldProfil]);
}
// Données du formulaire
$data = [
'name' => $this->getInput('profilEditName', helper::FILTER_STRING_SHORT, true),
'readonly' => false,
'permanent' => $group === '1' ? true : false,
'comment' => $this->getInput('profilEditComment', helper::FILTER_STRING_SHORT, true),
'filemanager' => $fileManager,
'file' => [
'download' => $this->getInput('profilEditDownload', helper::FILTER_BOOLEAN),
'edit' => $this->getInput('profilEditEdit', helper::FILTER_BOOLEAN),
'create' => $this->getInput('profilEditCreate', helper::FILTER_BOOLEAN),
'rename' => $this->getInput('profilEditRename', helper::FILTER_BOOLEAN),
'upload' => $this->getInput('profilEditUpload', helper::FILTER_BOOLEAN),
'delete' => $this->getInput('profilEditDelete', helper::FILTER_BOOLEAN),
'preview' => $this->getInput('profilEditPreview', helper::FILTER_BOOLEAN),
'duplicate' => $this->getInput('profilEditDuplicate', helper::FILTER_BOOLEAN),
'extract' => $this->getInput('profilEditExtract', helper::FILTER_BOOLEAN),
'copycut' => $this->getInput('profilEditCopycut', helper::FILTER_BOOLEAN),
'chmod' => $this->getInput('profilEditChmod', helper::FILTER_BOOLEAN),
],
'folder' => [
'create' => $this->getInput('profilEditFolderCreate', helper::FILTER_BOOLEAN),
'delete' => $this->getInput('profilEditFolderDelete', helper::FILTER_BOOLEAN),
'rename' => $this->getInput('profilEditFolderRename', helper::FILTER_BOOLEAN),
'copycut' => $this->getInput('profilEditFolderCopycut', helper::FILTER_BOOLEAN),
'chmod' => $this->getInput('profilEditFolderChmod', helper::FILTER_BOOLEAN),
'path' => $path,
],
'page' => [
'add' => $this->getInput('profilEditPageAdd', helper::FILTER_BOOLEAN),
'edit' => $this->getInput('profilEditPageEdit', helper::FILTER_BOOLEAN),
'delete' => $this->getInput('profilEditPageDelete', helper::FILTER_BOOLEAN),
'duplicate' => $this->getInput('profilEditPageDuplicate', helper::FILTER_BOOLEAN),
'module' => $this->getInput('profilEditPageModule', helper::FILTER_BOOLEAN),
'cssEditor' => $this->getInput('profilEditPagecssEditor', helper::FILTER_BOOLEAN),
'jsEditor' => $this->getInput('profilEditPagejsEditor', helper::FILTER_BOOLEAN),
],
'user' => [
'edit' => $this->getInput('profilEditUserEdit', helper::FILTER_BOOLEAN),
]
];
// Données des modules
$dataModules = helper::getModules();
if (is_array($dataModules)) {
foreach ($dataModules as $moduleId => $moduleValue) {
if (file_exists('module/' . $moduleId . '/profil/main/edit.inc.php')) {
include('module/' . $moduleId . '/profil/main/edit.inc.php');
if (is_array($moduleData[$moduleId])) {
$data = array_merge($data, [$moduleId => $moduleData[$moduleId]]);
}
} }
} }
} }
//Sauvegarder le données
$this->setData([
'profil',
$group,
$profil,
$data
]);
// Valeurs en sortie
$this->addOutput([
'redirect' => helper::baseUrl() . 'user/profil',
'notification' => helper::translate('Modifications enregistrées'),
'state' => true
]);
} }
//Sauvegarder le données
$this->setData([
'profil',
$group,
$profil,
$data
]);
// Valeurs en sortie
$this->addOutput([
'redirect' => helper::baseUrl() . 'user/profil',
'notification' => helper::translate('Modifications enregistrées'),
'state' => true
]);
}
// Chemin vers les dossiers du gestionnaire de fichier // Chemin vers les dossiers du gestionnaire de fichier
self::$sharePath = $this->getSubdirectories('./site/file/source'); self::$sharePath = $this->getSubdirectories('./site/file/source');
self::$sharePath = array_flip(self::$sharePath); self::$sharePath = array_flip(self::$sharePath);
@ -681,11 +737,12 @@ class user extends common
// Gère le chemin // Gère le chemin
$fileManager = $this->getInput('profilAddFileManager', helper::FILTER_BOOLEAN); $fileManager = $this->getInput('profilAddFileManager', helper::FILTER_BOOLEAN);
$path = $this->getInput('profilAddPath'); $path = $this->getInput('profilAddPath');
if ($group <= self::GROUP_ADMIN if (
$group <= self::GROUP_ADMIN
&& $fileManager && $fileManager
&& empty($path) && empty($path)
) { ) {
$fileManager = false; $fileManager = false;
} }
if ($profil < self::MAX_PROFILS) { if ($profil < self::MAX_PROFILS) {
@ -1116,7 +1173,7 @@ class user extends common
'pseudo' => $item['prenom'], 'pseudo' => $item['prenom'],
'signature' => 1, 'signature' => 1,
// Pseudo // Pseudo
'password' => helper::filter($item['passe'],helper::FILTER_PASSWORD), 'password' => helper::filter($item['passe'], helper::FILTER_PASSWORD),
// A modifier à la première connexion // A modifier à la première connexion
"connectFail" => null, "connectFail" => null,
"connectTimeout" => null, "connectTimeout" => null,

37
core/module/user/view/index/index.php
View File

@ -38,4 +38,41 @@
]); ?> ]); ?>
</div> </div>
</div> </div>
<?php echo template::formOpen('userFilterUserForm'); ?>
<div class="row">
<div class="col10 offset1">
<div class="block">
<h4>
<?php echo helper::translate('Filtres'); ?>
</h4>
<div class="row">
<div class="col2">
<?php echo template::select('userFilterGroup', $module::$courseGroups, [
'label' => 'Groupes / Profils',
'selected' => isset($_POST['userFilterGroup']) ? $_POST['userFilterGroup'] : 'all',
]); ?>
</div>
<div class="col2">
<?php echo template::select('userFilterFirstName', $module::$alphabet, [
'label' => 'Prénom commence par',
'selected' => isset($_POST['userFilterFirstName']) ? $_POST['userFilterFirstName'] : 'all',
]); ?>
</div>
<div class="col2">
<?php echo template::select('userFilterLastName', $module::$alphabet, [
'label' => 'Nom commence par',
'selected' => isset($_POST['userFilterLastName']) ? $_POST['userFilterLastName'] : 'all',
]); ?>
</div>
<div class="col2 offset4">
<?php echo template::submit('userFilterSubmit', [
'value' => 'Filtrer',
'uniqueSubmission' => true
]); ?>
</div>
</div>
</div>
</div>
</div>
<?php echo template::formClose(); ?>
<?php echo template::table([2, 2 , 3, 3, 1, 1], $module::$users, ['Identifiant', 'Nom', 'Groupe', 'Profil', '', '']); ?> <?php echo template::table([2, 2 , 3, 3, 1, 1], $module::$users, ['Identifiant', 'Nom', 'Groupe', 'Profil', '', '']); ?>