From 76d1ccba590963b9723fb5cacd16935c2fea1107 Mon Sep 17 00:00:00 2001 From: ldestailleur Date: Tue, 25 Feb 2025 15:59:17 +0100 Subject: [PATCH 1/4] Doc --- 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 ccec4bc520e..63781a7b0c9 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -128,7 +128,7 @@ if (!function_exists('str_contains')) { * @param CommonObject $object Dolibarr common object. * @param string $module Override object element, for example to use 'mycompany' instead of 'societe' * @param int $forobject Return the more complete path for the given object instead of for the module only. - * @param string $mode 'output' (full main dir) or 'outputrel' (relative dir) or 'temp' (for temporary files) or 'version' (dir for archived files) + * @param string $mode 'output' (full main dir) or 'outputrel' (relative dir) or 'temp' (full dir for temporary files) or 'version' (full dir for archived files) * @return string|null The path of the relative directory of the module, ending with / * @since Dolibarr V18 */ From fbd2b4b5b2f4da74991df420f7ec14043bfee8a4 Mon Sep 17 00:00:00 2001 From: ldestailleur Date: Tue, 25 Feb 2025 16:19:03 +0100 Subject: [PATCH 2/4] Try to remove some TODO - Better test of oauth return --- htdocs/main.inc.php | 8 +++----- htdocs/viewimage.php | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 5c06842b25d..5d0c431d050 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -979,9 +979,8 @@ if (!defined('NOLOGIN')) { $oauthmodetotestarray = array('google'); foreach ($oauthmodetotestarray as $oauthmodetotest) { if (in_array($oauthmodetotest.'oauth', $authmode)) { // This is an authmode that is currently qualified. Do we have to remove it ? - // If we click on the link to use OAuth authentication or if we goes after callback return, we do nothing - // TODO Use: if (GETPOST('beforeoauthloginredirect') == $oauthmodetotest || GETPOST('afteroauthloginreturn') == $oauthmodetotest) { - if (GETPOST('beforeoauthloginredirect') == $oauthmodetotest || GETPOST('afteroauthloginreturn')) { + // If we click on the link to use OAuth authentication or if we go here after a callback return, we do nothing + if (GETPOST('beforeoauthloginredirect') == $oauthmodetotest || GETPOST('afteroauthloginreturn') == $oauthmodetotest) { continue; } dol_syslog("User did not click on link for OAuth, or is not on the OAuth return, so we disable check using ".$oauthmodetotest); @@ -1936,7 +1935,6 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr } if (getDolGlobalString('THEME_ELDY_TOPMENU_BACK1')) { - // TODO: use auto theme color switch print ''."\n"; } @@ -2231,7 +2229,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr print '' . "\n"; } - // Leaflet TODO use dolibarr files + // Leaflet if (getDolGlobalString('MAIN_USE_GEOPHP')) { print ''."\n"; print ''."\n"; diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php index f2f38ee3c05..a235d54d41f 100644 --- a/htdocs/viewimage.php +++ b/htdocs/viewimage.php @@ -306,7 +306,7 @@ if (!empty($hashp)) { } elseif (GETPOSTINT("publictakepos")) { if (getDolGlobalString('TAKEPOS_AUTO_ORDER') && in_array($modulepart, array('product', 'category'))) { $accessallowed = 1; // When TakePOS Public Auto Order is enabled, we accept to see all images of product and categories with no login - // TODO Replace this with a call of getPublicImageOfObject like used by website so + // TODO Replace the use of link to viewimage with a call to get link by getPublicImageOfObject, like done by website templates so // only shared images are visible } } else { From 27f926b4c3d5c2bab49daa1b83dbf0e764fef3ff Mon Sep 17 00:00:00 2001 From: ldestailleur Date: Tue, 25 Feb 2025 16:23:08 +0100 Subject: [PATCH 3/4] Doc --- htdocs/adherents/admin/member.php | 2 +- htdocs/adherents/admin/member_emails.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/adherents/admin/member.php b/htdocs/adherents/admin/member.php index 31a1597eeed..6fd6a74922d 100644 --- a/htdocs/adherents/admin/member.php +++ b/htdocs/adherents/admin/member.php @@ -540,7 +540,7 @@ print $form->selectyesno('ADHERENT_LOGIN_NOT_REQUIRED', (getDolGlobalString('ADH print "\n"; // Create an external user login after an online payment of a membership subscription -// TODO Move this into the validate() method of the member. +// TODO Move this into a checkbox into the validate process of the memberinstead of a global option. print ''.$langs->trans("MemberCreateAnExternalUserForSubscriptionValidated").''; print $form->selectyesno('ADHERENT_CREATE_EXTERNAL_USER_LOGIN', getDolGlobalInt('ADHERENT_CREATE_EXTERNAL_USER_LOGIN'), 1, false, 0, 1); print "\n"; diff --git a/htdocs/adherents/admin/member_emails.php b/htdocs/adherents/admin/member_emails.php index 6367a4087e5..9df7166f312 100644 --- a/htdocs/adherents/admin/member_emails.php +++ b/htdocs/adherents/admin/member_emails.php @@ -159,7 +159,7 @@ $head = member_admin_prepare_head(); print dol_get_fiche_head($head, 'emails', $langs->trans("Members"), -1, 'user'); -// TODO Use global form +// Use global form print '
'; print ''; print ''; From 05e0462a9a80061125d0232b4480c55bded9d463 Mon Sep 17 00:00:00 2001 From: ldestailleur Date: Tue, 25 Feb 2025 16:51:03 +0100 Subject: [PATCH 4/4] NEW Module WebPortal is moved as stable --- htdocs/core/modules/modWebPortal.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/modWebPortal.class.php b/htdocs/core/modules/modWebPortal.class.php index 7059e92fc0b..5487780341d 100644 --- a/htdocs/core/modules/modWebPortal.class.php +++ b/htdocs/core/modules/modWebPortal.class.php @@ -71,7 +71,7 @@ class modWebPortal extends DolibarrModules //$this->editor_url = 'dolibarr.org'; // Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated', 'experimental_deprecated' or a version string like 'x.y.z' - $this->version = 'experimental'; + $this->version = 'dolibarr'; // Url to the file with your last numberversion of this module //$this->url_last_version = 'http://www.example.com/versionmodule.txt';