![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index e800b61a90e1cb219d30e79d66d781566a7b33a5..5f00a2bd0abea86c7649a256c091fa0719aa824c 100644 (file)
function check_and_reload()
{
+ global $ui;
+
+ /* Check if class_location.inc has changed, this is the case
+ if we have installed or removed plugins.
+ */
+ if(session::is_set("class_location.inc:timestamp")){
+ $tmp = stat("../include/class_location.inc");
+ if($tmp['mtime'] != session::get("class_location.inc:timestamp")){
+ session::un_set("plist");
+ }
+ }
+ $tmp = stat("../include/class_location.inc");
+ session::set("class_location.inc:timestamp",$tmp['mtime']);
+
+
+
if($this->filename != "" && filemtime($this->filename) != $this->last_modified){
$this->config_found= FALSE;
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;
+ $this->data['SERVERS']['IMAP'][$name]=
+ array(
+ "server_dn" => $attrs['dn'],
+ "connect" => "",
+ "admin" => "",
+ "password" => "",
+ "sieve_server"=> "",
+ "sieve_option"=> "",
+ "sieve_port" => "");
}
- error_reporting(E_ALL);
} else {
$ldap->search ("(&(objectClass=goImapServer)(goImapSieveServer=*))",
array('goImapName', 'goImapConnect', 'goImapAdmin', 'goImapPassword',
$this->data['SERVERS']['IMAP'][$imap_server]=
array(
+ "server_dn" => $attrs['dn'],
"connect" => $imap_connect,
"admin" => $imap_admin,
"password" => $pwd,
$result['/']= $this->current['BASE'];
$this->tdepartments= array();
+ /* Get all department types from department Management, to be able detect the department type.
+ -It is possible that differnty department types have the same name,
+ in this case we have to mark the department name to be able to differentiate.
+ (e.g l=Name or o=Name)
+ */
+ $types = departmentManagement::get_support_departments();
+
+ /* Create a list of attributes to fetch */
+ $ldap_values = array("objectClass","gosaUnitTag");
+ $filter = "";
+ foreach($types as $type){
+ $ldap_values[] = $type['ATTR'];
+ $filter .= "(objectClass=".$type['OC'].")";
+ }
+ $filter = "(&(objectClass=gosaDepartment)(|".$filter."))";
+
/* Get list of department objects */
$ldap= $this->get_ldap_link();
$ldap->cd ($this->current['BASE']);
- $ldap->search ("(objectClass=gosaDepartment)", array("ou", "objectClass", "gosaUnitTag"));
+ $ldap->search ($filter, $ldap_values);
while ($attrs= $ldap->fetch()){
+
+ /* Detect department type */
+ $type_data = array();
+ foreach($types as $t => $data){
+ if(in_array($data['OC'],$attrs['objectClass'])){
+ $type_data = $data;
+ break;
+ }
+ }
+
+ /* Unknown department type -> skip
+ */
+ if(!count($type_data)) continue;
+
$dn= $ldap->getDN();
$this->tdepartments[$dn]= "";
continue;
}
+ $c_dn = convert_department_dn($dn)." (".$type_data['ATTR'].")";
+
/* Only assign non-root departments */
if ($dn != $result['/']){
- $result[convert_department_dn($dn)]= $dn;
+ $result[$c_dn]= $dn;
}
}
/* Extract department name */
$elestr = trim(preg_replace("/^[^=]*+=/","", $ele),",");
+ $nameA = trim(preg_replace("/=.*$/","", $ele),",");
+ if($nameA != "ou"){
+ $nameA = " (".$nameA.")";
+ }else{
+ $nameA = "";
+ }
+
/* Add to array */
if($key == (count($elements)-1)){
- $last[$elestr]['ENTRY'] = $val;
+ $last[$elestr.$nameA]['ENTRY'] = $val;
}
/* Set next array appending position */
- $last = &$last[$elestr]['SUB'];
+ $last = &$last[$elestr.$nameA]['SUB'];
}
}
+
/* Add base entry */
$ret["/"]["ENTRY"] = $base;
$ret["/"]["SUB"] = $arr;
}
/* Fix name, if it contains a replace tag */
- $name= @LDAP::fix($name);
+ $name= preg_replace('/\\\\,/', ',', @LDAP::fix($name));
/* Check if current name is too long, then cut it */
if(mb_strlen($name, 'UTF-8')> $max_size){
{
global $config;
$return = array();
+ $ui = get_userinfo();
$base = $config->current['BASE'];
$res= get_sub_list("(&(objectClass=goShareServer)(goExportEntry=*))", "server",
- get_ou("serverou"), $base,array("goExportEntry","cn"),GL_NONE);
+ get_ou("serverou"), $base,array("goExportEntry","cn"),GL_NONE | GL_NO_ACL_CHECK);
foreach($res as $entry){
+
+ $acl = $ui->get_permissions($entry['dn'],"server","");
if(isset($entry['goExportEntry']['count'])){
unset($entry['goExportEntry']['count']);
}
foreach($entry['goExportEntry'] as $share){
$a_share = split("\|",$share);
$sharename = $a_share[0];
- $return[$entry['cn'][0]."|".$sharename] = $entry['cn'][0]." [".$sharename."]";
+ $data= array();
+ $data['NAME'] = $sharename;
+ $data['ACL'] = $acl;
+ $data['SERVER'] = $entry['cn']['0'];
+ $data['SHARE'] = $sharename;
+ $data['DISPLAY']= $entry['cn'][0]." [".$sharename."]";
+ $return[$entry['cn'][0]."|".$sharename] = $data;
}
}
return($return);
}
+ function get_cfg_value($name, $default= "") {
+ $name= strtoupper($name);
+
+ /* Check if we have a current value for $name */
+ if (isset($this->current[$name])){
+ return ($this->current[$name]);
+ }
+
+ /* Check if we have a global value for $name */
+ if (isset($this->data["MAIN"][$name])){
+ return ($this->data["MAIN"][$name]);
+ }
+
+ return ($default);
+ }
+
+
function check_config_version()
{
/* Skip check, if we've already mentioned the mismatch