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

Platform: Drop *Available function 

Create a function extensionLoaded and change usages.

refs #5514
This commit is contained in:
Marius Hein 2014-08-28 11:54:45 +02:00
parent 436a4d2965
commit e345aa257a
3 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/forms/Config/Authentication/LdapBackendForm.php
View File

@ -136,7 +136,7 @@ class LdapBackendForm extends BaseBackendForm
*/ */
public function isValidAuthenticationBackend() public function isValidAuthenticationBackend()
{ {
if (! Platform::ldapAvailable()) { if (! Platform::extensionLoaded('ldap')) {
/* /*
* It should be possible to run icingaweb without the php ldap extension, when * It should be possible to run icingaweb without the php ldap extension, when
* no ldap backends are needed. When the user tries to create an ldap backend * no ldap backends are needed. When the user tries to create an ldap backend

4
application/forms/Config/ResourceForm.php
View File

@ -406,14 +406,14 @@ class ResourceForm extends Form
* in case they aren't actually used. When the user tries to create a resource that depends on an * in case they aren't actually used. When the user tries to create a resource that depends on an
* uninstalled extension, an error should be displayed. * uninstalled extension, an error should be displayed.
*/ */
if ($config->db === 'mysql' && ! Platform::mysqlAvailable()) { if ($config->db === 'mysql' && ! Platform::extensionLoaded('mysql')) {
$this->addErrorMessage( $this->addErrorMessage(
t('You need to install the php extension "mysql" and the ' . t('You need to install the php extension "mysql" and the ' .
'Zend_Pdo_Mysql classes to use MySQL database resources.') 'Zend_Pdo_Mysql classes to use MySQL database resources.')
); );
return false; return false;
} }
if ($config->db === 'pgsql' && ! Platform::pgsqlAvailable()) { if ($config->db === 'pgsql' && ! Platform::extensionLoaded('pgsql')) {
$this->addErrorMessage( $this->addErrorMessage(
t('You need to install the php extension "pgsql" and the ' . t('You need to install the php extension "pgsql" and the ' .
'Zend_Pdo_Pgsql classes to use PostgreSQL database resources.') 'Zend_Pdo_Pgsql classes to use PostgreSQL database resources.')

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

@ -121,32 +121,14 @@ class Platform
} }
/** /**
* Test of php ldap support * Test for php extension
* *
* @return bool * @param string $extensionName E.g. mysql, ldap
*/
public static function ldapAvailable()
{
return extension_loaded('ldap');
}
/**
* Test of php pgsql support
* *
* @return bool * @return bool
*/ */
public static function pgsqlAvailable() public static function extensionLoaded($extensionName)
{ {
return extension_loaded('pgsql'); return extension_loaded($extensionName);
}
/**
* Test of php mysql support
*
* @return bool
*/
public static function mysqlAvailable()
{
return extension_loaded('mysql');
} }
} }