diff --git a/plugins/personal/environment/class_environment.inc b/plugins/personal/environment/class_environment.inc
index 4c87bf17c85be07f5cd7604ab7e3e8ddf67eb9d6..2f55230ef965415fd09cb6a0170ed40ae0180145 100644 (file)
var $CopyPasteVars = array("gotoHotplugDevices","newKioskProfiles","gotoAvailableShares","gotoShareSelections","gotoPrinterSel","gotoProfileFlag_L","gotoXResolutions","gotoProfileFlag_C","gotoProfileServers","useProfile","is_group","in_dialog","OrigCn");
- var $attributes = array("uid","gotoProfileServer","gotoProfileFlags",
+ var $attributes = array("uid","gotoProfileServer","gotoProfileFlags","gotoHotplugDevice",
"gotoXResolution","gotoProfileQuota",
"gotoLogonScripts","gotoLogonScript",
"gotoPrinter", "gosaDefaultPrinter",
var $cn;
var $OrigCn;
- function environment ($config, $dn= NULL)
+ function environment ($config, $dn= NULL, $parent= NULL)
{
- plugin::plugin ($config, $dn);
+ plugin::plugin ($config, $dn, $parent);
/* Check : Are we currently editing a group or user dialog */
if((isset($this->attrs['cn'][0]))&&(!isset($this->attrs['uid'][0]))){
$tmp = split("\|",$share);
$tmp2['server'] =$tmp[0];
$tmp2['name'] =$tmp[1];
- $tmp2['mountPoint'] =$tmp[2];
+
+ /* Decode base64 if needed */
+ if (!preg_match('%/%', $tmp[2])){
+ $tmp2['mountPoint'] =base64_decode($tmp[2]);
+ } else {
+ $tmp2['mountPoint'] =$tmp[2];
+ }
+
if(isset($tmp[3])){
$tmp2['PwdHash'] =$tmp[3];
}else{
$this->useProfile = false;
}
- /* Set to group environment if we editing a group */
- if(!isset($this->parent)){
- $this->is_group = true;
- }
-
/* Set resolutions */
$this->gotoXResolutions = array("auto"=>_("auto"),
"640x480" => "640x480",
"800x600" => "800x600",
"1024x768" => "1024x768",
- "1154x864" => "1154x864",
+ "1152x864" => "1152x864",
"1280x768" => "1280x768",
"1280x1024" => "1280x1024");
}
+
+ /* Detect type of edited object (user|group)*/
+ function detect_grouptype()
+ {
+ if((!isset($this->parent))&&(!$this->is_account)){
+ $this->is_group = false;
+ }elseif((isset($this->parent))&&(!isset($this->parent->by_object['posixAccount']))){
+ $this->is_group = true;
+ }else{
+ $this->is_group = false;
+ }
+ }
+
+
function execute()
{
/* Call parent execute */
All these tab management is done here
*/
+ $this->detect_grouptype();
+
/* Working from Usermenu an the Account is currently disbled
* this->parent : is only set if we are working in a list of tabs
* is_account : is only true if the needed objectClass is given
*/
}elseif((isset($this->parent))&&(!isset($this->parent->by_object['posixAccount']))){
$smarty->assign("is_account","true");
- $this->is_group = true;
$this->uid = $this->cn;
$this->attrs['uid'] = $this->cn;
*/
$smarty->assign("is_account","true");
- $this->is_group = false;
/* Do we need to flip is_account state? */
if (isset($_POST['modify_state'])){
/* We assign a share to this user, if we don't know where to mount the share */
if((!isset($_POST['gotoShareMountPoint']))||(empty($_POST['gotoShareMountPoint']))||(preg_match("/[\|]/i",$_POST['gotoShareMountPoint']))){
print_red(_("You must specify a valid mount point."));
+ }elseif(preg_match('/ /', $_POST['gotoShareMountPoint'])){
+ print_red(_("Spaces are not allowed in the mount path!"));
}elseif(!(
preg_match("/^\//",$_POST['gotoShareMountPoint']) ||
preg_match("/^~/",$_POST['gotoShareMountPoint']) ||
$once = false;
$key = preg_replace("/^gotoShareDel_/","",$name);
$key = preg_replace("/_+[xy]$/","",$key);
+ $key = base64_decode($key);
+ if(isset($this->gotoShares[$key])) {
+ unset($this->gotoShares[$key]);
+ }
+
+ /* Remove corresponding password entry, too. This is a workaround
+ to get rid of old-style entries. */
+ $key= base64_decode($key);
if(isset($this->gotoShares[$key])) {
unset($this->gotoShares[$key]);
}
+
}
if((preg_match("/^gotoShareResetPwd_/",$name)) && ($once)){
$once = false;
$key = preg_replace("/^gotoShareResetPwd_/","",$name);
$key = preg_replace("/_+[xy]$/","",$key);
+ $key = base64_decode($key);
$this->gotoShares[$key]['PwdHash'] = "";
+ if(preg_match("/^!/",$this->gotoShares[$key]['server'])){
+ unset($this->gotoShares[$key]);
+ }
}
}
$divlistShares->SetHeight(100);
$tmp = $this->printOutAssignedShares();
+
foreach($tmp as $key => $value){
$img = "";
+ $hide = false;
+ $background = "";
+ if(chkacl($this->acl,"gotoShare") != ""){
+ $background = "background: #D0D0D0; ";
+ $hide = true;
+ }
+
/* Check if entry starts with an ! */
if(preg_match("/^!/",$this->gotoShares[$key]['server'])){
if($this->is_group) continue;
/* Create pwd reset images */
- if($this->gotoShares[$key]['PwdHash'] != ""){
- $img.= "<input type='image' name='gotoShareResetPwd_".$key." 'src='images/list_reset_password.png' alt='"._("Reset password hash")."'
+ if($this->gotoShares[$key]['PwdHash'] != "" && !$hide){
+ $img.= "<input type='image' name='gotoShareResetPwd_".base64_encode($key)." 'src='images/list_reset_password.png' alt='"._("Reset password hash")."'
title='"._("Reset password hash")."'>";
}
- $field1 = array("string" => "<font style=\"color:#C0C0C0\">".$value."</font>" );
- $field2 = array("string" => $img , "attach" => "style='border-right:0px;'");
+ $field1 = array("string" => "<font style=\"color:#C0C0C0\">".$value."</font>" , "attach" => "style='".$background."'");
+ $field2 = array("string" => $img , "attach" => "style='".$background."border-right:0px;'");
}else{
/* Create pwd reset img && delete image */
if($this->gotoShares[$key]['PwdHash'] != ""){
- $img.= "<input type='image' name='gotoShareResetPwd_".$key." 'src='images/list_reset_password.png' alt='"._("Reset password hash")."'
+ $img.= "<input type='image' name='gotoShareResetPwd_".base64_encode($key)." 'src='images/list_reset_password.png' alt='"._("Reset password hash")."'
title='"._("Reset password hash")."'>";
$img.= " ";
}
- $img.= "<input type='image' name='gotoShareDel_".$key." 'src='images/edittrash.png' alt='"._("Delete")."'
+ if(!$hide){
+ $img.= "<input type='image' name='gotoShareDel_".base64_encode($key)." 'src='images/edittrash.png' alt='"._("Delete")."'
title='"._("Delete share entry")."'>";
- $field1 = array("string" => $value);
- $field2 = array("string" => $img , "attach" => "style='border-right:0px;'");
+ }
+ $field1 = array("string" => $value , "attach" => "style='".$background."'");
+ $field2 = array("string" => $img , "attach" => "style='".$background."border-right:0px;'");
}
$divlistShares->AddEntry(array($field1,$field2));
}
}
}
- if((isset($_POST['gotoPrinterDefault']))&&(isset($_POST['gotoPrinterSel']))&&(!empty($_POST['gotoPrinterSel']))){
- if ($this->gosaDefaultPrinter == $_POST['gotoPrinterSel'][0]){
- $this->gosaDefaultPrinter= "";
- } else {
- $this->gosaDefaultPrinter= $_POST['gotoPrinterSel'][0];
+ if(!$this->is_group){
+ if((isset($_POST['gotoPrinterDefault']))&&(isset($_POST['gotoPrinterSel']))&&(!empty($_POST['gotoPrinterSel']))){
+ if ($this->gosaDefaultPrinter == $_POST['gotoPrinterSel'][0]){
+ $this->gosaDefaultPrinter= "";
+ } else {
+ $this->gosaDefaultPrinter= $_POST['gotoPrinterSel'][0];
+ }
}
- }
+ }
$smarty->assign("gotoPrinter",$this->printOutPrinterDevices());
$smarty->assign("gotoPrinterKeys",array_flip($this->printOutPrinterDevices()));
$smarty->assign("gotoProfileQuotaACL"," disabled ");
}
+ $smarty->assign("is_group",$this->is_group);
+
/* Als smarty vars are set. Get smarty template and generate output */
$display.= $smarty->fetch(get_template_path('environment.tpl', TRUE,dirname(__FILE__)));
-
return($display);
}
$ldap->cd($this->dn);
$this->cleanup();
- $ldap->modify ($this->attrs);
+ $ldap->modify ($this->attrs);
show_ldap_error($ldap->get_error(), _("Removing environment information failed"));
/* Optionally execute a command after we're done */
- $this->handle_post_events("remove");
+ $this->handle_post_events("remove",array("uid" => $this->uid));
}
function check()
{
/* Call common method to give check the hook */
+ $this->detect_grouptype();
$message= plugin::check();
if(preg_match("/[^0-9]/",$this->gotoProfileQuota)) {
/* Save usersettings to Printer */
-
+ $skip_printer_changes = false;
if(chkacl($this->acl,"gotoPrinter")!=""){
- $this->gotoPrinter = array();
+ $this->gotoPrinter = array();
+ $skip_printer_changes = true;
}
- if($this->is_group){
- $s_suffix = "Group";
- }else{
- $s_suffix = "User";
- }
-
-
- /* 1. Search all printers that have our uid/cn as member
- * 2. Delete this uid/cn from every single entry and save it again.
- * 2.1 There are different types of members: Users / Groups, this will be defined in $suffix
- * 2.2 And each type has two modes, Admin (e.g. 'gotoUserAdminPrinter') and Normal
- */
- $ldap->search("(&(objectClass=gotoPrinter)(|(goto".$s_suffix."Printer=".$this->uid.")(goto".$s_suffix."AdminPrinter=".$this->uid.")))",array("*"));
- while($attr = $ldap->fetch()){
-
- /* Walk trough all printers and check if our user id used, if so remove it.
- * Later we will insert our uid at the right place.
+ if(!$skip_printer_changes){
+ /* 1. Search all printers that have our uid/cn as member
+ * 2. Delete this uid/cn from every single entry and save it again.
+ * 2.1 There are different types of members: Users / Groups, this will be defined in $suffix
+ * 2.2 And each type has two modes, Admin (e.g. 'gotoUserAdminPrinter') and Normal
*/
+ $types = array( "gotoUserPrinter" => "AddUser",
+ "gotoGroupPrinter" => "AddGroup",
+ "gotoUserAdminPrinter" => "AddAdminUser",
+ "gotoGroupAdminPrinter" => "AddAdminGroup");
- /* Remove normal entries (User)*/
- if(isset($attr['goto'.$s_suffix.'Printer'])) {
- foreach($attr['goto'.$s_suffix.'Printer'] as $key => $user){
- if($this->uid==$user){
- unset($attr['goto'.$s_suffix.'Printer'][$key]);
- }
- }
- }
+ /* Detect type of edited object, sometimes this wasn't set correctly ... */
+ $this->detect_grouptype();
- /* Remove administrational entries (Admin)*/
- if(isset($attr['goto'.$s_suffix.'AdminPrinter'])){
- foreach($attr['goto'.$s_suffix.'AdminPrinter'] as $key => $user){
- if($this->uid==$user){
- unset($attr['goto'.$s_suffix.'AdminPrinter'][$key]);
- }
- }
- }
-
- /* Extract useable tags, to be able to save all changes
- */
- $attrs_used = array();
- foreach($attr as $key=>$val){
-
- /* If index is numeric, skip it ...*/
- if((!is_numeric($key))&&($key!="count")){
-
- /* If entry contains 'count' remove it */
- if(is_array($val)&&isset($val['count'])){
- unset($val['count']);
- }
- $attrs_used[$key]=$val;
- }
- }
- /* the result of cleaning the entry is
- * to be able to directly save this again,
- * if all changes are made
- */
- $attr= $attrs_used;
-
-#fix : Id don't know why such an entry was set ...
- if(isset($attr['GOTOADMINPRINTER'])){
- unset($attr['GOTOADMINPRINTER']);
+ if($this->is_group){
+ $s_suffix = "Group";
+ $useVar = "cn";
+ }else{
+ $useVar = "uid";
+ $s_suffix = "User";
}
- /* Save changes */
- $ldap->cd($attr['dn']);
- unset($attr['dn']);
-$ldap->modify ($attr);
-
- if($ldap->get_error()!="Success"){
- print_red(_("Error while writing printer")." : ".$ldap->get_error());
+ /* Remove old entries */
+ $ldap->search("(&(objectClass=gotoPrinter)(goto".$s_suffix."Printer=".$this->uid."))",array("*"));
+ while($attr = $ldap->fetch()){
+ $printerObj = NULL;
+ $printerObj = new printtabs($this->config,$this->config->data['TABS']['PRINTTABS'],$attr['dn']);
+ $printerObj->by_object['printgeneric']->DelMember($types["goto".$s_suffix."Printer"],$this->uid);
+ $printerObj->by_object['printgeneric']->save();
}
- }
- /* All printers are cleaned, (our cn/uid removed)
- * now we must add our uid / cn
- * to the new configured printers.
- */
- foreach($this->gotoPrinter as $printer) {
- $ldap->cat($printer['dn']);
- $attrs= $ldap->fetch();
- $attrs_used = array();
- foreach($attrs as $key=>$val){
- if((!is_numeric($key))&&($key!="count")){
- if(is_array($val)&&isset($val['count'])){
- unset($val['count']);
- }
- $attrs_used[$key]=$val;
- }
+ $ldap->search("(&(objectClass=gotoPrinter)(goto".$s_suffix."AdminPrinter=".$this->uid."))",array("*"));
+ while($attr = $ldap->fetch()){
+ $printerObj = NULL;
+ $printerObj = new printtabs($this->config,$this->config->data['TABS']['PRINTTABS'],$attr['dn']);
+ $printerObj->by_object['printgeneric']->DelMember($types["goto".$s_suffix."AdminPrinter"],$this->uid);
+ $printerObj->by_object['printgeneric']->save();
}
- /* $attrs contains all values
- * we need, to save the entry lateron
- */
- $attrs= $attrs_used;
- /* Depending on the type (User/Admin)
- * switch these attributes, that makes it easier
- */
- if($printer['mode'] == "user"){
- $attribute = "goto".$s_suffix."Printer";
- $attribute2 = "goto".$s_suffix."AdminPrinter";
- }else{
- $attribute = "goto".$s_suffix."AdminPrinter";
- $attribute2 = "goto".$s_suffix."Printer";
- }
+ foreach($this->gotoPrinter as $printer){
+ $printerObj = NULL;
+ $printerObj = new printtabs($this->config,$this->config->data['TABS']['PRINTTABS'],$printer['dn']);
- /* If this user is already assigned to $attribute2
- * delete user from $attribute2, to be albe to attach him to $attribute
- * A user can't be admin and normal user for one printer
- */
- if(!isset($printer[$attribute2])){
- $printer[$attribute2]=array();
- }else{
- if(in_array($this->uid,$printer[$attribute2])){
- $tmp = array_flip($printer[$attribute2]);
- unset($tmp[$this->uid]);
- $attrs[$attribute2]=array_flip($tmp);
- }
- /* If Last entry removed, clear attribute*/
- if(empty($attrs[$attribute2])){
- $attrs[$attribute2]=array();
- }
- }
-
- /* Attach user to the $attribute, if he is'nt already attached
- */
- if(!isset($attrs[$attribute])){
- $attrs[$attribute]=array($this->uid);
- }else{
- unset($attrs[$attribute]['count']);
- if(!in_array($this->uid,$attrs[$attribute])){
- $attrs[$attribute][]=$this->uid;
+ if($printer['mode'] == "admin") {
+ $attribute = "goto".$s_suffix."AdminPrinter";
+ }else{
+ $attribute = "goto".$s_suffix."Printer";
}
- }
-
- $ldap->cd($attrs['dn']);
- unset($attrs['dn']);
-$ldap->modify ($attrs);
- if($ldap->get_error()!="Success"){
- print_red(_("Error while writing printer settings")." : ".$ldap->get_error());
+ $printerObj->by_object['printgeneric']->AddMember($types[$attribute],$this->dn);
+ $printerObj->by_object['printgeneric']->save();
}
}
-
+
/* Prepare HotPlug devices */
$this->attrs['gotoHotplugDevice'] = array();
foreach($this->gotoHotplugDevices as $name => $device){
/* Prepare Shares */
$this->attrs['gotoShare']=array();
foreach($this->gotoShares as $name => $share){
- $this->attrs['gotoShare'][] =$share['server']."|".$share['name']."|".$share['mountPoint']."|".$share['PwdHash']."|".$share['Username'];
+ $mntp= $share['mountPoint'];
+ if (!preg_match('=^[a-z0-9+\._/%-]+$=i', $mntp)){
+ $mntp= base64_encode($mntp);
+ }
+ $this->attrs['gotoShare'][] =$share['server']."|".$share['name']."|".$mntp."|".$share['PwdHash']."|".$share['Username'];
}
$this->cleanup();
$ldap->$mode($this->attrs);
show_ldap_error($ldap->get_error(), _("Adding environment information failed"));
- $this->handle_post_events($mode);
+ $this->handle_post_events($mode,array("uid"=>$this->uid));
}
/* Generate ListBox frindly output for the defined shares
$a_return = array();
if(is_array($this->gotoShares)){
foreach($this->gotoShares as $share){
- $a_return[$share['name']."|".$share['server']]= preg_replace("/^!/","",$share['server'])."://".$share['name']." on ".$share['mountPoint']." as ".$share['Username'];
+ if(preg_match("/^!/",$share['server'])){
+ $a_return[$share['name']."|".$share['server']]= preg_replace("/^!/","",$share['server'])."://".$share['name']." - "._("group share");
+ }else{
+ $a_return[$share['name']."|".$share['server']]= $share['server']."://".$share['name']." on ".$share['mountPoint']." as ".$share['Username'];
+ }
}
}
return($a_return);