@@ -72,12 +72,12 @@ |
||
72 | 72 | /** |
73 | 73 | * @var string |
74 | 74 | */ |
75 | - public $exporttype; // deb or des |
|
75 | + public $exporttype; // deb or des |
|
76 | 76 | |
77 | 77 | /** |
78 | 78 | * @var string |
79 | 79 | */ |
80 | - public $type_declaration; // 'introduction' or 'expedition' |
|
80 | + public $type_declaration; // 'introduction' or 'expedition' |
|
81 | 81 | public $numero_declaration; |
82 | 82 | |
83 | 83 |
@@ -1110,7 +1110,7 @@ |
||
1110 | 1110 | $sqlfields[$i] .= " " . $this->sanitize($field_desc['extra'], 0, 0, 1); |
1111 | 1111 | } |
1112 | 1112 | if (!empty($primary_key) && $primary_key == $field_name) { |
1113 | - $sqlfields[$i] .= " AUTO_INCREMENT PRIMARY KEY"; // mysql instruction that will be converted by driver late |
|
1113 | + $sqlfields[$i] .= " AUTO_INCREMENT PRIMARY KEY"; // mysql instruction that will be converted by driver late |
|
1114 | 1114 | } |
1115 | 1115 | $i++; |
1116 | 1116 | } |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | $clientmustbe = 'utf8'; |
121 | 121 | } |
122 | 122 | |
123 | - $disableforcecharset = 0; // Set to 1 to test without charset forcing |
|
123 | + $disableforcecharset = 0; // Set to 1 to test without charset forcing |
|
124 | 124 | if (empty($disableforcecharset) && $this->db->character_set_name() != $clientmustbe) { |
125 | 125 | try { |
126 | 126 | //print "You should set the \$dolibarr_main_db_character_set and \$dolibarr_main_db_collation for the PHP to the one of the database ".$this->db->character_set_name(); |
@@ -873,7 +873,7 @@ discard block |
||
873 | 873 | $sqlfields[$i] .= " " . $this->sanitize($field_desc['extra'], 0, 0, 1); |
874 | 874 | } |
875 | 875 | if (!empty($primary_key) && $primary_key == $field_name) { |
876 | - $sqlfields[$i] .= " AUTO_INCREMENT PRIMARY KEY"; // mysql instruction that will be converted by driver late |
|
876 | + $sqlfields[$i] .= " AUTO_INCREMENT PRIMARY KEY"; // mysql instruction that will be converted by driver late |
|
877 | 877 | } |
878 | 878 | $i++; |
879 | 879 | } |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | if (!defined('NOBROWSERNOTIF')) { |
51 | 51 | define('NOBROWSERNOTIF', '1'); |
52 | 52 | } |
53 | -$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1)); // Keep $_GET and $_POST here. GETPOST not yet defined. |
|
53 | +$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1)); // Keep $_GET and $_POST here. GETPOST not yet defined. |
|
54 | 54 | if (is_numeric($entity)) { |
55 | 55 | define("DOLENTITY", $entity); |
56 | 56 | } |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | |
62 | 62 | $signature = GETPOST('signaturebase64'); |
63 | 63 | $ref = GETPOST('ref', 'aZ09'); |
64 | -$mode = GETPOST('mode', 'aZ09'); // 'proposal', ... |
|
64 | +$mode = GETPOST('mode', 'aZ09'); // 'proposal', ... |
|
65 | 65 | $SECUREKEY = GETPOST("securekey"); // Secure key |
66 | 66 | $online_sign_name = GETPOST("onlinesignname"); |
67 | 67 | |
@@ -118,8 +118,8 @@ discard block |
||
118 | 118 | $upload_dir = !empty($conf->propal->multidir_output[$object->entity]) ? $conf->propal->multidir_output[$object->entity] : $conf->propal->dir_output; |
119 | 119 | $upload_dir .= '/' . dol_sanitizeFileName($object->ref) . '/'; |
120 | 120 | |
121 | - $default_font_size = pdf_getPDFFontSize($langs); // Must be after pdf_getInstance |
|
122 | - $default_font = pdf_getPDFFont($langs); // Must be after pdf_getInstance |
|
121 | + $default_font_size = pdf_getPDFFontSize($langs); // Must be after pdf_getInstance |
|
122 | + $default_font = pdf_getPDFFont($langs); // Must be after pdf_getInstance |
|
123 | 123 | $langs->loadLangs(array("main", "companies")); |
124 | 124 | |
125 | 125 | $date = dol_print_date(dol_now(), "%Y%m%d%H%M%S"); |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | if (!$error) { |
143 | 143 | // Defined modele of doc |
144 | 144 | $last_main_doc_file = $object->last_main_doc; |
145 | - $directdownloadlink = $object->getLastMainDocLink('proposal'); // url to download the $object->last_main_doc |
|
145 | + $directdownloadlink = $object->getLastMainDocLink('proposal'); // url to download the $object->last_main_doc |
|
146 | 146 | |
147 | 147 | if (preg_match('/\.pdf/i', $last_main_doc_file)) { |
148 | 148 | // TODO Use the $last_main_doc_file to defined the $newpdffilename and $sourcefile |
@@ -170,13 +170,13 @@ discard block |
||
170 | 170 | } |
171 | 171 | |
172 | 172 | //$pdf->Open(); |
173 | - $pagecount = $pdf->setSourceFile($sourcefile); // original PDF |
|
173 | + $pagecount = $pdf->setSourceFile($sourcefile); // original PDF |
|
174 | 174 | |
175 | 175 | $param = array(); |
176 | 176 | $param['online_sign_name'] = $online_sign_name; |
177 | 177 | $param['pathtoimage'] = $upload_dir . $filename; |
178 | 178 | |
179 | - $s = array(); // Array with size of each page. Example array(w'=>210, 'h'=>297); |
|
179 | + $s = array(); // Array with size of each page. Example array(w'=>210, 'h'=>297); |
|
180 | 180 | for ($i = 1; $i < ($pagecount + 1); $i++) { |
181 | 181 | try { |
182 | 182 | $tppl = $pdf->importPage($i); |
@@ -332,7 +332,7 @@ discard block |
||
332 | 332 | if (!$error) { |
333 | 333 | // Defined modele of doc |
334 | 334 | $last_main_doc_file = $object->last_main_doc; |
335 | - $directdownloadlink = $object->getLastMainDocLink('contrat'); // url to download the $object->last_main_doc |
|
335 | + $directdownloadlink = $object->getLastMainDocLink('contrat'); // url to download the $object->last_main_doc |
|
336 | 336 | |
337 | 337 | if (preg_match('/\.pdf/i', $last_main_doc_file)) { |
338 | 338 | // TODO Use the $last_main_doc_file to defined the $newpdffilename and $sourcefile |
@@ -360,13 +360,13 @@ discard block |
||
360 | 360 | } |
361 | 361 | |
362 | 362 | //$pdf->Open(); |
363 | - $pagecount = $pdf->setSourceFile($sourcefile); // original PDF |
|
363 | + $pagecount = $pdf->setSourceFile($sourcefile); // original PDF |
|
364 | 364 | |
365 | 365 | $param = array(); |
366 | 366 | $param['online_sign_name'] = $online_sign_name; |
367 | 367 | $param['pathtoimage'] = $upload_dir . $filename; |
368 | 368 | |
369 | - $s = array(); // Array with size of each page. Example array(w'=>210, 'h'=>297); |
|
369 | + $s = array(); // Array with size of each page. Example array(w'=>210, 'h'=>297); |
|
370 | 370 | for ($i = 1; $i < ($pagecount + 1); $i++) { |
371 | 371 | try { |
372 | 372 | $tppl = $pdf->importPage($i); |
@@ -443,7 +443,7 @@ discard block |
||
443 | 443 | |
444 | 444 | $langs->loadLangs(array("main", "companies")); |
445 | 445 | |
446 | - $default_font_size = pdf_getPDFFontSize($langs); // Must be after pdf_getInstance |
|
446 | + $default_font_size = pdf_getPDFFontSize($langs); // Must be after pdf_getInstance |
|
447 | 447 | $default_font = pdf_getPDFFont($langs); // Must be |
448 | 448 | |
449 | 449 | $date = dol_print_date(dol_now(), "%Y%m%d%H%M%S"); |
@@ -466,7 +466,7 @@ discard block |
||
466 | 466 | if (!$error) { |
467 | 467 | // Defined modele of doc |
468 | 468 | $last_main_doc_file = $object->last_main_doc; |
469 | - $directdownloadlink = $object->getLastMainDocLink('fichinter'); // url to download the $object->last_main_doc |
|
469 | + $directdownloadlink = $object->getLastMainDocLink('fichinter'); // url to download the $object->last_main_doc |
|
470 | 470 | |
471 | 471 | if (preg_match('/\.pdf/i', $last_main_doc_file)) { |
472 | 472 | // TODO Use the $last_main_doc_file to defined the $newpdffilename and $sourcefile |
@@ -494,13 +494,13 @@ discard block |
||
494 | 494 | } |
495 | 495 | |
496 | 496 | //$pdf->Open(); |
497 | - $pagecount = $pdf->setSourceFile($sourcefile); // original PDF |
|
497 | + $pagecount = $pdf->setSourceFile($sourcefile); // original PDF |
|
498 | 498 | |
499 | 499 | $param = array(); |
500 | 500 | $param['online_sign_name'] = $online_sign_name; |
501 | 501 | $param['pathtoimage'] = $upload_dir . $filename; |
502 | 502 | |
503 | - $s = array(); // Array with size of each page. Example array(w'=>210, 'h'=>297); |
|
503 | + $s = array(); // Array with size of each page. Example array(w'=>210, 'h'=>297); |
|
504 | 504 | for ($i = 1; $i < ($pagecount + 1); $i++) { |
505 | 505 | try { |
506 | 506 | $tppl = $pdf->importPage($i); |
@@ -578,8 +578,8 @@ discard block |
||
578 | 578 | |
579 | 579 | $upload_dir = $conf->societe->multidir_output[$object->thirdparty->entity] . '/' . dol_sanitizeFileName($object->thirdparty->id) . '/'; |
580 | 580 | |
581 | - $default_font_size = pdf_getPDFFontSize($langs); // Must be after pdf_getInstance |
|
582 | - $default_font = pdf_getPDFFont($langs); // Must be after pdf_getInstance |
|
581 | + $default_font_size = pdf_getPDFFontSize($langs); // Must be after pdf_getInstance |
|
582 | + $default_font = pdf_getPDFFont($langs); // Must be after pdf_getInstance |
|
583 | 583 | $langs->loadLangs(array("main", "companies")); |
584 | 584 | |
585 | 585 | $date = dol_print_date(dol_now(), "%Y%m%d%H%M%S"); |
@@ -611,7 +611,7 @@ discard block |
||
611 | 611 | // Defined modele of doc |
612 | 612 | $last_main_doc_file = $object->last_main_doc; |
613 | 613 | $last_modelpdf = $object->model_pdf; |
614 | - $directdownloadlink = $object->getLastMainDocLink('company'); // url to download the $object->last_main_doc |
|
614 | + $directdownloadlink = $object->getLastMainDocLink('company'); // url to download the $object->last_main_doc |
|
615 | 615 | |
616 | 616 | if (preg_match('/\.pdf/i', $last_main_doc_file)) { |
617 | 617 | $sourcefile = ''; |
@@ -641,9 +641,9 @@ discard block |
||
641 | 641 | } |
642 | 642 | |
643 | 643 | //$pdf->Open(); |
644 | - $pagecount = $pdf->setSourceFile($sourcefile); // original PDF |
|
644 | + $pagecount = $pdf->setSourceFile($sourcefile); // original PDF |
|
645 | 645 | |
646 | - $s = array(); // Array with size of each page. Example array(w'=>210, 'h'=>297); |
|
646 | + $s = array(); // Array with size of each page. Example array(w'=>210, 'h'=>297); |
|
647 | 647 | for ($i = 1; $i < ($pagecount + 1); $i++) { |
648 | 648 | try { |
649 | 649 | $tppl = $pdf->importPage($i); |
@@ -784,7 +784,7 @@ discard block |
||
784 | 784 | |
785 | 785 | $langs->loadLangs(array("main", "companies")); |
786 | 786 | |
787 | - $default_font_size = pdf_getPDFFontSize($langs); // Must be after pdf_getInstance |
|
787 | + $default_font_size = pdf_getPDFFontSize($langs); // Must be after pdf_getInstance |
|
788 | 788 | $default_font = pdf_getPDFFont($langs); // Must be |
789 | 789 | |
790 | 790 | $date = dol_print_date(dol_now(), "%Y%m%d%H%M%S"); |
@@ -810,11 +810,11 @@ discard block |
||
810 | 810 | if (empty($last_main_doc_file) || !dol_is_file(DOL_DATA_ROOT . '/' . $object->last_main_doc)) { |
811 | 811 | // It seems document has never been generated, or was generated and then deleted. |
812 | 812 | // So we try to regenerate it with its default template. |
813 | - $defaulttemplate = ''; // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used. |
|
813 | + $defaulttemplate = ''; // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used. |
|
814 | 814 | $object->generateDocument($defaulttemplate, $langs); |
815 | 815 | } |
816 | 816 | $last_main_doc_file = $object->last_main_doc; |
817 | - $directdownloadlink = $object->getLastMainDocLink('expedition'); // url to download the $object->last_main_doc |
|
817 | + $directdownloadlink = $object->getLastMainDocLink('expedition'); // url to download the $object->last_main_doc |
|
818 | 818 | |
819 | 819 | if (preg_match('/\.pdf/i', $last_main_doc_file)) { |
820 | 820 | // TODO Use the $last_main_doc_file to defined the $newpdffilename and $sourcefile |
@@ -842,13 +842,13 @@ discard block |
||
842 | 842 | } |
843 | 843 | |
844 | 844 | //$pdf->Open(); |
845 | - $pagecount = $pdf->setSourceFile($sourcefile); // original PDF |
|
845 | + $pagecount = $pdf->setSourceFile($sourcefile); // original PDF |
|
846 | 846 | |
847 | 847 | $param = array(); |
848 | 848 | $param['online_sign_name'] = $online_sign_name; |
849 | 849 | $param['pathtoimage'] = $upload_dir . $filename; |
850 | 850 | |
851 | - $s = array(); // Array with size of each page. Example array(w'=>210, 'h'=>297); |
|
851 | + $s = array(); // Array with size of each page. Example array(w'=>210, 'h'=>297); |
|
852 | 852 | for ($i = 1; $i < ($pagecount + 1); $i++) { |
853 | 853 | try { |
854 | 854 | $tppl = $pdf->importPage($i); |
@@ -907,7 +907,7 @@ discard block |
||
907 | 907 | $db->begin(); |
908 | 908 | |
909 | 909 | $sql = "UPDATE " . MAIN_DB_PREFIX . "expedition"; |
910 | - $sql .= " SET signed_status = " . ((int) $object::STATUS_SIGNED) ; |
|
910 | + $sql .= " SET signed_status = " . ((int) $object::STATUS_SIGNED); |
|
911 | 911 | $sql .= " WHERE rowid = " . ((int) $object->id); |
912 | 912 | |
913 | 913 | dol_syslog(__FILE__, LOG_DEBUG); |
@@ -950,7 +950,7 @@ discard block |
||
950 | 950 | */ |
951 | 951 | function dolPrintSignatureImage(TCPDF $pdf, $langs, $params) |
952 | 952 | { |
953 | - $default_font_size = pdf_getPDFFontSize($langs); // Must be after pdf_getInstance |
|
953 | + $default_font_size = pdf_getPDFFontSize($langs); // Must be after pdf_getInstance |
|
954 | 954 | $default_font = pdf_getPDFFont($langs); // Must be |
955 | 955 | $xforimgstart = $params['xforimgstart']; |
956 | 956 | $yforimgstart = $params['yforimgstart']; |
@@ -45,7 +45,7 @@ |
||
45 | 45 | |
46 | 46 | $boxid = GETPOSTINT('boxid'); |
47 | 47 | $boxorder = GETPOST('boxorder'); |
48 | -$zone = GETPOST('zone'); // Can be '0' or '1' or 'pagename'... |
|
48 | +$zone = GETPOST('zone'); // Can be '0' or '1' or 'pagename'... |
|
49 | 49 | $userid = GETPOSTINT('userid'); |
50 | 50 | |
51 | 51 | // Security check |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | |
39 | 39 | // Load Dolibarr environment |
40 | 40 | require constant('DOL_DOCUMENT_ROOT') . '/main.inc.php'; |
41 | -require_once constant('DOL_DOCUMENT_ROOT') . '/core/class/fileupload.class.php'; // Class to upload common files |
|
41 | +require_once constant('DOL_DOCUMENT_ROOT') . '/core/class/fileupload.class.php'; // Class to upload common files |
|
42 | 42 | require_once constant('DOL_DOCUMENT_ROOT') . '/core/class/genericobject.class.php'; |
43 | 43 | require_once constant('DOL_DOCUMENT_ROOT') . '/core/lib/geturl.lib.php'; |
44 | 44 | |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | if (!empty($user->socid)) { |
64 | 64 | $socid = $user->socid; |
65 | 65 | if (!empty($object->socid) && $socid != $object->socid) { |
66 | - httponly_accessforbidden("Access on object not allowed for this external user."); // This includes the exit. |
|
66 | + httponly_accessforbidden("Access on object not allowed for this external user."); // This includes the exit. |
|
67 | 67 | } |
68 | 68 | } |
69 | 69 |
@@ -93,9 +93,9 @@ |
||
93 | 93 | $vartmp = (empty($InfoFieldList[3]) ? '' : $InfoFieldList[3]); |
94 | 94 | $reg = array(); |
95 | 95 | if (preg_match('/^.*:(\w*)$/', $vartmp, $reg)) { |
96 | - $InfoFieldList[4] = $reg[1]; // take the sort field |
|
96 | + $InfoFieldList[4] = $reg[1]; // take the sort field |
|
97 | 97 | } |
98 | - $InfoFieldList[3] = preg_replace('/:\w*$/', '', $vartmp); // take the filter field |
|
98 | + $InfoFieldList[3] = preg_replace('/:\w*$/', '', $vartmp); // take the filter field |
|
99 | 99 | |
100 | 100 | $classname = $InfoFieldList[0]; |
101 | 101 | $classpath = $InfoFieldList[1]; |
@@ -94,7 +94,7 @@ |
||
94 | 94 | $response = array(); |
95 | 95 | while ($i < $num) { |
96 | 96 | $obj = $db->fetch_object($resql); |
97 | - $response[] = array('title' => $obj->question,'ref' => $obj->ref,'answer' => dol_escape_htmltag(preg_replace('/\\r|\\r\\n|\\n/', "", $obj->answer)),'url' => $obj->url); |
|
97 | + $response[] = array('title' => $obj->question, 'ref' => $obj->ref, 'answer' => dol_escape_htmltag(preg_replace('/\\r|\\r\\n|\\n/', "", $obj->answer)), 'url' => $obj->url); |
|
98 | 98 | $i++; |
99 | 99 | } |
100 | 100 | } else { |
@@ -60,7 +60,7 @@ |
||
60 | 60 | $formProject = new FormProjets($db); |
61 | 61 | |
62 | 62 | |
63 | - $return['value'] = $formProject->selectInvoiceAndLine($invoice_id, 0, 'invoiceid', 'invoicelineid', 'maxwidth500', array(), 1); |
|
63 | + $return['value'] = $formProject->selectInvoiceAndLine($invoice_id, 0, 'invoiceid', 'invoicelineid', 'maxwidth500', array(), 1); |
|
64 | 64 | //$return['num'] = $form->num; |
65 | 65 | //$return['error'] = $form->error; |
66 | 66 | } |