Steve Gilvarry
a44f83cb7d
#658 Fix error message for finding arp path
2015-01-05 07:58:39 +11:00
Isaac Connor
1cfec7e3e7
Move require of config.php and logger up higher
2015-01-04 11:50:24 -05:00
Andrew Bauer
ac80649e26
Merge pull request #657 from ZoneMinder/log_export_use_PATH_SWAP
...
Make the log export use ZM_PATH_SWAP and report the full path on error
2015-01-03 14:28:18 -06:00
Isaac Connor
3f64f9d919
Make the log export use ZM_PATH_SWAP and report the full path on error
2015-01-03 15:16:19 -05:00
Günter Grodotzki
8350ddac7c
replace getLoad() / getDiskPercent() with PHP native functions
2015-01-03 19:22:19 +01:00
Isaac Connor
ddae55a1c9
Merge pull request #645 from ZoneMinder/skin_css_default
...
Skin css default
2014-12-29 12:00:44 -05:00
Isaac Connor
1131809c92
format duration into HH:MM:SS
2014-12-19 10:18:27 -05:00
Isaac Connor
05206279df
add missing commas
2014-12-18 09:44:04 -05:00
Isaac Connor
478c9bc630
add custom lines for loading the available skins and css options
2014-12-18 09:34:14 -05:00
Isaac Connor
50e6784779
this adds two config options to System tab to set the default skin and css
2014-12-17 16:45:41 -05:00
Isaac Connor
45feac3d36
Merge pull request #640 from jrd288/offer_login
...
Offer login prompt instead of throwing error
2014-12-16 09:35:08 -05:00
Andrew Bauer
c28206e8d1
Merge pull request #632 from ZoneMinder/better_security
...
better fix for the view=console security flaw.
2014-12-16 08:34:14 -06:00
jrd288
52d3ec7142
Fixed autotools build to reflect file name change
...
postlogin.js -> postlolgin.js.php
2014-12-15 18:11:06 -05:00
jrd288
f4289cd253
postlogin.js replaced by postlogin.js.php
2014-12-15 17:38:18 -05:00
jrd288
10dba9b4c2
Offer login instead of error
...
When a user accesses a view but receives an error, and is not logged
on, he is offered a login prompt instead. The login prompt saves the
original query URL in a hidden field, and postlogin redirects back to
the original URL once the user has logged on.
If the user is logged in and there is an error, no login prompt is
shown.
This allows the user to click an event link in an e-mail and then log
in before being shown the event, instead of requiring going back
through the front ZM page to log in.
2014-12-15 17:17:03 -05:00
Isaac Connor
3c8153c9b4
better fix for the view=console security flaw.
...
This does it in index.php,so it guards all pages, and also just changes the view to login, so instead of giving an error, it presents you with the login, which I think is better.
2014-12-12 09:38:54 -05:00
Isaac Connor
b1aa349f11
add check to see if user has rights to view this monitor
2014-12-12 09:32:03 -05:00
Isaac Connor
74da3e9c02
fix auth requirement by checking for user when AUTH is on
2014-12-11 17:09:18 -05:00
Isaac Connor
fafef86298
Merge branch 'control_improvements'
2014-12-08 16:52:52 -05:00
Isaac Connor
27b9001eb4
default MoveRoot to empty to quiet an error in logs
2014-12-08 16:52:10 -05:00
Isaac Connor
5abc58ea14
Merge pull request #620 from SteveGilvarry/11-php-short-tags
...
Replace PHP Short Open Tags - Fixes #11
Works for me too.
2014-12-08 14:39:24 -05:00
Isaac Connor
2c1e4a9965
fix the paths so that the ptzControls are visible
2014-12-08 10:34:25 -05:00
SteveGilvarry
e87e69fa57
Ran script to replace all Short open tags
2014-12-05 10:44:23 +11:00
Isaac Connor
f57f903aa6
Add views subdir
2014-12-01 16:10:01 -05:00
Isaac Connor
af0d9a1065
bug fix for listing the css options.
...
use SELECTED="SELECTED" instead of just SELECTED
2014-12-01 15:58:00 -05:00
Isaac Connor
fed12291be
add flat to the subdirs
2014-12-01 15:57:44 -05:00
Isaac Connor
9f7d31949d
remove the flat subdir
2014-12-01 15:55:22 -05:00
Isaac Connor
82c01479c6
move flat css files into the classic skin.
...
remove autotools references to the flat skin, add the classic/flat css dirs
remove the flat skin
2014-12-01 15:44:01 -05:00
Isaac Connor
d7e08559d6
Merge pull request #582 from hanzese/patch-1
...
Update et_ee.php
2014-12-01 15:34:53 -05:00
Hannes
e60919f19a
Update et_ee.php
...
Translating some code comments.
2014-11-27 03:51:40 +02:00
Hannes
92b65c553e
Update et_ee.php
...
Changing back charset-utf-8.
2014-11-27 03:43:59 +02:00
Isaac Connor
ebe602616b
needs this one too
2014-11-26 14:30:53 -05:00
Isaac Connor
593f0781d6
this css directory was moved under /web/skins/classic/css/views so we don't need to have it in the SUBDIRS
2014-11-26 11:57:35 -05:00
Isaac Connor
641c94d5be
add CSSDescription which is used on the options tab for skin
2014-11-26 11:57:01 -05:00
Isaac Connor
193cb71b71
Add option for setting css to use with the skin. Also happens to add missing elements of the table for the skins tab and cleans up some spacing. Also, use a variable to tell whether to reload the page or not, which is required after you change the skin or css.
2014-11-26 11:55:53 -05:00
Isaac Connor
a412799003
Move the skins/classic/views/css dir under skins/classic/css/classic/views and update Makefile.am's to match
2014-11-26 11:29:04 -05:00
Isaac Connor
5bf34de07b
Add lines to parse url ?css= commands and set a global variable to be used to determine which set of css files to use.
2014-11-26 11:26:29 -05:00
Isaac Connor
bf3ec7b490
Since the css files are in subdirectories now, thise just needs to reference them
2014-11-26 11:24:55 -05:00
Isaac Connor
ebb31f12d2
Add lines to parse url ?css= commands and set a global variable to be used to determine which set of css files to use.
2014-11-26 11:23:06 -05:00
Isaac Connor
53b70d27fb
Use the global variable which gets setup in web/index.php to look in a subdirectory of web/skins/classic/css to find the css files.
2014-11-26 11:18:03 -05:00
Isaac Connor
4c864aec35
fix saving groups
2014-11-25 14:29:15 -05:00
Emmanuel Papin
4e9c3494b8
Convert french lang file to UTF-8
2014-11-20 20:51:49 +01:00
hanzese
993a186d06
Update et_ee.php
...
ZoneMinder Estonian Translation by Hannes
2014-11-19 10:25:35 +02:00
hanzese
db86ac7b40
Update et_ee.php
...
ZoneMinder Estonian Translation by Hannes
2014-11-17 18:06:37 +02:00
hanzese
79ca3dd736
Update et_ee.php
...
ZoneMinder Estonian Translation
2014-11-17 02:53:50 +02:00
Kyle Johnson
35530c627a
Initial commit of Logs MVC
2014-11-15 19:03:40 +00:00
Kyle Johnson
0129ca5f74
Rework the ConfigParser component.
2014-11-15 19:03:10 +00:00
Kyle Johnson
e7d726bf75
Don't print out the Config string to the file system.
2014-11-15 19:02:54 +00:00
Kyle Johnson
fcaa67e3c3
Slight refactor of ConfigParser Component. Needs more work.
2014-11-15 19:02:18 +00:00
Kyle Johnson
cf3d0f962c
Add view for Configs Edit
2014-11-15 19:02:03 +00:00
