X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_printGeneric.inc;h=3738b4f4ac4b377b78588a0cbe85d81e43da65ba;hb=8edf1b0390149b39682c7e02c394fec56940874d;hp=965ee2e39ddac6f35317037191e77826cdc4a154;hpb=e6ccff2c6d732775f69f2a78b029e8769e053373;p=gosa.git
diff --git a/plugins/admin/systems/class_printGeneric.inc b/plugins/admin/systems/class_printGeneric.inc
index 965ee2e39..3738b4f4a 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);
@@ -77,7 +83,7 @@ class printgeneric extends plugin
/* 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";
}
@@ -87,11 +93,21 @@ class printgeneric extends plugin
/* Set base */
if ($this->dn == "new"){
- $ui= get_userinfo();
$this->base= dn2base($ui->dn);
$this->cn= "";
} else {
- $this->base= dn2base($this->dn);
+
+ /* Set base and check if the extracted base exists */
+ 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'];
+ }
}
/* Extract selected ppd */
@@ -112,19 +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();
- if(isset($entry['description'])){
- $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;
+ }
}
}
}
@@ -165,7 +192,7 @@ class printgeneric extends plugin
}else{
$this->BelongsTo = "Terminal";
}
- }elseif(isset($this->parent->by_object['printgeneric'])){
+ }elseif(isset($this->parent->by_name['printgeneric'])){
$this->BelongsTo = "Printer";
}
@@ -195,9 +222,9 @@ class printgeneric extends plugin
/* 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();
@@ -216,12 +243,12 @@ class printgeneric extends plugin
/* 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);
}
@@ -338,17 +365,19 @@ class printgeneric extends plugin
$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 */
@@ -390,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);
}
}
@@ -427,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;
@@ -464,7 +485,7 @@ class printgeneric extends plugin
$ppdManager= new ppdManager($path);
if(!empty($this->gotoPrinterPPD)){
if((!file_exists($path.$this->gotoPrinterPPD))){
- $smarty->assign("driverInfo", "".sprintf(_("Your currently selected PPD file '%s' doesn't exist."),$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));
}
@@ -500,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)));
}
@@ -522,23 +547,23 @@ class printgeneric extends plugin
/* 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 */
@@ -569,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'])){
@@ -589,6 +616,21 @@ class printgeneric extends plugin
$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)){
+ $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();
@@ -619,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;
@@ -642,6 +686,19 @@ class printgeneric extends plugin
$this->PPDdialogToSave->save_ppd();
}
+ 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);
+ }else{
+ $this->gotoPrinterPPD = array();
+ }
+
$dn= $this->dn;
plugin::save();
$ldap= $this->config->get_ldap_link();
@@ -661,41 +718,46 @@ class printgeneric extends plugin
$this->attrs= $attrs;
}
- if(preg_match("/https/i",$_SERVER['HTTP_REFERER'])){
- $method="https://";
- }else{
- $method="http://";
- }
-
- $this->attrs['gotoPrinterPPD'] = $method.str_replace("//","/",$_SERVER['SERVER_NAME']."/ppd/".$this->gotoPrinterPPD);
-
/* 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'){
@@ -715,7 +777,8 @@ class printgeneric extends plugin
$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;
@@ -723,6 +786,9 @@ class printgeneric extends plugin
/* Optionally execute a command after we're done */
$this->postcreate();
+
+ /* This is a multi object. Handle tagging here... */
+ $this->handle_object_tagging();
}
function generateList(){
@@ -743,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:
?>