php lint + code standard PSR-2

This commit is contained in:
Nikita Tarasov 2018-05-20 22:17:29 +03:00
parent ebd12ebeb2
commit 73f290e896
15 changed files with 796 additions and 531 deletions

View file

@ -1,18 +1,18 @@
<?php
include_once('includes/config.inc.php');
include_once('includes/session.inc.php');
include_once('includes/misc.inc.php');
include_once 'includes/config.inc.php';
include_once 'includes/session.inc.php';
include_once 'includes/misc.inc.php';
if (!is_csrf_safe()) {
header('Status: 403');
header('Location: ./index.php');
jtable_respond(null, 'error', "Authentication required");
jtable_respond(null, 'error', 'Authentication required');
}
if (!is_adminuser()) {
header('Status: 403');
jtable_respond(null, 'error', "You need adminprivileges to get here");
jtable_respond(null, 'error', 'You need adminprivileges to get here');
}
if (!isset($_GET['action'])) {
@ -22,29 +22,29 @@ if (!isset($_GET['action'])) {
switch ($_GET['action']) {
case "list":
case 'list':
$users = get_all_users();
jtable_respond($users);
break;
case "listoptions":
case 'listoptions':
$users = get_all_users();
$retusers = array();
$retusers = [];
foreach ($users as $user) {
$retusers[] = array(
$retusers[] = [
'DisplayText' => $user['emailaddress'],
'Value' => $user['emailaddress']);
'Value' => $user['emailaddress']];
}
jtable_respond($retusers, 'options');
break;
case "create":
case 'create':
$emailaddress = isset($_POST['emailaddress']) ? $_POST['emailaddress'] : '';
$isadmin = isset($_POST['isadmin']) ? $_POST['isadmin'] : '0';
$password = isset($_POST['password']) ? $_POST['password'] : '';
if (!valid_user($emailaddress)) {
jtable_respond(null, 'error', "Please only use ^[a-z0-9@_.-]+$ for usernames");
jtable_respond(null, 'error', 'Please only use ^[a-z0-9@_.-]+$ for usernames');
}
if (!$password) {
@ -56,31 +56,31 @@ case "create":
}
if (add_user($emailaddress, $isadmin, $password)) {
$result = array('emailaddress' => $emailaddress, 'isadmin' => $isadmin);
$result = ['emailaddress' => $emailaddress, 'isadmin' => $isadmin];
jtable_respond($result, 'single');
} else {
jtable_respond(null, 'error', 'Could not create user');
}
break;
case "update":
case 'update':
$id = isset($_POST['id']) ? intval($_POST['id']) : '';
$emailaddress = isset($_POST['emailaddress']) ? $_POST['emailaddress'] : '';
$isadmin = isset($_POST['isadmin']) ? $_POST['isadmin'] : '0';
$password = isset($_POST['password']) ? $_POST['password'] : '';
if ($id != '' and update_user($id, $isadmin, $password)) {
$result = array('isadmin' => $isadmin);
$result = ['isadmin' => $isadmin];
jtable_respond($result, 'single');
} else {
jtable_respond(null, 'error', 'Could not update user');
}
break;
case "delete":
case 'delete':
$id = isset($_POST['id']) ? intval($_POST['id']) : '';
if ($id != '' and delete_user($id) !== FALSE) {
if ($id != '' and delete_user($id) !== false) {
jtable_respond(null, 'delete');
} else {
jtable_respond(null, 'error', 'Could not delete user');