X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fclass_config.inc;h=92c87511716d8da745d968cd700fa5d413b3c131;hb=382443db9d291ebe40f97a94534a0913f7c0a6ef;hp=13c87c11db9f1f6fde76db4e29c476deaffc85d2;hpb=47f45f247c547999858874eac073796ce4d6e30b;p=gosa.git
diff --git a/include/class_config.inc b/include/class_config.inc
index 13c87c11d..92c875117 100644
--- a/include/class_config.inc
+++ b/include/class_config.inc
@@ -38,7 +38,7 @@ class config {
/* Configuration data */
var $data= array( 'TABS' => array(), 'LOCATIONS' => array(), 'SERVERS' => array(),
- 'MAIN' => array( 'LANGUAGES' => array(), 'FAXFORMATS' => array() ),
+ 'MAIN' => array(),
'MENU' => array(), 'SERVICE' => array());
var $basedir= "";
@@ -47,6 +47,8 @@ class config {
var $idepartments= array();
var $adepartments= array();
var $tdepartments= array();
+ var $filename = "";
+ var $last_modified = 0;
function config($filename, $basedir= "")
{
@@ -62,16 +64,47 @@ class config {
}
}
+
+ function check_and_reload()
+ {
+ if($this->filename != "" && filemtime($this->filename) != $this->last_modified){
+
+ $this->config_found= FALSE;
+ $this->tags= array();
+ $this->level= 0;
+ $this->gpc= 0;
+ $this->section= "";
+ $this->currentLocation= "";
+
+ $this->parser = xml_parser_create();
+ xml_set_object($this->parser, $this);
+ xml_set_element_handler($this->parser, "tag_open", "tag_close");
+ $this->parse($this->filename);
+ if(isset($_SESSION['plist'])){
+ unset($_SESSION['plist']);
+ }
+ if(isset($_SESSION['plug'])){
+ unset($_SESSION['plug']);
+ }
+ if(isset($_GET['plug'])){
+ unset($_GET['plug']);
+ }
+ }
+ }
+
+
function parse($filename)
{
+ $this->last_modified = filemtime($filename);
+ $this->filename = $filename;
$fh= fopen($filename, "r");
$xmldata= fread($fh, 100000);
fclose($fh);
if(!xml_parse($this->parser, chop($xmldata))){
- print_red(sprintf(_("XML error in gosa.conf: %s at line %d"),
+ $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)));
- echo $_SESSION['errors'];
+ xml_get_current_line_number($this->parser));
+ msg_dialog::display(_("Config file parsing"), $msg, FATAL_ERROR_DIALOG);
exit;
}
}
@@ -143,23 +176,6 @@ class config {
}
break;
- /* Handle language */
- case 'LANGUAGE':
- if ($this->tags[$this->level-2] == 'MAIN'){
- /* Add languages */
- $this->data['MAIN']['LANGUAGES'][$attrs['NAME']]=
- $attrs['TAG'];
- }
- 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);
@@ -241,6 +257,15 @@ class config {
if (!isset($this->current['GROUPS'])){
$this->current['GROUPS']= "ou=groups";
}
+
+ if (isset($this->current['INITIAL_BASE'])){
+ $_SESSION['CurrentMainBase']= $this->current['INITIAL_BASE'];
+ }
+
+ /* Remove possibly added ',' from end of group and people ou */
+ $this->current['GROUPS'] = preg_replace("/,*$/","",$this->current['GROUPS']);
+ $this->current['PEOPLE'] = preg_replace("/,*$/","",$this->current['PEOPLE']);
+
if (!isset($this->current['WINSTATIONS'])){
$this->current['WINSTATIONS']= "ou=winstations,ou=systems";
}
@@ -308,26 +333,41 @@ class config {
function load_servers ()
{
/* Only perform actions if current is set */
- if ($this->current == NULL){
+ if ($this->current === NULL){
return;
}
/* Fill imap servers */
$ldap= $this->get_ldap_link();
$ldap->cd ($this->current['BASE']);
- $ldap->search ("(objectClass=goImapServer)");
+ if (!isset($this->current['MAILMETHOD'])){
+ $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]);
+ $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(E_ALL);
/* Get kerberos server. FIXME: only one is supported currently */
$ldap->cd ($this->current['BASE']);
@@ -358,24 +398,46 @@ class config {
'PASSWORD' => $attrs['goFaxPassword'][0]);
}
+
/* Get asterisk servers */
$ldap->cd ($this->current['BASE']);
$ldap->search ("(objectClass=goFonServer)");
+ $this->data['SERVERS']['FON']= array();
if ($ldap->count()){
- $attrs= $ldap->fetch();
- $this->data['SERVERS']['FON']= array(
- 'SERVER' => $attrs['cn'][0],
- 'LOGIN' => $attrs['goFonAdmin'][0],
- 'PASSWORD' => $attrs['goFonPassword'][0],
- 'DB' => "gophone",
- 'SIP_TABLE' => "sip_users",
- 'EXT_TABLE' => "extensions",
- 'VOICE_TABLE' => "voicemail_users",
- 'QUEUE_TABLE' => "queues",
- 'QUEUE_MEMBER_TABLE' => "queue_members");
+ while ($attrs= $ldap->fetch()){
+
+ /* Add 0 entry for development */
+ if(count($this->data['SERVERS']['FON']) == 0){
+ $this->data['SERVERS']['FON'][0]= array(
+ 'DN' => $attrs['dn'],
+ 'SERVER' => $attrs['cn'][0],
+ 'LOGIN' => $attrs['goFonAdmin'][0],
+ 'PASSWORD' => $attrs['goFonPassword'][0],
+ 'DB' => "gophone",
+ 'SIP_TABLE' => "sip_users",
+ 'EXT_TABLE' => "extensions",
+ 'VOICE_TABLE' => "voicemail_users",
+ 'QUEUE_TABLE' => "queues",
+ 'QUEUE_MEMBER_TABLE' => "queue_members");
+ }
+
+ /* Add entry with 'dn' as index */
+ $this->data['SERVERS']['FON'][$attrs['dn']]= array(
+ 'DN' => $attrs['dn'],
+ 'SERVER' => $attrs['cn'][0],
+ 'LOGIN' => $attrs['goFonAdmin'][0],
+ 'PASSWORD' => $attrs['goFonPassword'][0],
+ 'DB' => "gophone",
+ 'SIP_TABLE' => "sip_users",
+ 'EXT_TABLE' => "extensions",
+ 'VOICE_TABLE' => "voicemail_users",
+ 'QUEUE_TABLE' => "queues",
+ 'QUEUE_MEMBER_TABLE' => "queue_members");
+ }
}
- /* Get asterisk servers */
+
+ /* Get glpi server */
$ldap->cd ($this->current['BASE']);
$ldap->search ("(&(objectClass=goGlpiServer)(cn=*)(goGlpiAdmin=*)(goGlpiDatabase=*))",array("cn","goGlpiPassword","goGlpiAdmin","goGlpiDatabase"));
if ($ldap->count()){
@@ -389,6 +451,8 @@ class config {
'PASSWORD' => $attrs['goGlpiPassword'][0],
'DB' => $attrs['goGlpiDatabase'][0]);
}
+
+
/* Get logdb server */
$ldap->cd ($this->current['BASE']);
$ldap->search ("(objectClass=goLogDBServer)");
@@ -399,6 +463,22 @@ class config {
'PASSWORD' => $attrs['goLogPassword'][0]);
}
+
+ /* GOsa logging databases */
+ $ldap->cd ($this->current['BASE']);
+ $ldap->search ("(objectClass=gosaLogServer)");
+ if ($ldap->count()){
+ while($attrs= $ldap->fetch()){
+ $this->data['SERVERS']['LOGGING'][$attrs['cn'][0]]=
+ array(
+ 'DN' => $attrs['dn'],
+ 'USER' => $attrs['goLogDBUser'][0],
+ 'DB' => $attrs['goLogDB'][0],
+ 'PWD' => $attrs['goLogDBPassword'][0]);
+ }
+ }
+
+
/* Get NFS server lists */
$tmp= array("default");
$ldap->cd ($this->current['BASE']);
@@ -595,6 +675,7 @@ class config {
$depth ++;
/* Walk through array */
+ ksort($arr);
foreach($arr as $name => $entries){
/* If this department is the last in the current tree position
@@ -615,7 +696,7 @@ class config {
if(isset($entries['ENTRY'])){
$a = "";
for($i = 0 ; $i < $depth ; $i ++){
- $a.=" ";
+ $a.=".";
}
$ret[$entries['ENTRY']]=$a." ".$name;
}
@@ -637,29 +718,35 @@ class config {
function getShareList($listboxEntry = false)
{
$ldap= $this->get_ldap_link();
- $a_res = $ldap->search("(objectClass=goShareServer)",array("goExportEntry","cn"));
- $return= array();
- while($entry = $ldap->fetch($a_res)){
- if(isset($entry['goExportEntry']['count'])){
- unset($entry['goExportEntry']['count']);
- }
- if(isset($entry['goExportEntry'])){
- foreach($entry['goExportEntry'] as $export){
- $shareAttrs = split("\|",$export);
- if($listboxEntry) {
- $return[$shareAttrs[0]."|".$entry['cn'][0]] = $shareAttrs[0]." - ".$entry['cn'][0];
- }else{
- $return[$shareAttrs[0]."|".$entry['cn'][0]]['server'] = $entry['cn'][0];
- $return[$shareAttrs[0]."|".$entry['cn'][0]]['name'] = $shareAttrs[0];
- $return[$shareAttrs[0]."|".$entry['cn'][0]]['description'] = $shareAttrs[1];
- $return[$shareAttrs[0]."|".$entry['cn'][0]]['type'] = $shareAttrs[2];
- $return[$shareAttrs[0]."|".$entry['cn'][0]]['charset'] = $shareAttrs[3];
- $return[$shareAttrs[0]."|".$entry['cn'][0]]['path'] = $shareAttrs[4];
- $return[$shareAttrs[0]."|".$entry['cn'][0]]['option'] = $shareAttrs[5];
+ $base = $this->current['BASE'];
+ $res= get_list("(&(objectClass=goShareServer)(goExportEntry=*))","server",$base,array("goExportEntry","cn"),GL_SUBSEARCH);
+ $return = array();
+
+ foreach($res as $entry){
+ if(obj_is_readable($entry['dn'], "server/goShareServer","goExportEntry")){
+
+ if(isset($entry['goExportEntry']['count'])){
+ unset($entry['goExportEntry']['count']);
+ }
+ if(isset($entry['goExportEntry'])){
+ foreach($entry['goExportEntry'] as $export){
+ $shareAttrs = split("\|",$export);
+ if($listboxEntry) {
+ $return[$shareAttrs[0]."|".$entry['cn'][0]] = $shareAttrs[0]." - ".$entry['cn'][0];
+ }else{
+ $return[$shareAttrs[0]."|".$entry['cn'][0]]['server'] = $entry['cn'][0];
+ $return[$shareAttrs[0]."|".$entry['cn'][0]]['name'] = $shareAttrs[0];
+ $return[$shareAttrs[0]."|".$entry['cn'][0]]['description'] = $shareAttrs[1];
+ $return[$shareAttrs[0]."|".$entry['cn'][0]]['type'] = $shareAttrs[2];
+ $return[$shareAttrs[0]."|".$entry['cn'][0]]['charset'] = $shareAttrs[3];
+ $return[$shareAttrs[0]."|".$entry['cn'][0]]['path'] = $shareAttrs[4];
+ $return[$shareAttrs[0]."|".$entry['cn'][0]]['option'] = $shareAttrs[5];
+ }
}
}
- }
+ }
}
+
return($return);
}
@@ -670,18 +757,19 @@ class config {
$return = array();
$ui = get_userinfo();
$base = $config->current['BASE'];
-echo "Need to adapt share list loading
";
- $res= get_list("(&(objectClass=goShareServer)(goExportEntry=*))", "all", $base,array("goExportEntry","cn"),GL_SUBSEARCH);
+
+ $res= get_list("(&(objectClass=goShareServer)(goExportEntry=*))", "server", $base,array("goExportEntry","cn"),GL_SUBSEARCH);
foreach($res as $entry){
- 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."]";
+ if(obj_is_readable($entry['dn'], "server/goShareServer","goExportEntry")){
+ 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."]";
+ }
}
-
}
return($return);
}
@@ -703,6 +791,60 @@ echo "Need to adapt share list loading
";
return FALSE;
}
+
+ function __search(&$arr, $name, $return)
+ {
+ $return= strtoupper($return);
+ if (is_array($arr)){
+ foreach ($arr as &$a){
+ if (isset($a['CLASS']) && strcasecmp($name, $a['CLASS']) == 0){
+ return(isset($a[$return])?$a[$return]:"");
+ } else {
+ $res= $this->__search ($a, $name, $return);
+ if ($res != ""){
+ return $res;
+ }
+ }
+ }
+ }
+ return ("");
+ }
+
+
+ function search($class, $value, $categories= "")
+ {
+ if (is_array($categories)){
+ foreach ($categories as $category){
+ $res= $this->__search($this->data[strtoupper($category)], $class, $value);
+ if ($res != ""){
+ return $res;
+ }
+ }
+ } else {
+ if ($categories == "") {
+ return $this->__search($this->data, $class, $value);
+ } else {
+ return $this->__search($this->data[strtoupper($categories)], $class, $value);
+ }
+ }
+
+ return ("");
+ }
+
+
+ /* 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.
+ * This function checks if the gosa.conf value matches the range
+ * defined by session.gc_maxlifetime.
+ */
+ function check_session_lifetime()
+ {
+ $cfg_lifetime = $this->data['MAIN']['SESSION_LIFETIME'];
+ $ini_lifetime = ini_get('session.gc_maxlifetime');
+ $deb_system = file_exists('/etc/debian_version');
+ return(!($deb_system && ($ini_lifetime < $cfg_lifetime)));
+ }
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: