X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=gosa-plugins%2Fgoto%2Fadmin%2Fsystems%2Fgoto%2Fclass_printGeneric.inc;h=39746e916a0c643fb1a7a57da9a91d2ce7a065f1;hb=f09bbee3265916598df06229de8ba974d062f39a;hp=9eec1acaf323d9ca82040d16ff8b31c992dd7c84;hpb=a58a64a5ddcf918a3f5e3411e372d7d5d11a6a97;p=gosa.git diff --git a/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc index 9eec1acaf..39746e916 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc @@ -2,11 +2,6 @@ class printgeneric extends plugin { - /* CLI vars */ - var $cli_summary = "Manage terminal base objects"; - var $cli_description = "Some longer text\nfor help"; - var $cli_parameters = array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser"); - /* Generic terminal attributes */ var $interfaces = array(); var $ignore_account = FALSE; @@ -20,6 +15,8 @@ class printgeneric extends plugin var $gotoPrinterPPD = ""; var $initial_PPD = ""; var $orig_dn = ""; + var $orig_cn = ""; + var $orig_base = ""; var $UserMember =""; var $UserMembers =array(); @@ -29,6 +26,8 @@ class printgeneric extends plugin var $AdminMembers =array(); var $AdminMemberKeys =array(); + var $ppdServerPart = ""; + var $PPDdialogToSave = NULL; var $BelongsTo = "unknown"; // Specifies if this is a standalone printer, or belongs to a terminal / WS @@ -42,14 +41,20 @@ class printgeneric extends plugin var $gotoGroupAdminPrinter ; var $gotoGroupPrinter; var $gotoUserPrinter ; + var $baseSelector; /* attribute list for save action */ var $attributes = array("cn", "description", "l", "labeledURI", "gotoPrinterPPD","gotoUserPrinter", "macAddress", - "gotoUserAdminPrinter","gotoGroupAdminPrinter","gotoUserPrinter","gotoGroupPrinter"); + "gotoUserAdminPrinter","gotoGroupAdminPrinter","gotoUserPrinter","gotoGroupPrinter","gosaUnitTag"); var $objectclasses = array("top", "gotoPrinter"); var $view_logged = FALSE; var $parent; + + // Memeber dialog object + var $userSelect; + var $adminUserSelect; + function printgeneric (&$config, $dn,$parent_init,$parent) { $this->config = &$config; @@ -66,11 +71,11 @@ class printgeneric extends plugin /* 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("/".normalizePreg(get_ou('terminalou'))."/",get_ou('printerou'),$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("/".normalizePreg(get_ou('workstationou'))."/",get_ou('printerou'),$this->dn); + $this->dn= preg_replace("/".preg_quote(get_ou("workgeneric", "workstationRDN") , '/')."/i",get_ou("workgeneric", "workstationRDN") ,$this->dn); } $this->orig_dn = $this->dn; @@ -94,23 +99,45 @@ class printgeneric extends plugin /* 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("/".normalizePreg(get_ou('incomingou'))."/",$this->dn)){ - $this->base= preg_replace("/".normalizePreg(get_ou('incomingou'))."/","",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("/".normalizePreg(get_ou('printerou'))."/","",dn2base($this->dn)); + $this->base= preg_replace("/".preg_quote(get_ou("workgeneric", "workstationRDN") , '/')."/i","",dn2base($this->dn)); } if(!isset($this->config->idepartments[$this->base])){ - print_red(_("Can't extract a valid base out of object dn, setting base to '%s'."),session::get('CurrentMainBase')); + msg_dialog::display(_("Internal error"), sprintf(_("Cannot determine a valid department for this object. Setting base to '%s'!"), session::get('CurrentMainBase')) , WARNING_DIALOG); $this->base = session::get('CurrentMainBase'); } } + /* If no ppd is selected, remove this attribute */ + if(!empty($this->gotoPrinterPPD) && $this->initially_was_account) { + $this->ppdServerPart = preg_replace("/^(http.*ppd)\/.*$/i","\\1",$this->gotoPrinterPPD); + }else{ + + /* Detect PPD server part */ + if(preg_match("/https/i",$_SERVER['HTTP_REFERER'])){ + $method="https://"; + }else{ + $method="http://"; + } + + /* Get servername */ + $server = $_SERVER['SERVER_NAME']; + if(tests::is_ip($server)){ + $server_name = @gethostbyaddr($server); + }else{ + $server_name = @gethostbyaddr(gethostbyname($server)); + } + $this->ppdServerPart = $method.str_replace("//","/",$server_name."/ppd"); + } + /* Extract selected ppd */ if(isset($this->gotoPrinterPPD)){ $this->gotoPrinterPPD = preg_replace("/^http.*ppd\//i","",$this->gotoPrinterPPD); @@ -127,14 +154,13 @@ class printgeneric extends plugin /* $this->members contains all members */ $this->member[$type]=array(); - if (isset($this->attrs[$attr]['count'])) { - unset($this->attrs[$attr]['count']); - } - if(isset($this->attrs[$attr])){ - foreach($this->attrs[$attr] as $mem){ + $ldap->cd($this->config->current['BASE']) ; + for($i = 0 ; $i < $this->attrs[$attr]['count']; $i++){ + + $mem = $this->attrs[$attr][$i]; if(preg_match("/Group/",$type)){ - $ldap->search("(&(objectClass=posixGroup)(cn=".$mem."))",array("cn","description")); + $ldap->search("(&(|(objectClass=posixGroup)(objectClass=gosaGroupOfNames))(cn=".$mem."))",array("cn","description")); if($ldap->count()){ $entry = $ldap->fetch(); $this->member[$type][$entry['cn'][0]]=$entry; @@ -149,6 +175,14 @@ class printgeneric extends plugin } } } + $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) @@ -222,11 +256,11 @@ class printgeneric extends plugin /* Update dn, to ensure storing as printer instead of WS / terminal */ if(preg_match("/terminal/i",$this->BelongsTo)){ - $this->dn= preg_replace("/".normalizePreg(get_ou('terminalou'))."/",get_ou('printerou'),$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("/".normalizePreg(get_ou('workstationou'))."/",get_ou('printerou'),$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; @@ -256,7 +290,6 @@ class printgeneric extends plugin new log("view","printer/".get_class($this),$this->dn); } - /* If type of printer couldn't be detected (because of missing parent object in construction) * hide this tab. */ @@ -289,6 +322,7 @@ class printgeneric extends plugin $smarty= get_smarty(); + /* Assign acls */ $tmp = $this->plInfo(); foreach($tmp['plProvidedAcls'] as $name => $translation){ @@ -315,16 +349,16 @@ class printgeneric extends plugin /* Do we represent a valid printer? */ if (!$this->is_account && $this->parent === NULL){ - $display= "\"\" ". - _("This 'dn' has no printer features.").""; + $display= "\"\" ". + msgPool::noValidExtension(_("printer")).""; return($display); } /* If this is a WS / Terminal depending printer, display account state button */ if(!preg_match("/^Printer$/i",$this->BelongsTo)){ - if((empty($this->cn)) && ($this->dn != "new")){ + if($this->cn == "" && ($this->dn != "new")){ $display= $this->show_enable_header(_("Add printer extension"), - _("This object has printer extension disabled. You can't enable it while 'cn' is not present in entry. Possibly you are currently creating a new terminal template"),TRUE,TRUE); + msgPool::featuresDisabled(_("printer"))._("You can't enable it while 'cn' is not present in entry. Possibly you are currently creating a new terminal template."),TRUE,TRUE); $this->is_account= false; return $display; } @@ -332,79 +366,38 @@ class printgeneric extends plugin if (($this->is_account)){ if(preg_match("/^Workstation$/i",$this->BelongsTo)){ $display= $this->show_disable_header(_("Remove printer extension"), - _("This workstation has printer extension enabled.You can disable it by clicking below.")); + msgPool::featuresEnabled(_("printer"))); }elseif(preg_match("/^Terminal$/i",$this->BelongsTo)){ $display= $this->show_disable_header(_("Remove printer extension"), - _("This terminal has printer extension enabled. You can disable it by clicking below.")); + msgPool::featuresDisabled(_("printer"))); } }else{ if(preg_match("/^Workstation$/i",$this->BelongsTo)){ - $display= $this->show_disable_header(_("Add printer extension"), - _("This workstation has printer extension disabled. You can enable it by clicking below.")); + $display= $this->show_enable_header(_("Add printer extension"), + msgPool::featuresEnabled(_("printer"))); }elseif(preg_match("/^Terminal$/i",$this->BelongsTo)){ $display= $this->show_enable_header(_("Add printer extension"), - _("This terminal has printer extension disabled. You can enable it by clicking below.")); + msgPool::featuresDisabled(_("printer"))); } return ($display); } } - /* 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"); - } - if(isset($_POST['AddGroup'])){ - $this->dialog = new selectUserToPrinterDialog($this->config, NULL,"AddGroup"); + $this->userSelect = new userGroupSelect($this->config, get_userinfo()); + $this->dialog = TRUE; } if(isset($_POST['AddAdminUser'])){ - $this->dialog = new selectUserToPrinterDialog($this->config, NULL,"AddAdminUser"); - } - if(isset($_POST['AddAdminGroup'])){ - $this->dialog = new selectUserToPrinterDialog($this->config, NULL,"AddAdminGroup"); + $this->adminUserSelect = new userGroupSelect($this->config, get_userinfo()); + $this->dialog = TRUE; } /* Display ppd configure/select dialog */ @@ -412,13 +405,43 @@ class printgeneric extends plugin if($this->PPDdialogToSave && is_object($this->PPDdialogToSave)){ $this->dialog = $this->PPDdialogToSave; }else{ - $this->dialog = new printerPPDDialog($this->config, $this->dn,$this->gotoPrinterPPD); + + if(is_array($this->gotoPrinterPPD)){ + $this->dialog = new printerPPDDialog($this->config, $this->dn,""); + }else{ + $this->dialog = new printerPPDDialog($this->config, $this->dn,$this->gotoPrinterPPD); + } $this->dialog->cn= $this->cn; } + + // Detect edit acl base + $ldap = $this->config->get_ldap_link(); + if($ldap->dn_exists($this->dn)){ + $acl_base = $this->dn; + }else{ + $acl_base = $this->base; + } + + $this->dialog->set_acl_base($acl_base); } /* remove ppd */ if(isset($_POST['RemoveDriver'])){ + /* Detect PPD server part */ + if(preg_match("/https/i",$_SERVER['HTTP_REFERER'])){ + $method="https://"; + }else{ + $method="http://"; + } + + /* Get servername */ + $server = $_SERVER['SERVER_NAME']; + if(tests::is_ip($server)){ + $server_name = @gethostbyaddr($server); + }else{ + $server_name = @gethostbyaddr(gethostbyname($server)); + } + $this->ppdServerPart = $method.str_replace("//","/",$server_name."/ppd"); $this->gotoPrinterPPD = array(); $this->PPDdialogToSave = NULL; } @@ -434,7 +457,7 @@ class printgeneric extends plugin $this->dialog->save_object(); if(count($this->dialog->check())){ foreach($this->dialog->check() as $msg){ - print_red($msg); + msg_dialog::display(_("Error"), $msg, ERROR_DIALOG); } }else{ $this->gotoPrinterPPD = array(); @@ -470,30 +493,55 @@ class printgeneric extends plugin } } - /* 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){ - print_red($msg); - } - }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(); @@ -503,26 +551,31 @@ class printgeneric extends plugin /* Parse selected ppd file */ $config = session::get('config'); - if((isset($config->data['MAIN']['PPD_PATH']))&&(is_dir($config->data['MAIN']['PPD_PATH']))){ - - $path = $config->data['MAIN']['PPD_PATH']; + if ($config->get_cfg_value("core","ppdPath") != ""){ + $path = $config->get_cfg_value("core","ppdPath"); if(!preg_match("/\/$/",$path)){ $path = $path."/"; } $ppdManager= new ppdManager($path); + $smarty->assign("displayServerPath",true); if(!empty($this->gotoPrinterPPD)){ if((!file_exists($path.$this->gotoPrinterPPD))){ $smarty->assign("driverInfo", "".sprintf(_("Your currently selected PPD file '%s' doesn't exist."),$path.$this->gotoPrinterPPD).""); }else{ - $smarty->assign("driverInfo", $ppdManager->loadDescription($path.$this->gotoPrinterPPD)); + $ppdDesc = $ppdManager->loadDescription($path.$this->gotoPrinterPPD); + $smarty->assign("driverInfo", $ppdDesc['name']); } }else{ $smarty->assign("driverInfo", _("Not defined")); + $smarty->assign("displayServerPath",false); } }else{ $smarty->assign("driverInfo",_("Can't get ppd informations.")); + $smarty->assign("displayServerPath",true); } + $smarty->assign("ppdServerPart",$this->ppdServerPart); + /* Create user & admin user list */ $list=$this->generateList(); @@ -534,9 +587,9 @@ class printgeneric extends plugin if(!preg_match("/Printer/i",$this->BelongsTo)){ if(preg_match("/Terminal/i",$this->BelongsTo)){ - $smarty->assign("desc" ,sprintf(_("This printer belongs to terminal %s. You can't rename this printer."),"".$this->cn."")); + $smarty->assign("desc" ,sprintf(_("This printer belongs to %s. You can't rename this printer."),_("terminal"),"".$this->cn."")); }else{ - $smarty->assign("desc" ,sprintf(_("This printer belongs to workstation %s. You can't rename this printer."),"".$this->cn."")); + $smarty->assign("desc" ,sprintf(_("This printer belongs to %s. You can't rename this printer."),_("workstation"),"".$this->cn."")); } $smarty->assign("cnACL" , $this->getacl("cn",true)); }else{ @@ -561,7 +614,7 @@ class printgeneric extends plugin $smarty->assign("netconfig", ""); } - return($display.$smarty->fetch (get_template_path('printer.tpl', TRUE))); + return($display.$smarty->fetch (get_template_path('printer.tpl', TRUE, dirname(__FILE__)))); } function remove_from_parent() @@ -572,25 +625,25 @@ class printgeneric extends plugin /* Update dn, to ensure storing as printer instead of WS / terminal */ if(preg_match("/terminal/i",$this->BelongsTo)){ - $this->dn= preg_replace("/".normalizePreg(get_ou('terminalou')).",/",get_ou('printerou'),$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("/".normalizePreg(get_ou('workstationou'))."/",get_ou('printerou'),$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 */ $ldap= $this->config->get_ldap_link(); $ldap->cat($this->dn, array('dn',"objectClass")); if(!$ldap->count()){ - print_red("Trying to remove printer object which isn't a printer. Aborted to avoid data loss."); + msg_dialog::display(_("Error"), _("Object is no printer!"), ERROR_DIALOG); return; } /* Check if obejct is a printer */ $CheckPrinter = $ldap->fetch(); if(!in_array("gotoPrinter",$CheckPrinter['objectClass'])){ - print_red("Trying to remove printer object which isn't a printer. Aborted to avoid data loss."); + msg_dialog::display(_("Error"), _("Object is no printer!"), ERROR_DIALOG); return; } @@ -600,7 +653,9 @@ class printgeneric extends plugin new log("remove","printer/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error()); - show_ldap_error($ldap->get_error(), sprintf(_("Removing of system print/generic with dn '%s' failed."),$this->dn)); + if (!$ldap->success()){ + msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, LDAP_DEL, get_class())); + } $this->handle_post_events("remove",array("macAddress" => $this->netConfigDNS->macAddress,"ipHostNumber" => $this->netConfigDNS->ipHostNumber)); /* Delete references to object groups */ @@ -631,17 +686,25 @@ class printgeneric extends plugin plugin::save_object(); $this->base = $base_tmp; + if(isset($_POST['ppdServerPart'])){ + $this->ppdServerPart = get_post('ppdServerPart'); + } + if(is_object($this->netConfigDNS)){ $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 */ @@ -664,41 +727,54 @@ class printgeneric extends plugin } } - $dn= "cn=".$this->cn.get_ou('printerou').",".$this->base; + $dn= "cn=".$this->cn.get_ou("workgeneric", "workstationRDN") .",".$this->base; /* must: cn */ - if(($this->BelongsTo == "Printer") && (empty($this->cn))){ - $message[]= _("The required field 'Printer name' is not set."); + 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[]= _("Invalid character in printer name."); + $message[]= msgPool::invalid(_("Name")); } /* must: labeledURI */ if(empty($this->labeledURI)){ - $message[]= "The required field 'Printer URL' is not set."; + $message[]= msgPool::required(_("Printer URL")); } /* Check if there is already an entry with this cn*/ 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('printerou').$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'])){ continue; } if ($attrs['dn'] != $this->orig_dn){ - $message[]= sprintf (_("There is already an entry '%s' in the base choosen by you"), $this->cn); + $message[]= msgPool::duplicated(_("Name")); break; } } } } + /* Check if we are allowed to create or move this object + */ + if($this->orig_dn == "new" && !$this->acl_is_createable($this->base)){ + $message[] = msgPool::permCreate(); + }elseif($this->orig_dn != "new" && $this->base != $this->orig_base && !$this->acl_is_moveable($this->base)){ + $message[] = msgPool::permMove(); + } + return ($message); } @@ -709,11 +785,11 @@ class printgeneric extends plugin /* Update dn, to ensure storing as printer instead of WS / terminal */ if(preg_match("/terminal/i",$this->BelongsTo)){ - $this->dn= preg_replace("/".normalizePreg(get_ou('terminalou')).",/",get_ou('printerou'),$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("/".normalizePreg(get_ou('workstationou'))."/",get_ou('printerou'),$this->dn); + $this->dn= preg_replace("/".preg_quote(get_ou("workgeneric", "workstationRDN") , '/')."/i",get_ou("workgeneric", "workstationRDN") ,$this->dn); } if(!$this->is_account) return; @@ -721,10 +797,19 @@ class printgeneric extends plugin if($this->parent->by_object['workgeneric']->cn == "wdefault"){ return; } + + /* Adapt IP & mac from parent object */ + $this->netConfigDNS->ipHostNumber = $this->parent->by_object['workgeneric']->netConfigDNS->ipHostNumber; + $this->netConfigDNS->macAddress = $this->parent->by_object['workgeneric']->netConfigDNS->macAddress; + }elseif(isset($this->parent->by_object['termgeneric'])){ if($this->parent->by_object['termgeneric']->cn == "default"){ return; } + + /* Adapt IP & mac from parent object */ + $this->netConfigDNS->ipHostNumber = $this->parent->by_object['termgeneric']->netConfigDNS->ipHostNumber; + $this->netConfigDNS->macAddress = $this->parent->by_object['termgeneric']->netConfigDNS->macAddress; } /* If type is still unknown, the initialisation of this printer failed, abort. */ @@ -734,45 +819,59 @@ class printgeneric extends plugin /* save ppd configuration */ if($this->PPDdialogToSave && is_object($this->PPDdialogToSave)){ + $this->PPDdialogToSave->save_ppd(); + + /* Rename the generated ppd to match the gzip ending '.gz', if necessary. + */ + $path = $this->config->get_cfg_value("core","ppdPath"); + if(!preg_match("/\/$/",$path)){ + $path = $path."/"; + } + $ppdManager= new ppdManager($path); + if($ppdManager->useGzip && !preg_match('/\.gz$/',$this->gotoPrinterPPD)){ + if(rename($path.$this->gotoPrinterPPD,$path.$this->gotoPrinterPPD.'.gz')){ + $this->gotoPrinterPPD .= '.gz'; + } + }elseif(!$ppdManager->useGzip && preg_match('/\.gz$/',$this->gotoPrinterPPD)){ + $new_ppd = preg_replace('/\.gz$/','',$this->gotoPrinterPPD); + if(rename($path.$this->gotoPrinterPPD,$path.$new_ppd)){ + $this->gotoPrinterPPD = $new_ppd; + } + } } - if($this->orig_dn != $this->dn){ + if($this->orig_dn != $this->dn && $this->orig_dn != "new"){ if(!empty($this->gotoPrinterPPD)) { $this->PPDdialogToSave = new printerPPDDialog($this->config, $this->dn,$this->gotoPrinterPPD); $this->PPDdialogToSave->cn = $this->cn; $this->PPDdialogToSave->generateProperties(); - $this->PPDdialogToSave->update_ppd_url(); + $this->gotoPrinterPPD = $this->PPDdialogToSave->update_ppd_url(); } } /* Remove previously selected ppd file.*/ - if($this->initial_PPD != $this->gotoPrinterPPD){ + if($this->initial_PPD != $this->gotoPrinterPPD && $this->initially_was_account){ if(!empty($this->initial_PPD)){ $tmp = new printerPPDDialog($this->config, $this->dn,$this->initial_PPD); $tmp->removeModifiedPPD(); } } - if(preg_match("/https/i",$_SERVER['HTTP_REFERER'])){ - $method="https://"; - }else{ - $method="http://"; - } - /* If no ppd is selected, remove this attribute */ if(!empty($this->gotoPrinterPPD)) { - $this->gotoPrinterPPD = $method.str_replace("//","/",$_SERVER['SERVER_NAME']."/ppd/".$this->gotoPrinterPPD); + $this->gotoPrinterPPD = $this->ppdServerPart.'/'.$this->gotoPrinterPPD; }else{ $this->gotoPrinterPPD = array(); } $dn= $this->dn; - plugin::save(); - $ldap= $this->config->get_ldap_link(); /* reduce objectClasses to minimun */ $this->attrs['objectClass']= $this->objectclasses; + plugin::save(); + $ldap= $this->config->get_ldap_link(); + /* Remove all empty values */ if ($this->orig_dn == 'new'){ $attrs= array(); @@ -819,14 +918,10 @@ class printgeneric extends plugin unset($this->attrs[$checkVar]); } } - }else{ - if(($this->gosaUnitTag) && (!in_array_ics("gosaAdministrativeUnitTag",$this->attrs['objectClass']))){ - $this->attrs['objectClass'][] = "gosaAdministrativeUnitTag"; - } } /* Ensure to create a new object */ - if(preg_match("/".normalizePreg(get_ou('incomingou'))."/",$this->orig_dn)){ + if(preg_match("/".preg_quote(get_ou("workgeneric", "workstationRDN") , '/')."/i",$this->orig_dn)){ $this->orig_dn = "new"; } @@ -860,13 +955,15 @@ class printgeneric extends plugin $this->handle_post_events("modify",array("macAddress" => $this->netConfigDNS->macAddress,"ipHostNumber" => $this->netConfigDNS->ipHostNumber)); new log("modify","printer/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error()); } - show_ldap_error($ldap->get_error(), sprintf(_("Saving of system print/generic with dn '%s' failed."),$this->dn)); + if (!$ldap->success()){ + msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, 0, get_class())); + } - if(preg_match("/printer/i",$this->BelongsTo)){ + #if(preg_match("/printer/i",$this->BelongsTo)){ $this->netConfigDNS->cn = $this->cn; $this->netConfigDNS->dn = $this->dn; $this->netConfigDNS->save(); - } + #} } function generateList(){ @@ -902,12 +999,27 @@ class printgeneric extends plugin "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")) )); @@ -925,7 +1037,7 @@ class printgeneric extends plugin } if(!$this->acl_is_writeable("gotoUserPrinter")){ - print_red(sprintf(_("You are not allowed to remove the given object '%s' from the list of members of printer '%s'."),$id,$this->dn)); + msg_dialog::display(_("Permission error"), msgPool::permDelete(_("printer user"), $id), INFO_DIALOG); return(FALSE); } @@ -942,12 +1054,12 @@ class printgeneric extends plugin { $types = array("AddUser","AddGroup","AddAdminUser","AddAdminGroup"); if(!in_array_ics($type, $types)){ - print_red(sprintf(_("Illegal printer type while adding '%s' to the list of '%s' printers,"),$dn,$type)); + msg_dialog::display(_("Internal error"), sprintf(_("Illegal member type '%s'!"), $type), ERROR_DIALOG); return(FALSE); } if(!$this->acl_is_writeable("gotoUserPrinter")){ - print_red(sprintf(_("You are not allowed to add the given object '%s' to the list of members of '%s'."),$dn,$this->dn)); + msg_dialog::display(_("Permission error"), msgPool::permModify(_("printer user"), $this->dn), INFO_DIALOG); return(FALSE); } @@ -982,7 +1094,7 @@ class printgeneric extends plugin } if(isset( $this->member[$ctype][$name])){ - print_red(sprintf(_("Can't add '%s' to the list of members, it is already used."),$attrs[$var][0])); + msg_dialog::display(_("Error"), sprintf(_("'%s' is already used!"), $attrs[$var][0]), ERROR_DIALOG); return(FALSE); } } @@ -993,7 +1105,7 @@ class printgeneric extends plugin print_a($attrs); } }else{ - print_red(sprintf(_("Can't add '%s' to list of members, it is not reachable."),$dn)); + msg_dialog::display(_("Error"), sprintf(_("'%s' does not exist!"), $dn), ERROR_DIALOG); return(FALSE); } return(TRUE); @@ -1040,6 +1152,13 @@ class printgeneric extends plugin $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: