Updated role handling

-Fixed posts
-Added name check

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@19217 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-plugins/rolemanagement/admin/roleManagement/class_roleGeneric.inc b/gosa-plugins/rolemanagement/admin/roleManagement/class_roleGeneric.inc
index e8922a8cc81f5cd3865d3584d342773ff5bc3a93..21190175401050560e9e297a15678ee38586bddf 100644 (file)
--- a/gosa-plugins/rolemanagement/admin/roleManagement/class_roleGeneric.inc
+++ b/gosa-plugins/rolemanagement/admin/roleManagement/class_roleGeneric.inc
@@ -1,476 +1,481 @@
 <?php
 /*
-* This code is part of GOsa (http://www.gosa-project.org)
-* Copyright (C) 2003-2008 GONICUS GmbH
-*
-* ID: $$Id: class_roleManagement.inc 13520 2009-03-09 14:54:13Z hickert $$
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+ * This code is part of GOsa (http://www.gosa-project.org)
+ * Copyright (C) 2003-2008 GONICUS GmbH
+ *
+ * ID: $$Id: class_roleManagement.inc 13520 2009-03-09 14:54:13Z hickert $$
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 
 class roleGeneric extends plugin {
 
-  // The variables this plugin takes care of.
-  var $cn = "";
-  var $description ="";
-  var $telephoneNumber = "";
-  var $facsimileTelephoneNumber = "";
-
-  // The objects base 
-  var $base = "";
- 
-  // Keep track if possible ng aming modifications
-  var $orig_dn = "";
-  var $orig_cn = "";
-  var $orig_base = "";
-
-  // The object classes written by this plugin
-  var $objectclasses = array("top","organizationalRole");
-
-  // The list of occupants  ([dn])
-  var $roleOccupant = array();
-  
-  // The roleOccupant cache, dn=>attrs
-  var $roleOccCache = array();
-
-  // A list of attributes managed by this plugin
-  var $attributes = array("cn","description",
-    "telephoneNumber","facsimileTelephoneNumber","roleOccupant");
- 
-  // 
-  var $objCacheLoaded = FALSE;
-  var $baseSelector;
-
-  /* Initialize the class 
-   */
-  function __construct($config,$dn){
-    plugin::plugin($config,$dn);
-    $this->is_account = TRUE;
-
-    // Initialize list of occupants
-    $this->roleOccupant = array();
-    if(isset($this->attrs['roleOccupant'])){
-      for($i=0;$i<$this->attrs['roleOccupant']['count']; $i++){
-        $this->roleOccupant[] = $this->attrs['roleOccupant'][$i];
-      }
-    }
+    // The variables this plugin takes care of.
+    var $cn = "";
+    var $description ="";
+    var $telephoneNumber = "";
+    var $facsimileTelephoneNumber = "";
 
-    // Detect the objects base
-    if ($this->dn == "new"){
-      $ui = get_userinfo();
-      $this->base= dn2base(session::global_is_set("CurrentMainBase")?"cn=dummy,".session::global_get("CurrentMainBase"):$ui->dn);
-    } else {
-      $this->base= preg_replace("/^[^,]+,".preg_quote(get_ou("roleGeneric", "roleRDN"), '/i')."/","",$this->dn);
-    }
+    // The objects base 
+    var $base = "";
 
-    // Keep track of naming attribute modifications
-    $this->orig_base = $this->base;
-    $this->orig_dn = $dn;
-    $this->orig_cn = $this->cn;
-
-    /* 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);
-
-    // Prepare lists
-    $this->memberList = new sortableListing();
-    $this->memberList->setDeleteable(true);
-    $this->memberList->setInstantDelete(true);
-    $this->memberList->setEditable(false);
-    $this->memberList->setWidth("100%");
-    $this->memberList->setHeight("300px");
-    $this->memberList->setHeader(array('~',_("Given name"),_("Surename"),_("Uid")));
-    $this->memberList->setColspecs(array('20px','*','*','*','20px'));
-    $this->memberList->setDefaultSortColumn(1);
-  }
-
-
-  /* Keep occupant cache up to date. 
-   * Else, we may have entries we can't display.
-   */
-  function reload()
-  {
-    // Entries can't be added twice. 
-    $attrs = array("description", "objectClass", "uid","cn",'sn','givenName');
-    $this->roleOccupant = array_unique($this->roleOccupant);
-    $this->roleOccupant = array_values($this->roleOccupant);
-  
-    $ldap = $this->config->get_ldap_link();
-    foreach($this->roleOccupant as $dn){
-      if(!isset($this->roleOccCache[$dn])){
-        if($ldap->dn_exists($dn)){
-          $ldap->cat($dn, $attrs);
-
-          $tmp = $ldap->fetch();
-          if(!isset($tmp['cn'])){
-         
-            // Extract the namingAttribute out of the dn.
-            $cn = preg_replace("/^[^=]*+=([^,]*).*$/","\\1",$tmp['dn']);
-            if(isset($tmp['uid'])){
-              $cn = $tmp['uid'][0];
-            }
-            if(isset($tmp['description'])){
-              $cn.= " [".$tmp['description'][0]."]";
+    // Keep track if possible ng aming modifications
+    var $orig_dn = "";
+    var $orig_cn = "";
+    var $orig_base = "";
+
+    // The object classes written by this plugin
+    var $objectclasses = array("top","organizationalRole");
+
+    // The list of occupants  ([dn])
+    var $roleOccupant = array();
+
+    // The roleOccupant cache, dn=>attrs
+    var $roleOccCache = array();
+
+    // A list of attributes managed by this plugin
+    var $attributes = array("cn","description",
+            "telephoneNumber","facsimileTelephoneNumber","roleOccupant");
+
+    // 
+    var $objCacheLoaded = FALSE;
+    var $baseSelector;
+
+    /* Initialize the class 
+     */
+    function __construct($config,$dn){
+        plugin::plugin($config,$dn);
+        $this->is_account = TRUE;
+
+        // Initialize list of occupants
+        $this->roleOccupant = array();
+        if(isset($this->attrs['roleOccupant'])){
+            for($i=0;$i<$this->attrs['roleOccupant']['count']; $i++){
+                $this->roleOccupant[] = $this->attrs['roleOccupant'][$i];
             }
-            $tmp['cn'][0] = $cn;
-          }
+        }
 
-          $this->roleOccCache[$dn] = $tmp;
+        // Detect the objects base
+        if ($this->dn == "new"){
+            $ui = get_userinfo();
+            $this->base= dn2base(session::global_is_set("CurrentMainBase")?"cn=dummy,".session::global_get("CurrentMainBase"):$ui->dn);
+        } else {
+            $this->base= preg_replace("/^[^,]+,".preg_quote(get_ou("roleGeneric", "roleRDN"), '/i')."/","",$this->dn);
         }
-      }
-    }
 
-  }
-  
-
-  function getOccupants(){
-    return($this->roleOccupant);
-  }
-
-  /* Generate HTML output of this plugin.
-   */
-  function execute()
-  {
-    plugin::execute();
-    // Get list of possible ldap bases, will be selectable in the ui.
-    $tmp = $this->allowedBasesToMoveTo();
-
-    // Reload the occupant cache. 
-    if(!$this->objCacheLoaded){
-      $this->reload();
-      $this->objCacheLoaded = TRUE;
+        // Keep track of naming attribute modifications
+        $this->orig_base = $this->base;
+        $this->orig_dn = $dn;
+        $this->orig_cn = $this->cn;
+
+        /* 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);
+
+        // Prepare lists
+        $this->memberList = new sortableListing();
+        $this->memberList->setDeleteable(true);
+        $this->memberList->setInstantDelete(true);
+        $this->memberList->setEditable(false);
+        $this->memberList->setWidth("100%");
+        $this->memberList->setHeight("300px");
+        $this->memberList->setHeader(array('~',_("Given name"),_("Surename"),_("Uid")));
+        $this->memberList->setColspecs(array('20px','*','*','*','20px'));
+        $this->memberList->setDefaultSortColumn(1);
     }
 
-    /***************
-     * Dialog handling
-     ***************/
 
-    if(isset($_POST['edit_membership']) && !$this->dialog instanceOf userSelect){
-      $this->dialog = new userSelect($this->config,get_userinfo());
+    /* Keep occupant cache up to date. 
+     * Else, we may have entries we can't display.
+     */
+    function reload()
+    {
+        // Entries can't be added twice. 
+        $attrs = array("description", "objectClass", "uid","cn",'sn','givenName');
+        $this->roleOccupant = array_unique($this->roleOccupant);
+        $this->roleOccupant = array_values($this->roleOccupant);
+
+        $ldap = $this->config->get_ldap_link();
+        foreach($this->roleOccupant as $dn){
+            if(!isset($this->roleOccCache[$dn])){
+                if($ldap->dn_exists($dn)){
+                    $ldap->cat($dn, $attrs);
+
+                    $tmp = $ldap->fetch();
+                    if(!isset($tmp['cn'])){
+
+                        // Extract the namingAttribute out of the dn.
+                        $cn = preg_replace("/^[^=]*+=([^,]*).*$/","\\1",$tmp['dn']);
+                        if(isset($tmp['uid'])){
+                            $cn = $tmp['uid'][0];
+                        }
+                        if(isset($tmp['description'])){
+                            $cn.= " [".$tmp['description'][0]."]";
+                        }
+                        $tmp['cn'][0] = $cn;
+                    }
+
+                    $this->roleOccCache[$dn] = $tmp;
+                }
+            }
+        }
+
     }
-    $this->memberList->save_object();
-    $action = $this->memberList->getAction();
-    if($action['action'] == 'delete'){
-        $this->roleOccupant = $this->memberList->getMaintainedData();
+
+
+    function getOccupants(){
+        return($this->roleOccupant);
     }
 
-    if(isset($_POST['delete_membership']) && !$this->dialog instanceOf userSelect){
-      if(isset($_POST['members'])){
-        foreach($_POST['members'] as $id){
-          if(isset($this->roleOccupant[$id])){
-            unset($this->roleOccupant[$id]);
-          }
+    /* Generate HTML output of this plugin.
+     */
+    function execute()
+    {
+        plugin::execute();
+        // Get list of possible ldap bases, will be selectable in the ui.
+        $tmp = $this->allowedBasesToMoveTo();
+
+        // Reload the occupant cache. 
+        if(!$this->objCacheLoaded){
+            $this->reload();
+            $this->objCacheLoaded = TRUE;
         }
-        $this->reload();
-      }
-    }
 
-    if(isset($_POST['add_users_cancel']) && $this->dialog instanceOf userSelect){
-      $this->dialog = NULL;
-    }
-    if(isset($_POST['add_users_finish']) && $this->dialog instanceOf userSelect){
-      $users = $this->dialog->detectPostActions();
-      if(isset($users['targets'])){
-        $headpage = $this->dialog->getHeadpage();
-        foreach($users['targets'] as $dn){
-          $attrs = $headpage->getEntry($dn);
-          $this->roleOccupant[] = $dn;
-          $this->roleOccCache[$dn] = $attrs;
+        /***************
+         * Dialog handling
+         ***************/
+
+        if(isset($_POST['edit_membership']) && !$this->dialog instanceOf userSelect){
+            $this->dialog = new userSelect($this->config,get_userinfo());
+        }
+        $this->memberList->save_object();
+        $action = $this->memberList->getAction();
+        if($action['action'] == 'delete'){
+            $this->roleOccupant = $this->memberList->getMaintainedData();
         }
-      } 
-      $this->dialog= FALSE;
-    }
 
-    if($this->dialog instanceOf userSelect){
+        if(isset($_POST['delete_membership']) && !$this->dialog instanceOf userSelect){
+            if(isset($_POST['members'])){
+                foreach($_POST['members'] as $id){
+                    if(isset($this->roleOccupant[$id])){
+                        unset($this->roleOccupant[$id]);
+                    }
+                }
+                $this->reload();
+            }
+        }
 
-      // Build up blocklist
-      session::set('filterBlacklist', array('dn' => $this->roleOccupant));
-      return($this->dialog->execute());
-    }
+        if(isset($_POST['add_users_cancel']) && $this->dialog instanceOf userSelect){
+            $this->dialog = NULL;
+        }
+        if(isset($_POST['add_users_finish']) && $this->dialog instanceOf userSelect){
+            $users = $this->dialog->detectPostActions();
+            if(isset($users['targets'])){
+                $headpage = $this->dialog->getHeadpage();
+                foreach($users['targets'] as $dn){
+                    $attrs = $headpage->getEntry($dn);
+                    $this->roleOccupant[] = $dn;
+                    $this->roleOccCache[$dn] = $attrs;
+                }
+            } 
+            $this->dialog= FALSE;
+        }
 
+        if($this->dialog instanceOf userSelect){
+
+            // Build up blocklist
+            session::set('filterBlacklist', array('dn' => $this->roleOccupant));
+            return($this->dialog->execute());
+        }
 
-    /***************
-     * Template handling
-     ***************/
-
-    $this->memberList->setAcl($this->getacl("roleOccupant"));
-
-    $data = $lData = array();
-    foreach ($this->roleOccupant as $key => $dn){
-      $data[$key] = $dn;
-      if(isset($this->roleOccCache[$dn])){
-        $icon = image('plugins/users/images/select_user.png');
-        $entry     = $this->roleOccCache[$dn];
-        $sn        = $entry['sn']['0'];
-        $givenName = $entry['givenName']['0'];
-        $uid       = $entry['uid']['0'];
-      }else{
-        $sn = $givenName = _("Unknown");
-        $uid = LDAP::fix($dn);
-        $icon = image('images/false.png');
-      }
-      $lData[$key] = array('data' => array($icon,$givenName,$sn, $uid));
-    }
 
-    $this->memberList->setListData($data,$lData);
-    $this->memberList->update();
+        /***************
+         * Template handling
+         ***************/
+
+        $this->memberList->setAcl($this->getacl("roleOccupant"));
+
+        $data = $lData = array();
+        foreach ($this->roleOccupant as $key => $dn){
+            $data[$key] = $dn;
+            if(isset($this->roleOccCache[$dn])){
+                $icon = image('plugins/users/images/select_user.png');
+                $entry     = $this->roleOccCache[$dn];
+                $sn        = $entry['sn']['0'];
+                $givenName = $entry['givenName']['0'];
+                $uid       = $entry['uid']['0'];
+            }else{
+                $sn = $givenName = _("Unknown");
+                $uid = LDAP::fix($dn);
+                $icon = image('images/false.png');
+            }
+            $lData[$key] = array('data' => array($icon,$givenName,$sn, $uid));
+        }
 
-    // Get smarty instance and assign required variables.
-    $smarty = get_smarty();
+        $this->memberList->setListData($data,$lData);
+        $this->memberList->update();
 
-    $smarty->assign("base", $this->baseSelector->render());
-    $smarty->assign("memberList",$this->memberList->render());
-    foreach($this->attributes as $attr){
-      $smarty->assign($attr,$this->$attr);
-    }
+        // Get smarty instance and assign required variables.
+        $smarty = get_smarty();
+
+        $smarty->assign("base", $this->baseSelector->render());
+        $smarty->assign("memberList",$this->memberList->render());
+        foreach($this->attributes as $attr){
+            $smarty->assign($attr, set_post($this->$attr));
+        }
 
-    // Assign current permissions for each attribute. 
-    $tmp = $this->plInfo();
-    foreach($tmp['plProvidedAcls'] as $attr => $desc){
-      $smarty->assign($attr."ACL",$this->getacl($attr));
+        // Assign current permissions for each attribute. 
+        $tmp = $this->plInfo();
+        foreach($tmp['plProvidedAcls'] as $attr => $desc){
+            $smarty->assign($attr."ACL",$this->getacl($attr));
+        }
+        return($smarty->fetch(get_template_path('roleGeneric.tpl',TRUE,dirname(__FILE__))));
     }
-    return($smarty->fetch(get_template_path('roleGeneric.tpl',TRUE,dirname(__FILE__))));
-  }
 
 
-  /* Check user input and return a list of 'invalid input' messages.
-   */
-  function check()
-  {
-    $message = plugin::check();
+    /* Check user input and return a list of 'invalid input' messages.
+     */
+    function check()
+    {
+        $message = plugin::check();
 
-    // Set the new acl base 
-    if($this->dn == "new") {
-      $this->set_acl_base($this->base);
-    }
+        // Set the new acl base 
+        if($this->dn == "new") {
+            $this->set_acl_base($this->base);
+        }
 
-    // Check if we are allowed to create/move this user
-    if($this->orig_dn == "new" && !$this->acl_is_createable($this->base)){
-      $message[]= msgPool::permCreate();
-    }elseif($this->orig_dn != "new" && 
-        !$this->acl_is_moveable($this->base) && 
-        ($this->orig_base != $this->base || $this->orig_cn != $this->cn )){ 
-      $message[]= msgPool::permMove();
-    }
+        // Check if we are allowed to create/move this user
+        if($this->orig_dn == "new" && !$this->acl_is_createable($this->base)){
+            $message[]= msgPool::permCreate();
+        }elseif($this->orig_dn != "new" && 
+                !$this->acl_is_moveable($this->base) && 
+                ($this->orig_base != $this->base || $this->orig_cn != $this->cn )){ 
+            $message[]= msgPool::permMove();
+        }
 
-    // Check if a wrong base was supplied
-    if(!$this->baseSelector->checkLastBaseUpdate()){
-      $message[]= msgPool::check_base();;
-    }
+        // Check if a wrong base was supplied
+        if(!$this->baseSelector->checkLastBaseUpdate()){
+            $message[]= msgPool::check_base();;
+        }
 
-    /* must: cn */
-    if ($this->cn == ""){
-      $message[]= msgPool::required(_("Name"));
-    }
+        /* must: cn */
+        if ($this->cn == ""){
+            $message[]= msgPool::required(_("Name"));
+        }
 
-    // Check if this name is uniq for roles.
-    $ldap= $this->config->get_ldap_link();
-    $ldap->cd($this->config->current['BASE']);
-    $ldap->search("(&(objectClass=organizationalRole)(cn=$this->cn))", array("cn"));
-    $ldap->fetch();
-    if ($ldap->count() != 0 && ( $this->dn == 'new' || $this->cn != $this->orig_cn)){
-      $message[]= msgPool::duplicated(_("Name"));
-    }
+       
+        if (preg_match("/[^a-z0-9]/i", $this->cn)){
+            $message[]= msgPool::invalid(_("Name"), $this->cn, '/[a-z0-9]/i');
+        }
 
-    return($message);
-  }
-  
-
-  /* Removes the object from the ldap database
-   */ 
-  function remove_from_parent()
-  {
-    plugin::remove_from_parent();
-
-    // Remove this object.
-    $ldap= $this->config->get_ldap_link();
-    $ldap->rmdir($this->dn);
-    if (!$ldap->success()){
-      msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, 0, get_class()));
-    }
+        // Check if this name is uniq for roles.
+        $ldap= $this->config->get_ldap_link();
+        $ldap->cd($this->config->current['BASE']);
+        $ldap->search("(&(objectClass=organizationalRole)(cn=$this->cn))", array("cn"));
+        $ldap->fetch();
+        if ($ldap->count() != 0 && ( $this->dn == 'new' || $this->cn != $this->orig_cn)){
+            $message[]= msgPool::duplicated(_("Name"));
+        }
 
-    // Log action.
-    new log("remove","roles/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
-
-    // Trigger remove signal
-    $this->handle_post_events("remove");
-  }
-
-
-  /* Saves object modifications
-   */  
-  function save()
-  {
-  
-    // Ensure that we've added objects only once.
-    $this->roleOccupant = array_unique($this->roleOccupant);
-    $this->roleOccupant = array_values($this->roleOccupant);
-
-    plugin::save();
-
-    /* Save data. Using 'modify' implies that the entry is already present, use 'add' for
-       new entries. So do a check first... */
-    $ldap = $this->config->get_ldap_link();
-    $ldap->cat ($this->dn, array('dn'));
-    if ($ldap->fetch()){
-      $mode= "modify";
-    } else {
-      $mode= "add";
-      $ldap->cd($this->config->current['BASE']);
-      $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $this->dn));
+        return($message);
     }
-    @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,$this->attributes, "Save via $mode");
 
-    // Finally write data with selected 'mode'
-    $this->cleanup();
-    $ldap->cd ($this->dn);
 
+    /* Removes the object from the ldap database
+     */ 
+    function remove_from_parent()
+    {
+        plugin::remove_from_parent();
+
+        // Remove this object.
+        $ldap= $this->config->get_ldap_link();
+        $ldap->rmdir($this->dn);
+        if (!$ldap->success()){
+            msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, 0, get_class()));
+        }
+
+        // Log action.
+        new log("remove","roles/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
 
-    $ldap->$mode ($this->attrs);
-    if (!$ldap->success()){
-      msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), 
-        $this->dn, LDAP_MOD, get_class()));
-      return (1);
+        // Trigger remove signal
+        $this->handle_post_events("remove");
     }
 
-    // Send modify/add events
-    $this->handle_post_events($mode);
 
-    // Update ACL dependencies too 
-    if($this->dn != $this->orig_dn && $this->orig_dn != "new"){
-      $tmp = new acl($this->config,$this->parent,$this->dn);
-      $tmp->update_acl_membership($this->orig_dn,$this->dn);
+    /* Saves object modifications
+     */  
+    function save()
+    {
+
+        // Ensure that we've added objects only once.
+        $this->roleOccupant = array_unique($this->roleOccupant);
+        $this->roleOccupant = array_values($this->roleOccupant);
+
+        plugin::save();
+
+        /* Save data. Using 'modify' implies that the entry is already present, use 'add' for
+           new entries. So do a check first... */
+        $ldap = $this->config->get_ldap_link();
+        $ldap->cat ($this->dn, array('dn'));
+        if ($ldap->fetch()){
+            $mode= "modify";
+        } else {
+            $mode= "add";
+            $ldap->cd($this->config->current['BASE']);
+            $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $this->dn));
+        }
+        @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,$this->attributes, "Save via $mode");
+
+        // Finally write data with selected 'mode'
+        $this->cleanup();
+        $ldap->cd ($this->dn);
+
+
+        $ldap->$mode ($this->attrs);
+        if (!$ldap->success()){
+            msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), 
+                        $this->dn, LDAP_MOD, get_class()));
+            return (1);
+        }
+
+        // Send modify/add events
+        $this->handle_post_events($mode);
+
+        // Update ACL dependencies too 
+        if($this->dn != $this->orig_dn && $this->orig_dn != "new"){
+            $tmp = new acl($this->config,$this->parent,$this->dn);
+            $tmp->update_acl_membership($this->orig_dn,$this->dn);
+        }
+
+        // Log action
+        if($mode == "modify"){
+            new log("modify","users/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
+        }else{
+            new log("create","users/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
+        }
+
+        return 0;
     }
 
-    // Log action
-    if($mode == "modify"){
-      new log("modify","users/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
-    }else{
-      new log("create","users/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
+
+    /* This avoids that users move themselves out of their rights.
+     */
+    function allowedBasesToMoveTo()
+    {
+        $bases  = $this->get_allowed_bases();
+        return($bases);
     }
 
-    return 0;
-  }
-
-
-  /* This avoids that users move themselves out of their rights.
-   */
-  function allowedBasesToMoveTo()
-  {
-    $bases  = $this->get_allowed_bases();
-    return($bases);
-  }
-
-  
-  /* Save HTML inputs
-   */
-  function save_object()
-  {
-    plugin::save_object();  
-
-    /* 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;
-      }
+
+    /* Save HTML inputs
+     */
+    function save_object()
+    {
+        plugin::save_object();  
+
+        /* 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;
+            }
+        }
+    }  
+
+
+    function PrepareForCopyPaste($source)
+    {
+        plugin::PrepareForCopyPaste($source);
+
+        /* Load member objects */
+        $this->roleOccupant = array();
+        if (isset($source['roleOccupant'])){
+            foreach ($source['roleOccupant'] as $key => $value){
+                if ("$key" != "count"){
+                    $value= @LDAP::convert($value);
+                    $this->roleOccupant["$value"]= "$value";
+                }
+            }
+        }
+        $this->reload();
     }
-  }  
 
 
-  function PrepareForCopyPaste($source)
-  {
-    plugin::PrepareForCopyPaste($source);
+    function getCopyDialog()
+    {
+        $smarty = get_smarty();
+        $smarty->assign("cn", set_post($this->cn));
+        $str = $smarty->fetch(get_template_path("paste_generic.tpl",TRUE,dirname(__FILE__)));
+        $ret = array();
+        $ret['string'] = $str;
+        $ret['status'] = "";
+        return($ret);
+    }
 
-    /* Load member objects */
-    $this->roleOccupant = array();
-    if (isset($source['roleOccupant'])){
-      foreach ($source['roleOccupant'] as $key => $value){
-        if ("$key" != "count"){
-          $value= @LDAP::convert($value);
-          $this->roleOccupant["$value"]= "$value";
+    function saveCopyDialog()
+    {
+        if(isset($_POST['cn'])){
+            $this->cn = get_post('cn');
         }
-      }
     }
-    $this->reload();
-  }
-
-
-  function getCopyDialog()
-  {
-    $smarty = get_smarty();
-    $smarty->assign("cn",     $this->cn);
-    $str = $smarty->fetch(get_template_path("paste_generic.tpl",TRUE,dirname(__FILE__)));
-    $ret = array();
-    $ret['string'] = $str;
-    $ret['status'] = "";
-    return($ret);
-  }
-
-  function saveCopyDialog()
-  {
-    if(isset($_POST['cn'])){
-      $this->cn = $_POST['cn'];
+
+
+    static function plInfo()
+    {
+        return (array(
+                    "plShortName"   => _("Generic"),
+                    "plDescription" => _("Role generic"),
+                    "plSelfModify"  => FALSE,
+                    "plDepends"     => array(),
+                    "plPriority"    => 1,
+                    "plSection"     => array("administration"),
+                    "plRequirements"=> array(
+                        'ldapSchema' => array('gosaRole' => '>=2.7'),
+                        'onFailureDisablePlugin' => array(get_class(), 'roleManagement')
+                        ),
+                    "plCategory"    => array("roles" => array("description"  => _("Roles"),
+                            "objectClass"  => "organizationalRole")),
+
+                    "plProperties" => 
+                    array(                        
+                        array(
+                            "name"          => "roleRDN",
+                            "type"          => "rdn",
+                            "default"       => "ou=roles,",
+                            "description"   => _("The 'roleRDN' statement defines the location where new roles will be created. The default is 'ou=roles,'."),
+                            "check"         => "gosaProperty::isRdn",
+                            "migrate"       => "migrate_roleRDN",
+                            "group"         => "plugin",
+                            "mandatory"     => FALSE)
+                        ),
+
+            "plProvidedAcls"=> array(
+                    "cn"                => _("Name"),
+                    "description" => _("Description"),
+                    "base" => _("Base"),
+                    "telephoneNumber" => _("Telefon number"),
+                    "facsimileTelephoneNumber" => _("Fax number"),
+                    "roleOccupant" => _("Occupants"))
+                ));
     }
-  }
-
- 
-  static function plInfo()
-  {
-      return (array(
-                  "plShortName"   => _("Generic"),
-                  "plDescription" => _("Role generic"),
-                  "plSelfModify"  => FALSE,
-                  "plDepends"     => array(),
-                  "plPriority"    => 1,
-                  "plSection"     => array("administration"),
-                  "plRequirements"=> array(
-                      'ldapSchema' => array('gosaRole' => '>=2.7'),
-                      'onFailureDisablePlugin' => array(get_class(), 'roleManagement')
-                      ),
-                  "plCategory"    => array("roles" => array("description"  => _("Roles"),
-                          "objectClass"  => "organizationalRole")),
-
-                  "plProperties" => 
-                  array(                        
-                      array(
-                          "name"          => "roleRDN",
-                          "type"          => "rdn",
-                          "default"       => "ou=roles,",
-                          "description"   => _("The 'roleRDN' statement defines the location where new roles will be created. The default is 'ou=roles,'."),
-                          "check"         => "gosaProperty::isRdn",
-                          "migrate"       => "migrate_roleRDN",
-                          "group"         => "plugin",
-                          "mandatory"     => FALSE)
-                      ),
-
-          "plProvidedAcls"=> array(
-                  "cn"                => _("Name"),
-                  "description" => _("Description"),
-                  "base" => _("Base"),
-                  "telephoneNumber" => _("Telefon number"),
-                  "facsimileTelephoneNumber" => _("Fax number"),
-                  "roleOccupant" => _("Occupants"))
-              ));
-  }
 }
 
 

diff --git a/gosa-plugins/rolemanagement/admin/roleManagement/class_roleManagement.inc b/gosa-plugins/rolemanagement/admin/roleManagement/class_roleManagement.inc
index 968baf6f9505a16109c45b82d6a5322657df0c99..a9f7123281a37c4f764fdcb0eaacc3c14a7fab51 100644 (file)
--- a/gosa-plugins/rolemanagement/admin/roleManagement/class_roleManagement.inc
+++ b/gosa-plugins/rolemanagement/admin/roleManagement/class_roleManagement.inc
@@ -22,46 +22,46 @@
 
 class roleManagement extends management
 {
-  var $plHeadline     = "Roles";
-  var $plDescription  = "Assign and manage organizational roles";
-  var $plIcon  = "plugins/rolemanagement/images/plugin.png";
+    var $plHeadline     = "Roles";
+    var $plDescription  = "Assign and manage organizational roles";
+    var $plIcon  = "plugins/rolemanagement/images/plugin.png";
 
-  // Tab definition 
-  protected $tabClass = "roletabs";
-  protected $tabType = "ROLETABS";
-  protected $aclCategory = "roles";
-  protected $aclPlugin   = "role";
-  protected $objectName   = "role";
+    // Tab definition 
+    protected $tabClass = "roletabs";
+    protected $tabType = "ROLETABS";
+    protected $aclCategory = "roles";
+    protected $aclPlugin   = "role";
+    protected $objectName   = "role";
 
-  function __construct($config,$ui)
-  {
-    $this->config = $config;
-    $this->ui = $ui;
-   
-    $this->storagePoints = array(get_ou("roleGeneric", "roleRDN"));
- 
-    // Build filter
-    if (session::global_is_set(get_class($this)."_filter")){
-      $filter= session::global_get(get_class($this)."_filter");
-    } else {
-      $filter = new filter(get_template_path("role-filter.xml", true));
-      $filter->setObjectStorage($this->storagePoints);
-    }
-    $this->setFilter($filter);
+    function __construct($config,$ui)
+    {
+        $this->config = $config;
+        $this->ui = $ui;
 
-    // Build headpage
-    $headpage = new listing(get_template_path("role-list.xml", true));
-    $headpage->setFilter($filter);
+        $this->storagePoints = array(get_ou("roleGeneric", "roleRDN"));
 
-    // Add copy&paste and snapshot handler.
-    if ($this->config->boolValueIsTrue("core", "copyPaste")){
-      $this->cpHandler = new CopyPasteHandler($this->config);
-    }
-    if($this->config->get_cfg_value("core","enableSnapshots") == "true"){
-      $this->snapHandler = new SnapshotHandler($this->config);
+        // Build filter
+        if (session::global_is_set(get_class($this)."_filter")){
+            $filter= session::global_get(get_class($this)."_filter");
+        } else {
+            $filter = new filter(get_template_path("role-filter.xml", true));
+            $filter->setObjectStorage($this->storagePoints);
+        }
+        $this->setFilter($filter);
+
+        // Build headpage
+        $headpage = new listing(get_template_path("role-list.xml", true));
+        $headpage->setFilter($filter);
+
+        // Add copy&paste and snapshot handler.
+        if ($this->config->boolValueIsTrue("core", "copyPaste")){
+            $this->cpHandler = new CopyPasteHandler($this->config);
+        }
+        if($this->config->get_cfg_value("core","enableSnapshots") == "true"){
+            $this->snapHandler = new SnapshotHandler($this->config);
+        }
+        parent::__construct($config, $ui, "roles", $headpage);
     }
-    parent::__construct($config, $ui, "roles", $headpage);
-  }
 } 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>

diff --git a/gosa-plugins/rolemanagement/admin/roleManagement/migration/class_migrate_roleRDN.inc b/gosa-plugins/rolemanagement/admin/roleManagement/migration/class_migrate_roleRDN.inc
index 4a3daaaeedc6884ca7c77a3caa196f367432e77d..b91ac2bc4fc52201c43cb6abffaf8481352f9310 100644 (file)
--- a/gosa-plugins/rolemanagement/admin/roleManagement/migration/class_migrate_roleRDN.inc
+++ b/gosa-plugins/rolemanagement/admin/roleManagement/migration/class_migrate_roleRDN.inc
@@ -1,6 +1,6 @@
 <?php 
 class migrate_roleRDN extends migrateRDN implements propertyMigration
 {
-       protected $filter = "(&(objectClass=organizationalRole)%s)";
+    protected $filter = "(&(objectClass=organizationalRole)%s)";
 }
 ?>