浏览代码

Merge pull request #526 from AngelFQC/BT9464

Fix add/edit session - refs BT#9464
Yannick Warnier 10 年之前
父节点
当前提交
0be9693ae5

+ 8 - 0
.gitignore

@@ -17,6 +17,14 @@ home/*
 main/upload/users/*
 main/upload/users/*
 !main/upload/users/index.html
 !main/upload/users/index.html
 
 
+# Session images
+main/upload/sessions/*
+!main/upload/sessions/index.html
+
+# Course images
+main/upload/courses/*
+!main/upload/courses/index.html
+
 # Logs and databases #
 # Logs and databases #
 *.log
 *.log
 
 

+ 3 - 0
documentation/installation_guide.html

@@ -144,10 +144,13 @@ The following directories need to be readable, writeable and executable by your
 <ul>
 <ul>
   <li>[chamilo]/main/inc/conf/</li>
   <li>[chamilo]/main/inc/conf/</li>
   <li>[chamilo]/main/upload/users/</li>
   <li>[chamilo]/main/upload/users/</li>
+  <li>[chamilo]/main/upload/sessions/</li>
+  <li>[chamilo]/main/upload/courses/</li>
   <li>[chamilo]/main/default_course_document/images/</li>
   <li>[chamilo]/main/default_course_document/images/</li>
   <li>[chamilo]/archive/</li>
   <li>[chamilo]/archive/</li>
   <li>[chamilo]/courses/</li>
   <li>[chamilo]/courses/</li>
   <li>[chamilo]/home/</li>
   <li>[chamilo]/home/</li>
+  <li>[chamilo]/data/</li>
 </ul>
 </ul>
 Optionally, you can do the same to the following directories if you want to
 Optionally, you can do the same to the following directories if you want to
 enable CSS styles package upload and sub-language definition:
 enable CSS styles package upload and sub-language definition:

+ 3 - 0
documentation/installation_guide_es_ES.html

@@ -132,10 +132,13 @@ Remplace [chamilo] por el directorio en el cual está ubicado su Chamilo:
 <ul>
 <ul>
   <li>[chamilo]/main/inc/conf/</li>
   <li>[chamilo]/main/inc/conf/</li>
   <li>[chamilo]/main/upload/users/</li>
   <li>[chamilo]/main/upload/users/</li>
+  <li>[chamilo]/main/upload/sessions/</li>
+  <li>[chamilo]/main/upload/courses/</li>
   <li>[chamilo]/main/default_course_document/images/</li>
   <li>[chamilo]/main/default_course_document/images/</li>
   <li>[chamilo]/archive/</li>
   <li>[chamilo]/archive/</li>
   <li>[chamilo]/courses/</li>
   <li>[chamilo]/courses/</li>
   <li>[chamilo]/home/</li>
   <li>[chamilo]/home/</li>
+  <li>[chamilo]/data/</li>
 </ul>
 </ul>
 Opcionalmente, puede hacer lo mismo a los directorios siguientes si desea
 Opcionalmente, puede hacer lo mismo a los directorios siguientes si desea
 activar la subida de paquetes de estilos CSS y la definición de sub-idiomas:
 activar la subida de paquetes de estilos CSS y la definición de sub-idiomas:

+ 3 - 0
documentation/installation_guide_fr_FR.html

@@ -176,10 +176,13 @@ Remplacez [chamilo] par le répertoire où vous avez placé le contenu du zip:
 <ul>
 <ul>
   <li>[chamilo]/main/inc/conf/</li>
   <li>[chamilo]/main/inc/conf/</li>
   <li>[chamilo]/main/upload/users/</li>
   <li>[chamilo]/main/upload/users/</li>
+  <li>[chamilo]/main/upload/sessions/</li>
+  <li>[chamilo]/main/upload/courses/</li>
   <li>[chamilo]/main/default_course_document/images/</li>
   <li>[chamilo]/main/default_course_document/images/</li>
   <li>[chamilo]/archive/</li>
   <li>[chamilo]/archive/</li>
   <li>[chamilo]/courses/</li>
   <li>[chamilo]/courses/</li>
   <li>[chamilo]/home/</li>
   <li>[chamilo]/home/</li>
+  <li>[chamilo]/data/</li>
 </ul>
 </ul>
 Optionnellement, vous pouvez faire la même chose pour les répertoires suivants
 Optionnellement, vous pouvez faire la même chose pour les répertoires suivants
 si vous souhaitez permettre l'envoi de styles CSS ou la définition de nouvelles
 si vous souhaitez permettre l'envoi de styles CSS ou la définition de nouvelles

+ 3 - 0
documentation/installation_guide_it_IT.html

@@ -108,10 +108,13 @@
 <ul>
 <ul>
   <li class="li2"><span class="s1">[chamilo]/main/inc/conf/</span></li>
   <li class="li2"><span class="s1">[chamilo]/main/inc/conf/</span></li>
   <li class="li2"><span class="s1">[chamilo]/main/upload/users/</span></li>
   <li class="li2"><span class="s1">[chamilo]/main/upload/users/</span></li>
+  <li clasS="li2">[chamilo]/main/upload/sessions/</li>
+  <li class="li2">[chamilo]/main/upload/courses/</li>
   <li class="li2"><span class="s1">[chamilo]/main/default_course_document/images/</span></li>
   <li class="li2"><span class="s1">[chamilo]/main/default_course_document/images/</span></li>
   <li class="li2"><span class="s1">[chamilo]/archive/</span></li>
   <li class="li2"><span class="s1">[chamilo]/archive/</span></li>
   <li class="li2"><span class="s1">[chamilo]/courses/</span></li>
   <li class="li2"><span class="s1">[chamilo]/courses/</span></li>
   <li class="li2"><span class="s1">[chamilo]/home/</span></li>
   <li class="li2"><span class="s1">[chamilo]/home/</span></li>
+  <li class="li2"><span class="s1">[chamilo]/data/</span></li>
 </ul>
 </ul>
 <p class="p3"><span class="s1"></span><br></p>
 <p class="p3"><span class="s1"></span><br></p>
 <p class="p2"><span class="s1">Opzionalmente puoi fare lo stesso alle seguenti cartelle se vuoi consentire il caricamento dei pacchetti di stile CSS (CSS styles package) e la definizione di sotto-linguaggi (sub-language definition):</span></p>
 <p class="p2"><span class="s1">Opzionalmente puoi fare lo stesso alle seguenti cartelle se vuoi consentire il caricamento dei pacchetti di stile CSS (CSS styles package) e la definizione di sotto-linguaggi (sub-language definition):</span></p>

+ 2 - 2
main/admin/session_edit.php

@@ -92,13 +92,13 @@ foreach ($coaches as $coach) {
     $coachesOption[$coach['user_id']] = "$personName ({$coach['username']})";
     $coachesOption[$coach['user_id']] = "$personName ({$coach['username']})";
 }
 }
 
 
-$Categories = SessionManager::get_all_session_category();
+$categoriesList = SessionManager::get_all_session_category();
 
 
 $categoriesOption = array(
 $categoriesOption = array(
     '0' => get_lang('None')
     '0' => get_lang('None')
 );
 );
 
 
-if ($Categories != false) {
+if ($categoriesList != false) {
     foreach ($categoriesList as $categoryItem) {
     foreach ($categoriesList as $categoryItem) {
         $categoriesOption[$categoryItem['id']] = $categoryItem['name'];
         $categoriesOption[$categoryItem['id']] = $categoryItem['name'];
     }
     }

+ 12 - 0
main/install/install.lib.php

@@ -1416,6 +1416,18 @@ function display_requirements($installType, $badUpdatePath, $updatePath = '', $u
             @chmod($checked_writable, $perm);
             @chmod($checked_writable, $perm);
         }
         }
 
 
+        $checkedWritable = api_get_path(SYS_CODE_PATH).'upload/sessions/';
+        if (!is_writable($checkedWritable)) {
+            $notwritable[] = $checkedWritable;
+            @chmod($checkedWritable, $perm);
+        }
+
+        $checkedWritable = api_get_path(SYS_CODE_PATH).'upload/courses/';
+        if (!is_writable($checkedWritable)) {
+            $notwritable[] = $checkedWritable;
+            @chmod($checkedWritable, $perm);
+        }
+
         $checked_writable = api_get_path(SYS_CODE_PATH).'default_course_document/images/';
         $checked_writable = api_get_path(SYS_CODE_PATH).'default_course_document/images/';
         if (!is_writable($checked_writable)) {
         if (!is_writable($checked_writable)) {
             $notwritable[] = $checked_writable;
             $notwritable[] = $checked_writable;