tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-27 07:44:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/packages-4075

Browse Source
This commit is contained in:
Eric Lippmann 2014-12-29 15:59:27 +01:00
commit 960cead434
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/forms/Config/Authentication/AutologinBackendForm.php
View File

@ -53,8 +53,10 @@ class AutologinBackendForm extends Form
'strip_username_regexp', 'strip_username_regexp',
array( array(
'label' => t('Filter Pattern'), 'label' => t('Filter Pattern'),
'description' => t('The regular expression to use to strip specific parts off from usernames. Leave empty if you do not want to strip off anything'), 'description' => t(
'value' => '/\@[^$]+$/', 'The regular expression to use to strip specific parts off from usernames.'
. ' Leave empty if you do not want to strip off anything'
),
'validators' => array( 'validators' => array(
new Zend_Validate_Callback(function ($value) { new Zend_Validate_Callback(function ($value) {
return @preg_match($value, '') !== false; return @preg_match($value, '') !== false;

2
application/forms/Config/Resource/LivestatusResourceForm.php
View File

@ -44,7 +44,7 @@ class LivestatusResourceForm extends Form
'required' => true, 'required' => true,
'label' => t('Socket'), 'label' => t('Socket'),
'description' => t('The path to your livestatus socket used for querying monitoring data'), 'description' => t('The path to your livestatus socket used for querying monitoring data'),
'value' => realpath(Icinga::app()->getApplicationDir() . '/../var/rw/livestatus') 'value' => '/var/run/icinga2/cmd/livestatus'
) )
); );