diff --git a/plugins/admin/systems/class_printGeneric.inc b/plugins/admin/systems/class_printGeneric.inc
index 51b124383034e151f792c4f8f3d8ada7428008b6..3c2e84c7178611e5962910596dbf2e4e26e71fef 100644 (file)
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
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;
/* set orig dn to new if object is new */
$ldap= $this->config->get_ldap_link();
- $ldap->cat($this->dn);
+ $ldap->cat($this->dn, array('dn'));
if(!$ldap->count()){
$this->orig_dn = "new";
}
} else {
/* Set base and check if the extracted base exists */
- $this->base= preg_replace("/ou=printers,ou=systems,/","",dn2base($this->dn));
+ if(preg_match("/ou=incoming,/",$this->dn)){
+ $this->base= preg_replace("/ou=incoming,/","",dn2base($this->dn));
+ }else{
+ $this->base= preg_replace("/ou=printers,ou=systems,/","",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['CurrentMainBase']);
$this->base = $_SESSION['CurrentMainBase'];
if(preg_match("/Group/",$type)){
$ldap->search("(&(objectClass=posixGroup)(cn=".$mem."))",array("cn","description"));
$entry = $ldap->fetch();
- if(isset($entry['description'])){
- $this->member[$type][$entry['cn'][0]]=$entry;
- }
+ $this->member[$type][$entry['cn'][0]]=$entry;
}else{
$ldap->search("(&(objectClass=person)(objectClass=inetOrgPerson)(uid=".$mem."))",array("cn","uid"));
$entry = $ldap->fetch();
/* Detect if this is a valid printer account;
*/
+ //FIXME: do we need to do this? we've already everything we need in $this->attrs...
$ldap = $this->config->get_ldap_link();
- $ldap->cd($this->config->current['BASE']);
- $ldap->cat($this->dn);
+ $ldap->cat($this->dn, array('objectClass'));
if($ldap->count()){
$attrs = $ldap->fetch();
/* Call parent execute */
plugin::execute();
- /* If type of printer couldn't be detected (because of missing parent object in construcktion)
+ /* If type of printer couldn't be detected (because of missing parent object in construction)
* hide this tab.
*/
if($this->BelongsTo == "unknown"){
$display= $this->show_header(_("Add printer extension"),
- _("Could not intialize printer tab, parameter parent was missing while construcktion."),TRUE,TRUE);
+ _("Could not intialize printer tab, parameter parent was missing while construction."),TRUE,TRUE);
return($display);
}
$smarty->assign("$attr", $this->$attr);
}
+ $smarty->assign("baseACL", chkacl($this->acl,"base"));
+
if(isset($_POST['AddUser'])){
- $this->dialog = new selectUserToPrinterDialog($this->config, get_userinfo(),"AddUser");
+ $this->dialog = new selectUserToPrinterDialog($this->config, NULL,"AddUser");
}
if(isset($_POST['AddGroup'])){
- $this->dialog = new selectUserToPrinterDialog($this->config, get_userinfo(),"AddGroup");
+ $this->dialog = new selectUserToPrinterDialog($this->config, NULL,"AddGroup");
}
if(isset($_POST['AddAdminUser'])){
- $this->dialog = new selectUserToPrinterDialog($this->config, get_userinfo(),"AddAdminUser");
+ $this->dialog = new selectUserToPrinterDialog($this->config, NULL,"AddAdminUser");
}
if(isset($_POST['AddAdminGroup'])){
- $this->dialog = new selectUserToPrinterDialog($this->config, get_userinfo(),"AddAdminGroup");
+ $this->dialog = new selectUserToPrinterDialog($this->config, NULL,"AddAdminGroup");
}
/* Display ppd configure/select dialog */
/* 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);
}
}
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;
$ppdManager= new ppdManager($path);
if(!empty($this->gotoPrinterPPD)){
if((!file_exists($path.$this->gotoPrinterPPD))){
- $smarty->assign("driverInfo", "<b>".sprintf(_("Your currently selected PPD file '%s' doesn't exist."),$this->gotoPrinterPPD))."</b>";
+ $smarty->assign("driverInfo", "<b>".sprintf(_("Your currently selected PPD file '%s' doesn't exist."),$path.$this->gotoPrinterPPD))."</b>";
}else{
$smarty->assign("driverInfo", $ppdManager->loadDescription($path.$this->gotoPrinterPPD));
}
/* Check if this dn points to a printer, to avoid deleting something else */
$ldap= $this->config->get_ldap_link();
- $ldap->cat($this->dn);
+ $ldap->cat($this->dn, array('dn',"objectClass"));
if(!$ldap->count()){
- print_red("Trying to remove printer obejct which isn't a printer. Aborted to avoid data loss.");
+ print_red("Trying to remove printer object which isn't a printer. Aborted to avoid data loss.");
return;
}
/* Check if obejct is a printer */
$CheckPrinter = $ldap->fetch();
if(!in_array("gotoPrinter",$CheckPrinter['objectClass'])){
- print_red("Trying to remove printer obejct which isn't a printer. Aborted to avoid data loss.");
+ print_red("Trying to remove printer object which isn't a printer. Aborted to avoid data loss.");
return;
}
/* Remove account & dns extension */
$this->netConfigDNS->remove_from_parent();
$ldap->rmdir($this->dn);
- show_ldap_error($ldap->get_error());
+ show_ldap_error($ldap->get_error(), _("Removing printer failed"));
$this->handle_post_events("remove");
/* Delete references to object groups */
$message[]= "The required field 'Printer name' is not set.";
}
+ /* must: labeledURI */
+ if(empty($this->labeledURI)){
+ $message[]= "The required field 'Printer URL' is not set.";
+ }
+
/* Check if there is already an entry with this cn*/
if (($this->orig_dn != $dn)&&($this->BelongsTo == "Printer")){
$ldap= $this->config->get_ldap_link();
/* 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];
}
+ if(($this->gosaUnitTag) && (!in_array_ics("gosaAdministrativeUnitTag",$this->attrs['objectClass']))){
+ $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'){
$this->handle_post_events("modify");
}
- show_ldap_error($ldap->get_error());
+ show_ldap_error($ldap->get_error(), _("Saving printer failed"));
$this->netConfigDNS->cn = $this->cn;
$this->netConfigDNS->dn = $this->dn;
}
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:
?>