![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 963db36b3a45a2f95323c9076920585580c89ab0..e800b61a90e1cb219d30e79d66d781566a7b33a5 100644 (file)
'MAIN' => array(),
'MENU' => array(), 'SERVICE' => array());
var $basedir= "";
+ var $config_version ="";
/* Keep a copy of the current deparment list */
var $departments= array();
xml_set_object($this->parser, $this);
xml_set_element_handler($this->parser, "tag_open", "tag_close");
$this->parse($this->filename);
- if(session::is_set('plist')){
- session::un_set('plist');
- }
- if(session::is_set('plug')){
- session::un_set('plug');
- }
- if(isset($_GET['plug'])){
- unset($_GET['plug']);
- }
+# if(session::is_set('plist')){
+# session::un_set('plist');
+# }
+# if(session::is_set('plug')){
+# session::un_set('plug');
+# }
+# if(isset($_GET['plug'])){
+# unset($_GET['plug']);
+# }
}
}
$msg = sprintf(_("XML error in gosa.conf: %s at line %d"),
xml_error_string(xml_get_error_code($this->parser)),
xml_get_current_line_number($this->parser));
- msg_dialog::display(_("Config file parsing"), $msg, FATAL_ERROR_DIALOG);
+ msg_dialog::display(_("Configuration error"), $msg, FATAL_ERROR_DIALOG);
exit;
}
}
function tag_open($parser, $tag, $attrs)
- {
+ {
/* Save last and current tag for reference */
$this->tags[$this->level]= $tag;
$this->level++;
/* Trigger on CONF section */
if ($tag == 'CONF'){
$this->config_found= TRUE;
+ if(isset($attrs['CONFIG_VERSION'])){
+ $this->config_version = $attrs['CONFIG_VERSION'];
+ }
}
/* Return if we're not in config section */
case 'LOCATION':
if ($this->tags[$this->level-2] == 'MAIN'){
$name= $attrs['NAME'];
+ $name = preg_replace("/[<>\"']/","",$name);
+ $attrs['NAME'] = $name;
$this->currentLocation= $name;
/* Add location elements */
- $this->data['LOCATIONS'][$name]= $attrs;
- }
+ $this->data['LOCATIONS'][$name]= $attrs;
+ }
break;
/* Handle referral tags */
$this->level--;
}
+
+ function get_credentials($creds)
+ {
+ if (isset($_SERVER['HTTP_GOSA_KEY'])){
+ return (cred_decrypt($creds, $_SERVER['HTTP_GOSA_KEY']));
+ }
+ return ($creds);
+ }
+
+
function get_ldap_link($sizelimit= FALSE)
{
if($this->ldap === NULL || !is_resource($this->ldap->cid)){
/* Build new connection */
$this->ldap= ldap_init ($this->current['SERVER'], $this->current['BASE'],
- $this->current['ADMIN'], $this->current['PASSWORD']);
+ $this->current['ADMIN'], $this->get_credentials($this->current['PASSWORD']));
/* Check for connection */
if (is_null($this->ldap) || (is_int($this->ldap) && $this->ldap == 0)){
$this->ldap->referrals= $this->current['REFERRAL'];
}
}
- return ($this->ldap);
+
+ return new ldapMultiplexer($this->ldap);
}
function set_current($name)
{
$this->current= $this->data['LOCATIONS'][$name];
+
if (!isset($this->current['PEOPLE'])){
$this->current['PEOPLE']= "ou=people";
}
}
error_reporting(E_ALL);
} else {
- $ldap->search ("(objectClass=goImapServer)", array('goImapName', 'goImapConnect', 'goImapAdmin', 'goImapPassword',
+ $ldap->search ("(&(objectClass=goImapServer)(goImapSieveServer=*))",
+ 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]);
+
+ /* Check if the given goImapSieveServer is in the new style "{cn:port/option}"
+ or the old style just "cn".
+ */
+ if(preg_match("/\{/",$attrs['goImapSieveServer'][0])){
+ $sieve_server = preg_replace("/^\{([^:]*).*$/","\\1",$attrs['goImapSieveServer'][0]);
+ $sieve_option = preg_replace("/^[^:]*[^\/]*+\/(.*)\}$/","\\1",$attrs['goImapSieveServer'][0]);
+ }else{
+ $sieve_server = $attrs['goImapSieveServer'][0];
+ $sieve_option = "";
+ }
+
+ $pwd = $attrs['goImapPassword'][0];
+ $imap_admin = $attrs['goImapAdmin'][0];
+ $imap_connect = $attrs['goImapConnect'][0];
+ $imap_server = $attrs['goImapName'][0];
+ $sieve_port = $attrs['goImapSievePort'][0];
+
+ $this->data['SERVERS']['IMAP'][$imap_server]=
+ array(
+ "connect" => $imap_connect,
+ "admin" => $imap_admin,
+ "password" => $pwd,
+ "sieve_server"=> $sieve_server,
+ "sieve_option"=> $sieve_option,
+ "sieve_port" => $sieve_port);
}
- error_reporting(E_ALL);
}
/* Get kerberos server. FIXME: only one is supported currently */
$ldap->cd ($this->current['BASE']);
- $ldap->search ("(objectClass=goKrbServer)");
+ $ldap->search ("(&(goKrbRealm=*)(goKrbAdmin=*)(objectClass=goKrbServer))");
if ($ldap->count()){
$attrs= $ldap->fetch();
$this->data['SERVERS']['KERBEROS']= array( 'SERVER' => $attrs['cn'][0],
'REALM' => $attrs['goKrbRealm'][0],
- 'ADMIN' => $attrs['goKrbAdmin'][0],
- 'PASSWORD' => $attrs['goKrbPassword'][0]);
+ 'ADMIN' => $attrs['goKrbAdmin'][0]);
}
/* Get cups server. FIXME: only one is supported currently */
}
}
- /* remove base from dn */
- $val2 = str_replace($base,"",$val);
-
- /* Get every single ou */
- $str = preg_replace("/ou=/","|ou=",$val2);
- $elements = array_reverse(split("\|",$str));
-
- /* Save last array position */
- $last = &$arr;
-
- /* Get array depth */
- $cnt = count($elements);
+ /* Split dn into single department pieces.
+ */
+ $elements = array_reverse(split(",",preg_replace("/".normalizePreg($base)."$/","",$val)));
/* Add last ou element of current dn to our array */
+ $last = &$arr;
foreach($elements as $key => $ele){
- /* skip enpty */
+ /* skip empty */
if(empty($ele)) continue;
/* Extract department name */
- $elestr = preg_replace("/^ou=/","", $ele);
- $elestr = preg_replace("/,$/","",$elestr);
+ $elestr = trim(preg_replace("/^[^=]*+=/","", $ele),",");
/* Add to array */
- if($key == ($cnt-2)){
+ if($key == (count($elements)-1)){
$last[$elestr]['ENTRY'] = $val;
}
/* Add base entry */
$ret["/"]["ENTRY"] = $base;
$ret["/"]["SUB"] = $arr;
-
$this->idepartments= $this->generateDepartmentArray($ret,-1,$max_size);
}
/* Creates display friendly output from make_idepartments */
- function generateDepartmentArray($arr,$depth = -1,$max_size){
+ function generateDepartmentArray($arr,$depth = -1,$max_size)
+ {
$ret = array();
$depth ++;
*/
function getShareList($listboxEntry = false)
{
- $tmp = get_sub_list("(&(objectClass=goShareServer)(goExportEntry=*))","",get_ou("serverou"),
+ $tmp = get_sub_list("(&(objectClass=goShareServer)(goExportEntry=*))","server",get_ou("serverou"),
$this->current['BASE'],array("goExportEntry","cn"), GL_NONE);
$return =array();
foreach($tmp as $entry){
}
+ function check_config_version()
+ {
+ /* Skip check, if we've already mentioned the mismatch
+ */
+ if(session::is_set("LastChecked") && session::get("LastChecked") == $this->config_version) return;
+
+ /* Remember last checked version
+ */
+ session::set("LastChecked",$this->config_version);
+
+ $current = md5(file_get_contents(CONFIG_TEMPLATE_DIR."/gosa.conf"));
+
+ /* Check contributed config version and current config version.
+ */
+ if($this->config_version != $current && !empty($this->config_version)){
+ msg_dialog::display(_("Configuration"),_("The configuration file you are using seems to be outdated. Please move the GOsa configuration file away to run the GOsa setup again."));
+ }
+ }
+
+
/* On debian systems the session files are deleted with
* a cronjob, which detects all files older than specified
* in php.ini:'session.gc_maxlifetime' and removes them.