Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

session tweaks

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@203420 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
wclouser%mozilla.com 2006-07-22 00:38:22 +00:00
parent 3d3eaa0020
commit fdc7a45595
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/webtools/firefox_survey/config/core.php
View File

@ -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.

5
mozilla/webtools/firefox_survey/controllers/users_controller.php
View File

@ -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>
"

4
mozilla/webtools/firefox_survey/vendors/captcha/freecap.php vendored
View File

@ -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:
//////////////////////////////////////////////////////