ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,860 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

87 Commits

Author SHA1 Message Date
Isaac Connor 1530096560 whitespace/google code style 2016-05-12 10:17:41 -04:00
Isaac Connor 5e20831030 Don't return of disk_free_space returns false, just log it. 2016-04-28 09:29:40 -04:00
Isaac Connor d847d66e99 handle disk_free_space error 2016-04-26 14:40:40 -04:00
Isaac Connor 851a81eff7 Merge pull request #1406 from ZoneMinder/svg_zones 
replace the static zone image with a stream, and use SVG to draw the zones
 2016-04-11 11:14:11 -04:00
Isaac Connor feb7b36f11 use a local variable to prevent modifying the arguments 2016-04-09 11:23:52 -04:00
Isaac Connor e90024c0d0 Better Error logging on disk_total_space failure 2016-04-09 09:27:12 -04:00
Isaac Connor 3056069f3f introduce getStreamHTML which returns the required HTML to give you a live image 2016-04-08 11:06:34 -04:00
Isaac Connor 711343a5cc fix ZM_SERVER_ID instead of ZM_SERVER 2016-04-04 16:34:21 -04:00
Isaac Connor 02eb36040a fix bad code 2016-04-04 12:01:37 -04:00
Laercio Motta ad912a6c6b Improve test multiserver restart camera. (FIX) 
Check if the server is correctly before restart cam and multiserver is activate.
 2016-03-31 09:45:13 -03:00
Laercio Motta 2f27818e5b Improve test multiserver restart cam. 
Test if correct server from camera edit settings.
 2016-03-31 09:23:01 -03:00
Isaac Connor 4520902dd2 use trim on values when saving. 2016-01-14 09:37:41 -05:00
Isaac Connor f72260733c Only do CORSHeaders if there is more than 1 server 2016-01-04 09:38:24 -05:00
Isaac Connor d256530896 return early if no servers are defined instead of logging a warning 2016-01-04 09:36:45 -05:00
Isaac Connor b8fb711593 only do CORS if Origin is set 2015-12-02 11:02:47 -05:00
Isaac Connor 62adb756a9 put back CORS validity checking code 2015-12-02 10:12:20 -05:00
Isaac Connor 3f8a45bbbb Add a function to setup CORS access headers 2015-12-02 10:05:03 -05:00
Andy Bauer 64299082ad Send login activity to the zoneminder event log 2015-08-17 17:54:17 -05:00
Isaac Connor fed6748c6d fixes to format date into zero padding and year as 2 digit 2015-02-06 13:00:55 -05:00
Isaac Connor dbac099223 we don't use EndTime so don't load it 2015-02-06 11:50:23 -05:00
Isaac Connor 9a1e210849 add comment 2015-02-06 11:46:35 -05:00
Isaac Connor 02a6c78182 make deleteEvent take either an event object or an eid. 
load the relevant event data if passed an eid.
Use the StartTime to get to the event files instead of globbing the entire events path under the monitor.
 2015-02-06 11:41:37 -05:00
Günter Grodotzki 8350ddac7c replace getLoad() / getDiskPercent() with PHP native functions 2015-01-03 19:22:19 +01:00
SteveGilvarry e87e69fa57 Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
Isaac Connor bec58a6011 fixes WRT to db logging. I believe fixes issue #504 2014-09-26 14:43:58 -04:00
Andrew Bauer aa3803cb0b Update functions.php 
A more efficient check for IE >= 11 than the previous commit
 2014-09-13 09:47:22 -05:00
Andrew Bauer 91b99b97a5 Update functions.php 
Add logic to detect the User Agent string from IE11 (and potentially newer).
 2014-09-13 08:19:08 -05:00
Isaac Connor 5ae3cb8907 merge some security fixes from rogerroger288 2014-06-05 15:14:12 -04:00
Maciej Czerniak 50a9055601 fix sql error which prevents remote login from working 2014-04-13 09:54:11 +02:00
m-bene f22b956b8b do not quote column names in parse filter 2014-04-08 09:07:59 +02:00
Isaac Connor ffa952419c Merge branch 'mysql2PDO' 
Conflicts:
	distros/ubuntu1204/changelog
	scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm
	web/includes/actions.php
 2014-03-20 16:48:03 -04:00
Isaac Connor 7b26636bcd Merge pull request #280 from ZoneMinder/zmfixremoval 
Remove zmfix
 2013-12-22 11:22:18 -08:00
Miklos Marton 5de638214b In the web/includes/functions.php there were some html formatting errors in the outputVideoStream function. 
These errors were:
- Unclosed object and embed tags
- param tags without closing tags

These errors lead to rendering errors when using the mobile skins with some specific streaming options.
 2013-12-22 15:17:21 +01:00
Kfir Itzhak e9bb632a78 Remove zmfix 2013-12-22 16:08:17 +02:00
Philipp Rehs d4babd23f1 Fix checkJsonError messages 
The $value string was not set inside checkJsonError, so it was not possible to see the data which caused the error
 2013-11-30 18:13:02 +01:00
Isaac Connor 51455b5c85 more updates and removal of escaping and quoting 2013-11-04 12:43:34 -05:00
Isaac Connor cde89a7144 more quoting removal, some slight optimisations 2013-10-17 21:03:24 -04:00
Isaac Connor ef765afa2d Merge branch 'master' into mysql2PDO 2013-10-17 17:02:44 -04:00
Isaac Connor 36c4fad644 remove extra quoets since dbEcape does quoting now 2013-10-17 15:35:23 -04:00
Isaac Connor 870a59bed4 fix missing <?php. The missing full size tag makes the file fail when short tags are turned off 2013-10-17 14:23:25 -04:00
Knniggett 6d00540b5d Improve Chrome browser support & log streaming events 2013-09-21 14:52:41 -05:00
Richard Kojedzinszky 0f5c90bbe4 Rewritten the query to allow mysql to use indexes 
On a system with heavy logging, without this the login procedure took
too long.
 2013-09-12 22:46:26 +02:00
Kyle Johnson d47aaec775 Merge pull request #92 from knnniggett/patch-9 
Update getBrowser() to match IE10
 2013-09-03 06:38:13 -07:00
Kyle Johnson 2f92689d7e Resolving CVE-2013-0232 - this should fix #93. 2013-08-30 21:53:19 -04:00
Andy de51926434 Update getBrowser() to match IE10 
Updates the preg_match expression to match Internet Explorer 10. The previous pattern would not detect IE10, and hence zoneminder would not attempt to stream via Cambozola, which leaves IE10 users looking at a broken link.

NOTE: There is another file in the zoneminder source tree, AssetDispatcher.php, that also uses the same pattern match expression.  It is part of the Cake folder, which I am not familiar with.  Please advise if we should edit that file as well.
 2013-08-29 17:41:20 -05:00
Kyle Johnson 2c04d0774f Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
Kyle Johnson 1ed6462354 Removed all of the old web files 2013-05-01 06:52:43 -04:00
stan 62df1ba8de Tidier detainting. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3494 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-03 17:33:58 +00:00
stan aa0ee13afa Detaint further dodgy path varieties. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3488 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-03 11:08:40 +00:00
stan 6035ed211a Detaint some user inputs to avoid malicious file inclusion 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3483 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-07-22 08:37:01 +00:00