diff --git a/plugins/personal/environment/class_environment.inc b/plugins/personal/environment/class_environment.inc
index e3ea8c8923deec7d2e1f21c1e42f5bf12d6c1335..c42b2ad25eafb075c7c754b6b20ab8f66cd4d0ef 100644 (file)
$suffix="User";
}
+ $this->gotoKioskProfile= preg_replace("/^.*\//i","",$this->gotoKioskProfile);
+
/* Get all Printer assignments */
$ldap = $this->config->get_ldap_link();
$ldap->cd($this->config->current['BASE']);
$tmp2['server'] =$tmp[0];
$tmp2['name'] =$tmp[1];
$tmp2['mountPoint'] =$tmp[2];
+ if(isset($tmp[3])){
+ $tmp2['OtherStuff'] =$tmp[3];
+ }else{
+ $tmp2['OtherStuff'] ="";
+ }
$this->gotoShares[$tmp[1]."|".$tmp[0]]=$tmp2;
}
}
/* Call parent execute */
plugin::execute();
+ /* Fill templating stuff */
+ $smarty= get_smarty();
+ $display= "";
+
/* Prepare all variables for smarty */
foreach($this->attributes as $s_attr){
/* Set value*/
}
- /* Fill templating stuff */
- $smarty= get_smarty();
- $display= "";
/* Is accout enabled | are we editing from usermenu or admin menu
All these tab management is done here
*/
$smarty->assign("useProfileACL","");
}else{
$smarty->assign("gotoProfileFlag_CACL"," disabled ");
+ $smarty->assign("useProfileACL","disabled");
$smarty->assign("gotoProfileServer"," disabled ");
}
$s_mount = $_POST['gotoShareMountPoint'];
/* Preparing the new assignment */
$this->gotoShares[$a_share['name']]=$a_share;
+ $this->gotoShares[$a_share['name']]['OtherStuff']="";
$this->gotoShares[$a_share['name']]['mountPoint']=$s_mount;
}
}
/* Prepare Shares */
$this->attrs['gotoShare']=array();
foreach($this->gotoShares as $name => $share){
- $this->attrs['gotoShare'][] =$share['server']."|".$share['name']."|".$share['mountPoint'];
+ $this->attrs['gotoShare'][] =$share['server']."|".$share['name']."|".$share['mountPoint']."|".$share['OtherStuff'];
}
if(!empty($this->gotoKioskProfile)){
- $this->attrs['gotoKioskProfile']= $this->gotoKioskProfile;
+ if(preg_match("/https/i",$_SERVER['HTTP_REFERER'])){
+ $method="https://";
+ }else{
+ $method="http://";
+ }
+
+ $str = $method.str_replace("//","/",$_SERVER['SERVER_NAME']."/kiosk/");
+ $this->attrs['gotoKioskProfile']= $str.$this->gotoKioskProfile;
}else{
$this->attrs['gotoKioskProfile']= array();
}
- $saveThis = array("gotoKioskProfile","gotoProfileQuota","gotoXResolution","gotoProfileServer");
+ $saveThis = array("gotoProfileQuota","gotoXResolution","gotoProfileServer");
foreach($saveThis as $tosave){
if(!empty($this->$tosave)){