chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Register when a user was subscribed to session - refs BT#9881 #TMI

Browse Source
1.10.x
Angel Fernando Quiroz Campos 11 years ago
parent 428ffbba46
commit 66e1e9fe59
9 changed files with 68 additions and 24 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 18
      main/admin/ldap_import_students_to_session.php
  2. 4
      main/admin/ldap_synchro.php
  3. 4
      main/auth/ldap/authldap.php
  4. 4
      main/inc/lib/myspace.lib.php
  5. 20
      main/inc/lib/sessionmanager.lib.php
  6. 1
      main/install/database.sql
  7. 6
      main/session/session_import.php
  8. 4
      main/webservices/registration.soap.php
  9. 31
      src/Chamilo/CoreBundle/Migrations/Schema/V110/Version201505191532.php

18
main/admin/ldap_import_students_to_session.php
Unescape View File

@ -162,13 +162,17 @@ elseif (!empty($annee) && !empty($id_session) && ($_POST['confirmed']=='yes'))
$tbl_session_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
foreach ($UserList as $user_id) {
$sql = 'INSERT INTO '.$tbl_session_user.' SET
user_id ="'.intval($user_id).'",
session_id = "'.intval($id_session).'"';
$res_user = Database::query($sql);
if ($res_user) {
$num++;
}
$res_user = Database::insert(
$tbl_session_user,
[
'session_id' => intval($id_session),
'user_id' => intval($user_id),
'registered_at' => api_get_utc_datetime()
]
);
if ($res_user !== false) {
$num++;
}
}
if($num>0) {

4
main/admin/ldap_synchro.php
Unescape View File

@ -149,8 +149,8 @@ foreach($Sessions as $session){
}
// On ajoute la relation entre l'utilisateur et la session
foreach($UserList as $enreg_user){
$sql = "INSERT IGNORE INTO $tbl_session_rel_user(session_id, user_id) " .
"VALUES('$id_session','$enreg_user')";
$sql = "INSERT IGNORE INTO $tbl_session_rel_user(session_id, user_id, registered_at) " .
"VALUES('$id_session','$enreg_user', '" . api_get_utc_datetime() . "')";
Database::query($sql);
}
$sql = "SELECT COUNT(user_id) as nbUsers " .

4
main/auth/ldap/authldap.php
Unescape View File

@ -581,8 +581,8 @@ function ldap_add_user_to_session($UserList, $id_session) {
foreach ($UserList as $enreg_user) {
$enreg_user = (int) $enreg_user;
Database::query("INSERT IGNORE INTO $tbl_session_rel_user ".
" (session_id, user_id) " .
" VALUES('$id_session','$enreg_user')");
" (session_id, user_id, registered_at) " .
" VALUES('$id_session','$enreg_user', '" . api_get_utc_datetime() . "')");
}
// We update the number of users in the session
$sql = "SELECT COUNT(user_id) as nbUsers FROM $tbl_session_rel_user ".

4
main/inc/lib/myspace.lib.php
Unescape View File

@ -2569,8 +2569,8 @@ class MySpace
$new_users = array();
foreach ($users as $index => $user) {
$userid = $user['id'];
$sql_insert = "INSERT IGNORE INTO $tbl_session_rel_user(session_id, user_id)
VALUES ('$id_session','$userid')";
$sql_insert = "INSERT IGNORE INTO $tbl_session_rel_user(session_id, user_id, registered_at)
VALUES ('$id_session','$userid', '" . api_get_utc_datetime() . "')";
Database::query($sql_insert);
$user['added_at_session'] = 1;
$new_users[] = $user;

20
main/inc/lib/sessionmanager.lib.php
Unescape View File

@ -1688,8 +1688,8 @@ class SessionManager
foreach ($user_list as $enreg_user) {
$enreg_user = Database::escape_string($enreg_user);
$nbr_users++;
$sql = "INSERT IGNORE INTO $tbl_session_rel_user (relation_type, session_id, user_id)
VALUES (0, $id_session, $enreg_user)";
$sql = "INSERT IGNORE INTO $tbl_session_rel_user (relation_type, session_id, user_id, registered_at)
VALUES (0, $id_session, $enreg_user, '" . api_get_utc_datetime() . "')";
Database::query($sql);
}
@ -1913,8 +1913,8 @@ class SessionManager
if (empty($count)) {
// If user is not registered to a session then add it.
$sql = "INSERT IGNORE INTO $tbl_session_rel_user (session_id, user_id)
VALUES ($session_id, $enreg_user)";
$sql = "INSERT IGNORE INTO $tbl_session_rel_user (session_id, user_id, registered_at)
VALUES ($session_id, $enreg_user, '" . api_get_utc_datetime() . "')";
Database::query($sql);
$sql = "UPDATE $tbl_session SET nbr_users = nbr_users + 1
@ -2817,8 +2817,13 @@ class SessionManager
foreach ($sessions_list as $session_id) {
$session_id = intval($session_id);
$sql = "INSERT IGNORE INTO $tbl_session_rel_user (session_id, user_id, relation_type)
VALUES ($session_id, $userId, '" . SESSION_RELATION_TYPE_RRHH . "')";
$sql = "INSERT IGNORE INTO $tbl_session_rel_user (session_id, user_id, relation_type, registered_at)
VALUES (
$session_id,
$userId,
'" . SESSION_RELATION_TYPE_RRHH . "',
'" . api_get_utc_datetime() . "'
)";
Database::query($sql);
$affected_rows++;
}
@ -4241,7 +4246,8 @@ class SessionManager
// Insert new users.
$sql = "INSERT IGNORE INTO $tbl_session_user SET
user_id = '$user_id',
session_id = '$session_id'";
session_id = '$session_id',
registered_at = '" . api_get_utc_datetime() . "'";
Database::query($sql);
if ($debug) {
$logger->addInfo("Sessions - Adding User #$user_id ($user) to session #$session_id");

1
main/install/database.sql
Unescape View File

@ -513,6 +513,7 @@ CREATE TABLE IF NOT EXISTS session_rel_user (
id_user mediumint unsigned NOT NULL default '0',
relation_type int default 0,
duration int,
registered_at DATETIME not null,
PRIMARY KEY (id_session, id_user, relation_type)
);

6
main/session/session_import.php
Unescape View File

@ -317,7 +317,8 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
if ($user_id !== false) {
$sql = "INSERT IGNORE INTO $tbl_session_user SET
user_id ='$user_id',
session_id = '$session_id'";
session_id = '$session_id',
registered_at = '" . api_get_utc_datetime() . "'";
$rs_user = Database::query($sql);
$user_counter++;
}
@ -369,7 +370,8 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
// Adding to session_rel_user table.
$sql = "INSERT IGNORE INTO $tbl_session_user SET
user_id ='$user_id',
session_id = '$session_id'";
session_id = '$session_id',
registered_at = '" . api_get_utc_datetime() . "'";
$rs_user = Database::query($sql);
$user_counter++;
// Adding to session_rel_user_rel_course table.

4
main/webservices/registration.soap.php
Unescape View File

@ -4823,8 +4823,8 @@ function WSSuscribeUsersToSession($params)
foreach ($usersList as $enreg_user) {
$enreg_user = Database::escape_string($enreg_user);
$nbr_users++;
$sql = "INSERT IGNORE INTO $tbl_session_rel_user(session_id, user_id)
VALUES ('$sessionId','$enreg_user')";
$sql = "INSERT IGNORE INTO $tbl_session_rel_user(session_id, user_id, registered_at)
VALUES ('$sessionId','$enreg_user', '" . api_get_utc_datetime() . "')";
Database::query($sql);
}

31
src/Chamilo/CoreBundle/Migrations/Schema/V110/Version201505191532.php
Unescape View File

@ -0,0 +1,31 @@
<?php
/* For licensing terms, see /license.txt */
namespace Chamilo\CoreBundle\Migrations\Schema\V110;
use Chamilo\CoreBundle\Migrations\AbstractMigrationChamilo;
use Doctrine\DBAL\Schema\Schema;
/**
* Username changes
*/
class Version201505191532 extends AbstractMigrationChamilo
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$this->addSql('ALTER TABLE session_rel_user ADD COLUMN registered_at DATETIME NOT NULL');
$this->addSql("UPDATE settings_current SET selected_value = '1.10.0.40' WHERE variable = 'chamilo_database_version'");
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$this->addSql('ALTER TABLE session_rel_user DROP COLUMN registered_at');
$this->addSql("UPDATE settings_current SET selected_value = '1.10.0.39' WHERE variable = 'chamilo_database_version'");
}
}
Write Preview
Loading…
Cancel
Save