diff --git a/gosa-core/setup/class_setupStep_Feedback.inc b/gosa-core/setup/class_setupStep_Feedback.inc
index 514b6e79fdfab635d812c57d0ad69ad40f69b154..f1e9e1259016c91f6d721561e254057b6aa42df6 100644 (file)
$this->web_server = $_SERVER['SERVER_SOFTWARE'];
$this->php_version = PHP_VERSION;
$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;
$cv = $this->parent->captured_values;
- $ldap = new LDAP($cv['admin'],
+ $ldap_l = new LDAP($cv['admin'],
$cv['password'],
$cv['connection'],
FALSE,
$cv['tls']);
$cv['password'],
$cv['connection'],
FALSE,
$cv['tls']);
+
+ $this->object_count= "";
+ $ldap = new ldapMultiplexer($ldap_l);
$ldap->cd($cv['base']);
$ldap->cd($cv['base']);
- $ldap->search("(objectClass=*)",array("dn"));
- $this->object_count=$ldap->count();
/* Preselect used features */
$oc = $ldap->get_objectclasses();
/* Preselect used features */
$oc = $ldap->get_objectclasses();
function update_strings()
{
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");
}
$this->s_info = _("Get notifications or send feedback");
$this->s_title_long = _("Notification and feedback");
}
$smarty = get_smarty();
foreach($this->attributes as $attr){
$smarty = get_smarty();
foreach($this->attributes as $attr){
- $smarty->assign($attr, $this->$attr);
+ $smarty->assign($attr, reverse_html_entities($this->$attr));
}
$smarty->assign("years",$years);
$smarty->assign("features_used",$this->features_used);
}
$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__))));
}
$smarty->assign ("must", "<font class=\"must\">*</font>");
return($smarty->fetch(get_template_path("setup_feedback.tpl",TRUE,dirname(__FILE__))));
}
function check_feedback()
{
$msgs = array();
function check_feedback()
{
$msgs = array();
- if(!is_email($this->eMail) || empty($this->eMail)){
+ if(!tests::is_email($this->eMail) || empty($this->eMail)){
$msgs[] = _("Please specify a valid email address.");
}
if(!$this->subscribe && !$this->use_gosa_announce){
$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);
}
return($msgs);