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

129 Commits

Author SHA1 Message Date
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
stan a3ef933f2d Check for json_last_error function existence before invoking. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3482 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-07-22 08:34:35 +00:00
stan 6ff385e407 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f 2011-06-21 09:19:10 +00:00
stan 87124001ba Added error checking to builtin JSON functions 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3351 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-23 15:15:37 +00:00
stan 1d84fb8f7d Added jsonDecode function and stop encoding single quotes in JSON encoder 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3350 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-23 13:17:12 +00:00
stan 47e8d6112a Do not ignore return status of unlink 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3326 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-04-19 11:47:25 +00:00
stan bf101660b4 Added deletePath function and changed deleteEvent to use it. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3323 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-04-19 10:54:41 +00:00
stan 6a5f649092 Improved process control options, guesses less. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3320 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-04-19 09:35:39 +00:00
stan 3b149bf552 Fixed JSON encoding bug 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3292 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-11 14:48:03 +00:00
stan 98203e6c2f Improved stream handling for single image mode, for Chrome etc. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3281 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-06 16:04:11 +00:00
stan ee3c2f84a4 Removed debug 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3280 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-06 15:36:20 +00:00
stan 255cf27e49 Removed support for PHP 4.1.0 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3279 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-06 15:31:30 +00:00
stan 5985897a5c Modified and improved browser checking 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3278 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-06 15:29:06 +00:00
stan 6c547aba85 Fixed use of analysis images in getImageSrc function plus fixed implementation of overwrite flag in various functions. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3207 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-28 21:20:02 +00:00
stan c7e4ebd85d Updated with new bandwidth based stream config 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3167 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-03 16:36:50 +00:00
stan ac0e0c9ca6 Fixed typo in Quicktime video 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3033 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-02-23 10:41:04 +00:00
stan 9b31bf29e8 Added in image view to allow event root to be able web root 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3031 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-02-23 09:12:12 +00:00
stan a9c2044669 Changed split and ereg calls to explode and preg_match 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3029 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-02-23 09:00:31 +00:00
stan 6fc7acb378 Changed query separator to &amp; and added CDATA wrapper. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2981 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-10-16 17:04:44 +00:00
stan 9116927ca2 Removed extranrous quote. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2860 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-05-06 09:48:01 +00:00
stan 7b4c0fa926 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2820 e3e1d417-86f3-4887-817a-d78f3d33393f 2009-03-27 16:01:59 +00:00
stan f512cd91e7 Fixed issue with 'set' values. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2793 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-03 17:50:31 +00:00
stan 61089eeeb1 Added authentication hashed logins. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2781 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-19 14:06:39 +00:00
stan 847606a200 Fixed further with editng control capabilities 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2737 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-01-30 17:43:29 +00:00
stan 69f6270171 Fixed issue with X10 web commands. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2712 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-01-05 14:37:26 +00:00
viseon 5d766dde92 Remove decorations from Cambozola applet and escape line endings in json values. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2707 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-12-05 23:44:43 +00:00
viseon 59b9f622d8 Strip out cr/lfs from JSON values 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2684 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-11-03 13:14:35 +00:00
stan 9201e1319d Fixed some php warnings. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2677 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-10-28 14:24:46 +00:00
stan 9725a76371 Added default scale to getImagePath 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2673 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-10-28 12:49:04 +00:00
stan 81fd3aaa41 Restructured ajax to be consistent. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2668 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-10-16 16:12:23 +00:00
stan dc25beb8e4 Fixed MIME type issues. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2664 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-10-14 12:55:27 +00:00
stan 1080485c33 Motage and event list issues, fixes. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2642 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-09-30 15:29:14 +00:00
stan ef8f7b85fd Continuing development and bugfixes 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2632 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-09-26 09:47:20 +00:00
stan ba788cc001 Fixed issues with creation, editing and deletion of monitors. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2626 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-09-01 16:43:34 +00:00
stan 106882c161 Updated copyright notices 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2612 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-25 09:48:16 +00:00
stan 0f0a8c004f Changed skinSeq to skinBase 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2596 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-23 09:57:11 +00:00
stan 4f67ddd94a Fixed language selection 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2528 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-15 21:24:14 +00:00
stan 2824cb7355 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2508 e3e1d417-86f3-4887-817a-d78f3d33393f 2008-07-14 13:54:50 +00:00