X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_workstationStartup.inc;h=0874a2814a86ac9bb92c3b4b9d9ad98d41428691;hb=ccb05fb19fe5af3570c2c57b703a595b1c78bf28;hp=c993c65a736bd1b3231bf71fe1ca325d21858998;hpb=9ba37d0ddd9297f3eded1e12d899e939d9f15555;p=gosa.git
diff --git a/plugins/admin/systems/class_workstationStartup.inc b/plugins/admin/systems/class_workstationStartup.inc
index c993c65a7..0874a2814 100644
--- a/plugins/admin/systems/class_workstationStartup.inc
+++ b/plugins/admin/systems/class_workstationStartup.inc
@@ -2,11 +2,6 @@
class workstartup extends plugin
{
- /* CLI vars */
- var $cli_summary= "Manage terminal startup options";
- var $cli_description= "Some longer text\nfor help";
- var $cli_parameters= array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser");
-
/* Generic terminal attributes */
var $bootmode = "G";
var $goLdapServerList = array();
@@ -55,10 +50,35 @@ class workstartup extends plugin
/* Contains all possible server/release/class settings */
var $FAIServRepConfig = array();
+ var $fai_activated = FALSE;
+ var $member_of_ogroup = FALSE;
+
+ var $o_group_dn = "";
+
function workstartup ($config, $dn= NULL, $parent= NULL)
{
+ /* Cehck if FAI is activated, else do not save any FAI attributes */
+ $tmp = search_config($config->data,"faiManagement","CLASS");
+ if(!empty($tmp)){
+ $this->fai_activated = TRUE;
+ }else{
+ $this->attributes = array("gotoLdapServer", "gotoBootKernel", "gotoKernelParameters", "gotoShare");
+ $this->objectclasses = array("GOhard");
+ }
+
plugin::plugin ($config, $dn, $parent);
+ if(!isset($this->parent->by_object['ogroup'])){
+ $ldap = $this->config->get_ldap_link();
+ $ldap->cd ($this->config->current['BASE']);
+ $ldap->search("(&(objectClass=gotoWorkstationTemplate)(member=".LDAP::prepare4filter($this->dn)."))",array("cn","dn"));
+ if($ldap->count()){
+ $this->member_of_ogroup = TRUE;
+ $attrs = $ldap->fetch();
+ $this->o_group_dn = $attrs['dn'];
+ }
+ }
+
/* Creating a list of valid Mirrors
* none will not be saved to ldap.
*/
@@ -68,143 +88,161 @@ class workstartup extends plugin
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();
-
- $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;
-
- if(in_array('FAIpackageList',$attr['objectClass'])){
- $tmp2[$cn]['FAIpackageList']['obj'] = 'FAIpackageList';
- $tmp2[$cn]['FAIpackageList']['kzl'] = 'Pl';
- $tmp2[$cn]['FAIpackageList']['sec'] = $attr['FAIdebianSection'];
- $this->FAIclasses[$attr['cn'][0]]=$attr['cn'][0];
- }
- if(in_array('FAItemplate',$attr['objectClass'])){
- $tmp2[$cn]['FAItemplate']['obj'] = 'FAItemplate';
- $tmp2[$cn]['FAItemplate']['kzl'] = 'T';
- $this->FAIclasses[$attr['cn'][0]]=$attr['cn'][0];
- }
- if(in_array('FAIvariable',$attr['objectClass'])){
- $tmp2[$cn]['FAIvariable']['obj'] = 'FAIvariable';
- $tmp2[$cn]['FAIvariable']['kzl'] = 'V';
- $this->FAIclasses[$attr['cn'][0]]=$attr['cn'][0];
- }
- if(in_array('FAIscript',$attr['objectClass'])){
- $tmp2[$cn]['FAIscript']['obj'] = 'FAIscript';
- $tmp2[$cn]['FAIscript']['kzl'] = 'S';
- $this->FAIclasses[$attr['cn'][0]]=$attr['cn'][0];
- }
- if(in_array('FAIhook',$attr['objectClass'])){
- $tmp2[$cn]['FAIhook']['obj'] = 'FAIhook';
- $tmp2[$cn]['FAIhook']['kzl'] = 'H';
- $this->FAIclasses[$attr['cn'][0]]=$attr['cn'][0];
- }
- if(in_array('FAIpartitionTable',$attr['objectClass'])){
- $tmp2[$cn]['FAIpartitionTable']['obj']= 'FAIpartitionTable';
- $tmp2[$cn]['FAIpartitionTable']['kzl']= 'Pt';
- $this->FAIclasses[$attr['cn'][0]]=$attr['cn'][0];
- }
- if(in_array('FAIprofile',$attr['objectClass'])){
- $tmp2[$cn]['FAIprofile']['obj']= 'FAIprofile';
- $tmp2[$cn]['FAIprofile']['kzl']= 'P';
- $this->FAIclasses[$attr['cn'][0]]=$attr['cn'][0];
- }
- }
- if(is_array($this->FAIclasses)){
- natcasesort($this->FAIclasses);
- }
-
- if(isset($tmp2)){
- $this->FAIclassInfo = $tmp2;
- } else {
- $this->FAIclassInfo = array();
- }
-
- /* Build up an array like this one :
- [$url]['SERVER'] = 'srv1-002';
- [$url]['RELEASE']['siga/rc9.0.2']
- ['SECTIONS'][0] "main";
- ['SECTIONS'][1] "non-free";
- [$url]['RELEASE']['siga/rc9.0.2']
- ['PACKAGES'][0] "pkg1";
- ['PACKAGES'][1] "postfix";
- */
- $ldap->search("(&(FAIrepository=*)(objectClass=FAIrepositoryServer))",array("FAIrepository"));
- $test = array();
- while($attr = $ldap->fetch()){
- if(isset($attr['FAIrepository'])){
+
+ /* Perform some special FAI stuff, only if it is activated */
+ if($this->fai_activated){
+
+ $_SESSION['getAvailableClassesForThisRelease_CACHE'] = array();
+ $_SESSION['getAvailableClassesForThisRelease_CACHED_CLASSES'] = array();
+
+ $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","description"));
+
+ foreach($res as $attr){
+ $cn = $attr['cn'][0];
+
+ $_SESSION['getAvailableClassesForThisRelease_CACHED_CLASSES'][] = $attr;
+
+ if(!isset($attr['description'])){
+ $attr['description'][0] = "";
+ }
- unset($attr['FAIrepository']['count']);
+ if(in_array('FAIpackageList',$attr['objectClass'])){
+ $tmp2[$cn]['FAIpackageList']['obj'] = 'FAIpackageList';
+ $tmp2[$cn]['FAIpackageList']['kzl'] = 'Pl';
+ $tmp2[$cn]['FAIpackageList']['sec'] = $attr['FAIdebianSection'];
+ $tmp2[$cn]['FAIpackageList']['desc'] = $attr['description'];
+ $this->FAIclasses[$attr['cn'][0]]=$attr['cn'][0];
+ }
+ if(in_array('FAItemplate',$attr['objectClass'])){
+ $tmp2[$cn]['FAItemplate']['obj'] = 'FAItemplate';
+ $tmp2[$cn]['FAItemplate']['kzl'] = 'T';
+ $tmp2[$cn]['FAItemplate']['desc'] = $attr['description'];
+ $this->FAIclasses[$attr['cn'][0]]=$attr['cn'][0];
+ }
+ if(in_array('FAIvariable',$attr['objectClass'])){
+ $tmp2[$cn]['FAIvariable']['obj'] = 'FAIvariable';
+ $tmp2[$cn]['FAIvariable']['kzl'] = 'V';
+ $tmp2[$cn]['FAIvariable']['desc'] = $attr['description'];
+ $this->FAIclasses[$attr['cn'][0]]=$attr['cn'][0];
+ }
+ if(in_array('FAIscript',$attr['objectClass'])){
+ $tmp2[$cn]['FAIscript']['obj'] = 'FAIscript';
+ $tmp2[$cn]['FAIscript']['kzl'] = 'S';
+ $tmp2[$cn]['FAIscript']['desc'] = $attr['description'];
+ $this->FAIclasses[$attr['cn'][0]]=$attr['cn'][0];
+ }
+ if(in_array('FAIhook',$attr['objectClass'])){
+ $tmp2[$cn]['FAIhook']['obj'] = 'FAIhook';
+ $tmp2[$cn]['FAIhook']['kzl'] = 'H';
+ $tmp2[$cn]['FAIhook']['desc'] = $attr['description'];
+ $this->FAIclasses[$attr['cn'][0]]=$attr['cn'][0];
+ }
+ if(in_array('FAIpartitionTable',$attr['objectClass'])){
+ $tmp2[$cn]['FAIpartitionTable']['obj']= 'FAIpartitionTable';
+ $tmp2[$cn]['FAIpartitionTable']['kzl']= 'Pt';
+ $tmp2[$cn]['FAIpartitionTable']['desc'] = $attr['description'];
+ $this->FAIclasses[$attr['cn'][0]]=$attr['cn'][0];
+ }
+ if(in_array('FAIprofile',$attr['objectClass'])){
+ $tmp2[$cn]['FAIprofile']['obj']= 'FAIprofile';
+ $tmp2[$cn]['FAIprofile']['kzl']= 'P';
+ $tmp2[$cn]['FAIprofile']['desc'] = $attr['description'];
+ $this->FAIclasses[$attr['cn'][0]]=$attr['cn'][0];
+ }
+ }
+ if(is_array($this->FAIclasses)){
+ natcasesort($this->FAIclasses);
+ }
- foreach($attr['FAIrepository'] as $rep){
- $tmp = split("\|",$rep);
+ if(isset($tmp2)){
+ $this->FAIclassInfo = $tmp2;
+ } else {
+ $this->FAIclassInfo = array();
+ }
- if(count($tmp)==4){
- $sections = split(",",$tmp[3]);
- $release = $tmp[2];
- $server = $tmp[1];
- $url = $tmp[0];
-
- $test[$url]['RELEASE'][$release]['SECTIONS'] = $sections;
-
- /* Result will be cached
- */
- $test[$url]['RELEASE'][$release]['PACKAGES'] = $this->getAvailableClassesForThisRelease($release);
- $test[$url]['SERVER'] = $server;
-
- /* auto gets all releases/classes
- */
- $test['auto']['RELEASE'][$release]['SECTION'] = $sections;
- $test['auto']['RELEASE'][$release]['PACKAGES'] = $this->getAvailableClassesForThisRelease($release);
+ /* Build up an array like this one :
+ [$url]['SERVER'] = 'srv1-002';
+ [$url]['RELEASE']['siga/rc9.0.2']
+ ['SECTIONS'][0] "main";
+ ['SECTIONS'][1] "non-free";
+ [$url]['RELEASE']['siga/rc9.0.2']
+ ['PACKAGES'][0] "pkg1";
+ ['PACKAGES'][1] "postfix";
+ */
+ $filter= "";
+ $ui= get_userinfo();
+ if (isset($config->current['STRICT_UNITS']) && preg_match('/TRUE/i', $config->current['STRICT_UNITS']) && $ui->gosaUnitTag != ""){ $filter= "(gosaUnitTag=".$ui->gosaUnitTag.")";
+ } $ldap->search("(&(FAIrepository=*)(objectClass=FAIrepositoryServer)$filter)",array("FAIrepository"));
+ $test = array();
+ while($attr = $ldap->fetch()){
+ if(isset($attr['FAIrepository'])){
+
+ unset($attr['FAIrepository']['count']);
+
+ foreach($attr['FAIrepository'] as $rep){
+ $tmp = split("\|",$rep);
+
+ if(count($tmp)==4){
+ $sections = split(",",$tmp[3]);
+ $release = $tmp[2];
+ $server = $tmp[1];
+ $url = $tmp[0];
+
+ $test[$url]['RELEASE'][$release]['SECTIONS'] = $sections;
+
+ /* Result will be cached
+ */
+ $test[$url]['RELEASE'][$release]['PACKAGES'] = $this->getAvailableClassesForThisRelease($release);
+ $test[$url]['SERVER'] = $server;
+
+ /* auto gets all releases/classes
+ */
+ $test['auto']['RELEASE'][$release]['SECTION'] = $sections;
+ $test['auto']['RELEASE'][$release]['PACKAGES'] = $this->getAvailableClassesForThisRelease($release);
+ }
}
}
}
- }
-
- /* Add possible elements from hook */
- $lines= $this->GetHookElements();
- foreach ($lines as $hline){
- $entries= split(";", $hline);
- if (isset($entries[1]) && !isset($test[$entries[1]])){
- $test[$entries[1]]['RELEASE']= array();
-
- /* Split releases */
- if (isset($entries[2])){
- $releases= split(",", $entries[2]);
-
- foreach ($releases as $release){
- $rname= preg_replace('/:.*$/', '', $release);
- $sections= split(':', preg_replace('/^[^:]+:([^|]+)|.*$/', '\1', $release));
- $classes= split('\|', preg_replace('/^[^|]+\|(.*)$/', '\1', $release));
- $test[$entries[1]]['RELEASE'][$rname]= array();
- $test[$entries[1]]['RELEASE'][$rname]['SECTION']= $sections;
- foreach ($classes as $class){
- if ($class != ""){
- $test[$entries[1]]['RELEASE'][$rname]['PACKAGES'][$class]= $class;
+
+ /* Add possible elements from hook */
+ $lines= $this->GetHookElements();
+ foreach ($lines as $hline){
+ $entries= split(";", $hline);
+ if (isset($entries[1]) && !isset($test[$entries[1]])){
+ $test[$entries[1]]['RELEASE']= array();
+
+ /* Split releases */
+ if (isset($entries[2])){
+ $releases= split(",", $entries[2]);
+
+ foreach ($releases as $release){
+ $rname= preg_replace('/:.*$/', '', $release);
+ $sections= split(':', preg_replace('/^[^:]+:([^|]+)|.*$/', '\1', $release));
+ $classes= split('\|', preg_replace('/^[^|]+\|(.*)$/', '\1', $release));
+ $test[$entries[1]]['RELEASE'][$rname]= array();
+ $test[$entries[1]]['RELEASE'][$rname]['SECTION']= $sections;
+ foreach ($classes as $class){
+ if ($class != ""){
+ $test[$entries[1]]['RELEASE'][$rname]['PACKAGES'][$class]= $class;
+ }
}
}
}
}
}
- }
-
- $this->FAIServRepConfig= $test;
+
+ $this->FAIServRepConfig= $test;
+ } // Do FAI stuff end
/* Get arrays */
foreach (array("gotoModules", "gotoAutoFs", "gotoFilesystem") as $val){
@@ -217,6 +255,7 @@ class workstartup extends plugin
}
sort ($this->$val);
$this->$val= array_unique($this->$val);
+ $this->saved_attributes[$val]= $this->$val;
}
/* Parse Kernel Parameters to decide what boot mode is enabled */
@@ -251,24 +290,28 @@ class workstartup extends plugin
$this->gotoShareSelections= $config->getShareList(true);
$this->gotoAvailableShares= $config->getShareList(false);
$tmp2 = array();
-
- if((isset($this->FAIclass))&&(!is_array($this->FAIclass))){
- $tmp = array();
- $tmp = split(" ",$this->FAIclass);
- $tmp2 =array();
-
- foreach($tmp as $class){
- if( ":" == $class[0] ) {
- $this->FAIrelease = substr( $class, 1 );
+
+
+ /* Again some special FAI stuff */
+ if($this->fai_activated){
+ if((isset($this->FAIclass))&&(!is_array($this->FAIclass))){
+ $tmp = array();
+ $tmp = split(" ",$this->FAIclass);
+ $tmp2 =array();
+
+ foreach($tmp as $class){
+ if( ":" == $class[0] ) {
+ $this->FAIrelease = substr( $class, 1 );
+ }
+ else
+ $tmp2[$class] = $class;
}
- else
- $tmp2[$class] = $class;
+ $this->FAIclass = $tmp2;
}
- $this->FAIclass = $tmp2;
- }
- if(!is_array($this->FAIclass)){
- $this->FAIclass =array();
+ if(!is_array($this->FAIclass)){
+ $this->FAIclass =array();
+ }
}
$this->orig_dn= $this->dn;
@@ -278,11 +321,20 @@ class workstartup extends plugin
/* 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","FAIclass","FAIdebianMirror","gotoBootKernel");
+ if ($this->member_of_ogroup){
+
+ if(count($this->FAIclass)==0 && $this->FAIrelease == ""){
+ $this->FAIdebianMirror = "inherited";
+ }
+
+ if($this->fai_activated){
+ $map= array("gotoLdapServer","FAIclass","FAIdebianMirror","gotoBootKernel");
+ }else{
+ $map= array("gotoLdapServer","gotoBootKernel");
+ }
+
+ $ldap = $this->config->get_ldap_link();
+ $ldap->cat($this->o_group_dn);
$attrs= $ldap->fetch();
foreach ($map as $name){
@@ -351,9 +403,6 @@ class workstartup extends plugin
$this->gotoBootKernel= "default";
}
- if(count($this->FAIclass)==0 && $this->FAIrelease == ""){
- $this->FAIdebianMirror = "inherited";
- }
}
@@ -413,12 +462,20 @@ class workstartup extends plugin
else select the first one ..
*/
$tmp2 = $this->getFAIreleases();
+ if(!isset($tmp2[$this->FAIrelease]) || !$tmp2[$this->FAIrelease]['USE']){
+ foreach($tmp2 as $key => $data){
+ if($data['USE']){
+ $this->FAIrelease = $key;
+ }
+ }
+ }
if(!in_array($this->FAIrelease, $tmp2)){
- $this->FAIrelease = key($tmp2);
+ # $this->FAIrelease = key($tmp2);
}
/* Get all Packages for this server/release combination
*/
+
if(!isset($this->FAIServRepConfig[$this->FAIdebianMirror]['RELEASE'][$this->FAIrelease]['PACKAGES'])){
$pkgs = array();
print_red(_("There are packages in your configuration, which can't be resolved with current server/release settings."));
@@ -474,7 +531,6 @@ class workstartup extends plugin
function execute()
{
-
/* Call parent execute */
plugin::execute();
@@ -491,7 +547,7 @@ class workstartup extends plugin
}
/* Add module */
- if (isset ($_POST['add_module'])){
+ if (isset ($_POST['add_module']) ){
if ($_POST['module'] != "" && chkacl ($this->acl, "gotoModule") == ""){
$this->add_list ($this->gotoModules, $_POST['module']);
}
@@ -503,94 +559,97 @@ class workstartup extends plugin
$this->del_list ($this->gotoModules, $_POST['modules_list']);
}
}
-
+
/* FAI class management */
- if((isset($_POST['AddClass']))&&(isset($_POST['FAIclassesSel']))){
- $found = 0 ;
+ if($this->fai_activated && chkacl($this->acl,"FAIclass") == ""){
- /* If this new class/profile will attach a second partition table
- * to our list of classes, abort and show a message.
- */
- foreach($this->FAIclass as $name){
- if(isset($this->FAIclassInfo[$name])){
- foreach($this->FAIclassInfo[$name] as $atr){
- if(isset($atr['obj'])){
- if($atr['obj'] == "FAIpartitionTable"){
- $found ++ ;
+ if((isset($_POST['AddClass']))&&(isset($_POST['FAIclassesSel']))){
+ $found = 0 ;
+
+ /* If this new class/profile will attach a second partition table
+ * to our list of classes, abort and show a message.
+ */
+ foreach($this->FAIclass as $name){
+ if(isset($this->FAIclassInfo[$name])){
+ foreach($this->FAIclassInfo[$name] as $atr){
+ if(isset($atr['obj'])){
+ if($atr['obj'] == "FAIpartitionTable"){
+ $found ++ ;
+ }
}
}
}
}
- }
- if((isset($this->FAIclassInfo[$_POST['FAIclassesSel']]['FAIpartitionTable']))&&($found>0)){
- print_red(_("There is already a profile in your selection that contain partition table configurations."));
- }else{
- $this->FAIclass[$_POST['FAIclassesSel']]=$_POST['FAIclassesSel'];
+ if((isset($this->FAIclassInfo[$_POST['FAIclassesSel']]['FAIpartitionTable']))&&($found>0)){
+ print_red(_("There is already a profile in your selection that contain partition table configurations."));
+ }else{
+ $this->FAIclass[$_POST['FAIclassesSel']]=$_POST['FAIclassesSel'];
+ }
}
- }
- $sort = false;
- foreach($_POST as $name => $val){
-
- $sort_type = false;
- if((preg_match("/sort_up/",$name))&&(!$sort)){
- $sort_type = "sort_up_";
- }
- if((preg_match("/sort_down/",$name))&&(!$sort)){
- $sort_type = "sort_down_";
- }
-
- if(($sort_type)&&(!$sort)){
- $value = base64_decode(preg_replace("/_.*$/i","",preg_replace("/".$sort_type."/i","",$name)));
- $sort = true;
+ $sort = false;
+ foreach($_POST as $name => $val){
- $last = -1;
- $change_down = -1;
-
- /* Create array with numeric index */
- $tmp = array();
- foreach($this->FAIclass as $class){
- $tmp [] = $class;
+ $sort_type = false;
+ if((preg_match("/sort_up/",$name))&&(!$sort)){
+ $sort_type = "sort_up_";
}
+ if((preg_match("/sort_down/",$name))&&(!$sort)){
+ $sort_type = "sort_down_";
+ }
+
+ if(($sort_type)&&(!$sort)){
+ $value = base64_decode(preg_replace("/_.*$/i","",preg_replace("/".$sort_type."/i","",$name)));
+ $sort = true;
+
+ $last = -1;
+ $change_down = -1;
+
+ /* Create array with numeric index */
+ $tmp = array();
+ foreach($this->FAIclass as $class){
+ $tmp [] = $class;
+ }
- /* Walk trough array */
- foreach($tmp as $key => $faiName){
- if($faiName == $value){
- if($sort_type == "sort_up_"){
- if($last != -1){
- $change_down= $last;
- }
- }else{
- if(isset($tmp[$key+1])){
- $change_down = $key;
+ /* Walk trough array */
+ foreach($tmp as $key => $faiName){
+ if($faiName == $value){
+ if($sort_type == "sort_up_"){
+ if($last != -1){
+ $change_down= $last;
+ }
+ }else{
+ if(isset($tmp[$key+1])){
+ $change_down = $key;
+ }
}
}
+ $last = $key;
}
- $last = $key;
- }
-
- $tmp2 = array();
- $skip = false;
-
- foreach($tmp as $ky => $vl){
+
+ $tmp2 = array();
+ $skip = false;
+
+ foreach($tmp as $ky => $vl){
- if($ky == $change_down){
- $skip = $vl;
- }else{
- $tmp2[$vl] = $vl;
- }
- if(($skip != false)&&($ky != $change_down)){
- $tmp2[$skip] = $skip;
- $skip =false;
- }
- }
- $this->FAIclass = $tmp2;
- }
-
- if(preg_match("/fai_remove/i",$name)){
- $value = base64_decode(preg_replace("/_.*$/i","",preg_replace("/fai_remove_/i","",$name)));
- unset($this->FAIclass[$value]);
+ if($ky == $change_down){
+ $skip = $vl;
+ }else{
+ $tmp2[$vl] = $vl;
+ }
+ if(($skip != false)&&($ky != $change_down)){
+ $tmp2[$skip] = $skip;
+ $skip =false;
+ }
+ }
+ $this->FAIclass = $tmp2;
+ }
+
+ if(preg_match("/fai_remove/i",$name)){
+ $value = base64_decode(preg_replace("/_.*$/i","",preg_replace("/fai_remove_/i","",$name)));
+ unset($this->FAIclass[$value]);
+ }
}
}
@@ -608,7 +667,7 @@ class workstartup extends plugin
/* if $_POST['gotoShareAdd'] is set, we will try to add a new entry
* This entry will be, a combination of mountPoint and sharedefinitions
*/
- if(isset($_POST['gotoShareAdd'])){
+ if(isset($_POST['gotoShareAdd']) && chkacl($this->acl,"gotoShare") ==""){
/* 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."));
@@ -626,7 +685,7 @@ class workstartup extends plugin
/* if the Post gotoShareDel is set, someone asked GOsa to delete the selected entry (if there is one selected)
* If there is no defined share selected, we will abort the deletion without any message
*/
- if((isset($_POST['gotoShareDel']))&&(isset($_POST['gotoShare']))){
+ if((isset($_POST['gotoShareDel']))&&(isset($_POST['gotoShare'])) && chkacl($this->acl,"gotoShare") ==""){
unset($this->gotoShares[$_POST['gotoShare']]);
}
@@ -662,6 +721,8 @@ class workstartup extends plugin
$use = " checked ";
};
+ $use .= chkacl($this->acl,"gotoLdapServer");
+
$display = $server;
$SelectBoxLdapServer->AddEntry(
@@ -685,57 +746,69 @@ class workstartup extends plugin
$smarty->assign($val."ACL", chkacl($this->acl, $val));
}
- $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);
+ $smarty->assign("fai_activated",$this->fai_activated);
+ if($this->fai_activated){
+ $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");
- $str_up = " ";
- $str_down = " ";
- $str_remove = " ";
- $str_empty = " 
";
+ $div = new divSelectBox("WSFAIscriptClasses");
+ $div -> SetHeight("110");
+ $str_up = " ";
+ $str_down = " ";
+ $str_remove = " ";
+ $str_empty = " ";
- $i = 1;
-
- 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").")";
- }
+ $i = 1;
if($this->FAIdebianMirror == "inherited"){
- $str = "";
+ $tmp = $this->InheritedFAIclass;
}else{
- 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;
- }
+ $tmp = $this->FAIclass;
}
- $i ++ ;
- $div->AddEntry(array(
- array("string"=>$class.$marker),
- array("string"=>preg_replace("/\%s/",base64_encode($class),$str),"attach"=>"style='width:50px;border-right:none;'")
- ));
- }
+ foreach($tmp as $class){
+
+ $marker = "";
+ if(in_array_ics($class,$this->unresolved_classes)){
+ $marker = " ("._("Not available in current setup").")";
+ }
- $smarty->assign("FAIScriptlist",$div->DrawList());
+ if($this->FAIdebianMirror == "inherited"){
+ $str = "";
+ }else{
+ 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 ++ ;
+
+ $desc = "";
+ foreach($this->FAIclassInfo[$class] as $types ){
+ if(isset($types['desc'][0])){
+ $desc.= $types['desc'][0]." ";
+ }
+ }
+ if(!empty($desc)){
+ $desc = " [".trim($desc)."]";
+ }
+
+ $div->AddEntry(array(
+ array("string"=>$class.$desc.$marker),
+ array("string"=>preg_replace("/\%s/",base64_encode($class),$str),"attach"=>"style='width:50px;border-right:none;'")
+ ));
+ }
+ $smarty->assign("FAIScriptlist",$div->DrawList());
+ }
/* Radio button group */
if (preg_match("/G/", $this->bootmode)) {
@@ -792,8 +865,16 @@ class workstartup extends plugin
function getFAIdebianMirrors()
{
$ret = array();
- $ret['inherited']="["._("inherited")."]";
- $ret['auto']=_("automatic");
+
+ /* Only add inherit option, if we are part in an object group
+ */
+ if($this->member_of_ogroup) {
+ $ret['inherited']['NAME']="["._("inherited")."]";
+ $ret['inherited']['USE'] = TRUE;
+ }
+
+ $ret['auto']['NAME']=_("automatic");
+ $ret['auto']['USE'] = TRUE;
$secs = array();
/* Walk through all available servers
@@ -802,15 +883,19 @@ class workstartup extends plugin
*/
foreach($this->FAIServRepConfig as $mirror => $rest){
- $use = false;
+ /* Automatically selection is available everytime */
+ if($mirror == "auto"){
+ continue;
+ }
+ $use = false;
if(count($this->FAIclass) == 0){
$use = true;
}else{
$tmp = $this->getFAIreleases();
- foreach($tmp as $release){
- if(isset($rest['RELEASE'][$release])){
- $use =true;
+ foreach($tmp as $release => $data){
+ if(isset($rest['RELEASE'][$release]) && $release == $this->FAIrelease){
+ $use = $data['USE'];
}
}
}
@@ -818,9 +903,8 @@ class workstartup extends plugin
/* If current server, doesn't support this class
remove it from list
*/
- if($use){
- $ret[$mirror] = $mirror;
- }
+ $ret[$mirror]['NAME'] = $mirror;
+ $ret[$mirror]['USE'] = $use;
}
return($ret);
}
@@ -829,13 +913,15 @@ class workstartup extends plugin
{
$ret = array();
- if($this->FAIdebianMirror == "inherited") return(array());
+ if($this->FAIdebianMirror == "inherited") {
+ return(array());
+ }
if(!isset($this->FAIServRepConfig[$this->FAIdebianMirror])){
$this->FAIdebianMirror = "auto";
}
- $errorClasses = array();
+ $errorClasses = array();
if(isset($this->FAIServRepConfig[$this->FAIdebianMirror]['RELEASE'])) {
foreach($this->FAIServRepConfig[$this->FAIdebianMirror]['RELEASE'] as $release => $sections){
$use = true;
@@ -847,16 +933,16 @@ class workstartup extends plugin
$errorClasses[$class] = $class;
}else{
if(isset($errorClasses[$class])){
- unset($errorClasses[$class]);
+ unset($errorClasses[$class]);
}
}
}
}
- if($use){
- $ret[$release]=$release;
- }
+ $ret[$release]['NAME']=$release;
+ $ret[$release]['USE']=$use;
}
- }
+ }
+
if((count($ret) == 0 ) && ($this->FAIdebianMirror != "auto")){
$eClasses = " ";
@@ -873,7 +959,7 @@ class workstartup extends plugin
foreach($errorClasses as $class){
$eClasses .= $class." ";
}
-
+
$this->unresolved_classes = $errorClasses;
$this->FAIdebianMirror = "auto";
//$this->FAIclass= array();
@@ -910,16 +996,20 @@ class workstartup extends plugin
* if we are currently editing from ogroup menu we use (array("gotWorkstationTemplate","GOhard", "FAIobject"))
*/
if(isset($this->parent->by_object['ogroup'])){
- $this->objectclasses = array("gotoWorkstationTemplate", "FAIobject");
+ $this->objectclasses = array("gotoWorkstationTemplate");
}elseif(isset($this->parent->by_object['workgeneric'])){
- $this->objectclasses = array("GOhard", "FAIobject");
+ $this->objectclasses = array("GOhard");
}elseif(isset($this->parent->by_object['servgeneric'])){
- $this->objectclasses = array("GOhard", "FAIobject");
+ $this->objectclasses = array("GOhard");
}else{
print "Object Type Configuration : unknown";
exit();
}
+ if($this->fai_activated){
+ $this->objectclasses [] = "FAIobject";
+ }
+
/* Find proper terminal path for tftp configuration
FIXME: This is suboptimal when the default has changed to
another location! */
@@ -968,25 +1058,34 @@ class workstartup extends plugin
plugin::save();
- unset( $this->attrs['FAIrelease'] );
+
+ if($this->fai_activated){
+
+ unset( $this->attrs['FAIrelease'] );
+
+ $str = "";
+
+ if($this->FAIdebianMirror == "inherited"){
- $str = "";
+ $this->attrs['FAIclass'] = $this->attrs['FAIrelease'] = $this->attrs['FAIdebianMirror'] = array();
- if($this->FAIdebianMirror == "inherited"){
-
- $this->attrs['FAIclass'] = $this->attrs['FAIrelease'] = $this->attrs['FAIdebianMirror'] = array();
+ }else{
- }else{
+ foreach($this->FAIclass as $class){
+ $str .= $class." ";
+ }
+ $str .= ":" . $this->FAIrelease;
+ $this->attrs['FAIclass']= "";
+ $this->attrs['FAIclass']= trim($str);
- foreach($this->FAIclass as $class){
- $str .= $class." ";
+ if(empty($this->attrs['FAIclass'])){
+ $this->attrs['FAIclass'] = array();
+ }
}
- $str .= ":" . $this->FAIrelease;
- $this->attrs['FAIclass']= "";
- $this->attrs['FAIclass']= trim($str);
- if(empty($this->attrs['FAIclass'])){
- $this->attrs['FAIclass'] = array();
+ /* if mirror == none stop saving this attribute */
+ if($this->FAIdebianMirror == "none"){
+ $this->FAIdebianMirror = "";
}
}
@@ -1008,21 +1107,19 @@ class workstartup extends plugin
$this->attrs['gotoBootKernel']= array();
}
- /* if mirror == none stop saving this attribute */
- if($this->FAIdebianMirror == "none"){
- $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) && (!isset($checkFAIstate['FAIstate']))){
- $this->attrs['FAIclass'] = array();
- $this->attrs['FAIdebianMirror'] = array();
+ /* Get FAIstate from object, the generic tab could have changed it during execute */
+ if($this->fai_activated){
+ $ldap->cat($this->dn,array("FAIstate"));
+ $checkFAIstate = $ldap->fetch();
+
+ /* Remove FAI objects if no FAI class is selected */
+ if((count($this->FAIclass)==0) && (!isset($checkFAIstate['FAIstate']))){
+ $this->attrs['FAIclass'] = array();
+ $this->attrs['FAIdebianMirror'] = array();
+ }
}
/* prepare share settings */