![[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 372c6b7e1bde2bb21b0c203c2dbc68d5f2d439b9..c42b2ad25eafb075c7c754b6b20ab8f66cd4d0ef 100644 (file)
var $gotoLogonScript = ""; // The selected Logon Script
/* Printer */
- var $gotoPrinters = array();// All available Printer
- var $gotoPrinter = ""; // The selected Printer
+ var $gotoPrinter = array();// All available Printer, with their configurations
+ var $gotoPrinterSel = ""; // The selected Printer
/* Share */
- var $gotoShares = array();// Currently Share Option
+ var $gotoShares = array();// Current Share Options
var $gotoShare = ""; // currently selected Share Option
var $gotoShareSelections= array();// Available Shares for this account in Listbox format
var $gotoAvailableShares= array();// Available Shares for this account
/* general settings */
// Sets the attributes which will kept on page reload, which will be saved, ...
- var $attributes = array("uid","useProfile","gotoProfileServer","gotoProfileServers","gotoProfileFlags","gotoProfileFlag_C",
- "gotoXResolution","gotoXResolutions","gotoProfileFlag_L","gotoProfileQuota",
+ var $attributes = array("uid","gotoProfileServer","gotoProfileFlags",
+ "gotoXResolution","gotoProfileQuota",
"gotoLogonScripts","gotoLogonScript",
- "gotoPrinters","gotoPrinter",
- "gotoShares","gotoShare","gotoShareSelections",
+ "gotoPrinter",
+ "gotoShares","gotoShare",
"gotoKioskProfile","gotoKioskProfiles",
- "gotoHotplugDevice","gotoHotplugDevices");
+ "gotoHotplugDevices");
var $objectclasses = array("gotoEnvironment"); // Specifies the objectClass which contains the attributes edited here
var $cn;
plugin::plugin ($config, $dn);
-
+ /* Check : Are we currently editing a group or user dialog */
if((isset($this->attrs['cn'][0]))&&(!isset($this->attrs['uid'][0]))){
$suffix="Group";
$this->uid = $this->attrs['cn'][0];
$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']);
$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";
+ $this->gotoPrinter[$printer['cn'][0]]=$printer;
+ $this->gotoPrinter[$printer['cn'][0]]['mode']="user";
}
$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";
+ $this->gotoPrinter[$printer['cn'][0]]=$printer;
+ $this->gotoPrinter[$printer['cn'][0]]['mode']="admin";
}
-
+
/* prepare hotplugs */
if((isset($this->attrs['gotoHotplugDevice']))&&(is_array($this->attrs['gotoHotplugDevice']))){
unset($this->attrs['gotoHotplugDevice']['count']);
$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;
}
}
foreach($this->attrs['gotoShare'] as $share){
$tmp = $tmp2 = array();
$tmp = split("\|",$share);
- $tmp2['name'] =$tmp[0];
- $tmp2['mountPoint']=base64_decode($tmp[1]);
- $this->gotoShares[$tmp[0]]=$tmp2;
+ $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;
}
}
$this->is_group = true;
}
+ $this->gotoProfileServers= $config->getShareServerList() ;
+ $this->gotoShareSelections= $config->getShareList(true);
+ $this->gotoAvailableShares= $config->getShareList(false);
}
function execute()
{
- /* 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
- */
+ /* 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*/
+ $smarty->assign($s_attr,$this->$s_attr);
+
+ /* Set checkbox state*/
+ if(empty($this->$s_attr)){
+ $smarty->assign($s_attr."CHK","");
+ }else{
+ $smarty->assign($s_attr."CHK"," checked ");
+ }
+
+ /* Prepare ACL settings*/
+ if(chkacl($this->acl,$s_attr)=="") {
+ $smarty->assign($s_attr."ACL","");
+ }else{
+ $smarty->assign($s_attr."ACL"," disabled ");
+ }
+
+ }
- print_a($this);
+ /* Is accout enabled | are we editing from usermenu or admin menu
+ All these tab management is done here
+ */
- /* Working from Usermenu an the Account is currently disbled
+ /* 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
*/
*/
$smarty->assign("is_account","true");
+ $this->is_group = false;
+
/* Do we need to flip is_account state? */
if (isset($_POST['modify_state'])){
$this->is_account= !$this->is_account;
}
}
+
+ foreach(array("gotoHotplugDevice","gotoPrinterSel") as $s_attr){
+ if(chkacl($this->acl,$s_attr)=="") {
+ $smarty->assign($s_attr."ACL","");
+ }else{
+ $smarty->assign($s_attr."ACL"," disabled ");
+ }
+ }
+ $smarty->assign("useProfileACL","");
if($this->acl != "#none#"){
$smarty->assign("useProfileACL","");
}else{
$smarty->assign("gotoProfileFlag_CACL"," disabled ");
+ $smarty->assign("useProfileACL","disabled");
$smarty->assign("gotoProfileServer"," disabled ");
}
* Assign this all to Smarty
*/
+ if(empty($this->gotoProfileFlag_L)){
+ $smarty->assign("gotoProfileFlag_LCHK"," ");
+ }else{
+ $smarty->assign("gotoProfileFlag_LCHK"," checked ");
+ }
+
+ if(empty($this->gotoProfileFlag_C)){
+ $smarty->assign("gotoProfileFlag_CCHK"," ");
+ }else{
+ $smarty->assign("gotoProfileFlag_CCHK"," checked ");
+ }
+
if(empty($this->useProfile)){
$smarty->assign("gotoProfileACL","disabled");
$smarty->assign("useProfileCHK","");
}
$this->gotoXResolutions = array("640x480","800x600","1024x768","1280x768","1280x1024");
- $this->gotoProfileServers =$this->getShareServerList() ;
$smarty->assign("gotoXResolutions",$this->gotoXResolutions);
$smarty->assign("gotoProfileServers",$this->gotoProfileServers);
+ if(!is_array($this->gotoProfileServers)){
+ $this->gotoProfileServers =array();
+ }
$smarty->assign("gotoProfileServerKeys",array_flip($this->gotoProfileServers));
/* Handle kiosk profiles
* Open management if post is transmitted
*/
- /* 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;
- }
-
/* Save */
if(isset($_POST['KioskClose'])){
$this->newKioskProfiles = array_merge($this->newKioskProfiles,$this->dialog->save());
$tmp = new kioskManagementDialog($this->config,$this->dn);
$list = $tmp->getKioskProfiles($this->newKioskProfiles);
+ /* Reassign help class */
+ $_SESSION['current_class_for_help'] = get_class($this);
+
+ /* 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;
+ }
+
$smarty->assign("gotoKioskProfiles",$list);
$smarty->assign("gotoKioskProfileKeys",array_flip($list));
* and attach this combination to his setup.
*/
- $this->gotoShareSelections = $this->getShareList(true);
- $this->gotoAvailableShares = $this->getShareList(false);
-
$smarty->assign("gotoShareSelections", $this->gotoShareSelections);
+ if(!is_array($this->gotoShareSelections)){
+ print $this->gotoShareSelections;
+ $this->gotoShareSelections = array();
+ }
$smarty->assign("gotoShareSelectionKeys", array_flip($this->gotoShareSelections));
/* if $_POST['gotoShareAdd'] is set, we will try to add a new entry
/* 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($_POST['gotoShareMountPoint'][0] !="/" ){
+ print_red(_("You must specify a valid mount point."));
}else{
$a_share = $this->gotoAvailableShares[$_POST['gotoShareSelection']];
$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;
}
}
$this->dialog->save_object();
$tmp = $this->dialog->save();
$tmp2= $this->dialog->getPrinter(true);
- $this->gotoPrinters[$tmp]=$tmp2[$tmp];
- $this->gotoPrinters[$tmp]['mode']="user";
+ $this->gotoPrinter[$tmp]=$tmp2[$tmp];
+ $this->gotoPrinter[$tmp]['mode']="user";
$this->is_dialog=false;
unset($this->dialog);
$this->dialog =NULL;
}
}
- if((isset($_POST['gotoPrinterDel']))&&(isset($_POST['gotoPrinter']))&&(!empty($_POST['gotoPrinter']))){
- $printer = $_POST['gotoPrinter'];
- unset($this->gotoPrinters[$printer]);
+ if((isset($_POST['gotoPrinterDel']))&&(isset($_POST['gotoPrinterSel']))&&(!empty($_POST['gotoPrinterSel']))){
+ $printer = $_POST['gotoPrinterSel'];
+ unset($this->gotoPrinter[$printer]);
}
- if((isset($_POST['gotoPrinterEdit']))&&(isset($_POST['gotoPrinter']))&&(!empty($_POST['gotoPrinter']))){
- $printer = $_POST['gotoPrinter'];
- if($this->gotoPrinters[$printer]['mode']=="user"){
- $this->gotoPrinters[$printer]['mode']="admin";
+ if((isset($_POST['gotoPrinterEdit']))&&(isset($_POST['gotoPrinterSel']))&&(!empty($_POST['gotoPrinterSel']))){
+ $printer = $_POST['gotoPrinterSel'];
+ if($this->gotoPrinter[$printer]['mode']=="user"){
+ $this->gotoPrinter[$printer]['mode']="admin";
}else{
- $this->gotoPrinters[$printer]['mode']="user";
+ $this->gotoPrinter[$printer]['mode']="user";
}
}
- $smarty->assign("gotoPrinters",$this->printOutPrinterDevices());
+ $smarty->assign("gotoPrinter",$this->printOutPrinterDevices());
$smarty->assign("gotoPrinterKeys",array_flip($this->printOutPrinterDevices()));
/* General behavior */
plugin::remove_from_parent();
/* Don't save our template variables */
- $skip = array("useProfile","uid","gotoProfileServers","gotoProfileFlag_C","gotoXResolutions","gotoProfileFlag_L",
- "gotoLogonScripts","gotoPrinters","gotoShares","gotoShareSelections","gotoKioskProfiles","gotoHotplugDevices",
- "gotoPrinter");
+ $skip = array("uid",
+ "gotoLogonScripts","gotoPrinter","gotoShares","gotoKioskProfiles","gotoHotplugDevices" );
/* Skip all these attributes */
foreach($skip as $del){
unset($this->attrs[$del]);
/* Get all Posted vars
* Setup checkboxes
*/
+
+
if(isset($_POST['iamposted'])){
+ if(isset($_POST['useProfile'])){
+ $this->useProfile = $_POST['useProfile'];
+ }else{
+ $this->useProfile = true;
+ }
+ if(isset($_POST['gotoProfileFlag_C'])){
+ $this->gotoProfileFlag_C = $_POST['gotoProfileFlag_C'];
+ }else{
+ $this->gotoProfileFlag_C = false;
+ }
+ if(isset($_POST['gotoProfileFlag_L'])){
+ $this->gotoProfileFlag_L = $_POST['gotoProfileFlag_L'];
+ }else{
+ $this->gotoProfileFlag_L = false;
+ }
+
plugin::save_object();
foreach($this->attributes as $s_attr){
- if(in_array($s_attr,array("gotoShares","gotoHotplugDevices","gotoPrinters","gotoLogonScripts","uid"))) continue;
+ if(in_array($s_attr,array("gotoShares","gotoHotplugDevices","gotoPrinter","gotoLogonScripts","uid"))) continue;
if(isset($_POST[$s_attr])){
$this->$s_attr = $_POST[$s_attr];
}else{
$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'];
/* Save usersettings to Printer */
if(chkacl($this->acl,"gotoPrinter")!=""){
- $this->gotoPrinters = array();
+ $this->gotoPrinter = array();
}
if($this->is_group){
}
- if(count($this->gotoPrinters)==0){
- $ldap->search("(&(objectClass=gotoPrinter)(|(goto".$s_suffix."Printer=".$this->uid.")(goto".$s_suffix."AdminPrinter=".$this->uid.")))",array("*"));
- while($attr = $ldap->fetch()){
-
+ /* 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.
+ */
+
+ /* 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]);
}
}
+ }
+ /* 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")){
- $attrs_used = array();
- foreach($attr as $key=>$val){
- if((!is_numeric($key))&&($key!="count")){
- if(is_array($val)&&isset($val['count'])){
- unset($val['count']);
- }
- $attrs_used[$key]=$val;
+ /* If entry contains 'count' remove it */
+ if(is_array($val)&&isset($val['count'])){
+ unset($val['count']);
}
+ $attrs_used[$key]=$val;
}
- $attr= $attrs_used;
- $tmp =array();
- foreach($attr['goto'.$s_suffix.'AdminPrinter'] as $print){
- $tmp[]=$print;
- }
- $attr['goto'.$s_suffix.'AdminPrinter'] = $tmp;
+ }
+ /* the result of cleaning the entry is
+ * to be able to directly save this again,
+ * if all changes are made
+ */
+ $attr= $attrs_used;
- $tmp =array();
- foreach($attr['goto'.$s_suffix.'Printer'] as $print){
- $tmp[]=$print;
- }
- $attr['goto'.$s_suffix.'Printer'] = $tmp;
+#fix : Id don't know why such an entry was set ...
+ if(isset($attr['GOTOADMINPRINTER'])){
+ unset($attr['GOTOADMINPRINTER']);
+ }
- $ldap->cd($attr['dn']);
- unset($attr['dn']);
- $ldap->modify($attr);
- if($ldap->get_error()!="Success"){
- print_red(_("Error while writing printer")." : ".$ldap->get_error());
- }
+ /* 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());
}
- }
+ }
- foreach($this->gotoPrinters as $printer) {
+ /* 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->cd($printer['dn']);
$ldap->cat($printer['dn']);
$attrs= $ldap->fetch();
$attrs_used[$key]=$val;
}
}
+ /* $attrs contains all values
+ * we need, to save the entry lateron
+ */
$attrs= $attrs_used;
- /* Filter entries */
-
+ /* 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."UserPrinter";
+ $attribute2 = "goto".$s_suffix."Printer";
}
/* If this user is already assigned to $attribute2
$printer[$attribute2]=array();
}else{
if(in_array($this->uid,$printer[$attribute2])){
- $tmp = array_flip($attrs[$attribute2]);
+ $tmp = array_flip($printer[$attribute2]);
unset($tmp[$this->uid]);
$attrs[$attribute2]=array_flip($tmp);
}
}
}
- $tmp =array();
- if(isset($attrs['goto'.$s_suffix.'AdminPrinter'])){
- foreach($attrs['goto'.$s_suffix.'AdminPrinter'] as $print){
- $tmp[]=$print;
- }
- }
- $attrs['goto'.$s_suffix.'AdminPrinter'] = $tmp;
-
- $tmp =array();
- if(isset($attrs['goto'.$s_suffix.'Printer'])){
- foreach($attrs['goto'.$s_suffix.'Printer'] as $print){
- $tmp[]=$print;
- }
- }
- $attrs['goto'.$s_suffix.'Printer'] = $tmp;
-
$ldap->cd($attrs['dn']);
unset($attrs['dn']);
$ldap->modify($attrs);
}
}
- if(isset($this->attrs['gotoPrinter'])){
- unset($this->attrs['gotoPrinter']);
- }
-
/* 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['name']."|".base64_encode($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)){
$this->handle_post_events($mode);
}
-/* This function returns all available Shares defined in this ldap
- * There are two ways to call this function, if listboxEntry is true
- * only name and path are attached to the array, in it is false, the whole
- * entry will be parsed an atached to the result.
- */
- function getShareList($listboxEntry = false)
- {
- $ldap= $this->config->get_ldap_link();
- $a_res = $ldap->search("(objectClass=goShareServer)",array("goExportEntry"));
- $return= array();
- while($entry = $ldap->fetch($a_res)){
- unset($entry['goExportEntry']['count']);
- foreach($entry['goExportEntry'] as $export){
- $shareAttrs = split("\|",$export);
- if($listboxEntry) {
- $return[$shareAttrs[0]] = $shareAttrs[0]." - ".$shareAttrs[4];
- }else{
- $return[$shareAttrs[0]]['name'] = $shareAttrs[0];
- $return[$shareAttrs[0]]['description'] = $shareAttrs[1];
- $return[$shareAttrs[0]]['type'] = $shareAttrs[2];
- $return[$shareAttrs[0]]['charset'] = $shareAttrs[3];
- $return[$shareAttrs[0]]['path'] = $shareAttrs[4];
- $return[$shareAttrs[0]]['option'] = $shareAttrs[5];
- }
- }
- }
- return($return);
- }
-
-
-/* This function returns all available ShareServer
- */
- function getShareServerList()
- {
- $ldap= $this->config->get_ldap_link();
- $a_res = $ldap->search("(objectClass=goShareServer)",array("goExportEntry","cn"));
- $return= array();
- while($entry = $ldap->fetch($a_res)){
- $return[$entry['cn'][0]] = $entry['cn'][0];
- }
- return($return);
- }
-
/* Generate ListBox frindly output for the defined shares
* Possibly Add or remove an attribute here,
*/
$a_return = array();
if(is_array($this->gotoShares)){
foreach($this->gotoShares as $share){
- $a_return[$share['name']]= $share['name']." ".$share['mountPoint'];
+ $a_return[$share['name']."|".$share['server']]= $share['server']."://".$share['name']." on ".$share['mountPoint'];
}
}
return($a_return);
function printOutPrinterDevices()
{
$a_return = array();
- if(is_array($this->gotoPrinters)){
- foreach($this->gotoPrinters as $printer){
+ if(is_array($this->gotoPrinter)){
+ foreach($this->gotoPrinter as $printer){
if($printer['mode'] == "admin"){
$a_return[$printer['cn'][0]]= $printer['cn'][0]." - "._("Admin");
}else{