Permalink
Browse files

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
  • Loading branch information...
1 parent 97d4ec7 commit 28304a0415518b93ac329dd1b705e77c5be324ff @c-schmitz c-schmitz committed Jun 1, 2009
Showing with 16,372 additions and 7,001 deletions.
  1. +2 −1 admin/database.php
  2. +1 −1 admin/dataentry.php
  3. +2 −2 admin/labels.php
  4. +14 −1 admin/statistics.php
  5. +369 −63 classes/adodb/adodb-active-record.inc.php
  6. +1,421 −0 classes/adodb/adodb-active-recordx.inc.php
  7. +6 −6 classes/adodb/adodb-csvlib.inc.php
  8. +15 −7 classes/adodb/adodb-datadict.inc.php
  9. +1 −1 classes/adodb/adodb-error.inc.php
  10. +1 −1 classes/adodb/adodb-errorhandler.inc.php
  11. +2 −2 classes/adodb/adodb-errorpear.inc.php
  12. +1 −1 classes/adodb/adodb-exceptions.inc.php
  13. +4 −59 classes/adodb/adodb-iterator.inc.php
  14. +53 −35 classes/adodb/adodb-lib.inc.php
  15. +159 −87 classes/adodb/adodb-memcache.lib.inc.php
  16. +7 −7 classes/adodb/adodb-pager.inc.php
  17. +8 −8 classes/adodb/adodb-pear.inc.php
  18. +72 −60 classes/adodb/adodb-perf.inc.php
  19. +1 −1 classes/adodb/adodb-php4.inc.php
  20. +3 −3 classes/adodb/adodb-time.inc.php
  21. +15 −13 classes/adodb/adodb-xmlschema.inc.php
  22. +15 −14 classes/adodb/adodb-xmlschema03.inc.php
  23. +487 −358 classes/adodb/adodb.inc.php
  24. +182 −182 classes/adodb/contrib/toxmlrpc.inc.php
  25. +2 −2 classes/adodb/datadict/datadict-access.inc.php
  26. +3 −3 classes/adodb/datadict/datadict-db2.inc.php
  27. +2 −2 classes/adodb/datadict/datadict-firebird.inc.php
  28. +1 −1 classes/adodb/datadict/datadict-generic.inc.php
  29. +1 −1 classes/adodb/datadict/datadict-ibase.inc.php
  30. +2 −2 classes/adodb/datadict/datadict-informix.inc.php
  31. +3 −3 classes/adodb/datadict/datadict-mssql.inc.php
  32. +282 −0 classes/adodb/datadict/datadict-mssqlnative.inc.php
  33. +2 −2 classes/adodb/datadict/datadict-mysql.inc.php
  34. +10 −9 classes/adodb/datadict/datadict-oci8.inc.php
  35. +5 −4 classes/adodb/datadict/datadict-postgres.inc.php
  36. +2 −2 classes/adodb/datadict/datadict-sapdb.inc.php
  37. +2 −2 classes/adodb/datadict/datadict-sybase.inc.php
  38. +565 −46 classes/adodb/docs/docs-active-record.htm
  39. +7,664 −3,607 classes/adodb/docs/docs-adodb.htm
  40. +12 −11 classes/adodb/docs/docs-datadict.htm
  41. +542 −542 classes/adodb/docs/docs-oracle.htm
  42. +3 −3 classes/adodb/docs/docs-perf.htm
  43. +1 −35 classes/adodb/docs/docs-session.htm
  44. +0 −822 classes/adodb/docs/old-changelog.htm
  45. +367 −367 classes/adodb/docs/tips_portable_sql.htm
  46. +1 −1 classes/adodb/docs/tute.htm
  47. +3 −3 classes/adodb/drivers/adodb-access.inc.php
  48. +26 −11 classes/adodb/drivers/adodb-ado.inc.php
  49. +41 −12 classes/adodb/drivers/adodb-ado5.inc.php
  50. +1 −1 classes/adodb/drivers/adodb-ado_access.inc.php
  51. +1 −1 classes/adodb/drivers/adodb-ado_mssql.inc.php
  52. +2 −2 classes/adodb/drivers/adodb-borland_ibase.inc.php
  53. +7 −7 classes/adodb/drivers/adodb-csv.inc.php
  54. +19 −19 classes/adodb/drivers/adodb-db2.inc.php
  55. +5 −5 classes/adodb/drivers/adodb-fbsql.inc.php
  56. +4 −4 classes/adodb/drivers/adodb-firebird.inc.php
  57. +11 −11 classes/adodb/drivers/adodb-ibase.inc.php
  58. +1 −1 classes/adodb/drivers/adodb-informix.inc.php
  59. +6 −6 classes/adodb/drivers/adodb-informix72.inc.php
  60. +20 −15 classes/adodb/drivers/adodb-ldap.inc.php
  61. +38 −32 classes/adodb/drivers/adodb-mssql.inc.php
  62. +2 −2 classes/adodb/drivers/adodb-mssql_n.inc.php
  63. +922 −0 classes/adodb/drivers/adodb-mssqlnative.inc.php
  64. +2 −2 classes/adodb/drivers/adodb-mssqlpo.inc.php
  65. +31 −27 classes/adodb/drivers/adodb-mysql.inc.php
  66. +83 −27 classes/adodb/drivers/adodb-mysqli.inc.php
  67. +138 −0 classes/adodb/drivers/adodb-mysqlpo.inc.php
  68. +6 −6 classes/adodb/drivers/adodb-mysqlt.inc.php
  69. +3 −3 classes/adodb/drivers/adodb-netezza.inc.php
  70. +125 −48 classes/adodb/drivers/adodb-oci8.inc.php
  71. +1,532 −0 classes/adodb/drivers/adodb-oci8.old.inc.php
  72. +2 −2 classes/adodb/drivers/adodb-oci805.inc.php
  73. +6 −5 classes/adodb/drivers/adodb-oci8po.inc.php
  74. +12 −12 classes/adodb/drivers/adodb-odbc.inc.php
  75. +7 −7 classes/adodb/drivers/adodb-odbc_db2.inc.php
  76. +15 −25 classes/adodb/drivers/adodb-odbc_mssql.inc.php
  77. +3 −3 classes/adodb/drivers/adodb-odbc_oracle.inc.php
  78. +105 −12 classes/adodb/drivers/adodb-odbtp.inc.php
  79. +1 −1 classes/adodb/drivers/adodb-odbtp_unicode.inc.php
  80. +2 −2 classes/adodb/drivers/adodb-oracle.inc.php
  81. +62 −7 classes/adodb/drivers/adodb-pdo.inc.php
  82. +3 −3 classes/adodb/drivers/adodb-pdo_mssql.inc.php
  83. +19 −9 classes/adodb/drivers/adodb-pdo_mysql.inc.php
  84. +4 −4 classes/adodb/drivers/adodb-pdo_oci.inc.php
  85. +14 −14 classes/adodb/drivers/adodb-pdo_pgsql.inc.php
  86. +190 −0 classes/adodb/drivers/adodb-pdo_sqlite.inc.php
  87. +1 −1 classes/adodb/drivers/adodb-postgres.inc.php
  88. +17 −14 classes/adodb/drivers/adodb-postgres64.inc.php
  89. +58 −9 classes/adodb/drivers/adodb-postgres7.inc.php
  90. +1 −1 classes/adodb/drivers/adodb-postgres8.inc.php
  91. +1 −1 classes/adodb/drivers/adodb-proxy.inc.php
  92. +3 −3 classes/adodb/drivers/adodb-sapdb.inc.php
  93. +1 −1 classes/adodb/drivers/adodb-sqlanywhere.inc.php
  94. +7 −7 classes/adodb/drivers/adodb-sqlite.inc.php
  95. +1 −1 classes/adodb/drivers/adodb-sqlitepo.inc.php
  96. +30 −20 classes/adodb/drivers/adodb-sybase.inc.php
  97. +5 −5 classes/adodb/drivers/adodb-sybase_ase.inc.php
  98. +2 −2 classes/adodb/drivers/adodb-vfp.inc.php
  99. +35 −0 classes/adodb/lang/adodb-fa.inc.php
  100. +2 −2 classes/adodb/perf/perf-db2.inc.php
  101. +2 −2 classes/adodb/perf/perf-informix.inc.php
  102. +3 −3 classes/adodb/perf/perf-mssql.inc.php
  103. +164 −0 classes/adodb/perf/perf-mssqlnative.inc.php
  104. +2 −2 classes/adodb/perf/perf-mysql.inc.php
  105. +33 −13 classes/adodb/perf/perf-oci8.inc.php
  106. +2 −4 classes/adodb/perf/perf-postgres.inc.php
  107. +1 −1 classes/adodb/pivottable.inc.php
  108. +3 −3 classes/adodb/rsfilter.inc.php
  109. +2 −2 classes/adodb/server.php
  110. +1 −1 classes/adodb/session/adodb-compress-bzip2.php
  111. +1 −1 classes/adodb/session/adodb-compress-gzip.php
  112. +1 −1 classes/adodb/session/adodb-cryptsession.php
  113. +1 −1 classes/adodb/session/adodb-cryptsession2.php
  114. +1 −1 classes/adodb/session/adodb-encrypt-mcrypt.php
  115. +3 −3 classes/adodb/session/adodb-encrypt-md5.php
  116. +1 −1 classes/adodb/session/adodb-encrypt-secret.php
  117. +31 −31 classes/adodb/session/adodb-encrypt-sha1.php
  118. +1 −1 classes/adodb/session/adodb-session-clob.php
  119. +1 −1 classes/adodb/session/adodb-session-clob2.php
  120. +29 −29 classes/adodb/session/adodb-session.php
  121. +68 −70 classes/adodb/session/adodb-session2.php
  122. +4 −3 classes/adodb/toexport.inc.php
  123. +15 −9 classes/adodb/tohtml.inc.php
  124. +42 −12 classes/core/surveytranslator.php
  125. +9 −8 common.php
View
@@ -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());
View
@@ -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'])."'";}
View
@@ -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";
View
@@ -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);
Oops, something went wrong.

0 comments on commit 28304a0

Please sign in to comment.