index d13bcf5d919b2d3e1c477dbccc692ea8736de9b5..b79df2426fb5b024e98e0224029ba8fd9a656748 100644 (file)
--- a/include/class_config.inc
+++ b/include/class_config.inc
return;
}
return;
}
+ /* yes/no to true/false and upper case TRUE to true and so on*/
+ foreach($attrs as $name => $value){
+ if((preg_match("/^yes$/i",$value)) || (preg_match("/^true$/i",$value))){
+ $attrs[$name] = "true";
+ }elseif((preg_match("/^no$/i",$value)) || (preg_match("/^false$/i",$value))){
+ $attrs[$name] = "false";
+ }
+ }
+
/* Look through attributes */
switch ($this->tags[$this->level-1]){
/* Look through attributes */
switch ($this->tags[$this->level-1]){
+
/* Handle tab section */
case 'TAB': $name= $this->tags[$this->level-2];
/* Handle tab section */
case 'TAB': $name= $this->tags[$this->level-2];
$this->currentLocation= $name;
/* Add location elements */
$this->currentLocation= $name;
/* Add location elements */
- $this->data['LOCATIONS'][$name]= $attrs;
- }
+ $this->data['LOCATIONS'][$name]= $attrs;
+ }
break;
/* Handle referral tags */
break;
/* Handle referral tags */
/* Check for connection */
if (is_null($this->ldap) || (is_int($this->ldap) && $this->ldap == 0)){
/* Check for connection */
if (is_null($this->ldap) || (is_int($this->ldap) && $this->ldap == 0)){
+ $smarty= get_smarty();
print_red (_("Can't bind to LDAP. Please contact the system administrator."));
print_red (_("Can't bind to LDAP. Please contact the system administrator."));
- echo $_SESSION['errors'];
- exit;
+ $smarty->display (get_template_path('headers.tpl'));
+ echo '<body style="background-image:none">'.$_SESSION['errors'].'</body></html>';
+ exit();
}
if (!isset($_SESSION['size_limit'])){
}
if (!isset($_SESSION['size_limit'])){
/* Get asterisk servers */
$ldap->cd ($this->current['BASE']);
/* Get asterisk servers */
$ldap->cd ($this->current['BASE']);
- $ldap->search ("(objectClass=goGlpiServer)");
+ $ldap->search ("(&(objectClass=goGlpiServer)(cn=*)(goGlpiAdmin=*)(goGlpiDatabase=*))",array("cn","goGlpiPassword","goGlpiAdmin","goGlpiDatabase"));
if ($ldap->count()){
$attrs= $ldap->fetch();
if ($ldap->count()){
$attrs= $ldap->fetch();
+ if(!isset($attrs['goGlpiPassword'])){
+ $attrs['goGlpiPassword'][0] ="";
+ }
$this->data['SERVERS']['GLPI']= array(
'SERVER' => $attrs['cn'][0],
'LOGIN' => $attrs['goGlpiAdmin'][0],
$this->data['SERVERS']['GLPI']= array(
'SERVER' => $attrs['cn'][0],
'LOGIN' => $attrs['goGlpiAdmin'][0],
$ldap->search ("(&(objectClass=goShareServer)(goExportEntry=*))");
while ($attrs= $ldap->fetch()){
for ($i= 0; $i<$attrs["goExportEntry"]["count"]; $i++){
$ldap->search ("(&(objectClass=goShareServer)(goExportEntry=*))");
while ($attrs= $ldap->fetch()){
for ($i= 0; $i<$attrs["goExportEntry"]["count"]; $i++){
- $path= preg_replace ("/\s.*$/", "", $attrs["goExportEntry"][$i]);
+ if(!preg_match('/^[^|]+\|[^|]+\|NFS\|.*$/', $attrs["goExportEntry"][$i])){
+ continue;
+ }
+ $path= preg_replace ("/^[^|]+\|[^|]+\|[^|]+\|[^|]+\|([^|]+).*$/", '\1', $attrs["goExportEntry"][$i]);
$tmp[]= $attrs["cn"][0].":$path";
}
}
$this->data['SERVERS']['NFS']= $tmp;
$tmp[]= $attrs["cn"][0].":$path";
}
}
$this->data['SERVERS']['NFS']= $tmp;
-
/* Load Terminalservers */
$ldap->cd ($this->current['BASE']);
$ldap->search ("(objectClass=goTerminalServer)");
/* Load Terminalservers */
$ldap->cd ($this->current['BASE']);
$ldap->search ("(objectClass=goTerminalServer)");
}
/* Ldap Server */
}
/* Ldap Server */
- $this->data['SERVERS']['LDAP']= array("default");
+ $this->data['SERVERS']['LDAP']= array();
$ldap->cd ($this->current['BASE']);
$ldap->search ("(objectClass=goLdapServer)");
while ($attrs= $ldap->fetch()){
$ldap->cd ($this->current['BASE']);
$ldap->search ("(objectClass=goLdapServer)");
while ($attrs= $ldap->fetch()){