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

Conflicts:
	main/inc/lib/database.constants.inc.php

.gitignore

@@ -1,39 +1,27 @@
-# Chamilo configuration
-main/inc/conf
+# Cache directories
+app/cache/*
+!app/cache/.htaccess
 
-# Temp directories
-archive/*
-!archive/.htaccess
+# Chamilo configuration
+app/config/
 
 # Courses
-
-courses/*
-!courses/index.html
+app/courses/*
 
 # Home
-home/*
+app/home/*
 
-# User images
-main/upload/users/*
-!main/upload/users/index.html
+app/logs/*
+app/Resources/translations/*
+app/Resources/views/*
 
-# Session images
-main/upload/sessions/*
-!main/upload/sessions/index.html
-
-# Course images
-main/upload/courses/*
-!main/upload/courses/index.html
+# Upload content
+app/upload/*
 
 # Logs and databases #
 *.log
 
-# Xapian indexes directory
-searchdb/*
-!searchdb/index.html
-
 # IDE settings
-
 .idea
 .idea/*
 .idea/dictionaries/*
@@ -53,8 +41,3 @@ composer.lock
 vendor
 web/assets/*
 
-# Data directory (new directory for archive/)
-data/*
-!data/index.html
-data/badges/*
-!data/badges/index.html

.htaccess

@@ -0,0 +1,34 @@
+# Check that your Apache virtualhost have this settings:
+
+#<Directory "/var/www/chamilo-classic">
+#  AllowOverride All
+#  Order allow,deny
+#  Allow from all
+#</Directory>
+
+RewriteEngine on
+RewriteCond %{QUERY_STRING} ^id=(.*)$
+
+# http://my.chamilo.net/certificates/?id=123 to http://my.chamilo.net/certificates/index.php?id=123
+RewriteRule ^certificates/$ certificates/index.php?id=%1 [L]
+
+# http://my.chamilo.net/jdoe to http://my.chamilo.net/user.php?jdoe
+RewriteRule ^([^/.]+)/?$ user.php?$1 [L]
+
+# Course redirection
+RewriteCond %{QUERY_STRING} ^id_session=(.*)$
+RewriteRule ^courses/([^/]+)/index.php$ main/course_home/course_home.php?cidReq=$1&id_session=%1 [L]
+RewriteRule ^courses/([^/]+)/$ main/course_home/course_home.php?cidReq=$1&id_session=%1 [L]
+RewriteRule ^courses/([^/]+)/index.php$ main/course_home/course_home.php?cidReq=$1 [L]
+
+# Rewrite everything in the scorm folder of a course to the download script
+RewriteRule ^courses/([^/]+)/scorm/(.*)$ main/document/download_scorm.php?doc_url=/$2&cDir=$1 [QSA,L]
+
+# Rewrite everything in the document folder of a course to the download script
+RewriteRule ^courses/([^/]+)/document/(.*)$ main/document/download.php?doc_url=/$2&cDir=$1 [QSA,L]
+
+# Rewrite everything in the work folder
+RewriteRule ^courses/([^/]+)/work/(.*)$ main/work/download.php?file=work/$2&cDir=$1 [QSA,L]
+
+# Course upload files
+RewriteRule ^courses/([^/]+)/upload/(.*)$ app/courses/$1/upload/$2 [QSA,L]

.scrutinizer.yml

@@ -18,8 +18,8 @@ filter:
         - tests/*
         - main/img/*
         - main/lang/*
-        - archive/*
-        - data/*
+        - app/cache/*
+        - app/logs/*
         - web/*
 checks:
     php:

.travis.yml

@@ -40,7 +40,7 @@ before_script:
   - cp chamilo-cli-install/chamilo-cli-installer.php main/install/
   - mysql -u root -e 'create database chamilo'
   # install Chamilo with Chash - see reference https://github.com/sonnym/travis-ci-drupal-module-example/blob/master/.travis.yml
-  - sudo chmod -R 0777 archive courses home main/upload/ main/default_course_document/images main/inc/conf searchdb main/lang main/css
+  - sudo chmod -R 0777 app/config app main/default_course_document/images main/lang
   - cd main/install/
   - sudo php5 chamilo-cli-installer.php -l admin -p admin -U travis -u 'http://localhost/' -X travis -L english -z 'admin@example.com' -f 'John' -g 'Doe' -b '555-5555' -c 'Test campus' -y 'Chamilo' -x 'https://chamilo.org'
   - cd ../..

README.md

@@ -59,7 +59,7 @@ composer update
 
 On a Debian-based system, launch:
 ```
-sudo chown -R www-data:www-data archive course data home searchdb main/upload/users main/upload/sessions main/upload/courses main/default_course_document/images main/lang main/css main/inc/conf
+sudo chown -R www-data:www-data app main/default_course_document/images main/lang  
 ```
 
 ### Start the installer

app/AppKernel.php

@@ -0,0 +1,66 @@
+<?php
+/* For licensing terms, see /license.txt */
+
+/**
+ * Class AppKernel
+ */
+class AppKernel
+{
+    protected $rootDir;
+
+    /**
+     * @return string
+     */
+    public function getRootDir()
+    {
+        if (null === $this->rootDir) {
+            $r = new \ReflectionObject($this);
+            $this->rootDir = str_replace('\\', '/', dirname($r->getFileName()));
+        }
+
+        return $this->rootDir;
+    }
+
+    /**
+     * Returns the real root path
+     * @return string
+     */
+    public function getRealRootDir()
+    {
+        return realpath($this->getRootDir().'/../').'/';
+    }
+
+    /**
+     * Returns the data path
+     * @return string
+     */
+    public function getDataDir()
+    {
+        return $this->getRealRootDir().'data/';
+    }
+
+    /**
+     * @return string
+     */
+    public function getAppDir()
+    {
+        return $this->getRealRootDir().'app/';
+    }
+
+    /**
+     * @return string
+     */
+    public function getConfigDir()
+    {
+        return $this->getRealRootDir().'app/config/';
+    }
+
+    /**
+     * @return string
+     */
+    public function getConfigurationFile()
+    {
+        return $this->getRealRootDir().'app/config/configuration.php';
+    }
+}
+

app/Resources/public/css/csshover3.htc

@@ -1,14 +1,14 @@
-<public:attach event="ondocumentready" onevent="CSSHover()" />
-<script>
-/**
- *	Whatever:hover - V3.00.081222
- *	--------------------------------------------------------
- *	Author  - Peter Nederlof, http://www.xs4all.nl/~peterned
- *	License - http://creativecommons.org/licenses/LGPL/2.1
- *	Packed  - http://dean.edwards.name/packer
- *
- *	howto: body { behavior:url("csshover3.htc"); }
- */
-eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('r.R=(8(){4 f=/(^|\\s)((([^a]([^ ]+)?)|(a([^#.][^ ]+)+)):(C|D|E))/i,S=/(.*?)\\:(C|D|E)/i,T=/[^:]+:([a-z-]+).*/i,U=/(\\.([a-V-W-]+):[a-z]+)|(:[a-z]+)/1c,X=/\\.([a-V-W-]*Y(C|D|E))/i,Z=/1d (5|6|7)/i,10=/1e/i;4 g=\'1f-\';4 h={p:[],t:{},11:8(){n(!Z.F(1g.1h)&&!10.F(r.12.1i))u;4 a=r.12.1j,l=a.v;w(4 i=0;i<l;i++){3.G(a[i])}},G:8(a){n(a.H){I{4 b=a.H,l=b.v;w(4 i=0;i<l;i++){3.G(a.H[i])}}J(13){}}I{4 c=a.1k,l=c.v;w(4 j=0;j<l;j++){3.14(c[j],a)}}J(13){}},14:8(a,b){4 c=a.1l;n(f.F(c)){4 d=a.K.1m,L=S.15(c)[1],M=c.N(T,\'Y$1\'),O=c.N(U,\'.$2\'+M),o=X.15(O)[1];4 e=L+o;n(!3.t[e]){b.16(L,g+o+\':1n(R(3, "\'+M+\'", "\'+o+\'"))\');3.t[e]=17}b.16(O,d)}},18:8(a,b,c){4 d=g+c;n(a.K[d]){a.K[d]=q}n(!a.x)a.x=[];n(!a.x[c]){a.x[c]=17;4 e=19 P(a,b,c);3.p.1o(e)}u b},y:8(){I{4 l=3.p.v;w(4 i=0;i<l;i++){3.p[i].y()}3.p=[];3.t={}}J(e){}}};r.Q(\'1p\',8(){h.y()});4 k={1q:{9:\'1r\',m:\'1s\'},1t:{9:\'1u\',m:\'1v\'},1a:{9:\'1a\',m:\'1w\'}};8 P(a,b,c){3.A=a;3.B=b;4 d=19 1x(\'(^|\\\\s)\'+c+\'(\\\\s|$)\',\'g\');3.9=8(){a.o+=\' \'+c};3.m=8(){a.o=a.o.N(d,\' \')};a.Q(k[b].9,3.9);a.Q(k[b].m,3.m)}P.1y={y:8(){3.A.1b(k[3.B].9,3.9);3.A.1b(k[3.B].m,3.m);3.9=q;3.m=q;3.A=q;3.B=q}};u 8(a,b,c){n(a){u h.18(a,b,c)}1z{h.11()}}})();',62,98,'|||this|var||||function|activator|||||||||||||deactivator|if|className|elements|null|window||callbacks|return|length|for|csshover|unload||node|type|hover|active|focus|test|parseStylesheet|imports|try|catch|style|affected|pseudo|replace|newSelect|CSSHoverElement|attachEvent|CSSHover|REG_AFFECTED|REG_PSEUDO|REG_SELECT|z0|9_|REG_CLASS|on|REG_MSIE|REG_COMPAT|init|document|securityException|parseCSSRule|exec|addRule|true|patch|new|onfocus|detachEvent|gi|msie|backcompat|csh|navigator|userAgent|compatMode|styleSheets|rules|selectorText|cssText|expression|push|onbeforeunload|onhover|onmouseenter|onmouseleave|onactive|onmousedown|onmouseup|onblur|RegExp|prototype|else'.split('|'),0,{}));
-
+<public:attach event="ondocumentready" onevent="CSSHover()" />
+<script>
+/**
+ *	Whatever:hover - V3.00.081222
+ *	--------------------------------------------------------
+ *	Author  - Peter Nederlof, http://www.xs4all.nl/~peterned
+ *	License - http://creativecommons.org/licenses/LGPL/2.1
+ *	Packed  - http://dean.edwards.name/packer
+ *
+ *	howto: body { behavior:url("csshover3.htc"); }
+ */
+eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('r.R=(8(){4 f=/(^|\\s)((([^a]([^ ]+)?)|(a([^#.][^ ]+)+)):(C|D|E))/i,S=/(.*?)\\:(C|D|E)/i,T=/[^:]+:([a-z-]+).*/i,U=/(\\.([a-V-W-]+):[a-z]+)|(:[a-z]+)/1c,X=/\\.([a-V-W-]*Y(C|D|E))/i,Z=/1d (5|6|7)/i,10=/1e/i;4 g=\'1f-\';4 h={p:[],t:{},11:8(){n(!Z.F(1g.1h)&&!10.F(r.12.1i))u;4 a=r.12.1j,l=a.v;w(4 i=0;i<l;i++){3.G(a[i])}},G:8(a){n(a.H){I{4 b=a.H,l=b.v;w(4 i=0;i<l;i++){3.G(a.H[i])}}J(13){}}I{4 c=a.1k,l=c.v;w(4 j=0;j<l;j++){3.14(c[j],a)}}J(13){}},14:8(a,b){4 c=a.1l;n(f.F(c)){4 d=a.K.1m,L=S.15(c)[1],M=c.N(T,\'Y$1\'),O=c.N(U,\'.$2\'+M),o=X.15(O)[1];4 e=L+o;n(!3.t[e]){b.16(L,g+o+\':1n(R(3, "\'+M+\'", "\'+o+\'"))\');3.t[e]=17}b.16(O,d)}},18:8(a,b,c){4 d=g+c;n(a.K[d]){a.K[d]=q}n(!a.x)a.x=[];n(!a.x[c]){a.x[c]=17;4 e=19 P(a,b,c);3.p.1o(e)}u b},y:8(){I{4 l=3.p.v;w(4 i=0;i<l;i++){3.p[i].y()}3.p=[];3.t={}}J(e){}}};r.Q(\'1p\',8(){h.y()});4 k={1q:{9:\'1r\',m:\'1s\'},1t:{9:\'1u\',m:\'1v\'},1a:{9:\'1a\',m:\'1w\'}};8 P(a,b,c){3.A=a;3.B=b;4 d=19 1x(\'(^|\\\\s)\'+c+\'(\\\\s|$)\',\'g\');3.9=8(){a.o+=\' \'+c};3.m=8(){a.o=a.o.N(d,\' \')};a.Q(k[b].9,3.9);a.Q(k[b].m,3.m)}P.1y={y:8(){3.A.1b(k[3.B].9,3.9);3.A.1b(k[3.B].m,3.m);3.9=q;3.m=q;3.A=q;3.B=q}};u 8(a,b,c){n(a){u h.18(a,b,c)}1z{h.11()}}})();',62,98,'|||this|var||||function|activator|||||||||||||deactivator|if|className|elements|null|window||callbacks|return|length|for|csshover|unload||node|type|hover|active|focus|test|parseStylesheet|imports|try|catch|style|affected|pseudo|replace|newSelect|CSSHoverElement|attachEvent|CSSHover|REG_AFFECTED|REG_PSEUDO|REG_SELECT|z0|9_|REG_CLASS|on|REG_MSIE|REG_COMPAT|init|document|securityException|parseCSSRule|exec|addRule|true|patch|new|onfocus|detachEvent|gi|msie|backcompat|csh|navigator|userAgent|compatMode|styleSheets|rules|selectorText|cssText|expression|push|onbeforeunload|onhover|onmouseenter|onmouseleave|onactive|onmousedown|onmouseup|onblur|RegExp|prototype|else'.split('|'),0,{}));
+
 </script>

app/Resources/public/css/default_scorm.css

@@ -1,164 +1,164 @@
-/*
-File used to display Learning Path item in student view
-If scorm.css file exists in theme folder, scorm.css file is used instead of this one
-See https://support.chamilo.org/issues/6976
-*/
-
-.inner_lp_toc {
-    overflow: auto;
-    background-color: white;
-    height: 210px;
-}
-
-.inner_lp_toc .scorm_item a {
-    font-weight: bold;
-    font-size: 14px;
-    margin-right: 1px;
-    padding-bottom: 2px;
-    text-decoration: none;
-    color: #2F3E46;
-}
-
-.inner_lp_toc .scorm_item a.chapter_module {
-    font-weight: normal;
-    margin-right: 10px;
-}
-.inner_lp_toc .scorm_item_highlight {
-    border: 1px solid #999;
-    background:#999;
-    font-weight:bold;
-    text-shadow:0 -1px 1px #666;
-    background-image:-webkit-gradient(linear,left top,left bottom,from(#666),to(#999));
-    background-image:-webkit-linear-gradient(top,#666,#999);
-    background-image:-moz-linear-gradient(top,#666,#999);
-    background-image:-ms-linear-gradient(top,#666,#999);
-    background-image:-o-linear-gradient(top,#666,#999);
-    background-image:linear-gradient(top,#666,#999);
-    margin-right: 0px;
-    padding: 10px 0px 10px 0px;
-    text-decoration: none;
-}
-
-.inner_lp_toc .scorm_item_highlight a {
-    color:#fff;
-    margin-right: 1px;
-    text-decoration: none;
-    font-weight: bold;
-}
-
-.inner_lp_toc .scorm_item_section {
-    border:1px solid #222;
-    background:#333;
-    font-weight:bold;
-    color:#fff;
-    text-shadow:0 -1px 1px #000;
-    background-image:-webkit-gradient(linear,left top,left bottom,from(#555),to(#333));
-    background-image:-webkit-linear-gradient(top,#555,#333);
-    background-image:-moz-linear-gradient(top,#555,#333);
-    background-image:-ms-linear-gradient(top,#555,#333);
-    background-image:-o-linear-gradient(top,#555,#333);
-    background-image:linear-gradient(top,#555,#333);
-    margin-right: 1px;
-    padding: 10px 0px 10px 0px;
-    text-decoration: none;
-}
-
-.inner_lp_toc .scorm_item {
-    font-size: 16px;
-    margin-left: 10px;
-    margin-right:10px;
-    text-decoration: none;
-    border-color: rgba(255, 255, 255, 0.3);
-}
-
-.inner_lp_toc .scorm_item_1 {
-    border-bottom: 1px solid #CCCCCC;
-    background:#eee;
-    font-weight:bold;
-    color:#444;
-    text-shadow:0 1px 1px #f6f6f6;
-    background-image:-webkit-gradient(linear,left top,left bottom,from(#fdfdfd),to(#eee));
-    background-image:-webkit-linear-gradient(top,#fdfdfd,#eee);
-    background-image:-moz-linear-gradient(top,#fdfdfd,#eee);
-    background-image:-ms-linear-gradient(top,#fdfdfd,#eee);
-    background-image:-o-linear-gradient(top,#fdfdfd,#eee);
-    background-image:linear-gradient(top,#fdfdfd,#eee);
-    margin-right: 1px;
-    padding: 10px 0px 10px 0px;
-    text-decoration: none;
-    font-weight: normal;
-     background:#FDFDFD;
-}
-
-.inner_lp_toc .scorm_item_2 {
-    background-image:-webkit-gradient(linear,left top,left bottom,from(#fdfdfd),to(#eee));
-    background-image:-webkit-linear-gradient(top,#fdfdfd,#eee);
-    background-image:-moz-linear-gradient(top,#fdfdfd,#eee);
-    background-image:-ms-linear-gradient(top,#fdfdfd,#eee);
-    background-image:-o-linear-gradient(top,#fdfdfd,#eee);
-    background-image:linear-gradient(top,#fdfdfd,#eee);
-    border-bottom: 1px solid #CCCCCC;
-    color: #444444;
-    font-weight: bold;
-    text-shadow: 0 1px 1px #F6F6F6;
-    margin-right: 1px;
-    padding: 10px 0px 10px 0px;
-    text-decoration: none;
-    font-weight: normal;
-}
-
-.inner_lp_toc .scorm_item_section .scorm_item:before {
-    content : url('../../img/lp_section.png');  /* path from main/newscorm/lp_controller.php file */
-    vertical-align: text-top;
-    margin-right : 5px;
-}
-
-/* learning path's classes for section and item for 5 levels of depth */
-
-.scorm_section_level_0 {
-    padding : 0 0 0 0;
-}
-
-.scorm_section_level_1 {
-    padding : 0 0.5em 0 2em;
-}
-
-.scorm_section_level_2 {
-    padding : 0 0.5em 0 4em;
-}
-
-.scorm_section_level_3 {
-    padding : 0 0.5em 0 6em;
-}
-
-.scorm_section_level_4 {
-    padding : 0 0.5em 0 8em;
-}
-
-.scorm_section_level_5 {
-    padding : 0 0.5em 0 10em;
-}
-
-.scorm_item_level_0 {
-    padding : 0 0 0 0;
-}
-
-.scorm_item_level_1 {
-    padding : 0 0.5em 0 1.5em;
-}
-
-.scorm_item_level_2 {
-    padding : 0 0.5em 0 3em;
-}
-
-.scorm_item_level_3 {
-    padding : 0 0.5em 0 4.5em;
-}
-
-.scorm_item_level_4 {
-    padding : 0 0.5em 0 6em;
-}
-
-.scorm_item_level_5 {
-    padding : 0 0.5em 0 7.5em;
-}
+/*
+File used to display Learning Path item in student view
+If scorm.css file exists in theme folder, scorm.css file is used instead of this one
+See https://support.chamilo.org/issues/6976
+*/
+
+.inner_lp_toc {
+    overflow: auto;
+    background-color: white;
+    height: 210px;
+}
+
+.inner_lp_toc .scorm_item a {
+    font-weight: bold;
+    font-size: 14px;
+    margin-right: 1px;
+    padding-bottom: 2px;
+    text-decoration: none;
+    color: #2F3E46;
+}
+
+.inner_lp_toc .scorm_item a.chapter_module {
+    font-weight: normal;
+    margin-right: 10px;
+}
+.inner_lp_toc .scorm_item_highlight {
+    border: 1px solid #999;
+    background:#999;
+    font-weight:bold;
+    text-shadow:0 -1px 1px #666;
+    background-image:-webkit-gradient(linear,left top,left bottom,from(#666),to(#999));
+    background-image:-webkit-linear-gradient(top,#666,#999);
+    background-image:-moz-linear-gradient(top,#666,#999);
+    background-image:-ms-linear-gradient(top,#666,#999);
+    background-image:-o-linear-gradient(top,#666,#999);
+    background-image:linear-gradient(top,#666,#999);
+    margin-right: 0px;
+    padding: 10px 0px 10px 0px;
+    text-decoration: none;
+}
+
+.inner_lp_toc .scorm_item_highlight a {
+    color:#fff;
+    margin-right: 1px;
+    text-decoration: none;
+    font-weight: bold;
+}
+
+.inner_lp_toc .scorm_item_section {
+    border:1px solid #222;
+    background:#333;
+    font-weight:bold;
+    color:#fff;
+    text-shadow:0 -1px 1px #000;
+    background-image:-webkit-gradient(linear,left top,left bottom,from(#555),to(#333));
+    background-image:-webkit-linear-gradient(top,#555,#333);
+    background-image:-moz-linear-gradient(top,#555,#333);
+    background-image:-ms-linear-gradient(top,#555,#333);
+    background-image:-o-linear-gradient(top,#555,#333);
+    background-image:linear-gradient(top,#555,#333);
+    margin-right: 1px;
+    padding: 10px 0px 10px 0px;
+    text-decoration: none;
+}
+
+.inner_lp_toc .scorm_item {
+    font-size: 16px;
+    margin-left: 10px;
+    margin-right:10px;
+    text-decoration: none;
+    border-color: rgba(255, 255, 255, 0.3);
+}
+
+.inner_lp_toc .scorm_item_1 {
+    border-bottom: 1px solid #CCCCCC;
+    background:#eee;
+    font-weight:bold;
+    color:#444;
+    text-shadow:0 1px 1px #f6f6f6;
+    background-image:-webkit-gradient(linear,left top,left bottom,from(#fdfdfd),to(#eee));
+    background-image:-webkit-linear-gradient(top,#fdfdfd,#eee);
+    background-image:-moz-linear-gradient(top,#fdfdfd,#eee);
+    background-image:-ms-linear-gradient(top,#fdfdfd,#eee);
+    background-image:-o-linear-gradient(top,#fdfdfd,#eee);
+    background-image:linear-gradient(top,#fdfdfd,#eee);
+    margin-right: 1px;
+    padding: 10px 0px 10px 0px;
+    text-decoration: none;
+    font-weight: normal;
+     background:#FDFDFD;
+}
+
+.inner_lp_toc .scorm_item_2 {
+    background-image:-webkit-gradient(linear,left top,left bottom,from(#fdfdfd),to(#eee));
+    background-image:-webkit-linear-gradient(top,#fdfdfd,#eee);
+    background-image:-moz-linear-gradient(top,#fdfdfd,#eee);
+    background-image:-ms-linear-gradient(top,#fdfdfd,#eee);
+    background-image:-o-linear-gradient(top,#fdfdfd,#eee);
+    background-image:linear-gradient(top,#fdfdfd,#eee);
+    border-bottom: 1px solid #CCCCCC;
+    color: #444444;
+    font-weight: bold;
+    text-shadow: 0 1px 1px #F6F6F6;
+    margin-right: 1px;
+    padding: 10px 0px 10px 0px;
+    text-decoration: none;
+    font-weight: normal;
+}
+
+.inner_lp_toc .scorm_item_section .scorm_item:before {
+    content : url('../../img/lp_section.png');  /* path from main/newscorm/lp_controller.php file */
+    vertical-align: text-top;
+    margin-right : 5px;
+}
+
+/* learning path's classes for section and item for 5 levels of depth */
+
+.scorm_section_level_0 {
+    padding : 0 0 0 0;
+}
+
+.scorm_section_level_1 {
+    padding : 0 0.5em 0 2em;
+}
+
+.scorm_section_level_2 {
+    padding : 0 0.5em 0 4em;
+}
+
+.scorm_section_level_3 {
+    padding : 0 0.5em 0 6em;
+}
+
+.scorm_section_level_4 {
+    padding : 0 0.5em 0 8em;
+}
+
+.scorm_section_level_5 {
+    padding : 0 0.5em 0 10em;
+}
+
+.scorm_item_level_0 {
+    padding : 0 0 0 0;
+}
+
+.scorm_item_level_1 {
+    padding : 0 0.5em 0 1.5em;
+}
+
+.scorm_item_level_2 {
+    padding : 0 0.5em 0 3em;
+}
+
+.scorm_item_level_3 {
+    padding : 0 0.5em 0 4.5em;
+}
+
+.scorm_item_level_4 {
+    padding : 0 0.5em 0 6em;
+}
+
+.scorm_item_level_5 {
+    padding : 0 0.5em 0 7.5em;
+}

app/Resources/public/css/themes/chamilo/default.css

@@ -215,3 +215,7 @@ footer{
 footer a{
   color: #ffffff;
 }
+
+.navbar-default .navbar-brand {
+  color:white;
+}

app/Resources/public/css/themes/chamilo/scormfs.css

@@ -1,82 +1,82 @@
-.scormpage {
-}
-.scormpage .menu {
-	width: 180px;
-	padding: 0px;
-	font-size: small;
-	position: absolute;
-	background-color: white;
-}
-.scormpage .menu .lp_nav {
-	height: 50px;
-	width: 160px;
-	padding-top: 4px;
-	padding-bottom:0px;
-	/*	
-	margin-left: 10px;
-	margin-right: 10px;
-*/
-	margin-top: 0px;
-}
-.lp_navigation_elem {
-	padding-left: 15px;
-	padding-top: 0px;
-}
-/*.scormpage .menu */
-.lp_navigation_elem .progresstext {
-	font-size: smaller;
-}
-/*.scormpage .menu */
-.lp_navigation_elem .buttons {
-	margin-left: 5px;
-	margin-right: 0em;
-	margin-top: 0.4em;
-}
-#msg_div_id {
-	padding-left: 10px;
-	padding-top: 4px;
-}
-.scormpage .menu .notification {
-	height: 50px;
-	margin-left: 15px;
-	margin-right: 15px;
-}
-.scormpage .menu .notification .message {
-	height: 50px;
-	width: 140px;
-	border: none;
-}
-.scormpage .menu .notification .lp_log {
-	height: 100px;
-	width: 180px;
-	border: none;
-	overflow: auto;
-}
-.scormpage .content .iframe {
-	/*
-	border: none;
-	height: 700px;
-	margin: 0px;
-	padding-right: 0px;
-	margin-right: 0%;
-	margin-left: 0%;
-	*/
-	/* trying the absolute mode */
-	position: fixed;
-	bottom:0;
-	left:0;
-	width: 100%;
-	height: 100%;
-}
-.scormpage .footer {
-	clear: both;
-}
-#image_preview {
-	padding-left: 17px;
-}
-#author_name {
-	padding-left: 5px;
-	padding-top: 5px;
-	font-size: 11px;
-	color:#888;
-}
+.scormpage {
+}
+.scormpage .menu {
+	width: 180px;
+	padding: 0px;
+	font-size: small;
+	position: absolute;
+	background-color: white;
+}
+.scormpage .menu .lp_nav {
+	height: 50px;
+	width: 160px;
+	padding-top: 4px;
+	padding-bottom:0px;
+	/*	
+	margin-left: 10px;
+	margin-right: 10px;
+*/
+	margin-top: 0px;
+}
+.lp_navigation_elem {
+	padding-left: 15px;
+	padding-top: 0px;
+}
+/*.scormpage .menu */
+.lp_navigation_elem .progresstext {
+	font-size: smaller;
+}
+/*.scormpage .menu */
+.lp_navigation_elem .buttons {
+	margin-left: 5px;
+	margin-right: 0em;
+	margin-top: 0.4em;
+}
+#msg_div_id {
+	padding-left: 10px;
+	padding-top: 4px;
+}
+.scormpage .menu .notification {
+	height: 50px;
+	margin-left: 15px;
+	margin-right: 15px;
+}
+.scormpage .menu .notification .message {
+	height: 50px;
+	width: 140px;
+	border: none;
+}
+.scormpage .menu .notification .lp_log {
+	height: 100px;
+	width: 180px;
+	border: none;
+	overflow: auto;
+}
+.scormpage .content .iframe {
+	/*
+	border: none;
+	height: 700px;
+	margin: 0px;
+	padding-right: 0px;
+	margin-right: 0%;
+	margin-left: 0%;
+	*/
+	/* trying the absolute mode */
+	position: fixed;
+	bottom:0;
+	left:0;
+	width: 100%;
+	height: 100%;
+}
+.scormpage .footer {
+	clear: both;
+}
+#image_preview {
+	padding-left: 17px;
+}
+#author_name {
+	padding-left: 5px;
+	padding-top: 5px;
+	font-size: 11px;
+	color:#888;
+}

app/config/add_course.conf.dist.php

@@ -7,6 +7,6 @@
  *	@package chamilo.configuration
  */
 
-$firstExpirationDelay			= 31536000; // <- 86400*365    // 60*60*24 = 1 jour = 86400
-$prefixAntiNumber				= 'z';
-$DEBUG							= false;
+$firstExpirationDelay = 31536000; // <- 86400*365    // 60*60*24 = 1 jour = 86400
+$prefixAntiNumber = 'z';
+$DEBUG = false;

app/config/course_info.conf.dist.php

@@ -29,15 +29,15 @@ $canBeEmpty['department_name']		= true;
 $canBeEmpty['department_url']		= true;
 */
 
-$showDiskQuota						= true;
+$showDiskQuota = true;
 //$showDiskUse						= true;
 //$showLinkToChangeDiskQuota		= true;
-$showExpirationDate 				= true;
-$showCreationDate 					= true;
-$showLastEdit 						= true;
-$showLastVisit 						= true;
-$canReportExpirationDate			= true; // Needs to be true
-											// if ScriptToReportExpirationDate
-											// is not automaticly called
+$showExpirationDate = true;
+$showCreationDate = true;
+$showLastEdit = true;
+$showLastVisit = true;
+$canReportExpirationDate = true; // Needs to be true
+// if ScriptToReportExpirationDate
+// is not automaticly called
 //$linkToChangeDiskQuota			= 'changeQuota.php';
-$urlScriptToReportExpirationDate	= 'postpone.php'; // external script to postpone the expiration of course.
+$urlScriptToReportExpirationDate = 'postpone.php'; // external script to postpone the expiration of course.

app/config/mail.conf.dist.php

@@ -0,0 +1,19 @@
+<?php
+
+/**
+ *	This file holds the configuration settings
+ *	for phpmailer Class.
+ *
+ *	@package chamilo.configuration
+ */
+
+$platform_email['SMTP_FROM_EMAIL'] = (isset($administrator['email']) ? $administrator['email'] : 'admin@example.com');
+$platform_email['SMTP_FROM_NAME'] = (isset($administrator['name']) ? $administrator['name'] : 'Admin');
+$platform_email['SMTP_HOST'] = 'localhost';
+$platform_email['SMTP_PORT'] = 25;
+$platform_email['SMTP_MAILER'] = IS_WINDOWS_OS ? 'smtp' : 'mail'; // mail, sendmail or smtp
+$platform_email['SMTP_AUTH'] = 0;
+$platform_email['SMTP_USER'] = '';
+$platform_email['SMTP_PASS'] = '';
+$platform_email['SMTP_CHARSET'] = 'UTF-8';
+$platform_email['SMTP_UNIQUE_SENDER'] = 0; // to send all mails from the same user