index 6a8e23b64e2d01d839b954354ed694e3ecf836ab..a60ae8e243ce2ccc5f85fdd7334e7ccf0a810c9f 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( 'FAXFORMATS' => 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'){
/* Fill imap servers */
$ldap= $this->get_ldap_link();
$ldap->cd ($this->current['BASE']);
- $ldap->search ("(objectClass=goImapServer)");
-
- $this->data['SERVERS']['IMAP']= array();
- error_reporting(0);
- while ($attrs= $ldap->fetch()){
- $name= $attrs['goImapName'][0];
- $this->data['SERVERS']['IMAP'][$name]= array( "connect" => $attrs['goImapConnect'][0],
- "admin" => $attrs['goImapAdmin'][0],
- "password" => $attrs['goImapPassword'][0],
- "sieve_server" => $attrs['goImapSieveServer'][0],
- "sieve_port" => $attrs['goImapSievePort'][0]);
+ if (!isset($this->current['MAILMETHOD'])){
+ $this->current['MAILMETHOD']= "";
+ }
+ if ($this->current['MAILMETHOD'] == ""){
+ $ldap->search ("(objectClass=goMailServer)", array('cn'));
+ $this->data['SERVERS']['IMAP']= array();
+ error_reporting(0);
+ while ($attrs= $ldap->fetch()){
+ $name= $attrs['cn'][0];
+ $this->data['SERVERS']['IMAP'][$name]= $name;
+ }
+ error_reporting(E_ALL);
+ } else {
+ $ldap->search ("(objectClass=goImapServer)", array('goImapName', 'goImapConnect', 'goImapAdmin', 'goImapPassword',
+ 'goImapSieveServer', 'goImapSievePort'));
+
+ $this->data['SERVERS']['IMAP']= array();
+ error_reporting(0);
+ while ($attrs= $ldap->fetch()){
+ $name= $attrs['goImapName'][0];
+ $this->data['SERVERS']['IMAP'][$name]= array( "connect" => $attrs['goImapConnect'][0],
+ "admin" => $attrs['goImapAdmin'][0],
+ "password" => $attrs['goImapPassword'][0],
+ "sieve_server" => $attrs['goImapSieveServer'][0],
+ "sieve_port" => $attrs['goImapSievePort'][0]);
+ }
+ error_reporting(E_ALL);
}
- error_reporting(E_ALL);
/* Get kerberos server. FIXME: only one is supported currently */
$ldap->cd ($this->current['BASE']);
$ret = array();
$depth ++;
- /* Walk through array */
+ /* Walk through array */
+ ksort($arr);
foreach($arr as $name => $entries){
/* If this department is the last in the current tree position
if(isset($entries['ENTRY'])){
$a = "";
for($i = 0 ; $i < $depth ; $i ++){
- $a.=" ";
+ $a.=".";
}
$ret[$entries['ENTRY']]=$a." ".$name;
}