From: hickert Date: Tue, 13 Dec 2005 09:53:28 +0000 (+0000) Subject: Added none to kioskprofiles X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=be62d9a928470450b97351501ee9eefcd26a94af;p=gosa.git Added none to kioskprofiles git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2303 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/plugins/personal/environment/class_environment.inc b/plugins/personal/environment/class_environment.inc index ca471c64a..63ceccd5f 100644 --- a/plugins/personal/environment/class_environment.inc +++ b/plugins/personal/environment/class_environment.inc @@ -48,7 +48,7 @@ class environment extends plugin var $gotoAvailableShares= array();// Available Shares for this account /* Kiosk profile */ - var $gotoKioskProfile = ""; // The selected Kiosk Profile + var $gotoKioskProfile = "none"; // The selected Kiosk Profile var $gotoKioskProfiles = array();// All available Kiosk profiles VAR $newKioskProfiles = array(); @@ -392,6 +392,10 @@ class environment extends plugin $tmp = new kioskManagementDialog($this->config,$this->dn); $list = $tmp->getKioskProfiles($this->newKioskProfiles); + $list['none']=_("None"); + + $list = array_reverse($list); + /* Reassign help class */ $_SESSION['current_class_for_help'] = get_class($this); @@ -932,7 +936,7 @@ class environment extends plugin $this->attrs['gotoShare'][] =$share['server']."|".$share['name']."|".$share['mountPoint']."|".$share['OtherStuff']; } - if(!empty($this->gotoKioskProfile)){ + if((!empty($this->gotoKioskProfile))&&($this->gotoKioskProfile != "none")){ if(preg_match("/https/i",$_SERVER['HTTP_REFERER'])){ $method="https://"; }else{