index 106e4995a53766703f923e1711e06c1d52c303d8..c01a2ec0e519fe9e696298030f2692cccbe49b79 100644 (file)
var $idepartments= array();
var $adepartments= array();
var $tdepartments= array();
var $idepartments= array();
var $adepartments= array();
var $tdepartments= array();
+ var $department_info= array();
var $filename = "";
var $last_modified = 0;
var $filename = "";
var $last_modified = 0;
+ public $configRegistry = NULL;
+
/*! \brief Class constructor of the config class
*
* \param string 'filename' path to the configuration file
/*! \brief Class constructor of the config class
*
* \param string 'filename' path to the configuration file
if ($filename != ""){
$this->parse($filename);
}
if ($filename != ""){
$this->parse($filename);
}
+
+ // Load configuration registry
+ $this->configRegistry = new configRegistry($this);
}
}
fclose($fh);
if(!xml_parse($this->parser, chop($xmldata))){
$msg = sprintf(_("XML error in gosa.conf: %s at line %d"),
fclose($fh);
if(!xml_parse($this->parser, chop($xmldata))){
$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));
+ bold(xml_error_string(xml_get_error_code($this->parser))),
+ bold(xml_get_current_line_number($this->parser)));
msg_dialog::display(_("Configuration error"), $msg, FATAL_ERROR_DIALOG);
exit;
}
msg_dialog::display(_("Configuration error"), $msg, FATAL_ERROR_DIALOG);
exit;
}
}
break;
}
break;
+ case 'PATHMENU':
+ $this->data['PATHMENU']= array(); ;
+ break;
+
/* Inser plugins */
case 'PLUGIN':
if ($this->tags[$this->level-3] == 'MENU' &&
/* Inser plugins */
case 'PLUGIN':
if ($this->tags[$this->level-3] == 'MENU' &&
$this->data['MENU'][$this->section][$this->gpc++]= $attrs;
}
$this->data['MENU'][$this->section][$this->gpc++]= $attrs;
}
+ if ($this->tags[$this->level-2] == 'PATHMENU'){
+ $this->data['PATHMENU'][$this->gpc++]= $attrs;
+ }
if ($this->tags[$this->level-2] == 'SERVICEMENU'){
$this->data['SERVICE'][$attrs['CLASS']]= $attrs;
}
if ($this->tags[$this->level-2] == 'SERVICEMENU'){
$this->data['SERVICE'][$attrs['CLASS']]= $attrs;
}
/* Check for connection */
if (is_null($this->ldap) || (is_int($this->ldap) && $this->ldap == 0)){
$smarty= get_smarty();
/* Check for connection */
if (is_null($this->ldap) || (is_int($this->ldap) && $this->ldap == 0)){
$smarty= get_smarty();
- msg_dialog::display(_("LDAP error"), _("Cannot bind to LDAP. Please contact the system administrator."), FATAL_ERROR_DIALOG);
+ msg_dialog::display(_("LDAP error"), _("Cannot bind to LDAP!"), FATAL_ERROR_DIALOG);
exit();
}
exit();
}
$bases= array();
$servers= array();
foreach ($this->current['REFERRAL'] as $ref){
$bases= array();
$servers= array();
foreach ($this->current['REFERRAL'] as $ref){
- $server= preg_replace('%^(.*)/[^/]+$%', '\\1', $ref['URI']);
- $base= preg_replace('%^.*/([^/]+)$%', '\\1', $ref['URI']);
+ $server= preg_replace('%^(.*://[^/]+)/.*$%', '\\1', $ref['URI']);
+ $base= preg_replace('%^.*://[^/]+/(.*)$%', '\\1', $ref['URI']);
$bases[$base]= strlen($base);
$servers[$base]= $server;
}
$bases[$base]= strlen($base);
$servers[$base]= $server;
}
$types = departmentManagement::get_support_departments();
/* Create a list of attributes to fetch */
$types = departmentManagement::get_support_departments();
/* Create a list of attributes to fetch */
- $ldap_values = array("objectClass","gosaUnitTag");
+ $ldap_values = array("objectClass","gosaUnitTag", "description");
$filter = "";
foreach($types as $type){
$ldap_values[] = $type['ATTR'];
$filter = "";
foreach($types as $type){
$ldap_values[] = $type['ATTR'];
foreach($types as $t => $data){
if(in_array($data['OC'],$attrs['objectClass'])){
$type_data = $data;
foreach($types as $t => $data){
if(in_array($data['OC'],$attrs['objectClass'])){
$type_data = $data;
- break;
+ break;
}
}
}
}
- /* Unknown department type -> skip
- */
+ /* Unknown department type -> skip */
if(!count($type_data)) continue;
$dn= $ldap->getDN();
$this->tdepartments[$dn]= "";
if(!count($type_data)) continue;
$dn= $ldap->getDN();
$this->tdepartments[$dn]= "";
+ $this->department_info[$dn]= array("img" => $type_data['IMG'],
+ "description" => isset($attrs['description'][0])?$attrs['description'][0]:"",
+ "name" => $attrs[$type_data['ATTR']][0]);
/* Save administrative departments */
if (in_array_ics("gosaAdministrativeUnit", $attrs['objectClass']) &&
/* Save administrative departments */
if (in_array_ics("gosaAdministrativeUnit", $attrs['objectClass']) &&
if ($dn == $ignore_dn){
continue;
}
if ($dn == $ignore_dn){
continue;
}
-
$c_dn = convert_department_dn($dn)." (".$type_data['ATTR'].")";
/* Only assign non-root departments */
$c_dn = convert_department_dn($dn)." (".$type_data['ATTR'].")";
/* Only assign non-root departments */
*
*
*/
*
*
*/
- function get_cfg_value($name, $default= "") {
+ function get_cfg_value($name, $default= "")
+ {
+
+ if($this->configRegistry->propertyExists('core',$name)){
+ return($this->configRegistry->getPropertyValue('core',$name));
+ }
+
+ syslog(1, $name);
+
$name= strtoupper($name);
/* Check if we have a current value for $name */
$name= strtoupper($name);
/* Check if we have a current value for $name */
/* Check contributed config version and current config version.
*/
if(($this->config_version == "NOT SET") || ($this->config_version != $current && !empty($this->config_version))){
/* Check contributed config version and current config version.
*/
if(($this->config_version == "NOT SET") || ($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."));
+ msg_dialog::display(_("Configuration"),_("The configuration file you are using is outdated. Please move the GOsa configuration file away to run the GOsa setup again."));
}
}
}
}
if(!session::is_set("snapshotFailMessageSend")){
session::set("snapshotFailMessageSend",TRUE);
msg_dialog::display(_("Configuration error"),
if(!session::is_set("snapshotFailMessageSend")){
session::set("snapshotFailMessageSend",TRUE);
msg_dialog::display(_("Configuration error"),
- sprintf(_("The snapshot functionality is enabled, but the required variable '%s' is not set."),
- "snapshotBase"), ERROR_DIALOG);
+ sprintf(_("The snapshot functionality is enabled, but the required variable %s is not set."),
+ bold("snapshotBase")), ERROR_DIALOG);
}
return(FALSE);
}
}
return(FALSE);
}
if(!session::is_set("snapshotFailMessageSend")){
session::set("snapshotFailMessageSend",TRUE);
msg_dialog::display(_("Configuration error"),
if(!session::is_set("snapshotFailMessageSend")){
session::set("snapshotFailMessageSend",TRUE);
msg_dialog::display(_("Configuration error"),
- sprintf(_("The snapshot functionality is enabled, but the required compression module is missing. Please install '%s'."),"php5-zip / php5-gzip"), ERROR_DIALOG);
+ sprintf(_("The snapshot functionality is enabled, but the required compression module is missing. Please install %s."), bold("php5-zip / php5-gzip")), ERROR_DIALOG);
}
return(FALSE);
}
}
return(FALSE);
}
if(!session::is_set("snapshotFailMessageSend")){
session::set("snapshotFailMessageSend",TRUE);
msg_dialog::display(_("Configuration error"),
if(!session::is_set("snapshotFailMessageSend")){
session::set("snapshotFailMessageSend",TRUE);
msg_dialog::display(_("Configuration error"),
- sprintf(_("The snapshot functionality is enabled, but the required variable '%s' is not set."),
- $missing), ERROR_DIALOG);
+ sprintf(_("The snapshot functionality is enabled, but the required variable %s is not set."),
+ bold($missing)), ERROR_DIALOG);
}
return(FALSE);
}
}
return(FALSE);
}