Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-05 17:18:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur
2025-09-15 23:29:19 +02:00
parent 7d7994aa1d d685f1e529
commit b757f3392f
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/lib/files.lib.php
View File

@@ -2435,11 +2435,11 @@ function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uplo
/** /**
* Delete files into database index using search criteria. * Delete files into database index using search criteria.
* *
* @param string $dir Directory name (full real path without ending /) * @param string $dir Directory name (full real path without ending /)
* @param string $file File name * @param string $file File name
* @param string $mode How file was created ('uploaded', 'generated', ...) * @param string $mode How file was created ('uploaded', 'generated', ...)
* @param Object $object object used for entity * @param ?CommonObject $object object used for entity
* @return int Return integer <0 if KO, 0 if nothing done, >0 if OK * @return int Return integer <0 if KO, 0 if nothing done, >0 if OK
*/ */
function deleteFilesIntoDatabaseIndex($dir, $file, $mode = 'uploaded', $object = null) function deleteFilesIntoDatabaseIndex($dir, $file, $mode = 'uploaded', $object = null)
{ {

4
htdocs/public/webportal/css/style.css.php
View File

@@ -48,12 +48,16 @@ session_cache_limiter('public');
require_once __DIR__.'/../webportal.main.inc.php'; // __DIR__ allow this script to be included in custom themes require_once __DIR__.'/../webportal.main.inc.php'; // __DIR__ allow this script to be included in custom themes
/** /**
* @var Conf $conf * @var Conf $conf
* @var Translate $langs
* *
* @var string $dolibarr_nocache * @var string $dolibarr_nocache
*/ */
$fontlist = 'arial,tahoma,verdana,helvetica'; $fontlist = 'arial,tahoma,verdana,helvetica';
$colorbacktitle1 = '#fff'; $colorbacktitle1 = '#fff';
$langs->load("main", 0, 1);
$right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right');
$left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
// Define css type // Define css type
top_httphead('text/css'); top_httphead('text/css');

1
htdocs/public/webportal/tpl/header.tpl.php
View File

@@ -17,6 +17,7 @@
/** /**
* @var Context $context Object context for webportal * @var Context $context Object context for webportal
* @var Translate $langs
*/ */
// Protection to avoid direct call of template // Protection to avoid direct call of template

7
htdocs/public/webportal/webportal.main.inc.php
View File

@@ -88,7 +88,14 @@ require_once DOL_DOCUMENT_ROOT . '/webportal/class/webportalpartnership.class.ph
* @var DoliDB $db * @var DoliDB $db
* @var HookManager $hookmanager * @var HookManager $hookmanager
* @var Translate $langs * @var Translate $langs
*
* @var string $sessionname
* @var string $sessiontimeout
*/ */
'
@phan-var-force string $sessionname
@phan-var-force string $sessiontimeout
';
// Init session. Name of session is specific to WEBPORTAL instance. // Init session. Name of session is specific to WEBPORTAL instance.
// Must be done after the include of filefunc.inc.php so global variables of conf file are defined (like $dolibarr_main_instance_unique_id or $dolibarr_main_force_https). // Must be done after the include of filefunc.inc.php so global variables of conf file are defined (like $dolibarr_main_instance_unique_id or $dolibarr_main_force_https).
// Note: the function dol_getprefix is defined into functions.lib.php but may have been defined to return a different key to manage another area to protect. // Note: the function dol_getprefix is defined into functions.lib.php but may have been defined to return a different key to manage another area to protect.