Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-12 19:02:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into develop

Browse Source
This commit is contained in:
jonathan-stimactiv
2025-02-25 17:05:14 +01:00
committed by GitHub
parent bf1bc4d262 05e0462a9a
commit cffd0bd230
6 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/adherents/admin/member.php
View File

@@ -540,7 +540,7 @@ print $form->selectyesno('ADHERENT_LOGIN_NOT_REQUIRED', (getDolGlobalString('ADH
print "</td></tr>\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 '<tr class="oddeven"><td>'.$langs->trans("MemberCreateAnExternalUserForSubscriptionValidated").'</td><td>';
print $form->selectyesno('ADHERENT_CREATE_EXTERNAL_USER_LOGIN', getDolGlobalInt('ADHERENT_CREATE_EXTERNAL_USER_LOGIN'), 1, false, 0, 1);
print "</td></tr>\n";

2
htdocs/adherents/admin/member_emails.php
View File

@@ -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 '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="action" value="updateall">';

2
htdocs/core/lib/functions.lib.php
View File

@@ -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
*/

2
htdocs/core/modules/modWebPortal.class.php
View File

@@ -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';

8
htdocs/main.inc.php
View File

@@ -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 '<meta name="theme-color" content="rgb(' . getDolGlobalString('THEME_ELDY_TOPMENU_BACK1').')">'."\n";
}
@@ -2231,7 +2229,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
print '<script nonce="' . getNonce() . '" src="' . DOL_URL_ROOT . '/core/js/lib_head.js.php?lang=' . $langs->defaultlang . ($ext ? '&amp;' . $ext : '') . '"></script>' . "\n";
}
// Leaflet TODO use dolibarr files
// Leaflet
if (getDolGlobalString('MAIN_USE_GEOPHP')) {
print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/leaflet/leaflet.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/leaflet/leaflet-geoman.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";

2
htdocs/viewimage.php
View File

@@ -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 {