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

1487 Commits

Author SHA1 Message Date
Isaac Connor cdac403fb1 Merge ../zum into develop 
Conflicts:
	AUTHORS
	configure.ac
	db/zm_create.sql.in
	scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
	scripts/zmupdate.pl.in
	src/Makefile.am
	src/zm_buffer.cpp
	src/zm_config_defines.h
	src/zm_event.cpp
	src/zm_ffmpeg.h
	src/zm_ffmpeg_camera.cpp
	src/zm_image.cpp
	src/zm_jpeg.h
	src/zm_local_camera.cpp
	src/zm_logger.cpp
	src/zm_mem_utils.h
	src/zm_monitor.cpp
	src/zm_monitor.h
	src/zm_mpeg.cpp
	src/zm_remote_camera_http.cpp
	src/zm_remote_camera_rtsp.cpp
	src/zm_rtsp.cpp
	src/zm_sdp.cpp
	src/zm_sdp.h
	src/zm_stream.cpp
	src/zm_thread.cpp
	src/zm_thread.h
	src/zm_threaddata.cpp
	src/zm_user.cpp
	src/zm_user.h
	src/zm_utils.cpp
	src/zm_zone.cpp
	src/zm_zone.h
	web/includes/actions.php
	web/lang/big5_big5.php
	web/lang/cn_zh.php
	web/lang/cs_cz.php
	web/lang/de_de.php
	web/lang/dk_dk.php
	web/lang/en_gb.php
	web/lang/es_ar.php
	web/lang/et_ee.php
	web/lang/fr_fr.php
	web/lang/he_il.php
	web/lang/hu_hu.php
	web/lang/it_it.php
	web/lang/ja_jp.php
	web/lang/nl_nl.php
	web/lang/pl_pl.php
	web/lang/pt_br.php
	web/lang/ro_ro.php
	web/lang/ru_ru.php
	web/lang/se_se.php
	web/skins/classic/js/skin.js
	web/skins/classic/views/js/monitor.js.php
	web/skins/classic/views/monitor.php
	web/skins/classic/views/zone.php
 2013-07-25 11:49:55 -04:00
Kyle Johnson f1d9de75b0 Point root to the Monitors index action 2013-07-19 09:30:08 -04:00
Kyle Johnson 46deb93f74 Events index view is now at a semi-usable state, similar to the original skin. 
In the interest of releasing something, I am not going to use ajax here
for now.  Goal is to have this view behave similar to the original Events
view in the original skin.  Currently you can:

  * Paginate events
  * Filter events using the sidebar

Bug:  Filter elements are unset when paginating.
 2013-07-19 07:30:13 -04:00
Kyle Johnson ad0aaa6e93 Initial commit of Zone MVC 2013-07-18 08:08:07 -04:00
Kyle Johnson 6ba1d8f041 Added the Js helper and RequestHandler component to AppController to be available app-wide. 2013-07-16 08:33:53 -04:00
Kyle Johnson e4ccd359cd Allow setting of width with the live stream helper 2013-07-15 07:35:39 -04:00
Kyle Johnson 4265e8b45f Sort with newest at top, not bottom. 2013-07-11 12:09:45 -04:00
Kyle Johnson 67ad15fdc5 Initial commit of the Logs Controller and View. 
The log functionality is similar to that of the classic skin, though
with fewer options.  Initial filtering support is for only component type.
Also displays a fixed last 100 log events, sorted by TimeKey ascending.
 2013-07-11 12:06:12 -04:00
Kyle Johnson 2ea43105ec Merged config.js and events.js into main.js. 
This should fix #15 as I'm keeping all JS in a single file, instead of
a file per page.
 2013-07-11 12:00:01 -04:00
Kyle Johnson 80ebaad07b Initial commit of the Log model 2013-07-10 10:00:49 -04:00
Kyle Johnson 64fba81f6a Moved the navigation items to an ordered list 2013-06-25 12:21:21 -04:00
Kyle Johnson cdbb3d126e Added Masonry from http://masonry.desandro.com/ 
Masonry is a JavaScript grid layout library, and it is going to make my
life easier on the Events page.
 2013-06-22 21:53:53 -04:00
Kyle Johnson 12537a7860 Added jquery-ui images and updated jquery-ui css to point to them. 2013-06-22 21:50:22 -04:00
Kyle Johnson e9e99261d9 Better styling of the Config page. 
Added row highlighting, positioned all of the labels and inputs
appropriately, and added the description of the option.
 2013-06-22 21:40:29 -04:00
Kyle Johnson bffe78904f Display the correct input type for the config option. 
I am keying the input type off of the 'Hint' and 'Type' columns
in the Config table.  It would be easier if I just added an 'inputtype'
column to the Config table, and I might do that later, but I don't want to
mess with the database right now.
 2013-06-22 11:59:46 -04:00
Kyle Johnson fe5df3eb8c Also grab the Hint column from the Config table 2013-06-22 11:59:03 -04:00
Kyle Johnson 5635b24897 Make the tab's first character uppercase 2013-06-21 22:22:54 -04:00
Kyle Johnson 567c0c5c20 Switching on the category type to determine which type of input to display. 2013-06-21 22:20:16 -04:00
Kyle Johnson 6faa248248 Sorting the Config results by Type (boolean, string, etc) 2013-06-21 22:19:27 -04:00
Kyle Johnson 819f1b48d6 Filtering out the "hidden" category 2013-06-21 22:18:44 -04:00
Kyle Johnson d64a09576f Split the config / options page into tabs based on Category. 
Still a lot of work to do such as displaying the proper input
type based on option, however basic tabbing and saving works,
as does the on-hover tooltip (I think I put that in this commit).
 2013-06-21 12:52:30 -04:00
Kyle Johnson bb19e80fa8 Support for control when monitor source is ffmpeg. This should fix #16. 
Some IP cameras need the source set to ffmpeg even though they are remote
cameras.  These cameras do have a remote PTZ interface, but previously
when the monitor source was set to ffmpeg, the only control type
available was 'none'.
 2013-06-15 19:50:19 -04:00
Kyle Johnson 964e1919bc Initial commit of Filters MVC. 
The filters will be split from the events in this interface, where
in the classic interface, they were combined.
 2013-06-04 13:23:00 -04:00
Kyle Johnson f50bf834d9 Forgot to change $event to $value, and to move a <td> or two. 2013-05-30 23:00:09 -04:00
Kyle Johnson 50085d48b5 Reworked the Events index view to display thumbnails by default. 
The EventsController calls createListThumbnail() to build a list
of thumbnail data which is then passed to the view to be looped though.

Also had to change how I loop through $events so that I can match up the
indexes in $events with the indexes in $thumbData
 2013-05-30 22:54:51 -04:00
Kyle Johnson 3505f35a6d Replaced my function for selecting and filtering events based on monitors 
The new way of doing it leverages jquery-ui functions.
 2013-05-30 22:46:27 -04:00
Kyle Johnson 59a1740dca Re-worked the Events index view to display the monitors as a list 
This will allow me to use the jquery-ui selectabled on the list.
 2013-05-30 22:43:48 -04:00
Kyle Johnson e80bd5ffd0 Updated the CSS for jquery-ui-selected elements 2013-05-30 22:36:51 -04:00
Kyle Johnson 26c1110e3f Function to return info necessary to create an HTML img tag for a given event. 
This function determines the scaled width and height of the image for the
thumbnail, as well as other information relating to the frame with the
highest score in this event.
 2013-05-30 22:31:55 -04:00
Kyle Johnson 1ae5cdd291 Function to return components necessary to build src to an event thumbnail. 
A lot of this code was re-worked from the original includes/functions.php
file found in the classic zoneminder skin to work with CakePHP.
Function seems to work, but looks like it could use some serious re-factoring.
 2013-05-30 22:22:48 -04:00
Kyle Johnson 22a73a3255 Added one of the hard coded options from the original config.php file 2013-05-30 22:03:20 -04:00
Kyle Johnson f4d2df3941 Function to determine the path to an event in the filesystem. 2013-05-30 20:30:09 -04:00
Kyle Johnson c2e2079818 Function to rescale dimenions of events. 2013-05-30 20:25:18 -04:00
Kyle Johnson e107e34164 Associated the Event Model with the Frame Model 2013-05-30 19:47:32 -04:00
Kyle Johnson fb97233869 Initial commit of Frame Model 2013-05-30 19:47:07 -04:00
Kyle Johnson 26f99bf76b Adding jQuery UI 2013-05-29 17:46:07 -04:00
Kyle Johnson 633aa7a9ad Initial support for filtering events. 
First I tell extractNamedParams() which params I care about (ignore the rest),
then I loop through the returned results and build my query via named params.

Finally I pass the named params into the $conditions array for paginate to use.
 2013-05-29 07:54:06 -04:00
Kyle Johnson cc4af23115 Removed the Config model from the Events controller. 
Not needed since commit c408575075
 2013-05-29 07:52:34 -04:00
Kyle Johnson fdb5fd5b57 An AJAX loading / spinner gif 2013-05-29 07:50:49 -04:00
Kyle Johnson 870298082e Minor styling to selected rows in the Events view. 2013-05-29 07:50:23 -04:00
Kyle Johnson 984035dde3 Initial commit of events.js file; added it to all pages. 
events.js should eventually be loaded in only the events view.  This commit
creates #15.
 2013-05-29 07:47:27 -04:00
Kyle Johnson 47af648803 Minor HTML updates so that I can better select elements with jQuery later on. 
Wrapped the Events table in a div, and gave the id #Events to that div.
 2013-05-29 07:45:47 -04:00
Kyle Johnson d5e60e8b78 Minor indenting, and added an empty placeholder $conditions array. 2013-05-29 07:44:30 -04:00
Kyle Johnson 545826b55c A method to make named parameters strongly defined. 
Added a method that processes named parameters and ensures all mandatory ones
exist and substitutes missing optional ones with default values.  This makes
named parameters strongly defined and easier to read.

Thanks to http://developinginthedark.com/posts/cakephp-tip-1-named-parameters
for the idea.
 2013-05-29 07:37:00 -04:00
Kyle Johnson c408575075 Grab ZM_WEB_EVENTS_PER_PAGE from Configure instead of the database 2013-05-25 12:30:34 -04:00
Kyle Johnson 6d2f7baf5d Re-added the jQuery javascript engine 2013-05-25 12:22:23 -04:00
Kyle Johnson 1795633b71 Added names to the tables and td for sorting the events list via js 2013-05-25 11:55:52 -04:00
Kyle Johnson 60b67a1703 Removed the jquery helper. Going to keep my js code in seperate files for now 2013-05-25 11:54:34 -04:00
Kyle Johnson 07ac7aaeb4 Use the jQuery javascript engine 2013-05-25 11:44:53 -04:00
Kyle Johnson 13b7c4b04a Write cached scripts 2013-05-25 11:43:22 -04:00
Kyle Johnson aa72855b28 Added jQuery 2.0.1 file 2013-05-25 11:39:24 -04:00
Kyle Johnson 05c8ddf153 Reworked to allow displaying of monitors from many views with less code. 
* Moved getStreamSrc from Monitors Controller to Monitors Model
 * Minor indenting of code
 * Removed some old code
 * Changed how I lookup ZM_MPEG_LIVE_FORMAT from within getStreamSrc
 * Changed Monitors View view to use divs instead of tables
 2013-05-24 20:13:14 -04:00
Kyle Johnson 7b98b62c16 Fixed some indenting 2013-05-22 21:19:10 -04:00
Kyle Johnson 57c553e05f Added LiveStream helper 2013-05-22 21:18:43 -04:00
Kyle Johnson 155ec308a0 Replaced HTML image tag with LiveStream helper 2013-05-22 21:18:01 -04:00
Kyle Johnson f05c23b104 Created a helper for live video streams 2013-05-18 18:22:39 -04:00
Kyle Johnson c28a35ca31 Added a daemon status message to the footer of every page (whether or not ZM is running) 2013-05-17 09:03:30 -04:00
Kyle Johnson ae5a3d716c Made zm.conf options available site-side 2013-05-17 09:02:34 -04:00
Kyle Johnson 9628aff358 Load AppModel to AppController 2013-05-17 09:01:54 -04:00
Kyle Johnson 195b5deac1 Added a function to check the status of the ZoneMinder daemons 2013-05-17 08:57:24 -04:00
Kyle Johnson f1a590c805 Made the options in the Config table available site-wide. 2013-05-17 08:42:32 -04:00
Kyle Johnson 17c8b98a41 Moved all of the Events table stuff in the Monitors index view to the Events index view 2013-05-15 17:53:07 -04:00
Kyle Johnson 869fb3f626 Changed the way that I am looking up monitors 2013-05-15 17:52:30 -04:00
Kyle Johnson 0d004fb588 Changed some minor indents 2013-05-15 17:51:53 -04:00
Kyle Johnson 343fd4c3b6 Removed the host field from the monitors query 2013-05-15 17:51:14 -04:00
Kyle Johnson 176064343d Moved the events table code frmo the Monitors controller to the Events controller 2013-05-15 17:50:46 -04:00
Kyle Johnson 4022695961 Reworked the events paginate function, it now grabs only the needed fields, sorts properly, and limits based on the configured ZM_WEB_EVENTS_PER_PAGE option. 2013-05-15 17:46:11 -04:00
Kyle Johnson c47f450e41 Added the Monitor and Config model to the Events controller 2013-05-15 17:42:42 -04:00
Kyle Johnson 2a3b649341 Forgot to pull out the Monitors schema before committing... 2013-05-15 08:42:39 -04:00
Kyle Johnson 7913fbb49f Added a link to the add monitors page 2013-05-15 08:36:05 -04:00
Kyle Johnson a1aed0ec03 First pass at ability to add monitors. Field names do not match database columns so not all values are saved 2013-05-15 08:35:49 -04:00
Kyle Johnson 39e15b48a1 Replaced use of querybuilder functionality via find() with prebuilt queries via query(). This fixes #1. 2013-05-14 22:52:47 -04:00
Isaac Connor 3a8481a591 cleanup 2013-05-10 14:02:22 -04:00
Isaac Connor a468baf9eb cleanup 2013-05-10 13:55:45 -04:00
Isaac Connor 9d89fb3bcb Merge branch 'kfir-proper' into develop 2013-05-10 12:23:58 -04:00
Isaac Connor 0a3ffb5e2e fix control types dropdown for a new monitor 2013-05-09 14:11:20 -04:00
Kyle Johnson 1307ba41c8 Changed the event count lookups to use find() instead of custom functions 2013-05-08 09:37:56 -04:00
Kyle Johnson 08f57b6b47 Made the footer link legible 2013-05-08 08:03:58 -04:00
Kyle Johnson 0e8a96141e Lack of newlines makes me cry 2013-05-08 07:56:11 -04:00
Kyle Johnson 74008dcb8b Moved some of the logic for determining video streaming options from the controller to the model 2013-05-07 11:15:06 -04:00
Kyle Johnson b5e15a1708 First pass of the Monitors view page with code to determine stream type (mpeg, jpeg), bitrate, fps, etc 2013-05-07 10:29:34 -04:00
Kyle Johnson a6bcd78e6e Added a link to change the bandwidth 2013-05-06 19:53:38 -04:00
Kyle Johnson 29784fa3d3 Set the zmBandwidth variable app-wide 2013-05-06 19:53:25 -04:00
Kyle Johnson 82c14790c5 Added the live stream with hardcoded values 2013-05-06 19:38:22 -04:00
Kyle Johnson 49a01a9c28 Initial commit of Bandwidth Model, View and Controller. 2013-05-06 19:37:22 -04:00
Kyle Johnson ac93b8318e Added Cookie and Session components to the entire app, also set the zmBandwidth cookie to low by default 2013-05-06 19:36:34 -04:00
Kyle Johnson 9052b7fda5 Added a style to make the header legible 2013-05-06 11:34:48 -04:00
Kyle Johnson 69f9f446a8 Added Monitors, Events and Options index view to the header 2013-05-06 11:34:17 -04:00
Kyle Johnson f35e7cbe73 Initial commit of Config Controller and View. 
* Allows basic updating of config options
 * No validation yet
 * All options are rendered as text boxes.  Some need to be dropdown, etc.
 2013-05-06 11:06:58 -04:00
Kyle Johnson 869b84732d Changed the primaryKey to the actual primary key of the Config table 2013-05-06 11:05:33 -04:00
Kyle Johnson 5f7e4a3471 Overriding the primaryKey for the Events and Monitors models 2013-05-06 10:36:47 -04:00
Kyle Johnson 03a9915138 Added the Config model 2013-05-06 08:42:05 -04:00
Kyle Johnson b6bf96b701 Added the list of distinct monitors to the monitors variable for later use with filtering 2013-05-06 08:40:25 -04:00
Kyle Johnson d4b0d05366 Added number of archived events per monitor to Monitors index view 2013-05-04 22:45:59 -04:00
Kyle Johnson 3af0600917 Limited the number of fields returned when searching for associated events and zones 2013-05-04 22:41:27 -04:00
Kyle Johnson d681654e56 Moved events queries from the Monitors controller to the Monitors model 2013-05-04 19:42:37 -04:00
Kyle Johnson a56ae4ed42 Display last events per hour, day, week, month per monitor 2013-05-04 19:22:48 -04:00
Kyle Johnson 20b024ef02 Added queries for last events per hour, day, week and month 2013-05-04 19:22:09 -04:00
Kyle Johnson c42ae4a91d Moved the Html and Form helpers to the common AppController 2013-05-03 07:34:45 -04:00
Kyle Johnson cff58441fc Fixed some indents 2013-05-02 21:31:05 -04:00
Isaac Connor 7cf5475542 Merge ../ZoneMinder-kfir into kfir-proper 
Conflicts:
	configure
	src/Makefile.am
	src/Makefile.in
 2013-05-02 21:28:51 -04:00
Kyle Johnson 2cc0620edc Added zone count to monitor index 2013-05-02 21:27:55 -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 b7d993839b Added Zone model, as well as Monitor and Zone model association 2013-05-02 09:01:27 -04:00
Kyle Johnson 12642e6c45 Added additional table columns as well as total event count per monitor 2013-05-02 08:56:51 -04:00
Kyle Johnson e782fbe38d Defined associations between the Monitor and Event models 2013-05-02 08:55:59 -04:00
Kyle Johnson e2751c0597 Initial ability to edit limited options of existing monitors 2013-05-01 21:03:25 -04:00
Kyle Johnson 6bc6610542 Added Monitors view view 2013-05-01 20:57:10 -04:00
Kyle Johnson 1be91f67e3 Added Function and Source columns 2013-05-01 18:46:01 -04:00
Kyle Johnson 055d8f8d0b Initial commit of MVC for Monitors 2013-05-01 18:41:59 -04:00
Kyle Johnson a5e2f29a4b Specified the specific table name for the Event model 2013-05-01 18:21:46 -04:00
Kyle Johnson a16054b33f Removed an HTML comment and changed the heading from 1 to 2. 2013-05-01 08:24:42 -03:00
Kyle Johnson 31902af09a Update README.md 2013-05-01 08:04:57 -03:00
Kyle Johnson 9d5243ccab Initial commit of Event Model, View and Controller with basic support for drilling into an event 2013-05-01 07:02:12 -04:00
Kyle Johnson 8322dc390f Initial commit of CakePHP 2.3.4 2013-05-01 06:58:31 -04:00
Kyle Johnson 1ed6462354 Removed all of the old web files 2013-05-01 06:52:43 -04:00
nextime 33cbd89212 Migrate svn to git 2013-03-17 00:45:21 +01:00
Kfir Itzhak 0fe55a18bf Something useable :) 
1) Added optimized versions of four field deinterlacing, including SSSE3 ones.
2) Removed the "Very Soft" and "Very Hard" options.
3) Deinterlacing happens before any rotation to the image.
 2012-07-15 17:30:37 +03:00
Kfir Itzhak a6c7acd02a Some more progress on the deinterlacing code. 2012-07-13 20:11:16 +03:00
Kfir Itzhak f27b424503 Much more progress! 
1) Removed the V4L2_CAPTURE_FIELDS option.
2) V4L2 Interlacing control options added to the new per-monitor deinterlacing option.
3) Fixed the 32bit version of Linear.
4) Added Blend (50%) and Blend (25%).
5) Completed the grayscale version of the Four Field Motion Adaptive deinterlacing algorithm.
 2012-07-13 20:11:16 +03:00
Kfir Itzhak 8f0ec42ba2 First work on adding built-in deinterlacing to ZM. 2012-07-13 20:11:16 +03: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
stan be97b244b4 Increased size of options window and changed to use debug functions instead of console ones. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3659 e3e1d417-86f3-4887-817a-d78f3d33393f
 2012-07-04 08:58:19 +00:00
Kfir Itzhak 2dfdc8129c Few small fixes: 
1) Added a workaround against SWS_CPU_CAPS_SSE2 not being defined.
2) Fixed enableDisableAlarms javascript error.
3) swscale unsupported format errors now include the unsupported format in the error.
4) Fixed a small error affecting local cameras with rotation enabled.
 2012-03-07 14:33:09 +02:00
Kfir Itzhak d5fbd351b3 Small corrections 2012-02-01 07:33:21 +02:00
Kfir Itzhak be8ef02a7c Small corrections 2012-02-01 07:33:21 +02:00
Kfir Itzhak b4921c4403 1) Made 24bit the default target colorspace. 
2) Changed crop info's layout.
 2012-02-01 07:33:21 +02:00
Kfir Itzhak 066fe89718 Added automatic capture palette selection. 2012-02-01 07:33:21 +02:00
Kfir Itzhak bdf0687550 1) Added support for JPEG and MJPEG capture palettes - needs to be tested 
2) Allow the blend percent to be zero, to disable blending
 2012-02-01 07:33:20 +02:00
Kfir Itzhak 63122ab9bc Undo translations in es_es.php because its not available in the ZM 1.24.4 package. 2012-02-01 07:33:20 +02:00
Kfir Itzhak 8ac3dda54b 1) Removal of the ZM_LOCAL_BGR_INVERT option. 
2) Allow FPS reporting interval to be zero again.
3) Added translation for the new texts.
4) Corrected the blend function declaration.
 2012-02-01 07:33:20 +02:00
Kfir Itzhak eeaed7ccd3 Some small changes 
1) Fixed wrong size calculation in Image::AssignDirect.
2) Improved libjpeg subpixel order selection.
3) Finished adding support in the simple Overlay function.
4) Completed Flip and Rotate 32bit RGB support.
5) Allow ZM to compile on 32bit with omit frame pointer disabled by defining _DEBUG
   To use one less register in the SSE algorithms.
6) Removed the counter variable in some loops to reduce loop overhead.
7) Modified crop query error handling.
8) Most of the shared data now declared as volatile.
9) Small improvements to the AlarmedPixels motion detection.
10) Changed the default blend percent from 7% to 12%.
11) Fixed an earlier bug created by me: motion detection checking the wrong pixels.
 2012-02-01 07:33:20 +02:00
Kfir Itzhak 642a1bfdb2 1) RTSP support for direct capture and target colorspace. 
2) Hopefully fixed the mmap unexpected shared memory size completely this time.
3) Added 32bit RGB and grayscale support to the signal checking.
4) Fixed zms\nph-zms keeps running after changing capture options, eating CPU and has to be killed with -9.
5) Default monitor options changed again.
6) Fixed unrelated bug: Undefined constant ZM_V4L2 in monitor probe.
7) Fixed unrelated bug: Error in offset X in monitor probe.
8) Changed monitor probe's prefered capture settings.
9) Small other minor changes.
 2012-02-01 07:33:20 +02:00
Kfir Itzhak b0bc227232 1) Made shared memory 16 byte aligned and identical size and layout for all platforms. 
2) Fixed a bug in zmwatch.pl: Not freeing shared memory handles between iterations.
3) Modified default monitor options to simplify new monitor creation.
 2012-02-01 07:33:20 +02:00
Kfir Itzhak 33119c6dc5 1) Added image size requirements to ensure proper alignment 
2) Changed image class buffer related functions
3) Improved format selection for local cameras
4) Removed imagesize check for swscale
5) Fixed mmap unexpected memory size when changing capture options
6) Fixed unrelated bug in zmdc.pl: sockets directory doesn't exist
 2012-02-01 07:33:20 +02:00
Kfir Itzhak c3ecdd00e0 1) Relocated conversion functions and tables to zm_image.cpp 
2) SSE2 aligned memcpy now functional
3) Fixed fill functions bug from an earlier commit
4) Many changes to zm_local_camera.cpp format selection
5) Fixed memory leak in AssignDirect()
6) Fixed Target Colorspace webinterface issues
7) Small other changes
 2012-02-01 07:33:20 +02:00
stan 2c47a15f9b Use event dimensions instead of monitor ones as they may have changed. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3520 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-11-10 22:53:29 +00:00
stan 8b86c9af58 Removed permissions check when creating new log entries. Instead check that request is 'post'ed and moved some other requests to be 'post' only. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3509 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-26 10:50:50 +00:00
stan e695dfd4dd Allow for level as a minimum when selecting availability criteria for other fields. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3501 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-24 13:15:58 +00:00
stan b64c506659 Added SFTP upload option. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3500 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-23 14:10:20 +00:00
stan 194d8350b4 Fixed distribution and install lists 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3497 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-05 11:24:24 +00: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 63589ddee7 Don't include postprocessed config.php 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3487 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-07-28 21:26:20 +00:00
stan 3a399378b2 Fixed problem with link to overlay css file 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3485 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-07-27 16:09:09 +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 b40669dc75 Updated Spanish translation 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3476 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-07-07 08:30:12 +00:00
stan 07fca2ad9a Fixed environment fetching when in cli mode and logfile error message. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3471 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-06-27 16:15:59 +00:00
stan 7e55373b87 Fixed incorrect scaling of timeout on select call 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3470 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-06-27 16:15:16 +00:00
stan bf90ab8158 Added error trapping to log file exports. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3463 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-06-23 22:33:07 +00:00
stan 1ce54fb0db Enabled alternate selections when a filter has been chosen. Improved 
styles for debug entries in log.


git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3462 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-06-23 21:53:45 +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
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
stan b3d8279dfc Fixed problem with transparency 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3373 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-27 10:41:43 +00:00
stan a6011b4f93 Fixed down/right PTZ image 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3372 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-27 08:39:22 +00:00
stan d2f5e9623c Added checks for mismatches between system and database versions 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3364 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-25 09:15:14 +00:00
stan a20180aded Updated to process other sections on top of SLANG 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3362 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-25 09:13:47 +00:00
stan 7b43ac2645 Use JSON encoding for language independent serialisation (filters and control commands) rather than PHP serialisation. Removes dependency on rare PHP::Serialization perl module. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3357 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-23 16:18:18 +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 327ae02e9a Regenerated. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3340 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-16 14:48:52 +00:00
stan 24c3c068dd Removed original apache config and merged with new one in misc 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3339 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-15 21:16:36 +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 249b53ec7e When creating a monitor add it to the current group if any 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3325 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-04-19 11:46:55 +00:00
stan 27fedec37b Reordered monitor deletion to do primary activities first in case of deletions timing out 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3324 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-04-19 10:56:39 +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 e46acf74b0 Fixed broken previous commit. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3322 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-04-19 09:53:33 +00:00
stan 40dfb5abde Fixed potential issues with monitor deletion 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3321 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-04-19 09:50:28 +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
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
stan a1ccff276f Auto-updated. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3310 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-03-02 12:35:17 +00:00
stan 0327f0f751 Added Spanish translation 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3309 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-03-02 12:34:58 +00:00
stan 0ff4e53832 Allow FPS reporting to be disabled by setting valure to zero 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3308 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-03-02 12:23:10 +00:00
stan f0a012ebfd Fixed bug to do with V4L versions and monitor settings 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3307 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-03-02 12:04:52 +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 efa583aed0 Fixed JSON request queueing issue. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3299 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-15 11:17:44 +00:00
stan f4ee181a1b Removed redundant overloaded code, now implmented directly in MooTools 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3298 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-15 11:17:30 +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 49daed8658 Changed name of event variable as Chrome objects. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3289 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-08 14:30:59 +00:00
stan f92752b358 Added more content headers for video download. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3288 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-06 16:52:10 +00:00
stan 240027dd98 Fixed javascript error due to archive button permissions - http://www.zoneminder.com/forums/viewtopic.php?t=15387 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3286 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-06 16:17:42 +00:00
stan 45f1ee9c36 Fixed restricted user not being able to select a monitor in console - http://www.zoneminder.com/forums/viewtopic.php?t=15347 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3285 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-06 16:14:16 +00:00
stan c19b71975c Fixed issue with deleteing current monitor grouyp - http://www.zoneminder.com/forums/viewtopic.php?t=15278 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3284 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-06 16:11:56 +00:00
stan dae7327e7e Fixed enable/disable monitor from monitor settings - http://www.zoneminder.com/forums/viewtopic.php?t=15273 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3283 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-06 16:08:16 +00:00
stan 48d287f9de Fixed bug where unarchiving multiple events would not work - http://www.zoneminder.com/forums/viewtopic.php?t=15272 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3282 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-06 16:06:44 +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 1027b1c75b Prevented memory exhaustion in timeline view for very long events 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3277 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-06 15:28:49 +00:00
stan 173de6debf Replaced deprecated split function call 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3276 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-06 15:28:25 +00:00
stan ccfdd30988 Fixed typo in error message 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3275 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-06 15:28:01 +00:00
stan e1a9514262 Added Estonian language 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3274 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-06 15:27:32 +00:00