Fixed issue #6008: File upload doesn't work from data entry, not avai…

…lable in response edit dev: in yii branch creation of upload directory didn't work other than that data entry file upload works fine
LimeSurvey · May 1, 2012 · f84f4db · f84f4db
1 parent 134812e
commit f84f4db
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/application/helpers/admin/activate_helper.php b/application/helpers/admin/activate_helper.php
@@ -481,21 +481,19 @@ function activateSurvey($surveyid, $simulate = false)
         $activateoutput .= "<div class='successheader'>".$clang->gT("Survey has been activated. Results table has been successfully created.")."</div><br /><br />\n";
 
         // create the survey directory where the uploaded files can be saved
-        if ($createsurveydirectory)
-            if (!file_exists(Yii::app()->getConfig('rootdir')."upload/surveys/" . $surveyid . "/files") && !(mkdir(Yii::app()->getConfig('rootdir')."upload/surveys/" . $surveyid . "/files", 0777, true)))
-            if (!file_exists(Yii::app()->getConfig('uploaddir')."/surveys/" . $surveyid . "/files"))
+        if ($createsurveydirectory) 
+        {
+            if (!file_exists(Yii::app()->getConfig('uploaddir') . "/surveys/" . $surveyid . "/files"))
             {
-               if (!(mkdir(Yii::app()->getConfig('uploaddir')."/surveys/" . $surveyid . "/files", 0777, true)))
-               {
-
-                $activateoutput .= "<div class='warningheader'>".
-                    $clang->gT("The required directory for saving the uploaded files couldn't be created. Please check file premissions on the /upload/surveys directory.") . "</div>";
-               }
-               else
-               {
-                   file_put_contents(Yii::app()->getConfig('uploaddir')."/surveys/" . $surveyid . "/files/index.html",'<html><head></head><body></body></html>');
-               }
+                if (!(mkdir(Yii::app()->getConfig('uploaddir') . "/surveys/" . $surveyid . "/files", 0777, true)))
+                {
+                    $activateoutput .= "<div class='warningheader'>" .
+                        $clang->gT("The required directory for saving the uploaded files couldn't be created. Please check file premissions on the /upload/surveys directory.") . "</div>";
+                } else {
+                    file_put_contents(Yii::app()->getConfig('uploaddir') . "/surveys/" . $surveyid . "/files/index.html", '<html><head></head><body></body></html>');
+                }                
             }
+        }
         $acquery = "UPDATE {{surveys}} SET active='Y' WHERE sid=".$surveyid;
         $acresult = Yii::app()->db->createCommand($acquery)->query();