diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index ba0057324e9..ccd873ece8a 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -642,16 +642,17 @@ class Form
/**
* Return combo list of activated countries, into language of user
*
- * @param string $selected Id or Code or Label of preselected country
- * @param string $htmlname Name of html select object
- * @param string $htmloption Options html on select object
- * @param integer $maxlength Max length for labels (0=no limit)
- * @param string $morecss More css class
- * @param string $usecodeaskey 'code3'=Use code on 3 alpha as key, 'code2"=Use code on 2 alpha as key
- * @param int $showempty Show empty choice
- * @return string HTML string with select
+ * @param string $selected Id or Code or Label of preselected country
+ * @param string $htmlname Name of html select object
+ * @param string $htmloption Options html on select object
+ * @param integer $maxlength Max length for labels (0=no limit)
+ * @param string $morecss More css class
+ * @param string $usecodeaskey 'code3'=Use code on 3 alpha as key, 'code2"=Use code on 2 alpha as key
+ * @param int $showempty Show empty choice
+ * @param int $disablefavorites Disable favorites
+ * @return string HTML string with select
*/
- function select_country($selected='', $htmlname='country_id', $htmloption='', $maxlength=0, $morecss='minwidth300', $usecodeaskey='', $showempty=1)
+ function select_country($selected='', $htmlname='country_id', $htmloption='', $maxlength=0, $morecss='minwidth300', $usecodeaskey='', $showempty=1, $disablefavorites=0)
{
global $conf,$langs;
@@ -692,13 +693,14 @@ class Form
$i++;
}
- array_multisort($favorite, SORT_DESC, $label, SORT_ASC, $countryArray);
+ if (empty($disablefavorites)) array_multisort($favorite, SORT_DESC, $label, SORT_ASC, $countryArray);
+ else $countryArray = dol_sort_array($countryArray, 'label');
foreach ($countryArray as $row)
{
if (empty($showempty) && empty($row['rowid'])) continue;
- if ($row['favorite'] && $row['code_iso']) $atleastonefavorite++;
+ if (empty($disablefavorites) && $row['favorite'] && $row['code_iso']) $atleastonefavorite++;
if (empty($row['favorite']) && $atleastonefavorite)
{
$atleastonefavorite=0;
@@ -4774,8 +4776,8 @@ class Form
*
* @param timestamp $set_time Pre-selected date (must be a local PHP server timestamp), -1 to keep date not preselected, '' to use current date (emptydate must be 0).
* @param string $prefix Prefix for fields name
- * @param int $h 1=Show also hours (-1 has same effect, but hour and minutes are prefilled with 23:59 if $set_time = -1)
- * @param int $m 1=Show also minutes
+ * @param int $h 1 or 2=Show also hours (2=hours on a new line), -1 has same effect but hour and minutes are prefilled with 23:59 if date is empty, 3 show hour always empty
+ * @param int $m 1=Show also minutes, -1 has same effect but hour and minutes are prefilled with 23:59 if date is empty, 3 show minutes always empty
* @param int $empty 0=Fields required, 1=Empty inputs are allowed, 2=Empty inputs are allowed for hours only
* @param string $form_name Not used
* @param int $d 1=Show days, month, years
@@ -4848,6 +4850,8 @@ class Form
$smin = !isset($conf->global->MAIN_DEFAULT_DATE_MIN) ? ($h == -1 ? '59' : '') : $conf->global->MAIN_DEFAULT_DATE_MIN;
$ssec = !isset($conf->global->MAIN_DEFAULT_DATE_SEC) ? ($h == -1 ? '59' : '') : $conf->global->MAIN_DEFAULT_DATE_SEC;
}
+ if ($h == 3) $shour = '';
+ if ($m == 3) $smin = '';
// You can set MAIN_POPUP_CALENDAR to 'eldy' or 'jquery'
$usecalendar='combo';
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 3d3f38eca2c..744a1326e69 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -454,6 +454,18 @@ function dol_is_file($pathoffile)
return is_file($newpathoffile);
}
+/**
+ * Return if path is a symbolic link
+ *
+ * @param string $pathoffile Path of file
+ * @return boolean True or false
+ */
+function dol_is_link($pathoffile)
+{
+ $newpathoffile=dol_osencode($pathoffile);
+ return is_link($newpathoffile);
+}
+
/**
* Return if path is an URL
*
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4cbb3043bda..dcf4b6fb998 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -542,6 +542,13 @@ function GETPOST($paramname, $check='none', $method=0, $filter=null, $options=nu
if (preg_match('/[^a-z0-9_\-\.]+/i',$out)) $out='';
}
break;
+ case 'aZ09comma': // great to sanitize sortfield or sortorder params that can be t.abc,t.def_gh
+ if (! is_array($out))
+ {
+ $out=trim($out);
+ if (preg_match('/[^a-z0-9_\-\.,]+/i',$out)) $out='';
+ }
+ break;
case 'array':
if (! is_array($out) || empty($out)) $out=array();
break;
@@ -3090,7 +3097,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
//if (in_array($picto, array('switch_off', 'switch_on', 'off', 'on')))
if (empty($srconly) && in_array($pictowithoutext, array(
- 'bank', 'close_title', 'delete', 'edit', 'filter', 'grip', 'grip_title', 'off', 'on', 'play', 'playdisabled', 'printer', 'resize',
+ 'bank', 'close_title', 'delete', 'edit', 'ellipsis-h', 'filter', 'grip', 'grip_title', 'off', 'on', 'play', 'playdisabled', 'printer', 'resize',
'switch_off', 'switch_on', 'unlink', 'uparrow')
)) {
$fakey = $pictowithoutext;
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index c82839d8499..06d0b7aa6d3 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -893,8 +893,9 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))
{
print '
';
diff --git a/htdocs/langs/en_US/opensurvey.lang b/htdocs/langs/en_US/opensurvey.lang
index 1f8a90b5657..0819a077f71 100644
--- a/htdocs/langs/en_US/opensurvey.lang
+++ b/htdocs/langs/en_US/opensurvey.lang
@@ -57,4 +57,5 @@ ErrorInsertingComment=There was an error while inserting your comment
MoreChoices=Enter more choices for the voters
SurveyExpiredInfo=The poll has been closed or voting delay has expired.
EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
-ShowSurvey=Show survey
\ No newline at end of file
+ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name, that the one used to vote, to post a comment
\ No newline at end of file
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 43720614a2e..dbf99903110 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -357,6 +357,7 @@ $param.=($search_task_label?'&search_task_label='.$search_task_label:'');
// Show navigation bar
$nav =''.img_previous($langs->trans("Previous"))."\n";
+$nav.=dol_print_date(dol_mktime(0,0,0,$month,$day,$year),"%A").' ';
$nav.=" ".dol_print_date(dol_mktime(0,0,0,$month,$day,$year),"day")." \n";
$nav.=''.img_next($langs->trans("Next"))."\n";
$nav.=" (".$langs->trans("Today").")";
@@ -409,7 +410,7 @@ print '