13.5 Désinscription en masse

core/module/user/user.php

@@ -19,6 +19,7 @@ class user extends common
 	public static $actions = [
 		'add' => self::GROUP_ADMIN,
 		'delete' => self::GROUP_ADMIN,
+		'usersDelete' => self::GROUP_ADMIN,
 		'import' => self::GROUP_ADMIN,
 		'index' => self::GROUP_ADMIN,
 		'template' => self::GROUP_ADMIN,
@@ -31,6 +32,7 @@ class user extends common
 		'profilEdit' => self::GROUP_ADMIN,
 		'profilAdd' => self::GROUP_ADMIN,
 		'profilDelete' => self::GROUP_ADMIN,
+		'tag' => self::GROUP_ADMIN,
 	];
 
 	public static $users = [];
@@ -61,7 +63,7 @@ class user extends common
 	public static $languagesInstalled = [];
 
 	public static $sharePath = [
-		'/site/file/source/'
+		'site/file/source/'
 	];
 
 	public static $groupProfils = [
@@ -229,6 +231,161 @@ class user extends common
 		}
 	}
 
+	/**
+	 * Désinscription de tous les utilisateurs
+	 * Les désinscriptions ne suppriment pas les historiques
+	 */
+	public function usersDelete()
+	{
+
+		// Contenu sélectionné
+		$courseId = $this->getUrl(2);
+
+		// Accès limité aux admins, à l'auteur ou éditeurs inscrits
+		if (
+			$this->getUser('permission', __CLASS__, __FUNCTION__) !== true
+		) {
+			// Valeurs en sortie
+			$this->addOutput([
+				'access' => false
+			]);
+		}
+
+		// Inscription des utilisateurs cochés
+		if (
+			isset($_POST['usersDeleteSubmit'])
+		) {
+			$notification = helper::translate('Suppression de %s compte');
+			$success = true;
+			$count = 0;
+			foreach ($_POST as $keyPost => $valuePost) {
+				// Exclure les variables post qui ne sont pas des userId et ne traiter que les non inscrits
+				if (
+					$this->getData(['user', $keyPost]) !== null
+				) {
+
+					if ($keyPost === $this->getUser('id')) {
+						$notification = helper::translate('Votre compte n\'a pas été supprimé !') . '<br />' . $notification;
+						$success = 1;
+					} else {
+						$this->deleteData(['user', $keyPost]);
+						$count += 1;
+					}
+				}
+			}
+			// Valeurs en sortie
+			$this->addOutput([
+				'redirect' => helper::baseUrl() . 'user/usersDelete',
+				'notification' => sprintf($count > 1 ? $notification . 's' : $notification, $count),
+				'state' => $success
+			]);
+
+		}
+
+		// Liste des groupes et des profils
+		$usersGroups = $this->getData(['profil']);
+
+		foreach ($usersGroups as $groupId => $groupValue) {
+			switch ($groupId) {
+				case "-1":
+				case "0":
+					break;
+				case "3":
+					self::$usersGroups['30'] = 'Administrateur';
+					$profils['30'] = 0;
+					break;
+				case "1":
+				case "2":
+					foreach ($groupValue as $profilId => $profilValue) {
+						if ($profilId) {
+							self::$usersGroups[$groupId . $profilId] = sprintf(helper::translate('Groupe %s - Profil %s'), self::$groupPublics[$groupId], $profilValue['name']);
+							$profils[$groupId . $profilId] = 0;
+						}
+					}
+			}
+		}
+
+		// Liste alphabétique
+		self::$alphabet = range('A', 'Z');
+		$alphabet = range('A', 'Z');
+		self::$alphabet = array_combine($alphabet, self::$alphabet);
+		self::$alphabet = array_merge(['all' => 'Tout'], self::$alphabet);
+
+		// Liste des inscrits dans le contenu sélectionné.
+		$users = $this->getData(['user']);
+		if (is_array($users)) {
+			// Tri du tableau par défaut par $userId
+			ksort($users);
+			foreach ($users as $userId => $userValue) {
+
+				// Compte les rôles
+				if (isset($profils[$this->getData(['user', $userId, 'group']) . $this->getData(['user', $userId, 'profil'])])) {
+					$profils[$this->getData(['user', $userId, 'group']) . $this->getData(['user', $userId, 'profil'])]++;
+				}
+
+				// Filtres
+				if (
+					isset($_POST['usersFilterGroup'])
+					|| isset($_POST['usersFilterFirstName'])
+					|| isset($_POST['usersFilterLastName'])
+				) {
+
+					// 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('usersFilterGroup', helper::FILTER_INT) > 0
+						&& $this->getInput('usersFilterGroup', helper::FILTER_STRING_SHORT) !== $group . $profil
+					)
+						continue;
+					// Première lettre du prénom
+					if (
+						$this->getInput('usersFilterFirstName', helper::FILTER_STRING_SHORT) !== 'all'
+						&& $this->getInput('usersFilterFirstName', helper::FILTER_STRING_SHORT) !== strtoupper(substr($firstName, 0, 1))
+					)
+						continue;
+					// Première lettre du nom
+					if (
+						$this->getInput('usersFilterLastName', helper::FILTER_STRING_SHORT) !== 'all'
+						&& $this->getInput('usersFilterLastName', helper::FILTER_STRING_SHORT) !== strtoupper(substr($lastName, 0, 1))
+					)
+						continue;
+				}
+
+				// Construction du tableau
+				self::$users[] = [
+					template::checkbox($userId, true, '', ['class' => 'checkboxSelect']),
+					$userId,
+					$this->getData(['user', $userId, 'firstname']),
+					$this->getData(['user', $userId, 'lastname']),
+					$this->getData(['user', $userId, 'tags']),
+				];
+
+			}
+		}
+
+		// Ajoute les effectifs aux profils du sélecteur
+		foreach (self::$usersGroups as $groupId => $groupValue) {
+			if ($groupId === 'all') {
+				self::$usersGroups['all'] = self::$usersGroups['all'] . ' (' . array_sum($profils) . ')';
+			} else {
+				self::$usersGroups[$groupId] = self::$usersGroups[$groupId] . ' (' . $profils[$groupId] . ')';
+			}
+		}
+
+		// Valeurs en sortie
+		$this->addOutput([
+			'title' => helper::translate('Désincription en masse'),
+			'view' => 'usersDelete',
+			'vendor' => [
+				'datatables'
+			]
+		]);
+	}
+
+
 	/**
 	 * Édition
 	 */
@@ -271,7 +428,9 @@ class user extends common
 					if ($this->getUser('group') < self::GROUP_ADMIN) {
 						if ($this->getInput('userEditNewPassword')) {
 							// L'ancien mot de passe est correct
-							if (password_verify(html_entity_decode($this->getInput('userEditOldPassword')), $this->getData(['user', $this->getUrl(2), 'password']))) {
+							if (
+								password_verify(html_entity_decode($this->getInput('userEditOldPassword')), $this->getData(['user', $this->getUrl(2), 'password']))
+							) {
 								// La confirmation correspond au mot de passe
 								if ($this->getInput('userEditNewPassword') === $this->getInput('userEditConfirmPassword')) {
 									$newPassword = $this->getInput('userEditNewPassword', helper::FILTER_PASSWORD, true);
@@ -519,13 +678,15 @@ class user extends common
 
 				// Formatage de la liste
 				self::$users[] = [
-					$userId,
+					//$userId,
 					$this->getData(['user', $userId, 'firstname']) . ' ' . $userLastNames,
 					helper::translate(self::$groups[(int) $this->getData(['user', $userId, 'group'])]),
 					empty($this->getData(['profil', $this->getData(['user', $userId, 'group']), $this->getData(['user', $userId, 'profil']), 'name']))
 					? helper::translate(self::$groups[(int) $this->getData(['user', $userId, 'group'])])
 					: $this->getData(['profil', $this->getData(['user', $userId, 'group']), $this->getData(['user', $userId, 'profil']), 'name']),
 					$this->getData(['user', $userId, 'tags']),
+					helper::dateUTF8('%d/%m/%Y', $this->getData(['user', $userId, 'accessTimer']), self::$i18nUI),
+					//helper::dateUTF8('%H:%M', $this->getData(['user', $userId, 'accessTimer']), self::$i18nUI),
 					template::button('userEdit' . $userId, [
 						'href' => helper::baseUrl() . 'user/edit/' . $userId,
 						'value' => template::ico('pencil'),
@@ -1002,7 +1163,7 @@ class user extends common
 						'lastFail' => time(),
 						'ip' => helper::getIp()
 					]
-				]);
+				], false);
 				// Verrouillage des IP
 				$ipBlackList = helper::arrayColumn($this->getData(['blacklist']), 'ip');
 				if (
@@ -1049,7 +1210,7 @@ class user extends common
 
 					// Clé d'authenfication
 					$authKey = uniqid('', true) . bin2hex(random_bytes(8));
-					$this->setData(['user', $userId, 'authKey', $authKey]);
+					$this->setData(['user', $userId, 'authKey', $authKey], false);
 
 					// Validité du cookie
 					$expire = $this->getInput('userLoginLongTime', helper::FILTER_BOOLEAN) === true ? strtotime("+1 year") : 0;
@@ -1106,7 +1267,7 @@ class user extends common
 					$notification = helper::translate('Captcha, identifiant ou mot de passe incorrects');
 					$logStatus = $captcha === true ? 'Erreur de mot de passe' : 'Erreur de captcha';
 					// Cas 1 le nombre de connexions est inférieur aux tentatives autorisées : incrément compteur d'échec
-					if ($this->getData(['user', $userId, 'connectFail']) < $this->getData(['config', 'connect', 'attempt'], false)) {
+					if ($this->getData(['user', $userId, 'connectFail']) < $this->getData(['config', 'connect', 'attempt'])) {
 						$this->setData(['user', $userId, 'connectFail', $this->getdata(['user', $userId, 'connectFail']) + 1], false);
 					}
 					// Cas 2 la limite du nombre de connexion est atteinte : placer le timer
@@ -1124,9 +1285,10 @@ class user extends common
 					]);
 				}
 			}
-			// Force la sauvegarde
+			// Sauvegarde la base manuellement
-			$this->saveDB('user');
+			$this->saveDB(module: 'user');
 		}
+
 		// Journalisation
 		$this->saveLog($logStatus);
 
@@ -1175,13 +1337,29 @@ class user extends common
 			// Lien de réinitialisation trop vieux
 			or $this->getData(['user', $this->getUrl(2), 'forgot']) + 86400 < time()
 			// Id unique incorrecte
-			or $this->getUrl(3) !== md5(json_encode($this->getData(['user', $this->getUrl(2)])))
+			or $this->getUrl(3) !== md5(json_encode($this->getData(['user', $this->getUrl(2), 'forgot'])))
 		) {
+			$this->saveLog(
+				' Erreur de réinitialisation de mot de passe ' . $this->getUrl(2) .
+				' Compte : ' . $this->getData(['user', $this->getUrl(2)]) .
+				' Temps : ' . $this->getData(['user', $this->getUrl(2), 'forgot']) + 86400 < time() .
+				' Clé : ' . $this->getUrl(3) !== md5(json_encode($this->getData(['user', $this->getUrl(2), 'forgot'])))
+			);
+			// Message d'erreur en cas de problème de réinitialisation de mot de passe
+			$message = $this->getData(['user', $this->getUrl(2)]) === null
+				? ' Utilisateur inconnu '
+				: '';
+			$message = $this->getData(['user', $this->getUrl(2), 'forgot']) + 86400 < time()
+				? ' Temps dépassé '
+				: $message;
+			$message = $this->getUrl(3) !== md5(json_encode($this->getData(['user', $this->getUrl(2)])))
+				? ' Clé invalide '
+				: $message;
 
 			// Valeurs en sortie
 			$this->addOutput([
 				'redirect' => helper::baseurl(),
-				'notification' => helper::translate('Impossible de réinitialiser le mot de passe de ce compte !'),
+				'notification' => helper::translate('Impossible de réinitialiser le mot de passe de ce compte !') . $message,
 				'state' => false
 				//'access' => false
 			]);
@@ -1209,7 +1387,9 @@ class user extends common
 					$this->setData(['user', $this->getUrl(2), 'forgot', 0], false);
 					// Réinitialise le blocage
 					$this->setData(['user', $this->getUrl(2), 'connectFail', 0], false);
-					$this->setData(['user', $this->getUrl(2), 'connectTimeout', 0]);
+					$this->setData(['user', $this->getUrl(2), 'connectTimeout', 0], false);
+					// Sauvegarde la base manuellement
+					$this->saveDB('user');
 					// Valeurs en sortie
 					$this->addOutput([
 						'notification' => helper::translate('Nouveau mot de passe enregistré'),
@@ -1364,8 +1544,8 @@ class user extends common
 					}
 
 				}
-				// Force la sauvegarde
+				// Sauvegarde la base manuellement
-				$this->saveDB('user');
+				$this->saveDB(module: 'user');
 				if (empty(self::$users)) {
 					$notification = helper::translate('Rien à importer, erreur de format ou fichier incorrect');
 					$success = false;
@@ -1407,6 +1587,154 @@ class user extends common
 
 	}
 
+	public function tag()
+	{
+		// Contenu sélectionné
+		$courseId = $this->getUrl(2);
+
+		// Accès limité aux admins, à l'auteur ou éditeurs inscrits
+		if (
+			$this->getUser('permission', __CLASS__, __FUNCTION__) !== true
+		) {
+			// Valeurs en sortie
+			$this->addOutput([
+				'access' => false
+			]);
+		}
+
+		// Inscription des utilisateurs cochés
+		if (
+			isset($_POST['usersTagSubmit'])
+		) {
+			$notification = helper::translate('Modification de %s étiquette(s)');
+			$success = true;
+			$count = 0;
+			$newTags = $this->getInput('usersTagLabel', null, true);
+			foreach ($_POST as $keyPost => $valuePost) {
+				// Exclure les variables post qui ne sont pas des userId et ne traiter que les non inscrits
+				if (
+					$this->getData(['user', $keyPost]) !== null
+				) {
+					$this->setData(['user', $keyPost, 'tags', $newTags], false);
+					$count += 1;
+				}
+			}
+			// Sauvegarde la base manuellement
+			$this->saveDB(module: 'user');
+			// Valeurs en sortie
+			$this->addOutput([
+				'redirect' => helper::baseUrl() . 'user/tag',
+				'notification' => sprintf($count > 1 ? $notification . 's' : $notification, $count),
+				'state' => $success
+			]);
+
+		}
+
+
+		// Liste des groupes et des profils
+		$usersGroups = $this->getData(['profil']);
+
+		foreach ($usersGroups as $groupId => $groupValue) {
+			switch ($groupId) {
+				case "-1":
+				case "0":
+					break;
+				case "3":
+					self::$usersGroups['30'] = 'Administrateur';
+					$profils['30'] = 0;
+					break;
+				case "1":
+				case "2":
+					foreach ($groupValue as $profilId => $profilValue) {
+						if ($profilId) {
+							self::$usersGroups[$groupId . $profilId] = sprintf(helper::translate('Groupe %s - Profil %s'), self::$groupPublics[$groupId], $profilValue['name']);
+							$profils[$groupId . $profilId] = 0;
+						}
+					}
+			}
+		}
+
+		// Liste alphabétique
+		self::$alphabet = range('A', 'Z');
+		$alphabet = range('A', 'Z');
+		self::$alphabet = array_combine($alphabet, self::$alphabet);
+		self::$alphabet = array_merge(['all' => 'Tout'], self::$alphabet);
+
+		// Liste des inscrits dans le contenu sélectionné.
+		$users = $this->getData(['user']);
+		if (is_array($users)) {
+			// Tri du tableau par défaut par $userId
+			ksort($users);
+			foreach ($users as $userId => $userValue) {
+
+				// Compte les rôles
+				if (isset($profils[$this->getData(['user', $userId, 'group']) . $this->getData(['user', $userId, 'profil'])])) {
+					$profils[$this->getData(['user', $userId, 'group']) . $this->getData(['user', $userId, 'profil'])]++;
+				}
+
+				// Filtres
+				if (
+					isset($_POST['usersFilterGroup'])
+					|| isset($_POST['usersFilterFirstName'])
+					|| isset($_POST['usersFilterLastName'])
+				) {
+
+					// 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('usersFilterGroup', helper::FILTER_INT) > 0
+						&& $this->getInput('usersFilterGroup', helper::FILTER_STRING_SHORT) !== $group . $profil
+					)
+						continue;
+					// Première lettre du prénom
+					if (
+						$this->getInput('usersFilterFirstName', helper::FILTER_STRING_SHORT) !== 'all'
+						&& $this->getInput('usersFilterFirstName', helper::FILTER_STRING_SHORT) !== strtoupper(substr($firstName, 0, 1))
+					)
+						continue;
+					// Première lettre du nom
+					if (
+						$this->getInput('usersFilterLastName', helper::FILTER_STRING_SHORT) !== 'all'
+						&& $this->getInput('usersFilterLastName', helper::FILTER_STRING_SHORT) !== strtoupper(substr($lastName, 0, 1))
+					)
+						continue;
+				}
+
+				// Construction du tableau
+				self::$users[] = [
+					template::checkbox($userId, true, '', ['class' => 'checkboxSelect']),
+					$userId,
+					$this->getData(['user', $userId, 'firstname']),
+					$this->getData(['user', $userId, 'lastname']),
+					$this->getData(['user', $userId, 'tags']),
+				];
+
+			}
+		}
+
+		// Ajoute les effectifs aux profils du sélecteur
+		foreach (self::$usersGroups as $groupId => $groupValue) {
+			if ($groupId === 'all') {
+				self::$usersGroups['all'] = self::$usersGroups['all'] . ' (' . array_sum($profils) . ')';
+			} else {
+				self::$usersGroups[$groupId] = self::$usersGroups[$groupId] . ' (' . $profils[$groupId] . ')';
+			}
+		}
+
+		// Valeurs en sortie
+		$this->addOutput([
+			'view' => 'tag',
+			'title' => 'Étiquettes',
+			'vendor' => [
+				'datatables'
+			]
+		]);
+
+	}
+
 	/**
 	 * Liste les dossier contenus dans RFM
 	 */

core/module/user/view/edit/edit.php

@@ -77,7 +77,7 @@
 				<div class="col12">
 				<?php echo template::text('userEditTags', [
 						'label' => 'Étiquettes',
-						'disabled' => $this->getUser('group') > self::GROUP_EDITOR ? false : true,
+						'readonly' => $this->getUser('group') > self::GROUP_EDITOR ? false : true,
 						'value' => $this->getData(['user', $this->getUrl(2), 'tags']),
 						'help' => 'Les étiquettes sont séparées par des espaces'
 					]); ?>

core/module/user/view/index/index.css

@@ -16,4 +16,3 @@
 /** NE PAS EFFACER
 * admin.css
 */
-

core/module/user/view/index/index.js.php

@@ -22,10 +22,10 @@ $(document).ready((function () {
     $("#userFilterGroup, #userFilterFirstName, #userFilterLastName").change(function () {
         $("#userFilterUserForm").submit();
     });
-
+    $.fn.dataTable.moment( 'DD/MM/YYYY' );
     $('#dataTables').DataTable({
         language: {
-            url: "core/vendor/datatables/french.json",
+            url: "core/vendor/datatables/french.json"
         },
         locale: 'fr',
         stateSave: true,

core/module/user/view/index/index.php

@@ -6,27 +6,35 @@
 			'value' => template::ico('home')
 		]); ?>
 	</div>
-	<div class="col1">
+	<div class="col2 offset2">
-		<?php /**echo template::button('userHelp', [
-			 'href' => 'https://doc.zwiicms.fr/gestion-des-utilisateurs',
-			 'target' => '_blank',
-			 'value' => template::ico('help'),
-			 'class' => 'buttonHelp',
-			 'help' => 'Consulter l\'aide en ligne'
-		 ]);*/?>
-	</div>
-	<div class="col1 offset7">
 		<?php echo template::button('userImport', [
 			'href' => helper::baseUrl() . 'user/import',
-			'value' => template::ico('upload'),
+			'ico' => 'users',
-			'help' => 'Importer des utilisateurs en masse'
+			'value' => 'Importer en masse'
 		]); ?>
 	</div>
-	<div class="col1">
+	<div class="col2">
+	<?php echo template::button('userDeleteAll', [
+		'class' => 'userDeleteAll buttonRed',
+		'href' => helper::baseUrl() . 'user/usersDelete/' . $this->getUrl(2),
+		'ico' => 'users',
+		'value' => 'Désinscrire en masse',
+	]) ?>
+	</div>
+	<div class="col2">
+		<?php echo template::button('userTag', [
+			'href' => helper::baseUrl() . 'user/tag',
+			'ico' => 'tags',
+			'value' => 'Étiquettes',
+			'help' => 'Filtrer les utilisateurs avec des tags'
+		]); ?>
+	</div>
+	<div class="col2">
 		<?php echo template::button('userGroup', [
 			'href' => helper::baseUrl() . 'user/profil',
-			'value' => template::ico('lock'),
+			'ico' => 'lock',
-			'help' => 'Profils'
+			'value' => 'Profils',
+			'help' => 'Permissions par profils'
 		]); ?>
 	</div>
 	<div class="col1">
@@ -60,4 +68,4 @@
 	</div>
 </div>
 <?php echo template::formClose(); ?>
-<?php echo template::table([2, 2, 2, 2, 2, 1, 1], $module::$users, ['Identifiant', 'Nom', 'Groupe', 'Profil', 'Étiquettes',  '', ''], ['id' => 'dataTables']); ?>
+<?php echo template::table([3, 2, 2, 2, 2, 1, 1], $module::$users, ['Nom', 'Groupe', 'Profil', 'Étiquettes', 'Date dernière vue', '', ''], ['id' => 'dataTables']); ?>

core/module/user/view/login/login.js.php

@@ -8,4 +8,32 @@
  * @license CC Attribution-NonCommercial-NoDerivatives 4.0 International
  * @link http://zwiicms.fr/
  */
-$(document).ready((function(){$(".zwiico-eye").mouseenter((function(){$("#userLoginPassword").attr("type","text")})),$(".zwiico-eye").mouseleave((function(){$("#userLoginPassword").attr("type","password")}))}));
+ $(document).ready((function() {
+    $("#userLoginId").on("change keydown keyup", function (event) {
+		var userId = $(this).val();
+		if (
+			event.keyCode !== 8 // BACKSPACE
+			&& event.keyCode !== 37 // LEFT
+			&& event.keyCode !== 39 // RIGHT
+			&& event.keyCode !== 46 // DELETE
+			&& window.getSelection().toString() !== userId // Texte sélectionné
+		) {
+			var searchReplace = {
+				"á": "a", "à": "a", "â": "a", "ä": "a", "ã": "a", "å": "a", "ç": "c", "é": "e", "è": "e", "ê": "e", "ë": "e", "í": "i", "ì": "i", "î": "i", "ï": "i", "ñ": "n", "ó": "o", "ò": "o", "ô": "o", "ö": "o", "õ": "o", "ú": "u", "ù": "u", "û": "u", "ü": "u", "ý": "y", "ÿ": "y",
+				"Á": "A", "À": "A", "Â": "A", "Ä": "A", "Ã": "A", "Å": "A", "Ç": "C", "É": "E", "È": "E", "Ê": "E", "Ë": "E", "Í": "I", "Ì": "I", "Î": "I", "Ï": "I", "Ñ": "N", "Ó": "O", "Ò": "O", "Ô": "O", "Ö": "O", "Õ": "O", "Ú": "U", "Ù": "U", "Û": "U", "Ü": "U", "Ý": "Y", "Ÿ": "Y",
+				"'": "-", "\"": "-", " ": "-"
+			};
+			userId = userId.replace(/[áàâäãåçéèêëíìîïñóòôöõúùûüýÿ'" ]/ig, function (match) {
+				return searchReplace[match];
+			});
+			userId = userId.replace(/[^a-z0-9-]/ig, "");
+			$(this).val(userId);
+		}
+	});
+
+    $(".zwiico-eye").mouseenter((function() {
+        $("#userLoginPassword").attr("type", "text")
+    })), $(".zwiico-eye").mouseleave((function() {
+        $("#userLoginPassword").attr("type", "password")
+    }))
+}));

core/module/user/view/tag/tag.css

@@ -0,0 +1,18 @@
+/**
+ * This file is part of Zwii.
+ *
+ * For full copyright and license information, please see the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Rémi Jean <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @copyright Copyright (C) 2018-2024, Frédéric Tempez
+ * @license CC Attribution-NonCommercial-NoDerivatives 4.0 International
+ * @link http://zwiicms.fr/
+ */
+
+
+/** NE PAS EFFACER
+* admin.css
+*/

core/module/user/view/tag/tag.js.php

@@ -0,0 +1,101 @@
+/**
+ * This file is part of Zwii.
+ * For full copyright and license information, please see the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Rémi Jean <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @copyright Copyright (C) 2018-2024, Frédéric Tempez
+ * @license CC Attribution-NonCommercial-NoDerivatives 4.0 International
+ * @link http://zwiicms.fr/
+ */
+
+$(document).ready((function () {
+
+    $('tr').click(function () {
+        // Cochez ou décochez la case à cocher dans cette ligne
+        $(this).find('input[type="checkbox"]').prop('checked', function (i, val) {
+            return !val; // Inverse l'état actuel de la case à cocher
+        });
+    });
+
+    $('#usersTagSelectAll').on('click', function () {
+        $('.checkboxSelect').prop('checked', true);
+        saveCheckboxState();
+    });
+    $('#usersTagSelectNone').on('click', function () {
+        $('.checkboxSelect').prop('checked', false);
+        saveCheckboxState();
+    });
+
+    $("#usersFilterGroup, #usersFilterFirstName, #usersFilterLastName").change(function () {
+        saveCheckboxState();
+        $("#usersTagForm").submit();
+    });
+
+    var table = $('#dataTables').DataTable({
+        language: {
+            url: "core/vendor/datatables/french.json"
+        },
+        locale: 'fr',
+        "lengthMenu": [[10, 25, 50, 100, 299,  -1], [10, 25, 50, 100, 200, "Tout"]],
+        "columnDefs": [
+            {
+                target: 0,
+                orderable: false,
+                searchable: false,
+            }
+        ]
+    });
+
+    // Handle checkbox change event
+    $('.checkboxSelect').on('change', function () {
+        // Save checkbox state to cookies or local storage
+        saveCheckboxState();
+    });
+
+    // Handle checkbox state on DataTables draw event
+    table.on('draw', function () {
+        // Restore checkbox state from cookies or local storage
+        restoreCheckboxState();
+    });
+
+    // Empty local storage after submit
+    $("#usersTagSubmit").on("click", function () {
+        localStorage.setItem('checkboxState', JSON.stringify({}));
+    });
+
+    // Restore checkbox state on page load
+    restoreCheckboxState();
+
+    function saveCheckboxState() {
+
+        // Récupérer d'abord les données existantes dans le localStorage
+        var existingData = JSON.parse(localStorage.getItem('checkboxState')) || {};
+
+        // Ajouter ou mettre à jour les données actuelles
+        $('.checkboxSelect').each(function () {
+            var checkboxId = $(this).attr('id');
+            var checked = $(this).prop('checked');
+            existingData[checkboxId] = checked;
+        });
+
+        // Sauvegarder les données mises à jour dans le localStorage
+        localStorage.setItem('checkboxState', JSON.stringify(existingData));
+    }
+
+    // Function to restore checkbox state
+    function restoreCheckboxState() {
+        var checkboxState = JSON.parse(localStorage.getItem('checkboxState')) || {};
+        // console.log(checkboxState);
+        for (var checkboxId in checkboxState) {
+            if (checkboxState.hasOwnProperty(checkboxId)) {
+                var checked = checkboxState[checkboxId];
+                // Update checkbox state based on stored information
+                $('#' + checkboxId).prop('checked', checked);
+            }
+        }
+    }
+
+}));

core/module/user/view/tag/tag.php

@@ -0,0 +1,65 @@
+<?php echo template::formOpen('usersTagForm'); ?>
+<div class="row">
+    <div class="col1">
+        <?php echo template::button('userDeleteBack', [
+            'class' => 'buttonGrey',
+            'href' => helper::baseUrl() . 'user/' . $this->getUrl(2),
+            'value' => template::ico('left')
+        ]); ?>
+    </div>
+</div>
+<div class="row">
+    <div class="col12">
+        <div class="block">
+            <h4>Étiquette de remplacement</h4>
+            <div class="row">
+                <div class="col8">
+                    <?php echo template::text('usersTagLabel', [
+                        'placeholder' => 'Les étiquettes saisis remplaceront celles existantes. Les étiquettes sont séparées par des espaces'
+                    ]); ?>
+                </div>
+                <div class="col2 offset2 verticalAlignBottom">
+                    <?php echo template::submit('usersTagSubmit'); ?>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="row" id="Bfrtip">
+    <div class="col3">
+        <?php echo template::select('usersFilterGroup', $module::$usersGroups, [
+            'label' => 'Groupes / Profils',
+            'selected' => isset($_POST['usersFilterGroup']) ? $_POST['usersFilterGroup'] : 'all',
+        ]); ?>
+    </div>
+    <div class="col3">
+        <?php echo template::select('usersFilterFirstName', $module::$alphabet, [
+            'label' => 'Prénom commence par',
+            'selected' => isset($_POST['usersFilterFirstName']) ? $_POST['usersFilterFirstName'] : 'all',
+        ]); ?>
+    </div>
+    <div class="col3">
+        <?php echo template::select('usersFilterLastName', $module::$alphabet, [
+            'label' => 'Nom commence par',
+            'selected' => isset($_POST['usersFilterLastName']) ? $_POST['usersFilterLastName'] : 'all',
+        ]); ?>
+    </div>
+    <div class="col1 offset1 verticalAlignBottom">
+        <?php echo template::button('usersTagSelectAll', [
+            'value' => template::ico('square-check'),
+            'help' => 'Tout sélectionner'
+        ]); ?>
+    </div>
+    <div class="col1 verticalAlignBottom">
+        <?php echo template::button('usersTagSelectNone', [
+            'value' => template::ico('square-check-empty'),
+            'help' => 'Tout désélectionner'
+        ]); ?>
+    </div>
+</div>
+<?php if ($module::$users): ?>
+    <?php echo template::table([1, 2, 3, 3, 3], $module::$users, ['', 'Id', 'Prénom', 'Nom', 'Étiquettes'], ['id' => 'dataTables']); ?>
+<?php else: ?>
+    <?php echo template::speech('Aucun inscrit'); ?>
+<?php endif; ?>
+<?php echo template::formClose(); ?>

core/module/user/view/usersDelete/usersDelete.css

@@ -0,0 +1,26 @@
+/**
+ * This file is part of Zwii.
+ *
+ * For full copyright and license information, please see the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Rémi Jean <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @copyright Copyright (C) 2018-2024, Frédéric Tempez
+ * @license CC Attribution-NonCommercial-NoDerivatives 4.0 International
+ * @link http://zwiicms.fr/
+ */
+
+
+/** NE PAS EFFACER
+* admin.css
+*/
+
+#usersDeleteSubmit {
+    background-color: rgba(217, 95, 78, 1);
+}
+
+tr {
+    cursor: pointer;
+}

core/module/user/view/usersDelete/usersDelete.js.php

@@ -0,0 +1,101 @@
+/**
+ * This file is part of Zwii.
+ * For full copyright and license information, please see the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Rémi Jean <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @copyright Copyright (C) 2018-2024, Frédéric Tempez
+ * @license CC Attribution-NonCommercial-NoDerivatives 4.0 International
+ * @link http://zwiicms.fr/
+ */
+
+$(document).ready((function () {
+
+    $('tr').click(function () {
+        // Cochez ou décochez la case à cocher dans cette ligne
+        $(this).find('input[type="checkbox"]').prop('checked', function (i, val) {
+            return !val; // Inverse l'état actuel de la case à cocher
+        });
+    });
+
+    $('#usersDeleteSelectAll').on('click', function () {
+        $('.checkboxSelect').prop('checked', true);
+        saveCheckboxState();
+    });
+    $('#usersDeleteSelectNone').on('click', function () {
+        $('.checkboxSelect').prop('checked', false);
+        saveCheckboxState();
+    });
+
+    $("#usersFilterGroup, #usersFilterFirstName, #usersFilterLastName").change(function () {
+        saveCheckboxState();
+        $("#usersDeleteForm").submit();
+    });
+
+    var table = $('#dataTables').DataTable({
+        language: {
+            url: "core/vendor/datatables/french.json"
+        },
+        locale: 'fr',
+        "lengthMenu": [[10, 25, 50, 100, 299,  -1], [10, 25, 50, 100, 200, "Tout"]],
+        "columnDefs": [
+            {
+                target: 0,
+                orderable: false,
+                searchable: false,
+            }
+        ]
+    });
+
+    // Handle checkbox change event
+    $('.checkboxSelect').on('change', function () {
+        // Save checkbox state to cookies or local storage
+        saveCheckboxState();
+    });
+
+    // Handle checkbox state on DataTables draw event
+    table.on('draw', function () {
+        // Restore checkbox state from cookies or local storage
+        restoreCheckboxState();
+    });
+
+    // Empty local storage after submit
+    $("#usersDeleteSubmit").on("click", function () {
+        localStorage.setItem('checkboxState', JSON.stringify({}));
+    });
+
+    // Restore checkbox state on page load
+    restoreCheckboxState();
+
+    function saveCheckboxState() {
+
+        // Récupérer d'abord les données existantes dans le localStorage
+        var existingData = JSON.parse(localStorage.getItem('checkboxState')) || {};
+
+        // Ajouter ou mettre à jour les données actuelles
+        $('.checkboxSelect').each(function () {
+            var checkboxId = $(this).attr('id');
+            var checked = $(this).prop('checked');
+            existingData[checkboxId] = checked;
+        });
+
+        // Sauvegarder les données mises à jour dans le localStorage
+        localStorage.setItem('checkboxState', JSON.stringify(existingData));
+    }
+
+    // Function to restore checkbox state
+    function restoreCheckboxState() {
+        var checkboxState = JSON.parse(localStorage.getItem('checkboxState')) || {};
+        // console.log(checkboxState);
+        for (var checkboxId in checkboxState) {
+            if (checkboxState.hasOwnProperty(checkboxId)) {
+                var checked = checkboxState[checkboxId];
+                // Update checkbox state based on stored information
+                $('#' + checkboxId).prop('checked', checked);
+            }
+        }
+    }
+
+}));

core/module/user/view/usersDelete/usersDelete.php

@@ -0,0 +1,55 @@
+<?php echo template::formOpen('usersDeleteForm'); ?>
+<div class="row">
+    <div class="col1">
+        <?php echo template::button('userDeleteBack', [
+            'class' => 'buttonGrey',
+            'href' => helper::baseUrl() . 'user/' . $this->getUrl(2),
+            'value' => template::ico('left')
+        ]); ?>
+    </div>
+    <div class="col1 offset10">
+        <?php echo template::submit('usersDeleteSubmit', [
+            'class' => 'buttonRed',
+            'ico' => '',
+            'value' => template::ico('minus'),
+        ]); ?>
+    </div>
+</div>
+<div class="row" id="Bfrtip">
+    <div class="col3">
+        <?php echo template::select('usersFilterGroup', $module::$usersGroups, [
+            'label' => 'Groupes / Profils',
+            'selected' => isset($_POST['usersFilterGroup']) ? $_POST['usersFilterGroup'] : 'all',
+        ]); ?>
+    </div>
+    <div class="col3">
+        <?php echo template::select('usersFilterFirstName', $module::$alphabet, [
+            'label' => 'Prénom commence par',
+            'selected' => isset($_POST['usersFilterFirstName']) ? $_POST['usersFilterFirstName'] : 'all',
+        ]); ?>
+    </div>
+    <div class="col3">
+        <?php echo template::select('usersFilterLastName', $module::$alphabet, [
+            'label' => 'Nom commence par',
+            'selected' => isset($_POST['usersFilterLastName']) ? $_POST['usersFilterLastName'] : 'all',
+        ]); ?>
+    </div>
+    <div class="col1 offset1 verticalAlignBottom">
+        <?php echo template::button('usersDeleteSelectAll', [
+            'value' => template::ico('square-check'),
+            'help' => 'Tout sélectionner'
+        ]); ?>
+    </div>
+    <div class="col1 verticalAlignBottom">
+        <?php echo template::button('usersDeleteSelectNone', [
+            'value' => template::ico('square-check-empty'),
+            'help' => 'Tout désélectionner'
+        ]); ?>
+    </div>
+</div>
+<?php if ($module::$users): ?>
+    <?php echo template::table([1, 2, 3, 3, 3], $module::$users, ['', 'Id', 'Prénom', 'Nom', 'Étiquettes'], ['id' => 'dataTables']); ?>
+<?php else: ?>
+    <?php echo template::speech('Aucun inscrit'); ?>
+<?php endif; ?>
+<?php echo template::formClose(); ?>

core/vendor/zwiico/css/zwiico-codes.css

@@ -1,6 +1,7 @@
+@charset "UTF-8";
 
 .zwiico-plus-circled:before { content: '\2191'; } /* '↑' */
-.zwiico-logout:before { content: '\e800'; } /* '' */
+.zwiico-square-check:before { content: '\e800'; } /* '' */
 .zwiico-plus:before { content: '\e801'; } /* '' */
 .zwiico-cancel:before { content: '\e802'; } /* '' */
 .zwiico-help:before { content: '\e803'; } /* '' */
@@ -46,7 +47,11 @@
 .zwiico-right-big:before { content: '\e82b'; } /* '' */
 .zwiico-up-dir:before { content: '\e82c'; } /* '' */
 .zwiico-right-dir:before { content: '\e82d'; } /* '' */
+.zwiico-chart-line:before { content: '\e82e'; } /* '' */
+.zwiico-book:before { content: '\e82f'; } /* '' */
+.zwiico-square-check-empty:before { content: '\e830'; } /* '' */
 .zwiico-spin:before { content: '\e831'; } /* '' */
+.zwiico-tags:before { content: '\e832'; } /* '' */
 .zwiico-twitter:before { content: '\f099'; } /* '' */
 .zwiico-facebook:before { content: '\f09a'; } /* '' */
 .zwiico-docs:before { content: '\f0c5'; } /* '' */
@@ -64,6 +69,7 @@
 .zwiico-instagram:before { content: '\f16d'; } /* '' */
 .zwiico-box:before { content: '\f187'; } /* '' */
 .zwiico-vimeo:before { content: '\f194'; } /* '' */
+.zwiico-cube:before { content: '\f1b2'; } /* '' */
 .zwiico-cubes:before { content: '\f1b3'; } /* '' */
 .zwiico-steam:before { content: '\f1b6'; } /* '' */
 .zwiico-file-archive:before { content: '\f1c6'; } /* '' */
@@ -73,3 +79,4 @@
 .zwiico-pinterest:before { content: '\f231'; } /* '' */
 .zwiico-reddit:before { content: '\f281'; } /* '' */
 .zwiico-shopping-basket:before { content: '\f291'; } /* '' */
+.zwiico-logout:before { content: '🎓'; } /* '\1f393' */

core/vendor/zwiico/css/zwiico-ie7-codes.css

@@ -1,6 +1,6 @@
 
 .zwiico-plus-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '↑ '); }
-.zwiico-logout { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
+.zwiico-square-check { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-plus { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-cancel { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-help { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
@@ -46,7 +46,11 @@
 .zwiico-right-big { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-up-dir { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-right-dir { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
+.zwiico-chart-line { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
+.zwiico-book { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
+.zwiico-square-check-empty { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-spin { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
+.zwiico-tags { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-twitter { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-facebook { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-docs { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
@@ -64,6 +68,7 @@
 .zwiico-instagram { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-box { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-vimeo { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
+.zwiico-cube { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-cubes { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-steam { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-file-archive { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
@@ -73,3 +78,4 @@
 .zwiico-pinterest { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-reddit { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-shopping-basket { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
+.zwiico-logout { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🎓 '); }

core/vendor/zwiico/css/zwiico-ie7.css

@@ -11,7 +11,7 @@
 }
 
 .zwiico-plus-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '↑ '); }
-.zwiico-logout { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
+.zwiico-square-check { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-plus { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-cancel { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-help { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
@@ -57,7 +57,11 @@
 .zwiico-right-big { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-up-dir { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-right-dir { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
+.zwiico-chart-line { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
+.zwiico-book { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
+.zwiico-square-check-empty { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-spin { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
+.zwiico-tags { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-twitter { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-facebook { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-docs { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
@@ -75,6 +79,7 @@
 .zwiico-instagram { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-box { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-vimeo { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
+.zwiico-cube { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-cubes { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-steam { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-file-archive { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
@@ -84,3 +89,4 @@
 .zwiico-pinterest { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-reddit { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-shopping-basket { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
+.zwiico-logout { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🎓 '); }

core/vendor/zwiico/css/zwiico.css

@@ -1,11 +1,12 @@
+@charset "UTF-8";
 @font-face {
   font-family: 'zwiico';
-  src: url('../font/zwiico.eot?3721857');
+  src: url('../font/zwiico.eot?24931130');
-  src: url('../font/zwiico.eot?3721857#iefix') format('embedded-opentype'),
+  src: url('../font/zwiico.eot?24931130#iefix') format('embedded-opentype'),
-       url('../font/zwiico.woff2?3721857') format('woff2'),
+       url('../font/zwiico.woff2?24931130') format('woff2'),
-       url('../font/zwiico.woff?3721857') format('woff'),
+       url('../font/zwiico.woff?24931130') format('woff'),
-       url('../font/zwiico.ttf?3721857') format('truetype'),
+       url('../font/zwiico.ttf?24931130') format('truetype'),
-       url('../font/zwiico.svg?3721857#zwiico') format('svg');
+       url('../font/zwiico.svg?24931130#zwiico') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -15,7 +16,7 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: 'zwiico';
-    src: url('../font/zwiico.svg?3721857#zwiico') format('svg');
+    src: url('../font/zwiico.svg?24931130#zwiico') format('svg');
   }
 }
 */
@@ -55,7 +56,7 @@
 }
 
 .zwiico-plus-circled:before { content: '\2191'; } /* '↑' */
-.zwiico-logout:before { content: '\e800'; } /* '' */
+.zwiico-square-check:before { content: '\e800'; } /* '' */
 .zwiico-plus:before { content: '\e801'; } /* '' */
 .zwiico-cancel:before { content: '\e802'; } /* '' */
 .zwiico-help:before { content: '\e803'; } /* '' */
@@ -101,7 +102,11 @@
 .zwiico-right-big:before { content: '\e82b'; } /* '' */
 .zwiico-up-dir:before { content: '\e82c'; } /* '' */
 .zwiico-right-dir:before { content: '\e82d'; } /* '' */
+.zwiico-chart-line:before { content: '\e82e'; } /* '' */
+.zwiico-book:before { content: '\e82f'; } /* '' */
+.zwiico-square-check-empty:before { content: '\e830'; } /* '' */
 .zwiico-spin:before { content: '\e831'; } /* '' */
+.zwiico-tags:before { content: '\e832'; } /* '' */
 .zwiico-twitter:before { content: '\f099'; } /* '' */
 .zwiico-facebook:before { content: '\f09a'; } /* '' */
 .zwiico-docs:before { content: '\f0c5'; } /* '' */
@@ -119,6 +124,7 @@
 .zwiico-instagram:before { content: '\f16d'; } /* '' */
 .zwiico-box:before { content: '\f187'; } /* '' */
 .zwiico-vimeo:before { content: '\f194'; } /* '' */
+.zwiico-cube:before { content: '\f1b2'; } /* '' */
 .zwiico-cubes:before { content: '\f1b3'; } /* '' */
 .zwiico-steam:before { content: '\f1b6'; } /* '' */
 .zwiico-file-archive:before { content: '\f1c6'; } /* '' */
@@ -128,3 +134,4 @@
 .zwiico-pinterest:before { content: '\f231'; } /* '' */
 .zwiico-reddit:before { content: '\f281'; } /* '' */
 .zwiico-shopping-basket:before { content: '\f291'; } /* '' */
+.zwiico-logout:before { content: '🎓'; } /* '\1f393' */

core/vendor/zwiico/font/zwiico.svg

@@ -8,7 +8,7 @@
 <missing-glyph horiz-adv-x="1000" />
 <glyph glyph-name="plus-circled" unicode="&#x2191;" d="M420 770q174 0 297-123t123-297-123-297-297-123-297 123-123 297 123 297 297 123z m52-470l200 0 0 102-200 0 0 202-102 0 0-202-202 0 0-102 202 0 0-202 102 0 0 202z" horiz-adv-x="840" />
 
-<glyph glyph-name="logout" unicode="&#xe800;" d="M357 46q0-2 1-11t0-14-2-14-5-11-12-3h-178q-67 0-114 47t-47 114v392q0 67 47 114t114 47h178q8 0 13-5t5-13q0-2 1-11t0-15-2-13-5-11-12-3h-178q-37 0-63-26t-27-64v-392q0-37 27-63t63-27h174t6 0 7-2 4-3 4-5 1-8z m518 304q0-14-11-25l-303-304q-11-10-25-10t-25 10-11 25v161h-250q-14 0-25 11t-11 25v214q0 15 11 25t25 11h250v161q0 14 11 25t25 10 25-10l303-304q11-10 11-25z" horiz-adv-x="928.6" />
+<glyph glyph-name="square-check" unicode="&#xe800;" d="M0-150l0 1000 646 0-164-164-318 0 0-672 672 0 0 319 164 164 0-647-1000 0z m234 623l133 131 129-129 361 363 133-132-361-364-133-133z" horiz-adv-x="1000" />
 
 <glyph glyph-name="plus" unicode="&#xe801;" d="M786 439v-107q0-22-16-38t-38-15h-232v-233q0-22-16-37t-38-16h-107q-22 0-38 16t-15 37v233h-232q-23 0-38 15t-16 38v107q0 23 16 38t38 16h232v232q0 22 15 38t38 16h107q23 0 38-16t16-38v-232h232q23 0 38-16t16-38z" horiz-adv-x="785.7" />
 
@@ -100,8 +100,16 @@
 
 <glyph glyph-name="right-dir" unicode="&#xe82d;" d="M321 350q0-14-10-25l-250-250q-11-11-25-11t-25 11-11 25v500q0 15 11 25t25 11 25-11l250-250q10-10 10-25z" horiz-adv-x="357.1" />
 
+<glyph glyph-name="chart-line" unicode="&#xe82e;" d="M34 284q-42 10-32 56 10 42 54 32l98-24-52-80z m890-12q14 12 33 11t31-15q32-32-2-64l-252-226q-12-12-30-12-14 0-28 10l-286 220-54 14 50 80 36-8q12-4 16-8l264-204z m-490 220l-350-550q-12-22-38-22-12 0-24 8-16 10-20 29t6 33l374 588q8 16 28 20 18 6 36-6l246-156 226 326q10 16 28 19t34-9q38-24 12-62l-252-362q-24-36-62-12z" horiz-adv-x="1003" />
+
+<glyph glyph-name="book" unicode="&#xe82f;" d="M915 583q22-31 10-72l-154-505q-10-36-42-60t-69-25h-515q-43 0-83 30t-55 74q-14 37-1 71 0 2 1 15t3 20q0 5-2 12t-2 11q1 6 5 12t9 13 9 13q13 21 25 51t17 51q2 6 0 17t0 16q2 6 9 15t10 13q12 20 23 51t14 51q1 5-1 17t0 16q2 7 12 17t13 13q10 14 23 47t16 54q0 4-2 14t-1 15q1 4 5 10t10 13 10 11q4 7 9 17t8 20 9 20 11 18 15 13 20 6 26-3l0-1q21 5 28 5h425q41 0 64-32t10-72l-153-506q-20-66-40-85t-72-20h-485q-15 0-21-8-6-9-1-24 14-39 81-39h515q16 0 31 9t20 23l167 550q4 13 3 32 21-8 33-24z m-594-1q-2-7 1-12t11-6h339q8 0 15 6t9 12l12 36q2 7-1 12t-12 6h-339q-7 0-14-6t-9-12z m-46-143q-3-7 1-12t11-6h339q7 0 14 6t10 12l11 36q3 7-1 13t-11 5h-339q-7 0-14-5t-10-13z" horiz-adv-x="928.6" />
+
+<glyph glyph-name="square-check-empty" unicode="&#xe830;" d="M0-150l0 1000 1000 0 0-1000-1000 0z m164 164l672 0 0 672-672 0 0-672z" horiz-adv-x="1000" />
+
 <glyph glyph-name="spin" unicode="&#xe831;" d="M46 144l0 0c0 0-1 0-1 0-8 18-15 37-21 55-6 19-11 38-15 58-19 99-8 203 35 298 3 6 10 8 15 5 1 0 2 0 2-1l0 0 80-59c5-3 6-9 4-14-5-12-9-25-12-37-4-13-7-26-9-40-11-67-3-137 23-201 2-5 0-10-4-13l0 0-80-56c-5-4-12-2-16 3-1 0-1 1-1 2l0 0z m120 574l0 0c0 1 0 1 0 1 15 13 30 25 46 37 16 11 33 22 51 31 89 50 192 72 297 60 6-1 10-6 10-13 0-1-1-1-1-2l0 0-31-94c-2-5-8-8-13-7-13 0-27 0-40 0-14-1-27-2-40-4-68-11-133-40-186-84-4-3-10-3-14 0l0 0-79 58c-5 3-6 11-2 16 0 0 1 1 2 1l0 0z m588 65l0 0c0 0 1 0 1 0 17-10 34-21 50-32 16-12 31-25 46-38 74-69 127-160 148-262 2-6-2-12-9-13-1 0-1 0-2 0l0 0-100 1c-5 0-10 4-11 9-3 13-8 26-12 38-5 12-10 25-17 36-31 61-78 113-137 150-5 3-6 8-5 13l0 0 31 92c2 6 9 9 15 7 1 0 2-1 2-1l0 0z m244-535l0 0c0 0 0 0 0 0-4-20-9-39-15-57-7-19-14-37-22-55-44-92-114-170-205-221-6-3-13-1-16 4 0 1-1 2-1 2l0 0-30 94c-2 6 1 12 6 14 11 7 22 15 32 23 11 9 21 18 30 27 49 48 84 109 101 176 2 5 6 8 11 8l0 0 98-1c6 0 11-5 11-11 0-1 0-2 0-3l0 0z m-438-395l0 0c0 0 0 0 0 0-20-2-40-3-60-3-20 0-40 1-59 4-102 12-198 54-276 125-5 4-5 11 0 16 0 0 1 1 1 1l0 0 81 58c5 3 12 2 16-2 10-8 20-16 32-23 11-7 22-14 34-20 62-31 131-45 200-41 6 0 10-3 12-8l0 0 29-92c2-6-1-12-7-14-1-1-2-1-3-1l0 0z" horiz-adv-x="1000" />
 
+<glyph glyph-name="tags" unicode="&#xe832;" d="M250 600q0 30-21 51t-50 20-51-20-21-51 21-50 51-21 50 21 21 50z m595-321q0-30-20-51l-274-274q-22-21-51-21-30 0-50 21l-399 399q-21 21-36 57t-15 65v232q0 29 21 50t50 22h233q29 0 65-15t57-36l399-399q20-21 20-50z m215 0q0-30-21-51l-274-274q-22-21-51-21-20 0-33 8t-29 25l262 262q21 21 21 51 0 29-21 50l-399 399q-21 21-57 36t-65 15h125q29 0 65-15t57-36l399-399q21-21 21-50z" horiz-adv-x="1071.4" />
+
 <glyph glyph-name="twitter" unicode="&#xf099;" d="M904 622q-37-54-90-93 0-8 0-23 0-73-21-145t-64-139-103-117-144-82-181-30q-151 0-276 81 19-2 43-2 126 0 224 77-59 1-105 36t-64 89q19-3 34-3 24 0 48 6-63 13-104 62t-41 115v2q38-21 82-23-37 25-59 64t-22 86q0 49 25 91 68-83 164-133t208-55q-5 21-5 41 0 75 53 127t127 53q79 0 132-57 61 12 115 44-21-64-80-100 52 6 104 28z" horiz-adv-x="928.6" />
 
 <glyph glyph-name="facebook" unicode="&#xf09a;" d="M535 843v-147h-87q-48 0-65-20t-17-60v-106h164l-22-165h-142v-424h-171v424h-142v165h142v122q0 104 58 161t155 57q82 0 127-7z" horiz-adv-x="571.4" />
@@ -136,6 +144,8 @@
 
 <glyph glyph-name="vimeo" unicode="&#xf194;" d="M721 494q6 121-90 124-129 4-174-146 25 11 46 11 47 0 41-54-2-32-41-93t-59-61q-24 0-46 94-7 30-25 142-16 106-89 99-33-4-91-56l-46-40-45-40 29-37q43 29 49 29 32 0 59-100 9-31 26-92t25-92q38-100 91-100 88 0 214 164 123 158 126 248z m136 124v-536q0-66-47-113t-114-48h-535q-67 0-114 48t-47 113v536q0 66 47 113t114 48h535q67 0 114-48t47-113z" horiz-adv-x="857.1" />
 
+<glyph glyph-name="cube" unicode="&#xf1b2;" d="M500-59l357 195v355l-357-130v-420z m-36 483l390 141-390 142-389-142z m465 140v-428q0-20-10-37t-28-26l-393-214q-15-9-34-9t-34 9l-393 214q-17 10-27 26t-10 37v428q0 23 13 41t34 26l393 143q12 5 24 5t25-5l393-143q21-8 34-26t13-41z" horiz-adv-x="1000" />
+
 <glyph glyph-name="cubes" unicode="&#xf1b3;" d="M357-61l214 107v176l-214-92v-191z m-36 254l226 96-226 97-225-97z m608-254l214 107v176l-214-92v-191z m-36 254l225 96-225 97-226-97z m-250 163l214 92v149l-214-92v-149z m-36 212l246 105-246 106-246-106z m607-289v-233q0-20-10-37t-29-26l-250-125q-14-8-32-8t-32 8l-250 125q-2 1-4 2-1-1-4-2l-250-125q-14-8-32-8t-31 8l-250 125q-19 9-29 26t-11 37v233q0 21 12 39t32 26l242 104v223q0 22 12 40t31 26l250 107q13 6 28 6t28-6l250-107q20-9 32-26t12-40v-223l242-104q20-8 32-26t11-39z" horiz-adv-x="1285.7" />
 
 <glyph glyph-name="steam" unicode="&#xf1b6;" d="M883 525q0-56-40-96t-96-40-97 40-39 96 39 97 97 39 96-39 40-97z m-430-414q0 58-41 99t-98 41q-15 0-30-4l58-23q43-17 61-59t1-85q-18-43-60-61t-85 0q-12 4-35 13t-34 14q18-34 51-54t73-20q58 0 98 40t41 99z m463 414q0 70-50 120t-120 50q-71 0-121-50t-50-120q0-71 50-121t121-49q70 0 120 49t50 121z m84 0q0-106-74-180t-180-74l-244-178q-6-72-61-122t-127-50q-68 0-120 43t-66 107l-128 51v240l217-88q44 27 97 27 7 0 19-1l159 227q1 104 75 178t179 74q105 0 180-75t74-179z" horiz-adv-x="1000" />
@@ -153,6 +163,8 @@
 <glyph glyph-name="reddit" unicode="&#xf281;" d="M1000 378q0-32-16-59t-45-40q7-26 7-54 0-86-60-160t-162-117-223-42-223 42-162 117-59 160q0 26 6 53-28 13-46 41t-17 59q0 46 32 78t79 33q48 0 81-35 122 85 287 90l65 291q2 7 9 12t14 2l206-45q10 21 30 33t44 13q35 0 59-24t25-59-25-59-59-25-59 24-24 59l-186 42-58-264q167-5 289-89 33 34 80 34 46 0 79-33t32-78z m-767-111q0-35 25-59t58-25 60 25 24 59-24 59-60 24q-34 0-58-25t-25-58z m452-198q6 6 6 14t-6 15q-5 5-14 5t-14-5q-23-24-68-35t-89-11-89 11-68 35q-6 5-14 5t-14-5q-6-6-6-14t6-15q24-24 66-38t68-17 51-2 51 2 68 17 66 38z m-1 114q34 0 59 25t24 59q0 34-25 58t-58 25q-35 0-60-24t-24-59 24-59 60-25z" horiz-adv-x="1000" />
 
 <glyph glyph-name="shopping-basket" unicode="&#xf291;" d="M1071 421q30 0 51-20t21-51-21-50-51-21h-8l-64-370q-5-26-25-42t-45-17h-715q-25 0-45 17t-25 42l-64 370h-9q-29 0-50 21t-21 50 21 51 50 20h1000z m-800-446q14 1 24 13t9 26l-18 232q-1 14-13 24t-26 9-24-13-9-26l18-232q1-14 12-24t24-9h3z m229 36v232q0 14-11 25t-25 11-25-11-10-25v-232q0-15 10-25t25-11 25 11 11 25z m214 0v232q0 14-10 25t-25 11-25-11-11-25v-232q0-15 11-25t25-11 25 11 10 25z m197-3l18 232q1 15-9 26t-24 13-26-9-13-24l-18-232q-1-15 9-26t24-13h3q14 0 24 9t12 24z m-645 679l-52-230h-74l56 246q11 49 50 80t89 31h94q0 15 10 25t25 11h215q14 0 25-11t10-25h94q50 0 89-31t49-80l57-246h-74l-52 230q-6 25-25 40t-44 16h-94q0-15-10-25t-25-11h-215q-14 0-25 11t-10 25h-94q-25 0-44-16t-25-40z" horiz-adv-x="1142.9" />
+
+<glyph glyph-name="logout" unicode="&#x1f393;" d="M357 46q0-2 1-11t0-14-2-14-5-11-12-3h-178q-67 0-114 47t-47 114v392q0 67 47 114t114 47h178q8 0 13-5t5-13q0-2 1-11t0-15-2-13-5-11-12-3h-178q-37 0-63-26t-27-64v-392q0-37 27-63t63-27h174t6 0 7-2 4-3 4-5 1-8z m518 304q0-14-11-25l-303-304q-11-10-25-10t-25 10-11 25v161h-250q-14 0-25 11t-11 25v214q0 15 11 25t25 11h250v161q0 14 11 25t25 10 25-10l303-304q11-10 11-25z" horiz-adv-x="928.6" />
 </font>
 </defs>
 </svg>