From 81a23930b1932cb64ebb0f756a2cffb721d1fa11 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 11:44:44 +0000 Subject: [PATCH 01/74] Fix: Use correct style path From 1712396d19a2bcdddfbcc54445eb15ea89d58d5a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 11:46:16 +0000 Subject: [PATCH 02/74] Sec: Fix security login mutualized function. --- test/phpunit/WebservicesTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/phpunit/WebservicesTest.php b/test/phpunit/WebservicesTest.php index cfc9b80d94c..a24f4e58521 100755 --- a/test/phpunit/WebservicesTest.php +++ b/test/phpunit/WebservicesTest.php @@ -41,7 +41,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1; /** - * Class for PHPUnit tests + * When no cover is provided. We use everything. * * @backupGlobals disabled * @backupStaticAttributes enabled From 29bf0aff8d58d6635266f39d051cafde10fdf564 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 11:53:22 +0000 Subject: [PATCH 03/74] Sec: Fix security login mutualized function. --- htdocs/main.inc.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 0e2f6ee691f..3919bcffcde 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -155,6 +155,7 @@ require_once("master.inc.php"); register_shutdown_function('dol_shutdown'); // Detection browser +// TODO rename conf->browser into user->browser if (isset($_SERVER["HTTP_USER_AGENT"])) { // If phone/smartphone, we set phone os name. @@ -337,9 +338,10 @@ if (! defined('NOLOGIN')) // Verification security graphic code if (isset($_POST["username"]) && ! empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA)) { - require_once(ARTICHOW_PATH.'Artichow.cfg.php'); - require_once(ARTICHOW.'/AntiSpam.class.php'); + require_once DOL_DOCUMENT_ROOT.'/includes/artichow/Artichow.cfg.php'; + require_once ARTICHOW."/AntiSpam.class.php"; + // It creates an anti-spam object $object = new AntiSpam(); // Verifie code From 57ace4b1743b9ddad1c0fb872d1f6130ea5c1ec9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 12:21:00 +0000 Subject: [PATCH 04/74] Enhance PHPUnit tests --- test/phpunit/WebservicesTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/phpunit/WebservicesTest.php b/test/phpunit/WebservicesTest.php index a24f4e58521..cfc9b80d94c 100755 --- a/test/phpunit/WebservicesTest.php +++ b/test/phpunit/WebservicesTest.php @@ -41,7 +41,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1; /** - * When no cover is provided. We use everything. + * Class for PHPUnit tests * * @backupGlobals disabled * @backupStaticAttributes enabled From 7276a744efb193074e5936d0b9bdee208efaf65b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 23:12:25 +0000 Subject: [PATCH 05/74] Fix: Trans From bc28b2401e45d13cf5b396d94812f5b872e361d1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 23:36:55 +0000 Subject: [PATCH 06/74] Qual: Centralise declaratin of external lib artichow at one location. --- htdocs/main.inc.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 3919bcffcde..bd3f5ceb5f3 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -338,10 +338,9 @@ if (! defined('NOLOGIN')) // Verification security graphic code if (isset($_POST["username"]) && ! empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA)) { - require_once DOL_DOCUMENT_ROOT.'/includes/artichow/Artichow.cfg.php'; - require_once ARTICHOW."/AntiSpam.class.php"; + require_once(ARTICHOW_PATH.'Artichow.cfg.php'); + require_once(ARTICHOW.'/AntiSpam.class.php'); - // It creates an anti-spam object $object = new AntiSpam(); // Verifie code From ef893bf9978cd06bda4c7ba5678c7cb44c3e0cb0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 23:46:14 +0000 Subject: [PATCH 07/74] Qual: Uniformize code From bf99b78c2dd5b239f27e612dfa7f119cdad9a3ca Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 23:46:53 +0000 Subject: [PATCH 08/74] Qual: Removed deprecated code From e3ae9c744790c2fa92dec26adcea625623d985db Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 24 Sep 2011 01:44:18 +0000 Subject: [PATCH 09/74] Removed TODO --- htdocs/main.inc.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index bd3f5ceb5f3..0e2f6ee691f 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -155,7 +155,6 @@ require_once("master.inc.php"); register_shutdown_function('dol_shutdown'); // Detection browser -// TODO rename conf->browser into user->browser if (isset($_SERVER["HTTP_USER_AGENT"])) { // If phone/smartphone, we set phone os name. From 253945dbea28a91c95b22668463247f5cc0f4996 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 24 Sep 2011 01:56:05 +0000 Subject: [PATCH 10/74] Removed a TODO From a8f3350a145f16b9bbc44717c09ea313e64d04bd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 24 Sep 2011 02:01:26 +0000 Subject: [PATCH 11/74] Doxygen From 37505f0e0efae303ac7cdbdf472e16ec21c6f78a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 11:44:44 +0000 Subject: [PATCH 12/74] Fix: Use correct style path From caf6ed11d3e95d5c6ee646c9dd3556a467bde7ad Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 11:46:16 +0000 Subject: [PATCH 13/74] Sec: Fix security login mutualized function. --- test/phpunit/WebservicesTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/phpunit/WebservicesTest.php b/test/phpunit/WebservicesTest.php index cfc9b80d94c..a24f4e58521 100755 --- a/test/phpunit/WebservicesTest.php +++ b/test/phpunit/WebservicesTest.php @@ -41,7 +41,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1; /** - * Class for PHPUnit tests + * When no cover is provided. We use everything. * * @backupGlobals disabled * @backupStaticAttributes enabled From 0060895665cc0667776eb83a4ec093a96a2ab945 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 11:53:22 +0000 Subject: [PATCH 14/74] Sec: Fix security login mutualized function. --- htdocs/main.inc.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 0e2f6ee691f..3919bcffcde 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -155,6 +155,7 @@ require_once("master.inc.php"); register_shutdown_function('dol_shutdown'); // Detection browser +// TODO rename conf->browser into user->browser if (isset($_SERVER["HTTP_USER_AGENT"])) { // If phone/smartphone, we set phone os name. @@ -337,9 +338,10 @@ if (! defined('NOLOGIN')) // Verification security graphic code if (isset($_POST["username"]) && ! empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA)) { - require_once(ARTICHOW_PATH.'Artichow.cfg.php'); - require_once(ARTICHOW.'/AntiSpam.class.php'); + require_once DOL_DOCUMENT_ROOT.'/includes/artichow/Artichow.cfg.php'; + require_once ARTICHOW."/AntiSpam.class.php"; + // It creates an anti-spam object $object = new AntiSpam(); // Verifie code From 8e0728d73f0d3dae3e940df8409989039933908a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 12:21:00 +0000 Subject: [PATCH 15/74] Enhance PHPUnit tests --- test/phpunit/WebservicesTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/phpunit/WebservicesTest.php b/test/phpunit/WebservicesTest.php index a24f4e58521..cfc9b80d94c 100755 --- a/test/phpunit/WebservicesTest.php +++ b/test/phpunit/WebservicesTest.php @@ -41,7 +41,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1; /** - * When no cover is provided. We use everything. + * Class for PHPUnit tests * * @backupGlobals disabled * @backupStaticAttributes enabled From e97c77afa590ed5fb1d2f87526d86fca9231ab5b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 23:12:25 +0000 Subject: [PATCH 16/74] Fix: Trans From 463038d0b449ebaa9db56a5e86796d61ee3f9738 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 23:36:55 +0000 Subject: [PATCH 17/74] Qual: Centralise declaratin of external lib artichow at one location. --- htdocs/main.inc.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 3919bcffcde..bd3f5ceb5f3 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -338,10 +338,9 @@ if (! defined('NOLOGIN')) // Verification security graphic code if (isset($_POST["username"]) && ! empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA)) { - require_once DOL_DOCUMENT_ROOT.'/includes/artichow/Artichow.cfg.php'; - require_once ARTICHOW."/AntiSpam.class.php"; + require_once(ARTICHOW_PATH.'Artichow.cfg.php'); + require_once(ARTICHOW.'/AntiSpam.class.php'); - // It creates an anti-spam object $object = new AntiSpam(); // Verifie code From 7bf5762d2f3ce85bd7c03d75e73b4a4d926746e7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 23:46:14 +0000 Subject: [PATCH 18/74] Qual: Uniformize code From 09261516abe61946e99ae51c9c9b7d0fb9da162f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 23:46:53 +0000 Subject: [PATCH 19/74] Qual: Removed deprecated code From e9360ce8b0be67b03c9fa78af8558a0ac24dedef Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 24 Sep 2011 01:44:18 +0000 Subject: [PATCH 20/74] Removed TODO --- htdocs/main.inc.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index bd3f5ceb5f3..0e2f6ee691f 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -155,7 +155,6 @@ require_once("master.inc.php"); register_shutdown_function('dol_shutdown'); // Detection browser -// TODO rename conf->browser into user->browser if (isset($_SERVER["HTTP_USER_AGENT"])) { // If phone/smartphone, we set phone os name. From f85f73c62abd9c99ba576629257f36c552d805d1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 24 Sep 2011 01:56:05 +0000 Subject: [PATCH 21/74] Removed a TODO From ed6605d04d5e5f20449095a4bb5bbb009ebf9771 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 24 Sep 2011 02:01:26 +0000 Subject: [PATCH 22/74] Doxygen From 145c6b2ab679e496a88da2ef325efe7b4e18b52b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 11:44:44 +0000 Subject: [PATCH 23/74] Fix: Use correct style path From 045ee2c83384d64e4fa002502938c11824030769 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 11:46:16 +0000 Subject: [PATCH 24/74] Sec: Fix security login mutualized function. --- test/phpunit/WebservicesTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/phpunit/WebservicesTest.php b/test/phpunit/WebservicesTest.php index cfc9b80d94c..a24f4e58521 100755 --- a/test/phpunit/WebservicesTest.php +++ b/test/phpunit/WebservicesTest.php @@ -41,7 +41,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1; /** - * Class for PHPUnit tests + * When no cover is provided. We use everything. * * @backupGlobals disabled * @backupStaticAttributes enabled From becebcaab2344eee4394a27bb25af8d0c648796e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 11:53:22 +0000 Subject: [PATCH 25/74] Sec: Fix security login mutualized function. --- htdocs/main.inc.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 0e2f6ee691f..3919bcffcde 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -155,6 +155,7 @@ require_once("master.inc.php"); register_shutdown_function('dol_shutdown'); // Detection browser +// TODO rename conf->browser into user->browser if (isset($_SERVER["HTTP_USER_AGENT"])) { // If phone/smartphone, we set phone os name. @@ -337,9 +338,10 @@ if (! defined('NOLOGIN')) // Verification security graphic code if (isset($_POST["username"]) && ! empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA)) { - require_once(ARTICHOW_PATH.'Artichow.cfg.php'); - require_once(ARTICHOW.'/AntiSpam.class.php'); + require_once DOL_DOCUMENT_ROOT.'/includes/artichow/Artichow.cfg.php'; + require_once ARTICHOW."/AntiSpam.class.php"; + // It creates an anti-spam object $object = new AntiSpam(); // Verifie code From baa3d51a586b129be3fe2bf69f4877af7b78d6ae Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 12:21:00 +0000 Subject: [PATCH 26/74] Enhance PHPUnit tests --- test/phpunit/WebservicesTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/phpunit/WebservicesTest.php b/test/phpunit/WebservicesTest.php index a24f4e58521..cfc9b80d94c 100755 --- a/test/phpunit/WebservicesTest.php +++ b/test/phpunit/WebservicesTest.php @@ -41,7 +41,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1; /** - * When no cover is provided. We use everything. + * Class for PHPUnit tests * * @backupGlobals disabled * @backupStaticAttributes enabled From f0d7042204572497612f4563a18872646ab4b9c8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 23:12:25 +0000 Subject: [PATCH 27/74] Fix: Trans From e1366a92fffbfec7c52656c3fd525563391276c4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 23:36:55 +0000 Subject: [PATCH 28/74] Qual: Centralise declaratin of external lib artichow at one location. --- htdocs/main.inc.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 3919bcffcde..bd3f5ceb5f3 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -338,10 +338,9 @@ if (! defined('NOLOGIN')) // Verification security graphic code if (isset($_POST["username"]) && ! empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA)) { - require_once DOL_DOCUMENT_ROOT.'/includes/artichow/Artichow.cfg.php'; - require_once ARTICHOW."/AntiSpam.class.php"; + require_once(ARTICHOW_PATH.'Artichow.cfg.php'); + require_once(ARTICHOW.'/AntiSpam.class.php'); - // It creates an anti-spam object $object = new AntiSpam(); // Verifie code From d97e8e16a1c099b12795064ec9f45a17c63a7e42 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 23:46:14 +0000 Subject: [PATCH 29/74] Qual: Uniformize code From 03b62b48604818a75208436f402efb6cc2e71dda Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 23:46:53 +0000 Subject: [PATCH 30/74] Qual: Removed deprecated code From a8c18594a455f7f9d47850978a37f4f491aa086f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 24 Sep 2011 01:44:18 +0000 Subject: [PATCH 31/74] Removed TODO --- htdocs/main.inc.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index bd3f5ceb5f3..0e2f6ee691f 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -155,7 +155,6 @@ require_once("master.inc.php"); register_shutdown_function('dol_shutdown'); // Detection browser -// TODO rename conf->browser into user->browser if (isset($_SERVER["HTTP_USER_AGENT"])) { // If phone/smartphone, we set phone os name. From b56ca03381d6cc1aaf57b6f083ec203fd2c29129 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 24 Sep 2011 01:56:05 +0000 Subject: [PATCH 32/74] Removed a TODO From 3473d73671699efc6158120d9597e9fcc52cb206 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 24 Sep 2011 02:01:26 +0000 Subject: [PATCH 33/74] Doxygen From eaea3a9665ebd5a3ca075b6839d794d211649284 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 11:44:44 +0000 Subject: [PATCH 34/74] Fix: Use correct style path From 19dee68f4fbfe211b60df4cccb0f3ec84e6fd852 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 11:46:16 +0000 Subject: [PATCH 35/74] Sec: Fix security login mutualized function. --- test/phpunit/WebservicesTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/phpunit/WebservicesTest.php b/test/phpunit/WebservicesTest.php index cfc9b80d94c..a24f4e58521 100755 --- a/test/phpunit/WebservicesTest.php +++ b/test/phpunit/WebservicesTest.php @@ -41,7 +41,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1; /** - * Class for PHPUnit tests + * When no cover is provided. We use everything. * * @backupGlobals disabled * @backupStaticAttributes enabled From bf6a94f09f79aebaef69bae8391c74cb9795845b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 11:53:22 +0000 Subject: [PATCH 36/74] Sec: Fix security login mutualized function. --- htdocs/main.inc.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 0e2f6ee691f..3919bcffcde 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -155,6 +155,7 @@ require_once("master.inc.php"); register_shutdown_function('dol_shutdown'); // Detection browser +// TODO rename conf->browser into user->browser if (isset($_SERVER["HTTP_USER_AGENT"])) { // If phone/smartphone, we set phone os name. @@ -337,9 +338,10 @@ if (! defined('NOLOGIN')) // Verification security graphic code if (isset($_POST["username"]) && ! empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA)) { - require_once(ARTICHOW_PATH.'Artichow.cfg.php'); - require_once(ARTICHOW.'/AntiSpam.class.php'); + require_once DOL_DOCUMENT_ROOT.'/includes/artichow/Artichow.cfg.php'; + require_once ARTICHOW."/AntiSpam.class.php"; + // It creates an anti-spam object $object = new AntiSpam(); // Verifie code From ca82052a4d795466da5a9ed8eec1794824a1b2bc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 12:21:00 +0000 Subject: [PATCH 37/74] Enhance PHPUnit tests --- test/phpunit/WebservicesTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/phpunit/WebservicesTest.php b/test/phpunit/WebservicesTest.php index a24f4e58521..cfc9b80d94c 100755 --- a/test/phpunit/WebservicesTest.php +++ b/test/phpunit/WebservicesTest.php @@ -41,7 +41,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1; /** - * When no cover is provided. We use everything. + * Class for PHPUnit tests * * @backupGlobals disabled * @backupStaticAttributes enabled From 77b6019672e5f8a06b323df7c3570d3daf6aca67 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 23:12:25 +0000 Subject: [PATCH 38/74] Fix: Trans From 21d16c77007d65a7efa3b37cdbac36a4587592d6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 23:36:55 +0000 Subject: [PATCH 39/74] Qual: Centralise declaratin of external lib artichow at one location. --- htdocs/main.inc.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 3919bcffcde..bd3f5ceb5f3 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -338,10 +338,9 @@ if (! defined('NOLOGIN')) // Verification security graphic code if (isset($_POST["username"]) && ! empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA)) { - require_once DOL_DOCUMENT_ROOT.'/includes/artichow/Artichow.cfg.php'; - require_once ARTICHOW."/AntiSpam.class.php"; + require_once(ARTICHOW_PATH.'Artichow.cfg.php'); + require_once(ARTICHOW.'/AntiSpam.class.php'); - // It creates an anti-spam object $object = new AntiSpam(); // Verifie code From 2d3a0b291521b3a1fcb3c399b39f590b541ed862 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 23:46:14 +0000 Subject: [PATCH 40/74] Qual: Uniformize code From dbd5ddca899b4940ef28fd88809b5add0638b302 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 23:46:53 +0000 Subject: [PATCH 41/74] Qual: Removed deprecated code From 6be305f94a1e1458f6454134b779338e21621f2e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 24 Sep 2011 01:44:18 +0000 Subject: [PATCH 42/74] Removed TODO --- htdocs/main.inc.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index bd3f5ceb5f3..0e2f6ee691f 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -155,7 +155,6 @@ require_once("master.inc.php"); register_shutdown_function('dol_shutdown'); // Detection browser -// TODO rename conf->browser into user->browser if (isset($_SERVER["HTTP_USER_AGENT"])) { // If phone/smartphone, we set phone os name. From d7eecf1f2926d5823df63ffb5632df98e501c345 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 24 Sep 2011 01:56:05 +0000 Subject: [PATCH 43/74] Removed a TODO From 0f8136a7961df40f98a9c39803c946e44e58a489 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 24 Sep 2011 02:01:26 +0000 Subject: [PATCH 44/74] Doxygen From c22d038f114162b4200ccce0b11dabf152d66228 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 11:44:44 +0000 Subject: [PATCH 45/74] Fix: Use correct style path From e354b8d265ba105a8c9e35f908c94e92ab31c53b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 11:46:16 +0000 Subject: [PATCH 46/74] Sec: Fix security login mutualized function. --- test/phpunit/WebservicesTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/phpunit/WebservicesTest.php b/test/phpunit/WebservicesTest.php index cfc9b80d94c..a24f4e58521 100755 --- a/test/phpunit/WebservicesTest.php +++ b/test/phpunit/WebservicesTest.php @@ -41,7 +41,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1; /** - * Class for PHPUnit tests + * When no cover is provided. We use everything. * * @backupGlobals disabled * @backupStaticAttributes enabled From 227dc014a64cfb9019f7f0019a67040cefd636de Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 11:53:22 +0000 Subject: [PATCH 47/74] Sec: Fix security login mutualized function. --- htdocs/main.inc.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 0e2f6ee691f..3919bcffcde 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -155,6 +155,7 @@ require_once("master.inc.php"); register_shutdown_function('dol_shutdown'); // Detection browser +// TODO rename conf->browser into user->browser if (isset($_SERVER["HTTP_USER_AGENT"])) { // If phone/smartphone, we set phone os name. @@ -337,9 +338,10 @@ if (! defined('NOLOGIN')) // Verification security graphic code if (isset($_POST["username"]) && ! empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA)) { - require_once(ARTICHOW_PATH.'Artichow.cfg.php'); - require_once(ARTICHOW.'/AntiSpam.class.php'); + require_once DOL_DOCUMENT_ROOT.'/includes/artichow/Artichow.cfg.php'; + require_once ARTICHOW."/AntiSpam.class.php"; + // It creates an anti-spam object $object = new AntiSpam(); // Verifie code From 02491157d4baf62cdad4c849bc19aeac51119a9f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 12:21:00 +0000 Subject: [PATCH 48/74] Enhance PHPUnit tests --- test/phpunit/WebservicesTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/phpunit/WebservicesTest.php b/test/phpunit/WebservicesTest.php index a24f4e58521..cfc9b80d94c 100755 --- a/test/phpunit/WebservicesTest.php +++ b/test/phpunit/WebservicesTest.php @@ -41,7 +41,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1; /** - * When no cover is provided. We use everything. + * Class for PHPUnit tests * * @backupGlobals disabled * @backupStaticAttributes enabled From e4d7df8a53fb4113943b97d26806852d8f580e2f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 23:12:25 +0000 Subject: [PATCH 49/74] Fix: Trans From d1231294632607027f5e95952a28e88afce10cd8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 23:36:55 +0000 Subject: [PATCH 50/74] Qual: Centralise declaratin of external lib artichow at one location. --- htdocs/main.inc.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 3919bcffcde..bd3f5ceb5f3 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -338,10 +338,9 @@ if (! defined('NOLOGIN')) // Verification security graphic code if (isset($_POST["username"]) && ! empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA)) { - require_once DOL_DOCUMENT_ROOT.'/includes/artichow/Artichow.cfg.php'; - require_once ARTICHOW."/AntiSpam.class.php"; + require_once(ARTICHOW_PATH.'Artichow.cfg.php'); + require_once(ARTICHOW.'/AntiSpam.class.php'); - // It creates an anti-spam object $object = new AntiSpam(); // Verifie code From 7be6eedd961c935dcf4fd258f32ad9a36f914b84 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 23:46:14 +0000 Subject: [PATCH 51/74] Qual: Uniformize code From 1ecf8e3b2879c02bf99cee0003ac8f67844dd651 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 23:46:53 +0000 Subject: [PATCH 52/74] Qual: Removed deprecated code From 56a464855f9d53f94f69df3ea3de72995d9250b0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 24 Sep 2011 01:44:18 +0000 Subject: [PATCH 53/74] Removed TODO --- htdocs/main.inc.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index bd3f5ceb5f3..0e2f6ee691f 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -155,7 +155,6 @@ require_once("master.inc.php"); register_shutdown_function('dol_shutdown'); // Detection browser -// TODO rename conf->browser into user->browser if (isset($_SERVER["HTTP_USER_AGENT"])) { // If phone/smartphone, we set phone os name. From d7b9b34846849eba731b905a7d7b2b0c5ba83324 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 24 Sep 2011 01:56:05 +0000 Subject: [PATCH 54/74] Removed a TODO From ca75219b902c986e99e8d66383986959b1ac4f6b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 11:44:44 +0000 Subject: [PATCH 55/74] Fix: Use correct style path From 2ec449fcb22f05c6e294c702ed98c6626c75adff Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 24 Sep 2011 02:01:26 +0000 Subject: [PATCH 56/74] Doxygen From a15d4e4b8ada7a90c179a41ea0e294a89484f1b9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 11:46:16 +0000 Subject: [PATCH 57/74] Sec: Fix security login mutualized function. --- test/phpunit/WebservicesTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/phpunit/WebservicesTest.php b/test/phpunit/WebservicesTest.php index cfc9b80d94c..a24f4e58521 100755 --- a/test/phpunit/WebservicesTest.php +++ b/test/phpunit/WebservicesTest.php @@ -41,7 +41,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1; /** - * Class for PHPUnit tests + * When no cover is provided. We use everything. * * @backupGlobals disabled * @backupStaticAttributes enabled From cd4d04281bc7b6f4e7808d424fa2b26facc4adaf Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 11:53:22 +0000 Subject: [PATCH 58/74] Sec: Fix security login mutualized function. --- htdocs/main.inc.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 0e2f6ee691f..3919bcffcde 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -155,6 +155,7 @@ require_once("master.inc.php"); register_shutdown_function('dol_shutdown'); // Detection browser +// TODO rename conf->browser into user->browser if (isset($_SERVER["HTTP_USER_AGENT"])) { // If phone/smartphone, we set phone os name. @@ -337,9 +338,10 @@ if (! defined('NOLOGIN')) // Verification security graphic code if (isset($_POST["username"]) && ! empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA)) { - require_once(ARTICHOW_PATH.'Artichow.cfg.php'); - require_once(ARTICHOW.'/AntiSpam.class.php'); + require_once DOL_DOCUMENT_ROOT.'/includes/artichow/Artichow.cfg.php'; + require_once ARTICHOW."/AntiSpam.class.php"; + // It creates an anti-spam object $object = new AntiSpam(); // Verifie code From ccb60652bced04e9cf6e463a7a63d52efe7ea6ab Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 12:21:00 +0000 Subject: [PATCH 59/74] Enhance PHPUnit tests --- test/phpunit/WebservicesTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/phpunit/WebservicesTest.php b/test/phpunit/WebservicesTest.php index a24f4e58521..cfc9b80d94c 100755 --- a/test/phpunit/WebservicesTest.php +++ b/test/phpunit/WebservicesTest.php @@ -41,7 +41,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1; /** - * When no cover is provided. We use everything. + * Class for PHPUnit tests * * @backupGlobals disabled * @backupStaticAttributes enabled From ccbdfc497f02562444089df21aa933b2e73b6947 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 23:12:25 +0000 Subject: [PATCH 60/74] Fix: Trans From 5653e966ee50b430e1c269c5529d90455e2a429c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 23:36:55 +0000 Subject: [PATCH 61/74] Qual: Centralise declaratin of external lib artichow at one location. --- htdocs/main.inc.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 3919bcffcde..bd3f5ceb5f3 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -338,10 +338,9 @@ if (! defined('NOLOGIN')) // Verification security graphic code if (isset($_POST["username"]) && ! empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA)) { - require_once DOL_DOCUMENT_ROOT.'/includes/artichow/Artichow.cfg.php'; - require_once ARTICHOW."/AntiSpam.class.php"; + require_once(ARTICHOW_PATH.'Artichow.cfg.php'); + require_once(ARTICHOW.'/AntiSpam.class.php'); - // It creates an anti-spam object $object = new AntiSpam(); // Verifie code From 675b689f7ee56f43ef3982efe28cf65543aad73d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 23:46:14 +0000 Subject: [PATCH 62/74] Qual: Uniformize code From 49c1dc33b6f45087dd6c60c78b4c1907a1def40d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 23:46:53 +0000 Subject: [PATCH 63/74] Qual: Removed deprecated code From 150e604870f42741b59cd5403e8bcff619eb0d48 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 24 Sep 2011 01:44:18 +0000 Subject: [PATCH 64/74] Removed TODO --- htdocs/main.inc.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index bd3f5ceb5f3..0e2f6ee691f 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -155,7 +155,6 @@ require_once("master.inc.php"); register_shutdown_function('dol_shutdown'); // Detection browser -// TODO rename conf->browser into user->browser if (isset($_SERVER["HTTP_USER_AGENT"])) { // If phone/smartphone, we set phone os name. From dbdc5ea40b73b67d3e830636b0a3d00f88efc577 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 24 Sep 2011 01:56:05 +0000 Subject: [PATCH 65/74] Removed a TODO From 24f92465b53bfa7d47a93d554dbc9b23d769679b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 24 Sep 2011 02:01:26 +0000 Subject: [PATCH 66/74] Doxygen From 9318d8b5ebec0baf5a97ffa2fe4d264b73fbba9a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 12:21:00 +0000 Subject: [PATCH 67/74] Enhance PHPUnit tests From 551488c2461bf86fc14bff4164b7478db0f9680f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 23:12:25 +0000 Subject: [PATCH 68/74] Fix: Trans From b9c0ec01620a2912cb55f7f00144d31bf1be44f2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 23:36:55 +0000 Subject: [PATCH 69/74] Qual: Centralise declaratin of external lib artichow at one location. --- htdocs/main.inc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 0e2f6ee691f..bd3f5ceb5f3 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -155,6 +155,7 @@ require_once("master.inc.php"); register_shutdown_function('dol_shutdown'); // Detection browser +// TODO rename conf->browser into user->browser if (isset($_SERVER["HTTP_USER_AGENT"])) { // If phone/smartphone, we set phone os name. From 0d959fce1f1e34e1c0c2a6cbf9215fc0b4f29647 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 23:46:14 +0000 Subject: [PATCH 70/74] Qual: Uniformize code From 6c464cb9c041bfa829f9a6bcec87607a7cfe21d7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Sep 2011 23:46:53 +0000 Subject: [PATCH 71/74] Qual: Removed deprecated code From aaf6bc530299a7e6d564e8cc4d12362e7110a499 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 24 Sep 2011 01:44:18 +0000 Subject: [PATCH 72/74] Removed TODO --- htdocs/main.inc.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index bd3f5ceb5f3..0e2f6ee691f 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -155,7 +155,6 @@ require_once("master.inc.php"); register_shutdown_function('dol_shutdown'); // Detection browser -// TODO rename conf->browser into user->browser if (isset($_SERVER["HTTP_USER_AGENT"])) { // If phone/smartphone, we set phone os name. From c48631a997052ba2d550c37b361d35dcf251967e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 24 Sep 2011 01:56:05 +0000 Subject: [PATCH 73/74] Removed a TODO From b1c69ddb85019eadb535d5ec8a050ba3ae2caebe Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 24 Sep 2011 02:01:26 +0000 Subject: [PATCH 74/74] Doxygen