Isaac Connor
a8e407172a
split out versus get functionality in includes/functions. Fix positioning of svg over image stream
2016-05-24 15:50:22 -04:00
Isaac Connor
89f58daf89
Merge branch 'master' into fix_zone_edit
2016-05-24 15:30:56 -04:00
josh4trunks
2ab79820a1
Add back changes
2016-05-22 08:08:12 -07:00
Isaac Connor
235095ed5f
fix URL to image view
2016-05-16 10:32:43 -04:00
Isaac Connor
1530096560
whitespace/google code style
2016-05-12 10:17:41 -04:00
Isaac Connor
aba80f0935
introduce htmlselect as an alternative to buildselect
2016-05-12 09:43:37 -04:00
Isaac Connor
c050969141
Merge object model classes from storageareas
2016-05-05 15:33:28 -04:00
Isaac Connor
be5f0cd4a9
replace OutputVideoStream and OutputImageStream with versions that return a string. Call getStreamHTML before we output the headers because we use streamMode and streamSrc in the header .js.php
2016-04-29 10:44:46 -04:00
Isaac Connor
5e20831030
Don't return of disk_free_space returns false, just log it.
2016-04-28 09:29:40 -04:00
Isaac Connor
d847d66e99
handle disk_free_space error
2016-04-26 14:40:40 -04:00
Isaac Connor
851a81eff7
Merge pull request #1406 from ZoneMinder/svg_zones
...
replace the static zone image with a stream, and use SVG to draw the zones
2016-04-11 11:14:11 -04:00
Andy Bauer
e5bf2d245c
quit the stream in zones.php when zone.php is called
2016-04-10 15:33:55 -05:00
Isaac Connor
feb7b36f11
use a local variable to prevent modifying the arguments
2016-04-09 11:23:52 -04:00
Isaac Connor
ce6f8da098
Use PDO::error_string instead of mysql_error
2016-04-09 11:23:35 -04:00
Isaac Connor
e90024c0d0
Better Error logging on disk_total_space failure
2016-04-09 09:27:12 -04:00
Isaac Connor
3056069f3f
introduce getStreamHTML which returns the required HTML to give you a live image
2016-04-08 11:06:34 -04:00
Andy Bauer
4e9a925933
Merge branch 'Autotools_delete' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-Autotools_delete
2016-04-04 20:52:49 -05:00
Andy Bauer
7ff8d36598
Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation
2016-04-04 20:44:53 -05:00
Isaac Connor
711343a5cc
fix ZM_SERVER_ID instead of ZM_SERVER
2016-04-04 16:34:21 -04:00
Isaac Connor
02eb36040a
fix bad code
2016-04-04 12:01:37 -04:00
Laercio Motta
ad912a6c6b
Improve test multiserver restart camera. (FIX)
...
Check if the server is correctly before restart cam and multiserver is activate.
2016-03-31 09:45:13 -03:00
Laercio Motta
2f27818e5b
Improve test multiserver restart cam.
...
Test if correct server from camera edit settings.
2016-03-31 09:23:01 -03:00
Andy Bauer
466f2b2ae3
change multi-server error message text
2016-03-01 11:12:54 -06:00
SteveGilvarry
d40bf89b17
Remove Phone BW settings used with mobile skin
2016-02-26 22:43:37 +11:00
SteveGilvarry
5ff427d9e9
Removed Autotools Makefile.am
...
Conflicts:
Makefile.am
misc/Makefile.am
src/Makefile.am
web/includes/Makefile.am
web/js/Makefile.am
web/skins/classic/css/classic/views/Makefile.am
web/skins/classic/css/flat/views/Makefile.am
web/skins/classic/views/Makefile.am
web/skins/classic/views/js/Makefile.am
2016-02-26 22:19:02 +11:00
Andrew Bauer
ab7b4ab3e6
Merge pull request #1221 from ZoneMinder/rotate_dimensions_when_image_is_rotated
...
implement Width and Height functions, and test for image rotation and…
2016-02-04 10:17:19 -06:00
Isaac Connor
4520902dd2
use trim on values when saving.
2016-01-14 09:37:41 -05:00
Isaac Connor
f5db14d823
return empty for the non multi-server case
2016-01-04 13:46:05 -05:00
Isaac Connor
45fc689203
implement Width and Height functions, and test for image rotation and output opposite dimension. Fixes #1220
2016-01-04 13:15:50 -05:00
Isaac Connor
f72260733c
Only do CORSHeaders if there is more than 1 server
2016-01-04 09:38:24 -05:00
Isaac Connor
d256530896
return early if no servers are defined instead of logging a warning
2016-01-04 09:36:45 -05:00
Isaac Connor
c639822d62
When Server is not set, us ZM_BASE_PATH
2016-01-03 11:55:53 -05:00
Isaac Connor
12ee147bc7
Add a find_all function to return an array of Server objects
2015-12-31 10:13:48 -05:00
Isaac Connor
6df1425897
Slight update to allow the instantiation with no row or Id
2015-12-22 09:52:33 -05:00
Isaac Connor
aaa9f3bcc9
Handle case where parameter is not passed to constuctor
2015-12-15 11:19:50 -05:00
Isaac Connor
6cfd993890
Merge branch 'master' into multi-server
2015-12-09 10:43:38 -05:00
Isaac Connor
53dec9f26d
check for setting of __REQUEST['object'] to silence php NOTICE
2015-12-09 10:43:23 -05:00
Isaac Connor
e6c9830728
Use Monitor class instead of old sql
2015-12-09 09:23:36 -05:00
Isaac Connor
961dc90b0e
add Server function
2015-12-02 11:21:04 -05:00
Isaac Connor
b8fb711593
only do CORS if Origin is set
2015-12-02 11:02:47 -05:00
Isaac Connor
62adb756a9
put back CORS validity checking code
2015-12-02 10:12:20 -05:00
Isaac Connor
3f8a45bbbb
Add a function to setup CORS access headers
2015-12-02 10:05:03 -05:00
Isaac Connor
a799a1ce79
Make Server constructor take a row or an id
2015-12-02 10:04:47 -05:00
Isaac Connor
c5d57b5b64
convert monitor hash accesses to function calls
2015-12-01 15:16:43 -05:00
Isaac Connor
945949ebc0
fix __call to actually return the value
2015-12-01 15:16:18 -05:00
Isaac Connor
2dfa6d6bae
add Url and __call functions
2015-12-01 15:16:07 -05:00
Isaac Connor
e85ba683e1
improve constructor to handle numeric as well, and give error when something else
2015-12-01 14:29:57 -05:00
Isaac Connor
e4f5f76782
rewrite constructor to take a row as well as an Id
2015-12-01 14:03:55 -05:00
Isaac Connor
4d6c4355db
Merge branch 'master' into multi-server
2015-11-20 16:07:50 -05:00
Isaac Connor
a0d4934b84
Have PDO actually throw exceptions on db errors. Prior to this it would have been just failing silently. Also, fix a . to -> in the exception catcher.
2015-11-11 16:56:28 -05:00
Isaac Connor
2237391876
white spacing, and fix loading of Server objects in monitor
2015-10-15 09:28:35 -04:00
Isaac Connor
6570a8d855
fix Server->Hostname()
2015-10-02 18:22:19 +00:00
Isaac Connor
00ef849908
fix line testing for Hostname
2015-10-02 15:29:17 +00:00
Isaac Connor
e4d51e1819
Merge branch 'master' into multi-server
2015-09-28 10:04:23 -04:00
Pliable Pixels
d751c3ad61
recaptcha now displays translated message if secret is wrong
2015-09-25 11:11:15 -04:00
Pliable Pixels
e5a6889253
fixed conflict
2015-09-24 15:51:16 -04:00
Pliable Pixels
23b549a471
recaptcha fixes to avoid lockout
2015-09-24 15:44:35 -04:00
Pliable Pixels
ae6fd7daea
fixed constant check when not defined
2015-09-24 09:57:43 -04:00
Isaac Connor
ba1100fc03
continue conversion from array to class of Monitor
2015-09-17 16:06:47 -04:00
Isaac Connor
01718aaffb
consturctor just takes an id
2015-09-17 15:34:26 -04:00
Isaac Connor
13327b7651
Load Controls if appropriate
2015-09-17 15:34:09 -04:00
Isaac Connor
52cdb8a05a
add Monitor class
2015-09-17 15:29:36 -04:00
Isaac Connor
ac5f42efcf
add a class for Server objects
2015-09-16 15:16:07 -04:00
Isaac Connor
a8ba32db64
add Server.php to autoconf build
2015-09-16 14:51:59 -04:00
Isaac Connor
73badd1c2d
check for value of ZM_SERVER_NAME and ZM_SERVER_HOST and include it in the error message
2015-09-16 11:12:04 -04:00
Isaac Connor
535a760f26
Merge branch 'master' into multi-server
...
Conflicts:
configure.ac
2015-09-16 09:12:55 -04:00
Isaac Connor
fb872315d1
add an error log entry for unknown action
2015-09-16 08:38:53 -04:00
Isaac Connor
b680aa41c5
save should be Save
2015-09-15 17:26:31 -04:00
Isaac Connor
d235733290
Need to include logger if we are going to use Error
2015-09-14 15:57:22 -04:00
Andrew Bauer
04fcc253bd
Merge pull request #1048 from pliablepixels/1046-google-recaptcha
...
Google recaptcha
2015-09-01 08:18:54 -05:00
Pliable Pixels
22a7a1d53d
Handled situation where user enables captcha but forgets to supply keys
2015-08-31 20:39:28 -04:00
Isaac Connor
bb41ebf776
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
2015-08-31 16:03:40 -04:00
Pliable Pixels
feeb890be2
removed recaptcha client dependency
2015-08-29 15:14:20 -04:00
Pliable Pixels
f7fea2fe48
Removed dependency on recaptcha client library
2015-08-29 15:13:15 -04:00
Pliable Pixels
73fa051ef8
Google recaptcha
2015-08-29 13:29:52 -04:00
Andy Bauer
395e628541
Merge branch 'new_rtsp_describe' of https://github.com/knnniggett/ZoneMinder into knnniggett-new_rtsp_describe
...
Conflicts:
CMakeLists.txt
configure.ac
version
2015-08-29 07:57:18 -05:00
Isaac Connor
75919c9cd5
Merge branch 'master' into multi-server
...
Conflicts:
docs/installationguide/ubuntu.rst
misc/apache.conf.in
src/zm_monitor.cpp
2015-08-27 10:34:47 -04:00
Robin Daermann
d68e8e8f68
Restart capture process after deleting a Privacy zone
2015-08-27 10:12:54 +02:00
Robin Daermann
dc8a3769e7
Make the capture process restart if a Privacy zone got changed
2015-08-27 09:45:12 +02:00
Andrew Bauer
2fbf79674b
Add RTSP Describe checkbox to web console
2015-08-21 10:32:50 -05:00
Isaac Connor
880e77b096
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2015-08-19 13:30:48 -04:00
Andrew Bauer
c78f39c106
Merge pull request #962 from Linwood-F/959-add-exif-date-time-to-images
...
959 add exif date time to images
2015-08-18 13:46:54 -05:00
Linwood-F
987db68452
Fix extra image copy; fix options unset of exif toggle
2015-08-18 14:39:55 -04:00
Andy Bauer
64299082ad
Send login activity to the zoneminder event log
2015-08-17 17:54:17 -05:00
Andrew Bauer
5b2155f551
define Groups permission for the default user
2015-08-15 16:47:07 -05:00
Andrew Bauer
0dc35553ef
modify group delete action
2015-08-15 14:03:11 -05:00
Andrew Bauer
1d688be1a1
propagate canEditGroup permission
2015-08-15 13:22:13 -05:00
Andrew Bauer
2770e752b4
create new permission group "Groups" in php
2015-08-15 11:56:51 -05:00
Isaac Connor
441a82e611
fixup loading SERVER_ID from SERVER_NAME
2015-07-17 10:12:44 -04:00
Isaac Connor
69e1fd8b18
add code to convert the human readable config entry ZM_SERVER_NAME into ZM_SERVER_ID
2015-07-09 11:45:19 -04:00
Isaac Connor
04366e752a
add Servers to options, a server editing popup and a server selection to monitors
2015-07-09 11:41:46 -04:00
Andrew Bauer
3a94712db2
add translate function
2015-05-10 08:10:30 -05:00
Andrew Bauer
4182fb3295
Don't show ONVIf probe link when ONVIF support is not enabled
2015-02-21 11:12:07 -06:00
Andrew Bauer
8657d0a243
Merge pull request #696 from ZoneMinder/improve_deleteEvent
...
Improve delete event
2015-02-09 07:15:27 -06:00
Isaac Connor
4524a61a50
prevent error message in log when Enabled is not checked
2015-02-06 14:15:26 -05:00
Isaac Connor
fed6748c6d
fixes to format date into zero padding and year as 2 digit
2015-02-06 13:00:55 -05:00
Isaac Connor
dbac099223
we don't use EndTime so don't load it
2015-02-06 11:50:23 -05:00
Isaac Connor
bcdac0104f
pass a minimum event hash instead of the event id to deleteEvent
2015-02-06 11:50:07 -05:00
Isaac Connor
9a1e210849
add comment
2015-02-06 11:46:35 -05:00
Isaac Connor
02a6c78182
make deleteEvent take either an event object or an eid.
...
load the relevant event data if passed an eid.
Use the StartTime to get to the event files instead of globbing the entire events path under the monitor.
2015-02-06 11:41:37 -05:00