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/themes/chamilo/default.css

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

app/config/course_info.conf.dist.php

@@ -37,7 +37,7 @@ $showCreationDate 					= true;
 $showLastEdit = true;
 $showLastVisit = true;
 $canReportExpirationDate = true; // Needs to be true
-											// if ScriptToReportExpirationDate
-											// is not automaticly called
+// if ScriptToReportExpirationDate
+// is not automaticly called
 //$linkToChangeDiskQuota			= 'changeQuota.php';
 $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