From 8a0d2a39e2030c558ea997c41d424da644c77913 Mon Sep 17 00:00:00 2001
From: Julian Prud'homme <j.prudhomme@elixir-interactive.com>
Date: Tue, 18 Sep 2007 11:26:22 +0200
Subject: [PATCH] [svn r13069] The course code is no more required when
 creating a course so we generate a course code if it's empty

---
 main/admin/course_add.php           |  7 +++++--
 main/create_course/add_course.php   | 11 ++++++++---
 main/inc/lib/add_course.lib.inc.php | 14 +++++++++++---
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/main/admin/course_add.php b/main/admin/course_add.php
index 1f571b5695..8a6209d9d2 100644
--- a/main/admin/course_add.php
+++ b/main/admin/course_add.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: course_add.php 12612 2007-06-15 13:37:31Z elixir_julian $
+// $Id: course_add.php 13069 2007-09-18 09:26:22Z elixir_julian $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -75,7 +75,7 @@ while($obj = mysql_fetch_object($res))
 }
 // Build the form
 $form = new FormValidator('update_course');
-$form->add_textfield( 'visual_code', get_lang('CourseCode'),true,array('size'=>'20','maxlength'=>20));
+$form->add_textfield( 'visual_code', get_lang('CourseCode'),false,array('size'=>'20','maxlength'=>20));
 $form->applyFilter('visual_code','strtoupper');
 $form->addRule('wanted_code',get_lang('Max'),'maxlength',20);
 $form->addElement('select', 'tutor_id', get_lang('CourseTitular'), $teachers);
@@ -134,6 +134,9 @@ if( $form->validate())
 	{
 		$department_url = 'http://'.$department_url;
 	}
+	if(trim($code) == ''){
+		$code = generate_course_code($title);
+	}
 	$keys = define_course_keys($code, "", $_configuration['db_prefix']);
 	if (sizeof($keys))
 	{
diff --git a/main/create_course/add_course.php b/main/create_course/add_course.php
index 108a6048dd..2e7ea205ba 100644
--- a/main/create_course/add_course.php
+++ b/main/create_course/add_course.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: add_course.php 12291 2007-05-03 17:54:20Z elixir_julian $
+// $Id: add_course.php 13069 2007-09-18 09:26:22Z elixir_julian $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -80,7 +80,7 @@ $form->add_textfield('title',get_lang('Title'),true,array('size'=>'60'));
 $form->addElement('static',null,null,get_lang('Ex'));
 $form->addElement('select', 'category_code', get_lang('Fac'), $categories);
 $form->addElement('static',null,null, get_lang('TargetFac'));
-$form->add_textfield('wanted_code', get_lang('Code'),true,array('size'=>'20','maxlength'=>20));
+$form->add_textfield('wanted_code', get_lang('Code'),false,array('size'=>'20','maxlength'=>20));
 $form->addRule('wanted_code',get_lang('Max'),'maxlength',20);
 $titular= &$form->add_textfield('tutor_name', get_lang('Professors'),true,array('size'=>'60'));
 $form->addElement('select_language', 'course_language', get_lang('Ln'));
@@ -108,6 +108,11 @@ if($form->validate())
 	$category_code = $course_values['category_code'];
 	$title = $course_values['title'];
 	$course_language = $course_values['course_language'];
+	
+	if(trim($wanted_code) == ''){
+		$wanted_code = generate_course_code($title);
+	}
+	
 	$keys = define_course_keys($wanted_code, "", $_configuration['db_prefix']);
 	
 	$sql_check = sprintf('SELECT * FROM '.$table_course.' WHERE visual_code = "%s"',Database :: escape_string($wanted_code));
@@ -129,7 +134,7 @@ if($form->validate())
 			register_course($code, $visual_code, $directory, $db_name, $tutor_name, $category_code, $title, $course_language, $_user['user_id'], $expiration_date);
 		}
 		$message = get_lang('JustCreated');
-		$message .= " <strong>".$course_values['wanted_code']."</strong>";
+		$message .= " <strong>".$visual_code."</strong>";
 		$message .= "<br/><br/>";
 		$message .= '<a href="'.api_get_path(WEB_PATH).'user_portal.php">'.get_lang('Enter').'</a>';
 		Display :: display_confirmation_message($message,false);
diff --git a/main/inc/lib/add_course.lib.inc.php b/main/inc/lib/add_course.lib.inc.php
index f5d0c2cf7e..e020e910d6 100644
--- a/main/inc/lib/add_course.lib.inc.php
+++ b/main/inc/lib/add_course.lib.inc.php
@@ -73,6 +73,14 @@ function create_course($wanted_code, $title, $tutor_name, $category_code, $cours
 		return false;
 }
 
+
+function generate_course_code($course_title){
+	$wantedCode = strtr($course_title, "�����������������������������������������������������������", "AAAAAACEEEEIIIIDNOOOOOOUUUUYsaaaaaaaceeeeiiiionoooooouuuuyy");
+	$wantedCode = ereg_replace("[^A-Z0-9]", "", strtoupper($wantedCode));
+	return $wantedCode;
+}
+
+
 /**
  *	Defines the four needed keys to create a course based on several parameters.
  *	@return array with the needed keys ["currentCourseCode"], ["currentCourseId"], ["currentCourseDbName"], ["currentCourseRepository"]
@@ -91,10 +99,10 @@ function define_course_keys($wantedCode, $prefix4all = "", $prefix4baseName = ""
 
 	$wantedCode = ereg_replace("[^A-Z0-9]", "", strtoupper($wantedCode));
 
-	if(empty ($wantedCode))
+	/*if(empty ($wantedCode))
 	{
-		$wantedCode = "CL";
-	}
+		$wantedCode = generate_course_code($wantedCode);
+	}*/
 
 	$keysCourseCode = $wantedCode;