index 4d8b18c8c325eb34c66232ecfd0012cff7400b34..29d45a9ac18cff7e786b2b4104ec86da1dcf89e9 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']);
+# }
}
}
}
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 */
$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->get_admin_dn(), $this->get_admin_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)){
/* Convert BASE to have escaped special characters */
$this->current['BASE']= @LDAP::convert($this->current['BASE']);
- /* Load server informations */
- $this->load_servers();
- }
-
-
- function update_credentials_from_config()
- {
/* Parse LDAP referral informations */
if (!isset($this->current['ADMIN']) || !isset($this->current['PASSWORD'])){
$url= $this->current['SERVER'];
$this->current['PASSWORD']= $referral['PASSWORD'];
}
- /* Bail out if problematic */
- if (!isset($this->current['ADMIN']) || !isset($this->current['PASSWORD'])){
- msg_dialog::display(_("Configuration error"), _("Cannot find any administrative LDAP credentials!"), FATAL_ERROR_DIALOG);
- exit;
- }
- }
-
-
- function encode_server_url($url, $base, $val)
- {
- return (preg_replace("/_+/", "_", "HTTP_".strtr(strtoupper($url."_".md5($base)."_$val"), ".-:/", "____")));
- }
-
-
- function get_admin_dn()
- {
- $enc= $this->encode_server_url($this->current['SERVER'], $this->current['BASE'], "ADMIN");
- /* Answer from http request */
- if (isset($_SERVER[$enc])){
- return $_SERVER[$enc];
- }
-
- /* Answer in old style for compatibility */
- $this->update_credentials_from_config();
- return $this->current['ADMIN'];
- }
-
-
- function get_admin_password()
- {
- $enc= $this->encode_server_url($this->current['SERVER'], $this->current['BASE'], "PASSWORD");
-
- /* Answer from http request */
- if (isset($_SERVER[$enc])){
- return $_SERVER[$enc];
- }
-
- /* Answer in old style for compatibility */
- $this->update_credentials_from_config();
- return $this->current['PASSWORD'];
+ /* Load server informations */
+ $this->load_servers();
}
-
function load_servers ()
{
/* Only perform actions if current is set */
/* 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]);
+ 'REALM' => $attrs['goKrbRealm'][0],
+ 'ADMIN' => $attrs['goKrbAdmin'][0]);
}
/* Get cups server. FIXME: only one is supported currently */
}
+ function check_config_version()
+ {
+
+ $current = get_gosa_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);
+
+ if(preg_match("/\(Rev[^\)]*\)/",$current)){
+
+ /* Development Version
+ */
+ $c_v = preg_replace("/^.*\(Rev ([0-9]*)\).*$/","\\1",$current);
+ $g_v = preg_replace("/^.*\(Rev ([0-9]*)\).*$/","\\1",$this->config_version);
+ if($c_v != $g_v){
+# 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."));
+ }
+ }else{
+
+ /* Tagged version
+ */
+ if($this->config_version != $current){
+ 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.