[svn r13080] cancel commit 13076 ... I'm sorry and stupid : this wasn't a bug (in fact the bug was due to mkdirs without umask)

main/admin/user_add.php

@@ -1,4 +1,4 @@
-<?php // $Id: user_add.php 13079 2007-09-19 08:11:36Z elixir_inter $
+<?php // $Id: user_add.php 13080 2007-09-19 08:21:27Z elixir_inter $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -173,7 +173,7 @@ if( $form->validate())
 				if(mkdir(api_get_path(SYS_CODE_PATH).'upload/users/'))
 				{
 					$perm = api_get_setting('permissions_for_new_directories');
-					$perm = octdec(!empty($perm))?$perm:'0770';
+					$perm = octdec(!empty($perm)?$perm:'0770');
 					chmod(api_get_path(SYS_CODE_PATH).'upload/users/');
 				}
 			}

main/chat/chat_chat.php

@@ -64,7 +64,7 @@ if(!is_dir($chatPath))
 	}
 	
 	$perm = api_get_setting('permissions_for_new_directories');
-	$perm = octdec(!empty($perm))?$perm:'0770';
+	$perm = octdec(!empty($perm)?$perm:'0770');
 	@mkdir($chatPath,$perm);
 	@chmod($chatPath,$perm);
 

main/chat/chat_message.php

@@ -85,7 +85,7 @@ if(!is_dir($chatPath))
 	}
 
 	$perm = api_get_setting('permissions_for_new_directories');
-	$perm = octdec(!empty($perm))?$perm:'0770';
+	$perm = octdec(!empty($perm)?$perm:'0770');
 	@mkdir($chatPath,$perm);
 	@chmod($chatPath,$perm);
 

main/document/create_document.php

@@ -1,5 +1,5 @@
 <?php
-// $Id: create_document.php 13079 2007-09-19 08:11:36Z elixir_inter $
+// $Id: create_document.php 13080 2007-09-19 08:21:27Z elixir_inter $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -306,7 +306,7 @@ if ($form->validate())
 		fclose($fp);
 
 		$perm = api_get_setting('permissions_for_new_directories');
-		$perm = octdec(!empty($perm))?$perm:'0770';
+		$perm = octdec(!empty($perm)?$perm:'0770');
 		if (!is_dir($filepath.'css'))
 		{
 			mkdir($filepath.'css');

main/document/edit_document.php

@@ -1,4 +1,4 @@
-<?php // $Id: edit_document.php 13076 2007-09-19 07:45:31Z elixir_inter $
+<?php // $Id: edit_document.php 13080 2007-09-19 08:21:27Z elixir_inter $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -381,7 +381,7 @@ if($is_allowedToEdit)
 				fclose($fp);
 
 				$perm = api_get_setting('permissions_for_new_directories');
-				$perm = octdec(!empty($perm))?$perm:'0770';
+				$perm = octdec(!empty($perm)?$perm:'0770');
 
 				if(!is_dir($filepath.'css'))
 				{

main/inc/lib/add_course.lib.inc.php

@@ -220,7 +220,7 @@ function prepare_course_repository($courseRepository, $courseId)
 {
 	umask(0);
 	$perm = api_get_setting('permissions_for_new_directories');
-	$perm = octdec(!empty($perm))?$perm:'0770';
+	$perm = octdec(!empty($perm)?$perm:'0770');
 	mkdir(api_get_path(SYS_COURSE_PATH).$courseRepository, $perm);
 	mkdir(api_get_path(SYS_COURSE_PATH).$courseRepository . "/document", $perm);
 	mkdir(api_get_path(SYS_COURSE_PATH).$courseRepository . "/document/images", $perm);
@@ -1453,9 +1453,9 @@ function fill_course_repository($courseRepository)
 		$pictures_array = array_merge($pictures_array,sort_pictures($files,"file"));
 
 		$perm = api_get_setting('permissions_for_new_directories');
-		$perm = octdec(!empty($perm))?$perm:'0770';
+		$perm = octdec(!empty($perm)?$perm:'0770');
 		$perm_file = api_get_setting('permissions_for_new_files');
-		$perm_file = octdec(!empty($perm_file))?$perm_file:'0660';
+		$perm_file = octdec(!empty($perm_file)?$perm_file:'0660');
 		mkdir($course_documents_folder_images,$perm);
 
 		$handle = opendir($img_code_path);

main/inc/lib/fckeditor/editor/filemanager/browser/default/connectors/php/commands.php

@@ -168,7 +168,7 @@ function FileUpload( $resourceType, $currentFolder )
 		$arDenied	= $Config['DeniedExtensions'][$resourceType] ;
 
 		$perm = api_get_setting('permissions_for_new_files');
-		$perm = octdec(!empty($perm))?$perm:'0660';
+		$perm = octdec(!empty($perm)?$perm:'0660');
 
 		if ( ( count($arAllowed) == 0 || in_array( $sExtension, $arAllowed ) ) && ( count($arDenied) == 0 || !in_array( $sExtension, $arDenied ) ) )
 		{

main/inc/lib/fckeditor/editor/filemanager/browser/default/connectors/php/io.php

@@ -71,7 +71,7 @@ function CreateServerFolder( $folderPath )
 
 		// To create the folder with 0777 permissions, we need to set umask to zero.
 		$perm = api_get_setting('permissions_for_new_directories');
-		$perm = octdec(!empty($perm))?$perm:'0770';
+		$perm = octdec(!empty($perm)?$perm:'0770');
 		$oldumask = umask(0) ;
 		mkdir( $folderPath, $perm ) ;
 		umask( $oldumask ) ;

main/inc/lib/fckeditor/editor/filemanager/upload/php/upload.php

@@ -155,7 +155,7 @@ if ( is_file( $sServerDir.$sFileName ) )
 {
 	$oldumask = umask(0) ;
 	$perm = api_get_setting('permissions_for_new_files');
-	$perm = octdec(!empty($perm))?$perm:'0660';
+	$perm = octdec(!empty($perm)?$perm:'0660');
 	chmod( $sFilePath, $perm ) ;
 	umask( $oldumask ) ;
 }

main/inc/lib/fckeditor/editor/plugins/ImageManager/Classes/Files.php

@@ -84,7 +84,7 @@ class Files
 	function createFolder($newFolder) 
 	{
 		$perm = api_get_setting('permissions_for_new_directories');
-		$perm = octdec(!empty($perm))?$perm:'0770';
+		$perm = octdec(!empty($perm)?$perm:'0770');
 		mkdir ($newFolder, $perm);
 		return chmod($newFolder, $perm);
 	}

main/inc/lib/fileUpload.lib.php

@@ -1395,7 +1395,7 @@ function create_unexisting_directory($_course,$user_id,$to_group_id,$to_user_id,
 	if ( mkdir($base_work_dir.$desired_dir_name.$nb))
 	{
 		$perm = api_get_setting('permissions_for_new_directories');
-		$perm = octdec(!empty($perm))?$perm:'0770';
+		$perm = octdec(!empty($perm)?$perm:'0770');
 		chmod($base_work_dir.$desired_dir_name.$nb,$perm);
 		$document_id = add_document($_course, $desired_dir_name.$nb,'folder',0,$title);
 		if ($document_id)

main/install/install_functions.inc.php

@@ -572,9 +572,9 @@ function display_requirements($installType, $badUpdatePath, $updatePath='', $upd
 		$error=false;
 
 		$perm = api_get_setting('permissions_for_new_directories');
-		$perm = octdec(!empty($perm))?$perm:'0770';
+		$perm = octdec(!empty($perm)?$perm:'0770');
 		$perm_file = api_get_setting('permissions_for_new_files');
-		$perm_file = octdec(!empty($perm_file))?$perm_file:'0660';
+		$perm_file = octdec(!empty($perm_file)?$perm_file:'0660');
 
 		//First, attempt to set writing permissions if we don't have them yet
 		//0xxx is an octal number, this is the required format

main/install/update-files-1.6.x-1.8.0.inc.php

@@ -1,4 +1,4 @@
-<?php //$Id: update-files-1.6.x-1.8.0.inc.php 13079 2007-09-19 08:11:36Z elixir_inter $
+<?php //$Id: update-files-1.6.x-1.8.0.inc.php 13080 2007-09-19 08:21:27Z elixir_inter $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -76,7 +76,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 	$result=mysql_query($sql);
 	
 	$perm = api_get_setting('permissions_for_new_directories');
-	$perm = octdec(!empty($perm))?$perm:'0770';
+	$perm = octdec(!empty($perm)?$perm:'0770');
 	$old_umask = umask(0);
 	while($courses_directories=mysql_fetch_array($result)){
 		

main/install/update_files.inc.php

@@ -153,7 +153,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 	$oldPath = $_POST['updatePath'];
 
 	$perm = api_get_setting('permissions_for_new_directories');
-	$perm = octdec(!empty($perm))?$perm:'0770';
+	$perm = octdec(!empty($perm)?$perm:'0770');
 
 	foreach ($coursePath as $key => $course)
 	{

main/install/upgrade.php

@@ -161,7 +161,7 @@ class Page_Requirements extends HTML_QuickForm_Page
 		$writable_folders = array ('../inc/conf', '../garbage', '../upload', '../../archive', '../../courses', '../../home');
 		$not_writable = array ();
 		$perm = api_get_setting('permissions_for_new_directories');
-		$perm = octdec(!empty($perm))?$perm:'0770';
+		$perm = octdec(!empty($perm)?$perm:'0770');
 		foreach ($writable_folders as $index => $folder)
 		{
 			if (!is_writable($folder) && !@ chmod($folder, $perm))

main/mySpace/admin.php

@@ -69,7 +69,7 @@ $tbl_admin				= Database :: get_main_table(TABLE_MAIN_ADMIN);
 		fwrite($open,$info);
 		fclose($open);
 		$perm = api_get_setting('permissions_for_new_files');
-		$perm = octdec(!empty($perm))?$perm:'0660';
+		$perm = octdec(!empty($perm)?$perm:'0660');
 		chmod($fileName,$perm);
 		
 		header("Location:".$archiveURL.$fileName);

main/mySpace/coaches.php

@@ -78,7 +78,7 @@ $tbl_track_login 					= Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_
 		fwrite($open,$info);
 		fclose($open);
 		$perm = api_get_setting('permissions_for_new_files');
-		$perm = octdec(!empty($perm))?$perm:'0660';
+		$perm = octdec(!empty($perm)?$perm:'0660');
 		chmod($fileName,$perm);
 		
 		header("Location:".$archiveURL.$fileName);

main/mySpace/progression.php

@@ -65,7 +65,7 @@ $tbl_track_exercice = Database :: get_statistic_table(STATISTIC_TRACK_E_EXERCICE
 		fwrite($open,$info);
 		fclose($open);
 		$perm = api_get_setting('permissions_for_new_files');
-		$perm = octdec(!empty($perm))?$perm:'0660';
+		$perm = octdec(!empty($perm)?$perm:'0660');
 		chmod($fileName,$perm);
 		$message = get_lang('UsageDatacreated');
 		

main/mySpace/teachers.php

@@ -70,7 +70,7 @@ function exportCsv($a_header,$a_data)
 		fwrite($open,$info);
 		fclose($open);
 		$perm = api_get_setting('permissions_for_new_files');
-		$perm = octdec(!empty($perm))?$perm:'0660';
+		$perm = octdec(!empty($perm)?$perm:'0660');
 		chmod($fileName,$perm);
 		
 		header("Location:".$archiveURL.$fileName);

main/newscorm/learnpath.class.php

@@ -6991,7 +6991,7 @@ function display_thread_form($action = 'add', $id = 0, $extra_info = '')
 			$dest_path_to_lp = substr($this->path, -1) == '.' ? substr($this->path, 0, -1) : $this->path;
 			$dest_path_to_scorm_folder = str_replace('//','/',$temp_zip_dir.'/scorm/'.$dest_path_to_lp);
 			$perm = api_get_setting('permissions_for_new_directories');
-			$perm = octdec(!empty($perm))?$perm:'0770';
+			$perm = octdec(!empty($perm)?$perm:'0770');
 			mkdir ($dest_path_to_scorm_folder, $perm, true);
 			$zip_files_dist = copyr($current_course_path.'/scorm/'.$this->path, $dest_path_to_scorm_folder, array('imsmanifest'), $zip_files);
 		}

main/newscorm/presentation.class.php

@@ -60,7 +60,7 @@ class presentation extends learnpath {
 		move_uploaded_file($file['tmp_name'],$base_work_dir.'/'.$file['name']);
 		$file = $base_work_dir.'/'.$file['name'];
 		$perm = api_get_setting('permissions_for_new_files');
-		$perm = octdec(!empty($perm))?$perm:'0660';
+		$perm = octdec(!empty($perm)?$perm:'0660');
 		chmod($file,$perm);
 		
 		

main/newscorm/word_document.class.php

@@ -138,7 +138,7 @@ class word_document extends learnpath {
 					}
 				}
 			}
-			$perm = octdec(!empty($perm))?$perm:0700;
+			$perm = octdec(!empty($perm)?$perm:0700);
 			chmod ($base_work_dir.$created_dir,$perm);
 			chmod($file,$perm);
 			

main/work/work.lib.php

@@ -508,7 +508,7 @@ function create_unexisting_work_directory($base_work_dir,$desired_dir_name)
 	}
 	//echo "creating ".$base_work_dir.$desired_dir_name.$nb."#...";
 	$perm = api_get_setting('permissions_for_new_directories');
-	$perm = octdec(!empty($perm))?$perm:'0770';
+	$perm = octdec(!empty($perm)?$perm:'0770');
 	if ( mkdir($base_work_dir.$desired_dir_name.$nb, $perm))
 	{
 		chmod($base_work_dir.$desired_dir_name.$nb, $perm);