Changeset 18814 for extensions/ContactForm

Timestamp:

Oct 30, 2012, 12:17:34 AM (11 years ago)

Author:

mistic100

Message:

remove minimum characters limit, don't display user ip by default

Location:

extensions/ContactForm

Files:

• include/functions.inc.php (modified) (4 diffs)
• template/contact_form.tpl (modified) (2 diffs)

extensions/ContactForm/include/functions.inc.php

@@ -12 +12 @@
   {
     $page['section'] = 'contact';
-    $page['title'] = '<a href="'.get_absolute_root_url().'">'.l10n('Home').'</a>'.$conf['level_separator'].'<a href="'.CONTACT_FORM_PUBLIC.'">'.l10n('Contact').'</a>';
+    $page['title'] = $page['section_title'] = '<a href="'.get_absolute_root_url().'">'.l10n('Home').'</a>'.$conf['level_separator'].'<a href="'.CONTACT_FORM_PUBLIC.'">'.l10n('Contact').'</a>';
   }
 }
@@ -160 +160 @@
     $comment_action='reject';
   }
-  else if (strlen($comm['subject']) < 4)
-  {
-    array_push($page['errors'], sprintf(l10n('%s must not be less than %d characters long'), l10n('Subject'), 4));
-    $comment_action='reject';
-  }
   else if (strlen($comm['subject']) > 100)
   {
@@ -183 +178 @@
   {
     array_push($page['errors'], l10n('Please enter a message'));
-    $comment_action='reject';
-  }
-  else if (strlen($comm['content']) < 20)
-  {
-    array_push($page['errors'], sprintf(l10n('%s must not be less than %d characters long'), l10n('Message'), 20));
     $comment_action='reject';
   }
@@ -260 +250 @@
     }
     
-    $comm['show_ip'] = isset($conf['contact_form_show_ip']) ? $conf['contact_form_show_ip'] : true;
+    $comm['show_ip'] = isset($conf['contact_form_show_ip']) ? $conf['contact_form_show_ip'] : false;
     
     $template->assign(array(

extensions/ContactForm/template/contact_form.tpl

@@ -21 +21 @@
 var subject = new LiveValidation('subject', {ldelim} onlyOnSubmit: true });
 subject.add(Validate.Presence, {ldelim} failureMessage: "{'Please enter a subject'|@translate}" });
-subject.add(Validate.Length, {ldelim} minimum: 4, maximum: 100,
-  tooShortMessage: "{'%s must not be less than %d characters long'|@translate|@sprintf:'':4}",
+subject.add(Validate.Length, {ldelim} maximum: 100,
   tooLongMessage: "{'%s must not be more than %d characters long'|@translate|@sprintf:'':100}" 
   });
@@ -28 +27 @@
 var content = new LiveValidation('cf_content', {ldelim} onlyOnSubmit: true });
 content.add(Validate.Presence, {ldelim} failureMessage: "{'Please enter a message'|@translate}" });
-content.add(Validate.Length, {ldelim} minimum: 20, maximum: 2000,
-  tooShortMessage: "{'%s must not be less than %d characters long'|@translate|@sprintf:'':20}",
+content.add(Validate.Length, {ldelim} maximum: 2000,
   tooLongMessage: "{'%s must not be more %d characters long'|@translate|@sprintf:'':2000}",
   });