chamilo / chamilo-lms

main/lp/lp_controller.php

Indentation +11 added lines, -11 removed lines

@@ -544,17 +544,17 @@ 
                 if (isset($_REQUEST['activate_start_date_check']) &&
                     $_REQUEST['activate_start_date_check'] == 1
                 ) {
-                	$publicated_on = $_REQUEST['publicated_on'];
+                    $publicated_on = $_REQUEST['publicated_on'];
                 } else {
-                	$publicated_on = null;
+                    $publicated_on = null;
                 }
 
                 if (isset($_REQUEST['activate_end_date_check']) &&
                     $_REQUEST['activate_end_date_check'] == 1
                 ) {
-                	$expired_on = $_REQUEST['expired_on'];
+                    $expired_on = $_REQUEST['expired_on'];
                 } else {
-                	$expired_on = null;
+                    $expired_on = null;
                 }
 
                 $new_lp_id = learnpath::add_lp(
@@ -958,9 +958,9 @@ 
             $_SESSION['oLP']->setAccumulateScormTime($accumulateScormTime);
 
             if (isset($_REQUEST['activate_start_date_check']) && $_REQUEST['activate_start_date_check'] == 1) {
-            	$publicated_on  = $_REQUEST['publicated_on'];
+                $publicated_on  = $_REQUEST['publicated_on'];
             } else {
-            	$publicated_on = null;
+                $publicated_on = null;
             }
 
             if (isset($_REQUEST['activate_end_date_check']) && $_REQUEST['activate_end_date_check'] == 1) {
@@ -1178,7 +1178,7 @@ 
         } elseif ($mode == 'embedded') {
             $_SESSION['oLP']->mode = 'embedded';
         } elseif ($mode == 'embedframe') {
-        	$_SESSION['oLP']->mode = 'embedframe';
+            $_SESSION['oLP']->mode = 'embedframe';
         } elseif ($mode == 'impress') {
             $_SESSION['oLP']->mode = 'impress';
         }
@@ -1219,10 +1219,10 @@ 
 		require 'lp_list.php';
 		break;
      */
-	case 'switch_attempt_mode':
-		if(!$lp_found){ error_log('New LP - No learnpath given for switch',0); require 'lp_list.php'; }
-		$_SESSION['refresh'] = 1;
-		$_SESSION['oLP']->switch_attempt_mode();
+    case 'switch_attempt_mode':
+        if(!$lp_found){ error_log('New LP - No learnpath given for switch',0); require 'lp_list.php'; }
+        $_SESSION['refresh'] = 1;
+        $_SESSION['oLP']->switch_attempt_mode();
         require 'lp_list.php';
         break;
     case 'switch_scorm_debug':

main/lp/lp_edit.php

Indentation +2 added lines, -2 removed lines

@@ -178,8 +178,8 @@
 );
 $display_date = 'none';
 if (!empty($expired_on)) {
-	$display_date = 'block';
-	$defaults['activate_end_date_check'] = 1;
+    $display_date = 'block';
+    $defaults['activate_end_date_check'] = 1;
 }
 
 $form->addElement('html', '<div id="end_date_div" style="display:'.$display_date.';">');

main/user/subscribe_user.php

Indentation +297 added lines, -297 removed lines

@@ -27,7 +27,7 @@ 
 
 // Access restriction
 if (!api_is_allowed_to_edit()) {
-	 api_not_allowed(true);
+        api_not_allowed(true);
 }
 
 $tool_name = get_lang("SubscribeUserToCourse");
@@ -37,7 +37,7 @@ 
 $courseInfo = api_get_course_info();
 
 if ($type == COURSEMANAGER) {
-	$tool_name = get_lang("SubscribeUserToCourseAsTeacher");
+    $tool_name = get_lang("SubscribeUserToCourseAsTeacher");
 }
 
 //extra entries in breadcrumb
@@ -50,7 +50,7 @@ 
         "url" => "subscribe_user.php?type=".$type.'&'.api_get_cidreq(),
         "name" => $tool_name,
     );
-	$tool_name = get_lang('SearchResults');
+    $tool_name = get_lang('SearchResults');
 }
 
 $current_session_id = api_get_session_id();
@@ -79,7 +79,7 @@ 
         );
     }
 
-	$user_id_temp = $_SESSION['session_user_id'];
+    $user_id_temp = $_SESSION['session_user_id'];
 
     if (is_array($user_id_temp)) {
         $counter = count($user_id_temp);
@@ -172,16 +172,16 @@ 
 
             header('Location:'.api_get_path(WEB_CODE_PATH).'user/user.php?'.api_get_cidreq().'&type='.$type);
             exit;
-			break;
-	}
+            break;
+    }
 }
 
 if (!empty($_SESSION['session_user_id'])) {
-	unset($_SESSION['session_user_id']);
+    unset($_SESSION['session_user_id']);
 }
 
 if (!empty($_SESSION['session_user_name'])) {
-	unset($_SESSION['session_user_name']);
+    unset($_SESSION['session_user_name']);
 }
 
 $is_western_name_order = api_is_western_name_order();
@@ -189,10 +189,10 @@ 
 
 // Build table
 $table = new SortableTable(
-	'subscribe_users',
-	'get_number_of_users',
-	'get_user_data',
-	($is_western_name_order xor $sort_by_first_name) ? 3 : 2
+    'subscribe_users',
+    'get_number_of_users',
+    'get_user_data',
+    ($is_western_name_order xor $sort_by_first_name) ? 3 : 2
 );
 $parameters['keyword'] = $keyword;
 $parameters['type'] = $type;
@@ -274,18 +274,18 @@ 
  */
 function get_number_of_users()
 {
-	// Database table definition
-	$user_table = Database::get_main_table(TABLE_MAIN_USER);
-	$course_user_table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
-	$tbl_session_rel_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
-	$table_user_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
+    // Database table definition
+    $user_table = Database::get_main_table(TABLE_MAIN_USER);
+    $course_user_table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
+    $tbl_session_rel_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
+    $table_user_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
 
     $courseCode = api_get_course_id();
     $sessionId = api_get_session_id();
 
-	if (isset($_REQUEST['type']) && $_REQUEST['type'] === 'teacher') {
-		if (api_get_session_id() != 0) {
-			$sql = "SELECT COUNT(u.user_id)
+    if (isset($_REQUEST['type']) && $_REQUEST['type'] === 'teacher') {
+        if (api_get_session_id() != 0) {
+            $sql = "SELECT COUNT(u.user_id)
 					FROM $user_table u
 					LEFT JOIN $tbl_session_rel_course_user cu
 					ON
@@ -297,11 +297,11 @@ 
 						u.status = 1 AND
 						(u.official_code <> 'ADMIN' OR u.official_code IS NULL) ";
 
-			if (api_is_multiple_url_enabled()) {
-				$url_access_id = api_get_current_access_url_id();
-				if ($url_access_id !=-1) {
-					$tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
-					$sql = "SELECT COUNT(u.user_id)
+            if (api_is_multiple_url_enabled()) {
+                $url_access_id = api_get_current_access_url_id();
+                if ($url_access_id !=-1) {
+                    $tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+                    $sql = "SELECT COUNT(u.user_id)
 							FROM $user_table u
 							LEFT JOIN $tbl_session_rel_course_user cu
 							ON
@@ -315,34 +315,34 @@ 
 								u.status = 1 AND
 								(u.official_code <> 'ADMIN' OR u.official_code IS NULL)
 							";
-				}
-			}
-		} else {
-			$sql = "SELECT COUNT(u.user_id)
+                }
+            }
+        } else {
+            $sql = "SELECT COUNT(u.user_id)
 					FROM $user_table u
 					LEFT JOIN $course_user_table cu
 					ON u.user_id = cu.user_id and c_id='".api_get_course_int_id()."'
 				    WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
 
-			if (api_is_multiple_url_enabled()) {
-				$url_access_id = api_get_current_access_url_id();
-				if ($url_access_id !=-1) {
-					$tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+            if (api_is_multiple_url_enabled()) {
+                $url_access_id = api_get_current_access_url_id();
+                if ($url_access_id !=-1) {
+                    $tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
 
-					$sql = "SELECT COUNT(u.user_id)
+                    $sql = "SELECT COUNT(u.user_id)
 						FROM $user_table u
 						LEFT JOIN $course_user_table cu
 						ON u.user_id = cu.user_id AND c_id='".api_get_course_int_id()."'
 						INNER JOIN  $tbl_url_rel_user as url_rel_user
 						ON (url_rel_user.user_id = u.user_id)
 						WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
-				}
-			}
-		}
-	} else {
-		// students
-		if (api_get_session_id() != 0) {
-			$sql = "SELECT COUNT(u.user_id)
+                }
+            }
+        }
+    } else {
+        // students
+        if (api_get_session_id() != 0) {
+            $sql = "SELECT COUNT(u.user_id)
 					FROM $user_table u
 					LEFT JOIN $tbl_session_rel_course_user cu
 					ON
@@ -354,11 +354,11 @@ 
 						u.status<>".DRH." AND
 						(u.official_code <> 'ADMIN' OR u.official_code IS NULL) ";
 
-			if (api_is_multiple_url_enabled()) {
-				$url_access_id = api_get_current_access_url_id();
-				if ($url_access_id !=-1) {
-					$tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
-					$sql = "SELECT COUNT(u.user_id)
+            if (api_is_multiple_url_enabled()) {
+                $url_access_id = api_get_current_access_url_id();
+                if ($url_access_id !=-1) {
+                    $tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+                    $sql = "SELECT COUNT(u.user_id)
 							FROM $user_table u
 							LEFT JOIN $tbl_session_rel_course_user cu
 							ON
@@ -372,21 +372,21 @@ 
 								u.status<>".DRH." AND
 								access_url_id= $url_access_id AND
 								(u.official_code <> 'ADMIN' OR u.official_code IS NULL) ";
-				}
-			}
-		} else {
-			$sql = "SELECT COUNT(u.user_id)
+                }
+            }
+        } else {
+            $sql = "SELECT COUNT(u.user_id)
 					FROM $user_table u
 					LEFT JOIN $course_user_table cu
 					ON u.user_id = cu.user_id AND c_id='".api_get_course_int_id()."'";
 
-			// we change the SQL when we have a filter
-			if (isset($_GET['subscribe_user_filter_value']) &&
+            // we change the SQL when we have a filter
+            if (isset($_GET['subscribe_user_filter_value']) &&
                 !empty($_GET['subscribe_user_filter_value']) &&
                 api_get_setting('ProfilingFilterAddingUsers') == 'true'
             ){
-				$field_identification = explode('*',$_GET['subscribe_user_filter_value']);
-				$sql .=	"
+                $field_identification = explode('*',$_GET['subscribe_user_filter_value']);
+                $sql .=	"
 					LEFT JOIN $table_user_field_values field_values
 					ON field_values.item_id = u.user_id
 					WHERE
@@ -395,32 +395,32 @@ 
 						field_values.field_id = '".intval($field_identification[0])."' AND
 						field_values.value = '".Database::escape_string($field_identification[1])."'
 					";
-			} else	{
-				$sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
-			}
+            } else	{
+                $sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
+            }
 
-			if (api_is_multiple_url_enabled()) {
-				$url_access_id = api_get_current_access_url_id();
+            if (api_is_multiple_url_enabled()) {
+                $url_access_id = api_get_current_access_url_id();
 
-				if ($url_access_id !=-1) {
+                if ($url_access_id !=-1) {
 
-					$tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+                    $tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
 
-					$sql = "SELECT COUNT(u.user_id)
+                    $sql = "SELECT COUNT(u.user_id)
 							FROM $user_table u
 							LEFT JOIN $course_user_table cu on u.user_id = cu.user_id and c_id='".api_get_course_int_id()."'
 							INNER JOIN  $tbl_url_rel_user as url_rel_user
 							ON (url_rel_user.user_id = u.user_id)
 							WHERE cu.user_id IS NULL AND access_url_id= $url_access_id AND u.status<>".DRH." ";
-				}
-			}
-		}
-	}
-
-	// when there is a keyword then we are searching and we have to change the SQL statement
-	if (isset($_GET['keyword']) AND !empty($_GET['keyword'])) {
-		$keyword = Database::escape_string(trim($_REQUEST['keyword']));
-		$sql .= " AND (
+                }
+            }
+        }
+    }
+
+    // when there is a keyword then we are searching and we have to change the SQL statement
+    if (isset($_GET['keyword']) AND !empty($_GET['keyword'])) {
+        $keyword = Database::escape_string(trim($_REQUEST['keyword']));
+        $sql .= " AND (
 		    firstname LIKE '%".$keyword."%' OR
 		    lastname LIKE '%".$keyword."%' OR
 		    email LIKE '%".$keyword."%' OR
@@ -428,37 +428,37 @@ 
 		    official_code LIKE '%".$keyword."%'
         )";
 
-		// we also want to search for users who have something in their profile fields that matches the keyword
-		if (api_get_setting('ProfilingFilterAddingUsers') == 'true') {
-			$additional_users = search_additional_profile_fields($keyword);
-		}
+        // we also want to search for users who have something in their profile fields that matches the keyword
+        if (api_get_setting('ProfilingFilterAddingUsers') == 'true') {
+            $additional_users = search_additional_profile_fields($keyword);
+        }
 
-		// getting all the users of the course (to make sure that we do not display users that are already in the course)
-		if (!empty($_SESSION["id_session"])) {
+        // getting all the users of the course (to make sure that we do not display users that are already in the course)
+        if (!empty($_SESSION["id_session"])) {
             $a_course_users = CourseManager:: get_user_list_from_course_code(
                 $courseCode,
                 $sessionId
             );
-		} else {
+        } else {
             $a_course_users = CourseManager:: get_user_list_from_course_code(
                 $courseCode,
                 0
             );
-	    }
-		foreach ($a_course_users as $user_id=>$course_user) {
-			$users_of_course[] = $course_user['user_id'];
-	    }
-	}
+        }
+        foreach ($a_course_users as $user_id=>$course_user) {
+            $users_of_course[] = $course_user['user_id'];
+        }
+    }
     $sql .=" AND u.status <> ".ANONYMOUS." ";
-	$res = Database::query($sql);
+    $res = Database::query($sql);
     $count_user = 0;
 
     if ($res) {
-	   $row = Database::fetch_row($res);
-	   $count_user = $row[0];
-	}
+        $row = Database::fetch_row($res);
+        $count_user = $row[0];
+    }
 
-	return $count_user;
+    return $count_user;
 }
 /**
  * Get the users to display on the current page.
@@ -468,17 +468,17 @@ 
     $url_access_id = api_get_current_access_url_id();
     $course_code = api_get_course_id();
     $session_id = api_get_session_id();
-	$courseId = api_get_course_int_id();
+    $courseId = api_get_course_int_id();
 
-	// Database table definitions
-	$user_table = Database::get_main_table(TABLE_MAIN_USER);
-	$course_user_table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
-	$tbl_session_rel_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
-	$table_user_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
+    // Database table definitions
+    $user_table = Database::get_main_table(TABLE_MAIN_USER);
+    $course_user_table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
+    $tbl_session_rel_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
+    $table_user_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
     $tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
 
     // adding teachers
-	$is_western_name_order = api_is_western_name_order();
+    $is_western_name_order = api_is_western_name_order();
 
     if (api_get_setting('show_email_addresses') == 'true') {
 
@@ -503,10 +503,10 @@ 
                 u.active               AS col4,
                 u.user_id              AS col5";
     }
-	if (isset($_REQUEST['type']) && $_REQUEST['type'] == COURSEMANAGER) {
-		// adding a teacher through a session
-		if (!empty($session_id)) {
-			$sql = "SELECT $select_fields
+    if (isset($_REQUEST['type']) && $_REQUEST['type'] == COURSEMANAGER) {
+        // adding a teacher through a session
+        if (!empty($session_id)) {
+            $sql = "SELECT $select_fields
 					FROM $user_table u
 					LEFT JOIN $tbl_session_rel_course_user cu
 					ON
@@ -516,13 +516,13 @@ 
                     INNER JOIN  $tbl_url_rel_user as url_rel_user
                     ON (url_rel_user.user_id = u.user_id) ";
 
-			// applying the filter of the additional user profile fields
-			if (isset($_GET['subscribe_user_filter_value']) &&
-				!empty($_GET['subscribe_user_filter_value']) &&
-				api_get_setting('ProfilingFilterAddingUsers') == 'true'
-			) {
-				$field_identification = explode('*',$_GET['subscribe_user_filter_value']);
-				$sql .=	"
+            // applying the filter of the additional user profile fields
+            if (isset($_GET['subscribe_user_filter_value']) &&
+                !empty($_GET['subscribe_user_filter_value']) &&
+                api_get_setting('ProfilingFilterAddingUsers') == 'true'
+            ) {
+                $field_identification = explode('*',$_GET['subscribe_user_filter_value']);
+                $sql .=	"
 					LEFT JOIN $table_user_field_values field_values
 						ON field_values.item_id = u.user_id
 					WHERE
@@ -531,53 +531,53 @@ 
 						(u.official_code <> 'ADMIN' OR u.official_code IS NULL) AND
 						field_values.field_id = '".intval($field_identification[0])."' AND
 						field_values.value = '".Database::escape_string($field_identification[1])."'";
-			} else {
-				$sql .=	"WHERE cu.user_id IS NULL AND u.status=1 AND (u.official_code <> 'ADMIN' OR u.official_code IS NULL) ";
-			}
+            } else {
+                $sql .=	"WHERE cu.user_id IS NULL AND u.status=1 AND (u.official_code <> 'ADMIN' OR u.official_code IS NULL) ";
+            }
 
             $sql .=	" AND access_url_id= $url_access_id";
 
-		} else {
-		     // adding a teacher NOT through a session
-			$sql = "SELECT $select_fields
+        } else {
+                // adding a teacher NOT through a session
+            $sql = "SELECT $select_fields
                     FROM $user_table u
                     LEFT JOIN $course_user_table cu
                     ON u.user_id = cu.user_id AND c_id = '".$courseId."'";
 
-				// applying the filter of the additional user profile fields
-				if (isset($_GET['subscribe_user_filter_value']) &&
-					!empty($_GET['subscribe_user_filter_value']) &&
-					api_get_setting('ProfilingFilterAddingUsers') == 'true'
-				) {
-					$field_identification = explode('*',$_GET['subscribe_user_filter_value']);
-					$sql .=	"
+                // applying the filter of the additional user profile fields
+                if (isset($_GET['subscribe_user_filter_value']) &&
+                    !empty($_GET['subscribe_user_filter_value']) &&
+                    api_get_setting('ProfilingFilterAddingUsers') == 'true'
+                ) {
+                    $field_identification = explode('*',$_GET['subscribe_user_filter_value']);
+                    $sql .=	"
 						LEFT JOIN $table_user_field_values field_values
 							ON field_values.item_id = u.user_id
 						WHERE
 							cu.user_id IS NULL AND u.status<>".DRH." AND
 							field_values.field_id = '".intval($field_identification[0])."' AND
 							field_values.value = '".Database::escape_string($field_identification[1])."'";
-				} else	{
-					$sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
-				}
-
-				// adding a teacher NOT trough a session on a portal with multiple URLs
-				if (api_is_multiple_url_enabled()) {
-					if ($url_access_id !=-1) {
-						$sql = "SELECT $select_fields
+                } else	{
+                    $sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
+                }
+
+                // adding a teacher NOT trough a session on a portal with multiple URLs
+                if (api_is_multiple_url_enabled()) {
+                    if ($url_access_id !=-1) {
+                        $sql = "SELECT $select_fields
 						FROM $user_table u
 						LEFT JOIN $course_user_table cu
 						ON u.user_id = cu.user_id and c_id='".$courseId."'
 						INNER JOIN  $tbl_url_rel_user as url_rel_user
 						ON (url_rel_user.user_id = u.user_id) ";
 
-					// applying the filter of the additional user profile fields
-					if (isset($_GET['subscribe_user_filter_value']) &&
-						!empty($_GET['subscribe_user_filter_value']) &&
-						api_get_setting('ProfilingFilterAddingUsers') == 'true'
-					){
-						$field_identification = explode('*', $_GET['subscribe_user_filter_value']);
-						$sql .=	"
+                    // applying the filter of the additional user profile fields
+                    if (isset($_GET['subscribe_user_filter_value']) &&
+                        !empty($_GET['subscribe_user_filter_value']) &&
+                        api_get_setting('ProfilingFilterAddingUsers') == 'true'
+                    ){
+                        $field_identification = explode('*', $_GET['subscribe_user_filter_value']);
+                        $sql .=	"
 							LEFT JOIN $table_user_field_values field_values
 								ON field_values.item_id = u.user_id
 							WHERE
@@ -585,16 +585,16 @@ 
 							 	u.status<>".DRH." AND
 							 	field_values.field_id = '".intval($field_identification[0])."' AND
 							 	field_values.value = '".Database::escape_string($field_identification[1])."'";
-					} else	{
-						$sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
-					}
-				}
-			}
-		}
-	} else {
-		// adding a student
-		if (!empty($session_id)) {
-			$sql = "SELECT $select_fields
+                    } else	{
+                        $sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
+                    }
+                }
+            }
+        }
+    } else {
+        // adding a student
+        if (!empty($session_id)) {
+            $sql = "SELECT $select_fields
                     FROM $user_table u
                     LEFT JOIN $tbl_session_rel_course_user cu
                     ON
@@ -629,7 +629,7 @@ 
                 $sql .=  "AND access_url_id = $url_access_id";
             }
 
-		} else {
+        } else {
             $sql = "SELECT $select_fields
                     FROM $user_table u
                     LEFT JOIN $course_user_table cu
@@ -637,10 +637,10 @@ 
                     	u.user_id = cu.user_id AND
                     	c_id ='".$courseId."'";
 
-			// applying the filter of the additional user profile fields
-			if (isset($_GET['subscribe_user_filter_value']) && !empty($_GET['subscribe_user_filter_value'])){
-				$field_identification = explode('*',$_GET['subscribe_user_filter_value']);
-				$sql .=	"
+            // applying the filter of the additional user profile fields
+            if (isset($_GET['subscribe_user_filter_value']) && !empty($_GET['subscribe_user_filter_value'])){
+                $field_identification = explode('*',$_GET['subscribe_user_filter_value']);
+                $sql .=	"
 					LEFT JOIN $table_user_field_values field_values
 						ON field_values.item_id = u.user_id
 					WHERE
@@ -648,28 +648,28 @@ 
 						u.status<>".DRH." AND
 						field_values.field_id = '".intval($field_identification[0])."' AND
 						field_values.value = '".Database::escape_string($field_identification[1])."'";
-			} else	{
-				$sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
-			}
+            } else	{
+                $sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
+            }
 
-			//showing only the courses of the current Chamilo access_url_id
+            //showing only the courses of the current Chamilo access_url_id
 
-			if (api_is_multiple_url_enabled()) {
-				if ($url_access_id !=-1) {
-					$sql = "SELECT $select_fields
+            if (api_is_multiple_url_enabled()) {
+                if ($url_access_id !=-1) {
+                    $sql = "SELECT $select_fields
 						FROM $user_table u
 						LEFT JOIN $course_user_table cu
 						ON u.user_id = cu.user_id AND c_id='".$courseId."'
 						INNER JOIN  $tbl_url_rel_user as url_rel_user
 						ON (url_rel_user.user_id = u.user_id) ";
 
-					// applying the filter of the additional user profile fields
-					if (isset($_GET['subscribe_user_filter_value']) &&
-						!empty($_GET['subscribe_user_filter_value']) &&
-						api_get_setting('ProfilingFilterAddingUsers') == 'true'
-					){
-						$field_identification = explode('*', $_GET['subscribe_user_filter_value']);
-						$sql .=	"
+                    // applying the filter of the additional user profile fields
+                    if (isset($_GET['subscribe_user_filter_value']) &&
+                        !empty($_GET['subscribe_user_filter_value']) &&
+                        api_get_setting('ProfilingFilterAddingUsers') == 'true'
+                    ){
+                        $field_identification = explode('*', $_GET['subscribe_user_filter_value']);
+                        $sql .=	"
 							LEFT JOIN $table_user_field_values field_values
 								ON field_values.item_id = u.user_id
 							WHERE
@@ -679,19 +679,19 @@ 
 								field_values.value = '".Database::escape_string($field_identification[1])."' AND
 								access_url_id = $url_access_id
                             ";
-					} else	{
-						$sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
-					}
-				}
-			}
-		}
-	}
-
-	// adding additional WHERE statements to the SQL for the search functionality
+                    } else	{
+                        $sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
+                    }
+                }
+            }
+        }
+    }
+
+    // adding additional WHERE statements to the SQL for the search functionality
     $additional_users = null;
-	if (isset($_REQUEST['keyword'])) {
-		$keyword = Database::escape_string(trim($_REQUEST['keyword']));
-		$sql .= " AND (
+    if (isset($_REQUEST['keyword'])) {
+        $keyword = Database::escape_string(trim($_REQUEST['keyword']));
+        $sql .= " AND (
 					firstname LIKE '%".$keyword."%' OR
 					lastname LIKE '%".$keyword."%' OR
 					email LIKE '%".$keyword."%' OR
@@ -700,46 +700,46 @@ 
 					)
 				";
 
-		if (api_get_setting('ProfilingFilterAddingUsers') == 'true') {
-			// we also want to search for users who have something in
-			// their profile fields that matches the keyword
-			$additional_users = search_additional_profile_fields($keyword);
-		}
-
-		// getting all the users of the course (to make sure that we do not
-		// display users that are already in the course)
-		if (!empty($session_id)) {
-			$a_course_users = CourseManager :: get_user_list_from_course_code($course_code, $session_id);
-		} else {
-			$a_course_users = CourseManager :: get_user_list_from_course_code($course_code, 0);
-	    }
-		foreach ($a_course_users as $user_id=>$course_user) {
-			$users_of_course[] = $course_user['user_id'];
-		}
-	}
-
-	$sql .=" AND u.status != ".ANONYMOUS." ";
-
-	// Sorting and pagination (used by the sortable table)
-	$sql .= " ORDER BY col$column $direction ";
-	$sql .= " LIMIT $from,$number_of_items";
-
-	$res = Database::query($sql);
-	$users = array ();
-	while ($user = Database::fetch_row($res)) {
-		$users[] = $user;
-		$_SESSION['session_user_id'][] = $user[0];
-		if ($is_western_name_order) {
-			$_SESSION['session_user_name'][] = api_get_person_name($user[2], $user[3]);
-		} else {
-			$_SESSION['session_user_name'][] = api_get_person_name($user[3], $user[2]);
-		}
-	}
-	// adding additional users based on the search on the additional profile fields
-	if (isset($_REQUEST['keyword'])){
-		if (is_array($additional_users)) {
-			foreach($additional_users as $additional_user_key=>$additional_user_value){
-				if (!in_array($additional_user_key, $_SESSION['session_user_id']) &&
+        if (api_get_setting('ProfilingFilterAddingUsers') == 'true') {
+            // we also want to search for users who have something in
+            // their profile fields that matches the keyword
+            $additional_users = search_additional_profile_fields($keyword);
+        }
+
+        // getting all the users of the course (to make sure that we do not
+        // display users that are already in the course)
+        if (!empty($session_id)) {
+            $a_course_users = CourseManager :: get_user_list_from_course_code($course_code, $session_id);
+        } else {
+            $a_course_users = CourseManager :: get_user_list_from_course_code($course_code, 0);
+        }
+        foreach ($a_course_users as $user_id=>$course_user) {
+            $users_of_course[] = $course_user['user_id'];
+        }
+    }
+
+    $sql .=" AND u.status != ".ANONYMOUS." ";
+
+    // Sorting and pagination (used by the sortable table)
+    $sql .= " ORDER BY col$column $direction ";
+    $sql .= " LIMIT $from,$number_of_items";
+
+    $res = Database::query($sql);
+    $users = array ();
+    while ($user = Database::fetch_row($res)) {
+        $users[] = $user;
+        $_SESSION['session_user_id'][] = $user[0];
+        if ($is_western_name_order) {
+            $_SESSION['session_user_name'][] = api_get_person_name($user[2], $user[3]);
+        } else {
+            $_SESSION['session_user_name'][] = api_get_person_name($user[3], $user[2]);
+        }
+    }
+    // adding additional users based on the search on the additional profile fields
+    if (isset($_REQUEST['keyword'])){
+        if (is_array($additional_users)) {
+            foreach($additional_users as $additional_user_key=>$additional_user_value){
+                if (!in_array($additional_user_key, $_SESSION['session_user_id']) &&
                     !in_array($additional_user_key,$users_of_course)
                 ){
                     $users[] = array(
@@ -751,11 +751,11 @@ 
                         $additional_user_value['col5'],
                         $additional_user_value['col6'],
                     );
-				}
-			}
-		}
-	}
-	return $users;
+                }
+            }
+        }
+    }
+    return $users;
 }
 /**
 * Returns a mailto-link
@@ -763,7 +763,7 @@ 
 * @return string HTML-code with a mailto-link
 */
 function email_filter($email) {
-	return Display :: encrypted_mailto_link($email, $email);
+    return Display :: encrypted_mailto_link($email, $email);
 }
 /**
  * Build the reg-column of the table
@@ -776,8 +776,8 @@ 
     } else {
         $type = STUDENT;
     }
-	$result = '<a class="btn btn-small btn-primary" href="'.api_get_self().'?register=yes&type='.$type.'&user_id='.$user_id.'">'.get_lang("reg").'</a>';
-	return $result;
+    $result = '<a class="btn btn-small btn-primary" href="'.api_get_self().'?register=yes&type='.$type.'&user_id='.$user_id.'">'.get_lang("reg").'</a>';
+    return $result;
 }
 
 /**
@@ -791,23 +791,23 @@ 
  */
 
 function active_filter($active, $url_params, $row) {
-	$_user = api_get_user_info();
-	if ($active=='1') {
-		$action='AccountActive';
-		$image='accept';
-	}
-
-	if ($active=='0') {
-		$action='AccountInactive';
-		$image='error';
-	}
+    $_user = api_get_user_info();
+    if ($active=='1') {
+        $action='AccountActive';
+        $image='accept';
+    }
+
+    if ($active=='0') {
+        $action='AccountInactive';
+        $image='error';
+    }
     $result = null;
-	if ($row['0']<>$_user['user_id']) {
-	// you cannot lock yourself out otherwise you could disable all the accounts
-	// including your own => everybody is locked out and nobody can change it anymore.
-		$result = Display::return_icon($image.'.png',  get_lang(ucfirst($action)), array() , ICON_SIZE_TINY);
-	}
-	return $result;
+    if ($row['0']<>$_user['user_id']) {
+    // you cannot lock yourself out otherwise you could disable all the accounts
+    // including your own => everybody is locked out and nobody can change it anymore.
+        $result = Display::return_icon($image.'.png',  get_lang(ucfirst($action)), array() , ICON_SIZE_TINY);
+    }
+    return $result;
 }
 
 /**
@@ -825,29 +825,29 @@ 
  */
 function search_additional_profile_fields($keyword)
 {
-	// database table definitions
-	$table_user_field_options = Database :: get_main_table(TABLE_EXTRA_FIELD_OPTIONS);
-	$table_user_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
+    // database table definitions
+    $table_user_field_options = Database :: get_main_table(TABLE_EXTRA_FIELD_OPTIONS);
+    $table_user_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
     $tableExtraField = Database::get_main_table(TABLE_EXTRA_FIELD);
-	$table_user = Database::get_main_table(TABLE_MAIN_USER);
+    $table_user = Database::get_main_table(TABLE_MAIN_USER);
 
-	// getting the field option text that match this keyword (for radio buttons and checkboxes)
-	$sql = "SELECT * FROM $table_user_field_options
+    // getting the field option text that match this keyword (for radio buttons and checkboxes)
+    $sql = "SELECT * FROM $table_user_field_options
 	        WHERE display_text LIKE '%".$keyword."%'";
-	$result_profiling = Database::query($sql);
-	while ($profiling_field_options = Database::fetch_array($result_profiling)) {
-		$profiling_field_options_exact_values[] = $profiling_field_options;
-	}
+    $result_profiling = Database::query($sql);
+    while ($profiling_field_options = Database::fetch_array($result_profiling)) {
+        $profiling_field_options_exact_values[] = $profiling_field_options;
+    }
     $profiling_field_options_exact_values_sql = '';
-	foreach ($profiling_field_options_exact_values as $profilingkey => $profilingvalue){
-		$profiling_field_options_exact_values_sql .= " OR (field_id = '".$profilingvalue['field_id']."' AND value='".$profilingvalue['option_value']."') ";
-	}
+    foreach ($profiling_field_options_exact_values as $profilingkey => $profilingvalue){
+        $profiling_field_options_exact_values_sql .= " OR (field_id = '".$profilingvalue['field_id']."' AND value='".$profilingvalue['option_value']."') ";
+    }
 
     $extraFieldType = ExtraField::USER_FIELD_TYPE;
 
-	// getting all the user ids of the users who have chosen on of the predefined fields that contain the keyword
-	// or all the users who have entered the keyword in a free-form field
-	$sql = "SELECT
+    // getting all the user ids of the users who have chosen on of the predefined fields that contain the keyword
+    // or all the users who have entered the keyword in a free-form field
+    $sql = "SELECT
 	            user.user_id as col0,
 	            user.official_code as col1,
 	            user.lastname as col2,
@@ -861,13 +861,13 @@ 
                 user_values.field_id = e.id AND
                 e.extra_field_type = $extraFieldType AND
                 (value LIKE '%".$keyword."%'".$profiling_field_options_exact_values_sql.")";
-	$result = Database::query($sql);
+    $result = Database::query($sql);
     $additional_users = array();
-	while ($profiled_users = Database::fetch_array($result)) {
-		$additional_users[$profiled_users['col0']] = $profiled_users;
-	}
+    while ($profiled_users = Database::fetch_array($result)) {
+        $additional_users[$profiled_users['col0']] = $profiled_users;
+    }
 
-	return $additional_users;
+    return $additional_users;
 }
 
 /**
@@ -879,41 +879,41 @@ 
  */
 function display_extra_profile_fields_filter()
 {
-	// getting all the additional user profile fields
-	$extra = UserManager::get_extra_fields(0,50,5,'ASC');
-
-	$return='<option value="">'.get_lang('SelectFilter').'</option>';
-
-	// looping through the additional user profile fields
-	foreach ($extra as $id => $field_details) {
-		// $field_details[2] contains the type of the additional user profile field
-		switch ($field_details[2]) {
-			// text fields cannot be used as a filter
-			case ExtraFieldModel::FIELD_TYPE_TEXT:
-				break;
-			// text area fields cannot be used as a filter
-			case ExtraFieldModel::FIELD_TYPE_TEXTAREA:
-				break;
-			case ExtraFieldModel::FIELD_TYPE_RADIO:
-			case ExtraFieldModel::FIELD_TYPE_SELECT:
-			case ExtraFieldModel::FIELD_TYPE_SELECT_MULTIPLE:
-				$return .= '<optgroup label="'.$field_details[3].'">';
-				foreach($field_details[9] as $option_id => $option_details) {
-					if ($_GET['subscribe_user_filter_value'] == $field_details[0].'*'.$option_details[1]) {
-						$selected = 'selected="selected"';
-					} else {
-						$selected = false;
-					}
-					$return .= '<option value="'.$field_details[0].'*'.$option_details[1].'" '.$selected.'>'.$option_details[2].'</option>';
-				}
-				$return .= '</optgroup>';
-				break;
-		}
-	}
-
-	echo '<form id="subscribe_user_filter" name="subscribe_user_filter" method="get" action="'.api_get_self().'?api_get_cidreq" style="float:left;">';
-	echo '	<input type="hidden" name="type" id="type" value="'.Security::remove_XSS($_REQUEST['type']).'" />';
-	echo   '<select name="subscribe_user_filter_value" id="subscribe_user_filter_value">'.$return.'</select>';
-	echo   '<button type="submit" name="submit_filter" id="submit_filter" value="" class="search">'.get_lang('Filter').'</button>';
-	echo '</form>';
+    // getting all the additional user profile fields
+    $extra = UserManager::get_extra_fields(0,50,5,'ASC');
+
+    $return='<option value="">'.get_lang('SelectFilter').'</option>';
+
+    // looping through the additional user profile fields
+    foreach ($extra as $id => $field_details) {
+        // $field_details[2] contains the type of the additional user profile field
+        switch ($field_details[2]) {
+            // text fields cannot be used as a filter
+            case ExtraFieldModel::FIELD_TYPE_TEXT:
+                break;
+            // text area fields cannot be used as a filter
+            case ExtraFieldModel::FIELD_TYPE_TEXTAREA:
+                break;
+            case ExtraFieldModel::FIELD_TYPE_RADIO:
+            case ExtraFieldModel::FIELD_TYPE_SELECT:
+            case ExtraFieldModel::FIELD_TYPE_SELECT_MULTIPLE:
+                $return .= '<optgroup label="'.$field_details[3].'">';
+                foreach($field_details[9] as $option_id => $option_details) {
+                    if ($_GET['subscribe_user_filter_value'] == $field_details[0].'*'.$option_details[1]) {
+                        $selected = 'selected="selected"';
+                    } else {
+                        $selected = false;
+                    }
+                    $return .= '<option value="'.$field_details[0].'*'.$option_details[1].'" '.$selected.'>'.$option_details[2].'</option>';
+                }
+                $return .= '</optgroup>';
+                break;
+        }
+    }
+
+    echo '<form id="subscribe_user_filter" name="subscribe_user_filter" method="get" action="'.api_get_self().'?api_get_cidreq" style="float:left;">';
+    echo '	<input type="hidden" name="type" id="type" value="'.Security::remove_XSS($_REQUEST['type']).'" />';
+    echo   '<select name="subscribe_user_filter_value" id="subscribe_user_filter_value">'.$return.'</select>';
+    echo   '<button type="submit" name="submit_filter" id="submit_filter" value="" class="search">'.get_lang('Filter').'</button>';
+    echo '</form>';
 }

main/admin/configure_extensions.php

Indentation +27 added lines, -27 removed lines

@@ -17,56 +17,56 @@ 
 $message = '';
 
 if (isset($_POST['activeExtension'])) {
-	switch ($_POST['extension_code']) {
-		case 'ppt2lp':
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
+    switch ($_POST['extension_code']) {
+        case 'ppt2lp':
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
 					selected_value="true"
 					WHERE variable="service_ppt2lp"
 					AND subkey="active"';
 
-			$rs = Database::query($sql);
+            $rs = Database::query($sql);
 
-			if (Database::affected_rows($rs)>0){
-				$message = get_lang('ServiceActivated');
-			}
+            if (Database::affected_rows($rs)>0){
+                $message = get_lang('ServiceActivated');
+            }
 
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
 					selected_value="'.addslashes($_POST['host']).'"
 					WHERE variable="service_ppt2lp"
 					AND subkey="host"';
-			Database::query($sql);
+            Database::query($sql);
 
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
 					selected_value="'.addslashes($_POST['port']).'"
 					WHERE variable="service_ppt2lp"
 					AND subkey="port"';
-			Database::query($sql);
+            Database::query($sql);
 
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
 					selected_value="'.addslashes($_POST['ftp_password']).'"
 					WHERE variable="service_ppt2lp"
 					AND subkey="ftp_password"';
-			Database::query($sql);
+            Database::query($sql);
 
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
 					selected_value="'.addslashes($_POST['user']).'"
 					WHERE variable="service_ppt2lp"
 					AND subkey="user"';
-			Database::query($sql);
+            Database::query($sql);
 
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
 					selected_value="'.addslashes($_POST['path_to_lzx']).'"
 					WHERE variable="service_ppt2lp"
 					AND subkey="path_to_lzx"';
-			Database::query($sql);
+            Database::query($sql);
 
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
 					selected_value="'.addslashes($_POST['size']).'"
 					WHERE variable="service_ppt2lp"
 					AND subkey="size"';
-			Database::query($sql);
-			break;
-	}
+            Database::query($sql);
+            break;
+    }
 }
 
 $listActiveServices = array();
@@ -77,13 +77,13 @@ 
 
 $rs = Database::query($sql);
 while($row = Database::fetch_array($rs)){
-	$listActiveServices[] = $row['variable'];
+    $listActiveServices[] = $row['variable'];
 }
 
 // javascript to handle accordion behaviour
 $javascript_message = '';
 if(!empty($message)){
-	$javascript_message = '
+    $javascript_message = '
 	document.getElementById("message").style.display = "block";
 	var timer = setTimeout(hideMessage, 5000);';
 }
@@ -135,9 +135,9 @@ 
 ?>
 <div id="message" style="display: none">
 	<?php
-	if(!empty($message))
-		Display::display_normal_message($message)
-	?>
+    if(!empty($message))
+        Display::display_normal_message($message)
+    ?>
 </div>
 
 <div id="content" align="center">
@@ -200,7 +200,7 @@ 
         </div>
     </div>
 	<?php
-	/*
+    /*
 	<!-- EPHORUS -->
 	<div id="main_ephorus">
 		<div id="extension_header_ephorus" class="accordion_header">