Commit d937a688 authored by Benoit Mortier's avatar Benoit Mortier
Browse files

Fixes: #1246, #1248 ambiguous error message in installation check, [wizard]...

Fixes: #1246, #1248 ambiguous error message in installation check,  [wizard] Add non blocking test for MDB2 drivers on wizard checks step.
parent f1f0c810
......@@ -843,6 +843,16 @@ class msgPool {
return sprintf(_("Install and activate the %s PHP module."), $what);
}
/*!
* \brief Display install or activate a PEAR module
*
* \param string $what Name of the module
*/
public static function installPearModule($what)
{
return sprintf(_("Install and activate the %s Pear module."), $what);
}
/*!
* \brief Display error when a class is not found
*
......
......@@ -127,11 +127,19 @@ class Step_Checks extends setup_step
/* Check if MDB2 module is available */
$N = msgPool::checkingFor(_("MDB2"));
$D = _("FusionDirectory requires this module to communicate with several supported databases.");
$S = msgPool::installPhpModule("MDB2");
$S = msgPool::installPearModule("MDB2");
$R = ((@include_once("PEAR.php")) && (@include_once("MDB2.php")));
$M = FALSE;
$this->basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M );
/* Check if MDB2 mysql driver is available */
$N = msgPool::checkingFor(_("MDB2 mysql"));
$D = _("FusionDirectory requires this module to communicate with mysql databases.");
$S = msgPool::installPearModule("MDB2 mysql");
$R = ((@include_once("PEAR.php")) && (@include_once("MDB2/Driver/mysql.php")));
$M = FALSE;
$this->basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M );
/* Check generation of LM/NT password hashes */
/* need the perl Mcrypt library and fusiondirectory-mkntpassword executable */
$query= "fusiondirectory-mkntpassword 2>&1";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment