dd4b93f130
add submodule video.js, using release tag v5.18.4
2017-04-20 10:35:32 -04:00
fb2f8022a7
don't use external hosted video.js or moment.js
2017-04-20 10:12:47 -04:00
3db38eb474
limit points to the limits of the monitor
2017-04-19 16:12:12 -04:00
fbbe748bc8
Restore old behaviour for events that don't have a video
2017-04-19 14:15:32 -04:00
dd4ea635e8
remove rotate, as the video file itself has the rotate set
2017-04-19 13:12:15 -04:00
8fbe765a7d
Set filename so that save as gives the correct filename
2017-04-19 13:11:15 -04:00
b87839f785
turn off csrf on view=view_video
2017-04-19 10:12:51 -04:00
7697b8c7be
" to '
2017-04-19 10:09:27 -04:00
71a9763c32
add a comment
2017-04-19 10:02:31 -04:00
d1d4fa7b8f
fix the redirect location
2017-04-19 10:02:07 -04:00
b71d021ae1
Merge branch 'fix_1849' into storageareas
2017-04-18 12:43:04 -04:00
f2920c37e0
escapeshellarg adds quotes, which is bad. Use escapeshellcmd on the whole string instead.
2017-04-18 12:31:20 -04:00
008624451f
Merge pull request #1856 from connortechnology/remove_BOM
...
use dos2unix to remove BOM
2017-04-17 08:32:17 -05:00
a164118ad3
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-04-16 11:26:30 -04:00
273229858f
Merge branch 'master' into storageareas
2017-04-16 11:26:18 -04:00
f1f54205fb
Merge branch 'remove_BOM' into storageareas
2017-04-16 09:28:35 -04:00
5e0012569f
use dos2unix to remove BOM
2017-04-16 09:22:37 -04:00
0efca38d68
Merge pull request #1854 from knnniggett/caketmp
...
make cake tmp = zoneminder tmp
2017-04-15 10:23:03 -04:00
ab4b5e6b69
Merge pull request #1853 from knnniggett/cakecache
...
change cake cache engine from File -> Apc
2017-04-14 21:10:23 -04:00
0b729cf295
modify cmakelists.txt
2017-04-14 15:15:29 -05:00
d2490cf7e3
make cake tmp = zoneminder tmp
2017-04-14 15:11:41 -05:00
48a73f7e78
change cache engine from File -> Apc
2017-04-14 14:31:42 -05:00
3cbd32cd41
move cake log to zoneminder log folder
2017-04-14 14:24:29 -05:00
a5e7db0f7c
use faster ffmpeg method to generate frame image
2017-04-13 12:35:14 -04:00
7d6505f015
use Delta to grab frame from video, using -ss for speed
2017-04-12 16:17:19 -04:00
f97e074393
braces fixes
2017-04-12 16:16:56 -04:00
d039227f79
Merge branch 'master' into storageareas
2017-04-12 13:51:10 -04:00
d462dfdb77
fix error message when fid not specified
2017-04-07 13:20:54 -04:00
92a2d6f4f2
hide the video, let's stick with jpeg's, which will be auto-generated
2017-04-07 13:20:28 -04:00
8f51331472
fix timeline view by using view=image instead of direct path
2017-04-07 13:20:04 -04:00
2b9a0f96d3
remove and break over multiple lines
2017-04-05 16:10:06 -04:00
d611840750
whitespace, handle NaN in limitArea
2017-04-05 16:09:40 -04:00
c5ff45922f
fix zone edit height
2017-04-05 16:09:06 -04:00
7815f1c539
introduce a redirect flag global variable to allow us to redirect. Which allows to redirect on successful login so we don't get repost popups
2017-04-05 10:05:21 -04:00
a10d52a3e1
Merge pull request #1844 from connortechnology/fix_1812
...
fix Monitors filtering SQL
2017-04-03 20:06:39 -05:00
08766b7546
decrease wait time in order to achieve greater throughput. flush after every print so that we don't buffer the whole file
2017-03-31 14:33:00 -04:00
58d119d9ed
Merge branch 'fix_1762' into storageareas
2017-03-31 13:38:59 -04:00
514c83d3e9
whitespace and add a test for ->Triggers being an array
2017-03-31 12:01:37 -04:00
d1a60dedc8
Fix the overzealous use of escapeshellcmd that breaks restarting monitors
2017-03-31 11:59:55 -04:00
d3f6ab3d29
fix Monitors filtering SQL
2017-03-30 13:06:54 -04:00
56476a7774
uppercase SQL
2017-03-30 13:05:10 -04:00
4f2dcdacb4
update, remove styles and fix the sql for limiting monitors
2017-03-30 13:04:16 -04:00
dd4550406f
remove styles from montagereview and stick them in a view-specific css
2017-03-30 13:03:46 -04:00
7e3b27a130
Test for Controllable as well as ControlId
2017-03-30 10:49:02 -04:00
b2db0888ae
add a warning if csrf_check returns false
2017-03-30 10:46:13 -04:00
5ea77f0781
Make zones a link to zones_overview
2017-03-30 10:45:55 -04:00
538658403c
Merge pull request #1822 from knnniggett/csrf
...
Implement CSRF Mitigation
2017-03-30 10:39:55 -04:00
fe223e3b29
remove a warning when adding users when not logged in (could happen if OPT_AUTH isn't turned on yet
2017-03-29 10:38:29 -04:00
35067211e0
more the csrf to before actions.php
2017-03-29 10:19:00 -04:00
3cd9e46df9
Merge branch 'knnniggett-csrf' into storageareas
2017-03-28 20:44:38 -04:00
d006ebfc3c
Merge branch 'csrf' of https://github.com/knnniggett/ZoneMinder into knnniggett-csrf
2017-03-28 20:10:59 -04:00
769af661e9
Merge branch 'fix_x10' into storageareas
2017-03-28 20:05:52 -04:00
589b369109
fix inserting x10 record with missing ,
2017-03-28 20:03:46 -04:00
eb55a6bb9b
set action,view, and/or request to NULL if there are not defined
2017-03-28 17:52:31 -05:00
4e16ae6d19
add ZM_ENABLE_CSRF_MAGIC toggle
2017-03-28 17:29:36 -05:00
4d2fb6b7f8
don't need to reload when deleting. The row will no longer be in there
2017-03-27 13:13:48 -04:00
7b63461517
attempt to support redirecting to the given url instead of just refreshing
2017-03-27 13:13:08 -04:00
8ef7a708bd
updates in filters, try to get the new filter loaded when saving with a new name
2017-03-27 13:12:37 -04:00
7360619941
Merge branch 'master' into storageareas
2017-03-24 11:53:45 -04:00
8bd34a982d
only use scale if it has a value
2017-03-21 15:30:22 -04:00
6081374ace
Updated Russian translation
2017-03-21 17:39:22 +03:00
eaca58bb7c
Merge pull request #1815 from mnoorenberghe/postlogin
...
Properly escape postLoginQuery. Fixes #1797
2017-03-21 10:27:13 -04:00
670c1a3c7c
pass NULL for ['width']
2017-03-21 09:47:07 -04:00
ea558c79a0
Fix check that API user is enabled
2017-03-20 17:16:24 -07:00
badbf1c74c
Merge pull request #1816 from mnoorenberghe/flat_window_sizes
...
Increase default window sizes for the flat theme. Fixes #1059
2017-03-20 13:10:13 -04:00
70246ce55a
whitespace corrections and ensure that options[width] and options[height] are defined
2017-03-20 12:10:28 -04:00
2dcd95bc7f
Merge pull request #1504 from ZoneMinder/improve_filter
...
Improve filter
2017-03-18 21:12:58 -05:00
d38bae72ae
integrate csrf-magic library
2017-03-18 20:12:06 -05:00
a16ea554a3
Swap to PNG
2017-03-18 22:34:13 +11:00
c7955cd1b6
Add eslint configuration files extending Google's rules
2017-03-18 00:02:17 -07:00
91ad6afffb
Increase default window sizes for the flat theme. Fixes #1059
...
Used the computed height of <html> and rounded up the nearest multiple of 5.
2017-03-17 22:24:42 -07:00
ea5342abd2
Properly escape postLoginQuery. Fixes #1797
2017-03-17 21:05:28 -07:00
8834109812
code style and whitespace changes
2017-03-17 09:59:23 -04:00
d9c665b021
Merge branch 'fix_crash_with_invalid_zones' into storageareas
2017-03-17 09:35:11 -04:00
9681a444b4
Merge pull request #1765 from SteveGilvarry/ffmpeg_url
...
Align Method description to what it is actually doing
2017-03-16 09:32:30 -05:00
7e0ac4b239
Merge pull request #1780 from connortechnology/fix_1775
...
use escapeshellarg on inputs to daemonControl and other functions
2017-03-16 09:27:04 -05:00
5bccd92b68
fix scoping of scale var
2017-03-16 09:53:53 -04:00
9f99d34807
fix calls to getStreamHTML
2017-03-13 14:22:33 -04:00
14c4a156c6
set img.src='' first so that Chrome closes the old stream.
2017-03-06 20:21:12 -05:00
4df12ae370
Merge branch 'montage_width_height' of github.com:ConnorTechnology/ZoneMinder into montage_width_height
2017-03-06 17:30:00 -05:00
d3f7451736
Merge branch 'storageareas' into montage_width_height
2017-03-06 16:56:18 -05:00
fdcb93eacc
Merge branch 'master' into storageareas
2017-03-06 16:22:28 -05:00
ebafc62b51
Must reopen the session so we can generate an auth hash
2017-03-01 15:27:42 -05:00
4fc0aead70
wip
2017-03-01 15:26:40 -05:00
c4caa9a631
convert arguments from an array of strong to a hash and use http_build_query
2017-02-27 21:48:08 -05:00
c3a52272d8
implement changeWidth, changeHeight and alter getStreamHTML to take an array of options
2017-02-27 20:56:14 -05:00
a0dd36d869
add width and height scale dropdowns
2017-02-27 16:40:40 -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
186e5ba866
Merge branch 'master' into storageareas
2017-02-21 09:48:00 -05: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
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
11b90e6011
fix usage of wrong key
2017-02-17 12:37:58 -05:00
980b088d57
google style and add label tags around Scale
2017-02-17 09:19:54 -05:00
2bf4b5ad1a
use escapeshellarg on inputs to daemonControl and other functions where exec is called
2017-02-15 09:45:25 -05:00
d135216ac7
Merge branch 'master' into storageareas
2017-02-15 09:30:35 -05:00
aeedfe8d74
fix some whitespacing
2017-02-14 09:11:54 -05:00
b791504598
Wording of help text fixes
2017-02-06 08:01:04 +11:00
9716c4ef89
Add Option help
2017-02-05 18:43:47 +11:00
c72704bf0b
Change descriptions for ffmpeg methods and put TCP first.
2017-02-05 15:34:06 +11: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
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
e3edbf40cf
make url full width
2017-02-02 12:16:40 -05:00
7b73eb350f
update to current.
2017-02-02 12:15:16 -05:00
d8c79cb750
fixup header and sidebar layout
2017-02-02 11:31:16 -05:00
cee05a1bb7
fix merge problem
2017-02-02 09:21:49 -05:00
9135da92ed
fix typo fileFields => filterFields
2017-01-31 21:33:43 -05:00
7d451e1e41
float the scale control right, add css for other skins
2017-01-31 11:13:16 -05:00
4a4f62f0a7
add a scale element to the frame view. Include some bits from StorageAreas to make it work
2017-01-31 11:13:16 -05:00
568160e5aa
add a scale element to the frame view. Include some bits from StorageAreas to make it work
2017-01-31 11:13:15 -05:00
6f6eacaa72
fixup classic and dark skins
2017-01-30 21:45:48 -05:00
89022fff0c
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-01-30 21:16:26 -05:00
f3378207c0
make navbar static instead of fixed, sync up dark theme, and improve storage editing styles
2017-01-30 21:16:21 -05:00
ad2e00166a
use isset
2017-01-30 19:53:08 -05:00
4543b3e1b1
include jquery-ui instead of using a cdn version
2017-01-30 19:17:14 -05:00
19aed3f860
dont check ZM_DIR_EVENTS if it already exists in storageareas
2017-01-30 17:29:15 -05:00
9fd9c5de20
test for empty and non-existent path
2017-01-30 17:24:41 -05:00
fda115bebe
tell zmc and zma to stop before updating db
2017-01-30 16:37:53 -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
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
7ab6818fa0
Merge branch 'sanitize_image_path' of https://github.com/knnniggett/ZoneMinder into storageareas_sanitize
2017-01-25 17:14:30 -05: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
129acb5b8e
only show mark column if you have the Monitor Edit ability
2017-01-24 09:30:56 -05:00
5b598fe90d
cleanup and use cleaned up monitor_id
2017-01-23 21:51:38 -05:00
7cd2f6c69e
use glyphicon for sort
2017-01-23 21:51:17 -05:00
bb3d47ab45
get rid of mapping
2017-01-23 21:34:06 -05:00
e937b4099b
add an ajax file for console to do sorting
2017-01-23 10:13:16 -05:00
fdd71a826a
implement dragndrop sorting
2017-01-23 10:12:57 -05:00
35148008b6
make img an inline-block so that it continues having space, even when is a broken link
2017-01-18 21:14:15 -05:00
8ce7719a33
remove extra db call cuz i sredundant
2017-01-18 21:12:54 -05:00
2f3ebd80da
Remove zmf, die..die..die
2017-01-16 13:20:05 -08:00
9c8b229c74
Fix cutnpaste error
2017-01-14 17:08:13 -05:00
899b1b82b9
Merge branch 'filter_by_runstate' into storageareas
2017-01-14 17:07:20 -05:00
242e5a56d8
rough in the ability to filter on RunState
2017-01-14 16:55:28 -05:00
2ce4bad39b
fix Event being undefined when called by path
2017-01-13 14:42:10 -05:00
0e7794f2a7
Merge pull request #1 from connortechnology/cookie_http_only
...
set http_only flag in cookie settings
2017-01-12 09:25:36 -07:00
16fdac3179
fix remSocketFile to remSockFile
2017-01-11 11:14:00 -05:00
2436e40f5d
Merge branch 'master' into storageareas
2017-01-11 10:34:27 -05:00
7ef7a36f39
fix conditional logic in controlcap.js
2017-01-10 17:53:05 -06:00
3074263e06
Merge branch 'control_fixes' into storageareas
2017-01-10 12:54:46 -05:00
55403219d8
fix regexp for direction in control command. Also log if the regexp doesn't match
2017-01-10 12:35:38 -05:00
fea5fa1b59
fix xtell should be -1 for move left
2017-01-10 12:35:02 -05:00
d8b8d78576
Fix storagearea lookup. Default to ZM_EVENTS_DIR
2017-01-09 16:35:58 -05:00
03fd964518
fix parsing StorageID
2017-01-09 14:59:14 -05:00
7ef0c2c9d3
fix deleting filters. We don't need to set fid anymore
2017-01-09 14:58:55 -05:00
cc724a5542
add a question mark to delete confirmation
2017-01-09 14:53:13 -05:00
84183c819c
Merge branch 'master' into storageareas
2017-01-03 09:53:09 -05:00
b4bddee337
Merge branch 'master' into improve_filter
2017-01-03 08:49:56 -05:00
0a90dbac9f
require Event.php and clean up use of object vs db row array. Use newer way of using views/image.php by passing eid and frameid instead of a path.
2017-01-02 10:35:51 -05:00
30674919c4
always include Storage object, because in the end we will be using it everywhere
2017-01-02 10:34:45 -05:00
f6ea52280a
Update Event object to @iconnor's latest which brings us a createListThumbnail function copied from includes/functions
2017-01-02 10:34:15 -05:00
b063d8d6aa
Merge pull request #1728 from connortechnology/path_zms_message
...
Path zms message
2017-01-02 08:54:32 -06:00
5ae34a7561
Merge branch 'master' into storageareas
2017-01-02 09:39:10 -05:00
ef71ae248c
fix ramSocketFile to remSocketFile
2017-01-02 09:31:26 -05:00
d97926c478
fix ramSocketFile to remSocketFile
2017-01-02 09:31:06 -05:00
0d549f1db3
spelling fixes
2016-12-29 10:31:05 +01:00
25ab1bee18
more fixed to gpl license text
2016-12-26 10:40:09 -06:00
2dda2d9e1e
remove unneeded, empty files
2016-12-26 09:49:14 -06:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
0f4b78b180
increase height of bandwidth popup
2016-12-21 10:46:42 -05:00
f92edc3456
refresh stream url when changing scale
2016-12-21 10:40:47 -05:00
02a2fdf58f
Merge branch 'remove_emptys' into storageareas
2016-12-20 16:40:42 -05:00
38c0cedecc
remove the use of empty which on php < 5.5 only supports variables.
2016-12-20 16:37:42 -05:00
c27d0270dc
Merge branch 'knnniggett-zmMemDetach' into storageareas
2016-12-20 15:40:14 -05:00
752f0eb40b
Merge branch 'master' into improve_filter
2016-12-20 11:43:02 -05:00
68a24040ab
Merge pull request #1710 from connortechnology/path_zms_message
...
replace the old socket_sendto error message with something more useful
2016-12-20 10:30:35 -06:00
8b726996f7
FAQ fixes, more text about zms problems in it, and adjust the socket_sendto error message to point to the FAQ entry that is relevant.
2016-12-19 21:36:39 -05:00
fe3f3d91ce
replace the old socket_sendto error message with something more useful so that people stop asking us how to fix it.
2016-12-16 09:12:27 -05:00
794043cbe9
On successful login, tell php to regenerate the session id
2016-12-14 15:06:18 -05:00
ad157cf21c
fix tabs
2016-12-14 14:56:54 -05:00
69c39f8a23
set http_only flag in cookie settings
2016-12-14 14:39:44 -05:00
87e8f91868
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2016-12-13 15:06:07 -05:00
708f52beda
Merge branch 'disk_space_in_events' into storageareas
2016-12-13 13:36:18 -05:00
a9548d3f6b
Add a config entry to turn event disk space on/off
2016-12-13 13:34:56 -05:00
30ec67d4c3
Merge branch 'master' into disk_space_in_events
2016-12-13 13:28:32 -05:00
821f9f8e6e
Merge branch 'fix_sql_injection' into storageareas
2016-12-08 15:58:10 -05:00
b5e4c94682
test for integer string as well
2016-12-08 15:58:00 -05:00
4fa24dcda4
Merge branch 'fix_sql_injection' into storageareas
2016-12-08 15:53:46 -05:00
7c84e2417d
remove extra ?
2016-12-08 15:53:38 -05:00
f68c73b4a8
Merge branch 'fix_sql_injection' into storageareas
2016-12-08 15:52:52 -05:00
08370b010e
Merge branch 'log_xss_fixes' into storageareas
2016-12-08 15:52:37 -05:00
42fdd1fbe9
Use htmlentities on the error message when dying because the string will be sent to the browser and if it includes scripts they will be run.
2016-12-08 15:52:21 -05:00
c8009baf3f
fix missing ; and test for integer string in limit
2016-12-08 15:46:42 -05:00
acbc5bc9e3
Merge branch 'cookie_http_only' into storageareas
2016-12-08 15:20:54 -05:00
772792a1b9
remove extra ,
2016-12-08 15:20:43 -05:00
ced701f56f
Merge branch 'fix_sql_injection' into storageareas
2016-12-08 14:58:50 -05:00
7f2bf04c2f
Merge branch 'cookie_http_only' into storageareas
2016-12-08 14:26:13 -05:00
20793ee822
set httpOnly to true on cookie creation. This will override whatever is in php.ini
2016-12-08 14:25:29 -05:00
d600eb0e8b
Merge branch 'master' into fix_sql_injection
2016-12-08 13:39:04 -05:00
e7d0861530
check limit for a valid integer and complain if not.
2016-12-08 13:37:23 -05:00
587fd16aa6
Add testing for limit, sortField and all the filters to ensure that they are valid.
2016-12-08 13:31:44 -05:00
857b4e8345
Merge branch 'master' into improve_filter
2016-12-06 11:58:41 -05:00
986567839e
Additional minor changes
2016-12-02 10:08:49 +01:00
e27639f599
Updated dutch translation
2016-12-02 09:49:50 +01:00
9e5f52a0ae
fix MonitorId is part of event, not frame
2016-11-29 15:25:51 -05:00
2adb17ad90
fix type
2016-11-29 15:25:24 -05:00
c2d6b3d809
fix auth
2016-11-29 15:25:10 -05:00
f9af1e7129
put authorized check back after including actions.php where it needs to go
2016-11-28 11:34:46 -05:00
be5b4691da
check for isset of SESSION['username'] instead of just assuming it exists
2016-11-22 15:35:07 -05:00
9312eed17f
Merge branch 'master' into disk_space_in_events
2016-11-22 10:58:24 -05:00
02cd3e8cba
Merge branch 'master' into small_fixes
2016-11-22 10:52:07 -05:00
6bf921a858
Add thumbnanils to the frames view. Also add a content-disposition header and some url mangling to help browsers give a useful filename when doing Save Image As
2016-11-21 12:28:15 -05:00
4fe6b6f8b7
set a min width so that small images or fps updates don't cause a reflow
2016-11-21 11:39:31 -05:00
c360e27b02
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-11-17 13:13:47 -05:00
bb6b0c2d49
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into improve_filter
2016-11-17 12:16:49 -05:00
4eb5ff7aff
Fix Undefined index: loginFailed. Resolves #1684
2016-11-16 19:42:04 -07:00
2bd080a6a6
Merge branch 'master' into storageareas
2016-11-15 08:41:00 -05:00
8f71971209
Show error message upon unsuccessful login. Fixes #1648 ( #1680 )
...
* Add additional post-cmake files to .gitignore
* Add bootstrap 3.3.7
* Load bootstrap css
* Restyle login page, move recaptcha js to <head>
The way it was handled previously resulted in
invalid html, with an extra <head> tag being
inserteed inside the <body>.
* Update doctype to HTML5, add meta tags for mobile browsers
* Move inline Login css to css file
* Remove extra php tag in functions.php
* Show error message upon unsuccessful login. Fixes #1648
* Includes bootstrap glyphicons as they're used in the error message.
* Failure check is done via a simple test in login.js.php and login.js.
The 'view' param will only be set (to 'postlogin') if the login page
has refreshed due to a failed login. Otherwise you're directed to
the console view.
* Only load bootstrap css in specific views.
Bootstrap was causing some styling conflicts with the legacy css.
As such only load bootstrap.css on pages which we have specifically
allowed, which would be pages that have been restyled and verified.
* Test for invalid login via session variable.
The previous method had cases where the error messsage was displayed
when it shouldn't have been, such as when specifying ?view=login
* Fix a few typos in login inputs
* Add new fonts directory to web CMakeLists
2016-11-14 21:24:43 -05:00
b0d22aa2a5
Add new fonts directory to web CMakeLists
2016-11-14 19:23:05 -07:00
3b7723ee8f
Merge branch 'master' into storageareas
2016-11-11 22:40:00 -05:00
49d8e35e56
Show available PATH_MAP percent on console ( #1675 )
...
* Add PATH_SWAP percent to console
* add changes to console.php
* use ZM_PATH_MAP instead of ZM_PATH_SWAP
* show the folder name PATH_MAP points to
* use a dash as the delimiter instead of fwd slash
2016-11-11 08:47:08 -05:00
65fe07e7aa
Fix a few typos in login inputs
2016-11-10 23:36:28 -07:00
95d00f70a3
Test for invalid login via session variable.
...
The previous method had cases where the error messsage was displayed
when it shouldn't have been, such as when specifying ?view=login
2016-11-10 23:29:12 -07:00
3916b02a74
Only load bootstrap css in specific views.
...
Bootstrap was causing some styling conflicts with the legacy css.
As such only load bootstrap.css on pages which we have specifically
allowed, which would be pages that have been restyled and verified.
2016-11-10 23:07:52 -07:00
0800a69a57
Show error message upon unsuccessful login. Fixes #1648
...
* Includes bootstrap glyphicons as they're used in the error message.
* Failure check is done via a simple test in login.js.php and login.js.
The 'view' param will only be set (to 'postlogin') if the login page
has refreshed due to a failed login. Otherwise you're directed to
the console view.
2016-11-10 22:51:32 -07:00
97fb53e95c
Remove extra php tag in functions.php
2016-11-10 21:49:57 -07:00
227b196a2e
Move inline Login css to css file
2016-11-10 21:48:42 -07:00
3e3956f45d
Update doctype to HTML5, add meta tags for mobile browsers
2016-11-10 21:47:53 -07:00
eacf6cd415
Restyle login page, move recaptcha js to <head>
...
The way it was handled previously resulted in
invalid html, with an extra <head> tag being
inserteed inside the <body>.
2016-11-10 21:46:55 -07:00
1607ae1210
Load bootstrap css
2016-11-10 21:45:46 -07:00
2c93f61622
Add bootstrap 3.3.7
2016-11-10 21:45:18 -07:00
9f43825b92
prevent the end user from slecting an invalid configuration on the PT… ( #1676 )
...
* prevent the end user from slecting an invalid configuration on the PTZ control configuraion "Move" tab
* change to console.php should not be in this pr
2016-11-08 22:10:51 -05:00
8c41781a9f
Fix event.stop error in watch.js See #1672 ( #1678 )
2016-11-08 18:53:06 -05:00
4b3ac63a68
merge master, deprecate qqq()
2016-11-08 11:30:44 -05:00
735d2df3c9
event is redefined before being passed to deleteEvent. Fixes #1671
2016-11-04 23:23:40 -06:00
1e233c0ce5
Merge branch 'master' into improve_filter
2016-11-04 15:20:43 -04:00
5c62c654ce
fix WatchScale -> EventScale
2016-11-03 16:47:22 -04:00
53166fabf5
Merge branch 'master' into storageareas
2016-11-03 14:59:06 -04:00
cb69d1a693
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2016-11-03 14:57:29 -04:00
bd47439056
Merge pull request #1639 from connortechnology/cookie_scale
...
store the scale value for watch and event views in a cookie, differen…
2016-11-03 12:35:15 -06:00
099cca210b
fix monitorId to MonitorId
2016-11-03 14:34:17 -04:00
6d57b326fa
change logic of sending file contents to handle an off by one and be more readable
2016-11-03 11:42:42 -04:00
9d76c9cf6a
fix fclose
2016-11-03 11:23:50 -04:00
a87f5e1592
fix sending full content when we should be
2016-11-03 11:23:10 -04:00
0ea8461192
remove extra s
2016-11-03 09:43:38 -04:00
2f22eb5a8c
fix error when only 1 monitor is listed
2016-11-03 09:41:54 -04:00
d504043a9e
Update ru_ru.php
...
Remote extra line
2016-11-01 00:32:46 +11:00
ca69a79bed
fix video.js not being included when we are viewing an event without an h264 file, and when buttons do not exist.
2016-10-27 17:05:33 -04:00
a7c1231b46
fix WatchScale -> EventScale
2016-10-26 14:53:24 -04:00
340b172dc4
Merge branch 'add_scale_to_frame_view' into storageareas
2016-10-26 14:46:50 -04:00
42783b68f9
float the scale control right, add css for other skins
2016-10-26 14:43:23 -04:00
4defad1352
Merge branch 'add_scale_to_frame_view' into storageareas
2016-10-26 14:04:43 -04:00
d9a31f7fb6
Merge branch 'master' into storageareas
2016-10-26 13:39:31 -04:00
c74cc54ac0
add a scale element to the frame view. Include some bits from StorageAreas to make it work
2016-10-26 13:34:30 -04:00
98cde11e86
add a scale element to the frame view. Include some bits from StorageAreas to make it work
2016-10-26 13:34:28 -04:00
cf0e4935f1
cleanups, more debugging
...
Also, when adding a monitor, a user who is restricted to monitors can't create one, add an error essage about it instead of failing silently.
2016-10-21 12:43:23 -04:00
f9ac601194
fix getOutputHelperStream -> getHelperStream
2016-10-21 12:41:37 -04:00
7b1395a4ea
set default for StorageId to '0' since it can't be NULL anymore
2016-10-20 14:06:09 -04:00
f153e9b8fb
MontageReview should only be visisble to people who can view events. Fix running state
2016-10-20 13:38:12 -04:00
67e14bd12f
move States loading code into state view where it belongs. Move runnign check into specific places where it is needed. These changes reduce events list load time by about 4 seconds for me.
2016-10-20 13:16:50 -04:00
cb88b984c7
fix capt -> capture and some suspicious sprintf formatting and double quotes to single quotes
2016-10-20 12:01:25 -04:00
5ee8a1c0a7
deprecate the contents of getImageSrc since it is now in Event.php
2016-10-20 11:52:01 -04:00
fc540786a5
Move login by auth hash out of actions.php and into index.php. Double quotes to single quotes and google code style changes in indx.php
2016-10-20 11:51:42 -04:00
c795dd7568
double quotes to single quotes, remove some includes, slight efficiency gains and better error reporting when the .mp4 doesn't exist.
2016-10-20 11:50:13 -04:00
017085aee7
Use proper rounding instead of sprintf based rounding for fps
2016-10-20 11:49:35 -04:00
0409ae5582
Merge pull request #1652 from connortechnology/fix_popup
...
handle when window.open fails
2016-10-20 05:17:44 +11:00
11cc73f55d
Merge pull request #1651 from connortechnology/fix_disable_monitor
...
Fix logic when disabling a monitor
2016-10-20 05:16:22 +11:00
c78a543e8e
Merge pull request #1475 from connortechnology/htmlselect
...
introduce htmlselect as an alternative to buildselect
2016-10-20 05:05:59 +11:00
192d0dbb45
added TimeZone get API
2016-10-18 14:07:31 -04:00
de9c5a3bed
add in missing break
2016-10-18 10:20:42 -04:00
aaf8f6c98b
add the missing case for ServerId in Filter processing.
2016-10-18 10:14:19 -04:00
b385ba7bf4
Merge branch 'master' into improve_filter
2016-10-18 09:59:45 -04:00
85faa7321c
reorder if logic to handle first page load before AuthHash has ever been set.
2016-10-17 13:12:13 -04:00
4bb9709cb2
use object methods of Event
2016-10-12 15:39:53 -04:00
dcf6a39bf6
split Event and Monitor into objects and use properties from appropriate object
2016-10-12 15:39:32 -04:00
c2911ae756
better debug in deletePath
2016-10-12 15:38:59 -04:00
3baa64aa52
add caller info to log when a bad argument is passed to event constructor
2016-10-12 15:38:40 -04:00
bf4bbf8b8d
use object methods for event deletion. Main benefit is error message when deleting
2016-10-12 15:36:40 -04:00
ba7d935a85
fix border size of text below the image in montage when alerted.
2016-10-12 12:19:04 -04:00
5b8b9c5345
merge update
2016-10-12 09:24:10 -04:00
b4f065eb75
Convert event view to use Objects
2016-10-12 09:17:57 -04:00
b00588b6ff
add back montagereview
2016-10-11 17:35:41 -04:00
0903ef294f
quick for to make MontageReview work
2016-10-11 17:35:28 -04:00
7c8b99af23
fix bracket problems
2016-10-11 12:43:13 -04:00
0358476ac0
Merge branch 'fix_popup' into storageareas
2016-10-11 12:19:38 -04:00
743e8c59f9
google code style and double to single quotes
2016-10-11 12:11:59 -04:00
0c956d6728
fix logic when disabling a monitor
2016-10-11 12:11:33 -04:00
c02b840274
Fix logic when disabling a monitor
2016-10-11 12:10:47 -04:00
ded1e0ea73
handle when window.open fails
2016-10-11 11:48:29 -04:00
3801d9e43e
Disabled autocorrect, autocapitalize, spellcheck on username field for login form
2016-10-10 11:27:36 -07:00
7b574e0d41
Merge pull request #1645 from connortechnology/fix_onvif
...
Fix onvif
2016-10-04 16:34:58 -05:00
96b5af9021
Merge branch 'fix_onvif' into storageareas
2016-10-04 15:00:28 -04:00
ac24865647
add NoDetectProfiles instead of reusing NoDetectedCameras
2016-10-04 14:33:51 -04:00
6814bcc791
add NoDetectProfiles instead of reusing NoDetectedCameras
2016-10-04 14:33:38 -04:00
09c5e3012a
username and password don't actually have to be specified
2016-10-04 14:09:32 -04:00
21a94a6200
better error message
2016-10-04 10:29:37 -04:00
68936b9af9
code style, replace with '
2016-10-03 21:58:57 -04:00
d4be5b06ea
Only generate auth hash when logged in.
2016-10-03 21:22:16 -04:00
f4418260e7
Should only generate an auth hash if we are logged in.
2016-10-03 21:18:13 -04:00
16bee2ef55
only generate auth hash if we are logged in
2016-10-02 14:13:54 -04:00
0ab84abe5b
Since we are returning a hash called user, it should really contain all data for that user.
2016-09-29 10:43:07 -04:00
404bbb79f0
must return the generated hash
2016-09-29 10:11:37 -04:00
8bc7b9562f
introduce config option ZM_AUTH_HASH_TTL which is the # of hours to make an auth hash valid for
2016-09-29 10:04:53 -04:00
cf9fa78ca3
work on fixing event view
2016-09-29 09:28:48 -04:00
07ae6b6aa2
commit authhash to session
2016-09-28 11:49:00 -04:00
09f7c9ddf9
Merge pull request #1633 from bhaal2/storageareas
...
Storageareas
2016-09-28 09:43:00 -04:00
994f1d566e
fix [
2016-09-28 09:09:01 -04:00
9bf48d27b1
implement caching the authhash in the session
2016-09-28 09:08:49 -04:00
1ae23b49bf
generateAuthHash early when session is active, it will get cached in session
2016-09-28 09:08:36 -04:00
02a196d98b
add missing ]
2016-09-28 08:30:22 -04:00
e217ca17cd
Merge branch 'fix_auth_timeout' into storageareas
2016-09-27 11:57:53 -04:00
303a2c6c5f
re-open session if neccessary to save AuthHashGeneratedAt
2016-09-27 11:56:31 -04:00
6840031ee3
fix auth timeout and user session[username] when checking auth hash for speedup
2016-09-27 11:51:55 -04:00
e04266600e
Merge branch 'fix_auth_timeout' into storageareas
2016-09-27 11:04:12 -04:00
4ce531099c
add an auth field to request=stream results to give the client a new auth hash to use
2016-09-27 11:03:12 -04:00
167214cb01
Merge branch 'cookie_scale' into storageareas
2016-09-27 10:05:16 -04:00
6c3a3d3d50
store the scale value for watch and event views in a cookie, differentiated by monitorId.
2016-09-27 09:46:04 -04:00
0580ef0c88
whitespace changes
2016-09-26 20:09:09 -04:00
3dcc1c3697
fix php outputting extra newlines after content
2016-09-22 10:37:32 -04:00
d96febd967
when ZM_DIR_EVENTS is relative, append ZM_PATH_WEB
2016-09-21 16:00:23 -04:00
92d7cad5f1
enabled utf8
2016-09-21 11:53:34 -04:00
091459004c
ServerId can be 0
2016-09-21 10:30:31 -04:00
b9b1dd144c
@connortechnology changed the selectName back to Id from filterId in filter.php, this had a flowon effect in filtersave.php as well.
2016-09-21 21:41:22 +10:00
364a80fb94
don't output jpeg header unless there is some kind of success
2016-09-20 15:55:28 -04:00
33ab9d3098
instead of filterId, use Id so that the object in is properly filled out. Add object=filter to hidden fields
2016-09-20 12:19:44 -04:00
5ce2e95fb7
replace getDiskPercent call with code to show percent for all storageareas
2016-09-20 12:18:50 -04:00
fb610ba87d
fix getDiskPercent to take a StorageArea as a param and use it's disk_usage_percent function. When parsing filter, DiskPercent requires a storagearea now, so look for it in the terms
2016-09-20 12:18:20 -04:00
1add270b72
fixup saving Filters and executing them
2016-09-20 12:17:19 -04:00
f06723a178
add disk_usage_percent and fix whitespace
2016-09-20 12:16:49 -04:00
5604fe5610
add more debugging and fix LinkPath -> LinkPath
2016-09-20 12:16:07 -04:00
c74af40ffb
Had file open with old stuff. Fixed now.
2016-09-17 02:20:17 +10:00
aee6ae956d
Moved '%' to getDiskPercent() where it should have been.
2016-09-17 02:13:33 +10:00
c95e449bbd
Modifications to getDiskPercent():
...
Moved '%' to this function instead of at end of html in skins/classing/include/functions.php
Changed from SQL query to Storage area object model.
2016-09-17 02:11:07 +10:00
5f46b8f942
Merge pull request #1621 from connortechnology/fix_1620
...
ptzControl expects a monitor object instead of a dbrow array.
2016-09-15 10:18:26 -04:00
2c21fe80e7
Merge pull request #1626 from bhaal2/storageareas
...
Storageareas
2016-09-15 10:18:11 -04:00
181339a2dd
Nearly forgot its possible to have no "default" storage area, have wrapped the defaults space check in an if()
2016-09-15 19:49:58 +10:00
76beaf281a
Changed "Disk" to "Storage" which looked better when showing disk space for all storage areas.
2016-09-15 19:44:13 +10:00
d5337a08a8
Modify getDiskPercent() to report disk space for all storage areas.
2016-09-15 19:41:16 +10:00
37c559ba3d
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-09-14 12:49:55 -04:00
cf45feea66
quiet the logs on initial view load
2016-09-14 12:49:47 -04:00
fb8b2f2490
Merge pull request #1625 from bhaal2/storageareas
...
Storageareas
2016-09-14 12:08:55 -04:00
01ae4de123
Modified so deleting a filter is done by table Id instead of Name
2016-09-15 01:59:31 +10:00
17555bf623
Added extra argument 'id' to deleteFilter function to send to delete action for deleting a filter.
2016-09-15 01:57:31 +10:00
67f2ddc404
Changed filter list order back to Name
...
Added extra argument 'Id' to delete button onClick call
2016-09-15 01:55:58 +10:00
cd626a54ee
Converted filter action to use table Id's instead of filterName's when editing existings and creating new filters.
2016-09-15 01:29:44 +10:00
99a212803a
Converted filter action to use table Id's instead of filterName's when editing existings and creating new filters.
2016-09-15 01:29:35 +10:00
0d83fc5be7
Converted filter action to use table Id's instead of filterName's when editing existings and creating new filters.
2016-09-15 01:27:59 +10:00
a0eaea00a5
fix relative paths to jquery and bootstrap fixes #1618
2016-09-14 10:06:15 -04:00
cd0e6ba285
StorageId now defaults to 0 and database column now set to NOT NULL. Changed default Id in php to match
2016-09-14 23:56:05 +10:00
33fc47c4b1
StorageId now defaults to 0 (NOT NULL) in the Monitors table, updates to filter.php set the default Id for the default storage area to 0
2016-09-14 23:53:52 +10:00
db8cada380
fix merge
2016-09-13 15:01:02 -04:00
0bc50810de
only add the development h3 if it has contents, otherwise it pushes the header size down
2016-09-13 10:25:49 -04:00
2b4bad86cb
Merge branch 'master' into storageareas
2016-09-13 10:21:10 -04:00
Isaac Connor
Andrew Bauer
Isaac Connor
Andrew Bauer
Andy Bauer
IDDQDesnik
Matthew Noorenberghe
SteveGilvarry
Isaac Connor
Manojav Sridhar
Kyle Johnson
Isaac Connor
klemens
Bernardus Jansen
Pliable Pixels
Jeff Vogt
bhaal2