diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index 2c83daa6582..fc827ff5a9b 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -88,7 +88,7 @@ function pdf_getFormat($outputlangs = null, $mode = 'setup') { global $conf, $db, $langs; - dol_syslog("pdf_getFormat Get paper format with mode=".$mode." MAIN_PDF_FORMAT=".(!getDolGlobalString('MAIN_PDF_FORMAT') ? 'null' : $conf->global->MAIN_PDF_FORMAT)." outputlangs->defaultlang=".(is_object($outputlangs) ? $outputlangs->defaultlang : 'null')." and langs->defaultlang=".(is_object($langs) ? $langs->defaultlang : 'null')); + dol_syslog("pdf_getFormat Get paper format with mode=".$mode." MAIN_PDF_FORMAT=".getDolGlobalString('MAIN_PDF_FORMAT')." outputlangs->defaultlang=".(is_object($outputlangs) ? $outputlangs->defaultlang : 'null')." and langs->defaultlang=".(is_object($langs) ? $langs->defaultlang : 'null')); // Default value if setup was not done and/or entry into c_paper_format not defined $width = 210; @@ -247,7 +247,9 @@ function pdf_getEncryption($pathoffile) //ob_start(); @($parser = new TCPDF_PARSER(ltrim($content))); - [$xref, $data] = $parser->getParsedData(); + $tmp = $parser->getParsedData(); + $xref = $tmp[0]; + $data = $tmp[1] ?? null; unset($parser); //ob_end_clean(); @@ -270,10 +272,8 @@ function pdf_getEncryption($pathoffile) */ function pdf_getPDFFont($outputlangs) { - global $conf; - if (getDolGlobalString('MAIN_PDF_FORCE_FONT')) { - return $conf->global->MAIN_PDF_FORCE_FONT; + return getDolGlobalString('MAIN_PDF_FORCE_FONT'); } $font = 'Helvetica'; // By default, for FPDI, or ISO language on TCPDF @@ -1606,7 +1606,10 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_ $pdf->SetDrawColor(224, 224, 224); // Option for footer text color if (getDolGlobalString('PDF_FOOTER_TEXT_COLOR')) { - [$r, $g, $b] = sscanf(getDolGlobalString('PDF_FOOTER_TEXT_COLOR'), '%d, %d, %d'); + $tmparray = sscanf(getDolGlobalString('PDF_FOOTER_TEXT_COLOR'), '%d, %d, %d'); + $r = $tmparray[0]; + $g = $tmparray[1]; + $b = $tmparray[2]; $pdf->SetTextColor($r, $g, $b); } @@ -1644,7 +1647,10 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_ // Option for footer background color (without freetext zone) if (getDolGlobalString('PDF_FOOTER_BACKGROUND_COLOR')) { - [$r, $g, $b] = sscanf($conf->global->PDF_FOOTER_BACKGROUND_COLOR, '%d, %d, %d'); + $tmparray = sscanf(getDolGlobalString('PDF_FOOTER_BACKGROUND_COLOR'), '%d, %d, %d'); + $r = $tmparray[0]; + $g = $tmparray[1]; + $b = $tmparray[2]; $pdf->setAutoPageBreak(false, 0); // Disable auto pagebreak $pdf->Rect(0, $dims['hk'] - $posy + $freetextheight, $dims['wk'] + 1, $marginwithfooter + 1, 'F', array(), $fill_color = array($r, $g, $b)); $pdf->setAutoPageBreak(true, 0); // Restore pagebreak @@ -1696,7 +1702,10 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_ // Option for footer background color (without freetext zone) if (getDolGlobalString('PDF_FOOTER_BACKGROUND_COLOR')) { - [$r, $g, $b] = sscanf($conf->global->PDF_FOOTER_BACKGROUND_COLOR, '%d, %d, %d'); + $tmparray = sscanf(getDolGlobalString('PDF_FOOTER_BACKGROUND_COLOR'), '%d, %d, %d'); + $r = $tmparray[0]; + $g = $tmparray[1]; + $b = $tmparray[2]; $pdf->setAutoPageBreak(false, 0); // Disable auto pagebreak $pdf->Rect(0, $dims['hk'] - $posy + $freetextheight, $dims['wk'] + 1, $marginwithfooter + 1, 'F', array(), $fill_color = array($r, $g, $b)); $pdf->setAutoPageBreak(true, 0); // Restore pagebreak @@ -2154,7 +2163,8 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0, } if (isset($productCustomerPrice) && !empty($productCustomerPrice->ref_customer)) { - switch ($conf->global->PRODUIT_CUSTOMER_PRICES_PDF_REF_MODE) { + $idcustprice = getDolGlobalInt('PRODUIT_CUSTOMER_PRICES_PDF_REF_MODE'); + switch ($idcustprice) { case 1: $ref_prodserv = $productCustomerPrice->ref_customer; break; diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php index e35cf6f1e81..4c7ac5b137c 100644 --- a/htdocs/core/lib/security.lib.php +++ b/htdocs/core/lib/security.lib.php @@ -1205,10 +1205,10 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl $sql .= " AND dbt.".$db->sanitize($dbt_keyfield)." = ".((int) $user->socid); } elseif (isModEnabled("societe") && !$user->hasRight('societe', 'client', 'voir')) { // If internal user without permission to see all thirdparties: Check permission for internal users that are restricted on their objects + if (empty($dbt_keyfield)) { + dol_print_error(null, 'Param dbt_keyfield is required but not defined'); + } if ($feature != 'ticket') { - if (empty($dbt_keyfield)) { - dol_print_error(null, 'Param dbt_keyfield is required but not defined'); - } $sql = "SELECT COUNT(sc.fk_soc) as nb"; $sql .= " FROM ".MAIN_DB_PREFIX.$db->sanitize($dbtablename)." as dbt"; $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -1228,7 +1228,7 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = dbt.".$db->sanitize($dbt_keyfield)." AND sc.fk_user = ".((int) $user->id); $sql .= " WHERE dbt.".$db->sanitize($dbt_select)." IN (".$db->sanitize($objectid, 1).")"; $sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")"; - $sql .= " AND (sc.fk_user = ".((int) $user->id)." OR sc.fk_user IS NULL)"; + $sql .= " AND (sc.fk_user = ".((int) $user->id)." OR dbt.".$dbt_keyfield." IS NULL OR dbt.".$dbt_keyfield." = 0)"; } } elseif (isModEnabled('multicompany')) { // If multicompany, and user is an internal user with all permissions, check that object is in correct entity diff --git a/htdocs/install/mysql/migration/22.0.0-23.0.0.sql b/htdocs/install/mysql/migration/22.0.0-23.0.0.sql index 8b9a4fa4d0a..07dee3352dd 100644 --- a/htdocs/install/mysql/migration/22.0.0-23.0.0.sql +++ b/htdocs/install/mysql/migration/22.0.0-23.0.0.sql @@ -54,11 +54,16 @@ create table llx_categorie_project_task ( ALTER TABLE llx_categorie_project_task ADD PRIMARY KEY pk_categorie_propal (fk_categorie, fk_project_task); --noqa:enable=PRS ALTER TABLE llx_categorie_project_task ADD INDEX idx_categorie_project_fk_categorie (fk_categorie); -ALTER TABLE llx_categorie_project_task ADD INDEX idx_categorie_project_fk_task (fk_project_task); ALTER TABLE llx_categorie_project_task ADD CONSTRAINT fk_categorie_project_task_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid); + +ALTER TABLE llx_categorie_project_task DROP FOREIGN KEY fk_categorie_project_task_rowid; +-- VMYSQL4.1 DROP INDEX idx_categorie_project_fk_task ON llx_categorie_project_task; +-- VPGSQL8.2 DROP INDEX idx_categorie_project_fk_task; +ALTER TABLE llx_categorie_project_task ADD INDEX idx_categorie_project_fk_task (fk_project_task); ALTER TABLE llx_categorie_project_task ADD CONSTRAINT fk_categorie_project_task_rowid FOREIGN KEY (fk_project_task) REFERENCES llx_projet_task (rowid); + UPDATE llx_actioncomm SET elementtype = 'project_task' WHERE elementtype = 'task'; ALTER TABLE llx_document_model ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;