PSR2 Cleanup: /html edition

Travis tests for code conformance. Ignore warnings for now.
Fixed all errors, left most warnings.
This commit is contained in:
Tony Murray
2016-08-18 20:28:22 -05:00
parent f0c82498b5
commit 8c639aa5a4
468 changed files with 6605 additions and 7629 deletions

View File

@@ -4,51 +4,55 @@ require_once $config['install_dir'].'/lib/pure_php_radius/radius.class.php';
$radius = new Radius($config['radius']['hostname'], $config['radius']['secret'], $config['radius']['suffix'], $config['radius']['timeout'], $config['radius']['port']);
function authenticate($username, $password) {
function authenticate($username, $password)
{
global $config, $radius, $debug;
if (empty($username)) {
return 0;
}
else {
} else {
if ($debug) {
$radius->SetDebugMode(TRUE);
$radius->SetDebugMode(true);
}
$rad = $radius->AccessRequest($username,$password);
if($rad === true) {
$rad = $radius->AccessRequest($username, $password);
if ($rad === true) {
adduser($username);
return 1;
}
else {
} else {
return 0;
}
}
}
function reauthenticate() {
function reauthenticate()
{
return 0;
}
function passwordscanchange() {
function passwordscanchange()
{
// not supported so return 0
return 0;
}
function changepassword() {
function changepassword()
{
// not supported so return 0
return 0;
}
function auth_usermanagement() {
function auth_usermanagement()
{
// not supported so return 0
return 1;
}
function adduser($username, $password, $level=1, $email='', $realname='', $can_modify_passwd=0, $description='', $twofactor=0) {
function adduser($username, $password, $level = 1, $email = '', $realname = '', $can_modify_passwd = 0, $description = '', $twofactor = 0)
{
// Check to see if user is already added in the database
global $config;
if (!user_exists($username)) {
@@ -60,35 +64,37 @@ function adduser($username, $password, $level=1, $email='', $realname='', $can_m
$userid = dbInsert(array('username' => $username, 'password' => $encrypted, 'realname' => $realname, 'email' => $email, 'descr' => $description, 'level' => $level, 'can_modify_passwd' => $can_modify_passwd, 'twofactor' => $twofactor), 'users');
if ($userid == false) {
return false;
}
else {
foreach (dbFetchRows('select notifications.* from notifications where not exists( select 1 from notifications_attribs where notifications.notifications_id = notifications_attribs.notifications_id and notifications_attribs.user_id = ?) order by notifications.notifications_id desc',array($userid)) as $notif) {
dbInsert(array('notifications_id'=>$notif['notifications_id'],'user_id'=>$userid,'key'=>'read','value'=>1),'notifications_attribs');
} else {
foreach (dbFetchRows('select notifications.* from notifications where not exists( select 1 from notifications_attribs where notifications.notifications_id = notifications_attribs.notifications_id and notifications_attribs.user_id = ?) order by notifications.notifications_id desc', array($userid)) as $notif) {
dbInsert(array('notifications_id'=>$notif['notifications_id'],'user_id'=>$userid,'key'=>'read','value'=>1), 'notifications_attribs');
}
}
return $userid;
}
else {
} else {
return false;
}
}
function user_exists($username) {
function user_exists($username)
{
return dbFetchCell('SELECT COUNT(*) FROM users WHERE username = ?', array($username), true);
}
function get_userlevel($username) {
function get_userlevel($username)
{
return dbFetchCell('SELECT `level` FROM `users` WHERE `username` = ?', array($username), true);
}
function get_userid($username) {
function get_userid($username)
{
return dbFetchCell('SELECT `user_id` FROM `users` WHERE `username` = ?', array($username), true);
}
function deluser($username) {
function deluser($username)
{
dbDelete('bill_perms', '`user_name` = ?', array($username));
dbDelete('devices_perms', '`user_name` = ?', array($username));
dbDelete('ports_perms', '`user_name` = ?', array($username));
@@ -98,23 +104,26 @@ function deluser($username) {
}
function get_userlist() {
function get_userlist()
{
return dbFetchRows('SELECT * FROM `users`');
}
function can_update_users() {
function can_update_users()
{
// supported so return 1
return 1;
}
function get_user($user_id) {
function get_user($user_id)
{
return dbFetchRow('SELECT * FROM `users` WHERE `user_id` = ?', array($user_id), true);
}
function update_user($user_id, $realname, $level, $can_modify_passwd, $email) {
function update_user($user_id, $realname, $level, $can_modify_passwd, $email)
{
dbUpdate(array('realname' => $realname, 'level' => $level, 'can_modify_passwd' => $can_modify_passwd, 'email' => $email), 'users', '`user_id` = ?', array($user_id));
}