diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index 7dc0ec5a4ae..37dc1df4f6a 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -2435,11 +2435,11 @@ function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uplo /** * Delete files into database index using search criteria. * - * @param string $dir Directory name (full real path without ending /) - * @param string $file File name - * @param string $mode How file was created ('uploaded', 'generated', ...) - * @param Object $object object used for entity - * @return int Return integer <0 if KO, 0 if nothing done, >0 if OK + * @param string $dir Directory name (full real path without ending /) + * @param string $file File name + * @param string $mode How file was created ('uploaded', 'generated', ...) + * @param ?CommonObject $object object used for entity + * @return int Return integer <0 if KO, 0 if nothing done, >0 if OK */ function deleteFilesIntoDatabaseIndex($dir, $file, $mode = 'uploaded', $object = null) { diff --git a/htdocs/public/webportal/css/style.css.php b/htdocs/public/webportal/css/style.css.php index 1a17074ba7e..7b9e95d82de 100644 --- a/htdocs/public/webportal/css/style.css.php +++ b/htdocs/public/webportal/css/style.css.php @@ -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 /** * @var Conf $conf + * @var Translate $langs * * @var string $dolibarr_nocache */ $fontlist = 'arial,tahoma,verdana,helvetica'; $colorbacktitle1 = '#fff'; +$langs->load("main", 0, 1); +$right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right'); +$left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left'); // Define css type top_httphead('text/css'); diff --git a/htdocs/public/webportal/tpl/header.tpl.php b/htdocs/public/webportal/tpl/header.tpl.php index a45754a286e..374bf3a3811 100644 --- a/htdocs/public/webportal/tpl/header.tpl.php +++ b/htdocs/public/webportal/tpl/header.tpl.php @@ -17,6 +17,7 @@ /** * @var Context $context Object context for webportal + * @var Translate $langs */ // Protection to avoid direct call of template diff --git a/htdocs/public/webportal/webportal.main.inc.php b/htdocs/public/webportal/webportal.main.inc.php index 1997cbda9bc..87143cc1234 100644 --- a/htdocs/public/webportal/webportal.main.inc.php +++ b/htdocs/public/webportal/webportal.main.inc.php @@ -88,7 +88,14 @@ require_once DOL_DOCUMENT_ROOT . '/webportal/class/webportalpartnership.class.ph * @var DoliDB $db * @var HookManager $hookmanager * @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. // 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.