![[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 879f2bc69f96684d99b789d388757316104e55c6..6ec5f58fce0dafe4dca5246c2ea4080180bf1aef 100644 (file)
var $in_dialog = false;
var $uid = "";
+
+ var $is_group = false;
+
/* Attribute definition
*/
var $gotoProfileFlags = ""; // Flags enabled ? only used to set ACL and save
var $gotoProfileFlag_C = ""; // Flag is set to C if we have the profile caching fucntion enabled
- var $gotoXResolution = ""; // The selected resolution eg: 1024x768
+ var $gotoXResolution = "1024x768"; // The selected resolution eg: 1024x768
var $gotoXResolutions = array();// Contains all available resolutions for this account
var $gotoProfileFlag_L = ""; // Flag is set to L to enable runtime resolution change
var $gotoProfileQuota = ""; // User Quota Settings
"gotoKioskProfile","gotoKioskProfiles",
"gotoHotplugDevice","gotoHotplugDevices");
var $objectclasses = array("gotoEnvironment"); // Specifies the objectClass which contains the attributes edited here
+ var $cn;
function environment ($config, $dn= NULL)
{
plugin::plugin ($config, $dn);
+
+
+ if((isset($this->attrs['cn'][0]))&&(!isset($this->attrs['uid'][0]))){
+ $suffix="Group";
+ $this->uid = $this->attrs['cn'][0];
+ $this->attrs['uid'] = $this->attrs['cn'][0];
+ }else{
+ $suffix="User";
+ }
+
/* Get all Printer assignments */
$ldap = $this->config->get_ldap_link();
$ldap->cd($this->config->current['BASE']);
- $ldap->search("(&(objectClass=gotoPrinter)(gotoUserPrinter=".$this->uid."))",array("*"));
+ $ldap->search("(&(objectClass=gotoPrinter)(goto".$suffix."Printer=".$this->uid."))",array("*"));
while($printer = $ldap->fetch()){
$this->gotoPrinters[$printer['cn'][0]]=$printer;
$this->gotoPrinters[$printer['cn'][0]]['mode']="user";
}
- $ldap->search("(&(objectClass=gotoPrinter)(gotoAdminPrinter=".$this->uid."))",array("*"));
+ $ldap->search("(&(objectClass=gotoPrinter)(goto".$suffix."AdminPrinter=".$this->uid."))",array("*"));
while($printer = $ldap->fetch()){
$this->gotoPrinters[$printer['cn'][0]]=$printer;
$this->gotoPrinters[$printer['cn'][0]]['mode']="admin";
}
-
+
/* prepare hotplugs */
if((isset($this->attrs['gotoHotplugDevice']))&&(is_array($this->attrs['gotoHotplugDevice']))){
unset($this->attrs['gotoHotplugDevice']['count']);
$tmp = $tmp2 = array();
$tmp = split("\|",$share);
$tmp2['name'] =$tmp[0];
- $tmp2['mountPoint']=$tmp[1];
+ $tmp2['mountPoint']=base64_decode($tmp[1]);
$this->gotoShares[$tmp[0]]=$tmp2;
}
}
$this->useProfile = false;
}
+ /* Set to group environment if we editing a group */
+ if(!isset($this->parent)){
+ $this->is_group = true;
+ }
+
+
}
function execute()
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)){
/* We are currently editing this tab from usermenu, but this account is not enabled */
$smarty->assign("is_account",$this->is_account);
$display .= back_to_main();
/* Display our message to the user */
return $display;
+
+
+ /* 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_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;
+ }
- // Account is enabled
+ /* 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((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;
}
}
/* Open Management Dialog */
if(isset($_POST['KioskManagementDialog'])){
$this->dialog = new kioskManagementDialog($this->config,$this->dn,$this->newKioskProfiles);
+ $this->dialog->parent= $this;
$this->is_dialog = true;
}
*/
if(isset($_POST['gotoShareAdd'])){
/* We assign a share to this user, if we don't know where to mount the share */
- if((!isset($_POST['gotoShareMountPoint']))||(empty($_POST['gotoShareMountPoint']))){
- print_red("You must specify a valid mount point.");
+ if((!isset($_POST['gotoShareMountPoint']))||(empty($_POST['gotoShareMountPoint']))||(preg_match("/[\|]/i",$_POST['gotoShareMountPoint']))){
+ print_red(_("You must specify a valid mount point."));
}else{
$a_share = $this->gotoAvailableShares[$_POST['gotoShareSelection']];
$s_mount = $_POST['gotoShareMountPoint'];
if(preg_match("/[^0-9]/",$this->gotoProfileQuota)) {
$message[]=_("Please set a valid profile quota size.");
- }
-
- if(!((in_array("posixAccount",$this->attrs['objectClass']))||($this->parent->by_object['posixAccount']->is_account==true))){
- $message[]=(_("You need to setup a valid posix extension in order to enable evironment features."));
+ }
+ if(!isset($this->attrs['objectClass'])){
+ $this->attrs['objectClass']=array();
+ }
+ if(!$this->is_group){
+ if((!((in_array("posixAccount",$this->attrs['objectClass']))||($this->parent->by_object['posixAccount']->is_account==true)))&&(!$this->is_group)){
+ $message[]=(_("You need to setup a valid posix extension in order to enable evironment features."));
+ }
}
-
return ($message);
}
$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'];
$fp = @fopen($path."/".$file['name'],"w");
if(!$fp){
- print_red("Can't save new kiosk profiles, possibly permission denied for folder :",$path);
+ print_red(_("Can't save new kiosk profiles, possibly permission denied for folder")." : ",$path);
}else{
fwrite($fp,$contents,strlen($contents));
}
@unlink($file['tmp_name']);
}
-
-
-
-
-
/* Save already used objectClasses */
$ocs = $this->attrs['objectClass'];
if(chkacl($this->acl,"gotoPrinter")!=""){
$this->gotoPrinters = array();
}
+
+ if($this->is_group){
+ $s_suffix = "Group";
+ }else{
+ $s_suffix = "User";
+ }
+
if(count($this->gotoPrinters)==0){
- $ldap->search("(&(objectClass=gotoPrinter)(|(gotoUserPrinter=".$this->uid.")(gotoAdminPrinter=".$this->uid.")))",array("*"));
+ $ldap->search("(&(objectClass=gotoPrinter)(|(goto".$s_suffix."Printer=".$this->uid.")(goto".$s_suffix."AdminPrinter=".$this->uid.")))",array("*"));
while($attr = $ldap->fetch()){
- foreach($attr['gotoUserPrinter'] as $key => $user){
+ foreach($attr['goto'.$s_suffix.'Printer'] as $key => $user){
if($this->uid==$user){
- unset($attr['gotoUserPrinter'][$key]);
+ unset($attr['goto'.$s_suffix.'Printer'][$key]);
}
}
- foreach($attr['gotoAdminPrinter'] as $key => $user){
+ foreach($attr['goto'.$s_suffix.'AdminPrinter'] as $key => $user){
if($this->uid==$user){
- unset($attr['gotoAdminPrinter'][$key]);
+ unset($attr['goto'.$s_suffix.'AdminPrinter'][$key]);
}
}
}
$attr= $attrs_used;
$tmp =array();
- foreach($attr['gotoAdminPrinter'] as $print){
+ foreach($attr['goto'.$s_suffix.'AdminPrinter'] as $print){
$tmp[]=$print;
}
- $attr['gotoAdminPrinter'] = $tmp;
+ $attr['goto'.$s_suffix.'AdminPrinter'] = $tmp;
$tmp =array();
- foreach($attr['gotoUserPrinter'] as $print){
+ foreach($attr['goto'.$s_suffix.'Printer'] as $print){
$tmp[]=$print;
}
- $attr['gotoUserPrinter'] = $tmp;
+ $attr['goto'.$s_suffix.'Printer'] = $tmp;
$ldap->cd($attr['dn']);
unset($attr['dn']);
$ldap->modify($attr);
if($ldap->get_error()!="Success"){
- print_red("Printer saving ".$ldap->get_error());
+ print_red(_("Error while writing printer")." : ".$ldap->get_error());
}
}
}
/* Filter entries */
if($printer['mode'] == "user"){
- $attribute = "gotoUserPrinter";
- $attribute2 = "gotoAdminPrinter";
+ $attribute = "goto".$s_suffix."Printer";
+ $attribute2 = "goto".$s_suffix."AdminPrinter";
}else{
- $attribute = "gotoAdminPrinter";
- $attribute2 = "gotoUserPrinter";
+ $attribute = "goto".$s_suffix."AdminPrinter";
+ $attribute2 = "goto".$s_suffix."UserPrinter";
}
/* If this user is already assigned to $attribute2
}
$tmp =array();
- if(isset($attrs['gotoAdminPrinter'])){
- foreach($attrs['gotoAdminPrinter'] as $print){
+ if(isset($attrs['goto'.$s_suffix.'AdminPrinter'])){
+ foreach($attrs['goto'.$s_suffix.'AdminPrinter'] as $print){
$tmp[]=$print;
}
}
- $attrs['gotoAdminPrinter'] = $tmp;
+ $attrs['goto'.$s_suffix.'AdminPrinter'] = $tmp;
$tmp =array();
- if(isset($attrs['gotoUserPrinter'])){
- foreach($attrs['gotoUserPrinter'] as $print){
+ if(isset($attrs['goto'.$s_suffix.'Printer'])){
+ foreach($attrs['goto'.$s_suffix.'Printer'] as $print){
$tmp[]=$print;
}
}
- $attrs['gotoUserPrinter'] = $tmp;
+ $attrs['goto'.$s_suffix.'Printer'] = $tmp;
$ldap->cd($attrs['dn']);
unset($attrs['dn']);
$ldap->modify($attrs);
if($ldap->get_error()!="Success"){
- print_red("Printer saving ".$ldap->get_error());
+ print_red(_("Error while writing printer settings")." : ".$ldap->get_error());
}
}
/* Prepare Shares */
$this->attrs['gotoShare']=array();
foreach($this->gotoShares as $name => $share){
- $this->attrs['gotoShare'][] = $share['name']."|".$share['mountPoint'];
+ $this->attrs['gotoShare'][] = $share['name']."|".base64_encode($share['mountPoint']);
}
if(!empty($this->gotoKioskProfile)){