瀏覽代碼

[svn r14632] replace drh_id by hr_dept_id

Eric Marguin 17 年之前
父節點
當前提交
432856afe2

+ 4 - 4
main/admin/user_add.php

@@ -1,4 +1,4 @@
-<?php // $Id: user_add.php 14615 2008-03-17 09:53:23Z elixir_inter $
+<?php // $Id: user_add.php 14632 2008-03-17 17:49:21Z elixir_inter $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -152,7 +152,7 @@ $form->addElement('select','status',get_lang('Status'),$status,'id="status_selec
 //drh list (display only if student)
 $display = $_POST['status'] == STUDENT ? 'block' : 'none';
 $form->addElement('html','<div id="drh_list" style="display:'.$display.';">');
-$drh_select = $form->addElement('select','drh_id',get_lang('Drh'),array(),'id="drh_select"');
+$drh_select = $form->addElement('select','hr_dept_id',get_lang('Drh'),array(),'id="drh_select"');
 $drh_list = UserManager :: get_user_list(array('status'=>DRH),array('lastname','firstname'));
 $drh_select->addOption('---',0);
 foreach($drh_list as $drh)
@@ -230,7 +230,7 @@ if( $form->validate())
 		$picture = $_FILES['picture'];
 		$platform_admin = intval($user['admin']['platform_admin']);
 		$send_mail = intval($user['mail']['send_mail']);
-		$drh_id = intval($user['drh_id']);
+		$hr_dept_id = intval($user['hr_dept_id']);
 		if(count($extAuthSource) > 0 && $user['password']['password_auto'] == '2')
 		{
 			$auth_source = $user['password']['auth_source'];
@@ -251,7 +251,7 @@ if( $form->validate())
 		}
 		$active = intval($user['active']);
 	
-		$user_id = UserManager::create_user($firstname,$lastname,$status,$email,$username,$password,$official_code,api_get_setting('platformLanguage'),$phone,$picture_uri,$auth_source,$expiration_date,$active, $drh_id);
+		$user_id = UserManager::create_user($firstname,$lastname,$status,$email,$username,$password,$official_code,api_get_setting('platformLanguage'),$phone,$picture_uri,$auth_source,$expiration_date,$active, $hr_dept_id);
 		if ($platform_admin)
 		{
 			$sql = "INSERT INTO $table_admin SET user_id = '".$user_id."'";

+ 4 - 4
main/admin/user_edit.php

@@ -1,4 +1,4 @@
-<?php // $Id: user_edit.php 14615 2008-03-17 09:53:23Z elixir_inter $
+<?php // $Id: user_edit.php 14632 2008-03-17 17:49:21Z elixir_inter $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -166,7 +166,7 @@ $form->addElement('select','status',get_lang('Status'),$status,'id="status_selec
 
 $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','drh_id',get_lang('Drh'),array(),'id="drh_select"');
+$drh_select = $form->addElement('select','hr_dept_id',get_lang('Drh'),array(),'id="drh_select"');
 $drh_list = UserManager :: get_user_list(array('status'=>DRH),array('lastname','firstname'));
 $drh_select->addOption('---',0);
 foreach($drh_list as $drh)
@@ -265,7 +265,7 @@ if( $form->validate())
 	$platform_admin = intval($user['platform_admin']);
 	$send_mail = intval($user['send_mail']);
 	$reset_password = intval($user['reset_password']);
-	$drh_id = intval($user['drh_id']);
+	$hr_dept_id = intval($user['hr_dept_id']);
 	if ($user['radio_expiration_date']=='1' && ! $user_data['platform_admin'] )
 	{
 		$expiration_date=$user['expiration_date'];
@@ -296,7 +296,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, $drh_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);
 	if(api_get_setting('openid_authentication')=='true' && !empty($user['openid']))
 	{
 		$up = UserManager::update_openid($user_id,$user['openid']);

+ 3 - 3
main/inc/lib/tracking.lib.php

@@ -767,16 +767,16 @@ class Tracking {
 	}
 	
 	
-	function get_student_followed_by_drh($drh_id) {
+	function get_student_followed_by_drh($hr_dept_id) {
 		
-		$drh_id = intval($drh_id);
+		$hr_dept_id = intval($hr_dept_id);
 		$a_students = array ();
 		
 		$tbl_organism = Database :: get_main_table(TABLE_MAIN_ORGANISM);
 		$tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
 		
 		$sql = 'SELECT DISTINCT user_id FROM '.$tbl_user.' as user
-				WHERE drh_id='.$drh_id;
+				WHERE hr_dept_id='.$hr_dept_id;
 		$rs = api_sql_query($sql, __FILE__, __LINE__);
 		
 		while($user = Database :: fetch_array($rs))

+ 4 - 4
main/inc/lib/usermanager.lib.php

@@ -57,7 +57,7 @@ class UserManager
 	  *
 	  * @todo Add the user language to the parameters
 	  */
-	function create_user($firstName, $lastName, $status, $email, $loginName, $password, $official_code = '', $language='', $phone = '', $picture_uri = '', $auth_source = PLATFORM_AUTH_SOURCE, $expiration_date = '0000-00-00 00:00:00', $active = 1, $drh_id=0)
+	function create_user($firstName, $lastName, $status, $email, $loginName, $password, $official_code = '', $language='', $phone = '', $picture_uri = '', $auth_source = PLATFORM_AUTH_SOURCE, $expiration_date = '0000-00-00 00:00:00', $active = 1, $hr_dept_id=0)
 	{
 		global $_user, $userPasswordCrypted;
 		
@@ -98,7 +98,7 @@ class UserManager
 				                    language = '".Database::escape_string($language)."', 
 				                    registration_date = now(),
 				                    expiration_date = '".Database::escape_string($expiration_date)."',
-									drh_id = '".Database::escape_string($drh_id)."',
+									hr_dept_id = '".Database::escape_string($hr_dept_id)."',
 									active = '".Database::escape_string($active)."'";
 		$result = api_sql_query($sql);
 		if ($result)
@@ -246,7 +246,7 @@ class UserManager
 	 * @param int $creator_id
 	 * @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, $drh_id=0)
+	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)
 	{
 		global $userPasswordCrypted;
 		$table_user = Database :: get_main_table(TABLE_MAIN_USER);
@@ -271,7 +271,7 @@ class UserManager
 				picture_uri='".Database::escape_string($picture_uri)."',
 				expiration_date='".Database::escape_string($expiration_date)."',
 				active='".Database::escape_string($active)."',
-				drh_id=".intval($drh_id);
+				hr_dept_id=".intval($hr_dept_id);
 		if(!is_null($creator_id))
 		{
 			$sql .= ", creator_id='".Database::escape_string($creator_id)."'";

+ 1 - 0
main/install/dokeos_main.sql

@@ -730,6 +730,7 @@ CREATE TABLE user (
   active tinyint unsigned NOT NULL default 1,
   openid varchar(255) DEFAULT NULL,
   theme varchar(255) DEFAULT NULL,
+  hr_dept_id smallint unsigned NOT NULL default 0,
   PRIMARY KEY  (user_id),
   UNIQUE KEY username (username)
 );

+ 1 - 1
main/mySpace/lp_tracking.php

@@ -30,7 +30,7 @@ $user_infos = UserManager :: get_user_info_by_id($user_id);
 $name = $user_infos['firstname'].' '.$user_infos['lastname'];
 
 
-if(!api_is_platform_admin() && !CourseManager :: is_course_teacher($_user['user_id'], $_GET['course']) && !Tracking :: is_allowed_to_coach_student($_user['user_id'],$_GET['student_id']) && $user_infos['drh_id']!==$_user['user_id'])
+if(!api_is_platform_admin() && !CourseManager :: is_course_teacher($_user['user_id'], $_GET['course']) && !Tracking :: is_allowed_to_coach_student($_user['user_id'],$_GET['student_id']) && $user_infos['hr_dept_id']!==$_user['user_id'])
 {
 	Display::display_header('');
 	api_not_allowed();

+ 1 - 1
main/mySpace/myStudents.php

@@ -171,7 +171,7 @@ if(!empty($_GET['student']))
 	
 	// infos about user
 	$a_infosUser = UserManager::get_user_info_by_id($student_id);
-	if($_user['status']==DRH && $a_infosUser['drh_id']!=$_user['user_id'])
+	if($_user['status']==DRH && $a_infosUser['hr_dept_id']!=$_user['user_id'])
 	{
 		api_not_allowed();
 	}