diff --git a/plugins/admin/systems/class_selectUserToPrinterDialog.inc b/plugins/admin/systems/class_selectUserToPrinterDialog.inc
index 4321e412da2f93d1ba395f936b3894d1b6ea30af..923f9454f0f84bc628fb896f73941d35a51a454d 100644 (file)
var $searchObjects = "";
var $searchAttrs = "";
var $searchAppend = "";
+ var $baseAddition = "";
var $type = "";
function selectUserToPrinterDialog ($config, $dn= NULL,$type=false )
switch($type){
case "AddUser" :
- $this->searchObjects = "(objectClass=person)(objectClass=inetOrgPerson)";
+ $this->searchObjects = "(objectClass=gosaAccount)(!(uid=*$))";
$this->searchAttrs = array("cn","uid");
$this->searchAppend = "uid";
+ $this->baseAddition = get_people_ou();
;break;
case "AddGroup" :
$this->searchObjects = "(objectClass=posixGroup)";
$this->searchAttrs = array("cn","description");
$this->searchAppend = "cn";
+ $this->baseAddition = get_groups_ou();
;break;
case "AddAdminUser" :
- $this->searchObjects = "(objectClass=person)(objectClass=inetOrgPerson)";
+ $this->searchObjects = "(objectClass=gosaAccount)(!(uid=*$))";
$this->searchAttrs = array("cn","uid");
$this->searchAppend = "uid";
+ $this->baseAddition = get_people_ou();
;break;
case "AddAdminGroup" :
$this->searchObjects = "(objectClass=posixGroup)";
$this->searchAttrs = array("cn","description");
$this->searchAppend = "cn";
+ $this->baseAddition = get_groups_ou();
;break;
}
$this->type = $type;
$this->regex=preg_replace("/\*\*/","*",$this->regex);
}
- $this->deplist=array_flip($this->config->departments);
-
+ $tmp_printers= $this->getPrinter();
$smarty->assign("regexPrinter" , $this->regex);
- $smarty->assign("deplistPrinter" , $this->deplist);
+ $smarty->assign("deplistPrinter" , $this->config->idepartments);//deplist);
$smarty->assign("depselectPrinter" , $this->depselect);
- $smarty->assign("gotoPrinters" , $this->getPrinter());
- $smarty->assign("gotoPrinterKeys" , array_flip($this->getPrinter()));
+ $smarty->assign("gotoPrinters" , $tmp_printers);
+ $smarty->assign("gotoPrinterKeys" , array_flip($tmp_printers));
$smarty->assign("apply" , apply_filter());
$smarty->assign("alphabet" , generate_alphabet());
$smarty->assign("search_image" , get_template_path('images/search.png'));
$smarty->assign("tree_image" , get_template_path('images/tree.png'));
$smarty->assign("infoimage" , get_template_path('images/info.png'));
- $smarty->assign("launchimage" , get_template_path('images/launch.png'));
+ $smarty->assign("launchimage" , get_template_path('images/small_filter.png'));
$smarty->assign("deplist" , $this->config->idepartments);
$display.= $smarty->fetch(get_template_path('selectUserToPrinterDialog.tpl', TRUE,dirname(__FILE__)));
$a_return=array();
$ldap = $this->config->get_ldap_link();
$ldap->cd($this->depselect);
- $ldap->search("(&".$this->searchObjects."(cn=".$this->regex."))",$this->searchAttrs);
+ #$ldap->search("(&".$this->searchObjects."(cn=".$this->regex."))", $this->depselect, $this->searchAttrs);
+ $ldap->ls("(&".$this->searchObjects."(cn=".$this->regex."))", $this->baseAddition.$this->depselect, $this->searchAttrs);
while($printer = $ldap->fetch()){
if(($detailed ==true)){
if(isset($printer[$this->searchAppend])){
}
}
-
-
-
-
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
?>