lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dorian Vabre 2021-05-20 17:26:07 +02:00
commit 83555da795
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/system/security.php
View File

@ -155,7 +155,7 @@ print '<strong>'.$langs->trans("PermissionsOnFilesInWebRoot").'</strong>: ';
$arrayoffilesinroot = dol_dir_list(DOL_DOCUMENT_ROOT, 'all', 1, '', array('\/custom'), 'name', SORT_ASC, 4, 1, '', 1);
$fileswithwritepermission = array();
foreach ($arrayoffilesinroot as $fileinroot) {
// Test permission on file
// Test if there is at least one write permission file. If yes, add the entry into array $fileswithwritepermission
if ($fileinroot['perm'] & 0222) {
$fileswithwritepermission[] = $fileinroot['relativename'];
}

24
htdocs/public/agenda/agendaexport.php
View File

@ -96,9 +96,9 @@ if (!isset($conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY)) {
$format = 'ical';
$type = 'event';
if (GETPOST("format", 'alpha')) {
$format = GETPOST("format", 'apha');
$format = GETPOST("format", 'alpha');
}
if (GETPOST("type", 'apha')) {
if (GETPOST("type", 'alpha')) {
$type = GETPOST("type", 'alpha');
}
@ -115,20 +115,20 @@ if (GETPOST("idfrom", 'int')) {
if (GETPOST("idto", 'int')) {
$filters['idto'] = GETPOST("idto", 'int');
}
if (GETPOST("project", 'apha')) {
$filters['project'] = GETPOST("project", 'apha');
if (GETPOST("project", 'alpha')) {
$filters['project'] = GETPOST("project", 'alpha');
}
if (GETPOST("logina", 'apha')) {
$filters['logina'] = GETPOST("logina", 'apha');
if (GETPOST("logina", 'alpha')) {
$filters['logina'] = GETPOST("logina", 'alpha');
}
if (GETPOST("logint", 'apha')) {
$filters['logint'] = GETPOST("logint", 'apha');
if (GETPOST("logint", 'alpha')) {
$filters['logint'] = GETPOST("logint", 'alpha');
}
if (GETPOST("notactiontype", 'apha')) {
$filters['notactiontype'] = GETPOST("notactiontype", 'apha');
if (GETPOST("notactiontype", 'alpha')) {
$filters['notactiontype'] = GETPOST("notactiontype", 'alpha');
}
if (GETPOST("actiontype", 'apha')) {
$filters['actiontype'] = GETPOST("actiontype", 'apha');
if (GETPOST("actiontype", 'alpha')) {
$filters['actiontype'] = GETPOST("actiontype", 'alpha');
}
if (GETPOST("notolderthan", 'int')) {
$filters['notolderthan'] = GETPOST("notolderthan", "int");