projects
/
e-DoKo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
set languages can also be used by UID now; make mymail langauge sensitive
[e-DoKo.git]
/
include
/
user.php
diff --git
a/include/user.php
b/include/user.php
index b811cdaa0d4f52a74c5ae632e5865b868a96f36a..551e7d57038aa44c5ffe03c0b6cbfb7d81e249d5 100644
(file)
--- a/
include/user.php
+++ b/
include/user.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.
*
@@
-25,12
+25,7
@@
if(!isset($HOST))
exit;
/* test id and password, should really be done in one step */
exit;
/* test id and password, should really be done in one step */
-if(!isset($_SESSION['name']))
- {
- $email = $_REQUEST['email'];
- $password = $_REQUEST['password'];
- }
-else
+if(isset($_SESSION['name']))
{
$name = $_SESSION['name'];
$email = DB_get_email('name',$name);
{
$name = $_SESSION['name'];
$email = DB_get_email('name',$name);
@@
-106,12
+101,14
@@
else
{ /* normal user page */
/* verify password and email */
{ /* normal user page */
/* verify password and email */
- if(strlen($password)!=32)
- $password = md5($password);
-
$ok = 1;
$ok = 1;
- $myid = DB_get_userid('email-password',$email,$password);
- if(!$myid)
+ if(isset($email, $password))
+ {
+ $myid = DB_get_userid('email-password',$email,$password);
+ if(!$myid)
+ $ok = 0;
+ }
+ else
$ok = 0;
if($ok)
$ok = 0;
if($ok)
@@
-121,6
+118,9
@@
else
$_SESSION['name'] = $myname;
$PREF = DB_get_PREF($myid);
$_SESSION['name'] = $myname;
$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']);
DB_update_user_timestamp($myid);
DB_update_user_timestamp($myid);