From 719d2d9dc5ae37ef0bd42a087e18ed54fcf7835d Mon Sep 17 00:00:00 2001
From: Carsten Schmitz <carsten.schmitz@limesurvey.org>
Date: Tue, 25 Aug 2015 10:25:00 +0200
Subject: [PATCH] Fixed issue: User can accidentally change certain survey
 settings after survey is already active

---
 application/controllers/admin/surveyadmin.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php
index 37b07b5b0c5..1602acb1d9e 100644
--- a/application/controllers/admin/surveyadmin.php
+++ b/application/controllers/admin/surveyadmin.php
@@ -1413,16 +1413,19 @@ function update($iSurveyId)
         $oSurvey->admin =  Yii::app()->request->getPost('admin');
         $oSurvey->expires =  $expires;
         $oSurvey->startdate =  $startdate;
-        $oSurvey->anonymized = App()->request->getPost('anonymized');
         $oSurvey->faxto = App()->request->getPost('faxto');
         $oSurvey->format = App()->request->getPost('format');
-        $oSurvey->savetimings = App()->request->getPost('savetimings');
         $oSurvey->template = Yii::app()->request->getPost('template');
         $oSurvey->assessments = App()->request->getPost('assessments');
         $oSurvey->additional_languages = implode(' ',Yii::app()->request->getPost('additional_languages',array()));
-        $oSurvey->datestamp = App()->request->getPost('datestamp');
-        $oSurvey->ipaddr = App()->request->getPost('ipaddr');
-        $oSurvey->refurl = App()->request->getPost('refurl');
+        if ($oSurvey->active!='Y')
+        {
+            $oSurvey->anonymized = App()->request->getPost('anonymized');
+            $oSurvey->savetimings = App()->request->getPost('savetimings');
+            $oSurvey->datestamp = App()->request->getPost('datestamp');
+            $oSurvey->ipaddr = App()->request->getPost('ipaddr');
+            $oSurvey->refurl = App()->request->getPost('refurl');
+        }
         $oSurvey->publicgraphs = App()->request->getPost('publicgraphs');
         $oSurvey->usecookie = App()->request->getPost('usecookie');
         $oSurvey->allowregister = App()->request->getPost('allowregister');
@@ -1499,7 +1502,7 @@ function update($iSurveyId)
         cleanLanguagesFromSurvey($iSurveyId,implode(" ",$oSurvey->additionalLanguages));
         fixLanguageConsistency($iSurveyId,implode(" ",$oSurvey->additionalLanguages));
 
-        // Url params in json 
+        // Url params in json
         $aURLParams=json_decode(Yii::app()->request->getPost('allurlparams'),true);
         SurveyURLParameter::model()->deleteAllByAttributes(array('sid'=>$iSurveyId));
         if(isset($aURLParams))