X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fpreferences.php;h=990626a264172873c7720a57aa92e45c263585e5;hp=6648b993458ace924d212f9715e5d452d4a267d4;hb=106c90b95129be78b2763553c72e3aa131f5ee4b;hpb=f47ddae6b4d00d950c3a29d6b7536ce1ae9ac813 diff --git a/include/preferences.php b/include/preferences.php index 6648b99..990626a 100644 --- a/include/preferences.php +++ b/include/preferences.php @@ -1,5 +1,5 @@ +/* Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Arun Persaud * * This file is part of e-DoKo. * @@ -43,11 +43,15 @@ $changed_openforgames = 0; $changed_vacation = 0; $changed_openid = 0; $changed_digest = 0; +$changed_language = 0; display_user_menu($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']; +set_language($PREF['language']); $timezone = DB_get_user_timezone($myid); DB_update_user_timestamp($myid); @@ -85,7 +89,7 @@ if(myisset('vacation_start','vacation_stop','vacation_comment') && $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'" ); @@ -270,9 +274,9 @@ if(myisset("password0","password1","password2") && $_REQUEST["password0"]!="" & $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 */ @@ -285,8 +289,19 @@ if(myisset("password0","password1","password2") && $_REQUEST["password0"]!="" & 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 */ } @@ -297,6 +312,25 @@ if(myisset("openid_url") && $_REQUEST['openid_url']!='') DB_AttachOpenID($openid_url, $myid); } +if(myisset("language")) + { + $language = $_REQUEST['language']; + if($language != $PREF['language']) + { + /* check if we already have an entry for the user, if so change it, if not create new one */ + $result = DB_query("SELECT * from User_Prefs". + " WHERE user_id='$myid' AND pref_key='language'" ); + if( DB_fetch_array($result)) + $result = DB_query("UPDATE User_Prefs SET value=".DB_quote_smart($language). + " WHERE user_id='$myid' AND pref_key='language'" ); + else + $result = DB_query("INSERT INTO User_Prefs VALUES(NULL,'$myid','language',". + DB_quote_smart($language).")"); + $changed_language = 1; + } + } + + /* get infos again in case they have changed */ $PREF = DB_get_PREF($myid); $timezone = DB_get_user_timezone($myid); @@ -307,189 +341,192 @@ $timezone = DB_get_user_timezone($myid); echo "
\n"; echo "
\n"; -echo "

Your settings are

\n"; +echo '

'._('Your settings are')."

\n"; echo "
\n"; -echo " Game-related\n"; +echo ' '._('Game-related')."\n"; echo " \n"; -echo " \n"; +echo ' \n"; if($PREF['vacation_start']) $value = substr($PREF['vacation_start'],0,10); else $value = ''; -echo " \n"; +echo " \n"; if($PREF['vacation_stop']) $value = substr($PREF['vacation_stop'],0,10); else $value = ''; -echo " \n"; +echo " \n"; if($PREF['vacation_comment']) $value = $PREF['vacation_comment']; else $value = ''; -echo " \n"; -echo "\n"; -echo " \n"; +echo ' \n"; -echo " \n"; -echo " \n"; -echo " \n"; -echo " \n"; -echo " \n"; echo "
Vacation:
'._('Vacation').": start:"._('start').":stop:"._('stop').":comment:"; -if($changed_vacation == 1) echo "changed"; -if($changed_vacation == -1) echo "wrong date format"; +echo ' '._('comment:').""; +if($changed_vacation == 1) echo _('changed'); +if($changed_vacation == -1) echo _('wrong date format'); echo "
use YYYY-MM-DDuse '-' in start field to unset vacation
Notification: \n"; +echo '
'._("set both dates to the same day to end vacation")."
'._('Notification').": \n"; echo " "; -if($changed_notify) echo "changed"; +if($changed_notify) echo _('changed'); echo "
Digest: \n"; +echo '
'._('Digest').": \n"; echo " "; -if($changed_digest) echo "changed"; +if($changed_digest) echo _('changed'); echo "
Autosetup: \n"; +echo '
'._('Autosetup').": \n"; echo " "; -if($changed_autosetup) echo "changed"; +if($changed_autosetup) echo _('changed'); echo "
Sorting: \n"; +echo '
'._('Sorting').": \n"; echo " "; -if($changed_sorting) echo "changed"; +if($changed_sorting) echo _('changed'); echo "
Open for new games: \n"; +echo '
'._('Open for new games').": \n"; echo " "; -if($changed_openforgames) echo "changed"; +if($changed_openforgames) echo _('changed'); echo "
Card set: \n"; +echo '
'.('Card set').": \n"; echo " "; -if($changed_cards) echo "changed"; +if($changed_cards) echo _('changed'); echo "
\n"; echo "
\n"; echo "
\n"; -echo " Personal\n"; +echo ' '._('Personal')."\n"; echo " \n"; -echo " \n"; -echo " \n"; +echo ' \n"; - -echo " \n"; +echo ' \n"; -echo " \n"; -echo " \n"; echo "
Email: $email
Timezone: \n"; +echo '
'._('Email').": $email
'._('Timezone').": \n"; output_select_timezone("timezone",$timezone); -if($changed_timezone) echo "changed"; +if($changed_timezone) echo _('changed'); echo "
Password(old): ", +echo '
'._('Language').": \n"; +output_select_language("language",$PREF['language']); +if($changed_language == 1) echo _('changed'); +echo "
'._('Password(old)').": ", ""; 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 "
Password(new): ", +echo '
'._('Password(new)').": ", "", "
Password(new, retype): ", +echo '
'._('Password(new, retype)').": ", "", "
\n"; echo "
\n"; echo "
\n"; -echo " OpenID\n"; +echo ' '._('OpenID')."\n"; $openids = array(); $openids = DB_GetOpenIDsByUser($myid); @@ -497,7 +534,7 @@ $openids = DB_GetOpenIDsByUser($myid); if(sizeof($openids)) { echo " \n"; - echo " \n"; + echo ' \n"; echo " \n"; foreach ($openids as $ids) { @@ -508,15 +545,23 @@ if(sizeof($openids)) echo "
Delete?OpenId
'._('Delete')."?OpenId
\n"; } -echo " add OpenID: ", +echo ' '._('add OpenID').': ', ""; if($changed_openid) - echo " Deleted some OpenIDs!
\n"; + echo ' '._('Deleted some OpenIDs!')."
\n"; echo "
\n"; -echo "
Submit
\n"; +echo '
'._('Submit')."
\n"; echo "
\n"; -echo "

E-DoKo uses gravatars as icons. I

"; +echo '

'._('E-DoKo uses gravatars as icons.').'

'; echo "
\n"; +// add jquery date picker if html5 is not available +?> + + \ No newline at end of file