X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fsetup%2Fclass_setupStep_Feedback.inc;h=d655c2e5e79d756cc72786eff4b9e6db1af16df8;hb=e8b930aa6c5ae4af7c8b17651683e4902d5feb8a;hp=3243a770dfd88b5e93dd03d92eb53f521a8edcd0;hpb=0c5f131e68d9de99c8011ca2b6d66830af5749fc;p=gosa.git

diff --git a/gosa-core/setup/class_setupStep_Feedback.inc b/gosa-core/setup/class_setupStep_Feedback.inc
index 3243a770d..d655c2e5e 100644
--- a/gosa-core/setup/class_setupStep_Feedback.inc
+++ b/gosa-core/setup/class_setupStep_Feedback.inc
@@ -23,7 +23,7 @@
 class Step_Feedback  extends setup_step
 {
   var $languages      = array();
-  var $header_image   = "images/welcome.png";
+  var $header_image   = "images/setup/welcome.png";
 
   var $organization       = "";
   var $eMail              = "";
@@ -49,7 +49,7 @@ class Step_Feedback  extends setup_step
 
   var $features_used        = array();  
   var $initialized          = FALSE; 
-
+  var $feedback_send        = FALSE;
   var $attributes = array("organization","eMail","name","subscribe","use_gosa_announce","get_started","problems_encountered","features_used",
                           "first_use","use_since","distribution","web_server","php_version","ldap_server","object_count","want_to_see_next");
   
@@ -73,16 +73,17 @@ class Step_Feedback  extends setup_step
     $this->web_server     = $_SERVER['SERVER_SOFTWARE'];
     $this->php_version    = PHP_VERSION;
 
-    /* On first call check for rid/sid base */
+    /* Establish ldap connection */
     $cv = $this->parent->captured_values;
-    $ldap = new LDAP($cv['admin'],
+    $ldap_l = new LDAP($cv['admin'],
         $cv['password'],
         $cv['connection'],
         FALSE,
         $cv['tls']);
+
+    $this->object_count= "";
+    $ldap = new ldapMultiplexer($ldap_l);
     $ldap->cd($cv['base']);
-    $ldap->search("(objectClass=*)",array("dn"));
-    $this->object_count=$ldap->count();
 
     /* Preselect used features */
     $oc = $ldap->get_objectclasses();
@@ -108,7 +109,7 @@ class Step_Feedback  extends setup_step
 
   function update_strings()
   {
-    $this->s_title      = _("Notification and feedback");
+    $this->s_title      = _("Feedback");
     $this->s_info       = _("Get notifications or send feedback");
     $this->s_title_long = _("Notification and feedback");
   }
@@ -122,7 +123,6 @@ class Step_Feedback  extends setup_step
     }
 
     $additional_info ="";
-
     if(isset($_POST['send_feedback'])){
 
       $msgs = $this->check_feedback();
@@ -146,7 +146,7 @@ class Step_Feedback  extends setup_step
           if(!preg_match("/successful/i",$ret_value)){
             msg_dialog::display(_("Feedback error"), _("Cannot send feedback: service temporarily unavailable"), ERROR_DIALOG);
           }else{
-            $additional_info = "<font color='green'>"._("Feedback sucessfully send")."</font>";
+            $this->feedback_send = TRUE;
           }
         }
         @fclose($ret);
@@ -162,11 +162,12 @@ class Step_Feedback  extends setup_step
     $smarty = get_smarty();
 
     foreach($this->attributes as $attr){
-      $smarty->assign($attr, $this->$attr);
+      $smarty->assign($attr,   reverse_html_entities($this->$attr));
     }
+    $smarty->assign("feedback_send",$this->feedback_send);
     $smarty->assign("years",$years);
     $smarty->assign("features_used",$this->features_used);
-    $smarty->assign("additional_info",$additional_info);
+    $smarty->assign("additional_info", reverse_html_entities($additional_info));
     $smarty->assign ("must", "<font class=\"must\">*</font>");
     return($smarty->fetch(get_template_path("setup_feedback.tpl",TRUE,dirname(__FILE__))));
   }
@@ -175,12 +176,12 @@ class Step_Feedback  extends setup_step
   function check_feedback()
   {
     $msgs = array();
-    if(!tests::is_email($this->eMail) || empty($this->eMail)){
+    if($this->subscribe && (!tests::is_email($this->eMail) || empty($this->eMail))){
       $msgs[] = _("Please specify a valid email address.");
     }
 
     if(!$this->subscribe && !$this->use_gosa_announce){
-      $msgs[] = _("You should have enabled at least one option, to subscribe or send your feedback.");
+      $msgs[] = _("You have to select at least one of both options, subscribe or send feedback.");
     }
 
     return($msgs);