Fixed issue #6197: Session expiration timeout is 0

LimeSurvey · Jun 18, 2012 · cb8844e · cb8844e
1 parent e12bec3
commit cb8844e
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/application/config/config-defaults.php b/application/config/config-defaults.php
@@ -483,6 +483,12 @@
 $config['enableXMLRPCInterface'] = 0;
 
 
+/**
+* This parameter sets the default session expiration time in seconds
+* Default is 8 hours
+* @var integer
+*/
+$config['iSessionExpirationTime'] = 28800;
 
 // === Advanced Setup
 // The following parameters need information from config.php

diff --git a/application/controllers/admin/globalsettings.php b/application/controllers/admin/globalsettings.php
@@ -154,9 +154,9 @@ private function _saveSettings()
         setGlobalSetting('repeatheadings', $repeatheadingstemp);
 
         setGlobalSetting('maxemails', sanitize_int($maxemails));
-        $iSessionExpirationTime = (int)($_POST['sess_expiration']);
+        $iSessionExpirationTime = (int)($_POST['iSessionExpirationTime']);
         if ($iSessionExpirationTime == 0) $iSessionExpirationTime = 3600;
-        setGlobalSetting('sess_expiration', $iSessionExpirationTime);
+        setGlobalSetting('iSessionExpirationTime', $iSessionExpirationTime);
         setGlobalSetting('ipInfoDbAPIKey', $_POST['ipInfoDbAPIKey']);
         setGlobalSetting('googleMapsAPIKey', $_POST['googleMapsAPIKey']);
         setGlobalSetting('googleanalyticsapikey',$_POST['googleanalyticsapikey']);

diff --git a/application/controllers/admin/remotecontrol.php b/application/controllers/admin/remotecontrol.php
@@ -119,7 +119,7 @@ public function get_session_key($username, $password)
 
             $session = new Sessions;
             $session->id = $session_key;
-            $session->expire = time() + Yii::app()->getConfig('sess_expiration');
+            $session->expire = time() + Yii::app()->getConfig('iSessionExpirationTime');
             $session->data = $username;
             $session->save();
 

diff --git a/application/controllers/survey/index.php b/application/controllers/survey/index.php
@@ -24,7 +24,7 @@ function action()
         global $thissurvey, $thisstep;
         global $clienttoken, $tokensexist, $token;
         $clang = Yii::app()->lang;
-        @ini_set('session.gc_maxlifetime', Yii::app()->getConfig('sess_expiration'));
+        @ini_set('session.gc_maxlifetime', Yii::app()->getConfig('iSessionExpirationTime'));
 
         $this->_loadRequiredHelpersAndLibraries();
 

diff --git a/application/models/Sessions.php b/application/models/Sessions.php
@@ -17,7 +17,7 @@
 class Sessions extends CActiveRecord
 {
 	/**
-	 * Returns the static model of Settings table
+	 * Returns the static model of Session table
 	 *
 	 * @static
 	 * @access public

diff --git a/application/views/admin/globalSettings_view.php b/application/views/admin/globalSettings_view.php
@@ -181,8 +181,8 @@
                         <?php $clang->eT("Server time:").' '.convertDateTimeFormat(date('Y-m-d H:i:s'),'Y-m-d H:i:s',$dateformatdata['phpdate'].' H:i')." - ". $clang->gT("Corrected time :").' '.convertDateTimeFormat(dateShift(date("Y-m-d H:i:s"), 'Y-m-d H:i:s', getGlobalSetting('timeadjust')),'Y-m-d H:i:s',$dateformatdata['phpdate'].' H:i'); ?>
                     </span></li>
 
-                <li><label for='sess_expiration'><?php $clang->eT("Session lifetime (seconds):"); ?></label>
-                    <input type='text' size='10' id='sess_expiration' name='sess_expiration' value="<?php echo htmlspecialchars(getGlobalSetting('sess_expiration')); ?>" /></li>
+                <li><label for='iSessionExpirationTime'><?php $clang->eT("Session lifetime (seconds):"); ?></label>
+                    <input type='text' size='10' id='iSessionExpirationTime' name='iSessionExpirationTime' value="<?php echo htmlspecialchars(getGlobalSetting('iSessionExpirationTime')); ?>" /></li>
                 <li><label for='ipInfoDbAPIKey'><?php $clang->eT("IP Info DB API Key:"); ?></label>
                     <input type='text' size='35' id='ipInfoDbAPIKey' name='ipInfoDbAPIKey' value="<?php echo htmlspecialchars(getGlobalSetting('ipInfoDbAPIKey')); ?>" /></li>
                 <li><label for='googleMapsAPIKey'><?php $clang->eT("Google Maps API key:"); ?></label>