projects
/
e-DoKo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
BUGIFX: leaked silent solo information in game type
[e-DoKo.git]
/
include
/
preferences.php
diff --git
a/include/preferences.php
b/include/preferences.php
index 0485d9ec0f9b6a611c8d254664893cfdd0d9ef71..57c025fe78fd6635adc85dcbf56d9da2ac365897 100644
(file)
--- a/
include/preferences.php
+++ b/
include/preferences.php
@@
-1,5
+1,5
@@
<?php
<?php
-/* Copyright 2006, 2007, 2008, 2009, 2010 Arun Persaud <arun@nubati.net>
+/* Copyright 2006, 2007, 2008, 2009, 2010
, 2011, 2012
Arun Persaud <arun@nubati.net>
*
* This file is part of e-DoKo.
*
*
* This file is part of e-DoKo.
*
@@
-49,6
+49,8
@@
display_user_menu($myid);
/* get old infos */
$PREF = DB_get_PREF($myid);
/* get old infos */
$PREF = DB_get_PREF($myid);
+/* set language chosen in preferences, will become active on the next reload (see index.php)*/
+$_SESSION['language'] = $PREF['language'];
$timezone = DB_get_user_timezone($myid);
DB_update_user_timestamp($myid);
$timezone = DB_get_user_timezone($myid);
DB_update_user_timestamp($myid);
@@
-86,7
+88,7
@@
if(myisset('vacation_start','vacation_stop','vacation_comment') &&
$changed_vacation = -1;
/* test if we should delete the entry */
$changed_vacation = -1;
/* test if we should delete the entry */
- if($
vacation_start == '- 00:00:00'
)
+ if($
_REQUEST['vacation_start'] == $_REQUEST['vacation_stop']
)
{
$result = DB_query("DELETE FROM User_Prefs".
" WHERE user_id='$myid' AND pref_key='vacation start'" );
{
$result = DB_query("DELETE FROM User_Prefs".
" WHERE user_id='$myid' AND pref_key='vacation start'" );
@@
-337,12
+339,12
@@
if($PREF['vacation_start'])
$value = substr($PREF['vacation_start'],0,10);
else
$value = '';
$value = substr($PREF['vacation_start'],0,10);
else
$value = '';
-echo " <td>"._('start').":<input type=\"
text\" id=\"vacation_start\" name=\"vacation_start\" size=\"10\" maxlength=\"10
\" value=\"$value\" /></td>\n";
+echo " <td>"._('start').":<input type=\"
date\" class=\"date\" name=\"vacation_start
\" value=\"$value\" /></td>\n";
if($PREF['vacation_stop'])
$value = substr($PREF['vacation_stop'],0,10);
else
$value = '';
if($PREF['vacation_stop'])
$value = substr($PREF['vacation_stop'],0,10);
else
$value = '';
-echo " <td>"._('stop').":<input type=\"
text\" id=\"vacation_stop\" name=\"vacation_stop\" size=\"10\" maxlength=\"10
\" value=\"$value\" /></td>\n";
+echo " <td>"._('stop').":<input type=\"
date\" class=\"date\" name=\"vacation_stop
\" value=\"$value\" /></td>\n";
if($PREF['vacation_comment'])
$value = $PREF['vacation_comment'];
else
if($PREF['vacation_comment'])
$value = $PREF['vacation_comment'];
else
@@
-351,7
+353,7
@@
echo ' <td>'._('comment:')."<input type=\"text\" id=\"vacation_commen
if($changed_vacation == 1) echo _('changed');
if($changed_vacation == -1) echo _('wrong date format');
echo "</td></tr>\n";
if($changed_vacation == 1) echo _('changed');
if($changed_vacation == -1) echo _('wrong date format');
echo "</td></tr>\n";
-echo '<tr><td></td><td
>'._('use YYYY-MM-DD').'</td><td>'._("use '-' in start field to unset
vacation")."</td></tr>\n";
+echo '<tr><td></td><td
colspan="2">'._("set both dates to the same day to end
vacation")."</td></tr>\n";
echo ' <tr><td>'._('Notification').": </td><td>\n";
echo " <select id=\"notify\" name=\"notify\" size=\"1\">\n";
if($PREF['email']=="emailaddict")
echo ' <tr><td>'._('Notification').": </td><td>\n";
echo " <select id=\"notify\" name=\"notify\" size=\"1\">\n";
if($PREF['email']=="emailaddict")
@@
-424,18
+426,18
@@
if($PREF['autosetup']=="yes")
echo " </select>";
if($changed_autosetup) echo _('changed');
echo " </td></tr>\n";
echo " </select>";
if($changed_autosetup) echo _('changed');
echo " </td></tr>\n";
-echo
" <tr><td>Sorting
: </td><td>\n";
+echo
' <tr><td>'._('Sorting')."
: </td><td>\n";
echo " <select id=\"sorting\" name=\"sorting\" size=\"1\">\n";
if($PREF['sorting']=="high-low")
{
echo " <select id=\"sorting\" name=\"sorting\" size=\"1\">\n";
if($PREF['sorting']=="high-low")
{
- echo " <option value=\"high-low\" selected=\"selected\">
high to low
</option>\n";
- echo " <option value=\"low-high\">
low to high
</option>\n";
+ echo " <option value=\"high-low\" selected=\"selected\">
"._('high to low')."
</option>\n";
+ echo " <option value=\"low-high\">
"._('low to high')."
</option>\n";
}
else
{
}
else
{
- echo " <option value=\"high-low\">
high to low
</option>\n";
- echo " <option value=\"low-high\" selected=\"selected\">
low to high
</option>\n";
+ echo " <option value=\"high-low\">
"._('high to low')."
</option>\n";
+ echo " <option value=\"low-high\" selected=\"selected\">
"._('low to high')."
</option>\n";
}
echo " </select>";
if($changed_sorting) echo _('changed');
}
echo " </select>";
if($changed_sorting) echo _('changed');
@@
-444,13
+446,13
@@
echo ' <tr><td>'._('Open for new games').": </td><td>\n";
echo " <select id=\"open_for_games\" name=\"open_for_games\" size=\"1\">\n";
if($PREF['open_for_games']=="no")
{
echo " <select id=\"open_for_games\" name=\"open_for_games\" size=\"1\">\n";
if($PREF['open_for_games']=="no")
{
- echo
" <option value=\"yes\">"
._('yes')."</option>\n";
- echo
" <option value=\"no\" selected=\"selected\">no
</option>\n";
+ echo
' <option value="yes">'
._('yes')."</option>\n";
+ echo
' <option value="no" selected="selected">'._('no')."
</option>\n";
}
else /* default */
{
}
else /* default */
{
- echo
" <option value=\"yes\" selected=\"selected\">yes
</option>\n";
- echo
" <option value=\"no\">"
._('no')."</option>\n";
+ echo
' <option value="yes" selected="selected">'._('yes')."
</option>\n";
+ echo
' <option value="no">'
._('no')."</option>\n";
}
echo " </select>";
if($changed_openforgames) echo _('changed');
}
echo " </select>";
if($changed_openforgames) echo _('changed');
@@
-520,7
+522,7
@@
$openids = DB_GetOpenIDsByUser($myid);
if(sizeof($openids))
{
echo " <table class=\"openid\">\n";
if(sizeof($openids))
{
echo " <table class=\"openid\">\n";
- echo
" <thead><tr><th>Delete
?</th><th>OpenId</th></tr></thead>\n";
+ echo
' <thead><tr><th>'._('Delete')."
?</th><th>OpenId</th></tr></thead>\n";
echo " <tbody>\n";
foreach ($openids as $ids)
{
echo " <tbody>\n";
foreach ($openids as $ids)
{
@@
-538,8
+540,16
@@
if($changed_openid)
echo " </fieldset>\n";
echo ' <fieldset><legend>'._('Submit')."</legend><input type=\"submit\" name=\"passwd\" value=\"set\" /></fieldset>\n";
echo " </form>\n";
echo " </fieldset>\n";
echo ' <fieldset><legend>'._('Submit')."</legend><input type=\"submit\" name=\"passwd\" value=\"set\" /></fieldset>\n";
echo " </form>\n";
-echo ' <p>'._('E-DoKo uses <a href=
\"http://www.gravatar.org\
">gravatars</a> as icons.').'</p>';
+echo ' <p>'._('E-DoKo uses <a href=
"http://www.gravatar.org
">gravatars</a> as icons.').'</p>';
echo "</div>\n";
echo "</div>\n";
+// add jquery date picker if html5 is not available
+?>
+<script>
+ $(".date").dateinput({ format: 'yyyy-mm-dd' });
+</script>
+<?php
+
+
return;
?>
\ No newline at end of file
return;
?>
\ No newline at end of file