ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix problem editing users, a semi-colon screwed up the if statement. 

Also change behaviour so that if a user is specified, and doesn't load, generate an error.
This also removes a search for empty user id in the db
pull/485/head
Isaac Connor 2014-07-08 10:52:55 -04:00
parent 70471936a7
commit 2be38d7f32
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
web/skins/classic/views/user.php
View File

@ -25,11 +25,17 @@ if ( !canEdit( 'System' ) && !$selfEdit )
$view = "error";
return;
}
if ( !($newUser = dbFetchOne( 'SELECT * FROM Users WHERE Id = ?', NULL, ARRAY($_REQUEST['uid'])) ) ); {
$newUser = array();
$newUser['Username'] = $SLANG['NewUser'];
$newUser['Enabled'] = 1;
$newUser['MonitorIds'] = '';
if ( $_REQUEST['uid'] ) {
if ( !($newUser = dbFetchOne( 'SELECT * FROM Users WHERE Id = ?', NULL, ARRAY($_REQUEST['uid'])) ) ) {
$view = "error";
return;
}
} else {
$newUser = array();
$newUser['Username'] = $SLANG['NewUser'];
$newUser['Enabled'] = 1;
$newUser['MonitorIds'] = '';
}
$monitorIds = array_flip(explode( ',', $newUser['MonitorIds'] ));

16
web/skins/flat/views/user.php
View File

@ -25,11 +25,17 @@ if ( !canEdit( 'System' ) && !$selfEdit )
$view = "error";
return;
}
if ( !($newUser = dbFetchOne( 'SELECT * FROM Users WHERE Id = ?', NULL, ARRAY($_REQUEST['uid'])) ) ); {
$newUser = array();
$newUser['Username'] = $SLANG['NewUser'];
$newUser['Enabled'] = 1;
$newUser['MonitorIds'] = '';
if ( $_REQUEST['uid'] ) {
if ( !($newUser = dbFetchOne( 'SELECT * FROM Users WHERE Id = ?', NULL, ARRAY($_REQUEST['uid'])) ) ) {
$view = "error";
return;
}
} else {
$newUser = array();
$newUser['Username'] = $SLANG['NewUser'];
$newUser['Enabled'] = 1;
$newUser['MonitorIds'] = '';
}
$monitorIds = array_flip(explode( ',', $newUser['MonitorIds'] ));