diff --git a/application/forms/Config/Authentication/AutologinBackendForm.php b/application/forms/Config/Authentication/AutologinBackendForm.php index 662106bcd..cb4d100a0 100644 --- a/application/forms/Config/Authentication/AutologinBackendForm.php +++ b/application/forms/Config/Authentication/AutologinBackendForm.php @@ -32,7 +32,7 @@ class AutologinBackendForm extends Form array( 'required' => true, 'label' => t('Backend Name'), - 'helptext' => t('The name of this authentication backend'), + 'description' => t('The name of this authentication backend'), 'validators' => array( array( 'Regex', @@ -53,7 +53,7 @@ class AutologinBackendForm extends Form array( 'required' => true, 'label' => t('Backend Domain Pattern'), - 'helptext' => t('The domain pattern of this authentication backend'), + 'description' => t('The domain pattern of this authentication backend'), 'value' => '/\@[^$]+$/', 'validators' => array( new Zend_Validate_Callback(function ($value) { diff --git a/application/forms/Config/Authentication/DbBackendForm.php b/application/forms/Config/Authentication/DbBackendForm.php index 338b01c60..603aaeb79 100644 --- a/application/forms/Config/Authentication/DbBackendForm.php +++ b/application/forms/Config/Authentication/DbBackendForm.php @@ -55,7 +55,7 @@ class DbBackendForm extends Form array( 'required' => true, 'label' => t('Backend Name'), - 'helptext' => t('The name of this authentication provider'), + 'description' => t('The name of this authentication provider'), ) ), $this->createElement( @@ -64,7 +64,7 @@ class DbBackendForm extends Form array( 'required' => true, 'label' => t('Database Connection'), - 'helptext' => t('The database connection to use for authenticating with this provider'), + 'description' => t('The database connection to use for authenticating with this provider'), 'multiOptions' => false === empty($this->resources) ? array_combine($this->resources, $this->resources) : array() diff --git a/application/forms/Config/Authentication/LdapBackendForm.php b/application/forms/Config/Authentication/LdapBackendForm.php index f451417ea..79949e2de 100644 --- a/application/forms/Config/Authentication/LdapBackendForm.php +++ b/application/forms/Config/Authentication/LdapBackendForm.php @@ -54,7 +54,7 @@ class LdapBackendForm extends Form array( 'required' => true, 'label' => t('Backend Name'), - 'helptext' => t('The name of this authentication backend') + 'description' => t('The name of this authentication backend') ) ), $this->createElement( @@ -63,7 +63,7 @@ class LdapBackendForm extends Form array( 'required' => true, 'label' => t('LDAP Resource'), - 'helptext' => t('The resource to use for authenticating with this provider'), + 'description' => t('The resource to use for authenticating with this provider'), 'multiOptions' => false === empty($this->resources) ? array_combine($this->resources, $this->resources) : array() @@ -73,20 +73,20 @@ class LdapBackendForm extends Form 'text', 'user_class', array( - 'required' => true, - 'label' => t('LDAP User Object Class'), - 'helptext' => t('The object class used for storing users on the ldap server'), - 'value' => 'inetOrgPerson' + 'required' => true, + 'label' => t('LDAP User Object Class'), + 'description' => t('The object class used for storing users on the ldap server'), + 'value' => 'inetOrgPerson' ) ), $this->createElement( 'text', 'user_name_attribute', array( - 'required' => true, - 'label' => t('LDAP User Name Attribute'), - 'helptext' => t('The attribute name used for storing the user name on the ldap server'), - 'value' => 'uid' + 'required' => true, + 'label' => t('LDAP User Name Attribute'), + 'description' => t('The attribute name used for storing the user name on the ldap server'), + 'value' => 'uid' ) ), $this->createElement( diff --git a/application/forms/Config/AuthenticationBackendConfigForm.php b/application/forms/Config/AuthenticationBackendConfigForm.php index 6b1cacbdc..f91044446 100644 --- a/application/forms/Config/AuthenticationBackendConfigForm.php +++ b/application/forms/Config/AuthenticationBackendConfigForm.php @@ -266,10 +266,10 @@ class AuthenticationBackendConfigForm extends ConfigForm 'checkbox', 'force_creation', array( - 'order' => 0, - 'ignore' => true, - 'label' => t('Force Changes'), - 'helptext' => t('Check this box to enforce changes without connectivity validation') + 'order' => 0, + 'ignore' => true, + 'label' => t('Force Changes'), + 'description' => t('Check this box to enforce changes without connectivity validation') ) ); } @@ -304,12 +304,12 @@ class AuthenticationBackendConfigForm extends ConfigForm 'select', 'type', array( - 'ignore' => true, - 'required' => true, - 'autosubmit' => true, - 'label' => t('Backend Type'), - 'helptext' => t('The type of the resource to use for this authenticaton backend'), - 'multiOptions' => $backendTypes + 'ignore' => true, + 'required' => true, + 'autosubmit' => true, + 'label' => t('Backend Type'), + 'description' => t('The type of the resource to use for this authenticaton backend'), + 'multiOptions' => $backendTypes ) ); diff --git a/application/forms/Config/General/ApplicationConfigForm.php b/application/forms/Config/General/ApplicationConfigForm.php index 89e75f66a..7f3b746e4 100644 --- a/application/forms/Config/General/ApplicationConfigForm.php +++ b/application/forms/Config/General/ApplicationConfigForm.php @@ -41,7 +41,7 @@ class ApplicationConfigForm extends Form 'label' => t('Default Language'), 'required' => true, 'multiOptions' => $languages, - 'helptext' => t( + 'description' => t( 'Select the language to use by default. Can be overwritten by a user in his preferences.' ) ) @@ -59,7 +59,7 @@ class ApplicationConfigForm extends Form 'label' => t('Default Application Timezone'), 'required' => true, 'multiOptions' => $tzList, - 'helptext' => t( + 'description' => t( 'Select the timezone to be used as the default. User\'s can set their own timezone if' . ' they like to, but this is the timezone to be used as the default setting .' ), @@ -71,9 +71,9 @@ class ApplicationConfigForm extends Form 'text', 'global_modulePath', array( - 'label' => t('Module Path'), - 'required' => true, - 'helptext' => t( + 'label' => t('Module Path'), + 'required' => true, + 'description' => t( 'Contains the directories that will be searched for available modules, separated by ' . 'colons. Modules that don\'t exist in these directories can still be symlinked in ' . 'the module folder, but won\'t show up in the list of disabled modules.' diff --git a/application/forms/Config/General/LoggingConfigForm.php b/application/forms/Config/General/LoggingConfigForm.php index f91ce74b5..07f2e4d78 100644 --- a/application/forms/Config/General/LoggingConfigForm.php +++ b/application/forms/Config/General/LoggingConfigForm.php @@ -31,7 +31,7 @@ class LoggingConfigForm extends Form array( 'required' => true, 'label' => t('Logging Level'), - 'helptext' => t('The maximum loglevel to emit.'), + 'description' => t('The maximum loglevel to emit.'), 'multiOptions' => array( 0 => t('None'), 1 => t('Error'), @@ -48,7 +48,7 @@ class LoggingConfigForm extends Form 'required' => true, 'class' => 'autosubmit', 'label' => t('Logging Type'), - 'helptext' => t('The type of logging to utilize.'), + 'description' => t('The type of logging to utilize.'), 'multiOptions' => array( 'syslog' => 'Syslog', 'file' => t('File') @@ -63,7 +63,7 @@ class LoggingConfigForm extends Form array( 'required' => true, 'label' => t('Application Prefix'), - 'helptext' => t('The name of the application by which to prefix syslog messages.'), + 'description' => t('The name of the application by which to prefix syslog messages.'), 'value' => 'icingaweb', 'validators' => array( array( @@ -85,7 +85,7 @@ class LoggingConfigForm extends Form array( 'required' => true, 'label' => t('Facility'), - 'helptext' => t('The Syslog facility to utilize.'), + 'description' => t('The Syslog facility to utilize.'), 'multiOptions' => array( 'LOG_USER' => 'LOG_USER' ) @@ -98,7 +98,7 @@ class LoggingConfigForm extends Form array( 'required' => true, 'label' => t('Filepath'), - 'helptext' => t('The logfile to write messages to.'), + 'description' => t('The logfile to write messages to.'), 'value' => $this->getDefaultLogDir(), 'validators' => array(new WritablePathValidator()) ) diff --git a/application/forms/Config/Resource/DbResourceForm.php b/application/forms/Config/Resource/DbResourceForm.php index 05e946f8e..e5ae4b9a7 100644 --- a/application/forms/Config/Resource/DbResourceForm.php +++ b/application/forms/Config/Resource/DbResourceForm.php @@ -36,11 +36,11 @@ class DbResourceForm extends Form array( 'required' => true, 'label' => t('Database Type'), - 'helptext' => t('The type of SQL database'), + 'description' => t('The type of SQL database'), 'multiOptions' => array( - 'mysql' => 'MySQL', - 'pgsql' => 'PostgreSQL' - //'oracle' => 'Oracle' + 'mysql' => 'MySQL', + 'pgsql' => 'PostgreSQL' + //'oracle' => 'Oracle' ) ) ), @@ -48,10 +48,10 @@ class DbResourceForm extends Form 'text', 'host', array ( - 'required' => true, - 'label' => t('Host'), - 'helptext' => t('The hostname of the database'), - 'value' => 'localhost' + 'required' => true, + 'label' => t('Host'), + 'description' => t('The hostname of the database'), + 'value' => 'localhost' ) ), new Number( @@ -59,7 +59,7 @@ class DbResourceForm extends Form 'required' => true, 'name' => 'port', 'label' => t('Port'), - 'helptext' => t('The port to use'), + 'description' => t('The port to use'), 'value' => 3306 ) ), @@ -67,18 +67,18 @@ class DbResourceForm extends Form 'text', 'dbname', array( - 'required' => true, - 'label' => t('Database Name'), - 'helptext' => t('The name of the database to use') + 'required' => true, + 'label' => t('Database Name'), + 'description' => t('The name of the database to use') ) ), $this->createElement( 'text', 'username', array ( - 'required' => true, - 'label' => t('Username'), - 'helptext' => t('The user name to use for authentication') + 'required' => true, + 'label' => t('Username'), + 'description' => t('The user name to use for authentication') ) ), $this->createElement( @@ -88,7 +88,7 @@ class DbResourceForm extends Form 'required' => true, 'renderPassword' => true, 'label' => t('Password'), - 'helptext' => t('The password to use for authentication') + 'description' => t('The password to use for authentication') ) ) ); diff --git a/application/forms/Config/Resource/FileResourceForm.php b/application/forms/Config/Resource/FileResourceForm.php index 0bebf09d3..422979585 100644 --- a/application/forms/Config/Resource/FileResourceForm.php +++ b/application/forms/Config/Resource/FileResourceForm.php @@ -32,7 +32,7 @@ class FileResourceForm extends Form array( 'required' => true, 'label' => t('Filepath'), - 'helptext' => t('The filename to fetch information from'), + 'description' => t('The filename to fetch information from'), 'validators' => array(new ReadablePathValidator()) ) ), @@ -40,9 +40,9 @@ class FileResourceForm extends Form 'text', 'fields', array( - 'required' => true, - 'label' => t('Pattern'), - 'helptext' => t('The regular expression by which to identify columns') + 'required' => true, + 'label' => t('Pattern'), + 'description' => t('The regular expression by which to identify columns') ) ) ); diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php index af811c154..3b3075dc7 100644 --- a/application/forms/Config/Resource/LdapResourceForm.php +++ b/application/forms/Config/Resource/LdapResourceForm.php @@ -36,7 +36,7 @@ class LdapResourceForm extends Form array( 'required' => true, 'label' => t('Host'), - 'helptext' => t('The hostname or address of the LDAP server to use for authentication'), + 'description' => t('The hostname or address of the LDAP server to use for authentication'), 'value' => 'localhost' ) ), @@ -45,7 +45,7 @@ class LdapResourceForm extends Form 'required' => true, 'name' => 'port', 'label' => t('Port'), - 'helptext' => t('The port of the LDAP server to use for authentication'), + 'description' => t('The port of the LDAP server to use for authentication'), 'value' => 389 ) ), @@ -53,18 +53,18 @@ class LdapResourceForm extends Form 'text', 'root_dn', array( - 'required' => true, - 'label' => t('Root DN'), - 'helptext' => t('The path where users can be found on the ldap server') + 'required' => true, + 'label' => t('Root DN'), + 'description' => t('The path where users can be found on the ldap server') ) ), $this->createElement( 'text', 'bind_dn', array( - 'required' => true, - 'label' => t('Bind DN'), - 'helptext' => t('The user dn to use for querying the ldap server') + 'required' => true, + 'label' => t('Bind DN'), + 'description' => t('The user dn to use for querying the ldap server') ) ), $this->createElement( @@ -74,7 +74,7 @@ class LdapResourceForm extends Form 'required' => true, 'renderPassword' => true, 'label' => t('Bind Password'), - 'helptext' => t('The password to use for querying the ldap server') + 'description' => t('The password to use for querying the ldap server') ) ) ); diff --git a/application/forms/Config/Resource/LivestatusResourceForm.php b/application/forms/Config/Resource/LivestatusResourceForm.php index 359fe4978..e7e49a375 100644 --- a/application/forms/Config/Resource/LivestatusResourceForm.php +++ b/application/forms/Config/Resource/LivestatusResourceForm.php @@ -34,10 +34,10 @@ class LivestatusResourceForm extends Form 'text', 'socket', array( - 'required' => true, - 'label' => t('Socket'), - 'helptext' => t('The path to your livestatus socket used for querying monitoring data'), - 'value' => realpath(Icinga::app()->getApplicationDir() . '/../var/rw/livestatus') + 'required' => true, + 'label' => t('Socket'), + 'description' => t('The path to your livestatus socket used for querying monitoring data'), + 'value' => realpath(Icinga::app()->getApplicationDir() . '/../var/rw/livestatus') ) ) ); diff --git a/application/forms/Config/Resource/StatusdatResourceForm.php b/application/forms/Config/Resource/StatusdatResourceForm.php index 5cdddc6d6..69c3d9040 100644 --- a/application/forms/Config/Resource/StatusdatResourceForm.php +++ b/application/forms/Config/Resource/StatusdatResourceForm.php @@ -33,7 +33,7 @@ class StatusdatResourceForm extends Form array( 'required' => true, 'label' => t('Filepath'), - 'helptext' => t('Location of your icinga status.dat file'), + 'description' => t('Location of your icinga status.dat file'), 'value' => realpath(Icinga::app()->getApplicationDir() . '/../var/status.dat'), 'validators' => array(new ReadablePathValidator()) ) @@ -44,7 +44,7 @@ class StatusdatResourceForm extends Form array( 'required' => true, 'label' => t('Filepath'), - 'helptext' => t('Location of your icinga objects.cache file'), + 'description' => t('Location of your icinga objects.cache file'), 'value' => realpath(Icinga::app()->getApplicationDir() . '/../var/objects.cache'), 'validators' => array(new ReadablePathValidator()) ) diff --git a/application/forms/Config/ResourceConfigForm.php b/application/forms/Config/ResourceConfigForm.php index 7527ca1e7..9a3ae7793 100644 --- a/application/forms/Config/ResourceConfigForm.php +++ b/application/forms/Config/ResourceConfigForm.php @@ -197,10 +197,10 @@ class ResourceConfigForm extends ConfigForm 'checkbox', 'force_creation', array( - 'order' => 0, - 'ignore' => true, - 'label' => t('Force Changes'), - 'helptext' => t('Check this box to enforce changes without connectivity validation') + 'order' => 0, + 'ignore' => true, + 'label' => t('Force Changes'), + 'description' => t('Check this box to enforce changes without connectivity validation') ) ); } @@ -229,21 +229,21 @@ class ResourceConfigForm extends ConfigForm 'text', 'name', array( - 'required' => true, - 'label' => t('Resource Name'), - 'helptext' => t('The unique name of this resource') + 'required' => true, + 'label' => t('Resource Name'), + 'description' => t('The unique name of this resource') ) ), $this->createElement( 'select', 'type', array( - 'required' => true, - 'autosubmit' => true, - 'label' => t('Resource Type'), - 'helptext' => t('The type of resource'), - 'multiOptions' => $resourceTypes, - 'value' => $resourceType + 'required' => true, + 'autosubmit' => true, + 'label' => t('Resource Type'), + 'description' => t('The type of resource'), + 'multiOptions' => $resourceTypes, + 'value' => $resourceType ) ) );