';
print $langs->trans('From').' ';
-// TODO For the moment we keep a fre input text instead of a combo. The select_auxaccount has problem because it does not
+// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because it does not
// use setup of keypress to select thirdparty and this hang browser on large database.
if (! empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
{
- print $formaccounting->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
+ print $formaccounting->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
}
else
{
- print '';
+ print '';
}
print '
';
print '
';
print $langs->trans('to').' ';
-// TODO For the moment we keep a fre input text instead of a combo. The select_auxaccount has problem because it does not
+// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because it does not
// use setup of keypress to select thirdparty and this hang browser on large database.
if (! empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
{
- print $formaccounting->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
+ print $formaccounting->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
}
else
{
- print '';
+ print '';
}
print '
";
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 513a99d843f..037d27ea852 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1562,7 +1562,7 @@ class Adherent extends CommonObject
*
* @param int $withpictoimg 0=No picto, 1=Include picto into link, 2=Only picto, -1=Include photo into link, -2=Only picto photo, -3=Only photo very small)
* @param int $maxlen length max label
- * @param string $option Page for link
+ * @param string $option Page for link ('card', 'category', 'subscription', ...)
* @param string $mode ''=Show firstname and lastname, 'firstname'=Show only firstname, 'login'=Show login, 'ref'=Show ref
* @param string $morecss Add more css on link
* @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
@@ -1592,10 +1592,7 @@ class Adherent extends CommonObject
$label.= ' ' . $langs->trans('Name') . ': ' . $this->getFullName($langs);
$label.='';
- if (empty($option) || $option == 'card' || $option == 'category')
- {
- $url = DOL_URL_ROOT.'/adherents/card.php?rowid='.$this->id;
- }
+ $url = DOL_URL_ROOT.'/adherents/card.php?rowid='.$this->id;
if ($option == 'subscription')
{
$url = DOL_URL_ROOT.'/adherents/subscription.php?rowid='.$this->id;
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 30c85618bfa..5537730e678 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -59,7 +59,7 @@ class AdherentType extends CommonObject
public $note;
/** @var bool Can vote*/
public $vote;
- /** @var bool Email sent during validation */
+ /** @var string Email sent during validation */
public $mail_valid;
/** @var array Array of members */
public $members=array();
@@ -481,7 +481,7 @@ class AdherentType extends CommonObject
// Initialise parametres
$this->id = 0;
- $this->ref = 0;
+ $this->ref = 'MTSPEC';
$this->specimen=1;
$this->label='MEMBERS TYPE SPECIMEN';
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 673ce2f2d24..068513b245c 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1749,7 +1749,7 @@ $db->close();
* @param Object $obj If we show a particular record, obj is filled with record fields
* @param string $tabname Name of SQL table
* @param string $context 'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered
- * @return void
+ * @return string '' or value of entity into table
*/
function fieldList($fieldlist, $obj='', $tabname='', $context='')
{
@@ -1763,7 +1763,7 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
$formcompany = new FormCompany($db);
if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
- $withentity=null;
+ $withentity='';
foreach ($fieldlist as $field => $value)
{
diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index 4d0efb63d62..123b5f50bd8 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -49,66 +49,85 @@ class Documents extends DolibarrApi
$this->db = $db;
}
-
+
/**
- * Return list of documents.
+ * Returns a document. Note that, this API is similar to using the wrapper link "documents.php" to download
+ * a file (used for internal HTML links of documents into application), but with no need to be into a logged session (no need to post the session cookie).
*
* @param string $module_part Name of module or area concerned by file download ('facture', ...)
- * @param string $ref Reference of object (This will define subdir automatically)
- * @param string $subdir NOT YET AVAILABLE : Subdirectory (Only if ref not provided)
+ * @param string $original_file Relative path with filename, relative to modulepart (for example: IN201701-999/IN201701-999.pdf)
+ * @param int $regeneratedoc If requested document is the main document of an object, setting this to 1 ask API to regenerate document before returning it (supported for some module_part only). It is no effect in other cases.
+ * Also, note that setting this to 1 nead write access on object.
* @return array List of documents
*
+ * @throws 500
+ * @throws 501
* @throws 400
* @throws 401
- * @throws 200 OK
+ * @throws 200
*/
- public function index($module_part, $ref='', $subdir='') {
- global $conf;
+ public function index($module_part, $original_file='', $regeneratedoc=0)
+ {
+ global $conf;
- if (empty($module_part)) {
- throw new RestException(400, 'bad value for parameter modulepart');
- }
- if (empty($ref) && empty($subdir)) {
+ if (empty($module_part)) {
+ throw new RestException(400, 'bad value for parameter modulepart');
+ }
+ if (empty($original_file)) {
throw new RestException(400, 'bad value for parameter ref or subdir');
}
- if (empty($ref)) {
- throw new RestException(404, 'FeatureNotYetAvailable');
- }
- if (!DolibarrApiAccess::$user->rights->ecm->read) {
- throw new RestException(401);
+
+ //--- Finds and returns the document
+ $entity=$conf->entity;
+
+ $check_access = dol_check_secure_access_document($module_part, $original_file, $entity, DolibarrApiAccess::$user, '', ($regeneratedoc ? 'write' : 'read'));
+ $accessallowed = $check_access['accessallowed'];
+ $sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
+ $original_file = $check_access['original_file'];
+
+ if (preg_match('/\.\./',$original_file) || preg_match('/[<>|]/',$original_file))
+ {
+ throw new RestException(401);
+ }
+ if (!$accessallowed) {
+ throw new RestException(401);
+ }
+
+ // --- Generates the document
+ if ($regeneratedoc)
+ {
+ $hidedetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 0 : 1;
+ $hidedesc = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 0 : 1;
+ $hideref = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 0 : 1;
+
+ if ($module_part == 'facture' || $module_part == 'invoice')
+ {
+ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+ $this->invoice = new Facture($this->db);
+ $result = $this->invoice->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
+ if( ! $result ) {
+ throw new RestException(404, 'Invoice not found');
+ }
+ $result = $this->invoice->generateDocument($this->invoice->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+ if( $result <= 0 ) {
+ throw new RestException(500, 'Error generating document');
+ }
+ }
}
- $original_file = str_replace("../","/", $ref.'/'.$ref.'.pdf');
- $refname=basename(dirname($original_file)."/");
- $entity=$conf->entity;
+ $filename = basename($original_file);
+ $original_file_osencoded=dol_osencode($original_file); // New file name encoded in OS encoding charset
- $check_access = dol_check_secure_access_document($module_part,$original_file,$entity,DolibarrApiAccess::$user);
- $accessallowed = $check_access['accessallowed'];
- $sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
- $original_file = $check_access['original_file'];
+ if (! file_exists($original_file_osencoded))
+ {
+ throw new RestException(404, 'File not found');
+ }
- if (preg_match('/\.\./',$original_file) || preg_match('/[<>|]/',$original_file))
- {
- throw new RestException(401);
- }
- if (!$accessallowed) {
- throw new RestException(401);
- }
-
-
- $filename = basename($original_file);
- $original_file_osencoded=dol_osencode($original_file); // New file name encoded in OS encoding charset
-
- if (! file_exists($original_file_osencoded))
- {
- throw new RestException(404, 'File not found');
- }
-
- $file_content=file_get_contents($original_file_osencoded);
+ $file_content=file_get_contents($original_file_osencoded);
return array('filename'=>$filename, 'content'=>base64_encode($file_content), 'encoding'=>'MIME base64 (base64_encode php function, http://php.net/manual/en/function.base64-encode.php)' );
}
-
-
+
+
/**
* Return a document.
*
@@ -121,10 +140,10 @@ class Documents extends DolibarrApi
public function get($id) {
return array('note'=>'xxx');
}*/
-
-
+
+
/**
- * Push a file.
+ * Push a file.
* Test sample 1: { "filename": "mynewfile.txt", "modulepart": "facture", "ref": "FA1701-001", "subdir": "", "filecontent": "content text", "fileencoding": "", "overwriteifexists": "0" }.
* Test sample 2: { "filename": "mynewfile.txt", "modulepart": "medias", "ref": "", "subdir": "mysubdir1/mysubdir2", "filecontent": "content text", "fileencoding": "", "overwriteifexists": "0" }.
*
@@ -141,12 +160,12 @@ class Documents extends DolibarrApi
public function post($filename, $modulepart, $ref='', $subdir='', $filecontent='', $fileencoding='', $overwriteifexists=0)
{
global $db, $conf;
-
+
/*var_dump($modulepart);
var_dump($filename);
var_dump($filecontent);
exit;*/
-
+
require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
if (!DolibarrApiAccess::$user->rights->ecm->upload) {
@@ -170,7 +189,7 @@ class Documents extends DolibarrApi
$object=new Facture($db);
$result = $object->fetch('', $ref);
}
-
+
if (! ($object->id > 0))
{
throw new RestException(500, 'The object '.$modulepart." with ref '".$ref."' was not found.");
@@ -178,7 +197,7 @@ class Documents extends DolibarrApi
$tmp = dol_check_secure_access_document($modulepart, $tmpreldir.$object->ref, $entity, DolibarrApiAccess::$user, $ref, 'write');
$upload_dir = $tmp['original_file'];
-
+
if (empty($upload_dir) || $upload_dir == '/')
{
throw new RestException(500, 'This value of modulepart does not support yet usage of ref. Check modulepart parameter or try to use subdir parameter instead of ref.');
@@ -187,7 +206,7 @@ class Documents extends DolibarrApi
else
{
if ($modulepart == 'invoice') $modulepart ='facture';
-
+
$tmp = dol_check_secure_access_document($modulepart, $subdir, $entity, DolibarrApiAccess::$user, '', 'write');
$upload_dir = $tmp['original_file'];
@@ -196,14 +215,14 @@ class Documents extends DolibarrApi
throw new RestException(500, 'This value of modulepart does not support yet usage of ref. Check modulepart parameter or try to use subdir parameter instead of ref.');
}
}
-
-
+
+
$upload_dir = dol_sanitizePathName($upload_dir);
-
+
$destfile = $upload_dir . '/' . $original_file;
$destfiletmp = DOL_DATA_ROOT.'/admin/temp/' . $original_file;
dol_delete_file($destfiletmp);
-
+
if (!dol_is_dir($upload_dir)) {
throw new RestException(401,'Directory not exists : '.$upload_dir);
}
@@ -212,7 +231,7 @@ class Documents extends DolibarrApi
{
throw new RestException(500, "File with name '".$original_file."' already exists.");
}
-
+
$fhandle = @fopen($destfiletmp, 'w');
if ($fhandle)
{
@@ -224,9 +243,9 @@ class Documents extends DolibarrApi
{
throw new RestException(500, "Failed to open file '".$destfiletmp."' for write");
}
-
+
$result = dol_move($destfiletmp, $destfile, 0, $overwriteifexists, 1);
-
+
return $result;
}
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 6027f76ec58..6242691d1f1 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -882,7 +882,7 @@ class Categorie extends CommonObject
/**
* List categories of an element id
*
- * @param int $item Id of element
+ * @param int $id Id of element
* @param string $type Type of category ('member', 'customer', 'supplier', 'product', 'contact')
* @param string $sortfield Sort field
* @param string $sortorder Sort order
diff --git a/htdocs/core/class/comment.class.php b/htdocs/core/class/comment.class.php
index 0ec77405721..870c4f4bccd 100644
--- a/htdocs/core/class/comment.class.php
+++ b/htdocs/core/class/comment.class.php
@@ -1,4 +1,4 @@
-db = $db;
}
-
+
/**
* Create into database
@@ -190,7 +190,7 @@ class Comment extends CommonObject
$sql.= " description=".(isset($this->description)?"'".$this->db->escape($this->description)."'":"null").",";
$sql.= " datec=".($this->datec!=''?"'".$this->db->idate($this->datec)."'":'null').",";
$sql.= " fk_element=".(isset($this->fk_element)?$this->fk_element:"null").",";
- $sql.= " element_type='".$this->element_type."',";
+ $sql.= " element_type='".$this->db->escape($this->element_type)."',";
$sql.= " fk_user_author=".(isset($this->fk_user_author)?$this->fk_user_author:"null").",";
$sql.= " entity=".(!empty($this->entity)?$this->entity:'1').",";
$sql.= " import_key=".(!empty($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null");
@@ -280,12 +280,14 @@ class Comment extends CommonObject
return 1;
}
}
-
-
+
+
/**
* Load comments linked with current task
*
- * @return array Comment array
+ * @param string $element_type Element type
+ * @param int $fk_element Id of element
+ * @return array Comment array
*/
public static function fetchAllFor($element_type, $fk_element)
{
@@ -299,7 +301,7 @@ class Comment extends CommonObject
$sql.= " AND c.element_type = '".$element_type."'";
$sql.= " AND c.entity = ".$conf->entity;
$sql.= " ORDER BY c.tms DESC";
-
+
dol_syslog("Comment::fetchAllFor", LOG_DEBUG);
$resql=$db->query($sql);
if ($resql)
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index b4381349aec..73634f0d5e8 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -930,7 +930,7 @@ class ExtraFields
if (!empty($value)) { // $value in memory is a php numeric, we format it into user number format.
$value=price($value);
}
- $out.=' '.$langs->getCurrencySymbol($conf->currency);
+ $out=' '.$langs->getCurrencySymbol($conf->currency);
}
elseif ($type == 'double')
{
diff --git a/htdocs/core/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php
index 129bbcedf38..247dc4ac6ae 100644
--- a/htdocs/core/login/functions_ldap.php
+++ b/htdocs/core/login/functions_ldap.php
@@ -138,7 +138,7 @@ function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest)
$ldap->searchUser=$ldapuserattr."=".$usertotest.",".$ldapdn; // Default dn (will work if LDAP accept a dn with login value inside)
// But if LDAP need a dn with name like "cn=Jhon Bloggs,ou=People,dc=foo,dc=com", previous part must have been executed to have
// dn detected into ldapUserDN.
- if ($resultFetchLdapUser AND !empty($ldap->ldapUserDN)) $ldap->searchUser = $ldap->ldapUserDN;
+ if ($resultFetchLdapUser && !empty($ldap->ldapUserDN)) $ldap->searchUser = $ldap->ldapUserDN;
$ldap->searchPassword=$passwordtotest;
// Test with this->seachUser and this->searchPassword
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index b11389905a4..11f8b70f26b 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -328,14 +328,14 @@ class DolibarrModules // Can not be abstract, because we need to insta
public $langfiles;
/**
- * @var string[] Array of warnings to show when we activate the module
+ * @var array Array of warnings to show when we activate the module
*
* array('always'='text') or array('FR'='text')
*/
public $warnings_activation;
/**
- * @var string[] Array of warnings to show when we activate an external module
+ * @var array Array of warnings to show when we activate an external module
*
* array('always'='text') or array('FR'='text')
*/
diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php
index 24027375528..f3e0146a719 100644
--- a/htdocs/core/modules/dons/html_cerfafr.modules.php
+++ b/htdocs/core/modules/dons/html_cerfafr.modules.php
@@ -136,27 +136,27 @@ class html_cerfafr extends ModeleDon
else $paymentmode = '';
if ($don->modepaiementid==7){
- $ModePaiement = '
Remise d\'espèces
Chèque
Virement, prélèvement, carte bancaire
';
+ $ModePaiement = '
Remise d\'espèces
Chèque
Virement, prélèvement, carte bancaire
';
}
else if ($don->modepaiementid==4){
- $ModePaiement = '
Remise d\'espèces
Chèque
Virement, prélèvement, carte bancaire
';
+ $ModePaiement = '
Remise d\'espèces
Chèque
Virement, prélèvement, carte bancaire
';
}
- else if ($don->modepaiementid==2 OR $don->modepaiementid==3 OR $don->modepaiementid==6){
- $ModePaiement = '
';
}
/*
if (empty($don->societe))
{
- $CodeDon = '
200 du CGI
238 bis du CGI
885-0 V bis A du CGI
';
+ $CodeDon = '
200 du CGI
238 bis du CGI
885-0 V bis A du CGI
';
}
else
{
- $CodeDon = '
200 du CGI
238 bis du CGI
885-0 V bis A du CGI
';
+ $CodeDon = '
200 du CGI
238 bis du CGI
885-0 V bis A du CGI
';
}
*/
diff --git a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
index af08ae53392..96041bcac2c 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
@@ -1,6 +1,7 @@
- * Copyright (C) 2014 Teddy Andreotti <125155@supinfo.com>
+/* Copyright (C) 2006-2011 Laurent Destailleur
+ * Copyright (C) 2014 Teddy Andreotti <125155@supinfo.com>
+ * Copyright (C) 2017 Regis Houssin
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -98,7 +99,10 @@ class modGeneratePassPerso extends ModeleGenPassword
$this->Spe = str_replace($this->Ambi,"",$this->Spe);
}
- $this->All = str_shuffle($this->Maj. $this->Min. $this->Nb. $this->Spe);
+ $pattern = $this->Min . (! empty($this->NbMaj)?$this->Maj:'') . (! empty($this->NbNum)?$this->Nb:'') . (! empty($this->NbSpe)?$this->Spe:'');
+ $this->All = str_shuffle($pattern);
+
+ //$this->All = str_shuffle($this->Maj. $this->Min. $this->Nb. $this->Spe);
//$this->All = $this->Maj. $this->Min. $this->Nb. $this->Spe;
//$this->All = $this->Spe;
diff --git a/htdocs/document.php b/htdocs/document.php
index 0b2db2323cd..a0b764882f8 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -27,6 +27,7 @@
* \remarks Call of this wrapper is made with URL:
* document.php?modulepart=repfichierconcerne&file=relativepathoffile
* document.php?modulepart=logs&file=dolibarr.log
+ * document.php?modulepart=logs&hashp=sharekey
*/
define('NOTOKENRENEWAL',1); // Disables token renewal
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index 0035b18d3c7..7af07c8675b 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -82,10 +82,9 @@ class EcmFiles //extends CommonObject
/**
* Create object into database
*
- * @param User $user User that creates
- * @param bool $notrigger false=launch triggers after, true=disable triggers
- *
- * @return int <0 if KO, Id of created object if OK
+ * @param User $user User that creates
+ * @param bool $notrigger false=launch triggers after, true=disable triggers
+ * @return int <0 if KO, Id of created object if OK
*/
public function create(User $user, $notrigger = false)
{
@@ -144,8 +143,8 @@ class EcmFiles //extends CommonObject
if (empty($this->date_c)) $this->date_c = dol_now();
// If ref not defined
- if (empty($ref)) $ref = dol_hash($this->filepath.'/'.$this->filename, 3);
-
+ $ref = dol_hash($this->filepath.'/'.$this->filename, 3);
+ if (! empty($this->ref)) $ref=$this->ref;
$maxposition=0;
if (empty($this->position)) // Get max used
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 014c9de3a19..f26efeadc4a 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -1487,14 +1487,14 @@ class Expedition extends CommonObject
* Return clicable link of object (with eventually picto)
*
* @param int $withpicto Add picto into link
- * @param int $option Where point the link
+ * @param string $option Where the link point to
* @param int $max Max length to show
* @param int $short Use short labels
* @param int $notooltip 1=No tooltip
* @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
* @return string String with URL
*/
- function getNomUrl($withpicto=0, $option=0, $max=0, $short=0, $notooltip=0, $save_lastsearch_value=-1)
+ function getNomUrl($withpicto=0, $option='', $max=0, $short=0, $notooltip=0, $save_lastsearch_value=-1)
{
global $langs;
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index bdbb03492f7..b67e5073144 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -663,7 +663,7 @@ class Fichinter extends CommonObject
*/
function getNomUrl($withpicto=0, $option='', $notooltip=0, $save_lastsearch_value=-1)
{
- global $langs;
+ global $conf, $langs;
$result='';
@@ -674,13 +674,13 @@ class Fichinter extends CommonObject
$picto='intervention';
$url = DOL_URL_ROOT.'/fichinter/card.php?id='.$this->id;
- //if ($option !== 'nolink')
- //{
- // Add param to save lastsearch_values or not
+ if ($option !== 'nolink')
+ {
+ // Add param to save lastsearch_values or not
$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
- //}
+ }
$linkclose='';
if (empty($notooltip))
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 70d00bd2f01..382530225fd 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -781,12 +781,13 @@ class Holiday extends CommonObject
$num_rows = $this->db->num_rows($resql); // Note, we can have 2 records if on is morning and the other one is afternoon
if ($num_rows > 0)
{
+ $arrayofrecord=array();
$i=0;
while ($i < $num_rows)
{
$obj = $this->db->fetch_object($resql);
- // Note: $obj->halday is 0:Full days, 2:Sart afternoon end morning, -1:Start afternoon, 1:End morning
+ // Note: $obj->halfday is 0:Full days, 2:Sart afternoon end morning, -1:Start afternoon, 1:End morning
$arrayofrecord[$obj->rowid]=array('date_start'=>$this->db->jdate($obj->date_start), 'date_end'=>$this->db->jdate($obj->date_end), 'halfday'=>$obj->halfday);
$i++;
}
diff --git a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
index fb9e5f8749f..5d87f42faed 100644
--- a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
+++ b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
@@ -253,7 +253,7 @@ CREATE TABLE llx_expensereport_rules (
code_expense_rules_type varchar(50) NOT NULL,
is_for_all tinyint DEFAULT '0',
entity integer DEFAULT 1
-);
+)ENGINE=innodb;
ALTER TABLE llx_expensereport_det ADD COLUMN rule_warning_message text;
ALTER TABLE llx_expensereport_det ADD COLUMN fk_c_exp_tax_cat integer;
@@ -302,8 +302,9 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_CLOSE_SIGNED','Price request closed signed','Executed when a customer proposal is closed signed','proposal_supplier',10);
insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_CLOSE_REFUSED','Price request closed refused','Executed when a customer proposal is closed refused','proposal_supplier',10);
-DROP TABLE `llx_projet_task_comment`;
-CREATE TABLE IF NOT EXISTS llx_comment (
+DROP TABLE llx_projet_task_comment;
+
+CREATE TABLE llx_comment (
rowid integer AUTO_INCREMENT PRIMARY KEY,
datec datetime DEFAULT NULL,
tms timestamp,
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 8ab0ddc018c..eacfe4fc2aa 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -148,7 +148,8 @@ Doctype=Type of document
Docdate=Date
Docref=Reference
Code_tiers=Thirdparty
-Labelcompte=Label account
+LabelAccount=Label account
+LabelOperation=Label operation
Sens=Sens
Codejournal=Journal
NumPiece=Piece number
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index 73ff04221ef..233e4339bca 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -12,7 +12,7 @@ ObjectKey=Object key
ModuleInitialized=Module initialized
FilesForObjectInitialized=Files for new object '%s' initialized
FilesForObjectUpdated=Files for object '%s' updated (.sql files and .class.php file)
-ModuleBuilderDescdescription=Enter here all general information that describe your module
+ModuleBuilderDescdescription=Enter here all general information that describe your module.
ModuleBuilderDescspecifications=You can enter here a long text to describe the specifications of your module that is not already structured into other tabs. So you have within easy reach all the rules to develop. Also this text content will be included into the generated documentation (see last tab). You can use Markdown format, but it is recommanded to use Asciidoc format (Comparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
ModuleBuilderDescobjects=Define here the objects you want to manage with your module. A CRUD DAO class, SQL files, page to list record of objects, to create/edit/view a record and an API will be generated.
ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
@@ -77,7 +77,7 @@ SpecDefDesc=Enter here all documentation you want to provide with your module th
LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
-HooksDefDesc=Define in the module_parts['hooks'] property in the module descriptor the context of hooks you want to manage (list of contexts can be found by a search on 'initHooks(' in core code). Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on 'executeHooks' in core code).
-TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed
+HooksDefDesc=Define in the module_parts['hooks'] property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on 'initHooks(' in core code). Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on 'executeHooks' in core code).
+TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
SeeIDsInUse=See IDs in use in your installation
SeeReservedIDsRangeHere=See range of reserved IDs
\ No newline at end of file
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 1e7826ebf16..767370786c1 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -28,6 +28,7 @@ if (! defined('NOSCANPOSTFORINJECTION')) define('NOSCANPOSTFORINJECTION','1');
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/modulebuilder.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
@@ -764,6 +765,7 @@ if ($action == 'reset' && $user->admin)
*/
$form = new Form($db);
+$formadmin = new FormAdmin($db);
// Set dir where external modules are installed
if (! dol_is_dir($dirins))
@@ -1252,6 +1254,20 @@ elseif (! empty($module))
print $langs->trans("LanguageDefDesc").' ';
print ' ';
+
+ print '';
+
+ print ' ';
+ print ' ';
+
$langfiles=dol_dir_list(dol_buildpath($modulelowercase.'/langs', 0), 'files', 1, '\.lang$');
foreach ($langfiles as $langfile)
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index a7c2d0f1a6b..980faafc028 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2109,8 +2109,8 @@ class User extends CommonObject
if (! empty($_SESSION["disablemodules"])) $label.= ' '.$langs->trans("DisabledModules").': '.join(', ',explode(',',$_SESSION["disablemodules"]));
}
- if ($option == 'leave') $url.= DOL_URL_ROOT.'/holiday/list.php?id='.$this->id;
- else $link.= $url.= DOL_URL_ROOT.'/user/card.php?id='.$this->id;
+ $url = DOL_URL_ROOT.'/user/card.php?id='.$this->id;
+ if ($option == 'leave') $url = DOL_URL_ROOT.'/holiday/list.php?id='.$this->id;
if ($option != 'nolink')
{
diff --git a/htdocs/websites/index.php b/htdocs/websites/index.php
index a6de8c15c65..f2b94ff5705 100644
--- a/htdocs/websites/index.php
+++ b/htdocs/websites/index.php
@@ -1861,7 +1861,6 @@ function dolSaveHtmlHeader($filehtmlheader, $htmlheadercontent)
if (! $result)
{
- $error++;
setEventMessages('Failed to write file '.$filehtmlheader, null, 'errors');
return false;
}
@@ -1887,14 +1886,13 @@ function dolSaveCssFile($filecss, $csscontent)
if (! empty($conf->global->MAIN_UMASK))
@chmod($filecss, octdec($conf->global->MAIN_UMASK));
- if (! $result)
- {
- $error++;
- setEventMessages('Failed to write file '.$filecss, null, 'errors');
- return false;
- }
+ if (! $result)
+ {
+ setEventMessages('Failed to write file '.$filecss, null, 'errors');
+ return false;
+ }
- return true;
+ return true;
}
/**
@@ -1917,7 +1915,6 @@ function dolSaveRobotFile($filerobot, $robotcontent)
if (! $result)
{
- $error++;
setEventMessages('Failed to write file '.$filerobot, null, 'errors');
return false;
}
@@ -1945,7 +1942,6 @@ function dolSaveHtaccessFile($filehtaccess, $htaccess)
if (! $result)
{
- $error++;
setEventMessages('Failed to write file '.$filehtaccess, null, 'errors');
return false;
}
diff --git a/scripts/members/sync_members_types_ldap2dolibarr.php b/scripts/members/sync_members_types_ldap2dolibarr.php
index fb8fb160d36..55d5606cd30 100755
--- a/scripts/members/sync_members_types_ldap2dolibarr.php
+++ b/scripts/members/sync_members_types_ldap2dolibarr.php
@@ -69,7 +69,7 @@ $required_fields = array(
);
// Remove from required_fields all entries not configured in LDAP (empty) and duplicated
-$required_fields=array_unique(array_values(array_filter($required_fields, "dolValidElement")));
+$required_fields=array_unique(array_values(array_filter($required_fields, "dolValidElementType")));
if (! isset($argv[1])) {
@@ -214,7 +214,7 @@ exit($error);
* @param string $element Value to test
* @return boolean True of false
*/
-function dolValidElement($element)
+function dolValidElementType($element)
{
return (trim($element) != '');
}