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 |
|
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 |