X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_workstationStartup.inc;h=3d4d1300dbe8a2c6d3fff8f8c13efbf8f4539f2d;hb=afecd435ef601ea27a281cc6667f94d7273b40e2;hp=2a03e655478a2bb74cbe3bf3a94fcf66c87e30b2;hpb=274c1b77ba78f47cea1c0bc4300b1a33e5354689;p=gosa.git
diff --git a/plugins/admin/systems/class_workstationStartup.inc b/plugins/admin/systems/class_workstationStartup.inc
index 2a03e6554..3d4d1300d 100644
--- a/plugins/admin/systems/class_workstationStartup.inc
+++ b/plugins/admin/systems/class_workstationStartup.inc
@@ -1,4 +1,5 @@
config->get_ldap_link();
$ldap->cd($this->config->current['BASE']);
- $this->goLdapServerList= $this->config->data['SERVERS']['LDAP'];
+ foreach($this->config->data['SERVERS']['LDAP'] as $server) {
+ $this->goLdapServerList[$server]= $server; // $this->config->data['SERVERS']['LDAP'];
+ }
$_SESSION['getAvailableClassesForThisRelease_CACHE'] = array();
$_SESSION['getAvailableClassesForThisRelease_CACHED_CLASSES'] = array();
- /* Search all FAI objects */
- $ldap->search("(|(objectClass=FAIpackageList)(objectClass=FAItemplate)(objectClass=FAIvariable)(objectClass=FAIscript)(objectClass=FAIhook)(objectClass=FAIprofile)(objectClass=FAIpartitionTable))",array("cn","objectClass","FAIdebianSection"));
- /* Sort all entries, and attach elementtype.
- * To be able to show the types in the listbox.
- */
- while($attr = $ldap->fetch()){
+ $ui = get_userinfo();
+ $res = get_list( "(|(objectClass=FAIpackageList)".
+ "(objectClass=FAItemplate)".
+ "(objectClass=FAIvariable)".
+ "(objectClass=FAIscript)".
+ "(objectClass=FAIhook)".
+ "(objectClass=FAIprofile)".
+ "(objectClass=FAIpartitionTable))",
+ $ui->subtreeACL,$this->config->current['BASE'],
+ array("cn","objectClass","FAIdebianSection"));
+
+ foreach($res as $attr){
$cn = $attr['cn'][0];
$_SESSION['getAvailableClassesForThisRelease_CACHED_CLASSES'][] = $attr;
@@ -110,8 +126,11 @@ class workstartup extends plugin
natcasesort($this->FAIclasses);
}
- $this->FAIclassInfo = $tmp2;
-
+ if(isset($tmp2)){
+ $this->FAIclassInfo = $tmp2;
+ } else {
+ $this->FAIclassInfo = array();
+ }
/* Build up an array like this one :
[$url]['SERVER'] = 'srv1-002';
@@ -252,36 +271,15 @@ class workstartup extends plugin
$this->orig_dn= $this->dn;
/* Handle inheritance value "default" */
- $this->gotoBootKernels= array("%default%" => '['._("inherited").']');
+ $this->gotoBootKernels= array();
- /* Get list of boot kernels */
- if (isset($this->config->data['TABS'])){
- $command= search_config($this->config->data['TABS'], get_class($this), "KERNELS");
-
- if (!check_command($command)){
- $message[]= sprintf(_("Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to exist."), $command,
- get_class($this));
- } else {
- $fh= popen($command, "r");
- while (!feof($fh)) {
- $buffer= trim(fgets($fh, 256));
-
- if ($buffer != ""){
- $this->gotoBootKernels[preg_replace('/:.*$/', '', $buffer)]= $buffer;
- }
- }
- pclose($fh);
- ksort($this->gotoBootKernels);
- }
-
- }
/* Load hardware list */
$ldap= $this->config->get_ldap_link();
$ldap->cd($this->config->current['BASE']);
$ldap->search("(&(objectClass=gotoWorkstationTemplate)(member=".$this->dn."))");
if ($ldap->count() == 1){
- $map= array("gotoLdapServer");
+ $map= array("gotoLdapServer","FAIclass","FAIdebianMirror","gotoBootKernel");
$attrs= $ldap->fetch();
foreach ($map as $name){
@@ -289,33 +287,70 @@ class workstartup extends plugin
continue;
}
-print_a($attrs);
switch ($name){
case 'gotoLdapServer':
- $this->goLdapServerList= array_merge(array('default' => _("inherited").' ['.$attrs[$name][0].']' ), $this->goLdapServerList);
+ $this->goLdapServerList= array_merge(array('default-inherited' => _("inherited").' ['.$attrs[$name][0].']' ), $this->goLdapServerList);
+ break;
+
+ case 'gotoBootKernel':
+ $this->gotoBootKernels['default-inherited']= _("inherited").' ['.$attrs[$name][0].']' ;
break;
-# case 'gotoXColordepth':
-# $this->XColordepths= array_merge(array('default' => $attrs[$name][0].' ['._("inherited").']' ), $this->XColordepths);
-# break;
-# case 'gotoXKbModel':
-# $this->XKbModels= array_merge(array('default' => $attrs[$name][0].' ['._("inherited").']' ), $this->XKbModels);
-# break;
-# case 'gotoXKbLayout':
-# $this->XKbLayouts= array_merge(array('default' => $attrs[$name][0].' ['._("inherited").']' ), $this->XKbLayouts);
-# break;
-# case 'gotoXKbVariant':
-# $this->XKBvariants= array_merge(array('default' => $attrs[$name][0].' ['._("inherited").']' ), $this->XKbVariants);
-# break;
-# case 'gotoMouseType':
-# $this->XMouseTypes= array_merge(array('default' => $attrs[$name][0].' ['._("inherited").']' ), $this->XMouseTypes);
-# break;
-# case 'gotoMousePort':
-# $this->XMousePorts= array_merge(array('default' => $attrs[$name][0].' ['._("inherited").']' ), $this->XMousePorts);
-# break;
+
+ case 'FAIclass':
+ $str = split(":",$attrs[$name][0]);
+ $this->InheritedFAIclass = split("\ ",trim($str[0]));
+ $this->InheritedFAIrelease = trim($str[1]);
+ break;
+
+ case 'FAIdebianMirror':
+ $this->InheritedFAIdebianMirror = $attrs[$name][0];
+ break;
+ }
+ }
+ }
+
+ /* Get list of boot kernels */
+ if (isset($this->config->data['TABS'])){
+ $command= search_config($this->config->data['TABS'], get_class($this), "KERNELS");
+
+ if (!check_command($command)){
+ $message[]= sprintf(_("Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to exist."), $command,
+ get_class($this));
+ } else {
+
+ $first = false;
+ $fh= popen($command, "r");
+ while (!feof($fh)) {
+ $buffer= trim(fgets($fh, 256));
+
+ if(!empty($buffer)){
+
+ $name=$value = $buffer;
+ if(preg_match("/:/",$buffer)){
+ $name = preg_replace("/:.*$/","",$buffer);
+ $value= preg_replace("/^.*:/","",$buffer);
+ $this->gotoBootKernels[$name]= $name.":".$value;
+ }else{
+ $this->gotoBootKernels[$name]= $value;
+ }
+ if($this->gotoBootKernel =="" ){
+ $this->gotoBootKernel = $name;
+ }
+
+ }
}
+ pclose($fh);
}
}
+ /* Turn to default, if we've nothing to inherit */
+ if (!isset($this->gotoBootKernels['default-inherited']) && $this->gotoBootKernel == "default-inherited"){
+ $this->gotoBootKernel= "default";
+ }
+
+ if(count($this->FAIclass)==0 && $this->FAIrelease == ""){
+ $this->FAIdebianMirror = "inherited";
+ }
}
@@ -333,28 +368,6 @@ print_a($attrs);
return($_SESSION['getAvailableClassesForThisRelease_CACHE'][$release]);
}
- /* Create cache with all classes
- */
- if((!isset($_SESSION['getAvailableClassesForThisRelease_CACHED_CLASSES'])) ||
- (!is_array($_SESSION['getAvailableClassesForThisRelease_CACHED_CLASSES'])) ||
- (count($_SESSION['getAvailableClassesForThisRelease_CACHED_CLASSES']) ==0 )){
-
- /* Get ldap connection */
- $ldap = $this->config->get_ldap_link();
- $ldap->cd($this->config->current['BASE']);
-
- /* Get possible classes ...
- This would be faste with some kind of caching ...
- */
- $ldap->search("(|(objectClass=FAIpackageList)(objectClass=FAItemplate)(objectClass=FAIvariable)(objectClass=FAIscript)(objectClass=FAIhook)(objectClass=FAIprofile)(objectClass=FAIpartitionTable))",array("cn"),true);
- /* Sort all entries, and attach elementtype.
- * To be able to show the types in the listbox.
- */
- while($attr = $ldap->fetch()){
- $_SESSION['getAvailableClassesForThisRelease_CACHED_CLASSES'][] = $attr;
- }
- }
-
/* Walk through cache and get out what we need.
*
* Function od : "$this->generateDNSyn($release)"
@@ -391,6 +404,8 @@ print_a($attrs);
function selectFriendlyClasses(){
$tmp=array();
+ if($this->FAIdebianMirror == "inherited") return($tmp);
+
/* check if the current release exists,
else select the first one ..
*/
@@ -576,13 +591,6 @@ print_a($attrs);
}
}
- /* Delete selected class from our list */
- if((isset($_POST['DelClass']))&&(isset($_POST['FAIclassSel']))){
- if(isset($this->FAIclass[$_POST['FAIclassSel']])){
- unset($this->FAIclass[$_POST['FAIclassSel']]);
- }
- }
-
/* Show main page */
$smarty= get_smarty();
$smarty->assign("SelectBoxLdapServer","");
@@ -602,11 +610,13 @@ print_a($attrs);
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'];
- /* Preparing the new assignment */
- $this->gotoShares[$a_share['name']."|".$a_share['server']]=$a_share;
- $this->gotoShares[$a_share['name']."|".$a_share['server']]['mountPoint']=$s_mount;
+ if(count($this->gotoAvailableShares)){
+ $a_share = $this->gotoAvailableShares[$_POST['gotoShareSelection']];
+ $s_mount = $_POST['gotoShareMountPoint'];
+ /* Preparing the new assignment */
+ $this->gotoShares[$a_share['name']."|".$a_share['server']]=$a_share;
+ $this->gotoShares[$a_share['name']."|".$a_share['server']]['mountPoint']=$s_mount;
+ }
}
}
@@ -618,6 +628,7 @@ print_a($attrs);
}
$smarty->assign("gotoShares",$this->printOutAssignedShares());
+ $smarty->assign("gotoSharesCount",count($this->printOutAssignedShares()));
$smarty->assign("gotoShareKeys",array_flip($this->printOutAssignedShares()));
$smarty->assign("gotoBootKernels",$this->gotoBootKernels);
@@ -641,7 +652,7 @@ print_a($attrs);
/* Add Entries
*/
- foreach($tmp as $server){
+ foreach($tmp as $key => $server){
$use ="";
if(($this->gotoLdapServer == $server) || ($found == false)) {
$found = true;
@@ -652,9 +663,9 @@ print_a($attrs);
$SelectBoxLdapServer->AddEntry(
array(
- array("string"=>$display),
- array("string"=>"",
- "attach"=>"style='border-right:0px;'")
+ array("string"=>"",
+ "attach"=>"style='border-left:0px;'"),
+ array("string"=>$display)
));
}
@@ -672,11 +683,13 @@ print_a($attrs);
}
$smarty->assign("FAIdebianMirrors",$this->getFAIdebianMirrors());
+ $smarty->assign("FAIdebianMirror",$this->FAIdebianMirror);
$smarty->assign("FAIreleases",$this->getFAIreleases());
$smarty->assign("FAIrelease",$this->FAIrelease);
$smarty->assign("FAIclasses",$this->selectFriendlyClasses());
$smarty->assign("FAIclassesKeys",array_flip($this->selectFriendlyClasses()));
$smarty->assign("FAIclassKeys",$this->FAIclass);
+ $smarty->assign("InheritedFAIrelease",$this->InheritedFAIrelease);
$div = new divSelectBox("WSFAIscriptClasses");
$div -> SetHeight("110");
@@ -686,18 +699,35 @@ print_a($attrs);
$str_empty = "
";
$i = 1;
- foreach($this->FAIclass as $class){
- if($i==1){
- $str = $str_empty.$str_down.$str_remove;
- }elseif($i == count($this->FAIclass)){
- $str = $str_up.$str_empty.$str_remove;
+
+ if($this->FAIdebianMirror == "inherited"){
+ $tmp = $this->InheritedFAIclass;
+ }else{
+ $tmp = $this->FAIclass;
+ }
+
+ foreach($tmp as $class){
+
+ $marker = "";
+ if(in_array_ics($class,$this->unresolved_classes)){
+ $marker = " ("._("Not available in current setup").")";
+ }
+
+ if($this->FAIdebianMirror == "inherited"){
+ $str = "";
}else{
- $str = $str_up.$str_down.$str_remove;
+ if($i==1){
+ $str = $str_empty.$str_down.$str_remove;
+ }elseif($i == count($this->FAIclass)){
+ $str = $str_up.$str_empty.$str_remove;
+ }else{
+ $str = $str_up.$str_down.$str_remove;
+ }
}
$i ++ ;
$div->AddEntry(array(
- array("string"=>$class),
+ array("string"=>$class.$marker),
array("string"=>preg_replace("/\%s/",base64_encode($class),$str),"attach"=>"style='width:50px;border-right:none;'")
));
}
@@ -759,6 +789,7 @@ print_a($attrs);
function getFAIdebianMirrors()
{
$ret = array();
+ $ret['inherited']="["._("inherited")."]";
$ret['auto']=_("automatic");
$secs = array();
@@ -795,29 +826,32 @@ print_a($attrs);
{
$ret = array();
+ if($this->FAIdebianMirror == "inherited") return(array());
+
if(!isset($this->FAIServRepConfig[$this->FAIdebianMirror])){
$this->FAIdebianMirror = "auto";
}
- $errorClasses = "";
-
- foreach($this->FAIServRepConfig[$this->FAIdebianMirror]['RELEASE'] as $release => $sections){
- $use = true;
-
- if(!count($this->FAIclass) == 0){
- foreach($this->FAIclass as $class){
- if(!in_array($class, $sections['PACKAGES'])){
- $use = false;
- $errorClasses[$class] = $class;
- }else{
- if(isset($errorClasses[$class])){
- unset($errorClasses[$class]);
+ $errorClasses = array();
+ if(isset($this->FAIServRepConfig[$this->FAIdebianMirror]['RELEASE'])) {
+ foreach($this->FAIServRepConfig[$this->FAIdebianMirror]['RELEASE'] as $release => $sections){
+ $use = true;
+
+ if(!count($this->FAIclass) == 0){
+ foreach($this->FAIclass as $class){
+ if(!in_array($class, $sections['PACKAGES'])){
+ $use = false;
+ $errorClasses[$class] = $class;
+ }else{
+ if(isset($errorClasses[$class])){
+ unset($errorClasses[$class]);
+ }
}
}
}
- }
- if($use){
- $ret[$release]=$release;
+ if($use){
+ $ret[$release]=$release;
+ }
}
}
if((count($ret) == 0 ) && ($this->FAIdebianMirror != "auto")){
@@ -837,8 +871,10 @@ print_a($attrs);
$eClasses .= $class." ";
}
- $this->FAIclass= array();
- print_red(sprintf(_("Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI configurations, possibly some classes where deleted or renamed. !All classes have been removed from this account, press cancel if you don't want this to be saved."),$eClasses));
+ $this->unresolved_classes = $errorClasses;
+ $this->FAIdebianMirror = "auto";
+ //$this->FAIclass= array();
+ print_red(sprintf(_("Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI configurations, possibly some classes where deleted or renamed. Server was reset to 'auto'."),$eClasses));
}
return($ret);
}
@@ -857,6 +893,7 @@ print_a($attrs);
if (chkacl ($this->acl, "gotoKernelParameters") == "" && isset($_POST["customParameters"])){
$this->customParameters= $_POST["customParameters"];
}
+
}
@@ -883,7 +920,7 @@ print_a($attrs);
/* Find proper terminal path for tftp configuration
FIXME: This is suboptimal when the default has changed to
another location! */
- if ($this->gotoTerminalPath == "default"){
+ if (($this->gotoTerminalPath == "default")){
$ldap= $this->config->get_ldap_link();
/* Strip relevant part from dn, keep trailing ',' */
@@ -931,15 +968,23 @@ print_a($attrs);
unset( $this->attrs['FAIrelease'] );
$str = "";
- foreach($this->FAIclass as $class){
- $str .= $class." ";
- }
- $str .= ":" . $this->FAIrelease;
- $this->attrs['FAIclass']= "";
- $this->attrs['FAIclass']= trim($str);
- if(empty($this->attrs['FAIclass'])){
- $this->attrs['FAIclass'] = array();
+ if($this->FAIdebianMirror == "inherited"){
+
+ $this->attrs['FAIclass'] = $this->attrs['FAIrelease'] = $this->attrs['FAIdebianMirror'] = array();
+
+ }else{
+
+ foreach($this->FAIclass as $class){
+ $str .= $class." ";
+ }
+ $str .= ":" . $this->FAIrelease;
+ $this->attrs['FAIclass']= "";
+ $this->attrs['FAIclass']= trim($str);
+
+ if(empty($this->attrs['FAIclass'])){
+ $this->attrs['FAIclass'] = array();
+ }
}
/* Add missing arrays */
@@ -950,12 +995,13 @@ print_a($attrs);
}
if(!isset($this->attrs["$val"])) $this->attrs["$val"]=array();
}
+
/* Strip out 'default' values */
- if ($this->attrs['gotoLdapServer'] == "default"){
+ if ($this->attrs['gotoLdapServer'] == "default-inherited"){
$this->attrs['gotoLdapServer']= array();
}
- if ($this->attrs['gotoBootKernel'] == "%default%" || $this->attrs['gotoBootKernel'] == "default"){
+ if (($this->attrs['gotoBootKernel'] == "default-inherited") || ($this->attrs['gotoBootKernel'] == "%default%")){
$this->attrs['gotoBootKernel']= array();
}
@@ -964,15 +1010,14 @@ print_a($attrs);
$this->FAIdebianMirror = "";
}
+ /* Get FAIstate from object, the generic tab could have changed it during execute */
+ $ldap= $this->config->get_ldap_link();
+ $ldap->cd($this->dn);
+ $ldap->cat($this->dn,array("FAIstate"));
+ $checkFAIstate = $ldap->fetch();
+
/* Remove FAI objects if no FAI class is selected */
- if(count($this->FAIclass)==0){
- $tmp = array();
- foreach($this->attrs['objectClass'] as $class){
- if($class != "FAIobject"){
- $tmp[] = $class;
- }
- }
- $this->attrs['objectClass'] = $tmp;
+ if((count($this->FAIclass)==0) && (!isset($checkFAIstate['FAIstate']))){
$this->attrs['FAIclass'] = array();
$this->attrs['FAIdebianMirror'] = array();
}
@@ -986,8 +1031,6 @@ print_a($attrs);
}
$this->attrs['gotoShare']=$tmp;
- $ldap= $this->config->get_ldap_link();
- $ldap->cd($this->dn);
$this->cleanup();
$ldap->modify ($this->attrs);