Dev Fixed next/previous group/question arrows

Dev Fixed .csv survey import

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@9579 b72ed6b6-b9f8-46b5-92b4-906544132732

admin/html.php

@@ -525,13 +525,13 @@
         {
           $surveysummary .= ""
             . "<a href='{$scriptname}?sid=$surveyid&amp;gid=$GidPrev'>"
-            . "<img src='{$imageurl}/questiongroupprevious.png' title='' alt='".$clang->gT("Previous question group")."' "
+            . "<img src='{$imageurl}/previous_20.png' title='' alt='".$clang->gT("Previous question group")."' "
             ."name='questiongroupprevious' ".$clang->gT("Previous question group")."/> </a>";
         }
         else
         {
           $surveysummary .= ""
-            . "<img src='{$imageurl}/questiongroupprevioushidden.png' title='' alt='".$clang->gT("No previous question group")."' "
+            . "<img src='{$imageurl}/previous_disabled_20.png' title='' alt='".$clang->gT("No previous question group")."' "
             ."name='noquestiongroupprevious' />";
         }
 
@@ -540,13 +540,13 @@
         {
           $surveysummary .= ""
             . "<a href='{$scriptname}?sid=$surveyid&amp;gid=$GidNext'>"
-            . "<img src='{$imageurl}/questiongroupnext.png' title='' alt='".$clang->gT("Next question group")."' "
+            . "<img src='{$imageurl}/next_20.png' title='' alt='".$clang->gT("Next question group")."' "
             ."name='questiongroupnext' ".$clang->gT("Next question group")."/> </a>";
         }
         else
         {
           $surveysummary .= ""
-            . "<img src='{$imageurl}/questiongroupnexthidden.png' title='' alt='".$clang->gT("No next question group")."' "
+            . "<img src='{$imageurl}/next_disabled_20.png' title='' alt='".$clang->gT("No next question group")."' "
             ."name='noquestiongroupnext' />";
         }
 		$surveysummary .= "</span>";
@@ -914,13 +914,13 @@
         {
           $groupsummary .= ""
             . "<a href='{$scriptname}?sid=$surveyid&amp;gid=$gid&amp;qid=$QidPrev'>"
-            . "<img src='{$imageurl}/questionprevious.png' title='' alt='".$clang->gT("Previous question")."' "
+            . "<img src='{$imageurl}/previous_20.png' title='' alt='".$clang->gT("Previous question")."' "
             ."name='questiongroupprevious' ".$clang->gT("Previous question")."/> </a>";
         }
         else
         {
           $groupsummary .= ""
-            . "<img src='{$imageurl}/questionprevioushidden.png' title='' alt='".$clang->gT("No previous question")."' "
+            . "<img src='{$imageurl}/previous_disabled_20.png' title='' alt='".$clang->gT("No previous question")."' "
             ."name='noquestionprevious' />";
         }
 
@@ -930,13 +930,13 @@
         {
           $groupsummary .= ""
             . "<a href='{$scriptname}?sid=$surveyid&amp;gid=$gid&amp;qid=$QidNext'>"
-            . "<img src='{$imageurl}/questiongroupnext.png' title='' alt='".$clang->gT("Next question")."' "
+            . "<img src='{$imageurl}/next_20.png' title='' alt='".$clang->gT("Next question")."' "
             ."name='questiongroupnext' ".$clang->gT("Next question")."/> </a>";
         }
         else
         {
           $groupsummary .= ""
-            . "<img src='{$imageurl}/questiongroupnexthidden.png' title='' alt='".$clang->gT("No next question")."' "
+            . "<img src='{$imageurl}/next_disabled_20.png' title='' alt='".$clang->gT("No next question")."' "
             ."name='noquestionnext' />";
         }
         $groupsummary .= "</span>";

admin/import_functions.php

@@ -432,9 +432,14 @@ function CSVImportSurvey($sFullFilepath,$iDesiredSurveyId=NULL)
     unset($surveyrowdata['attribute1']);
     unset($surveyrowdata['attribute2']);
     unset($surveyrowdata['usestartdate']);
+    unset($surveyrowdata['notification']);
     unset($surveyrowdata['useexpiry']);
     unset($surveyrowdata['url']);
     unset($surveyrowdata['lastpage']);
+    if (isset($surveyrowdata['private'])){
+        $surveyrowdata['anonymized']=$surveyrowdata['private'];
+        unset($surveyrowdata['private']);
+    }                            
     if (isset($surveyrowdata['startdate'])) {unset($surveyrowdata['startdate']);}
     $surveyrowdata['bounce_email']=$surveyrowdata['adminemail'];
     if (!isset($surveyrowdata['datecreated']) || $surveyrowdata['datecreated']=='' || $surveyrowdata['datecreated']=='null') {$surveyrowdata['datecreated']=$connect->BindTimeStamp(date_shift(date("Y-m-d H:i:s"), "Y-m-d", $timeadjust));}
@@ -464,7 +469,6 @@ function CSVImportSurvey($sFullFilepath,$iDesiredSurveyId=NULL)
         $surveylsrowdata['surveyls_email_register']=translink('survey', $oldsid, $newsid, $surveylsrowdata['surveyls_email_register']);
         $surveylsrowdata['surveyls_email_confirm']=translink('survey', $oldsid, $newsid, $surveylsrowdata['surveyls_email_confirm']);
         unset($surveylsrowdata['lastpage']);
-        $surveylsrowdata['surveyls_numberformat']=translink('survey', $oldsid, $newsid, $surveylsrowdata['surveyls_numberformat']);;
         $surveylsrowdata['surveyls_survey_id']=$newsid;
         $newvalues=array_values($surveylsrowdata);
         $newvalues=array_map(array(&$connect, "qstr"),$newvalues); // quote everything accordingly

survey.php

@@ -40,7 +40,7 @@
 $filenotvalidated = checkUploadedFileValidity($move);
 
 //SUBMIT
-if ((isset($move) && $move == "movesubmit") && (!isset($notanswered) || !$notanswered) && (!isset($notvalidated) && !$notvalidated) && (!isset($filenotvalidated) && !$filenotvalidated))
+if ((isset($move) && $move == "movesubmit") && (!isset($notanswered) || !$notanswered) && (!isset($notvalidated) && !$notvalidated) && (!isset($filenotvalidated) || !$filenotvalidated))
 {
     if ($thissurvey['anonymized'] == "Y")
     {