Fixed issue #3238: Notice at adding a new labelset

Fixed issue #3225: MySQL error when update saved response dev Updated adodb to version 5.08 for better PHP5 strict compatibility dev Fixed a couple of STRICT errors git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@6989 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Jun 1, 2009 · 28304a0 · 28304a0
1 parent 97d4ec7
commit 28304a0
Show file tree

Hide file tree

Showing 125 changed files with 16,372 additions and 7,001 deletions.
diff --git a/admin/database.php b/admin/database.php
@@ -1381,7 +1381,8 @@ function get_max_question_order($gid)
                             'publicgraphs'=>$_POST['publicgraphs'],
                             'assessments'=>$_POST['assessments']
                             );
-        $isquery = $connect->GetInsertSQL(db_table_name_nq('surveys'), $insertarray, get_magic_quotes_gpc());    
+        $dbtablename=db_table_name_nq('surveys');                    
+        $isquery = $connect->GetInsertSQL($dbtablename, $insertarray, get_magic_quotes_gpc());    
 		$isresult = $connect->Execute($isquery) or safe_die ($isrquery."<br />".$connect->ErrorMsg()); 
 
 

diff --git a/admin/dataentry.php b/admin/dataentry.php
@@ -1785,7 +1785,7 @@ function saveshow(value)
 		}
 		$updateqr = substr($updateqr, 0, -3);
 		if (isset($_POST['datestamp']) && $_POST['datestamp']) {$updateqr .= ", datestamp='".auto_escape($_POST['datestamp'])."'";}
-		if (isset($_POST['ipaddr']) && $_POST['ipaddr']) {$updateqr .= ", ipaddr=".auto_escape($_POST['ipaddr'])."'";}
+		if (isset($_POST['ipaddr']) && $_POST['ipaddr']) {$updateqr .= ", ipaddr='".auto_escape($_POST['ipaddr'])."'";}
 		if (isset($_POST['token']) && $_POST['token']) {$updateqr .= ", token='".auto_escape($_POST['token'])."'";}
 		if (isset($_POST['language']) && $_POST['language']) {$updateqr .= ", startlanguage='".auto_escape($_POST['language'])."'";}
 		if (isset($_POST['submitdate']) && $_POST['submitdate'] && $_POST['submitdate'] != "N") {$updateqr .= ", submitdate='".auto_escape($_POST['submitdate'])."'";}

diff --git a/admin/labels.php b/admin/labels.php
@@ -135,8 +135,8 @@
 		$langidsarray=explode(" ",trim($langids)); //Make an array of it
 		$labelsoutput.= "\n\t</th></tr></table>\n";
 
-
-		$labelsoutput.= "<div class='tab-pane' id='tab-pane-labelset-{$row['lid']}'>\n";
+        if (isset($row['lid'])) { $panecookie=$row['lid'];} else  {$panecookie='new';}
+		$labelsoutput.= "<div class='tab-pane' id='tab-pane-labelset-{$panecookie}'>\n";
 
 		$labelsoutput.= "<div class='tab-page'> <h2 class='tab'>".$tabitem."</h2>\n";
 

diff --git a/admin/statistics.php b/admin/statistics.php
@@ -3607,6 +3607,7 @@
 
 					//edit labels and put them into antoher array
                     $lbl[] = wordwrap(FlattenText("$al[1] ($row[0])"), 25, "\n"); // NMO 2009-03-24
+                    $lblrtl[] = utf8_strrev(wordwrap(FlattenText("$al[1] )$row[0]("), 25, "\n")); // NMO 2009-03-24
 
                 }	//end while -> loop through results
 
@@ -4187,10 +4188,21 @@
                         {$i++;}
                     }
 
+                    $lblout=array();
+                    if (getLanguageRTL($language))
+                    {
+                        $lblout=$lblrtl;     
+                    }
+                    else
+                    {
+                        $lblout=$lbl;  
+                    }
+
+
                     //create new 3D pie chart
 					$DataSet = new pData; 
                     $DataSet->AddPoint($gdata,"Serie1");  
-                    $DataSet->AddPoint($lbl,"Serie2");  
+                    $DataSet->AddPoint($lblout,"Serie2");  
                     $DataSet->AddAllSeries();
                     $DataSet->SetAbsciseLabelSerie("Serie2");
 
@@ -4238,6 +4250,7 @@
 		unset($grawdata);
         unset($label);
 		unset($lbl);
+        unset($lblout);
 		unset($justcode);
 		unset ($alist);