tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/deduplicate-puppet-code-6842

This commit is contained in:
Eric Lippmann 2014-12-10 09:38:59 +01:00
parent fb6b2a7273 196b6a4875
commit 9d7f3bdbc6
44 changed files with 1042 additions and 1056 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Vagrantfile.parallels Normal file
View File

@ -0,0 +1,27 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :
Vagrant.configure("2") do |config|
config.vm.box = "parallels/centos-6.5"
config.vm.network "forwarded_port", guest: 80, host: 8080,
auto_correct: true
config.vm.provider "parallels" do |v|
v.name = "Icinga Web 2 Development"
# Update Parallels Tools automatically
v.update_guest_tools = true
# Set power consumption mode to "Better Performance"
v.optimize_power_consumption = false
v.memory = 1024
v.cpus = 2
end
config.puppet_install.puppet_version = :latest
config.vm.provision :puppet do |puppet|
puppet.module_path = ".vagrant-puppet/modules"
puppet.manifests_path = ".vagrant-puppet/manifests"
# puppet.options = "-v -d"
end
end

2
application/controllers/ConfigController.php
View File

@ -62,7 +62,7 @@ class ConfigController extends ActionController
public function modulesAction()
{
$this->view->tabs = Widget::create('tabs')->add('modules', array(
'title' => 'Modules',
'title' => $this->translate('Modules'),
'url' => 'config/modules'
));

4
application/forms/Config/Resource/DbResourceForm.php
View File

@ -29,10 +29,10 @@ class DbResourceForm extends Form
public function createElements(array $formData)
{
$dbChoices = array();
if (Platform::zendClassExists('Zend_Db_Adapter_Pdo_Mysql')) {
if (Platform::hasMysqlSupport()) {
$dbChoices['mysql'] = 'MySQL';
}
if (Platform::zendClassExists('Zend_Db_Adapter_Pdo_Pgsql')) {
if (Platform::hasPostgresqlSupport()) {
$dbChoices['pgsql'] = 'PostgreSQL';
}

2
application/forms/Config/ResourceConfigForm.php
View File

@ -217,7 +217,7 @@ class ResourceConfigForm extends ConfigForm
if ($resourceType === 'ldap' || Platform::extensionLoaded('ldap')) {
$resourceTypes['ldap'] = 'LDAP';
}
if ($resourceType === 'db' || Platform::extensionLoaded('mysql') || Platform::extensionLoaded('pgsql')) {
if ($resourceType === 'db' || Platform::hasMysqlSupport() || Platform::hasPostgresqlSupport()) {
$resourceTypes['db'] = t('SQL Database');
}

BIN
application/locale/pt_BR/LC_MESSAGES/icinga.mo
View File

Binary file not shown.

489
application/locale/pt_BR/LC_MESSAGES/icinga.po
View File

@ -1,15 +1,21 @@
# Icinga Web 2 - Head for multiple monitoring backends.
# Copyright (C) 2014 Icinga Development Team
# This file is distributed under the same license as Icinga Web 2.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
msgid ""
msgstr ""
"Project-Id-Version: Icinga Web 2 (0.1)\n"
"Project-Id-Version: Icinga Web 2 (None)\n"
"Report-Msgid-Bugs-To: dev@icinga.org\n"
"POT-Creation-Date: 2014-06-03 15:23+0200\n"
"PO-Revision-Date: 2014-11-18 16:11-0300\n"
"POT-Creation-Date: 2014-12-03 09:11-0200\n"
"PO-Revision-Date: 2014-12-03 09:19-0300\n"
"Last-Translator: Carlos Cesario <carloscesario@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: pt_BR\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.5.4\n"
#: /usr/local/icingaweb/library/Icinga/Web/Menu/MonitoringMenuItemRenderer.php:41
@ -38,10 +44,29 @@ msgstr "%s: %d até %d de %d"
msgid "'%s' is not a valid number"
msgstr "'%s' não é um número válido"
#: /usr/local/icingaweb/application/forms/Authentication/LoginForm.php:45
msgid "...and your password"
msgstr "... e sua senha"
#: /usr/local/icingaweb/application/views/scripts/dashboard/new-component.phtml:5
msgid "Add Component To Dashboard"
msgstr "Adicionar componente ao dashboard"
#: /usr/local/icingaweb/application/views/scripts/dashboard/new-dashlet.phtml:5
msgid "Add Dashlet To Dashboard"
msgstr "Adicionar dashlet ao dashboard"
#: /usr/local/icingaweb/application/forms/Dashboard/ComponentForm.php:29
#: /usr/local/icingaweb/application/forms/Dashboard/DashletForm.php:29
#: /usr/local/icingaweb/application/forms/Dashboard/AddUrlForm.php:22
#: /usr/local/icingaweb/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php:26
msgid "Add To Dashboard"
msgstr "Adicionar ao dashboard"
#: /usr/local/icingaweb/application/views/scripts/dashboard/addurl.phtml:6
msgid "Add URL to Dashboard"
msgstr "Adicionar URL ao dashboard"
#: /usr/local/icingaweb/library/Icinga/Web/Widget/FilterWidget.php:81
msgid "Add filter..."
msgstr "Adicionar filtro..."
@ -54,7 +79,13 @@ msgstr ""
"Todos os métodos de autenticação configurados falharam. Por favor, verifique "
"o log de sistema ou o log do Icinga Web 2 para obter mais informações."
#: /usr/local/icingaweb/library/Icinga/Web/Menu.php:229
#: /usr/local/icingaweb/application/controllers/RolesController.php:17
#: /usr/local/icingaweb/application/controllers/ConfigController.php:27
#: /usr/local/icingaweb/application/controllers/PermissionsController.php:17
msgid "Application"
msgstr "Aplicação"
#: /usr/local/icingaweb/library/Icinga/Web/Menu.php:234
msgid "Application Log"
msgstr "Log da aplicação"
@ -66,6 +97,12 @@ msgstr "Prefixo da aplicação"
msgid "Apply"
msgstr "Aplicar"
#: /usr/local/icingaweb/application/controllers/RolesController.php:20
#: /usr/local/icingaweb/application/controllers/ConfigController.php:30
#: /usr/local/icingaweb/application/controllers/PermissionsController.php:20
msgid "Authentication"
msgstr "Autenticação"
#: /usr/local/icingaweb/application/forms/Config/AuthenticationBackendConfigForm.php:214
#, php-format
msgid "Authentication backend \"%s\" has been successfully changed"
@ -76,7 +113,7 @@ msgstr "Backend de autenticação \"%s\" foi alterado com sucesso"
msgid "Authentication backend \"%s\" has been successfully created"
msgstr "Backend de autenticação \"%s\" foi criado com sucesso"
#: /usr/local/icingaweb/application/controllers/ConfigController.php:194
#: /usr/local/icingaweb/application/controllers/ConfigController.php:197
#, php-format
msgid "Authentication backend \"%s\" has been successfully removed"
msgstr "Backend de autenticação \"%s\" foi removido com sucesso"
@ -139,7 +176,27 @@ msgctxt "preferences.form"
msgid "Browser (%s)"
msgstr "Navegador (%s)"
#: /usr/local/icingaweb/library/Icinga/Web/Widget/FilterEditor.php:335
#: /usr/local/icingaweb/application/forms/Security/RoleForm.php:155
#, php-format
msgid "Can't add role '%s'. Role already exists"
msgstr "Não foi possível adicionar a função '%s'. A função já existe"
#: /usr/local/icingaweb/application/forms/Security/RoleForm.php:123
#, php-format
msgid "Can't load role '%s'. Role does not exist"
msgstr "Não é possível carregar a função '%s'. A função não existe"
#: /usr/local/icingaweb/application/forms/Security/RoleForm.php:181
#, php-format
msgid "Can't remove role '%s'. Role does not exist"
msgstr "Não é possível remover a função '%s'. A função não existe"
#: /usr/local/icingaweb/application/forms/Security/RoleForm.php:214
#, php-format
msgid "Can't update role '%s'. Role does not exist"
msgstr "Não é possível atulizar a função '%s'. A função não existe"
#: /usr/local/icingaweb/library/Icinga/Web/Widget/FilterEditor.php:340
msgid "Cancel this operation"
msgstr "Cancelar esta operação"
@ -148,22 +205,35 @@ msgstr "Cancelar esta operação"
msgid "Cannot read config file \"%s\". Permission denied"
msgstr "Não é possível ler arquivo de configuração \"%s\". Permissão negada"
#: /usr/local/icingaweb/application/forms/Dashboard/DashletForm.php:124
msgid "Check this box if you want to add the dashlet to a new dashboard"
msgstr ""
"Marque esta caixa se você deseja adicionar o dashlet a um novo dashboard"
#: /usr/local/icingaweb/application/forms/Config/AuthenticationBackendConfigForm.php:280
#: /usr/local/icingaweb/application/forms/Config/ResourceConfigForm.php:201
msgid "Check this box to enforce changes without connectivity validation"
msgstr ""
"Marque esta caixa para forçar as alterações sem validação conectividade"
#: /usr/local/icingaweb/library/Icinga/Web/Widget/FilterEditor.php:309
#: /usr/local/icingaweb/library/Icinga/Web/Widget/FilterEditor.php:314
msgid "Click to add another filter"
msgstr "Clique para adicionar outro filtro"
#: /usr/local/icingaweb/library/Icinga/Web/Widget/FilterWidget.php:69
#: /usr/local/icingaweb/library/Icinga/Web/Widget/FilterEditor.php:296
#: /usr/local/icingaweb/library/Icinga/Web/Widget/FilterEditor.php:301
msgid "Click to remove this part of your filter"
msgstr "Clique para remover esta parte do seu filtro"
#: /usr/local/icingaweb/library/Icinga/Web/Menu.php:219
#: /usr/local/icingaweb/application/forms/Security/RoleForm.php:80
msgid "Comma-separated list of groups that are assigned to the role"
msgstr "Lista separada por vírgulas dos grupos que são atribuídos à função"
#: /usr/local/icingaweb/application/forms/Security/RoleForm.php:72
msgid "Comma-separated list of users that are assigned to the role"
msgstr "Lista separada por vírgulas dos usuários que são atribuídos à função"
#: /usr/local/icingaweb/library/Icinga/Web/Menu.php:224
msgid "Configuration"
msgstr "Configuração"
@ -197,6 +267,10 @@ msgstr ""
msgid "Could not find any resources for authentication"
msgstr "Não foi possível encontrar os recursos para autenticação"
#: /usr/local/icingaweb/application/views/scripts/dashboard/error.phtml:2
msgid "Could not persist dashboard"
msgstr "Não foi possível salvar o dashboard"
#: /usr/local/icingaweb/application/controllers/AuthenticationController.php:60
msgid ""
"Could not read your authentication.ini, no authentication methods are "
@ -209,6 +283,10 @@ msgstr ""
msgid "Create A New Authentication Backend"
msgstr "Criar um novo backend de autenticação"
#: /usr/local/icingaweb/application/forms/Dashboard/ComponentForm.php:133
msgid "Create A New Dashboard"
msgstr "Criar um novo dashboard"
#: /usr/local/icingaweb/application/forms/Dashboard/AddUrlForm.php:88
msgid "Create A New Pane"
msgstr "Criar um novo painel"
@ -222,6 +300,11 @@ msgstr "Criar um novo recurso"
msgid "Create New Authentication Backend"
msgstr "Criar um novo backend de autenticação"
#: /usr/local/icingaweb/application/controllers/RolesController.php:57
#: /usr/local/icingaweb/application/controllers/PermissionsController.php:57
msgid "Create Role"
msgstr "Criar função"
#: /usr/local/icingaweb/application/views/scripts/config/authentication/create.phtml:7
msgid ""
"Create a new backend for authenticating your users. This backend will be "
@ -230,7 +313,7 @@ msgstr ""
"Criar um novo backend para autenticar os usuários. Este backend será "
"adicionado por último."
#: /usr/local/icingaweb/application/views/scripts/dashboard/index.phtml:12
#: /usr/local/icingaweb/application/views/scripts/dashboard/index.phtml:13
#, php-format
msgid ""
"Currently there is no dashlet available. This might change once you enabled "
@ -240,10 +323,41 @@ msgstr ""
"você habilite algum dos disponíveis %s."
#: /usr/local/icingaweb/application/layouts/scripts/body.phtml:31
#: /usr/local/icingaweb/library/Icinga/Web/Menu.php:209
#: /usr/local/icingaweb/application/forms/Dashboard/ComponentForm.php:122
#: /usr/local/icingaweb/application/forms/Dashboard/DashletForm.php:109
#: /usr/local/icingaweb/library/Icinga/Web/Menu.php:214
msgid "Dashboard"
msgstr "Dashboard"
#: /usr/local/icingaweb/application/views/scripts/dashboard/settings.phtml:7
msgid "Dashboard Settings"
msgstr "Configurações do dashboard"
#: /usr/local/icingaweb/application/controllers/DashboardController.php:203
msgid "Dashboard has been removed"
msgstr "O dashboard foi removido"
#: /usr/local/icingaweb/application/views/scripts/dashboard/settings.phtml:13
msgid "Dashlet Name"
msgstr "Nome do dashlet"
#: /usr/local/icingaweb/application/forms/Dashboard/ComponentForm.php:78
#: /usr/local/icingaweb/application/forms/Dashboard/DashletForm.php:79
msgid "Dashlet Title"
msgstr "Título do dashlet"
#: /usr/local/icingaweb/application/controllers/DashboardController.php:67
msgid "Dashlet created"
msgstr "Dashlet criado"
#: /usr/local/icingaweb/application/controllers/DashboardController.php:165
msgid "Dashlet has been removed from"
msgstr "O dashlet foi removido do"
#: /usr/local/icingaweb/application/controllers/DashboardController.php:128
msgid "Dashlet updated"
msgstr "Dashlet atualizado"
#: /usr/local/icingaweb/application/forms/Config/AuthenticationBackendConfigForm.php:294
#: /usr/local/icingaweb/application/forms/Config/General/ApplicationConfigForm.php:56
msgid "Database"
@ -272,7 +386,15 @@ msgctxt "app.config.logging.level"
msgid "Debug"
msgstr "Depurar"
#: /usr/local/icingaweb/application/views/scripts/showConfiguration.phtml:20
#: /usr/local/icingaweb/application/views/scripts/config/module.phtml:42
msgid "Dependencies"
msgstr "Dependências"
#: /usr/local/icingaweb/application/views/scripts/config/module.phtml:38
msgid "Description"
msgstr "Descrição"
#: /usr/local/icingaweb/application/views/scripts/showConfiguration.phtml:19
msgid ""
"Details can be found in the application log. (If you don't have access to "
"this log, call your administrator in this case)"
@ -288,6 +410,14 @@ msgstr "Não salvar as preferências"
msgid "Edit Backend"
msgstr "Editar backend"
#: /usr/local/icingaweb/application/views/scripts/dashboard/update-component.phtml:6
msgid "Edit Component"
msgstr "Editar componente"
#: /usr/local/icingaweb/application/views/scripts/dashboard/update-dashlet.phtml:6
msgid "Edit Dashlet"
msgstr "Editar dashlet"
#: /usr/local/icingaweb/application/views/scripts/config/resource/modify.phtml:4
msgid "Edit Existing Resource"
msgstr "Editar o recurso existente"
@ -297,11 +427,34 @@ msgstr "Editar o recurso existente"
msgid "Enabling the \"%s\" module might help!"
msgstr "Habilitando o módulo \"%s\" pode ajudar!"
#: /usr/local/icingaweb/application/forms/Dashboard/ComponentForm.php:79
#: /usr/local/icingaweb/application/forms/Dashboard/DashletForm.php:80
msgid "Enter a title for the dashlet."
msgstr "Entre com o título para o dashlet."
#: /usr/local/icingaweb/application/forms/Dashboard/ComponentForm.php:93
#: /usr/local/icingaweb/application/forms/Dashboard/DashletForm.php:100
msgid "Enter a title for the new pane."
msgstr "Entre com o título para o novo painel."
#: /usr/local/icingaweb/application/forms/Dashboard/ComponentForm.php:70
#: /usr/local/icingaweb/application/forms/Dashboard/DashletForm.php:71
msgid ""
"Enter url being loaded in the dashlet. You can paste the full URL, including "
"filters."
msgstr ""
"Digite url a ser carregada no dashlet. Você pode colar a URL completa, "
"incluindo os filtros."
#: /usr/local/icingaweb/application/forms/Config/General/LoggingConfigForm.php:53
msgctxt "app.config.logging.level"
msgid "Error"
msgstr "Erro"
#: /usr/local/icingaweb/application/views/scripts/dashboard/error.phtml:11
msgid "Error details"
msgstr "Detalhes do erro"
#: /usr/local/icingaweb/application/forms/Config/ResourceConfigForm.php:214
msgid "File"
msgstr "Arquivo"
@ -328,7 +481,7 @@ msgid "Filter Pattern"
msgstr "Padrão do filtro"
#: /usr/local/icingaweb/library/Icinga/Web/Widget/FilterWidget.php:90
#: /usr/local/icingaweb/library/Icinga/Web/Widget/FilterEditor.php:642
#: /usr/local/icingaweb/library/Icinga/Web/Widget/FilterEditor.php:647
msgid "Filter this list"
msgstr "Filtrar esta lista"
@ -345,6 +498,12 @@ msgstr "Finalizar"
msgid "Force Changes"
msgstr "Forçar as alterações"
#: /usr/local/icingaweb/application/views/scripts/roles/index.phtml:17
#: /usr/local/icingaweb/application/views/scripts/permissions/index.phtml:16
#: /usr/local/icingaweb/application/forms/Security/RoleForm.php:79
msgid "Groups"
msgstr "Grupos"
#: /usr/local/icingaweb/application/views/scripts/search/hint.phtml:3
msgid "Hint"
msgstr "Sugestão"
@ -382,7 +541,7 @@ msgstr ""
"Se esta mensagem não desaparecer, pode ser necessário sair da sessão atual "
"manualmente limpando o cache ou fechando a sessão atual do navegador. "
#: /usr/local/icingaweb/application/views/scripts/showConfiguration.phtml:22
#: /usr/local/icingaweb/application/views/scripts/showConfiguration.phtml:21
msgid ""
"In case you can access the file by yourself, you can open it and insert the "
"config manually:"
@ -448,7 +607,7 @@ msgid "Login"
msgstr "Login"
#: /usr/local/icingaweb/application/layouts/scripts/parts/topbar.phtml:35
#: /usr/local/icingaweb/library/Icinga/Web/Menu.php:244
#: /usr/local/icingaweb/library/Icinga/Web/Menu.php:249
msgid "Logout"
msgstr "Logout"
@ -456,17 +615,22 @@ msgstr "Logout"
msgid "Logout successful!"
msgstr "Sucesso ao realizar o logout!"
#: /usr/local/icingaweb/application/views/scripts/dashboard/error.phtml:7
msgid "Make sure that the webserver can write to this file."
msgstr ""
"Certifique-se de que o servidor web tenha permissão para gravar este arquivo."
#: /usr/local/icingaweb/library/Icinga/Web/Widget/FilterWidget.php:95
#: /usr/local/icingaweb/library/Icinga/Web/Widget/FilterEditor.php:644
#: /usr/local/icingaweb/library/Icinga/Web/Widget/FilterEditor.php:649
msgid "Modify this filter"
msgstr "Modificar este filtro"
#: /usr/local/icingaweb/application/controllers/ConfigController.php:118
#: /usr/local/icingaweb/application/controllers/ConfigController.php:121
#, php-format
msgid "Module \"%s\" disabled"
msgstr "Módulo \"%s\" desabilitado"
#: /usr/local/icingaweb/application/controllers/ConfigController.php:99
#: /usr/local/icingaweb/application/controllers/ConfigController.php:102
#, php-format
msgid "Module \"%s\" enabled"
msgstr "Módulo \"%s\" habilitado"
@ -483,7 +647,8 @@ msgstr "Módulo está desabilitado"
msgid "Module is enabled"
msgstr "Módulo está habilitado"
#: /usr/local/icingaweb/library/Icinga/Web/Menu.php:223
#: /usr/local/icingaweb/application/controllers/ConfigController.php:65
#: /usr/local/icingaweb/library/Icinga/Web/Menu.php:228
msgid "Modules"
msgstr "Módulos"
@ -495,10 +660,28 @@ msgstr "Mover para baixo na ordem de autenticação"
msgid "Move up in authentication order"
msgstr "Mover para cima na ordem de autenticação"
#: /usr/local/icingaweb/application/views/scripts/config/module.phtml:18
#: /usr/local/icingaweb/application/views/scripts/roles/index.phtml:13
#: /usr/local/icingaweb/application/views/scripts/permissions/index.phtml:13
msgid "Name"
msgstr "Nome"
#: /usr/local/icingaweb/application/views/scripts/pivottablePagination.phtml:16
msgid "Navigation"
msgstr "Navegação"
#: /usr/local/icingaweb/application/forms/Dashboard/ComponentForm.php:91
#: /usr/local/icingaweb/application/forms/Dashboard/DashletForm.php:98
msgid "New Dashboard Title"
msgstr "Novo título do bashboard"
#: /usr/local/icingaweb/application/views/scripts/roles/new.phtml:2
#: /usr/local/icingaweb/application/views/scripts/roles/index.phtml:65
#: /usr/local/icingaweb/application/views/scripts/permissions/new.phtml:2
#: /usr/local/icingaweb/application/views/scripts/permissions/index.phtml:43
msgid "New Role"
msgstr "Nova função"
#: /usr/local/icingaweb/application/forms/Config/AuthenticationBackendConfigForm.php:119
msgid "New authentication backend name missing"
msgstr "Falta o nome do novo backend de autenticação"
@ -507,6 +690,10 @@ msgstr "Falta o nome do novo backend de autenticação"
msgid "New configuration has successfully been stored"
msgstr "A nova configuração foi salva com sucesso"
#: /usr/local/icingaweb/application/forms/Dashboard/DashletForm.php:122
msgid "New dashboard"
msgstr "Novo dashboard"
#: /usr/local/icingaweb/application/forms/Config/ResourceConfigForm.php:90
msgid "New resource name missing"
msgstr "Falta o nome do novo rescurso"
@ -535,6 +722,18 @@ msgstr ""
"Não há métodos de autenticação disponíveis. Você criou o arquivo "
"authentication.ini ao configurar Icinga Web 2?"
#: /usr/local/icingaweb/application/views/scripts/dashboard/settings.phtml:37
msgid "No dashlets added to dashboard"
msgstr "Nenhum dashlet adicionado ao dashboard"
#: /usr/local/icingaweb/application/views/scripts/permissions/index.phtml:8
msgid "No permissions found."
msgstr "Não há nenhuma permissão."
#: /usr/local/icingaweb/application/views/scripts/roles/index.phtml:8
msgid "No roles found."
msgstr "Não há nenhuma função."
#: /usr/local/icingaweb/application/forms/Config/Authentication/DbBackendForm.php:110
msgid "No users found under the specified database backend"
msgstr "Nenhum usuário encontrado no backend do banco de dados especificado"
@ -593,13 +792,34 @@ msgstr "Caminho não tem permissão de leitura"
msgid "Pattern"
msgstr "Padrão"
#: /usr/local/icingaweb/application/views/scripts/dashboard/addurl.phtml:9
msgid ""
"Please have a little patience, we are hard working on it, take a look at "
"icingaweb2 issues."
msgstr ""
"Por favor, tenha um pouco de paciência, estamos trabalhando duro nisso, dê "
"uma olhada nos problemas do icingaweb2."
#: /usr/local/icingaweb/application/views/scripts/config/module.phtml:54
#: /usr/local/icingaweb/application/views/scripts/roles/index.phtml:14
#: /usr/local/icingaweb/application/views/scripts/permissions/index.phtml:6
#: /usr/local/icingaweb/application/views/scripts/permissions/index.phtml:14
#: /usr/local/icingaweb/application/controllers/PermissionsController.php:26
msgid "Permissions"
msgstr "Permissões"
#: /usr/local/icingaweb/application/forms/Security/RoleForm.php:87
msgid "Permissions Set"
msgstr "Definir permissões"
#: /usr/local/icingaweb/application/views/scripts/dashboard/remove-component.phtml:9
#: /usr/local/icingaweb/application/views/scripts/dashboard/remove-dashlet.phtml:9
msgid "Please confirm the removal"
msgstr "Por favor, confirme a remoção"
#: /usr/local/icingaweb/application/views/scripts/dashboard/remove-pane.phtml:9
msgid "Please confirm the removal of"
msgstr "Por favor, confirme a remoção do"
#: /usr/local/icingaweb/application/views/scripts/dashboard/error.phtml:4
msgid "Please copy the following dashboard snippet to "
msgstr "Por favor, copie o seguinte trecho do dashboard para"
#: /usr/local/icingaweb/application/forms/Authentication/LoginForm.php:35
msgid "Please enter your username..."
msgstr "Por favor, entre com seu usuário..."
#: /usr/local/icingaweb/application/controllers/AuthenticationController.php:116
msgid ""
@ -628,7 +848,7 @@ msgstr "Porta"
#: /usr/local/icingaweb/application/layouts/scripts/parts/topbar.phtml:32
#: /usr/local/icingaweb/application/controllers/PreferenceController.php:30
#: /usr/local/icingaweb/library/Icinga/Web/Menu.php:239
#: /usr/local/icingaweb/library/Icinga/Web/Menu.php:244
msgid "Preferences"
msgstr "Preferências"
@ -655,14 +875,50 @@ msgstr "Remover"
msgid "Remove Backend"
msgstr "Remover backend"
#: /usr/local/icingaweb/application/views/scripts/dashboard/remove-component.phtml:6
msgid "Remove Component From Dashboard"
msgstr "Remover componente do dashboard"
#: /usr/local/icingaweb/application/views/scripts/dashboard/remove-pane.phtml:6
msgid "Remove Dashboard"
msgstr "Remover dashboard"
#: /usr/local/icingaweb/application/views/scripts/dashboard/remove-dashlet.phtml:6
msgid "Remove Dashlet From Dashboard"
msgstr "Remover dashlet do dashboard"
#: /usr/local/icingaweb/application/views/scripts/config/resource/remove.phtml:4
msgid "Remove Existing Resource"
msgstr "Remover recurso existente"
#: /usr/local/icingaweb/application/controllers/RolesController.php:144
#: /usr/local/icingaweb/application/controllers/PermissionsController.php:144
msgid "Remove Role"
msgstr "Remover função"
#: /usr/local/icingaweb/application/views/scripts/roles/remove.phtml:2
#: /usr/local/icingaweb/application/views/scripts/permissions/remove.phtml:2
#, php-format
msgid "Remove Role %s"
msgstr "Remover função %s"
#: /usr/local/icingaweb/application/views/scripts/roles/index.phtml:55
#: /usr/local/icingaweb/application/views/scripts/permissions/index.phtml:33
msgid "Remove role"
msgstr "Remover função"
#: /usr/local/icingaweb/library/Icinga/Web/Widget/FilterWidget.php:99
msgid "Remove this filter"
msgstr "Remover este filtro"
#: /usr/local/icingaweb/application/controllers/RolesController.php:69
#: /usr/local/icingaweb/application/controllers/RolesController.php:113
#: /usr/local/icingaweb/application/controllers/PermissionsController.php:69
#: /usr/local/icingaweb/application/controllers/PermissionsController.php:113
#, php-format
msgid "Required parameter '%s' missing"
msgstr "Está faltando o paramento requerido \"%s'"
#: /usr/local/icingaweb/application/views/scripts/config/resource.phtml:12
msgid "Resource"
msgstr "Recurso"
@ -677,7 +933,7 @@ msgstr "Recurso \"%s\" foi alterado com sucesso"
msgid "Resource \"%s\" has been successfully created"
msgstr "Recurso \"%s\" foi criado com sucesso"
#: /usr/local/icingaweb/application/controllers/ConfigController.php:266
#: /usr/local/icingaweb/application/controllers/ConfigController.php:269
#, php-format
msgid "Resource \"%s\" has been successfully removed"
msgstr "Recurso \"%s\" foi removido com sucesso"
@ -703,10 +959,46 @@ msgstr "Recurso já existe"
msgid "Resource name missing"
msgstr "Falta o nome do recurso"
#: /usr/local/icingaweb/application/controllers/RolesController.php:23
#: /usr/local/icingaweb/application/controllers/ConfigController.php:33
#: /usr/local/icingaweb/application/controllers/PermissionsController.php:23
msgid "Resources"
msgstr "Recursos"
#: /usr/local/icingaweb/application/views/scripts/config/resource/create.phtml:5
msgid "Resources are entities that provide data to Icinga Web 2."
msgstr "Os recursos são entidades que fornecem dados para Icinga Web 2."
#: /usr/local/icingaweb/application/views/scripts/config/module.phtml:62
#: /usr/local/icingaweb/application/views/scripts/roles/index.phtml:15
msgid "Restrictions"
msgstr "Restrições"
#: /usr/local/icingaweb/application/forms/Security/RoleForm.php:62
msgid "Role Name"
msgstr "Nome da função"
#: /usr/local/icingaweb/application/controllers/RolesController.php:50
#: /usr/local/icingaweb/application/controllers/PermissionsController.php:50
msgid "Role created"
msgstr "Função criada"
#: /usr/local/icingaweb/application/controllers/RolesController.php:137
#: /usr/local/icingaweb/application/controllers/PermissionsController.php:137
msgid "Role removed"
msgstr "Função removida"
#: /usr/local/icingaweb/application/controllers/RolesController.php:97
#: /usr/local/icingaweb/application/controllers/PermissionsController.php:97
msgid "Role updated"
msgstr "Função atualizada"
#: /usr/local/icingaweb/application/views/scripts/roles/index.phtml:3
#: /usr/local/icingaweb/application/controllers/RolesController.php:26
#: /usr/local/icingaweb/application/controllers/ConfigController.php:36
msgid "Roles"
msgstr "Funções"
#: /usr/local/icingaweb/application/forms/Config/Resource/LdapResourceForm.php:64
msgid "Root DN"
msgstr "DN Root"
@ -727,7 +1019,7 @@ msgstr "Salvar para a sessão atual"
#: /usr/local/icingaweb/application/forms/PreferenceForm.php:194
msgid "Save to the Preferences"
msgstr "Salvar as preferências"
msgstr "Salvar preferências"
#: /usr/local/icingaweb/application/views/scripts/showConfiguration.phtml:2
msgid "Saving Configuration Failed"
@ -747,16 +1039,25 @@ msgstr "Pesquisar este domínio para os registros de servidores disponíveis."
#: /usr/local/icingaweb/application/views/scripts/layout/menu.phtml:8
#: /usr/local/icingaweb/application/layouts/scripts/parts/navigation.phtml:20
#: /usr/local/icingaweb/library/Icinga/Web/Widget/FilterEditor.php:638
#: /usr/local/icingaweb/library/Icinga/Web/Widget/FilterEditor.php:643
msgid "Search..."
msgstr "Pesquisar..."
#: /usr/local/icingaweb/application/forms/Dashboard/ComponentForm.php:125
#: /usr/local/icingaweb/application/forms/Dashboard/DashletForm.php:112
msgid "Select a pane you want to add the dashlet."
msgstr "Selecione o painel que você deseja adicionar ao dashlet."
#: /usr/local/icingaweb/application/views/scripts/joystickPagination.phtml:53
#: /usr/local/icingaweb/application/views/scripts/joystickPagination.phtml:69
#: /usr/local/icingaweb/application/views/scripts/pivottablePagination.phtml:34
msgid "Services"
msgstr "Serviços"
#: /usr/local/icingaweb/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php:35
msgid "Settings"
msgstr "Configurações"
#: /usr/local/icingaweb/library/Icinga/Web/Widget/Limiter.php:84
#, php-format
msgid "Show %s rows on one page"
@ -771,7 +1072,7 @@ msgstr "Mostrar linhas %d até %d de %d"
msgid "Socket"
msgstr "Soquete"
#: /usr/local/icingaweb/application/views/scripts/showConfiguration.phtml:15
#: /usr/local/icingaweb/application/views/scripts/showConfiguration.phtml:14
msgid "Something went wrong while writing the file"
msgstr "Algo deu errado ao gravar o arquivo"
@ -779,11 +1080,11 @@ msgstr "Algo deu errado ao gravar o arquivo"
msgid "State"
msgstr "Estado"
#: /usr/local/icingaweb/library/Icinga/Web/Widget/FilterEditor.php:322
#: /usr/local/icingaweb/library/Icinga/Web/Widget/FilterEditor.php:327
msgid "Strip this filter"
msgstr "Retirar esse filtro"
#: /usr/local/icingaweb/library/Icinga/Web/Menu.php:215
#: /usr/local/icingaweb/library/Icinga/Web/Menu.php:220
msgid "System"
msgstr "Sistema"
@ -807,7 +1108,7 @@ msgstr ""
"A conexão com o banco de dados a ser utilizada para autenticar com este "
"provedor"
#: /usr/local/icingaweb/application/views/scripts/showConfiguration.phtml:6
#: /usr/local/icingaweb/application/views/scripts/showConfiguration.phtml:5
#, php-format
msgid "The file %s couldn't be stored. (Error: \"%s\")"
msgstr "O arquivo %s não pode ser gravado. (Erro: \"%s\")"
@ -843,6 +1144,10 @@ msgstr ""
msgid "The name of the database to use"
msgstr "O nome do banco de dados a ser utilizado"
#: /usr/local/icingaweb/application/forms/Security/RoleForm.php:63
msgid "The name of the role"
msgstr "O nome da função"
#: /usr/local/icingaweb/application/forms/Config/Authentication/DbBackendForm.php:58
#: /usr/local/icingaweb/application/forms/Config/Authentication/AutologinBackendForm.php:35
#: /usr/local/icingaweb/application/forms/Config/Authentication/LdapBackendForm.php:59
@ -881,6 +1186,11 @@ msgstr ""
"O caminho onde os usuários serão encontrados no servidor LDAP. Deixe em "
"branco para selecionar todos os usuários disponíveis no recurso especificado."
#: /usr/local/icingaweb/application/forms/Security/RoleForm.php:88
msgid "The permissions to grant. You may select more than one permission"
msgstr ""
"Permissões a serem concedidas. Você pode selecionar mais de uma permissão"
#: /usr/local/icingaweb/application/forms/Config/Resource/LdapResourceForm.php:55
msgid "The port of the LDAP server to use for authentication"
msgstr "A porta do servidor LDAP utilizado para autenticação"
@ -901,7 +1211,7 @@ msgstr ""
"A expressão regular usada para retirar partes específicas dos nomes de "
"usuário. Deixe em branco se você não quiser retirar nada"
#: /usr/local/icingaweb/application/controllers/ConfigController.php:282
#: /usr/local/icingaweb/application/controllers/ConfigController.php:285
#, php-format
msgid ""
"The resource \"%s\" is currently in use by the authentication backend \"%s"
@ -958,19 +1268,15 @@ msgstr "O nome do usuário a ser utilizado para a autenticação"
msgid "There is no such module installed."
msgstr "Não existe nenhum módulo instalado."
#: /usr/local/icingaweb/application/views/scripts/showConfiguration.phtml:16
#: /usr/local/icingaweb/application/views/scripts/showConfiguration.phtml:15
msgid ""
"There's an application error preventing you from persisting the configuration"
msgstr "Há um erro na aplicação impedindo você de salvar a configuração"
#: /usr/local/icingaweb/application/views/scripts/showConfiguration.phtml:11
#: /usr/local/icingaweb/application/views/scripts/showConfiguration.phtml:10
msgid "This could have one or more of the following reasons:"
msgstr "Isto pode ter uma ou mais das seguintes razões:"
#: /usr/local/icingaweb/application/views/scripts/dashboard/addurl.phtml:6
msgid "This feature is deactivated at the moment."
msgstr "Esta funcionalidade está desabilitada no momento."
#: /usr/local/icingaweb/application/views/scripts/config/module.phtml:46
msgid "This module has no dependencies"
msgstr "Este módulo não tem dependências"
@ -1005,10 +1311,32 @@ msgstr "Backend de autenticação fornecido desconhecido"
msgid "Unknown resource provided"
msgstr "Recurso fornecido desconhecido"
#: /usr/local/icingaweb/application/controllers/DashboardController.php:81
msgid "Update Dashlet"
msgstr "Atualizar dashlet"
#: /usr/local/icingaweb/application/controllers/RolesController.php:74
#: /usr/local/icingaweb/application/controllers/PermissionsController.php:74
msgid "Update Role"
msgstr "Atualizar função"
#: /usr/local/icingaweb/application/views/scripts/roles/update.phtml:2
#: /usr/local/icingaweb/application/views/scripts/permissions/update.phtml:2
#, php-format
msgid "Update Role %s"
msgstr "Atualizar função %s"
#: /usr/local/icingaweb/application/views/scripts/dashboard/settings.phtml:16
#: /usr/local/icingaweb/application/forms/Dashboard/ComponentForm.php:68
#: /usr/local/icingaweb/application/forms/Dashboard/DashletForm.php:69
#: /usr/local/icingaweb/application/forms/Dashboard/AddUrlForm.php:35
msgid "Url"
msgstr "Url"
#: /usr/local/icingaweb/application/forms/Dashboard/ComponentForm.php:109
msgid "Use An Existing Dashboard"
msgstr "Usar um dashboard existente"
#: /usr/local/icingaweb/application/forms/Dashboard/AddUrlForm.php:67
msgid "Use An Existing Pane"
msgstr "Usar um painel existente"
@ -1034,11 +1362,21 @@ msgstr "Tipo de armazenamento para as preferências do usuário"
msgid "Username"
msgstr "Nome do usuário"
#: /usr/local/icingaweb/application/views/scripts/roles/index.phtml:16
#: /usr/local/icingaweb/application/views/scripts/permissions/index.phtml:15
#: /usr/local/icingaweb/application/forms/Security/RoleForm.php:71
msgid "Users"
msgstr "Usuários"
#: /usr/local/icingaweb/application/forms/Config/Authentication/DbBackendForm.php:114
#, php-format
msgid "Using the specified backend failed: %s"
msgstr "A utilização do backend especificado falhou: %s"
#: /usr/local/icingaweb/application/views/scripts/config/module.phtml:35
msgid "Version"
msgstr "Versão"
#: /usr/local/icingaweb/application/forms/Config/General/LoggingConfigForm.php:54
msgctxt "app.config.logging.level"
msgid "Warning"
@ -1048,7 +1386,7 @@ msgstr "Atenção"
msgid "Welcome to Icinga Web!"
msgstr "Bem vindo ao Icinga Web"
#: /usr/local/icingaweb/application/views/scripts/showConfiguration.phtml:14
#: /usr/local/icingaweb/application/views/scripts/showConfiguration.phtml:13
msgid "You don't have file-system permissions to write to the file"
msgstr "Você não tem permissão no sistema de arquivos para gravar o arquivo"
@ -1057,7 +1395,7 @@ msgid "You need to configure how to store preferences first."
msgstr ""
"Você precisa em primeiro lugar configurar as preferências de armazenamento."
#: /usr/local/icingaweb/application/views/scripts/authentication/login.phtml:20
#: /usr/local/icingaweb/application/views/scripts/authentication/login.phtml:21
#, php-format
msgid ""
"You seem not to have Icinga Web 2 configured yet so it's not possible to log "
@ -1082,12 +1420,32 @@ msgstr "Seu fuso horário atual"
msgid "all"
msgstr "todas"
#: /usr/local/icingaweb/application/views/scripts/config/module.phtml:24
msgid "disable"
msgstr "desabilitar"
#: /usr/local/icingaweb/application/views/scripts/config/modules.phtml:22
msgid "disabled"
msgstr "desabilitado"
#: /usr/local/icingaweb/application/views/scripts/config/module.phtml:29
msgid "enable"
msgstr "habilitar"
#: /usr/local/icingaweb/application/views/scripts/config/modules.phtml:22
msgid "enabled"
msgstr "habilitado"
#: /usr/local/icingaweb/application/views/scripts/config/modules.phtml:22
msgid "failed"
msgstr "falhou"
#: /usr/local/icingaweb/library/Icinga/Util/Format.php:83
#: /usr/local/icingaweb/library/Icinga/Util/Format.php:89
msgid "for"
msgstr "até"
msgstr "por"
#: /usr/local/icingaweb/application/views/scripts/dashboard/index.phtml:13
#: /usr/local/icingaweb/application/views/scripts/dashboard/index.phtml:14
msgid "modules"
msgstr "módulos"
@ -1100,3 +1458,42 @@ msgstr "desde"
#: /usr/local/icingaweb/application/views/scripts/config/devtools.phtml:5
msgid "toggle"
msgstr "alternar"
#~ msgid "Component Name"
#~ msgstr "Nome do componente"
#~ msgid "Component created"
#~ msgstr "Componente criado"
#~ msgid "Component updated"
#~ msgstr "Componente atualizado"
#~ msgid "Remove Pane"
#~ msgstr "Remover o painel"
#~ msgid "Update Component"
#~ msgstr "Atualizar componente"
#~ msgid ""
#~ "Click on the button to add the dashlet to an existing pane on your "
#~ "dashboard."
#~ msgstr ""
#~ "Clique no botão para adicionar o dashlet a um painel existente no "
#~ "dashboard."
#~ msgid ""
#~ "Decide if you want add the dashlet to an existing pane or create a new "
#~ "pane. Have a look on the button below."
#~ msgstr ""
#~ "Decida se você quer adicionar o dashlet a um painel existente ou criar um "
#~ "novo painel. Dê uma olhada no botão abaixo."
#~ msgid ""
#~ "Please have a little patience, we are hard working on it, take a look at "
#~ "icingaweb2 issues."
#~ msgstr ""
#~ "Por favor, tenha um pouco de paciência, estamos trabalhando duro nisso, "
#~ "dê uma olhada nos problemas do icingaweb2."
#~ msgid "This feature is deactivated at the moment."
#~ msgstr "Esta funcionalidade está desabilitada no momento."

16
application/views/scripts/config/module.phtml
View File

@ -15,31 +15,31 @@ $state = $moduleData->enabled ? ($moduleData->loaded ? 'enabled' : 'failed') : '
?>
<table class="avp">
<tr>
<th><?= $this->escape('Name') ?></th>
<th><?= $this->escape($this->translate('Name')) ?></th>
<td><?= $this->escape($module->getName()) ?></td>
</tr>
<tr>
<th><?= $this->translate('State') ?></th>
<td><?= $state ?><?php if ($state === 'enabled'): ?>
<?= $this->qlink('disable', 'config/moduledisable', array(
<?= $this->qlink($this->translate('disable'), 'config/moduledisable', array(
'name' => $module->getName()
)) ?>
<?php endif ?>
<?php if ($state === 'disabled'): ?>
<?= $this->qlink('enable', 'config/moduleenable', array(
<?= $this->qlink($this->translate('enable'), 'config/moduleenable', array(
'name' => $module->getName()
)) ?>
<?php endif ?>
</td>
<tr>
<th><?= $this->escape('Version') ?></th>
<th><?= $this->escape($this->translate('Version')) ?></th>
<td><?= $this->escape($module->getVersion()) ?></td></tr>
<tr>
<th><?= $this->escape('Description') ?></th>
<th><?= $this->escape($this->translate('Description')) ?></th>
<td><?= nl2br($this->escape($module->getDescription())) ?></td>
</tr>
<tr>
<th><?= $this->escape('Dependencies') ?></th>
<th><?= $this->escape($this->translate('Dependencies')) ?></th>
<td><?php
if (empty($dependencies)):
@ -51,7 +51,7 @@ else: foreach ($dependencies as $name => $versionString): ?>
</tr>
<?php if (! empty($permissions)): ?>
<tr>
<th><?= $this->escape('Permissions') ?></th>
<th><?= $this->escape($this->translate('Permissions')) ?></th>
<td><?php foreach ($permissions as $permission): ?>
<strong><?= $this->escape($permission->name) ?></strong>: <?= $this->escape($permission->description) ?><br />
<?php endforeach ?></td>
@ -59,7 +59,7 @@ else: foreach ($dependencies as $name => $versionString): ?>
<?php endif ?>
<?php if (! empty($restrictions)): ?>
<tr>
<th><?= $this->escape('Restrictions') ?></th>
<th><?= $this->escape($this->translate('Restrictions')) ?></th>
<td><?php foreach ($restrictions as $restriction): ?>
<strong><?= $this->escape($restriction->name) ?></strong>: <?= $this->escape($restriction->description) ?><br />
<?php endforeach ?></td>

2
application/views/scripts/config/modules.phtml
View File

@ -19,7 +19,7 @@
'config/module/',
array('name' => $module->name)
) ?>"><?= $this->escape($module->name); ?></a> (<?=
$module->enabled ? ($module->loaded ? 'enabled' : 'failed') : 'disabled'
$module->enabled ? ($module->loaded ? $this->translate('enabled') : $this->translate('failed')) : $this->translate('disabled')
?>)
</td>
</tr>

22
doc/LICENSEHEAD
View File

@ -1,22 +0,0 @@
This file is part of Icinga Web 2.
Icinga Web 2 - Head for multiple monitoring backends.
Copyright (C) %(YEAR)s Icinga Development Team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@copyright %(YEAR)s Icinga Development Team <info@icinga.org>
@license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2
@author Icinga Development Team <info@icinga.org>

293
doc/LIVESTATUS_COLUMNS
View File

@ -1,293 +0,0 @@
# TODO: Remove from release, used while developing
hosts
=====
accept_passive_checks
acknowledged
acknowledgement_type
action_url
action_url_expanded
active_checks_enabled
address
alias
check_command
check_flapping_recovery_notification
check_freshness
check_interval
check_options
check_period
check_type
checks_enabled
childs
comments
comments_with_info
contact_groups
contacts
current_attempt
current_notification_number
custom_variable_names
custom_variable_values
custom_variables
display_name
downtimes
downtimes_with_info
event_handler_enabled
execution_time
filename
first_notification_delay
flap_detection_enabled
groups
hard_state
has_been_checked
high_flap_threshold
icon_image
icon_image_alt
icon_image_expanded
in_check_period
in_notification_period
initial_state
is_executing
is_flapping
last_check
last_hard_state
last_hard_state_change
last_notification
last_state
last_state_change
last_time_down
last_time_unreachable
last_time_up
latency
long_plugin_output
low_flap_threshold
max_check_attempts
modified_attributes
modified_attributes_list
name
next_check
next_notification
no_more_notifications
notes
notes_expanded
notes_url
notes_url_expanded
notification_interval
notification_period
notifications_enabled
num_services
num_services_crit
num_services_hard_crit
num_services_hard_ok
num_services_hard_unknown
num_services_hard_warn
num_services_ok
num_services_pending
num_services_unknown
num_services_warn
obsess_over_host
parents
pending_flex_downtime
percent_state_change
perf_data
plugin_output
pnpgraph_present
process_performance_data
retry_interval
scheduled_downtime_depth
services
services_with_info
services_with_state
state
state_type
statusmap_image
total_services
worst_service_hard_state
worst_service_state
x_3d
y_3d
z_3d
services
========
accept_passive_checks
acknowledged
acknowledgement_type
action_url
action_url_expanded
active_checks_enabled
check_command
check_interval
check_options
check_period
check_type
checks_enabled
comments
comments_with_info
contact_groups
contacts
current_attempt
current_notification_number
custom_variable_names
custom_variable_values
custom_variables
description
display_name
downtimes
downtimes_with_info
event_handler
event_handler_enabled
execution_time
first_notification_delay
flap_detection_enabled
groups
has_been_checked
high_flap_threshold
host_accept_passive_checks
host_acknowledged
host_acknowledgement_type
host_action_url
host_action_url_expanded
host_active_checks_enabled
host_address
host_alias
host_check_command
host_check_flapping_recovery_notification
host_check_freshness
host_check_interval
host_check_options
host_check_period
host_check_type
host_checks_enabled
host_childs
host_comments
host_comments_with_info
host_contact_groups
host_contacts
host_current_attempt
host_current_notification_number
host_custom_variable_names
host_custom_variable_values
host_custom_variables
host_display_name
host_downtimes
host_downtimes_with_info
host_event_handler_enabled
host_execution_time
host_filename
host_first_notification_delay
host_flap_detection_enabled
host_groups
host_hard_state
host_has_been_checked
host_high_flap_threshold
host_icon_image
host_icon_image_alt
host_icon_image_expanded
host_in_check_period
host_in_notification_period
host_initial_state
host_is_executing
host_is_flapping
host_last_check
host_last_hard_state
host_last_hard_state_change
host_last_notification
host_last_state
host_last_state_change
host_last_time_down
host_last_time_unreachable
host_last_time_up
host_latency
host_long_plugin_output
host_low_flap_threshold
host_max_check_attempts
host_modified_attributes
host_modified_attributes_list
host_name
host_next_check
host_next_notification
host_no_more_notifications
host_notes
host_notes_expanded
host_notes_url
host_notes_url_expanded
host_notification_interval
host_notification_period
host_notifications_enabled
host_num_services
host_num_services_crit
host_num_services_hard_crit
host_num_services_hard_ok
host_num_services_hard_unknown
host_num_services_hard_warn
host_num_services_ok
host_num_services_pending
host_num_services_unknown
host_num_services_warn
host_obsess_over_host
host_parents
host_pending_flex_downtime
host_percent_state_change
host_perf_data
host_plugin_output
host_pnpgraph_present
host_process_performance_data
host_retry_interval
host_scheduled_downtime_depth
host_services
host_services_with_info
host_services_with_state
host_state
host_state_type
host_statusmap_image
host_total_services
host_worst_service_hard_state
host_worst_service_state
host_x_3d
host_y_3d
host_z_3d
icon_image
icon_image_alt
icon_image_expanded
in_check_period
in_notification_period
initial_state
is_executing
is_flapping
last_check
last_hard_state
last_hard_state_change
last_notification
last_state
last_state_change
last_time_critical
last_time_ok
last_time_unknown
last_time_warning
latency
long_plugin_output
low_flap_threshold
max_check_attempts
modified_attributes
modified_attributes_list
next_check
next_notification
no_more_notifications
notes
notes_expanded
notes_url
notes_url_expanded
notification_interval
notification_period
notifications_enabled
obsess_over_service
percent_state_change
perf_data
plugin_output
pnpgraph_present
process_performance_data
retry_interval
scheduled_downtime_depth
state
state_type

3
doc/ORACLE
View File

@ -1,3 +0,0 @@
pdo_oci has a Bug that shall be fixed with PHP 5.4.5, it segfaults when
fetching more than a single LOB value. The patch works also for older
pdo_oci versions and can be found here: https://bugs.php.net/bug.php?id=57702

273
doc/res/Dashboard.graphml
View File

@ -1,273 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<graphml xmlns="http://graphml.graphdrawing.org/xmlns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:y="http://www.yworks.com/xml/graphml" xmlns:yed="http://www.yworks.com/xml/yed/3" xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns http://www.yworks.com/xml/schema/graphml/1.1/ygraphml.xsd">
<!--Created by yFiles for Java 2.10-->
<key for="graphml" id="d0" yfiles.type="resources"/>
<key for="port" id="d1" yfiles.type="portgraphics"/>
<key for="port" id="d2" yfiles.type="portgeometry"/>
<key for="port" id="d3" yfiles.type="portuserdata"/>
<key attr.name="url" attr.type="string" for="node" id="d4"/>
<key attr.name="description" attr.type="string" for="node" id="d5"/>
<key for="node" id="d6" yfiles.type="nodegraphics"/>
<key attr.name="Description" attr.type="string" for="graph" id="d7"/>
<key attr.name="url" attr.type="string" for="edge" id="d8"/>
<key attr.name="description" attr.type="string" for="edge" id="d9"/>
<key for="edge" id="d10" yfiles.type="edgegraphics"/>
<graph edgedefault="directed" id="G">
<data key="d7"/>
<node id="n0">
<data key="d5"/>
<data key="d6">
<y:ShapeNode>
<y:Geometry height="313.0" width="488.0" x="171.0" y="186.0"/>
<y:Fill color="#C0C0C0" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" modelName="custom" textColor="#000000" visible="true" width="67.193359375" x="210.4033203125" y="147.43359375">Dashboard<y:LabelModel>
<y:SmartNodeLabelModel distance="4.0"/>
</y:LabelModel>
<y:ModelParameter>
<y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
</y:ModelParameter>
</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<node id="n1">
<data key="d5"/>
<data key="d6">
<y:ShapeNode>
<y:Geometry height="288.0" width="488.0" x="171.0" y="211.0"/>
<y:Fill color="#808080" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" modelName="custom" textColor="#000000" visible="true" width="4.0" x="242.0" y="142.0">
<y:LabelModel>
<y:SmartNodeLabelModel distance="4.0"/>
</y:LabelModel>
<y:ModelParameter>
<y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
</y:ModelParameter>
</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<node id="n2">
<data key="d5"/>
<data key="d6">
<y:ShapeNode>
<y:Geometry height="203.0" width="167.0" x="195.0" y="237.0"/>
<y:Fill color="#00CCFF" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" modelName="custom" textColor="#000000" visible="true" width="4.0" x="81.5" y="99.5">
<y:LabelModel>
<y:SmartNodeLabelModel distance="4.0"/>
</y:LabelModel>
<y:ModelParameter>
<y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
</y:ModelParameter>
</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<node id="n3">
<data key="d5"/>
<data key="d6">
<y:ShapeNode>
<y:Geometry height="94.0" width="158.0" x="374.0" y="237.0"/>
<y:Fill color="#00CCFF" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" modelName="custom" textColor="#000000" visible="true" width="4.0" x="77.0" y="45.0">
<y:LabelModel>
<y:SmartNodeLabelModel distance="4.0"/>
</y:LabelModel>
<y:ModelParameter>
<y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
</y:ModelParameter>
</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<node id="n4">
<data key="d5"/>
<data key="d6">
<y:ShapeNode>
<y:Geometry height="94.0" width="158.0" x="374.0" y="346.0"/>
<y:Fill color="#00CCFF" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" modelName="custom" textColor="#000000" visible="true" width="4.0" x="77.0" y="45.0">
<y:LabelModel>
<y:SmartNodeLabelModel distance="4.0"/>
</y:LabelModel>
<y:ModelParameter>
<y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
</y:ModelParameter>
</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<node id="n5">
<data key="d5"/>
<data key="d6">
<y:ShapeNode>
<y:Geometry height="14.0" width="73.0" x="183.0" y="197.0"/>
<y:Fill color="#808080" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" modelName="custom" textColor="#000000" visible="true" width="4.0" x="34.5" y="5.0">
<y:LabelModel>
<y:SmartNodeLabelModel distance="4.0"/>
</y:LabelModel>
<y:ModelParameter>
<y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
</y:ModelParameter>
</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<node id="n6">
<data key="d5"/>
<data key="d6">
<y:ShapeNode>
<y:Geometry height="14.0" width="73.0" x="271.0" y="197.0"/>
<y:Fill color="#808080" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" modelName="custom" textColor="#000000" visible="true" width="4.0" x="34.5" y="5.0">
<y:LabelModel>
<y:SmartNodeLabelModel distance="4.0"/>
</y:LabelModel>
<y:ModelParameter>
<y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
</y:ModelParameter>
</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<node id="n7">
<data key="d5"/>
<data key="d6">
<y:ShapeNode>
<y:Geometry height="30.0" width="123.0" x="171.0" y="115.0"/>
<y:Fill color="#FFCC00" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" modelName="custom" textColor="#000000" visible="true" width="37.509765625" x="42.7451171875" y="5.93359375">Panes<y:LabelModel>
<y:SmartNodeLabelModel distance="4.0"/>
</y:LabelModel>
<y:ModelParameter>
<y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
</y:ModelParameter>
</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<node id="n8">
<data key="d5"/>
<data key="d6">
<y:ShapeNode>
<y:Geometry height="30.0" width="187.0" x="472.0" y="115.0"/>
<y:Fill color="#FFCC00" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" modelName="custom" textColor="#000000" visible="true" width="67.193359375" x="59.9033203125" y="5.93359375">Dashboard<y:LabelModel>
<y:SmartNodeLabelModel distance="4.0"/>
</y:LabelModel>
<y:ModelParameter>
<y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
</y:ModelParameter>
</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<node id="n9">
<data key="d5"/>
<data key="d6">
<y:ShapeNode>
<y:Geometry height="30.0" width="129.0" x="171.0" y="529.0"/>
<y:Fill color="#FFCC00" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" modelName="custom" textColor="#000000" visible="true" width="77.986328125" x="25.5068359375" y="5.93359375">Components<y:LabelModel>
<y:SmartNodeLabelModel distance="4.0"/>
</y:LabelModel>
<y:ModelParameter>
<y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
</y:ModelParameter>
</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<edge id="e0" source="n8" target="n0">
<data key="d9"/>
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="none"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e1" source="n5" target="n7">
<data key="d9"/>
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="none"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e2" source="n9" target="n2">
<data key="d9"/>
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="none"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e3" source="n9" target="n3">
<data key="d9"/>
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="none"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e4" source="n9" target="n4">
<data key="d9"/>
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="none"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e5" source="n6" target="n7">
<data key="d9"/>
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="none"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
</graph>
<data key="d0">
<y:Resources/>
</data>
</graphml>

BIN
doc/res/Dashboard.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.0 KiB

BIN
doc/res/Form.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.8 KiB

94
doc/res/Form.violet
View File

@ -1,94 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<java version="1.7.0_25" class="java.beans.XMLDecoder">
<object class="com.horstmann.violet.ClassDiagramGraph">
<void method="addNode">
<object class="com.horstmann.violet.ClassNode" id="ClassNode0">
<void property="methods">
<void property="text">
<string>init()
isValid()
</string>
</void>
</void>
<void property="name">
<void property="text">
<string>Zend_Form</string>
</void>
</void>
</object>
<object class="java.awt.geom.Point2D$Double" id="Point2D$Double0">
<void class="java.awt.geom.Point2D$Double" method="getField">
<string>x</string>
<void method="set">
<object idref="Point2D$Double0"/>
<double>50.0</double>
</void>
</void>
<void class="java.awt.geom.Point2D$Double" method="getField">
<string>y</string>
<void method="set">
<object idref="Point2D$Double0"/>
<double>70.0</double>
</void>
</void>
<void method="setLocation">
<double>50.0</double>
<double>70.0</double>
</void>
</object>
</void>
<void method="addNode">
<object class="com.horstmann.violet.ClassNode" id="ClassNode1">
<void property="methods">
<void property="text">
<string>create(): void
preValid(data: array): void
postValid(data: array, isValid: boolean): void
isValid(data: mixed): boolean
setRequest(request: Zend_Controller_Request_Abstract)
getRequest(): Zend_Controller_Request_Abstract
buildForm(): void
initCsrfToken(): void</string>
</void>
</void>
<void property="name">
<void property="text">
<string>Icinga\Web\Form</string>
</void>
</void>
</object>
<object class="java.awt.geom.Point2D$Double" id="Point2D$Double1">
<void class="java.awt.geom.Point2D$Double" method="getField">
<string>x</string>
<void method="set">
<object idref="Point2D$Double1"/>
<double>310.0</double>
</void>
</void>
<void class="java.awt.geom.Point2D$Double" method="getField">
<string>y</string>
<void method="set">
<object idref="Point2D$Double1"/>
<double>30.0</double>
</void>
</void>
<void method="setLocation">
<double>310.0</double>
<double>30.0</double>
</void>
</object>
</void>
<void method="connect">
<object class="com.horstmann.violet.ClassRelationshipEdge">
<void property="bentStyle">
<object class="com.horstmann.violet.BentStyle" field="VHV"/>
</void>
<void property="endArrowHead">
<object class="com.horstmann.violet.ArrowHead" field="TRIANGLE"/>
</void>
</object>
<object idref="ClassNode1"/>
<object idref="ClassNode0"/>
</void>
</object>
</java>

2
library/Icinga/Application/ApplicationBootstrap.php
View File

@ -351,7 +351,7 @@ abstract class ApplicationBootstrap
*
* @return $this
*/
protected function setupZendAutoloader()
public function setupZendAutoloader()
{
require_once 'Zend/Loader/Autoloader.php';

10
library/Icinga/Application/Logger/Writer/StdoutWriter.php
View File

@ -3,7 +3,7 @@
namespace Icinga\Application\Logger\Writer;
use Icinga\Cli\Screen;
use Icinga\Application\Logger\Logger;
use Icinga\Application\Logger;
use Icinga\Application\Logger\LogWriter;
use Zend_Config;
@ -32,16 +32,16 @@ class StdoutWriter extends LogWriter
{
$color = 'black';
switch ($severity) {
case Logger::$ERROR:
case Logger::ERROR:
$color = 'red';
break;
case Logger::$WARNING:
case Logger::WARNING:
$color = 'orange';
break;
case Logger::$INFO:
case Logger::INFO:
$color = 'green';
break;
case Logger::$DEBUG:
case Logger::DEBUG:
$color = 'blue';
break;
}

2
library/Icinga/Application/Modules/Module.php
View File

@ -264,7 +264,7 @@ class Module
$this->cssdir = $basedir . '/public/css';
$this->jsdir = $basedir . '/public/js';
$this->libdir = $basedir . '/library';
$this->configdir = $basedir . '/config';
$this->configdir = $app->getConfigDir('modules/' . $name);
$this->localedir = $basedir . '/application/locale';
$this->formdir = $basedir . '/application/forms';
$this->controllerdir = $basedir . '/application/controllers';

24
library/Icinga/Application/Platform.php
View File

@ -197,4 +197,28 @@ class Platform
return (@include str_replace('_', '/', $name) . '.php') !== false;
}
/**
* Return whether it's possible to connect to a MySQL database
*
* Checks whether the mysql pdo extension has been loaded and the Zend framework adapter for MySQL is available
*
* @return bool
*/
public static function hasMysqlSupport()
{
return static::extensionLoaded('mysql') && static::zendClassExists('Zend_Db_Adapter_Pdo_Mysql');
}
/**
* Return whether it's possible to connect to a PostgreSQL database
*
* Checks whether the pgsql pdo extension has been loaded and the Zend framework adapter for PostgreSQL is available
*
* @return bool
*/
public static function hasPostgresqlSupport()
{
return static::extensionLoaded('pgsql') && static::zendClassExists('Zend_Db_Adapter_Pdo_Pgsql');
}
}

4
library/Icinga/Web/Controller/ActionController.php
View File

@ -73,10 +73,10 @@ class ActionController extends Zend_Controller_Action
$this->handlerBrowserWindows();
$this->view->translationDomain = 'icinga';
$this->_helper->layout()->isIframe = $this->params->shift('isIframe');
$this->_helper->layout()->isIframe = $request->getUrl()->shift('isIframe');
$this->_helper->layout()->moduleName = false;
if ($this->rerenderLayout = $this->params->shift('renderLayout')) {
if ($this->rerenderLayout = $request->getUrl()->shift('renderLayout')) {
$this->xhrLayout = 'body';
}

1
modules/monitoring/application/clicommands/ListCommand.php
View File

@ -25,6 +25,7 @@ class ListCommand extends Command
public function init()
{
$this->app->setupZendAutoloader();
$this->backend = Backend::createBackend($this->params->shift('backend'));
$this->dumpSql = $this->params->shift('showsql');
}

2
modules/monitoring/application/controllers/AlertsummaryController.php
View File

@ -64,7 +64,7 @@ class Monitoring_AlertsummaryController extends Controller
*/
public function indexAction()
{
$this->addTitleTab('alertsummary', t('Alert Summary'));
$this->addTitleTab('alertsummary', $this->translate('Alert Summary'));
$this->view->intervalBox = $this->createIntervalBox();
$this->view->recentAlerts = $this->createRecentAlerts();
$this->view->interval = $this->getInterval();

26
modules/monitoring/application/controllers/ListController.php
View File

@ -107,7 +107,7 @@ class Monitoring_ListController extends Controller
$stateChangeColumn = 'host_last_state_change';
}
$this->addTitleTab('hosts');
$this->addTitleTab('hosts', $this->translate('Hosts'));
$this->setAutorefreshInterval(10);
$query = $this->backend->select()->from('hostStatus', array_merge(array(
'host_icon_image',
@ -181,7 +181,7 @@ class Monitoring_ListController extends Controller
$stateType = 'soft';
}
$this->addTitleTab('services');
$this->addTitleTab('services', $this->translate('Services'));
$this->view->showHost = true;
if ($host = $this->_getParam('host')) {
if (strpos($host, '*') === false) {
@ -276,7 +276,7 @@ class Monitoring_ListController extends Controller
if ($url = $this->hasBetterUrl()) {
return $this->redirectNow($url);
}
$this->addTitleTab('downtimes');
$this->addTitleTab('downtimes', $this->translate('Downtimes'));
$this->setAutorefreshInterval(12);
$query = $this->backend->select()->from('downtime', array(
'id' => 'downtime_internal_id',
@ -325,7 +325,7 @@ class Monitoring_ListController extends Controller
if ($url = $this->hasBetterUrl()) {
return $this->redirectNow($url);
}
$this->addTitleTab('notifications');
$this->addTitleTab('notifications', $this->translate('Notifications'));
$this->setAutorefreshInterval(15);
$query = $this->backend->select()->from('notification', array(
'host',
@ -347,7 +347,7 @@ class Monitoring_ListController extends Controller
if ($url = $this->hasBetterUrl()) {
return $this->redirectNow($url);
}
$this->addTitleTab('contacts');
$this->addTitleTab('contacts', $this->translate('Contacts'));
$query = $this->backend->select()->from('contact', array(
'contact_name',
'contact_id',
@ -386,7 +386,7 @@ class Monitoring_ListController extends Controller
if ($url = $this->hasBetterUrl()) {
return $this->redirectNow($url);
}
$this->addTitleTab('eventgrid', t('Event Grid'));
$this->addTitleTab('eventgrid', $this->translate('Event Grid'));
$form = new StatehistoryForm();
$form->setEnctype(Zend_Form::ENCTYPE_URLENCODED);
@ -427,7 +427,7 @@ class Monitoring_ListController extends Controller
if ($url = $this->hasBetterUrl()) {
return $this->redirectNow($url);
}
$this->addTitleTab('contactgroups');
$this->addTitleTab('contactgroups', $this->translate('Contact Groups'));
$query = $this->backend->select()->from('contactgroup', array(
'contactgroup_name',
'contactgroup_alias',
@ -459,7 +459,7 @@ class Monitoring_ListController extends Controller
if ($url = $this->hasBetterUrl()) {
return $this->redirectNow($url);
}
$this->addTitleTab('comments');
$this->addTitleTab('comments', $this->translate('Comments'));
$this->setAutorefreshInterval(12);
$query = $this->backend->select()->from('comment', array(
'id' => 'comment_internal_id',
@ -492,7 +492,7 @@ class Monitoring_ListController extends Controller
if ($url = $this->hasBetterUrl()) {
return $this->redirectNow($url);
}
$this->addTitleTab('servicegroups');
$this->addTitleTab('servicegroups', $this->translate('Service Groups'));
$this->setAutorefreshInterval(12);
$query = $this->backend->select()->from('groupsummary', array(
'servicegroup',
@ -539,7 +539,7 @@ class Monitoring_ListController extends Controller
if ($url = $this->hasBetterUrl()) {
return $this->redirectNow($url);
}
$this->addTitleTab('hostgroups');
$this->addTitleTab('hostgroups', $this->translate('Host Groups'));
$this->setAutorefreshInterval(12);
$query = $this->backend->select()->from('groupsummary', array(
'hostgroup',
@ -602,7 +602,7 @@ class Monitoring_ListController extends Controller
'service'
));
$this->applyFilter($query);
$this->filterQuery($query);
$this->setupSortControl(array(
'timestamp' => 'Occurence'
@ -639,8 +639,8 @@ class Monitoring_ListController extends Controller
{
$editor = Widget::create('filterEditor')
->setQuery($query)
->preserveParams('limit', 'sort', 'dir', 'format', 'view', 'backend', 'renderLayout', 'stateType', 'addColumns')
->ignoreParams('page', 'objecttype', 'from', 'to', 'btn_submit', 'icon')
->preserveParams('limit', 'sort', 'dir', 'format', 'view', 'backend', 'stateType', 'addColumns')
->ignoreParams('page')
->handleRequest($this->getRequest());
$query->applyFilter($editor->getFilter());

8
modules/monitoring/application/controllers/ShowController.php
View File

@ -202,7 +202,7 @@ class Monitoring_ShowController extends Controller
$tabs->add(
'host',
array(
'title' => 'Host',
'title' => $this->translate('Host'),
'icon' => 'host',
'url' => 'monitoring/show/host',
'urlParams' => $params,
@ -212,7 +212,7 @@ class Monitoring_ShowController extends Controller
$tabs->add(
'service',
array(
'title' => 'Service',
'title' => $this->translate('Service'),
'icon' => 'service',
'url' => 'monitoring/show/service',
'urlParams' => $params,
@ -222,7 +222,7 @@ class Monitoring_ShowController extends Controller
$tabs->add(
'services',
array(
'title' => 'Services',
'title' => $this->translate('Services'),
'icon' => 'services',
'url' => 'monitoring/show/services',
'urlParams' => $params,
@ -232,7 +232,7 @@ class Monitoring_ShowController extends Controller
$tabs->add(
'history',
array(
'title' => 'History',
'title' => $this->translate('History'),
'icon' => 'rewind',
'url' => 'monitoring/show/history',
'urlParams' => $params,

2
modules/monitoring/application/forms/Setup/BackendPage.php
View File

@ -50,7 +50,7 @@ class BackendPage extends Form
);
$resourceTypes = array();
if (Platform::extensionLoaded('mysql') || Platform::extensionLoaded('pgsql')) {
if (Platform::hasMysqlSupport() || Platform::hasPostgresqlSupport()) {
$resourceTypes['ido'] = 'IDO';
}
$resourceTypes['livestatus'] = 'Livestatus';

BIN
modules/monitoring/application/locale/pt_BR/LC_MESSAGES/monitoring.mo
View File

Binary file not shown.

644
modules/monitoring/application/locale/pt_BR/LC_MESSAGES/monitoring.po
View File

File diff suppressed because it is too large Load Diff

4
modules/monitoring/application/views/scripts/list/comments.phtml
View File

@ -10,8 +10,8 @@
<?php endif ?>
<div class="content">
<?php if (empty($comments)): ?>
<?= $this->translate('No comments matching the filter') ?>
<?php if (count($comments) === 0): ?>
<?= $this->translate('No comments matching the filter'); ?>
</div>
<?php return; endif ?>

7
modules/monitoring/application/views/scripts/list/eventhistory.phtml
View File

@ -1,8 +1,10 @@
<?php if (false === $this->compact): ?>
<div class="controls">
<?= $this->tabs->render($this); ?>
<?= $this->tabs ?>
<div style="margin: 1em" class="dontprint">
<?= $this->translate('Sort by'); ?> <?= $this->sortControl->render($this); ?>
<div style="float: right">
<?= $this->translate('Sort by') ?> <?= $this->sortControl ?>
</div>
</div>
<?= $this->widget('limiter', array('url' => $this->url, 'max' => $this->history->count())); ?>
@ -12,6 +14,7 @@
<?php endif ?>
<div class="content">
<?= $this->filterEditor ?>
<?php if (empty($history)): ?>
<?= $this->translate('No history events matching the filter') ?>
</div>

2
modules/monitoring/application/views/scripts/show/components/hostservicesummary.phtml
View File

@ -7,7 +7,7 @@ $currentUrl = Url::fromRequest()->without('limit')->getRelativeUrl();
?>
<h1 class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : '' ?>>
<?php if ($object->stats->services_total > 0): ?>
<?= $this->qlink(sprintf($this->translate('%s configured services:'), $object->stats->services_total), $selfUrl) ?>
<?= $this->qlink(sprintf($this->translatePlural('%d configured service:', '%d configured services:', $object->stats->services_total), $object->stats->services_total), $selfUrl) ?>
<?php else: ?>
<?= $this->translate('No services configured on this host'); ?>
<?php endif; ?>

14
modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml
View File

@ -1,5 +1,5 @@
<div class="box hostservicechecks">
<h2><?= $this->translate('Host- and Servicechecks'); ?></h2>
<h2><?= $this->translate('Host and Service Checks'); ?></h2>
<div class="box contents">
<table>
<thead>
@ -17,7 +17,7 @@
'monitoring/list/hosts',
array('host_active_checks_enabled' => 1)
); ?>">
<?= $this->statusSummary->hosts_active . ' ' . $this->translate('Active'); ?>
<?= sprintf($this->translatePlural('%d Active', '%d Active', $this->statusSummary->hosts_active), $this->statusSummary->hosts_active); ?>
</a>
</div>
<?php endif ?>
@ -27,7 +27,7 @@
'monitoring/list/hosts',
array('host_active_checks_enabled' => 0, 'host_passive_checks_enabled' => 1)
); ?>">
<?= $this->statusSummary->hosts_passive . ' ' . $this->translate('Passive'); ?>
<?= sprintf($this->translatePlural('%d Passive', '%d Passive', $this->statusSummary->hosts_passive), $this->statusSummary->hosts_passive); ?>
</a>
</div>
<?php endif ?>
@ -37,7 +37,7 @@
'monitoring/list/hosts',
array('host_active_checks_enabled' => 0, 'host_passive_checks_enabled' => 0)
); ?>" style="color: red;">
<?= $this->statusSummary->hosts_not_checked . ' ' . $this->translate('Disabled'); ?>
<?= sprintf($this->translatePlural('%d Disabled', '%d Disabled', $this->statusSummary->hosts_not_checked), $this->statusSummary->hosts_not_checked); ?>
</a>
</div>
<?php endif ?>
@ -49,7 +49,7 @@
'monitoring/list/services',
array('service_active_checks_enabled' => 1)
); ?>">
<?= $this->statusSummary->services_active . ' ' . $this->translate('Active'); ?>
<?= sprintf($this->translatePlural('%d Active', '%d Active', $this->statusSummary->services_active), $this->statusSummary->services_active); ?>
</a>
</div>
<?php endif ?>
@ -59,7 +59,7 @@
'monitoring/list/services',
array('service_active_checks_enabled' => 0, 'service_passive_checks_enabled' => 1)
); ?>">
<?= $this->statusSummary->services_passive . ' ' . $this->translate('Passive'); ?>
<?= sprintf($this->translatePlural('%d Passive', '%d Passive', $this->statusSummary->services_passive), $this->statusSummary->services_passive); ?>
</a>
</div>
<?php endif ?>
@ -69,7 +69,7 @@
'monitoring/list/services',
array('service_active_checks_enabled' => 0, 'service_passive_checks_enabled' => 0)
); ?>" style="color: red;">
<?= $this->statusSummary->services_not_checked . ' ' . $this->translate('Disabled'); ?>
<?= sprintf($this->translatePlural('%d Disabled', '%d Disabled', $this->statusSummary->services_not_checked), $this->statusSummary->services_not_checked); ?>
</a>
</div>
<?php endif ?>

36
modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml
View File

@ -3,9 +3,9 @@
<div class="box contents">
<?php if ($this->statusSummary->hosts_without_flap_detection || $this->statusSummary->services_without_flap_detection ||
$this->statusSummary->hosts_flapping || $this->statusSummary->services_flapping): ?>
<div class="box-separator feature-highlight"><?= $this->translate('Flap detection'); ?></div>
<div class="box-separator feature-highlight"><?= $this->translate('Flap Detection'); ?></div>
<?php else: ?>
<div class="box-separator"><?= $this->translate('Flap detection'); ?></div>
<div class="box-separator"><?= $this->translate('Flap Detection'); ?></div>
<?php endif ?>
<table>
<tbody>
@ -17,7 +17,7 @@
'monitoring/list/hosts',
array('host_flap_detection_enabled' => 0)
); ?>" class="feature-highlight">
<?= sprintf($this->translate('%d hosts disabled'), $this->statusSummary->hosts_without_flap_detection); ?>
<?= sprintf($this->translatePlural('%d Host Disabled', '%d Hosts Disabled', $this->statusSummary->hosts_without_flap_detection), $this->statusSummary->hosts_without_flap_detection); ?>
</a>
<?php else: ?>
<div class="box entry">
@ -25,7 +25,7 @@
'monitoring/list/hosts',
array('host_flap_detection_enabled' => 1)
); ?>">
<?= $this->translate('All hosts enabled'); ?>
<?= $this->translate('All Hosts Enabled'); ?>
</a>
<?php endif ?>
<?php if ($this->statusSummary->hosts_flapping): ?>
@ -33,7 +33,7 @@
'monitoring/list/hosts',
array('host_is_flapping' => 1)
); ?>" class="feature-highlight">
<?= sprintf($this->translate('%d hosts flapping'), $this->statusSummary->hosts_flapping); ?>
<?= sprintf($this->translatePlural('%d Host Flapping', '%d Hosts Flapping', $this->statusSummary->hosts_flapping), $this->statusSummary->hosts_flapping); ?>
</a>
<?php endif ?>
</div>
@ -45,7 +45,7 @@
'monitoring/list/services',
array('service_flap_detection_enabled' => 0)
); ?>" class="feature-highlight">
<?= sprintf($this->translate('%d services disabled'), $this->statusSummary->services_without_flap_detection); ?>
<?= sprintf($this->translatePlural('%d Service Disabled', '%d Services Disabled', $this->statusSummary->services_without_flap_detection), $this->statusSummary->services_without_flap_detection); ?>
</a>
<?php else: ?>
<div class="box entry">
@ -53,7 +53,7 @@
'monitoring/list/services',
array('service_flap_detection_enabled' => 1)
); ?>">
<?= $this->translate('All services enabled'); ?>
<?= $this->translate('All Services Enabled'); ?>
</a>
<?php endif ?>
<?php if ($this->statusSummary->services_flapping): ?>
@ -61,7 +61,7 @@
'monitoring/list/services',
array('service_is_flapping' => 1)
); ?>" class="feature-highlight">
<?= sprintf($this->translate('%d services flapping'), $this->statusSummary->services_flapping); ?>
<?= sprintf($this->translatePlural('%d Service Flapping', '%d Services Flapping', $this->statusSummary->services_flapping), $this->statusSummary->services_flapping); ?>
</a>
<?php endif ?>
</div>
@ -84,7 +84,7 @@
'monitoring/list/hosts',
array('host_notifications_enabled' => 0)
); ?>" class="feature-highlight">
<?= sprintf($this->translate('%d hosts disabled'), $this->statusSummary->hosts_not_triggering_notifications); ?>
<?= sprintf($this->translatePlural('%d Host Disabled', '%d Hosts Disabled', $this->statusSummary->hosts_not_triggering_notifications), $this->statusSummary->hosts_not_triggering_notifications); ?>
</a>
<?php else: ?>
<div class="box entry ">
@ -92,7 +92,7 @@
'monitoring/list/hosts',
array('host_notifications_enabled' => 1)
); ?>">
<?= $this->translate('All hosts enabled'); ?>
<?= $this->translate('All Hosts Enabled'); ?>
</a>
<?php endif ?>
</div>
@ -104,7 +104,7 @@
'monitoring/list/services',
array('service_notifications_enabled' => 0)
); ?>" class="feature-highlight">
<?= sprintf($this->translate('%d services disabled'), $this->statusSummary->services_not_triggering_notifications); ?>
<?= sprintf($this->translatePlural('%d Service Disabled', '%d Services Disabled', $this->statusSummary->services_not_triggering_notifications), $this->statusSummary->services_not_triggering_notifications); ?>
</a>
<?php else: ?>
<div class="box entry">
@ -112,7 +112,7 @@
'monitoring/list/services',
array('service_notifications_enabled' => 1)
); ?>">
<?= $this->translate('All services enabled'); ?>
<?= $this->translate('All Services Enabled'); ?>
</a>
<?php endif ?>
</div>
@ -121,9 +121,9 @@
</tbody>
</table>
<?php if ($this->statusSummary->hosts_not_processing_event_handlers || $this->statusSummary->services_not_processing_event_handlers): ?>
<div class="box-separator feature-highlight"><?= $this->translate('Event handlers'); ?></div>
<div class="box-separator feature-highlight"><?= $this->translate('Event Handlers'); ?></div>
<?php else: ?>
<div class="box-separator"><?= $this->translate('Event handlers'); ?></div>
<div class="box-separator"><?= $this->translate('Event Handlers'); ?></div>
<?php endif ?>
<table>
<tbody>
@ -135,7 +135,7 @@
'monitoring/list/hosts',
array('host_event_handler_enabled' => 0)
); ?>" class="feature-highlight">
<?= sprintf($this->translate('%d hosts disabled'), $this->statusSummary->hosts_not_processing_event_handlers); ?>
<?= sprintf($this->translatePlural('%d Host Disabled', '%d Hosts Disabled', $this->statusSummary->hosts_not_processing_event_handlers), $this->statusSummary->hosts_not_processing_event_handlers); ?>
</a>
<?php else: ?>
<div class="box entry">
@ -143,7 +143,7 @@
'monitoring/list/hosts',
array('host_event_handler_enabled' => 1)
); ?>">
<?= $this->translate('All hosts enabled'); ?>
<?= $this->translate('All Hosts Enabled'); ?>
</a>
<?php endif ?>
</div>
@ -155,7 +155,7 @@
'monitoring/list/services',
array('service_event_handler_enabled' => 0)
); ?>" class="feature-highlight">
<?= sprintf($this->translate('%d services disabled'), $this->statusSummary->services_not_processing_event_handlers); ?>
<?= sprintf($this->translatePlural('%d Service Disabled', '%d Services Disabled', $this->statusSummary->services_not_processing_event_handlers), $this->statusSummary->services_not_processing_event_handlers); ?>
</a>
<?php else: ?>
<div class="box entry">
@ -163,7 +163,7 @@
'monitoring/list/services',
array('service_event_handler_enabled' => 1)
); ?>">
<?= $this->translate('All services enabled'); ?>
<?= $this->translate('All Services Enabled'); ?>
</a>
<?php endif ?>
</div>

4
modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml
View File

@ -12,14 +12,14 @@ $service_problems = (
<?php if ($this->statusSummary->hosts_up): ?>
<h2>
<a href="<?= $this->href('monitoring/list/hosts', array('host_state' => 0)); ?>">
<?= sprintf($this->translate('%d Hosts UP'), $this->statusSummary->hosts_up); ?>
<?= sprintf($this->translatePlural('%d Host UP', '%d Hosts UP', $this->statusSummary->hosts_up), $this->statusSummary->hosts_up); ?>
</a>
</h2>
<?php endif ?>
<?php if ($this->statusSummary->hosts_pending): ?>
<h2>
<a href="<?= $this->href('monitoring/list/hosts', array('host_state' => 99)); ?>">
<?= sprintf($this->translate('%d Hosts PENDING'), $this->statusSummary->hosts_pending); ?>
<?= sprintf($this->translatePlural('%d Host PENDING', '%d Hosts PENDING', $this->statusSummary->hosts_pending), $this->statusSummary->hosts_pending); ?>
</a>
</h2>
<?php endif ?>

6
modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml
View File

@ -5,7 +5,7 @@
'monitoring/list/services',
array('host_problem' => $host_problem, 'service_state' => 2, 'service_acknowledged' => 0, 'service_in_downtime' => 0)
); ?>">
<?= $services_critical_unhandled; ?> <?= $this->translate('CRITICAL', 'icinga.state') ?>
<?= sprintf($this->translatePlural('%d CRITICAL', '%d CRITICAL', $services_critical_unhandled, 'icinga.state'), $services_critical_unhandled); ?>
</a>
<?php endif ?>
<?php if ($services_critical_handled): ?>
@ -145,7 +145,7 @@
'monitoring/list/services',
array('host_problem' => $host_problem, 'service_state' => 3, 'service_acknowledged' => 0, 'service_in_downtime' => 0)
); ?>">
<?= $services_unknown_unhandled; ?> <?= $this->translate('UNKNOWN', 'icinga.state') ?>
<?= sprintf($this->translatePlural('%d UNKNOWN', '%d UNKNOWN', $services_unknown_unhandled, 'icinga.state'), $services_unknown_unhandled) ?>
</a>
<?php endif ?>
<?php if ($services_unknown_handled): ?>
@ -249,7 +249,7 @@
'monitoring/list/services',
array('host_problem' => $host_problem, 'service_state' => 99)
); ?>">
<?= $services_pending; ?> <?= $this->translate('PENDING', 'icinga.state') ?>
<?= sprintf($this->translatePlural('%d PENDING', '%d PENDING', $services_pending, 'icinga.state'), $services_pending); ?>
</a>
<?php if ($services_pending_not_checked): ?>
<a href="<?= $this->href(

4
modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml
View File

@ -7,14 +7,14 @@
<?php if ($this->statusSummary->hosts_down): ?>
<h2>
<a href="<?= $this->href('monitoring/list/hosts', array('host_state' => 1)); ?>">
<?= sprintf($this->translate('%d Hosts DOWN'), $this->statusSummary->hosts_down); ?>
<?= sprintf($this->translatePlural('%d Host DOWN', '%d Hosts DOWN', $this->statusSummary->hosts_down), $this->statusSummary->hosts_down); ?>
</a>
</h2>
<?php endif ?>
<?php if ($this->statusSummary->hosts_unreachable): ?>
<h2>
<a href="<?= $this->href('monitoring/list/hosts', array('host_state' => 2)); ?>">
<?= sprintf($this->translate('%d Hosts UNREACHABLE'), $this->statusSummary->hosts_unreachable); ?>
<?= sprintf($this->translatePlural('%d Host UNREACHABLE', '%d Hosts UNREACHABLE', $this->statusSummary->hosts_unreachable), $this->statusSummary->hosts_unreachable); ?>
</a>
</h2>
<?php endif ?>

10
modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
View File

@ -72,7 +72,15 @@ class GroupSummaryQuery extends IdoQuery
)
);
if (in_array('servicegroup', $this->desiredColumns)) {
$hosts->group(array('sgo.name1', 'ho.object_id', 'state', 'acknowledged', 'in_downtime'));
$hosts->group(array(
'sgo.name1',
'ho.object_id',
'state',
'acknowledged',
'in_downtime',
'state_change',
'severity'
));
}
$services = $this->createSubQuery(
'Status',

8
modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
View File

@ -186,7 +186,7 @@ abstract class MonitoredObjectController extends Controller
$tabs->add(
'host',
array(
'title' => 'Host',
'title' => $this->translate('Host'),
'icon' => 'host',
'url' => 'monitoring/host/show',
'urlParams' => $params
@ -196,7 +196,7 @@ abstract class MonitoredObjectController extends Controller
$tabs->add(
'service',
array(
'title' => 'Service',
'title' => $this->translate('Service'),
'icon' => 'service',
'url' => 'monitoring/service/show',
'urlParams' => $params
@ -206,7 +206,7 @@ abstract class MonitoredObjectController extends Controller
$tabs->add(
'services',
array(
'title' => 'Services',
'title' => $this->translate('Services'),
'icon' => 'services',
'url' => 'monitoring/show/services',
'urlParams' => $params
@ -216,7 +216,7 @@ abstract class MonitoredObjectController extends Controller
$tabs->add(
'history',
array(
'title' => 'History',
'title' => $this->translate('History'),
'icon' => 'rewind',
'url' => 'monitoring/show/history',
'urlParams' => $params

2
modules/setup/application/forms/AuthenticationPage.php
View File

@ -49,7 +49,7 @@ class AuthenticationPage extends Form
);
$backendTypes = array();
if (Platform::extensionLoaded('mysql') || Platform::extensionLoaded('pgsql')) {
if (Platform::hasMysqlSupport() || Platform::hasPostgresqlSupport()) {
$backendTypes['db'] = t('Database');
}
if (Platform::extensionLoaded('ldap')) {

2
modules/setup/application/forms/PreferencesPage.php
View File

@ -64,7 +64,7 @@ class PreferencesPage extends Form
$storageTypes = array();
$storageTypes['ini'] = t('File System (INI Files)');
if (Platform::extensionLoaded('mysql') || Platform::extensionLoaded('pgsql')) {
if (Platform::hasMysqlSupport() || Platform::hasPostgresqlSupport()) {
$storageTypes['db'] = t('Database');
}
$storageTypes['null'] = t('Don\'t Store Preferences');

2
modules/setup/library/Setup/Utils/DbTool.php
View File

@ -486,7 +486,7 @@ class DbTool
'GRANT %%s ON %s.%%s TO %s@%s',
$this->quoteIdentifier($this->config['dbname']),
$this->quoteIdentifier($username),
$this->quoteIdentifier($host)
str_replace('%', '%%', $this->quoteIdentifier($host))
);
$dbPrivileges = array();

34
public/css/icinga/layout-structure.less
View File

@ -257,6 +257,40 @@ html {
#main {
left: 0;
}
#login {
.logo .image img {
width: 70%;
}
.form {
width: 100%;
margin: auto;
}
.form label {
width: 100%;
margin: 0;
text-align: center;
display: inline-block;
}
.footer {
margin-left: 0;
}
h1 {
margin-left: 0px;
text-align: center;
}
form {
width: 100%;
margin: 0;
}
form input {
margin: auto;
display: block;
}
form input[type=submit] {
margin-top: 1.5em;
}
}
}

7
test/php/bootstrap.php
View File

@ -56,6 +56,13 @@ foreach ($modules as $module) {
$loader->register();
set_include_path(
implode(
PATH_SEPARATOR,
array($libraryPath . '/vendor', get_include_path())
)
);
require_once 'Zend/Loader/Autoloader.php';
\Zend_Loader_Autoloader::getInstance();