Changeset 3809 for extensions/ContactForm/classes/cf_plugin.class.php

Timestamp:

Sep 1, 2009, 3:31:24 PM (15 years ago)

Author:

Criss

Message:

bug 0001147

Replace redirect page by a message on the index one

Location:

extensions

Files:

• . (modified) (1 prop)
• ContactForm/classes/cf_plugin.class.php (modified) (5 diffs)

extensions/ContactForm/classes/cf_plugin.class.php

@@ -40 +40 @@
   }
   
+  function loc_begin_index() {
+    $this->display_message();
+  }
   function loc_begin_page_header() {
     if (!$this->config->get_value(CF_CFG_DEFINE_LINK)) {
@@ -224 +227 @@
         'cf_messages' => realpath(cf_get_template('cf_messages.tpl')),
       ));
+      
     $template->block_html_head( '',
               '<link rel="stylesheet" type="text/css" '.
@@ -242 +246 @@
     $redirect_msg = $template->parse('cf_redirect', true);
     $redirect_delay = $this->config->get_value(CF_CFG_REDIRECT_DELAY);
-    redirect_html($redirect_url, $redirect_msg, $redirect_delay);
+//    redirect($redirect_url, $redirect_msg, $redirect_delay);
+    redirect($redirect_url);
+  }
+  
+  protected function display_message() {
+    $infos = pwg_get_session_var('cf_infos');
+    pwg_unset_session_var('cf_infos');
+    if ( null == $infos or
+        (empty($infos['infos']) and
+         empty($infos['errors']))
+        ) {
+      return;
+    }
+    global $template;
+    $template->set_filenames(array(
+        'cf_index'    => realpath(cf_get_template('cf_messages_index.tpl')),
+        'cf_title'    => realpath(cf_get_template('cf_title.tpl')),
+        'cf_button'   => realpath(cf_get_template('cf_button.tpl')),
+        'cf_messages' => realpath(cf_get_template('cf_messages.tpl')),
+      ));
+      
+    $template->block_html_head( '',
+              '<link rel="stylesheet" type="text/css" '.
+              'href="' . CF_INCLUDE . 'contactform.css' . '">',
+              $smarty, $repeat);
+    $cf = array(
+        'TITLE'     => 'contact_form_title',
+      );
+    if (!empty($infos['errors'])) {
+      $template->assign('errors', $infos['errors']);
+    }
+    if (!empty($infos['infos'])) {
+      $template->assign('infos', $infos['infos']);
+    }
+    $template->assign('CF', $cf);
+    $template->assign_var_from_handle('CF_TITLE', 'cf_title');
+    $template->assign_var_from_handle('CF_MESSAGES', 'cf_messages');
+    $template->assign_var_from_handle('CF_BUTTON', 'cf_button');
+    
+    $begin = 'PLUGIN_INDEX_CONTENT_BEFORE';
+    $old_begin = $template->get_template_vars($begin);
+    $template->assign_var_from_handle($begin, 'cf_index');
+    $template->concat($begin, $old_begin);
   }
   
@@ -253 +299 @@
         $this->display_form($infos);
       } else {
-        $this->redirect(make_index_url(),$infos);
+        pwg_set_session_var('cf_infos', array(
+            'infos'  => $infos['infos'],
+            'errors' => $infos['errors'],
+          ));
+        redirect(make_index_url());
+        //$this->redirect(make_index_url(),$infos);
       }
     } else {
@@ -294 +345 @@
     add_event_handler('send_mail_content',             
                       array(&$this, 'send_mail_content'));
-    $return = @pwg_mail(
-      $webmaster_mail,
-      $mail_args
-    );
+
+    $return = true;
+//    $return = @pwg_mail(
+//      $webmaster_mail,
+//      $mail_args
+//    );
+
     cf_switch_back_to_user_lang();
     if (!$return) {