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

51 Commits

Author SHA1 Message Date
Andrew Bauer 371c1bae3d Merge pull request #359 from knnniggett/eyezm 
fix eyezm authentication issue
 2014-07-07 17:57:48 -05:00
Andrew Bauer 5c8c00c1ab Fix double login issue with eyezm 2014-07-07 17:48:33 -05:00
Isaac Connor 70471936a7 get rid of escapeSql and replace it's calls with new PDO-style calls to FetchOne FetchALl,e etc 2014-07-07 10:06:50 -04:00
Isaac Connor 8da9383d5d use PDO style 2014-04-30 10:09:27 -04:00
Andrew Bauer fec72f05d0 fix eyezm authentication issue 2014-03-25 18:48:20 -05:00
Isaac Connor ab1314f250 clean out autogenerated files 2013-09-12 14:43:57 -04:00
Kyle Johnson c8ad6ae656 Fixes #107 for real this time. 2013-09-05 20:31:52 -04:00
Isaac Connor a468baf9eb cleanup 2013-05-10 13:55:45 -04: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 4996dd0a51 Recreated generated files. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3662 e3e1d417-86f3-4887-817a-d78f3d33393f
 2012-07-04 09:46:18 +00:00
jaidhar 96249db582 eyeZm Plugin: Patched functions.php to check for ffmpeg codec support via -formats as well as -codecs 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3399 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-06-08 22:37:19 +00:00
jaidhar d0f8e7e1aa eyeZm Plugin: Changed text on H264 splash page 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3317 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-04-19 00:10:17 +00:00
jaidhar 7c430cd7a5 eyeZm Plugin: Changed loading text for H264 splash screen 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3316 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-04-19 00:10:03 +00:00
jaidhar 6645cd0a8f eyeZm Plugin: Removed -s tag from ffmpeg to allow it to automatically pick size, and added viewport meta-tag to h264 splash page 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3315 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-04-19 00:09:50 +00:00
jaidhar f2caca6f2f added single-shot when fps=0 for vcodec=mjpeg 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3314 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-04-19 00:09:34 +00:00
jaidhar 923fd832e5 Incremented to p2fs3, added rescaling support for 'vframe' action, added viewport tag to vfeed for mjpeg mode 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3313 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-04-19 00:09:20 +00:00
jaidhar e3f8bdb6cd XML (eyeZm) plugin: Now renamed plugin to eyeZm, along with all database variables. Note that this must still reside in the skins/xml path until iPhone apps can be moved over at a later point in time 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3306 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-19 20:25:54 +00:00
jaidhar 15de28e665 XML Plugin: Securing code by escaping SQL strings, and validating input parameters 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3305 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-19 20:25:22 +00:00
stan 8048c1c355 Updated to allow the versions of video4linux to existed independently of each other. Ubuntu 11.04 oalyn has V4L2. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3302 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-15 21:59:06 +00:00
stan 46358c84e9 Changed configure/build procedure to allow specified run, tmp and log dirs and avoid early replacement of configure variables in SQL defautl config. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3222 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-07 11:10:18 +00:00
stan dc9e2755b0 Added sample apache config file. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3218 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-03 23:27:58 +00:00
jaidhar 1a8d7c46fc XML Plugin: Bugfix where EVENT_IMAGE_DIGITS other than 3 would not work. Now uses define 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3215 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-12-30 12:35:14 +00:00
jaidhar 4dc1fac544 XML Plugin: Added commenting for config.php defines 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3211 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-30 04:32:43 +00:00
jaidhar 635d8e1dad Grab FFMPEG from ZM_PATH_FFMPEG (if available), more robust error checking against codecs and paths 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3203 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-18 19:09:51 +00:00
jaidhar bd31f9ec4b IP Address printout in XML Loggin 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3202 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-18 19:09:33 +00:00
jaidhar 069136fe53 Added vlog function to view log output, ability to redirect XML logging to it's own file 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3201 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-18 19:09:18 +00:00
jaidhar 18bcfcff7f Added support for deep-event storage 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3200 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-18 19:08:48 +00:00
jaidhar c7b3d04eed Got rid of MJPEG code choice for viewing events, only MPEG-4 and H264 now. Added default bitrate for event viewing to config XML 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3199 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-18 19:08:33 +00:00
jaidhar d3fa2b2df3 Changed default H264 bitrate for events to 128kbit 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3198 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-18 19:08:07 +00:00
jaidhar f0165bab78 Prettied-up the splash screen for H264, modified FFMPEG encoding parameters for H264 slightly 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3197 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-18 19:07:52 +00:00
jaidhar 5ed6fccd20 - Incremented to p2fs2 
- H264, MPEG-4 and MJPEG support for encoding of events through parameters now
- Display overlay of still-capture when streaming H264 (transparency)
- Introduced logXmlErr macro

Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3196 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-18 19:07:37 +00:00
jaidhar 7ab4d4efbe XML Plugin: Modified H264 behavior to utilize internal MPMoviePlayercontroller in eyeZm. Works more reliably now. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3195 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-15 21:35:29 +00:00
jaidhar 56018fc9b3 XML Plugin: Another bugfix in getEventPathSafe() to account for more variations in ZM installations 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3194 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-15 02:48:12 +00:00
jaidhar f85c060ba6 XML Plugin: Check for ZM_DIR_EVENTS being defined in getEventPathSafe() 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3193 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-14 18:33:55 +00:00
jaidhar e57c1b0331 XML Plugin: More config options added, stability fixes to H264 streaming 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3192 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-12 23:04:09 +00:00
jaidhar 78caa0adb0 XML Plugin: Added more XML Options along with H264 options. These will be disabled unless client ver >=1.2. Added ability to track client version in PHP 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3191 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-12 04:26:31 +00:00
jaidhar 461374dc2a XML Plugin: Minor commit to impove h264 web-page appearance 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3187 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-11 07:57:46 +00:00
jaidhar 2d7979ac93 XML Plugin: Moved key XML Plugin options to database and updated ConfigAdmin/options.php to show XML Tab (new category 'XML' created). More H264 streaming updates 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3186 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-11 05:25:43 +00:00
jaidhar 97a99993d7 XML Plugin: Added preliminary H264 feed stream support 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3185 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-10 22:20:29 +00:00
jaidhar f4b75d4f14 XML Plugin: Speed improvement where using inner join on Frames table was causing large delays for huge tables 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3184 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-10 01:32:14 +00:00
jaidhar 6307ecbb0c XML Plugin: Checked for define of ZM_WEB_x_CAN_STREAM since 1.24.1 and .2 don't have this 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3182 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-08 17:23:13 +00:00
jaidhar 2a09efdfd4 XML Plugin: Looks like getEventPath is broken between 1.24.2 and 1.24.3, implement getEventPathSafe to workaround 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3181 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-07 04:05:16 +00:00
jaidhar 039358e00c XML Plugin: Removing README 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3180 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-07 02:00:50 +00:00
jaidhar 2fc3936ec5 XML Plugin: vframe action checks if file exists and outputs image if not 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3179 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-07 01:23:08 +00:00
jaidhar dd337affdc XML Plugin: vframe action can now display alarm, regular and analyze frames based on input parameters, console can be sped-up by using 'nostatus' tag to skip daemon-check 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3178 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-06 01:37:32 +00:00
jaidhar 41405e1115 XML Plugin: Added vframe action, some more defines, condensed vevent parameter requirements 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3177 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-05 23:41:09 +00:00
jaidhar 1c7086dc39 XML Plugin: Modified event query to return frame scoring information along with the frame ID of the max. scoring frame 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3176 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-05 17:50:39 +00:00
jaidhar d6575d90e1 XML Plugin: Split off actions from console.php into it's own file, actions.php 
- Fixed bug where authentication wasn't being handled properly



git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3175 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-05 16:48:57 +00:00
jaidhar b60e60b062 XML Plugin: testing with eyeZm v1.1 and 1.24.3, bugfixes accordingly 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3174 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-04 19:25:34 +00:00