Fixed issue #6282: Error accessing a survey from a language that it h…

…asn't
LimeSurvey · Jul 6, 2012 · 11342a0 · 11342a0
1 parent d997153
commit 11342a0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/admin/tokens.php b/admin/tokens.php
@@ -2123,7 +2123,7 @@
             while (($tkrow = $tkresult->FetchRow()) && $invalidtokencount<50)
             {
                 $isvalidtoken = false;
-                while ($isvalidtoken == false && $invalidtokencount<50) 
+                while ($isvalidtoken == false && $invalidtokencount<50)
                 {
                     $newtoken = sRandomChars($tokenlength);
                     if (!isset($existingtokens[$newtoken])) {
@@ -2144,7 +2144,7 @@
                 }
             }
             if(!$invalidtokencount){
-                $tokenoutput .= "<div class='successheader'>".sprintf($clang->gT("%s tokens have been created"),$newtokencount)."</div>\n";
+                $tokenoutput .= "<div class='successheader'>".sprintf($clang->gT("%s tokens have been created."),$newtokencount)."</div>\n";
             }else{
                 $tokenoutput .= "\t\t<div class='errorheader'>".$clang->gT("Error")."</div>\n"
             ."\t\t<p>".sprintf($clang->gT("Only %s new tokens were added after %s trials."),$newtokencount,$invalidtokencount)."\n"

diff --git a/index.php b/index.php
@@ -126,7 +126,7 @@
     }
     $languagechanger = makelanguagechanger();
     //Find out if there are any publicly available surveys
-    $query = "SELECT a.sid, b.surveyls_title, a.publicstatistics
+    $query = "SELECT a.sid, b.surveyls_title, a.publicstatistics,a.language
     FROM ".db_table_name('surveys')." AS a
     INNER JOIN ".db_table_name('surveys_languagesettings')." AS b
     ON ( surveyls_survey_id = a.sid AND surveyls_language = a.language )
@@ -143,20 +143,18 @@
     {
         while($rows = $result->FetchRow())
         {
+            $sLinkLanguage=$rows['language'];
             $result2 = db_execute_assoc("Select surveyls_title from ".db_table_name('surveys_languagesettings')." where surveyls_survey_id={$rows['sid']} and surveyls_language='$baselang'");
             if ($result2->RecordCount())
             {
                 $languagedetails=$result2->FetchRow();
                 $rows['surveyls_title']=$languagedetails['surveyls_title'];
+                $sLinkLanguage=$baselang;
             }
             $link = "<li><a href='$rooturl/index.php?sid=".$rows['sid'];
             if (isset($_GET['lang']))
             {
-                $link .= "&lang=".sanitize_languagecode($_GET['lang']);
-            }
-            if (isset($_GET['lang']))
-            {
-                $link .= "&amp;lang=".sanitize_languagecode($_GET['lang']);
+                $link .= "&amp;lang=".$sLinkLanguage;
             }
             $link .= "'  class='surveytitle'>".$rows['surveyls_title']."</a>\n";
             if ($rows['publicstatistics'] == 'Y') $link .= "<a href='{$relativeurl}/statistics_user.php?sid={$rows['sid']}'>(".$clang->gT('View statistics').")</a>";
@@ -805,7 +803,7 @@
             }
             // done deleting uploaded files
         }
-        
+
         // also delete a record from saved_control when there is one, we can allway do it.
         $connect->query('DELETE FROM '.db_table_name('saved_control'). ' WHERE srid='.$_SESSION['srid'].' AND sid='.$surveyid);
     }
@@ -878,7 +876,7 @@
         if(($row['submitdate']==''  && $thissurvey['tokenanswerspersistence'] == 'Y' )|| ($row['submitdate']!='' && $thissurvey['alloweditaftercompletion'] == 'Y'))
         {
             $_SESSION['srid'] = $row['id'];
-            if (!is_null($row['lastpage']) && $row['submitdate']=='') 
+            if (!is_null($row['lastpage']) && $row['submitdate']=='')
             {
                 $_SESSION['LEMtokenResume'] = true;
                 $_SESSION['step'] = $row['lastpage'];