From a4935b7f089aee0161a3b1b345b00d64cfaf5608 Mon Sep 17 00:00:00 2001 From: azammitdcarf Date: Fri, 11 Nov 2011 01:59:29 +0000 Subject: [PATCH] Updated Limesurvey to revision 11354 --- .../admin/classes/quexml/quexmlpdf.php | 62 +- .../limesurvey/admin/classes/tcpdf/mypdf.php | 13 +- .../admin/export_data_functions.php | 32 +- include/limesurvey/admin/export_data_r.php | 2 +- .../admin/export_structure_quexml.php | 90 +- include/limesurvey/admin/exportresults.php | 11 +- include/limesurvey/admin/html.php | 6 +- include/limesurvey/admin/importquestion.php | 1 + include/limesurvey/admin/iterate_survey.php | 2 +- include/limesurvey/admin/listcolumn.php | 8 +- include/limesurvey/admin/printablesurvey.php | 3 + .../limesurvey/admin/statistics_function.php | 11 +- include/limesurvey/admin/tokens.php | 44 +- .../limesurvey/admin/update/upgrade-all.php | 2 +- include/limesurvey/common_functions.php | 233 +- include/limesurvey/config-defaults.php | 2 +- include/limesurvey/docs/release_notes.txt | 48 +- include/limesurvey/index.php | 58 - .../limesurvey/locale/cs/LC_MESSAGES/cs.mo | Bin 228369 -> 227139 bytes .../limesurvey/locale/cs/LC_MESSAGES/cs.po | 21008 ++++++++-------- .../limesurvey/locale/da/LC_MESSAGES/da.mo | Bin 187462 -> 159810 bytes .../limesurvey/locale/da/LC_MESSAGES/da.po | 20382 ++++++++------- .../limesurvey/locale/pl/LC_MESSAGES/pl.mo | Bin 229402 -> 229336 bytes .../limesurvey/locale/pl/LC_MESSAGES/pl.po | 1368 +- include/limesurvey/printanswers.php | 4 +- include/limesurvey/qanda.php | 2 +- include/limesurvey/save.php | 15 +- 27 files changed, 23399 insertions(+), 20008 deletions(-) diff --git a/include/limesurvey/admin/classes/quexml/quexmlpdf.php b/include/limesurvey/admin/classes/quexml/quexmlpdf.php index 0527c8ca..51ca5846 100644 --- a/include/limesurvey/admin/classes/quexml/quexmlpdf.php +++ b/include/limesurvey/admin/classes/quexml/quexmlpdf.php @@ -79,8 +79,19 @@ class queXMLPDF extends TCPDF { * * @var bool Defaults to 138. * @since 2010-09-20 + * @deprecated + * @see $barcodeMarginX */ - protected $barcodeX = 138; + //protected $barcodeX = 138; + + /** + * The distance between the right hand page border and + * the end of the barcode in MM + * + * @var bool Defaults to 23. + * @since 2011-10-25 + */ + protected $barcodeMarginX = 23; /** * Y position of barcode in mm @@ -173,7 +184,7 @@ class queXMLPDF extends TCPDF { protected $style = "