From ebed09fd16b76ed679f7d08e2ebcfffff77bfbd3 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 28 Apr 2022 15:04:10 +0200 Subject: [PATCH 001/143] Modification des gitignore" --- htdocs/.gitignore | 3 +++ htdocs/custom/.gitignore | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/htdocs/.gitignore b/htdocs/.gitignore index ef87c0455d6..e29dfb9c5f9 100644 --- a/htdocs/.gitignore +++ b/htdocs/.gitignore @@ -26,3 +26,6 @@ /of/ /workstation/ /oblyon* + + +/custom diff --git a/htdocs/custom/.gitignore b/htdocs/custom/.gitignore index 9420e8c61eb..e69de29bb2d 100644 --- a/htdocs/custom/.gitignore +++ b/htdocs/custom/.gitignore @@ -1,4 +0,0 @@ -/* -!.gitignore -!README.md -!index.html From a5148243427208c041489ae9c59a71487ab2c9ce Mon Sep 17 00:00:00 2001 From: Franck Lauby Date: Mon, 20 Jun 2022 14:55:07 +0200 Subject: [PATCH 002/143] =?UTF-8?q?pr=C3=A9pa=20des=20d=C3=A9pots?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/custom/.gitignore | 1 + htdocs/custom/README.md | 27 --------------------------- 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 htdocs/custom/README.md diff --git a/htdocs/custom/.gitignore b/htdocs/custom/.gitignore index e69de29bb2d..cd95745c140 100644 --- a/htdocs/custom/.gitignore +++ b/htdocs/custom/.gitignore @@ -0,0 +1 @@ +moduleFormation/ diff --git a/htdocs/custom/README.md b/htdocs/custom/README.md deleted file mode 100644 index 2fc3067f204..00000000000 --- a/htdocs/custom/README.md +++ /dev/null @@ -1,27 +0,0 @@ -# DOLIBARR ERP & CRM custom directory for external modules - -This directory is dedicated to store external modules. -To use it, just copy here the directory of the module into this directory. - -Note: On linux or MAC systems, it is better to unzip/store the external module directory into -a different place than this directory and just adding a symbolic link here to the htdocs directory -of the module. - -For example on Linux OS: Get the module from the command - -`mkdir ~/git; cd ~/git` - -`git clone https://git.framasoft.org/p/newmodule/newmodule.git` - -Then create the symbolic link - -`ln -fs ~/git/newmodule/htdocs /path_to_dolibarr/htdocs/custom/newmodule` - -WARNING !!! -Check also that the /custom directory is active by adding into dolibarr `conf/conf.php` file the following -two lines, so dolibarr will also scan /custom directory to find external external modules: - -```php -$dolibarr_main_url_root_alt='/custom'; -$dolibarr_main_document_root_alt='/path_to_dolibarr/htdocs/custom/'; -``` From c6bc767834706ca5824307307c26c62a793489b6 Mon Sep 17 00:00:00 2001 From: Thomas Negre Date: Thu, 7 Jul 2022 17:05:47 +0200 Subject: [PATCH 003/143] send formconfirm as a POST --- htdocs/core/class/html.form.class.php | 29 ++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 9568ec25828..f3c88b55af4 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -5148,8 +5148,9 @@ class Form closeOnEscape: false, buttons: { "'.dol_escape_js($langs->transnoentities($labelbuttonyes)).'": function() { - var options = "&token='.urlencode(newToken()).'"; + var options = "token='.urlencode(newToken()).'"; var inputok = '.json_encode($inputok).'; /* List of fields into form */ + var page = "'.dol_escape_js(!empty($page) ? $page : '').'"; var pageyes = "'.dol_escape_js(!empty($pageyes) ? $pageyes : '').'"; if (inputok.length>0) { $.each(inputok, function(i, inputname) { @@ -5166,12 +5167,20 @@ class Form options += "&" + inputname + "=" + encodeURIComponent(inputvalue); }); } - var urljump = pageyes + (pageyes.indexOf("?") < 0 ? "?" : "") + options; - if (pageyes.length > 0) { location.href = urljump; } + if (pageyes.length > 0) { + console.log(page); + console.log(pageyes); + console.log(options); + var post = $.post( + pageyes, + options, + () => {location.assign(page)} + ); + } $(this).dialog("close"); }, "'.dol_escape_js($langs->transnoentities($labelbuttonno)).'": function() { - var options = "&token='.urlencode(newToken()).'"; + var options = "token='.urlencode(newToken()).'"; var inputko = '.json_encode($inputko).'; /* List of fields into form */ var pageno="'.dol_escape_js(!empty($pageno) ? $pageno : '').'"; if (inputko.length>0) { @@ -5183,9 +5192,15 @@ class Form options += "&" + inputname + "=" + encodeURIComponent(inputvalue); }); } - var urljump=pageno + (pageno.indexOf("?") < 0 ? "?" : "") + options; - //alert(urljump); - if (pageno.length > 0) { location.href = urljump; } + if (pageno.length > 0) { + console.log(pageno); + console.log(options); + var post = $.post( + pageno, + options, + () => {location.assign(page)} + ); + } $(this).dialog("close"); } } From 11e97df5581c1fb283006657176ca111516fb019 Mon Sep 17 00:00:00 2001 From: Thomas Negre Date: Thu, 7 Jul 2022 17:38:41 +0200 Subject: [PATCH 004/143] forgot a 'page' parameter for 'no' button --- htdocs/core/class/html.form.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index f3c88b55af4..2b70d91b5c4 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -5182,6 +5182,7 @@ class Form "'.dol_escape_js($langs->transnoentities($labelbuttonno)).'": function() { var options = "token='.urlencode(newToken()).'"; var inputko = '.json_encode($inputko).'; /* List of fields into form */ + var page = "'.dol_escape_js(!empty($page) ? $page : '').'"; var pageno="'.dol_escape_js(!empty($pageno) ? $pageno : '').'"; if (inputko.length>0) { $.each(inputko, function(i, inputname) { From 8f505fbd67edc0c15ee3334a2d6e4782b76e6e8c Mon Sep 17 00:00:00 2001 From: Thomas Negre Date: Fri, 8 Jul 2022 16:30:26 +0200 Subject: [PATCH 005/143] formconfirm: redraw the page with the data returned from POST request. This displays errors, if there are. --- htdocs/core/class/html.form.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 2b70d91b5c4..5ba9e139e09 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -5174,7 +5174,7 @@ class Form var post = $.post( pageyes, options, - () => {location.assign(page)} + (data) => {$("body").html(data)} ); } $(this).dialog("close"); @@ -5199,7 +5199,7 @@ class Form var post = $.post( pageno, options, - () => {location.assign(page)} + (data) => {$("body").html(data)} ); } $(this).dialog("close"); From c71000aef6c72ad32bcdea4e2282c664c8c35e24 Mon Sep 17 00:00:00 2001 From: Thomas Negre Date: Mon, 11 Jul 2022 09:18:03 +0200 Subject: [PATCH 006/143] remove useless console.log() --- htdocs/core/class/html.form.class.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 5ba9e139e09..18273b0e509 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -5168,9 +5168,6 @@ class Form }); } if (pageyes.length > 0) { - console.log(page); - console.log(pageyes); - console.log(options); var post = $.post( pageyes, options, @@ -5194,8 +5191,6 @@ class Form }); } if (pageno.length > 0) { - console.log(pageno); - console.log(options); var post = $.post( pageno, options, From f30c95ad2233c04b9776973cae57869ef360cd58 Mon Sep 17 00:00:00 2001 From: Yoan Mollard Date: Fri, 8 Jul 2022 14:53:46 +0200 Subject: [PATCH 007/143] Create a 3rd party from the self-subscription membership form Only when ADHERENT_DEFAULT_CREATE_THIRDPARTY = 1 --- htdocs/adherents/card.php | 28 ++++---------------------- htdocs/public/members/new.php | 12 ++++++++++- htdocs/societe/class/societe.class.php | 17 ++++++++++++---- 3 files changed, 28 insertions(+), 29 deletions(-) diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index ee195da77be..4ac0d020458 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -564,36 +564,16 @@ if (empty($reshook)) { $id = $object->id; } else { $db->rollback(); + setEventMessages($object->error, $object->errors, 'errors'); - if ($object->error) { - setEventMessages($object->error, $object->errors, 'errors'); - } else { - setEventMessages($object->error, $object->errors, 'errors'); - } } + // Auto-create thirdparty on member creation if (!empty($conf->global->ADHERENT_DEFAULT_CREATE_THIRDPARTY)) { if ($result > 0) { - // User creation + // Create third party out of a member $company = new Societe($db); - - $companyalias = ''; - $fullname = $object->getFullName($langs); - - if ($object->morphy == 'mor') { - $companyname = $object->company; - if (!empty($fullname)) { - $companyalias = $fullname; - } - } else { - $companyname = $fullname; - if (!empty($object->company)) { - $companyalias = $object->company; - } - } - - $result = $company->create_from_member($object, $companyname, $companyalias); - + $result = $company->create_from_member($object); if ($result < 0) { $langs->load("errors"); setEventMessages($langs->trans($company->error), null, 'errors'); diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index d29d80cf5d4..ac06a95a2b6 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -254,7 +254,7 @@ if (empty($reshook) && $action == 'add') { $public = GETPOSTISSET('public') ? 1 : 0; if (!$error) { - // email a peu pres correct et le login n'existe pas + // E-mail looks OK and login does not exist $adh = new Adherent($db); $adh->statut = -1; $adh->public = $public; @@ -375,6 +375,16 @@ if (empty($reshook) && $action == 'add') { } } + // Auto-create thirdparty on member creation + if (!empty($conf->global->ADHERENT_DEFAULT_CREATE_THIRDPARTY)) { + $company = new Societe($db); + $result = $company->create_from_member($adh); + if ($result < 0) { + $error++; + $errmsg .= join('
', $company->errors); + } + } + if (!empty($backtopage)) { $urlback = $backtopage; } elseif (!empty($conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION)) { diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 7c5773363c4..9d7a666d87d 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -3904,12 +3904,21 @@ class Societe extends CommonObject global $conf, $user, $langs; dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG); - - $name = $socname ? $socname : $member->societe; - if (empty($name)) { - $name = $member->getFullName($langs); + $fullname = $member->getFullName($langs); + + if ($member->morphy == 'mor') { + $socname = $member->company? $member->company : $member->societe; + if (!empty($fullname) && empty($socalias)) { + $socalias = $fullname; + } + } else if(empty($socname) && $member->morphy == 'phy') { + $socname = $fullname; + if (!empty($member->company) && empty($socalias)) { + $socalias = $member->company; + } } + $name = $socname; $alias = $socalias ? $socalias : ''; // Positionne parametres From b0c9f5c3123084b3ac3767d2e27647e414b75108 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Mon, 25 Jul 2022 14:14:28 +0000 Subject: [PATCH 008/143] Fixing style errors. --- htdocs/societe/class/societe.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 9d7a666d87d..68942d5f9ba 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -3905,13 +3905,13 @@ class Societe extends CommonObject dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG); $fullname = $member->getFullName($langs); - + if ($member->morphy == 'mor') { $socname = $member->company? $member->company : $member->societe; if (!empty($fullname) && empty($socalias)) { $socalias = $fullname; } - } else if(empty($socname) && $member->morphy == 'phy') { + } elseif (empty($socname) && $member->morphy == 'phy') { $socname = $fullname; if (!empty($member->company) && empty($socalias)) { $socalias = $member->company; From 54b90abd87b50cd8cf1ed7d318f3fccf8376a844 Mon Sep 17 00:00:00 2001 From: atm-lena Date: Tue, 26 Jul 2022 13:50:53 +0200 Subject: [PATCH 009/143] Delete Knowledge : categorie management --- .../class/knowledgerecord.class.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php index 8629ec7bbc6..a1d41c97a9f 100644 --- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php +++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php @@ -467,6 +467,24 @@ class KnowledgeRecord extends CommonObject $this->error .= $this->db->lasterror(); $errorflag = -1; } + + // Delete all child tables + if (!$error) { + $elements = array('categorie_knowledgemanagement'); // product_batch is done before + foreach ($elements as $table) { + if (!$error) { + $sql = "DELETE FROM ".MAIN_DB_PREFIX.$table; + $sql .= " WHERE fk_knowledgemanagement = ".(int) $this->id; + + $result = $this->db->query($sql); + if (!$result) { + $error++; + $this->errors[] = $this->db->lasterror(); + } + } + } + } + return $this->deleteCommon($user, $notrigger); //return $this->deleteCommon($user, $notrigger, 1); } From f79cd2a5336316b28395ce6fdd80bc3094351ab3 Mon Sep 17 00:00:00 2001 From: Quatadah Nasdami Date: Wed, 27 Jul 2022 00:19:29 +0200 Subject: [PATCH 010/143] adding template 01 --- .../websites/website_template-style01.png | Bin 0 -> 46056 bytes .../websites/website_template-style01.zip | Bin 0 -> 16346 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 htdocs/install/doctemplates/websites/website_template-style01.png create mode 100644 htdocs/install/doctemplates/websites/website_template-style01.zip diff --git a/htdocs/install/doctemplates/websites/website_template-style01.png b/htdocs/install/doctemplates/websites/website_template-style01.png new file mode 100644 index 0000000000000000000000000000000000000000..4e409583f92ea376461cfdf3eeed22bd57b88950 GIT binary patch literal 46056 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 literal 0 HcmV?d00001 diff --git a/htdocs/install/doctemplates/websites/website_template-style01.zip b/htdocs/install/doctemplates/websites/website_template-style01.zip new file mode 100644 index 0000000000000000000000000000000000000000..12c001b5d7f44d8d8fb7c5e53f3ee8f1dd37e160 GIT binary patch literal 16346 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 z z@%n%jWOg%x#WyUsqJ?IqYH?22DZ>W?Na43MgPfyAM>fCB6-0WvbFty`%p_vxQp((f z2=V%)qw+&vx`Ag>H^#Jhm;mdPh$o!;2o7g;gws9aPVY1Sc67qSLdYtzhODxszA52R zVFU!^mjP6rp#g^Ym$zxUEMj|E#k3zgRmqn}PUl?mmlo2pNyn#5_P&>rJCp@g)I)9( z*}_*hA*r=wc=GqQgFEIh!9NYvYNo~(N_LfYJdC;#K!9)HAW>qLeSBc>u@Ub_1aoQt zzQA$Vh_)L>Ai(^bkjK^nIX>IqpgQ+Ie7fb~fjzJhDF|8s0CYY!g7bL)?pJV7XbEe9 z?!ahoAjmH_Y6>G>Q=4j@#xCZk)muEzVYquvaw4c_@Tnlm`SBnW6Sr)5&CFnv?JE zZy6`SabXTgCQgcIQ8gm+U6I-vX;|&W6ncCz$BX^NB)+*z-P3gV4e>;?;4QiIThxQi zY_??sK6IgcsZxPAgfQbHSzK$THg2*_jvZu3Q17cc<|uhQF_MX}-d?+P9T(nhv>|7# zb2>IneRe9#%7ou(1S-`Hk+XWe29HdLM}z}cym_oHf)Kbv>xgf4Lu(r$4{Q5Jg}OMs zB^4Q@ns2GzR+l~;iH{rK)dW1qKA9pS!zs%a#f&P7`{o>498E{V>KDTN_&&RI1JBG> z7A{_Fa7uGM^Eu~xxJt2;)hN;@sV$nqQd`<|ZjNkALxid1N{!+2E6t+}vPoW_G09Qs zg{^+d#B~N2k$IzL2#P%@yUff8+RvUE8G3P_us`oprLsL#4TC=YXTHlKVG8W5M3R}{onVjVd-wfW~imUi8=wBs|4lupH6w$AB zEh<)!7a!(xRq4X7h0Ge?%}R3fw(U1e;&)x}530Th;>R!D;mdcaitXc2$uV`}cQm`W zdCeWxUp-vy=dCavTq5d9j5;llB;@$#Z9gMaEp;`;PBaIH)s^nipRUwB^dsX!P4W6cdO<<7rl2^ z{(F(R)q9BcpJ?u%OELal`oE!_rHR}BVfCw(^nZ6@@qcaPm(K8e-5<~ZU=*NVF#p`r zua4Az4aEQb{V%CPLHgf@|L+dff13gUQNADkm*Ic)$Ys@9NQi!Tc#>{|)oE;Px9Pl<*Ij z|HyBDBm6C+{YJR?6XCb0_BX`e(${Z@fcIwW|GJhx-S_Og`VU9& zH^Scu_iu!Bx<3&9k$(S;^mmf@8;OzO|B*8OHvgv!_~qsPHGa8(D$f6Sk^jr+m)HB( z_+>Qr+vwju@ZX-}pXdAK1^+dEnZEsP`v22${mY&G!uf^5`Y!DL_I>}?#(#Oqe~n*u bx_{XHacVH|U&~P5KP+JHH5|W`W1#;JQh+%A literal 0 HcmV?d00001 From cfcfc38bcfde158d6395caf2a4efacb4774d14f1 Mon Sep 17 00:00:00 2001 From: Quatadah Nasdami Date: Wed, 27 Jul 2022 00:21:52 +0200 Subject: [PATCH 011/143] Adding new template --- .../websites/website_template-style01.png | Bin 0 -> 46056 bytes .../websites/website_template-style01.zip | Bin 0 -> 16346 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 htdocs/install/doctemplates/websites/website_template-style01.png create mode 100644 htdocs/install/doctemplates/websites/website_template-style01.zip diff --git a/htdocs/install/doctemplates/websites/website_template-style01.png b/htdocs/install/doctemplates/websites/website_template-style01.png new file mode 100644 index 0000000000000000000000000000000000000000..4e409583f92ea376461cfdf3eeed22bd57b88950 GIT binary patch literal 46056 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 literal 0 HcmV?d00001 diff --git a/htdocs/install/doctemplates/websites/website_template-style01.zip b/htdocs/install/doctemplates/websites/website_template-style01.zip new file mode 100644 index 0000000000000000000000000000000000000000..12c001b5d7f44d8d8fb7c5e53f3ee8f1dd37e160 GIT binary patch literal 16346 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 z z@%n%jWOg%x#WyUsqJ?IqYH?22DZ>W?Na43MgPfyAM>fCB6-0WvbFty`%p_vxQp((f z2=V%)qw+&vx`Ag>H^#Jhm;mdPh$o!;2o7g;gws9aPVY1Sc67qSLdYtzhODxszA52R zVFU!^mjP6rp#g^Ym$zxUEMj|E#k3zgRmqn}PUl?mmlo2pNyn#5_P&>rJCp@g)I)9( z*}_*hA*r=wc=GqQgFEIh!9NYvYNo~(N_LfYJdC;#K!9)HAW>qLeSBc>u@Ub_1aoQt zzQA$Vh_)L>Ai(^bkjK^nIX>IqpgQ+Ie7fb~fjzJhDF|8s0CYY!g7bL)?pJV7XbEe9 z?!ahoAjmH_Y6>G>Q=4j@#xCZk)muEzVYquvaw4c_@Tnlm`SBnW6Sr)5&CFnv?JE zZy6`SabXTgCQgcIQ8gm+U6I-vX;|&W6ncCz$BX^NB)+*z-P3gV4e>;?;4QiIThxQi zY_??sK6IgcsZxPAgfQbHSzK$THg2*_jvZu3Q17cc<|uhQF_MX}-d?+P9T(nhv>|7# zb2>IneRe9#%7ou(1S-`Hk+XWe29HdLM}z}cym_oHf)Kbv>xgf4Lu(r$4{Q5Jg}OMs zB^4Q@ns2GzR+l~;iH{rK)dW1qKA9pS!zs%a#f&P7`{o>498E{V>KDTN_&&RI1JBG> z7A{_Fa7uGM^Eu~xxJt2;)hN;@sV$nqQd`<|ZjNkALxid1N{!+2E6t+}vPoW_G09Qs zg{^+d#B~N2k$IzL2#P%@yUff8+RvUE8G3P_us`oprLsL#4TC=YXTHlKVG8W5M3R}{onVjVd-wfW~imUi8=wBs|4lupH6w$AB zEh<)!7a!(xRq4X7h0Ge?%}R3fw(U1e;&)x}530Th;>R!D;mdcaitXc2$uV`}cQm`W zdCeWxUp-vy=dCavTq5d9j5;llB;@$#Z9gMaEp;`;PBaIH)s^nipRUwB^dsX!P4W6cdO<<7rl2^ z{(F(R)q9BcpJ?u%OELal`oE!_rHR}BVfCw(^nZ6@@qcaPm(K8e-5<~ZU=*NVF#p`r zua4Az4aEQb{V%CPLHgf@|L+dff13gUQNADkm*Ic)$Ys@9NQi!Tc#>{|)oE;Px9Pl<*Ij z|HyBDBm6C+{YJR?6XCb0_BX`e(${Z@fcIwW|GJhx-S_Og`VU9& zH^Scu_iu!Bx<3&9k$(S;^mmf@8;OzO|B*8OHvgv!_~qsPHGa8(D$f6Sk^jr+m)HB( z_+>Qr+vwju@ZX-}pXdAK1^+dEnZEsP`v22${mY&G!uf^5`Y!DL_I>}?#(#Oqe~n*u bx_{XHacVH|U&~P5KP+JHH5|W`W1#;JQh+%A literal 0 HcmV?d00001 From af3d8e08ecd8f3d97233e9fbbf88a446d558ad38 Mon Sep 17 00:00:00 2001 From: Quatadah Nasdami Date: Wed, 27 Jul 2022 00:24:01 +0200 Subject: [PATCH 012/143] --- htdocs/core/lib/functions.lib.php | 8 ++++---- htdocs/projet/card.php | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index e7c0244387f..3df96d4e057 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -10343,7 +10343,6 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st * @param string $actionType default, delete, danger * @param string $url the url for link * @param string $id attribute id of button - * @param bboolean $isDropdown is dropdown button * @param int $userRight user action right * // phpcs:disable * @param array $params = [ // Various params for future : recommended rather than adding more function arguments @@ -10359,17 +10358,18 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st * 'cancel-btn-label' => '', // Overide label of cancel button, if empty default label use "CloseDialog" lang key * 'content' => '', // Overide text of content, if empty default content use "ConfirmBtnCommonContent" lang key * 'modal' => true, // true|false to display dialog as a modal (with dark background) + * 'isDropDrown' => false, // true|false to display dialog as a dropdown (with dark background) * ], * ] * // phpcs:enable * @return string html button */ -function dolGetButtonAction($label, $html = '', $actionType = 'default', $url = '', $id = '', $isDropdown = false, $userRight = 1, $params = array()) +function dolGetButtonAction($label, $html = '', $actionType = 'default', $url = '', $id = '', $userRight = 1, $params = array()) { global $hookmanager, $action, $object, $langs; - //var_dump($isDropdown); - if ($isDropdown) + //var_dump($params); + if ($params['isDropdown']) $class = "dropdown-item"; else { $class = 'butAction'; diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php index 0864a5b53f6..7353323b60d 100644 --- a/htdocs/projet/card.php +++ b/htdocs/projet/card.php @@ -1319,48 +1319,48 @@ if ($action == 'create' && $user->rights->projet->creer) { if (!empty($conf->global->PROJECT_SHOW_CREATE_OBJECT_BUTTON)) { print'
'; - print''.$langs->trans("Create").''; + print''.$langs->trans("Create").''; print '
'; print '
'; if (!empty($conf->propal->enabled) && $user->rights->propal->creer) { $langs->load("propal"); - print dolGetButtonAction('', $langs->trans('AddProp'), 'default', DOL_URL_ROOT.'/comm/propal/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', true); + print dolGetButtonAction('', $langs->trans('AddProp'), 'default', DOL_URL_ROOT.'/comm/propal/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', 1, array('isDropDown' => true)); } if (!empty($conf->commande->enabled) && $user->rights->commande->creer) { $langs->load("orders"); - print dolGetButtonAction('', $langs->trans('CreateOrder'), 'default', DOL_URL_ROOT.'/commande/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', true); + print dolGetButtonAction('', $langs->trans('CreateOrder'), 'default', DOL_URL_ROOT.'/commande/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', 1, array('isDropDown' => true)); } if (isModEnabled('facture') && $user->rights->facture->creer) { $langs->load("bills"); - print dolGetButtonAction('', $langs->trans('CreateBill'), 'default', DOL_URL_ROOT.'/compta/facture/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', true); + print dolGetButtonAction('', $langs->trans('CreateBill'), 'default', DOL_URL_ROOT.'/compta/facture/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', 1, array('isDropDown' => true)); } if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->creer) { $langs->load("supplier_proposal"); - print dolGetButtonAction('', $langs->trans('AddSupplierProposal'), 'default', DOL_URL_ROOT.'/supplier_proposal/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', true); + print dolGetButtonAction('', $langs->trans('AddSupplierProposal'), 'default', DOL_URL_ROOT.'/supplier_proposal/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', 1, array('isDropDown' => true)); } if (!empty($conf->supplier_order->enabled) && ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer)) { $langs->load("suppliers"); - print dolGetButtonAction('', $langs->trans('AddSupplierOrder'), 'default', DOL_URL_ROOT.'/fourn/commande/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', true); + print dolGetButtonAction('', $langs->trans('AddSupplierOrder'), 'default', DOL_URL_ROOT.'/fourn/commande/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', 1, array('isDropDown' => true)); } if (!empty($conf->supplier_invoice->enabled) && ($user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer)) { $langs->load("suppliers"); - print dolGetButtonAction('', $langs->trans('AddSupplierInvoice'), 'default', DOL_URL_ROOT.'/fourn/facture/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', true); + print dolGetButtonAction('', $langs->trans('AddSupplierInvoice'), 'default', DOL_URL_ROOT.'/fourn/facture/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', 1, array('isDropDown' => true)); } if (!empty($conf->ficheinter->enabled) && $user->rights->ficheinter->creer) { $langs->load("interventions"); - print dolGetButtonAction('', $langs->trans('AddIntervention'), 'default', DOL_URL_ROOT.'/fichinter/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', true); + print dolGetButtonAction('', $langs->trans('AddIntervention'), 'default', DOL_URL_ROOT.'/fichinter/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', 1, array('isDropDown' => true)); } if (!empty($conf->contrat->enabled) && $user->rights->contrat->creer) { $langs->load("contracts"); - print dolGetButtonAction('', $langs->trans('AddContract'), 'default', DOL_URL_ROOT.'/contrat/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', true); + print dolGetButtonAction('', $langs->trans('AddContract'), 'default', DOL_URL_ROOT.'/contrat/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', 1, array('isDropDown' => true)); } if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->creer) { $langs->load("trips"); - print dolGetButtonAction('', $langs->trans('AddTrip'), 'default', DOL_URL_ROOT.'/expensereport/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', true); + print dolGetButtonAction('', $langs->trans('AddTrip'), 'default', DOL_URL_ROOT.'/expensereport/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', 1, array('isDropDown' => true)); } if (!empty($conf->don->enabled) && $user->rights->don->creer) { $langs->load("donations"); - print dolGetButtonAction('', $langs->trans('AddDonation'), 'default', DOL_URL_ROOT.'/don/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', true); + print dolGetButtonAction('', $langs->trans('AddDonation'), 'default', DOL_URL_ROOT.'/don/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', 1, array('isDropDown' => true)); } print "
"; print "
"; From 36bae800cef8ee7f546c02948780b45ec21e3b7c Mon Sep 17 00:00:00 2001 From: Quatadah Nasdami Date: Wed, 27 Jul 2022 00:27:24 +0200 Subject: [PATCH 013/143] website template 01 --- .../websites/website_template-style01.png | Bin 0 -> 46056 bytes .../websites/website_template-style01.zip | Bin 0 -> 16346 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 htdocs/install/doctemplates/websites/website_template-style01.png create mode 100644 htdocs/install/doctemplates/websites/website_template-style01.zip diff --git a/htdocs/install/doctemplates/websites/website_template-style01.png b/htdocs/install/doctemplates/websites/website_template-style01.png new file mode 100644 index 0000000000000000000000000000000000000000..4e409583f92ea376461cfdf3eeed22bd57b88950 GIT binary patch literal 46056 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 literal 0 HcmV?d00001 diff --git a/htdocs/install/doctemplates/websites/website_template-style01.zip b/htdocs/install/doctemplates/websites/website_template-style01.zip new file mode 100644 index 0000000000000000000000000000000000000000..12c001b5d7f44d8d8fb7c5e53f3ee8f1dd37e160 GIT binary patch literal 16346 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 z z@%n%jWOg%x#WyUsqJ?IqYH?22DZ>W?Na43MgPfyAM>fCB6-0WvbFty`%p_vxQp((f z2=V%)qw+&vx`Ag>H^#Jhm;mdPh$o!;2o7g;gws9aPVY1Sc67qSLdYtzhODxszA52R zVFU!^mjP6rp#g^Ym$zxUEMj|E#k3zgRmqn}PUl?mmlo2pNyn#5_P&>rJCp@g)I)9( z*}_*hA*r=wc=GqQgFEIh!9NYvYNo~(N_LfYJdC;#K!9)HAW>qLeSBc>u@Ub_1aoQt zzQA$Vh_)L>Ai(^bkjK^nIX>IqpgQ+Ie7fb~fjzJhDF|8s0CYY!g7bL)?pJV7XbEe9 z?!ahoAjmH_Y6>G>Q=4j@#xCZk)muEzVYquvaw4c_@Tnlm`SBnW6Sr)5&CFnv?JE zZy6`SabXTgCQgcIQ8gm+U6I-vX;|&W6ncCz$BX^NB)+*z-P3gV4e>;?;4QiIThxQi zY_??sK6IgcsZxPAgfQbHSzK$THg2*_jvZu3Q17cc<|uhQF_MX}-d?+P9T(nhv>|7# zb2>IneRe9#%7ou(1S-`Hk+XWe29HdLM}z}cym_oHf)Kbv>xgf4Lu(r$4{Q5Jg}OMs zB^4Q@ns2GzR+l~;iH{rK)dW1qKA9pS!zs%a#f&P7`{o>498E{V>KDTN_&&RI1JBG> z7A{_Fa7uGM^Eu~xxJt2;)hN;@sV$nqQd`<|ZjNkALxid1N{!+2E6t+}vPoW_G09Qs zg{^+d#B~N2k$IzL2#P%@yUff8+RvUE8G3P_us`oprLsL#4TC=YXTHlKVG8W5M3R}{onVjVd-wfW~imUi8=wBs|4lupH6w$AB zEh<)!7a!(xRq4X7h0Ge?%}R3fw(U1e;&)x}530Th;>R!D;mdcaitXc2$uV`}cQm`W zdCeWxUp-vy=dCavTq5d9j5;llB;@$#Z9gMaEp;`;PBaIH)s^nipRUwB^dsX!P4W6cdO<<7rl2^ z{(F(R)q9BcpJ?u%OELal`oE!_rHR}BVfCw(^nZ6@@qcaPm(K8e-5<~ZU=*NVF#p`r zua4Az4aEQb{V%CPLHgf@|L+dff13gUQNADkm*Ic)$Ys@9NQi!Tc#>{|)oE;Px9Pl<*Ij z|HyBDBm6C+{YJR?6XCb0_BX`e(${Z@fcIwW|GJhx-S_Og`VU9& zH^Scu_iu!Bx<3&9k$(S;^mmf@8;OzO|B*8OHvgv!_~qsPHGa8(D$f6Sk^jr+m)HB( z_+>Qr+vwju@ZX-}pXdAK1^+dEnZEsP`v22${mY&G!uf^5`Y!DL_I>}?#(#Oqe~n*u bx_{XHacVH|U&~P5KP+JHH5|W`W1#;JQh+%A literal 0 HcmV?d00001 From 2674d2e8a25317d30f1865e30704d156cd3863a4 Mon Sep 17 00:00:00 2001 From: Quatadah Nasdami Date: Wed, 27 Jul 2022 00:33:37 +0200 Subject: [PATCH 014/143] remove unused changes --- htdocs/core/lib/functions.lib.php | 17 ++++++----------- htdocs/projet/card.php | 30 ++++++++++++------------------ 2 files changed, 18 insertions(+), 29 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 3df96d4e057..8a837d5934c 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -10357,8 +10357,7 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st * 'action-btn-label' => '', // Overide label of action button, if empty default label use "Confirm" lang key * 'cancel-btn-label' => '', // Overide label of cancel button, if empty default label use "CloseDialog" lang key * 'content' => '', // Overide text of content, if empty default content use "ConfirmBtnCommonContent" lang key - * 'modal' => true, // true|false to display dialog as a modal (with dark background) - * 'isDropDrown' => false, // true|false to display dialog as a dropdown (with dark background) + * 'modal' => true, // true|false to display dialog as a modal (with dark background) * ], * ] * // phpcs:enable @@ -10368,16 +10367,12 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url = { global $hookmanager, $action, $object, $langs; - //var_dump($params); - if ($params['isDropdown']) - $class = "dropdown-item"; - else { - $class = 'butAction'; - if ($actionType == 'danger' || $actionType == 'delete') { - $class = 'butActionDelete'; - if (!empty($url) && strpos($url, 'token=') === false) $url .= '&token='.newToken(); - } + $class = 'butAction'; + if ($actionType == 'danger' || $actionType == 'delete') { + $class = 'butActionDelete'; + if (!empty($url) && strpos($url, 'token=') === false) $url .= '&token='.newToken(); } + $attr = array( 'class' => $class, 'href' => empty($url) ? '' : $url, diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php index 7353323b60d..62a950237d5 100644 --- a/htdocs/projet/card.php +++ b/htdocs/projet/card.php @@ -1316,56 +1316,50 @@ if ($action == 'create' && $user->rights->projet->creer) { } } - + // Add button to create objects from projects if (!empty($conf->global->PROJECT_SHOW_CREATE_OBJECT_BUTTON)) { - print'
'; - print''.$langs->trans("Create").''; - print '
'; - print '
'; if (!empty($conf->propal->enabled) && $user->rights->propal->creer) { $langs->load("propal"); - print dolGetButtonAction('', $langs->trans('AddProp'), 'default', DOL_URL_ROOT.'/comm/propal/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', 1, array('isDropDown' => true)); + print dolGetButtonAction('', $langs->trans('AddProp'), 'default', DOL_URL_ROOT.'/comm/propal/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, ''); } if (!empty($conf->commande->enabled) && $user->rights->commande->creer) { $langs->load("orders"); - print dolGetButtonAction('', $langs->trans('CreateOrder'), 'default', DOL_URL_ROOT.'/commande/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', 1, array('isDropDown' => true)); + print dolGetButtonAction('', $langs->trans('CreateOrder'), 'default', DOL_URL_ROOT.'/commande/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, ''); } if (isModEnabled('facture') && $user->rights->facture->creer) { $langs->load("bills"); - print dolGetButtonAction('', $langs->trans('CreateBill'), 'default', DOL_URL_ROOT.'/compta/facture/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', 1, array('isDropDown' => true)); + print dolGetButtonAction('', $langs->trans('CreateBill'), 'default', DOL_URL_ROOT.'/compta/facture/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, ''); } if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->creer) { $langs->load("supplier_proposal"); - print dolGetButtonAction('', $langs->trans('AddSupplierProposal'), 'default', DOL_URL_ROOT.'/supplier_proposal/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', 1, array('isDropDown' => true)); + print dolGetButtonAction('', $langs->trans('AddSupplierProposal'), 'default', DOL_URL_ROOT.'/supplier_proposal/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, ''); } if (!empty($conf->supplier_order->enabled) && ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer)) { $langs->load("suppliers"); - print dolGetButtonAction('', $langs->trans('AddSupplierOrder'), 'default', DOL_URL_ROOT.'/fourn/commande/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', 1, array('isDropDown' => true)); + print dolGetButtonAction('', $langs->trans('AddSupplierOrder'), 'default', DOL_URL_ROOT.'/fourn/commande/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, ''); } if (!empty($conf->supplier_invoice->enabled) && ($user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer)) { $langs->load("suppliers"); - print dolGetButtonAction('', $langs->trans('AddSupplierInvoice'), 'default', DOL_URL_ROOT.'/fourn/facture/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', 1, array('isDropDown' => true)); + print dolGetButtonAction('', $langs->trans('AddSupplierInvoice'), 'default', DOL_URL_ROOT.'/fourn/facture/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, ''); } if (!empty($conf->ficheinter->enabled) && $user->rights->ficheinter->creer) { $langs->load("interventions"); - print dolGetButtonAction('', $langs->trans('AddIntervention'), 'default', DOL_URL_ROOT.'/fichinter/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', 1, array('isDropDown' => true)); + print dolGetButtonAction('', $langs->trans('AddIntervention'), 'default', DOL_URL_ROOT.'/fichinter/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, ''); } if (!empty($conf->contrat->enabled) && $user->rights->contrat->creer) { $langs->load("contracts"); - print dolGetButtonAction('', $langs->trans('AddContract'), 'default', DOL_URL_ROOT.'/contrat/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', 1, array('isDropDown' => true)); + print dolGetButtonAction('', $langs->trans('AddContract'), 'default', DOL_URL_ROOT.'/contrat/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, ''); } if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->creer) { $langs->load("trips"); - print dolGetButtonAction('', $langs->trans('AddTrip'), 'default', DOL_URL_ROOT.'/expensereport/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', 1, array('isDropDown' => true)); + print dolGetButtonAction('', $langs->trans('AddTrip'), 'default', DOL_URL_ROOT.'/expensereport/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, ''); } if (!empty($conf->don->enabled) && $user->rights->don->creer) { $langs->load("donations"); - print dolGetButtonAction('', $langs->trans('AddDonation'), 'default', DOL_URL_ROOT.'/don/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', 1, array('isDropDown' => true)); + print dolGetButtonAction('', $langs->trans('AddDonation'), 'default', DOL_URL_ROOT.'/don/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, ''); } - print "
"; - print "
"; - print "
"; } + // Clone if ($user->rights->projet->creer) { if ($userWrite > 0) { From 376b0d85d971079e96eae4ff3c5c779d48a8dc50 Mon Sep 17 00:00:00 2001 From: Quatadah Nasdami Date: Wed, 27 Jul 2022 00:35:05 +0200 Subject: [PATCH 015/143] remove unused changes --- htdocs/core/lib/functions.lib.php | 2 +- htdocs/projet/card.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 8a837d5934c..bf41b5a624a 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -10357,7 +10357,7 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st * 'action-btn-label' => '', // Overide label of action button, if empty default label use "Confirm" lang key * 'cancel-btn-label' => '', // Overide label of cancel button, if empty default label use "CloseDialog" lang key * 'content' => '', // Overide text of content, if empty default content use "ConfirmBtnCommonContent" lang key - * 'modal' => true, // true|false to display dialog as a modal (with dark background) + * 'modal' => true, // true|false to display dialog as a modal (with dark background) * ], * ] * // phpcs:enable diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php index 62a950237d5..0cfe126d69b 100644 --- a/htdocs/projet/card.php +++ b/htdocs/projet/card.php @@ -1316,7 +1316,7 @@ if ($action == 'create' && $user->rights->projet->creer) { } } - // Add button to create objects from projects + // Add button to create objects from project if (!empty($conf->global->PROJECT_SHOW_CREATE_OBJECT_BUTTON)) { if (!empty($conf->propal->enabled) && $user->rights->propal->creer) { $langs->load("propal"); From 209db182b3c0a2c09f9bc69de21c539bf8332732 Mon Sep 17 00:00:00 2001 From: Franck Lauby Date: Wed, 27 Jul 2022 17:03:45 +0200 Subject: [PATCH 016/143] give the possibility to leave the "Request type", "Ticket categorization" and "Severity" selectors empty --- htdocs/core/class/html.formticket.class.php | 6 +++--- htdocs/ticket/card.php | 14 +++++++++++++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php index 6866bfa8356..05ecdf3a005 100644 --- a/htdocs/core/class/html.formticket.class.php +++ b/htdocs/core/class/html.formticket.class.php @@ -210,7 +210,7 @@ class FormTicket // Type print ''; - $this->selectTypesTickets((GETPOST('type_code', 'alpha') ? GETPOST('type_code', 'alpha') : $this->type_code), 'type_code', '', 2, 0, 0, 0, 'minwidth200'); + $this->selectTypesTickets((GETPOST('type_code', 'alpha') ? GETPOST('type_code', 'alpha') : $this->type_code), 'type_code', '', 2, $conf->global->TICKET_FORCE_DISPLAY_EMPTY_OPTION, 0, 0, 'minwidth200'); print ''; // Group @@ -219,12 +219,12 @@ class FormTicket if ($public) { $filter = 'public=1'; } - $this->selectGroupTickets((GETPOST('category_code') ? GETPOST('category_code') : $this->category_code), 'category_code', $filter, 2, 0, 0, 0, 'minwidth200'); + $this->selectGroupTickets((GETPOST('category_code') ? GETPOST('category_code') : $this->category_code), 'category_code', $filter, 2, $conf->global->TICKET_FORCE_DISPLAY_EMPTY_OPTION, 0, 0, 'minwidth200'); print ''; // Severity print ''; - $this->selectSeveritiesTickets((GETPOST('severity_code') ? GETPOST('severity_code') : $this->severity_code), 'severity_code', '', 2, 0); + $this->selectSeveritiesTickets((GETPOST('severity_code') ? GETPOST('severity_code') : $this->severity_code), 'severity_code', '', 2, $conf->global->TICKET_FORCE_DISPLAY_EMPTY_OPTION); print ''; // Subject diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php index 7decdeadd7b..8754c40ac99 100644 --- a/htdocs/ticket/card.php +++ b/htdocs/ticket/card.php @@ -171,7 +171,19 @@ if (empty($reshook)) { if (GETPOST('save', 'alpha') && !empty($user->rights->ticket->write)) { $error = 0; - if (!GETPOST("subject", 'alphanohtml')) { + if (!GETPOST("type_code", 'alpha')) { + $error++; + setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("TicketTypeRequest")), null, 'errors'); + $action = 'create'; + } elseif (!GETPOST("category_code", 'alpha')) { + $error++; + setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("TicketCategory")), null, 'errors'); + $action = 'create'; + } elseif (!GETPOST("severity_code", 'alpha')) { + $error++; + setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("TicketSeverity")), null, 'errors'); + $action = 'create'; + } elseif (!GETPOST("subject", 'alphanohtml')) { $error++; setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Subject")), null, 'errors'); $action = 'create'; From 4c306b958ca99a64c45c0213447df2c53ee679b7 Mon Sep 17 00:00:00 2001 From: atm-steve Date: Wed, 22 Jun 2022 10:50:54 +0200 Subject: [PATCH 017/143] wip: popin with new fileds --- htdocs/index.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/index.php b/htdocs/index.php index 6715577e615..ff070d1939e 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -155,14 +155,14 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) { require_once DOL_DOCUMENT_ROOT.'/core/class/workboardresponse.class.php'; // Number of actions to do (late) - if (isModEnabled('agenda') && empty($conf->global->MAIN_DISABLE_BLOCK_AGENDA) && $user->rights->agenda->myactions->read) { + if (isModEnabled('agenda') && empty($conf->global->MAIN_DISABLE_BLOCK_AGENDA) && $user->hasRight('agenda', 'myactions', 'READ')) { include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; $board = new ActionComm($db); $dashboardlines[$board->element] = $board->load_board($user); } // Number of project opened - if (!empty($conf->project->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_PROJECT) && $user->hasRight('projet', 'lire')) { + if (isModEnabled('project') && empty($conf->global->MAIN_DISABLE_BLOCK_PROJECT) && $user->hasRight('projet', 'lire')) { include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; $board = new Project($db); $dashboardlines[$board->element] = $board->load_board($user); @@ -202,7 +202,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) { } // Number of suppliers orders a deal - if (isModEnabled('supplier_order') && empty($conf->global->MAIN_DISABLE_BLOCK_SUPPLIER) && $user->rights->fournisseur->commande->lire) { + if (isModEnabled('supplier_order') && empty($conf->global->MAIN_DISABLE_BLOCK_SUPPLIER) && $user->hasRight('fournisseur', 'commande', 'lire')) { include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; $board = new CommandeFournisseur($db); $dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened"); @@ -235,7 +235,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) { } // Number of supplier invoices (paid) - if (isModEnabled('supplier_invoice') && empty($conf->global->MAIN_DISABLE_BLOCK_SUPPLIER) && !empty($user->rights->fournisseur->facture->lire)) { + if (isModEnabled('supplier_invoice') && empty($conf->global->MAIN_DISABLE_BLOCK_SUPPLIER) && $user->hasRight('fournisseur', 'facture', 'lire')) { include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; $board = new FactureFournisseur($db); $dashboardlines[$board->element] = $board->load_board($user); From a990480ba6f9c008c19cbdfc14a8b486dfe30afb Mon Sep 17 00:00:00 2001 From: Faustin Date: Mon, 1 Aug 2022 11:31:32 +0200 Subject: [PATCH 018/143] Use of oauth for smtp is available (tested only with google) --- htdocs/admin/mails.php | 93 ++++++++++++++++++++++++++- htdocs/core/class/CMailFile.class.php | 33 ++++++++++ htdocs/core/class/smtps.class.php | 37 +++++++++-- htdocs/langs/en_US/admin.lang | 6 +- htdocs/langs/fr_FR/admin.lang | 5 ++ 5 files changed, 166 insertions(+), 8 deletions(-) diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index 67bf775bdd9..7c72825ad60 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -89,6 +89,12 @@ if ($action == 'update' && !$cancel) { dolibarr_set_const($db, "MAIN_MAIL_SMTP_SERVER", GETPOST("MAIN_MAIL_SMTP_SERVER", 'alphanohtml'), 'chaine', 0, '', $conf->entity); dolibarr_set_const($db, "MAIN_MAIL_SMTPS_ID", GETPOST("MAIN_MAIL_SMTPS_ID", 'alphanohtml'), 'chaine', 0, '', $conf->entity); dolibarr_set_const($db, "MAIN_MAIL_SMTPS_PW", GETPOST("MAIN_MAIL_SMTPS_PW", 'none'), 'chaine', 0, '', $conf->entity); + if (GETPOSTISSET("MAIN_MAIL_SMTPS_USE_OAUTH")) { + dolibarr_set_const($db, "MAIN_MAIL_SMTPS_USE_OAUTH", GETPOST("MAIN_MAIL_SMTPS_USE_OAUTH", 'none'), 'chaine', 0, '', $conf->entity); + $method = GETPOST("MAIN_MAIL_SMTPS_USE_OAUTH", 'aZ09') == 1 ? 'XOAUTH2' : 'LOGIN'; + dolibarr_set_const($db, "MAIL_SMTP_AUTH_TYPE", $method, 'chaine', 0, '', $conf->entity); + } + dolibarr_set_const($db, "MAIN_MAIL_SMTPS_OAUTH_SERVICE", GETPOST("MAIN_MAIL_SMTPS_OAUTH_SERVICE", 'none'), 'chaine', 0, '', $conf->entity); dolibarr_set_const($db, "MAIN_MAIL_EMAIL_TLS", GETPOST("MAIN_MAIL_EMAIL_TLS", 'int'), 'chaine', 0, '', $conf->entity); dolibarr_set_const($db, "MAIN_MAIL_EMAIL_STARTTLS", GETPOST("MAIN_MAIL_EMAIL_STARTTLS", 'int'), 'chaine', 0, '', $conf->entity); dolibarr_set_const($db, "MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED", GETPOST("MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED", 'int'), 'chaine', 0, '', $conf->entity); @@ -171,6 +177,23 @@ if (version_compare(phpversion(), '7.0', '>=')) { $listofmethods['swiftmailer'] = 'Swift Mailer socket library'; } +// List of oauth services +$oauthservices = array(); + +foreach ($conf->global as $key => $val) { + if (!empty($val) && preg_match('/^OAUTH_.*_ID$/', $key)) { + $key = preg_replace('/^OAUTH_/', '', $key); + $key = preg_replace('/_ID$/', '', $key); + if (preg_match('/^.*-/', $key)) { + $name = preg_replace('/^.*-/', '', $key); + } else { + $name = $langs->trans("NoName"); + } + $provider = preg_replace('/-.*$/', '', $key); + + $oauthservices[$key] = $name." (".$provider.")"; + } +} if ($action == 'edit') { if ($conf->use_javascript_ajax) { @@ -195,6 +218,8 @@ if ($action == 'edit') { jQuery("#MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY").prop("disabled", true); jQuery(".smtp_method").hide(); jQuery(".dkim").hide(); + jQuery(".smtp_oauth_service").hide(); + jQuery(".smtp_use_oauth").hide(); '; if ($linuxlike) { print ' @@ -237,6 +262,8 @@ if ($action == 'edit') { jQuery("#smtp_port_mess").hide(); jQuery(".smtp_method").show(); jQuery(".dkim").hide(); + jQuery(".smtp_oauth_service").show(); + jQuery(".smtp_use_oauth").show(); } if (jQuery("#MAIN_MAIL_SENDMODE").val()==\'swiftmailer\') { @@ -264,12 +291,28 @@ if ($action == 'edit') { jQuery("#smtp_port_mess").hide(); jQuery(".smtp_method").show(); jQuery(".dkim").show(); + jQuery(".smtp_oauth_service").hide(); + jQuery(".smtp_use_oauth").hide(); } } + function change_smtp_oauth_service() { + console.log(jQuery("#MAIN_MAIL_SMTPS_USE_OAUTH").val()); + if (jQuery("#MAIN_MAIL_SMTPS_USE_OAUTH").val() == 1) { + jQuery(".smtp_oauth_service").show(); + jQuery(".smtp_pw").hide(); + } else { + jQuery(".smtp_oauth_service").hide(); + jQuery(".smtp_pw").show(); + } + } initfields(); + change_smtp_oauth_service(); jQuery("#MAIN_MAIL_SENDMODE").change(function() { initfields(); }); + jQuery("#MAIN_MAIL_SMTPS_USE_OAUTH").change(function() { + change_smtp_oauth_service(); + }); jQuery("#MAIN_MAIL_EMAIL_TLS").change(function() { if (jQuery("#MAIN_MAIL_EMAIL_TLS").val() == 1) jQuery("#MAIN_MAIL_EMAIL_STARTTLS").val(0); @@ -369,6 +412,20 @@ if ($action == 'edit') { } print ''; + // OAUTH + if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))) { + print ''.$form->textwithpicto($langs->trans("MAIN_MAIL_SMTPS_USE_OAUTH"), $langs->trans("OauthNotAvailableForAll")).''; + if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) { + print $form->selectyesno('MAIN_MAIL_SMTPS_USE_OAUTH', (!empty($conf->global->MAIN_MAIL_SMTPS_USE_OAUTH) ? $conf->global->MAIN_MAIL_SMTPS_USE_OAUTH : 0), 1); + } else { + $value = yn($conf->global->MAIN_MAIL_SMTPS_USE_OAUTH); + $htmltext = $langs->trans("ContactSuperAdminForChange"); + print $form->textwithpicto($text, $htmltext, 1, 'superadmin'); + print ''; + } + print ''; + } + // Port print ''; if (!$conf->use_javascript_ajax && $linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail') { @@ -416,7 +473,7 @@ if ($action == 'edit') { // PW if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))) { $mainsmtppw = (!empty($conf->global->MAIN_MAIL_SMTPS_PW) ? $conf->global->MAIN_MAIL_SMTPS_PW : ''); - print ''; + print ''; print $form->textwithpicto($langs->trans("MAIN_MAIL_SMTPS_PW"), $langs->trans("WithGMailYouCanCreateADedicatedPassword")); print ''; // SuperAdministrator access only @@ -430,6 +487,24 @@ if ($action == 'edit') { print ''; } + // OAUTH service provider + if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps')))) { + print ''.$form->textwithpicto($langs->trans("MAIN_MAIL_SMTPS_OAUTH_SERVICE"), $langs->trans("DontForgetCreateTokenOauthMod")).''; + + // SuperAdministrator access only + if ((empty($conf->global->MAIN_MODULE_MULTICOMPANY)) || ($user->admin && !$user->entity)) { + print $form->selectarray('MAIN_MAIL_SMTPS_OAUTH_SERVICE', $oauthservices, $conf->global->MAIN_MAIL_SMTPS_OAUTH_SERVICE); + } else { + $text = $oauthservices[$conf->global->MAIN_MAIL_SMTPS_OAUTH_SERVICE]; + if (empty($text)) { + $text = $langs->trans("Undefined"); + } + $htmltext = $langs->trans("ContactSuperAdminForChange"); + print $form->textwithpicto($text, $htmltext, 1, 'superadmin'); + print ''; + } + print ''; + } // TLS print ''.$langs->trans("MAIN_MAIL_EMAIL_TLS").''; if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))) { @@ -601,6 +676,11 @@ if ($action == 'edit') { print ''.$langs->trans("MAIN_MAIL_SMTP_SERVER", ini_get('SMTP') ?ini_get('SMTP') : $langs->transnoentities("Undefined")).''.(!empty($conf->global->MAIN_MAIL_SMTP_SERVER) ? $conf->global->MAIN_MAIL_SMTP_SERVER : '').''; } + // Use OAUTH + if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps'))) { + print ''.$langs->trans("MAIN_MAIL_SMTPS_USE_OAUTH").''.yn($conf->global->MAIN_MAIL_SMTPS_USE_OAUTH).''; + } + // Port if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail')) { print ''.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").''.$langs->trans("SeeLocalSendMailSetup").''; @@ -614,10 +694,19 @@ if ($action == 'edit') { } // SMTPS PW - if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer'))) { + if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')) && (!(isset($conf->global->MAIL_SMTP_AUTH_TYPE) && $conf->global->MAIL_SMTP_AUTH_TYPE === "XOAUTH2"))) { print ''.$langs->trans("MAIN_MAIL_SMTPS_PW").''.preg_replace('/./', '*', $conf->global->MAIN_MAIL_SMTPS_PW).''; } + // SMTPS oauth service + if (isset($conf->global->MAIL_SMTP_AUTH_TYPE) && $conf->global->MAIL_SMTP_AUTH_TYPE === "XOAUTH2") { + $text = $oauthservices[$conf->global->MAIN_MAIL_SMTPS_OAUTH_SERVICE]; + if (empty($text)) { + $text = $langs->trans("Undefined").img_warning(); + } + print ''.$langs->trans("MAIN_MAIL_SMTPS_OAUTH_SERVICE").''.$text.''; + } + // TLS print ''.$langs->trans("MAIN_MAIL_EMAIL_TLS").''; if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer'))) { diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index 94fb05d5346..24c27b47795 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -30,6 +30,7 @@ * \brief File of class to send emails (with attachments or not) */ +use OAuth\Common\Storage\DoliStorage; /** * Class to send emails (with attachments or not) * Usage: $mailfile = new CMailFile($subject,$sendto,$replyto,$message,$filepath,$mimetype,$filename,$cc,$ccc,$deliveryreceipt,$msgishtml,$errors_to,$css,$trackid,$moreinheader,$sendcontext,$replyto); @@ -657,6 +658,8 @@ class CMailFile } $keyforsmtpserver = 'MAIN_MAIL_SMTP_SERVER'; + $keyforsmtpuseoauth = "MAIN_MAIL_SMTPS_USE_OAUTH"; + $keyforsmtpoauthservice = "MAIN_MAIL_SMTPS_OAUTH_SERVICE"; $keyforsmtpport = 'MAIN_MAIL_SMTP_PORT'; $keyforsmtpid = 'MAIN_MAIL_SMTPS_ID'; $keyforsmtppw = 'MAIN_MAIL_SMTPS_PW'; @@ -832,6 +835,36 @@ class CMailFile $this->smtps->setPW($loginpass); } + if (!empty($conf->global->$keyforsmtpuseoauth)) { + require_once DOL_DOCUMENT_ROOT.'/core/lib/oauth.lib.php'; // define $supportedoauth2array + $keyforsupportedoauth2array = $conf->global->$keyforsmtpoauthservice; + if (preg_match('/^.*-/', $keyforsupportedoauth2array)) { + $keyforprovider = preg_replace('/^.*-/', '', $keyforsupportedoauth2array); + } else { + $keyforprovider = ''; + } + $keyforsupportedoauth2array = preg_replace('/-.*$/', '', $keyforsupportedoauth2array); + $keyforsupportedoauth2array = 'OAUTH_'.$keyforsupportedoauth2array.'_NAME'; + + $OAUTH_SERVICENAME = (empty($supportedoauth2array[$keyforsupportedoauth2array]['name']) ? 'Unknown' : $supportedoauth2array[$keyforsupportedoauth2array]['name'].($keyforprovider ? '-'.$keyforprovider : '')); + + require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php'; + + $storage = new DoliStorage($db, $conf); + try { + $tokenobj = $storage->retrieveAccessToken($OAUTH_SERVICENAME); + if (is_object($tokenobj)) { + $this->smtps->setToken($tokenobj->getAccessToken()); + } else { + $this->error = "Token not found"; + } + } catch (Exception $e) { + // Return an error if token not found + $this->error = $e->getMessage(); + dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR); + } + } + $res = true; $from = $this->smtps->getFrom('org'); if ($res && !$from) { diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php index 1f5a48a517d..05248e89143 100644 --- a/htdocs/core/class/smtps.class.php +++ b/htdocs/core/class/smtps.class.php @@ -68,6 +68,11 @@ class SMTPs */ private $_smtpsPW = null; + /** + * Token in case we use OAUTH2 + */ + private $_smtpsToken = null; + /** * Who sent the Message * This can be defined via a INI file or via a setter method @@ -583,9 +588,10 @@ class SMTPs break; case 'XOAUTH2': // "user=$email\1auth=Bearer $token\1\1" - $token = 'xxx'; - $xxxx = "user=".$this->_smtpsID."\1auth=Bearer ".$token."\1\1"; - $_retVal = $this->socket_send_str('AUTH XOAUTH2 '.base64_encode($xxxx), '235'); + $user = $this->_smtpsID; + $token = $this->_smtpsToken; + $initRes = "user=".$user."\001auth=Bearer ".$token."\001\001"; + $_retVal = $this->socket_send_str('AUTH XOAUTH2 '.base64_encode($initRes), '235'); if (!$_retVal) { $this->_setErr(130, 'Error when asking for AUTH XOAUTH2'); } @@ -631,7 +637,7 @@ class SMTPs // Connect to Server if ($this->socket = $this->_server_connect()) { // If a User ID *and* a password is given, assume Authentication is desired - if (!empty($this->_smtpsID) && !empty($this->_smtpsPW)) { + if (!empty($this->_smtpsID) && (!empty($this->_smtpsPW) || !empty($this->_smtpsToken))) { // Send the RFC2554 specified EHLO. $_retVal = $this->_server_authenticate(); } else { @@ -923,6 +929,27 @@ class SMTPs return $this->_smtpsPW; } + /** + * User token for OAUTH2 + * + * @param string $_strToken User token + * @return void + */ + public function setToken($_strToken) + { + $this->_smtpsToken = $_strToken; + } + + /** + * Retrieves the User token for OAUTH2 + * + * @return string User token for OAUTH2 + */ + public function getToken() + { + return $this->_smtpsToken; + } + /** * Character set used for current message * Character set is defaulted to 'iso-8859-1'; @@ -1866,7 +1893,7 @@ class SMTPs } if (!(substr($server_response, 0, 3) == $response)) { - $this->_setErr(120, "Ran into problems sending Mail.\r\nResponse: $server_response"); + $this->_setErr(120, "Ran into problems sending Mail.\r\nResponse:".$server_response); $_retVal = false; } diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index c1f01ae85d9..e5b8fe597bc 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -2286,4 +2286,8 @@ DoesNotWorkWithAllThemes=Will not work with all themes NoName=No name ShowAdvancedOptions= Show advanced options HideAdvancedoptions= Hide advanced options -CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is: +CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is: +MAIN_MAIL_SMTPS_USE_OAUTH=Use OAUTH2 authentication +OauthNotAvailableForAll=OAUTH2 authentication is not available for all hosts +MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 authentication service +DontForgetCreateTokenOauthMod=A token with the right permissions must have been created upstream with the OAUTH module \ No newline at end of file diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index f374349d72f..6302377b449 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -2286,3 +2286,8 @@ NoName=Sans nom ShowAdvancedOptions= Show advanced options HideAdvancedoptions= Hide advanced options CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is: +DoesNotWorkWithAllThemes=Ne fonctionne pas avec tous les thèmes +MAIN_MAIL_SMTPS_USE_OAUTH=Utilisation de l'authentification OAUTH2 +OauthNotAvailableForAll=L'authentification OAUTH2 n'est pas disponible pour tous les hôtes +MAIN_MAIL_SMTPS_OAUTH_SERVICE=Service d'authentification OAUTH2 +DontForgetCreateTokenOauthMod=Un jeton avec les bonnes permissions doit avoir été créé en amont avec le module OAUTH From 809c6acf4411cd5c3ffd7770931e7549445abb38 Mon Sep 17 00:00:00 2001 From: Faustin Date: Mon, 1 Aug 2022 12:03:33 +0200 Subject: [PATCH 019/143] fix GETPOST on none --- htdocs/admin/mails.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index 7c72825ad60..52f82b27630 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -88,13 +88,17 @@ if ($action == 'update' && !$cancel) { dolibarr_set_const($db, "MAIN_MAIL_SMTP_PORT", GETPOST("MAIN_MAIL_SMTP_PORT", 'int'), 'chaine', 0, '', $conf->entity); dolibarr_set_const($db, "MAIN_MAIL_SMTP_SERVER", GETPOST("MAIN_MAIL_SMTP_SERVER", 'alphanohtml'), 'chaine', 0, '', $conf->entity); dolibarr_set_const($db, "MAIN_MAIL_SMTPS_ID", GETPOST("MAIN_MAIL_SMTPS_ID", 'alphanohtml'), 'chaine', 0, '', $conf->entity); - dolibarr_set_const($db, "MAIN_MAIL_SMTPS_PW", GETPOST("MAIN_MAIL_SMTPS_PW", 'none'), 'chaine', 0, '', $conf->entity); + if (GETPOSTISSET("MAIN_MAIL_SMTPS_PW")) { + dolibarr_set_const($db, "MAIN_MAIL_SMTPS_PW", GETPOST("MAIN_MAIL_SMTPS_PW", 'none'), 'chaine', 0, '', $conf->entity); + } if (GETPOSTISSET("MAIN_MAIL_SMTPS_USE_OAUTH")) { dolibarr_set_const($db, "MAIN_MAIL_SMTPS_USE_OAUTH", GETPOST("MAIN_MAIL_SMTPS_USE_OAUTH", 'none'), 'chaine', 0, '', $conf->entity); $method = GETPOST("MAIN_MAIL_SMTPS_USE_OAUTH", 'aZ09') == 1 ? 'XOAUTH2' : 'LOGIN'; dolibarr_set_const($db, "MAIL_SMTP_AUTH_TYPE", $method, 'chaine', 0, '', $conf->entity); } - dolibarr_set_const($db, "MAIN_MAIL_SMTPS_OAUTH_SERVICE", GETPOST("MAIN_MAIL_SMTPS_OAUTH_SERVICE", 'none'), 'chaine', 0, '', $conf->entity); + if (GETPOSTISSET("MAIN_MAIL_SMTPS_OAUTH_SERVICE")) { + dolibarr_set_const($db, "MAIN_MAIL_SMTPS_OAUTH_SERVICE", GETPOST("MAIN_MAIL_SMTPS_OAUTH_SERVICE", 'none'), 'chaine', 0, '', $conf->entity); + } dolibarr_set_const($db, "MAIN_MAIL_EMAIL_TLS", GETPOST("MAIN_MAIL_EMAIL_TLS", 'int'), 'chaine', 0, '', $conf->entity); dolibarr_set_const($db, "MAIN_MAIL_EMAIL_STARTTLS", GETPOST("MAIN_MAIL_EMAIL_STARTTLS", 'int'), 'chaine', 0, '', $conf->entity); dolibarr_set_const($db, "MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED", GETPOST("MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED", 'int'), 'chaine', 0, '', $conf->entity); From d21fbd5a0f43e6fbaef70df8c48001497ab18b1c Mon Sep 17 00:00:00 2001 From: Faustin Date: Mon, 1 Aug 2022 13:11:57 +0200 Subject: [PATCH 020/143] fix GETPOST on none --- htdocs/admin/mails.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index 52f82b27630..31198471710 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -92,12 +92,12 @@ if ($action == 'update' && !$cancel) { dolibarr_set_const($db, "MAIN_MAIL_SMTPS_PW", GETPOST("MAIN_MAIL_SMTPS_PW", 'none'), 'chaine', 0, '', $conf->entity); } if (GETPOSTISSET("MAIN_MAIL_SMTPS_USE_OAUTH")) { - dolibarr_set_const($db, "MAIN_MAIL_SMTPS_USE_OAUTH", GETPOST("MAIN_MAIL_SMTPS_USE_OAUTH", 'none'), 'chaine', 0, '', $conf->entity); + dolibarr_set_const($db, "MAIN_MAIL_SMTPS_USE_OAUTH", GETPOST("MAIN_MAIL_SMTPS_USE_OAUTH", 'int'), 'chaine', 0, '', $conf->entity); $method = GETPOST("MAIN_MAIL_SMTPS_USE_OAUTH", 'aZ09') == 1 ? 'XOAUTH2' : 'LOGIN'; dolibarr_set_const($db, "MAIL_SMTP_AUTH_TYPE", $method, 'chaine', 0, '', $conf->entity); } if (GETPOSTISSET("MAIN_MAIL_SMTPS_OAUTH_SERVICE")) { - dolibarr_set_const($db, "MAIN_MAIL_SMTPS_OAUTH_SERVICE", GETPOST("MAIN_MAIL_SMTPS_OAUTH_SERVICE", 'none'), 'chaine', 0, '', $conf->entity); + dolibarr_set_const($db, "MAIN_MAIL_SMTPS_OAUTH_SERVICE", GETPOST("MAIN_MAIL_SMTPS_OAUTH_SERVICE", 'chaine'), 'chaine', 0, '', $conf->entity); } dolibarr_set_const($db, "MAIN_MAIL_EMAIL_TLS", GETPOST("MAIN_MAIL_EMAIL_TLS", 'int'), 'chaine', 0, '', $conf->entity); dolibarr_set_const($db, "MAIN_MAIL_EMAIL_STARTTLS", GETPOST("MAIN_MAIL_EMAIL_STARTTLS", 'int'), 'chaine', 0, '', $conf->entity); From cec9725ced00a63289748d3062a4ad89428ac407 Mon Sep 17 00:00:00 2001 From: jpb Date: Mon, 1 Aug 2022 16:28:44 +0200 Subject: [PATCH 021/143] FIX : VAT rate recalculation set a checkbox on clone formquestion --- htdocs/compta/facture/card.php | 11 ++++++++--- htdocs/compta/facture/class/facture.class.php | 10 +++++++++- htdocs/langs/en_US/bills.lang | 3 ++- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index eb43da88a4b..268463f1e7d 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -207,8 +207,12 @@ if (empty($reshook)) { $objectutil = dol_clone($object, 1); // To avoid to denaturate loaded object when setting some properties for clone. We use native clone to keep this->db valid. $objectutil->date = dol_mktime(12, 0, 0, GETPOST('newdatemonth', 'int'), GETPOST('newdateday', 'int'), GETPOST('newdateyear', 'int')); + $objectutil->socid = $socid; - $result = $objectutil->createFromClone($user, $id); + + $targetThirdPartyVat = GETPOSTISSET('targetThirdPartyVat'); + $result = $objectutil->createFromClone($user, $id, $targetThirdPartyVat); + if ($result > 0) { header("Location: ".$_SERVER['PHP_SELF'].'?facid='.$result); exit(); @@ -4174,9 +4178,10 @@ if ($action == 'create') { // Create an array for form $formquestion = array( array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company($object->socid, 'socid', '(s.client=1 OR s.client=2 OR s.client=3)', 1)), - array('type' => 'date', 'name' => 'newdate', 'label' => $langs->trans("Date"), 'value' => dol_now()) + array('type' => 'date', 'name' => 'newdate', 'label' => $langs->trans("Date"), 'value' => dol_now()), + array('type' => 'checkbox', 'name' => 'targetThirdPartyVat', 'label' => $langs->trans("targetThirdPartyVat"), 'value' => 0 ), ); - // Ask confirmatio to clone + // Ask confirmation to clone $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?facid='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneInvoice', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 250); } diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index ec8e4a93b80..fb6a59ef3da 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -1192,7 +1192,7 @@ class Facture extends CommonInvoice * @param int $fromid Id of object to clone * @return int New id of clone */ - public function createFromClone(User $user, $fromid = 0) + public function createFromClone(User $user, $fromid = 0, $targetThirdPartyVat = false) { global $conf, $hookmanager; @@ -1277,6 +1277,14 @@ class Facture extends CommonInvoice $object->lines[$i]->ref_ext = ''; // Do not clone ref_ext } + // we have a different thirdparty selected and we checked $targetThirdPartyVat + if ($objFrom->socid != $object->socid && $targetThirdPartyVat) { + global $mysoc; + + foreach ($object->lines as $line) { + $line->tva_tx = get_default_tva($mysoc, $objsoc, $line->fk_product); + } + } // Create clone $object->context['createfromclone'] = 'createfromclone'; diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index b9b4b111b43..4d32f48f862 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -609,4 +609,5 @@ NoPaymentAvailable=No payment available for %s PaymentRegisteredAndInvoiceSetToPaid=Payment registered and invoice %s set to paid SendEmailsRemindersOnInvoiceDueDate=Send reminder by email for unpaid invoices MakePaymentAndClassifyPayed=Record payment -BulkPaymentNotPossibleForInvoice=Bulk payment is not possible for invoice %s (bad type or status) \ No newline at end of file +BulkPaymentNotPossibleForInvoice=Bulk payment is not possible for invoice %s (bad type or status) +targetThirdPartyVat=Modify the VAT rate to use the default rate depending on the new thirdparty From d872b9c2c789def2f1e7d76a3cc652e4c272486e Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Tue, 2 Aug 2022 21:05:33 +0200 Subject: [PATCH 022/143] Fix correct fix of paymentok.php this line was deleted by error --- htdocs/public/payment/paymentok.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php index e04f00d7459..57e23350a2c 100644 --- a/htdocs/public/payment/paymentok.php +++ b/htdocs/public/payment/paymentok.php @@ -368,6 +368,7 @@ if ($ispaymentok) { } if (empty($user->rights->adherent)) { $user->rights->adherent = new stdClass(); + $user->rights->adherent->cotisation = new stdClass(); } $user->rights->societe->creer = 1; $user->rights->facture->creer = 1; From 3185821806efb2b576a0ba8626c5647242187c90 Mon Sep 17 00:00:00 2001 From: Anthony Berton <34568357+bb2a@users.noreply.github.com> Date: Wed, 3 Aug 2022 09:06:52 +0200 Subject: [PATCH 023/143] Update index.php --- htdocs/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/index.php b/htdocs/index.php index ff070d1939e..903f77c0ed8 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -155,7 +155,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) { require_once DOL_DOCUMENT_ROOT.'/core/class/workboardresponse.class.php'; // Number of actions to do (late) - if (isModEnabled('agenda') && empty($conf->global->MAIN_DISABLE_BLOCK_AGENDA) && $user->hasRight('agenda', 'myactions', 'READ')) { + if (isModEnabled('agenda') && empty($conf->global->MAIN_DISABLE_BLOCK_AGENDA) && $user->hasRight('agenda', 'myactions', 'read')) { include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; $board = new ActionComm($db); $dashboardlines[$board->element] = $board->load_board($user); From e511291228fc47b8b978633eae2ba3d0b317f77a Mon Sep 17 00:00:00 2001 From: Anthony Berton Date: Wed, 3 Aug 2022 17:04:34 +0200 Subject: [PATCH 024/143] init function --- htdocs/core/lib/ftp.lib.php | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/htdocs/core/lib/ftp.lib.php b/htdocs/core/lib/ftp.lib.php index 42f5806fba5..52ff8263d07 100644 --- a/htdocs/core/lib/ftp.lib.php +++ b/htdocs/core/lib/ftp.lib.php @@ -246,3 +246,33 @@ function dol_ftp_rmdir($connect_id, $file, $newsection) return @ftp_rmdir($connect_id, $newremotefileiso); } } + + +/** + * Remove FTP directory + * + * @param resource $connect_id Connection handler + * @param string $newdir Dir create + * @param string $newsection $newsection + * @return result + */ +function dol_ftp_mkdir($connect_id, $newdir, $newsection) +{ + + global $conf; + + if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) { + $newsection = ssh2_sftp_realpath($connect_id, ".").'/./'; // workaround for bug https://bugs.php.net/bug.php?id=64169 + } + + // Remote file + $filename = $file; + $remotefile = $newsection.(preg_match('@[\\\/]$@', $newsection) ? '' : '/').$file; + $newremotefileiso = utf8_decode($remotefile); + + if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) { + return ssh2_sftp_mkdir($connect_id, $newremotefileiso); + } else { + return @ftp_mkdir($connect_id, $newremotefileiso); + } +} From c545756b6eb49ae53d6356169305453ab7624c01 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 3 Aug 2022 17:06:19 +0200 Subject: [PATCH 025/143] Revert "FIX : VAT rate recalculation" --- htdocs/compta/facture/card.php | 11 +++-------- htdocs/compta/facture/class/facture.class.php | 10 +--------- htdocs/langs/en_US/bills.lang | 3 +-- 3 files changed, 5 insertions(+), 19 deletions(-) diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index 268463f1e7d..eb43da88a4b 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -207,12 +207,8 @@ if (empty($reshook)) { $objectutil = dol_clone($object, 1); // To avoid to denaturate loaded object when setting some properties for clone. We use native clone to keep this->db valid. $objectutil->date = dol_mktime(12, 0, 0, GETPOST('newdatemonth', 'int'), GETPOST('newdateday', 'int'), GETPOST('newdateyear', 'int')); - $objectutil->socid = $socid; - - $targetThirdPartyVat = GETPOSTISSET('targetThirdPartyVat'); - $result = $objectutil->createFromClone($user, $id, $targetThirdPartyVat); - + $result = $objectutil->createFromClone($user, $id); if ($result > 0) { header("Location: ".$_SERVER['PHP_SELF'].'?facid='.$result); exit(); @@ -4178,10 +4174,9 @@ if ($action == 'create') { // Create an array for form $formquestion = array( array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company($object->socid, 'socid', '(s.client=1 OR s.client=2 OR s.client=3)', 1)), - array('type' => 'date', 'name' => 'newdate', 'label' => $langs->trans("Date"), 'value' => dol_now()), - array('type' => 'checkbox', 'name' => 'targetThirdPartyVat', 'label' => $langs->trans("targetThirdPartyVat"), 'value' => 0 ), + array('type' => 'date', 'name' => 'newdate', 'label' => $langs->trans("Date"), 'value' => dol_now()) ); - // Ask confirmation to clone + // Ask confirmatio to clone $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?facid='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneInvoice', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 250); } diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index fb6a59ef3da..ec8e4a93b80 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -1192,7 +1192,7 @@ class Facture extends CommonInvoice * @param int $fromid Id of object to clone * @return int New id of clone */ - public function createFromClone(User $user, $fromid = 0, $targetThirdPartyVat = false) + public function createFromClone(User $user, $fromid = 0) { global $conf, $hookmanager; @@ -1277,14 +1277,6 @@ class Facture extends CommonInvoice $object->lines[$i]->ref_ext = ''; // Do not clone ref_ext } - // we have a different thirdparty selected and we checked $targetThirdPartyVat - if ($objFrom->socid != $object->socid && $targetThirdPartyVat) { - global $mysoc; - - foreach ($object->lines as $line) { - $line->tva_tx = get_default_tva($mysoc, $objsoc, $line->fk_product); - } - } // Create clone $object->context['createfromclone'] = 'createfromclone'; diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 4d32f48f862..b9b4b111b43 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -609,5 +609,4 @@ NoPaymentAvailable=No payment available for %s PaymentRegisteredAndInvoiceSetToPaid=Payment registered and invoice %s set to paid SendEmailsRemindersOnInvoiceDueDate=Send reminder by email for unpaid invoices MakePaymentAndClassifyPayed=Record payment -BulkPaymentNotPossibleForInvoice=Bulk payment is not possible for invoice %s (bad type or status) -targetThirdPartyVat=Modify the VAT rate to use the default rate depending on the new thirdparty +BulkPaymentNotPossibleForInvoice=Bulk payment is not possible for invoice %s (bad type or status) \ No newline at end of file From 93b040250eaf112f716383ba47844ba6cf47781f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 3 Aug 2022 18:25:32 +0200 Subject: [PATCH 026/143] Update knowledgerecord.class.php --- htdocs/knowledgemanagement/class/knowledgerecord.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php index a1d41c97a9f..c78a88e07c7 100644 --- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php +++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php @@ -470,7 +470,7 @@ class KnowledgeRecord extends CommonObject // Delete all child tables if (!$error) { - $elements = array('categorie_knowledgemanagement'); // product_batch is done before + $elements = array('categorie_knowledgemanagement'); foreach ($elements as $table) { if (!$error) { $sql = "DELETE FROM ".MAIN_DB_PREFIX.$table; From 7544c26b9580afb9a30eb6bbbdc7fb1ac58dd402 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 3 Aug 2022 19:10:38 +0200 Subject: [PATCH 027/143] Fix link to delete website --- htdocs/website/index.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/htdocs/website/index.php b/htdocs/website/index.php index 4f8c79d91b1..933f1f73687 100644 --- a/htdocs/website/index.php +++ b/htdocs/website/index.php @@ -2741,7 +2741,12 @@ if (!GETPOST('hide_websitemenu')) { print ''; - print ''; + // Delete website + if ($website->status == $website::STATUS_VALIDATED) { + print ''; + } else { + print ''; + } // Regenerate all pages print 'ref).'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("RegenerateWebsiteContent")).'">'; From 868d07ae9674e6062ac01841e4cb613f559a4142 Mon Sep 17 00:00:00 2001 From: Faustin Date: Wed, 3 Aug 2022 20:01:13 +0200 Subject: [PATCH 028/143] New prop : select auth type with radio box --- htdocs/admin/mails.php | 81 +++++++++++++++------------ htdocs/core/class/CMailFile.class.php | 4 +- htdocs/core/class/smtps.class.php | 6 +- htdocs/langs/en_US/admin.lang | 8 ++- htdocs/langs/fr_FR/admin.lang | 6 +- 5 files changed, 58 insertions(+), 47 deletions(-) diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index 31198471710..6b09c211414 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -91,10 +91,8 @@ if ($action == 'update' && !$cancel) { if (GETPOSTISSET("MAIN_MAIL_SMTPS_PW")) { dolibarr_set_const($db, "MAIN_MAIL_SMTPS_PW", GETPOST("MAIN_MAIL_SMTPS_PW", 'none'), 'chaine', 0, '', $conf->entity); } - if (GETPOSTISSET("MAIN_MAIL_SMTPS_USE_OAUTH")) { - dolibarr_set_const($db, "MAIN_MAIL_SMTPS_USE_OAUTH", GETPOST("MAIN_MAIL_SMTPS_USE_OAUTH", 'int'), 'chaine', 0, '', $conf->entity); - $method = GETPOST("MAIN_MAIL_SMTPS_USE_OAUTH", 'aZ09') == 1 ? 'XOAUTH2' : 'LOGIN'; - dolibarr_set_const($db, "MAIL_SMTP_AUTH_TYPE", $method, 'chaine', 0, '', $conf->entity); + if (GETPOSTISSET("MAIN_MAIL_SMTPS_AUTH_TYPE")) { + dolibarr_set_const($db, "MAIN_MAIL_SMTPS_AUTH_TYPE", GETPOST("MAIN_MAIL_SMTPS_AUTH_TYPE", 'chaine'), 'chaine', 0, '', $conf->entity); } if (GETPOSTISSET("MAIN_MAIL_SMTPS_OAUTH_SERVICE")) { dolibarr_set_const($db, "MAIN_MAIL_SMTPS_OAUTH_SERVICE", GETPOST("MAIN_MAIL_SMTPS_OAUTH_SERVICE", 'chaine'), 'chaine', 0, '', $conf->entity); @@ -222,8 +220,7 @@ if ($action == 'edit') { jQuery("#MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY").prop("disabled", true); jQuery(".smtp_method").hide(); jQuery(".dkim").hide(); - jQuery(".smtp_oauth_service").hide(); - jQuery(".smtp_use_oauth").hide(); + jQuery(".smtp_auth_method").hide(); '; if ($linuxlike) { print ' @@ -266,8 +263,7 @@ if ($action == 'edit') { jQuery("#smtp_port_mess").hide(); jQuery(".smtp_method").show(); jQuery(".dkim").hide(); - jQuery(".smtp_oauth_service").show(); - jQuery(".smtp_use_oauth").show(); + jQuery(".smtp_auth_method").show(); } if (jQuery("#MAIN_MAIL_SENDMODE").val()==\'swiftmailer\') { @@ -295,27 +291,30 @@ if ($action == 'edit') { jQuery("#smtp_port_mess").hide(); jQuery(".smtp_method").show(); jQuery(".dkim").show(); - jQuery(".smtp_oauth_service").hide(); - jQuery(".smtp_use_oauth").hide(); + jQuery(".smtp_auth_method").hide(); } } - function change_smtp_oauth_service() { - console.log(jQuery("#MAIN_MAIL_SMTPS_USE_OAUTH").val()); - if (jQuery("#MAIN_MAIL_SMTPS_USE_OAUTH").val() == 1) { + function change_smtp_auth_method() { + console.log(jQuery("#radio_pw").prop("checked")); + if (jQuery("#MAIN_MAIL_SENDMODE").val()==\'smtps\' && jQuery("#radio_oauth").prop("checked")) { jQuery(".smtp_oauth_service").show(); jQuery(".smtp_pw").hide(); + } else if(jQuery("#MAIN_MAIL_SENDMODE").val()==\'mail\'){ + jQuery(".smtp_oauth_service").hide(); + jQuery(".smtp_pw").hide(); } else { jQuery(".smtp_oauth_service").hide(); jQuery(".smtp_pw").show(); } } initfields(); - change_smtp_oauth_service(); + change_smtp_auth_method(); jQuery("#MAIN_MAIL_SENDMODE").change(function() { initfields(); + change_smtp_auth_method(); }); - jQuery("#MAIN_MAIL_SMTPS_USE_OAUTH").change(function() { - change_smtp_oauth_service(); + jQuery("#radio_pw, #radio_oauth").change(function() { + change_smtp_auth_method(); }); jQuery("#MAIN_MAIL_EMAIL_TLS").change(function() { if (jQuery("#MAIN_MAIL_EMAIL_TLS").val() == 1) @@ -416,20 +415,6 @@ if ($action == 'edit') { } print ''; - // OAUTH - if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))) { - print ''.$form->textwithpicto($langs->trans("MAIN_MAIL_SMTPS_USE_OAUTH"), $langs->trans("OauthNotAvailableForAll")).''; - if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) { - print $form->selectyesno('MAIN_MAIL_SMTPS_USE_OAUTH', (!empty($conf->global->MAIN_MAIL_SMTPS_USE_OAUTH) ? $conf->global->MAIN_MAIL_SMTPS_USE_OAUTH : 0), 1); - } else { - $value = yn($conf->global->MAIN_MAIL_SMTPS_USE_OAUTH); - $htmltext = $langs->trans("ContactSuperAdminForChange"); - print $form->textwithpicto($text, $htmltext, 1, 'superadmin'); - print ''; - } - print ''; - } - // Port print ''; if (!$conf->use_javascript_ajax && $linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail') { @@ -474,6 +459,25 @@ if ($action == 'edit') { print ''; } + + // OAUTH + if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))) { + print ''.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").''; + if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) { + print 'global->MAIN_MAIL_SMTPS_AUTH_TYPE == 'LOGIN' ? ' checked' : '').'> '; + print ''; + print '            '; + print 'global->MAIN_MAIL_SMTPS_AUTH_TYPE == 'XOAUTH2' ? ' checked' : '').'> '; + print ''; + } else { + $value = $conf->global->MAIN_MAIL_SMTPS_AUTH_TYPE; + $htmltext = $langs->trans("ContactSuperAdminForChange"); + print $form->textwithpicto($langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE"), $htmltext, 1, 'superadmin'); + print ''; + } + print ''; + } + // PW if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))) { $mainsmtppw = (!empty($conf->global->MAIN_MAIL_SMTPS_PW) ? $conf->global->MAIN_MAIL_SMTPS_PW : ''); @@ -493,7 +497,7 @@ if ($action == 'edit') { // OAUTH service provider if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps')))) { - print ''.$form->textwithpicto($langs->trans("MAIN_MAIL_SMTPS_OAUTH_SERVICE"), $langs->trans("DontForgetCreateTokenOauthMod")).''; + print ''.$langs->trans("MAIN_MAIL_SMTPS_OAUTH_SERVICE").''; // SuperAdministrator access only if ((empty($conf->global->MAIN_MODULE_MULTICOMPANY)) || ($user->admin && !$user->entity)) { @@ -680,10 +684,6 @@ if ($action == 'edit') { print ''.$langs->trans("MAIN_MAIL_SMTP_SERVER", ini_get('SMTP') ?ini_get('SMTP') : $langs->transnoentities("Undefined")).''.(!empty($conf->global->MAIN_MAIL_SMTP_SERVER) ? $conf->global->MAIN_MAIL_SMTP_SERVER : '').''; } - // Use OAUTH - if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps'))) { - print ''.$langs->trans("MAIN_MAIL_SMTPS_USE_OAUTH").''.yn($conf->global->MAIN_MAIL_SMTPS_USE_OAUTH).''; - } // Port if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail')) { @@ -697,13 +697,20 @@ if ($action == 'edit') { print ''.$langs->trans("MAIN_MAIL_SMTPS_ID").''.$conf->global->MAIN_MAIL_SMTPS_ID.''; } + // AUTH method + if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps'))) { + $authtype = $conf->global->MAIN_MAIL_SMTPS_AUTH_TYPE; + $text = ($authtype === "LOGIN") ? $langs->trans("UsePassword") : ($authtype === "XOAUTH2" ? $langs->trans("UseOauth") : '') ; + print ''.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").''.$text.''; + } + // SMTPS PW - if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')) && (!(isset($conf->global->MAIL_SMTP_AUTH_TYPE) && $conf->global->MAIL_SMTP_AUTH_TYPE === "XOAUTH2"))) { + if (isset($conf->global->MAIN_MAIL_SENDMODE) && (in_array($conf->global->MAIN_MAIL_SENDMODE, array('swiftmailer')) || (in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps')) && (isset($conf->global->MAIN_MAIL_SMTPS_AUTH_TYPE) && $conf->global->MAIN_MAIL_SMTPS_AUTH_TYPE === "LOGIN")))) { print ''.$langs->trans("MAIN_MAIL_SMTPS_PW").''.preg_replace('/./', '*', $conf->global->MAIN_MAIL_SMTPS_PW).''; } // SMTPS oauth service - if (isset($conf->global->MAIL_SMTP_AUTH_TYPE) && $conf->global->MAIL_SMTP_AUTH_TYPE === "XOAUTH2") { + if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps')) && isset($conf->global->MAIN_MAIL_SMTPS_AUTH_TYPE) && $conf->global->MAIN_MAIL_SMTPS_AUTH_TYPE === "XOAUTH2") { $text = $oauthservices[$conf->global->MAIN_MAIL_SMTPS_OAUTH_SERVICE]; if (empty($text)) { $text = $langs->trans("Undefined").img_warning(); diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index 24c27b47795..de2a44070fc 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -658,7 +658,7 @@ class CMailFile } $keyforsmtpserver = 'MAIN_MAIL_SMTP_SERVER'; - $keyforsmtpuseoauth = "MAIN_MAIL_SMTPS_USE_OAUTH"; + $keyforsmtpauthtype = "MAIN_MAIL_SMTPS_AUTH_TYPE"; $keyforsmtpoauthservice = "MAIN_MAIL_SMTPS_OAUTH_SERVICE"; $keyforsmtpport = 'MAIN_MAIL_SMTP_PORT'; $keyforsmtpid = 'MAIN_MAIL_SMTPS_ID'; @@ -835,7 +835,7 @@ class CMailFile $this->smtps->setPW($loginpass); } - if (!empty($conf->global->$keyforsmtpuseoauth)) { + if (!empty($conf->global->$keyforsmtpauthtype) && $conf->global->$keyforsmtpauthtype === "XOAUTH2") { require_once DOL_DOCUMENT_ROOT.'/core/lib/oauth.lib.php'; // define $supportedoauth2array $keyforsupportedoauth2array = $conf->global->$keyforsmtpoauthservice; if (preg_match('/^.*-/', $keyforsupportedoauth2array)) { diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php index 05248e89143..06ada5c4911 100644 --- a/htdocs/core/class/smtps.class.php +++ b/htdocs/core/class/smtps.class.php @@ -570,13 +570,13 @@ class SMTPs } // Default authentication method is LOGIN - if (empty($conf->global->MAIL_SMTP_AUTH_TYPE)) { - $conf->global->MAIL_SMTP_AUTH_TYPE = 'LOGIN'; + if (empty($conf->global->MAIN_MAIL_SMTPS_AUTH_TYPE)) { + $conf->global->MAIN_MAIL_SMTPS_AUTH_TYPE = 'LOGIN'; } // Send Authentication to Server // Check for errors along the way - switch ($conf->global->MAIL_SMTP_AUTH_TYPE) { + switch ($conf->global->MAIN_MAIL_SMTPS_AUTH_TYPE) { case 'NONE': // Do not send the 'AUTH type' message. For test purpose, if you don't need authentication, it is better to not enter login/pass into setup. $_retVal = true; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index e5b8fe597bc..d629bbc0fbf 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -2287,7 +2287,9 @@ NoName=No name ShowAdvancedOptions= Show advanced options HideAdvancedoptions= Hide advanced options CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is: -MAIN_MAIL_SMTPS_USE_OAUTH=Use OAUTH2 authentication -OauthNotAvailableForAll=OAUTH2 authentication is not available for all hosts +OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 authentication is not available for all hosts, and a token with the right permissions must have been created upstream with the OAUTH module MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 authentication service -DontForgetCreateTokenOauthMod=A token with the right permissions must have been created upstream with the OAUTH module \ No newline at end of file +DontForgetCreateTokenOauthMod=A token with the right permissions must have been created upstream with the OAUTH module +MAIN_MAIL_SMTPS_AUTH_TYPE=Authentification method +UsePassword=Use a password +UseOauth=Use a OAUTH token \ No newline at end of file diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 6302377b449..42d973e8e06 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -2287,7 +2287,9 @@ ShowAdvancedOptions= Show advanced options HideAdvancedoptions= Hide advanced options CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is: DoesNotWorkWithAllThemes=Ne fonctionne pas avec tous les thèmes -MAIN_MAIL_SMTPS_USE_OAUTH=Utilisation de l'authentification OAUTH2 -OauthNotAvailableForAll=L'authentification OAUTH2 n'est pas disponible pour tous les hôtes +OauthNotAvailableForAllAndHadToBeCreatedBefore=L'authentification OAUTH2 n'est pas disponible pour tous les hôtes, de plus, un jeton avec les bonnes permissions doit avoir été créé en amont avec le module OAUTH MAIN_MAIL_SMTPS_OAUTH_SERVICE=Service d'authentification OAUTH2 DontForgetCreateTokenOauthMod=Un jeton avec les bonnes permissions doit avoir été créé en amont avec le module OAUTH +MAIN_MAIL_SMTPS_AUTH_TYPE=Méthode d'authentication +UsePassword=Utiliser un mot de pass +UseOauth=Utiliser un jeton d'authentification OAUTH \ No newline at end of file From f06de750ebca84dc7e2e8b92754665373b997273 Mon Sep 17 00:00:00 2001 From: Faustin Date: Wed, 3 Aug 2022 21:14:38 +0200 Subject: [PATCH 029/143] oauth provider now showed in small caps --- htdocs/admin/mails.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index 6b09c211414..9145ad9a1a7 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -192,6 +192,7 @@ foreach ($conf->global as $key => $val) { $name = $langs->trans("NoName"); } $provider = preg_replace('/-.*$/', '', $key); + $provider = ucfirst(strtolower($provider)); $oauthservices[$key] = $name." (".$provider.")"; } From b6ff439964b76eac460fa1a3bae33ab53cfcd8dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 4 Aug 2022 09:14:34 +0200 Subject: [PATCH 030/143] catch all errors --- htdocs/core/actions_sendmails.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php index f0ef66eb78b..7494f5a3668 100644 --- a/htdocs/core/actions_sendmails.inc.php +++ b/htdocs/core/actions_sendmails.inc.php @@ -361,7 +361,7 @@ if (($action == 'send' || $action == 'relance') && !GETPOST('addfile') && !GETPO } $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1, '', '', $trackid, '', $sendcontext); - if ($mailfile->error) { + if (!empty($mailfile->error) || !empty($mailfile->errors)) { setEventMessages($mailfile->error, $mailfile->errors, 'errors'); $action = 'presend'; } else { From 32ac59622c6c6bd0e7a8a650dd237e283d7d7832 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 4 Aug 2022 09:24:57 +0200 Subject: [PATCH 031/143] Update CMailFile.class.php --- htdocs/core/class/CMailFile.class.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index 7acd7ac3db0..08f883a388f 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -470,12 +470,12 @@ class CMailFile $emailMatchs = preg_match_all($regexp, $from, $adressEmailFrom); $adressEmailFrom = reset($adressEmailFrom); if ($emailMatchs !== false && filter_var($conf->global->MAIN_MAIL_SMTPS_ID, FILTER_VALIDATE_EMAIL) && $conf->global->MAIN_MAIL_SMTPS_ID !== $adressEmailFrom) { - $result = $this->message->setFrom($conf->global->MAIN_MAIL_SMTPS_ID); + $this->message->setFrom($conf->global->MAIN_MAIL_SMTPS_ID); } else { - $result = $this->message->setFrom($this->getArrayAddress($this->addr_from)); + $this->message->setFrom($this->getArrayAddress($this->addr_from)); } } else { - $result = $this->message->setFrom($this->getArrayAddress($this->addr_from)); + $this->message->setFrom($this->getArrayAddress($this->addr_from)); } } catch (Exception $e) { $this->errors[] = $e->getMessage(); @@ -485,7 +485,7 @@ class CMailFile // Set the To addresses with an associative array if (!empty($this->addr_to)) { try { - $result = $this->message->setTo($this->getArrayAddress($this->addr_to)); + $this->message->setTo($this->getArrayAddress($this->addr_to)); } catch (Exception $e) { $this->errors[] = $e->getMessage(); } @@ -493,14 +493,14 @@ class CMailFile if (!empty($this->reply_to)) { try { - $result = $this->message->SetReplyTo($this->getArrayAddress($this->reply_to)); + $this->message->SetReplyTo($this->getArrayAddress($this->reply_to)); } catch (Exception $e) { $this->errors[] = $e->getMessage(); } } try { - $result = $this->message->setCharSet($conf->file->character_set_client); + $this->message->setCharSet($conf->file->character_set_client); } catch (Exception $e) { $this->errors[] = $e->getMessage(); } @@ -562,7 +562,11 @@ class CMailFile } //if (! empty($this->errors_to)) $this->message->setErrorsTo($this->getArrayAddress($this->errors_to)); if (isset($this->deliveryreceipt) && $this->deliveryreceipt == 1) { - $this->message->setReadReceiptTo($this->getArrayAddress($this->addr_from)); + try { + $this->message->setReadReceiptTo($this->getArrayAddress($this->addr_from)); + } catch (Exception $e) { + $this->errors[] = $e->getMessage(); + } } } else { // Send mail method not correctly defined From e742ba45e8ef988dce57d9e061a9c337fa0951a2 Mon Sep 17 00:00:00 2001 From: Franck Lauby Date: Thu, 4 Aug 2022 09:45:00 +0200 Subject: [PATCH 032/143] Eldy's suggestion: replace hidden option with hardcoded '1' --- htdocs/core/class/html.formticket.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php index 05ecdf3a005..d523fa83953 100644 --- a/htdocs/core/class/html.formticket.class.php +++ b/htdocs/core/class/html.formticket.class.php @@ -210,7 +210,7 @@ class FormTicket // Type print ''; - $this->selectTypesTickets((GETPOST('type_code', 'alpha') ? GETPOST('type_code', 'alpha') : $this->type_code), 'type_code', '', 2, $conf->global->TICKET_FORCE_DISPLAY_EMPTY_OPTION, 0, 0, 'minwidth200'); + $this->selectTypesTickets((GETPOST('type_code', 'alpha') ? GETPOST('type_code', 'alpha') : $this->type_code), 'type_code', '', 2, 1, 0, 0, 'minwidth200'); print ''; // Group @@ -219,12 +219,12 @@ class FormTicket if ($public) { $filter = 'public=1'; } - $this->selectGroupTickets((GETPOST('category_code') ? GETPOST('category_code') : $this->category_code), 'category_code', $filter, 2, $conf->global->TICKET_FORCE_DISPLAY_EMPTY_OPTION, 0, 0, 'minwidth200'); + $this->selectGroupTickets((GETPOST('category_code') ? GETPOST('category_code') : $this->category_code), 'category_code', $filter, 2, 1, 0, 0, 'minwidth200'); print ''; // Severity print ''; - $this->selectSeveritiesTickets((GETPOST('severity_code') ? GETPOST('severity_code') : $this->severity_code), 'severity_code', '', 2, $conf->global->TICKET_FORCE_DISPLAY_EMPTY_OPTION); + $this->selectSeveritiesTickets((GETPOST('severity_code') ? GETPOST('severity_code') : $this->severity_code), 'severity_code', '', 2, 1); print ''; // Subject From 0101b4d151d5e296891fc5708ab1b2ebde035b98 Mon Sep 17 00:00:00 2001 From: Quatadah Nasdami Date: Thu, 4 Aug 2022 11:38:26 +0200 Subject: [PATCH 033/143] removing useless changes --- htdocs/core/lib/functions.lib.php | 2 +- htdocs/projet/card.php | 30 ++++++++++++++++++------------ 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index dda26dfa304..70eb4e50fa6 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -10420,6 +10420,7 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st * 'cancel-btn-label' => '', // Overide label of cancel button, if empty default label use "CloseDialog" lang key * 'content' => '', // Overide text of content, if empty default content use "ConfirmBtnCommonContent" lang key * 'modal' => true, // true|false to display dialog as a modal (with dark background) + * 'isDropDrown' => false, // true|false to display dialog as a dropdown (with dark background) * ], * ] * // phpcs:enable @@ -10439,7 +10440,6 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url = if (!empty($url) && strpos($url, 'token=') === false) $url .= '&token='.newToken(); } } - $attr = array( 'class' => $class, 'href' => empty($url) ? '' : $url, diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php index f79e2b779ab..95c3a533d1f 100644 --- a/htdocs/projet/card.php +++ b/htdocs/projet/card.php @@ -1338,50 +1338,56 @@ if ($action == 'create' && $user->rights->projet->creer) { } } - // Add button to create objects from project + if (!empty($conf->global->PROJECT_SHOW_CREATE_OBJECT_BUTTON)) { + print'
'; + print''.$langs->trans("Create").''; + print '
'; + print '
'; if (!empty($conf->propal->enabled) && $user->rights->propal->creer) { $langs->load("propal"); - print dolGetButtonAction('', $langs->trans('AddProp'), 'default', DOL_URL_ROOT.'/comm/propal/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, ''); + print dolGetButtonAction('', $langs->trans('AddProp'), 'default', DOL_URL_ROOT.'/comm/propal/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', 1, array('isDropDown' => true)); } if (!empty($conf->commande->enabled) && $user->rights->commande->creer) { $langs->load("orders"); - print dolGetButtonAction('', $langs->trans('CreateOrder'), 'default', DOL_URL_ROOT.'/commande/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, ''); + print dolGetButtonAction('', $langs->trans('CreateOrder'), 'default', DOL_URL_ROOT.'/commande/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', 1, array('isDropDown' => true)); } if (isModEnabled('facture') && $user->rights->facture->creer) { $langs->load("bills"); - print dolGetButtonAction('', $langs->trans('CreateBill'), 'default', DOL_URL_ROOT.'/compta/facture/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, ''); + print dolGetButtonAction('', $langs->trans('CreateBill'), 'default', DOL_URL_ROOT.'/compta/facture/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', 1, array('isDropDown' => true)); } if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->creer) { $langs->load("supplier_proposal"); - print dolGetButtonAction('', $langs->trans('AddSupplierProposal'), 'default', DOL_URL_ROOT.'/supplier_proposal/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, ''); + print dolGetButtonAction('', $langs->trans('AddSupplierProposal'), 'default', DOL_URL_ROOT.'/supplier_proposal/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', 1, array('isDropDown' => true)); } if (!empty($conf->supplier_order->enabled) && ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer)) { $langs->load("suppliers"); - print dolGetButtonAction('', $langs->trans('AddSupplierOrder'), 'default', DOL_URL_ROOT.'/fourn/commande/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, ''); + print dolGetButtonAction('', $langs->trans('AddSupplierOrder'), 'default', DOL_URL_ROOT.'/fourn/commande/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', 1, array('isDropDown' => true)); } if (!empty($conf->supplier_invoice->enabled) && ($user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer)) { $langs->load("suppliers"); - print dolGetButtonAction('', $langs->trans('AddSupplierInvoice'), 'default', DOL_URL_ROOT.'/fourn/facture/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, ''); + print dolGetButtonAction('', $langs->trans('AddSupplierInvoice'), 'default', DOL_URL_ROOT.'/fourn/facture/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', 1, array('isDropDown' => true)); } if (!empty($conf->ficheinter->enabled) && $user->rights->ficheinter->creer) { $langs->load("interventions"); - print dolGetButtonAction('', $langs->trans('AddIntervention'), 'default', DOL_URL_ROOT.'/fichinter/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, ''); + print dolGetButtonAction('', $langs->trans('AddIntervention'), 'default', DOL_URL_ROOT.'/fichinter/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', 1, array('isDropDown' => true)); } if (!empty($conf->contrat->enabled) && $user->rights->contrat->creer) { $langs->load("contracts"); - print dolGetButtonAction('', $langs->trans('AddContract'), 'default', DOL_URL_ROOT.'/contrat/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, ''); + print dolGetButtonAction('', $langs->trans('AddContract'), 'default', DOL_URL_ROOT.'/contrat/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', 1, array('isDropDown' => true)); } if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->creer) { $langs->load("trips"); - print dolGetButtonAction('', $langs->trans('AddTrip'), 'default', DOL_URL_ROOT.'/expensereport/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, ''); + print dolGetButtonAction('', $langs->trans('AddTrip'), 'default', DOL_URL_ROOT.'/expensereport/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', 1, array('isDropDown' => true)); } if (!empty($conf->don->enabled) && $user->rights->don->creer) { $langs->load("donations"); - print dolGetButtonAction('', $langs->trans('AddDonation'), 'default', DOL_URL_ROOT.'/don/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, ''); + print dolGetButtonAction('', $langs->trans('AddDonation'), 'default', DOL_URL_ROOT.'/don/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', 1, array('isDropDown' => true)); } + print "
"; + print "
"; + print "
"; } - // Clone if ($user->rights->projet->creer) { if ($userWrite > 0) { From 766943ee43a2f33d7d7d97a2c1b732f553680bc9 Mon Sep 17 00:00:00 2001 From: Quatadah Nasdami Date: Thu, 4 Aug 2022 11:39:16 +0200 Subject: [PATCH 034/143] removing uselss changes2 --- htdocs/core/lib/functions.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 70eb4e50fa6..4efeb18fb60 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -10420,7 +10420,7 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st * 'cancel-btn-label' => '', // Overide label of cancel button, if empty default label use "CloseDialog" lang key * 'content' => '', // Overide text of content, if empty default content use "ConfirmBtnCommonContent" lang key * 'modal' => true, // true|false to display dialog as a modal (with dark background) - * 'isDropDrown' => false, // true|false to display dialog as a dropdown (with dark background) + * 'isDropDrown' => false, // true|false to display dialog as a dropdown (with dark background) * ], * ] * // phpcs:enable From b5ea8c5817073d43c2b136da67300bc6ee77fab0 Mon Sep 17 00:00:00 2001 From: Quatadah Nasdami Date: Thu, 4 Aug 2022 11:39:52 +0200 Subject: [PATCH 035/143] removing uselss changes2 --- htdocs/core/lib/functions.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 4efeb18fb60..57747cbf37a 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -10420,7 +10420,7 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st * 'cancel-btn-label' => '', // Overide label of cancel button, if empty default label use "CloseDialog" lang key * 'content' => '', // Overide text of content, if empty default content use "ConfirmBtnCommonContent" lang key * 'modal' => true, // true|false to display dialog as a modal (with dark background) - * 'isDropDrown' => false, // true|false to display dialog as a dropdown (with dark background) + * 'isDropDrown' => false, // true|false to display dialog as a dropdown (with dark background) * ], * ] * // phpcs:enable From b6b3f6389c51ee821bb1ae3c57aae83ae63574de Mon Sep 17 00:00:00 2001 From: Quatadah Nasdami Date: Thu, 4 Aug 2022 11:40:15 +0200 Subject: [PATCH 036/143] removing uselss changes2 --- htdocs/core/lib/functions.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 57747cbf37a..90698c95f80 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -10420,7 +10420,7 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st * 'cancel-btn-label' => '', // Overide label of cancel button, if empty default label use "CloseDialog" lang key * 'content' => '', // Overide text of content, if empty default content use "ConfirmBtnCommonContent" lang key * 'modal' => true, // true|false to display dialog as a modal (with dark background) - * 'isDropDrown' => false, // true|false to display dialog as a dropdown (with dark background) + * 'isDropDrown' => false, // true|false to display dialog as a dropdown (with dark background) * ], * ] * // phpcs:enable From 4090ce9227f0aa5d1e92a86fa29953375fb2e55b Mon Sep 17 00:00:00 2001 From: Quatadah Nasdami Date: Thu, 4 Aug 2022 11:51:47 +0200 Subject: [PATCH 037/143] changing the zip folder of the template style 02 --- .../websites/website_template-style02.zip | Bin 15973 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 htdocs/install/doctemplates/websites/website_template-style02.zip diff --git a/htdocs/install/doctemplates/websites/website_template-style02.zip b/htdocs/install/doctemplates/websites/website_template-style02.zip deleted file mode 100644 index 11116bcfc648ebc7a11d308b528dffd227668ced..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15973 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 Date: Thu, 4 Aug 2022 11:52:02 +0200 Subject: [PATCH 038/143] fix phpcs --- .../facture/doc/pdf_sponge.modules.php | 110 +++++++++--------- 1 file changed, 54 insertions(+), 56 deletions(-) diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php index 9c79896ee6e..f096392df4a 100644 --- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php @@ -116,30 +116,30 @@ class pdf_sponge extends ModelePDFFactures public $marge_basse; - /** - * @var int heightforinfotot - */ - public $heightforinfotot; + /** + * @var int heightforinfotot + */ + public $heightforinfotot; - /** - * @var int heightforfreetext - */ - public $heightforfreetext; + /** + * @var int heightforfreetext + */ + public $heightforfreetext; - /** - * @var int heightforfooter - */ - public $heightforfooter; + /** + * @var int heightforfooter + */ + public $heightforfooter; - /** - * @var int tab_top - */ - public $tab_top; + /** + * @var int tab_top + */ + public $tab_top; - /** - * @var int tab_top_newpage - */ - public $tab_top_newpage; + /** + * @var int tab_top_newpage + */ + public $tab_top_newpage; /** * Issuer @@ -1243,37 +1243,37 @@ class pdf_sponge extends ModelePDFFactures if (empty($object->mode_reglement_code) && empty($conf->global->FACTURE_CHQ_NUMBER) && empty($conf->global->FACTURE_RIB_NUMBER)) { - $this->error = $outputlangs->transnoentities("ErrorNoPaiementModeConfigured"); + $this->error = $outputlangs->transnoentities("ErrorNoPaiementModeConfigured"); } elseif (($object->mode_reglement_code == 'CHQ' && empty($conf->global->FACTURE_CHQ_NUMBER) && empty($object->fk_account) && empty($object->fk_bank)) - || ($object->mode_reglement_code == 'VIR' && empty($conf->global->FACTURE_RIB_NUMBER) && empty($object->fk_account) && empty($object->fk_bank))) { - // Avoid having any valid PDF with setup that is not complete - $outputlangs->load("errors"); + || ($object->mode_reglement_code == 'VIR' && empty($conf->global->FACTURE_RIB_NUMBER) && empty($object->fk_account) && empty($object->fk_bank))) { + // Avoid having any valid PDF with setup that is not complete + $outputlangs->load("errors"); - $pdf->SetXY($this->marge_gauche, $posy); - $pdf->SetTextColor(200, 0, 0); - $pdf->SetFont('', 'B', $default_font_size - 2); - $this->error = $outputlangs->transnoentities("ErrorPaymentModeDefinedToWithoutSetup", $object->mode_reglement_code); - $pdf->MultiCell($posxend - $this->marge_gauche, 3, $this->error, 0, 'L', 0); - $pdf->SetTextColor(0, 0, 0); + $pdf->SetXY($this->marge_gauche, $posy); + $pdf->SetTextColor(200, 0, 0); + $pdf->SetFont('', 'B', $default_font_size - 2); + $this->error = $outputlangs->transnoentities("ErrorPaymentModeDefinedToWithoutSetup", $object->mode_reglement_code); + $pdf->MultiCell($posxend - $this->marge_gauche, 3, $this->error, 0, 'L', 0); + $pdf->SetTextColor(0, 0, 0); - $posy = $pdf->GetY() + 1; + $posy = $pdf->GetY() + 1; } // Show payment mode if (!empty($object->mode_reglement_code) - && $object->mode_reglement_code != 'CHQ' - && $object->mode_reglement_code != 'VIR') { - $pdf->SetFont('', 'B', $default_font_size - 2); - $pdf->SetXY($this->marge_gauche, $posy); - $titre = $outputlangs->transnoentities("PaymentMode").':'; - $pdf->MultiCell($posxend - $this->marge_gauche, 5, $titre, 0, 'L'); + && $object->mode_reglement_code != 'CHQ' + && $object->mode_reglement_code != 'VIR') { + $pdf->SetFont('', 'B', $default_font_size - 2); + $pdf->SetXY($this->marge_gauche, $posy); + $titre = $outputlangs->transnoentities("PaymentMode").':'; + $pdf->MultiCell($posxend - $this->marge_gauche, 5, $titre, 0, 'L'); - $pdf->SetFont('', '', $default_font_size - 2); - $pdf->SetXY($posxval, $posy); - $lib_mode_reg = $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) != ('PaymentType'.$object->mode_reglement_code) ? $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) : $outputlangs->convToOutputCharset($object->mode_reglement); - $pdf->MultiCell($posxend - $posxval, 5, $lib_mode_reg, 0, 'L'); + $pdf->SetFont('', '', $default_font_size - 2); + $pdf->SetXY($posxval, $posy); + $lib_mode_reg = $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) != ('PaymentType'.$object->mode_reglement_code) ? $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) : $outputlangs->convToOutputCharset($object->mode_reglement); + $pdf->MultiCell($posxend - $posxval, 5, $lib_mode_reg, 0, 'L'); - $posy = $pdf->GetY(); + $posy = $pdf->GetY(); } // Show online payment link @@ -1461,13 +1461,12 @@ class pdf_sponge extends ModelePDFFactures if ($posy > $this->page_hauteur - 4 - $this->heightforfooter) { $this->_pagefoot($pdf, $object, $outputlangs, 1); $pdf->addPage(); - if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) { - $this->_pagehead($pdf, $object, 0, $outputlangs, $outputlangsbis); - $pdf->setY($this->tab_top_newpage); - } - else{ - $pdf->setY($this->marge_haute); - } + if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) { + $this->_pagehead($pdf, $object, 0, $outputlangs, $outputlangsbis); + $pdf->setY($this->tab_top_newpage); + } else { + $pdf->setY($this->marge_haute); + } $posy = $pdf->GetY(); } @@ -1529,13 +1528,12 @@ class pdf_sponge extends ModelePDFFactures if ($posy > $this->page_hauteur - 4 - $this->heightforfooter) { $pdf->addPage(); - if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) { - $this->_pagehead($pdf, $object, 0, $outputlangs, $outputlangsbis); - $pdf->setY($this->tab_top_newpage); - } - else { - $pdf->setY($this->marge_haute); - } + if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) { + $this->_pagehead($pdf, $object, 0, $outputlangs, $outputlangsbis); + $pdf->setY($this->tab_top_newpage); + } else { + $pdf->setY($this->marge_haute); + } $posy = $pdf->GetY(); } From a064b25fdd6d1dfa052a7777137df0b147b557cd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 4 Aug 2022 11:14:21 +0200 Subject: [PATCH 039/143] css --- htdocs/user/ldap.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php index 5e6cf57bfd4..3e39a55cfb4 100644 --- a/htdocs/user/ldap.php +++ b/htdocs/user/ldap.php @@ -94,7 +94,7 @@ llxHeader(); $head = user_prepare_head($object); $title = $langs->trans("User"); -print dol_get_fiche_head($head, 'ldap', $title, 0, 'user'); +print dol_get_fiche_head($head, 'ldap', $title, -1, 'user'); $linkback = ''; @@ -107,7 +107,7 @@ dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $use print '
'; print '
'; -print ''; +print '
'; // Login print ''; From 9c87b56863e345b23243d52d2ef1d4d9c5d0ad3b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 4 Aug 2022 13:13:24 +0200 Subject: [PATCH 040/143] css --- htdocs/emailcollector/class/emailcollector.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php index 9a60624e9d2..47e3c1303da 100644 --- a/htdocs/emailcollector/class/emailcollector.class.php +++ b/htdocs/emailcollector/class/emailcollector.class.php @@ -111,7 +111,7 @@ class EmailCollector extends CommonObject public $fields = array( 'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>2, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1), 'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'notnull'=>1, 'index'=>1, 'position'=>20), - 'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'help'=>'Example: MyCollector1', 'csslist'=>'tdoverflowmax250'), + 'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'help'=>'Example: MyCollector1', 'csslist'=>'tdoverflowmax150'), 'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'notnull'=>-1, 'searchall'=>1, 'help'=>'Example: My Email collector', 'csslist'=>'tdoverflowmax150'), 'description' => array('type'=>'text', 'label'=>'Description', 'visible'=>-1, 'enabled'=>1, 'position'=>60, 'notnull'=>-1, 'csslist'=>'small'), 'host' => array('type'=>'varchar(255)', 'label'=>'EMailHost', 'visible'=>1, 'enabled'=>1, 'position'=>90, 'notnull'=>1, 'searchall'=>1, 'comment'=>"IMAP server", 'help'=>'Example: imap.gmail.com', 'csslist'=>'tdoverflow125'), From 39dccc4fdf4f0d38d1ef58f765f7b5ed8920b5e5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 4 Aug 2022 13:42:57 +0200 Subject: [PATCH 041/143] FIX Scan IMAP must not be done automatically --- htdocs/admin/emailcollector_card.php | 86 +++++++++++++++------------- 1 file changed, 45 insertions(+), 41 deletions(-) diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php index ab4f0c7def0..2a32551eaad 100644 --- a/htdocs/admin/emailcollector_card.php +++ b/htdocs/admin/emailcollector_card.php @@ -378,33 +378,54 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea $connectstringserver = $object->getConnectStringIMAP($usessl); - try { - if ($sourcedir) { - //$connectstringsource = $connectstringserver.imap_utf7_encode($sourcedir); - $connectstringsource = $connectstringserver.$object->getEncodedUtf7($sourcedir); - } - if ($targetdir) { - //$connectstringtarget = $connectstringserver.imap_utf7_encode($targetdir); - $connectstringtarget = $connectstringserver.$object->getEncodedUtf7($targetdir); + if ($action == 'scan') { + try { + if ($sourcedir) { + //$connectstringsource = $connectstringserver.imap_utf7_encode($sourcedir); + $connectstringsource = $connectstringserver.$object->getEncodedUtf7($sourcedir); + } + if ($targetdir) { + //$connectstringtarget = $connectstringserver.imap_utf7_encode($targetdir); + $connectstringtarget = $connectstringserver.$object->getEncodedUtf7($targetdir); + } + + $timeoutconnect = empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 5 : $conf->global->MAIN_USE_CONNECT_TIMEOUT; + $timeoutread = empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 20 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT; + + dol_syslog("imap_open connectstring=".$connectstringsource." login=".$object->login." password=".$object->password." timeoutconnect=".$timeoutconnect." timeoutread=".$timeoutread); + + $result1 = imap_timeout(IMAP_OPENTIMEOUT, $timeoutconnect); // timeout seems ignored with ssl connect + $result2 = imap_timeout(IMAP_READTIMEOUT, $timeoutread); + $result3 = imap_timeout(IMAP_WRITETIMEOUT, 5); + $result4 = imap_timeout(IMAP_CLOSETIMEOUT, 5); + + dol_syslog("result1=".$result1." result2=".$result2." result3=".$result3." result4=".$result4); + + $connection = imap_open($connectstringsource, $object->login, $object->password); + + //dol_syslog("end imap_open connection=".var_export($connection, true)); + } catch (Exception $e) { + print $e->getMessage(); } - $timeoutconnect = empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 5 : $conf->global->MAIN_USE_CONNECT_TIMEOUT; - $timeoutread = empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 20 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT; + if (!$connection) { + $morehtml .= 'Failed to open IMAP connection '.$connectstringsource; + if (function_exists('imap_last_error')) { + $morehtml .= '
'.imap_last_error(); + } + dol_syslog("Error ".$morehtml, LOG_WARNING); + //var_dump(imap_errors()) + } else { + dol_syslog("Imap connected. Now we call imap_num_msg()"); + $morehtml .= imap_num_msg($connection); + } - dol_syslog("imap_open connectstring=".$connectstringsource." login=".$object->login." password=".$object->password." timeoutconnect=".$timeoutconnect." timeoutread=".$timeoutread); - - $result1 = imap_timeout(IMAP_OPENTIMEOUT, $timeoutconnect); // timeout seems ignored with ssl connect - $result2 = imap_timeout(IMAP_READTIMEOUT, $timeoutread); - $result3 = imap_timeout(IMAP_WRITETIMEOUT, 5); - $result4 = imap_timeout(IMAP_CLOSETIMEOUT, 5); - - dol_syslog("result1=".$result1." result2=".$result2." result3=".$result3." result4=".$result4); - - $connection = imap_open($connectstringsource, $object->login, $object->password); - - //dol_syslog("end imap_open connection=".var_export($connection, true)); - } catch (Exception $e) { - print $e->getMessage(); + if ($connection) { + dol_syslog("Imap close"); + imap_close($connection); + } + } else { + $morehtml .= ''.img_picto('', 'refresh', 'class="paddingrightonly"').$langs->trans("Refresh").''; } $morehtml .= $form->textwithpicto('', 'connect string '.$connectstringserver); @@ -412,23 +433,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea $morehtml .= 'IMAP functions not available on your PHP. '; } - if (!$connection) { - $morehtml .= 'Failed to open IMAP connection '.$connectstringsource; - if (function_exists('imap_last_error')) { - $morehtml .= '
'.imap_last_error(); - } - dol_syslog("Error ".$morehtml, LOG_WARNING); - //var_dump(imap_errors()) - } else { - dol_syslog("Imap connected. Now we call imap_num_msg()"); - $morehtml .= imap_num_msg($connection); - } - - if ($connection) { - dol_syslog("Imap close"); - imap_close($connection); - } - dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref.'
'.$morehtml.'
', '', 0, '', '', 0, ''); print '
'; From 852dc909aa74e7675c643de0884bdf67aaec031c Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Thu, 4 Aug 2022 14:46:20 +0200 Subject: [PATCH 042/143] NEW add hook un takepos/pay.php add hook for new payment method --- htdocs/takepos/pay.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php index f487862e895..24ca8cc782b 100644 --- a/htdocs/takepos/pay.php +++ b/htdocs/takepos/pay.php @@ -655,6 +655,10 @@ if ($conf->global->TAKEPOS_ENABLE_SUMUP) { } } +$parameters = array(); +$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $invoice, $action); // Note that $action and $object may have been modified by hook +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); + $class = ($i == 3) ? "calcbutton3" : "calcbutton2"; foreach ($action_buttons as $button) { $newclass = $class.($button["class"] ? " ".$button["class"] : ""); From 236c8e21f54006a32c91895be6ea0aa542a46bdc Mon Sep 17 00:00:00 2001 From: lmarcouiller Date: Thu, 4 Aug 2022 15:05:16 +0200 Subject: [PATCH 043/143] Fix : regretion on stockmovement --- htdocs/product/class/product.class.php | 2 +- htdocs/product/stock/massstockmove.php | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 6c249e6b3bd..8ff8f53275e 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -5037,7 +5037,7 @@ class Product extends CommonObject $result .= (img_object(($notooltip ? '' : $label), 'service', ($notooltip ? 'class="paddingright"' : 'class="paddingright classfortooltip"'), 0, 0, $notooltip ? 0 : 1)); } } - $result .= $newref; + $result .= dol_escape_htmltag($newref); $result .= $linkend; if ($withpicto != 2) { $result .= (($add_label && $this->label) ? $sep.dol_trunc($this->label, ($add_label > 1 ? $add_label : 0)) : ''); diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php index 31b2aa8e187..4da9156e955 100644 --- a/htdocs/product/stock/massstockmove.php +++ b/htdocs/product/stock/massstockmove.php @@ -336,11 +336,11 @@ if ($action == 'importCSV' && !empty($user->rights->stock->mouvement->creer)) { continue; } //var_dump($data); - $tmp_id_sw = (int) $data[$i][0]['val']; - $tmp_id_tw = (int) $data[$i][1]['val']; - $tmp_id_product = (int) $data[$i][2]['val']; - $tmp_qty = price2num((float) $data[$i][3]['val'], 'MS'); - $tmp_batch = dol_escape_htmltag($data[$i][4]['val']); + $tmp_id_sw = $data[$i][0]['val']; + $tmp_id_tw = $data[$i][1]['val']; + $tmp_id_product = $data[$i][2]['val']; + $tmp_qty = $data[$i][3]['val']; + $tmp_batch = $data[$i][4]['val']; if (!is_numeric($tmp_id_product)) { $result = fetchref($productstatic, $tmp_id_product); @@ -604,11 +604,11 @@ print ''; if (isModEnabled('productbatch')) { print '
'; } // Qty -print ''; +print ''; // Button to add line print ''; @@ -641,14 +641,14 @@ foreach ($listofdata as $key => $val) { print $warehousestatict->getNomUrl(1); print ''; print ''; if (isModEnabled('productbatch')) { print ''; } - print ''; + print ''; print ''; print ''; } From a3cf76cfd7d21d1148b0d457e34f405aed7bbd84 Mon Sep 17 00:00:00 2001 From: jpb Date: Thu, 4 Aug 2022 15:43:14 +0200 Subject: [PATCH 044/143] add token to link --- htdocs/mrp/mo_production.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php index f6aba7f2597..65019337b64 100644 --- a/htdocs/mrp/mo_production.php +++ b/htdocs/mrp/mo_production.php @@ -39,7 +39,7 @@ dol_include_once('/mrp/lib/mrp_mo.lib.php'); // Load translation files required by the page $langs->loadLangs(array("mrp", "stocks", "other", "product", "productbatch")); - +$newToken = function_exists('newToken') ? newToken() : $_SESSION['newtoken']; // Get parameters $id = GETPOST('id', 'int'); $ref = GETPOST('ref', 'alpha'); @@ -257,6 +257,7 @@ if (empty($reshook)) { // Process line to produce $pos = 0; + foreach ($object->lines as $line) { if ($line->role == 'toproduce') { $tmpproduct = new Product($db); @@ -588,7 +589,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea if ($object->status == $object::STATUS_DRAFT) { if ($permissiontoadd) { if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0)) { - print ''.$langs->trans("Validate").''; + print ''.$langs->trans("Validate").''; } else { $langs->load("errors"); print ''.$langs->trans("Validate").''; @@ -599,7 +600,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea // Consume or produce if ($object->status == Mo::STATUS_VALIDATED || $object->status == Mo::STATUS_INPROGRESS) { if ($permissiontoproduce) { - print ''.$langs->trans('ConsumeOrProduce').''; + print ''.$langs->trans('ConsumeOrProduce').''; } else { print ''.$langs->trans('ConsumeOrProduce').''; } @@ -610,7 +611,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea // ConsumeAndProduceAll if ($object->status == Mo::STATUS_VALIDATED || $object->status == Mo::STATUS_INPROGRESS) { if ($permissiontoproduce) { - print ''.$langs->trans('ConsumeAndProduceAll').''; + print ''.$langs->trans('ConsumeAndProduceAll').''; } else { print ''.$langs->trans('ConsumeAndProduceAll').''; } @@ -627,21 +628,21 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea $nbProduced += $lineproduced['qty']; } if ($nbProduced > 0) { // If production has started, we can close it - print ''.$langs->trans("Close").''."\n"; + print ''.$langs->trans("Close").''."\n"; } else { print 'transnoentitiesnoconv("Production")).'">'.$langs->trans("Close").''."\n"; } - print ''.$langs->trans("Cancel").''."\n"; + print ''.$langs->trans("Cancel").''."\n"; } if ($object->status == $object::STATUS_CANCELED) { - print ''.$langs->trans("Re-Open").''."\n"; + print ''.$langs->trans("Re-Open").''."\n"; } if ($object->status == $object::STATUS_PRODUCED) { if ($permissiontoproduce) { - print ''.$langs->trans('ReOpen').''; + print ''.$langs->trans('ReOpen').''; } else { print ''.$langs->trans('ReOpen').''; } From 0a623ab0683c7b1b41bca4d070c70f7e1140befc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 4 Aug 2022 16:17:07 +0200 Subject: [PATCH 045/143] Fix yogosha#11976 --- htdocs/barcode/printsheet.php | 35 ++++++++++++++++++---------------- htdocs/langs/en_US/errors.lang | 2 ++ 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php index 763463d6fb8..c55db4ef2a1 100644 --- a/htdocs/barcode/printsheet.php +++ b/htdocs/barcode/printsheet.php @@ -203,25 +203,30 @@ if ($action == 'builddoc') { $forceimgscalewidth = (empty($conf->global->BARCODE_FORCEIMGSCALEWIDTH) ? 1 : $conf->global->BARCODE_FORCEIMGSCALEWIDTH); $forceimgscaleheight = (empty($conf->global->BARCODE_FORCEIMGSCALEHEIGHT) ? 1 : $conf->global->BARCODE_FORCEIMGSCALEHEIGHT); - for ($i = 0; $i < $numberofsticker; $i++) { - $arrayofrecords[] = array( - 'textleft'=>$textleft, - 'textheader'=>$textheader, - 'textfooter'=>$textfooter, - 'textright'=>$textright, - 'code'=>$code, - 'encoding'=>$encoding, - 'is2d'=>$is2d, - 'photo'=>$barcodeimage // Photo must be a file that exists with format supported by TCPDF - ); + $MAXSTICKERS = 1000; + if ($numberofsticker <= $MAXSTICKERS) { + for ($i = 0; $i < $numberofsticker; $i++) { + $arrayofrecords[] = array( + 'textleft'=>$textleft, + 'textheader'=>$textheader, + 'textfooter'=>$textfooter, + 'textright'=>$textright, + 'code'=>$code, + 'encoding'=>$encoding, + 'is2d'=>$is2d, + 'photo'=>$barcodeimage // Photo must be a file that exists with format supported by TCPDF + ); + } + } else { + $mesg = $langs->trans("ErrorQuantityIsLimitedTo", $MAXSTICKERS); + $error++; } } $i++; - $mesg = ''; // Build and output PDF - if ($mode == 'label') { + if (!$error && $mode == 'label') { if (!count($arrayofrecords)) { $mesg = $langs->trans("ErrorRecordNotFound"); } @@ -240,7 +245,7 @@ if ($action == 'builddoc') { } } - if ($result <= 0 || $mesg) { + if ($result <= 0 || $mesg || $error) { if (empty($mesg)) { $mesg = 'Error '.$result; } @@ -272,8 +277,6 @@ print '
'; print ''.$langs->trans("PageToGenerateBarCodeSheets", $langs->transnoentitiesnoconv("BuildPageToPrint")).'
'; print '
'; -dol_htmloutput_errors($mesg); - //print img_picto('','puce').' '.$langs->trans("PrintsheetForOneBarCode").'
'; //print '
'; diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang index 9d38eab591e..50bc7931fd2 100644 --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -289,6 +289,8 @@ ErrorInvoiceLoadThirdPartyKey=Third-party key "%s" no set for invoice "%s" ErrorDeleteLineNotAllowedByObjectStatus=Delete line is not allowed by current object status ErrorAjaxRequestFailed=Request failed ErrorThirpdartyOrMemberidIsMandatory=Third party or Member of partnership is mandatory +ErrorFailedToWriteInTempDirectory=Failed to write in temp directory +ErrorQuantityIsLimitedTo=Quantity is limited to %s # Warnings WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup. From 3719366e04c7ce28d1ce0a6fcc5161c43b70926d Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Thu, 4 Aug 2022 19:31:14 +0200 Subject: [PATCH 046/143] Fix read knowledgemanagement categories --- htdocs/categories/class/api_categories.class.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php index fcac14f1337..0a618974024 100644 --- a/htdocs/categories/class/api_categories.class.php +++ b/htdocs/categories/class/api_categories.class.php @@ -305,7 +305,8 @@ class Categories extends DolibarrApi Categorie::TYPE_CUSTOMER, Categorie::TYPE_SUPPLIER, Categorie::TYPE_MEMBER, - Categorie::TYPE_PROJECT + Categorie::TYPE_PROJECT, + Categorie::TYPE_KNOWLEDGEMANAGEMENT ])) { throw new RestException(401); } @@ -322,6 +323,8 @@ class Categories extends DolibarrApi throw new RestException(401); } elseif ($type == Categorie::TYPE_PROJECT && !DolibarrApiAccess::$user->rights->projet->lire) { throw new RestException(401); + } elseif ($type == Categorie::TYPE_KNOWLEDGEMANAGEMENT && !DolibarrApiAccess::$user->rights->knowledgemanagement->knowledgerecord->read) { + throw new RestException(401); } $categories = $this->category->getListForItem($id, $type, $sortfield, $sortorder, $limit, $page); From 9955e51956fc5bc5bc5c9a2b520009fb7c2d12c1 Mon Sep 17 00:00:00 2001 From: Anthony Berton Date: Fri, 5 Aug 2022 09:39:31 +0200 Subject: [PATCH 047/143] NEW - FTP Function mkdir --- htdocs/core/lib/ftp.lib.php | 5 ++--- htdocs/ftp/index.php | 40 +++++++++++++++++++++++++++++++---- htdocs/langs/en_US/other.lang | 3 +++ 3 files changed, 41 insertions(+), 7 deletions(-) diff --git a/htdocs/core/lib/ftp.lib.php b/htdocs/core/lib/ftp.lib.php index 4a9f5a894d4..361904e3bd1 100644 --- a/htdocs/core/lib/ftp.lib.php +++ b/htdocs/core/lib/ftp.lib.php @@ -296,9 +296,8 @@ function dol_ftp_mkdir($connect_id, $newdir, $newsection) } // Remote file - $filename = $file; - $remotefile = $newsection.(preg_match('@[\\\/]$@', $newsection) ? '' : '/').$file; - $newremotefileiso = utf8_decode($remotefile); + $newremotefileiso = $newsection.(preg_match('@[\\\/]$@', $newsection) ? '' : '/').$newdir; + $newremotefileiso = utf8_decode($newremotefileiso); if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) { return ssh2_sftp_mkdir($connect_id, $newremotefileiso); diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php index 4df7e1512a6..20389ade79e 100644 --- a/htdocs/ftp/index.php +++ b/htdocs/ftp/index.php @@ -41,6 +41,7 @@ $result = restrictedArea($user, 'ftp', ''); // Get parameters $action = GETPOST('action', 'aZ09'); $section = GETPOST('section'); +$newfolder = GETPOST('newfolder'); if (!$section) { $section = '/'; } @@ -141,11 +142,8 @@ if ($action == 'uploadfile') { $mesg = $resultarray['mesg']; } if ($conn_id && $ok && !$mesg) { - // var_dump($_FILES['userfile']['name']); $nbfile = count($_FILES['userfile']['name']); - $i = 0; - for (; $i < $nbfile; $i++) { - var_dump($i); + for ($i = 0; $i < $nbfile; $i++) { $newsection = $newsectioniso; $fileupload = $_FILES['userfile']['name'][$i]; $fileuploadpath = $_FILES['userfile']['tmp_name'][$i]; @@ -164,6 +162,30 @@ if ($action == 'uploadfile') { } } +if ($action == 'addfolder') { + // set up a connection or die + if (!$conn_id) { + $newsectioniso = utf8_decode($section); + $resultarray = dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive); + $conn_id = $resultarray['conn_id']; + $ok = $resultarray['ok']; + $mesg = $resultarray['mesg']; + } + if ($conn_id && $ok && !$mesg) { + $result = dol_ftp_mkdir($conn_id, $newfolder, $newsectioniso); + + if ($result) { + setEventMessages($langs->trans("FileWasCreateFolder", $newfolder), null, 'mesgs'); + } else { + dol_syslog("ftp/index.php ftp_delete", LOG_ERR); + setEventMessages($langs->trans("FTPFailedToCreateFolder", $newfolder), null, 'errors'); + } + $action = ''; + } else { + dol_print_error('', $mesg); + } +} + // Action ajout d'un rep if ($action == 'add' && $user->rights->ftp->setup) { $ecmdir->ref = GETPOST("ref"); @@ -633,6 +655,16 @@ if (!function_exists('ftp_connect')) { print ''; print ''; print ''; + print load_fiche_titre($langs->trans("AddFolder"), null, null); + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; } } else { $foundsetup = false; diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang index daa52aac9fe..8be37bd0f9a 100644 --- a/htdocs/langs/en_US/other.lang +++ b/htdocs/langs/en_US/other.lang @@ -328,3 +328,6 @@ FailedToGetFile=Failed to get files %s ErrorFTPNodisconnect=Error to disconnect FTP/SFTP server FileWasUpload=File %s was upload FTPFailedToUploadFile=Failed to upload file %s. +AddFolder=Create folder +FileWasCreateFolder=Folder %s was create +FTPFailedToCreateFolder=Failed to create folder %s. From 17483eb08222c6d50a04cc0e9f57352cb84d2449 Mon Sep 17 00:00:00 2001 From: Anthony Berton Date: Fri, 5 Aug 2022 10:47:00 +0200 Subject: [PATCH 048/143] Fix --- htdocs/core/lib/ftp.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/ftp.lib.php b/htdocs/core/lib/ftp.lib.php index 361904e3bd1..118c85e9b74 100644 --- a/htdocs/core/lib/ftp.lib.php +++ b/htdocs/core/lib/ftp.lib.php @@ -300,7 +300,7 @@ function dol_ftp_mkdir($connect_id, $newdir, $newsection) $newremotefileiso = utf8_decode($newremotefileiso); if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) { - return ssh2_sftp_mkdir($connect_id, $newremotefileiso); + return ssh2_sftp_mkdir($connect_id, $newremotefileiso, 0777); } else { return @ftp_mkdir($connect_id, $newremotefileiso); } From 5f32d17158117a5ba5802bef20b8fe3868ad896e Mon Sep 17 00:00:00 2001 From: lmarcouiller Date: Fri, 5 Aug 2022 16:21:01 +0200 Subject: [PATCH 049/143] Fix : permission error on category view --- htdocs/categories/viewcat.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index 5450127bff3..3fc42bb2818 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -952,7 +952,7 @@ if ($type == Categorie::TYPE_ACCOUNT) { } // List of Project -if ($type == Categorie::TYPE_PROJECT) { +if ($type == Categorie::TYPE_PROJECT ) { require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; $permission = $user->rights->projet->creer; @@ -1030,7 +1030,7 @@ if ($type == Categorie::TYPE_PROJECT) { } // List of users -if ($type == Categorie::TYPE_USER) { +if ($type == Categorie::TYPE_USER && $user->hasRight("user", "user", "read")) { require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; $users = $object->getObjectsInCateg($type); @@ -1099,6 +1099,9 @@ if ($type == Categorie::TYPE_USER) { print ''."\n"; } +} else { + print_barre_liste($langs->trans("Users"), null, $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'user'); + accessforbidden($langs->trans("NotEnoughPermissions"), 0, 0); } From bfe28bfda3dcae049599d578d4b05484000f9ddc Mon Sep 17 00:00:00 2001 From: lmarcouiller Date: Fri, 5 Aug 2022 16:22:03 +0200 Subject: [PATCH 050/143] remove artefacts --- htdocs/categories/viewcat.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index 3fc42bb2818..5405b33d994 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -952,7 +952,7 @@ if ($type == Categorie::TYPE_ACCOUNT) { } // List of Project -if ($type == Categorie::TYPE_PROJECT ) { +if ($type == Categorie::TYPE_PROJECT) { require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; $permission = $user->rights->projet->creer; From bbe74c5d77a20e2e64494a48fb08c251796a7140 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sat, 6 Aug 2022 13:44:56 +0200 Subject: [PATCH 051/143] FIX errors when search by code --- htdocs/admin/dict.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 621b2b783a7..22481296c68 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -1169,14 +1169,16 @@ if ($id) { $sql .= natural_search("code_iso", $search_code); } elseif ($search_code != '' && $id == 28) { $sql .= natural_search("h.code", $search_code); - } elseif ($search_code != '' && $id == 32) { + } elseif ($search_code != '' && ($id == 7 || $id == 32)) { $sql .= natural_search("a.code", $search_code); } elseif ($search_code != '' && $id == 3) { $sql .= natural_search("r.code_region", $search_code); - } elseif ($search_code != '' && $id == 7) { - $sql .= natural_search("a.code", $search_code); - } elseif ($search_code != '' && $id == 10) { + } elseif ($search_code != '' && ($id == 8 || $id == 10)) { $sql .= natural_search("t.code", $search_code); + } elseif ($search_code != '' && $id == 1) { + $sql .= natural_search("f.code", $search_code); + } elseif ($search_code != '' && $id == 2) { + $sql .= natural_search("d.code_departement", $search_code); } elseif ($search_code != '' && $id != 9) { $sql .= natural_search("code", $search_code); } From 1fac6e0ee47d69caf28badc9bc062e98e3e69c4a Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Sat, 6 Aug 2022 14:50:53 +0200 Subject: [PATCH 052/143] New filter by category for knowledgemanagement API --- .../class/api_knowledgemanagement.class.php | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php b/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php index b95a5717932..ccf54b1d6d9 100644 --- a/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php +++ b/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php @@ -125,18 +125,19 @@ class KnowledgeManagement extends DolibarrApi * * Get a list of knowledgerecords * - * @param string $sortfield Sort field - * @param string $sortorder Sort order - * @param int $limit Limit for list - * @param int $page Page number - * @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')" + * @param string $sortfield Sort field + * @param string $sortorder Sort order + * @param int $limit Limit for list + * @param int $page Page number + * @param int $category Use this param to filter list by category + * @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')" * @return array Array of order objects * * @throws RestException * * @url GET /knowledgerecords/ */ - public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '') + public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $category = 0, $sqlfilters = '') { global $db, $conf; @@ -166,6 +167,9 @@ class KnowledgeManagement extends DolibarrApi if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) { $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale } + if ($category > 0) { + $sql .= ", ".$this->db->prefix()."categorie_knowledgemanagement as c"; + } $sql .= " WHERE 1 = 1"; // Example of use $mode @@ -188,6 +192,11 @@ class KnowledgeManagement extends DolibarrApi if ($restrictonsocid && $search_sale > 0) { $sql .= " AND sc.fk_user = ".((int) $search_sale); } + // Select products of given category + if ($category > 0) { + $sql .= " AND c.fk_categorie = ".((int) $category); + $sql .= " AND c.fk_knowledgemanagement = t.rowid"; + } if ($sqlfilters) { $errormessage = ''; if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) { From ed9cadac7e6ad2768d84cc7b7440b62d06efe556 Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Sat, 6 Aug 2022 18:47:41 +0200 Subject: [PATCH 053/143] NEW default_lang for members --- htdocs/install/mysql/migration/16.0.0-17.0.0.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql index e72fc1b8dcd..c1f96ca9d3e 100644 --- a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql +++ b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql @@ -77,3 +77,5 @@ ALTER TABLE llx_recruitment_recruitmentcandidature ADD email_date datetime after ALTER TABLE llx_ticket ADD email_date datetime after email_msgid; INSERT INTO llx_const (name, entity, value, type, visible) VALUES ('MAIN_SECURITY_MAX_IMG_IN_HTML_CONTENT', 1, 1000, 'int', 0); + +ALTER TABLE `llx_adherent` ADD default_lang VARCHAR(6) NULL DEFAULT NULL AFTER datefin; From 1ffbf1e56b1396febf2df03b2a2957260e3dd71b Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Sat, 6 Aug 2022 18:49:18 +0200 Subject: [PATCH 054/143] Update llx_adherent.sql --- htdocs/install/mysql/tables/llx_adherent.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql index 01a87167411..e0ba93554b8 100644 --- a/htdocs/install/mysql/tables/llx_adherent.sql +++ b/htdocs/install/mysql/tables/llx_adherent.sql @@ -71,6 +71,7 @@ create table llx_adherent statut smallint NOT NULL DEFAULT 0, public smallint NOT NULL DEFAULT 0, -- certain champ de la fiche sont ils public ou pas ? datefin datetime, -- end date of validity of the contribution / date de fin de validite de la cotisation + default_lang varchar(6) NULL, note_private text DEFAULT NULL, note_public text DEFAULT NULL, model_pdf varchar(255), From d91c90bba1d886d4103db4ad62cad0951a394744 Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Sat, 6 Aug 2022 19:49:03 +0200 Subject: [PATCH 055/143] FIX lang label & flag in user/card.php --- htdocs/user/card.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 8e375933a91..988f508550b 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -1642,6 +1642,7 @@ if ($action == 'create' || $action == 'adduserldap') { //$s=picto_from_langcode($object->default_lang); //print ($s?$s.' ':''); $labellang = ($object->lang ? $langs->trans('Language_'.$object->lang) : ''); + print picto_from_langcode($object->lang, 'class="paddingrightonly saturatemedium opacitylow"'); print $labellang; print ''; } From 1a1c5d9110b45a1fb064aa613e652987391da4c1 Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Sun, 7 Aug 2022 10:14:05 +0200 Subject: [PATCH 056/143] Update user.class.php --- htdocs/user/class/user.class.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 4c044f329b2..008aaae5007 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -2073,6 +2073,8 @@ class User extends CommonObject $adh->phone = $this->office_phone; $adh->phone_mobile = $this->user_mobile; + $adh->default_lang = $this->lang; + $adh->user_id = $this->id; $adh->user_login = $this->login; @@ -2117,6 +2119,8 @@ class User extends CommonObject $tmpobj->phone_mobile = $this->user_mobile; $tmpobj->fax = $this->office_fax; + $tmpobj->default_lang = $this->lang; + $tmpobj->address = $this->address; $tmpobj->town = $this->town; $tmpobj->zip = $this->zip; From 65629121f8e9687c5ee32baa3278ab8ed3fa61ab Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Sun, 7 Aug 2022 10:14:40 +0200 Subject: [PATCH 057/143] update --- htdocs/adherents/card.php | 30 ++++++++++++++++++++--- htdocs/adherents/class/adherent.class.php | 17 ++++++++++++- 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index 44a12293e67..f7b900feaa4 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -40,6 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php'; require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; @@ -311,8 +312,8 @@ if (empty($reshook)) { //$object->twitter = trim(GETPOST("twitter", 'alpha')); //$object->facebook = trim(GETPOST("facebook", 'alpha')); //$object->linkedin = trim(GETPOST("linkedin", 'alpha')); - $object->birth = $birthdate; - + $object->birth = $birthdate; + $object->default_lang = GETPOST('default_lang', 'alpha'); $object->typeid = GETPOST("typeid", 'int'); //$object->note = trim(GETPOST("comment","alpha")); $object->morphy = GETPOST("morphy", 'alpha'); @@ -457,6 +458,7 @@ if (empty($reshook)) { $userid = GETPOST("userid", 'int'); $socid = GETPOST("socid", 'int'); + $default_lang = GETPOST('default_lang', 'alpha'); $object->civility_id = $civility_id; $object->firstname = $firstname; @@ -498,7 +500,7 @@ if (empty($reshook)) { $object->user_id = $userid; $object->socid = $socid; $object->public = $public; - + $object->default_lang = $default_lang; // Fill array 'array_options' with data from add form $ret = $extrafields->setOptionalsFromPost(null, $object); if ($ret < 0) { @@ -899,6 +901,7 @@ if (empty($reshook)) { $form = new Form($db); $formfile = new FormFile($db); +$formadmin = new FormAdmin($db); $formcompany = new FormCompany($db); $title = $langs->trans("Member")." - ".$langs->trans("Card"); @@ -1363,6 +1366,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { print $form->selectDate(($object->birth ? $object->birth : -1), 'birth', '', '', 1, 'formsoc'); print "\n"; + // Default language + if (!empty($conf->global->MAIN_MULTILANGS)) { + print ''; + print ''; + } + // Public profil print "'; + // Default language + if (!empty($conf->global->MAIN_MULTILANGS)) { + require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; + print ''; + } + // Public print ''; diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index dec7584b68e..318dc4ac794 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -215,6 +215,12 @@ class Adherent extends CommonObject */ public $public; + /** + * Default language code of member (en_US, ...) + * @var string + */ + public $default_lang; + /** * @var string photo of member */ @@ -328,6 +334,7 @@ class Adherent extends CommonObject 'photo' => array('type' => 'varchar(255)', 'label' => 'Photo', 'enabled' => 1, 'visible' => -1, 'position' => 135), 'public' => array('type' => 'smallint(6)', 'label' => 'Public', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 145), 'datefin' => array('type' => 'datetime', 'label' => 'DateEnd', 'enabled' => 1, 'visible' => -1, 'position' => 150), + 'default_lang' =>array('type'=>'varchar(6)', 'label'=>'Default lang', 'enabled'=>1, 'visible'=>-1, 'position'=> 153), 'note_private' => array('type' => 'text', 'label' => 'NotePublic', 'enabled' => 1, 'visible' => 0, 'position' => 155), 'note_public' => array('type' => 'text', 'label' => 'NotePrivate', 'enabled' => 1, 'visible' => 0, 'position' => 160), 'datevalid' => array('type' => 'datetime', 'label' => 'DateValidation', 'enabled' => 1, 'visible' => -1, 'position' => 165), @@ -710,9 +717,11 @@ class Adherent extends CommonObject $sql .= ", photo = ".($this->photo ? "'".$this->db->escape($this->photo)."'" : "null"); $sql .= ", public = '".$this->db->escape($this->public)."'"; $sql .= ", statut = ".$this->db->escape($this->statut); + $sql .= ", default_lang = ".(!empty($this->default_lang) ? "'".$this->db->escape($this->default_lang)."'" : "null"); $sql .= ", fk_adherent_type = ".$this->db->escape($this->typeid); $sql .= ", morphy = '".$this->db->escape($this->morphy)."'"; $sql .= ", birth = ".($this->birth ? "'".$this->db->idate($this->birth)."'" : "null"); + if ($this->datefin) { $sql .= ", datefin = '".$this->db->idate($this->datefin)."'"; // Must be modified only when deleting a subscription } @@ -833,6 +842,8 @@ class Adherent extends CommonObject $luser->office_phone = $this->phone; $luser->user_mobile = $this->phone_mobile; + $luser->lang = $this->default_lang; + $luser->fk_member = $this->id; $result = $luser->update($user, 0, 1, 1); // Use nosync to 1 to avoid cyclic updates @@ -868,6 +879,7 @@ class Adherent extends CommonObject $lthirdparty->state_id = $this->state_id; $lthirdparty->country_id = $this->country_id; //$lthirdparty->phone_mobile=$this->phone_mobile; + $lthirdparty->default_lang = $this->default_lang; $result = $lthirdparty->update($this->fk_soc, $user, 0, 1, 1, 'update'); // Use sync to 0 to avoid cyclic updates @@ -1314,7 +1326,7 @@ class Adherent extends CommonObject $sql .= " d.photo, d.fk_adherent_type, d.morphy, d.entity,"; $sql .= " d.datec as datec,"; $sql .= " d.tms as datem,"; - $sql .= " d.datefin as datefin,"; + $sql .= " d.datefin as datefin, d.default_lang,"; $sql .= " d.birth as birthday,"; $sql .= " d.datevalid as datev,"; $sql .= " d.country,"; @@ -1407,6 +1419,8 @@ class Adherent extends CommonObject $this->date_validation = $this->db->jdate($obj->datev); $this->birth = $this->db->jdate($obj->birthday); + $this->default_lang = $obj->default_lang; + $this->note_private = $obj->note_private; $this->note_public = $obj->note_public; $this->morphy = $obj->morphy; @@ -2556,6 +2570,7 @@ class Adherent extends CommonObject $this->datefin = $now; $this->datevalid = $now; + $this->default_lang = ''; $this->typeid = 1; // Id type adherent $this->type = 'Type adherent'; // Libelle type adherent From 6aedbc5445a4d65938231e3140d7c804ad144925 Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Sun, 7 Aug 2022 12:59:58 +0200 Subject: [PATCH 058/143] Update llx_adherent.sql --- htdocs/install/mysql/tables/llx_adherent.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql index e0ba93554b8..be29e82d013 100644 --- a/htdocs/install/mysql/tables/llx_adherent.sql +++ b/htdocs/install/mysql/tables/llx_adherent.sql @@ -71,7 +71,7 @@ create table llx_adherent statut smallint NOT NULL DEFAULT 0, public smallint NOT NULL DEFAULT 0, -- certain champ de la fiche sont ils public ou pas ? datefin datetime, -- end date of validity of the contribution / date de fin de validite de la cotisation - default_lang varchar(6) NULL, + default_lang varchar(6) DEFAULT NULL, note_private text DEFAULT NULL, note_public text DEFAULT NULL, model_pdf varchar(255), From d7e114aa60b8daea21592db040090938d4f1f39f Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Sun, 7 Aug 2022 13:00:48 +0200 Subject: [PATCH 059/143] Update 16.0.0-17.0.0.sql --- htdocs/install/mysql/migration/16.0.0-17.0.0.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql index c1f96ca9d3e..b0f9dc6ce56 100644 --- a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql +++ b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql @@ -78,4 +78,4 @@ ALTER TABLE llx_ticket ADD email_date datetime after email_msgid; INSERT INTO llx_const (name, entity, value, type, visible) VALUES ('MAIN_SECURITY_MAX_IMG_IN_HTML_CONTENT', 1, 1000, 'int', 0); -ALTER TABLE `llx_adherent` ADD default_lang VARCHAR(6) NULL DEFAULT NULL AFTER datefin; +ALTER TABLE llx_adherent ADD COLUMN default_lang VARCHAR(6) DEFAULT NULL AFTER datefin; From 0f6effcdb05d54099a69d13bea265d73aaa5d1cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnter=20Lukas?= Date: Sun, 7 Aug 2022 14:43:26 +0200 Subject: [PATCH 060/143] Update import_xlsx.modules.php --- htdocs/core/modules/import/import_xlsx.modules.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php index 1c38f52cbfc..ae95b78ec8d 100644 --- a/htdocs/core/modules/import/import_xlsx.modules.php +++ b/htdocs/core/modules/import/import_xlsx.modules.php @@ -863,7 +863,7 @@ class ImportXlsx extends ModeleImports if (empty($keyfield)) { $keyfield = 'rowid'; } - $sqlSelect .= "WHERE " . $keyfield . " = " .((int) $lastinsertid); + $sqlSelect .= " WHERE " . $keyfield . " = " .((int) $lastinsertid); $resql = $this->db->query($sqlSelect); if ($resql) { From 6ff002405ef524d16adc8bf73cd39716917be281 Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Sun, 7 Aug 2022 19:37:15 +0200 Subject: [PATCH 061/143] NEW manage virtual stock at future date --- htdocs/product/class/api_products.class.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php index 2566ca24919..e34b270562e 100644 --- a/htdocs/product/class/api_products.class.php +++ b/htdocs/product/class/api_products.class.php @@ -253,7 +253,7 @@ class Products extends DolibarrApi if (!$ids_only) { $product_static = new Product($this->db); if ($product_static->fetch($obj->rowid)) { - if ($includestockdata && DolibarrApiAccess::$user->rights->stock->lire) { + if (!empty($includestockdata) && DolibarrApiAccess::$user->rights->stock->lire) { $product_static->load_stock(); if (is_array($product_static->stock_warehouse)) { @@ -1644,10 +1644,10 @@ class Products extends DolibarrApi $combinations[$key]->attributes = $prodc2vp->fetchByFkCombination((int) $combination->id); $combinations[$key] = $this->_cleanObjectDatas($combinations[$key]); - if ($includestock==1 && DolibarrApiAccess::$user->rights->stock->lire) { + if (!empty($includestock) && DolibarrApiAccess::$user->rights->stock->lire) { $productModel = new Product($this->db); $productModel->fetch((int) $combination->fk_product_child); - $productModel->load_stock(); + $productModel->load_stock($includestock); $combinations[$key]->stock_warehouse = $this->_cleanObjectDatas($productModel)->stock_warehouse; } } @@ -2040,8 +2040,8 @@ class Products extends DolibarrApi throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); } - if ($includestockdata && DolibarrApiAccess::$user->rights->stock->lire) { - $this->product->load_stock(); + if (!empty($includestockdata) && DolibarrApiAccess::$user->rights->stock->lire) { + $this->product->load_stock($includestockdata); if (is_array($this->product->stock_warehouse)) { foreach ($this->product->stock_warehouse as $keytmp => $valtmp) { From e55b45cdc8f1691b3d9ee82282163ed2c4f58849 Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Sun, 7 Aug 2022 19:52:06 +0200 Subject: [PATCH 062/143] Update stockatdate.php --- htdocs/product/stock/stockatdate.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php index d4f1bbf4861..ef774081017 100644 --- a/htdocs/product/stock/stockatdate.php +++ b/htdocs/product/stock/stockatdate.php @@ -518,13 +518,9 @@ while ($i < ($limit ? min($num, $limit) : $num)) { } if ($mode == 'future') { - $prod->load_stock('warehouseopen, warehouseinternal', 0); // This call also ->load_virtual_stock() - - //$result = $prod->load_stats_reception(0, '4'); - //print $prod->stats_commande_fournisseur['qty'].'
'."\n"; - //print $prod->stats_reception['qty']; - - $stock = ''.$langs->trans("FeatureNotYetAvailable").''; + $prod->load_stock('warehouseopen, warehouseinternal', 0, $dateendofday); + $stock = $prod->stock_theorique; + $prod->load_stock('warehouseopen, warehouseinternal', 0); $virtualstock = $prod->stock_theorique; } else { if ($fk_warehouse > 0) { From 07f6ae34dcba035ffdbfd344557565ef690ca808 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Sun, 7 Aug 2022 17:52:32 +0000 Subject: [PATCH 063/143] Fixing style errors. --- htdocs/product/stock/stockatdate.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php index ef774081017..82d818af2c9 100644 --- a/htdocs/product/stock/stockatdate.php +++ b/htdocs/product/stock/stockatdate.php @@ -518,7 +518,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) { } if ($mode == 'future') { - $prod->load_stock('warehouseopen, warehouseinternal', 0, $dateendofday); + $prod->load_stock('warehouseopen, warehouseinternal', 0, $dateendofday); $stock = $prod->stock_theorique; $prod->load_stock('warehouseopen, warehouseinternal', 0); $virtualstock = $prod->stock_theorique; From fcff96d43f85a5edd52fe7fbb108838700214782 Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Sun, 7 Aug 2022 20:00:25 +0200 Subject: [PATCH 064/143] Update product.class.php --- htdocs/product/class/product.class.php | 56 ++++++++++++++++---------- 1 file changed, 34 insertions(+), 22 deletions(-) diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 6c249e6b3bd..f2611e80000 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -3038,12 +3038,13 @@ class Product extends CommonObject /** * Charge tableau des stats commande fournisseur pour le produit/service * - * @param int $socid Id societe pour filtrer sur une societe - * @param string $filtrestatut Id des statuts pour filtrer sur des statuts - * @param int $forVirtualStock Ignore rights filter for virtual stock calculation. - * @return int Array of stats in $this->stats_commande_fournisseur, <0 if ko or >0 if ok + * @param int $socid Id societe pour filtrer sur une societe + * @param string $filtrestatut Id des statuts pour filtrer sur des statuts + * @param int $forVirtualStock Ignore rights filter for virtual stock calculation. + * @param int $dateofvirtualstock Date of virtual stock + * @return int Array of stats in $this->stats_commande_fournisseur, <0 if ko or >0 if ok */ - public function load_stats_commande_fournisseur($socid = 0, $filtrestatut = '', $forVirtualStock = 0) + public function load_stats_commande_fournisseur($socid = 0, $filtrestatut = '', $forVirtualStock = 0, $dateofvirtualstock = null) { // phpcs:enable global $conf, $user, $hookmanager, $action; @@ -3069,6 +3070,9 @@ class Product extends CommonObject if ($filtrestatut != '') { $sql .= " AND c.fk_statut in (".$this->db->sanitize($filtrestatut).")"; // Peut valoir 0 } + if (!empty($dateofvirtualstock)) { + $sql .= " AND c.date_livraison <= '".$this->db->idate($dateofvirtualstock)."'"; + } $result = $this->db->query($sql); if ($result) { @@ -3181,12 +3185,13 @@ class Product extends CommonObject /** * Charge tableau des stats réception fournisseur pour le produit/service * - * @param int $socid Id societe pour filtrer sur une societe - * @param string $filtrestatut Id statut pour filtrer sur un statut - * @param int $forVirtualStock Ignore rights filter for virtual stock calculation. + * @param int $socid Id societe pour filtrer sur une societe + * @param string $filtrestatut Id statut pour filtrer sur un statut + * @param int $forVirtualStock Ignore rights filter for virtual stock calculation. + * @param int $dateofvirtualstock Date of virtual stock * @return int Array of stats in $this->stats_reception, <0 if ko or >0 if ok */ - public function load_stats_reception($socid = 0, $filtrestatut = '', $forVirtualStock = 0) + public function load_stats_reception($socid = 0, $filtrestatut = '', $forVirtualStock = 0, $dateofvirtualstock = null) { // phpcs:enable global $conf, $user, $hookmanager, $action; @@ -3212,6 +3217,9 @@ class Product extends CommonObject if ($filtrestatut <> '') { $sql .= " AND cf.fk_statut IN (".$this->db->sanitize($filtrestatut).")"; } + if (!empty($dateofvirtualstock)) { + $sql .= " AND fd.datec <= '".$this->db->idate($dateofvirtualstock)."'"; + } $result = $this->db->query($sql); if ($result) { @@ -3238,12 +3246,13 @@ class Product extends CommonObject /** * Charge tableau des stats production pour le produit/service * - * @param int $socid Id societe pour filtrer sur une societe - * @param string $filtrestatut Id statut pour filtrer sur un statut - * @param int $forVirtualStock Ignore rights filter for virtual stock calculation. + * @param int $socid Id societe pour filtrer sur une societe + * @param string $filtrestatut Id statut pour filtrer sur un statut + * @param int $forVirtualStock Ignore rights filter for virtual stock calculation. + * @param int $dateofvirtualstock Date of virtual stock * @return integer Array of stats in $this->stats_mrptoproduce (nb=nb of order, qty=qty ordered), <0 if ko or >0 if ok */ - public function load_stats_inproduction($socid = 0, $filtrestatut = '', $forVirtualStock = 0) + public function load_stats_inproduction($socid = 0, $filtrestatut = '', $forVirtualStock = 0, $dateofvirtualstock = null) { // phpcs:enable global $conf, $user, $hookmanager, $action; @@ -3268,6 +3277,9 @@ class Product extends CommonObject if ($filtrestatut <> '') { $sql .= " AND m.status IN (".$this->db->sanitize($filtrestatut).")"; } + if (!empty($dateofvirtualstock)) { + $sql .= " AND m.date_valid <= '".$this->db->idate($dateofvirtualstock)."'"; // better date to code ? end of production ? + } $sql .= " GROUP BY role"; $this->stats_mrptoconsume['customers'] = 0; @@ -5346,10 +5358,11 @@ class Product extends CommonObject * @param string $option '' = Load all stock info, also from closed and internal warehouses, 'nobatch', 'novirtual' * You can also filter on 'warehouseclosed', 'warehouseopen', 'warehouseinternal' * @param int $includedraftpoforvirtual Include draft status of PO for virtual stock calculation + * @param int $dateofvirtualstock Date of virtual stock * @return int < 0 if KO, > 0 if OK * @see load_virtual_stock(), loadBatchInfo() */ - public function load_stock($option = '', $includedraftpoforvirtual = null) + public function load_stock($option = '', $includedraftpoforvirtual = null, $dateofvirtualstock = null) { // phpcs:enable global $conf; @@ -5407,7 +5420,7 @@ class Product extends CommonObject $this->db->free($result); if (!preg_match('/novirtual/', $option)) { - $this->load_virtual_stock($includedraftpoforvirtual); // This also load all arrays stats_xxx... + $this->load_virtual_stock($includedraftpoforvirtual, $dateofvirtualstock); // This also load all arrays stats_xxx... } return 1; @@ -5424,10 +5437,11 @@ class Product extends CommonObject * This function need a lot of load. If you use it on list, use a cache to execute it one for each product id. * * @param int $includedraftpoforvirtual Include draft status and not yet approved Purchase Orders for virtual stock calculation + * @param int $dateofvirtualstock Date of virtual stock * @return int < 0 if KO, > 0 if OK * @see load_stock(), loadBatchInfo() */ - public function load_virtual_stock($includedraftpoforvirtual = null) + public function load_virtual_stock($includedraftpoforvirtual = null, $dateofvirtualstock = null) { // phpcs:enable global $conf, $hookmanager, $action; @@ -5466,7 +5480,7 @@ class Product extends CommonObject if (isset($includedraftpoforvirtual)) { $filterStatus = '0,1,2,'.$filterStatus; // 1,2 may have already been inside $filterStatus but it is better to have twice than missing $filterStatus does not include them } - $result = $this->load_stats_commande_fournisseur(0, $filterStatus, 1); + $result = $this->load_stats_commande_fournisseur(0, $filterStatus, 1, $dateofvirtualstock); if ($result < 0) { dol_print_error($this->db, $this->error); } @@ -5478,7 +5492,7 @@ class Product extends CommonObject if (isset($includedraftpoforvirtual)) { $filterStatus = '0,'.$filterStatus; } - $result = $this->load_stats_reception(0, $filterStatus, 1); + $result = $this->load_stats_reception(0, $filterStatus, 1, $dateofvirtualstock); if ($result < 0) { dol_print_error($this->db, $this->error); } @@ -5490,14 +5504,14 @@ class Product extends CommonObject if (isset($includedraftpoforvirtual)) { $filterStatus = '0,'.$filterStatus; } - $result = $this->load_stats_reception(0, $filterStatus, 1); // Use same tables than when module reception is not used. + $result = $this->load_stats_reception(0, $filterStatus, 1, $dateofvirtualstock); // Use same tables than when module reception is not used. if ($result < 0) { dol_print_error($this->db, $this->error); } $stock_reception_fournisseur = $this->stats_reception['qty']; } if (!empty($conf->mrp->enabled)) { - $result = $this->load_stats_inproduction(0, '1,2', 1); + $result = $this->load_stats_inproduction(0, '1,2', 1, $dateofvirtualstock); if ($result < 0) { dol_print_error($this->db, $this->error); } @@ -6196,8 +6210,6 @@ class Product extends CommonObject } } - - /** * Class to manage products or services. * Do not use 'Service' as class name since it is already used by APIs. From 96c17b485c2471bf5b9535ff731a013cc84572e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Mon, 8 Aug 2022 11:07:38 +0200 Subject: [PATCH 065/143] do not loose decription when changing country, reload cause description lost --- htdocs/product/card.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/product/card.php b/htdocs/product/card.php index a1be8f35c29..b6180b2f77d 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -16,7 +16,7 @@ * Copyright (C) 2016 Charlie Benke * Copyright (C) 2016 Meziane Sof * Copyright (C) 2017 Josep Lluís Amador - * Copyright (C) 2019-2021 Frédéric France + * Copyright (C) 2019-2022 Frédéric France * Copyright (C) 2019-2020 Thibault FOUCART * Copyright (C) 2020 Pierre Ardoin * @@ -1728,7 +1728,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { print '"; From 5ef9d2d40d707b00a341cfd5eb7f2ad5b1b0d809 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Mon, 8 Aug 2022 11:11:17 +0200 Subject: [PATCH 066/143] keep url --- htdocs/product/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/product/card.php b/htdocs/product/card.php index b6180b2f77d..b8f4a8fa7f7 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -1738,7 +1738,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { if (empty($conf->global->PRODUCT_DISABLE_PUBLIC_URL)) { print ''; } From b20144c3d01f0d44a6f22163650d1958e1e441dc Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 8 Aug 2022 11:39:43 +0200 Subject: [PATCH 067/143] FIX php8 compatibility --- htdocs/comm/propal/card.php | 12 ++++++------ htdocs/commande/card.php | 8 ++++---- htdocs/compta/facture/card.php | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index b8b46a0c8d9..c05554d2242 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -112,17 +112,17 @@ if ($id > 0 || !empty($ref)) { // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context $hookmanager->initHooks(array('propalcard', 'globalcard')); -$usercanread = $user->rights->propal->lire; -$usercancreate = $user->rights->propal->creer; -$usercandelete = $user->rights->propal->supprimer; +$usercanread = $user->hasRight("propal", "lire"); +$usercancreate = $user->hasRight("propal", "creer"); +$usercandelete = $user->hasRight("propal", "supprimer"); $usercanclose = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->propal->propal_advance->close))); $usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->propal->propal_advance->validate))); $usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->propal->propal_advance->send))); -$usercancreateorder = $user->rights->commande->creer; -$usercancreateinvoice = $user->rights->facture->creer; -$usercancreatecontract = $user->rights->contrat->creer; +$usercancreateorder = $user->hasRight("commande", "creer"); +$usercancreateinvoice = $user->hasRight("facture", "creer"); +$usercancreatecontract = $user->hasRight("contrat", "creer"); $usercancreateintervention = $user->hasRight('ficheinter', 'creer'); $usercancreatepurchaseorder = ($user->hasRight('fournisseur', 'commande', 'creer') || $user->hasRight('supplier_order', 'creer')); diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 1e6a33e8ae8..bc4d085f8ce 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -108,16 +108,16 @@ $extrafields->fetch_name_optionals_label($object->table_element); // Load object include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once -$usercanread = $user->rights->commande->lire; -$usercancreate = $user->rights->commande->creer; -$usercandelete = $user->rights->commande->supprimer; +$usercanread = $user->hasRight("commande", "lire"); +$usercancreate = $user->hasRight("commande", "creer"); +$usercandelete = $user->hasRight("commande", "supprimer"); // Advanced permissions $usercanclose = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->commande->creer)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->commande->order_advance->close))); $usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->commande->order_advance->validate))); $usercancancel = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->commande->order_advance->annuler))); $usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->commande->order_advance->send); -$usercancreatepurchaseorder = ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer); +$usercancreatepurchaseorder = ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer")); $permissionnote = $usercancreate; // Used by the include of actions_setnotes.inc.php $permissiondellink = $usercancreate; // Used by the include of actions_dellink.inc.php diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index d0b0ba331f3..ea2eb805ce5 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -128,11 +128,11 @@ if ($id > 0 || !empty($ref)) { // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context $hookmanager->initHooks(array('invoicecard', 'globalcard')); -$usercanread = $user->rights->facture->lire; -$usercancreate = $user->rights->facture->creer; -$usercanissuepayment = $user->rights->facture->paiement; -$usercandelete = $user->rights->facture->supprimer; -$usercancreatecontract = $user->rights->contrat->creer; +$usercanread = $user->hasRight("facture", "lire"); +$usercancreate = $user->hasRight("facture", "creer"); +$usercanissuepayment = $user->hasRight("facture", "paiement"); +$usercandelete = $user->hasRight("facture", "supprimer"); +$usercancreatecontract = $user->hasRight("contrat", "creer"); $usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->facture->invoice_advance->validate))); $usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->facture->invoice_advance->send))); $usercanreopen = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->facture->invoice_advance->reopen))); From 0e0c297ed59f49d5a474164e835aed5f73dc0a0d Mon Sep 17 00:00:00 2001 From: lvessiller Date: Mon, 8 Aug 2022 14:56:28 +0200 Subject: [PATCH 068/143] NEW filter on reception dates (from / to) in cheque paiement card --- htdocs/compta/paiement/cheque/card.php | 38 +++++++++++++++++++++----- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php index 8c859e6e689..f41ecd820ad 100644 --- a/htdocs/compta/paiement/cheque/card.php +++ b/htdocs/compta/paiement/cheque/card.php @@ -59,8 +59,15 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit; $offset = $limit * $page; $upload_dir = $conf->bank->multidir_output[$object->entity ? $object->entity : $conf->entity]."/checkdeposits"; - -$filterdate = dol_mktime(0, 0, 0, GETPOST('fdmonth'), GETPOST('fdday'), GETPOST('fdyear')); +// filter by dates from / to +$search_date_start_day = GETPOST('search_date_start_day', 'int'); +$search_date_start_month = GETPOST('search_date_start_month', 'int'); +$search_date_start_year = GETPOST('search_date_start_year', 'int'); +$search_date_end_day = GETPOST('search_date_end_day', 'int'); +$search_date_end_month = GETPOST('search_date_end_month', 'int'); +$search_date_end_year = GETPOST('search_date_end_year', 'int'); +$search_date_start = dol_mktime(0, 0, 0, $search_date_start_month, $search_date_start_day, $search_date_start_year); +$search_date_end = dol_mktime(23, 59, 59, $search_date_end_month, $search_date_end_day, $search_date_end_year); $filteraccountid = GETPOST('accountid', 'int'); // Security check @@ -265,7 +272,15 @@ if ($action == 'builddoc' && $user->rights->banque->cheque) { */ if (GETPOST('removefilter')) { - $filterdate = ''; + // filter by dates from / to + $search_date_start_day = ''; + $search_date_start_month = ''; + $search_date_start_year = ''; + $search_date_end_day = ''; + $search_date_end_month = ''; + $search_date_end_year = ''; + $search_date_start = ''; + $search_date_end = ''; $filteraccountid = 0; } @@ -352,7 +367,13 @@ if ($action == 'new') { //print ''; // Filter print ''; print ''; - print ''; diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php index a78694bf830..b66eff03a71 100644 --- a/htdocs/product/stock/replenishorders.php +++ b/htdocs/product/stock/replenishorders.php @@ -217,13 +217,13 @@ if ($resql) { print ''; print ''; print ''; print ''; print ''; + print ''; // Author $userstatic->id = $obj->fk_user_author; From a465aa8f581b062475d0adadfaa03c95d1a021d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 10 Aug 2022 14:47:04 +0200 Subject: [PATCH 100/143] fix php8 warning --- htdocs/core/class/html.formmail.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index c23545a34c9..e906fc7f7a6 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -604,7 +604,7 @@ class FormMail extends Form // Also add robot email if (!empty($this->fromalsorobot)) { - if (!empty($conf->global->MAIN_MAIL_EMAIL_FROM) && $conf->global->MAIN_MAIL_EMAIL_FROM != $conf->global->MAIN_INFO_SOCIETE_MAIL) { + if (!empty($conf->global->MAIN_MAIL_EMAIL_FROM) && getDolGlobalString('MAIN_MAIL_EMAIL_FROM') != getDolGlobalString('MAIN_INFO_SOCIETE_MAIL')) { $liste['robot'] = $conf->global->MAIN_MAIL_EMAIL_FROM; if ($this->frommail) { $liste['robot'] .= ' <'.$conf->global->MAIN_MAIL_EMAIL_FROM.'>'; From 3efcd5f618e9a3f248c63de767447283767d722c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 10 Aug 2022 16:29:37 +0200 Subject: [PATCH 101/143] fix log --- htdocs/core/class/CMailFile.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index 161be6dc72e..54573f92c7a 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -992,7 +992,7 @@ class CMailFile } catch (Exception $e) { // Return an error if token not found $this->errors[] = $e->getMessage(); - dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR); + dol_syslog("CMailFile::sendfile: mail end error=".$e->getMessage(), LOG_ERR); } } if (!empty($conf->global->$keyforsslseflsigned)) { From d6494ae484db9879e96c9ef1692fef46cf1dc621 Mon Sep 17 00:00:00 2001 From: lvessiller Date: Wed, 10 Aug 2022 17:35:39 +0200 Subject: [PATCH 102/143] NEW make sell or eat by mandatory in product lot (SQL) --- htdocs/install/mysql/migration/16.0.0-17.0.0.sql | 3 +++ htdocs/install/mysql/tables/llx_product.sql | 1 + 2 files changed, 4 insertions(+) diff --git a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql index e72fc1b8dcd..ea87bd858e0 100644 --- a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql +++ b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql @@ -77,3 +77,6 @@ ALTER TABLE llx_recruitment_recruitmentcandidature ADD email_date datetime after ALTER TABLE llx_ticket ADD email_date datetime after email_msgid; INSERT INTO llx_const (name, entity, value, type, visible) VALUES ('MAIN_SECURITY_MAX_IMG_IN_HTML_CONTENT', 1, 1000, 'int', 0); + +-- Make sell-by or eat-by date mandatory +ALTER TABLE llx_product ADD COLUMN sell_or_eat_by_mandatory tinyint DEFAULT 0 NOT NULL AFTER tobatch; diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql index 83e8882caa7..a234ae8ddb1 100644 --- a/htdocs/install/mysql/tables/llx_product.sql +++ b/htdocs/install/mysql/tables/llx_product.sql @@ -59,6 +59,7 @@ create table llx_product tobuy tinyint DEFAULT 1, -- Product you buy onportal tinyint DEFAULT 0, -- If it is a product you sell and you want to sell it on portal (module website must be on) tobatch tinyint DEFAULT 0 NOT NULL, -- Is it a product that need a batch management (eat-by or lot management) + sell_or_eat_by_mandatory tinyint DEFAULT 0 NOT NULL, -- Make sell-by or eat-by date mandatory batch_mask varchar(32) DEFAULT NULL, -- If the product has batch feature, you may want to use a batch mask per product fk_product_type integer DEFAULT 0, -- Type of product: 0 for regular product, 1 for service, 9 for other (used by external module) duration varchar(6), From bde596deb37fb48b5bc74c4e92294817925b1f83 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 10 Aug 2022 17:55:42 +0200 Subject: [PATCH 103/143] Upgrade to jquery-ui 1.13.2 #yogosha12015 --- COPYRIGHT | 2 +- htdocs/includes/jquery/js/jquery-ui.js | 165 +++++++++++---------- htdocs/includes/jquery/js/jquery-ui.min.js | 4 +- 3 files changed, 88 insertions(+), 83 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 45b3047a375..83d054d63be 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -52,7 +52,7 @@ Ace 1.4.14 BSD Yes ChartJS 3.7.1 MIT License Yes JS library for graph CKEditor 4.18 LGPL-2.1+ Yes Editor WYSIWYG jQuery 3.6.0 MIT License Yes JS library -jQuery UI 1.13.1 GPL and MIT License Yes JS library plugin UI +jQuery UI 1.13.2 GPL and MIT License Yes JS library plugin UI jQuery select2 4.0.13 GPL and Apache License Yes JS library plugin for sexier multiselect. Warning: 4.0.6+ create troubles without patching css jQuery blockUI 2.70.0 GPL and MIT License Yes JS library plugin blockUI (to use ajax popups) jQuery Colorpicker 1.1 MIT License Yes JS library for color picker for a defined list of colors diff --git a/htdocs/includes/jquery/js/jquery-ui.js b/htdocs/includes/jquery/js/jquery-ui.js index 5d9bfa2f1b1..1a613bf2f94 100644 --- a/htdocs/includes/jquery/js/jquery-ui.js +++ b/htdocs/includes/jquery/js/jquery-ui.js @@ -1,4 +1,4 @@ -/*! jQuery UI - v1.13.1 - 2022-01-20 +/*! jQuery UI - v1.13.2 - 2022-07-14 * http://jqueryui.com * Includes: widget.js, position.js, data.js, disable-selection.js, effect.js, effects/effect-blind.js, effects/effect-bounce.js, effects/effect-clip.js, effects/effect-drop.js, effects/effect-explode.js, effects/effect-fade.js, effects/effect-fold.js, effects/effect-highlight.js, effects/effect-puff.js, effects/effect-pulsate.js, effects/effect-scale.js, effects/effect-shake.js, effects/effect-size.js, effects/effect-slide.js, effects/effect-transfer.js, focusable.js, form-reset-mixin.js, jquery-patch.js, keycode.js, labels.js, scroll-parent.js, tabbable.js, unique-id.js, widgets/accordion.js, widgets/autocomplete.js, widgets/button.js, widgets/checkboxradio.js, widgets/controlgroup.js, widgets/datepicker.js, widgets/dialog.js, widgets/draggable.js, widgets/droppable.js, widgets/menu.js, widgets/mouse.js, widgets/progressbar.js, widgets/resizable.js, widgets/selectable.js, widgets/selectmenu.js, widgets/slider.js, widgets/sortable.js, widgets/spinner.js, widgets/tabs.js, widgets/tooltip.js * Copyright jQuery Foundation and other contributors; Licensed MIT */ @@ -20,11 +20,11 @@ $.ui = $.ui || {}; -var version = $.ui.version = "1.13.1"; +var version = $.ui.version = "1.13.2"; /*! - * jQuery UI Widget 1.13.1 + * jQuery UI Widget 1.13.2 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -766,7 +766,7 @@ var widget = $.widget; /*! - * jQuery UI Position 1.13.1 + * jQuery UI Position 1.13.2 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -1263,7 +1263,7 @@ var position = $.ui.position; /*! - * jQuery UI :data 1.13.1 + * jQuery UI :data 1.13.2 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -1292,7 +1292,7 @@ var data = $.extend( $.expr.pseudos, { } ); /*! - * jQuery UI Disable Selection 1.13.1 + * jQuery UI Disable Selection 1.13.2 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -2047,7 +2047,7 @@ colors = jQuery.Color.names = { /*! - * jQuery UI Effects 1.13.1 + * jQuery UI Effects 1.13.2 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -2431,7 +2431,7 @@ if ( $.uiBackCompat !== false ) { } $.extend( $.effects, { - version: "1.13.1", + version: "1.13.2", define: function( name, mode, effect ) { if ( !effect ) { @@ -2999,7 +2999,7 @@ var effect = $.effects; /*! - * jQuery UI Effects Blind 1.13.1 + * jQuery UI Effects Blind 1.13.2 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -3054,7 +3054,7 @@ var effectsEffectBlind = $.effects.define( "blind", "hide", function( options, d /*! - * jQuery UI Effects Bounce 1.13.1 + * jQuery UI Effects Bounce 1.13.2 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -3149,7 +3149,7 @@ var effectsEffectBounce = $.effects.define( "bounce", function( options, done ) /*! - * jQuery UI Effects Clip 1.13.1 + * jQuery UI Effects Clip 1.13.2 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -3199,7 +3199,7 @@ var effectsEffectClip = $.effects.define( "clip", "hide", function( options, don /*! - * jQuery UI Effects Drop 1.13.1 + * jQuery UI Effects Drop 1.13.2 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -3253,7 +3253,7 @@ var effectsEffectDrop = $.effects.define( "drop", "hide", function( options, don /*! - * jQuery UI Effects Explode 1.13.1 + * jQuery UI Effects Explode 1.13.2 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -3349,7 +3349,7 @@ var effectsEffectExplode = $.effects.define( "explode", "hide", function( option /*! - * jQuery UI Effects Fade 1.13.1 + * jQuery UI Effects Fade 1.13.2 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -3381,7 +3381,7 @@ var effectsEffectFade = $.effects.define( "fade", "toggle", function( options, d /*! - * jQuery UI Effects Fold 1.13.1 + * jQuery UI Effects Fold 1.13.2 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -3455,7 +3455,7 @@ var effectsEffectFold = $.effects.define( "fold", "hide", function( options, don /*! - * jQuery UI Effects Highlight 1.13.1 + * jQuery UI Effects Highlight 1.13.2 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -3497,7 +3497,7 @@ var effectsEffectHighlight = $.effects.define( "highlight", "show", function( op /*! - * jQuery UI Effects Size 1.13.1 + * jQuery UI Effects Size 1.13.2 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -3675,7 +3675,7 @@ var effectsEffectSize = $.effects.define( "size", function( options, done ) { /*! - * jQuery UI Effects Scale 1.13.1 + * jQuery UI Effects Scale 1.13.2 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -3715,7 +3715,7 @@ var effectsEffectScale = $.effects.define( "scale", function( options, done ) { /*! - * jQuery UI Effects Puff 1.13.1 + * jQuery UI Effects Puff 1.13.2 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -3741,7 +3741,7 @@ var effectsEffectPuff = $.effects.define( "puff", "hide", function( options, don /*! - * jQuery UI Effects Pulsate 1.13.1 + * jQuery UI Effects Pulsate 1.13.2 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -3790,7 +3790,7 @@ var effectsEffectPulsate = $.effects.define( "pulsate", "show", function( option /*! - * jQuery UI Effects Shake 1.13.1 + * jQuery UI Effects Shake 1.13.2 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -3849,7 +3849,7 @@ var effectsEffectShake = $.effects.define( "shake", function( options, done ) { /*! - * jQuery UI Effects Slide 1.13.1 + * jQuery UI Effects Slide 1.13.2 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -3910,7 +3910,7 @@ var effectsEffectSlide = $.effects.define( "slide", "show", function( options, d /*! - * jQuery UI Effects Transfer 1.13.1 + * jQuery UI Effects Transfer 1.13.2 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -3935,7 +3935,7 @@ var effectsEffectTransfer = effect; /*! - * jQuery UI Focusable 1.13.1 + * jQuery UI Focusable 1.13.2 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -4017,7 +4017,7 @@ var form = $.fn._form = function() { /*! - * jQuery UI Form Reset Mixin 1.13.1 + * jQuery UI Form Reset Mixin 1.13.2 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -4079,7 +4079,7 @@ var formResetMixin = $.ui.formResetMixin = { /*! - * jQuery UI Support for jQuery core 1.8.x and newer 1.13.1 + * jQuery UI Support for jQuery core 1.8.x and newer 1.13.2 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -4154,7 +4154,7 @@ if ( !$.fn.even || !$.fn.odd ) { ; /*! - * jQuery UI Keycode 1.13.1 + * jQuery UI Keycode 1.13.2 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -4189,7 +4189,7 @@ var keycode = $.ui.keyCode = { /*! - * jQuery UI Labels 1.13.1 + * jQuery UI Labels 1.13.2 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -4244,7 +4244,7 @@ var labels = $.fn.labels = function() { /*! - * jQuery UI Scroll Parent 1.13.1 + * jQuery UI Scroll Parent 1.13.2 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -4278,7 +4278,7 @@ var scrollParent = $.fn.scrollParent = function( includeHidden ) { /*! - * jQuery UI Tabbable 1.13.1 + * jQuery UI Tabbable 1.13.2 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -4302,7 +4302,7 @@ var tabbable = $.extend( $.expr.pseudos, { /*! - * jQuery UI Unique ID 1.13.1 + * jQuery UI Unique ID 1.13.2 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -4340,7 +4340,7 @@ var uniqueId = $.fn.extend( { /*! - * jQuery UI Accordion 1.13.1 + * jQuery UI Accordion 1.13.2 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -4361,7 +4361,7 @@ var uniqueId = $.fn.extend( { var widgetsAccordion = $.widget( "ui.accordion", { - version: "1.13.1", + version: "1.13.2", options: { active: 0, animate: {}, @@ -4972,7 +4972,7 @@ var safeActiveElement = $.ui.safeActiveElement = function( document ) { /*! - * jQuery UI Menu 1.13.1 + * jQuery UI Menu 1.13.2 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -4991,7 +4991,7 @@ var safeActiveElement = $.ui.safeActiveElement = function( document ) { var widgetsMenu = $.widget( "ui.menu", { - version: "1.13.1", + version: "1.13.2", defaultElement: "
    ", delay: 300, options: { @@ -5663,7 +5663,7 @@ var widgetsMenu = $.widget( "ui.menu", { /*! - * jQuery UI Autocomplete 1.13.1 + * jQuery UI Autocomplete 1.13.2 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -5682,7 +5682,7 @@ var widgetsMenu = $.widget( "ui.menu", { $.widget( "ui.autocomplete", { - version: "1.13.1", + version: "1.13.2", defaultElement: "", options: { appendTo: null, @@ -6319,7 +6319,7 @@ var widgetsAutocomplete = $.ui.autocomplete; /*! - * jQuery UI Controlgroup 1.13.1 + * jQuery UI Controlgroup 1.13.2 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -6340,7 +6340,7 @@ var widgetsAutocomplete = $.ui.autocomplete; var controlgroupCornerRegex = /ui-corner-([a-z]){2,6}/g; var widgetsControlgroup = $.widget( "ui.controlgroup", { - version: "1.13.1", + version: "1.13.2", defaultElement: "
    ", options: { direction: "horizontal", @@ -6604,7 +6604,7 @@ var widgetsControlgroup = $.widget( "ui.controlgroup", { } ); /*! - * jQuery UI Checkboxradio 1.13.1 + * jQuery UI Checkboxradio 1.13.2 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -6624,7 +6624,7 @@ var widgetsControlgroup = $.widget( "ui.controlgroup", { $.widget( "ui.checkboxradio", [ $.ui.formResetMixin, { - version: "1.13.1", + version: "1.13.2", options: { disabled: null, label: null, @@ -6636,8 +6636,7 @@ $.widget( "ui.checkboxradio", [ $.ui.formResetMixin, { }, _getCreateOptions: function() { - var disabled, labels; - var that = this; + var disabled, labels, labelContents; var options = this._super() || {}; // We read the type here, because it makes more sense to throw a element type error first, @@ -6657,12 +6656,18 @@ $.widget( "ui.checkboxradio", [ $.ui.formResetMixin, { // We need to get the label text but this may also need to make sure it does not contain the // input itself. - this.label.contents().not( this.element[ 0 ] ).each( function() { + // The label contents could be text, html, or a mix. We wrap all elements + // and read the wrapper's `innerHTML` to get a string representation of + // the label, without the input as part of it. + labelContents = this.label.contents().not( this.element[ 0 ] ); - // The label contents could be text, html, or a mix. We concat each element to get a - // string representation of the label, without the input as part of it. - that.originalLabel += this.nodeType === 3 ? $( this ).text() : this.outerHTML; - } ); + if ( labelContents.length ) { + this.originalLabel += labelContents + .clone() + .wrapAll( "
    " ) + .parent() + .html(); + } // Set the label option if we found label text if ( this.originalLabel ) { @@ -6870,7 +6875,7 @@ var widgetsCheckboxradio = $.ui.checkboxradio; /*! - * jQuery UI Button 1.13.1 + * jQuery UI Button 1.13.2 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -6889,7 +6894,7 @@ var widgetsCheckboxradio = $.ui.checkboxradio; $.widget( "ui.button", { - version: "1.13.1", + version: "1.13.2", defaultElement: "
    "),i=e.children()[0];return V("body").append(e),t=i.offsetWidth,e.css("overflow","scroll"),t===(i=i.offsetWidth)&&(i=e[0].clientWidth),e.remove(),s=t-i},getScrollInfo:function(t){var e=t.isWindow||t.isDocument?"":t.element.css("overflow-x"),i=t.isWindow||t.isDocument?"":t.element.css("overflow-y"),e="scroll"===e||"auto"===e&&t.widthx(k(s),k(n))?o.important="horizontal":o.important="vertical",u.using.call(this,t,o)}),a.offset(V.extend(h,{using:t}))})},V.ui.position={fit:{left:function(t,e){var i=e.within,s=i.isWindow?i.scrollLeft:i.offset.left,n=i.width,o=t.left-e.collisionPosition.marginLeft,a=s-o,r=o+e.collisionWidth-n-s;e.collisionWidth>n?0n?0")[0],w=d.each;function P(t){return null==t?t+"":"object"==typeof t?p[e.call(t)]||"object":typeof t}function M(t,e,i){var s=v[e.type]||{};return null==t?i||!e.def?null:e.def:(t=s.floor?~~t:parseFloat(t),isNaN(t)?e.def:s.mod?(t+s.mod)%s.mod:Math.min(s.max,Math.max(0,t)))}function S(s){var n=m(),o=n._rgba=[];return s=s.toLowerCase(),w(g,function(t,e){var i=e.re.exec(s),i=i&&e.parse(i),e=e.space||"rgba";if(i)return i=n[e](i),n[_[e].cache]=i[_[e].cache],o=n._rgba=i._rgba,!1}),o.length?("0,0,0,0"===o.join()&&d.extend(o,B.transparent),n):B[s]}function H(t,e,i){return 6*(i=(i+1)%1)<1?t+(e-t)*i*6:2*i<1?e:3*i<2?t+(e-t)*(2/3-i)*6:t}y.style.cssText="background-color:rgba(1,1,1,.5)",b.rgba=-1o.mod/2?s+=o.mod:s-n>o.mod/2&&(s-=o.mod)),l[i]=M((n-s)*a+s,e)))}),this[e](l)},blend:function(t){if(1===this._rgba[3])return this;var e=this._rgba.slice(),i=e.pop(),s=m(t)._rgba;return m(d.map(e,function(t,e){return(1-i)*s[e]+i*t}))},toRgbaString:function(){var t="rgba(",e=d.map(this._rgba,function(t,e){return null!=t?t:2").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),e={width:i.width(),height:i.height()},n=document.activeElement;try{n.id}catch(t){n=document.body}return i.wrap(t),i[0]!==n&&!V.contains(i[0],n)||V(n).trigger("focus"),t=i.parent(),"static"===i.css("position")?(t.css({position:"relative"}),i.css({position:"relative"})):(V.extend(s,{position:i.css("position"),zIndex:i.css("z-index")}),V.each(["top","left","bottom","right"],function(t,e){s[e]=i.css(e),isNaN(parseInt(s[e],10))&&(s[e]="auto")}),i.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),i.css(e),t.css(s).show()},removeWrapper:function(t){var e=document.activeElement;return t.parent().is(".ui-effects-wrapper")&&(t.parent().replaceWith(t),t[0]!==e&&!V.contains(t[0],e)||V(e).trigger("focus")),t}}),V.extend(V.effects,{version:"1.13.1",define:function(t,e,i){return i||(i=e,e="effect"),V.effects.effect[t]=i,V.effects.effect[t].mode=e,i},scaledDimensions:function(t,e,i){if(0===e)return{height:0,width:0,outerHeight:0,outerWidth:0};var s="horizontal"!==i?(e||100)/100:1,e="vertical"!==i?(e||100)/100:1;return{height:t.height()*e,width:t.width()*s,outerHeight:t.outerHeight()*e,outerWidth:t.outerWidth()*s}},clipToBox:function(t){return{width:t.clip.right-t.clip.left,height:t.clip.bottom-t.clip.top,left:t.clip.left,top:t.clip.top}},unshift:function(t,e,i){var s=t.queue();1").insertAfter(t).css({display:/^(inline|ruby)/.test(t.css("display"))?"inline-block":"block",visibility:"hidden",marginTop:t.css("marginTop"),marginBottom:t.css("marginBottom"),marginLeft:t.css("marginLeft"),marginRight:t.css("marginRight"),float:t.css("float")}).outerWidth(t.outerWidth()).outerHeight(t.outerHeight()).addClass("ui-effects-placeholder"),t.data(j+"placeholder",e)),t.css({position:i,left:s.left,top:s.top}),e},removePlaceholder:function(t){var e=j+"placeholder",i=t.data(e);i&&(i.remove(),t.removeData(e))},cleanUp:function(t){V.effects.restoreStyle(t),V.effects.removePlaceholder(t)},setTransition:function(s,t,n,o){return o=o||{},V.each(t,function(t,e){var i=s.cssUnit(e);0");l.appendTo("body").addClass(t.className).css({top:s.top-a,left:s.left-r,height:i.innerHeight(),width:i.innerWidth(),position:n?"fixed":"absolute"}).animate(o,t.duration,t.easing,function(){l.remove(),"function"==typeof e&&e()})}}),V.fx.step.clip=function(t){t.clipInit||(t.start=V(t.elem).cssClip(),"string"==typeof t.end&&(t.end=G(t.end,t.elem)),t.clipInit=!0),V(t.elem).cssClip({top:t.pos*(t.end.top-t.start.top)+t.start.top,right:t.pos*(t.end.right-t.start.right)+t.start.right,bottom:t.pos*(t.end.bottom-t.start.bottom)+t.start.bottom,left:t.pos*(t.end.left-t.start.left)+t.start.left})},Y={},V.each(["Quad","Cubic","Quart","Quint","Expo"],function(e,t){Y[t]=function(t){return Math.pow(t,e+2)}}),V.extend(Y,{Sine:function(t){return 1-Math.cos(t*Math.PI/2)},Circ:function(t){return 1-Math.sqrt(1-t*t)},Elastic:function(t){return 0===t||1===t?t:-Math.pow(2,8*(t-1))*Math.sin((80*(t-1)-7.5)*Math.PI/15)},Back:function(t){return t*t*(3*t-2)},Bounce:function(t){for(var e,i=4;t<((e=Math.pow(2,--i))-1)/11;);return 1/Math.pow(4,3-i)-7.5625*Math.pow((3*e-2)/22-t,2)}}),V.each(Y,function(t,e){V.easing["easeIn"+t]=e,V.easing["easeOut"+t]=function(t){return 1-e(1-t)},V.easing["easeInOut"+t]=function(t){return t<.5?e(2*t)/2:1-e(-2*t+2)/2}});y=V.effects,V.effects.define("blind","hide",function(t,e){var i={up:["bottom","top"],vertical:["bottom","top"],down:["top","bottom"],left:["right","left"],horizontal:["right","left"],right:["left","right"]},s=V(this),n=t.direction||"up",o=s.cssClip(),a={clip:V.extend({},o)},r=V.effects.createPlaceholder(s);a.clip[i[n][0]]=a.clip[i[n][1]],"show"===t.mode&&(s.cssClip(a.clip),r&&r.css(V.effects.clipToBox(a)),a.clip=o),r&&r.animate(V.effects.clipToBox(a),t.duration,t.easing),s.animate(a,{queue:!1,duration:t.duration,easing:t.easing,complete:e})}),V.effects.define("bounce",function(t,e){var i,s,n=V(this),o=t.mode,a="hide"===o,r="show"===o,l=t.direction||"up",h=t.distance,c=t.times||5,o=2*c+(r||a?1:0),u=t.duration/o,d=t.easing,p="up"===l||"down"===l?"top":"left",f="up"===l||"left"===l,g=0,t=n.queue().length;for(V.effects.createPlaceholder(n),l=n.css(p),h=h||n["top"==p?"outerHeight":"outerWidth"]()/3,r&&((s={opacity:1})[p]=l,n.css("opacity",0).css(p,f?2*-h:2*h).animate(s,u,d)),a&&(h/=Math.pow(2,c-1)),(s={})[p]=l;g").css({position:"absolute",visibility:"visible",left:-s*p,top:-i*f}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:p,height:f,left:n+(u?a*p:0),top:o+(u?r*f:0),opacity:u?0:1}).animate({left:n+(u?0:a*p),top:o+(u?0:r*f),opacity:u?1:0},t.duration||500,t.easing,m)}),V.effects.define("fade","toggle",function(t,e){var i="show"===t.mode;V(this).css("opacity",i?0:1).animate({opacity:i?1:0},{queue:!1,duration:t.duration,easing:t.easing,complete:e})}),V.effects.define("fold","hide",function(e,t){var i=V(this),s=e.mode,n="show"===s,o="hide"===s,a=e.size||15,r=/([0-9]+)%/.exec(a),l=!!e.horizFirst?["right","bottom"]:["bottom","right"],h=e.duration/2,c=V.effects.createPlaceholder(i),u=i.cssClip(),d={clip:V.extend({},u)},p={clip:V.extend({},u)},f=[u[l[0]],u[l[1]]],s=i.queue().length;r&&(a=parseInt(r[1],10)/100*f[o?0:1]),d.clip[l[0]]=a,p.clip[l[0]]=a,p.clip[l[1]]=0,n&&(i.cssClip(p.clip),c&&c.css(V.effects.clipToBox(p)),p.clip=u),i.queue(function(t){c&&c.animate(V.effects.clipToBox(d),h,e.easing).animate(V.effects.clipToBox(p),h,e.easing),t()}).animate(d,h,e.easing).animate(p,h,e.easing).queue(t),V.effects.unshift(i,s,4)}),V.effects.define("highlight","show",function(t,e){var i=V(this),s={backgroundColor:i.css("backgroundColor")};"hide"===t.mode&&(s.opacity=0),V.effects.saveStyle(i),i.css({backgroundImage:"none",backgroundColor:t.color||"#ffff99"}).animate(s,{queue:!1,duration:t.duration,easing:t.easing,complete:e})}),V.effects.define("size",function(s,e){var n,i=V(this),t=["fontSize"],o=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],a=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],r=s.mode,l="effect"!==r,h=s.scale||"both",c=s.origin||["middle","center"],u=i.css("position"),d=i.position(),p=V.effects.scaledDimensions(i),f=s.from||p,g=s.to||V.effects.scaledDimensions(i,0);V.effects.createPlaceholder(i),"show"===r&&(r=f,f=g,g=r),n={from:{y:f.height/p.height,x:f.width/p.width},to:{y:g.height/p.height,x:g.width/p.width}},"box"!==h&&"both"!==h||(n.from.y!==n.to.y&&(f=V.effects.setTransition(i,o,n.from.y,f),g=V.effects.setTransition(i,o,n.to.y,g)),n.from.x!==n.to.x&&(f=V.effects.setTransition(i,a,n.from.x,f),g=V.effects.setTransition(i,a,n.to.x,g))),"content"!==h&&"both"!==h||n.from.y!==n.to.y&&(f=V.effects.setTransition(i,t,n.from.y,f),g=V.effects.setTransition(i,t,n.to.y,g)),c&&(c=V.effects.getBaseline(c,p),f.top=(p.outerHeight-f.outerHeight)*c.y+d.top,f.left=(p.outerWidth-f.outerWidth)*c.x+d.left,g.top=(p.outerHeight-g.outerHeight)*c.y+d.top,g.left=(p.outerWidth-g.outerWidth)*c.x+d.left),delete f.outerHeight,delete f.outerWidth,i.css(f),"content"!==h&&"both"!==h||(o=o.concat(["marginTop","marginBottom"]).concat(t),a=a.concat(["marginLeft","marginRight"]),i.find("*[width]").each(function(){var t=V(this),e=V.effects.scaledDimensions(t),i={height:e.height*n.from.y,width:e.width*n.from.x,outerHeight:e.outerHeight*n.from.y,outerWidth:e.outerWidth*n.from.x},e={height:e.height*n.to.y,width:e.width*n.to.x,outerHeight:e.height*n.to.y,outerWidth:e.width*n.to.x};n.from.y!==n.to.y&&(i=V.effects.setTransition(t,o,n.from.y,i),e=V.effects.setTransition(t,o,n.to.y,e)),n.from.x!==n.to.x&&(i=V.effects.setTransition(t,a,n.from.x,i),e=V.effects.setTransition(t,a,n.to.x,e)),l&&V.effects.saveStyle(t),t.css(i),t.animate(e,s.duration,s.easing,function(){l&&V.effects.restoreStyle(t)})})),i.animate(g,{queue:!1,duration:s.duration,easing:s.easing,complete:function(){var t=i.offset();0===g.opacity&&i.css("opacity",f.opacity),l||(i.css("position","static"===u?"relative":u).offset(t),V.effects.saveStyle(i)),e()}})}),V.effects.define("scale",function(t,e){var i=V(this),s=t.mode,s=parseInt(t.percent,10)||(0===parseInt(t.percent,10)||"effect"!==s?0:100),s=V.extend(!0,{from:V.effects.scaledDimensions(i),to:V.effects.scaledDimensions(i,s,t.direction||"both"),origin:t.origin||["middle","center"]},t);t.fade&&(s.from.opacity=1,s.to.opacity=0),V.effects.effect.size.call(this,s,e)}),V.effects.define("puff","hide",function(t,e){t=V.extend(!0,{},t,{fade:!0,percent:parseInt(t.percent,10)||150});V.effects.effect.scale.call(this,t,e)}),V.effects.define("pulsate","show",function(t,e){var i=V(this),s=t.mode,n="show"===s,o=2*(t.times||5)+(n||"hide"===s?1:0),a=t.duration/o,r=0,l=1,s=i.queue().length;for(!n&&i.is(":visible")||(i.css("opacity",0).show(),r=1);l li > :first-child").add(t.find("> :not(li)").even())},heightStyle:"auto",icons:{activeHeader:"ui-icon-triangle-1-s",header:"ui-icon-triangle-1-e"},activate:null,beforeActivate:null},hideProps:{borderTopWidth:"hide",borderBottomWidth:"hide",paddingTop:"hide",paddingBottom:"hide",height:"hide"},showProps:{borderTopWidth:"show",borderBottomWidth:"show",paddingTop:"show",paddingBottom:"show",height:"show"},_create:function(){var t=this.options;this.prevShow=this.prevHide=V(),this._addClass("ui-accordion","ui-widget ui-helper-reset"),this.element.attr("role","tablist"),t.collapsible||!1!==t.active&&null!=t.active||(t.active=0),this._processPanels(),t.active<0&&(t.active+=this.headers.length),this._refresh()},_getCreateEventData:function(){return{header:this.active,panel:this.active.length?this.active.next():V()}},_createIcons:function(){var t,e=this.options.icons;e&&(t=V(""),this._addClass(t,"ui-accordion-header-icon","ui-icon "+e.header),t.prependTo(this.headers),t=this.active.children(".ui-accordion-header-icon"),this._removeClass(t,e.header)._addClass(t,null,e.activeHeader)._addClass(this.headers,"ui-accordion-icons"))},_destroyIcons:function(){this._removeClass(this.headers,"ui-accordion-icons"),this.headers.children(".ui-accordion-header-icon").remove()},_destroy:function(){var t;this.element.removeAttr("role"),this.headers.removeAttr("role aria-expanded aria-selected aria-controls tabIndex").removeUniqueId(),this._destroyIcons(),t=this.headers.next().css("display","").removeAttr("role aria-hidden aria-labelledby").removeUniqueId(),"content"!==this.options.heightStyle&&t.css("height","")},_setOption:function(t,e){"active"!==t?("event"===t&&(this.options.event&&this._off(this.headers,this.options.event),this._setupEvents(e)),this._super(t,e),"collapsible"!==t||e||!1!==this.options.active||this._activate(0),"icons"===t&&(this._destroyIcons(),e&&this._createIcons())):this._activate(e)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t),this._toggleClass(null,"ui-state-disabled",!!t),this._toggleClass(this.headers.add(this.headers.next()),null,"ui-state-disabled",!!t)},_keydown:function(t){if(!t.altKey&&!t.ctrlKey){var e=V.ui.keyCode,i=this.headers.length,s=this.headers.index(t.target),n=!1;switch(t.keyCode){case e.RIGHT:case e.DOWN:n=this.headers[(s+1)%i];break;case e.LEFT:case e.UP:n=this.headers[(s-1+i)%i];break;case e.SPACE:case e.ENTER:this._eventHandler(t);break;case e.HOME:n=this.headers[0];break;case e.END:n=this.headers[i-1]}n&&(V(t.target).attr("tabIndex",-1),V(n).attr("tabIndex",0),V(n).trigger("focus"),t.preventDefault())}},_panelKeyDown:function(t){t.keyCode===V.ui.keyCode.UP&&t.ctrlKey&&V(t.currentTarget).prev().trigger("focus")},refresh:function(){var t=this.options;this._processPanels(),!1===t.active&&!0===t.collapsible||!this.headers.length?(t.active=!1,this.active=V()):!1===t.active?this._activate(0):this.active.length&&!V.contains(this.element[0],this.active[0])?this.headers.length===this.headers.find(".ui-state-disabled").length?(t.active=!1,this.active=V()):this._activate(Math.max(0,t.active-1)):t.active=this.headers.index(this.active),this._destroyIcons(),this._refresh()},_processPanels:function(){var t=this.headers,e=this.panels;"function"==typeof this.options.header?this.headers=this.options.header(this.element):this.headers=this.element.find(this.options.header),this._addClass(this.headers,"ui-accordion-header ui-accordion-header-collapsed","ui-state-default"),this.panels=this.headers.next().filter(":not(.ui-accordion-content-active)").hide(),this._addClass(this.panels,"ui-accordion-content","ui-helper-reset ui-widget-content"),e&&(this._off(t.not(this.headers)),this._off(e.not(this.panels)))},_refresh:function(){var i,t=this.options,e=t.heightStyle,s=this.element.parent();this.active=this._findActive(t.active),this._addClass(this.active,"ui-accordion-header-active","ui-state-active")._removeClass(this.active,"ui-accordion-header-collapsed"),this._addClass(this.active.next(),"ui-accordion-content-active"),this.active.next().show(),this.headers.attr("role","tab").each(function(){var t=V(this),e=t.uniqueId().attr("id"),i=t.next(),s=i.uniqueId().attr("id");t.attr("aria-controls",s),i.attr("aria-labelledby",e)}).next().attr("role","tabpanel"),this.headers.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}).next().attr({"aria-hidden":"true"}).hide(),this.active.length?this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}).next().attr({"aria-hidden":"false"}):this.headers.eq(0).attr("tabIndex",0),this._createIcons(),this._setupEvents(t.event),"fill"===e?(i=s.height(),this.element.siblings(":visible").each(function(){var t=V(this),e=t.css("position");"absolute"!==e&&"fixed"!==e&&(i-=t.outerHeight(!0))}),this.headers.each(function(){i-=V(this).outerHeight(!0)}),this.headers.next().each(function(){V(this).height(Math.max(0,i-V(this).innerHeight()+V(this).height()))}).css("overflow","auto")):"auto"===e&&(i=0,this.headers.next().each(function(){var t=V(this).is(":visible");t||V(this).show(),i=Math.max(i,V(this).css("height","").height()),t||V(this).hide()}).height(i))},_activate:function(t){t=this._findActive(t)[0];t!==this.active[0]&&(t=t||this.active[0],this._eventHandler({target:t,currentTarget:t,preventDefault:V.noop}))},_findActive:function(t){return"number"==typeof t?this.headers.eq(t):V()},_setupEvents:function(t){var i={keydown:"_keydown"};t&&V.each(t.split(" "),function(t,e){i[e]="_eventHandler"}),this._off(this.headers.add(this.headers.next())),this._on(this.headers,i),this._on(this.headers.next(),{keydown:"_panelKeyDown"}),this._hoverable(this.headers),this._focusable(this.headers)},_eventHandler:function(t){var e=this.options,i=this.active,s=V(t.currentTarget),n=s[0]===i[0],o=n&&e.collapsible,a=o?V():s.next(),r=i.next(),a={oldHeader:i,oldPanel:r,newHeader:o?V():s,newPanel:a};t.preventDefault(),n&&!e.collapsible||!1===this._trigger("beforeActivate",t,a)||(e.active=!o&&this.headers.index(s),this.active=n?V():s,this._toggle(a),this._removeClass(i,"ui-accordion-header-active","ui-state-active"),e.icons&&(i=i.children(".ui-accordion-header-icon"),this._removeClass(i,null,e.icons.activeHeader)._addClass(i,null,e.icons.header)),n||(this._removeClass(s,"ui-accordion-header-collapsed")._addClass(s,"ui-accordion-header-active","ui-state-active"),e.icons&&(n=s.children(".ui-accordion-header-icon"),this._removeClass(n,null,e.icons.header)._addClass(n,null,e.icons.activeHeader)),this._addClass(s.next(),"ui-accordion-content-active")))},_toggle:function(t){var e=t.newPanel,i=this.prevShow.length?this.prevShow:t.oldPanel;this.prevShow.add(this.prevHide).stop(!0,!0),this.prevShow=e,this.prevHide=i,this.options.animate?this._animate(e,i,t):(i.hide(),e.show(),this._toggleComplete(t)),i.attr({"aria-hidden":"true"}),i.prev().attr({"aria-selected":"false","aria-expanded":"false"}),e.length&&i.length?i.prev().attr({tabIndex:-1,"aria-expanded":"false"}):e.length&&this.headers.filter(function(){return 0===parseInt(V(this).attr("tabIndex"),10)}).attr("tabIndex",-1),e.attr("aria-hidden","false").prev().attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_animate:function(t,i,e){var s,n,o,a=this,r=0,l=t.css("box-sizing"),h=t.length&&(!i.length||t.index()",delay:300,options:{icons:{submenu:"ui-icon-caret-1-e"},items:"> *",menus:"ul",position:{my:"left top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.lastMousePosition={x:null,y:null},this.element.uniqueId().attr({role:this.options.role,tabIndex:0}),this._addClass("ui-menu","ui-widget ui-widget-content"),this._on({"mousedown .ui-menu-item":function(t){t.preventDefault(),this._activateItem(t)},"click .ui-menu-item":function(t){var e=V(t.target),i=V(V.ui.safeActiveElement(this.document[0]));!this.mouseHandled&&e.not(".ui-state-disabled").length&&(this.select(t),t.isPropagationStopped()||(this.mouseHandled=!0),e.has(".ui-menu").length?this.expand(t):!this.element.is(":focus")&&i.closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":"_activateItem","mousemove .ui-menu-item":"_activateItem",mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(t,e){var i=this.active||this._menuItems().first();e||this.focus(t,i)},blur:function(t){this._delay(function(){V.contains(this.element[0],V.ui.safeActiveElement(this.document[0]))||this.collapseAll(t)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(t){this._closeOnDocumentClick(t)&&this.collapseAll(t,!0),this.mouseHandled=!1}})},_activateItem:function(t){var e,i;this.previousFilter||t.clientX===this.lastMousePosition.x&&t.clientY===this.lastMousePosition.y||(this.lastMousePosition={x:t.clientX,y:t.clientY},e=V(t.target).closest(".ui-menu-item"),i=V(t.currentTarget),e[0]===i[0]&&(i.is(".ui-state-active")||(this._removeClass(i.siblings().children(".ui-state-active"),null,"ui-state-active"),this.focus(t,i))))},_destroy:function(){var t=this.element.find(".ui-menu-item").removeAttr("role aria-disabled").children(".ui-menu-item-wrapper").removeUniqueId().removeAttr("tabIndex role aria-haspopup");this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeAttr("role aria-labelledby aria-expanded aria-hidden aria-disabled tabIndex").removeUniqueId().show(),t.children().each(function(){var t=V(this);t.data("ui-menu-submenu-caret")&&t.remove()})},_keydown:function(t){var e,i,s,n=!0;switch(t.keyCode){case V.ui.keyCode.PAGE_UP:this.previousPage(t);break;case V.ui.keyCode.PAGE_DOWN:this.nextPage(t);break;case V.ui.keyCode.HOME:this._move("first","first",t);break;case V.ui.keyCode.END:this._move("last","last",t);break;case V.ui.keyCode.UP:this.previous(t);break;case V.ui.keyCode.DOWN:this.next(t);break;case V.ui.keyCode.LEFT:this.collapse(t);break;case V.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(t);break;case V.ui.keyCode.ENTER:case V.ui.keyCode.SPACE:this._activate(t);break;case V.ui.keyCode.ESCAPE:this.collapse(t);break;default:e=this.previousFilter||"",s=n=!1,i=96<=t.keyCode&&t.keyCode<=105?(t.keyCode-96).toString():String.fromCharCode(t.keyCode),clearTimeout(this.filterTimer),i===e?s=!0:i=e+i,e=this._filterMenuItems(i),(e=s&&-1!==e.index(this.active.next())?this.active.nextAll(".ui-menu-item"):e).length||(i=String.fromCharCode(t.keyCode),e=this._filterMenuItems(i)),e.length?(this.focus(t,e),this.previousFilter=i,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter}n&&t.preventDefault()},_activate:function(t){this.active&&!this.active.is(".ui-state-disabled")&&(this.active.children("[aria-haspopup='true']").length?this.expand(t):this.select(t))},refresh:function(){var t,e,s=this,n=this.options.icons.submenu,i=this.element.find(this.options.menus);this._toggleClass("ui-menu-icons",null,!!this.element.find(".ui-icon").length),e=i.filter(":not(.ui-menu)").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var t=V(this),e=t.prev(),i=V("").data("ui-menu-submenu-caret",!0);s._addClass(i,"ui-menu-icon","ui-icon "+n),e.attr("aria-haspopup","true").prepend(i),t.attr("aria-labelledby",e.attr("id"))}),this._addClass(e,"ui-menu","ui-widget ui-widget-content ui-front"),(t=i.add(this.element).find(this.options.items)).not(".ui-menu-item").each(function(){var t=V(this);s._isDivider(t)&&s._addClass(t,"ui-menu-divider","ui-widget-content")}),i=(e=t.not(".ui-menu-item, .ui-menu-divider")).children().not(".ui-menu").uniqueId().attr({tabIndex:-1,role:this._itemRole()}),this._addClass(e,"ui-menu-item")._addClass(i,"ui-menu-item-wrapper"),t.filter(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!V.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(t,e){var i;"icons"===t&&(i=this.element.find(".ui-menu-icon"),this._removeClass(i,null,this.options.icons.submenu)._addClass(i,null,e.submenu)),this._super(t,e)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",String(t)),this._toggleClass(null,"ui-state-disabled",!!t)},focus:function(t,e){var i;this.blur(t,t&&"focus"===t.type),this._scrollIntoView(e),this.active=e.first(),i=this.active.children(".ui-menu-item-wrapper"),this._addClass(i,null,"ui-state-active"),this.options.role&&this.element.attr("aria-activedescendant",i.attr("id")),i=this.active.parent().closest(".ui-menu-item").children(".ui-menu-item-wrapper"),this._addClass(i,null,"ui-state-active"),t&&"keydown"===t.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),(i=e.children(".ui-menu")).length&&t&&/^mouse/.test(t.type)&&this._startOpening(i),this.activeMenu=e.parent(),this._trigger("focus",t,{item:e})},_scrollIntoView:function(t){var e,i,s;this._hasScroll()&&(i=parseFloat(V.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(V.css(this.activeMenu[0],"paddingTop"))||0,e=t.offset().top-this.activeMenu.offset().top-i-s,i=this.activeMenu.scrollTop(),s=this.activeMenu.height(),t=t.outerHeight(),e<0?this.activeMenu.scrollTop(i+e):s",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,liveRegionTimer:null,_create:function(){var i,s,n,t=this.element[0].nodeName.toLowerCase(),e="textarea"===t,t="input"===t;this.isMultiLine=e||!t&&this._isContentEditable(this.element),this.valueMethod=this.element[e||t?"val":"text"],this.isNewMenu=!0,this._addClass("ui-autocomplete-input"),this.element.attr("autocomplete","off"),this._on(this.element,{keydown:function(t){if(this.element.prop("readOnly"))s=n=i=!0;else{s=n=i=!1;var e=V.ui.keyCode;switch(t.keyCode){case e.PAGE_UP:i=!0,this._move("previousPage",t);break;case e.PAGE_DOWN:i=!0,this._move("nextPage",t);break;case e.UP:i=!0,this._keyEvent("previous",t);break;case e.DOWN:i=!0,this._keyEvent("next",t);break;case e.ENTER:this.menu.active&&(i=!0,t.preventDefault(),this.menu.select(t));break;case e.TAB:this.menu.active&&this.menu.select(t);break;case e.ESCAPE:this.menu.element.is(":visible")&&(this.isMultiLine||this._value(this.term),this.close(t),t.preventDefault());break;default:s=!0,this._searchTimeout(t)}}},keypress:function(t){if(i)return i=!1,void(this.isMultiLine&&!this.menu.element.is(":visible")||t.preventDefault());if(!s){var e=V.ui.keyCode;switch(t.keyCode){case e.PAGE_UP:this._move("previousPage",t);break;case e.PAGE_DOWN:this._move("nextPage",t);break;case e.UP:this._keyEvent("previous",t);break;case e.DOWN:this._keyEvent("next",t)}}},input:function(t){if(n)return n=!1,void t.preventDefault();this._searchTimeout(t)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(t){clearTimeout(this.searching),this.close(t),this._change(t)}}),this._initSource(),this.menu=V("
      ").appendTo(this._appendTo()).menu({role:null}).hide().attr({unselectable:"on"}).menu("instance"),this._addClass(this.menu.element,"ui-autocomplete","ui-front"),this._on(this.menu.element,{mousedown:function(t){t.preventDefault()},menufocus:function(t,e){var i,s;if(this.isNewMenu&&(this.isNewMenu=!1,t.originalEvent&&/^mouse/.test(t.originalEvent.type)))return this.menu.blur(),void this.document.one("mousemove",function(){V(t.target).trigger(t.originalEvent)});s=e.item.data("ui-autocomplete-item"),!1!==this._trigger("focus",t,{item:s})&&t.originalEvent&&/^key/.test(t.originalEvent.type)&&this._value(s.value),(i=e.item.attr("aria-label")||s.value)&&String.prototype.trim.call(i).length&&(clearTimeout(this.liveRegionTimer),this.liveRegionTimer=this._delay(function(){this.liveRegion.html(V("
      ").text(i))},100))},menuselect:function(t,e){var i=e.item.data("ui-autocomplete-item"),s=this.previous;this.element[0]!==V.ui.safeActiveElement(this.document[0])&&(this.element.trigger("focus"),this.previous=s,this._delay(function(){this.previous=s,this.selectedItem=i})),!1!==this._trigger("select",t,{item:i})&&this._value(i.value),this.term=this._value(),this.close(t),this.selectedItem=i}}),this.liveRegion=V("
      ",{role:"status","aria-live":"assertive","aria-relevant":"additions"}).appendTo(this.document[0].body),this._addClass(this.liveRegion,null,"ui-helper-hidden-accessible"),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(t,e){this._super(t,e),"source"===t&&this._initSource(),"appendTo"===t&&this.menu.element.appendTo(this._appendTo()),"disabled"===t&&e&&this.xhr&&this.xhr.abort()},_isEventTargetInWidget:function(t){var e=this.menu.element[0];return t.target===this.element[0]||t.target===e||V.contains(e,t.target)},_closeOnClickOutside:function(t){this._isEventTargetInWidget(t)||this.close()},_appendTo:function(){var t=this.options.appendTo;return t=!(t=!(t=t&&(t.jquery||t.nodeType?V(t):this.document.find(t).eq(0)))||!t[0]?this.element.closest(".ui-front, dialog"):t).length?this.document[0].body:t},_initSource:function(){var i,s,n=this;Array.isArray(this.options.source)?(i=this.options.source,this.source=function(t,e){e(V.ui.autocomplete.filter(i,t.term))}):"string"==typeof this.options.source?(s=this.options.source,this.source=function(t,e){n.xhr&&n.xhr.abort(),n.xhr=V.ajax({url:s,data:t,dataType:"json",success:function(t){e(t)},error:function(){e([])}})}):this.source=this.options.source},_searchTimeout:function(s){clearTimeout(this.searching),this.searching=this._delay(function(){var t=this.term===this._value(),e=this.menu.element.is(":visible"),i=s.altKey||s.ctrlKey||s.metaKey||s.shiftKey;t&&(e||i)||(this.selectedItem=null,this.search(null,s))},this.options.delay)},search:function(t,e){return t=null!=t?t:this._value(),this.term=this._value(),t.length").append(V("
      ").text(e.label)).appendTo(t)},_move:function(t,e){if(this.menu.element.is(":visible"))return this.menu.isFirstItem()&&/^previous/.test(t)||this.menu.isLastItem()&&/^next/.test(t)?(this.isMultiLine||this._value(this.term),void this.menu.blur()):void this.menu[t](e);this.search(null,e)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(t,e){this.isMultiLine&&!this.menu.element.is(":visible")||(this._move(t,e),e.preventDefault())},_isContentEditable:function(t){if(!t.length)return!1;var e=t.prop("contentEditable");return"inherit"===e?this._isContentEditable(t.parent()):"true"===e}}),V.extend(V.ui.autocomplete,{escapeRegex:function(t){return t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(t,e){var i=new RegExp(V.ui.autocomplete.escapeRegex(e),"i");return V.grep(t,function(t){return i.test(t.label||t.value||t)})}}),V.widget("ui.autocomplete",V.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(t){return t+(1").text(e))},100))}});V.ui.autocomplete;var tt=/ui-corner-([a-z]){2,6}/g;V.widget("ui.controlgroup",{version:"1.13.1",defaultElement:"
      ",options:{direction:"horizontal",disabled:null,onlyVisible:!0,items:{button:"input[type=button], input[type=submit], input[type=reset], button, a",controlgroupLabel:".ui-controlgroup-label",checkboxradio:"input[type='checkbox'], input[type='radio']",selectmenu:"select",spinner:".ui-spinner-input"}},_create:function(){this._enhance()},_enhance:function(){this.element.attr("role","toolbar"),this.refresh()},_destroy:function(){this._callChildMethod("destroy"),this.childWidgets.removeData("ui-controlgroup-data"),this.element.removeAttr("role"),this.options.items.controlgroupLabel&&this.element.find(this.options.items.controlgroupLabel).find(".ui-controlgroup-label-contents").contents().unwrap()},_initWidgets:function(){var o=this,a=[];V.each(this.options.items,function(s,t){var e,n={};if(t)return"controlgroupLabel"===s?((e=o.element.find(t)).each(function(){var t=V(this);t.children(".ui-controlgroup-label-contents").length||t.contents().wrapAll("")}),o._addClass(e,null,"ui-widget ui-widget-content ui-state-default"),void(a=a.concat(e.get()))):void(V.fn[s]&&(n=o["_"+s+"Options"]?o["_"+s+"Options"]("middle"):{classes:{}},o.element.find(t).each(function(){var t=V(this),e=t[s]("instance"),i=V.widget.extend({},n);"button"===s&&t.parent(".ui-spinner").length||((e=e||t[s]()[s]("instance"))&&(i.classes=o._resolveClassesValues(i.classes,e)),t[s](i),i=t[s]("widget"),V.data(i[0],"ui-controlgroup-data",e||t[s]("instance")),a.push(i[0]))})))}),this.childWidgets=V(V.uniqueSort(a)),this._addClass(this.childWidgets,"ui-controlgroup-item")},_callChildMethod:function(e){this.childWidgets.each(function(){var t=V(this).data("ui-controlgroup-data");t&&t[e]&&t[e]()})},_updateCornerClass:function(t,e){e=this._buildSimpleOptions(e,"label").classes.label;this._removeClass(t,null,"ui-corner-top ui-corner-bottom ui-corner-left ui-corner-right ui-corner-all"),this._addClass(t,null,e)},_buildSimpleOptions:function(t,e){var i="vertical"===this.options.direction,s={classes:{}};return s.classes[e]={middle:"",first:"ui-corner-"+(i?"top":"left"),last:"ui-corner-"+(i?"bottom":"right"),only:"ui-corner-all"}[t],s},_spinnerOptions:function(t){t=this._buildSimpleOptions(t,"ui-spinner");return t.classes["ui-spinner-up"]="",t.classes["ui-spinner-down"]="",t},_buttonOptions:function(t){return this._buildSimpleOptions(t,"ui-button")},_checkboxradioOptions:function(t){return this._buildSimpleOptions(t,"ui-checkboxradio-label")},_selectmenuOptions:function(t){var e="vertical"===this.options.direction;return{width:e&&"auto",classes:{middle:{"ui-selectmenu-button-open":"","ui-selectmenu-button-closed":""},first:{"ui-selectmenu-button-open":"ui-corner-"+(e?"top":"tl"),"ui-selectmenu-button-closed":"ui-corner-"+(e?"top":"left")},last:{"ui-selectmenu-button-open":e?"":"ui-corner-tr","ui-selectmenu-button-closed":"ui-corner-"+(e?"bottom":"right")},only:{"ui-selectmenu-button-open":"ui-corner-top","ui-selectmenu-button-closed":"ui-corner-all"}}[t]}},_resolveClassesValues:function(i,s){var n={};return V.each(i,function(t){var e=s.options.classes[t]||"",e=String.prototype.trim.call(e.replace(tt,""));n[t]=(e+" "+i[t]).replace(/\s+/g," ")}),n},_setOption:function(t,e){"direction"===t&&this._removeClass("ui-controlgroup-"+this.options.direction),this._super(t,e),"disabled"!==t?this.refresh():this._callChildMethod(e?"disable":"enable")},refresh:function(){var n,o=this;this._addClass("ui-controlgroup ui-controlgroup-"+this.options.direction),"horizontal"===this.options.direction&&this._addClass(null,"ui-helper-clearfix"),this._initWidgets(),n=this.childWidgets,(n=this.options.onlyVisible?n.filter(":visible"):n).length&&(V.each(["first","last"],function(t,e){var i,s=n[e]().data("ui-controlgroup-data");s&&o["_"+s.widgetName+"Options"]?((i=o["_"+s.widgetName+"Options"](1===n.length?"only":e)).classes=o._resolveClassesValues(i.classes,s),s.element[s.widgetName](i)):o._updateCornerClass(n[e](),e)}),this._callChildMethod("refresh"))}});V.widget("ui.checkboxradio",[V.ui.formResetMixin,{version:"1.13.1",options:{disabled:null,label:null,icon:!0,classes:{"ui-checkboxradio-label":"ui-corner-all","ui-checkboxradio-icon":"ui-corner-all"}},_getCreateOptions:function(){var t,e=this,i=this._super()||{};return this._readType(),t=this.element.labels(),this.label=V(t[t.length-1]),this.label.length||V.error("No label found for checkboxradio widget"),this.originalLabel="",this.label.contents().not(this.element[0]).each(function(){e.originalLabel+=3===this.nodeType?V(this).text():this.outerHTML}),this.originalLabel&&(i.label=this.originalLabel),null!=(t=this.element[0].disabled)&&(i.disabled=t),i},_create:function(){var t=this.element[0].checked;this._bindFormResetHandler(),null==this.options.disabled&&(this.options.disabled=this.element[0].disabled),this._setOption("disabled",this.options.disabled),this._addClass("ui-checkboxradio","ui-helper-hidden-accessible"),this._addClass(this.label,"ui-checkboxradio-label","ui-button ui-widget"),"radio"===this.type&&this._addClass(this.label,"ui-checkboxradio-radio-label"),this.options.label&&this.options.label!==this.originalLabel?this._updateLabel():this.originalLabel&&(this.options.label=this.originalLabel),this._enhance(),t&&this._addClass(this.label,"ui-checkboxradio-checked","ui-state-active"),this._on({change:"_toggleClasses",focus:function(){this._addClass(this.label,null,"ui-state-focus ui-visual-focus")},blur:function(){this._removeClass(this.label,null,"ui-state-focus ui-visual-focus")}})},_readType:function(){var t=this.element[0].nodeName.toLowerCase();this.type=this.element[0].type,"input"===t&&/radio|checkbox/.test(this.type)||V.error("Can't create checkboxradio on element.nodeName="+t+" and element.type="+this.type)},_enhance:function(){this._updateIcon(this.element[0].checked)},widget:function(){return this.label},_getRadioGroup:function(){var t=this.element[0].name,e="input[name='"+V.escapeSelector(t)+"']";return t?(this.form.length?V(this.form[0].elements).filter(e):V(e).filter(function(){return 0===V(this)._form().length})).not(this.element):V([])},_toggleClasses:function(){var t=this.element[0].checked;this._toggleClass(this.label,"ui-checkboxradio-checked","ui-state-active",t),this.options.icon&&"checkbox"===this.type&&this._toggleClass(this.icon,null,"ui-icon-check ui-state-checked",t)._toggleClass(this.icon,null,"ui-icon-blank",!t),"radio"===this.type&&this._getRadioGroup().each(function(){var t=V(this).checkboxradio("instance");t&&t._removeClass(t.label,"ui-checkboxradio-checked","ui-state-active")})},_destroy:function(){this._unbindFormResetHandler(),this.icon&&(this.icon.remove(),this.iconSpace.remove())},_setOption:function(t,e){if("label"!==t||e){if(this._super(t,e),"disabled"===t)return this._toggleClass(this.label,null,"ui-state-disabled",e),void(this.element[0].disabled=e);this.refresh()}},_updateIcon:function(t){var e="ui-icon ui-icon-background ";this.options.icon?(this.icon||(this.icon=V(""),this.iconSpace=V(" "),this._addClass(this.iconSpace,"ui-checkboxradio-icon-space")),"checkbox"===this.type?(e+=t?"ui-icon-check ui-state-checked":"ui-icon-blank",this._removeClass(this.icon,null,t?"ui-icon-blank":"ui-icon-check")):e+="ui-icon-blank",this._addClass(this.icon,"ui-checkboxradio-icon",e),t||this._removeClass(this.icon,null,"ui-icon-check ui-state-checked"),this.icon.prependTo(this.label).after(this.iconSpace)):void 0!==this.icon&&(this.icon.remove(),this.iconSpace.remove(),delete this.icon)},_updateLabel:function(){var t=this.label.contents().not(this.element[0]);this.icon&&(t=t.not(this.icon[0])),(t=this.iconSpace?t.not(this.iconSpace[0]):t).remove(),this.label.append(this.options.label)},refresh:function(){var t=this.element[0].checked,e=this.element[0].disabled;this._updateIcon(t),this._toggleClass(this.label,"ui-checkboxradio-checked","ui-state-active",t),null!==this.options.label&&this._updateLabel(),e!==this.options.disabled&&this._setOptions({disabled:e})}}]);var et;V.ui.checkboxradio;V.widget("ui.button",{version:"1.13.1",defaultElement:"
'.$langs->trans("Login").''; print img_picto($langs->trans("LotSerial"), 'lot', 'class="paddingright"'); - print ''; + print ''; print ''; - print $productstatic->getNomUrl(1).' - '.$productstatic->label; + print $productstatic->getNomUrl(1).' - '.dol_escape_htmltag($productstatic->label); print ''; - print $val['batch']; + print dol_escape_htmltag($val['batch']); print ''.$val['qty'].''.price2num((float) $val['qty'], 'MS').''.img_delete($langs->trans("Remove")).'
'.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0).''."\n"; + print img_picto('', 'language').$formadmin->select_language($object->default_lang, 'default_lang', 0, 0, 1); + print '
".$langs->trans("Public")."\n"; print $form->selectyesno("public", (GETPOSTISSET("public") ? GETPOST("public", 'alphanohtml', 2) : $object->public), 1); @@ -1803,6 +1814,19 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { // Birth Date print '
'.$langs->trans("DateOfBirth").''.dol_print_date($object->birth, 'day').'
'.$langs->trans("DefaultLang").''; + //$s=picto_from_langcode($object->default_lang); + //print ($s?$s.' ':''); + $langs->load("languages"); + $labellang = ($object->default_lang ? $langs->trans('Language_'.$object->default_lang) : ''); + print picto_from_langcode($object->default_lang, 'class="paddingrightonly saturatemedium opacitylow"'); + print $labellang; + print '
'.$langs->trans("Public").''.yn($object->public).'
'.$langs->trans("Description").''; // We use dolibarr_details as type of DolEditor here, because we must not accept images as description is included into PDF and not accepted by TCPDF. - $doleditor = new DolEditor('desc', $object->description, '', 160, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_4, '90%'); + $doleditor = new DolEditor('desc', GETPOSTISSET('desc') ? GETPOST('desc', 'restricthtml') : $object->description, '', 160, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_4, '90%'); $doleditor->Create(); print "
'.$langs->trans("PublicUrl").''; print img_picto('', 'globe', 'class="pictofixedwidth"'); - print ''; + print ''; print '
'.$langs->trans('Date').''.dol_print_date($now,'day').'
'.$langs->trans("DateChequeReceived").''; - print $form->selectDate($filterdate, 'fd', 0, 0, 1, '', 1, 1); + // filter by dates from / to + print '
'; + print $form->selectDate($search_date_start, 'search_date_start_', 0, 0, 1, '', 1, 1, 0, '', '', '', '', 1, '', $langs->trans('From')); + print '
'; + print '
'; + print $form->selectDate($search_date_end, 'search_date_end_', 0, 0, 1, '', 1, 1, 0, '', '', '', '', 1, '', $langs->trans('to')); + print '
'; print '
'.$langs->trans("BankAccount").''; $form->select_comptes($filteraccountid, 'accountid', 0, 'courant <> 2', 1); @@ -363,7 +384,7 @@ if ($action == 'new') { print '
'; print ''; - if ($filterdate || $filteraccountid > 0) { + if ($search_date_start || $search_date_end || $filteraccountid > 0) { print '   '; print ''; } @@ -382,8 +403,11 @@ if ($action == 'new') { $sql .= " AND ba.entity IN (".getEntity('bank_account').")"; $sql .= " AND b.fk_bordereau = 0"; $sql .= " AND b.amount > 0"; - if ($filterdate) { - $sql .= " AND b.dateo = '".$db->idate($filterdate)."'"; + if ($search_date_start) { + $sql .= " AND b.dateo >= '".$db->idate($search_date_start)."'"; + } + if ($search_date_end) { + $sql .= " AND b.dateo <= '".$db->idate($search_date_end)."'"; } if ($filteraccountid > 0) { $sql .= " AND ba.rowid = ".((int) $filteraccountid); From ef0bd60283c98c8c939e605ec72479ffe15eaf39 Mon Sep 17 00:00:00 2001 From: lvessiller Date: Mon, 8 Aug 2022 15:06:25 +0200 Subject: [PATCH 069/143] FIX reload stickler-ci From 60e12db1dab18f624bbc538ece3f31cdbffd82b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?This=20Charl=C3=A8ne?= <1179011+defrance@users.noreply.github.com> Date: Mon, 8 Aug 2022 15:12:40 +0200 Subject: [PATCH 070/143] php v8 warning --- htdocs/core/class/commonobject.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 567c51f08c9..d7e2472f22c 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -6010,7 +6010,7 @@ abstract class CommonObject // Test fetch_array ! is_int($key) because fetch_array result is a mix table with Key as alpha and Key as int (depend db engine) if ($key != 'rowid' && $key != 'tms' && $key != 'fk_member' && !is_int($key)) { // we can add this attribute to object - if (!empty($extrafields) && in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date', 'datetime'))) { + if (!empty($extrafields->attributes[$this->table_element]) && in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date', 'datetime'))) { //var_dump($extrafields->attributes[$this->table_element]['type'][$key]); $this->array_options["options_".$key] = $this->db->jdate($value); } else { @@ -6023,7 +6023,7 @@ abstract class CommonObject // If field is a computed field, value must become result of compute foreach ($tab as $key => $value) { - if (!empty($extrafields) && !empty($extrafields->attributes[$this->table_element]['computed'][$key])) { + if (!empty($extrafields->attributes[$this->table_element]) && !empty($extrafields->attributes[$this->table_element]['computed'][$key])) { //var_dump($conf->disable_compute); if (empty($conf->disable_compute)) { $this->array_options["options_".$key] = dol_eval($extrafields->attributes[$this->table_element]['computed'][$key], 1, 0, ''); From 001d326a8cb0919c3fd5f31cd4854e74608d05dc Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 9 Aug 2022 10:32:34 +0200 Subject: [PATCH 071/143] update code for PHP8 compliance --- htdocs/imports/import.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 51a50c6376c..7aa566630c3 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -1818,7 +1818,7 @@ if ($step == 5 && $datatoimport) { // Actions print '
'; - if ($user->rights->import->run) { + if ($user->hasRight('import', 'run')) { print ''; } else { print ''.$langs->trans("RunSimulateImportFile").''; @@ -1974,7 +1974,7 @@ if ($step == 5 && $datatoimport) { // Actions print '
'; - if ($user->rights->import->run) { + if ($user->hasRight('import', 'run')) { if (empty($nboferrors)) { print ''.$langs->trans("RunImportFile").''; } else { From b8a29fbcb2c3d02afa5c1c29ada8403ed849ca02 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 9 Aug 2022 10:40:08 +0200 Subject: [PATCH 072/143] update code for PHP8 compliance --- htdocs/document.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/document.php b/htdocs/document.php index a33708e3e77..e432d6a92f1 100644 --- a/htdocs/document.php +++ b/htdocs/document.php @@ -120,7 +120,7 @@ if ($user->socid > 0) { // For some module part, dir may be privates if (in_array($modulepart, array('facture_paiement', 'unpaid'))) { - if (empty($user->rights->societe->client->voir) || $socid) { + if (empty($user->hasRight('societe', 'client', 'voir')) || $socid) { $original_file = 'private/'.$user->id.'/'.$original_file; // If user has no permission to see all, output dir is specific to user } } From 79830bee9e5865cfe1723da522ea4a9716e2f469 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 9 Aug 2022 10:57:58 +0200 Subject: [PATCH 073/143] update code for PHP8 compliance --- htdocs/accountancy/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php index 99ae0bd845b..bd48c205dae 100644 --- a/htdocs/accountancy/index.php +++ b/htdocs/accountancy/index.php @@ -49,7 +49,7 @@ if (empty($user->rights->accounting->mouvements->lire)) { if (empty($conf->comptabilite->enabled) && empty($conf->accounting->enabled) && empty($conf->asset->enabled) && empty($conf->intracommreport->enabled)) { accessforbidden(); } -if (empty($user->rights->compta->resultat->lire) && empty($user->rights->accounting->comptarapport->lire) && empty($user->rights->accounting->mouvements->lire) && empty($user->rights->asset->read) && empty($user->rights->intracommreport->read)) { +if (empty($user->hasRight('compta', 'resultat', 'lire')) && empty($user->hasRight('accounting', 'comptarapport', 'lire')) && empty($user->hasRight('accounting', 'mouvements', 'lire')) && empty($user->hasRight('asset', 'read')) && empty($user->hasRight('intracommreport', 'read'))) { accessforbidden(); } From fb386faf94c2a934bb965bc4fb4a409ffcca187c Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 9 Aug 2022 11:05:49 +0200 Subject: [PATCH 074/143] update code for PHP8 compliance --- htdocs/index.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/index.php b/htdocs/index.php index 6715577e615..017b90a6194 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -155,12 +155,12 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) { require_once DOL_DOCUMENT_ROOT.'/core/class/workboardresponse.class.php'; // Number of actions to do (late) - if (isModEnabled('agenda') && empty($conf->global->MAIN_DISABLE_BLOCK_AGENDA) && $user->rights->agenda->myactions->read) { + if (isModEnabled('agenda') && empty($conf->global->MAIN_DISABLE_BLOCK_AGENDA) && $user->hasRight('agenda', 'myactions', 'read')) { include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; $board = new ActionComm($db); $dashboardlines[$board->element] = $board->load_board($user); } - + // Number of project opened if (!empty($conf->project->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_PROJECT) && $user->hasRight('projet', 'lire')) { include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; @@ -202,13 +202,13 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) { } // Number of suppliers orders a deal - if (isModEnabled('supplier_order') && empty($conf->global->MAIN_DISABLE_BLOCK_SUPPLIER) && $user->rights->fournisseur->commande->lire) { + if (isModEnabled('supplier_order') && empty($conf->global->MAIN_DISABLE_BLOCK_SUPPLIER) && $user->hasRight('fournisseur', 'commande', 'lire')) { include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; $board = new CommandeFournisseur($db); $dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened"); $dashboardlines[$board->element.'_awaiting'] = $board->load_board($user, 'awaiting'); } - + // Number of contract / services enabled (delayed) if (isModEnabled('contrat') && empty($conf->global->MAIN_DISABLE_BLOCK_CONTRACT) && $user->hasRight('contrat', 'lire')) { include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; @@ -235,12 +235,12 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) { } // Number of supplier invoices (paid) - if (isModEnabled('supplier_invoice') && empty($conf->global->MAIN_DISABLE_BLOCK_SUPPLIER) && !empty($user->rights->fournisseur->facture->lire)) { + if (isModEnabled('supplier_invoice') && empty($conf->global->MAIN_DISABLE_BLOCK_SUPPLIER) && !empty($user->hasRight('fournisseur', 'facture', 'lire'))) { include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; $board = new FactureFournisseur($db); $dashboardlines[$board->element] = $board->load_board($user); } - + // Number of transactions to conciliate if (isModEnabled('banque') && empty($conf->global->MAIN_DISABLE_BLOCK_BANK) && $user->hasRight('banque', 'lire') && !$user->socid) { include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; From e51732682a13b4715a0c0aa04c20fcc3f53b8545 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Tue, 9 Aug 2022 09:06:20 +0000 Subject: [PATCH 075/143] Fixing style errors. --- htdocs/index.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/index.php b/htdocs/index.php index 017b90a6194..afce0c5e553 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -160,7 +160,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) { $board = new ActionComm($db); $dashboardlines[$board->element] = $board->load_board($user); } - + // Number of project opened if (!empty($conf->project->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_PROJECT) && $user->hasRight('projet', 'lire')) { include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; @@ -208,7 +208,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) { $dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened"); $dashboardlines[$board->element.'_awaiting'] = $board->load_board($user, 'awaiting'); } - + // Number of contract / services enabled (delayed) if (isModEnabled('contrat') && empty($conf->global->MAIN_DISABLE_BLOCK_CONTRACT) && $user->hasRight('contrat', 'lire')) { include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; @@ -240,7 +240,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) { $board = new FactureFournisseur($db); $dashboardlines[$board->element] = $board->load_board($user); } - + // Number of transactions to conciliate if (isModEnabled('banque') && empty($conf->global->MAIN_DISABLE_BLOCK_BANK) && $user->hasRight('banque', 'lire') && !$user->socid) { include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; From 7a4ec39a821c28c5402977d92c66079e6be98570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 9 Aug 2022 16:36:02 +0200 Subject: [PATCH 076/143] fix doc_generic_recruitmentjobposition_odt --- .../doc_generic_recruitmentjobposition_odt.modules.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php index 8d187807700..ba35cb0ba3f 100644 --- a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php +++ b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php @@ -4,7 +4,7 @@ * Copyright (C) 2014 Marcos García * Copyright (C) 2016 Charlie Benke * Copyright (C) 2018-2021 Philippe Grand - * Copyright (C) 2018 Frédéric France + * Copyright (C) 2018-2022 Frédéric France * * 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 @@ -22,12 +22,12 @@ */ /** - * \file htdocs/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php + * \file htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php * \ingroup recruitment * \brief File of class to build ODT documents for recruitmentjobpositions */ -dol_include_once('/recruitment/core/modules/recruitment/modules_recruitmentjobposition.php'); +require_once DOL_DOCUMENT_ROOT.'/recruitment/core/modules/recruitment/modules_recruitmentjobposition.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; @@ -234,7 +234,7 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi $outputlangs->loadLangs(array("main", "dict", "companies", "bills")); - if ($conf->commande->dir_output) { + if ($conf->recruitment->dir_output) { // If $object is id instead of object if (!is_object($object)) { $id = $object; @@ -246,7 +246,7 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi } } - $dir = $conf->commande->multidir_output[isset($object->entity) ? $object->entity : 1]; + $dir = $conf->recruitment->multidir_output[isset($object->entity) ? $object->entity : 1].'/recruitmentjobposition/'; $objectref = dol_sanitizeFileName($object->ref); if (!preg_match('/specimen/i', $objectref)) { $dir .= "/".$objectref; From c724c5172a48bc55093b463b848a8cde80c20deb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 9 Aug 2022 16:37:29 +0200 Subject: [PATCH 077/143] Update recruitmentjobposition_card.php --- .../recruitmentjobposition_card.php | 26 +++---------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/htdocs/recruitment/recruitmentjobposition_card.php b/htdocs/recruitment/recruitmentjobposition_card.php index ed1b1b54711..996868a791e 100644 --- a/htdocs/recruitment/recruitmentjobposition_card.php +++ b/htdocs/recruitment/recruitmentjobposition_card.php @@ -21,41 +21,21 @@ * \brief Page to create/edit/view recruitmentjobposition */ -//if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1'); // Do not create database handler $db -//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Do not load object $user -//if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); // Do not load object $mysoc -//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); // Do not load object $langs -//if (! defined('NOSCANGETFORINJECTION')) define('NOSCANGETFORINJECTION','1'); // Do not check injection attack on GET parameters -//if (! defined('NOSCANPOSTFORINJECTION')) define('NOSCANPOSTFORINJECTION','1'); // Do not check injection attack on POST parameters -//if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK','1'); // Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on). -//if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on) -//if (! defined('NOSTYLECHECK')) define('NOSTYLECHECK','1'); // Do not check style html tag into posted data -//if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1'); // If there is no need to load and show top and left menu -//if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php -//if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); // Do not load ajax.lib.php library -//if (! defined("NOLOGIN")) define("NOLOGIN",'1'); // If this page is public (can be called outside logged session). This include the NOIPCHECK too. -//if (! defined('NOIPCHECK')) define('NOIPCHECK','1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip -//if (! defined("MAIN_LANG_DEFAULT")) define('MAIN_LANG_DEFAULT','auto'); // Force lang to a particular value -//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE','aloginmodule'); // Force authentication handler -//if (! defined("NOREDIRECTBYMAINTOLOGIN")) define('NOREDIRECTBYMAINTOLOGIN',1); // The main.inc.php does not make a redirect if not logged, instead show simple error message -//if (! defined("FORCECSP")) define('FORCECSP','none'); // Disable all Content Security Policies - - // Load Dolibarr environment require_once '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; -dol_include_once('/recruitment/class/recruitmentjobposition.class.php'); -dol_include_once('/recruitment/lib/recruitment_recruitmentjobposition.lib.php'); +require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentjobposition.class.php'; +require_once DOL_DOCUMENT_ROOT.'/recruitment/lib/recruitment_recruitmentjobposition.lib.php'; // Load translation files required by the page $langs->loadLangs(array("recruitment", "other")); // Get parameters $id = GETPOST('id', 'int'); -$ref = GETPOST('ref', 'alpha'); +$ref = GETPOST('ref', 'alpha'); $action = GETPOST('action', 'aZ09'); $confirm = GETPOST('confirm', 'alpha'); $cancel = GETPOST('cancel', 'aZ09'); From 0764a9c123d0896a024c90f49ad5ce8e6263343d Mon Sep 17 00:00:00 2001 From: Anthony Berton Date: Tue, 9 Aug 2022 16:45:04 +0200 Subject: [PATCH 078/143] FIX - php V8 multiprice thirdpaty card --- htdocs/comm/multiprix.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php index 8da9a17ebb2..0e582946df9 100644 --- a/htdocs/comm/multiprix.php +++ b/htdocs/comm/multiprix.php @@ -75,7 +75,7 @@ if ($_socid > 0) { // We load data of thirdparty $objsoc = new Societe($db); $objsoc->id = $_socid; - $objsoc->fetch($_socid, $to); + $objsoc->fetch($_socid); $head = societe_prepare_head($objsoc); @@ -141,7 +141,6 @@ if ($_socid > 0) { $resql = $db->query($sql); if ($resql) { print ''; - $tag = !$tag; print ''; print ''; print ''; From 3c3e8dabe2f70c228bdf6d14b05849e5362ff5fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 9 Aug 2022 16:48:17 +0200 Subject: [PATCH 079/143] Update recruitmentjobposition_document.php --- htdocs/recruitment/recruitmentjobposition_document.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/recruitment/recruitmentjobposition_document.php b/htdocs/recruitment/recruitmentjobposition_document.php index 49a36a736d1..d05ed9ab5d6 100644 --- a/htdocs/recruitment/recruitmentjobposition_document.php +++ b/htdocs/recruitment/recruitmentjobposition_document.php @@ -28,8 +28,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; -dol_include_once('/recruitment/class/recruitmentjobposition.class.php'); -dol_include_once('/recruitment/lib/recruitment_recruitmentjobposition.lib.php'); +require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentjobposition.class.php'; +require_once DOL_DOCUMENT_ROOT.'/recruitment/lib/recruitment_recruitmentjobposition.lib.php'; // Load translation files required by the page $langs->loadLangs(array("recruitment", "companies", "other", "mails")); From 2dd1ef22fa7bf96ef6229945f0b493f8f3d0d75c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 10 Aug 2022 03:34:16 +0200 Subject: [PATCH 080/143] css --- htdocs/product/stock/tpl/stockcorrection.tpl.php | 8 ++++---- htdocs/product/stock/tpl/stocktransfer.tpl.php | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php index 19974c49afe..08a66d1b8c6 100644 --- a/htdocs/product/stock/tpl/stockcorrection.tpl.php +++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php @@ -106,7 +106,7 @@ if ($object->element == 'stock') { print ''; print ''; print 'element == 'stock' ? '' : ' class="fieldrequired"').'>'.$langs->trans("batch_number").''; print ''; print ''; @@ -161,7 +161,7 @@ if (!empty($conf->project->enabled)) { print ''; print ''; } print ''; @@ -171,7 +171,7 @@ $valformovementlabel = ((GETPOST("label") && (GETPOST('label') != $langs->trans( print ''; print ''; print ''; print ''; print ''; } if ($object->element == 'stock') { @@ -87,7 +87,7 @@ if ($object->element == 'stock') { } print ''; print ''; print ''; @@ -104,7 +104,7 @@ if (!empty($conf->productbatch->enabled) && print ''; print ''; } else { - print ''; + print ''; } print ''; print ''; @@ -128,7 +128,7 @@ $valformovementlabel = (GETPOST("label") ? GETPOST("label") : $langs->trans("Mov print ''; print ''; print ''; print ''; print ''; // Product or sub-bom - print ''; - print ''; + // Qty print ''; print ''; //print ''; - // print ''; + //print ''; print ''; $i = 0; diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php index f6aba7f2597..d92c595c6ec 100644 --- a/htdocs/mrp/mo_production.php +++ b/htdocs/mrp/mo_production.php @@ -708,7 +708,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea print '
'; $url = $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=addconsumeline&token='.newToken(); - $permissiontoaddaconsumeline = $object->status != $object::STATUS_PRODUCED && $object->status != $object::STATUS_CANCELED && $action != 'consumeorproduce' && $action != 'consumeandproduceall'; + $permissiontoaddaconsumeline = $object->status != $object::STATUS_PRODUCED && $object->status != $object::STATUS_CANCELED; $parameters = array('morecss'=>'reposition'); $newcardbutton = ''; @@ -996,6 +996,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea $i = 1; print ''."\n"; print ''; + // Ref print ''; $preselected = (GETPOSTISSET('qty-'.$line->id.'-'.$i) ? GETPOST('qty-'.$line->id.'-'.$i) : max(0, $line->qty - $alreadyconsumed)); if ($action == 'consumeorproduce' && !GETPOSTISSET('qty-'.$line->id.'-'.$i)) { @@ -1044,12 +1045,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea $preselected = (GETPOSTISSET('batch-'.$line->id.'-'.$i) ? GETPOST('batch-'.$line->id.'-'.$i) : ''); print ''; print $formproduct->selectLotDataList('batch-'.$line->id.'-'.$i, 0, $line->fk_product, '', ''); - } - print ''; - print ''; } @@ -1094,10 +1092,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea $newcardbutton = ''; $url = $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=addproduceline&token='.newToken(); - $permissiontoaddaproductline = $object->status != $object::STATUS_PRODUCED && $object->status != $object::STATUS_CANCELED && $action != 'consumeorproduce' && $action != 'consumeandproduceall'; + $permissiontoaddaproductline = $object->status != $object::STATUS_PRODUCED && $object->status != $object::STATUS_CANCELED; $parameters = array('morecss'=>'reposition'); - if ($nblinetoproduce == 0 || $object->mrptype == 1) { - $newcardbutton = dolGetButtonTitle($langs->trans('AddNewProduceLines'), '', 'fa fa-plus-circle size15x', $url, '', $permissiontoaddaproductline, $parameters); + if ($action != 'consumeorproduce' && $action != 'consumeandproduceall') { + if ($nblinetoproduce == 0 || $object->mrptype == 1) { + $newcardbutton = dolGetButtonTitle($langs->trans('AddNewProduceLines'), '', 'fa fa-plus-circle size15x', $url, '', $permissiontoaddaproductline, $parameters); + } } print load_fiche_titre($langs->trans('Production'), $newcardbutton, '', 0, '', ''); @@ -1196,12 +1196,15 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea print ''; if ($permissiontoupdatecost) { // Defined $manufacturingcost - $manufacturingcost = $bomcost; - if (empty($manufacturingcost)) { - $manufacturingcost = price2num($tmpproduct->cost_price, 'MU'); - } - if (empty($manufacturingcost)) { - $manufacturingcost = price2num($tmpproduct->pmp, 'MU'); + $manufacturingcost = 0; + if ($object->mrptype == 0) { // If MO is a "Manufacture" type (and not "Disassemble" + $manufacturingcost = $bomcost; + if (empty($manufacturingcost)) { + $manufacturingcost = price2num($tmpproduct->cost_price, 'MU'); + } + if (empty($manufacturingcost)) { + $manufacturingcost = price2num($tmpproduct->pmp, 'MU'); + } } print ''; if ($permissiontoupdatecost) { // Defined $manufacturingcost - $manufacturingcost = $bomcost; - if (empty($manufacturingcost)) { - $manufacturingcost = price2num($tmpproduct->cost_price, 'MU'); - } - if (empty($manufacturingcost)) { - $manufacturingcost = price2num($tmpproduct->pmp, 'MU'); + $manufacturingcost = 0; + if ($object->mrptype == 0) { // If MO is a "Manufacture" type (and not "Disassemble" + $manufacturingcost = $bomcost; + if (empty($manufacturingcost)) { + $manufacturingcost = price2num($tmpproduct->cost_price, 'MU'); + } + if (empty($manufacturingcost)) { + $manufacturingcost = price2num($tmpproduct->pmp, 'MU'); + } } if ($tmpproduct->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) { - $preselected = (GETPOSTISSET('pricetoproduce-'.$line->id.'-'.$i) ? GETPOST('pricetoproduce-'.$line->id.'-'.$i) : price($manufacturingcost)); + $preselected = (GETPOSTISSET('pricetoproduce-'.$line->id.'-'.$i) ? GETPOST('pricetoproduce-'.$line->id.'-'.$i) : ($manufacturingcost ? price($manufacturingcost) : '')); print ''; } else { - print ''; + print ''; } } print ''; diff --git a/htdocs/mrp/tpl/originproductline.tpl.php b/htdocs/mrp/tpl/originproductline.tpl.php index e641bd142fc..7e0468119bd 100644 --- a/htdocs/mrp/tpl/originproductline.tpl.php +++ b/htdocs/mrp/tpl/originproductline.tpl.php @@ -44,6 +44,7 @@ $res = $tmpbom->fetch($line->fk_bom_child); tpl['strike']) ? '' : ' strikefordisabled').'">'; +// Ref or label print ''; -//print ''; +// Qty print ''; print ''; -if ($tmpbom->id) { +if ($tmpbom->id > 0) { print ''; } else { - print ''; + print ''; } +//print ''; + print ''."\n"; // Select of all the sub-BOM lines From 630113902792d32ed67c67bc817d30bf4217b066 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 10 Aug 2022 04:42:08 +0200 Subject: [PATCH 082/143] Update mo_production.php --- htdocs/mrp/mo_production.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php index 65019337b64..c35dd303dcc 100644 --- a/htdocs/mrp/mo_production.php +++ b/htdocs/mrp/mo_production.php @@ -39,7 +39,7 @@ dol_include_once('/mrp/lib/mrp_mo.lib.php'); // Load translation files required by the page $langs->loadLangs(array("mrp", "stocks", "other", "product", "productbatch")); -$newToken = function_exists('newToken') ? newToken() : $_SESSION['newtoken']; + // Get parameters $id = GETPOST('id', 'int'); $ref = GETPOST('ref', 'alpha'); @@ -431,6 +431,8 @@ $tmpstockmovement = new MouvementStock($db); $help_url = 'EN:Module_Manufacturing_Orders|FR:Module_Ordres_de_Fabrication'; llxHeader('', $langs->trans('Mo'), $help_url, '', 0, 0, array('/mrp/js/lib_dispatch.js.php')); +$newToken = newToken(); + // Part to show record if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) { $res = $object->fetch_thirdparty(); From abcdb8dd10b2b907762034cecca5f478432daf5c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 10 Aug 2022 05:06:58 +0200 Subject: [PATCH 083/143] css --- htdocs/product/fournisseurs.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index 49242eb47e4..99d204a1d64 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -471,6 +471,7 @@ if ($id > 0 || $ref) { print load_fiche_titre($langs->trans("AddSupplierPrice")); } + print "\n"; print '
'; print ''; print ''; @@ -480,7 +481,7 @@ if ($id > 0 || $ref) { print '
'.$langs->trans("Date").''.$langs->trans("PriceLevel").''.$langs->trans("NumberOfUnit").''; if ($object->element == 'product' || $object->element == 'stock') { - print ''; print ''; print ''; print ''; @@ -134,7 +134,7 @@ if (!empty($conf->productbatch->enabled) && ) { print '
'; - print ''; + print ''; print '
'.$langs->trans('Project').''; print img_picto('', 'project'); - $formproject->select_projects(-1, '', 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 0, 0, 'maxwidth300'); + $formproject->select_projects(-1, '', 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 0, 0, 'maxwidth300 widthcentpercentminusx'); print '
'.$langs->trans("MovementLabel").''; -print ''; +print ''; print ''.$langs->trans("InventoryCode").''; diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php index 53803b0929d..f2ecfa1d73c 100644 --- a/htdocs/product/stock/tpl/stocktransfer.tpl.php +++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php @@ -75,7 +75,7 @@ if ($object->element == 'product') { print img_picto('', 'stock'); $selected = (GETPOST("dwid") ?GETPOST("dwid", 'int') : (GETPOST('id_entrepot') ?GETPOST('id_entrepot', 'int') : ($object->element == 'product' && $object->fk_default_warehouse ? $object->fk_default_warehouse : 'ifone'))); $warehousestatus = 'warehouseopen,warehouseinternal'; - print $formproduct->selectWarehouses($selected, 'id_entrepot', $warehousestatus, 1); + print $formproduct->selectWarehouses($selected, 'id_entrepot', $warehousestatus, 1, 0, 0, '', 0, 0, array(), 'minwidth75 maxwidth300 widthcentpercentminusx'); print ''.$langs->trans("WarehouseTarget").''; -print img_picto('', 'stock').$formproduct->selectWarehouses(GETPOST('id_entrepot_destination'), 'id_entrepot_destination', 'warehouseopen,warehouseinternal', 1); +print img_picto('', 'stock').$formproduct->selectWarehouses(GETPOST('id_entrepot_destination'), 'id_entrepot_destination', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, array(), 'minwidth75 maxwidth300 widthcentpercentminusx'); print '
'.$langs->trans("NumberOfUnit").'
'.$langs->trans("MovementLabel").''; -print ''; +print ''; print ''.$langs->trans("InventoryCode").''; From 427541beaa3199dbca97b46eca73684f143baa2a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 10 Aug 2022 04:07:18 +0200 Subject: [PATCH 081/143] FIX #21668 --- htdocs/mrp/class/mo.class.php | 8 ++-- htdocs/mrp/mo_production.php | 52 +++++++++++++----------- htdocs/mrp/tpl/originproductline.tpl.php | 14 ++++--- 3 files changed, 41 insertions(+), 33 deletions(-) diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php index 0a953ea869c..d186c6e533b 100644 --- a/htdocs/mrp/class/mo.class.php +++ b/htdocs/mrp/class/mo.class.php @@ -101,7 +101,7 @@ class Mo extends CommonObject 'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id",), 'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'position'=>5, 'notnull'=>1, 'default'=>'1', 'index'=>1), 'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>4, 'position'=>10, 'notnull'=>1, 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", 'showoncombobox'=>'1', 'noteditable'=>1), - 'fk_bom' => array('type'=>'integer:Bom:bom/class/bom.class.php:0:t.status=1', 'filter'=>'active=1', 'label'=>'BOM', 'enabled'=>'$conf->bom->enabled', 'visible'=>1, 'position'=>33, 'notnull'=>-1, 'index'=>1, 'comment'=>"Original BOM", 'css'=>'minwidth100 maxwidth300', 'csslist'=>'nowraponall'), + 'fk_bom' => array('type'=>'integer:Bom:bom/class/bom.class.php:0:t.status=1', 'filter'=>'active=1', 'label'=>'BOM', 'enabled'=>'$conf->bom->enabled', 'visible'=>1, 'position'=>33, 'notnull'=>-1, 'index'=>1, 'comment'=>"Original BOM", 'css'=>'minwidth100 maxwidth300', 'csslist'=>'nowraponall', 'picto'=>'bom'), 'mrptype' => array('type'=>'integer', 'label'=>'Type', 'enabled'=>1, 'visible'=>1, 'position'=>34, 'notnull'=>1, 'default'=>'0', 'arrayofkeyval'=>array(0=>'Manufacturing', 1=>'Disassemble'), 'css'=>'minwidth150', 'csslist'=>'minwidth150 center'), 'fk_product' => array('type'=>'integer:Product:product/class/product.class.php:0', 'label'=>'Product', 'enabled'=>'$conf->product->enabled', 'visible'=>1, 'position'=>35, 'notnull'=>1, 'index'=>1, 'comment'=>"Product to produce", 'css'=>'maxwidth300', 'csslist'=>'tdoverflowmax100', 'picto'=>'product'), 'qty' => array('type'=>'real', 'label'=>'QtyToProduce', 'enabled'=>1, 'visible'=>1, 'position'=>40, 'notnull'=>1, 'comment'=>"Qty to produce", 'css'=>'width75', 'default'=>1, 'isameasure'=>1), @@ -1375,13 +1375,13 @@ class Mo extends CommonObject print '
'.$langs->trans('Description'); + print ''.$langs->trans('Ref'); if (!empty($conf->global->BOM_SUB_BOM)) { print '   '.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").'  '; print ''.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").' '; } print ''.$langs->trans('Ref').''.$langs->trans('Qty'); if ($this->bom->bomtype == 0) { print ' ('.$langs->trans("ForAQuantityOf", $this->bom->qty).')'; @@ -1395,7 +1395,7 @@ class Mo extends CommonObject print ''.$langs->trans('DisableStockChange').''.$langs->trans('MoChildGenerate').''.$form->showCheckAddButtons('checkforselect', 1).'
'.$langs->trans("ToConsume").''; - if ($tmpproduct->status_batch) { + $type = 'batch'; - print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine('.$line->id.', \''.$type.'\', \'qtymissingconsume\')"'); + print ' '.img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine('.((int) $line->id).', \''.dol_escape_js($type).'\', \'qtymissingconsume\')"'); } print ''.$line->qty.''; @@ -1300,19 +1303,22 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea print ' '; if ($res) { print $tmpproduct->getNomUrl(1); @@ -58,7 +59,7 @@ if ($res) { print $this->tpl['label']; } print ''.$this->tpl['label'].''.$this->tpl['qty'].(($this->tpl['efficiency'] > 0 && $this->tpl['efficiency'] < 1) ? ' / '.$form->textwithpicto($this->tpl['efficiency'], $langs->trans("ValueOfMeansLoss")).' = '.$qtytoconsumeforline : '').''.(empty($this->tpl['stock']) ? 0 : price2num($this->tpl['stock'], 'MS')); if ($this->tpl['seuil_stock_alerte'] != '' && ($this->tpl['stock'] < $this->tpl['seuil_stock_alerte'])) { @@ -78,18 +79,19 @@ $selected = 1; if (!empty($selectedLines) && !in_array($this->tpl['id'], $selectedLines)) { $selected = 0; } -print ''; -//print ''; -print ''; print ''; print ' '; +//print ''; +//print '
'; // Supplier - print ''; print ''; From b1814a45ce7ce8b2b11d9274d4bd54769ff6a107 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 10 Aug 2022 09:33:58 +0200 Subject: [PATCH 084/143] add oauth2 for swiftmailer --- htdocs/admin/mails.php | 21 ++++++++++++--------- htdocs/langs/fr_FR/admin.lang | 4 ++-- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index 9145ad9a1a7..03b4387b255 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -292,7 +292,7 @@ if ($action == 'edit') { jQuery("#smtp_port_mess").hide(); jQuery(".smtp_method").show(); jQuery(".dkim").show(); - jQuery(".smtp_auth_method").hide(); + jQuery(".smtp_auth_method").show(); } } function change_smtp_auth_method() { @@ -300,6 +300,9 @@ if ($action == 'edit') { if (jQuery("#MAIN_MAIL_SENDMODE").val()==\'smtps\' && jQuery("#radio_oauth").prop("checked")) { jQuery(".smtp_oauth_service").show(); jQuery(".smtp_pw").hide(); + } else if (jQuery("#MAIN_MAIL_SENDMODE").val()==\'swiftmailer\' && jQuery("#radio_oauth").prop("checked")) { + jQuery(".smtp_oauth_service").show(); + jQuery(".smtp_pw").hide(); } else if(jQuery("#MAIN_MAIL_SENDMODE").val()==\'mail\'){ jQuery(".smtp_oauth_service").hide(); jQuery(".smtp_pw").hide(); @@ -465,13 +468,13 @@ if ($action == 'edit') { if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))) { print ''; } // SMTPS PW - if (isset($conf->global->MAIN_MAIL_SENDMODE) && (in_array($conf->global->MAIN_MAIL_SENDMODE, array('swiftmailer')) || (in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps')) && (isset($conf->global->MAIN_MAIL_SMTPS_AUTH_TYPE) && $conf->global->MAIN_MAIL_SMTPS_AUTH_TYPE === "LOGIN")))) { + if (isset($conf->global->MAIN_MAIL_SENDMODE) && (in_array($conf->global->MAIN_MAIL_SENDMODE, array('swiftmailer')) || (in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps')) && getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE') === "LOGIN"))) { print ''; } // SMTPS oauth service - if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps')) && isset($conf->global->MAIN_MAIL_SMTPS_AUTH_TYPE) && $conf->global->MAIN_MAIL_SMTPS_AUTH_TYPE === "XOAUTH2") { + if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps')) && getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE') === "XOAUTH2") { $text = $oauthservices[$conf->global->MAIN_MAIL_SMTPS_OAUTH_SERVICE]; if (empty($text)) { $text = $langs->trans("Undefined").img_warning(); diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 42d973e8e06..18c2dfc615d 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -2291,5 +2291,5 @@ OauthNotAvailableForAllAndHadToBeCreatedBefore=L'authentification OAUTH2 n'est p MAIN_MAIL_SMTPS_OAUTH_SERVICE=Service d'authentification OAUTH2 DontForgetCreateTokenOauthMod=Un jeton avec les bonnes permissions doit avoir été créé en amont avec le module OAUTH MAIN_MAIL_SMTPS_AUTH_TYPE=Méthode d'authentication -UsePassword=Utiliser un mot de pass -UseOauth=Utiliser un jeton d'authentification OAUTH \ No newline at end of file +UsePassword=Utiliser un mot de passe +UseOauth=Utiliser un jeton d'authentification OAUTH From 32c617b78617a5c32c078d43a118b03278a22f11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 10 Aug 2022 09:54:14 +0200 Subject: [PATCH 085/143] add oauth2 for swiftmailer --- htdocs/admin/mails.php | 12 +++++----- htdocs/core/class/CMailFile.class.php | 34 +++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 8 deletions(-) diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index 03b4387b255..0504315075d 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -682,7 +682,7 @@ if ($action == 'edit') { print ''; // Host server - if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail')) { + if ($linuxlike && (getDolGlobalString('MAIN_MAIL_SENDMODE') == 'mail')) { print ''; } else { print ''; @@ -690,31 +690,31 @@ if ($action == 'edit') { // Port - if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail')) { + if ($linuxlike && (getDolGlobalString('MAIN_MAIL_SENDMODE') == 'mail')) { print ''; } else { print ''; } // SMTPS ID - if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer'))) { + if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE'), array('smtps', 'swiftmailer'))) { print ''; } // AUTH method - if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer'))) { + if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE'), array('smtps', 'swiftmailer'))) { $authtype = getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE', 'LOGIN'); $text = ($authtype === "LOGIN") ? $langs->trans("UsePassword") : ($authtype === "XOAUTH2" ? $langs->trans("UseOauth") : '') ; print ''; } // SMTPS PW - if (isset($conf->global->MAIN_MAIL_SENDMODE) && (in_array($conf->global->MAIN_MAIL_SENDMODE, array('swiftmailer')) || (in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps')) && getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE') === "LOGIN"))) { + if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE'), array('smtps', 'swiftmailer')) && getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE') != "XOAUTH2") { print ''; } // SMTPS oauth service - if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps')) && getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE') === "XOAUTH2") { + if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE'), array('smtps', 'swiftmailer')) && getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE') === "XOAUTH2") { $text = $oauthservices[$conf->global->MAIN_MAIL_SMTPS_OAUTH_SERVICE]; if (empty($text)) { $text = $langs->trans("Undefined").img_warning(); diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index 1b03ed0d604..b991b4542f9 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -847,7 +847,7 @@ class CMailFile $this->smtps->setPW($loginpass); } - if (!empty($conf->global->$keyforsmtpauthtype) && $conf->global->$keyforsmtpauthtype === "XOAUTH2") { + if (getDolGlobalString($keyforsmtpauthtype) === "XOAUTH2") { require_once DOL_DOCUMENT_ROOT.'/core/lib/oauth.lib.php'; // define $supportedoauth2array $keyforsupportedoauth2array = $conf->global->$keyforsmtpoauthservice; if (preg_match('/^.*-/', $keyforsupportedoauth2array)) { @@ -943,9 +943,39 @@ class CMailFile if (!empty($conf->global->$keyforsmtpid)) { $this->transport->setUsername($conf->global->$keyforsmtpid); } - if (!empty($conf->global->$keyforsmtppw)) { + if (!empty($conf->global->$keyforsmtppw) && getDolGlobalString($keyforsmtpauthtype) != "XOAUTH2") { $this->transport->setPassword($conf->global->$keyforsmtppw); } + if (getDolGlobalString($keyforsmtpauthtype) === "XOAUTH2") { + require_once DOL_DOCUMENT_ROOT.'/core/lib/oauth.lib.php'; // define $supportedoauth2array + $keyforsupportedoauth2array = getDolGlobalString($keyforsmtpoauthservice); + if (preg_match('/^.*-/', $keyforsupportedoauth2array)) { + $keyforprovider = preg_replace('/^.*-/', '', $keyforsupportedoauth2array); + } else { + $keyforprovider = ''; + } + $keyforsupportedoauth2array = preg_replace('/-.*$/', '', $keyforsupportedoauth2array); + $keyforsupportedoauth2array = 'OAUTH_'.$keyforsupportedoauth2array.'_NAME'; + + $OAUTH_SERVICENAME = (empty($supportedoauth2array[$keyforsupportedoauth2array]['name']) ? 'Unknown' : $supportedoauth2array[$keyforsupportedoauth2array]['name'].($keyforprovider ? '-'.$keyforprovider : '')); + + require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php'; + + $storage = new DoliStorage($db, $conf); + try { + $tokenobj = $storage->retrieveAccessToken($OAUTH_SERVICENAME); + if (is_object($tokenobj)) { + $this->transport->setAuthMode('XOAUTH2'); + $this->transport->setPassword($tokenobj->getAccessToken()); + } else { + $this->errors[] = "Token not found"; + } + } catch (Exception $e) { + // Return an error if token not found + $this->errors[] = $e->getMessage(); + dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR); + } + } if (!empty($conf->global->$keyforsslseflsigned)) { $this->transport->setStreamOptions(array('ssl' => array('allow_self_signed' => true, 'verify_peer' => false))); } From 4237f902a3aa3e1524a98f9d371955a14331e89f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 10 Aug 2022 10:09:52 +0200 Subject: [PATCH 086/143] add oauth2 for swiftmailer --- htdocs/core/actions_sendmails.inc.php | 9 +++++++-- htdocs/core/class/CMailFile.class.php | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php index 7494f5a3668..3749b403469 100644 --- a/htdocs/core/actions_sendmails.inc.php +++ b/htdocs/core/actions_sendmails.inc.php @@ -427,9 +427,14 @@ if (($action == 'send' || $action == 'relance') && !GETPOST('addfile') && !GETPO } else { $langs->load("other"); $mesg = '
'; - if ($mailfile->error) { + if (!empty($mailfile->error) || !empty($mailfile->errors)) { $mesg .= $langs->transnoentities('ErrorFailedToSendMail', dol_escape_htmltag($from), dol_escape_htmltag($sendto)); - $mesg .= '
'.$mailfile->error; + if (!empty($mailfile->error)) { + $mesg .= '
'.$mailfile->error; + } + if (!empty($mailfile->errors) && is_array($mailfile->errors)) { + $mesg .= '
'.implode('
', $mailfile->errors); + } } else { $mesg .= $langs->transnoentities('ErrorFailedToSendMail', dol_escape_htmltag($from), dol_escape_htmltag($sendto)); if (!empty($conf->global->MAIN_DISABLE_ALL_MAILS)) { diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index b991b4542f9..f299ecf9a88 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -1008,16 +1008,16 @@ class CMailFile try { $result = $this->mailer->send($this->message, $failedRecipients); } catch (Exception $e) { - $this->error = $e->getMessage(); + $this->errors[] = $e->getMessage(); } if (!empty($conf->global->MAIN_MAIL_DEBUG)) { $this->dump_mail(); } $res = true; - if (!empty($this->error) || !$result) { + if (!empty($this->error) || !empty($this->errors) || !$result) { if (!empty($failedRecipients)) { - $this->error = 'Transport failed for the following addresses: "' . join('", "', $failedRecipients) . '".'; + $this->errors[] = 'Transport failed for the following addresses: "' . join('", "', $failedRecipients) . '".'; } dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR); $res = false; From 8581156402eb2421bbd3753050007086b709f436 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 10 Aug 2022 10:59:57 +0200 Subject: [PATCH 087/143] add oauth2 for swiftmailer --- htdocs/core/class/CMailFile.class.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index f299ecf9a88..fddd06f89b2 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -75,6 +75,16 @@ class CMailFile public $smtps; // Contains SMTPs object (if this method is used) public $phpmailer; // Contains PHPMailer object (if this method is used) + /** + * @var Swift_SmtpTransport + */ + public $transport; + + /** + * @var Swift_Mailer + */ + public $mailer; + /** * @var string CSS */ From 6f6ced5b9c9a48019c337b5624e6b6ca9dfd3898 Mon Sep 17 00:00:00 2001 From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com> Date: Wed, 10 Aug 2022 13:31:44 +0200 Subject: [PATCH 088/143] Update note.php $help_url + DE:Modul_Produkte + DE:Modul_Leistungen --- htdocs/product/note.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/product/note.php b/htdocs/product/note.php index c54bd3637ae..93d40e296e9 100644 --- a/htdocs/product/note.php +++ b/htdocs/product/note.php @@ -86,21 +86,21 @@ $form = new Form($db); $help_url = ''; if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT)) { - $help_url = 'EN:Module_Products|FR:Module_Produits|ES:Módulo_Productos'; + $help_url = 'EN:Module_Products|FR:Module_Produits|ES:Módulo_Productos|DE:Modul_Produkte'; } if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE)) { - $help_url = 'EN:Module_Services_En|FR:Module_Services|ES:Módulo_Servicios'; + $help_url = 'EN:Module_Services_En|FR:Module_Services|ES:Módulo_Servicios|DE:Modul_Leistungen'; } $title = $langs->trans('ProductServiceCard'); $shortlabel = dol_trunc($object->label, 16); if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT)) { $title = $langs->trans('Product')." ".$shortlabel." - ".$langs->trans('Notes'); - $help_url = 'EN:Module_Products|FR:Module_Produits|ES:Módulo_Productos'; + $help_url = 'EN:Module_Products|FR:Module_Produits|ES:Módulo_Productos|DE:Modul_Produkte'; } if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE)) { $title = $langs->trans('Service')." ".$shortlabel." - ".$langs->trans('Notes'); - $help_url = 'EN:Module_Services_En|FR:Module_Services|ES:Módulo_Servicios'; + $help_url = 'EN:Module_Services_En|FR:Module_Services|ES:Módulo_Servicios|DE:Modul_Leistungen'; } llxHeader('', $title, $help_url); From a8a107fb376023ea1bce77ffca9fd5d330053bad Mon Sep 17 00:00:00 2001 From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com> Date: Wed, 10 Aug 2022 13:37:15 +0200 Subject: [PATCH 089/143] Update index.php delete double entry: $taskstatic = new Task($db); --- htdocs/projet/activity/index.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php index 453a4078978..bbd9442f876 100644 --- a/htdocs/projet/activity/index.php +++ b/htdocs/projet/activity/index.php @@ -66,7 +66,6 @@ $month = $tmp['mon']; $year = $tmp['year']; $projectstatic = new Project($db); -$taskstatic = new Task($db); $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1); // Return all projects I have permission on because I want my tasks and some of my task may be on a public projet that is not my project $taskstatic = new Task($db); $tasktmp = new Task($db); From 917ab403ff989bec9b081780ab39969e8b13d378 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 10 Aug 2022 13:38:18 +0200 Subject: [PATCH 090/143] wip --- htdocs/core/class/CMailFile.class.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index fddd06f89b2..8963ded6be8 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -72,6 +72,11 @@ class CMailFile */ public $error = ''; + /** + * @var string[] Array of Error code (or message) + */ + public $errors = array(); + public $smtps; // Contains SMTPs object (if this method is used) public $phpmailer; // Contains PHPMailer object (if this method is used) @@ -85,6 +90,11 @@ class CMailFile */ public $mailer; + /** + * @var Swift_Plugins_Loggers_ArrayLogger + */ + public $logger; + /** * @var string CSS */ From bf704ec3608dd065429feacee737a14daa1c882d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 10 Aug 2022 13:41:30 +0200 Subject: [PATCH 091/143] remove duplicate --- htdocs/langs/en_US/admin.lang | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 6215867920d..69a1f97e0e5 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -2296,4 +2296,3 @@ UsePassword=Use a password UseOauth=Use a OAUTH token Images=Images MaxNumberOfImagesInGetPost=Max number of images allowed in GETPOST check -CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is: From af8abecbd6e97ebb812017fb35e32f46179454ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 10 Aug 2022 13:50:42 +0200 Subject: [PATCH 092/143] wip --- htdocs/core/class/CMailFile.class.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index 8963ded6be8..161be6dc72e 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -917,7 +917,6 @@ class CMailFile } $result = $this->smtps->sendMsg(); - //print $result; if (!empty($conf->global->MAIN_MAIL_DEBUG)) { $this->dump_mail(); From 4c76223d639889de549696cd96b6ab5276ed6721 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 10 Aug 2022 14:09:14 +0200 Subject: [PATCH 093/143] Doc --- htdocs/conf/conf.php.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example index 487576ed058..b58ac33707e 100644 --- a/htdocs/conf/conf.php.example +++ b/htdocs/conf/conf.php.example @@ -185,7 +185,7 @@ $dolibarr_main_instance_unique_id='84b5bc91f83b56e458db71e0adac2b62'; // values using a ",". In this case, Dolibarr will check login/pass for each value in // order defined into value. However, note that this can't work with all values. // Examples: -// $dolibarr_main_authentication='dolibarr'; // Use the password defined into application on user record. +// $dolibarr_main_authentication='dolibarr'; // Use the password defined into application on user file (default). // $dolibarr_main_authentication='http'; // Use the HTTP Basic authentication // $dolibarr_main_authentication='ldap'; // Check the password into a LDAP server // $dolibarr_main_authentication='ldap,dolibarr'; // You can set several mode using a comma as a separator. From 8465c0825371a46f8d25ec5f921e3867b091ae32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 10 Aug 2022 14:29:13 +0200 Subject: [PATCH 094/143] fix php8 warning --- htdocs/admin/mails_senderprofile_list.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php index 8e31d0e6d62..db92c33a7fb 100644 --- a/htdocs/admin/mails_senderprofile_list.php +++ b/htdocs/admin/mails_senderprofile_list.php @@ -557,6 +557,7 @@ if (!empty($extrafields->attributes[$object->table_element]['computed']) && is_a // -------------------------------------------------------------------- $i = 0; $totalarray = array(); +$totalarray['nbfield'] = 0; while ($i < ($limit ? min($num, $limit) : $num)) { $obj = $db->fetch_object($resql); if (empty($obj)) { From ec042b1701dec66cd95002c642cf3f4457752727 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 10 Aug 2022 14:32:26 +0200 Subject: [PATCH 095/143] css --- htdocs/product/fournisseurs.php | 4 +++- htdocs/product/price.php | 11 +++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index 99d204a1d64..9dfc90b86a4 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -464,6 +464,9 @@ if ($id > 0 || $ref) { if (($action == 'add_price' || $action == 'update_price') && $usercancreate) { $langs->load("suppliers"); + print "\n"; + print '
'; + if ($rowid) { $object->fetch_product_fournisseur_price($rowid, 1); //Ignore the math expression when getting the price print load_fiche_titre($langs->trans("ChangeSupplierPrice")); @@ -471,7 +474,6 @@ if ($id > 0 || $ref) { print load_fiche_titre($langs->trans("AddSupplierPrice")); } - print "\n"; print ''; print ''; print ''; diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 618e5cc6a78..b129a1ff4e5 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -1391,6 +1391,7 @@ if ($action == 'edit_vat' && ($user->rights->produit->creer || $user->rights->se } if ($action == 'edit_price' && $object->getRights()->creer) { + print '
'; print load_fiche_titre($langs->trans("NewPrice"), ''); if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) { @@ -1915,14 +1916,17 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { // Form to add a new customer price $maxpricesupplier = $object->min_recommended_price(); - print load_fiche_titre($langs->trans('PriceByCustomer')); + print ''; + print load_fiche_titre($langs->trans('AddCustomerPrice')); print ''; print ''; print ''; print ''; - print '
'.$langs->trans("Supplier").''; + print '
'.$langs->trans("Supplier").''; if ($rowid) { $supplier = new Fournisseur($db); $supplier->fetch($socid); @@ -636,7 +637,7 @@ if ($id > 0 || $ref) { $currencycodetouse = $conf->currency; } print $form->selectMultiCurrency($currencycodetouse, "multicurrency_code", 1); - print '   '.$langs->trans("CurrencyRate").' '; + print '     '.$langs->trans("CurrencyRate").' '; print ''; print '
'.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").''; if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) { - print 'global->MAIN_MAIL_SMTPS_AUTH_TYPE == 'LOGIN' ? ' checked' : '').'> '; + print ' '; print ''; print '            '; - print 'global->MAIN_MAIL_SMTPS_AUTH_TYPE == 'XOAUTH2' ? ' checked' : '').'> '; + print ' '; print ''; } else { - $value = $conf->global->MAIN_MAIL_SMTPS_AUTH_TYPE; + $value = getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE', 'LOGIN'); $htmltext = $langs->trans("ContactSuperAdminForChange"); print $form->textwithpicto($langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE"), $htmltext, 1, 'superadmin'); print ''; @@ -497,7 +500,7 @@ if ($action == 'edit') { } // OAUTH service provider - if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps')))) { + if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))) { print '
'.$langs->trans("MAIN_MAIL_SMTPS_OAUTH_SERVICE").''; // SuperAdministrator access only @@ -699,19 +702,19 @@ if ($action == 'edit') { } // AUTH method - if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps'))) { - $authtype = $conf->global->MAIN_MAIL_SMTPS_AUTH_TYPE; + if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer'))) { + $authtype = getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE', 'LOGIN'); $text = ($authtype === "LOGIN") ? $langs->trans("UsePassword") : ($authtype === "XOAUTH2" ? $langs->trans("UseOauth") : '') ; print '
'.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").''.$text.'
'.$langs->trans("MAIN_MAIL_SMTPS_PW").''.preg_replace('/./', '*', $conf->global->MAIN_MAIL_SMTPS_PW).'
'.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").''.$langs->trans("SeeLocalSendMailSetup").'
'.$langs->trans("MAIN_MAIL_SMTP_SERVER", ini_get('SMTP') ?ini_get('SMTP') : $langs->transnoentities("Undefined")).''.(!empty($conf->global->MAIN_MAIL_SMTP_SERVER) ? $conf->global->MAIN_MAIL_SMTP_SERVER : '').'
'.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").''.$langs->trans("SeeLocalSendMailSetup").'
'.$langs->trans("MAIN_MAIL_SMTP_PORT", ini_get('smtp_port') ?ini_get('smtp_port') : $langs->transnoentities("Undefined")).''.(!empty($conf->global->MAIN_MAIL_SMTP_PORT) ? $conf->global->MAIN_MAIL_SMTP_PORT : '').'
'.$langs->trans("MAIN_MAIL_SMTPS_ID").''.$conf->global->MAIN_MAIL_SMTPS_ID.'
'.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").''.$text.'
'.$langs->trans("MAIN_MAIL_SMTPS_PW").''.preg_replace('/./', '*', $conf->global->MAIN_MAIL_SMTPS_PW).'
'; + print '
'; + + print '
'; print ''; print ''; print '
'.$langs->trans('ThirdParty').''; @@ -1976,6 +1980,8 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { print '
'; + print '
'; + print '
'; @@ -1992,6 +1998,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { // Edit mode $maxpricesupplier = $object->min_recommended_price(); + print ''; print load_fiche_titre($langs->trans('PriceByCustomer')); $result = $prodcustprice->fetch(GETPOST('lineid', 'int')); From cded29f684b3f1d40014707431fff7307e4a526a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 10 Aug 2022 14:36:29 +0200 Subject: [PATCH 096/143] fix php8 warning --- htdocs/core/class/html.formmail.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index c23545a34c9..4652081c0f3 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -4,7 +4,7 @@ * Copyright (C) 2010-2011 Juanjo Menent * Copyright (C) 2015-2017 Marcos García * Copyright (C) 2015-2017 Nicolas ZABOURI - * Copyright (C) 2018-2021 Frédéric France + * Copyright (C) 2018-2022 Frédéric France * Copyright (C) 2022 Charlene Benke * * This program is free software; you can redistribute it and/or modify @@ -401,7 +401,7 @@ class FormMail extends Form // Define output language $outputlangs = $langs; $newlang = ''; - if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang)) { + if (!empty($conf->global->MAIN_MULTILANGS) && !empty($this->param['langsmodels'])) { $newlang = $this->param['langsmodels']; } if (!empty($newlang)) { From 5377c6c05522ca0ec90fd6d28a1bc6aee19105e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 10 Aug 2022 14:38:38 +0200 Subject: [PATCH 097/143] fix php8 warning --- htdocs/core/class/html.formmail.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index c23545a34c9..85cfba6cacd 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -428,7 +428,7 @@ class FormMail extends Form $keytoavoidconflict = empty($this->trackid) ? '' : '-'.$this->trackid; // this->trackid must be defined if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelselected') && GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1')) { - if (!empty($arraydefaultmessage->joinfiles) && is_array($this->param['fileinit'])) { + if (!empty($arraydefaultmessage->joinfiles) && !empty($this->param['fileinit']) && is_array($this->param['fileinit'])) { foreach ($this->param['fileinit'] as $file) { $this->add_attached_files($file, basename($file), dol_mimetype($file)); } From 78c5521d808506c9080aa6c1d1b8b9f844221e11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 10 Aug 2022 14:42:07 +0200 Subject: [PATCH 098/143] fix php8 warning --- htdocs/core/class/html.formmail.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index c23545a34c9..ee8b382f947 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -1182,7 +1182,7 @@ class FormMail extends Form { global $conf, $langs; //if (! $this->errorstomail) $this->errorstomail=$this->frommail; - $errorstomail = (!empty($conf->global->MAIN_MAIL_ERRORS_TO) ? $conf->global->MAIN_MAIL_ERRORS_TO : $this->errorstomail); + $errorstomail = getDolGlobalString('MAIN_MAIL_ERRORS_TO', (!empty($this->errorstomail) ? $this->errorstomail : '')); if ($this->witherrorstoreadonly) { $out = '
'.$langs->trans("MailErrorsTo").''; $out .= ''; From a0f5c69ccd25fa143538b5dcfc1f022727edcecf Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 10 Aug 2022 14:45:21 +0200 Subject: [PATCH 099/143] Debug v16 --- htdocs/product/popuprop.php | 1 + htdocs/product/stock/replenish.php | 7 ++++--- htdocs/product/stock/replenishorders.php | 8 ++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php index b921f16d02e..17716a4b3ed 100644 --- a/htdocs/product/popuprop.php +++ b/htdocs/product/popuprop.php @@ -229,6 +229,7 @@ if ($mode && $mode != '-1') { } } + $tmpproduct->id = $prodid; $tmpproduct->ref = $vals['ref']; $tmpproduct->label = $vals['label']; $tmpproduct->type = $vals['type']; diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php index 86b91f73e2b..91833e95271 100644 --- a/htdocs/product/stock/replenish.php +++ b/htdocs/product/stock/replenish.php @@ -623,7 +623,7 @@ if (empty($reshook)) { } print '
'; -print ''; +print ''; print '
'; print ''; @@ -697,7 +697,7 @@ $texte = $langs->trans('Replenishment'); print '
'; -print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table +print '
'; if (!empty($conf->global->REPLENISH_ALLOW_VARIABLESIZELIST)) { print_barre_liste( @@ -894,7 +894,8 @@ while ($i < ($limit ? min($num, $limit) : $num)) { print '
'.$prod->getNomUrl(1, 'stock').''.$objp->label; + print ''; + print dol_escape_htmltag($objp->label); print ''; // TODO Remove this and make a fetch to get description when creating order instead of a GETPOST print '
'; - print ''; + print ''; print ''; - print ''; + print ''; print ''; - print ''; + print ''; print ''; print ''; @@ -322,7 +322,7 @@ if ($resql) { // Company $href = DOL_URL_ROOT.'/fourn/card.php?socid='.$obj->socid; - print ''.img_object($langs->trans('ShowCompany'), 'company').' '.$obj->name.''.img_object($langs->trans('ShowCompany'), 'company').' '.$obj->name.'
",x=o?"":"",g=0;g<7;g++)x+="";for(w+=x+"",D=this._getDaysInMonth(U,K),U===t.selectedYear&&K===t.selectedMonth&&(t.selectedDay=Math.min(t.selectedDay,D)),C=(this._getFirstDayOfMonth(U,K)-n+7)%7,D=Math.ceil((C+D)/7),I=Y&&this.maxRows>D?this.maxRows:D,this.maxRows=I,T=this._daylightSavingAdjust(new Date(U,K,1-C)),P=0;P",M=o?"":"",g=0;g<7;g++)S=c?c.apply(t.input?t.input[0]:null,[T]):[!0,""],z=(H=T.getMonth()!==K)&&!d||!S[0]||j&&T"+(H&&!u?" ":z?""+T.getDate()+"":""+T.getDate()+"")+"",T.setDate(T.getDate()+1),T=this._daylightSavingAdjust(T);w+=M+""}11<++K&&(K=0,U++),_+=w+="
"+this._get(t,"weekHeader")+""+r[k]+"
"+this._get(t,"calculateWeek")(T)+"
"+(Y?"
"+(0
":""):"")}f+=_}return f+=F,t._keyEvent=!1,f},_generateMonthYearHeader:function(t,e,i,s,n,o,a,r){var l,h,c,u,d,p,f=this._get(t,"changeMonth"),g=this._get(t,"changeYear"),m=this._get(t,"showMonthAfterYear"),_=this._get(t,"selectMonthLabel"),v=this._get(t,"selectYearLabel"),b="
",y="";if(o||!f)y+=""+a[e]+"";else{for(l=s&&s.getFullYear()===i,h=n&&n.getFullYear()===i,y+=""}if(m||(b+=y+(!o&&f&&g?"":" ")),!t.yearshtml)if(t.yearshtml="",o||!g)b+=""+i+"";else{for(a=this._get(t,"yearRange").split(":"),u=(new Date).getFullYear(),d=(_=function(t){t=t.match(/c[+\-].*/)?i+parseInt(t.substring(1),10):t.match(/[+\-].*/)?u+parseInt(t,10):parseInt(t,10);return isNaN(t)?u:t})(a[0]),p=Math.max(d,_(a[1]||"")),d=s?Math.max(d,s.getFullYear()):d,p=n?Math.min(p,n.getFullYear()):p,t.yearshtml+="",b+=t.yearshtml,t.yearshtml=null}return b+=this._get(t,"yearSuffix"),m&&(b+=(!o&&f&&g?"":" ")+y),b+="
"},_adjustInstDate:function(t,e,i){var s=t.selectedYear+("Y"===i?e:0),n=t.selectedMonth+("M"===i?e:0),e=Math.min(t.selectedDay,this._getDaysInMonth(s,n))+("D"===i?e:0),e=this._restrictMinMax(t,this._daylightSavingAdjust(new Date(s,n,e)));t.selectedDay=e.getDate(),t.drawMonth=t.selectedMonth=e.getMonth(),t.drawYear=t.selectedYear=e.getFullYear(),"M"!==i&&"Y"!==i||this._notifyChange(t)},_restrictMinMax:function(t,e){var i=this._getMinMaxDate(t,"min"),t=this._getMinMaxDate(t,"max"),e=i&&e=i.getTime())&&(!s||e.getTime()<=s.getTime())&&(!n||e.getFullYear()>=n)&&(!o||e.getFullYear()<=o)},_getFormatConfig:function(t){var e=this._get(t,"shortYearCutoff");return{shortYearCutoff:e="string"!=typeof e?e:(new Date).getFullYear()%100+parseInt(e,10),dayNamesShort:this._get(t,"dayNamesShort"),dayNames:this._get(t,"dayNames"),monthNamesShort:this._get(t,"monthNamesShort"),monthNames:this._get(t,"monthNames")}},_formatDate:function(t,e,i,s){e||(t.currentDay=t.selectedDay,t.currentMonth=t.selectedMonth,t.currentYear=t.selectedYear);e=e?"object"==typeof e?e:this._daylightSavingAdjust(new Date(s,i,e)):this._daylightSavingAdjust(new Date(t.currentYear,t.currentMonth,t.currentDay));return this.formatDate(this._get(t,"dateFormat"),e,this._getFormatConfig(t))}}),V.fn.datepicker=function(t){if(!this.length)return this;V.datepicker.initialized||(V(document).on("mousedown",V.datepicker._checkExternalClick),V.datepicker.initialized=!0),0===V("#"+V.datepicker._mainDivId).length&&V("body").append(V.datepicker.dpDiv);var e=Array.prototype.slice.call(arguments,1);return"string"==typeof t&&("isDisabled"===t||"getDate"===t||"widget"===t)||"option"===t&&2===arguments.length&&"string"==typeof arguments[1]?V.datepicker["_"+t+"Datepicker"].apply(V.datepicker,[this[0]].concat(e)):this.each(function(){"string"==typeof t?V.datepicker["_"+t+"Datepicker"].apply(V.datepicker,[this].concat(e)):V.datepicker._attachDatepicker(this,t)})},V.datepicker=new st,V.datepicker.initialized=!1,V.datepicker.uuid=(new Date).getTime(),V.datepicker.version="1.13.1";V.datepicker,V.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase());var rt=!1;V(document).on("mouseup",function(){rt=!1});V.widget("ui.mouse",{version:"1.13.1",options:{cancel:"input, textarea, button, select, option",distance:1,delay:0},_mouseInit:function(){var e=this;this.element.on("mousedown."+this.widgetName,function(t){return e._mouseDown(t)}).on("click."+this.widgetName,function(t){if(!0===V.data(t.target,e.widgetName+".preventClickEvent"))return V.removeData(t.target,e.widgetName+".preventClickEvent"),t.stopImmediatePropagation(),!1}),this.started=!1},_mouseDestroy:function(){this.element.off("."+this.widgetName),this._mouseMoveDelegate&&this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(t){if(!rt){this._mouseMoved=!1,this._mouseStarted&&this._mouseUp(t),this._mouseDownEvent=t;var e=this,i=1===t.which,s=!("string"!=typeof this.options.cancel||!t.target.nodeName)&&V(t.target).closest(this.options.cancel).length;return i&&!s&&this._mouseCapture(t)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){e.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(t)&&this._mouseDelayMet(t)&&(this._mouseStarted=!1!==this._mouseStart(t),!this._mouseStarted)?(t.preventDefault(),!0):(!0===V.data(t.target,this.widgetName+".preventClickEvent")&&V.removeData(t.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(t){return e._mouseMove(t)},this._mouseUpDelegate=function(t){return e._mouseUp(t)},this.document.on("mousemove."+this.widgetName,this._mouseMoveDelegate).on("mouseup."+this.widgetName,this._mouseUpDelegate),t.preventDefault(),rt=!0)):!0}},_mouseMove:function(t){if(this._mouseMoved){if(V.ui.ie&&(!document.documentMode||document.documentMode<9)&&!t.button)return this._mouseUp(t);if(!t.which)if(t.originalEvent.altKey||t.originalEvent.ctrlKey||t.originalEvent.metaKey||t.originalEvent.shiftKey)this.ignoreMissingWhich=!0;else if(!this.ignoreMissingWhich)return this._mouseUp(t)}return(t.which||t.button)&&(this._mouseMoved=!0),this._mouseStarted?(this._mouseDrag(t),t.preventDefault()):(this._mouseDistanceMet(t)&&this._mouseDelayMet(t)&&(this._mouseStarted=!1!==this._mouseStart(this._mouseDownEvent,t),this._mouseStarted?this._mouseDrag(t):this._mouseUp(t)),!this._mouseStarted)},_mouseUp:function(t){this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,t.target===this._mouseDownEvent.target&&V.data(t.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(t)),this._mouseDelayTimer&&(clearTimeout(this._mouseDelayTimer),delete this._mouseDelayTimer),this.ignoreMissingWhich=!1,rt=!1,t.preventDefault()},_mouseDistanceMet:function(t){return Math.max(Math.abs(this._mouseDownEvent.pageX-t.pageX),Math.abs(this._mouseDownEvent.pageY-t.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}}),V.ui.plugin={add:function(t,e,i){var s,n=V.ui[t].prototype;for(s in i)n.plugins[s]=n.plugins[s]||[],n.plugins[s].push([e,i[s]])},call:function(t,e,i,s){var n,o=t.plugins[e];if(o&&(s||t.element[0].parentNode&&11!==t.element[0].parentNode.nodeType))for(n=0;n").css("position","absolute").appendTo(t.parent()).outerWidth(t.outerWidth()).outerHeight(t.outerHeight()).offset(t.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_blurActiveElement:function(t){var e=V.ui.safeActiveElement(this.document[0]);V(t.target).closest(e).length||V.ui.safeBlur(e)},_mouseStart:function(t){var e=this.options;return this.helper=this._createHelper(t),this._addClass(this.helper,"ui-draggable-dragging"),this._cacheHelperProportions(),V.ui.ddmanager&&(V.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(!0),this.offsetParent=this.helper.offsetParent(),this.hasFixedAncestor=0i[2]&&(o=i[2]+this.offset.click.left),t.pageY-this.offset.click.top>i[3]&&(a=i[3]+this.offset.click.top)),s.grid&&(t=s.grid[1]?this.originalPageY+Math.round((a-this.originalPageY)/s.grid[1])*s.grid[1]:this.originalPageY,a=!i||t-this.offset.click.top>=i[1]||t-this.offset.click.top>i[3]?t:t-this.offset.click.top>=i[1]?t-s.grid[1]:t+s.grid[1],t=s.grid[0]?this.originalPageX+Math.round((o-this.originalPageX)/s.grid[0])*s.grid[0]:this.originalPageX,o=!i||t-this.offset.click.left>=i[0]||t-this.offset.click.left>i[2]?t:t-this.offset.click.left>=i[0]?t-s.grid[0]:t+s.grid[0]),"y"===s.axis&&(o=this.originalPageX),"x"===s.axis&&(a=this.originalPageY)),{top:a-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.offset.scroll.top:n?0:this.offset.scroll.top),left:o-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.offset.scroll.left:n?0:this.offset.scroll.left)}},_clear:function(){this._removeClass(this.helper,"ui-draggable-dragging"),this.helper[0]===this.element[0]||this.cancelHelperRemoval||this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1,this.destroyOnClear&&this.destroy()},_trigger:function(t,e,i){return i=i||this._uiHash(),V.ui.plugin.call(this,t,[e,i,this],!0),/^(drag|start|stop)/.test(t)&&(this.positionAbs=this._convertPositionTo("absolute"),i.offset=this.positionAbs),V.Widget.prototype._trigger.call(this,t,e,i)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),V.ui.plugin.add("draggable","connectToSortable",{start:function(e,t,i){var s=V.extend({},t,{item:i.element});i.sortables=[],V(i.options.connectToSortable).each(function(){var t=V(this).sortable("instance");t&&!t.options.disabled&&(i.sortables.push(t),t.refreshPositions(),t._trigger("activate",e,s))})},stop:function(e,t,i){var s=V.extend({},t,{item:i.element});i.cancelHelperRemoval=!1,V.each(i.sortables,function(){var t=this;t.isOver?(t.isOver=0,i.cancelHelperRemoval=!0,t.cancelHelperRemoval=!1,t._storedCSS={position:t.placeholder.css("position"),top:t.placeholder.css("top"),left:t.placeholder.css("left")},t._mouseStop(e),t.options.helper=t.options._helper):(t.cancelHelperRemoval=!0,t._trigger("deactivate",e,s))})},drag:function(i,s,n){V.each(n.sortables,function(){var t=!1,e=this;e.positionAbs=n.positionAbs,e.helperProportions=n.helperProportions,e.offset.click=n.offset.click,e._intersectsWith(e.containerCache)&&(t=!0,V.each(n.sortables,function(){return this.positionAbs=n.positionAbs,this.helperProportions=n.helperProportions,this.offset.click=n.offset.click,t=this!==e&&this._intersectsWith(this.containerCache)&&V.contains(e.element[0],this.element[0])?!1:t})),t?(e.isOver||(e.isOver=1,n._parent=s.helper.parent(),e.currentItem=s.helper.appendTo(e.element).data("ui-sortable-item",!0),e.options._helper=e.options.helper,e.options.helper=function(){return s.helper[0]},i.target=e.currentItem[0],e._mouseCapture(i,!0),e._mouseStart(i,!0,!0),e.offset.click.top=n.offset.click.top,e.offset.click.left=n.offset.click.left,e.offset.parent.left-=n.offset.parent.left-e.offset.parent.left,e.offset.parent.top-=n.offset.parent.top-e.offset.parent.top,n._trigger("toSortable",i),n.dropped=e.element,V.each(n.sortables,function(){this.refreshPositions()}),n.currentItem=n.element,e.fromOutside=n),e.currentItem&&(e._mouseDrag(i),s.position=e.position)):e.isOver&&(e.isOver=0,e.cancelHelperRemoval=!0,e.options._revert=e.options.revert,e.options.revert=!1,e._trigger("out",i,e._uiHash(e)),e._mouseStop(i,!0),e.options.revert=e.options._revert,e.options.helper=e.options._helper,e.placeholder&&e.placeholder.remove(),s.helper.appendTo(n._parent),n._refreshOffsets(i),s.position=n._generatePosition(i,!0),n._trigger("fromSortable",i),n.dropped=!1,V.each(n.sortables,function(){this.refreshPositions()}))})}}),V.ui.plugin.add("draggable","cursor",{start:function(t,e,i){var s=V("body"),i=i.options;s.css("cursor")&&(i._cursor=s.css("cursor")),s.css("cursor",i.cursor)},stop:function(t,e,i){i=i.options;i._cursor&&V("body").css("cursor",i._cursor)}}),V.ui.plugin.add("draggable","opacity",{start:function(t,e,i){e=V(e.helper),i=i.options;e.css("opacity")&&(i._opacity=e.css("opacity")),e.css("opacity",i.opacity)},stop:function(t,e,i){i=i.options;i._opacity&&V(e.helper).css("opacity",i._opacity)}}),V.ui.plugin.add("draggable","scroll",{start:function(t,e,i){i.scrollParentNotHidden||(i.scrollParentNotHidden=i.helper.scrollParent(!1)),i.scrollParentNotHidden[0]!==i.document[0]&&"HTML"!==i.scrollParentNotHidden[0].tagName&&(i.overflowOffset=i.scrollParentNotHidden.offset())},drag:function(t,e,i){var s=i.options,n=!1,o=i.scrollParentNotHidden[0],a=i.document[0];o!==a&&"HTML"!==o.tagName?(s.axis&&"x"===s.axis||(i.overflowOffset.top+o.offsetHeight-t.pageY").css({overflow:"hidden",position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.resizable("instance")),this.elementIsWrapper=!0,t={marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom"),marginLeft:this.originalElement.css("marginLeft")},this.element.css(t),this.originalElement.css("margin",0),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css(t),this._proportionallyResize()),this._setupHandles(),e.autoHide&&V(this.element).on("mouseenter",function(){e.disabled||(i._removeClass("ui-resizable-autohide"),i._handles.show())}).on("mouseleave",function(){e.disabled||i.resizing||(i._addClass("ui-resizable-autohide"),i._handles.hide())}),this._mouseInit()},_destroy:function(){this._mouseDestroy(),this._addedHandles.remove();function t(t){V(t).removeData("resizable").removeData("ui-resizable").off(".resizable")}var e;return this.elementIsWrapper&&(t(this.element),e=this.element,this.originalElement.css({position:e.css("position"),width:e.outerWidth(),height:e.outerHeight(),top:e.css("top"),left:e.css("left")}).insertAfter(e),e.remove()),this.originalElement.css("resize",this.originalResizeStyle),t(this.originalElement),this},_setOption:function(t,e){switch(this._super(t,e),t){case"handles":this._removeHandles(),this._setupHandles();break;case"aspectRatio":this._aspectRatio=!!e}},_setupHandles:function(){var t,e,i,s,n,o=this.options,a=this;if(this.handles=o.handles||(V(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this._handles=V(),this._addedHandles=V(),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),i=this.handles.split(","),this.handles={},e=0;e"),this._addClass(n,"ui-resizable-handle "+s),n.css({zIndex:o.zIndex}),this.handles[t]=".ui-resizable-"+t,this.element.children(this.handles[t]).length||(this.element.append(n),this._addedHandles=this._addedHandles.add(n));this._renderAxis=function(t){var e,i,s;for(e in t=t||this.element,this.handles)this.handles[e].constructor===String?this.handles[e]=this.element.children(this.handles[e]).first().show():(this.handles[e].jquery||this.handles[e].nodeType)&&(this.handles[e]=V(this.handles[e]),this._on(this.handles[e],{mousedown:a._mouseDown})),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/^(textarea|input|select|button)$/i)&&(i=V(this.handles[e],this.element),s=/sw|ne|nw|se|n|s/.test(e)?i.outerHeight():i.outerWidth(),i=["padding",/ne|nw|n/.test(e)?"Top":/se|sw|s/.test(e)?"Bottom":/^e$/.test(e)?"Right":"Left"].join(""),t.css(i,s),this._proportionallyResize()),this._handles=this._handles.add(this.handles[e])},this._renderAxis(this.element),this._handles=this._handles.add(this.element.find(".ui-resizable-handle")),this._handles.disableSelection(),this._handles.on("mouseover",function(){a.resizing||(this.className&&(n=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),a.axis=n&&n[1]?n[1]:"se")}),o.autoHide&&(this._handles.hide(),this._addClass("ui-resizable-autohide"))},_removeHandles:function(){this._addedHandles.remove()},_mouseCapture:function(t){var e,i,s=!1;for(e in this.handles)(i=V(this.handles[e])[0])!==t.target&&!V.contains(i,t.target)||(s=!0);return!this.options.disabled&&s},_mouseStart:function(t){var e,i,s=this.options,n=this.element;return this.resizing=!0,this._renderProxy(),e=this._num(this.helper.css("left")),i=this._num(this.helper.css("top")),s.containment&&(e+=V(s.containment).scrollLeft()||0,i+=V(s.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:e,top:i},this.size=this._helper?{width:this.helper.width(),height:this.helper.height()}:{width:n.width(),height:n.height()},this.originalSize=this._helper?{width:n.outerWidth(),height:n.outerHeight()}:{width:n.width(),height:n.height()},this.sizeDiff={width:n.outerWidth()-n.width(),height:n.outerHeight()-n.height()},this.originalPosition={left:e,top:i},this.originalMousePosition={left:t.pageX,top:t.pageY},this.aspectRatio="number"==typeof s.aspectRatio?s.aspectRatio:this.originalSize.width/this.originalSize.height||1,s=V(".ui-resizable-"+this.axis).css("cursor"),V("body").css("cursor","auto"===s?this.axis+"-resize":s),this._addClass("ui-resizable-resizing"),this._propagate("start",t),!0},_mouseDrag:function(t){var e=this.originalMousePosition,i=this.axis,s=t.pageX-e.left||0,e=t.pageY-e.top||0,i=this._change[i];return this._updatePrevProperties(),i&&(e=i.apply(this,[t,s,e]),this._updateVirtualBoundaries(t.shiftKey),(this._aspectRatio||t.shiftKey)&&(e=this._updateRatio(e,t)),e=this._respectSize(e,t),this._updateCache(e),this._propagate("resize",t),e=this._applyChanges(),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),V.isEmptyObject(e)||(this._updatePrevProperties(),this._trigger("resize",t,this.ui()),this._applyChanges())),!1},_mouseStop:function(t){this.resizing=!1;var e,i,s,n=this.options,o=this;return this._helper&&(s=(e=(i=this._proportionallyResizeElements).length&&/textarea/i.test(i[0].nodeName))&&this._hasScroll(i[0],"left")?0:o.sizeDiff.height,i=e?0:o.sizeDiff.width,e={width:o.helper.width()-i,height:o.helper.height()-s},i=parseFloat(o.element.css("left"))+(o.position.left-o.originalPosition.left)||null,s=parseFloat(o.element.css("top"))+(o.position.top-o.originalPosition.top)||null,n.animate||this.element.css(V.extend(e,{top:s,left:i})),o.helper.height(o.size.height),o.helper.width(o.size.width),this._helper&&!n.animate&&this._proportionallyResize()),V("body").css("cursor","auto"),this._removeClass("ui-resizable-resizing"),this._propagate("stop",t),this._helper&&this.helper.remove(),!1},_updatePrevProperties:function(){this.prevPosition={top:this.position.top,left:this.position.left},this.prevSize={width:this.size.width,height:this.size.height}},_applyChanges:function(){var t={};return this.position.top!==this.prevPosition.top&&(t.top=this.position.top+"px"),this.position.left!==this.prevPosition.left&&(t.left=this.position.left+"px"),this.size.width!==this.prevSize.width&&(t.width=this.size.width+"px"),this.size.height!==this.prevSize.height&&(t.height=this.size.height+"px"),this.helper.css(t),t},_updateVirtualBoundaries:function(t){var e,i,s=this.options,n={minWidth:this._isNumber(s.minWidth)?s.minWidth:0,maxWidth:this._isNumber(s.maxWidth)?s.maxWidth:1/0,minHeight:this._isNumber(s.minHeight)?s.minHeight:0,maxHeight:this._isNumber(s.maxHeight)?s.maxHeight:1/0};(this._aspectRatio||t)&&(e=n.minHeight*this.aspectRatio,i=n.minWidth/this.aspectRatio,s=n.maxHeight*this.aspectRatio,t=n.maxWidth/this.aspectRatio,e>n.minWidth&&(n.minWidth=e),i>n.minHeight&&(n.minHeight=i),st.width,a=this._isNumber(t.height)&&e.minHeight&&e.minHeight>t.height,r=this.originalPosition.left+this.originalSize.width,l=this.originalPosition.top+this.originalSize.height,h=/sw|nw|w/.test(i),i=/nw|ne|n/.test(i);return o&&(t.width=e.minWidth),a&&(t.height=e.minHeight),s&&(t.width=e.maxWidth),n&&(t.height=e.maxHeight),o&&h&&(t.left=r-e.minWidth),s&&h&&(t.left=r-e.maxWidth),a&&i&&(t.top=l-e.minHeight),n&&i&&(t.top=l-e.maxHeight),t.width||t.height||t.left||!t.top?t.width||t.height||t.top||!t.left||(t.left=null):t.top=null,t},_getPaddingPlusBorderDimensions:function(t){for(var e=0,i=[],s=[t.css("borderTopWidth"),t.css("borderRightWidth"),t.css("borderBottomWidth"),t.css("borderLeftWidth")],n=[t.css("paddingTop"),t.css("paddingRight"),t.css("paddingBottom"),t.css("paddingLeft")];e<4;e++)i[e]=parseFloat(s[e])||0,i[e]+=parseFloat(n[e])||0;return{height:i[0]+i[2],width:i[1]+i[3]}},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var t,e=0,i=this.helper||this.element;e").css({overflow:"hidden"}),this._addClass(this.helper,this._helper),this.helper.css({width:this.element.outerWidth(),height:this.element.outerHeight(),position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++e.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(t,e){return{width:this.originalSize.width+e}},w:function(t,e){var i=this.originalSize;return{left:this.originalPosition.left+e,width:i.width-e}},n:function(t,e,i){var s=this.originalSize;return{top:this.originalPosition.top+i,height:s.height-i}},s:function(t,e,i){return{height:this.originalSize.height+i}},se:function(t,e,i){return V.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[t,e,i]))},sw:function(t,e,i){return V.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[t,e,i]))},ne:function(t,e,i){return V.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[t,e,i]))},nw:function(t,e,i){return V.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[t,e,i]))}},_propagate:function(t,e){V.ui.plugin.call(this,t,[e,this.ui()]),"resize"!==t&&this._trigger(t,e,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),V.ui.plugin.add("resizable","animate",{stop:function(e){var i=V(this).resizable("instance"),t=i.options,s=i._proportionallyResizeElements,n=s.length&&/textarea/i.test(s[0].nodeName),o=n&&i._hasScroll(s[0],"left")?0:i.sizeDiff.height,a=n?0:i.sizeDiff.width,n={width:i.size.width-a,height:i.size.height-o},a=parseFloat(i.element.css("left"))+(i.position.left-i.originalPosition.left)||null,o=parseFloat(i.element.css("top"))+(i.position.top-i.originalPosition.top)||null;i.element.animate(V.extend(n,o&&a?{top:o,left:a}:{}),{duration:t.animateDuration,easing:t.animateEasing,step:function(){var t={width:parseFloat(i.element.css("width")),height:parseFloat(i.element.css("height")),top:parseFloat(i.element.css("top")),left:parseFloat(i.element.css("left"))};s&&s.length&&V(s[0]).css({width:t.width,height:t.height}),i._updateCache(t),i._propagate("resize",e)}})}}),V.ui.plugin.add("resizable","containment",{start:function(){var i,s,n=V(this).resizable("instance"),t=n.options,e=n.element,o=t.containment,a=o instanceof V?o.get(0):/parent/.test(o)?e.parent().get(0):o;a&&(n.containerElement=V(a),/document/.test(o)||o===document?(n.containerOffset={left:0,top:0},n.containerPosition={left:0,top:0},n.parentData={element:V(document),left:0,top:0,width:V(document).width(),height:V(document).height()||document.body.parentNode.scrollHeight}):(i=V(a),s=[],V(["Top","Right","Left","Bottom"]).each(function(t,e){s[t]=n._num(i.css("padding"+e))}),n.containerOffset=i.offset(),n.containerPosition=i.position(),n.containerSize={height:i.innerHeight()-s[3],width:i.innerWidth()-s[1]},t=n.containerOffset,e=n.containerSize.height,o=n.containerSize.width,o=n._hasScroll(a,"left")?a.scrollWidth:o,e=n._hasScroll(a)?a.scrollHeight:e,n.parentData={element:a,left:t.left,top:t.top,width:o,height:e}))},resize:function(t){var e=V(this).resizable("instance"),i=e.options,s=e.containerOffset,n=e.position,o=e._aspectRatio||t.shiftKey,a={top:0,left:0},r=e.containerElement,t=!0;r[0]!==document&&/static/.test(r.css("position"))&&(a=s),n.left<(e._helper?s.left:0)&&(e.size.width=e.size.width+(e._helper?e.position.left-s.left:e.position.left-a.left),o&&(e.size.height=e.size.width/e.aspectRatio,t=!1),e.position.left=i.helper?s.left:0),n.top<(e._helper?s.top:0)&&(e.size.height=e.size.height+(e._helper?e.position.top-s.top:e.position.top),o&&(e.size.width=e.size.height*e.aspectRatio,t=!1),e.position.top=e._helper?s.top:0),i=e.containerElement.get(0)===e.element.parent().get(0),n=/relative|absolute/.test(e.containerElement.css("position")),i&&n?(e.offset.left=e.parentData.left+e.position.left,e.offset.top=e.parentData.top+e.position.top):(e.offset.left=e.element.offset().left,e.offset.top=e.element.offset().top),n=Math.abs(e.sizeDiff.width+(e._helper?e.offset.left-a.left:e.offset.left-s.left)),s=Math.abs(e.sizeDiff.height+(e._helper?e.offset.top-a.top:e.offset.top-s.top)),n+e.size.width>=e.parentData.width&&(e.size.width=e.parentData.width-n,o&&(e.size.height=e.size.width/e.aspectRatio,t=!1)),s+e.size.height>=e.parentData.height&&(e.size.height=e.parentData.height-s,o&&(e.size.width=e.size.height*e.aspectRatio,t=!1)),t||(e.position.left=e.prevPosition.left,e.position.top=e.prevPosition.top,e.size.width=e.prevSize.width,e.size.height=e.prevSize.height)},stop:function(){var t=V(this).resizable("instance"),e=t.options,i=t.containerOffset,s=t.containerPosition,n=t.containerElement,o=V(t.helper),a=o.offset(),r=o.outerWidth()-t.sizeDiff.width,o=o.outerHeight()-t.sizeDiff.height;t._helper&&!e.animate&&/relative/.test(n.css("position"))&&V(this).css({left:a.left-s.left-i.left,width:r,height:o}),t._helper&&!e.animate&&/static/.test(n.css("position"))&&V(this).css({left:a.left-s.left-i.left,width:r,height:o})}}),V.ui.plugin.add("resizable","alsoResize",{start:function(){var t=V(this).resizable("instance").options;V(t.alsoResize).each(function(){var t=V(this);t.data("ui-resizable-alsoresize",{width:parseFloat(t.width()),height:parseFloat(t.height()),left:parseFloat(t.css("left")),top:parseFloat(t.css("top"))})})},resize:function(t,i){var e=V(this).resizable("instance"),s=e.options,n=e.originalSize,o=e.originalPosition,a={height:e.size.height-n.height||0,width:e.size.width-n.width||0,top:e.position.top-o.top||0,left:e.position.left-o.left||0};V(s.alsoResize).each(function(){var t=V(this),s=V(this).data("ui-resizable-alsoresize"),n={},e=t.parents(i.originalElement[0]).length?["width","height"]:["width","height","top","left"];V.each(e,function(t,e){var i=(s[e]||0)+(a[e]||0);i&&0<=i&&(n[e]=i||null)}),t.css(n)})},stop:function(){V(this).removeData("ui-resizable-alsoresize")}}),V.ui.plugin.add("resizable","ghost",{start:function(){var t=V(this).resizable("instance"),e=t.size;t.ghost=t.originalElement.clone(),t.ghost.css({opacity:.25,display:"block",position:"relative",height:e.height,width:e.width,margin:0,left:0,top:0}),t._addClass(t.ghost,"ui-resizable-ghost"),!1!==V.uiBackCompat&&"string"==typeof t.options.ghost&&t.ghost.addClass(this.options.ghost),t.ghost.appendTo(t.helper)},resize:function(){var t=V(this).resizable("instance");t.ghost&&t.ghost.css({position:"relative",height:t.size.height,width:t.size.width})},stop:function(){var t=V(this).resizable("instance");t.ghost&&t.helper&&t.helper.get(0).removeChild(t.ghost.get(0))}}),V.ui.plugin.add("resizable","grid",{resize:function(){var t,e=V(this).resizable("instance"),i=e.options,s=e.size,n=e.originalSize,o=e.originalPosition,a=e.axis,r="number"==typeof i.grid?[i.grid,i.grid]:i.grid,l=r[0]||1,h=r[1]||1,c=Math.round((s.width-n.width)/l)*l,u=Math.round((s.height-n.height)/h)*h,d=n.width+c,p=n.height+u,f=i.maxWidth&&i.maxWidthd,s=i.minHeight&&i.minHeight>p;i.grid=r,m&&(d+=l),s&&(p+=h),f&&(d-=l),g&&(p-=h),/^(se|s|e)$/.test(a)?(e.size.width=d,e.size.height=p):/^(ne)$/.test(a)?(e.size.width=d,e.size.height=p,e.position.top=o.top-u):/^(sw)$/.test(a)?(e.size.width=d,e.size.height=p,e.position.left=o.left-c):((p-h<=0||d-l<=0)&&(t=e._getPaddingPlusBorderDimensions(this)),0=+this.uiDialog.css("z-index")&&(this.uiDialog.css("z-index",s+1),i=!0),i&&!e&&this._trigger("focus",t),i},open:function(){var t=this;this._isOpen?this._moveToTop()&&this._focusTabbable():(this._isOpen=!0,this.opener=V(V.ui.safeActiveElement(this.document[0])),this._size(),this._position(),this._createOverlay(),this._moveToTop(null,!0),this.overlay&&this.overlay.css("z-index",this.uiDialog.css("z-index")-1),this._show(this.uiDialog,this.options.show,function(){t._focusTabbable(),t._trigger("focus")}),this._makeFocusTarget(),this._trigger("open"))},_focusTabbable:function(){var t=this._focusedElement;(t=!(t=!(t=!(t=!(t=t||this.element.find("[autofocus]")).length?this.element.find(":tabbable"):t).length?this.uiDialogButtonPane.find(":tabbable"):t).length?this.uiDialogTitlebarClose.filter(":tabbable"):t).length?this.uiDialog:t).eq(0).trigger("focus")},_restoreTabbableFocus:function(){var t=V.ui.safeActiveElement(this.document[0]);this.uiDialog[0]===t||V.contains(this.uiDialog[0],t)||this._focusTabbable()},_keepFocus:function(t){t.preventDefault(),this._restoreTabbableFocus(),this._delay(this._restoreTabbableFocus)},_createWrapper:function(){this.uiDialog=V("
").hide().attr({tabIndex:-1,role:"dialog"}).appendTo(this._appendTo()),this._addClass(this.uiDialog,"ui-dialog","ui-widget ui-widget-content ui-front"),this._on(this.uiDialog,{keydown:function(t){if(this.options.closeOnEscape&&!t.isDefaultPrevented()&&t.keyCode&&t.keyCode===V.ui.keyCode.ESCAPE)return t.preventDefault(),void this.close(t);var e,i,s;t.keyCode!==V.ui.keyCode.TAB||t.isDefaultPrevented()||(e=this.uiDialog.find(":tabbable"),i=e.first(),s=e.last(),t.target!==s[0]&&t.target!==this.uiDialog[0]||t.shiftKey?t.target!==i[0]&&t.target!==this.uiDialog[0]||!t.shiftKey||(this._delay(function(){s.trigger("focus")}),t.preventDefault()):(this._delay(function(){i.trigger("focus")}),t.preventDefault()))},mousedown:function(t){this._moveToTop(t)&&this._focusTabbable()}}),this.element.find("[aria-describedby]").length||this.uiDialog.attr({"aria-describedby":this.element.uniqueId().attr("id")})},_createTitlebar:function(){var t;this.uiDialogTitlebar=V("
"),this._addClass(this.uiDialogTitlebar,"ui-dialog-titlebar","ui-widget-header ui-helper-clearfix"),this._on(this.uiDialogTitlebar,{mousedown:function(t){V(t.target).closest(".ui-dialog-titlebar-close")||this.uiDialog.trigger("focus")}}),this.uiDialogTitlebarClose=V("").button({label:V("").text(this.options.closeText).html(),icon:"ui-icon-closethick",showLabel:!1}).appendTo(this.uiDialogTitlebar),this._addClass(this.uiDialogTitlebarClose,"ui-dialog-titlebar-close"),this._on(this.uiDialogTitlebarClose,{click:function(t){t.preventDefault(),this.close(t)}}),t=V("").uniqueId().prependTo(this.uiDialogTitlebar),this._addClass(t,"ui-dialog-title"),this._title(t),this.uiDialogTitlebar.prependTo(this.uiDialog),this.uiDialog.attr({"aria-labelledby":t.attr("id")})},_title:function(t){this.options.title?t.text(this.options.title):t.html(" ")},_createButtonPane:function(){this.uiDialogButtonPane=V("
"),this._addClass(this.uiDialogButtonPane,"ui-dialog-buttonpane","ui-widget-content ui-helper-clearfix"),this.uiButtonSet=V("
").appendTo(this.uiDialogButtonPane),this._addClass(this.uiButtonSet,"ui-dialog-buttonset"),this._createButtons()},_createButtons:function(){var s=this,t=this.options.buttons;this.uiDialogButtonPane.remove(),this.uiButtonSet.empty(),V.isEmptyObject(t)||Array.isArray(t)&&!t.length?this._removeClass(this.uiDialog,"ui-dialog-buttons"):(V.each(t,function(t,e){var i;e=V.extend({type:"button"},e="function"==typeof e?{click:e,text:t}:e),i=e.click,t={icon:e.icon,iconPosition:e.iconPosition,showLabel:e.showLabel,icons:e.icons,text:e.text},delete e.click,delete e.icon,delete e.iconPosition,delete e.showLabel,delete e.icons,"boolean"==typeof e.text&&delete e.text,V("",e).button(t).appendTo(s.uiButtonSet).on("click",function(){i.apply(s.element[0],arguments)})}),this._addClass(this.uiDialog,"ui-dialog-buttons"),this.uiDialogButtonPane.appendTo(this.uiDialog))},_makeDraggable:function(){var n=this,o=this.options;function a(t){return{position:t.position,offset:t.offset}}this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(t,e){n._addClass(V(this),"ui-dialog-dragging"),n._blockFrames(),n._trigger("dragStart",t,a(e))},drag:function(t,e){n._trigger("drag",t,a(e))},stop:function(t,e){var i=e.offset.left-n.document.scrollLeft(),s=e.offset.top-n.document.scrollTop();o.position={my:"left top",at:"left"+(0<=i?"+":"")+i+" top"+(0<=s?"+":"")+s,of:n.window},n._removeClass(V(this),"ui-dialog-dragging"),n._unblockFrames(),n._trigger("dragStop",t,a(e))}})},_makeResizable:function(){var n=this,o=this.options,t=o.resizable,e=this.uiDialog.css("position"),t="string"==typeof t?t:"n,e,s,w,se,sw,ne,nw";function a(t){return{originalPosition:t.originalPosition,originalSize:t.originalSize,position:t.position,size:t.size}}this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:o.maxWidth,maxHeight:o.maxHeight,minWidth:o.minWidth,minHeight:this._minHeight(),handles:t,start:function(t,e){n._addClass(V(this),"ui-dialog-resizing"),n._blockFrames(),n._trigger("resizeStart",t,a(e))},resize:function(t,e){n._trigger("resize",t,a(e))},stop:function(t,e){var i=n.uiDialog.offset(),s=i.left-n.document.scrollLeft(),i=i.top-n.document.scrollTop();o.height=n.uiDialog.height(),o.width=n.uiDialog.width(),o.position={my:"left top",at:"left"+(0<=s?"+":"")+s+" top"+(0<=i?"+":"")+i,of:n.window},n._removeClass(V(this),"ui-dialog-resizing"),n._unblockFrames(),n._trigger("resizeStop",t,a(e))}}).css("position",e)},_trackFocus:function(){this._on(this.widget(),{focusin:function(t){this._makeFocusTarget(),this._focusedElement=V(t.target)}})},_makeFocusTarget:function(){this._untrackInstance(),this._trackingInstances().unshift(this)},_untrackInstance:function(){var t=this._trackingInstances(),e=V.inArray(this,t);-1!==e&&t.splice(e,1)},_trackingInstances:function(){var t=this.document.data("ui-dialog-instances");return t||this.document.data("ui-dialog-instances",t=[]),t},_minHeight:function(){var t=this.options;return"auto"===t.height?t.minHeight:Math.min(t.minHeight,t.height)},_position:function(){var t=this.uiDialog.is(":visible");t||this.uiDialog.show(),this.uiDialog.position(this.options.position),t||this.uiDialog.hide()},_setOptions:function(t){var i=this,s=!1,n={};V.each(t,function(t,e){i._setOption(t,e),t in i.sizeRelatedOptions&&(s=!0),t in i.resizableRelatedOptions&&(n[t]=e)}),s&&(this._size(),this._position()),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option",n)},_setOption:function(t,e){var i,s=this.uiDialog;"disabled"!==t&&(this._super(t,e),"appendTo"===t&&this.uiDialog.appendTo(this._appendTo()),"buttons"===t&&this._createButtons(),"closeText"===t&&this.uiDialogTitlebarClose.button({label:V("").text(""+this.options.closeText).html()}),"draggable"===t&&((i=s.is(":data(ui-draggable)"))&&!e&&s.draggable("destroy"),!i&&e&&this._makeDraggable()),"position"===t&&this._position(),"resizable"===t&&((i=s.is(":data(ui-resizable)"))&&!e&&s.resizable("destroy"),i&&"string"==typeof e&&s.resizable("option","handles",e),i||!1===e||this._makeResizable()),"title"===t&&this._title(this.uiDialogTitlebar.find(".ui-dialog-title")))},_size:function(){var t,e,i,s=this.options;this.element.show().css({width:"auto",minHeight:0,maxHeight:"none",height:0}),s.minWidth>s.width&&(s.width=s.minWidth),t=this.uiDialog.css({height:"auto",width:s.width}).outerHeight(),e=Math.max(0,s.minHeight-t),i="number"==typeof s.maxHeight?Math.max(0,s.maxHeight-t):"none","auto"===s.height?this.element.css({minHeight:e,maxHeight:i,height:"auto"}):this.element.height(Math.max(0,s.height-t)),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())},_blockFrames:function(){this.iframeBlocks=this.document.find("iframe").map(function(){var t=V(this);return V("
").css({position:"absolute",width:t.outerWidth(),height:t.outerHeight()}).appendTo(t.parent()).offset(t.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_allowInteraction:function(t){return!!V(t.target).closest(".ui-dialog").length||!!V(t.target).closest(".ui-datepicker").length},_createOverlay:function(){var i,s;this.options.modal&&(i=V.fn.jquery.substring(0,4),s=!0,this._delay(function(){s=!1}),this.document.data("ui-dialog-overlays")||this.document.on("focusin.ui-dialog",function(t){var e;s||((e=this._trackingInstances()[0])._allowInteraction(t)||(t.preventDefault(),e._focusTabbable(),"3.4."!==i&&"3.5."!==i||e._delay(e._restoreTabbableFocus)))}.bind(this)),this.overlay=V("
").appendTo(this._appendTo()),this._addClass(this.overlay,null,"ui-widget-overlay ui-front"),this._on(this.overlay,{mousedown:"_keepFocus"}),this.document.data("ui-dialog-overlays",(this.document.data("ui-dialog-overlays")||0)+1))},_destroyOverlay:function(){var t;this.options.modal&&this.overlay&&((t=this.document.data("ui-dialog-overlays")-1)?this.document.data("ui-dialog-overlays",t):(this.document.off("focusin.ui-dialog"),this.document.removeData("ui-dialog-overlays")),this.overlay.remove(),this.overlay=null)}}),!1!==V.uiBackCompat&&V.widget("ui.dialog",V.ui.dialog,{options:{dialogClass:""},_createWrapper:function(){this._super(),this.uiDialog.addClass(this.options.dialogClass)},_setOption:function(t,e){"dialogClass"===t&&this.uiDialog.removeClass(this.options.dialogClass).addClass(e),this._superApply(arguments)}});V.ui.dialog;function lt(t,e,i){return e<=t&&t").appendTo(this.element),this._addClass(this.valueDiv,"ui-progressbar-value","ui-widget-header"),this._refreshValue()},_destroy:function(){this.element.removeAttr("role aria-valuemin aria-valuemax aria-valuenow"),this.valueDiv.remove()},value:function(t){if(void 0===t)return this.options.value;this.options.value=this._constrainedValue(t),this._refreshValue()},_constrainedValue:function(t){return void 0===t&&(t=this.options.value),this.indeterminate=!1===t,"number"!=typeof t&&(t=0),!this.indeterminate&&Math.min(this.options.max,Math.max(this.min,t))},_setOptions:function(t){var e=t.value;delete t.value,this._super(t),this.options.value=this._constrainedValue(e),this._refreshValue()},_setOption:function(t,e){"max"===t&&(e=Math.max(this.min,e)),this._super(t,e)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t),this._toggleClass(null,"ui-state-disabled",!!t)},_percentage:function(){return this.indeterminate?100:100*(this.options.value-this.min)/(this.options.max-this.min)},_refreshValue:function(){var t=this.options.value,e=this._percentage();this.valueDiv.toggle(this.indeterminate||t>this.min).width(e.toFixed(0)+"%"),this._toggleClass(this.valueDiv,"ui-progressbar-complete",null,t===this.options.max)._toggleClass("ui-progressbar-indeterminate",null,this.indeterminate),this.indeterminate?(this.element.removeAttr("aria-valuenow"),this.overlayDiv||(this.overlayDiv=V("
").appendTo(this.valueDiv),this._addClass(this.overlayDiv,"ui-progressbar-overlay"))):(this.element.attr({"aria-valuemax":this.options.max,"aria-valuenow":t}),this.overlayDiv&&(this.overlayDiv.remove(),this.overlayDiv=null)),this.oldValue!==t&&(this.oldValue=t,this._trigger("change")),t===this.options.max&&this._trigger("complete")}}),V.widget("ui.selectable",V.ui.mouse,{version:"1.13.1",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch",selected:null,selecting:null,start:null,stop:null,unselected:null,unselecting:null},_create:function(){var i=this;this._addClass("ui-selectable"),this.dragged=!1,this.refresh=function(){i.elementPos=V(i.element[0]).offset(),i.selectees=V(i.options.filter,i.element[0]),i._addClass(i.selectees,"ui-selectee"),i.selectees.each(function(){var t=V(this),e=t.offset(),e={left:e.left-i.elementPos.left,top:e.top-i.elementPos.top};V.data(this,"selectable-item",{element:this,$element:t,left:e.left,top:e.top,right:e.left+t.outerWidth(),bottom:e.top+t.outerHeight(),startselected:!1,selected:t.hasClass("ui-selected"),selecting:t.hasClass("ui-selecting"),unselecting:t.hasClass("ui-unselecting")})})},this.refresh(),this._mouseInit(),this.helper=V("
"),this._addClass(this.helper,"ui-selectable-helper")},_destroy:function(){this.selectees.removeData("selectable-item"),this._mouseDestroy()},_mouseStart:function(i){var s=this,t=this.options;this.opos=[i.pageX,i.pageY],this.elementPos=V(this.element[0]).offset(),this.options.disabled||(this.selectees=V(t.filter,this.element[0]),this._trigger("start",i),V(t.appendTo).append(this.helper),this.helper.css({left:i.pageX,top:i.pageY,width:0,height:0}),t.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var t=V.data(this,"selectable-item");t.startselected=!0,i.metaKey||i.ctrlKey||(s._removeClass(t.$element,"ui-selected"),t.selected=!1,s._addClass(t.$element,"ui-unselecting"),t.unselecting=!0,s._trigger("unselecting",i,{unselecting:t.element}))}),V(i.target).parents().addBack().each(function(){var t,e=V.data(this,"selectable-item");if(e)return t=!i.metaKey&&!i.ctrlKey||!e.$element.hasClass("ui-selected"),s._removeClass(e.$element,t?"ui-unselecting":"ui-selected")._addClass(e.$element,t?"ui-selecting":"ui-unselecting"),e.unselecting=!t,e.selecting=t,(e.selected=t)?s._trigger("selecting",i,{selecting:e.element}):s._trigger("unselecting",i,{unselecting:e.element}),!1}))},_mouseDrag:function(s){if(this.dragged=!0,!this.options.disabled){var t,n=this,o=this.options,a=this.opos[0],r=this.opos[1],l=s.pageX,h=s.pageY;return ll||i.righth||i.bottoma&&i.rightr&&i.bottom",options:{appendTo:null,classes:{"ui-selectmenu-button-open":"ui-corner-top","ui-selectmenu-button-closed":"ui-corner-all"},disabled:null,icons:{button:"ui-icon-triangle-1-s"},position:{my:"left top",at:"left bottom",collision:"none"},width:!1,change:null,close:null,focus:null,open:null,select:null},_create:function(){var t=this.element.uniqueId().attr("id");this.ids={element:t,button:t+"-button",menu:t+"-menu"},this._drawButton(),this._drawMenu(),this._bindFormResetHandler(),this._rendered=!1,this.menuItems=V()},_drawButton:function(){var t,e=this,i=this._parseOption(this.element.find("option:selected"),this.element[0].selectedIndex);this.labels=this.element.labels().attr("for",this.ids.button),this._on(this.labels,{click:function(t){this.button.trigger("focus"),t.preventDefault()}}),this.element.hide(),this.button=V("",{tabindex:this.options.disabled?-1:0,id:this.ids.button,role:"combobox","aria-expanded":"false","aria-autocomplete":"list","aria-owns":this.ids.menu,"aria-haspopup":"true",title:this.element.attr("title")}).insertAfter(this.element),this._addClass(this.button,"ui-selectmenu-button ui-selectmenu-button-closed","ui-button ui-widget"),t=V("").appendTo(this.button),this._addClass(t,"ui-selectmenu-icon","ui-icon "+this.options.icons.button),this.buttonItem=this._renderButtonItem(i).appendTo(this.button),!1!==this.options.width&&this._resizeButton(),this._on(this.button,this._buttonEvents),this.button.one("focusin",function(){e._rendered||e._refreshMenu()})},_drawMenu:function(){var i=this;this.menu=V("