Code

Updated device handling .
authorhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Tue, 19 Oct 2010 09:15:58 +0000 (09:15 +0000)
committerhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Tue, 19 Oct 2010 09:15:58 +0000 (09:15 +0000)
-Moved action into init()

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@20091 594d385d-05f5-0310-b6e9-bd551577e9d8

gosa-plugins/goto/admin/systems/goto/Device/class_InstallRecipe.inc

index 9fc2272b07f48d6321af139a415b7119f8456f51..7e73df9470a1fd29226061708e5d4665798510e4 100644 (file)
@@ -65,6 +65,16 @@ class InstallRecipe extends plugin
         // Set default password hash
         $this->hash = $this->config->get_cfg_value("core","passwordDefaultHash"); 
 
+        // Prepare list of timezones
+        $this->timezones = $this->getTimezones();
+
+        // Get list of password hashes
+        $tmp = passwordMethod::get_available_methods();
+        $this->hashes = array();
+        foreach($tmp['name'] as $name){
+            $this->hashes[$name] = $name;
+        }
+
         // Prepare NTP servers list 
         $this->installNTPServerList= new sortableListing($this->installNTPServer);
         $this->installNTPServerList->setDeleteable(true);
@@ -95,9 +105,6 @@ class InstallRecipe extends plugin
         // Start without error.
         $this->initFailed = FALSE;
 
-        // Prepare list of timezones
-        $this->timezones = $this->getTimezones();
-
         // Get list of NTP servers
         $this->installNTPServer = array();
         if(isset($this->attrs['installNTPServer']['count'])){
@@ -106,13 +113,6 @@ class InstallRecipe extends plugin
             }
         }
 
-        // Get list of password hashes
-        $tmp = passwordMethod::get_available_methods();
-        $this->hashes = array();
-        foreach($tmp['name'] as $name){
-            $this->hashes[$name] = $name;
-        }
-
         // Load list of bootstrap methods.
         $res = $this->loadInstallationMethods();
         if($res == NULL){
@@ -123,6 +123,7 @@ class InstallRecipe extends plugin
         $this->installBootstrapMethodList = $res['installBootstrapMethodList'];
         $this->installConfigManagementList = $res['installConfigManagementList'];
 
+
         // Load system locales 
         $locales = $this->getSystemLocales();
         if($locales == NULL){
@@ -132,6 +133,7 @@ class InstallRecipe extends plugin
         }
         $this->installSystemLocaleList = $locales;
 
+
         // Load installation templates
         $res = $this->loadInstallationTemplates();
         if($res == NULL){