From 6996c216fce211a109023a96d4d900cfa751e5b9 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 11 Apr 2007 13:09:25 +0000
Subject: [PATCH] Added version info Udpated some texts

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6012 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 html/setup.php             |  2 ++
 setup/class_setupStep1.inc |  2 +-
 setup/class_setupStep3.inc | 18 +++++++++++++++++-
 setup/setup_frame.tpl      |  2 +-
 setup/setup_step1.tpl      |  2 +-
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/html/setup.php b/html/setup.php
index 8d2ef2e95..b11642a6c 100644
--- a/html/setup.php
+++ b/html/setup.php
@@ -122,6 +122,8 @@ if (isset($_SESSION['errors'])){
   $smarty->assign("errors"    , "");
 }
 
+$smarty->assign("version",get_gosa_version());
+
 echo $header.$smarty->fetch("../setup/setup_frame.tpl");
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>
diff --git a/setup/class_setupStep1.inc b/setup/class_setupStep1.inc
index 5d6fdbd34..0b0466c74 100644
--- a/setup/class_setupStep1.inc
+++ b/setup/class_setupStep1.inc
@@ -41,7 +41,7 @@ class setup_step_1 extends setup_step
   {
     $this->s_title      = _("Language selection");
     $this->s_title_long = _("Please choose a language");
-    $this->s_info       = _("This step is allows you to define your prefered language.");
+    $this->s_info       = _("This step is allows you to select your prefered language.");
   }
   
   function execute()
diff --git a/setup/class_setupStep3.inc b/setup/class_setupStep3.inc
index 0912abcc4..db861f868 100644
--- a/setup/class_setupStep3.inc
+++ b/setup/class_setupStep3.inc
@@ -28,9 +28,14 @@ class setup_step_3 extends setup_step
   function setup_step_3()
   {
     $this->update_strings();
+  }
 
+  
+  function load_license()
+  {
     if(!file_exists("../setup/license.txt")){
       $this->License = "<font color='red'>License not found. Setup stops here.</font>";
+      $this->license_found = false;
     }else{
       $fp = fopen("../setup/license.txt","r");
       $this->License = "";
@@ -52,13 +57,24 @@ class setup_step_3 extends setup_step
  
   function execute()
   {
+    $this->load_license();
+
     $smarty = get_smarty();
     $smarty -> assign("License",nl2br($this->License));
     $smarty -> assign("license_found",$this->license_found);
-    $this->is_completed = true;
+
     return($smarty -> fetch (get_template_path("../setup/setup_step3.tpl")));
   }
 
+  
+  function save_object()
+  {
+    if($this->license_found){
+      $this->is_completed = true;
+    }else{
+      $this->is_completed = false;
+    }
+  }
 }
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
diff --git a/setup/setup_frame.tpl b/setup/setup_frame.tpl
index b5866db65..e067df5d5 100644
--- a/setup/setup_frame.tpl
+++ b/setup/setup_frame.tpl
@@ -29,7 +29,7 @@
 		</div>
 
 		<div class='setup_bottom'>
-			Bottom	
+			{$version}	
 		</div>
 	</div>
 </div>
diff --git a/setup/setup_step1.tpl b/setup/setup_step1.tpl
index a2c23394e..e6df1b2ee 100644
--- a/setup/setup_step1.tpl
+++ b/setup/setup_step1.tpl
@@ -1,6 +1,6 @@
 <div>
 	<div class='default'>
-		<b>{t}Please select prefered language{/t}</b>
+		<b>{t}Please select your prefered language{/t}</b>
 	</div>
 	<br>
 	<div  class='default' style='float:left;width:160px;'>
-- 
2.30.2