Browse Source

Minor - format code.

Julio Montoya 11 years ago
parent
commit
01ea1ae59e

+ 36 - 53
main/inc/lib/fckeditor/editor/plugins/ImageManager/config.inc.php

@@ -27,62 +27,48 @@
  in this directory and its subdirectories.
 */
 $language_file = array('document');
+
 include '../../../../../../inc/global.inc.php';
 
 // Initialization of the repositories.
 require_once api_get_path(LIBRARY_PATH).'fckeditor/repository.php';
 
 // Choosing the repository to be used.
-if (api_is_in_course())
-{
-	if (!api_is_in_group())
-	{
-		// 1. We are inside a course and not in a group.
-		if (api_is_allowed_to_edit())
-		{
-			// 1.1. Teacher
-			$IMConfig['base_dir'] = api_get_path(SYS_COURSE_PATH).api_get_course_path().'/document/';
-			$IMConfig['base_url'] = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/';
-		}
-		else
-		{
-			// 1.2. Student			
-			$current_session_id = api_get_session_id();
-			if($current_session_id==0)
-			{
-				$IMConfig['base_dir'] = api_get_path(SYS_COURSE_PATH).api_get_course_path().'/document/shared_folder/sf_user_'.api_get_user_id().'/';
-				$IMConfig['base_url'] = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/shared_folder/sf_user_'.api_get_user_id().'/';
-			}
-			else
-			{
-				$IMConfig['base_dir'] = api_get_path(SYS_COURSE_PATH).api_get_course_path().'/document/shared_folder_session_'.$current_session_id.'/sf_user_'.api_get_user_id().'/';
-				$IMConfig['base_url'] = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/shared_folder_session_'.$current_session_id.'/sf_user_'.api_get_user_id().'/';	
-			}	
-		}
-	}
-	else
-	{
-		// 2. Inside a course and inside a group.
-		$IMConfig['base_dir'] = api_get_path(SYS_COURSE_PATH).api_get_course_path().'/document'.$group_properties['directory'].'/';
-		$IMConfig['base_url'] = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document'.$group_properties['directory'].'/';
-	}
-}
-else
-{
-	if (api_is_platform_admin() && $_SESSION['this_section'] == 'platform_admin')
-	{
-		// 3. Platform administration activities.
-		$IMConfig['base_dir'] = $_configuration['root_sys'].'home/default_platform_document/';
-		$IMConfig['base_url'] = $_configuration['root_web'].'home/default_platform_document/';
-	}
-	else
-	{
-		// 4. The user is outside courses.
-        $my_path = UserManager::get_user_picture_path_by_id(api_get_user_id(),'system');
-		$IMConfig['base_dir'] = $my_path['dir'].'my_files/';
-        $my_path = UserManager::get_user_picture_path_by_id(api_get_user_id(),'web');
-		$IMConfig['base_url'] = $my_path['dir'].'my_files/';
-	}
+if (api_is_in_course()) {
+	if (!api_is_in_group()) {
+        // 1. We are inside a course and not in a group.
+        if (api_is_allowed_to_edit()) {
+            // 1.1. Teacher
+            $IMConfig['base_dir'] = api_get_path(SYS_COURSE_PATH).api_get_course_path().'/document/';
+            $IMConfig['base_url'] = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/';
+        } else {
+            // 1.2. Student
+            $current_session_id = api_get_session_id();
+            if ($current_session_id == 0) {
+                $IMConfig['base_dir'] = api_get_path(SYS_COURSE_PATH).api_get_course_path().'/document/shared_folder/sf_user_'.api_get_user_id().'/';
+                $IMConfig['base_url'] = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/shared_folder/sf_user_'.api_get_user_id().'/';
+            } else {
+                $IMConfig['base_dir'] = api_get_path(SYS_COURSE_PATH).api_get_course_path().'/document/shared_folder_session_'.$current_session_id.'/sf_user_'.api_get_user_id().'/';
+                $IMConfig['base_url'] = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/shared_folder_session_'.$current_session_id.'/sf_user_'.api_get_user_id().'/';
+            }
+        }
+	} else {
+        // 2. Inside a course and inside a group.
+        $IMConfig['base_dir'] = api_get_path(SYS_COURSE_PATH).api_get_course_path().'/document'.$group_properties['directory'].'/';
+        $IMConfig['base_url'] = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document'.$group_properties['directory'].'/';
+    }
+} else {
+    if (api_is_platform_admin() && $_SESSION['this_section'] == 'platform_admin') {
+        // 3. Platform administration activities.
+        $IMConfig['base_dir'] = $_configuration['root_sys'].'home/default_platform_document/';
+        $IMConfig['base_url'] = $_configuration['root_web'].'home/default_platform_document/';
+    } else {
+        // 4. The user is outside courses.
+        $my_path = UserManager::get_user_picture_path_by_id(api_get_user_id(), 'system');
+        $IMConfig['base_dir'] = $my_path['dir'].'my_files/';
+        $my_path = UserManager::get_user_picture_path_by_id(api_get_user_id(), 'web');
+        $IMConfig['base_url'] = $my_path['dir'].'my_files/';
+    }
 }
 
 $IMConfig['server_name'] = $_SERVER['SERVER_NAME'];
@@ -91,11 +77,8 @@ $IMConfig['server_name'] = $_SERVER['SERVER_NAME'];
  demo - when true, no saving is allowed
 */
 $IMConfig['demo'] = false;
-
 /*
-
   Possible values: true, false
-
   TRUE - If PHP on the web server is in safe mode, set this to true.
          SAFE MODE restrictions: directory creation will not be possible,
 		 only the GD library can be used, other libraries require

+ 59 - 63
main/inc/lib/fckeditor/repository.php

@@ -1,20 +1,8 @@
 <?php
-/**
- *	Chamilo LMS
- *
- *	For a full list of contributors, see "credits.txt".
- *	The full license can be read in "license.txt".
- *
- *	This program is free software; you can redistribute it and/or
- *	modify it under the terms of the GNU General Public License
- *	as published by the Free Software Foundation; either version 2
- *	of the License, or (at your option) any later version.
- *
- *	See the GNU General Public License for more details.
- */
+/* For licensing terms, see /license.txt */
 
 /**
- * Aditional system config settings for document repositories, the Chamilo LMS
+ * Additional system config settings for document repositories, the Chamilo LMS
  * @author Juan Carlos Raña
  * @since 31/December/2008
  */
@@ -34,68 +22,76 @@ if (!empty($_course['path'])) {
 	$is_user_in_group = GroupManager::is_user_in_group($_user['user_id'],$_SESSION['_gid']);
 }
 
-$my_path = UserManager::get_user_picture_path_by_id(api_get_user_id(),'system');
+$my_path = UserManager::get_user_picture_path_by_id(api_get_user_id(), 'system');
 $user_folder = $my_path['dir'].'my_files/';
 
 // Sanity checks for Chamilo.
 
 // Creation of a user owned folder if it does not exist.
 if (!file_exists($user_folder)) {
-	// A recursive call of mkdir function.
-	@mkdir($user_folder, $permissions_for_new_directories, true);
+    // A recursive call of mkdir function.
+    @mkdir($user_folder, $permissions_for_new_directories, true);
 }
 
-// Creation of repository used by paltform administrators if it does not exist.
+// Creation of repository used by platform administrators if it does not exist.
 if (api_is_platform_admin()) {
-	$homepage_folder = api_get_path(SYS_PATH).'home/default_platform_document/';
-	if (!file_exists($homepage_folder)) {
-		@mkdir($homepage_folder, $permissions_for_new_directories);
-	}
+    $homepage_folder = api_get_path(SYS_PATH).'home/default_platform_document/';
+    if (!file_exists($homepage_folder)) {
+        @mkdir($homepage_folder, $permissions_for_new_directories);
+    }
 }
 
-
 // Create course shared folders
 if (api_is_in_course()) {
-	$course_dir      = $_course['path'].'/document';
-	$sys_course_path = api_get_path(SYS_COURSE_PATH);
-	$base_work_dir   = $sys_course_path.$course_dir;
-	$current_session_id = api_get_session_id();
-	$userinfo = Database::get_user_info_from_id(api_get_user_id());
+    $course_dir      = $_course['path'].'/document';
+    $sys_course_path = api_get_path(SYS_COURSE_PATH);
+    $base_work_dir   = $sys_course_path.$course_dir;
+    $current_session_id = api_get_session_id();
+    $userinfo = Database::get_user_info_from_id(api_get_user_id());
 
-	if($current_session_id==0){
-		//Create shared folder. Necessary for courses recycled. Allways session_id should be zero. Allway should be created from a base course, never from a session.
-		if (!file_exists($base_work_dir.'/shared_folder')) {
-			$usf_dir_title = get_lang('SharedFolder');
-			$usf_dir_name = '/shared_folder';
-			$to_group_id = 0;
-			$visibility = 0;
-			create_unexisting_directory($_course, $_user['user_id'], api_get_session_id(), $to_group_id, $to_user_id, $base_work_dir, $usf_dir_name, $usf_dir_title, $visibility);
-		}
-		// Create dynamic user shared folder
-		if (!file_exists($base_work_dir.'/shared_folder/sf_user_'.api_get_user_id())) {
-				$usf_dir_title = api_get_person_name($_user['firstName'], $_user['lastName']);
-				$usf_dir_name = '/shared_folder/sf_user_'.api_get_user_id();
-				$to_group_id = 0;
-				$visibility = 1;
-				create_unexisting_directory($_course, $_user['user_id'], api_get_session_id(), $to_group_id, $to_user_id, $base_work_dir, $usf_dir_name, $usf_dir_title, $visibility);
-		}
-	}
-	else{
-			//Create shared folder session
-			if (!file_exists($base_work_dir.'/shared_folder_session_'.$current_session_id)) {
-				$usf_dir_title = get_lang('SharedFolder').' ('.api_get_session_name($current_session_id).')';
-				$usf_dir_name = '/shared_folder_session_'.$current_session_id;
-				$to_group_id = 0;
-				$visibility = 0;
-				create_unexisting_directory($_course, $_user['user_id'], api_get_session_id(), $to_group_id, $to_user_id, $base_work_dir, $usf_dir_name, $usf_dir_title, $visibility);
-			}
-			//Create dynamic user shared folder into a shared folder session
-			if (!file_exists($base_work_dir.'/shared_folder_session_'.$current_session_id.'/sf_user_'.api_get_user_id())) {
-				$usf_dir_title = api_get_person_name($_user['firstName'], $_user['lastName']).'('.api_get_session_name($current_session_id).')';
-				$usf_dir_name = '/shared_folder_session_'.$current_session_id.'/sf_user_'.api_get_user_id();
-				$to_group_id = 0;
-				$visibility = 1;
-				create_unexisting_directory($_course, $_user['user_id'], api_get_session_id(), $to_group_id, $to_user_id, $base_work_dir, $usf_dir_name, $usf_dir_title, $visibility);
-			}
+	if ($current_session_id==0){
+        //Create shared folder. Necessary for courses recycled. Allways session_id should be zero. Allway should be created from a base course, never from a session.
+        if (!file_exists($base_work_dir.'/shared_folder')) {
+            $usf_dir_title = get_lang('SharedFolder');
+            $usf_dir_name = '/shared_folder';
+            $to_group_id = 0;
+            $visibility = 0;
+            create_unexisting_directory($_course, $_user['user_id'], api_get_session_id(), $to_group_id, $to_user_id, $base_work_dir, $usf_dir_name, $usf_dir_title, $visibility);
+        }
+        // Create dynamic user shared folder
+        if (!file_exists($base_work_dir.'/shared_folder/sf_user_'.api_get_user_id())) {
+            $usf_dir_title = api_get_person_name($_user['firstName'], $_user['lastName']);
+            $usf_dir_name = '/shared_folder/sf_user_'.api_get_user_id();
+            $to_group_id = 0;
+            $visibility = 1;
+            create_unexisting_directory($_course, $_user['user_id'], api_get_session_id(), $to_group_id, $to_user_id, $base_work_dir, $usf_dir_name, $usf_dir_title, $visibility);
+        }
+	} else {
+        //Create shared folder session
+        if (!file_exists($base_work_dir.'/shared_folder_session_'.$current_session_id)) {
+            $usf_dir_title = get_lang('SharedFolder').' ('.api_get_session_name($current_session_id).')';
+            $usf_dir_name = '/shared_folder_session_'.$current_session_id;
+            $to_group_id = 0;
+            $visibility = 0;
+            create_unexisting_directory($_course, $_user['user_id'], api_get_session_id(), $to_group_id, $to_user_id, $base_work_dir, $usf_dir_name, $usf_dir_title, $visibility);
+        }
+        //Create dynamic user shared folder into a shared folder session
+        if (!file_exists($base_work_dir.'/shared_folder_session_'.$current_session_id.'/sf_user_'.api_get_user_id())) {
+            $usf_dir_title = api_get_person_name($_user['firstName'], $_user['lastName']).'('.api_get_session_name($current_session_id).')';
+            $usf_dir_name = '/shared_folder_session_'.$current_session_id.'/sf_user_'.api_get_user_id();
+            $to_group_id = 0;
+            $visibility = 1;
+            create_unexisting_directory(
+                $_course,
+                $_user['user_id'],
+                api_get_session_id(),
+                $to_group_id,
+                $to_user_id,
+                $base_work_dir,
+                $usf_dir_name,
+                $usf_dir_title,
+                $visibility
+            );
+        }
 	}
 }