![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index d19adba6f2855806083654d8fdd9176affa177fd..270f1e2565c7f5484e10308ce47d45a1a1805a40 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( 'FAXFORMATS' => array() ),
+ 'MAIN' => array(),
'MENU' => array(), 'SERVICE' => array());
var $basedir= "";
}
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);
$this->level--;
}
- function get_ldap_link($sizelimit= FALSE)
- {
- /* Build new connection */
- $this->ldap= ldap_init ($this->current['SERVER'], $this->current['BASE'],
- $this->current['ADMIN'], $this->current['PASSWORD']);
- /* 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."));
- $smarty->display (get_template_path('headers.tpl'));
- echo '<body style="background-image:none">'.$_SESSION['errors'].'</body></html>';
- exit();
+ function get_credentials($creds)
+ {
+ if (isset($_SERVER['HTTP_GOSA_KEY'])){
+ return (cred_decrypt($creds, $_SERVER['HTTP_GOSA_KEY']));
}
+ return ($creds);
+ }
- if (!isset($_SESSION['size_limit'])){
- $_SESSION['size_limit']= $this->current['SIZELIMIT'];
- $_SESSION['size_ignore']= $this->current['SIZEIGNORE'];
- }
- if ($sizelimit){
- $this->ldap->set_size_limit($_SESSION['size_limit']);
- } else {
- $this->ldap->set_size_limit(0);
- }
+ function get_ldap_link($sizelimit= FALSE)
+ {
+ /* Build new connection */
+ $this->ldap= ldap_init ($this->current['SERVER'], $this->current['BASE'],
+ $this->current['ADMIN'], $this->get_credentials($this->current['PASSWORD']));
+
+ /* 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."));
+ $smarty->display (get_template_path('headers.tpl'));
+ echo '<body style="background-image:none">'.$_SESSION['errors'].'</body></html>';
+ exit();
+ }
- /* Move referrals */
- if (!isset($this->current['REFERRAL'])){
- $this->ldap->referrals= array();
- } else {
- $this->ldap->referrals= $this->current['REFERRAL'];
- }
+ if (!isset($_SESSION['size_limit'])){
+ $_SESSION['size_limit']= $this->current['SIZELIMIT'];
+ $_SESSION['size_ignore']= $this->current['SIZEIGNORE'];
+ }
+ if ($sizelimit){
+ $this->ldap->set_size_limit($_SESSION['size_limit']);
+ } else {
+ $this->ldap->set_size_limit(0);
+ }
+
+ /* Move referrals */
+ if (!isset($this->current['REFERRAL'])){
+ $this->ldap->referrals= array();
+ } else {
+ $this->ldap->referrals= $this->current['REFERRAL'];
+ }
+# }
return ($this->ldap);
}
$ldap= $this->get_ldap_link();
$ldap->cd ($this->current['BASE']);
if (!isset($this->current['MAILMETHOD'])){
- $this->current['MAILMETHOD']= "";
- }
- $this->data['SERVERS']['IMAP']= array();
- $old_err = 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]);
+ $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($old_err);
/* Get kerberos server. FIXME: only one is supported currently */
$ldap->cd ($this->current['BASE']);
$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 */