From fdc7a45595972b2f4d16724bdec53fb2e31dcdce Mon Sep 17 00:00:00 2001
From: "wclouser%mozilla.com"
 <wclouser%mozilla.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 22 Jul 2006 00:38:22 +0000
Subject: [PATCH] session tweaks

git-svn-id: svn://10.0.0.236/trunk@203420 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/firefox_survey/config/core.php        | 10 +++++-----
 .../firefox_survey/controllers/users_controller.php    |  5 +++--
 .../firefox_survey/vendors/captcha/freecap.php         |  4 +---
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/mozilla/webtools/firefox_survey/config/core.php b/mozilla/webtools/firefox_survey/config/core.php
index 28f363fdc82..a18106df333 100644
--- a/mozilla/webtools/firefox_survey/config/core.php
+++ b/mozilla/webtools/firefox_survey/config/core.php
@@ -1,5 +1,5 @@
 <?php
-/* SVN FILE: $Id: core.php,v 1.1.1.1 2006-07-07 18:09:28 wclouser%mozilla.com Exp $ */
+/* SVN FILE: $Id: core.php,v 1.2 2006-07-22 00:38:22 wclouser%mozilla.com Exp $ */
 
 /**
  * This is core configuration file.
@@ -22,9 +22,9 @@
  * @package      cake
  * @subpackage   cake.app.config
  * @since        CakePHP v 0.2.9
- * @version      $Revision: 1.1.1.1 $
+ * @version      $Revision: 1.2 $
  * @modifiedby   $LastChangedBy: phpnut $
- * @lastmodified $Date: 2006-07-07 18:09:28 $
+ * @lastmodified $Date: 2006-07-22 00:38:22 $
  * @license      http://www.opensource.org/licenses/mit-license.php The MIT License
  */
 
@@ -83,12 +83,12 @@ define('CAKE_SESSION_SAVE', 'php');
  * Set a random string of used in session.
  *
  */
-define('CAKE_SESSION_STRING', 'DYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi');
+define('CAKE_SESSION_STRING', 'DYhGjsi3834g1bKJAHGFI9348i18AHGA22knaAAi');
 /**
  * Set the name of session cookie
  *
  */
-define('CAKE_SESSION_COOKIE', 'CAKEPHP');
+define('CAKE_SESSION_COOKIE', 'moz_userpanel');
 
 /**
  * Set level of Cake security.
diff --git a/mozilla/webtools/firefox_survey/controllers/users_controller.php b/mozilla/webtools/firefox_survey/controllers/users_controller.php
index 640a0e894d6..5d61e68beb7 100644
--- a/mozilla/webtools/firefox_survey/controllers/users_controller.php
+++ b/mozilla/webtools/firefox_survey/controllers/users_controller.php
@@ -51,6 +51,7 @@ class UsersController extends AppController {
             // Check the captcha values
             if( $_SESSION['hash_func'](strtolower($this->params['data']['captcha'][0])) != $_SESSION['freecap_word_hash']) {
                 $form_captcha_error = 'The code you entered did not match the picture.  Please try again.';
+
                 $this->set('form_captcha_error',$form_captcha_error);
                 return;
             } else {
@@ -82,7 +83,7 @@ generation of Firefox.  Thanks again for making the browser a better place!</p>
 information provided will never be given or sold to any other outside company for its
 use in marketing or solicitation.</small></p>
 
-<p><small>If you choose not to take this survey, you will be automatically unsubscribed from the Firefox Survey list.</small></p>
+<p><small>If you choose not to take this survey, you will be automatically unsubscribed from the Firefox User Panel.</small></p>
 
 <p><small>If you think you received this in error, please <a href=\"mailto:firefoxsurvey@mozilla.com\">let us know</a>.</small></p>
 "
@@ -131,7 +132,7 @@ generation of Firefox.  Thanks again for making the browser a better place!</p>
 information provided will never be given or sold to any other outside company for its
 use in marketing or solicitation.</small></p>
 
-<p><small>If you choose not to take this survey, you will be automatically unsubscribed from the Firefox Survey list.</small></p>
+<p><small>If you choose not to take this survey, you will be automatically unsubscribed from the Firefox User Panel.</small></p>
 
 <p><small>If you think you received this in error, please <a href=\"mailto:firefoxsurvey@mozilla.com\">let us know</a>.</small></p>
 "
diff --git a/mozilla/webtools/firefox_survey/vendors/captcha/freecap.php b/mozilla/webtools/firefox_survey/vendors/captcha/freecap.php
index 2feeca0ce18..08936054b30 100644
--- a/mozilla/webtools/firefox_survey/vendors/captcha/freecap.php
+++ b/mozilla/webtools/firefox_survey/vendors/captcha/freecap.php
@@ -24,7 +24,7 @@
 \************************************************************/
 
 // rename this sometime?
-session_name('CAKEPHP');
+session_name('moz_userpanel');
 session_start();
 
 //////////////////////////////////////////////////////
@@ -377,8 +377,6 @@ if($use_dict==1)
 $_SESSION['freecap_word_hash'] = $hash_func($word);
 
 
-
-
 //////////////////////////////////////////////////////
 ////// Fill BGs and Allocate Colours:
 //////////////////////////////////////////////////////