ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

code style, replace with '

This commit is contained in:
Isaac Connor 2016-10-03 21:58:57 -04:00
parent 16bee2ef55 d4be5b06ea
commit 68936b9af9
3 changed files with 233 additions and 398 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
onvif/modules/lib/WSDiscovery/TransportUDP.pm
View File

@ -120,8 +120,8 @@ sub send_receive {
my ($address,$port) = ($endpoint =~ /([^:\/]+):([0-9]+)/); my ($address,$port) = ($endpoint =~ /([^:\/]+):([0-9]+)/);
# warn "address = ${address}"; warn "address = ${address}";
# warn "port = ${port}"; warn "port = ${port}";
$self->send_multi($address, $port, $envelope); $self->send_multi($address, $port, $envelope);

593
web/includes/actions.php
View File

File diff suppressed because it is too large Load Diff

34
web/includes/functions.php
View File

@ -141,32 +141,30 @@ function getAuthUser( $auth ) {
} }
function generateAuthHash( $useRemoteAddr ) { function generateAuthHash( $useRemoteAddr ) {
if ( ZM_OPT_USE_AUTH && ZM_AUTH_RELAY == 'hashed' ) { if ( ZM_OPT_USE_AUTH and ZM_AUTH_RELAY == 'hashed' and $_SESSION['username'] and $_SESSION['passwordHash'] ) {
# regenerate a hash at half the liftetime of a hash, an hour is 3600 so half is 1800 # regenerate a hash at half the liftetime of a hash, an hour is 3600 so half is 1800
if ( ( $_SESSION['AuthHashGeneratedAt'] < time() - ( ZM_AUTH_HASH_TTL * 1800 ) ) or ! isset($_SESSION['AuthHash']) ) { if ( ( $_SESSION['AuthHashGeneratedAt'] < time() - ( ZM_AUTH_HASH_TTL * 1800 ) ) or ! isset($_SESSION['AuthHash']) ) {
if ( ! ( $_SESSION['username'] and $_SESSION['passwordHash'] ) ) { # Don't both regenerating Auth Hash if an hour hasn't gone by yet
Warning("Can't generate auth hash until we are logged in"); $time = localtime();
$authKey = '';
if ( $useRemoteAddr ) {
$authKey = ZM_AUTH_HASH_SECRET.$_SESSION['username'].$_SESSION['passwordHash'].$_SESSION['remoteAddr'].$time[2].$time[3].$time[4].$time[5];
} else { } else {
$time = localtime(); $authKey = ZM_AUTH_HASH_SECRET.$_SESSION['username'].$_SESSION['passwordHash'].$time[2].$time[3].$time[4].$time[5];
if ( $useRemoteAddr ) {
$authKey = ZM_AUTH_HASH_SECRET.$_SESSION['username'].$_SESSION['passwordHash'].$_SESSION['remoteAddr'].$time[2].$time[3].$time[4].$time[5];
} else {
$authKey = ZM_AUTH_HASH_SECRET.$_SESSION['username'].$_SESSION['passwordHash'].$time[2].$time[3].$time[4].$time[5];
}
$auth = md5( $authKey );
if ( session_status() == PHP_SESSION_NONE ) {
Warning("Session is not active. AuthHash will not be cached.");
}
$_SESSION['AuthHash'] = $auth;
$_SESSION['AuthHashGeneratedAt'] = time();
Debug("Generating new auth $auth at " . $_SESSION['AuthHashGeneratedAt']. " using $authKey" );
} }
$auth = md5( $authKey );
if ( session_status() == PHP_SESSION_NONE ) {
Warning("Session is not active. AuthHash will not be cached.");
}
$_SESSION['AuthHash'] = $auth;
$_SESSION['AuthHashGeneratedAt'] = time();
Debug("Generated new auth $auth at " . $_SESSION['AuthHashGeneratedAt']. " using $authKey" );
} else { } else {
Debug("Using auth " . $_SESSION['AuthHash'] ); Debug( "Using cached auth " . $_SESSION['AuthHash'] );
} # end if AuthHash is not cached } # end if AuthHash is not cached
return $_SESSION['AuthHash']; return $_SESSION['AuthHash'];
} else { } else {
$auth = ""; $auth = '';
} }
return( $auth ); return( $auth );
} }