Changeset 18331

Timestamp:

Sep 28, 2012, 1:58:02 PM (12 years ago)

Author:

mistic100

Message:

• add redirect url option
• remove test code
• fix fatal error at first installation

Location:

extensions/ContactForm

Files:

• admin/config.php (modified) (1 diff)
• admin/emails.php (modified) (1 diff)
• admin/template/config.tpl (modified) (1 diff)
• include/contact_form.inc.php (modified) (2 diffs)
• include/functions.inc.php (modified) (1 diff)
• include/install.inc.php (modified) (2 diffs)
• language/en_UK/plugin.lang.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (1 diff)

extensions/ContactForm/admin/config.php

@@ -14 +14 @@
     'cf_mandatory_name' =>    isset($_POST['cf_mandatory_name']),
     'cf_mail_type' =>         $_POST['cf_mail_type'],
+    'cf_redirect_url' =>      $_POST['cf_redirect_url'],
     );
   $conf['ContactForm_before'] = $_POST['cf_before'];

extensions/ContactForm/admin/emails.php

@@ -5 +5 @@
 if (isset($_POST['save_emails']))
 {
-  var_dump($_POST);
   $emails = array();
   foreach ($_POST['emails'] as $entry)

extensions/ContactForm/admin/template/config.tpl

@@ -31 +31 @@
           <input type="checkbox" name="cf_mandatory_name" value="1" {if $cf_mandatory_name}checked="checked"{/if}>
           {'Name is mandatory'|@translate}
+        </label>
+      </li>
+      <li>
+        <label>
+          <input type="text" name="cf_redirect_url" value="{$cf_redirect_url}" size="30">
+          {'Redirect after sending email (optional)'|@translate}
         </label>
       </li>

extensions/ContactForm/include/contact_form.inc.php

@@ -27 +27 @@
   {
     case 'validate':
-      array_push($page['infos'], l10n('E-mail sent successfully'));
-      unset($contact);
+      $_SESSION['page_infos'][] = l10n('E-mail sent successfully');
+      if (!empty($conf['ContactForm']['cf_redirect_url']))
+      {
+        redirect($conf['ContactForm']['cf_redirect_url']);
+      }
+      else
+      {
+        redirect(CONTACT_FORM_PUBLIC);
+      }
       break;
     case 'moderate':
@@ -34 +41 @@
       break;
     default:
-      trigger_error('Invalid comment action '.$comment_action, E_USER_WARNING);
+      trigger_error('Invalid action '.$comment_action, E_USER_WARNING);
   }
 }

extensions/ContactForm/include/functions.inc.php

@@ -93 +93 @@
     CONTACT_FORM_TABLE,
     array('name','email','active'),
-    $email
+    $emails
     );
   

extensions/ContactForm/include/install.inc.php

@@ -32 +32 @@
       'cf_redirect_delay' => 5,
       'cf_mail_type' => 'text/html',
+      'cf_redirect_url' => null,
       ));
     
@@ -53 +54 @@
       $new_conf['cf_default_subject'] = 'A comment on your site';
       $new_conf['cf_mail_type'] = 'text/html';
+      $new_conf['cf_redirect_url'] = null;
       
       // move emails to database

extensions/ContactForm/language/en_UK/plugin.lang.php

@@ -54 +54 @@
 $lang['%s must not be more than %d characters long'] = '%s must not be more than %d characters long';
 $lang['Error while sending e-mail'] = 'Error while sending e-mail';
+$lang['Redirect after sending email (optional)'] = 'Redirect after sending email (optional)';
 
 ?>

extensions/ContactForm/language/fr_FR/plugin.lang.php

@@ -55 +55 @@
 $lang['%s must not be more than %d characters long'] = '%s ne doit pas faire plus de %d caractères';
 $lang['Error while sending e-mail'] = 'Erreur lors de l\'envoi de l\'e-mail';
+$lang['Redirect after sending email (optional)'] = 'Rediriger après l\'envoi du mail (optionel)';
 
 ?>