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

3613 Commits

Author SHA1 Message Date
Isaac Connor 44c07c4e7a put back proper sql 2017-05-18 14:42:55 -04:00
Isaac Connor 84a224d712 put back the AS E 2017-05-18 14:39:58 -04:00
Isaac Connor 4763ace165 Merge branch 'master' into storageareas 2017-05-18 14:24:09 -04:00
Isaac Connor da33cbe1f9 fix 2017-05-18 14:09:46 -04:00
Isaac Connor 158741a7d8 fix whitespace 2017-05-18 14:07:56 -04:00
Isaac Connor 319ad7fede fix whitespace 2017-05-18 14:07:51 -04:00
Isaac Connor 8b0f319834 fix whitespace 2017-05-18 14:06:13 -04:00
Isaac Connor 9fd9a75669 fix whitespace, braces, simplify sql 2017-05-18 14:04:24 -04:00
Isaac Connor 29bcab9204 fix Debug to Logger::Debug 2017-05-18 13:54:06 -04:00
Isaac Connor d1c61a252f fix whitspace/braces 2017-05-18 13:50:56 -04:00
Isaac Connor 96051a0071 we switched to .png instead of .gif 2017-05-18 13:50:46 -04:00
Isaac Connor e15fdf9ac3 We switched to png's now 2017-05-18 13:18:07 -04:00
Isaac Connor fd83a3fafc Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-05-18 12:59:16 -04:00
Isaac Connor 3ec4e1bfe7 fix merge 2017-05-18 12:59:09 -04:00
Isaac Connor c125d22d4d Fix Debug to Logger::Debug 2017-05-18 12:49:59 -04:00
Isaac Connor f4224bb88e Merge branch 'master' into storageareas 2017-05-17 17:47:39 -04:00
Andrew Bauer 200f92b1ad make zmexport not rely on symlinks in the webroot (#1888) 
* make zmexport not rely on symlinks in the webroot

* add archive view
 2017-05-17 11:30:39 -04:00
Isaac Connor dd75c4676b trivial updates (#1887) 
* merge some trivial updates from storageareas

* fix the code to do zm.conf.new
 2017-05-16 14:16:32 -04:00
Isaac Connor c859f7291c Feature h264 videostorage (#1882) 
* Moved writing of configure options from Controller to Model.  Fixes #191.

* Initial commit for saving events as videos :)

* Add zm_video.cpp to autotools

* Add zm_video.h to autotools

* Search for MP4V2 header file 3 times: mp4v2/mp4v2.h, mp4v2.h, mp4.h

* Fix serve memory leak

* Few minor code improvements

* Added the ability to override preset, tune, profile and few other improvements

* Correctly write SPS & PPS from x264 encoder headers

* Remove unnessecary SPS & PPS writing code

* Imported missing files from master to feature-h264-videostorage

* Audio support including fixes for dts/pts, split on keyframe and update to mkv extension to prevent ffmpeg problems writing rtsp audio to mp4 containter (header problem)

* Updates to make gcc happy

* Add html5 video control to timeline and event to support mkv playback

* Add zm_videostore.cpp to CMakeLists.txt

* Remove Modern Branch for now

* Fix minor bug

* Option handled added in master, removing duplicate declaration

* Add CaptureandRecord from zm_camera.h

* Putting placeholder in for CaptureAndRecord function

* Removed duplicate code and brackets

* add digest auth file for cmake

Conflicts:
	src/CMakeLists.txt

* Add web dir back into Makefile.am
Revert "Removed web from SUBDIRS in Makefile.am"

This reverts commit d9bbcdf3a9.

* Add CaptureAndRecord to vlc, still need to make it record

* Resolve SegFault on videostore

* Swap to mp4 container

* mp4 changes

* spaces to tabs, hide video stuff if video writer is turned off

* Make timeline open event.mp4 instead of mkv

* Missed mkv in timeline.js

* Fix some issues from the merge conflict

* Resolve post merge build issues with braces

* Fix whitespace

* Update Jpeg and Video options for passthrough options

* Whitespace fix zm_camera.h

* Fix array mkssing comma

* Add support for Jpeg save options for h264 branch snapshot. Might remove altogether if snapshots not needed

* Update VideoStoreData memory size comment

* Change from config.use_mkv_storage to per monitor option VideoWriter from video branch

* Fix bracket issues post merge

* Clean up comments and add av_free_packet

* Convert from event_directory to event file as per Video branch

* Testing videojs for video playback

* Fixed a missing bracket post merge and also SQL_values now used for EventID and Monitors

* bring recent improvements in ffmpeg capture function into captureandrecord

* Remove pict from writeAudioFramePacket as not used

* Add translate options for h264 Storage options in Monitor and update en_gb file

* Cherry-Pick from iconnor - make it compile on ubuntu 15.04.  Which is libav 56.1.0

Conflicts:
	src/zm_ffmpeg.cpp
	src/zm_remote_camera_rtsp.cpp

Conflicts:
	distros/ubuntu1204/changelog

* Clean up videostore code and remove lots of unused code

* proof of concept for dynamic/automatic video rotation using video-js plugin zoomrotate

Conflicts:
	web/skins/classic/views/event.php

* removed redundant field in sql query

Conflicts:
	web/skins/classic/views/event.php

* local storage of video js plugin

* Beautify!

Make the code somewhat readable.

* added missing videojs.zoomrotate.js file

added missing videojs.zoomrotate.js file

* Typo

added missing "

* Added missing brackets

* fix to display thumbnails when only storing snapshot.jpg

* added control for video playback rate

Conflicts:
	web/skins/classic/views/event.php

* dynamically create jpegs from video file for viewing in browser

* fix timeline view for SaveJPEGs monitors (without enabled VideoWriter)

* only expose monitor info which are being used in client

* fix segmentation fault in zma with ubuntu 14.04 and ffmpeg 2.5.8 (gcc 4.8)

when libx264 is not installed

* better way of detecting showing image or video in timeline and event view

instead of Monitor.VideoWriter, Event.DefaultVideo is used, so even if
VideoWriter/SaveJPEG option is changed, a valid image or video will always be
displayed for historical events in both timeline and event view

this also fixes loading videos in timeline view

* Fixes problem of crashing zmc when bad packet arrives causing av_interleaved_write_frame() to return non-zero (-22).  Prefilters common packet issues. Add metadata title to generated video file

* Remove syslog.h

* fixed SaveJPEGs are not working

which is caused in errors introduced when merging with master

* Update README.md

* Fix build warnings specific to h264 branch, unused FrameImg, unused ret and int64_t snprintf issues

* Fix PRId64 issue in travis, builds locally fine, but I can see a gcc version issue here

* Fix PRId64 issue in travis, another try

* Try "STDC_FORMAT_MACROS" to see if that helps Travis on gcc 4.6.3

* Revert space removal around PRId64

* video branch ffmpeg 2.9 fixes

ffmpeg 2.9 patched removed SSE2 CPU

* Add FFMPEGInit back

* use webvvt to overlay timestamp (honoring Monitor.LabelFormat) to videos in timeline and event

also fixed bug which prevented seeking in timeline video preview

* ffmpeg 3.0 API build failure fixes

* Update README.md

* merge all the commits from the messed up iconnor_video branch

* fix whitespace

* revert

* whitespace fixes

* spelling fix

* put back some text

* add these back

* fix spelling mistake

* Steal some packet dumping routines from ffmpeg. Convert them to use our logging routines

* add a test and error message if the codec is not h264

* these have been removed in master

* add a view to check auth and just send the video

* add some comments, and dump filename and AVFormatContext on failure to write header

* add the toggle for RecordAudio so that the checkbox works to turn off Audio

* Must init videoStore in constuctor

* more debug and comments, return checking

* Fix dropped part of sql query.

* fix extra else and some whitespace

* Fix missing } from merge that was preventing building.

* fix tabs

* get rid of use of separator, just use \n

* Restore lost fixes for deprecation

* Why are these failing

* Respect record_audio flag when setting up video file so dont try and initiliase mp4 with unsupported audio

* Forgot that I was trying to solve case of stream is true and record_audio
is false.

* Pass swscale_ctx back in to getCachedContext or it will create new
context every frame and leak memory like a mofo.

* Add libx264-dev and libmp4v2-dev to build requires to save hassle of
ensuring they are installed before build.

* Merge my Rotation/Orientation work and fixes for bad h264 streams

* need arpa/inet for reverse lookups

* pull in the new byte range code for viewing videos

* Move our recording flag deeper into closeevent

* add braces and only call closeEvent if there is an event

* deprecate the z_frame_rate stuff which is deprecated in ffmpeg

* remark out some debugging

* fix for video on stream 1

* fix audio_stream to audio_st

* Ignore bad decodes

* fix problems with content-length causing viewing to not work in chrome/android

* change logic of sending file contents to handle an off by one and be more readable

* Some fixes pointed out by Maxim Romanov.  Also simply the loading of events to not join the Monitors table

* fix to sql for timeline

* added RecordAudio to sql in README

* Use sub queries instead of joins to fix errors when using new mysql defaults.

* fix sql queries

* Dockerfile to build feature-h264-videostorage

* Must cast codec

* add php-acpu as a dependency

* require php5-acpu

* fix typo

* remove extra /

* Add a line for out-of-tree builds to do api/lib/Cake/bootstrap.php

* delete merge conflict files

* delete merge conflict files
 2017-05-15 22:02:48 -04:00
Matt N 33092e4022 Allow API authentication using the `auth` query parameter containing an auth. hash. (#1845) 
* Allow API authentication using the `auth` query parameter containing an auth. hash.

Fixes #1827

The same auth. hash for zms is used here. This allows consumers to use the API without sending the password in the query string and not require forging logins via the login form.

* Move logger.php's global Debug function to Logger::Debug to avoid polluting globals

This avoids a conflict with CakePHP when logger.php gets included indrectly from API code.

* Protect action=login when ZM_ENABLE_CSRF_MAGIC is enabled
 2017-05-15 21:51:48 -04:00
Isaac Connor 68aea50ca9 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-05-15 16:19:57 -04:00
Isaac Connor e737d90120 If AuthHash not set, return '' instead of php producing a warning 2017-05-12 09:05:14 -04:00
Isaac Connor fd44ff4e60 Merge branch 'master' into storageareas 2017-05-10 13:16:08 -04:00
Isaac Connor f832dd30ea Merge pull request #1817 from mnoorenberghe/eslint 
Add eslint configuration files extending Google's rules
 2017-05-10 09:04:51 -04:00
Andrew Bauer 3e550e1461 remove "Actual" key from ru lang file since that word is too common. 2017-05-10 07:59:04 -05:00
Andrew Bauer ef6a3b63af Merge branch 'Ru_Translation' of https://github.com/IDDQDesnik/ZoneMinder into IDDQDesnik-Ru_Translation 2017-05-10 07:58:31 -05:00
Andrew Bauer 06009f3b16 Merge pull request #1661 from connortechnology/add_scale_to_frame_view 
Add scale to frame view
 2017-05-10 07:56:36 -05:00
Andrew Bauer 62d6509708 Merge pull request #1818 from SteveGilvarry/743-Swap_to_PNG 
Swap to PNG
 2017-05-10 07:55:07 -05:00
Andrew Bauer e6c60737e9 Merge pull request #1756 from SteveGilvarry/zmf_goodbye 
Remove zmf
 2017-05-10 07:07:22 -05:00
Isaac Connor e0256c1a67 add local version of js files 2017-05-08 21:06:25 -04:00
Isaac Connor 9ac20999b3 rough in 2017-05-05 21:11:23 -04:00
Isaac Connor e45316dcd1 add debugging 2017-05-05 17:53:03 -04:00
Isaac Connor 7be2ee0e1b add back videoEvent 2017-05-05 17:19:02 -04:00
Isaac Connor 0f5142fa19 bring back video popup 2017-05-05 17:18:48 -04:00
Isaac Connor bde887fc9c remove unneeded ;'s 2017-05-05 17:17:55 -04:00
Isaac Connor fe532ac945 make args not required 2017-05-05 17:17:39 -04:00
Isaac Connor 1b0a03c723 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-05-05 16:52:38 -04:00
Isaac Connor fd90de5952 if no AuthHashGEneratedAt then generate one instead of outputting an error 2017-05-05 16:47:50 -04:00
Isaac Connor deb1cf653a fix dimensions of ptz box 2017-05-05 16:47:21 -04:00
Isaac Connor f66b606e34 use isset 2017-05-05 16:40:05 -04:00
Isaac Connor 92854f5cba more debug 2017-05-05 16:37:30 -04:00
Isaac Connor cb99d709c5 add debug 2017-05-05 16:37:12 -04:00
Isaac Connor 64193c3368 turn status ajax calls to gets instead of posts 2017-05-05 16:18:12 -04:00
Isaac Connor 1ff367373f use ZM_AUTH_HASH_SECRET for the key, not the secret 2017-05-05 16:15:34 -04:00
Isaac Connor a0e4e6537e prefer key based tokens over session 2017-05-05 16:11:40 -04:00
Isaac Connor 0982c9fdec add Debug lines 2017-05-05 16:00:52 -04:00
Isaac Connor 19b2de6d28 add a Download MP4 button 2017-05-05 15:13:25 -04:00
Isaac Connor 355eb1beef when mouseover the thumbnail, stream the video 2017-05-05 14:25:25 -04:00
Isaac Connor 3b6cf74ed3 add auth_hash to ajax calls 2017-05-05 11:53:40 -04:00
Isaac Connor cccc3df700 Merge branch 'master' into storageareas 2017-05-03 16:43:44 -04:00
Andrew Bauer 895f5cc7c4 Update CMakeLists.txt 
install the other bootstrap.php file under lib/cake
 2017-05-03 13:25:11 -05:00
Andrew Bauer 752959f3fc Update CMakeLists.txt 
typo - remove extra "/"
 2017-05-03 12:35:54 -05:00
Joergen Edelbo fb5668c9ef Fix spelling of remSocketFile 2017-04-29 09:02:35 +02:00
Isaac Connor 1253fb1723 update whitespacing/braces. Add a warning when dbFetchOne is used with a column that isn't in the returned row 2017-04-28 14:17:36 -04:00
Isaac Connor 9482114f95 add db connections to the header 2017-04-28 14:17:09 -04:00
Isaac Connor 20c699366e scale is a percentage, so use the rescale function 2017-04-28 11:10:43 -04:00
Isaac Connor df7161a4ea merge some stuff I did in vueip 2017-04-28 10:54:20 -04:00
Isaac Connor dce39bb2a9 Merge branch 'master' into storageareas 2017-04-26 15:58:17 -04:00
Andrew Bauer 1a565a47f2 fix skin path in export_functions 2017-04-26 12:17:01 -05:00
Isaac Connor 088fa0192b Merge branch 'master' into storageareas 2017-04-25 10:00:14 -04:00
Joshua Ruehlig 05a141bf78 Update database.php 2017-04-24 23:40:52 -07:00
Joshua Ruehlig ca1e8a13fe Update database.php.default 2017-04-24 23:40:21 -07:00
Isaac Connor 4b264251ac Merge branch 'zones_on_montage' into storageareas 2017-04-24 14:47:38 -04:00
Isaac Connor 5a2ef571ef fix scaling, zones now work. Add a Show/Hide Zones at the top 2017-04-24 14:47:30 -04:00
Isaac Connor 23f384407e blah 2017-04-24 14:00:47 -04:00
Isaac Connor 12ffa60023 fix applying sorting to MOnitors. 2017-04-24 11:13:08 -04:00
Isaac Connor 83ba74ad66 work in progress, rough in adding the svg zones to montage 2017-04-24 11:11:54 -04:00
Isaac Connor ef6c675c6a work in progress, rough in adding the svg zones to montage 2017-04-24 11:11:44 -04:00
Isaac Connor bafbdc28ed update to whats in master 2017-04-21 14:46:40 -04:00
Isaac Connor a29ec6af62 revert to master 2017-04-21 14:44:36 -04:00
Isaac Connor c8855c03fc don't use a submodule for video.js 2017-04-20 10:50:42 -04:00
Isaac Connor 035b464b97 Revert "don't use external hosted video.js or moment.js" 
This reverts commit fb2f8022a7.
 2017-04-20 10:45:51 -04:00
Isaac Connor dd4b93f130 add submodule video.js, using release tag v5.18.4 2017-04-20 10:35:32 -04:00
Isaac Connor fb2f8022a7 don't use external hosted video.js or moment.js 2017-04-20 10:12:47 -04:00
Isaac Connor 3db38eb474 limit points to the limits of the monitor 2017-04-19 16:12:12 -04:00
Isaac Connor fbbe748bc8 Restore old behaviour for events that don't have a video 2017-04-19 14:15:32 -04:00
Isaac Connor dd4ea635e8 remove rotate, as the video file itself has the rotate set 2017-04-19 13:12:15 -04:00
Isaac Connor 8fbe765a7d Set filename so that save as gives the correct filename 2017-04-19 13:11:15 -04:00
Isaac Connor b87839f785 turn off csrf on view=view_video 2017-04-19 10:12:51 -04:00
Isaac Connor 7697b8c7be " to ' 2017-04-19 10:09:27 -04:00
Isaac Connor 71a9763c32 add a comment 2017-04-19 10:02:31 -04:00
Isaac Connor d1d4fa7b8f fix the redirect location 2017-04-19 10:02:07 -04:00
Isaac Connor b71d021ae1 Merge branch 'fix_1849' into storageareas 2017-04-18 12:43:04 -04:00
Isaac Connor f2920c37e0 escapeshellarg adds quotes, which is bad. Use escapeshellcmd on the whole string instead. 2017-04-18 12:31:20 -04:00
Andrew Bauer 008624451f Merge pull request #1856 from connortechnology/remove_BOM 
use dos2unix to remove BOM
 2017-04-17 08:32:17 -05:00
Isaac Connor a164118ad3 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-04-16 11:26:30 -04:00
Isaac Connor 273229858f Merge branch 'master' into storageareas 2017-04-16 11:26:18 -04:00
Isaac Connor f1f54205fb Merge branch 'remove_BOM' into storageareas 2017-04-16 09:28:35 -04:00
Isaac Connor 5e0012569f use dos2unix to remove BOM 2017-04-16 09:22:37 -04:00
Isaac Connor 0efca38d68 Merge pull request #1854 from knnniggett/caketmp 
make cake tmp = zoneminder tmp
 2017-04-15 10:23:03 -04:00
Isaac Connor ab4b5e6b69 Merge pull request #1853 from knnniggett/cakecache 
change cake cache engine from File -> Apc
 2017-04-14 21:10:23 -04:00
Andrew Bauer 0b729cf295 modify cmakelists.txt 2017-04-14 15:15:29 -05:00
Andrew Bauer d2490cf7e3 make cake tmp = zoneminder tmp 2017-04-14 15:11:41 -05:00
Andrew Bauer 48a73f7e78 change cache engine from File -> Apc 2017-04-14 14:31:42 -05:00
Andrew Bauer 3cbd32cd41 move cake log to zoneminder log folder 2017-04-14 14:24:29 -05:00
Isaac Connor a5e7db0f7c use faster ffmpeg method to generate frame image 2017-04-13 12:35:14 -04:00
Isaac Connor 7d6505f015 use Delta to grab frame from video, using -ss for speed 2017-04-12 16:17:19 -04:00
Isaac Connor f97e074393 braces fixes 2017-04-12 16:16:56 -04:00
Isaac Connor d039227f79 Merge branch 'master' into storageareas 2017-04-12 13:51:10 -04:00
Isaac Connor d462dfdb77 fix error message when fid not specified 2017-04-07 13:20:54 -04:00
Isaac Connor 92a2d6f4f2 hide the video, let's stick with jpeg's, which will be auto-generated 2017-04-07 13:20:28 -04:00
Isaac Connor 8f51331472 fix timeline view by using view=image instead of direct path 2017-04-07 13:20:04 -04:00
Isaac Connor 2b9a0f96d3 remove   and break over multiple lines 2017-04-05 16:10:06 -04:00
Isaac Connor d611840750 whitespace, handle NaN in limitArea 2017-04-05 16:09:40 -04:00
Isaac Connor c5ff45922f fix zone edit height 2017-04-05 16:09:06 -04:00
Isaac Connor 7815f1c539 introduce a redirect flag global variable to allow us to redirect. Which allows to redirect on successful login so we don't get repost popups 2017-04-05 10:05:21 -04:00
Andrew Bauer a10d52a3e1 Merge pull request #1844 from connortechnology/fix_1812 
fix Monitors filtering SQL
 2017-04-03 20:06:39 -05:00
Isaac Connor 08766b7546 decrease wait time in order to achieve greater throughput. flush after every print so that we don't buffer the whole file 2017-03-31 14:33:00 -04:00
Isaac Connor 58d119d9ed Merge branch 'fix_1762' into storageareas 2017-03-31 13:38:59 -04:00
Isaac Connor 514c83d3e9 whitespace and add a test for ->Triggers being an array 2017-03-31 12:01:37 -04:00
Isaac Connor d1a60dedc8 Fix the overzealous use of escapeshellcmd that breaks restarting monitors 2017-03-31 11:59:55 -04:00
Isaac Connor d3f6ab3d29 fix Monitors filtering SQL 2017-03-30 13:06:54 -04:00
Isaac Connor 56476a7774 uppercase SQL 2017-03-30 13:05:10 -04:00
Isaac Connor 4f2dcdacb4 update, remove styles and fix the sql for limiting monitors 2017-03-30 13:04:16 -04:00
Isaac Connor dd4550406f remove styles from montagereview and stick them in a view-specific css 2017-03-30 13:03:46 -04:00
Isaac Connor 7e3b27a130 Test for Controllable as well as ControlId 2017-03-30 10:49:02 -04:00
Isaac Connor b2db0888ae add a warning if csrf_check returns false 2017-03-30 10:46:13 -04:00
Isaac Connor 5ea77f0781 Make zones a link to zones_overview 2017-03-30 10:45:55 -04:00
Isaac Connor 538658403c Merge pull request #1822 from knnniggett/csrf 
Implement CSRF Mitigation
 2017-03-30 10:39:55 -04:00
Isaac Connor fe223e3b29 remove a warning when adding users when not logged in (could happen if OPT_AUTH isn't turned on yet 2017-03-29 10:38:29 -04:00
Isaac Connor 35067211e0 more the csrf to before actions.php 2017-03-29 10:19:00 -04:00
Isaac Connor 3cd9e46df9 Merge branch 'knnniggett-csrf' into storageareas 2017-03-28 20:44:38 -04:00
Isaac Connor d006ebfc3c Merge branch 'csrf' of https://github.com/knnniggett/ZoneMinder into knnniggett-csrf 2017-03-28 20:10:59 -04:00
Isaac Connor 769af661e9 Merge branch 'fix_x10' into storageareas 2017-03-28 20:05:52 -04:00
Isaac Connor 589b369109 fix inserting x10 record with missing , 2017-03-28 20:03:46 -04:00
Andy Bauer eb55a6bb9b set action,view, and/or request to NULL if there are not defined 2017-03-28 17:52:31 -05:00
Andy Bauer 4e16ae6d19 add ZM_ENABLE_CSRF_MAGIC toggle 2017-03-28 17:29:36 -05:00
Isaac Connor 4d2fb6b7f8 don't need to reload when deleting. The row will no longer be in there 2017-03-27 13:13:48 -04:00
Isaac Connor 7b63461517 attempt to support redirecting to the given url instead of just refreshing 2017-03-27 13:13:08 -04:00
Isaac Connor 8ef7a708bd updates in filters, try to get the new filter loaded when saving with a new name 2017-03-27 13:12:37 -04:00
Isaac Connor 7360619941 Merge branch 'master' into storageareas 2017-03-24 11:53:45 -04:00
Isaac Connor 8bd34a982d only use scale if it has a value 2017-03-21 15:30:22 -04:00
IDDQDesnik 6081374ace Updated Russian translation 2017-03-21 17:39:22 +03:00
Isaac Connor eaca58bb7c Merge pull request #1815 from mnoorenberghe/postlogin 
Properly escape postLoginQuery. Fixes #1797
 2017-03-21 10:27:13 -04:00
Isaac Connor 670c1a3c7c pass NULL for ['width'] 2017-03-21 09:47:07 -04:00
Matthew Noorenberghe ea558c79a0 Fix check that API user is enabled 2017-03-20 17:16:24 -07:00
Isaac Connor badbf1c74c Merge pull request #1816 from mnoorenberghe/flat_window_sizes 
Increase default window sizes for the flat theme. Fixes #1059
 2017-03-20 13:10:13 -04:00
Isaac Connor 70246ce55a whitespace corrections and ensure that options[width] and options[height] are defined 2017-03-20 12:10:28 -04:00
Andrew Bauer 2dcd95bc7f Merge pull request #1504 from ZoneMinder/improve_filter 
Improve filter
 2017-03-18 21:12:58 -05:00
Andrew Bauer d38bae72ae integrate csrf-magic library 2017-03-18 20:12:06 -05:00
SteveGilvarry a16ea554a3 Swap to PNG 2017-03-18 22:34:13 +11:00
Matthew Noorenberghe c7955cd1b6 Add eslint configuration files extending Google's rules 2017-03-18 00:02:17 -07:00
Matthew Noorenberghe 91ad6afffb Increase default window sizes for the flat theme. Fixes #1059 
Used the computed height of <html> and rounded up the nearest multiple of 5.
 2017-03-17 22:24:42 -07:00
Matthew Noorenberghe ea5342abd2 Properly escape postLoginQuery. Fixes #1797 2017-03-17 21:05:28 -07:00
Isaac Connor 8834109812 code style and whitespace changes 2017-03-17 09:59:23 -04:00
Isaac Connor d9c665b021 Merge branch 'fix_crash_with_invalid_zones' into storageareas 2017-03-17 09:35:11 -04:00
Andrew Bauer 9681a444b4 Merge pull request #1765 from SteveGilvarry/ffmpeg_url 
Align Method description to what it is actually doing
 2017-03-16 09:32:30 -05:00
Andrew Bauer 7e0ac4b239 Merge pull request #1780 from connortechnology/fix_1775 
use escapeshellarg on inputs to daemonControl and other functions
 2017-03-16 09:27:04 -05:00
Isaac Connor 5bccd92b68 fix scoping of scale var 2017-03-16 09:53:53 -04:00
Isaac Connor 9f99d34807 fix calls to getStreamHTML 2017-03-13 14:22:33 -04:00
Isaac Connor 14c4a156c6 set img.src='' first so that Chrome closes the old stream. 2017-03-06 20:21:12 -05:00
Isaac Connor 4df12ae370 Merge branch 'montage_width_height' of github.com:ConnorTechnology/ZoneMinder into montage_width_height 2017-03-06 17:30:00 -05:00
Isaac Connor d3f7451736 Merge branch 'storageareas' into montage_width_height 2017-03-06 16:56:18 -05:00
Isaac Connor fdcb93eacc Merge branch 'master' into storageareas 2017-03-06 16:22:28 -05:00
Isaac Connor ebafc62b51 Must reopen the session so we can generate an auth hash 2017-03-01 15:27:42 -05:00
Isaac Connor 4fc0aead70 wip 2017-03-01 15:26:40 -05:00
Isaac Connor c4caa9a631 convert arguments from an array of strong to a hash and use http_build_query 2017-02-27 21:48:08 -05:00
Isaac Connor c3a52272d8 implement changeWidth, changeHeight and alter getStreamHTML to take an array of options 2017-02-27 20:56:14 -05:00
Isaac Connor a0dd36d869 add width and height scale dropdowns 2017-02-27 16:40:40 -05:00
Andy Bauer 8759e2bdb4 prevent divide by zero, make error messages more descriptive 2017-02-21 13:10:41 -06:00
Andy Bauer 27ca8d8674 use === operator in getDiskPercent function 2017-02-21 12:33:05 -06:00
Isaac Connor 186e5ba866 Merge branch 'master' into storageareas 2017-02-21 09:48:00 -05:00
Isaac Connor 971c70f540 Merge pull request #1793 from mnoorenberghe/api_debug_default 
Reduce the default API debug level
 2017-02-20 21:44:48 -05:00
Matthew Noorenberghe df4739826b Reduce the default API debug level 2017-02-18 23:06:53 -08:00
Manojav Sridhar f50c0e2096 fix missing isset check, caused number of Undefined Property warnings 2017-02-18 11:15:43 -05:00
Manojav Sridhar 11b90e6011 fix usage of wrong key 2017-02-17 12:37:58 -05:00
Isaac Connor 980b088d57 google style and add label tags around Scale 2017-02-17 09:19:54 -05:00
Isaac Connor 2bf4b5ad1a use escapeshellarg on inputs to daemonControl and other functions where exec is called 2017-02-15 09:45:25 -05:00
Isaac Connor d135216ac7 Merge branch 'master' into storageareas 2017-02-15 09:30:35 -05:00
Isaac Connor aeedfe8d74 fix some whitespacing 2017-02-14 09:11:54 -05:00
SteveGilvarry b791504598 Wording of help text fixes 2017-02-06 08:01:04 +11:00
SteveGilvarry 9716c4ef89 Add Option help 2017-02-05 18:43:47 +11:00
SteveGilvarry c72704bf0b Change descriptions for ffmpeg methods and put TCP first. 2017-02-05 15:34:06 +11:00
Kyle Johnson 5804cd2462 Merge pull request #2 from connortechnology/fix_sql_injection 
Sanitize input parameters
 2017-02-04 15:05:54 -07:00
Andrew Bauer c5906a5d4f Merge pull request #6 from connortechnology/log_xss_fixes2 
Log xss fixes2
 2017-02-04 16:05:43 -06:00
Kyle Johnson 6b3a53ec0f Tell PDO to use real prepared statements. 
This makes sure the statement and the values aren't
parsed by PHP before sending it to the MySQL server.

See https://stackoverflow.com/questions/60174/how-can-i-prevent-sql-injection-in-php
and https://secure.php.net/manual/en/pdo.setattribute.php
 2017-02-04 14:59:33 -07:00
Isaac Connor e3edbf40cf make url full width 2017-02-02 12:16:40 -05:00
Isaac Connor 7b73eb350f update to current. 2017-02-02 12:15:16 -05:00
Isaac Connor d8c79cb750 fixup header and sidebar layout 2017-02-02 11:31:16 -05:00
Isaac Connor cee05a1bb7 fix merge problem 2017-02-02 09:21:49 -05:00
Isaac Connor 9135da92ed fix typo fileFields => filterFields 2017-01-31 21:33:43 -05:00
Isaac Connor 7d451e1e41 float the scale control right, add css for other skins 2017-01-31 11:13:16 -05:00
Isaac Connor 4a4f62f0a7 add a scale element to the frame view. Include some bits from StorageAreas to make it work 2017-01-31 11:13:16 -05:00
Isaac Connor 568160e5aa add a scale element to the frame view. Include some bits from StorageAreas to make it work 2017-01-31 11:13:15 -05:00
Isaac Connor 6f6eacaa72 fixup classic and dark skins 2017-01-30 21:45:48 -05:00
Isaac Connor 89022fff0c Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-01-30 21:16:26 -05:00
Isaac Connor f3378207c0 make navbar static instead of fixed, sync up dark theme, and improve storage editing styles 2017-01-30 21:16:21 -05:00
Isaac Connor ad2e00166a use isset 2017-01-30 19:53:08 -05:00
Isaac Connor 4543b3e1b1 include jquery-ui instead of using a cdn version 2017-01-30 19:17:14 -05:00
Isaac Connor 19aed3f860 dont check ZM_DIR_EVENTS if it already exists in storageareas 2017-01-30 17:29:15 -05:00
Isaac Connor 9fd9c5de20 test for empty and non-existent path 2017-01-30 17:24:41 -05:00
Isaac Connor fda115bebe tell zmc and zma to stop before updating db 2017-01-30 16:37:53 -05:00
Isaac Connor 3437f23e8a Merge branch 'master' into fix_sql_injection 2017-01-28 14:33:49 -05:00
Isaac Connor 41dab0750e turn whatever gets output into html escaped html so that nothing gets revealed 2017-01-27 21:30:22 -05:00
Isaac Connor a8d1450adf Merge branch 'master' into fix_sql_injection 2017-01-27 17:18:34 -05:00
Kyle Johnson 746a096483 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-01-27 15:16:33 -07:00
Isaac Connor c1e05753d6 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder-Pro 2017-01-27 17:12:46 -05:00
Isaac Connor 7ab6818fa0 Merge branch 'sanitize_image_path' of https://github.com/knnniggett/ZoneMinder into storageareas_sanitize 2017-01-25 17:14:30 -05:00
Andrew Bauer dbd73690b2 use !== false rather than === true 2017-01-25 09:26:07 -06:00
Andrew Bauer 6189d2670c ZM_DIR_EVENTS can be, and often is, a symlink 2017-01-25 09:05:34 -06:00
Andrew Bauer 8b19fca992 sanitize the image path before processing 2017-01-25 08:30:19 -06:00
Isaac Connor 129acb5b8e only show mark column if you have the Monitor Edit ability 2017-01-24 09:30:56 -05:00
Isaac Connor 5b598fe90d cleanup and use cleaned up monitor_id 2017-01-23 21:51:38 -05:00
Isaac Connor 7cd2f6c69e use glyphicon for sort 2017-01-23 21:51:17 -05:00
Isaac Connor bb3d47ab45 get rid of mapping 2017-01-23 21:34:06 -05:00
Isaac Connor e937b4099b add an ajax file for console to do sorting 2017-01-23 10:13:16 -05:00
Isaac Connor fdd71a826a implement dragndrop sorting 2017-01-23 10:12:57 -05:00
Isaac Connor 35148008b6 make img an inline-block so that it continues having space, even when is a broken link 2017-01-18 21:14:15 -05:00
Isaac Connor 8ce7719a33 remove extra db call cuz i sredundant 2017-01-18 21:12:54 -05:00
SteveGilvarry 2f3ebd80da Remove zmf, die..die..die 2017-01-16 13:20:05 -08:00
Isaac Connor 9c8b229c74 Fix cutnpaste error 2017-01-14 17:08:13 -05:00
Isaac Connor 899b1b82b9 Merge branch 'filter_by_runstate' into storageareas 2017-01-14 17:07:20 -05:00
Isaac Connor 242e5a56d8 rough in the ability to filter on RunState 2017-01-14 16:55:28 -05:00
Isaac Connor 2ce4bad39b fix Event being undefined when called by path 2017-01-13 14:42:10 -05:00
Kyle Johnson 0e7794f2a7 Merge pull request #1 from connortechnology/cookie_http_only 
set http_only flag in cookie settings
 2017-01-12 09:25:36 -07:00
Isaac Connor 16fdac3179 fix remSocketFile to remSockFile 2017-01-11 11:14:00 -05:00
Isaac Connor 2436e40f5d Merge branch 'master' into storageareas 2017-01-11 10:34:27 -05:00
Andy Bauer 7ef7a36f39 fix conditional logic in controlcap.js 2017-01-10 17:53:05 -06:00
Isaac Connor 3074263e06 Merge branch 'control_fixes' into storageareas 2017-01-10 12:54:46 -05:00
Isaac Connor 55403219d8 fix regexp for direction in control command. Also log if the regexp doesn't match 2017-01-10 12:35:38 -05:00
Isaac Connor fea5fa1b59 fix xtell should be -1 for move left 2017-01-10 12:35:02 -05:00
Isaac Connor d8b8d78576 Fix storagearea lookup. Default to ZM_EVENTS_DIR 2017-01-09 16:35:58 -05:00
Isaac Connor 03fd964518 fix parsing StorageID 2017-01-09 14:59:14 -05:00
Isaac Connor 7ef0c2c9d3 fix deleting filters. We don't need to set fid anymore 2017-01-09 14:58:55 -05:00
Isaac Connor cc724a5542 add a question mark to delete confirmation 2017-01-09 14:53:13 -05:00
Isaac Connor 84183c819c Merge branch 'master' into storageareas 2017-01-03 09:53:09 -05:00
Isaac Connor b4bddee337 Merge branch 'master' into improve_filter 2017-01-03 08:49:56 -05:00
Isaac Connor 0a90dbac9f require Event.php and clean up use of object vs db row array. Use newer way of using views/image.php by passing eid and frameid instead of a path. 2017-01-02 10:35:51 -05:00
Isaac Connor 30674919c4 always include Storage object, because in the end we will be using it everywhere 2017-01-02 10:34:45 -05:00
Isaac Connor f6ea52280a Update Event object to @iconnor's latest which brings us a createListThumbnail function copied from includes/functions 2017-01-02 10:34:15 -05:00
Andrew Bauer b063d8d6aa Merge pull request #1728 from connortechnology/path_zms_message 
Path zms message
 2017-01-02 08:54:32 -06:00
Isaac Connor 5ae34a7561 Merge branch 'master' into storageareas 2017-01-02 09:39:10 -05:00
Isaac Connor ef71ae248c fix ramSocketFile to remSocketFile 2017-01-02 09:31:26 -05:00
Isaac Connor d97926c478 fix ramSocketFile to remSocketFile 2017-01-02 09:31:06 -05:00
klemens 0d549f1db3 spelling fixes 2016-12-29 10:31:05 +01:00
Andy Bauer 25ab1bee18 more fixed to gpl license text 2016-12-26 10:40:09 -06:00
Andy Bauer 2dda2d9e1e remove unneeded, empty files 2016-12-26 09:49:14 -06:00
Andy Bauer 254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Isaac Connor 0f4b78b180 increase height of bandwidth popup 2016-12-21 10:46:42 -05:00
Isaac Connor f92edc3456 refresh stream url when changing scale 2016-12-21 10:40:47 -05:00
Isaac Connor 02a2fdf58f Merge branch 'remove_emptys' into storageareas 2016-12-20 16:40:42 -05:00
Isaac Connor 38c0cedecc remove the use of empty which on php < 5.5 only supports variables. 2016-12-20 16:37:42 -05:00
Isaac Connor c27d0270dc Merge branch 'knnniggett-zmMemDetach' into storageareas 2016-12-20 15:40:14 -05:00
Isaac Connor 752f0eb40b Merge branch 'master' into improve_filter 2016-12-20 11:43:02 -05:00
Andrew Bauer 68a24040ab Merge pull request #1710 from connortechnology/path_zms_message 
replace the old socket_sendto error message with something more useful
 2016-12-20 10:30:35 -06:00
Isaac Connor 8b726996f7 FAQ fixes, more text about zms problems in it, and adjust the socket_sendto error message to point to the FAQ entry that is relevant. 2016-12-19 21:36:39 -05:00
Isaac Connor fe3f3d91ce replace the old socket_sendto error message with something more useful so that people stop asking us how to fix it. 2016-12-16 09:12:27 -05:00
Isaac Connor 794043cbe9 On successful login, tell php to regenerate the session id 2016-12-14 15:06:18 -05:00
Isaac Connor ad157cf21c fix tabs 2016-12-14 14:56:54 -05:00
Isaac Connor 69c39f8a23 set http_only flag in cookie settings 2016-12-14 14:39:44 -05:00
Isaac Connor 87e8f91868 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2016-12-13 15:06:07 -05:00
Isaac Connor 708f52beda Merge branch 'disk_space_in_events' into storageareas 2016-12-13 13:36:18 -05:00
Isaac Connor a9548d3f6b Add a config entry to turn event disk space on/off 2016-12-13 13:34:56 -05:00
Isaac Connor 30ec67d4c3 Merge branch 'master' into disk_space_in_events 2016-12-13 13:28:32 -05:00
Isaac Connor 821f9f8e6e Merge branch 'fix_sql_injection' into storageareas 2016-12-08 15:58:10 -05:00
Isaac Connor b5e4c94682 test for integer string as well 2016-12-08 15:58:00 -05:00
Isaac Connor 4fa24dcda4 Merge branch 'fix_sql_injection' into storageareas 2016-12-08 15:53:46 -05:00
Isaac Connor 7c84e2417d remove extra ? 2016-12-08 15:53:38 -05:00
Isaac Connor f68c73b4a8 Merge branch 'fix_sql_injection' into storageareas 2016-12-08 15:52:52 -05:00
Isaac Connor 08370b010e Merge branch 'log_xss_fixes' into storageareas 2016-12-08 15:52:37 -05:00
Isaac Connor 42fdd1fbe9 Use htmlentities on the error message when dying because the string will be sent to the browser and if it includes scripts they will be run. 2016-12-08 15:52:21 -05:00
Isaac Connor c8009baf3f fix missing ; and test for integer string in limit 2016-12-08 15:46:42 -05:00
Isaac Connor acbc5bc9e3 Merge branch 'cookie_http_only' into storageareas 2016-12-08 15:20:54 -05:00
Isaac Connor 772792a1b9 remove extra , 2016-12-08 15:20:43 -05:00
Isaac Connor ced701f56f Merge branch 'fix_sql_injection' into storageareas 2016-12-08 14:58:50 -05:00
Isaac Connor 7f2bf04c2f Merge branch 'cookie_http_only' into storageareas 2016-12-08 14:26:13 -05:00
Isaac Connor 20793ee822 set httpOnly to true on cookie creation. This will override whatever is in php.ini 2016-12-08 14:25:29 -05:00
Isaac Connor d600eb0e8b Merge branch 'master' into fix_sql_injection 2016-12-08 13:39:04 -05:00
Isaac Connor e7d0861530 check limit for a valid integer and complain if not. 2016-12-08 13:37:23 -05:00
Isaac Connor 587fd16aa6 Add testing for limit, sortField and all the filters to ensure that they are valid. 2016-12-08 13:31:44 -05:00
Isaac Connor 857b4e8345 Merge branch 'master' into improve_filter 2016-12-06 11:58:41 -05:00
Bernardus Jansen 986567839e
Additional minor changes 2016-12-02 10:08:49 +01:00
Bernardus Jansen e27639f599
Updated dutch translation 2016-12-02 09:49:50 +01:00
Isaac Connor 9e5f52a0ae fix MonitorId is part of event, not frame 2016-11-29 15:25:51 -05:00
Isaac Connor 2adb17ad90 fix type 2016-11-29 15:25:24 -05:00
Isaac Connor c2d6b3d809 fix auth 2016-11-29 15:25:10 -05:00
Isaac Connor f9af1e7129 put authorized check back after including actions.php where it needs to go 2016-11-28 11:34:46 -05:00
Isaac Connor be5b4691da check for isset of SESSION['username'] instead of just assuming it exists 2016-11-22 15:35:07 -05:00
Isaac Connor 9312eed17f Merge branch 'master' into disk_space_in_events 2016-11-22 10:58:24 -05:00
Isaac Connor 02cd3e8cba Merge branch 'master' into small_fixes 2016-11-22 10:52:07 -05:00
Isaac Connor 6bf921a858 Add thumbnanils to the frames view. Also add a content-disposition header and some url mangling to help browsers give a useful filename when doing Save Image As 2016-11-21 12:28:15 -05:00
Isaac Connor 4fe6b6f8b7 set a min width so that small images or fps updates don't cause a reflow 2016-11-21 11:39:31 -05:00
Isaac Connor c360e27b02 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-11-17 13:13:47 -05:00
Isaac Connor bb6b0c2d49 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into improve_filter 2016-11-17 12:16:49 -05:00
Kyle Johnson 4eb5ff7aff Fix Undefined index: loginFailed. Resolves #1684 2016-11-16 19:42:04 -07:00
Isaac Connor 2bd080a6a6 Merge branch 'master' into storageareas 2016-11-15 08:41:00 -05:00
Isaac Connor 8f71971209 Show error message upon unsuccessful login. Fixes #1648 (#1680) 
* Add additional post-cmake files to .gitignore

* Add bootstrap 3.3.7

* Load bootstrap css

* Restyle login page, move recaptcha js to <head>

The way it was handled previously resulted in
invalid html, with an extra <head> tag being
inserteed inside the <body>.

* Update doctype to HTML5, add meta tags for mobile browsers

* Move inline Login css to css file

* Remove extra php tag in functions.php

* Show error message upon unsuccessful login.  Fixes #1648

 * Includes bootstrap glyphicons as they're used in the error message.
 * Failure check is done via a simple test in login.js.php and login.js.
   The 'view' param will only be set (to 'postlogin') if the login page
   has refreshed due to a failed login.  Otherwise you're directed to
   the console view.

* Only load bootstrap css in specific views.

Bootstrap was causing some styling conflicts with the legacy css.
As such only load bootstrap.css on pages which we have specifically
allowed, which would be pages that have been restyled and verified.

* Test for invalid login via session variable.

The previous method had cases where the error messsage was displayed
when it shouldn't have been, such as when specifying ?view=login

* Fix a few typos in login inputs

* Add new fonts directory to web CMakeLists
 2016-11-14 21:24:43 -05:00
Kyle Johnson b0d22aa2a5 Add new fonts directory to web CMakeLists 2016-11-14 19:23:05 -07:00
Isaac Connor 3b7723ee8f Merge branch 'master' into storageareas 2016-11-11 22:40:00 -05:00
Andrew Bauer 49d8e35e56 Show available PATH_MAP percent on console (#1675) 
* Add PATH_SWAP percent to console

* add changes to console.php

* use ZM_PATH_MAP instead of ZM_PATH_SWAP

* show the folder name PATH_MAP points to

* use a dash as the delimiter instead of fwd slash
 2016-11-11 08:47:08 -05:00
Kyle Johnson 65fe07e7aa Fix a few typos in login inputs 2016-11-10 23:36:28 -07:00
Kyle Johnson 95d00f70a3 Test for invalid login via session variable. 
The previous method had cases where the error messsage was displayed
when it shouldn't have been, such as when specifying ?view=login
 2016-11-10 23:29:12 -07:00
Kyle Johnson 3916b02a74 Only load bootstrap css in specific views. 
Bootstrap was causing some styling conflicts with the legacy css.
As such only load bootstrap.css on pages which we have specifically
allowed, which would be pages that have been restyled and verified.
 2016-11-10 23:07:52 -07:00
Kyle Johnson 0800a69a57 Show error message upon unsuccessful login. Fixes #1648 
* Includes bootstrap glyphicons as they're used in the error message.
 * Failure check is done via a simple test in login.js.php and login.js.
   The 'view' param will only be set (to 'postlogin') if the login page
   has refreshed due to a failed login.  Otherwise you're directed to
   the console view.
 2016-11-10 22:51:32 -07:00
Kyle Johnson 97fb53e95c Remove extra php tag in functions.php 2016-11-10 21:49:57 -07:00
Kyle Johnson 227b196a2e Move inline Login css to css file 2016-11-10 21:48:42 -07:00
Kyle Johnson 3e3956f45d Update doctype to HTML5, add meta tags for mobile browsers 2016-11-10 21:47:53 -07:00
Kyle Johnson eacf6cd415 Restyle login page, move recaptcha js to <head> 
The way it was handled previously resulted in
invalid html, with an extra <head> tag being
inserteed inside the <body>.
 2016-11-10 21:46:55 -07:00
Kyle Johnson 1607ae1210 Load bootstrap css 2016-11-10 21:45:46 -07:00
Kyle Johnson 2c93f61622 Add bootstrap 3.3.7 2016-11-10 21:45:18 -07:00
Andrew Bauer 9f43825b92 prevent the end user from slecting an invalid configuration on the PT… (#1676) 
* prevent the end user from slecting an invalid configuration on the PTZ control configuraion "Move" tab

* change to console.php should not be in this pr
 2016-11-08 22:10:51 -05:00
Kyle Johnson 8c41781a9f Fix event.stop error in watch.js See #1672 (#1678) 2016-11-08 18:53:06 -05:00
Isaac Connor 4b3ac63a68 merge master, deprecate qqq() 2016-11-08 11:30:44 -05:00
Kyle Johnson 735d2df3c9 event is redefined before being passed to deleteEvent. Fixes #1671 2016-11-04 23:23:40 -06:00
Isaac Connor 1e233c0ce5 Merge branch 'master' into improve_filter 2016-11-04 15:20:43 -04:00
Isaac Connor 5c62c654ce fix WatchScale -> EventScale 2016-11-03 16:47:22 -04:00
Isaac Connor 53166fabf5 Merge branch 'master' into storageareas 2016-11-03 14:59:06 -04:00
Isaac Connor cb69d1a693 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2016-11-03 14:57:29 -04:00
Kyle Johnson bd47439056 Merge pull request #1639 from connortechnology/cookie_scale 
store the scale value for watch and event views in a cookie, differen…
 2016-11-03 12:35:15 -06:00
Isaac Connor 099cca210b fix monitorId to MonitorId 2016-11-03 14:34:17 -04:00
Isaac Connor 6d57b326fa change logic of sending file contents to handle an off by one and be more readable 2016-11-03 11:42:42 -04:00
Isaac Connor 9d76c9cf6a fix fclose 2016-11-03 11:23:50 -04:00
Isaac Connor a87f5e1592 fix sending full content when we should be 2016-11-03 11:23:10 -04:00
Isaac Connor 0ea8461192 remove extra s 2016-11-03 09:43:38 -04:00
Isaac Connor 2f22eb5a8c fix error when only 1 monitor is listed 2016-11-03 09:41:54 -04:00
Steve Gilvarry d504043a9e Update ru_ru.php 
Remote extra line
 2016-11-01 00:32:46 +11:00
Isaac Connor ca69a79bed fix video.js not being included when we are viewing an event without an h264 file, and when buttons do not exist. 2016-10-27 17:05:33 -04:00
Isaac Connor a7c1231b46 fix WatchScale -> EventScale 2016-10-26 14:53:24 -04:00
Isaac Connor 340b172dc4 Merge branch 'add_scale_to_frame_view' into storageareas 2016-10-26 14:46:50 -04:00
Isaac Connor 42783b68f9 float the scale control right, add css for other skins 2016-10-26 14:43:23 -04:00
Isaac Connor 4defad1352 Merge branch 'add_scale_to_frame_view' into storageareas 2016-10-26 14:04:43 -04:00
Isaac Connor d9a31f7fb6 Merge branch 'master' into storageareas 2016-10-26 13:39:31 -04:00
Isaac Connor c74cc54ac0 add a scale element to the frame view. Include some bits from StorageAreas to make it work 2016-10-26 13:34:30 -04:00
Isaac Connor 98cde11e86 add a scale element to the frame view. Include some bits from StorageAreas to make it work 2016-10-26 13:34:28 -04:00
Isaac Connor cf0e4935f1 cleanups, more debugging 
Also, when adding a monitor, a user who is restricted to monitors can't create one, add an error essage about it instead of failing silently.
 2016-10-21 12:43:23 -04:00
Isaac Connor f9ac601194 fix getOutputHelperStream -> getHelperStream 2016-10-21 12:41:37 -04:00
Isaac Connor 7b1395a4ea set default for StorageId to '0' since it can't be NULL anymore 2016-10-20 14:06:09 -04:00
Isaac Connor f153e9b8fb MontageReview should only be visisble to people who can view events. Fix running state 2016-10-20 13:38:12 -04:00
Isaac Connor 67e14bd12f move States loading code into state view where it belongs. Move runnign check into specific places where it is needed. These changes reduce events list load time by about 4 seconds for me. 2016-10-20 13:16:50 -04:00
Isaac Connor cb88b984c7 fix capt -> capture and some suspicious sprintf formatting and double quotes to single quotes 2016-10-20 12:01:25 -04:00
Isaac Connor 5ee8a1c0a7 deprecate the contents of getImageSrc since it is now in Event.php 2016-10-20 11:52:01 -04:00
Isaac Connor fc540786a5 Move login by auth hash out of actions.php and into index.php. Double quotes to single quotes and google code style changes in indx.php 2016-10-20 11:51:42 -04:00
Isaac Connor c795dd7568 double quotes to single quotes, remove some includes, slight efficiency gains and better error reporting when the .mp4 doesn't exist. 2016-10-20 11:50:13 -04:00
Isaac Connor 017085aee7 Use proper rounding instead of sprintf based rounding for fps 2016-10-20 11:49:35 -04:00
Steve Gilvarry 0409ae5582 Merge pull request #1652 from connortechnology/fix_popup 
handle when window.open fails
 2016-10-20 05:17:44 +11:00
Steve Gilvarry 11cc73f55d Merge pull request #1651 from connortechnology/fix_disable_monitor 
Fix logic when disabling a monitor
 2016-10-20 05:16:22 +11:00
Steve Gilvarry c78a543e8e Merge pull request #1475 from connortechnology/htmlselect 
introduce htmlselect as an alternative to buildselect
 2016-10-20 05:05:59 +11:00
Pliable Pixels 192d0dbb45 added TimeZone get API 2016-10-18 14:07:31 -04:00
Isaac Connor de9c5a3bed add in missing break 2016-10-18 10:20:42 -04:00
Isaac Connor aaf8f6c98b add the missing case for ServerId in Filter processing. 2016-10-18 10:14:19 -04:00
Isaac Connor b385ba7bf4 Merge branch 'master' into improve_filter 2016-10-18 09:59:45 -04:00
Isaac Connor 85faa7321c reorder if logic to handle first page load before AuthHash has ever been set. 2016-10-17 13:12:13 -04:00
Isaac Connor 4bb9709cb2 use object methods of Event 2016-10-12 15:39:53 -04:00
Isaac Connor dcf6a39bf6 split Event and Monitor into objects and use properties from appropriate object 2016-10-12 15:39:32 -04:00
Isaac Connor c2911ae756 better debug in deletePath 2016-10-12 15:38:59 -04:00
Isaac Connor 3baa64aa52 add caller info to log when a bad argument is passed to event constructor 2016-10-12 15:38:40 -04:00
Isaac Connor bf4bbf8b8d use object methods for event deletion. Main benefit is error message when deleting 2016-10-12 15:36:40 -04:00
Isaac Connor ba7d935a85 fix border size of text below the image in montage when alerted. 2016-10-12 12:19:04 -04:00
Isaac Connor 5b8b9c5345 merge update 2016-10-12 09:24:10 -04:00
Isaac Connor b4f065eb75 Convert event view to use Objects 2016-10-12 09:17:57 -04:00
Isaac Connor b00588b6ff add back montagereview 2016-10-11 17:35:41 -04:00
Isaac Connor 0903ef294f quick for to make MontageReview work 2016-10-11 17:35:28 -04:00
Isaac Connor 7c8b99af23 fix bracket problems 2016-10-11 12:43:13 -04:00
Isaac Connor 0358476ac0 Merge branch 'fix_popup' into storageareas 2016-10-11 12:19:38 -04:00
Isaac Connor 743e8c59f9 google code style and double to single quotes 2016-10-11 12:11:59 -04:00
Isaac Connor 0c956d6728 fix logic when disabling a monitor 2016-10-11 12:11:33 -04:00
Isaac Connor c02b840274 Fix logic when disabling a monitor 2016-10-11 12:10:47 -04:00
Isaac Connor ded1e0ea73 handle when window.open fails 2016-10-11 11:48:29 -04:00
Jeff Vogt 3801d9e43e Disabled autocorrect, autocapitalize, spellcheck on username field for login form 2016-10-10 11:27:36 -07:00
Andrew Bauer 7b574e0d41 Merge pull request #1645 from connortechnology/fix_onvif 
Fix onvif
 2016-10-04 16:34:58 -05:00
Isaac Connor 96b5af9021 Merge branch 'fix_onvif' into storageareas 2016-10-04 15:00:28 -04:00
Isaac Connor ac24865647 add NoDetectProfiles instead of reusing NoDetectedCameras 2016-10-04 14:33:51 -04:00
Isaac Connor 6814bcc791 add NoDetectProfiles instead of reusing NoDetectedCameras 2016-10-04 14:33:38 -04:00
Isaac Connor 09c5e3012a username and password don't actually have to be specified 2016-10-04 14:09:32 -04:00
Isaac Connor 21a94a6200 better error message 2016-10-04 10:29:37 -04:00
Isaac Connor 68936b9af9 code style, replace with ' 2016-10-03 21:58:57 -04:00
Isaac Connor d4be5b06ea Only generate auth hash when logged in. 2016-10-03 21:22:16 -04:00
Isaac Connor f4418260e7 Should only generate an auth hash if we are logged in. 2016-10-03 21:18:13 -04:00
Isaac Connor 16bee2ef55 only generate auth hash if we are logged in 2016-10-02 14:13:54 -04:00
Isaac Connor 0ab84abe5b Since we are returning a hash called user, it should really contain all data for that user. 2016-09-29 10:43:07 -04:00
Isaac Connor 404bbb79f0 must return the generated hash 2016-09-29 10:11:37 -04:00
Isaac Connor 8bc7b9562f introduce config option ZM_AUTH_HASH_TTL which is the # of hours to make an auth hash valid for 2016-09-29 10:04:53 -04:00
Isaac Connor cf9fa78ca3 work on fixing event view 2016-09-29 09:28:48 -04:00
Isaac Connor 07ae6b6aa2 commit authhash to session 2016-09-28 11:49:00 -04:00
Isaac Connor 09f7c9ddf9 Merge pull request #1633 from bhaal2/storageareas 
Storageareas
 2016-09-28 09:43:00 -04:00
Isaac Connor 994f1d566e fix [ 2016-09-28 09:09:01 -04:00
Isaac Connor 9bf48d27b1 implement caching the authhash in the session 2016-09-28 09:08:49 -04:00
Isaac Connor 1ae23b49bf generateAuthHash early when session is active, it will get cached in session 2016-09-28 09:08:36 -04:00
Isaac Connor 02a196d98b add missing ] 2016-09-28 08:30:22 -04:00
Isaac Connor e217ca17cd Merge branch 'fix_auth_timeout' into storageareas 2016-09-27 11:57:53 -04:00
Isaac Connor 303a2c6c5f re-open session if neccessary to save AuthHashGeneratedAt 2016-09-27 11:56:31 -04:00
Isaac Connor 6840031ee3 fix auth timeout and user session[username] when checking auth hash for speedup 2016-09-27 11:51:55 -04:00
Isaac Connor e04266600e Merge branch 'fix_auth_timeout' into storageareas 2016-09-27 11:04:12 -04:00
Isaac Connor 4ce531099c add an auth field to request=stream results to give the client a new auth hash to use 2016-09-27 11:03:12 -04:00
Isaac Connor 167214cb01 Merge branch 'cookie_scale' into storageareas 2016-09-27 10:05:16 -04:00
Isaac Connor 6c3a3d3d50 store the scale value for watch and event views in a cookie, differentiated by monitorId. 2016-09-27 09:46:04 -04:00
Isaac Connor 0580ef0c88 whitespace changes 2016-09-26 20:09:09 -04:00
Isaac Connor 3dcc1c3697 fix php outputting extra newlines after content 2016-09-22 10:37:32 -04:00
Isaac Connor d96febd967 when ZM_DIR_EVENTS is relative, append ZM_PATH_WEB 2016-09-21 16:00:23 -04:00
Pliable Pixels 92d7cad5f1 enabled utf8 2016-09-21 11:53:34 -04:00
Isaac Connor 091459004c ServerId can be 0 2016-09-21 10:30:31 -04:00
bhaal2 b9b1dd144c @connortechnology changed the selectName back to Id from filterId in filter.php, this had a flowon effect in filtersave.php as well. 2016-09-21 21:41:22 +10:00
Isaac Connor 364a80fb94 don't output jpeg header unless there is some kind of success 2016-09-20 15:55:28 -04:00
Isaac Connor 33ab9d3098 instead of filterId, use Id so that the object in is properly filled out. Add object=filter to hidden fields 2016-09-20 12:19:44 -04:00
Isaac Connor 5ce2e95fb7 replace getDiskPercent call with code to show percent for all storageareas 2016-09-20 12:18:50 -04:00
Isaac Connor fb610ba87d fix getDiskPercent to take a StorageArea as a param and use it's disk_usage_percent function. When parsing filter, DiskPercent requires a storagearea now, so look for it in the terms 2016-09-20 12:18:20 -04:00
Isaac Connor 1add270b72 fixup saving Filters and executing them 2016-09-20 12:17:19 -04:00
Isaac Connor f06723a178 add disk_usage_percent and fix whitespace 2016-09-20 12:16:49 -04:00
Isaac Connor 5604fe5610 add more debugging and fix LinkPath -> LinkPath 2016-09-20 12:16:07 -04:00
bhaal2 c74af40ffb Had file open with old stuff. Fixed now. 2016-09-17 02:20:17 +10:00
bhaal2 aee6ae956d Moved '%' to getDiskPercent() where it should have been. 2016-09-17 02:13:33 +10:00
bhaal2 c95e449bbd Modifications to getDiskPercent(): 
Moved '%' to this function instead of at end of html in skins/classing/include/functions.php
Changed from SQL query to Storage area object model.
 2016-09-17 02:11:07 +10:00
Isaac Connor 5f46b8f942 Merge pull request #1621 from connortechnology/fix_1620 
ptzControl expects a monitor object instead of a dbrow array.
 2016-09-15 10:18:26 -04:00
Isaac Connor 2c21fe80e7 Merge pull request #1626 from bhaal2/storageareas 
Storageareas
 2016-09-15 10:18:11 -04:00
bhaal2 181339a2dd Nearly forgot its possible to have no "default" storage area, have wrapped the defaults space check in an if() 2016-09-15 19:49:58 +10:00
bhaal2 76beaf281a Changed "Disk" to "Storage" which looked better when showing disk space for all storage areas. 2016-09-15 19:44:13 +10:00
bhaal2 d5337a08a8 Modify getDiskPercent() to report disk space for all storage areas. 2016-09-15 19:41:16 +10:00
Isaac Connor 37c559ba3d Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-09-14 12:49:55 -04:00
Isaac Connor cf45feea66 quiet the logs on initial view load 2016-09-14 12:49:47 -04:00
Isaac Connor fb8b2f2490 Merge pull request #1625 from bhaal2/storageareas 
Storageareas
 2016-09-14 12:08:55 -04:00
bhaal2 01ae4de123 Modified so deleting a filter is done by table Id instead of Name 2016-09-15 01:59:31 +10:00
bhaal2 17555bf623 Added extra argument 'id' to deleteFilter function to send to delete action for deleting a filter. 2016-09-15 01:57:31 +10:00
bhaal2 67f2ddc404 Changed filter list order back to Name 
Added extra argument 'Id' to delete button onClick call
 2016-09-15 01:55:58 +10:00
bhaal2 cd626a54ee Converted filter action to use table Id's instead of filterName's when editing existings and creating new filters. 2016-09-15 01:29:44 +10:00
bhaal2 99a212803a Converted filter action to use table Id's instead of filterName's when editing existings and creating new filters. 2016-09-15 01:29:35 +10:00
bhaal2 0d83fc5be7 Converted filter action to use table Id's instead of filterName's when editing existings and creating new filters. 2016-09-15 01:27:59 +10:00
Isaac Connor a0eaea00a5 fix relative paths to jquery and bootstrap fixes #1618 2016-09-14 10:06:15 -04:00
bhaal2 cd0e6ba285 StorageId now defaults to 0 and database column now set to NOT NULL. Changed default Id in php to match 2016-09-14 23:56:05 +10:00
bhaal2 33fc47c4b1 StorageId now defaults to 0 (NOT NULL) in the Monitors table, updates to filter.php set the default Id for the default storage area to 0 2016-09-14 23:53:52 +10:00
Isaac Connor db8cada380 fix merge 2016-09-13 15:01:02 -04:00
Isaac Connor 0bc50810de only add the development h3 if it has contents, otherwise it pushes the header size down 2016-09-13 10:25:49 -04:00
Isaac Connor 2b4bad86cb Merge branch 'master' into storageareas 2016-09-13 10:21:10 -04:00
Isaac Connor a80881bb98 Merge branch 'fix_1620' into storageareas 2016-09-13 10:03:02 -04:00
Isaac Connor 54db9f2e3a ptzControl expects a monitor object instead of a dbrow array. 2016-09-12 21:36:03 -04:00
Steve Gilvarry 563f4a9d46 Merge pull request #1505 from ZoneMinder/fix_filter_actions 
Confirmed check box status is now retained after save and changing filters.
 2016-09-11 14:13:51 +10:00
Andrew Bauer e35ef3ce83 Merge pull request #1617 from coracis/master 
Update German translation
 2016-09-09 08:55:19 -05:00
Andrew Bauer 321deb5506 Merge pull request #1599 from sabbath88/master 
add some more translation
 2016-09-09 08:40:05 -05:00
corax 070051d06a Merge commit '6fab2e97b1f45115107c4f5138424408f42dc3e9' 
For easy pull-requesting
 2016-09-09 14:20:03 +02:00
corax 6fab2e97b1 Update German translation of Buffer 2016-09-09 13:32:20 +02:00
corax b10c79b4f7 Add translation for 'Montage Review' 2016-09-09 13:26:19 +02:00
corax 6b18184e4a Remove confusing link to web console 2016-09-09 12:38:30 +02:00
corax 4dc6fc03b3 Add a missing translate()-call 2016-09-09 12:35:34 +02:00
corax 430ecd8e32 Fix some too direct translations into German 2016-09-09 11:51:53 +02:00
corax d017138550 Fix a 'false friend' in German translation 2016-09-09 11:25:12 +02:00
Pliable Pixels 1440dd9265 retab 2016-09-03 15:02:32 -04:00
Pliable Pixels 7bf0b3c423 readded forMonitor - removed by mistake 2016-09-03 14:51:24 -04:00
Pliable Pixels 9a4330eb59 #1537 Zones Controller not returning all zones 2016-09-03 14:46:47 -04:00
Kyle Johnson d6852e10b7 Merge pull request #1609 from connortechnology/fix_1606 
implement suggested code to stop the monitor when Function is set to …
 2016-09-01 22:57:57 -06:00
Isaac Connor 55f5db55dd implement suggested code to stop the monitor when Function is set to None 2016-09-01 11:43:20 -04:00
Isaac Connor 10abe98e91 merge from packet queue. add monitorId to livestream div lookup 2016-09-01 10:15:12 -04:00
Isaac Connor 5f07911a63 fix spacing 2016-08-31 10:09:42 -04:00
Isaac Connor ed1b6ccd58 Implement range support 2016-08-31 10:09:01 -04:00
Isaac Connor ffaf046485 fix missing / 2016-08-30 14:51:56 -04:00
Isaac Connor 27c1f95607 handle when ZM_BASE_PATH == '/' 2016-08-30 14:36:14 -04:00
Isaac Connor a28e7d8df8 fix typo 2016-08-30 14:24:51 -04:00
Isaac Connor 7411b47834 fix typo 2016-08-30 14:23:20 -04:00
Isaac Connor 6ce18c3628 ZM_BASE_URL is deprecated. Use ZM_BASE_PATH instead 2016-08-30 14:08:52 -04:00
Isaac Connor 237a4494b2 correct incorrect use of isset instead of array_key_exists 2016-08-30 13:44:57 -04:00
Isaac Connor 6204ed8dd4 correct incorrect use of isset instead of array_key_exists 2016-08-30 13:43:49 -04:00
David Sabbath Grits 2d44531d1f add some more translation 2016-08-25 14:24:14 +02:00