![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/personal/environment/class_environment.inc b/plugins/personal/environment/class_environment.inc
index d353665d05179c280473d161745b9f5402b2bb2f..6ec5f58fce0dafe4dca5246c2ea4080180bf1aef 100644 (file)
$tmp = split("\|",$device);
$tmp2['name'] = $tmp[0];
$tmp2['description'] = $tmp[1];
- $tmp2['id'] = base64_decode($tmp[2]);
+ $tmp2['id'] = $tmp[2];
$this->gotoHotplugDevices[$tmp[0]]=$tmp2;
}
}
All these tab management is done here
*/
- // 1. Account disabled . Editing from usermenu
+ /* 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
+ */
if((!isset($this->parent))&&(!$this->is_account)){
- print "asdf";
/* We are currently editing this tab from usermenu, but this account is not enabled */
$smarty->assign("is_account",$this->is_account);
/* Load template */
$display .= back_to_main();
/* Display our message to the user */
return $display;
+
- // Account is enabled
+ /* We are currently editing from group tabs, because
+ * $this->parent is set
+ * posixAccount is not set, so we are not in usertabs.
+ */
}elseif((isset($this->parent))&&(!isset($this->parent->by_object['posixAccount']))){
- $smarty->assign("is_account","true");
- $this->is_Account = true;
- $this->is_group = true;
- $this->uid = $this->cn;
- $this->attrs['uid'] = $this->cn;
-
- if (isset($_POST['modify_state'])){
- $this->is_account= !$this->is_account;
- }
-
- // 3. Account enabled . Editing from adminmenu
- if ($this->is_account){
- $display= $this->show_header(_("Remove environment extension"),
- _("This server has environment extension enabled. You can disable it by clicking below."));
- } else {
- if((in_array("posixAccount",$this->attrs['objectClass']))){
- // 4. There is a PosixAccount
- $display= $this->show_header(_("Add environment extension"),
- _("This server has environment extension disabled. You can enable it by clicking below."));
- return $display;
- }else{
- // 4. There is a PosixAccount
- $display= $this->show_header(_("Add environment extension"),
- _("This server has environment extension disabled. You have to setup a posix account before you can enable this feature."));
- return $display;
- }
- }
-
+ $smarty->assign("is_account","true");
+ $this->is_group = true;
+ $this->uid = $this->cn;
+ $this->attrs['uid'] = $this->cn;
+ /* Change state if needed */
+ if (isset($_POST['modify_state'])){
+ $this->is_account= !$this->is_account;
+ }
+ /* Group Dialog with enabled environment options */
+ if ($this->is_account){
+ $display= $this->show_header(_("Remove environment extension"),
+ _("Environment extension enabled. You can disable it by clicking below."));
+ } else {
+
+ /* Environment is disabled
+ If theres is no posixAccount enabled, you won't be able to enable
+ environment extensions
+ */
+ if((isset($this->attrs['objectClass']))&&((in_array("posixAccount",$this->attrs['objectClass'])))){
+ // 4. There is a PosixAccount
+ $display= $this->show_header(_("Add environment extension"),
+ _("Environment extension disabled. You can enable it by clicking below."));
+ return $display;
+ }else{
+ // 4. There is no PosixAccount
+ $display= $this->show_header(_("Add environment extension"),
+ _("Environment extension disabled. You have to setup a posix account before you can enable this feature."));
+ return $display;
+ }
+ }
}else{
- /* Tell smarty that this accoutn is enabled */
+ /* Editing from Usermenu
+ * Tell smarty that this accoutn is enabled
+ */
$smarty->assign("is_account","true");
/* Do we need to flip is_account state? */
if (isset($_POST['modify_state'])){
$this->is_account= !$this->is_account;
}
- if(!isset($this->parent)){
- // 3. ? Account Enabled . Editing from usermenu
- }else{
+ if(isset($this->parent)){
// 3. Account enabled . Editing from adminmenu
if ($this->is_account){
$display= $this->show_header(_("Remove environment extension"),
- _("This server has environment extension enabled. You can disable it by clicking below."));
+ _("Environment extension enabled. You can disable it by clicking below."));
} else {
- if((isset($this->attrs['objectClass']))&&((in_array("posixAccount",$this->attrs['objectClass'])))||($this->parent->by_object['posixAccount']->is_account==true)){
+ if((isset($this->attrs['objectClass']))
+ &&((in_array("posixAccount",$this->attrs['objectClass'])))
+ ||($this->parent->by_object['posixAccount']->is_account==true)){
// 4. There is a PosixAccount
$display= $this->show_header(_("Add environment extension"),
- _("This server has environment extension disabled. You can enable it by clicking below."));
+ _("Environment extension disabled. You can enable it by clicking below."));
return $display;
}else{
// 4. There is a PosixAccount
$display= $this->show_header(_("Add environment extension"),
- _("This server has environment extension disabled. You have to setup a posix account before you can enable this feature."),TRUE,TRUE);
+ _("Environment extension disabled. You have to setup a posix account before you can enable this feature."),TRUE,TRUE);
return $display;
}
}
$realyUsedAttrs= array();
- $path = search_config($this->config->data['MENU'],"environment", "KIOSKPATH");
+ $path = search_config($this->config->data,"environment", "KIOSKPATH");
/* Creating Kiosk Profiles */
foreach($this->newKioskProfiles as $file){
$contents = $file['contents'];
/* Prepare HotPlug devices */
$this->attrs['gotoHotplugDevice'] = array();
foreach($this->gotoHotplugDevices as $name => $device){
- $this->attrs['gotoHotplugDevice'][] = $device['name']."|".$device['description']."|".base64_encode($device['id']);
+ $this->attrs['gotoHotplugDevice'][] = $device['name']."|".$device['description']."|".$device['id'];
}
/* Prepare LogonScripts */