Php/OpenVPN-Admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Nettoyage js jslint/hint

Browse Source
This commit is contained in:
Chocobozzz 2014-03-15 17:34:15 +01:00
parent c3dc7bd2a4
commit 1f57798451
1 changed files with 240 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

189
js/index.js
View File

@ -1,4 +1,8 @@
/*jslint browser: true*/
/*global $, Slick, grid, jQuery, alert*/
$(function () { $(function () {
"use strict";
// Selection des users // Selection des users
$.ajax({ $.ajax({
@ -7,37 +11,15 @@ $(function () {
dataType: 'json', dataType: 'json',
data: "select=user", data: "select=user",
success: function (json) { success: function (json) {
// Bouton pour formater la cellule pour supprimer un user // Bouton pour formater la cellule pour supprimer un user
function buttonFormatter(row, cell, value, columnDef, dataContext) { function buttonFormatter(row, cell, value, columnDef, dataContext) {
var button = "<img src='images/drop.png' class='delete del_user' data-row='" + row + "' id='" + dataContext.user_id + "' />"; var button = "<img src='images/drop.png' class='delete del_user' data-row='" + row + "' id='" + dataContext.user_id + "' />";
return button; return button;
} }
// Action lorsqu'on veut supprimer un uset var
$('.del_user').live('click', function(){ i,
columns = [
// Suppression dans la bdd
var me = $(this), id = me.attr('id');
$.ajax({
type: "POST",
url: "ajax.php",
dataType: "json",
data: {del_user_id: id},
error: function(){
alert("Erreur dans la suppression de la donnée...");
}
})
// Suppression de la ligne en question
var data = grid.getData();
data.splice(me.attr('data-row'), 1);
grid.setData(data);
grid.render();
});
// Header des colonnes
var columns = [
{id: "user_id", name: "ID", field: "user_id", width: 120, cssClass: "cell-title", editor: Slick.Editors.Text}, {id: "user_id", name: "ID", field: "user_id", width: 120, cssClass: "cell-title", editor: Slick.Editors.Text},
{id: "user_pass", name: "Pass", field: "user_pass", width: 120, cssClass: "cell-title", editor: Slick.Editors.Text}, {id: "user_pass", name: "Pass", field: "user_pass", width: 120, cssClass: "cell-title", editor: Slick.Editors.Text},
{id: "user_mail", name: "Mail", field: "user_mail", width: 120, cssClass: "cell-title", editor: Slick.Editors.Text}, {id: "user_mail", name: "Mail", field: "user_mail", width: 120, cssClass: "cell-title", editor: Slick.Editors.Text},
@ -47,21 +29,53 @@ $(function () {
{id: "user_start_date", name: "Start Date", field: "user_start_date", width: 120, cssClass: "cell-title", editor: Slick.Editors.Date}, {id: "user_start_date", name: "Start Date", field: "user_start_date", width: 120, cssClass: "cell-title", editor: Slick.Editors.Date},
{id: "user_end_date", name: "End Date", field: "user_end_date", width: 120, cssClass: "cell-title", editor: Slick.Editors.Date}, {id: "user_end_date", name: "End Date", field: "user_end_date", width: 120, cssClass: "cell-title", editor: Slick.Editors.Date},
{id: "user_del", name: 'Delete', field: "user_del", width: 250, formatter: buttonFormatter} {id: "user_del", name: 'Delete', field: "user_del", width: 250, formatter: buttonFormatter}
]; ],
// Options de la grid // Options de la grid
var options = { options = {
editable: true, editable: true,
enableAddRow: true, enableAddRow: true,
enableCellNavigation: true, enableCellNavigation: true,
asyncEditorLoading: false, asyncEditorLoading: false,
autoEdit: false, autoEdit: false,
autoHeight: true autoHeight: true
}; },
// Création des données // Création des données
var data = []; data = [],
for (var i = 0; i < json.length; i++){
// Permet de sauvegarder l'ancien user_id lorsque l'admin modifie un utilisateur du VPN
save = null,
grid = null;
// Action lorsqu'on veut supprimer un user
$('.del_user').live('click', function () {
// Suppression dans la bdd
var me = $(this), id = me.attr('id'),
data = grid.getData();
$.ajax({
type: "POST",
url: "ajax.php",
dataType: "json",
data: {del_user_id: id},
error: function () {
alert("Erreur dans la suppression de la donnée...");
}
});
// Suppression de la ligne en question
data.splice(me.attr('data-row'), 1);
grid.setData(data);
grid.render();
});
for (i = 0; i < json.length; i += 1) {
data[i] = { data[i] = {
user_id: json[i].user_id, user_id: json[i].user_id,
user_pass: json[i].user_pass, user_pass: json[i].user_pass,
@ -75,16 +89,16 @@ $(function () {
} }
// Grille des utilisateurs du VPN // Grille des utilisateurs du VPN
var grid = new Slick.Grid($("#grid_user"), data, columns, options); grid = new Slick.Grid($("#grid_user"), data, columns, options);
// Permet de sauvegarder l'ancien user_id lorsque l'admin modifie un utilisateur du VPN
var save = null;
$("#grid_user").on('click', function () { $("#grid_user").on('click', function () {
var $active = grid.getActiveCell(); var $active = grid.getActiveCell();
if($active != undefined && $active.cell == 0)
if ($active !== undefined && $active.cell === 0) {
save = $(grid.getActiveCellNode()).html(); save = $(grid.getActiveCellNode()).html();
else } else {
save = null; save = null;
}
}); });
// Lorsqu'on modifie une cellule d'un utilisateur // Lorsqu'on modifie une cellule d'un utilisateur
@ -92,10 +106,11 @@ $(function () {
var item = args.item; var item = args.item;
// On sauvegarde l'ancien user_id // On sauvegarde l'ancien user_id
if(save) if (save) {
item.set_user = save; item.set_user = save;
else } else {
item.set_user = item.user_id; item.set_user = item.user_id;
}
// Suppression dans la bdd // Suppression dans la bdd
$.ajax({ $.ajax({
@ -116,8 +131,9 @@ $(function () {
var item = args.item; var item = args.item;
// On ne peut ajouter un utilisateur qu'en saisissant son id // On ne peut ajouter un utilisateur qu'en saisissant son id
if(!item.user_id) if (!item.user_id) {
return; return;
}
// Modification dans la bdd // Modification dans la bdd
item.add_user = true; item.add_user = true;
@ -132,7 +148,7 @@ $(function () {
} }
}); });
delete item.add_user delete item.add_user;
// Maj de la grille // Maj de la grille
grid.invalidateRow(data.length); grid.invalidateRow(data.length);
@ -141,7 +157,6 @@ $(function () {
grid.render(); grid.render();
}); });
grid.autosizeColumns(); grid.autosizeColumns();
}, },
error: function () { error: function () {
@ -156,9 +171,11 @@ $(function () {
dataType: 'json', dataType: 'json',
data: "select=log", data: "select=log",
success: function (json) { success: function (json) {
var
i,
// Header des colonnes // Header des colonnes
var columns = [ columns = [
{id: "log_id", name: "Log ID", field: "log_id", width: 120, cssClass: "cell-title", editor: Slick.Editors.Text}, {id: "log_id", name: "Log ID", field: "log_id", width: 120, cssClass: "cell-title", editor: Slick.Editors.Text},
{id: "user_id", name: "User ID", field: "user_id", width: 120, cssClass: "cell-title", editor: Slick.Editors.Text}, {id: "user_id", name: "User ID", field: "user_id", width: 120, cssClass: "cell-title", editor: Slick.Editors.Text},
{id: "log_trusted_ip", name: "Trusted IP", field: "log_trusted_ip", width: 120, cssClass: "cell-title", editor: Slick.Editors.Text}, {id: "log_trusted_ip", name: "Trusted IP", field: "log_trusted_ip", width: 120, cssClass: "cell-title", editor: Slick.Editors.Text},
@ -169,21 +186,23 @@ $(function () {
{id: "log_end_time", name: "End Time", field: "log_end_time", width: 120, cssClass: "cell-title", editor: Slick.Editors.Text}, {id: "log_end_time", name: "End Time", field: "log_end_time", width: 120, cssClass: "cell-title", editor: Slick.Editors.Text},
{id: "log_received", name: "Receveid", field: "log_received", width: 120, cssClass: "cell-title", editor: Slick.Editors.Text}, {id: "log_received", name: "Receveid", field: "log_received", width: 120, cssClass: "cell-title", editor: Slick.Editors.Text},
{id: "log_send", name: "Sent", field: "log_send", width: 120, cssClass: "cell-title", editor: Slick.Editors.Text} {id: "log_send", name: "Sent", field: "log_send", width: 120, cssClass: "cell-title", editor: Slick.Editors.Text}
]; ],
// Options de la grille // Options de la grille
var options = { options = {
editable: false, editable: false,
enableAddRow: false, enableAddRow: false,
enableCellNavigation: true, enableCellNavigation: true,
asyncEditorLoading: false, asyncEditorLoading: false,
autoEdit: false, autoEdit: false,
autoHeight: true autoHeight: true
}; },
// Données de la grille des logs // Données de la grille des logs
var data = []; data = [],
for (var i = 0; i < json.length; i++){ grid = null;
for (i = 0; i < json.length; i += 1) {
data[i] = { data[i] = {
log_id: json[i].log_id, log_id: json[i].log_id,
user_id: json[i].user_id, user_id: json[i].user_id,
@ -199,7 +218,7 @@ $(function () {
} }
// Création de la grille // Création de la grille
var grid = new Slick.Grid($("#grid_log"), data, columns, options); grid = new Slick.Grid($("#grid_log"), data, columns, options);
grid.autosizeColumns(); grid.autosizeColumns();
}, },
@ -216,17 +235,44 @@ $(function () {
dataType: 'json', dataType: 'json',
data: "select=admin", data: "select=admin",
success: function (json) { success: function (json) {
// Fonction créant la cellule pour supprimer un admin // Fonction créant la cellule pour supprimer un admin
function buttonFormatter(row, cell, value, columnDef, dataContext) { function buttonFormatter(row, cell, value, columnDef, dataContext) {
var button = "<img src='images/drop.png' class='delete del_admin' data-row='" + row + "' id='" + dataContext.admin_id + "' />"; var button = "<img src='images/drop.png' class='delete del_admin' data-row='" + row + "' id='" + dataContext.admin_id + "' />";
return button; return button;
} }
var
i,
// Header des colonnes
columns = [
{id: "admin_id", name: "Admin ID", field: "admin_id", width: 120, cssClass: "cell-title", editor: Slick.Editors.Text},
{id: "admin_pass", name: "Admin Pass", field: "admin_pass", width: 120, cssClass: "cell-title", editor: Slick.Editors.Text},
{id: "admin_del", name: 'Delete', field: "admin_del", width: 250, formatter: buttonFormatter}
],
// Option de la grille
options = {
editable: true,
enableAddRow: true,
enableCellNavigation: true,
asyncEditorLoading: false,
autoEdit: false,
autoHeight: true
},
data = [],
grid = null,
// Sauvegarder l'ancien admin_id lorsqu'on modifie un admin
save = null;
// Lorsqu'on veut supprimer un admin // Lorsqu'on veut supprimer un admin
$('.del_admin').live('click', function () { $('.del_admin').live('click', function () {
// Suppression dans la bdd // Suppression dans la bdd
var me = $(this), id = me.attr('id'); var me = $(this), id = me.attr('id'), data = grid.getData();
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: "ajax.php", url: "ajax.php",
@ -235,52 +281,32 @@ $(function () {
error: function () { error: function () {
alert("Erreur dans la suppression de la donnée..."); alert("Erreur dans la suppression de la donnée...");
} }
}) });
// Maj de la grille // Maj de la grille
var data = grid.getData();
data.splice(me.attr('data-row'), 1); data.splice(me.attr('data-row'), 1);
grid.setData(data); grid.setData(data);
grid.render(); grid.render();
}); });
// Header des colonnes
var columns = [
{id: "admin_id", name: "Admin ID", field: "admin_id", width: 120, cssClass: "cell-title", editor: Slick.Editors.Text},
{id: "admin_pass", name: "Admin Pass", field: "admin_pass", width: 120, cssClass: "cell-title", editor: Slick.Editors.Text},
{id: "admin_del", name:'Delete', field: "admin_del", width:250, formatter:buttonFormatter}
];
// Option de la grille for (i = 0; i < json.length; i += 1) {
var options = {
editable: true,
enableAddRow: true,
enableCellNavigation: true,
asyncEditorLoading: false,
autoEdit: false,
autoHeight:true
};
// Données
var data = [];
for (var i = 0; i < json.length; i++){
data[i] = { data[i] = {
admin_id: json[i].admin_id, admin_id: json[i].admin_id,
admin_pass: json[i].admin_pass, admin_pass: json[i].admin_pass
}; };
} }
var grid = new Slick.Grid($("#grid_admin"), data, columns, options); grid = new Slick.Grid($("#grid_admin"), data, columns, options);
// Sauvegarder l'ancien admin_id lorsqu'on modifie un admin
var save = null;
$("#grid_admin").on('click', function () { $("#grid_admin").on('click', function () {
var $active = grid.getActiveCell(); var $active = grid.getActiveCell();
if($active != undefined && $active.cell == 0) if ($active !== undefined && $active.cell === 0) {
save = $(grid.getActiveCellNode()).html(); save = $(grid.getActiveCellNode()).html();
else } else {
save = null; save = null;
}
}); });
// Lorsqu'on modifie un admin // Lorsqu'on modifie un admin
@ -288,10 +314,11 @@ $(function () {
var item = args.item; var item = args.item;
// On stocke l'ancien admin_id // On stocke l'ancien admin_id
if(save) if (save) {
item.set_admin = save; item.set_admin = save;
else } else {
item.set_admin = item.admin_id; item.set_admin = item.admin_id;
}
// Modification de la bdd // Modification de la bdd
$.ajax({ $.ajax({
@ -312,8 +339,9 @@ $(function () {
var item = args.item; var item = args.item;
// On peut ajouter un admin seulement en ajoutant un ID // On peut ajouter un admin seulement en ajoutant un ID
if(!item.admin_id) if (!item.admin_id) {
return; return;
}
item.add_admin = true; item.add_admin = true;
@ -337,11 +365,10 @@ $(function () {
grid.render(); grid.render();
}); });
grid.autosizeColumns(); grid.autosizeColumns();
}, },
error: function () { error: function () {
alert('Erreur dans la récupération des données...'); alert('Erreur dans la récupération des données...');
} }
}); });
}) });