Fix coding style part 2

This commit is contained in:
Job Snijders
2015-07-13 20:10:26 +02:00
parent ad9590df9b
commit d8693f05ae
733 changed files with 37359 additions and 33947 deletions

View File

@@ -1,104 +1,99 @@
<?php
if (!isset($_SESSION['username']))
{
$_SESSION['username'] = '';
if (!isset($_SESSION['username'])) {
$_SESSION['username'] = '';
}
function authenticate($username,$password)
{
global $config;
if (isset($_SERVER['REMOTE_USER']))
{
$_SESSION['username'] = mres($_SERVER['REMOTE_USER']);
function authenticate($username, $password) {
global $config;
$row = @dbFetchRow("SELECT username FROM `users` WHERE `username`=?", array($_SESSION['username']));
if (isset($row['username']) && $row['username'] == $_SESSION['username'])
{
return 1;
if (isset($_SERVER['REMOTE_USER'])) {
$_SESSION['username'] = mres($_SERVER['REMOTE_USER']);
$row = @dbFetchRow('SELECT username FROM `users` WHERE `username`=?', array($_SESSION['username']));
if (isset($row['username']) && $row['username'] == $_SESSION['username']) {
return 1;
}
else {
$_SESSION['username'] = $config['http_auth_guest'];
return 1;
}
}
else
{
$_SESSION['username'] = $config['http_auth_guest'];
return 1;
}
}
return 0;
return 0;
}
function reauthenticate($sess_id = "",$token = "")
{
return 0;
function reauthenticate($sess_id='', $token='') {
return 0;
}
function passwordscanchange($username = "")
{
return 0;
function passwordscanchange($username='') {
return 0;
}
function changepassword($username,$newpassword)
{
# Not supported
function changepassword($username, $newpassword) {
// Not supported
}
function auth_usermanagement()
{
return 1;
function auth_usermanagement() {
return 1;
}
function adduser($username, $password, $level, $email = "", $realname = "", $can_modify_passwd = '1')
{
function adduser($username, $password, $level, $email='', $realname='', $can_modify_passwd='1') {
if (!user_exists($username)) {
$hasher = new PasswordHash(8, FALSE);
$hasher = new PasswordHash(8, false);
$encrypted = $hasher->HashPassword($password);
return dbInsert(array('username' => $username, 'password' => $encrypted, 'level' => $level, 'email' => $email, 'realname' => $realname), 'users');
} else {
return FALSE;
}
else {
return false;
}
}
function user_exists($username)
{
// FIXME this doesn't seem right? (adama)
return dbFetchCell("SELECT * FROM `users` WHERE `username` = ?", array($username));
function user_exists($username) {
// FIXME this doesn't seem right? (adama)
return dbFetchCell('SELECT * FROM `users` WHERE `username` = ?', array($username));
}
function get_userlevel($username)
{
return dbFetchCell("SELECT `level` FROM `users` WHERE `username`= ?", array($username));
function get_userlevel($username) {
return dbFetchCell('SELECT `level` FROM `users` WHERE `username`= ?', array($username));
}
function get_userid($username)
{
return dbFetchCell("SELECT `user_id` FROM `users` WHERE `username`= ?", array($username));
function get_userid($username) {
return dbFetchCell('SELECT `user_id` FROM `users` WHERE `username`= ?', array($username));
}
function deluser($username)
{
# Not supported
return 0;
function deluser($username) {
// Not supported
return 0;
}
function get_userlist()
{
return dbFetchRows("SELECT * FROM `users`");
function get_userlist() {
return dbFetchRows('SELECT * FROM `users`');
}
function can_update_users()
{
# supported so return 1
return 1;
function can_update_users() {
// supported so return 1
return 1;
}
function get_user($user_id)
{
return dbFetchRow("SELECT * FROM `users` WHERE `user_id` = ?", array($user_id));
function get_user($user_id) {
return dbFetchRow('SELECT * FROM `users` WHERE `user_id` = ?', array($user_id));
}
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));
}
?>
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));
}