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

Fix issue with new null value for empty registration date when tested through SSO - refs BT#9704

Browse Source
1.10.x
Yannick Warnier 11 years ago
parent a62790d8de
commit adbadd0cb9
2 changed files with 3 additions and 2 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. 2
      main/auth/sso/sso.Drupal.class.php
  2. 3
      main/auth/sso/sso.class.php

2
main/auth/sso/sso.Drupal.class.php
Unescape View File

@ -118,7 +118,7 @@ class ssoDrupal
//Check if the account is active (not locked) //Check if the account is active (not locked)
if ($uData['active']=='1') { if ($uData['active']=='1') {
// check if the expiration date has not been reached // check if the expiration date has not been reached
if ($uData['expiration_date'] > date('Y-m-d H:i:s') OR $uData['expiration_date']=='0000-00-00 00:00:00') { if (empty($uData['expiration_date']) OR $uData['expiration_date'] > date('Y-m-d H:i:s') OR $uData['expiration_date']=='0000-00-00 00:00:00') {
//If Multiple URL is enabled //If Multiple URL is enabled
if (api_get_multiple_access_url()) { if (api_get_multiple_access_url()) {

3
main/auth/sso/sso.class.php
Unescape View File

@ -123,7 +123,8 @@ class sso {
//Check if the account is active (not locked) //Check if the account is active (not locked)
if ($uData['active']=='1') { if ($uData['active']=='1') {
// check if the expiration date has not been reached // check if the expiration date has not been reached
if ($uData['expiration_date'] > date('Y-m-d H:i:s') if (empty($uData['expiration_date'])
or $uData['expiration_date'] > date('Y-m-d H:i:s')
or $uData['expiration_date']=='0000-00-00 00:00:00') { or $uData['expiration_date']=='0000-00-00 00:00:00') {
//If Multiple URL is enabled //If Multiple URL is enabled

Write Preview
Loading…
Cancel
Save