Fixed issue #4979: Problem when transferring survey with embedded pic…

…tures from system A to system B. Fixed issue: linkes in URL containing uploaded images were not translated at import time. Fixed issue: the 'Convert resource links and INSERTANS fields?' test was reversed git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@9863 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Mar 8, 2011 · 5f13c1b · 5f13c1b
1 parent 900ac63
commit 5f13c1b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/admin/import_functions.php b/admin/import_functions.php
@@ -1338,6 +1338,7 @@ function XMLImportSurvey($sFullFilepath,$sXMLdata=NULL,$sNewSurveyName=NULL,$iDe
             $insertdata['qid']=$aQIDReplacements[(int)$insertdata['qid']]; // remap the parent_qid
 
             // now translate any links
+            $insertdata['answer']=translink('survey', $oldsid, $newsid, $insertdata['answer']);
             $query=$connect->GetInsertSQL($tablename,$insertdata);
             $result=$connect->Execute($query) or safe_die ($clang->gT("Error").": Failed to insert data<br />{$query}<br />\n".$connect->ErrorMsg());
             $results['answers']++;

diff --git a/common_functions.php b/common_functions.php
@@ -6701,21 +6701,22 @@ function getNextCode($sourcecode)
  */
 function translink($type, $oldid, $newid, $text)
 {
-    if (isset($_POST['translinksfields']))
+    global $relativeurl;
+    if (!isset($_POST['translinksfields']))
     {
         return $text;
     }
 
     if ($type == 'survey')
     {
-        $pattern = "upload/surveys/$oldid/";
-        $replace = "upload/surveys/$newid/";
+        $pattern = "([^'\"]*)/upload/surveys/$oldid/";
+        $replace = "$relativeurl/upload/surveys/$newid/";
         return preg_replace('#'.$pattern.'#', $replace, $text);
     }
     elseif ($type == 'label')
     {
-        $pattern = "upload/labels/$oldid/";
-        $replace = "upload/labels/$newid/";
+        $pattern = "([^'\"]*)/upload/labels/$oldid/";
+        $replace = "$relativeurl/upload/labels/$newid/";
         return preg_replace('#'.$pattern.'#', $replace, $text);
     }
     else