Multi-language fixes for groups

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/phpsurveyor@2083 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Oct 9, 2006 · 034e984 · 034e984
1 parent 1590ff8
commit 034e984
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/admin/database.php b/admin/database.php
@@ -105,16 +105,34 @@ function get_max_order($gid)
 		{
 			$_POST  = array_map('db_quote', $_POST);
 
-		$query = "INSERT INTO ".db_table_name('groups')." (sid, group_name, description,group_order) VALUES ('{$_POST['sid']}', '{$_POST['group_name']}', '{$_POST['description']}',".getMaxgrouporder($_POST['sid']).")";
+			$baselang = GetBaseLanguageFromSurveyID($_POST['sid']);
+			$query = "INSERT INTO ".db_table_name('groups')." (sid, group_name, description,group_order,language) VALUES ('{$_POST['sid']}', '{$_POST['group_name']}', '{$_POST['description']}',".getMaxgrouporder($_POST['sid']).",'{$baselang}')";
 			$result = $connect->Execute($query);
 
 			if ($result)
 			{
 				//echo "<script type=\"text/javascript\">\n<!--\n alert(\"New group ({$_POST['group_name']}) has been created for survey id $surveyid\")\n //-->\n < /script>\n";
-			$query = "SELECT gid FROM ".db_table_name('groups')." WHERE group_name='{$_POST['group_name']}' AND sid={$_POST['sid']}";
+				$query = "SELECT gid FROM ".db_table_name('groups')." WHERE group_name='{$_POST['group_name']}' AND sid={$_POST['sid']}";
 				$result = db_execute_assoc($query);
 				while ($res = $result->FetchRow()) {$gid = $res['gid'];}
 				$groupselect = getgrouplist($gid);
+				$addlangs = GetAdditionalLanguagesFromSurveyID($_POST['sid']);
+				foreach ($addlangs as $alang)
+				{
+					if ($alang != "")
+					{
+						$query = "INSERT INTO ".db_table_name('groups')." (gid,sid, group_name, description,group_order,language) VALUES ('{$gid}','{$_POST['sid']}', '{$_POST['group_name']}', '{$_POST['description']}',".getMaxgrouporder($_POST['sid']).",'{$alang}')";
+						$result = $connect->Execute($query);
+						if (!$result)
+						{
+							echo _("Error: The database reported the following error:")."<br />\n";
+							echo "<font color='red'>" . htmlspecialchars($connect->ErrorMsg()) . "</font>\n";
+							echo "<pre>".htmlspecialchars($query)."</pre>\n";
+							echo "</body>\n</html>";
+							exit;
+						}
+					}
+				}
 			}
 			else
 			{
@@ -165,7 +183,7 @@ function get_max_order($gid)
 	elseif ($action == "delgroup" && $actsurrows['define_questions'])
 	{
 		if (!isset($gid)) {$gid=returnglobal('gid');}
-	$query = "SELECT qid FROM ".db_table_name('groups').", ".db_table_name('questions')." WHERE ".db_table_name('groups').".gid={".db_table_name('questions').".gid AND ".db_table_name('groups').".gid=$gid";
+	$query = "SELECT qid FROM ".db_table_name('groups').", ".db_table_name('questions')." WHERE ".db_table_name('groups').".gid=".db_table_name('questions').".gid AND ".db_table_name('groups').".gid=$gid";
 		if ($result = db_execute_assoc($query))
 		{
 			if (!isset($total)) {$total=0;}

diff --git a/admin/html.php b/admin/html.php
@@ -282,8 +282,6 @@
     	$sumquery3 = "SELECT * FROM ".db_table_name('questions')." WHERE sid=$surveyid AND language='".$defaultlang."'"; //Getting a count of questions for this survey
 		$sumresult5 = db_execute_assoc($sumquery5);
 		$sumrows5 = $sumresult5->FetchRow();
-
-		$sumquery3 = "SELECT * FROM {$dbprefix}questions WHERE sid=$surveyid"; //Getting a count of questions for this survey
 		$sumresult3 = $connect->Execute($sumquery3);
 		$sumcount3 = $sumresult3->RecordCount();
 	    $sumquery2 = "SELECT * FROM ".db_table_name('groups')." WHERE sid=$surveyid AND language='".$defaultlang."'"; //Getting a count of groups for this survey
@@ -1464,7 +1462,7 @@
 
 if($action == "setnewparents") 
 	{
-	// muss noch eingeschränkt werden ...
+	// muss noch eingeschr?nkt werden ...
 	if($_SESSION['USER_RIGHT_MOVE_USER'])
 		{
 		$uid = $_POST['uid'];
@@ -3301,7 +3299,8 @@
 		{		
 		$ordergroups = "<ul id='arrangableNodes'>";
 		//Get the groups from this survey
-		$ogquery = "SELECT * FROM {$dbprefix}groups WHERE sid=$surveyid order by group_order,group_name" ;
+		$s_lang = GetBaseLanguageFromSurveyID($surveyid);
+		$ogquery = "SELECT * FROM {$dbprefix}groups WHERE sid='{$surveyid}' AND language='{$s_lang}' order by group_order,group_name" ;
 		$ogresult = db_execute_assoc($ogquery) or die($connect->ErrorMsg());
 		while($ogrows = $ogresult->FetchRow())
 		{