diff --git a/main/create_course/add_course.php b/main/create_course/add_course.php
index 61438bc4a4..fe1a5ba47e 100755
--- a/main/create_course/add_course.php
+++ b/main/create_course/add_course.php
@@ -6,10 +6,14 @@
  * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
  * @author Roan Embrechts, refactoring
  * @package chamilo.create_course
+ * "Course validation" feature:
+ * @author Jose Manuel Abuin Mosquera <chema@cesga.es>, Centro de Supercomputacion de Galicia
+ * "Course validation" feature, technical adaptation for Chamilo 1.8.8:
+ * @author Ivan Tcholakov <ivantcholakov@gmail.com>
  */
 
 // Name of the language file that needs to be included.
-$language_file = 'create_course';
+$language_file = array('create_course', 'cesga');
 
 // Flag forcing the "current course" reset.
 $cidReset = true;
@@ -23,12 +27,21 @@ $this_section = SECTION_COURSES;
 // Include configuration file.
 require_once api_get_path(CONFIGURATION_PATH).'add_course.conf.php';
 
+// "Course validation" feature. This value affects the way of a new course creation:
+// true  - the new course is requested only and it is created after approval;
+// false - the new course is created immedialely, after filling this form.
+$course_validation_feature = api_get_setting('course_validation') == 'true';
+
 // Require additional libraries.
 require_once api_get_path(LIBRARY_PATH).'add_course.lib.inc.php';
 require_once api_get_path(LIBRARY_PATH).'course.lib.php';
 require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
 require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
 require_once api_get_path(CONFIGURATION_PATH).'course_info.conf.php';
+if ($course_validation_feature) {
+    require_once api_get_path(LIBRARY_PATH).'course_request.lib.php';
+    require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
+}
 
 $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 $htmlHeadXtra[] = '<script type="text/javascript">
@@ -56,9 +69,11 @@ if (!api_is_allowed_to_create_course()) {
     Display::display_footer();
     exit;
 }
-// Get all course categories.
+
+// Get necessary table definitions.
 $table_course_category = Database :: get_main_table(TABLE_MAIN_CATEGORY);
 $table_course = Database :: get_main_table(TABLE_MAIN_COURSE);
+$table_course_request = Database :: get_main_table(TABLE_MAIN_COURSE_REQUEST);
 
 global $_configuration;
 $dbnamelength = strlen($_configuration['db_prefix']);
@@ -87,13 +102,50 @@ $form->add_textfield('wanted_code', get_lang('Code'), false, array('size' => '$m
 $form->applyFilter('wanted_code', 'html_filter');
 $form->addRule('wanted_code', get_lang('Max'), 'maxlength', $maxlength);
 
-$titular= &$form->add_textfield('tutor_name', get_lang('Professors'), null, array('size' => '60', 'disabled' => 'disabled'));
+$titular = & $form->add_textfield('tutor_name', get_lang('Professors'), null, array('size' => '60', 'disabled' => 'disabled'));
 $form->addElement('static', null, null, get_lang('ExplicationTrainers'));
 //$form->applyFilter('tutor_name', 'html_filter');
 
+if ($course_validation_feature) {
+
+    // Description of the requested course.
+    $form->addElement('textarea', 'description', get_lang('cesga_SolicFormDesc'), array('style' => 'border:#A5ACB2 solid 1px; font-family:arial,verdana,helvetica,sans-serif; font-size:12px', 'rows' => '3', 'cols' => '116'));
+    $form->addRule('description', get_lang('ThisFieldIsRequired'), 'required', '', '');
+
+    // Objectives of the requested course.
+    $form->addElement('textarea', 'objetives', get_lang('cesga_SolicFormObxe'), array('style' => 'border:#A5ACB2 solid 1px; font-family:arial,verdana,helvetica,sans-serif; font-size:12px', 'rows' => '3', 'cols' => '116'));
+    $form->addRule('objetives', get_lang('ThisFieldIsRequired'), 'required', '', '');
+
+    // Target audience of the requested course.
+    $form->addElement('textarea', 'target_audience', get_lang('cesga_SolicFormDest'), array('style' => 'border:#A5ACB2 solid 1px; font-family:arial,verdana,helvetica,sans-serif; font-size:12px', 'rows' => '3', 'cols' => '116'));
+    $form->addRule('target_audience', get_lang('ThisFieldIsRequired'), 'required', '', '');
+}
+
 $form->addElement('select_language', 'course_language', get_lang('Ln'));
 $form->applyFilter('select_language', 'html_filter');
 
+if ($course_validation_feature) {
+
+    // Terms and conditions to be accepted before sending a course request.
+    $form->addElement('checkbox', 'legal', get_lang('cesga_SolicFormLegal'), '', 1);
+    $form->addRule('legal', get_lang('cesga_SolicFormCond'), 'required', '', '');
+    // Link to terms and conditios.
+    // TODO: This hardcoded value is to be corrected/eliminated.
+    $link_terms_and_conditions = '<script type="text/JavaScript">
+    <!--
+    function MM_openBrWindow(theURL,winName,features) { //v2.0
+      window.open(theURL,winName,features);
+    }
+    //-->
+    </script>
+    <div class="row">
+    <div class="formw">
+    <a href="#" onclick="javascript: MM_openBrWindow(\'http://TODO.change.this/hardcoded/value/use/a/setting.html\',\'Conditions (TODO: Translate this title)\',\'scrollbars=yes, width=800\')">';
+    $link_terms_and_conditions .= get_lang('cesga_SolicFormLeerCond').'</a></div></div>';
+    $form->addElement('html', $link_terms_and_conditions);
+
+}
+
 $form->addElement('style_submit_button', null, get_lang('CreateCourseArea'), 'class="add"');
 $form->add_progress_bar();
 
@@ -109,44 +161,119 @@ $form->setDefaults($values);
 // Validate the form.
 if ($form->validate()) {
     $course_values = $form->exportValues();
-    $wanted_code = $course_values['wanted_code'];
+
+    $wanted_code = Security::remove_XSS($course_values['wanted_code']);
     $tutor_name = $course_values['tutor_name'];
     $category_code = $course_values['category_code'];
-    $title = $course_values['title'];
+    $title = Security::remove_XSS($course_values['title']);
     $course_language = $course_values['course_language'];
 
+    if ($course_validation_feature) {
+        $description = Security::remove_XSS($course_values['description']);
+        $objetives = Security::remove_XSS($course_values['objetives']);
+        $target_audience = Security::remove_XSS($course_values['target_audience']);
+        $status = '0';
+
+        $description = str_replace('"', '', $description);
+        $objetives = str_replace('"', '', $objetives);
+        $target_audience = str_replace('"', '', $target_audience);
+    }
+
+    $wanted_code = Database::escape_string($wanted_code);
+    $title = Database::escape_string($title);
+
+    if ($course_validation_feature) {
+        $description = Database::escape_string($description);
+        $objetives = Database::escape_string($objetives);
+        $target_audience = Database::escape_string($target_audience);
+    }
+
     if (trim($wanted_code) == '') {
         $wanted_code = generate_course_code(api_substr($title, 0, $maxlength));
+        $wanted_code = Database::escape_string($wanted_code);
+    }
+
+    // Check whether the requested course code has already been occupied.
+    if (!$course_validation_feature) {
+        $course_code_ok = !CourseManager::course_code_exists($wanted_code);
+    } else {
+        $course_code_ok = !CourseRequestManager::course_code_exists($wanted_code);
     }
 
-    $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));
-    $result_check = Database::query($sql_check);
-    if (Database::num_rows($result_check) < 1) {
-        if (sizeof($keys)) {
-            $visual_code = $keys['currentCourseCode'];
-            $code = $keys['currentCourseId'];
-            $db_name = $keys['currentCourseDbName'];
-            $directory = $keys['currentCourseRepository'];
-            $expiration_date = time() + $firstExpirationDelay;
-            prepare_course_repository($directory, $code);
-            update_Db_course($db_name);
-            $pictures_array = fill_course_repository($directory);
-            fill_Db_course($db_name, $directory, $course_language,$pictures_array);
-            register_course($code, $visual_code, $directory, $db_name, $tutor_name, $category_code, $title, $course_language, api_get_user_id(), $expiration_date);
+    if ($course_code_ok) {
+
+        if (!$course_validation_feature) {
+
+            // Create the course immediately.
+
+            $keys = define_course_keys($wanted_code, '', $_configuration['db_prefix']);
+
+            if (count($keys)) {
+
+                $visual_code = $keys['currentCourseCode'];
+                $code = $keys['currentCourseId'];
+                $db_name = $keys['currentCourseDbName'];
+                $directory = $keys['currentCourseRepository'];
+
+                $expiration_date = time() + $firstExpirationDelay;
+                prepare_course_repository($directory, $code);
+                update_Db_course($db_name);
+                $pictures_array = fill_course_repository($directory);
+                fill_Db_course($db_name, $directory, $course_language, $pictures_array);
+                register_course($code, $visual_code, $directory, $db_name, $tutor_name, $category_code, $title, $course_language, api_get_user_id(), $expiration_date);
+
+                // Preparing a confirmation message.
+                $link = api_get_path(WEB_COURSE_PATH).$directory.'/';
+                $message = get_lang('JustCreated');
+                $message .= ' <a href="'.$link.'">'.$title.'</a>';
+
+                Display :: display_confirmation_message($message, false);
+                echo '<div style="float: right; margin:0px; padding: 0px;">' .
+                    '<a class="bottom-link" href="'.api_get_path(WEB_PATH).'user_portal.php">'.get_lang('Enter').'</a>' .
+                    '</div>';
+
+            } else {
+
+                // TODO: Prepare an error message.
+                $message = '?';
+                Display :: display_error_message(get_lang($message), false);
+                // Display the form.
+                $form->display();
+
+            }
+
+        } else {
+
+            // Create a request for a new course.
+
+            $request_id = CourseRequestManager::create_course_request($wanted_code, $title, $description, $category_code, $course_language, $objetives, $target_audience);
+
+            if ($request_id) {
+
+                // TODO: Prepare and send notification e-mail messages.
+
+                $course_request_info = CourseRequestManager::get_course_request_info($request_id);
+                $visual_code = is_array($course_request_info) ? $course_request_info['visual_code'] : '';
+                $message = get_lang('cesga_SolicFormOK');
+                $message .= ' <strong>'.$visual_code.'</strong>';
+                Display :: display_confirmation_message($message, false);
+                echo '<div style="float: right; margin:0px; padding: 0px;">' .
+                    '<a class="bottom-link" href="'.api_get_path(WEB_PATH).'user_portal.php">'.get_lang('Enter').'</a>' .
+                    '</div>';
+
+            } else {
+
+                // TODO: Prepare an error message.
+                $message = '?';
+                Display :: display_error_message(get_lang($message), false);
+                // Display the form.
+                $form->display();
+
+            }
         }
-        $link = api_get_path(WEB_COURSE_PATH).$directory.'/';
-        $message = get_lang('JustCreated');
-        $message .= ' <a href="'.$link.'">'.$title."</a>";
-        //$message .= "<br /><br /><br />";
-        //$message .= '<a class="bottom-link" href="'.api_get_path(WEB_PATH).'user_portal.php">'.get_lang('Enter').'</a>';
-        Display :: display_confirmation_message($message, false);
-        echo '<div style="float:right; margin:0px; padding:0px;">' .
-                '<a class="bottom-link" href="'.api_get_path(WEB_PATH).'user_portal.php">'.get_lang('Enter').'</a>' .
-             '</div>';
+
     } else {
-        Display :: display_error_message(get_lang('CourseCodeAlreadyExists'),false);
+        Display :: display_error_message(get_lang('CourseCodeAlreadyExists'), false);
         // Display the form.
         $form->display();
         //echo '<p>'.get_lang('CourseCodeAlreadyExistExplained').'</p>';
@@ -155,7 +282,9 @@ if ($form->validate()) {
 } else {
     // Display the form.
     $form->display();
-    Display::display_normal_message(get_lang('Explanation'));
+    if (!$course_validation_feature) {
+        Display::display_normal_message(get_lang('Explanation'));
+    }
 }
 
 // Footer