Sfoglia il codice sorgente

[svn r20526] Removed garbage directory from requisites for the Dokeos installation (the archive directory is just as good) (see FS#4191)

Yannick Warnier 16 anni fa
parent
commit
e6a914d3e1

+ 0 - 8
documentation/installation_guide.html

@@ -195,17 +195,10 @@ The following directories need to be readable, writeable and executable for ever
 <ul>
 
   <li>dokeos/main/inc/conf/</li>
-
-  <li>dokeos/main/garbage/</li>
-
   <li>dokeos/main/upload/users/</li>
-
   <li>dokeos/main/default_course_document/</li>
-
   <li>dokeos/archive/</li>
-
   <li>dokeos/courses/</li>
-
   <li>dokeos/home/</li>
 
 </ul>
@@ -472,7 +465,6 @@ choose "Configure the homepage" in the Dokeos administration section.
 The following directories need to be readable, writeable and executable for the web server:
 <ul>
   <li>dokeos/main/inc/conf/</li>
-  <li>dokeos/main/garbage/</li>
   <li>dokeos/main/upload/users/</li>
   <li>dokeos/main/default_course_document/</li>
   <li>dokeos/archive/</li>

+ 0 - 10
documentation/installation_guide_es_ES.html

@@ -192,21 +192,12 @@ predeterminados. Considere cambiar la contraseña de administrador y recuerdela.
 
 Los siguientes directorios necesitan tener permisos de lectura, escritura y ejecución para todos:
 <ul>
-
   <li>dokeos/main/inc/conf/</li>
-
-  <li>dokeos/main/garbage/</li>
-
   <li>dokeos/main/upload/users/</li>
-
   <li>dokeos/main/default_course_document/</li>
-
   <li>dokeos/archive/</li>
-
   <li>dokeos/courses/</li>
-
   <li>dokeos/home/</li>
-
 </ul>
 
 (donde 'dokeos' es el directorio en el cual usted instaló Dokeos)
@@ -470,7 +461,6 @@ seleccione "Configurar la pagina de inicio" en la sección de administración de
 Los siguientes directorios necesitan permisos de lectura, escritura y ejecución para el servidor web:
 <ul>
   <li>dokeos/main/inc/conf/</li>
-  <li>dokeos/main/garbage/</li>
   <li>dokeos/main/upload/users/</li>
   <li>dokeos/main/default_course_document/</li>
   <li>dokeos/archive/</li>

+ 0 - 10
main/install/install_functions.inc.php

@@ -516,10 +516,6 @@ function display_requirements($installType, $badUpdatePath, $updatePath='', $upd
 				<td class="requirements-item">dokeos/main/inc/conf/</td>
 				<td class="requirements-value">'.check_writable('inc/conf/').'</td>
 			</tr>
-			<tr>
-				<td class="requirements-item">dokeos/main/garbage/</td>
-				<td class="requirements-value">'.check_writable('garbage/').'</td>
-			</tr>
 			<tr>
 				<td class="requirements-item">dokeos/main/upload/users/</td>
 				<td class="requirements-value">'.check_writable('upload/users/').'</td>
@@ -602,12 +598,6 @@ function display_requirements($installType, $badUpdatePath, $updatePath='', $upd
 			@chmod('../inc/conf',$perm);
 		}
 
-		if(!is_writable('../garbage'))
-		{
-			$notwritable[] = realpath($curdir.'/../garbage');
-			@chmod('../garbage',$perm);
-		}
-
 		if(!is_writable('../upload/users'))
 		{
 			$notwritable[] = realpath($curdir.'/../upload/users');

+ 0 - 2
main/install/install_upgrade.lib.php

@@ -180,7 +180,6 @@ function write_dokeos_config_file($path)
     $seek = array('\\','//');
     $destroy = array('/','/');
 	$rootSys = str_replace($seek,$destroy,realpath($pathForm).'/');
-	$garbageDir = str_replace($seek,$destroy,realpath('../garbage/').'/');
 	
 	$file_path = dirname(__FILE__).'/'.DOKEOS_CONFIG_FILENAME;
 	$content = file_get_contents($file_path);
@@ -200,7 +199,6 @@ function write_dokeos_config_file($path)
 	$config['{ROOT_WEB}'] = $urlForm;
 	$config['{ROOT_SYS}'] = str_replace('\\', '/', $rootSys);
 	$config['{URL_APPEND_PATH}'] = $urlAppendPath;
-	$config['{GARBAGE_DIR}'] = str_replace("\\", '/', $garbageDir);
 	$config['{PLATFORM_LANGUAGE}'] = $languageForm;
 	$config['{SECURITY_KEY}'] = md5(uniqid(rand().time()));
 	$config['{ENCRYPT_PASSWORD}'] = $encryptPassForm; 

+ 1 - 1
main/install/upgrade.php

@@ -158,7 +158,7 @@ class Page_Requirements extends HTML_QuickForm_Page
 	}
 	function get_not_writable_folders()
 	{
-		$writable_folders = array ('../inc/conf', '../garbage', '../upload', '../../archive', '../../courses', '../../home');
+		$writable_folders = array ('../inc/conf', '../upload', '../../archive', '../../courses', '../../home');
 		$not_writable = array ();
 		$perm = api_get_setting('permissions_for_new_directories');
 		$perm = octdec(!empty($perm)?$perm:'0770');