Andrew Bauer
4182fb3295
Don't show ONVIf probe link when ONVIF support is not enabled
2015-02-21 11:12:07 -06:00
Andrew Bauer
8657d0a243
Merge pull request #696 from ZoneMinder/improve_deleteEvent
...
Improve delete event
2015-02-09 07:15:27 -06:00
Isaac Connor
4524a61a50
prevent error message in log when Enabled is not checked
2015-02-06 14:15:26 -05:00
Isaac Connor
fed6748c6d
fixes to format date into zero padding and year as 2 digit
2015-02-06 13:00:55 -05:00
Isaac Connor
dbac099223
we don't use EndTime so don't load it
2015-02-06 11:50:23 -05:00
Isaac Connor
bcdac0104f
pass a minimum event hash instead of the event id to deleteEvent
2015-02-06 11:50:07 -05:00
Isaac Connor
9a1e210849
add comment
2015-02-06 11:46:35 -05:00
Isaac Connor
02a6c78182
make deleteEvent take either an event object or an eid.
...
load the relevant event data if passed an eid.
Use the StartTime to get to the event files instead of globbing the entire events path under the monitor.
2015-02-06 11:41:37 -05:00
Isaac Connor
74929236e3
put the sendControlCommand(quit) into the right place
2015-01-07 16:56:10 -05:00
Isaac Connor
d0138af00c
use new sendControlCommand function to send normal commands as well as send the quit command on monitor edit.
2015-01-07 16:24:34 -05:00
Isaac Connor
2e48c2ba3d
add sendControlCommand function to do the heavy work of sending zmcontrol a command
2015-01-07 16:24:07 -05:00
Günter Grodotzki
8350ddac7c
replace getLoad() / getDiskPercent() with PHP native functions
2015-01-03 19:22:19 +01:00
SteveGilvarry
e87e69fa57
Ran script to replace all Short open tags
2014-12-05 10:44:23 +11:00
Isaac Connor
4c864aec35
fix saving groups
2014-11-25 14:29:15 -05:00
Isaac Connor
9c30b806f2
don't require SystemView to view/select groups.
...
Change the way the groups ine is displayed to give people some idea that it might have something to do with grouping
use _POST instead of _REQUEST
2014-11-13 10:38:20 -05:00
Isaac Connor
bec58a6011
fixes WRT to db logging. I believe fixes issue #504
2014-09-26 14:43:58 -04:00
Andrew Bauer
aa3803cb0b
Update functions.php
...
A more efficient check for IE >= 11 than the previous commit
2014-09-13 09:47:22 -05:00
Andrew Bauer
91b99b97a5
Update functions.php
...
Add logic to detect the User Agent string from IE11 (and potentially newer).
2014-09-13 08:19:08 -05:00
Isaac Connor
5bf894d263
guard against unsafe monitor name
2014-06-05 15:23:15 -04:00
Isaac Connor
0689e8453c
guard against dangerous (old or new) monitor names
...
by rogerroger288
2014-06-05 15:21:28 -04:00
Isaac Connor
baf5da9561
guard against monitor names being dangerous
...
by rogerroger288
2014-06-05 15:20:04 -04:00
Isaac Connor
5ae3cb8907
merge some security fixes from rogerroger288
2014-06-05 15:14:12 -04:00
m-bene
28f62c4f8f
remove call of undefined "fixDevices" function
2014-04-26 04:23:36 +02:00
Maciej Czerniak
50a9055601
fix sql error which prevents remote login from working
2014-04-13 09:54:11 +02:00
m-bene
f22b956b8b
do not quote column names in parse filter
2014-04-08 09:07:59 +02:00
Isaac Connor
ffa952419c
Merge branch 'mysql2PDO'
...
Conflicts:
distros/ubuntu1204/changelog
scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm
web/includes/actions.php
2014-03-20 16:48:03 -04:00
Andrew Bauer
f435435481
Merge remote branch 'nagyrobi/patch-17' into nagyrobi
2014-02-26 09:15:05 -06:00
Andrew Bauer
b4679f0a8c
Add the ability to set up the Date and time formats by the language files, according to that language's regionals.
...
The patch allows to set up a global default, in case the language file doesn't contain the date and time definitions.
These definitions are removed from here and added with checking option to the later stage after loading the language files.
2014-02-26 09:14:04 -06:00
Isaac Connor
7b26636bcd
Merge pull request #280 from ZoneMinder/zmfixremoval
...
Remove zmfix
2013-12-22 11:22:18 -08:00
Miklos Marton
5de638214b
In the web/includes/functions.php there were some html formatting errors in the outputVideoStream function.
...
These errors were:
- Unclosed object and embed tags
- param tags without closing tags
These errors lead to rendering errors when using the mobile skins with some specific streaming options.
2013-12-22 15:17:21 +01:00
Kfir Itzhak
e9bb632a78
Remove zmfix
2013-12-22 16:08:17 +02:00
Isaac Connor
0c58957e04
fixes
2013-12-17 14:58:06 -05:00
Isaac Connor
4c348cf159
more updates
2013-12-17 11:16:20 -05:00
Isaac Connor
a2a3bda2e1
remove unneccessary quoting and escaping
2013-12-06 15:51:36 -05:00
Isaac Connor
86b04d0e6f
fixup dbFetchMOnitor
2013-12-06 14:22:07 -05:00
Philipp Rehs
d4babd23f1
Fix checkJsonError messages
...
The $value string was not set inside checkJsonError, so it was not possible to see the data which caused the error
2013-11-30 18:13:02 +01:00
Isaac Connor
969918781f
more updates, currently the log updates are not enough. Filtering does not work.
2013-11-13 10:11:16 -05:00
Isaac Connor
463d8a136f
Merge branch 'master' into mysql2PDO
...
Conflicts:
zm.conf.in
2013-11-08 11:22:09 -05:00
Isaac Connor
03809cfa0f
improve error reporting
2013-11-07 10:58:27 -05:00
Isaac Connor
4c6c415f02
fix: wrote dbCon instead of dbConn
2013-11-07 10:03:19 -05:00
Kfir Itzhak
be21a882ab
Merge pull request #242 from ZoneMinder/removeversionnumberfromzm.conf
...
Remove ZM_VERSION from zm.conf
2013-11-04 12:27:50 -08:00
Isaac Connor
51455b5c85
more updates and removal of escaping and quoting
2013-11-04 12:43:34 -05:00
Isaac Connor
7989e8e980
Merge branch 'master' into mysql2PDO
2013-11-03 16:07:37 -05:00
Isaac Connor
3fa91a30a3
allow the value side of config lines potentially be empty.
2013-11-03 15:52:37 -05:00
Isaac Connor
72b80d7417
remake this branch off master instead of off mysql2PDO.
...
Establish an automake substitution of @VERSION@ and use it throughotu to override whatever is in zm.conf
2013-11-01 09:47:28 -04:00
Isaac Connor
7fdb933d6b
rework dbQuery, dbFetchOne to take a parameters array, and use it
2013-10-18 14:15:24 -04:00
Isaac Connor
cde89a7144
more quoting removal, some slight optimisations
2013-10-17 21:03:24 -04:00
Isaac Connor
92591a6835
more removal of quotes
2013-10-17 17:05:50 -04:00
Isaac Connor
ef765afa2d
Merge branch 'master' into mysql2PDO
2013-10-17 17:02:44 -04:00
Isaac Connor
60e2703637
fix missing n
2013-10-17 17:01:37 -04:00
