X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=setup%2Fclass_setupStep_Feedback.inc;h=fbcfb4c97bfeb4d4be04e70f0d9e5d973ab05ac6;hb=484c83ff60fc5a427dd9e18be1c504d3dbb6e337;hp=778345d4d58c1072f66501006c51f7da978893a2;hpb=45bdbfd1e25072883ee4e95b64dd6f6b9abb3119;p=gosa.git

diff --git a/setup/class_setupStep_Feedback.inc b/setup/class_setupStep_Feedback.inc
index 778345d4d..fbcfb4c97 100644
--- a/setup/class_setupStep_Feedback.inc
+++ b/setup/class_setupStep_Feedback.inc
@@ -28,8 +28,8 @@ class Step_Feedback  extends setup_step
   var $organization       = "";
   var $eMail              = "";
   var $name               = "";
-  var $subscribe          = TRUE;
-  var $use_gosa_announce  = TRUE;
+  var $subscribe          = FALSE;
+  var $use_gosa_announce  = FALSE;
 
   var $feedback_url         = "http://oss.gonicus.de/gosa-feedback/";
   var $get_started          = TRUE;
@@ -98,7 +98,7 @@ class Step_Feedback  extends setup_step
     $this->features_used['asterisk']    = array("USED" => isset($oc['goFonAccount']), 
                                                 "NAME" => _("Asterisk administration"));
     $this->features_used['inventory']   = array("USED" => isset($oc['glpiAccount']) , 
-                                                "NAME" => _("System invetory"));
+                                                "NAME" => _("System inventory"));
     $this->features_used['system']      = array("USED" => FALSE , 
                                                 "NAME" => _("System-/Configmanagement"));
     $this->features_used['addressbook'] = array("USED" => FALSE , 
@@ -143,8 +143,8 @@ class Step_Feedback  extends setup_step
           while($ret && !feof($ret)){
             $ret_value.= fgets($ret,256);
           }
-          if(!preg_match("/successfully/i",$ret_value)){
-            print_red(sprintf(_("Could not send feedback. Script said '%s'."),$ret_value));
+          if(!preg_match("/successful/i",$ret_value)){
+            print_red(_("Error while sending your feedback. The service is possible temporary unavailable"));
           }else{
             $additional_info = "<font color='green'>"._("Feedback sucessfully send")."</font>";
           }
@@ -178,6 +178,11 @@ class Step_Feedback  extends setup_step
     if(!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.");
+    }
+
     return($msgs);
   }
   
@@ -234,7 +239,7 @@ class Step_Feedback  extends setup_step
       }else{
         $str .= "\nGet started: FALSE";
       }
-      $str .= "\nProblems : ".base64_encode($this->problems_encountered);
+      $str .= "\nProblems : ".($this->problems_encountered);
 
       if($this->first_use){
         $str .= "\nFirst use: TRUE";
@@ -248,7 +253,7 @@ class Step_Feedback  extends setup_step
       $str .="\nPHP_Version: ".$this->php_version;
       $str .="\nLDAP Server: ".$this->ldap_server;
       $str .="\nObject count: ".$this->object_count;
-      $str .="\nMissing features: ".base64_encode($this->want_to_see_next);
+      $str .="\nMissing features: ".($this->want_to_see_next);
     }
 
     $str .= "\n\nFeatures used";