![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc
index 809cd7292845a80ab061329f0271b5af768cd31f..39746e916a0c643fb1a7a57da9a91d2ce7a065f1 100644 (file)
var $gotoGroupAdminPrinter ;
var $gotoGroupPrinter;
var $gotoUserPrinter ;
+ var $baseSelector;
/* attribute list for save action */
var $attributes = array("cn", "description", "l", "labeledURI", "gotoPrinterPPD","gotoUserPrinter", "macAddress",
var $view_logged = FALSE;
var $parent;
+
+ // Memeber dialog object
+ var $userSelect;
+ var $adminUserSelect;
+
function printgeneric (&$config, $dn,$parent_init,$parent)
{
$this->config = &$config;
/* Update dn, to ensure storing as printer instead of WS / terminal */
if(preg_match("/Terminal/i",$this->BelongsTo) || preg_match("/TerminalTemplate/i",$this->BelongsTo)){
- $this->dn= preg_replace("/".preg_quote(get_ou('terminalRDN'), '/')."/i",get_ou('printerRDN'),$this->dn);
+ $this->dn= preg_replace("/".preg_quote(get_ou("workgeneric", "workstationRDN") , '/')."/i",get_ou("workgeneric", "workstationRDN") ,$this->dn);
}
if(preg_match("/Workstation/i",$this->BelongsTo) || preg_match("/WorkstationTemplate/i",$this->BelongsTo)){
- $this->dn= preg_replace("/".preg_quote(get_ou('workstationRDN'), '/')."/i",get_ou('printerRDN'),$this->dn);
+ $this->dn= preg_replace("/".preg_quote(get_ou("workgeneric", "workstationRDN") , '/')."/i",get_ou("workgeneric", "workstationRDN") ,$this->dn);
}
$this->orig_dn = $this->dn;
/* Set base */
if ($this->dn == "new"){
$ui= get_userinfo();
- $this->base= dn2base($ui->dn);
+ $this->base= dn2base(session::global_is_set("CurrentMainBase")?"cn=dummy,".session::global_get("CurrentMainBase"):$ui->dn);
$this->cn= "";
} else {
/* Set base and check if the extracted base exists */
- if(preg_match("/".preg_quote(get_ou('systemIncomingRDN'), '/')."/i",$this->dn)){
- $this->base= preg_replace("/".preg_quote(get_ou('systemIncomingRDN'), '/')."/i","",dn2base($this->dn));
+ if(preg_match("/".preg_quote(get_ou("workgeneric", "workstationRDN") , '/')."/i",$this->dn)){
+ $this->base= preg_replace("/".preg_quote(get_ou("workgeneric", "workstationRDN") , '/')."/i","",dn2base($this->dn));
}else{
- $this->base= preg_replace("/".preg_quote(get_ou('printerRDN'), '/')."/i","",dn2base($this->dn));
+ $this->base= preg_replace("/".preg_quote(get_ou("workgeneric", "workstationRDN") , '/')."/i","",dn2base($this->dn));
}
if(!isset($this->config->idepartments[$this->base])){
}
$this->orig_cn = $this->cn;
$this->orig_base = $this->base;
+
+ /* Instanciate base selector */
+ $this->baseSelector= new baseSelector($this->get_allowed_bases(), $this->base);
+ $this->baseSelector->setSubmitButton(false);
+ $this->baseSelector->setHeight(300);
+ $this->baseSelector->update(true);
}
function set_acl_base($base)
/* Update dn, to ensure storing as printer instead of WS / terminal
*/
if(preg_match("/terminal/i",$this->BelongsTo)){
- $this->dn= preg_replace("/".preg_quote(get_ou('terminalRDN'), '/')."/i",get_ou('printerRDN'),$this->dn);
+ $this->dn= preg_replace("/".preg_quote(get_ou("workgeneric", "workstationRDN") , '/')."/i",get_ou("workgeneric", "workstationRDN") ,$this->dn);
}
if(preg_match("/workstation/i",$this->BelongsTo)){
- $this->dn= preg_replace("/".preg_quote(get_ou('workstationRDN'), '/')."/i",get_ou('printerRDN'),$this->dn);
+ $this->dn= preg_replace("/".preg_quote(get_ou("workgeneric", "workstationRDN") , '/')."/i",get_ou("workgeneric", "workstationRDN") ,$this->dn);
}
/* Detect if this is a valid printer account;
$smarty= get_smarty();
+
/* Assign acls */
$tmp = $this->plInfo();
foreach($tmp['plProvidedAcls'] as $name => $translation){
}
}
- /* Base select dialog */
- $once = true;
- foreach($_POST as $name => $value){
- if(preg_match("/^chooseBase/",$name) && $once && $this->acl_is_moveable()){
- $once = false;
- $this->dialog = new baseSelectDialog($this->config,$this,$this->get_allowed_bases());
- $this->dialog->setCurrentBase($this->base);
- $this->baseSelection = true;
- }
- }
-
- /* Dialog handling for base select dialog
- * Check if base was selected, dialog aborted etc */
- if(is_object($this->dialog)){
-
- $this->dialog->save_object();
- if($this->baseSelection){
- if($this->dialog->isClosed()){
- $this->dialog = false;
- $this->baseSelection = false;
- }elseif($this->dialog->isSelected()){
-
- /* A new base was selected, check if it is a valid one */
- $tmp = $this->get_allowed_bases();
- if(isset($tmp[$this->dialog->isSelected()])){
- $this->base = $this->dialog->isSelected();
- }
-
- $this->dialog= false;
- $this->baseSelection = false;
- }else{
- return($this->dialog->execute());
- }
- }
- }
-
- /* Fill templating stuff */
- $smarty->assign("bases", $this->get_allowed_bases());
- $smarty->assign("base_select", $this->base);
-
/* Assign attributes */
foreach ($this->attributes as $attr){
$smarty->assign("$attr", $this->$attr);
}
+ $smarty->assign("base", $this->baseSelector->render());
+
+ // Act on add user/grouo requests
if(isset($_POST['AddUser'])){
- $this->dialog = new selectUserToPrinterDialog($this->config, NULL,"AddUser",$this->member);
- }
- if(isset($_POST['AddGroup'])){
- $this->dialog = new selectUserToPrinterDialog($this->config, NULL,"AddGroup",$this->member);
+ $this->userSelect = new userGroupSelect($this->config, get_userinfo());
+ $this->dialog = TRUE;
}
if(isset($_POST['AddAdminUser'])){
- $this->dialog = new selectUserToPrinterDialog($this->config, NULL,"AddAdminUser",$this->member);
- }
- if(isset($_POST['AddAdminGroup'])){
- $this->dialog = new selectUserToPrinterDialog($this->config, NULL,"AddAdminGroup",$this->member);
+ $this->adminUserSelect = new userGroupSelect($this->config, get_userinfo());
+ $this->dialog = TRUE;
}
/* Display ppd configure/select dialog */
}
}
- /* Abort user / group adding dialog */
- if(isset($_POST['PrinterCancel'])){
- unset($this->dialog);
- $this->dialog= FALSE;
+ // Abort user / group adding dialog
+ if(isset($_POST['userGroupSelect_cancel'])){
+ $this->dialog=FALSE;
+ $this->userSelect = NULL;
+ $this->adminUserSelect = NULL;
+ }
+
+ // Save selected users / groups
+ if(isset($_POST['userGroupSelect_save'])){
+ $users = array();
+ if($this->userSelect instanceOf userGroupSelect){
+ $users = $this->userSelect->save();
+ $add = '';
+ }elseif($this->adminUserSelect instanceOf userGroupSelect){
+ $users = $this->adminUserSelect->save();
+ $add = 'Admin';
+ }
+ foreach($users as $user){
+ if(in_array('gosaAccount', $user['objectClass'])){
+ $type = 'Add'.$add.'User';
+ }else{
+ $type = 'Add'.$add.'Group';
+ }
+ $this->AddMember($type, $user['dn']);
+ }
+ $this->dialog=FALSE;
+ $this->userSelect = NULL;
+ $this->adminUserSelect = NULL;
}
- /* Save selected users / groups */
- if(isset($_POST['PrinterSave'])){
- $this->dialog->save_object();
- if(count($this->dialog->check())){
- foreach($this->dialog->check() as $msg){
- msg_dialog::display(_("Error"), $msg, ERROR_DIALOG);
- }
- }else{
- $data= $new = $this->dialog->save();
- unset($data['type']);
- foreach($data as $mem){
- $this->AddMember($new['type'], $mem['dn']);
+ // Display add user/group dialogs
+ if($this->userSelect instanceOf userGroupSelect || $this->adminUserSelect instanceOf userGroupSelect){
+
+ // Build up blocklist
+ $used = array();
+ foreach($this->member as $type => $members){
+ foreach($members as $member){
+ $used['dn'][] = $member['dn'];
}
- unset($this->dialog);
- $this->dialog=FALSE;
+ }
+ session::set('filterBlacklist', $used);
+ if($this->userSelect instanceOf userGroupSelect){
+ return($this->userSelect->execute());
+ }elseif($this->adminUserSelect instanceOf userGroupSelect){
+ return($this->adminUserSelect->execute());
}
}
+
/* Display dialog, if there is currently one open*/
if(is_object($this->dialog)){
$this->dialog->save_object();
/* Parse selected ppd file */
$config = session::get('config');
- if ($config->get_cfg_value("ppdPath") != ""){
- $path = $config->get_cfg_value("ppdPath");
+ if ($config->get_cfg_value("core","ppdPath") != ""){
+ $path = $config->get_cfg_value("core","ppdPath");
if(!preg_match("/\/$/",$path)){
$path = $path."/";
}
/* Update dn, to ensure storing as printer instead of WS / terminal
*/
if(preg_match("/terminal/i",$this->BelongsTo)){
- $this->dn= preg_replace("/".preg_quote(get_ou('terminalRDN'), '/').",/i",get_ou('printerRDN'),$this->dn);
+ $this->dn= preg_replace("/".preg_quote(get_ou("workgeneric", "workstationRDN") , '/').",/i",get_ou("workgeneric", "workstationRDN") ,$this->dn);
}
if(preg_match("/workstation/i",$this->BelongsTo)){
- $this->dn= preg_replace("/".preg_quote(get_ou('workstationRDN'), '/')."/i",get_ou('printerRDN'),$this->dn);
+ $this->dn= preg_replace("/".preg_quote(get_ou("workgeneric", "workstationRDN") , '/')."/i",get_ou("workgeneric", "workstationRDN") ,$this->dn);
}
/* Check if this dn points to a printer, to avoid deleting something else */
$this->netConfigDNS->save_object();
}
- /* Set new base if allowed */
- $tmp = $this->get_allowed_bases();
- if(isset($_POST['base'])){
- if(isset($tmp[$_POST['base']])){
- $this->base= $_POST['base'];
+ /* Refresh base */
+ if ($this->acl_is_moveable($this->base)){
+ if (!$this->baseSelector->update()) {
+ msg_dialog::display(_("Error"), msgPool::permMove(), ERROR_DIALOG);
+ }
+ if ($this->base != $this->baseSelector->getBase()) {
+ $this->base= $this->baseSelector->getBase();
+ $this->is_modified= TRUE;
}
}
+
}
/* Check supplied data */
}
}
- $dn= "cn=".$this->cn.get_ou('printerRDN').",".$this->base;
+ $dn= "cn=".$this->cn.get_ou("workgeneric", "workstationRDN") .",".$this->base;
/* must: cn */
if(($this->BelongsTo == "Printer") && $this->cn == ""){
$message[]= msgPool::required(_("Name"));
}
+ // Check if a wrong base was supplied
+ if(!$this->baseSelector->checkLastBaseUpdate()){
+ $message[]= msgPool::check_base();
+ }
+
/* must: cn */
if(($this->BelongsTo == "Printer") && !tests::is_dns_name($this->cn)){
$message[]= msgPool::invalid(_("Name"));
if (($this->orig_dn != $dn)&&( preg_match("/printer/i",$this->BelongsTo))){
$ldap= $this->config->get_ldap_link();
$ldap->cd ($this->base);
- $ldap->ls("(cn=".$this->cn.")",get_ou('printerRDN').$this->base, array("cn"));
+ $ldap->ls("(cn=".$this->cn.")",get_ou("workgeneric", "workstationRDN") .$this->base, array("cn"));
if ($ldap->count() != 0){
while ($attrs= $ldap->fetch()){
if(preg_match("/cn=dhcp,/",$attrs['dn'])){
/* Update dn, to ensure storing as printer instead of WS / terminal
*/
if(preg_match("/terminal/i",$this->BelongsTo)){
- $this->dn= preg_replace("/".preg_quote(get_ou('terminalRDN'), '/')."/i",get_ou('printerRDN'),$this->dn);
+ $this->dn= preg_replace("/".preg_quote(get_ou("workgeneric", "workstationRDN") , '/')."/i",get_ou("workgeneric", "workstationRDN") ,$this->dn);
}
if(preg_match("/workstation/i",$this->BelongsTo)){
- $this->dn= preg_replace("/".preg_quote(get_ou('workstationRDN'), '/')."/i",get_ou('printerRDN'),$this->dn);
+ $this->dn= preg_replace("/".preg_quote(get_ou("workgeneric", "workstationRDN") , '/')."/i",get_ou("workgeneric", "workstationRDN") ,$this->dn);
}
if(!$this->is_account) return;
/* Rename the generated ppd to match the gzip ending '.gz', if necessary.
*/
- $path = $this->config->get_cfg_value("ppdPath");
+ $path = $this->config->get_cfg_value("core","ppdPath");
if(!preg_match("/\/$/",$path)){
$path = $path."/";
}
}
/* Ensure to create a new object */
- if(preg_match("/".preg_quote(get_ou('systemIncomingRDN'), '/')."/i",$this->orig_dn)){
+ if(preg_match("/".preg_quote(get_ou("workgeneric", "workstationRDN") , '/')."/i",$this->orig_dn)){
$this->orig_dn = "new";
}
"plSection" => array("administration"),
"plCategory" => array("printer" => array("description" => _("Printer"),
"objectClass" => "gotoPrinter"),"workstation","terminal"),
+ "plProperties" =>
+ array(
+ array(
+ "name" => "printerRDN",
+ "type" => "rdn",
+ "default" => "ou=printers,ou=systems,",
+ "description" => "The 'printerRDN' statement defines the location where new printers will be created. The default is 'ou=printers,ou=systems,'.",
+ "check" => "gosaProperty::isRdn",
+ "migrate" => "",
+ "group" => "plugin",
+ "mandatory" => FALSE
+ )
+ ),
+
"plProvidedAcls"=> array(
"cn" => _("Name"),
"base" => _("Base") ,
"description" => _("Description"),
"l" => _("Location"),
"labeledURI" => _("LabeledURL"),
+ "macAddress" => _("Mac address"),
"gotoPrinterPPD" => _("Printer PPD"),
"gotoUserPrinter" => _("Permissions"))
));
$this->gotoPrinterPPD = "";
}
+
+
+ function is_modal_dialog()
+ {
+ return((isset($this->dialog) && $this->dialog) || (isset($this->netConfigDNS->dialog) && $this->netConfigDNS->dialog));
+ }
+
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: