X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_printGeneric.inc;h=9cccd381a2afd013918ff2dcada07f989a971ad6;hb=78fd52f682986d25fb95c171757d58384f7f58f8;hp=8d4d00a8769602bfa516200ec27ac9042ff34019;hpb=ac742045742ba2124f58994386c3e1a6e0e00394;p=gosa.git diff --git a/plugins/admin/systems/class_printGeneric.inc b/plugins/admin/systems/class_printGeneric.inc index 8d4d00a87..9cccd381a 100644 --- a/plugins/admin/systems/class_printGeneric.inc +++ b/plugins/admin/systems/class_printGeneric.inc @@ -28,7 +28,6 @@ class printgeneric extends plugin var $AdminMembers =array(); var $AdminMemberKeys =array(); - var $gotoUserPrinter ; var $PPDdialogToSave = NULL; var $BelongsTo = "unknown"; // Specifies if this is a standalone printer, or belongs to a terminal / WS @@ -41,9 +40,15 @@ class printgeneric extends plugin var $macAddress = ""; /* attribute list for save action */ - var $attributes = array("cn", "description", "l", "labeledURI", "gotoPrinterPPD","gotoUserPrinter", "macAddress"); + var $attributes = array("cn", "description", "l", "labeledURI", "gotoPrinterPPD","gotoUserPrinter", "macAddress", + "gotoUserAdminPrinter","gotoGroupAdminPrinter","gotoUserPrinter","gotoGroupPrinter"); var $objectclasses = array("top", "gotoPrinter"); + var $gotoUserAdminPrinter; + var $gotoGroupAdminPrinter ; + var $gotoGroupPrinter; + var $gotoUserPrinter ; + function printgeneric ($config, $dn= NULL,$parent = NULL) { $this->config = $config; @@ -68,6 +73,7 @@ class printgeneric extends plugin } $this->orig_dn = $this->dn; + $ui= get_userinfo(); /* Get printer settings, possibly dn has changed */ plugin::plugin ($config, $this->dn); @@ -87,7 +93,6 @@ class printgeneric extends plugin /* Set base */ if ($this->dn == "new"){ - $ui= get_userinfo(); $this->base= dn2base($ui->dn); $this->cn= ""; } else { @@ -123,17 +128,30 @@ class printgeneric extends plugin unset($this->attrs[$attr]['count']); } + /* Set tag attribute if we've tagging activated */ + $tag= ""; + if ($ui->gosaUnitTag != "" && isset($config->current['STRICT_UNITS']) && + preg_match('/TRUE/i', $config->current['STRICT_UNITS'])){ + $tag= "(gosaUnitTag=".$ui->gosaUnitTag.")"; + } + if(isset($this->attrs[$attr])){ foreach($this->attrs[$attr] as $mem){ if(preg_match("/Group/",$type)){ - $ldap->search("(&(objectClass=posixGroup)(cn=".$mem."))",array("cn","description")); - $entry = $ldap->fetch(); - $this->member[$type][$entry['cn'][0]]=$entry; + $ldap->search("(&(objectClass=posixGroup)$tag(cn=".$mem."))",array("cn","description")); + if($ldap->count()){ + $entry = $ldap->fetch(); + if(isset($entry['cn'])){ + $this->member[$type][$entry['cn'][0]]=$entry; + } + } }else{ - $ldap->search("(&(objectClass=person)(objectClass=inetOrgPerson)(uid=".$mem."))",array("cn","uid")); - $entry = $ldap->fetch(); - if(isset($entry['uid'])){ - $this->member[$type][$entry['uid'][0]]=$entry; + $ldap->search("(&(objectClass=person)$tag(objectClass=inetOrgPerson)(uid=".$mem."))",array("cn","uid")); + if($ldap->count()){ + $entry = $ldap->fetch(); + if(isset($entry['uid'])){ + $this->member[$type][$entry['uid'][0]]=$entry; + } } } } @@ -401,26 +419,26 @@ class printgeneric extends plugin /* Member management, delete user / group / admin ..*/ if((isset($_POST['DelUser']))&&(isset($_POST['UserMember']))){ - if(isset($this->member['AddUser'][$_POST['UserMember']])){ - unset($this->member['AddUser'][$_POST['UserMember']]); + foreach($_POST['UserMember'] as $mem){ + $this->DelMember('AddUser',$mem); } } if((isset($_POST['DelUser']))&&(isset($_POST['UserMember']))){ - if(isset($this->member['AddGroup'][$_POST['UserMember']])){ - unset($this->member['AddGroup'][$_POST['UserMember']]); + foreach($_POST['UserMember'] as $mem){ + $this->DelMember('AddGroup',$mem); } } if((isset($_POST['DelAdmin']))&&(isset($_POST['AdminMember']))){ - if(isset($this->member['AddAdminUser'][$_POST['AdminMember']])){ - unset($this->member['AddAdminUser'][$_POST['AdminMember']]); + foreach($_POST['AdminMember'] as $mem){ + $this->DelMember('AddAdminUser',$mem); } } if((isset($_POST['DelAdmin']))&&(isset($_POST['AdminMember']))){ - if(isset($this->member['AddAdminGroup'][$_POST['AdminMember']])){ - unset($this->member['AddAdminGroup'][$_POST['AdminMember']]); + foreach($_POST['AdminMember'] as $mem){ + $this->DelMember('AddAdminGroup',$mem); } } @@ -438,18 +456,10 @@ class printgeneric extends plugin print_red($msg); } }else{ - $new = $this->dialog->save(); - $data = $new; + $data= $new = $this->dialog->save(); unset($data['type']); - - if(preg_match("/User/",$new['type'])){ - $use = "uid"; - }else{ - $use = "cn"; - } - - foreach($data as $mem){ - $this->member[$new['type']][$mem[$use][0]]=$mem; + foreach($data as $mem){ + $this->AddMember($new['type'], $mem['dn']); } unset($this->dialog); $this->dialog=NULL; @@ -511,7 +521,11 @@ class printgeneric extends plugin $smarty->assign("AdminMember" ,$this->AdminMember); $smarty->assign("AdminMembers" ,$adminlist); $smarty->assign("AdminMemberKeys",array_flip($adminlist)); - $smarty->assign("netconfig", $this->netConfigDNS->execute()); + if($this->BelongsTo == "Printer"){ + $smarty->assign("netconfig", $this->netConfigDNS->execute()); + } else { + $smarty->assign("netconfig", ""); + } return($display.$smarty->fetch (get_template_path('printer.tpl', TRUE))); } @@ -580,7 +594,9 @@ class printgeneric extends plugin { /* Call common method to give check the hook */ $message= plugin::check(); - $message= array_merge($message, $this->netConfigDNS->check()); + if ($this->BelongsTo == 'printer'){ + $message= array_merge($message, $this->netConfigDNS->check()); + } /* Don't display check messages if this is a template object */ if(isset($this->parent->by_object['workgeneric'])){ @@ -599,6 +615,16 @@ class printgeneric extends plugin if(($this->BelongsTo == "Printer") && (empty($this->cn))){ $message[]= "The required field 'Printer name' is not set."; } + + if($this->BelongsTo == "Printer"){ + $ui= get_userinfo(); + $acl= get_permissions ($dn, $ui->subtreeACL); + $acl= get_module_permission($acl, "printer", $this->dn); + if (chkacl($acl, "create") != ""){ + $message[]= _("You have no permissions to create a printer on this 'Base'."); + } + } + /* must: labeledURI */ if(empty($this->labeledURI)){ @@ -635,6 +661,8 @@ class printgeneric extends plugin if($this->BelongsTo == "Workstation"){ $this->dn= preg_replace("/ou=workstations,/","ou=printers,",$this->dn); + $mac = $this->parent->by_object['workgeneric']->netConfigDNS->macAddress; + $this->netConfigDNS->macAddress = $mac; } if(!$this->is_account) return; @@ -682,32 +710,38 @@ class printgeneric extends plugin }else{ $method="http://"; } - - $this->attrs['gotoPrinterPPD'] = $method.str_replace("//","/",$_SERVER['SERVER_NAME']."/ppd/".$this->gotoPrinterPPD); + + /* Only save ppd path, if the path is not empty (no ppd selected )*/ + if(count($this->gotoPrinterPPD)) { + $this->attrs['gotoPrinterPPD'] = $method.str_replace("//","/",$_SERVER['SERVER_NAME']."/ppd/".$this->gotoPrinterPPD); + }else{ + $this->attrs['gotoPrinterPPD'] = array(); + } /* Append printer user */ - if((isset($this->attrs['gotoUserPrinter'])) && (is_string($this->attrs['gotoUserPrinter']))){ - $this->attrs['gotoUserPrinter']=array(); - } + $this->attrs['gotoUserPrinter']=array(); foreach($this->member['AddUser'] as $mem){ $this->attrs['gotoUserPrinter'][]=$mem['uid'][0]; } /* Append printer group */ + $this->attrs['gotoGroupPrinter'] = array(); foreach($this->member['AddGroup'] as $mem){ $this->attrs['gotoGroupPrinter'][]=$mem['cn'][0]; } /* Append printer admin user */ + $this->attrs['gotoUserAdminPrinter'] =array(); foreach($this->member['AddAdminUser'] as $mem){ $this->attrs['gotoUserAdminPrinter'][]=$mem['uid'][0]; } /* Append printer admin group */ + $this->attrs['gotoGroupAdminPrinter'] = array(); foreach($this->member['AddAdminGroup'] as $mem){ $this->attrs['gotoGroupAdminPrinter'][]=$mem['cn'][0]; } @@ -716,6 +750,14 @@ class printgeneric extends plugin $this->attrs['objectClass'][] = "gosaAdministrativeUnitTag"; } + if($this->orig_dn == 'new'){ + foreach(array("gotoGroupPrinter","gotoUserAdminPrinter","gotoGroupAdminPrinter","gotoUserPrinter") as $checkVar){ + if(count($this->attrs[$checkVar]) == 0 || empty($this->attrs[$checkVar])){ + unset($this->attrs[$checkVar]); + } + } + } + /* Write back to ldap */ $ldap= $this->config->get_ldap_link(); if ($this->orig_dn == 'new'){ @@ -737,12 +779,16 @@ class printgeneric extends plugin } show_ldap_error($ldap->get_error(), _("Saving printer failed")); + $this->netConfigDNS->cn = $this->cn; $this->netConfigDNS->dn = $this->dn; $this->netConfigDNS->save($this->dn); /* Optionally execute a command after we're done */ $this->postcreate(); + + /* This is a multi object. Handle tagging here... */ + $this->handle_object_tagging(); } function generateList(){ @@ -763,9 +809,54 @@ class printgeneric extends plugin } return($a_return); } -} + /* Delete member */ + function DelMember($type,$id) + { + if(isset($this->member[$type][$id])){ + unset($this->member[$type][$id]); + } + } + + /* Add given obejct to members */ + function AddMember($type,$dn) + { + $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)); + return; + } + + /* Get name of index attributes */ + if(preg_match("/user/i",$type)){ + $var = "uid"; + }else{ + $var = "cn"; + } + + $ldap = $this->config->get_ldap_link(); + $ldap->cd($dn); + $ldap->cat($dn,array("cn","uid")); + if($ldap->count()){ + + $attrs = $ldap->fetch(); + $name = $attrs[$var][0]; + + /* Check if this uid/cn is already assigned to any permission */ + foreach($types as $ctype){ + 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])); + return; + } + } + /* Everything is fine. So add the given object to members */ + $this->member[$type][$attrs[$var][0]] = $attrs ; + }else{ + print_red(sprintf(_("Can't add '%s' to list of members, it is not reachable."),$dn)); + } + } +} // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: ?>