From 7cc2d15c3bc4e98e61273ee137d45b5ca6e79110 Mon Sep 17 00:00:00 2001 From: hickert Date: Fri, 27 Jan 2006 12:23:45 +0000 Subject: [PATCH] Added user to gotoShare attribute git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2594 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/personal/environment/class_environment.inc | 11 ++++++----- plugins/personal/environment/environment.tpl | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/plugins/personal/environment/class_environment.inc b/plugins/personal/environment/class_environment.inc index dcbe0bdb4..069e87044 100644 --- a/plugins/personal/environment/class_environment.inc +++ b/plugins/personal/environment/class_environment.inc @@ -146,9 +146,9 @@ class environment extends plugin $tmp2['name'] =$tmp[1]; $tmp2['mountPoint'] =$tmp[2]; if(isset($tmp[3])){ - $tmp2['OtherStuff'] =$tmp[3]; + $tmp2['Username'] =$tmp[3]; }else{ - $tmp2['OtherStuff'] =""; + $tmp2['Username'] =""; } $this->gotoShares[$tmp[1]."|".$tmp[0]]=$tmp2; } @@ -506,9 +506,10 @@ class environment extends plugin }else{ $a_share = $this->gotoAvailableShares[$_POST['gotoShareSelection']]; $s_mount = $_POST['gotoShareMountPoint']; + $s_user = $_POST['ShareUser']; /* Preparing the new assignment */ $this->gotoShares[$a_share['name']]=$a_share; - $this->gotoShares[$a_share['name']]['OtherStuff']=""; + $this->gotoShares[$a_share['name']]['Username']=$s_user; $this->gotoShares[$a_share['name']]['mountPoint']=$s_mount; } } @@ -948,7 +949,7 @@ class environment extends plugin /* Prepare Shares */ $this->attrs['gotoShare']=array(); foreach($this->gotoShares as $name => $share){ - $this->attrs['gotoShare'][] =$share['server']."|".$share['name']."|".$share['mountPoint']."|".$share['OtherStuff']; + $this->attrs['gotoShare'][] =$share['server']."|".$share['name']."|".$share['mountPoint']."|".$share['Username']; } if((!empty($this->gotoKioskProfile))&&($this->gotoKioskProfile != "none")){ @@ -1019,7 +1020,7 @@ class environment extends plugin if(is_array($this->gotoShares)){ foreach($this->gotoShares as $share){ if (!preg_match('/^!/', $share['server'])){ - $a_return[$share['name']."|".$share['server']]= $share['server']."://".$share['name']." on ".$share['mountPoint']; + $a_return[$share['name']."|".$share['server']]= $share['server']."://".$share['name']." on ".$share['mountPoint']." as ".$share['Username']; } } } diff --git a/plugins/personal/environment/environment.tpl b/plugins/personal/environment/environment.tpl index 5e9777ffb..0001a68c8 100644 --- a/plugins/personal/environment/environment.tpl +++ b/plugins/personal/environment/environment.tpl @@ -116,6 +116,7 @@ + -- 2.30.2