![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index ef1c93c669e9b47ec270b12b36545c872f95b1e9..339eca51fa81568fbe32d504acbb43a1207faba1 100644 (file)
--- a/include/class_config.inc
+++ b/include/class_config.inc
/* Keep a copy of the current deparment list */
var $departments= array();
var $idepartments= array();
+ var $adepartments= array();
+ var $tdepartments= array();
function config($filename, $basedir= "")
{
return;
}
+ /* yes/no to true/false and upper case TRUE to true and so on*/
+ foreach($attrs as $name => $value){
+ if(preg_match("/^(true|yes)$/i",$value)){
+ $attrs[$name] = "true";
+ }elseif(preg_match("/^(false|no)$/i",$value)){
+ $attrs[$name] = "false";
+ }
+ }
+
/* Look through attributes */
switch ($this->tags[$this->level-1]){
/* Check for connection */
if (is_null($this->ldap) || (is_int($this->ldap) && $this->ldap == 0)){
+ $smarty= get_smarty();
print_red (_("Can't bind to LDAP. Please contact the system administrator."));
- echo $_SESSION['errors'];
- exit;
+ $smarty->display (get_template_path('headers.tpl'));
+ echo '<body style="background-image:none">'.$_SESSION['errors'].'</body></html>';
+ exit();
}
if (!isset($_SESSION['size_limit'])){
'QUEUE_MEMBER_TABLE' => "queue_members");
}
- /* Get asterisk servers */
+ /* Get glpi servers */
$ldap->cd ($this->current['BASE']);
- $ldap->search ("(objectClass=goGlpiServer)");
+ $ldap->search ("(&(objectClass=goGlpiServer)(cn=*)(goGlpiAdmin=*)(goGlpiDatabase=*))",array("cn","goGlpiPassword","goGlpiAdmin","goGlpiDatabase"));
if ($ldap->count()){
$attrs= $ldap->fetch();
- $this->data['SERVERS']['GLPI']= array(
- 'SERVER' => $attrs['cn'][0],
- 'LOGIN' => $attrs['goGlpiAdmin'][0],
- 'PASSWORD' => $attrs['goGlpiPassword'][0],
- 'DB' => $attrs['goGlpiDatabase'][0]);
+ if(!isset($attrs['goGlpiPassword'])){
+ $attrs['goGlpiPassword'][0] ="";
+ }
+ $this->data['SERVERS']['GLPI']= array(
+ 'SERVER' => $attrs['cn'][0],
+ 'LOGIN' => $attrs['goGlpiAdmin'][0],
+ 'PASSWORD' => $attrs['goGlpiPassword'][0],
+ 'DB' => $attrs['goGlpiDatabase'][0]);
}
/* Get logdb server */
$ldap->cd ($this->current['BASE']);
}
/* Ldap Server */
- $this->data['SERVERS']['LDAP']= array("default");
+ $this->data['SERVERS']['LDAP']= array();
$ldap->cd ($this->current['BASE']);
$ldap->search ("(objectClass=goLdapServer)");
while ($attrs= $ldap->fetch()){
/* Initialize result hash */
$result= array();
+ $administrative= array();
$result['/']= $this->current['BASE'];
+ $this->tdepartments= array();
/* Get list of department objects */
$ldap= $this->get_ldap_link();
$ldap->cd ($this->current['BASE']);
- $ldap->search ("(objectClass=gosaDepartment)", array("ou"));
+ $ldap->search ("(objectClass=gosaDepartment)", array("ou", "objectClass", "gosaUnitTag"));
while ($attrs= $ldap->fetch()){
$dn= $ldap->getDN();
+ $this->tdepartments[$dn]= "";
+
+ /* Save administrative departments */
+ if (in_array_ics("gosaAdministrativeUnit", $attrs['objectClass']) &&
+ isset($attrs['gosaUnitTag'][0])){
+ $administrative[$dn]= $attrs['gosaUnitTag'][0];
+ $this->tdepartments[$dn]= $attrs['gosaUnitTag'][0];
+ }
+
+ if (in_array_ics("gosaAdministrativeUnitTag", $attrs['objectClass']) &&
+ isset($attrs['gosaUnitTag'][0])){
+ $this->tdepartments[$dn]= $attrs['gosaUnitTag'][0];
+ }
+
if ($dn == $ignore_dn){
continue;
}
}
}
+ $this->adepartments= $administrative;
$this->departments= $result;
}
global $config;
$base = $config->current['BASE'];
- $arr = array();
-
+ $arr= array();
+ $ui= get_userinfo();
$this->idepartments= array();
/* Create multidimensional array, with all departments. */
foreach ($this->departments as $key => $val){
+ /* When using strict_units, filter non relevant parts */
+ if (isset($config->current['STRICT_UNITS']) && preg_match('/true/i', $config->current['STRICT_UNITS'])){
+ if ($ui->gosaUnitTag != "" && isset($this->tdepartments[$val]) &&
+ $this->tdepartments[$val] != $ui->gosaUnitTag){
+ continue;
+ }
+ }
+
/* remove base from dn */
$val2 = str_replace($base,"",$val);
function getShareList($listboxEntry = false)
{
$ldap= $this->get_ldap_link();
- $a_res = $ldap->search("(objectClass=goShareServer)",array("goExportEntry","cn"));
+
+ /* Set tag attribute if we've tagging activated */
+ $tag= "";
+ $ui= get_userinfo();
+ if ($ui->gosaUnitTag != "" && isset($this->current['STRICT_UNITS']) &&
+ preg_match('/TRUE/i', $this->current['STRICT_UNITS'])){
+ $tag= "(gosaUnitTag=".$ui->gosaUnitTag.")";
+ }
+
+ $a_res = $ldap->search("(&(objectClass=goShareServer)$tag(objectClass=goServer))",array("goExportEntry","cn"));
$return= array();
while($entry = $ldap->fetch($a_res)){
if(isset($entry['goExportEntry']['count'])){
/* This function returns all available ShareServer */
function getShareServerList()
{
- $ldap= $this->get_ldap_link();
- $a_res = $ldap->search("(&(objectClass=goShareServer)(goExportEntry=*))",array("goExportEntry","cn"));
- $return= array();
- while($entry = $ldap->fetch($a_res)){
+ global $config;
+ $return = array();
+ $ui = get_userinfo();
+ $base = $config->current['BASE'];
+ $res = get_list("(&(objectClass=goShareServer)(goExportEntry=*))",$ui->subtreeACL,$base,array("goExportEntry","cn"),GL_SUBSEARCH);
+ foreach($res as $entry){
if(isset($entry['goExportEntry']['count'])){
unset($entry['goExportEntry']['count']);
}
$sharename = $a_share[0];
$return[$entry['cn'][0]."|".$sharename] = $entry['cn'][0]." [".$sharename."]";
}
+
}
return($return);
}