Fixes #3239 : Add code for that the icons work on 1.0.8.1

html/setup.php

@@ -92,7 +92,14 @@ $domain = 'fusiondirectory';
 bindtextdomain($domain, LOCALE_DIR);
 textdomain($domain);
 
-
+/* Minimal config */
+if (!session::global_is_set('config')) {
+  $config = new config('');
+  session::global_set('config', $config);
+}
+$config = session::global_get('config');
+load_plist(FALSE);
+IconTheme::loadThemes('themes');
 /* Call setup */
 $display = "";
 require_once("../setup/main.inc");

plugins/generic/welcome/main.inc

@@ -23,7 +23,7 @@
 if (!$cleanup){
   session::set('plugin_dir',dirname(__FILE__));
   $smarty->assign("iconmenu", $plist->show_iconmenu());
-  $smarty->assign("header", print_header(get_template_path('images/welcome.png'), sprintf(_("Welcome %s!"), $ui->cn)));
+  $smarty->assign("header", print_header(get_template_path('themes/default/icons/48/apps/config-welcome.png'), sprintf(_("Welcome %s!"), $ui->cn)));
   $smarty->assign("year", date("Y"));
 
   $smarty->assign("revision",FD_VERSION);

setup/class_setupStep.inc

@@ -28,7 +28,7 @@ class setup_step extends plugin
   var $is_enabled   = FALSE;
   var $is_completed = FALSE;
 
-  var $header_image = "images/setup/user.png";
+  var $header_image = "";
 
   var $attributes   = array();
   var $parent       = NULL;

setup/class_setupStep_Config1.inc

@@ -33,7 +33,7 @@ class Step_Config1 extends setup_step
   var $cngen_active = FALSE;
   var $cngen        = "%sn% %givenName%";
 
-  var $header_image       = "images/setup/server.png";
+  var $header_image       = 'geticon.php?context=categories&icon=settings&size=48';
   var $account_expiration = FALSE;
   var $base_hook          = "";
   var $base_hook_active   = FALSE;

setup/class_setupStep_Config2.inc

@@ -25,7 +25,7 @@ class Step_Config2 extends setup_step
 {
   var $governmentmode = FALSE;
   var $sambaidmapping = FALSE;
-  var $header_image   = "images/setup/server.png";
+  var $header_image   = 'geticon.php?context=categories&icon=settings&size=48';
 
   var $generic_settings  = array( "snapshot_active"     => TRUE,
                                   "snapshot_base"       => "ou=snapshots,%base%");

setup/class_setupStep_Config3.inc

@@ -23,7 +23,7 @@
 
 class Step_Config3 extends setup_step
 {
-  var $header_image = "images/setup/server.png";
+  var $header_image = 'geticon.php?context=categories&icon=settings&size=48';
 
   var $errorlvl   = FALSE;
 

setup/class_setupStep_Welcome.inc

@@ -23,7 +23,7 @@ class Step_Welcome  extends setup_step
 {
   var $languages      = array();
   var $attributes     = array();
-  var $header_image   = "images/setup/welcome.png";
+  var $header_image   = 'geticon.php?context=applications&icon=config-welcome&size=48';
   var $authPath;
 
   function __construct()