Andrew Bauer
526d1bc99e
configure rsync xfers to zmrepo
2017-02-27 09:45:08 -06:00
Andrew Bauer
b9cd96b269
initial ssh config, add encrypted rsa keys
2017-02-27 08:38:58 -06:00
Isaac Connor
f9c6742c25
Merge pull request #1794 from knnniggett/getdiskpercent
...
use === operator in getDiskPercent function
2017-02-21 14:53:36 -05:00
Andy Bauer
8759e2bdb4
prevent divide by zero, make error messages more descriptive
2017-02-21 13:10:41 -06:00
Andy Bauer
27ca8d8674
use === operator in getDiskPercent function
2017-02-21 12:33:05 -06:00
Isaac Connor
971c70f540
Merge pull request #1793 from mnoorenberghe/api_debug_default
...
Reduce the default API debug level
2017-02-20 21:44:48 -05:00
Andrew Bauer
81403eb1ce
Merge pull request #1792 from kunkku/link-content
...
zmlinkcontent: fix syntax error
2017-02-20 06:52:46 -06:00
Kaarle Ritvanen
548464c0d5
zmlinkcontent: fix syntax error
2017-02-20 11:12:15 +02:00
Isaac Connor
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
Andy Bauer
4f8b11d56f
move bash commands into external script
2017-02-19 10:18:59 -06:00
Andy Bauer
c305f9dbfd
add set -ev
2017-02-19 07:56:34 -06:00
Andy Bauer
8dbea3a20a
set correct perms on zm.conf
2017-02-19 07:40:34 -06:00
Matthew Noorenberghe
df4739826b
Reduce the default API debug level
2017-02-18 23:06:53 -08:00
Dan Walkes
aa1aeeeca4
Additional controls for FI8908W cameras
...
Mobile application ZM View uses relative move commands and presetGoto
commands which were not supported by the previous version of the script.
Add these commands based on documentation in
http://www.foscam.es/descarga/ipcam_cgi_sdk.pdf
Commands were tested on an FI8908W camera running version 11.37.2.65
firmware
2017-02-18 17:14:59 -07:00
Manojav Sridhar
f50c0e2096
fix missing isset check, caused number of Undefined Property warnings
2017-02-18 11:15:43 -05:00
Andy Bauer
d64de1f65a
remove clang compiler for now
2017-02-18 09:04:52 -06:00
Andy Bauer
a66c15f8a3
use sudo and specify full path to binaries
2017-02-18 08:36:04 -06:00
Andy Bauer
3bdb84cf0f
initial commit to use packpack
2017-02-18 07:57:51 -06:00
Andrew Bauer
33e8afa0e0
only patch packpack if it is not already patched
2017-02-17 13:25:17 -06:00
Kyle Johnson
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
Manojav Sridhar
11b90e6011
fix usage of wrong key
2017-02-17 12:37:58 -05:00
Andrew Bauer
dc76a876a1
packpack rpm specfile - ensure Crud submodule folder is empty
2017-02-17 07:07:17 -06:00
Andrew Bauer
4809a5d7de
patch packpack to remove "bebian" from the tarball filename
2017-02-16 15:59:43 -06:00
Isaac Connor
4792d21a68
use source format 1.0
2017-02-15 10:56:38 -05:00
Isaac Connor
2bf4b5ad1a
use escapeshellarg on inputs to daemonControl and other functions where exec is called
2017-02-15 09:45:25 -05:00
Isaac Connor
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
Manojav Sridhar
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
Steve Gilvarry
9dcbb8cf4d
Merge pull request #1774 from michaelarnauts/docker-no-ssh
...
Remove SSH server from docker image
2017-02-14 21:40:45 +11:00
Michaël Arnauts
c3da373b1b
Disable SSH
2017-02-14 10:52:00 +01:00
Kyle Johnson
bf94980516
Merge pull request #1773 from ZoneMinder/SteveGilvarry-patch-1
...
Add the missing F back in.
2017-02-13 08:15:16 -07:00
Steve Gilvarry
bf99d132c7
Add the missing F back in.
2017-02-13 22:15:10 +11:00
Andrew Bauer
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
Isaac Connor
d5bb6f3210
remove line that causes endless reading when doing single image mode
2017-02-11 09:57:36 -05:00
Isaac Connor
9b7465b328
Merge pull request #1767 from knnniggett/preset_docs
...
add motion zone preset disclaimer
2017-02-10 09:43:11 -05:00
Andrew Bauer
e680941568
add motion zone preset disclaimer
2017-02-10 08:30:13 -06:00
Andrew Bauer
91dd2105d2
rpmspecfile - use %{_sysconfdir} macro
2017-02-08 20:44:00 -06:00
Andrew Bauer
bd4aea0385
rpm specfile - php requires was listed twice
2017-02-08 20:21:23 -06:00
Andrew Bauer
9c8c87f591
rpm specfile - require php-mysqli, bump to 1.30.2
2017-02-08 20:12:54 -06:00
SteveGilvarry
b791504598
Wording of help text fixes
2017-02-06 08:01:04 +11:00
SteveGilvarry
9716c4ef89
Add Option help
2017-02-05 18:43:47 +11:00
SteveGilvarry
c72704bf0b
Change descriptions for ffmpeg methods and put TCP first.
2017-02-05 15:34:06 +11:00
Andrew Bauer
8feac1747d
Merge pull request #1764 from ZoneMinder/vulerability-fixes
...
sql injection and session fixation vulerability fixes
2017-02-04 16:23:51 -06:00
Kyle Johnson
5804cd2462
Merge pull request #2 from connortechnology/fix_sql_injection
...
Sanitize input parameters
2017-02-04 15:05:54 -07:00
Andrew Bauer
c5906a5d4f
Merge pull request #6 from connortechnology/log_xss_fixes2
...
Log xss fixes2
2017-02-04 16:05:43 -06:00
Kyle Johnson
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
Kyle Johnson
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
Isaac Connor
9135da92ed
fix typo fileFields => filterFields
2017-01-31 21:33:43 -05:00
Isaac Connor
3437f23e8a
Merge branch 'master' into fix_sql_injection
2017-01-28 14:33:49 -05:00
Isaac Connor
41dab0750e
turn whatever gets output into html escaped html so that nothing gets revealed
2017-01-27 21:30:22 -05:00
Isaac Connor
b5e995712e
Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder-Pro
2017-01-27 17:43:58 -05:00