mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
PSR2 Cleanup: /html edition
Travis tests for code conformance. Ignore warnings for now. Fixed all errors, left most warnings.
This commit is contained in:
@ -1,7 +1,8 @@
|
||||
<?php
|
||||
|
||||
|
||||
function authenticate($username, $password) {
|
||||
function authenticate($username, $password)
|
||||
{
|
||||
$encrypted_old = md5($password);
|
||||
$row = dbFetchRow('SELECT username,password FROM `users` WHERE `username`= ?', array($username), true);
|
||||
if ($row['username'] && $row['username'] == $username) {
|
||||
@ -13,8 +14,7 @@ function authenticate($username, $password) {
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
else if (substr($row['password'], 0, 3) == '$1$') {
|
||||
} elseif (substr($row['password'], 0, 3) == '$1$') {
|
||||
$row_type = dbFetchRow('DESCRIBE users password');
|
||||
if ($row_type['Type'] == 'varchar(60)') {
|
||||
if ($row['password'] == crypt($password, $row['password'])) {
|
||||
@ -30,26 +30,25 @@ function authenticate($username, $password) {
|
||||
}//end if
|
||||
|
||||
return 0;
|
||||
|
||||
}//end authenticate()
|
||||
|
||||
|
||||
function reauthenticate($sess_id, $token) {
|
||||
function reauthenticate($sess_id, $token)
|
||||
{
|
||||
list($uname,$hash) = explode('|', $token);
|
||||
$session = dbFetchRow("SELECT * FROM `session` WHERE `session_username` = '$uname' AND session_value='$sess_id'", array(), true);
|
||||
$hasher = new PasswordHash(8, false);
|
||||
if ($hasher->CheckPassword($uname.$session['session_token'], $hash)) {
|
||||
$_SESSION['username'] = $uname;
|
||||
return 1;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
|
||||
}//end reauthenticate()
|
||||
|
||||
|
||||
function passwordscanchange($username='') {
|
||||
function passwordscanchange($username = '')
|
||||
{
|
||||
/*
|
||||
* By default allow the password to be modified, unless the existing
|
||||
* user is explicitly prohibited to do so.
|
||||
@ -57,11 +56,9 @@ function passwordscanchange($username='') {
|
||||
|
||||
if (empty($username) || !user_exists($username)) {
|
||||
return 1;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
return dbFetchCell('SELECT can_modify_passwd FROM users WHERE username = ?', array($username), true);
|
||||
}
|
||||
|
||||
}//end passwordscanchange()
|
||||
|
||||
|
||||
@ -72,7 +69,8 @@ function passwordscanchange($username='') {
|
||||
* @param $max integer The number of characters in the string
|
||||
* @author AfroSoft <scripts@afrosoft.co.cc>
|
||||
*/
|
||||
function generateSalt($max=15) {
|
||||
function generateSalt($max = 15)
|
||||
{
|
||||
$characterList = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
|
||||
$i = 0;
|
||||
$salt = '';
|
||||
@ -82,66 +80,64 @@ function generateSalt($max=15) {
|
||||
} while ($i <= $max);
|
||||
|
||||
return $salt;
|
||||
|
||||
}//end generateSalt()
|
||||
|
||||
|
||||
function changepassword($username, $password) {
|
||||
function changepassword($username, $password)
|
||||
{
|
||||
$hasher = new PasswordHash(8, false);
|
||||
$encrypted = $hasher->HashPassword($password);
|
||||
return dbUpdate(array('password' => $encrypted), 'users', '`username` = ?', array($username));
|
||||
|
||||
}//end changepassword()
|
||||
|
||||
|
||||
function auth_usermanagement() {
|
||||
function auth_usermanagement()
|
||||
{
|
||||
return 1;
|
||||
|
||||
}//end auth_usermanagement()
|
||||
|
||||
|
||||
function adduser($username, $password, $level, $email='', $realname='', $can_modify_passwd=1, $description='', $twofactor=0) {
|
||||
function adduser($username, $password, $level, $email = '', $realname = '', $can_modify_passwd = 1, $description = '', $twofactor = 0)
|
||||
{
|
||||
if (!user_exists($username)) {
|
||||
$hasher = new PasswordHash(8, false);
|
||||
$encrypted = $hasher->HashPassword($password);
|
||||
$userid = dbInsert(array('username' => $username, 'password' => $encrypted, 'level' => $level, 'email' => $email, 'realname' => $realname, 'can_modify_passwd' => $can_modify_passwd, 'descr' => $description, '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;
|
||||
}
|
||||
|
||||
}//end adduser()
|
||||
|
||||
|
||||
function user_exists($username) {
|
||||
function user_exists($username)
|
||||
{
|
||||
$return = @dbFetchCell('SELECT COUNT(*) FROM users WHERE username = ?', array($username), true);
|
||||
return $return;
|
||||
|
||||
}//end user_exists()
|
||||
|
||||
|
||||
function get_userlevel($username) {
|
||||
function get_userlevel($username)
|
||||
{
|
||||
return dbFetchCell('SELECT `level` FROM `users` WHERE `username` = ?', array($username), true);
|
||||
|
||||
}//end get_userlevel()
|
||||
|
||||
|
||||
function get_userid($username) {
|
||||
function get_userid($username)
|
||||
{
|
||||
return dbFetchCell('SELECT `user_id` FROM `users` WHERE `username` = ?', array($username), true);
|
||||
|
||||
}//end get_userid()
|
||||
|
||||
|
||||
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));
|
||||
@ -149,30 +145,29 @@ function deluser($username) {
|
||||
dbDelete('users', '`user_name` = ?', array($username));
|
||||
|
||||
return dbDelete('users', '`username` = ?', array($username));
|
||||
|
||||
}//end deluser()
|
||||
|
||||
|
||||
function get_userlist() {
|
||||
function get_userlist()
|
||||
{
|
||||
return dbFetchRows('SELECT * FROM `users`');
|
||||
|
||||
}//end get_userlist()
|
||||
|
||||
|
||||
function can_update_users() {
|
||||
function can_update_users()
|
||||
{
|
||||
// supported so return 1
|
||||
return 1;
|
||||
|
||||
}//end can_update_users()
|
||||
|
||||
|
||||
function get_user($user_id) {
|
||||
function get_user($user_id)
|
||||
{
|
||||
return dbFetchRow('SELECT * FROM `users` WHERE `user_id` = ?', array($user_id), true);
|
||||
|
||||
}//end get_user()
|
||||
|
||||
|
||||
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));
|
||||
|
||||
}//end update_user()
|
||||
|
Reference in New Issue
Block a user