<?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.
*
/* 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);
$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'" );
$changed_password = 1;
/* check if old password matches */
- $oldpasswd = md5($_REQUEST["password0"]);
- $password = DB_get_passwd_by_userid($myid);
- if(!( ($password == $oldpasswd) || DB_check_recovery_passwords($oldpasswd,$email) ))
+ $result = verify_password($email, $_REQUEST["password0"]);
+
+ if( $result!=0 )
$changed_password = -1;
/* check if new password has been typed in correctly */
if($changed_password==1)
{
- DB_query("UPDATE User SET password='".md5($_REQUEST["password1"]).
+ // create a password hash using the crypt function, need php 5.3 for this
+ // create and random salt
+ $salt = substr(str_replace('+', '.', base64_encode(sha1(microtime(true), true))), 0, 22);
+ // hash incoming password using 12 rounds of blowfish
+ $hash = crypt($_REQUEST["password1"], '$2y$12$' . $salt);
+
+ DB_query("UPDATE User SET password='".$hash.
"' WHERE id=".DB_quote_smart($myid));
+
+ /* in case this was done using a recovery password delete that password */
+ $tmppasswd = md5($_REQUEST["password0"]);
+ if(DB_check_recovery_passwords($tmppasswd,$email))
+ DB_delete_recovery_passwords($myid);
}
/* error output below */
}
echo "<div class=\"user\">\n";
echo " <form action=\"index.php?action=prefs\" method=\"post\">\n";
-echo " <h2>Your settings are</h2>\n";
+echo ' <h2>'._('Your settings are')."</h2>\n";
echo " <fieldset>\n";
-echo " <legend>Game-related</legend>\n";
+echo ' <legend>'._('Game-related')."</legend>\n";
echo " <table>\n";
-echo " <tr><td>Vacation: </td>\n";
+echo ' <tr><td>'._('Vacation').": </td>\n";
if($PREF['vacation_start'])
$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 = '';
-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
$value = '';
-echo " <td>comment:<input type=\"text\" id=\"vacation_comment\" name=\"vacation_comment\" size=\"10\" maxlength=\"50\" value=\"$value\" />";
-if($changed_vacation == 1) echo "changed";
-if($changed_vacation == -1) echo "wrong date format";
+echo ' <td>'._('comment:')."<input type=\"text\" id=\"vacation_comment\" name=\"vacation_comment\" size=\"10\" maxlength=\"50\" value=\"$value\" />";
+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>Notification: </td><td>\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 " <option value=\"emailaddict\" selected=\"selected\">less emails</option>\n";
- echo " <option value=\"emailnonaddict\">lots of emails</option>\n";
+ echo " <option value=\"emailaddict\" selected=\"selected\">"._('less emails')."</option>\n";
+ echo " <option value=\"emailnonaddict\">"._('lots of emails')."</option>\n";
}
else
{
- echo " <option value=\"emailaddict\">less email</option>\n";
- echo " <option value=\"emailnonaddict\" selected=\"selected\">lots of email</option>\n";
+ echo " <option value=\"emailaddict\">"._('less emails')."</option>\n";
+ echo " <option value=\"emailnonaddict\" selected=\"selected\">"._('lots of emails')."</option>\n";
}
echo " </select>";
-if($changed_notify) echo "changed";
+if($changed_notify) echo _('changed');
echo " </td></tr>\n";
-echo " <tr><td>Digest: </td><td>\n";
+echo ' <tr><td>'._('Digest').": </td><td>\n";
echo " <select id=\"digest\" name=\"digest\" size=\"1\">\n";
$selected = "selected=\"selected\"";
echo " <option value=\"digest-off\"";
if($PREF['digest']=="digest-off") echo $selected;
-echo ">digest off</option>\n";
+echo '>'._('digest off')."</option>\n";
echo " <option value=\"digest-1h\" ";
if($PREF['digest']=="digest-1h") echo $selected;
-echo ">every hour</option>\n";
+echo ">"._('every hour')."</option>\n";
echo " <option value=\"digest-2h\" ";
if($PREF['digest']=="digest-2h") echo $selected;
-echo ">every 2h</option>\n";
+echo ">"._('every 2h')."</option>\n";
echo " <option value=\"digest-3h\" ";
if($PREF['digest']=="digest-3h") echo $selected;
-echo ">every 3h</option>\n";
+echo ">"._('every 3h')."</option>\n";
echo " <option value=\"digest-4h\" ";
if($PREF['digest']=="digest-4h") echo $selected;
-echo ">every 4h</option>\n";
+echo ">"._('every 4h')."</option>\n";
echo " <option value=\"digest-6h\" ";
if($PREF['digest']=="digest-6h") echo $selected;
-echo ">every 6h</option>\n";
+echo ">"._('every 6h')."</option>\n";
echo " <option value=\"digest-12h\"";
if($PREF['digest']=="digest-12h") echo $selected;
-echo ">every 12h</option>\n";
+echo ">"._('every 12h')."</option>\n";
echo " <option value=\"digest-24h\"";
if($PREF['digest']=="digest-24h") echo $selected;
-echo ">every 24h</option>\n";
+echo ">"._('every 24h')."</option>\n";
echo " </select>";
-if($changed_digest) echo "changed";
+if($changed_digest) echo _('changed');
echo " </td></tr>\n";
-echo " <tr><td>Autosetup: </td><td>\n";
+echo ' <tr><td>'._('Autosetup').": </td><td>\n";
echo " <select id=\"autosetup\" name=\"autosetup\" size=\"1\">\n";
if($PREF['autosetup']=="yes")
{
- echo " <option value=\"yes\" selected=\"selected\">accept every game</option>\n";
- echo " <option value=\"no\">ask for games</option>\n";
+ echo " <option value=\"yes\" selected=\"selected\">"._('accept every game')."</option>\n";
+ echo " <option value=\"no\">"._('ask for games')."</option>\n";
}
else
{
- echo " <option value=\"yes\">accept every game</option>\n";
- echo " <option value=\"no\" selected=\"selected\">ask for games</option>\n";
+ echo " <option value=\"yes\">"._('accept every game')."</option>\n";
+ echo " <option value=\"no\" selected=\"selected\">"._('ask for games')."</option>\n";
}
echo " </select>";
-if($changed_autosetup) echo "changed";
+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 " <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
{
- 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";
+if($changed_sorting) echo _('changed');
echo " </td></tr>\n";
-echo " <tr><td>Open for new games: </td><td>\n";
+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 " <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 */
{
- 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";
+if($changed_openforgames) echo _('changed');
echo " </td></tr>\n";
-echo " <tr><td>Card set: </td><td>\n";
+echo ' <tr><td>'.('Card set').": </td><td>\n";
echo " <select id=\"cards\" name=\"cards\" size=\"1\">\n";
if($PREF['cardset']=="altenburg")
{
- echo " <option value=\"altenburg\" selected=\"selected\">German cards</option>\n";
- echo " <option value=\"english\">English cards</option>\n";
+ echo " <option value=\"altenburg\" selected=\"selected\">"._('German cards')."</option>\n";
+ echo " <option value=\"english\">"._('English cards')."</option>\n";
}
else
{
- echo " <option value=\"altenburg\">German cards</option>\n";
- echo " <option value=\"english\" selected=\"selected\">English cards</option>\n";
+ echo " <option value=\"altenburg\">"._('German cards')."</option>\n";
+ echo " <option value=\"english\" selected=\"selected\">"._('English cards')."</option>\n";
}
echo " </select>";
-if($changed_cards) echo "changed";
+if($changed_cards) echo _('changed');
echo " </td></tr>\n";
echo " </table>\n";
echo " </fieldset>\n";
echo " <fieldset>\n";
-echo " <legend>Personal</legend>\n";
+echo ' <legend>'._('Personal')."</legend>\n";
echo " <table>\n";
-echo " <tr><td>Email: </td><td> $email </td></tr>\n";
-echo " <tr><td>Timezone: </td><td>\n";
+echo ' <tr><td>'._('Email').": </td><td> $email </td></tr>\n";
+echo ' <tr><td>'._('Timezone').": </td><td>\n";
output_select_timezone("timezone",$timezone);
-if($changed_timezone) echo "changed";
+if($changed_timezone) echo _('changed');
echo "</td></tr>\n";
-echo " <tr><td>Language: </td><td>\n";
+echo ' <tr><td>'._('Language').": </td><td>\n";
output_select_language("language",$PREF['language']);
+if($changed_language == 1) echo _('changed');
echo "</td></tr>\n";
-echo " <tr><td>Password(old): </td><td>",
+echo ' <tr><td>'._('Password(old)').": </td><td>",
"<input type=\"password\" id=\"password0\" name=\"password0\" size=\"20\" maxlength=\"30\" />";
switch($changed_password)
{
case '-3':
- echo "The new passwords is not long enough (you need at least 4 characters).";
+ echo _('The new passwords is not long enough (you need at least 4 characters).');
break;
case '-2':
- echo "The new passwords don't match.";
+ echo _('The new passwords don\'t match.');
break;
case '-1':
- echo "The old password is not correct.";
+ echo _('The old password is not correct.');
break;
case '1':
- echo "changed";
+ echo _('changed');
break;
}
echo " </td></tr>\n";
-echo " <tr><td>Password(new): </td><td>",
+echo ' <tr><td>'._('Password(new)').": </td><td>",
"<input type=\"password\" id=\"password1\" name=\"password1\" size=\"20\" maxlength=\"30\" />",
" </td></tr>\n";
-echo " <tr><td>Password(new, retype): </td><td>",
+echo ' <tr><td>'._('Password(new, retype)').": </td><td>",
"<input type=\"password\" id=\"password2\" name=\"password2\" size=\"20\" maxlength=\"30\" />",
" </td></tr>\n";
echo " </table>\n";
echo " </fieldset>\n";
echo " <fieldset>\n";
-echo " <legend>OpenID</legend>\n";
+echo ' <legend>'._('OpenID')."</legend>\n";
$openids = array();
$openids = DB_GetOpenIDsByUser($myid);
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 " </table>\n";
}
-echo " add OpenID: ",
+echo ' '._('add OpenID').': ',
"<input type=\"text\" id=\"openid_url\" name=\"openid_url\" size=\"20\" maxlength=\"50\" />";
if($changed_openid)
- echo " Deleted some OpenIDs! <br />\n";
+ echo ' '._('Deleted some OpenIDs!')." <br />\n";
echo " </fieldset>\n";
-echo " <fieldset><legend>Submit</legend><input type=\"submit\" name=\"passwd\" value=\"set\" /></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. I</p>";
+echo ' <p>'._('E-DoKo uses <a href="http://www.gravatar.org">gravatars</a> as icons.').'</p>';
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
projects / e-DoKo.git / blobdiff