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

Merge branch 'master' of github.com:ZoneMinder/zoneminder

This commit is contained in:
Isaac Connor 2022-01-14 14:46:00 -05:00
parent a4b0aa442a 7c1ba721aa
commit da538f7d1d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/zmupdate.pl.in
View File

@ -96,7 +96,7 @@ my $use_log = (($> == 0) || ($> == $web_uid));
logInit( toFile=>$use_log?DEBUG:NOLOG ); logInit( toFile=>$use_log?DEBUG:NOLOG );
logSetSignal(); logSetSignal();
my $interactive = 1; my $interactive = -t STDERR; # interactive if we have IO
my $check = 0; my $check = 0;
my $freshen = 0; my $freshen = 0;
my $rename = 0; my $rename = 0;
@ -144,7 +144,7 @@ if ( ($check + $freshen + $rename + $zoneFix + $migrateEvents + ($version?1:0))
pod2usage(-exitstatus => -1); pod2usage(-exitstatus => -1);
} }
if ($check and ($Config{ZM_CHECK_FOR_UPDATES} or $interactive) ) { if ($check) {
if (!$interactive) { if (!$interactive) {
Info('Update agent starting at '.strftime('%y/%m/%d %H:%M:%S', localtime() )."\n"); Info('Update agent starting at '.strftime('%y/%m/%d %H:%M:%S', localtime() )."\n");
} }

2
web/includes/csrf/csrf-magic.php
View File

@ -348,7 +348,7 @@ return false;
return $value === csrf_hash($_COOKIE[$n], $time); return $value === csrf_hash($_COOKIE[$n], $time);
case 'key': case 'key':
if (!$GLOBALS['csrf']['key']) { if (!$GLOBALS['csrf']['key']) {
Debug("Checking key: no key set" ); ZM\Debug("Checking key: no key set" );
return false; return false;
} }
#Debug("Checking sid: $value === " . csrf_hash($GLOBALS['csrf']['key'], $time) ); #Debug("Checking sid: $value === " . csrf_hash($GLOBALS['csrf']['key'], $time) );