0b9853e1d4
ZoneMinder: Rename public enum CHAR_WIDTH/CHAR_HEIGHT to avoid conflicts
...
CHAR_WIDTH is defined by limits.h, and class Image redefines it to 6,
which causes gcc6, clang, gcc5 to complain about it.
Fix by adding ZM_ prefix to CHAR_WIDTH and CHAR_HEIGHT, so it can be
compiled.
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
2017-03-12 22:00:46 +08:00
2686946ce9
Merge pull request #1800 from knnniggett/fix_deb_zm.conf_perms
...
fix permissions on zm.conf in deb pkg scripts
2017-03-05 13:32:48 -05:00
f66408b998
update the path to zm.conf
2017-03-05 10:50:09 -06:00
cfeb12fc73
fix permissions on zm.conf in deb pkg scripts
2017-03-05 10:37:44 -06:00
f9c6742c25
Merge pull request #1794 from knnniggett/getdiskpercent
...
use === operator in getDiskPercent function
2017-02-21 14:53:36 -05:00
8759e2bdb4
prevent divide by zero, make error messages more descriptive
2017-02-21 13:10:41 -06:00
27ca8d8674
use === operator in getDiskPercent function
2017-02-21 12:33:05 -06:00
971c70f540
Merge pull request #1793 from mnoorenberghe/api_debug_default
...
Reduce the default API debug level
2017-02-20 21:44:48 -05:00
81403eb1ce
Merge pull request #1792 from kunkku/link-content
...
zmlinkcontent: fix syntax error
2017-02-20 06:52:46 -06:00
548464c0d5
zmlinkcontent: fix syntax error
2017-02-20 11:12:15 +02:00
6ecfdf2c31
Merge pull request #1790 from vajonam/1789-fix-misssing-isset-check
...
fix missing isset check, caused number of Undefined Property warnings
2017-02-19 17:12:26 -05:00
df4739826b
Reduce the default API debug level
2017-02-18 23:06:53 -08:00
f50c0e2096
fix missing isset check, caused number of Undefined Property warnings
2017-02-18 11:15:43 -05:00
33e8afa0e0
only patch packpack if it is not already patched
2017-02-17 13:25:17 -06:00
b2b73edbfa
Merge pull request #1785 from vajonam/1784-wrong-key-for-alarmref
...
fix usage of wrong key
2017-02-17 11:13:06 -07:00
11b90e6011
fix usage of wrong key
2017-02-17 12:37:58 -05:00
dc76a876a1
packpack rpm specfile - ensure Crud submodule folder is empty
2017-02-17 07:07:17 -06:00
4809a5d7de
patch packpack to remove "bebian" from the tarball filename
2017-02-16 15:59:43 -06:00
1c5f5e9109
Merge pull request #1777 from vajonam/1776-fix-typo
...
fix typo for correct checking if a command has excuted for an event, …
2017-02-15 09:07:02 -05:00
f0b2910647
fix typo for correct checking if a command has excuted for an event, prevents execution on every filter run
2017-02-15 08:10:50 -05:00
9dcbb8cf4d
Merge pull request #1774 from michaelarnauts/docker-no-ssh
...
Remove SSH server from docker image
2017-02-14 21:40:45 +11:00
c3da373b1b
Disable SSH
2017-02-14 10:52:00 +01:00
bf94980516
Merge pull request #1773 from ZoneMinder/SteveGilvarry-patch-1
...
Add the missing F back in.
2017-02-13 08:15:16 -07:00
bf99d132c7
Add the missing F back in.
2017-02-13 22:15:10 +11:00
5201abd77d
Merge pull request #1770 from ZoneMinder/undo_1590
...
remove line that causes endless reading when doing single image mode
2017-02-11 09:14:07 -06:00
d5bb6f3210
remove line that causes endless reading when doing single image mode
2017-02-11 09:57:36 -05:00
9b7465b328
Merge pull request #1767 from knnniggett/preset_docs
...
add motion zone preset disclaimer
2017-02-10 09:43:11 -05:00
e680941568
add motion zone preset disclaimer
2017-02-10 08:30:13 -06:00
91dd2105d2
rpmspecfile - use %{_sysconfdir} macro
2017-02-08 20:44:00 -06:00
bd4aea0385
rpm specfile - php requires was listed twice
2017-02-08 20:21:23 -06:00
9c8c87f591
rpm specfile - require php-mysqli, bump to 1.30.2
2017-02-08 20:12:54 -06:00
8feac1747d
Merge pull request #1764 from ZoneMinder/vulerability-fixes
...
sql injection and session fixation vulerability fixes
2017-02-04 16:23:51 -06:00
5804cd2462
Merge pull request #2 from connortechnology/fix_sql_injection
...
Sanitize input parameters
2017-02-04 15:05:54 -07:00
c5906a5d4f
Merge pull request #6 from connortechnology/log_xss_fixes2
...
Log xss fixes2
2017-02-04 16:05:43 -06:00
024dd54716
Merge pull request #7 from ZoneMinder/pdo-emulated-prepares
...
Tell PDO to use real prepared statements.
2017-02-04 15:05:25 -07:00
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
9135da92ed
fix typo fileFields => filterFields
2017-01-31 21:33:43 -05:00
3437f23e8a
Merge branch 'master' into fix_sql_injection
2017-01-28 14:33:49 -05:00
41dab0750e
turn whatever gets output into html escaped html so that nothing gets revealed
2017-01-27 21:30:22 -05:00
b5e995712e
Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder-Pro
2017-01-27 17:43:58 -05:00
a8d1450adf
Merge branch 'master' into fix_sql_injection
2017-01-27 17:18:34 -05:00
746a096483
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-01-27 15:16:33 -07:00
c1e05753d6
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder-Pro
2017-01-27 17:12:46 -05:00
9e9b1a3a35
Merge pull request #1758 from knnniggett/sanitize_image_path
...
sanitize the image path before processing
2017-01-27 09:41:54 -05:00
20f31ce804
Merge pull request #1759 from knnniggett/packpack_crud
...
check if crud plugin exists before unpacking
2017-01-27 09:37:05 -05:00
fbb8375a1a
check if crud plugin exists before unpacking
2017-01-25 10:49:58 -06:00
dbd73690b2
use !== false rather than === true
2017-01-25 09:26:07 -06:00
6189d2670c
ZM_DIR_EVENTS can be, and often is, a symlink
2017-01-25 09:05:34 -06:00
8b19fca992
sanitize the image path before processing
2017-01-25 08:30:19 -06:00
13dc11bdf5
Merge pull request #1717 from connortechnology/fix_mmap_leak
...
must call zmMemInvalidate before next
2017-01-24 19:39:51 -06:00
Qu Wenruo
Isaac Connor
Andy Bauer
Kaarle Ritvanen
Matthew Noorenberghe
Manojav Sridhar
Andrew Bauer
Kyle Johnson
Andrew Bauer
Steve Gilvarry
Michaël Arnauts
Isaac Connor