' : '').''.$langs->trans("WarningPHPMailSPF", $conf->global->MAIN_EXTERNAL_MAIL_SPF_STRING_TO_ADD);
} else {
// MAIN_EXTERNAL_SMTP_CLIENT_IP_ADDRESS is list of IPs where email is sent from. Example: '1.2.3.4, [aaaa:bbbb:cccc:dddd]'.
if (!empty($conf->global->MAIN_EXTERNAL_SMTP_CLIENT_IP_ADDRESS)) {
// List of IP show as record to add in SPF if we use the mail method
- $text .= ($text ? '
' : '').''.$langs->trans("WarningPHPMailSPF", $conf->global->MAIN_EXTERNAL_SMTP_CLIENT_IP_ADDRESS);
}
}
} else {
if (!empty($conf->global->MAIN_EXTERNAL_SMTP_CLIENT_IP_ADDRESS)) {
// List of IP show as record to add as allowed IP if we use the smtp method. Value is '1.2.3.4, [aaaa:bbbb:cccc:dddd]'
// TODO Add a key to allow to show the IP/name of server detected dynamically
- $text .= ($text ? '
' : '').''.$langs->trans("WarningPHPMail2", $conf->global->MAIN_EXTERNAL_SMTP_CLIENT_IP_ADDRESS);
}
if (!empty($conf->global->MAIN_EXTERNAL_SMTP_SPF_STRING_TO_ADD)) { // Should be required only if you have preset the Dolibarr to use your own SMTP and you want to warn users to update their domain name to match your SMTP server.
// List of string to add in SPF if we use the smtp method. Example 'include:spf.mydomain.com'
- $text .= ($text ? '
';
echo '';
echo '';
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index 4dd2fbad58e..c8a2a02498c 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -90,7 +90,7 @@ $_SESSION["commandbackuptorun"] = '';
$_SESSION["commandbackupresult"] = '';
// Increase limit of time. Works only if we are not in safe mode
-$ExecTimeLimit = 600; // Set it to 0 to not use a forced time limit
+$ExecTimeLimit = 600; // Set it to 0 to not use a forced time limit
if (!empty($ExecTimeLimit)) {
$err = error_reporting();
error_reporting(0); // Disable all errors
diff --git a/htdocs/admin/workstation.php b/htdocs/admin/workstation.php
index 83241f2a9e2..e89cbb2fd41 100755
--- a/htdocs/admin/workstation.php
+++ b/htdocs/admin/workstation.php
@@ -26,8 +26,8 @@
require "../main.inc.php";
// Libraries
-require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
-require_once DOL_DOCUMENT_ROOT . '/workstation/lib/workstation.lib.php';
+require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
+require_once DOL_DOCUMENT_ROOT.'/workstation/lib/workstation.lib.php';
//require_once "../class/myclass.class.php";
// Translations
diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index f10c7b10b48..3cd8d3e0774 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -497,11 +497,11 @@ class Documents extends DolibarrApi
throw new RestException(404, 'Search for modulepart '.$modulepart.' with Id '.$object->id.(!empty($object->ref) ? ' or Ref '.$object->ref : '').' does not return any document.');
} else {
if (($object->id) > 0 && !empty($modulepart)) {
- require_once DOL_DOCUMENT_ROOT . '/ecm/class/ecmfiles.class.php';
+ require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
$ecmfile = new EcmFiles($this->db);
$result = $ecmfile->fetchAll('', '', 0, 0, array('t.src_object_type' => $modulepart, 't.src_object_id' => $object->id));
if ($result < 0) {
- throw new RestException(503, 'Error when retrieve ecm list : ' . $this->db->lasterror());
+ throw new RestException(503, 'Error when retrieve ecm list : '.$this->db->lasterror());
} elseif (is_array($ecmfile->lines) && count($ecmfile->lines) > 0) {
$filearray['ecmfiles_infos'] = $ecmfile->lines;
}
diff --git a/htdocs/asset/card.php b/htdocs/asset/card.php
index 524b92a080e..35c0ffcff88 100644
--- a/htdocs/asset/card.php
+++ b/htdocs/asset/card.php
@@ -316,8 +316,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
$filename = dol_sanitizeFileName($object->ref);
$filedir = $conf->contrat->dir_output."/".dol_sanitizeFileName($object->ref);
$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
- $genallowed = $user->rights->asset->read; // If you can read, you can build the PDF to read content
- $delallowed = $user->rights->asset->write; // If you can create/edit, you can remove a file on card
+ $genallowed = $user->rights->asset->read; // If you can read, you can build the PDF to read content
+ $delallowed = $user->rights->asset->write; // If you can create/edit, you can remove a file on card
print $formfile->showdocuments('asset', $filename, $filedir, $urlsource, 0, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php
index 2cb4d972493..6bfd655b62d 100644
--- a/htdocs/barcode/printsheet.php
+++ b/htdocs/barcode/printsheet.php
@@ -25,7 +25,7 @@
if (!empty($_POST['mode']) && $_POST['mode'] === 'label') { // Page is called to build a PDF and output, we must ne renew the token.
if (!defined('NOTOKENRENEWAL')) {
- define('NOTOKENRENEWAL', '1'); // Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+ define('NOTOKENRENEWAL', '1'); // Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
}
}
@@ -277,10 +277,10 @@ dol_htmloutput_errors($mesg);
//print img_picto('','puce').' '.$langs->trans("PrintsheetForOneBarCode").' ';
//print ' ';
-print '
';
if ($totalnb) {
- $this->info_box_contents[][]=array(
+ $this->info_box_contents[][] = array(
'td' => 'center',
'text' => $stringtoshow
);
} else {
$this->info_box_contents[0][0] = array(
'td' => 'class="center opacitymedium"',
- 'text' => $stringtoshow . $langs->trans("BoxNoTicketLastXDays", $days)
+ 'text' => $stringtoshow.$langs->trans("BoxNoTicketLastXDays", $days)
);
}
} else {
diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php
index f14ab699690..63a4e90cdd0 100644
--- a/htdocs/core/boxes/box_project.php
+++ b/htdocs/core/boxes/box_project.php
@@ -94,7 +94,7 @@ class box_project extends ModeleBoxes
// Get list of project id allowed to user (in a string list separated by coma)
$projectsListId = '';
- if (!$user->rights->projet->all->lire) {
+ if (empty($user->rights->projet->all->lire)) {
$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
}
@@ -102,7 +102,7 @@ class box_project extends ModeleBoxes
$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
$sql .= " WHERE p.entity IN (".getEntity('project').")"; // Only current entity or severals if permission ok
$sql .= " AND p.fk_statut = 1"; // Only open projects
- if (!$user->rights->projet->all->lire) {
+ if (empty($user->rights->projet->all->lire)) {
$sql .= " AND p.rowid IN (".$this->db->sanitize($projectsListId).")"; // public and assigned to, or restricted to company for external users
}
diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php
index 0c349ad3e4c..e86a1206902 100644
--- a/htdocs/core/boxes/box_task.php
+++ b/htdocs/core/boxes/box_task.php
@@ -145,7 +145,7 @@ class box_task extends ModeleBoxes
// Get list of project id allowed to user (in a string list separated by coma)
$projectsListId = '';
- if (!$user->rights->projet->all->lire) {
+ if (empty($user->rights->projet->all->lire)) {
$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
}
@@ -168,7 +168,7 @@ class box_task extends ModeleBoxes
$sql .= " AND p.fk_statut = ".Project::STATUS_VALIDATED;
$sql .= " AND (pt.progress < 100 OR pt.progress IS NULL ) "; // 100% is done and not displayed
$sql .= " AND p.usage_task = 1 ";
- if (!$user->rights->projet->all->lire) {
+ if (empty($user->rights->projet->all->lire)) {
$sql .= " AND p.rowid IN (".$this->db->sanitize($projectsListId).")"; // public and assigned to, or restricted to company for external users
}
diff --git a/htdocs/core/boxes/box_validated_projects.php b/htdocs/core/boxes/box_validated_projects.php
index 3f2b2cdc221..574ee7b7d80 100644
--- a/htdocs/core/boxes/box_validated_projects.php
+++ b/htdocs/core/boxes/box_validated_projects.php
@@ -101,7 +101,7 @@ class box_validated_projects extends ModeleBoxes
// Get list of project id allowed to user (in a string list separated by coma)
$projectsListId = '';
- if (!$user->rights->projet->all->lire) {
+ if (empty($user->rights->projet->all->lire)) {
$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
}
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 3b98d3f3356..c7a5beae245 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -970,8 +970,8 @@ abstract class CommonInvoiceLine extends CommonObjectLine
public $date_end_fill; // If set to 1, when invoice is created from a template invoice, it will also auto set the field date_end at creation
public $buy_price_ht;
- public $buyprice; // For backward compatibility
- public $pa_ht; // For backward compatibility
+ public $buyprice; // For backward compatibility
+ public $pa_ht; // For backward compatibility
public $marge_tx;
public $marque_tx;
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index c68cc9c7d84..91446f38070 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1851,7 +1851,7 @@ abstract class CommonObject
$result = false;
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$table;
- $sql .= " WHERE ".$field." = '".$key."'";
+ $sql .= " WHERE ".$field." = '".$this->db->escape($key)."'";
if (!empty($element)) {
$sql .= " AND entity IN (".getEntity($element).")";
} else {
diff --git a/htdocs/core/class/defaultvalues.class.php b/htdocs/core/class/defaultvalues.class.php
index ad69982357c..f6edb58207c 100644
--- a/htdocs/core/class/defaultvalues.class.php
+++ b/htdocs/core/class/defaultvalues.class.php
@@ -88,7 +88,7 @@ class DefaultValues extends CommonObject
/**
* @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
*/
- public $fields=array(
+ public $fields = array(
'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>15, 'index'=>1),
'type' =>array('type'=>'varchar(10)', 'label'=>'Type', 'enabled'=>1, 'visible'=>-1, 'position'=>20),
@@ -145,8 +145,12 @@ class DefaultValues extends CommonObject
$this->db = $db;
- if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible'] = 0;
- if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) $this->fields['entity']['enabled'] = 0;
+ if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+ $this->fields['rowid']['visible'] = 0;
+ }
+ if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+ $this->fields['entity']['enabled'] = 0;
+ }
// Unset fields that are disabled
foreach ($this->fields as $key => $val) {
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 68bba0e04b5..98ba6ca3cc2 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -193,12 +193,12 @@ class Form
* @param object $object Object
* @param boolean $perm Permission to allow button to edit parameter
* @param string $typeofdata Type of data ('string' by default, 'email', 'amount:99', 'numeric:99', 'text' or 'textarea:rows:cols%', 'datepicker' ('day' do not work, don't know why), 'dayhour' or 'datepickerhour', 'ckeditor:dolibarr_zzz:width:height:savemethod:toolbarstartexpanded:rows:cols', 'select;xkey:xval,ykey:yval,...')
- * @param string $editvalue When in edit mode, use this value as $value instead of value (for example, you can provide here a formated price instead of value). Use '' to use same than $value
+ * @param string $editvalue When in edit mode, use this value as $value instead of value (for example, you can provide here a formated price instead of numeric value). Use '' to use same than $value
* @param object $extObject External object
* @param mixed $custommsg String or Array of custom messages : eg array('success' => 'MyMessage', 'error' => 'MyMessage')
* @param string $moreparam More param to add on the form action href URL
* @param int $notabletag Do no output table tags
- * @param string $formatfunc Call a specific function to output field
+ * @param string $formatfunc Call a specific function to output field in view mode (For example: 'dol_print_email')
* @param string $paramid Key of parameter for id ('id', 'socid')
* @return string HTML edit field
*/
@@ -214,7 +214,7 @@ class Form
}
// When option to edit inline is activated
- if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !preg_match('/^select;|datehourpicker/', $typeofdata)) { // TODO add jquery timepicker and support select
+ if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !preg_match('/^select;|day|datepicker|dayhour|datehourpicker/', $typeofdata)) { // TODO add jquery timepicker and support select
$ret .= $this->editInPlace($object, $value, $htmlname, $perm, $typeofdata, $editvalue, $extObject, $custommsg);
} else {
$editmode = (GETPOST('action', 'aZ09') == 'edit'.$htmlname);
@@ -236,7 +236,7 @@ class Form
} elseif (preg_match('/^(numeric|amount)/', $typeofdata)) {
$tmp = explode(':', $typeofdata);
$valuetoshow = price2num($editvalue ? $editvalue : $value);
- $ret .= '';
+ $ret .= '';
} elseif (preg_match('/^(checkbox)/', $typeofdata)) {
$tmp = explode(':', $typeofdata);
$ret .= '';
@@ -8679,7 +8679,7 @@ class Form
*/
public function showrefnav($object, $paramid, $morehtml = '', $shownav = 1, $fieldid = 'rowid', $fieldref = 'ref', $morehtmlref = '', $moreparam = '', $nodbprefix = 0, $morehtmlleft = '', $morehtmlstatus = '', $morehtmlright = '')
{
- global $langs, $conf, $hookmanager, $extralanguages;
+ global $conf, $langs, $hookmanager, $extralanguages;
$ret = '';
if (empty($fieldid)) {
@@ -8691,7 +8691,7 @@ class Form
// Preparing gender's display if there is one
$addgendertxt = '';
- if (!empty($object->gender)) {
+ if (property_exists($object, 'gender') && !empty($object->gender)) {
$addgendertxt = ' ';
switch ($object->gender) {
case 'man':
@@ -8705,6 +8705,15 @@ class Form
break;
}
}
+ /*
+ $addadmin = '';
+ if (property_exists($object, 'admin')) {
+ if (!empty($conf->multicompany->enabled) && !empty($object->admin) && empty($object->entity)) {
+ $addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft"');
+ } elseif (!empty($object->admin)) {
+ $addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft"');
+ }
+ }*/
// Add where from hooks
if (is_object($hookmanager)) {
@@ -8837,7 +8846,7 @@ class Form
$ret .= dol_htmlentities($fullname).$addgendertxt.((!empty($object->societe) && $object->societe != $fullname) ? ' ('.dol_htmlentities($object->societe).')' : '');
}
} elseif (in_array($object->element, array('contact', 'user', 'usergroup'))) {
- $ret .= dol_htmlentities($object->getFullName($langs)).$addgendertxt;
+ $ret .= dol_htmlentities($object->getFullName($langs));
} elseif (in_array($object->element, array('action', 'agenda'))) {
$ret .= $object->ref.' '.$object->label;
} elseif (in_array($object->element, array('adherent_type'))) {
@@ -9085,7 +9094,7 @@ class Form
}
$ret .= '
';
if ($object->photo) {
- $ret .= '
'.$langs->trans("Delete").'
';
+ $ret .= '
';
}
$ret .= '
';
$ret .= '
';
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 1bd622d173f..ffa441c0527 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -500,7 +500,7 @@ class FormFile
$modellist = array();
if ($modulepart == 'company') {
- $showempty = 1; // can have no template active
+ $showempty = 1; // can have no template active
if (is_array($genallowed)) {
$modellist = $genallowed;
} else {
@@ -564,7 +564,7 @@ class FormFile
$modellist = ModelePDFFactures::liste_modeles($this->db);
}
} elseif ($modulepart == 'contract') {
- $showempty = 1; // can have no template active
+ $showempty = 1; // can have no template active
if (is_array($genallowed)) {
$modellist = $genallowed;
} else {
@@ -628,7 +628,7 @@ class FormFile
$modellist = ModelePDFSuppliersOrders::liste_modeles($this->db);
}
} elseif ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice') {
- $showempty = 1; // can have no template active
+ $showempty = 1; // can have no template active
if (is_array($genallowed)) {
$modellist = $genallowed;
} else {
@@ -1678,6 +1678,9 @@ class FormFile
} elseif ($modulepart == 'project') {
include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
$object_instance = new Project($this->db);
+ } elseif ($modulepart == 'project_task') {
+ include_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
+ $object_instance = new Task($this->db);
} elseif ($modulepart == 'fichinter') {
include_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
$object_instance = new Fichinter($this->db);
@@ -1696,13 +1699,16 @@ class FormFile
} elseif ($modulepart == 'banque') {
include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
$object_instance = new Account($this->db);
+ } elseif ($modulepart == 'chequereceipt') {
+ include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
+ $object_instance = new RemiseCheque($this->db);
} elseif ($modulepart == 'mrp-mo') {
include_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
$object_instance = new Mo($this->db);
} else {
$parameters = array('modulepart'=>$modulepart);
$reshook = $hookmanager->executeHooks('addSectionECMAuto', $parameters);
- if ($reshook > 0 && is_array($hookmanager->resArray) && count($hookmanager->resArray)>0) {
+ if ($reshook > 0 && is_array($hookmanager->resArray) && count($hookmanager->resArray) > 0) {
if (array_key_exists('classpath', $hookmanager->resArray) && !empty($hookmanager->resArray['classpath'])) {
dol_include_once($hookmanager->resArray['classpath']);
if (array_key_exists('classname', $hookmanager->resArray) && !empty($hookmanager->resArray['classname'])) {
@@ -1750,14 +1756,19 @@ class FormFile
$id = (isset($reg[1]) ? $reg[1] : '');
} elseif ($modulepart == 'invoice_supplier') {
preg_match('/([^\/]+)\/[^\/]+$/', $relativefile, $reg);
- $ref = (isset($reg[1]) ? $reg[1] : ''); if (is_numeric($ref)) {
+ $ref = (isset($reg[1]) ? $reg[1] : '');
+ if (is_numeric($ref)) {
$id = $ref;
$ref = '';
}
- } elseif ($modulepart == 'user' || $modulepart == 'holiday') {
+ } elseif ($modulepart == 'user') {
// $ref may be also id with old supplier invoices
preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg);
$id = (isset($reg[1]) ? $reg[1] : '');
+ } elseif ($modulepart == 'project_task') {
+ // $ref of task is the sub-directory of the project
+ $reg = explode("/", $relativefile);
+ $ref = (isset($reg[1]) ? $reg[1] : '');
} elseif (in_array($modulepart, array(
'invoice',
'propal',
@@ -1767,17 +1778,20 @@ class FormFile
'contract',
'product',
'project',
+ 'project_task',
'fichinter',
'expensereport',
'recruitment-recruitmentcandidature',
'mrp-mo',
- 'banque'))) {
+ 'banque',
+ 'chequereceipt',
+ 'holiday'))) {
preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg);
$ref = (isset($reg[1]) ? $reg[1] : '');
} else {
- $parameters = array('modulepart'=>$modulepart,'fileinfo'=>$file);
+ $parameters = array('modulepart'=>$modulepart, 'fileinfo'=>$file);
$reshook = $hookmanager->executeHooks('addSectionECMAuto', $parameters);
- if ($reshook > 0 && is_array($hookmanager->resArray) && count($hookmanager->resArray)>0) {
+ if ($reshook > 0 && is_array($hookmanager->resArray) && count($hookmanager->resArray) > 0) {
if (array_key_exists('ref', $hookmanager->resArray) && !empty($hookmanager->resArray['ref'])) {
$ref = $hookmanager->resArray['ref'];
}
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 4f9ec52dd8d..0478b4e215f 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -691,9 +691,9 @@ class FormMail extends Form
$out .= '
';
if ($action == 'launchsimu') {
- print '';
+ print '';
print '';
} else {
- print '';
+ print '';
print $form->textwithpicto("", $langs->trans("SetThisValueTo2ToExcludeFirstLine"));
}
print ' - ';
diff --git a/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_static.php b/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_static.php
index 969bb165e62..d66ec482549 100644
--- a/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_static.php
+++ b/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_static.php
@@ -49,7 +49,8 @@
* @version 1.1.1
* @author Nicola Asuni - info@tecnick.com
*/
-class TCPDF_STATIC {
+class TCPDF_STATIC
+{
/**
* Current TCPDF version.
@@ -114,7 +115,8 @@ class TCPDF_STATIC {
* @since 5.9.012 (2010-11-10)
* @public static
*/
- public static function getTCPDFVersion() {
+ public static function getTCPDFVersion()
+ {
return self::$tcpdf_version;
}
@@ -124,7 +126,8 @@ class TCPDF_STATIC {
* @since 6.0.000 (2013-03-16)
* @public static
*/
- public static function getTCPDFProducer() {
+ public static function getTCPDFProducer()
+ {
return "\x54\x43\x50\x44\x46\x20".self::getTCPDFVersion()."\x20\x28\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x74\x63\x70\x64\x66\x2e\x6f\x72\x67\x29";
}
@@ -134,7 +137,8 @@ class TCPDF_STATIC {
* @since 4.6.025 (2009-08-17)
* @public static
*/
- public static function set_mqr($mqr) {
+ public static function set_mqr($mqr)
+ {
if (!defined('PHP_VERSION_ID')) {
$version = PHP_VERSION;
define('PHP_VERSION_ID', (($version[0] * 10000) + ($version[2] * 100) + $version[4]));
@@ -150,7 +154,8 @@ class TCPDF_STATIC {
* @since 4.6.025 (2009-08-17)
* @public static
*/
- public static function get_mqr() {
+ public static function get_mqr()
+ {
if (!defined('PHP_VERSION_ID')) {
$version = PHP_VERSION;
define('PHP_VERSION_ID', (($version[0] * 10000) + ($version[2] * 100) + $version[4]));
@@ -168,9 +173,10 @@ class TCPDF_STATIC {
* @since 5.9.204 (2013-01-28)
* @public static
*/
- public static function isValidURL($url) {
+ public static function isValidURL($url)
+ {
$headers = @get_headers($url);
- return (strpos($headers[0], '200') !== false);
+ return (strpos($headers[0], '200') !== false);
}
/**
@@ -190,7 +196,8 @@ class TCPDF_STATIC {
* @since (4.5.019) 2009-02-28
* @public static
*/
- public static function removeSHY($txt='', $unicode=true) {
+ public static function removeSHY($txt = '', $unicode = true)
+ {
$txt = preg_replace('/([\\xc2]{1}[\\xad]{1})/', '', $txt);
if (!$unicode) {
$txt = preg_replace('/([\\xad]{1})/', '', $txt);
@@ -208,7 +215,8 @@ class TCPDF_STATIC {
* @since 4.4.002 (2008-12-09)
* @public static
*/
- public static function getBorderMode($brd, $position='start', $opencell=true) {
+ public static function getBorderMode($brd, $position = 'start', $opencell = true)
+ {
if ((!$opencell) OR empty($brd)) {
return $brd;
}
@@ -280,7 +288,8 @@ class TCPDF_STATIC {
* @since 4.5.044 (2009-04-16)
* @public static
*/
- public static function empty_string($str) {
+ public static function empty_string($str)
+ {
return (is_null($str) OR (is_string($str) AND (strlen($str) == 0)));
}
@@ -292,7 +301,8 @@ class TCPDF_STATIC {
* @since 4.5.000 (2008-12-31)
* @public static
*/
- public static function getObjFilename($type='tmp', $file_id='') {
+ public static function getObjFilename($type = 'tmp', $file_id = '')
+ {
return tempnam(K_PATH_CACHE, '__tcpdf_'.$file_id.'_'.$type.'_'.md5(TCPDF_STATIC::getRandomSeed()).'_');
}
@@ -302,7 +312,8 @@ class TCPDF_STATIC {
* @return string escaped string.
* @public static
*/
- public static function _escape($s) {
+ public static function _escape($s)
+ {
// the chr(13) substitution fixes the Bugs item #1421290.
return strtr($s, array(')' => '\\)', '(' => '\\(', '\\' => '\\\\', chr(13) => '\r'));
}
@@ -314,7 +325,8 @@ class TCPDF_STATIC {
* @since 5.9.121 (2011-09-28)
* @public static
*/
- public static function _escapeXML($str) {
+ public static function _escapeXML($str)
+ {
$replaceTable = array("\0" => '', '&' => '&', '<' => '<', '>' => '>');
$str = strtr($str, $replaceTable);
return $str;
@@ -327,7 +339,8 @@ class TCPDF_STATIC {
* @since 4.5.029 (2009-03-19)
* @public static
*/
- public static function objclone($object) {
+ public static function objclone($object)
+ {
if (($object instanceof Imagick) AND (version_compare(phpversion('imagick'), '3.0.1') !== 1)) {
// on the versions after 3.0.1 the clone() method was deprecated in favour of clone keyword
return @$object->clone();
@@ -342,7 +355,8 @@ class TCPDF_STATIC {
* @since 5.9.086
* @public static
*/
- public static function sendOutputData($data, $length) {
+ public static function sendOutputData($data, $length)
+ {
if (!isset($_SERVER['HTTP_ACCEPT_ENCODING']) OR empty($_SERVER['HTTP_ACCEPT_ENCODING'])) {
// the content length may vary if the server is using compression
header('Content-Length: '.$length);
@@ -358,7 +372,8 @@ class TCPDF_STATIC {
* @return replaced page content and updated $diff parameter as array.
* @public static
*/
- public static function replacePageNumAliases($page, $replace, $diff=0) {
+ public static function replacePageNumAliases($page, $replace, $diff = 0)
+ {
foreach ($replace as $rep) {
foreach ($rep[3] as $a) {
if (strpos($page, $a) !== false) {
@@ -377,7 +392,8 @@ class TCPDF_STATIC {
* @since 5.9.152 (2012-03-23)
* @public static
*/
- public static function getTimestamp($date) {
+ public static function getTimestamp($date)
+ {
if (($date[0] == 'D') AND ($date[1] == ':')) {
// remove date prefix if present
$date = substr($date, 2);
@@ -392,7 +408,8 @@ class TCPDF_STATIC {
* @since 5.9.152 (2012-03-23)
* @public static
*/
- public static function getFormattedDate($time) {
+ public static function getFormattedDate($time)
+ {
return substr_replace(date('YmdHisO', intval($time)), '\'', (0 - 2), 0).'\'';
}
@@ -404,7 +421,8 @@ class TCPDF_STATIC {
* @since 5.9.006 (2010-10-19)
* @public static
*/
- public static function getRandomSeed($seed='') {
+ public static function getRandomSeed($seed = '')
+ {
$rnd = uniqid(rand().microtime(true), true);
if (function_exists('posix_getpid')) {
$rnd .= posix_getpid();
@@ -427,7 +445,8 @@ class TCPDF_STATIC {
* @since 2.0.000 (2008-01-02)
* @public static
*/
- public static function _md5_16($str) {
+ public static function _md5_16($str)
+ {
return pack('H*', md5($str));
}
@@ -441,12 +460,13 @@ class TCPDF_STATIC {
* @since 5.0.005 (2010-05-11)
* @public static
*/
- public static function _AES($key, $text) {
+ public static function _AES($key, $text)
+ {
// padding (RFC 2898, PKCS #5: Password-Based Cryptography Specification Version 2.0)
$padding = 16 - (strlen($text) % 16);
$text .= str_repeat(chr($padding), $padding);
if (extension_loaded('openssl')) {
- $iv = openssl_random_pseudo_bytes (openssl_cipher_iv_length('aes-256-cbc'));
+ $iv = openssl_random_pseudo_bytes(openssl_cipher_iv_length('aes-256-cbc'));
$text = openssl_encrypt($text, 'aes-256-cbc', $key, OPENSSL_RAW_DATA, $iv);
return $iv.substr($text, 0, -16);
}
@@ -466,7 +486,8 @@ class TCPDF_STATIC {
* @since TODO
* @public static
*/
- public static function _AESnopad($key, $text) {
+ public static function _AESnopad($key, $text)
+ {
if (extension_loaded('openssl')) {
$iv = str_repeat("\x00", openssl_cipher_iv_length('aes-256-cbc'));
$text = openssl_encrypt($text, 'aes-256-cbc', $key, OPENSSL_RAW_DATA, $iv);
@@ -489,7 +510,8 @@ class TCPDF_STATIC {
* @author Klemen Vodopivec, Nicola Asuni
* @public static
*/
- public static function _RC4($key, $text, &$last_enc_key, &$last_enc_key_c) {
+ public static function _RC4($key, $text, &$last_enc_key, &$last_enc_key_c)
+ {
if (function_exists('mcrypt_encrypt') AND ($out = @mcrypt_encrypt(MCRYPT_ARCFOUR, $key, $text, MCRYPT_MODE_STREAM, ''))) {
// try to use mcrypt function if exist
return $out;
@@ -533,7 +555,8 @@ class TCPDF_STATIC {
* @author Nicola Asuni
* @public static
*/
- public static function getUserPermissionCode($permissions, $mode=0) {
+ public static function getUserPermissionCode($permissions, $mode = 0)
+ {
$options = array(
'owner' => 2, // bit 2 -- inverted logic: cleared by default
'print' => 4, // bit 3
@@ -570,7 +593,8 @@ class TCPDF_STATIC {
* @author Nicola Asuni
* @public static
*/
- public static function convertHexStringToString($bs) {
+ public static function convertHexStringToString($bs)
+ {
$string = ''; // string to be returned
$bslength = strlen($bs);
if (($bslength % 2) != 0) {
@@ -592,7 +616,8 @@ class TCPDF_STATIC {
* @author Nicola Asuni
* @public static
*/
- public static function convertStringToHexString($s) {
+ public static function convertStringToHexString($s)
+ {
$bs = '';
$chars = preg_split('//', $s, -1, PREG_SPLIT_NO_EMPTY);
foreach ($chars as $c) {
@@ -609,7 +634,8 @@ class TCPDF_STATIC {
* @author Nicola Asuni
* @public static
*/
- public static function getEncPermissionsString($protection) {
+ public static function getEncPermissionsString($protection)
+ {
$binprot = sprintf('%032b', $protection);
$str = chr(bindec(substr($binprot, 24, 8)));
$str .= chr(bindec(substr($binprot, 16, 8)));
@@ -626,7 +652,8 @@ class TCPDF_STATIC {
* @since 5.9.097 (2011-06-23)
* @public static
*/
- public static function encodeNameObject($name) {
+ public static function encodeNameObject($name)
+ {
$escname = '';
$length = strlen($name);
for ($i = 0; $i < $length; ++$i) {
@@ -650,7 +677,8 @@ class TCPDF_STATIC {
* @since 4.8.000 (2009-09-06)
* @public static
*/
- public static function getAnnotOptFromJSProp($prop, &$spot_colors, $rtl=false) {
+ public static function getAnnotOptFromJSProp($prop, &$spot_colors, $rtl = false)
+ {
if (isset($prop['aopt']) AND is_array($prop['aopt'])) {
// the annotation options area lready defined
return $prop['aopt'];
@@ -1016,8 +1044,9 @@ class TCPDF_STATIC {
* @since 4.2.005 (2008-11-06)
* @public static
*/
- public static function formatPageNumber($num) {
- return number_format((float)$num, 0, '', '.');
+ public static function formatPageNumber($num)
+ {
+ return number_format((float) $num, 0, '', '.');
}
/**
@@ -1028,8 +1057,9 @@ class TCPDF_STATIC {
* @see addTOC(), addHTMLTOC()
* @public static
*/
- public static function formatTOCPageNumber($num) {
- return number_format((float)$num, 0, '', '.');
+ public static function formatTOCPageNumber($num)
+ {
+ return number_format((float) $num, 0, '', '.');
}
/**
@@ -1040,7 +1070,8 @@ class TCPDF_STATIC {
* @since 5.1.000 (2010-05-25)
* @public static
*/
- public static function extractCSSproperties($cssdata) {
+ public static function extractCSSproperties($cssdata)
+ {
if (empty($cssdata)) {
return array();
}
@@ -1136,7 +1167,8 @@ class TCPDF_STATIC {
* @see setHtmlVSpace()
* @public static
*/
- public static function fixHTMLCode($html, $default_css='', $tagvs='', $tidy_options='', &$tagvspaces) {
+ public static function fixHTMLCode($html, $default_css = '', $tagvs = '', $tidy_options = '', &$tagvspaces)
+ {
// configure parameters for HTML Tidy
if ($tidy_options === '') {
$tidy_options = array (
@@ -1202,7 +1234,8 @@ class TCPDF_STATIC {
* @since 5.1.000 (2010-05-25)
* @public static
*/
- public static function isValidCSSSelectorForTag($dom, $key, $selector) {
+ public static function isValidCSSSelectorForTag($dom, $key, $selector)
+ {
$valid = false; // value to be returned
$tag = $dom[$key]['value'];
$class = array();
@@ -1362,7 +1395,8 @@ class TCPDF_STATIC {
* @since 5.1.000 (2010-05-25)
* @public static
*/
- public static function getCSSdataArray($dom, $key, $css) {
+ public static function getCSSdataArray($dom, $key, $css)
+ {
$cssarray = array(); // style to be returned
// get parent CSS selectors
$selectors = array();
@@ -1370,7 +1404,7 @@ class TCPDF_STATIC {
$selectors = $dom[($dom[$key]['parent'])]['csssel'];
}
// get all styles that apply
- foreach($css as $selector => $style) {
+ foreach ($css as $selector => $style) {
$pos = strpos($selector, ' ');
// get specificity
$specificity = substr($selector, 0, $pos);
@@ -1407,7 +1441,8 @@ class TCPDF_STATIC {
* @since 5.9.070 (2011-04-19)
* @public static
*/
- public static function getTagStyleFromCSSarray($css) {
+ public static function getTagStyleFromCSSarray($css)
+ {
$tagstyle = ''; // value to be returned
foreach ($css as $style) {
// split single css commands
@@ -1438,8 +1473,13 @@ class TCPDF_STATIC {
* @since 4.4.004 (2008-12-10)
* @public static
*/
- public static function intToRoman($number) {
+ public static function intToRoman($number)
+ {
$roman = '';
+ if ($number >= 4000) {
+ // do not represent numbers above 4000 in Roman numerals
+ return strval($number);
+ }
while ($number >= 1000) {
$roman .= 'M';
$number -= 1000;
@@ -1504,7 +1544,8 @@ class TCPDF_STATIC {
* @since 4.8.038 (2010-03-13)
* @public static
*/
- public static function revstrpos($haystack, $needle, $offset = 0) {
+ public static function revstrpos($haystack, $needle, $offset = 0)
+ {
$length = strlen($haystack);
$offset = ($offset > 0)?($length - $offset):abs($offset);
$pos = strpos(strrev($haystack), strrev($needle), $offset);
@@ -1519,7 +1560,8 @@ class TCPDF_STATIC {
* @since 4.9.012 (2010-04-12)
* @public static
*/
- public static function getHyphenPatternsFromTEX($file) {
+ public static function getHyphenPatternsFromTEX($file)
+ {
// TEX patterns are available at:
// http://www.ctan.org/tex-archive/language/hyph-utf8/tex/generic/hyph-utf8/patterns/
$data = file_get_contents($file);
@@ -1533,7 +1575,7 @@ class TCPDF_STATIC {
$patterns_array = preg_split('/[\s]+/', $data);
// create new language array of patterns
$patterns = array();
- foreach($patterns_array as $val) {
+ foreach ($patterns_array as $val) {
if (!TCPDF_STATIC::empty_string($val)) {
$val = trim($val);
$val = str_replace('\'', '\\\'', $val);
@@ -1547,27 +1589,28 @@ class TCPDF_STATIC {
/**
* Get the Path-Painting Operators.
* @param $style (string) Style of rendering. Possible values are:
- *
- *
S or D: Stroke the path.
- *
s or d: Close and stroke the path.
- *
f or F: Fill the path, using the nonzero winding number rule to determine the region to fill.
- *
f* or F*: Fill the path, using the even-odd rule to determine the region to fill.
- *
B or FD or DF: Fill and then stroke the path, using the nonzero winding number rule to determine the region to fill.
- *
B* or F*D or DF*: Fill and then stroke the path, using the even-odd rule to determine the region to fill.
- *
b or fd or df: Close, fill, and then stroke the path, using the nonzero winding number rule to determine the region to fill.
- *
b or f*d or df*: Close, fill, and then stroke the path, using the even-odd rule to determine the region to fill.
- *
CNZ: Clipping mode using the even-odd rule to determine which regions lie inside the clipping path.
- *
CEO: Clipping mode using the nonzero winding number rule to determine which regions lie inside the clipping path
- *
n: End the path object without filling or stroking it.
- *
+ *
+ *
S or D: Stroke the path.
+ *
s or d: Close and stroke the path.
+ *
f or F: Fill the path, using the nonzero winding number rule to determine the region to fill.
+ *
f* or F*: Fill the path, using the even-odd rule to determine the region to fill.
+ *
B or FD or DF: Fill and then stroke the path, using the nonzero winding number rule to determine the region to fill.
+ *
B* or F*D or DF*: Fill and then stroke the path, using the even-odd rule to determine the region to fill.
+ *
b or fd or df: Close, fill, and then stroke the path, using the nonzero winding number rule to determine the region to fill.
+ *
b or f*d or df*: Close, fill, and then stroke the path, using the even-odd rule to determine the region to fill.
+ *
CNZ: Clipping mode using the even-odd rule to determine which regions lie inside the clipping path.
+ *
CEO: Clipping mode using the nonzero winding number rule to determine which regions lie inside the clipping path
+ *
n: End the path object without filling or stroking it.
+ *
* @param $default (string) default style
* @author Nicola Asuni
* @since 5.0.000 (2010-04-30)
* @public static
*/
- public static function getPathPaintOperator($style, $default='S') {
+ public static function getPathPaintOperator($style, $default = 'S')
+ {
$op = '';
- switch($style) {
+ switch ($style) {
case 'S':
case 'D': {
$op = 'S';
@@ -1644,7 +1687,8 @@ class TCPDF_STATIC {
* @since 5.0.000 (2010-05-02)
* @public static
*/
- public static function getTransformationMatrixProduct($ta, $tb) {
+ public static function getTransformationMatrixProduct($ta, $tb)
+ {
$tm = array();
$tm[0] = ($ta[0] * $tb[0]) + ($ta[2] * $tb[1]);
$tm[1] = ($ta[1] * $tb[0]) + ($ta[3] * $tb[1]);
@@ -1663,7 +1707,8 @@ class TCPDF_STATIC {
* @since 5.0.000 (2010-05-02)
* @public static
*/
- public static function getSVGTransformMatrix($attribute) {
+ public static function getSVGTransformMatrix($attribute)
+ {
// identity matrix
$tm = array(1, 0, 0, 1, 0, 0);
$transform = array();
@@ -1760,7 +1805,8 @@ class TCPDF_STATIC {
* @since 5.0.000 (2010-05-04)
* @public static
*/
- public static function getVectorsAngle($x1, $y1, $x2, $y2) {
+ public static function getVectorsAngle($x1, $y1, $x2, $y2)
+ {
$dprod = ($x1 * $x2) + ($y1 * $y2);
$dist1 = sqrt(($x1 * $x1) + ($y1 * $y1));
$dist2 = sqrt(($x2 * $x2) + ($y2 * $y2));
@@ -1787,14 +1833,15 @@ class TCPDF_STATIC {
* @since 6.0.023
* @public static
*/
- public static function pregSplit($pattern, $modifiers, $subject, $limit=NULL, $flags=NULL) {
+ public static function pregSplit($pattern, $modifiers, $subject, $limit = null, $flags = null)
+ {
// the bug only happens on PHP 5.2 when using the u modifier
- if ((strpos($modifiers, 'u') === FALSE) OR (count(preg_split('//u', "\n\t", -1, PREG_SPLIT_NO_EMPTY)) == 2)) {
+ if ((strpos($modifiers, 'u') === false) OR (count(preg_split('//u', "\n\t", -1, PREG_SPLIT_NO_EMPTY)) == 2)) {
return preg_split($pattern.$modifiers, $subject, $limit, $flags);
}
// preg_split is bugged - try alternative solution
$ret = array();
- while (($nl = strpos($subject, "\n")) !== FALSE) {
+ while (($nl = strpos($subject, "\n")) !== false) {
$ret = array_merge($ret, preg_split($pattern.$modifiers, substr($subject, 0, $nl), $limit, $flags));
$ret[] = "\n";
$subject = substr($subject, ($nl + 1));
@@ -1805,28 +1852,28 @@ class TCPDF_STATIC {
return $ret;
}
- /**
- * Wrapper to use fopen only with local files
- * @param string $filename The full path to the file to open
- * @param string $mode Acceses type for the file ('r', 'r+', 'w', 'w+', 'a', 'a+', 'x', 'x+', 'c', 'c+' or 'e')
- * @return resource Returns a file pointer resource on success, or FALSE on error.
- * @public static
- */
- public static function fopenLocal($filename, $mode)
- {
- if (strpos($filename, '//') === 0) {
- // Share folder on a (windows) server
- // e.g.: "//[MyServerName]/[MySharedFolder]/"
- //
- // nothing to change
- } elseif (strpos($filename, '://') === false) {
- $filename = 'file://'.$filename;
- } elseif (stream_is_local($filename) !== true) {
- return false;
- }
+ /**
+ * Wrapper to use fopen only with local files
+ * @param string $filename The full path to the file to open
+ * @param string $mode Acceses type for the file ('r', 'r+', 'w', 'w+', 'a', 'a+', 'x', 'x+', 'c', 'c+' or 'e')
+ * @return resource Returns a file pointer resource on success, or FALSE on error.
+ * @public static
+ */
+ public static function fopenLocal($filename, $mode)
+ {
+ if (strpos($filename, '//') === 0) {
+ // Share folder on a (windows) server
+ // e.g.: "//[MyServerName]/[MySharedFolder]/"
+ //
+ // nothing to change
+ } elseif (strpos($filename, '://') === false) {
+ $filename = 'file://'.$filename;
+ } elseif (stream_is_local($filename) !== true) {
+ return false;
+ }
- return fopen($filename, $mode);
- }
+ return fopen($filename, $mode);
+ }
/**
* Check if the URL exist.
@@ -1834,7 +1881,8 @@ class TCPDF_STATIC {
* @return Returns TRUE if the URL exists; FALSE otherwise.
* @public static
*/
- public static function url_exists($url) {
+ public static function url_exists($url)
+ {
$crs = curl_init();
curl_setopt($crs, CURLOPT_URL, $url);
curl_setopt($crs, CURLOPT_NOBODY, true);
@@ -1861,7 +1909,8 @@ class TCPDF_STATIC {
* @return Returns TRUE if the file or directory specified by filename exists; FALSE otherwise.
* @public static
*/
- public static function file_exists($filename) {
+ public static function file_exists($filename)
+ {
if (preg_match('|^https?://|', $filename) == 1) {
return self::url_exists($filename);
}
@@ -1880,24 +1929,25 @@ class TCPDF_STATIC {
* @since 6.0.025
* @public static
*/
- public static function fileGetContents($file) {
+ public static function fileGetContents($file)
+ {
$alt = array($file);
//
if ((strlen($file) > 1)
- && ($file[0] === '/')
- && ($file[1] !== '/')
- && !empty($_SERVER['DOCUMENT_ROOT'])
- && ($_SERVER['DOCUMENT_ROOT'] !== '/')
+ && ($file[0] === '/')
+ && ($file[1] !== '/')
+ && !empty($_SERVER['DOCUMENT_ROOT'])
+ && ($_SERVER['DOCUMENT_ROOT'] !== '/')
) {
- $findroot = strpos($file, $_SERVER['DOCUMENT_ROOT']);
- if (($findroot === false) || ($findroot > 1)) {
- $alt[] = htmlspecialchars_decode(urldecode($_SERVER['DOCUMENT_ROOT'].$file));
- }
+ $findroot = strpos($file, $_SERVER['DOCUMENT_ROOT']);
+ if (($findroot === false) || ($findroot > 1)) {
+ $alt[] = htmlspecialchars_decode(urldecode($_SERVER['DOCUMENT_ROOT'].$file));
+ }
}
//
$protocol = 'http';
if (!empty($_SERVER['HTTPS']) && (strtolower($_SERVER['HTTPS']) != 'off')) {
- $protocol .= 's';
+ $protocol .= 's';
}
//
$url = $file;
@@ -1908,26 +1958,26 @@ class TCPDF_STATIC {
$alt[] = $url;
//
if (preg_match('%^(https?)://%', $url)
- && empty($_SERVER['HTTP_HOST'])
- && empty($_SERVER['DOCUMENT_ROOT'])
+ && empty($_SERVER['HTTP_HOST'])
+ && empty($_SERVER['DOCUMENT_ROOT'])
) {
$urldata = parse_url($url);
if (empty($urldata['query'])) {
$host = $protocol.'://'.$_SERVER['HTTP_HOST'];
if (strpos($url, $host) === 0) {
- // convert URL to full server path
- $tmp = str_replace($host, $_SERVER['DOCUMENT_ROOT'], $url);
- $alt[] = htmlspecialchars_decode(urldecode($tmp));
+ // convert URL to full server path
+ $tmp = str_replace($host, $_SERVER['DOCUMENT_ROOT'], $url);
+ $alt[] = htmlspecialchars_decode(urldecode($tmp));
}
}
}
//
if (isset($_SERVER['SCRIPT_URI'])
- && !preg_match('%^(https?|ftp)://%', $file)
- && !preg_match('%^//%', $file)
+ && !preg_match('%^(https?|ftp)://%', $file)
+ && !preg_match('%^//%', $file)
) {
- $urldata = @parse_url($_SERVER['SCRIPT_URI']);
- $alt[] = $urldata['scheme'].'://'.$urldata['host'].(($file[0] == '/') ? '' : '/').$file;
+ $urldata = @parse_url($_SERVER['SCRIPT_URI']);
+ $alt[] = $urldata['scheme'].'://'.$urldata['host'].(($file[0] == '/') ? '' : '/').$file;
}
//
$alt = array_unique($alt);
@@ -1937,7 +1987,7 @@ class TCPDF_STATIC {
}
$ret = @file_get_contents($path);
if ( $ret != false ) {
- return $ret;
+ return $ret;
}
// try to use CURL for URLs
if (!ini_get('allow_url_fopen')
@@ -1951,7 +2001,7 @@ class TCPDF_STATIC {
curl_setopt($crs, CURLOPT_FAILONERROR, true);
curl_setopt($crs, CURLOPT_RETURNTRANSFER, true);
if ((ini_get('open_basedir') == '') && (!ini_get('safe_mode'))) {
- curl_setopt($crs, CURLOPT_FOLLOWLOCATION, true);
+ curl_setopt($crs, CURLOPT_FOLLOWLOCATION, true);
}
curl_setopt($crs, CURLOPT_CONNECTTIMEOUT, 5);
curl_setopt($crs, CURLOPT_TIMEOUT, 30);
@@ -1977,7 +2027,8 @@ class TCPDF_STATIC {
* @since 5.2.000 (2010-06-02)
* @public static
*/
- public static function _getULONG($str, $offset) {
+ public static function _getULONG($str, $offset)
+ {
$v = unpack('Ni', substr($str, $offset, 4));
return $v['i'];
}
@@ -1991,7 +2042,8 @@ class TCPDF_STATIC {
* @since 5.2.000 (2010-06-02)
* @public static
*/
- public static function _getUSHORT($str, $offset) {
+ public static function _getUSHORT($str, $offset)
+ {
$v = unpack('ni', substr($str, $offset, 2));
return $v['i'];
}
@@ -2005,7 +2057,8 @@ class TCPDF_STATIC {
* @since 5.2.000 (2010-06-02)
* @public static
*/
- public static function _getSHORT($str, $offset) {
+ public static function _getSHORT($str, $offset)
+ {
$v = unpack('si', substr($str, $offset, 2));
return $v['i'];
}
@@ -2019,7 +2072,8 @@ class TCPDF_STATIC {
* @since 5.9.123 (2011-09-30)
* @public static
*/
- public static function _getFWORD($str, $offset) {
+ public static function _getFWORD($str, $offset)
+ {
$v = self::_getUSHORT($str, $offset);
if ($v > 0x7fff) {
$v -= 0x10000;
@@ -2036,7 +2090,8 @@ class TCPDF_STATIC {
* @since 5.9.123 (2011-09-30)
* @public static
*/
- public static function _getUFWORD($str, $offset) {
+ public static function _getUFWORD($str, $offset)
+ {
$v = self::_getUSHORT($str, $offset);
return $v;
}
@@ -2050,7 +2105,8 @@ class TCPDF_STATIC {
* @since 5.9.123 (2011-09-30)
* @public static
*/
- public static function _getFIXED($str, $offset) {
+ public static function _getFIXED($str, $offset)
+ {
// mantissa
$m = self::_getFWORD($str, $offset);
// fraction
@@ -2068,7 +2124,8 @@ class TCPDF_STATIC {
* @since 5.2.000 (2010-06-02)
* @public static
*/
- public static function _getBYTE($str, $offset) {
+ public static function _getBYTE($str, $offset)
+ {
$v = unpack('Ci', substr($str, $offset, 1));
return $v['i'];
}
@@ -2082,7 +2139,8 @@ class TCPDF_STATIC {
* @since 4.5.027 (2009-03-16)
* @public static
*/
- public static function rfread($handle, $length) {
+ public static function rfread($handle, $length)
+ {
$data = fread($handle, $length);
if ($data === false) {
return false;
@@ -2100,7 +2158,8 @@ class TCPDF_STATIC {
* @return 4-byte integer
* @public static
*/
- public static function _freadint($f) {
+ public static function _freadint($f)
+ {
$a = unpack('Ni', fread($f, 4));
return $a['i'];
}
@@ -2470,7 +2529,8 @@ class TCPDF_STATIC {
* @since 5.0.010 (2010-05-17)
* @public static
*/
- public static function getPageSizeFromFormat($format) {
+ public static function getPageSizeFromFormat($format)
+ {
if (isset(self::$page_formats[$format])) {
return self::$page_formats[$format];
}
@@ -2492,7 +2552,8 @@ class TCPDF_STATIC {
* @since 5.0.010 (2010-05-17)
* @public static
*/
- public static function setPageBoxes($page, $type, $llx, $lly, $urx, $ury, $points=false, $k, $pagedim=array()) {
+ public static function setPageBoxes($page, $type, $llx, $lly, $urx, $ury, $points = false, $k, $pagedim = array())
+ {
if (!isset($pagedim[$page])) {
// initialize array
$pagedim[$page] = array();
@@ -2518,7 +2579,8 @@ class TCPDF_STATIC {
* @since 5.0.010 (2010-05-17)
* @public static
*/
- public static function swapPageBoxCoordinates($page, $pagedim) {
+ public static function swapPageBoxCoordinates($page, $pagedim)
+ {
foreach (self::$pageboxes as $type) {
// swap X and Y coordinates
if (isset($pagedim[$page][$type])) {
@@ -2539,7 +2601,8 @@ class TCPDF_STATIC {
* @return (string) Canonical page layout name.
* @public static
*/
- public static function getPageLayoutMode($layout='SinglePage') {
+ public static function getPageLayoutMode($layout = 'SinglePage')
+ {
switch ($layout) {
case 'default':
case 'single':
@@ -2582,7 +2645,8 @@ class TCPDF_STATIC {
* @return (string) Canonical page mode name.
* @public static
*/
- public static function getPageMode($mode='UseNone') {
+ public static function getPageMode($mode = 'UseNone')
+ {
switch ($mode) {
case 'UseNone': {
$page_mode = 'UseNone';
@@ -2614,8 +2678,6 @@ class TCPDF_STATIC {
}
return $page_mode;
}
-
-
} // END OF TCPDF_STATIC CLASS
//============================================================+
diff --git a/htdocs/index.php b/htdocs/index.php
index 8c1433c79cb..1884d9a823a 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -26,7 +26,7 @@
*/
-define('CSRFCHECK_WITH_TOKEN', 1); // We force need to use a token to login when making a POST
+define('CSRFCHECK_WITH_TOKEN', 1); // We force need to use a token to login when making a POST
require 'main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
diff --git a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
index 5bf710ebe0f..d25f039fd42 100644
--- a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
+++ b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
@@ -384,3 +384,49 @@ ALTER TABLE llx_projet_task ADD COLUMN budget_amount double(24,8) AFTER priority
-- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT 'box_graph_nb_ticket_last_x_days.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_graph_nb_ticket_last_x_days.php' AND entity = 1);
-- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT 'box_graph_nb_tickets_type.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_graph_nb_tickets_type.php' AND entity = 1);
-- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT 'box_graph_new_vs_close_ticket.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_graph_new_vs_close_ticket.php' AND entity = 1);
+
+ALTER TABLE llx_user DROP COLUMN jabberid;
+ALTER TABLE llx_user DROP COLUMN skype;
+ALTER TABLE llx_user DROP COLUMN twitter;
+ALTER TABLE llx_user DROP COLUMN facebook;
+ALTER TABLE llx_user DROP COLUMN linkedin;
+ALTER TABLE llx_user DROP COLUMN instagram;
+ALTER TABLE llx_user DROP COLUMN snapchat;
+ALTER TABLE llx_user DROP COLUMN googleplus;
+ALTER TABLE llx_user DROP COLUMN youtube;
+ALTER TABLE llx_user DROP COLUMN whatsapp;
+
+ALTER TABLE llx_adherent DROP COLUMN jabberid;
+ALTER TABLE llx_adherent DROP COLUMN skype;
+ALTER TABLE llx_adherent DROP COLUMN twitter;
+ALTER TABLE llx_adherent DROP COLUMN facebook;
+ALTER TABLE llx_adherent DROP COLUMN linkedin;
+ALTER TABLE llx_adherent DROP COLUMN instagram;
+ALTER TABLE llx_adherent DROP COLUMN snapchat;
+ALTER TABLE llx_adherent DROP COLUMN googleplus;
+ALTER TABLE llx_adherent DROP COLUMN youtube;
+ALTER TABLE llx_adherent DROP COLUMN whatsapp;
+
+ALTER TABLE llx_societe DROP COLUMN jabberid;
+ALTER TABLE llx_societe DROP COLUMN skype;
+ALTER TABLE llx_societe DROP COLUMN twitter;
+ALTER TABLE llx_societe DROP COLUMN facebook;
+ALTER TABLE llx_societe DROP COLUMN linkedin;
+ALTER TABLE llx_societe DROP COLUMN instagram;
+ALTER TABLE llx_societe DROP COLUMN snapchat;
+ALTER TABLE llx_societe DROP COLUMN googleplus;
+ALTER TABLE llx_societe DROP COLUMN youtube;
+ALTER TABLE llx_societe DROP COLUMN whatsapp;
+
+ALTER TABLE llx_socpeople DROP COLUMN jabberid;
+ALTER TABLE llx_socpeople DROP COLUMN skype;
+ALTER TABLE llx_socpeople DROP COLUMN twitter;
+ALTER TABLE llx_socpeople DROP COLUMN facebook;
+ALTER TABLE llx_socpeople DROP COLUMN linkedin;
+ALTER TABLE llx_socpeople DROP COLUMN instagram;
+ALTER TABLE llx_socpeople DROP COLUMN snapchat;
+ALTER TABLE llx_socpeople DROP COLUMN googleplus;
+ALTER TABLE llx_socpeople DROP COLUMN youtube;
+ALTER TABLE llx_socpeople DROP COLUMN whatsapp;
+
+
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql
index 1d3a784dd74..bd74c33c688 100644
--- a/htdocs/install/mysql/tables/llx_adherent.sql
+++ b/htdocs/install/mysql/tables/llx_adherent.sql
@@ -51,15 +51,15 @@ create table llx_adherent
url varchar(255) NULL,
socialnetworks text DEFAULT NULL, -- json with socialnetworks
- skype varchar(255), -- deprecated
- twitter varchar(255), -- deprecated
- facebook varchar(255), -- deprecated
- linkedin varchar(255), -- deprecated
- instagram varchar(255), -- deprecated
- snapchat varchar(255), -- deprecated
- googleplus varchar(255), -- deprecated
- youtube varchar(255), -- deprecated
- whatsapp varchar(255), -- deprecated
+ --skype varchar(255), -- deprecated
+ --twitter varchar(255), -- deprecated
+ --facebook varchar(255), -- deprecated
+ --linkedin varchar(255), -- deprecated
+ --instagram varchar(255), -- deprecated
+ --snapchat varchar(255), -- deprecated
+ --googleplus varchar(255), -- deprecated
+ --youtube varchar(255), -- deprecated
+ --whatsapp varchar(255), -- deprecated
phone varchar(30),
phone_perso varchar(30),
diff --git a/htdocs/install/mysql/tables/llx_c_socialnetworks.key.sql b/htdocs/install/mysql/tables/llx_c_socialnetworks.key.sql
index ee48185e187..3d3afb94d8a 100644
--- a/htdocs/install/mysql/tables/llx_c_socialnetworks.key.sql
+++ b/htdocs/install/mysql/tables/llx_c_socialnetworks.key.sql
@@ -16,4 +16,4 @@
-- ========================================================================
-ALTER TABLE llx_c_socialnetworks ADD UNIQUE INDEX idx_c_socialnetworks_code_entity (code, entity);
+ALTER TABLE llx_c_socialnetworks ADD UNIQUE INDEX idx_c_socialnetworks_code_entity (entity, code);
diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql
index 011c82b65f7..c30c934b792 100644
--- a/htdocs/install/mysql/tables/llx_societe.sql
+++ b/htdocs/install/mysql/tables/llx_societe.sql
@@ -52,15 +52,15 @@ create table llx_societe
email varchar(128), --
socialnetworks text DEFAULT NULL, -- json with socialnetworks
- skype varchar(255), -- deprecated
- twitter varchar(255), -- deprecated
- facebook varchar(255), -- deprecated
- linkedin varchar(255), -- deprecated
- instagram varchar(255), -- deprecated
- snapchat varchar(255), -- deprecated
- googleplus varchar(255), -- deprecated
- youtube varchar(255), -- deprecated
- whatsapp varchar(255), -- deprecated
+ --skype varchar(255), -- deprecated
+ --twitter varchar(255), -- deprecated
+ --facebook varchar(255), -- deprecated
+ --linkedin varchar(255), -- deprecated
+ --instagram varchar(255), -- deprecated
+ --snapchat varchar(255), -- deprecated
+ --googleplus varchar(255), -- deprecated
+ --youtube varchar(255), -- deprecated
+ --whatsapp varchar(255), -- deprecated
fk_effectif integer DEFAULT 0, --
fk_typent integer DEFAULT NULL, -- type ent
diff --git a/htdocs/install/mysql/tables/llx_socpeople.sql b/htdocs/install/mysql/tables/llx_socpeople.sql
index 1f28534d5d3..59bd22ddfdc 100644
--- a/htdocs/install/mysql/tables/llx_socpeople.sql
+++ b/htdocs/install/mysql/tables/llx_socpeople.sql
@@ -44,16 +44,16 @@ create table llx_socpeople
email varchar(255),
socialnetworks text DEFAULT NULL, -- json with socialnetworks
- jabberid varchar(255),
- skype varchar(255),
- twitter varchar(255), --
- facebook varchar(255), --
- linkedin varchar(255), --
- instagram varchar(255), --
- snapchat varchar(255), --
- googleplus varchar(255), --
- youtube varchar(255), --
- whatsapp varchar(255), --
+ --jabberid varchar(255),
+ --skype varchar(255),
+ --twitter varchar(255), --
+ --facebook varchar(255), --
+ --linkedin varchar(255), --
+ --instagram varchar(255), --
+ --snapchat varchar(255), --
+ --googleplus varchar(255), --
+ --youtube varchar(255), --
+ --whatsapp varchar(255), --
photo varchar(255),
no_email smallint NOT NULL DEFAULT 0, -- deprecated. Use table llx_mailing_unsubscribe instead
diff --git a/htdocs/install/step2.php b/htdocs/install/step2.php
index 1835c87f759..30bee881584 100644
--- a/htdocs/install/step2.php
+++ b/htdocs/install/step2.php
@@ -570,19 +570,27 @@ dolibarr_install_syslog("Exit ".$ret);
dolibarr_install_syslog("- step2: end");
+// Force here a value we need after because master.inc.php is not loaded into step2.
+// This code must be similar with the one into main.inc.php
+$conf->file->instance_unique_id = (empty($dolibarr_main_instance_unique_id) ? (empty($dolibarr_main_cookie_cryptkey) ? '' : $dolibarr_main_cookie_cryptkey) : $dolibarr_main_instance_unique_id); // Unique id of instance
-$out = ' ';
+$hash_unique_id = md5('dolibarr'.$conf->file->instance_unique_id);
+
+$out = 'global->MAIN_FIRST_PING_OK_ID) && $conf->global->MAIN_FIRST_PING_OK_ID == 'disabled') ? '' : ' value="checked" checked="true"').'> ';
$out .= '';
$out .= '';
$out .= '';
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 960b5b88c74..9440e166429 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -4360,7 +4360,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
$mod = new $classname($db);
//$mod->remove('noboxes');
- $mod->delete_menus(); // We must delete to be sure it is inserted with new values
+ $mod->delete_menus(); // We must delete to be sure it is inserted with new values
$mod->init($reloadmode);
} else {
dolibarr_install_syslog('Failed to include '.DOL_DOCUMENT_ROOT.'/core/modules/mod'.$moduletoreloadshort.'.class.php');
@@ -4537,7 +4537,8 @@ and rowid in (...)
*/
/**
- * Migrate users fields facebook and co to socialnetworks
+ * Migrate users fields facebook and co to socialnetworks.
+ * Can be called only when version is 10.0.* or lower. Fields does not exists after.
*
* @return void
*/
@@ -4628,6 +4629,7 @@ function migrate_users_socialnetworks()
/**
* Migrate members fields facebook and co to socialnetworks
+ * Can be called only when version is 10.0.* or lower. Fields does not exists after.
*
* @return void
*/
@@ -4719,6 +4721,7 @@ function migrate_members_socialnetworks()
/**
* Migrate contacts fields facebook and co to socialnetworks
+ * Can be called only when version is 10.0.* or lower. Fields does not exists after.
*
* @return void
*/
@@ -4814,6 +4817,7 @@ function migrate_contacts_socialnetworks()
/**
* Migrate thirdparties fields facebook and co to socialnetworks
+ * Can be called only when version is 10.0.* or lower. Fields does not exists after.
*
* @return void
*/
diff --git a/htdocs/knowledgemanagement/knowledgerecord_document.php b/htdocs/knowledgemanagement/knowledgerecord_document.php
index f3d23fba4bd..90bb9f736cc 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_document.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_document.php
@@ -80,7 +80,7 @@ if ($id > 0 || !empty($ref)) {
//if ($user->socid > 0) $socid = $user->socid;
//$result = restrictedArea($user, 'knowledgemanagement', $object->id);
-$permissiontoadd = $user->rights->knowledgemanagement->knowledgerecord->write; // Used by the include of actions_addupdatedelete.inc.php
+$permissiontoadd = $user->rights->knowledgemanagement->knowledgerecord->write; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles.inc.php
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index f75ba12abe5..d9099f567fa 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -500,7 +500,7 @@ WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to
WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
WarningPHPMailD=Also, it is therefore recommended to change the sending method of e-mails to the value "SMTP". If you really want to keep the default "PHP" method to send emails, just ignore this warning, or remove it by setting the MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP constant to 1 in Home - Setup - Other.
WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: %s.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: %s.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: %s.
ClickToShowDescription=Click to show description
DependsOn=This module needs the module(s)
RequiredBy=This module is required by module(s)
@@ -1699,6 +1699,8 @@ MailingDelay=Seconds to wait after sending next message
NotificationSetup=Email Notification module setup
NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
FixedEmailTarget=Recipient
+NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
+NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
##### Sendings #####
SendingsSetup=Shipping module setup
SendingsReceiptModel=Sending receipt model
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 1bd2a9e9356..ad59e3690d7 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -192,6 +192,7 @@ ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a
ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
+ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fees)
ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
@@ -199,6 +200,7 @@ ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice
ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A bad customer is a customer that refuses to pay his debt.
ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=The unpaid amount is intermediary bank fees, deducted directly from the correct amount paid by the Customer.
ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation: - payment not complete because some products were shipped back - amount claimed too important because a discount was forgotten In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
ConfirmClassifyAbandonReasonOther=Other
ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
diff --git a/htdocs/langs/en_US/languages.lang b/htdocs/langs/en_US/languages.lang
index d486fef0f5c..91811ebf667 100644
--- a/htdocs/langs/en_US/languages.lang
+++ b/htdocs/langs/en_US/languages.lang
@@ -1,6 +1,7 @@
# Dolibarr language file - Source file is en_US - languages
Language_am_ET=Ethiopian
Language_ar_AR=Arabic
+Language_ar_DZ=Arabic (Algeria)
Language_ar_EG=Arabic (Egypt)
Language_ar_MA=Arabic (Moroco)
Language_ar_SA=Arabic
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 033f86b63aa..22fe0696363 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -60,6 +60,7 @@ EMailTestSubstitutionReplacedByGenericValues=When using test mode, substitutions
MailingAddFile=Attach this file
NoAttachedFiles=No attached files
BadEMail=Bad value for Email
+EMailNotDefined=Email not defined
ConfirmCloneEMailing=Are you sure you want to clone this emailing?
CloneContent=Clone message
CloneReceivers=Cloner recipients
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index ea280968ef4..9bc68dc3678 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -35,6 +35,9 @@ OnlyOneFieldForXAxisIsPossible=Only 1 field is currently possible as X-Axis. Onl
AtLeastOneMeasureIsRequired=At least 1 field for measure is required
AtLeastOneXAxisIsRequired=At least 1 field for X-Axis is required
LatestBlogPosts=Latest Blog Posts
+notiftouser=To users
+notiftofixedemail=To fixed mail
+notiftouserandtofixedemail=To user and fixed mail
Notify_ORDER_VALIDATE=Sales order validated
Notify_ORDER_SENTBYMAIL=Sales order sent by mail
Notify_ORDER_SUPPLIER_SENTBYMAIL=Purchase order sent by email
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index a5c420726e6..88701e35166 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -446,9 +446,10 @@ if ($id > 0) {
if (!empty($object->fk_project)) {
$proj = new Project($db);
$proj->fetch($object->fk_project);
- $morehtmlref .= '';
- $morehtmlref .= $proj->ref;
- $morehtmlref .= '';
+ $morehtmlref .= ' : '.$proj->getNomUrl(1);
+ if ($proj->title) {
+ $morehtmlref .= ' - '.$proj->title;
+ }
} else {
$morehtmlref .= '';
}
diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
index 2d6bfef3079..ce63cb248f7 100644
--- a/htdocs/loan/document.php
+++ b/htdocs/loan/document.php
@@ -71,6 +71,8 @@ if ($id > 0) {
$upload_dir = $conf->loan->dir_output.'/'.dol_sanitizeFileName($object->ref);
$modulepart = 'loan';
+$permissiontoadd = $user->rights->loan->write; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles.inc.php
+
/*
* Actions
@@ -122,9 +124,10 @@ if ($object->id) {
if (!empty($object->fk_project)) {
$proj = new Project($db);
$proj->fetch($object->fk_project);
- $morehtmlref .= '';
- $morehtmlref .= $proj->ref;
- $morehtmlref .= '';
+ $morehtmlref .= ' : '.$proj->getNomUrl(1);
+ if ($proj->title) {
+ $morehtmlref .= ' - '.$proj->title;
+ }
} else {
$morehtmlref .= '';
}
diff --git a/htdocs/loan/info.php b/htdocs/loan/info.php
index 54fd3cd6f97..3a5e95c7823 100644
--- a/htdocs/loan/info.php
+++ b/htdocs/loan/info.php
@@ -88,9 +88,10 @@ if (!empty($conf->projet->enabled)) {
if (!empty($object->fk_project)) {
$proj = new Project($db);
$proj->fetch($object->fk_project);
- $morehtmlref .= '';
- $morehtmlref .= $proj->ref;
- $morehtmlref .= '';
+ $morehtmlref .= ' : '.$proj->getNomUrl(1);
+ if ($proj->title) {
+ $morehtmlref .= ' - '.$proj->title;
+ }
} else {
$morehtmlref .= '';
}
diff --git a/htdocs/loan/note.php b/htdocs/loan/note.php
index 14ffcadc27d..0b982728b9e 100644
--- a/htdocs/loan/note.php
+++ b/htdocs/loan/note.php
@@ -113,9 +113,10 @@ if ($id > 0) {
if (!empty($object->fk_project)) {
$proj = new Project($db);
$proj->fetch($object->fk_project);
- $morehtmlref .= '';
- $morehtmlref .= $proj->ref;
- $morehtmlref .= '';
+ $morehtmlref .= ' : '.$proj->getNomUrl(1);
+ if ($proj->title) {
+ $morehtmlref .= ' - '.$proj->title;
+ }
} else {
$morehtmlref .= '';
}
diff --git a/htdocs/loan/schedule.php b/htdocs/loan/schedule.php
index d9b6120691b..ca6f5d50534 100644
--- a/htdocs/loan/schedule.php
+++ b/htdocs/loan/schedule.php
@@ -171,9 +171,10 @@ if (!empty($conf->projet->enabled)) {
if (!empty($object->fk_project)) {
$proj = new Project($db);
$proj->fetch($object->fk_project);
- $morehtmlref .= '';
- $morehtmlref .= $proj->ref;
- $morehtmlref .= '';
+ $morehtmlref .= ' : '.$proj->getNomUrl(1);
+ if ($proj->title) {
+ $morehtmlref .= ' - '.$proj->title;
+ }
} else {
$morehtmlref .= '';
}
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 4d233b9a290..c1f3231c737 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1795,7 +1795,6 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
global $hookmanager, $menumanager;
$searchform = '';
- $bookmarks = '';
// Instantiate hooks for external modules
$hookmanager->initHooks(array('toprightmenu'));
@@ -1825,7 +1824,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
// Show menu entries
print '
'."\n";
$menumanager->atarget = $target;
- $menumanager->showmenu('top', array('searchform'=>$searchform, 'bookmarks'=>$bookmarks)); // This contains a \n
+ $menumanager->showmenu('top', array('searchform'=>$searchform)); // This contains a \n
print "
\n";
// Define link to login card
@@ -1890,7 +1889,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
}
// Link to print main content area
- if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $conf->browser->layout != 'phone') {
+ if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
$qs = dol_escape_htmltag($_SERVER["QUERY_STRING"]);
if (isset($_POST) && is_array($_POST)) {
@@ -2712,7 +2711,6 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
global $hookmanager, $menumanager;
$searchform = '';
- $bookmarks = '';
if (!empty($menu_array_before)) {
dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
@@ -2783,7 +2781,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
// Show left menu with other forms
$menumanager->menu_array = $menu_array_before;
$menumanager->menu_array_after = $menu_array_after;
- $menumanager->showmenu('left', array('searchform'=>$searchform, 'bookmarks'=>$bookmarks)); // output menu_array and menu found in database
+ $menumanager->showmenu('left', array('searchform'=>$searchform)); // output menu_array and menu found in database
// Dolibarr version + help + bug report link
print "\n";
@@ -3225,6 +3223,7 @@ if (!function_exists("llxFooter")) {
if (($_SERVER["PHP_SELF"] == DOL_URL_ROOT.'/index.php') || $forceping) {
//print '';
$hash_unique_id = md5('dolibarr'.$conf->file->instance_unique_id);
+
if (empty($conf->global->MAIN_FIRST_PING_OK_DATE)
|| (!empty($conf->file->instance_unique_id) && ($hash_unique_id != $conf->global->MAIN_FIRST_PING_OK_ID) && ($conf->global->MAIN_FIRST_PING_OK_ID != 'disabled'))
|| $forceping) {
@@ -3233,7 +3232,7 @@ if (!function_exists("llxFooter")) {
print "\n\n";
} elseif (empty($_COOKIE['DOLINSTALLNOPING_'.$hash_unique_id]) || $forceping) { // Cookie is set when we uncheck the checkbox in the installation wizard.
// MAIN_LAST_PING_KO_DATE
- // Disable ping if MAIN_LAST_PING_KO_DATE is set and is recent
+ // Disable ping if MAIN_LAST_PING_KO_DATE is set and is recent (this month)
if (!empty($conf->global->MAIN_LAST_PING_KO_DATE) && substr($conf->global->MAIN_LAST_PING_KO_DATE, 0, 6) == dol_print_date(dol_now(), '%Y%m') && !$forceping) {
print "\n\n";
} else {
diff --git a/htdocs/mrp/mo_document.php b/htdocs/mrp/mo_document.php
index 7e297206b3d..c81ed1f995e 100644
--- a/htdocs/mrp/mo_document.php
+++ b/htdocs/mrp/mo_document.php
@@ -83,12 +83,14 @@ if ($id > 0 || !empty($ref)) {
$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
$result = restrictedArea($user, 'mrp', $object->id, 'mrp_mo', '', 'fk_soc', 'rowid', $isdraft);
+$permissiontoadd = $user->rights->mrp->write; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles.inc.php
+
/*
* Actions
*/
-include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
+include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php'; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles.inc.php
/*
diff --git a/htdocs/mrp/mo_note.php b/htdocs/mrp/mo_note.php
index 12b9ade3f2a..6fb173c4295 100644
--- a/htdocs/mrp/mo_note.php
+++ b/htdocs/mrp/mo_note.php
@@ -60,7 +60,7 @@ if ($id > 0 || !empty($ref)) {
$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
$result = restrictedArea($user, 'mrp', $object->id, 'mrp_mo', '', 'fk_soc', 'rowid', $isdraft);
-$permissionnote = $user->rights->mrp->write; // Used by the include of actions_setnotes.inc.php
+$permissionnote = $user->rights->mrp->write; // Used by the include of actions_setnotes.inc.php
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index d7cc53cdc8b..554ad59cbab 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -506,9 +506,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print $formconfirm;
- // Object card
+ // MO file
// ------------------------------------------------------------
- $linkback = ''.$langs->trans("BackToList").'';
+ $linkback = ''.$langs->trans("BackToList").'';
$morehtmlref = '
';
// Define a complementary filter for search of next/prev ref.
-if (!$user->rights->projet->all->lire) {
+if (empty($user->rights->projet->all->lire)) {
$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
$object->next_prev_filter = " te.rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
}
@@ -880,7 +880,7 @@ foreach ($listofreferent as $key => $value) {
}
// Add total if we have to
- if ($qualifiedfortotal) {
+ if ($qualifiedfortotal) {
$total_ht = $total_ht + $total_ht_by_line;
$total_ttc = $total_ttc + $total_ttc_by_line;
}
diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php
index 0aea36fe635..9c20aa562d7 100644
--- a/htdocs/projet/ganttview.php
+++ b/htdocs/projet/ganttview.php
@@ -116,13 +116,13 @@ if (($id > 0 && is_numeric($id)) || !empty($ref)) {
// Title
$morehtmlref .= $object->title;
// Thirdparty
- if ($object->thirdparty->id > 0) {
+ if (!empty($object->thirdparty->id) && $object->thirdparty->id > 0) {
$morehtmlref .= ' '.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
}
$morehtmlref .= '';
// Define a complementary filter for search of next/prev ref.
- if (!$user->rights->projet->all->lire) {
+ if (empty($user->rights->projet->all->lire)) {
$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
$object->next_prev_filter = " rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
}
diff --git a/htdocs/projet/graph_opportunities.inc.php b/htdocs/projet/graph_opportunities.inc.php
index 56649af9a45..ae0542d8b4b 100644
--- a/htdocs/projet/graph_opportunities.inc.php
+++ b/htdocs/projet/graph_opportunities.inc.php
@@ -19,7 +19,7 @@
if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
$sql = "SELECT p.fk_opp_status as opp_status, cls.code, COUNT(p.rowid) as nb, SUM(p.opp_amount) as opp_amount, SUM(p.opp_amount * p.opp_percent) as ponderated_opp_amount";
- $sql .= " FROM ".MAIN_DB_PREFIX."projet as p LEFT JOIN ".MAIN_DB_PREFIX."c_lead_status as cls ON p.fk_opp_status = cls.rowid"; // If lead status has been removed, we must show it in stats as unknown
+ $sql .= " FROM ".MAIN_DB_PREFIX."projet as p LEFT JOIN ".MAIN_DB_PREFIX."c_lead_status as cls ON p.fk_opp_status = cls.rowid"; // If lead status has been removed, we must show it in stats as unknown
$sql .= " WHERE p.entity IN (".getEntity('project').")";
$sql .= " AND p.fk_statut = 1"; // Opend projects only
if ($mine || empty($user->rights->projet->all->lire)) {
@@ -91,7 +91,7 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
$labelStatus = $listofopplabel[$status];
}
if (empty($labelStatus)) {
- $labelStatus = $langs->transnoentitiesnoconv('OldValue', $status); // When id is id of an entry no more in dictionary for example.
+ $labelStatus = $langs->transnoentitiesnoconv('OldValue', $status); // When id is id of an entry no more in dictionary for example.
}
//$labelStatus .= ' ('.$langs->trans("Coeff").': '.price2num($listofoppstatus[$status]).')';
diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php
index b8c6ae046cf..c0afe5d1370 100644
--- a/htdocs/projet/info.php
+++ b/htdocs/projet/info.php
@@ -128,13 +128,13 @@ $morehtmlref = '
\n";
+
+ // Sensitive salary/value information
+ if ((empty($user->socid) && in_array($id, $childids)) // A user can always see salary/value information for its subordinates
+ || (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->readall))
+ || (!empty($conf->hrm->enabled) && !empty($user->rights->hrm->employee->read))) {
+ $langs->load("salaries");
+
+ // Salary
+ print '
'."\n";
- // TODO Move this into tab RH, visible when salarie or RH is visible (HierarchicalResponsible must be on both tab)
+ // TODO This is also available into the tab RH
// Hierarchy
print '
\n";
+
+ // Sensitive salary/value information
+ if ((empty($user->socid) && in_array($id, $childids)) // A user can always see salary/value information for its subordinates
|| (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->readall))
|| (!empty($conf->hrm->enabled) && !empty($user->rights->hrm->employee->read))) {
- // Even a superior can't see this info of its subordinates wihtout $user->rights->salaries->read and $user->rights->hrm->employee->read (setting/viewing is reserverd to HR people).
- // However, he can see the valuation of timesheet of its subordinates even without these permissions.
$langs->load("salaries");
+ // Salary
+ print '
';
-
// Accountancy code
if (!empty($conf->accounting->enabled)) {
print "
";
@@ -2643,14 +2637,6 @@ if ($action == 'create' || $action == 'adduserldap') {
// TODO Move this into tab RH (HierarchicalResponsible must be on both tab)
- // Default warehouse
- if (!empty($conf->stock->enabled) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) {
- print '
\n";
+
+ // Sensitive salary/value information
+ if ((empty($user->socid) && in_array($id, $childids)) // A user can always see salary/value information for its subordinates
|| (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->readall))
|| (!empty($conf->hrm->enabled) && !empty($user->rights->hrm->employee->read))) {
- $langs->load("salaries");
+ $langs->load("salaries");
+
+ // Salary
+ print '