From ed0f112265de45b34711c7c3029f4ad0cfc11890 Mon Sep 17 00:00:00 2001
From: Yannick Warnier <yannick.warnier@beeznest.com>
Date: Mon, 17 Sep 2007 17:08:32 +0200
Subject: [PATCH] [svn r13048] Altered username field size and value to avoid
 bug shortening login (database field is limited to 20 characters anyway).
 Fixes FS#1903 Changed mysql_ call to Database:: call

---
 main/auth/inscription.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/main/auth/inscription.php b/main/auth/inscription.php
index c671bf10fe..7e0de90786 100644
--- a/main/auth/inscription.php
+++ b/main/auth/inscription.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: inscription.php 12734 2007-07-11 00:32:13Z yannoo $
+// $Id: inscription.php 13048 2007-09-17 15:08:32Z yannoo $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -72,7 +72,7 @@ if (CONFVAL_ASK_FOR_OFFICIAL_CODE)
 		$form->addRule('official_code', get_lang('ThisFieldIsRequired'), 'required');
 }
 //	USERNAME
-$form->addElement('text', 'username', get_lang('UserName'), array('size' => 40));
+$form->addElement('text', 'username', get_lang('UserName'), array('size' => 20));
 $form->addRule('username', get_lang('ThisFieldIsRequired'), 'required');
 $form->addRule('username', get_lang('UsernameWrong'), 'username');
 $form->addRule('username', get_lang('UserTaken'), 'username_available');
@@ -111,6 +111,7 @@ if ($form->validate())
 	  STORE THE NEW USER DATA INSIDE THE MAIN DOKEOS DATABASE
 	  -----------------------------------------------------*/
 	$values = $form->exportValues();
+	$values['username'] = substr($values['username'],0,20); //make *sure* the login isn't too long
 
 	if (get_setting('allow_registration_as_teacher') == 'false')
 	{
@@ -126,7 +127,7 @@ if ($form->validate())
 	{
 		// TODO: add language to parameter list of UserManager::create_user(...)
 		$sql = "UPDATE ".Database::get_main_table(TABLE_MAIN_USER)."
-		             SET language	= '".mysql_real_escape_string($values['language'])."'
+		             SET language	= '".Database::escape_string($values['language'])."'
 					WHERE user_id = '".$user_id."'	 ";
 		//api_sql_query($sql,__FILE__,__LINE__);