Isaac Connor
|
5ee8a1c0a7
|
deprecate the contents of getImageSrc since it is now in Event.php
|
2016-10-20 11:52:01 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
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 |
Steve Gilvarry
|
11cc73f55d
|
Merge pull request #1651 from connortechnology/fix_disable_monitor
Fix logic when disabling a monitor
|
2016-10-20 05:16:22 +11:00 |
|
Steve Gilvarry
|
c78a543e8e
|
Merge pull request #1475 from connortechnology/htmlselect
introduce htmlselect as an alternative to buildselect
|
2016-10-20 05:05:59 +11:00 |
|
Isaac Connor
|
de9c5a3bed
|
add in missing break
|
2016-10-18 10:20:42 -04:00 |
|
Isaac Connor
|
aaf8f6c98b
|
add the missing case for ServerId in Filter processing.
|
2016-10-18 10:14:19 -04:00 |
|
Isaac Connor
|
85faa7321c
|
reorder if logic to handle first page load before AuthHash has ever been set.
|
2016-10-17 13:12:13 -04:00 |
|
Isaac Connor
|
c2911ae756
|
better debug in deletePath
|
2016-10-12 15:38:59 -04:00 |
|
Isaac Connor
|
3baa64aa52
|
add caller info to log when a bad argument is passed to event constructor
|
2016-10-12 15:38:40 -04:00 |
|
Isaac Connor
|
0c956d6728
|
fix logic when disabling a monitor
|
2016-10-11 12:11:33 -04:00 |
|
Isaac Connor
|
c02b840274
|
Fix logic when disabling a monitor
|
2016-10-11 12:10:47 -04:00 |
|
Isaac Connor
|
68936b9af9
|
code style, replace with '
|
2016-10-03 21:58:57 -04:00 |
|
Isaac Connor
|
d4be5b06ea
|
Only generate auth hash when logged in.
|
2016-10-03 21:22:16 -04:00 |
|
Isaac Connor
|
f4418260e7
|
Should only generate an auth hash if we are logged in.
|
2016-10-03 21:18:13 -04:00 |
|
Isaac Connor
|
16bee2ef55
|
only generate auth hash if we are logged in
|
2016-10-02 14:13:54 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
404bbb79f0
|
must return the generated hash
|
2016-09-29 10:11:37 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
303a2c6c5f
|
re-open session if neccessary to save AuthHashGeneratedAt
|
2016-09-27 11:56:31 -04:00 |
|
Isaac Connor
|
db8cada380
|
fix merge
|
2016-09-13 15:01:02 -04:00 |
|
Steve Gilvarry
|
563f4a9d46
|
Merge pull request #1505 from ZoneMinder/fix_filter_actions
Confirmed check box status is now retained after save and changing filters.
|
2016-09-11 14:13:51 +10:00 |
Andrew Bauer
|
7d48b2c6c5
|
Merge pull request #1577 from ZoneMinder/fix_zmaControl
fix error in calling zmaControl
|
2016-08-17 08:36:51 -05:00 |
|
Andrew Bauer
|
31cb86046c
|
Merge pull request #1592 from connortechnology/fix_analysis_frame
Fix analysis frame
|
2016-08-14 10:54:46 -05:00 |
|
Isaac Connor
|
240336e3ec
|
silence error when Event has no StorageId set
|
2016-08-12 15:20:21 -04:00 |
|
Isaac Connor
|
3dadcc8d32
|
add ability to pass show=capture or show=analyse to getImageSrc
|
2016-08-12 15:14:51 -04:00 |
|
Andrew Bauer
|
382896dc0d
|
Merge pull request #1498 from josh4trunks/mysql_port_socket
Add support for MySQL Port / Unix Socket
|
2016-08-06 09:32:32 -05:00 |
|
Isaac Connor
|
aa78b403a1
|
zmaControl can take an id #, so need to move the check for local server test down.
|
2016-08-02 12:33:41 -04:00 |
|
Isaac Connor
|
cd43d1fa7a
|
Rough in Event disk space reporting
|
2016-07-19 17:34:01 -04:00 |
|
Andrew Bauer
|
a57a3d3186
|
Merge pull request #1501 from ZoneMinder/fix_zone_edit
Fix zone edit
|
2016-05-31 10:33:31 -05:00 |
|
Isaac Connor
|
65e33d6c19
|
synchronize on capitalizing the word Auto. This should fix the losing of the checkboxes when you change a filter
|
2016-05-27 11:11:30 -04:00 |
|
Andrew Bauer
|
1972c4116b
|
Merge pull request #1486 from connortechnology/update_image_view
Update image view
|
2016-05-26 09:05:14 -05:00 |
|
Isaac Connor
|
0d08c50199
|
change quotes
|
2016-09-29 12:22:01 -04:00 |
|
Isaac Connor
|
ab8b58ba48
|
Merge branch 'fix_auth_timeout' into storageareas
|
2016-09-29 10:44:30 -04:00 |
|
Isaac Connor
|
5c867aa5f5
|
Merge branch 'fix_auth_timeout' into storageareas
|
2016-09-29 10:10:38 -04:00 |
|
Isaac Connor
|
07ae6b6aa2
|
commit authhash to session
|
2016-09-28 11:49:00 -04:00 |
|
Isaac Connor
|
9bf48d27b1
|
implement caching the authhash in the session
|
2016-09-28 09:08:49 -04:00 |
|
Isaac Connor
|
1ae23b49bf
|
generateAuthHash early when session is active, it will get cached in session
|
2016-09-28 09:08:36 -04:00 |
|
Isaac Connor
|
e217ca17cd
|
Merge branch 'fix_auth_timeout' into storageareas
|
2016-09-27 11:57:53 -04:00 |
|
Isaac Connor
|
6840031ee3
|
fix auth timeout and user session[username] when checking auth hash for speedup
|
2016-09-27 11:51:55 -04:00 |
|
Isaac Connor
|
d96febd967
|
when ZM_DIR_EVENTS is relative, append ZM_PATH_WEB
|
2016-09-21 16:00:23 -04:00 |
|
Isaac Connor
|
091459004c
|
ServerId can be 0
|
2016-09-21 10:30:31 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
1add270b72
|
fixup saving Filters and executing them
|
2016-09-20 12:17:19 -04:00 |
|
Isaac Connor
|
f06723a178
|
add disk_usage_percent and fix whitespace
|
2016-09-20 12:16:49 -04:00 |
|
Isaac Connor
|
5604fe5610
|
add more debugging and fix LinkPath -> LinkPath
|
2016-09-20 12:16:07 -04:00 |
bhaal2
|
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 |
|
bhaal2
|
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 |
|
bhaal2
|
d5337a08a8
|
Modify getDiskPercent() to report disk space for all storage areas.
|
2016-09-15 19:41:16 +10:00 |
|
bhaal2
|
01ae4de123
|
Modified so deleting a filter is done by table Id instead of Name
|
2016-09-15 01:59:31 +10:00 |
|
bhaal2
|
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 |
|
Isaac Connor
|
ffaf046485
|
fix missing /
|
2016-08-30 14:51:56 -04:00 |
|
Isaac Connor
|
27c1f95607
|
handle when ZM_BASE_PATH == '/'
|
2016-08-30 14:36:14 -04:00 |
|
Isaac Connor
|
a28e7d8df8
|
fix typo
|
2016-08-30 14:24:51 -04:00 |
|
Isaac Connor
|
7411b47834
|
fix typo
|
2016-08-30 14:23:20 -04:00 |
|
Isaac Connor
|
6ce18c3628
|
ZM_BASE_URL is deprecated. Use ZM_BASE_PATH instead
|
2016-08-30 14:08:52 -04:00 |
|
Isaac Connor
|
237a4494b2
|
correct incorrect use of isset instead of array_key_exists
|
2016-08-30 13:44:57 -04:00 |
|
Isaac Connor
|
6204ed8dd4
|
correct incorrect use of isset instead of array_key_exists
|
2016-08-30 13:43:49 -04:00 |
|
Isaac Connor
|
944a131142
|
Merge ../ZoneMinder.master into storageareas
|
2016-08-22 11:49:50 -04:00 |
|
Isaac Connor
|
be7683299e
|
use single quotes instead of double quotes
|
2016-08-22 11:49:45 -04:00 |
|
Isaac Connor
|
d6b126fe8c
|
Add caller and line when an unknown function is called on the Monitor object
|
2016-08-22 11:28:53 -04:00 |
|
Isaac Connor
|
eafe3d7748
|
Merge branch 'master' into storageareas
|
2016-08-17 10:31:55 -04:00 |
|
Isaac Connor
|
c82c872665
|
add a default NULL value to __construct
|
2016-08-17 10:31:16 -04:00 |
|
Isaac Connor
|
19d46c2d09
|
Merge branch 'master' into storageareas
|
2016-08-15 10:45:50 -04:00 |
|
Isaac Connor
|
f9e7d3ccd8
|
fix error messages when an empty Monitor is instantiated
|
2016-08-09 10:43:51 -04:00 |
|
Isaac Connor
|
2451768295
|
Merge branch 'master' into storageareas
|
2016-08-08 18:08:46 -04:00 |
Isaac Connor
|
c58c3efcf5
|
fix to
|
2016-07-25 15:34:53 -04:00 |
|
Isaac Connor
|
b9bba6bde5
|
fix to
|
2016-07-25 15:32:57 -04:00 |
|
Isaac Connor
|
b9a15d1465
|
fix missed to conversion
|
2016-07-23 13:37:00 -04:00 |
|
Isaac Connor
|
8194876454
|
always put popup links in a, even if it is disabled
|
2016-07-22 16:03:57 -04:00 |
|
Isaac Connor
|
6d1f85bcd6
|
fix spacing and code style, and when logging in, change view to console
|
2016-07-22 16:03:39 -04:00 |
|
Isaac Connor
|
440f8fafdd
|
implement object based versions of getImageSrc and creatListThumbnail
|
2016-07-20 15:21:23 -04:00 |
|
Isaac Connor
|
b1d0223c30
|
implement human_filesize
|
2016-07-20 15:20:21 -04:00 |
|
Isaac Connor
|
bce7369984
|
Merge branch 'disk_space_in_events' into storageareas
|
2016-07-19 17:36:15 -04:00 |
|
Isaac Connor
|
eb0ddc4e32
|
update and use Monitor object to generate the stream html. Also introduce a mode parameter to getStreamHTML to specify stills
|
2016-07-14 11:55:27 -04:00 |
|
Isaac Connor
|
791c8fb3d5
|
add setting of object property
|
2016-06-24 10:30:56 -04:00 |
|
Isaac Connor
|
c1f30480e3
|
fix merge
|
2016-06-23 12:49:27 -04:00 |
|
Isaac Connor
|
e29a0ebe71
|
Merge branch 'feature-h264-videostorage' into storageareas
|
2016-06-21 13:48:32 -04:00 |
|
Isaac Connor
|
31a5252afa
|
apply btn and btn-primary styles to remaining buttons on console
|
2016-06-21 09:22:32 -04:00 |
|
Isaac Connor
|
4230bd1bd5
|
move the control_fields into the class so that it is available.
|
2016-06-20 12:46:23 -04:00 |
|
Isaac Connor
|
9c7b22086f
|
introduce a hash to define the fields and default values of the control table. Primarily this is to prevent method warnings when a monitor is not controllable
|
2016-06-20 12:41:14 -04:00 |
|
Isaac Connor
|
1d1cedce95
|
use rand mofification like when re-establishing the stream instead of an Time(). Drop use of a tempImage as it doesn't seem to be used anywhere. Cleanup use of streamSrc. Introduce a function getStreamMode
|
2016-06-20 12:40:33 -04:00 |
|
Isaac Connor
|
26bba58c56
|
Merge branch 'master' into feature-h264-videostorage
|
2016-06-17 11:09:47 -04:00 |
Isaac Connor
|
acba5bccf1
|
Always include the monitor Id in the tag id for the videostream
|
2016-06-14 12:38:37 -04:00 |
|
Isaac Connor
|
0f1a1a6294
|
log invalid calls to Monitor Object
|
2016-06-14 12:38:17 -04:00 |
|
Isaac Connor
|
94174a1fe2
|
use user= and pass= instead of auth hash
|
2016-06-07 15:47:59 -04:00 |
|
Isaac Connor
|
086d435712
|
send zmcCommand to api on server
|
2016-06-07 14:39:59 -04:00 |
|
Isaac Connor
|
c25b680799
|
Merge branch 'fix_filter_actions' into storageareas
|
2016-05-27 11:12:18 -04:00 |
|
Isaac Connor
|
8fabeb78d3
|
Merge branch 'fix_zone_edit' into storageareas
|
2016-05-24 15:55:49 -04:00 |
|
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 |
|
Isaac Connor
|
ae1eb94f27
|
fix getStreamHTML when using helper
|
2016-05-24 15:10:37 -04:00 |
josh4trunks
|
2ab79820a1
|
Add back changes
|
2016-05-22 08:08:12 -07:00 |
|
Isaac Connor
|
e62ea454ba
|
Merge branch 'master' into storageareas
|
2016-05-17 10:48:52 -04:00 |
|
Isaac Connor
|
e4566f2e8e
|
Merge branch 'update_image_view' into storageareas
|
2016-05-16 12:23:19 -04:00 |
Isaac Connor
|
235095ed5f
|
fix URL to image view
|
2016-05-16 10:32:43 -04:00 |
|
Isaac Connor
|
2144cb7de6
|
fix body padding only for console and options
|
2016-05-12 10:45:13 -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
|
a8de0bff71
|
Merge branch 'master' into storageareas
|
2016-05-09 19:30:02 -04:00 |
|
Isaac Connor
|
35783f7dc0
|
Merge branch 'mysql_fixes' into storageareas
|
2016-05-09 19:27:42 -04:00 |
|
Isaac Connor
|
7f9c70d521
|
when value to be stored is undefined or '', then set the field=NULL
|
2016-05-09 13:39:40 -04:00 |
|
Isaac Connor
|
c050969141
|
Merge object model classes from storageareas
|
2016-05-05 15:33:28 -04:00 |
|
Isaac Connor
|
4b782efd54
|
Whitespace fixes
|
2016-05-05 15:30:24 -04:00 |
|
Isaac Connor
|
0e74778dda
|
add find and find_all functions
|
2016-05-05 14:49:57 -04:00 |
|
Isaac Connor
|
fe63e4af80
|
remove extra semi colon
|
2016-05-02 13:42:42 -04:00 |
|
Steve Gilvarry
|
da157f5a1a
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2016-04-30 22:27:10 +10:00 |
|
Isaac Connor
|
0044161b9c
|
Merge branch 'fix_zone_edit' into storageareas
|
2016-04-29 10:46:37 -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
|
af66105c37
|
Merge branch 'master' into storageareas
|
2016-04-29 08:28:53 -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
|
59db5d42e7
|
include Frame.php
|
2016-04-25 15:00:27 -04:00 |
|
Isaac Connor
|
4b4add49bd
|
Merge /home/iconnor/sandbox/ZoneMinder.connortechnology into storageareas
|
2016-04-15 13:18:35 -04:00 |
|
Isaac Connor
|
ccb5ea766d
|
add the toggle for RecordAudio so that the checkbox works to turn off Audio
|
2016-04-15 13:16:52 -04:00 |
|
Isaac Connor
|
61bd60184a
|
Merge branch 'random_fixes' into storageareas
|
2016-04-11 11:28:24 -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 |
|
Isaac Connor
|
d493ca69a9
|
Merge branch 'master' into icon_video
|
2016-04-11 09:31:51 -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
|
78c6e14e0c
|
Merge branch 'master' into storageareas
|
2016-04-09 14:52:28 -04: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
|
6bb95beb9a
|
Merge branch 'svg_zones' into storageareas
|
2016-04-08 13:20:01 -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 |
|
Isaac Connor
|
7491aa4381
|
fix spelling mistake
|
2016-04-06 10:55:11 -04:00 |
|
Isaac Connor
|
b4b622668c
|
fix merge
|
2016-04-06 08:39:47 -04:00 |
|
Isaac Connor
|
9a795432cf
|
merge all the commits from the messed up iconnor_video branch
|
2016-04-05 17:14:46 -04:00 |
|
Isaac Connor
|
60642c1fff
|
Merge branch 'iconnor_video' into storageareas
|
2016-04-05 12:32:33 -04:00 |
|
Isaac Connor
|
238a25a302
|
Merge branch 'master' into iconnor_video
|
2016-04-05 09:38:59 -04:00 |
|
SteveGilvarry
|
4d7ded5ef0
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
Conflicts:
configure.ac
src/Makefile.am
web/js/Makefile.am
|
2016-04-05 22:06:14 +10: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
|
868e5a51fa
|
Rename some of the columns names when laoding Control settings as they conflict with Monitor columns
|
2016-04-04 16:44:21 -04:00 |
|
Isaac Connor
|
711343a5cc
|
fix ZM_SERVER_ID instead of ZM_SERVER
|
2016-04-04 16:34:21 -04:00 |
|
Isaac Connor
|
ec6782a663
|
fix ZM_SERVER_ID instead of ZM_SERVER
|
2016-04-04 16:33:46 -04:00 |
|
Isaac Connor
|
bc9760ce79
|
Merge branch 'master' into storageareas
|
2016-04-04 16:13:17 -04:00 |
|
Isaac Connor
|
02eb36040a
|
fix bad code
|
2016-04-04 12:01:37 -04:00 |
|
Isaac Connor
|
faa75bbe39
|
fix wrong brace and needs quotes
|
2016-04-04 12:00:29 -04:00 |
|
Isaac Connor
|
197ae67313
|
Merge branch 'always_show_ptz' into storageareas
|
2016-04-04 11:47:29 -04:00 |
|
Isaac Connor
|
c8fa0a9b4f
|
Merge branch 'master' into feature-h264-videostorage
|
2016-04-04 10:14:15 -04:00 |
|
Isaac Connor
|
8a2605578a
|
fix type in htmlSelect
|
2016-04-01 15:43:40 -04:00 |
|
Isaac Connor
|
d71eaa66ec
|
use view_video.php as a short-term fix for viewing video
|
2016-04-01 15:43:31 -04:00 |
|
Isaac Connor
|
ca96481036
|
fix thumbnail generation from video file
|
2016-04-01 13:02:31 -04:00 |
|
Isaac Connor
|
cbebdfe670
|
add Time function to get unixtime from StartTime
|
2016-04-01 13:00:59 -04:00 |
|
Isaac Connor
|
6ebd71f980
|
instead of loading and looking at current recording settings, check to see if the images exist. If not, generate them from the video file
|
2016-04-01 12:51:09 -04:00 |
|
Isaac Connor
|
6816a4c75b
|
Merge branch 'iconnor_video' into storageareas
|
2016-04-01 11:35:38 -04:00 |
|
Isaac Connor
|
59bf780537
|
introduce htmlSelect as a better version of buildSelect
|
2016-04-01 10:35:59 -04:00 |
|
Isaac Connor
|
c074f6e0bf
|
Add a set function to take an array of value to set in the Object
|
2016-04-01 10:34:40 -04:00 |
|
Isaac Connor
|
c9a1a9020d
|
Merge h264
|
2016-03-31 11:03:36 -04:00 |