index 64039fd3a115e36bd2544cbe461fc360d35180a7..ad109f53492a91a49ca0473ac76dd89612c6d9b6 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;
{
$this->current= $this->data['LOCATIONS'][$name];
+ if (!isset($this->current['SAMBAVERSION'])){
+ $this->current['SAMBAVERSION']= 3;
+ }
if (!isset($this->current['PEOPLE'])){
$this->current['PEOPLE']= "ou=people";
}
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',
}
/* 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){
foreach($res as $entry){
- $acl = $ui->get_permissions($entry['dn'],"server/goShareServer","");
+ $acl = $ui->get_permissions($entry['dn'],"server","");
if(isset($entry['goExportEntry']['count'])){
unset($entry['goExportEntry']['count']);
}
}
+ 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