diff --git a/application/config/config-defaults.php b/application/config/config-defaults.php
index 382d926c597..85864a8bda7 100644
--- a/application/config/config-defaults.php
+++ b/application/config/config-defaults.php
@@ -1,17 +1,17 @@
 <?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 /*
- * LimeSurvey
- * Copyright (C) 2007-2011 The LimeSurvey Project Team / Carsten Schmitz
- * All rights reserved.
- * License: GNU/GPL License v2 or later, see LICENSE.php
- * LimeSurvey is free software. This version may have been modified pursuant
- * to the GNU General Public License, and as distributed it includes or
- * is derivative of works licensed under the GNU General Public License or
- * other free or open source software licenses.
- * See COPYRIGHT.php for copyright notices and details.
- *
- *	$Id$
- */
+* LimeSurvey
+* Copyright (C) 2007-2011 The LimeSurvey Project Team / Carsten Schmitz
+* All rights reserved.
+* License: GNU/GPL License v2 or later, see LICENSE.php
+* LimeSurvey is free software. This version may have been modified pursuant
+* to the GNU General Public License, and as distributed it includes or
+* is derivative of works licensed under the GNU General Public License or
+* other free or open source software licenses.
+* See COPYRIGHT.php for copyright notices and details.
+*
+*	$Id$
+*/
 $config = array();
 
 // CAUTION
@@ -73,24 +73,6 @@
 
 $config['maxemails']          = 50;               // The maximum number of emails to send in one go (this is to prevent your mail server or script from timeouting when sending mass mail)
 
-// Support for Fancy URLs
-//
-// This new feature makes survey URLs more readable
-// For example a normal survey that looks like this
-
-//     http://example.com/limesurvey/index.php?sid=12345&lang=de
-
-// will look like this
-
-//      http://example.com/lime/survey/12345/lang-fr/tk-ertoiuy [^]
-
-// If you want to have fancy URLs, set this to 1 AND
-// rename htaccess.txt in the LimeSurvey root directory to .htaccess
-//
-// NOTE: You MUST have the Apache mod_rewrite module installed.
-// If you don't know what this is better leave this setting alone.
-$config['modrewrite']         =   0;
-
 // Enable or Disable LDAP feature
 $config['enableLdap'] = false;
 
@@ -256,76 +238,76 @@
 $config['demoMode'] = false;
 
 /** -----------------------------------------------------
- * Because columns are tricky things, in terms of balancing visual
- * layout against semantic markup. The choice has been left to the
- * system administrator or designer. (Who ever cares most.)
- *
- * $column_style defines how columns are rendered for survey answers.
- * There are four possible options:
- *     'css'   using one of the various CSS only methods for creating
- columns (see template style sheet for details).
- *     'ul'    using multiple floated unordered lists. (DEFAULT)
- *     'table' using conventional tables based layout.
- *     NULL    blocks the use of columns
- */
+* Because columns are tricky things, in terms of balancing visual
+* layout against semantic markup. The choice has been left to the
+* system administrator or designer. (Who ever cares most.)
+*
+* $column_style defines how columns are rendered for survey answers.
+* There are four possible options:
+*     'css'   using one of the various CSS only methods for creating
+columns (see template style sheet for details).
+*     'ul'    using multiple floated unordered lists. (DEFAULT)
+*     'table' using conventional tables based layout.
+*     NULL    blocks the use of columns
+*/
 $config['column_style'] = 'ul';
 
 /**
- * $hide_groupdescr_allinone.
- * This parameter 'hide_groupdescr_allinone' can be set to control
- * if the group description should be hidden if the group description of a group of questions
- * with all questions hidden by conditions is displayed in all-in-one survey mode.
- * hide_groupdescr_allinone can be set to true or false (default: true)
- */
+* $hide_groupdescr_allinone.
+* This parameter 'hide_groupdescr_allinone' can be set to control
+* if the group description should be hidden if the group description of a group of questions
+* with all questions hidden by conditions is displayed in all-in-one survey mode.
+* hide_groupdescr_allinone can be set to true or false (default: true)
+*/
 $config['hide_groupdescr_allinone']=true;
 
 
 /**
- * Use FireBug Lite for JavaScript and template development and testing.
- * This allows you to use all the features of Firebug in any browser.
- * see http://getfirebug.com/lite.html for more info.
- */
+* Use FireBug Lite for JavaScript and template development and testing.
+* This allows you to use all the features of Firebug in any browser.
+* see http://getfirebug.com/lite.html for more info.
+*/
 $config['use_firebug_lite'] = false;
 
 /*
- * When activated there are additional values like arithmetic mean and standard deviation at statistics.
- * This only affects question types "A" (5 point array) and "5" (5 point choice).
- * Furthermore data is aggregated to get a faster overview.
- */
+* When activated there are additional values like arithmetic mean and standard deviation at statistics.
+* This only affects question types "A" (5 point array) and "5" (5 point choice).
+* Furthermore data is aggregated to get a faster overview.
+*/
 $config['showaggregateddata'] = 1;
 
 
 /**
- * When this settings is true/1 (default) then the standard templates that are delivered with the
- * LimeSurvey installation package are read-only. If you want to modify a template just copy it first.
- * This prevents upgrade problems later because if you modify your standard templates you could accidenitally
- * overwrite these on a LimSurvey upgrade. Only set this to 0 if you know what you are doing.
- */
+* When this settings is true/1 (default) then the standard templates that are delivered with the
+* LimeSurvey installation package are read-only. If you want to modify a template just copy it first.
+* This prevents upgrade problems later because if you modify your standard templates you could accidenitally
+* overwrite these on a LimSurvey upgrade. Only set this to 0 if you know what you are doing.
+*/
 $config['standard_templates_readonly'] =  true;
 
 
 /**
- * When this settings is true/1 (default = false/0) then the printable survey option will show a reference
- * to the "lime_survey_12345" table which stores the survey answers.
- * It will show a code like "12345X22X333name":
- * 12345 = surveyID
- * 22 = groupID
- * 333 = questionID
- * name = answer code (only shown for certain question types
- *
- * This code will be shown in front of each question and in front of each answer option at the printable survey.
- * It can be used as a data analysis code book for querying data from the main response table.
- */
+* When this settings is true/1 (default = false/0) then the printable survey option will show a reference
+* to the "lime_survey_12345" table which stores the survey answers.
+* It will show a code like "12345X22X333name":
+* 12345 = surveyID
+* 22 = groupID
+* 333 = questionID
+* name = answer code (only shown for certain question types
+*
+* This code will be shown in front of each question and in front of each answer option at the printable survey.
+* It can be used as a data analysis code book for querying data from the main response table.
+*/
 $config['showsgqacode'] =  false;
 
 
 
 /**
- *  PDF Export Settings
- *  This feature activates PDF export for printable survey and Print Answers
- *  The PDF export is totally experimental. The output is mostly ugly.
- *  At this point no support can be given - if you want to help to fix it please get in touch with us
- */
+*  PDF Export Settings
+*  This feature activates PDF export for printable survey and Print Answers
+*  The PDF export is totally experimental. The output is mostly ugly.
+*  At this point no support can be given - if you want to help to fix it please get in touch with us
+*/
 
 $config['usepdfexport']   = 1;                       //Set 0 to disable; 1 to enable
 //$config['pdfdefaultfont'] = 'freemono';              //Default font for the pdf Export
@@ -337,26 +319,26 @@
 
 // RemoteControl Settings
 /**
- * This value determines if the RemoteControl is enabled (true) or not (false)
- */
+* This value determines if the RemoteControl is enabled (true) or not (false)
+*/
 $config['enableLsrc'] = false;
 
 /**
- * This value determines if you can save survey structures (as .csv) into your lsrc folder in export menu
- */
+* This value determines if you can save survey structures (as .csv) into your lsrc folder in export menu
+*/
 $config['export4lsrc'] = false;
 
 // CAS Settings
 /**
- * Please note that CAS functionality is very basic and you have to modify the client to your needs.
- * At least the hard work is done.
- * The Client is deployed in Limesurvey and a file login_check_cas.php does what login_check.php does in normal mode.
- *
- * $casEnabled determines if CAS should be used or not for Authentication.
- * $casAuthServer the servername of the cas Auth Server. Without http://
- * $casAuthPort CAS Server listening Port
- * $casAuthUri relative uri from $casAuthServer to cas workingdirectory
- */
+* Please note that CAS functionality is very basic and you have to modify the client to your needs.
+* At least the hard work is done.
+* The Client is deployed in Limesurvey and a file login_check_cas.php does what login_check.php does in normal mode.
+*
+* $casEnabled determines if CAS should be used or not for Authentication.
+* $casAuthServer the servername of the cas Auth Server. Without http://
+* $casAuthPort CAS Server listening Port
+* $casAuthUri relative uri from $casAuthServer to cas workingdirectory
+*/
 $config['casEnabled'] = false;
 $config['casAuthServer'] = 'localhost';
 $config['casAuthPort'] = 8443;
@@ -364,97 +346,97 @@
 
 
 /**
- *  Statistics chart settings
- *  Different languages need different fonts to properly create charts - this is what the following settings are for
- */
+*  Statistics chart settings
+*  Different languages need different fonts to properly create charts - this is what the following settings are for
+*/
 
 /**
- *  $chartfontfile - set the font file name used to created the charts in statistics - this font must reside in <limesurvey root folder>/fonts
- *  Set this to specific font-file (for example 'vera.ttf') or set it to 'auto' and LimeSurvey tried to pick the best font depending on your survey base language
- */
+*  $chartfontfile - set the font file name used to created the charts in statistics - this font must reside in <limesurvey root folder>/fonts
+*  Set this to specific font-file (for example 'vera.ttf') or set it to 'auto' and LimeSurvey tried to pick the best font depending on your survey base language
+*/
 $config['chartfontfile']='auto';
 
 /**
- *  $chartfontsize - set the size of the font to created the charts in statistics
- */
+*  $chartfontsize - set the size of the font to created the charts in statistics
+*/
 $config['chartfontsize'] =10;
 
 
 /**
- * $updatecheckperiod - sets how often LimeSurvey checks for updates - the number sets the number of days between updates.
- * Set to 0 to disable any update checks
- * Recommended: 7
- */
+* $updatecheckperiod - sets how often LimeSurvey checks for updates - the number sets the number of days between updates.
+* Set to 0 to disable any update checks
+* Recommended: 7
+*/
 $config['updatecheckperiod']=7;
 
 /**
- * @var $showxquestions string allows you to control whether or not
- * {THEREAREXQUESTIONS} is displayed (if it is included in a template)
- *	hide = always hide {THEREAREXQUESTIONS}
- *	show = always show {THEREAREXQUESTIONS}
- *	choose = allow survey admins to choose
- */
+* @var $showxquestions string allows you to control whether or not
+* {THEREAREXQUESTIONS} is displayed (if it is included in a template)
+*	hide = always hide {THEREAREXQUESTIONS}
+*	show = always show {THEREAREXQUESTIONS}
+*	choose = allow survey admins to choose
+*/
 $config['showxquestions'] = 'choose';
 
 
 /**
- * @var $showgroupinfo string allows you to control whether or not
- * {GROUPNAME} and/or {GROUPDESCRIPTION} are displayed (if they are
- * included in a template)
- *	none = always hide both title and description
- *	name = always {GROUPNAME} only
- *	description = always show {GROUPDESCRIPTION} only
- *	both = always show both {GROUPNAME} and {GROUPDESCRIPTION}
- *	choose = allow survey admins to choose
- */
+* @var $showgroupinfo string allows you to control whether or not
+* {GROUPNAME} and/or {GROUPDESCRIPTION} are displayed (if they are
+* included in a template)
+*	none = always hide both title and description
+*	name = always {GROUPNAME} only
+*	description = always show {GROUPDESCRIPTION} only
+*	both = always show both {GROUPNAME} and {GROUPDESCRIPTION}
+*	choose = allow survey admins to choose
+*/
 $config['showgroupinfo'] = 'choose';
 
 
 /**
- * @var $showqnumcode string allows you to control whether or not
- * {QUESTION_NUMBER} and/or {QUESTION_CODE} are displayed (if they
- * are included in a template)
- *	none = always hide both {QUESTION_NUMBER} and {QUESTION_CODE}
- *	code = always show {QUESTION_CODE} only
- *	number = always show {QUESTION_NUMBER} only
- *	both = always show both {QUESTION_NUMBER} and {QUESTION_CODE}
- *	choose = allow survey admins to choose
- */
+* @var $showqnumcode string allows you to control whether or not
+* {QUESTION_NUMBER} and/or {QUESTION_CODE} are displayed (if they
+* are included in a template)
+*	none = always hide both {QUESTION_NUMBER} and {QUESTION_CODE}
+*	code = always show {QUESTION_CODE} only
+*	number = always show {QUESTION_NUMBER} only
+*	both = always show both {QUESTION_NUMBER} and {QUESTION_CODE}
+*	choose = allow survey admins to choose
+*/
 $config['showqnumcode'] = 'choose';
 
 
 /**
- * @var $force_ssl string - forces LimeSurvey to run through HTTPS or to block HTTPS
- * 	'on' =	force SSL/HTTPS to be on (This will cause LimeSurvey
- *		to fail in SSL is turned off)
- *	'off' =	block SSL/HTTPS (this prevents LimeSurvey from
- *		running through SSL)
- *	'' =	do nothing (default)
- *
- * DO NOT turn on secure unless you are sure SSL/HTTPS is working and
- * that you have a current, working, valid certificate. If you are
- * unsure whether your server has a valid certificate, just add 's'
- * to the http part of your normal LimeSurvey URL.
- *	e.g. https://your.domain.org/limesurvey/admin/admin.php
- * If LimeSurvey comes up as normal, then everything is fine. If you
- * get a page not found error or permission denied error then
- */
+* @var $force_ssl string - forces LimeSurvey to run through HTTPS or to block HTTPS
+* 	'on' =	force SSL/HTTPS to be on (This will cause LimeSurvey
+*		to fail in SSL is turned off)
+*	'off' =	block SSL/HTTPS (this prevents LimeSurvey from
+*		running through SSL)
+*	'' =	do nothing (default)
+*
+* DO NOT turn on secure unless you are sure SSL/HTTPS is working and
+* that you have a current, working, valid certificate. If you are
+* unsure whether your server has a valid certificate, just add 's'
+* to the http part of your normal LimeSurvey URL.
+*	e.g. https://your.domain.org/limesurvey/admin/admin.php
+* If LimeSurvey comes up as normal, then everything is fine. If you
+* get a page not found error or permission denied error then
+*/
 $config['force_ssl'] = ''; // DO not turn on unless you are sure your server supports SSL/HTTPS
 
 
 /**
- * @var $ssl_emergency_override boolean forces SSL off
- * if You've turned HTTPS/SSL on in the global settings but your
- * server doesn't have HTTPS enabled, the only way to turn it off is
- * by changing a value in the database directly. This allows you to
- * force HTTPS off while you change the global settings for Force Secure.
- *
- *     false = do nothing;
- *     true = override $force_ssl=on;
- *
- * This should always be false except in emergencies where you change
- * it to true until you fix the problem.
- */
+* @var $ssl_emergency_override boolean forces SSL off
+* if You've turned HTTPS/SSL on in the global settings but your
+* server doesn't have HTTPS enabled, the only way to turn it off is
+* by changing a value in the database directly. This allows you to
+* force HTTPS off while you change the global settings for Force Secure.
+*
+*     false = do nothing;
+*     true = override $force_ssl=on;
+*
+* This should always be false except in emergencies where you change
+* it to true until you fix the problem.
+*/
 $config['ssl_emergency_override'] = false;
 
 
diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
index 4d6f7efbca0..42f4d83b606 100644
--- a/application/controllers/admin/tokens.php
+++ b/application/controllers/admin/tokens.php
@@ -1,32 +1,32 @@
 <?php if ( !defined('BASEPATH')) exit('No direct script access allowed');
 /*
- * LimeSurvey
- * Copyright (C) 2007-2011 The LimeSurvey Project Team / Carsten Schmitz
- * All rights reserved.
- * License: GNU/GPL License v2 or later, see LICENSE.php
- * LimeSurvey is free software. This version may have been modified pursuant
- * to the GNU General Public License, and as distributed it includes or
- * is derivative of works licensed under the GNU General Public License or
- * other free or open source software licenses.
- * See COPYRIGHT.php for copyright notices and details.
- *
- * 	$Id$
- */
+* LimeSurvey
+* Copyright (C) 2007-2011 The LimeSurvey Project Team / Carsten Schmitz
+* All rights reserved.
+* License: GNU/GPL License v2 or later, see LICENSE.php
+* LimeSurvey is free software. This version may have been modified pursuant
+* to the GNU General Public License, and as distributed it includes or
+* is derivative of works licensed under the GNU General Public License or
+* other free or open source software licenses.
+* See COPYRIGHT.php for copyright notices and details.
+*
+* 	$Id$
+*/
 
 /**
- * Tokens Controller
- *
- * This controller performs token actions
- *
- * @package		LimeSurvey
- * @subpackage	Backend
- */
+* Tokens Controller
+*
+* This controller performs token actions
+*
+* @package		LimeSurvey
+* @subpackage	Backend
+*/
 class tokens extends Survey_Common_Action
 {
 
-	/**
-	 * Show token index page, handle token database
-	 */
+    /**
+    * Show token index page, handle token database
+    */
     function index($iSurveyId)
     {
         $iSurveyId = sanitize_int($iSurveyId);
@@ -68,10 +68,10 @@ function index($iSurveyId)
     }
 
     /**
-     * tokens::bounceprocessing()
-     *
-     * @return void
-     */
+    * tokens::bounceprocessing()
+    *
+    * @return void
+    */
     function bounceprocessing($iSurveyId)
     {
         $iSurveyId = sanitize_int($iSurveyId);
@@ -177,7 +177,7 @@ function bounceprocessing($iSurveyId)
                             if ($iSurveyId == $iSurveyIdBounce[1])
                             {
                                 $aData = array(
-                                    'emailstatus' => 'bounced'
+                                'emailstatus' => 'bounced'
                                 );
                                 $condn = array('token' => $tokenBounce[1]);
 
@@ -230,8 +230,8 @@ function bounceprocessing($iSurveyId)
     }
 
     /**
-     * Browse Tokens
-     */
+    * Browse Tokens
+    */
     function browse($iSurveyId, $limit = 50, $start = 0, $order = false, $searchstring = false)
     {
         $this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . "admin/tokens.js");
@@ -318,12 +318,12 @@ function browse($iSurveyId, $limit = 50, $start = 0, $order = false, $searchstri
     }
 
     /**
-     * This function sends the shared participant info to the share panel using JSON encoding
-     * This function is called after the share panel grid is loaded
-     * This function returns the json depending on the user logged in by checking it from the session
-     * @param it takes the session user data loginID
-     * @return JSON encoded string containg sharing information
-     */
+    * This function sends the shared participant info to the share panel using JSON encoding
+    * This function is called after the share panel grid is loaded
+    * This function returns the json depending on the user logged in by checking it from the session
+    * @param it takes the session user data loginID
+    * @return JSON encoded string containg sharing information
+    */
     function getTokens_json($iSurveyId)
     {
         $clang = $this->getController()->lang;
@@ -404,7 +404,38 @@ function editToken($iSurveyId)
 
             echo $from . ',' . $until;
             $aData = array(
-                'firstname' => Yii::app()->request->getPost('firstname'),
+            'firstname' => Yii::app()->request->getPost('firstname'),
+            'lastname' => Yii::app()->request->getPost('lastname'),
+            'email' => Yii::app()->request->getPost('email'),
+            'emailstatus' => Yii::app()->request->getPost('emailstatus'),
+            'token' => Yii::app()->request->getPost('token'),
+            'language' => Yii::app()->request->getPost('language'),
+            'sent' => Yii::app()->request->getPost('sent'),
+            'remindersent' => Yii::app()->request->getPost('remindersent'),
+            'remindercount' => Yii::app()->request->getPost('remindercount'),
+            'completed' => Yii::app()->request->getPost('completed'),
+            'usesleft' => Yii::app()->request->getPost('usesleft'),
+            'validfrom' => $from,
+            'validuntil' => $until);
+            $attrfieldnames = Survey::model()->findByPk($iSurveyId)->tokenAttributes;
+            foreach ($attrfieldnames as $attr_name => $desc)
+            {
+                $value = Yii::app()->request->getPost($attr_name);
+                if ($desc['mandatory'] == 'Y' && trim($value) == '')
+                    $this->getController()->error(sprintf($this->controller->lang->gT('%s cannot be empty'), $desc['description']));
+                $aData[$attr_name] = Yii::app()->request->getPost($attr_name);
+            }
+            $token = Tokens_dynamic::model()->find('tid=' . CHttpRequest::getPost('id'));
+
+            foreach ($aData as $k => $v)
+                $token->$k = $v;
+            echo $token->update();
+        }
+        // if add it will insert a new row
+        elseif ($sOperation == 'add')
+        {
+            if (Yii::app()->request->getPost('language') == '')
+                $aData = array('firstname' => Yii::app()->request->getPost('firstname'),
                 'lastname' => Yii::app()->request->getPost('lastname'),
                 'email' => Yii::app()->request->getPost('email'),
                 'emailstatus' => Yii::app()->request->getPost('emailstatus'),
@@ -417,45 +448,14 @@ function editToken($iSurveyId)
                 'usesleft' => Yii::app()->request->getPost('usesleft'),
                 'validfrom' => $from,
                 'validuntil' => $until);
-                $attrfieldnames = Survey::model()->findByPk($iSurveyId)->tokenAttributes;
-                foreach ($attrfieldnames as $attr_name => $desc)
-                {
-                    $value = Yii::app()->request->getPost($attr_name);
-                    if ($desc['mandatory'] == 'Y' && trim($value) == '')
-                        $this->getController()->error(sprintf($this->controller->lang->gT('%s cannot be empty'), $desc['description']));
-                    $aData[$attr_name] = Yii::app()->request->getPost($attr_name);
-                }
-            $token = Tokens_dynamic::model()->find('tid=' . CHttpRequest::getPost('id'));
-
-            foreach ($aData as $k => $v)
-                $token->$k = $v;
-            echo $token->update();
-        }
-        // if add it will insert a new row
-        elseif ($sOperation == 'add')
-        {
-            if (Yii::app()->request->getPost('language') == '')
-                $aData = array('firstname' => Yii::app()->request->getPost('firstname'),
-                    'lastname' => Yii::app()->request->getPost('lastname'),
-                    'email' => Yii::app()->request->getPost('email'),
-                    'emailstatus' => Yii::app()->request->getPost('emailstatus'),
-                    'token' => Yii::app()->request->getPost('token'),
-                    'language' => Yii::app()->request->getPost('language'),
-                    'sent' => Yii::app()->request->getPost('sent'),
-                    'remindersent' => Yii::app()->request->getPost('remindersent'),
-                    'remindercount' => Yii::app()->request->getPost('remindercount'),
-                    'completed' => Yii::app()->request->getPost('completed'),
-                    'usesleft' => Yii::app()->request->getPost('usesleft'),
-                    'validfrom' => $from,
-                    'validuntil' => $until);
-                $attrfieldnames = Survey::model()->findByPk($iSurveyId)->tokenAttributes;
-                foreach ($attrfieldnames as $attr_name => $desc)
-                {
-                    $value = Yii::app()->request->getPost($attr_name);
-                    if ($desc['mandatory'] == 'Y' && trim($value) == '')
-                        $this->getController()->error(sprintf($clang->gT('%s cannot be empty'), $desc['description']));
-                    $aData[$attr_name] = Yii::app()->request->getPost($attr_name);
-                }
+            $attrfieldnames = Survey::model()->findByPk($iSurveyId)->tokenAttributes;
+            foreach ($attrfieldnames as $attr_name => $desc)
+            {
+                $value = Yii::app()->request->getPost($attr_name);
+                if ($desc['mandatory'] == 'Y' && trim($value) == '')
+                    $this->getController()->error(sprintf($clang->gT('%s cannot be empty'), $desc['description']));
+                $aData[$attr_name] = Yii::app()->request->getPost($attr_name);
+            }
             echo lsJSONEncode(var_export($aData));
             $token = new Tokens_dynamic;
             foreach ($aData as $k => $v)
@@ -470,8 +470,8 @@ function editToken($iSurveyId)
     }
 
     /**
-     * Add new token form
-     */
+    * Add new token form
+    */
     function addnew($iSurveyId)
     {
         $iSurveyId = sanitize_int($iSurveyId);
@@ -525,22 +525,22 @@ function addnew($iSurveyId)
                 }
                 $sanitizedtoken = $newtoken;
             }
-            
-            
-            
+
+
+
             $aData = array(
-                'firstname' => Yii::app()->request->getPost('firstname'),
-                'lastname' => Yii::app()->request->getPost('lastname'),
-                'email' => sanitize_email(Yii::app()->request->getPost('email')),
-                'emailstatus' => Yii::app()->request->getPost('emailstatus'),
-                'token' => $sanitizedtoken,
-                'language' => sanitize_languagecode(Yii::app()->request->getPost('language')),
-                'sent' => Yii::app()->request->getPost('sent'),
-                'remindersent' => Yii::app()->request->getPost('remindersent'),
-                'completed' => Yii::app()->request->getPost('completed'),
-                'usesleft' => Yii::app()->request->getPost('usesleft'),
-                'validfrom' => $validfrom,
-                'validuntil' => $validuntil,
+            'firstname' => Yii::app()->request->getPost('firstname'),
+            'lastname' => Yii::app()->request->getPost('lastname'),
+            'email' => sanitize_email(Yii::app()->request->getPost('email')),
+            'emailstatus' => Yii::app()->request->getPost('emailstatus'),
+            'token' => $sanitizedtoken,
+            'language' => sanitize_languagecode(Yii::app()->request->getPost('language')),
+            'sent' => Yii::app()->request->getPost('sent'),
+            'remindersent' => Yii::app()->request->getPost('remindersent'),
+            'completed' => Yii::app()->request->getPost('completed'),
+            'usesleft' => Yii::app()->request->getPost('usesleft'),
+            'validfrom' => $validfrom,
+            'validuntil' => $validuntil,
             );
 
             // add attributes
@@ -580,8 +580,8 @@ function addnew($iSurveyId)
     }
 
     /**
-     * Edit Tokens
-     */
+    * Edit Tokens
+    */
     function edit($iSurveyId, $iTokenId)
     {
         $iSurveyId = sanitize_int($iSurveyId);
@@ -658,17 +658,17 @@ function edit($iSurveyId, $iTokenId)
                 $token->save();
 
                 $this->_renderWrappedTemplate('token', array('tokenbar', 'message' => array(
-                    'title' => $clang->gT("Success"),
-                    'message' => $clang->gT("The token entry was successfully updated.") . "<br /><br />\n"
-                        . "\t\t<input type='button' value='" . $clang->gT("Display tokens") . "' onclick=\"window.open('" . $this->getController()->createUrl("admin/tokens/browse/surveyid/$iSurveyId/") . "', '_top')\" />\n"
+                'title' => $clang->gT("Success"),
+                'message' => $clang->gT("The token entry was successfully updated.") . "<br /><br />\n"
+                . "\t\t<input type='button' value='" . $clang->gT("Display tokens") . "' onclick=\"window.open('" . $this->getController()->createUrl("admin/tokens/browse/surveyid/$iSurveyId/") . "', '_top')\" />\n"
                 )), $aData);
             }
             else
             {
                 $this->_renderWrappedTemplate('token', array('tokenbar', 'message' => array(
-                    'title' => $clang->gT("Failed"),
-                    'message' => $clang->gT("There is already an entry with that exact token in the table. The same token cannot be used in multiple entries.") . "<br /><br />\n"
-                        . "\t\t<input type='button' value='" . $clang->gT("Show this token entry") . "' onclick=\"window.open('" . $this->getController()->createUrl("admin/tokens/edit/surveyid/$iSurveyId/tokenid/$iTokenId") . "', '_top')\" />\n"
+                'title' => $clang->gT("Failed"),
+                'message' => $clang->gT("There is already an entry with that exact token in the table. The same token cannot be used in multiple entries.") . "<br /><br />\n"
+                . "\t\t<input type='button' value='" . $clang->gT("Show this token entry") . "' onclick=\"window.open('" . $this->getController()->createUrl("admin/tokens/edit/surveyid/$iSurveyId/tokenid/$iTokenId") . "', '_top')\" />\n"
                 )));
             }
         }
@@ -679,8 +679,8 @@ function edit($iSurveyId, $iTokenId)
     }
 
     /**
-     * Delete tokens
-     */
+    * Delete tokens
+    */
     function delete($iSurveyId)
     {
         $iSurveyId = sanitize_int($iSurveyId);
@@ -694,8 +694,8 @@ function delete($iSurveyId)
     }
 
     /**
-     * Add dummy tokens form
-     */
+    * Add dummy tokens form
+    */
     function addDummies($iSurveyId, $subaction = '')
     {
         $iSurveyId = sanitize_int($iSurveyId);
@@ -736,17 +736,17 @@ function addDummies($iSurveyId, $subaction = '')
             $santitizedtoken = '';
 
             $aData = array('firstname' => Yii::app()->request->getPost('firstname'),
-                'lastname' => Yii::app()->request->getPost('lastname'),
-                'email' => sanitize_email(Yii::app()->request->getPost('email')),
-                'emailstatus' => 'OK',
-                'token' => $santitizedtoken,
-                'language' => sanitize_languagecode(Yii::app()->request->getPost('language')),
-                'sent' => 'N',
-                'remindersent' => 'N',
-                'completed' => 'N',
-                'usesleft' => Yii::app()->request->getPost('usesleft'),
-                'validfrom' => Yii::app()->request->getPost('validfrom'),
-                'validuntil' => Yii::app()->request->getPost('validuntil'));
+            'lastname' => Yii::app()->request->getPost('lastname'),
+            'email' => sanitize_email(Yii::app()->request->getPost('email')),
+            'emailstatus' => 'OK',
+            'token' => $santitizedtoken,
+            'language' => sanitize_languagecode(Yii::app()->request->getPost('language')),
+            'sent' => 'N',
+            'remindersent' => 'N',
+            'completed' => 'N',
+            'usesleft' => Yii::app()->request->getPost('usesleft'),
+            'validfrom' => Yii::app()->request->getPost('validfrom'),
+            'validuntil' => Yii::app()->request->getPost('validuntil'));
 
             // add attributes
             $attrfieldnames = Survey::model()->findByPk($iSurveyId)->tokenAttributes;
@@ -784,9 +784,9 @@ function addDummies($iSurveyId, $subaction = '')
             }
 
             $this->_renderWrappedTemplate('token', array('message' => array(
-                'title' => $clang->gT("Success"),
-                'message' => $clang->gT("New dummy tokens were added.") . "<br /><br />\n<input type='button' value='"
-                    . $clang->gT("Display tokens") . "' onclick=\"window.open('" . $this->getController()->createUrl("admin/tokens/browse/surveyid/$iSurveyId") . "', '_top')\" />\n"
+            'title' => $clang->gT("Success"),
+            'message' => $clang->gT("New dummy tokens were added.") . "<br /><br />\n<input type='button' value='"
+            . $clang->gT("Display tokens") . "' onclick=\"window.open('" . $this->getController()->createUrl("admin/tokens/browse/surveyid/$iSurveyId") . "', '_top')\" />\n"
             ) ));
         }
         else
@@ -808,8 +808,8 @@ function addDummies($iSurveyId, $subaction = '')
     }
 
     /**
-     * Handle managetokenattributes action
-     */
+    * Handle managetokenattributes action
+    */
     function managetokenattributes($iSurveyId)
     {
         $clang = $this->getController()->lang;
@@ -839,8 +839,8 @@ function managetokenattributes($iSurveyId)
     }
 
     /**
-     * Update token attributes
-     */
+    * Update token attributes
+    */
     function updatetokenattributes($iSurveyId)
     {
         $clang = $this->getController()->lang;
@@ -869,14 +869,14 @@ function updatetokenattributes($iSurveyId)
         $aData['surveyid'] = $iSurveyId;
 
         $this->_renderWrappedTemplate('token', array('tokenbar', 'message' => array(
-            'title' => sprintf($clang->gT("%s field(s) were successfully added."), $number2add),
-            'message' => "<br /><input type='button' value='" . $clang->gT("Back to attribute field management.") . "' onclick=\"window.open('" . $this->getController()->createUrl("/admin/tokens/managetokenattributes/surveyid/$iSurveyId") . "', '_top')\" />"
+        'title' => sprintf($clang->gT("%s field(s) were successfully added."), $number2add),
+        'message' => "<br /><input type='button' value='" . $clang->gT("Back to attribute field management.") . "' onclick=\"window.open('" . $this->getController()->createUrl("/admin/tokens/managetokenattributes/surveyid/$iSurveyId") . "', '_top')\" />"
         )), $aData);
     }
 
     /**
-     * updatetokenattributedescriptions action
-     */
+    * updatetokenattributedescriptions action
+    */
     function updatetokenattributedescriptions($iSurveyId)
     {
         $clang = $this->getController()->lang;
@@ -894,9 +894,9 @@ function updatetokenattributedescriptions($iSurveyId)
         foreach ($tokenattributefieldnames as $fieldname)
         {
             $fieldcontents[$fieldname] = array(
-                'description' => strip_tags(Yii::app()->request->getPost('description_' . $fieldname)),
-                'mandatory' => Yii::app()->request->getPost('mandatory_' . $fieldname) == 'Y' ? 'Y' : 'N',
-                'show_register' => Yii::app()->request->getPost('show_register_' . $fieldname) == 'Y' ? 'Y' : 'N',
+            'description' => strip_tags(Yii::app()->request->getPost('description_' . $fieldname)),
+            'mandatory' => Yii::app()->request->getPost('mandatory_' . $fieldname) == 'Y' ? 'Y' : 'N',
+            'show_register' => Yii::app()->request->getPost('show_register_' . $fieldname) == 'Y' ? 'Y' : 'N',
             );
             foreach ($languages as $language)
                 $captions[$language][$fieldname] = $_POST["caption_{$fieldname}_$language"];
@@ -912,14 +912,14 @@ function updatetokenattributedescriptions($iSurveyId)
         $aData['thissurvey'] = getSurveyInfo($iSurveyId);
         $aData['surveyid'] = $iSurveyId;
         $this->_renderWrappedTemplate('token', array('tokenbar', 'message' => array(
-            'title' => $clang->gT('Token attribute descriptions were successfully updated.'),
-            'message' => "<br /><input type='button' value='" . $clang->gT('Back to attribute field management.') . "' onclick=\"window.open('" . $this->getController()->createUrl("/admin/tokens/managetokenattributes/surveyid/$iSurveyId") . "', '_top')\" />"
+        'title' => $clang->gT('Token attribute descriptions were successfully updated.'),
+        'message' => "<br /><input type='button' value='" . $clang->gT('Back to attribute field management.') . "' onclick=\"window.open('" . $this->getController()->createUrl("/admin/tokens/managetokenattributes/surveyid/$iSurveyId") . "', '_top')\" />"
         )), $aData);
     }
 
     /**
-     * Handle email action
-     */
+    * Handle email action
+    */
     function email($iSurveyId, $aTokenIds = null)
     {
         $clang = $this->getController()->lang;
@@ -955,7 +955,6 @@ function email($iSurveyId, $aTokenIds = null)
             $bHtml = false;
         }
 
-        $modrewrite = Yii::app()->getConfig("modrewrite");
         $timeadjust = Yii::app()->getConfig("timeadjust");
 
         $aData['thissurvey'] = getSurveyInfo($iSurveyId);
@@ -1000,23 +999,23 @@ function email($iSurveyId, $aTokenIds = null)
             if (!$bEmail)
             {
                 if (Yii::app()->request->getPost('maxremindercount') &&
-                        Yii::app()->request->getPost('maxremindercount') != '' &&
-                        intval(Yii::app()->request->getPost('maxremindercount')) != 0)
+                Yii::app()->request->getPost('maxremindercount') != '' &&
+                intval(Yii::app()->request->getPost('maxremindercount')) != 0)
                 {
                     $SQLremindercountcondition = " AND remindercount < " . intval(Yii::app()->request->getPost('maxremindercount'));
                 }
 
                 if (Yii::app()->request->getPost('minreminderdelay') &&
-                        Yii::app()->request->getPost('minreminderdelay') != '' &&
-                        intval(Yii::app()->request->getPost('minreminderdelay')) != 0)
+                Yii::app()->request->getPost('minreminderdelay') != '' &&
+                intval(Yii::app()->request->getPost('minreminderdelay')) != 0)
                 {
                     // Yii::app()->request->getPost('minreminderdelay') in days (86400 seconds per day)
                     $compareddate = dateShift(
-                            date("Y-m-d H:i:s", time() - 86400 * intval(Yii::app()->request->getPost('minreminderdelay'))), "Y-m-d H:i", $timeadjust);
+                    date("Y-m-d H:i:s", time() - 86400 * intval(Yii::app()->request->getPost('minreminderdelay'))), "Y-m-d H:i", $timeadjust);
                     $SQLreminderdelaycondition = " AND ( "
-                            . " (remindersent = 'N' AND sent < '" . $compareddate . "') "
-                            . " OR "
-                            . " (remindersent < '" . $compareddate . "'))";
+                    . " (remindersent = 'N' AND sent < '" . $compareddate . "') "
+                    . " OR "
+                    . " (remindersent < '" . $compareddate . "'))";
                 }
             }
 
@@ -1082,7 +1081,7 @@ function email($iSurveyId, $aTokenIds = null)
                     }
 
                     $customheaders = array('1' => "X-surveyid: " . $iSurveyId,
-                        '2' => "X-tokenid: " . $fieldsarray["{TOKEN}"]);
+                    '2' => "X-tokenid: " . $fieldsarray["{TOKEN}"]);
 
                     global $maildebug;
                     $modsubject = Replacefields(Yii::app()->request->getPost('subject_' . $emrow['language']), $fieldsarray);
@@ -1150,20 +1149,20 @@ function email($iSurveyId, $aTokenIds = null)
             else
             {
                 $this->_renderWrappedTemplate('token', array('tokenbar', 'message' => array(
-                    'title' => $clang->gT("Warning"),
-                    'message' => $clang->gT("There were no eligible emails to send. This will be because none satisfied the criteria of:")
-                            . "<br/>&nbsp;<ul><li>" . $clang->gT("having a valid email address") . "</li>"
-                            . "<li>" . $clang->gT("not having been sent an invitation already") . "</li>"
-                            . "<li>" . $clang->gT("having already completed the survey") . "</li>"
-                            . "<li>" . $clang->gT("having a token") . "</li></ul>"
+                'title' => $clang->gT("Warning"),
+                'message' => $clang->gT("There were no eligible emails to send. This will be because none satisfied the criteria of:")
+                . "<br/>&nbsp;<ul><li>" . $clang->gT("having a valid email address") . "</li>"
+                . "<li>" . $clang->gT("not having been sent an invitation already") . "</li>"
+                . "<li>" . $clang->gT("having already completed the survey") . "</li>"
+                . "<li>" . $clang->gT("having a token") . "</li></ul>"
                 )), $aData);
             }
         }
     }
 
     /**
-     * Export Dialog
-     */
+    * Export Dialog
+    */
     function exportdialog($iSurveyId)
     {
         $clang = $this->getController()->lang;
@@ -1187,12 +1186,12 @@ function exportdialog($iSurveyId)
     }
 
     /**
-     * Performs a ldap import
-     *
-     * @access public
-     * @param int $iSurveyId
-     * @return void
-     */
+    * Performs a ldap import
+    *
+    * @access public
+    * @param int $iSurveyId
+    * @return void
+    */
     public function importldap($iSurveyId)
     {
         $iSurveyId = (int) $iSurveyId;
@@ -1223,16 +1222,16 @@ public function importldap($iSurveyId)
             $duplicatelist = array();
             $invalidemaillist = array();
             $tokenoutput .= "\t<tr><td colspan='2' height='4'><strong>"
-                    . $clang->gT("Uploading LDAP Query") . "</strong></td></tr>\n"
-                    . "\t<tr><td align='center'>\n";
+            . $clang->gT("Uploading LDAP Query") . "</strong></td></tr>\n"
+            . "\t<tr><td align='center'>\n";
             $ldapq = Yii::app()->request->getPost('ldapQueries'); // the ldap query id
 
             $ldap_server_id = $ldap_queries[$ldapq]['ldapServerId'];
             $ldapserver = $ldap_server[$ldap_server_id]['server'];
             $ldapport = $ldap_server[$ldap_server_id]['port'];
             if (isset($ldap_server[$ldap_server_id]['encoding']) &&
-                    $ldap_server[$ldap_server_id]['encoding'] != 'utf-8' &&
-                    $ldap_server[$ldap_server_id]['encoding'] != 'UTF-8')
+            $ldap_server[$ldap_server_id]['encoding'] != 'utf-8' &&
+            $ldap_server[$ldap_server_id]['encoding'] != 'UTF-8')
             {
                 $ldapencoding = $ldap_server[$ldap_server_id]['encoding'];
             }
@@ -1243,7 +1242,7 @@ public function importldap($iSurveyId)
 
             // define $attrlist: list of attributes to read from users' entries
             $attrparams = array('firstname_attr', 'lastname_attr',
-                'email_attr', 'token_attr', 'language');
+            'email_attr', 'token_attr', 'language');
 
             $aTokenAttr = getAttributeFieldNames($iSurveyId);
             foreach ($aTokenAttr as $thisattrfieldname)
@@ -1255,7 +1254,7 @@ public function importldap($iSurveyId)
             foreach ($attrparams as $id => $attr)
             {
                 if (array_key_exists($attr, $ldap_queries[$ldapq]) &&
-                        $ldap_queries[$ldapq][$attr] != '')
+                $ldap_queries[$ldapq][$attr] != '')
                 {
                     $attrlist[] = $ldap_queries[$ldapq][$attr];
                 }
@@ -1297,7 +1296,7 @@ public function importldap($iSurveyId)
                                 // ==> send PHP notice msg to apache logs otherwise
                                 $meetminirequirements = true;
                                 if (isset($responseGroup[$j][$ldap_queries[$ldapq]['firstname_attr']]) &&
-                                        isset($responseGroup[$j][$ldap_queries[$ldapq]['lastname_attr']])
+                                isset($responseGroup[$j][$ldap_queries[$ldapq]['lastname_attr']])
                                 )
                                 {
                                     // minimum requirement for ldap
@@ -1335,7 +1334,7 @@ public function importldap($iSurveyId)
                                 {
                                     $attridx = substr($thisattrfieldname, 10); // the 'attribute_' prefix is 10 chars long
                                     if (isset($ldap_queries[$ldapq]['attr' . $attridx]) &&
-                                            isset($responseGroup[$j][$ldap_queries[$ldapq]['attr' . $attridx]]))
+                                    isset($responseGroup[$j][$ldap_queries[$ldapq]['attr' . $attridx]]))
                                         $myattrArray[$attridx] = ldap_readattr($responseGroup[$j][$ldap_queries[$ldapq]['attr' . $attridx]]);
                                 }
 
@@ -1392,7 +1391,7 @@ public function importldap($iSurveyId)
                                 {
                                     // No issue, let's import
                                     $iq = "INSERT INTO {{tokens_".intval($iSurveyId)."}} \n"
-                                            . "(firstname, lastname, email, emailstatus, token, language";
+                                    . "(firstname, lastname, email, emailstatus, token, language";
 
                                     foreach ($aTokenAttr as $thisattrfieldname)
                                     {
@@ -1403,7 +1402,7 @@ public function importldap($iSurveyId)
                                         }
                                     }
                                     $iq .=") \n"
-                                            . "VALUES (" . Yii::app()->db->quoteValue($myfirstname) . ", " . Yii::app()->db->quoteValue($mylastname) . ", " . Yii::app()->db->quoteValue($myemail) . ", 'OK', " . Yii::app()->db->quoteValue($mytoken) . ", " . Yii::app()->db->quoteValue($mylanguage) . "";
+                                    . "VALUES (" . Yii::app()->db->quoteValue($myfirstname) . ", " . Yii::app()->db->quoteValue($mylastname) . ", " . Yii::app()->db->quoteValue($myemail) . ", 'OK', " . Yii::app()->db->quoteValue($mytoken) . ", " . Yii::app()->db->quoteValue($mylanguage) . "";
 
                                     foreach ($aTokenAttr as $thisattrfieldname)
                                     {
@@ -1450,8 +1449,8 @@ public function importldap($iSurveyId)
     }
 
     /**
-     * import from csv
-     */
+    * import from csv
+    */
     function import($iSurveyId)
     {
         $clang = $this->getController()->lang;
@@ -1465,43 +1464,43 @@ function import($iSurveyId)
         $this->getController()->_js_admin_includes('scripts/tokens.js');
 
         $aEncodings = array(
-            "armscii8" => $clang->gT("ARMSCII-8 Armenian")
-            , "ascii" => $clang->gT("US ASCII")
-            , "auto" => $clang->gT("Automatic")
-            , "big5" => $clang->gT("Big5 Traditional Chinese")
-            , "binary" => $clang->gT("Binary pseudo charset")
-            , "cp1250" => $clang->gT("Windows Central European")
-            , "cp1251" => $clang->gT("Windows Cyrillic")
-            , "cp1256" => $clang->gT("Windows Arabic")
-            , "cp1257" => $clang->gT("Windows Baltic")
-            , "cp850" => $clang->gT("DOS West European")
-            , "cp852" => $clang->gT("DOS Central European")
-            , "cp866" => $clang->gT("DOS Russian")
-            , "cp932" => $clang->gT("SJIS for Windows Japanese")
-            , "dec8" => $clang->gT("DEC West European")
-            , "eucjpms" => $clang->gT("UJIS for Windows Japanese")
-            , "euckr" => $clang->gT("EUC-KR Korean")
-            , "gb2312" => $clang->gT("GB2312 Simplified Chinese")
-            , "gbk" => $clang->gT("GBK Simplified Chinese")
-            , "geostd8" => $clang->gT("GEOSTD8 Georgian")
-            , "greek" => $clang->gT("ISO 8859-7 Greek")
-            , "hebrew" => $clang->gT("ISO 8859-8 Hebrew")
-            , "hp8" => $clang->gT("HP West European")
-            , "keybcs2" => $clang->gT("DOS Kamenicky Czech-Slovak")
-            , "koi8r" => $clang->gT("KOI8-R Relcom Russian")
-            , "koi8u" => $clang->gT("KOI8-U Ukrainian")
-            , "latin1" => $clang->gT("cp1252 West European")
-            , "latin2" => $clang->gT("ISO 8859-2 Central European")
-            , "latin5" => $clang->gT("ISO 8859-9 Turkish")
-            , "latin7" => $clang->gT("ISO 8859-13 Baltic")
-            , "macce" => $clang->gT("Mac Central European")
-            , "macroman" => $clang->gT("Mac West European")
-            , "sjis" => $clang->gT("Shift-JIS Japanese")
-            , "swe7" => $clang->gT("7bit Swedish")
-            , "tis620" => $clang->gT("TIS620 Thai")
-            , "ucs2" => $clang->gT("UCS-2 Unicode")
-            , "ujis" => $clang->gT("EUC-JP Japanese")
-            , "utf8" => $clang->gT("UTF-8 Unicode"));
+        "armscii8" => $clang->gT("ARMSCII-8 Armenian")
+        , "ascii" => $clang->gT("US ASCII")
+        , "auto" => $clang->gT("Automatic")
+        , "big5" => $clang->gT("Big5 Traditional Chinese")
+        , "binary" => $clang->gT("Binary pseudo charset")
+        , "cp1250" => $clang->gT("Windows Central European")
+        , "cp1251" => $clang->gT("Windows Cyrillic")
+        , "cp1256" => $clang->gT("Windows Arabic")
+        , "cp1257" => $clang->gT("Windows Baltic")
+        , "cp850" => $clang->gT("DOS West European")
+        , "cp852" => $clang->gT("DOS Central European")
+        , "cp866" => $clang->gT("DOS Russian")
+        , "cp932" => $clang->gT("SJIS for Windows Japanese")
+        , "dec8" => $clang->gT("DEC West European")
+        , "eucjpms" => $clang->gT("UJIS for Windows Japanese")
+        , "euckr" => $clang->gT("EUC-KR Korean")
+        , "gb2312" => $clang->gT("GB2312 Simplified Chinese")
+        , "gbk" => $clang->gT("GBK Simplified Chinese")
+        , "geostd8" => $clang->gT("GEOSTD8 Georgian")
+        , "greek" => $clang->gT("ISO 8859-7 Greek")
+        , "hebrew" => $clang->gT("ISO 8859-8 Hebrew")
+        , "hp8" => $clang->gT("HP West European")
+        , "keybcs2" => $clang->gT("DOS Kamenicky Czech-Slovak")
+        , "koi8r" => $clang->gT("KOI8-R Relcom Russian")
+        , "koi8u" => $clang->gT("KOI8-U Ukrainian")
+        , "latin1" => $clang->gT("cp1252 West European")
+        , "latin2" => $clang->gT("ISO 8859-2 Central European")
+        , "latin5" => $clang->gT("ISO 8859-9 Turkish")
+        , "latin7" => $clang->gT("ISO 8859-13 Baltic")
+        , "macce" => $clang->gT("Mac Central European")
+        , "macroman" => $clang->gT("Mac West European")
+        , "sjis" => $clang->gT("Shift-JIS Japanese")
+        , "swe7" => $clang->gT("7bit Swedish")
+        , "tis620" => $clang->gT("TIS620 Thai")
+        , "ucs2" => $clang->gT("UCS-2 Unicode")
+        , "ujis" => $clang->gT("EUC-JP Japanese")
+        , "utf8" => $clang->gT("UTF-8 Unicode"));
 
         if (Yii::app()->request->getPost('submit'))
         {
@@ -1699,8 +1698,8 @@ function import($iSurveyId)
                                 $sanitizedArray[Yii::app()->db->quoteColumnName($key)]= Yii::app()->db->quoteValue($value);
                             }
                             $iq = "INSERT INTO {{tokens_$iSurveyId}} \n"
-                                    . "(" . implode(',', array_keys($writearray)) . ") \n"
-                                    . "VALUES (" . implode(",", $sanitizedArray) . ")";
+                            . "(" . implode(',', array_keys($writearray)) . ") \n"
+                            . "VALUES (" . implode(",", $sanitizedArray) . ")";
                             $ir = Yii::app()->db->createCommand($iq)->execute();
 
                             if (!$ir)
@@ -1746,8 +1745,8 @@ function import($iSurveyId)
     }
 
     /**
-     * Generate tokens
-     */
+    * Generate tokens
+    */
     function tokenify($iSurveyId)
     {
         $iSurveyId = sanitize_int($iSurveyId);
@@ -1763,13 +1762,13 @@ function tokenify($iSurveyId)
         if (!Yii::app()->request->getParam('ok'))
         {
             $this->_renderWrappedTemplate('token', array('tokenbar', 'message' => array(
-                'title' => $clang->gT("Create tokens"),
-                'message' => $clang->gT("Clicking yes will generate tokens for all those in this token list that have not been issued one. Is this OK?") . "<br /><br />\n"
-                    . "<input type='submit' value='"
-                    . $clang->gT("Yes") . "' onclick=\"" . convertGETtoPOST($this->getController()->createUrl("admin/tokens/tokenify/surveyid/$iSurveyId") . "?ok=Y") . "\" />\n"
-                    . "<input type='submit' value='"
-                    . $clang->gT("No") . "' onclick=\"window.open('" . $this->getController()->createUrl("admin/tokens/index/surveyid/$iSurveyId") . "', '_top')\" />\n"
-                    . "<br />\n"
+            'title' => $clang->gT("Create tokens"),
+            'message' => $clang->gT("Clicking yes will generate tokens for all those in this token list that have not been issued one. Is this OK?") . "<br /><br />\n"
+            . "<input type='submit' value='"
+            . $clang->gT("Yes") . "' onclick=\"" . convertGETtoPOST($this->getController()->createUrl("admin/tokens/tokenify/surveyid/$iSurveyId") . "?ok=Y") . "\" />\n"
+            . "<input type='submit' value='"
+            . $clang->gT("No") . "' onclick=\"window.open('" . $this->getController()->createUrl("admin/tokens/index/surveyid/$iSurveyId") . "', '_top')\" />\n"
+            . "<br />\n"
             )), $aData);
         }
         else
@@ -1777,15 +1776,15 @@ function tokenify($iSurveyId)
             //get token length from survey settings
             $newtokencount = Tokens_dynamic::model($iSurveyId)->createTokens($iSurveyId);
             $this->_renderWrappedTemplate('token', array('tokenbar', 'message' => array(
-                'title' => $clang->gT("Create tokens"),
-                'message' => str_replace("{TOKENCOUNT}", $newtokencount, $clang->gT("{TOKENCOUNT} tokens have been created"))
+            'title' => $clang->gT("Create tokens"),
+            'message' => str_replace("{TOKENCOUNT}", $newtokencount, $clang->gT("{TOKENCOUNT} tokens have been created"))
             )), $aData);
         }
     }
 
     /**
-     * Remove Token Database
-     */
+    * Remove Token Database
+    */
     function kill($iSurveyId)
     {
         $iSurveyId = sanitize_int($iSurveyId);
@@ -1802,13 +1801,13 @@ function kill($iSurveyId)
         if (!Yii::app()->request->getPost('ok'))
         {
             $this->_renderWrappedTemplate('token', array('tokenbar', 'message' => array(
-                'title' => $clang->gT("Delete Tokens Table"),
-                'message' => $clang->gT("If you delete this table tokens will no longer be required to access this survey.") . "<br />" . $clang->gT("A backup of this table will be made if you proceed. Your system administrator will be able to access this table.") . "<br />\n"
-                    . "( \"old_tokens_{$iSurveyId}_$date\" )<br /><br />\n"
-                    . "<input type='submit' value='"
-                    . $clang->gT("Delete Tokens") . "' onclick=\"" . convertGETtoPOST($this->getController()->createUrl("admin/tokens/kill/surveyid/$iSurveyId") . "?ok=y") . "\" />\n"
-                    . "<input type='submit' value='"
-                    . $clang->gT("Cancel") . "' onclick=\"window.open('" . $this->getController()->createUrl("admin/tokens/index/surveyid/$iSurveyId") . "', '_top')\" />\n"
+            'title' => $clang->gT("Delete Tokens Table"),
+            'message' => $clang->gT("If you delete this table tokens will no longer be required to access this survey.") . "<br />" . $clang->gT("A backup of this table will be made if you proceed. Your system administrator will be able to access this table.") . "<br />\n"
+            . "( \"old_tokens_{$iSurveyId}_$date\" )<br /><br />\n"
+            . "<input type='submit' value='"
+            . $clang->gT("Delete Tokens") . "' onclick=\"" . convertGETtoPOST($this->getController()->createUrl("admin/tokens/kill/surveyid/$iSurveyId") . "?ok=y") . "\" />\n"
+            . "<input type='submit' value='"
+            . $clang->gT("Cancel") . "' onclick=\"window.open('" . $this->getController()->createUrl("admin/tokens/index/surveyid/$iSurveyId") . "', '_top')\" />\n"
             )), $aData);
         }
         else
@@ -1819,11 +1818,11 @@ function kill($iSurveyId)
             Yii::app()->db->createCommand()->renameTable("{{{$oldtable}}}", "{{{$newtable}}}");
 
             $this->_renderWrappedTemplate('token', array('tokenbar', 'message' => array(
-                'title' => $clang->gT("Delete Tokens Table"),
-                'message' => '<br />' . $clang->gT("The tokens table has now been removed and tokens are no longer required to access this survey.") . "<br /> " . $clang->gT("A backup of this table has been made and can be accessed by your system administrator.") . "<br />\n"
-                    . "(\"old_tokens_{$iSurveyId}_$date\")" . "<br /><br />\n"
-                    . "<input type='submit' value='"
-                    . $clang->gT("Main Admin Screen") . "' onclick=\"window.open('" . Yii::app()->getController()->createUrl("admin/") . "', '_top')\" />"
+            'title' => $clang->gT("Delete Tokens Table"),
+            'message' => '<br />' . $clang->gT("The tokens table has now been removed and tokens are no longer required to access this survey.") . "<br /> " . $clang->gT("A backup of this table has been made and can be accessed by your system administrator.") . "<br />\n"
+            . "(\"old_tokens_{$iSurveyId}_$date\")" . "<br /><br />\n"
+            . "<input type='submit' value='"
+            . $clang->gT("Main Admin Screen") . "' onclick=\"window.open('" . Yii::app()->getController()->createUrl("admin/") . "', '_top')\" />"
             )), $aData);
         }
     }
@@ -1838,8 +1837,8 @@ function bouncesettings($iSurveyId)
         if (!empty($_POST))
         {
             $fieldvalue = array(
-                "bounceprocessing" => Yii::app()->request->getPost('bounceprocessing'),
-                "bounce_email" => Yii::app()->request->getPost('bounce_email'),
+            "bounceprocessing" => Yii::app()->request->getPost('bounceprocessing'),
+            "bounce_email" => Yii::app()->request->getPost('bounce_email'),
             );
 
             if (Yii::app()->request->getPost('bounceprocessing') == 'L')
@@ -1857,9 +1856,9 @@ function bouncesettings($iSurveyId)
             $survey->save();
 
             $this->_renderWrappedTemplate('token', array('tokenbar', 'message' => array(
-                'title' => $clang->gT("Bounce settings"),
-                'message' => $clang->gT("Bounce settings have been saved."),
-                'class' => 'successheader'
+            'title' => $clang->gT("Bounce settings"),
+            'message' => $clang->gT("Bounce settings have been saved."),
+            'class' => 'successheader'
             )), $aData);
         }
         else
@@ -1869,8 +1868,8 @@ function bouncesettings($iSurveyId)
     }
 
     /**
-     * Handle token form for addnew/edit actions
-     */
+    * Handle token form for addnew/edit actions
+    */
     function _handletokenform($iSurveyId, $subaction, $iTokenId="")
     {
         $clang = $this->getController()->lang;
@@ -1909,40 +1908,40 @@ private function _getTokenIds($aTokenIds)
     }
 
     /**
-     * Show dialogs and create a new tokens table
-     */
+    * Show dialogs and create a new tokens table
+    */
     function _newtokentable($iSurveyId)
     {
         $clang = $this->getController()->lang;
         if (Yii::app()->request->getPost('createtable') == "Y" && hasSurveyPermission($iSurveyId, 'surveyactivation', 'update'))
         {
             $fields = array(
-                'tid' => 'int(11) not null auto_increment primary key',
-                'participant_id' => 'VARCHAR(50)',
-                'firstname' => 'VARCHAR(40)',
-                'lastname' => 'VARCHAR(40)',
-                'email' => 'text',
-                'emailstatus' => 'text',
-                'token' => 'VARCHAR(35)',
-                'language' => 'VARCHAR(25)',
-                'blacklisted' => 'CHAR(17)',
-                'sent' => 'VARCHAR(17) DEFAULT "N"',
-                'remindersent' => 'VARCHAR(17) DEFAULT "N"',
-                'remindercount' => 'INT(11) DEFAULT 0',
-                'completed' => 'VARCHAR(17) DEFAULT "N"',
-                'usesleft' => 'INT(11) DEFAULT 1',
-                'validfrom' => 'DATETIME',
-                'validuntil' => 'DATETIME',
-                'mpid' => 'INT(11)'
+            'tid' => 'int(11) not null auto_increment primary key',
+            'participant_id' => 'VARCHAR(50)',
+            'firstname' => 'VARCHAR(40)',
+            'lastname' => 'VARCHAR(40)',
+            'email' => 'text',
+            'emailstatus' => 'text',
+            'token' => 'VARCHAR(35)',
+            'language' => 'VARCHAR(25)',
+            'blacklisted' => 'CHAR(17)',
+            'sent' => 'VARCHAR(17) DEFAULT "N"',
+            'remindersent' => 'VARCHAR(17) DEFAULT "N"',
+            'remindercount' => 'INT(11) DEFAULT 0',
+            'completed' => 'VARCHAR(17) DEFAULT "N"',
+            'usesleft' => 'INT(11) DEFAULT 1',
+            'validfrom' => 'DATETIME',
+            'validuntil' => 'DATETIME',
+            'mpid' => 'INT(11)'
             );
             $comm = Yii::app()->db->createCommand();
             $comm->createTable("{{tokens_".intval($iSurveyId)."}}", $fields);
 
             $this->_renderWrappedTemplate('token', array('message' =>array(
-                'title' => $clang->gT("Token control"),
-                'message' => $clang->gT("A token table has been created for this survey.") . " (\"" . Yii::app()->db->tablePrefix . "tokens_$iSurveyId\")<br /><br />\n"
-                    . "<input type='submit' value='"
-                    . $clang->gT("Continue") . "' onclick=\"window.open('" . $this->getController()->createUrl("admin/tokens/index/surveyid/$iSurveyId") . "', '_top')\" />\n"
+            'title' => $clang->gT("Token control"),
+            'message' => $clang->gT("A token table has been created for this survey.") . " (\"" . Yii::app()->db->tablePrefix . "tokens_$iSurveyId\")<br /><br />\n"
+            . "<input type='submit' value='"
+            . $clang->gT("Continue") . "' onclick=\"window.open('" . $this->getController()->createUrl("admin/tokens/index/surveyid/$iSurveyId") . "', '_top')\" />\n"
             )));
         }
         elseif (returnGlobal('restoretable') == "Y" && tableExists(Yii::app()->request->getPost('oldtable')) && hasSurveyPermission($iSurveyId, 'surveyactivation', 'update'))
@@ -1950,10 +1949,10 @@ function _newtokentable($iSurveyId)
             Yii::app()->db->createCommand()->renameTable(Yii::app()->request->getPost('oldtable'), "tokens_".intval($iSurveyId));
 
             $this->_renderWrappedTemplate('token', array('message' => array(
-                'title' => $clang->gT("Import old tokens"),
-                'message' => $clang->gT("A token table has been created for this survey and the old tokens were imported.") . " (\"" . Yii::app()->db->tablePrefix . "tokens_$iSurveyId" . "\")<br /><br />\n"
-                    . "<input type='submit' value='"
-                    . $clang->gT("Continue") . "' onclick=\"window.open('" . $this->getController()->createUrl("admin/tokens/index/surveyid/$iSurveyId") . "', '_top')\" />\n"
+            'title' => $clang->gT("Import old tokens"),
+            'message' => $clang->gT("A token table has been created for this survey and the old tokens were imported.") . " (\"" . Yii::app()->db->tablePrefix . "tokens_$iSurveyId" . "\")<br /><br />\n"
+            . "<input type='submit' value='"
+            . $clang->gT("Continue") . "' onclick=\"window.open('" . $this->getController()->createUrl("admin/tokens/index/surveyid/$iSurveyId") . "', '_top')\" />\n"
             )));
         }
         else
@@ -2052,12 +2051,12 @@ function subval_sort($a, $subkey, $order)
     }
 
     /**
-     * Renders template(s) wrapped in header and footer
-     *
-     * @param string $sAction Current action, the folder to fetch views from
-     * @param string|array $aViewUrls View url(s)
-     * @param array $aData Data to be passed on. Optional.
-     */
+    * Renders template(s) wrapped in header and footer
+    *
+    * @param string $sAction Current action, the folder to fetch views from
+    * @param string|array $aViewUrls View url(s)
+    * @param array $aData Data to be passed on. Optional.
+    */
     protected function _renderWrappedTemplate($sAction = 'token', $aViewUrls = array(), $aData = array())
     {
         $aData['imageurl'] = Yii::app()->getConfig('imageurl');
diff --git a/application/libraries/Save.php b/application/libraries/Save.php
index f1f127489ca..612103ed230 100644
--- a/application/libraries/Save.php
+++ b/application/libraries/Save.php
@@ -1,17 +1,17 @@
 <?php
 /*
- * LimeSurvey
- * Copyright (C) 2007-2011 The LimeSurvey Project Team / Carsten Schmitz
- * All rights reserved.
- * License: GNU/GPL License v2 or later, see LICENSE.php
- * LimeSurvey is free software. This version may have been modified pursuant
- * to the GNU General Public License, and as distributed it includes or
- * is derivative of works licensed under the GNU General Public License or
- * other free or open source software licenses.
- * See COPYRIGHT.php for copyright notices and details.
- *
- *	$Id$
- *
+* LimeSurvey
+* Copyright (C) 2007-2011 The LimeSurvey Project Team / Carsten Schmitz
+* All rights reserved.
+* License: GNU/GPL License v2 or later, see LICENSE.php
+* LimeSurvey is free software. This version may have been modified pursuant
+* to the GNU General Public License, and as distributed it includes or
+* is derivative of works licensed under the GNU General Public License or
+* other free or open source software licenses.
+* See COPYRIGHT.php for copyright notices and details.
+*
+*	$Id$
+*
 //Security Checked: POST, GET, SESSION, REQUEST, returnGlobal, DB
 
 Redesigned 7/25/2006 - swales
@@ -232,7 +232,7 @@ function savedcontrol()
     */
     function savedsilent()
     {
-        global $surveyid, $thissurvey, $errormsg, $publicurl, $sitename, $timeadjust, $clang, $clienttoken, $thisstep, $modrewrite;
+        global $surveyid, $thissurvey, $errormsg, $publicurl, $sitename, $timeadjust, $clang, $clienttoken, $thisstep;
         submitanswer();
         // Prepare email
         $tokenentryquery = 'SELECT * from {{tokens_'.$surveyid.'}} WHERE token=\''.sanitize_paranoid_string($clienttoken).'\';';
@@ -246,14 +246,10 @@ function savedsilent()
         $message .= $clang->gT("Reload your survey by clicking on the following link (or pasting it into your browser):","unescaped").":\n";
         $language = $tokenentryarray['language'];
 
-        if($modrewrite)
-        {
-            $message .= "\n\n$publicurl/$surveyid/lang-$language/tk-$clienttoken";
-        }
-        else
-        {
-            $message .= "\n\n$publicurl/index.php?lang=$language&sid=$surveyid&token=$clienttoken";
-        };
+
+        $message .= "\n\n$publicurl/$surveyid/lang-$language/tk-$clienttoken";
+
+
         if (SendEmailMessage($message, $subject, $to, $from, $sitename, false, getBounceEmail($surveyid)))
         {
             $emailsent="Y";
@@ -284,10 +280,10 @@ function set_answer_time()
             $setField = $_POST['lastanswer'];
         }
         else if (isset($_POST['lastgroup']))
-        {
-            $setField = $_POST['lastgroup'];
-        }
-        $passedTime = round(microtime(true) - $_POST['start_time'],2);
+            {
+                $setField = $_POST['lastgroup'];
+            }
+            $passedTime = round(microtime(true) - $_POST['start_time'],2);
 
         if(!isset($setField)){ //we show the whole survey on one page - we don't have to save time for group/question
             $query = "UPDATE {{survey_{$thissurvey['sid']}_timings}} SET "