chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updating paths see #7522

Browse Source
1.10.x
Julio Montoya 11 years ago
parent 9c13c98876
commit f6096b1b2c
12 changed files with 96 additions and 107 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 10
      .gitignore
  2. 2
      README.md
  3. 22
      app/AppKernel.php
  4. 34
      documentation/installation_guide.html
  5. 33
      documentation/installation_guide_es_ES.html
  6. 33
      documentation/installation_guide_fr_FR.html
  7. 37
      documentation/installation_guide_it_IT.html
  8. 2
      documentation/optimization.html
  9. 5
      src/Chamilo/CoreBundle/Component/Editor/Driver/PersonalDriver.php
  10. 2
      tests/build.phing.xml
  11. 2
      tests/build.xml
  12. 21
      tests/wipe-out.php

10
.gitignore vendored
Unescape View File

@ -19,16 +19,16 @@ courses/*
home/*
# User images
main/upload/users/*
!main/upload/users/index.html
app/upload/users/*
!app/upload/users/index.html
# Session images
main/upload/sessions/*
app/upload/sessions/*
!main/upload/sessions/index.html
# Course images
main/upload/courses/*
!main/upload/courses/index.html
app/upload/courses/*
!app/upload/courses/index.html
# Logs and databases #
*.log

2
README.md
Unescape View File

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

22
app/AppKernel.php
Unescape View File

@ -21,28 +21,6 @@ class AppKernel
return $this->rootDir;
}
/*public function getCacheDir()
{
return dirname(dirname(__DIR__)).'/cache/'.$this->environment;
}
public function getLogDir()
{
return dirname(dirname(__DIR__)).'/log/';
}*/
/*public function getLogDir()
{
return $this->rootDir.'/../logs/'.$this->environment.'/logs/';
}
public function getCacheDir()
{
return $this->rootDir.'/../data/temp/'.$this->environment.'/cache/';
}*/
// Custom paths
/**
* Returns the real root path
* @return string

34
documentation/installation_guide.html
Unescape View File

@ -146,15 +146,15 @@ change to your configuration file</a>.</span>
The following directories need to be readable, writeable and executable by your web server.
<span class="muted">This usually requires no specific action on Windows servers, but will require a "chmod" under Linux and Mac. See instructions below.</span><br />Replace [chamilo] with the directory where your Chamilo installation is located):
<ul>
<li>[chamilo]/main/inc/conf/</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]/archive/</li>
<li>[chamilo]/courses/</li>
<li>[chamilo]/home/</li>
<li>[chamilo]/data/</li>
<li>[chamilo]/app/config/</li>
<li>[chamilo]/app/upload/users/</li>
<li>[chamilo]/app/upload/sessions/</li>
<li>[chamilo]/app/upload/courses/</li>
<li>[chamilo]/app/cache/</li>
<li>[chamilo]/app/courses/</li>
<li>[chamilo]/app/home/</li>
<li>[chamilo]/app/logs/</li>
<li>[chamilo]/main/default_course_document/images/</li>
</ul>
Optionally, you can do the same to the following directories if you want to
enable CSS styles package upload and sub-language definition:
@ -479,14 +479,16 @@ choose "Configure the homepage" in the Chamilo administration section.</p>
The following directories need to be readable, writeable and executable for the web server:
<ul>
<li>chamilo/main/inc/conf/</li>
<li>chamilo/main/upload/users/</li>
<li>chamilo/main/default_course_document/</li>
<li>chamilo/archive/</li>
<li>chamilo/courses/</li>
<li>chamilo/home/</li>
<li>[chamilo]/app/config/</li>
<li>[chamilo]/app/upload/users/</li>
<li>[chamilo]/app/upload/sessions/</li>
<li>[chamilo]/app/upload/courses/</li>
<li>[chamilo]/app/cache/</li>
<li>[chamilo]/app/courses/</li>
<li>[chamilo]/app/home/</li>
<li>[chamilo]/app/logs/</li>
<li>[chamilo]/main/default_course_document/images/</li>
</ul>
On Linux, Mac OS X and BSD operating systems you can quick-fix this using the
<em>chmod 0777</em> command, but if you are unsure, we recommend you seek advice for
your own OS on <a href="http://www.chamilo.org/forum">our forum</a>.

33
documentation/installation_guide_es_ES.html
Unescape View File

@ -131,15 +131,14 @@ Los siguientes directorios necesitan tener permisos de lectura, escritura y ejec
<p>
Remplace [chamilo] por el directorio en el cual está ubicado su Chamilo:
<ul>
<li>[chamilo]/main/inc/conf/</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]/archive/</li>
<li>[chamilo]/courses/</li>
<li>[chamilo]/home/</li>
<li>[chamilo]/data/</li>
<li>[chamilo]/app/config/</li>
<li>[chamilo]/app/upload/users/</li>
<li>[chamilo]/app/upload/sessions/</li>
<li>[chamilo]/app/upload/courses/</li>
<li>[chamilo]/main/default_course_document/images/</li>
<li>[chamilo]/app/cache/</li>
<li>[chamilo]/app/courses/</li>
<li>[chamilo]/app/home/</li>
</ul>
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:
@ -403,14 +402,16 @@ seleccione "Configurar la página de inicio" en la sección de administración d
Los siguientes directorios necesitan permisos de lectura, escritura y ejecución para el servidor web:
<ul>
<li>chamilo/main/inc/conf/</li>
<li>chamilo/main/upload/users/</li>
<li>chamilo/main/default_course_document/</li>
<li>chamilo/archive/</li>
<li>chamilo/courses/</li>
<li>chamilo/home/</li>
<li>[chamilo]/app/config/</li>
<li>[chamilo]/app/upload/users/</li>
<li>[chamilo]/app/upload/sessions/</li>
<li>[chamilo]/app/upload/courses/</li>
<li>[chamilo]/app/cache/</li>
<li>[chamilo]/app/courses/</li>
<li>[chamilo]/app/home/</li>
<li>[chamilo]/app/logs/</li>
<li>[chamilo]/main/default_course_document/images/</li>
</ul>
En Linux, Mac OS X y sistemas operativos BSD esto se puede arreglar rápidamente mediante el uso
del comando CHMOD 777, sin embargo si usted no está seguro, le recomandamos que busque
asistencia para su propio SO en <a href="http://www.chamilo.org/forum">nuestro foro</a>.

33
documentation/installation_guide_fr_FR.html
Unescape View File

@ -175,15 +175,14 @@ Les répertoires suivants doivent êtres lisibles, éditables et exécutables pa
<br /><br />
Remplacez [chamilo] par le répertoire où vous avez placé le contenu du zip:
<ul>
<li>[chamilo]/main/inc/conf/</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]/archive/</li>
<li>[chamilo]/courses/</li>
<li>[chamilo]/home/</li>
<li>[chamilo]/data/</li>
<li>[chamilo]/app/config/</li>
<li>[chamilo]/app/upload/users/</li>
<li>[chamilo]/app/upload/sessions/</li>
<li>[chamilo]/app/upload/courses/</li>
<li>[chamilo]/main/default_course_document/images/</li>
<li>[chamilo]/app/cache/</li>
<li>[chamilo]/app/courses/</li>
<li>[chamilo]/app/home/</li>
</ul>
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
@ -532,14 +531,16 @@ choose "Configure the homepage" in the Chamilo administration section.</p>
Les répertoires suivants doivent être accessibles en lecture, écriture et
exécution pour le serveur web:
<ul>
<li>chamilo/main/inc/conf/</li>
<li>chamilo/main/upload/users/</li>
<li>chamilo/main/default_course_document/</li>
<li>chamilo/archive/</li>
<li>chamilo/courses/</li>
<li>chamilo/home/</li>
<li>[chamilo]/app/config/</li>
<li>[chamilo]/app/upload/users/</li>
<li>[chamilo]/app/upload/sessions/</li>
<li>[chamilo]/app/upload/courses/</li>
<li>[chamilo]/app/cache/</li>
<li>[chamilo]/app/courses/</li>
<li>[chamilo]/app/home/</li>
<li>[chamilo]/app/logs/</li>
<li>[chamilo]/main/default_course_document/images/</li>
</ul>
On Linux, Mac OS X and BSD operating systems you can quick-fix this using the
<em>chmod 0777</em> command, but if you are unsure, we recommend you seek advice for
your own OS on <a href="http://www.chamilo.org/forum">our forum</a>.

37
documentation/installation_guide_it_IT.html
Unescape View File

@ -107,15 +107,15 @@
<p class="p9"><span class="s3">Sostituisci </span><span class="s1">[chamilo] con la cartella dove hai posizionato i file di installazione di chamilo:</span></p>
<p class="p3"><span class="s1"></span><br></p>
<ul>
<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">[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]/archive/</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]/data/</span></li>
<li>[chamilo]/app/config/</li>
<li>[chamilo]/app/upload/users/</li>
<li>[chamilo]/app/upload/sessions/</li>
<li>[chamilo]/app/upload/courses/</li>
<li>[chamilo]/app/cache/</li>
<li>[chamilo]/app/courses/</li>
<li>[chamilo]/app/home/</li>
<li>[chamilo]/app/logs/</li>
<li>[chamilo]/main/default_course_document/images/</li>
</ul>
<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>
@ -274,14 +274,17 @@
<p class="p2"><span class="s1"><b>3.5 In entrambi gli ultimi casi</b></span></p>
<p class="p2"><span class="s1">Le seguenti cartelle devono essere leggibili (readable), scrivibili (writeble) ed eseguibili (executable) dal webserver:</span></p>
<p class="p3"><span class="s1"></span><br></p>
<ul>
<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/default_course_document/</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/home/</span></li>
</ul>
<ul>
<li>[chamilo]/app/config/</li>
<li>[chamilo]/app/upload/users/</li>
<li>[chamilo]/app/upload/sessions/</li>
<li>[chamilo]/app/upload/courses/</li>
<li>[chamilo]/app/cache/</li>
<li>[chamilo]/app/courses/</li>
<li>[chamilo]/app/home/</li>
<li>[chamilo]/app/logs/</li>
<li>[chamilo]/main/default_course_document/images/</li>
</ul>
<p class="p3"><span class="s1"></span><br></p>
<p class="p2"><span class="s1">Sui sistemi operativi Linux, Mac OS X e BSD puoi facilmente settare queste impostazioni utilizzando il comando “chmod 0777”, ma se non ne sei sicuro, ti raccomandiamo di chiedere consiglio per il tuo sistema operativo sul nostro forum. In Windows devi controllare le proprietà di tutte le cartelle sopraindicate.</span></p>
<p class="p3"><span class="s1"></span><br></p>

2
documentation/optimization.html
Unescape View File

@ -306,7 +306,7 @@ One good reference: <a href="http://dev.mysql.com/doc/refman/5.1/en/multiple-key
php_admin_value session.save_path 1;/var/www/test.chamilo.org/sessions/
<hr />
<h2><a name="5.Users-upload-directories"></a>5. Users upload directories</h2>
Create 10 directories inside the main/upload/users directory (from 0 to 9) and update your admin settings. This has to be done at install &amp; configuration time, otherwise you might loose user data (or have to write a script for data distribution).
Create 10 directories inside the app/upload/users directory (from 0 to 9) and update your admin settings. This has to be done at install &amp; configuration time, otherwise you might loose user data (or have to write a script for data distribution).
<hr />
<h2><a name="6.Zlib-compression"></a>6. Zlib compressed output</h2>
Although this will not make your server faster, compressing the pages you are sending to the users will definitely make them feel like your website's responses are a lot faster, and thus increase their well-being when using Chamilo.<br /><br />

5
src/Chamilo/CoreBundle/Component/Editor/Driver/PersonalDriver.php
Unescape View File

@ -18,9 +18,8 @@ class PersonalDriver extends Driver implements DriverInterface
public function setup()
{
$userId = api_get_user_id();
$path = \UserManager::getUserPathById($userId);
if (!empty($path)) {
$dir = api_get_path(SYS_CODE_PATH) . $path;
$dir = \UserManager::getUserPathById($userId, 'system');
if (!empty($dir)) {
if (!is_dir($dir)) {
mkdir($dir);

2
tests/build.phing.xml
Unescape View File

@ -100,7 +100,7 @@
<target name="phpdoc" description="Generate API documentation">
<exec executable="phpdoc">
<arg line="-d ${basedir} -t ${basedir}/logs/docs -i ${basedir}/tests,${basedir}/main/inc/entity,${basedir}/main/inc/lib/symfony,${basedir}/main/inc/lib/phpdocx,${basedir}/main/inc/lib/phpqrcode,${basedir}/main/inc/lib/mpdf,${basedir}/main/inc/lib/internationalization_database/transliteration,${basedir}/main/inc/lib/phpmailer,${basedir}/main/inc/lib/htmlpurifier,${basedir}/main/inc/lib/formvalidator,${basedir}/main/upload/users,${basedir}/main/lang,${basedir}/courses,${basedir}/archive,.htaccess" />
<arg line="-d ${basedir} -t ${basedir}/logs/docs -i ${basedir}/tests,${basedir}/main/inc/entity,${basedir}/main/inc/lib/symfony,${basedir}/main/inc/lib/phpdocx,${basedir}/main/inc/lib/phpqrcode,${basedir}/main/inc/lib/mpdf,${basedir}/main/inc/lib/internationalization_database/transliteration,${basedir}/main/inc/lib/phpmailer,${basedir}/main/inc/lib/htmlpurifier,${basedir}/main/inc/lib/formvalidator,${basedir}/app/upload/users,${basedir}/main/lang,${basedir}/app/courses,${basedir}/app/cache,.htaccess" />
</exec>
</target>
<target name="phpcb" description="Aggregate tool output with PHP_CodeBrowser">

2
tests/build.xml
Unescape View File

@ -99,7 +99,7 @@
<target name="phpdoc" description="Generate API documentation">
<exec executable="phpdoc">
<arg line="-d ${basedir}/../ -t ${basedir}/logs/docs -ti ChamiloLMS -i archive/,home/,entity/,symfony/,phpdocx/,phpqrcode/,mpdf/,transliteration/*,phpmailer/*,htmlpurifier/,formvalidator/*,upload/users/,lang/,courses/,main/inc/lib/internationalization_database/,.htaccess -ct covers,assert" />
<arg line="-d ${basedir}/../ -t ${basedir}/logs/docs -ti ChamiloLMS -i archive/,home/,entity/,symfony/,phpdocx/,phpqrcode/,mpdf/,transliteration/*,phpmailer/*,htmlpurifier/,formvalidator/*,app/upload/users/,lang/,app/courses/,main/inc/lib/internationalization_database/,.htaccess -ct covers,assert" />
</exec>
</target>
<target name="phpcb" description="Aggregate tool output with PHP_CodeBrowser">

21
tests/wipe-out.php
Unescape View File

@ -5,7 +5,7 @@
* courses directories, configuration files and all other temp directories.
* It only works when launched from the command line and requires Chamilo to
* be installed (otherwise it will not find the references as to the paths and
* databases to delete). It only wipes out stuff and directories it knows are
* databases to delete). It only wipes out stuff and directories it knows are
* created by Chamilo though, so don't worry about your own files if you didn't
* store them in variable Chamilo directories.
* Requires Chamilo LMS 1.9 or greater
@ -32,7 +32,7 @@ if (!file_exists(dirname(__FILE__).'/../main/inc/global.inc.php')) {
}
if (!is_file(dirname(__FILE__).'/../main/inc/conf/configuration.php')) {
echo " This script will only work on an already installed version of Chamilo. The \n", "main/inc/conf/configuration.php file could not be found, which is understood\n", "as Chamilo not being installed.\n";
echo " This script will only work on an already installed version of Chamilo. The \n", "main/inc/conf/configuration.php file could not be found, which is understood\n", "as Chamilo not being installed.\n";
exit;
}
@ -51,10 +51,11 @@ $homepath = api_get_path(SYS_PATH).'home';
$clean_dirs = array(
api_get_path(SYS_COURSE_PATH), //courses
api_get_path(SYS_CODE_PATH).'inc/conf/',
api_get_path(SYS_CODE_PATH).'upload/users/',
api_get_path(SYS_APP_PATH).'config/',
api_get_path(SYS_APP_PATH).'upload/users/',
api_get_path(SYS_ARCHIVE_PATH)
);
// With all this, we will still be missing custom languages and CSS dirs
/**
* Running the cleanup
@ -65,15 +66,19 @@ foreach ($clean_dirs as $dir) {
$list = scandir($dir);
echo "Cleaning $dir\n";
foreach ($list as $entry) {
if (substr($entry,0,1) == '.' or strcmp($entry,'htaccess')===0 or strcmp($entry,'index.html')===0 or substr($entry,-9,9)=='.dist.php') {
if (substr($entry,0,1) == '.' or
strcmp($entry,'htaccess')===0 or
strcmp($entry,'index.html')===0 or
substr($entry,-9,9)=='.dist.php'
) {
//skip files that are part of the Chamilo installation
} else {
if ($dir == $homepath and
((is_dir($homepath.$entry) and $entry == 'default_platform_document')
if ($dir == $homepath and
((is_dir($homepath.$entry) and $entry == 'default_platform_document')
or (!is_dir($homepath.$entry) and substr($entry,-5)=='.html') and strlen($entry)<=17)
) {
//skip
} else {
} else {
if (is_dir($dir.$entry)) {
//echo "Removing ".$dir.$entry."\n";
rmdirr($dir.$entry);

Write Preview
Loading…
Cancel
Save