Merge branch '1.10.x' of https://github.com/chamilo/chamilo-lms into 1.10.0-rc

Author: ywarnier

main/document/create_document.php

@@ -52,6 +52,16 @@
     });
 });
 
+$(document).on("click", ".dropdown-menu li a", function () {
+    var textValue = $(this).text();
+    $.ajax({
+        contentType: "application/x-www-form-urlencoded",
+        data: "textValue="+textValue,
+        url: "' . api_get_path(WEB_AJAX_PATH) . 'document.ajax.php?a=documentDestination",
+        type: "POST"
+    });
+});
+
 function setFocus() {
    $("#document_title").focus();
 }
@@ -432,6 +442,20 @@ function document_exists($filename)
 	$values = $form->exportValues();
 	$readonly = isset($values['readonly']) ? 1 : 0;
 	$values['title'] = trim($values['title']);
+    
+    $textValue = $_SESSION['textValue'];
+    $homeDirectory = get_lang('HomeDirectory');
+    if ($textValue === $homeDirectory){
+        $dir = "/";
+    } else if ($dir != "/") {
+        $posTextValue = strpos($textValue, '—');
+        $textValue = substr($textValue, ($posTextValue + 4));
+        foreach ($folder_titles as $dirValue => $dirText) {
+            if ($dirText === $textValue) {
+                $dir = $dirValue;
+            }
+        }
+    }
 
     if ($dir[strlen($dir) - 1] != '/') {
 		$dir .= '/';

main/inc/ajax/document.ajax.php

@@ -73,5 +73,10 @@
             );
         }
         break;
+    case 'documentDestination':
+        //obtained the bootstrap-select selected value via ajax
+        $textValue = isset($_POST['textValue']) ? $_POST['textValue'] : null;
+        $_SESSION['textValue'] = $textValue;
+        break;
 }
 exit;