index 80d0105732ae20f564da8cc8dead4d12167943cc..848bc57a28ea351822da34d7dd17a403eacee999 100644 (file)
--- a/include/class_config.inc
+++ b/include/class_config.inc
/* Configuration data */
var $data= array( 'TABS' => array(), 'LOCATIONS' => array(), 'SERVERS' => array(),
- 'MAIN' => array( 'LANGUAGES' => array(), 'FAXFORMATS' => array() ),
+ 'MAIN' => array(),
'MENU' => array(), 'SERVICE' => array());
var $basedir= "";
}
break;
- /* Handle language */
- case 'LANGUAGE':
- if ($this->tags[$this->level-2] == 'MAIN'){
- /* Add languages */
- $this->data['MAIN']['LANGUAGES'][$attrs['NAME']]=
- $attrs['TAG'];
- }
- break;
-
- /* Handle faxformat */
- case 'FAXFORMAT':
- if ($this->tags[$this->level-2] == 'MAIN'){
- /* Add fax formats */
- $this->data['MAIN']['FAXFORMATS'][]= $attrs['TYPE'];
- }
- break;
-
/* Load main parameters */
case 'MAIN':
$this->data['MAIN']= array_merge ($this->data['MAIN'], $attrs);
$ldap->cd ($this->current['BASE']);
$ldap->search ("(objectClass=sambaDomain)");
while ($attrs= $ldap->fetch()){
- $this->data['SERVERS']['SAMBA'][$attrs['sambaDomainName'][0]]= array(
- "SID" => $attrs["sambaSID"][0],
- "RIDBASE" => $attrs["sambaAlgorithmicRidBase"][0]);
+ $this->data['SERVERS']['SAMBA'][$attrs['sambaDomainName'][0]]= array( "SID" =>"","RIDBASE" =>"");
+ if(isset($attrs["sambaSID"][0])){
+ $this->data['SERVERS']['SAMBA'][$attrs['sambaDomainName'][0]]["SID"] = $attrs["sambaSID"][0];
+ }
+ if(isset($attrs["sambaAlgorithmicRidBase"][0])){
+ $this->data['SERVERS']['SAMBA'][$attrs['sambaDomainName'][0]]["RIDBASE"] = $attrs["sambaAlgorithmicRidBase"][0];
+ }
}
/* If no samba servers are found, look for configured sid/ridbase */