[svn r19041] logic changes - allow to change language of user - (see FS#3874)

skala
Isaac Flores 16 years ago
parent 4809bf3afd
commit dedd12a238
  1. 8
      main/admin/user_edit.php
  2. 7
      main/inc/lib/usermanager.lib.php

@ -1,4 +1,4 @@
<?php // $Id: user_edit.php 18466 2009-02-12 14:25:22Z juliomontoya $
<?php // $Id: user_edit.php 19041 2009-03-13 21:15:04Z iflorespaz $
/*
==============================================================================
Dokeos - elearning and course management software
@ -169,6 +169,9 @@ $form->addGroup($group, 'password', null, '',false);
$status = api_get_status_langvars();
$form->addElement('select','status',get_lang('Status'),$status,'id="status_select" onchange="display_drh_list()"');
//Language
$form->addElement('select_language', 'language', get_lang('Language'));
$display = $user_data['status'] == STUDENT || $_POST['status'] == STUDENT ? 'block' : 'none';
$form->addElement('html','<div id="drh_list" style="display:'.$display.';">');
$drh_select = $form->addElement('select','hr_dept_id',get_lang('Drh'),array(),'id="drh_select"');
@ -374,6 +377,7 @@ if( $form->validate())
$send_mail = intval($user['send_mail']);
$reset_password = intval($user['reset_password']);
$hr_dept_id = intval($user['hr_dept_id']);
$language=$user['language'];
if ($user['radio_expiration_date']=='1' && ! $user_data['platform_admin'] )
{
$expiration_date=$user['expiration_date'];
@ -404,7 +408,7 @@ if( $form->validate())
$password = $user['password'];
$auth_source = $user['auth_source'];
}
UserManager::update_user($user_id,$firstname,$lastname,$username,$password,$auth_source,$email,$status,$official_code,$phone,$picture_uri,$expiration_date, $active, null, $hr_dept_id);
UserManager::update_user($user_id,$firstname,$lastname,$username,$password,$auth_source,$email,$status,$official_code,$phone,$picture_uri,$expiration_date, $active, null, $hr_dept_id,null,$language);
if(api_get_setting('openid_authentication')=='true' && !empty($user['openid']))
{
$up = UserManager::update_openid($user_id,$user['openid']);

@ -1,4 +1,4 @@
<?php // $Id: usermanager.lib.php 18942 2009-03-10 23:42:21Z juliomontoya $
<?php // $Id: usermanager.lib.php 19041 2009-03-13 21:15:04Z iflorespaz $
/*
==============================================================================
Dokeos - elearning and course management software
@ -292,14 +292,15 @@ class UserManager
* @param array A series of additional fields to add to this user as extra fields (optional, defaults to null)
* @return boolean true if the user information was updated
*/
function update_user($user_id, $firstname, $lastname, $username, $password = null, $auth_source = null, $email, $status, $official_code, $phone, $picture_uri, $expiration_date, $active, $creator_id= null, $hr_dept_id=0, $extra=null)
function update_user($user_id, $firstname, $lastname, $username, $password = null, $auth_source = null, $email, $status, $official_code, $phone, $picture_uri, $expiration_date, $active, $creator_id= null, $hr_dept_id=0, $extra=null,$language='english')
{
global $userPasswordCrypted;
$table_user = Database :: get_main_table(TABLE_MAIN_USER);
$sql = "UPDATE $table_user SET
lastname='".Database::escape_string($lastname)."',
firstname='".Database::escape_string($firstname)."',
username='".Database::escape_string($username)."',";
username='".Database::escape_string($username)."',
language='".Database::escape_string($language)."',";
if(!is_null($password))
{
//$password = $userPasswordCrypted ? md5($password) : $password;

Loading…
Cancel
Save