chamilo / chamilo-lms

main/admin/user_list.php

Indentation +84 added lines, -84 removed lines

@@ -372,13 +372,13 @@ 
     $firstname = $userInfo['firstname'];
     $lastname = $userInfo['lastname'];
 
-	if (api_is_western_name_order()) {
-		$message = sprintf(get_lang('AttemptingToLoginAs'),$firstname, $lastname, $userId);
-	} else {
-		$message = sprintf(get_lang('AttemptingToLoginAs'), $lastname, $firstname, $userId);
-	}
+    if (api_is_western_name_order()) {
+        $message = sprintf(get_lang('AttemptingToLoginAs'),$firstname, $lastname, $userId);
+    } else {
+        $message = sprintf(get_lang('AttemptingToLoginAs'), $lastname, $firstname, $userId);
+    }
 
-	if ($userId) {
+    if ($userId) {
 
         // Logout the current user
         LoginDelete(api_get_user_id());
@@ -453,7 +453,7 @@ 
     }*/
 
     if (!in_array($direction, array('ASC','DESC'))) {
-    	$direction = 'ASC';
+        $direction = 'ASC';
     }
     $column = intval($column);
     $from = intval($from);
@@ -464,23 +464,23 @@ 
         $sql .= " WHERE u.creator_id = ".api_get_user_id();
     }
 
-	$sql .= " ORDER BY col$column $direction ";
-	$sql .= " LIMIT $from,$number_of_items";
+    $sql .= " ORDER BY col$column $direction ";
+    $sql .= " LIMIT $from,$number_of_items";
 
-	$res = Database::query($sql);
+    $res = Database::query($sql);
 
-	$users = array ();
+    $users = array ();
     $t = time();
-	while ($user = Database::fetch_row($res)) {
-		$userPicture = UserManager::getUserPicture($user[0], USER_IMAGE_SIZE_SMALL);
-		$photo = '<img src="'.$userPicture.'" width="22" height="22" alt="'.api_get_person_name($user[2], $user[3]).'" title="'.api_get_person_name($user[2], $user[3]).'" />';
+    while ($user = Database::fetch_row($res)) {
+        $userPicture = UserManager::getUserPicture($user[0], USER_IMAGE_SIZE_SMALL);
+        $photo = '<img src="'.$userPicture.'" width="22" height="22" alt="'.api_get_person_name($user[2], $user[3]).'" title="'.api_get_person_name($user[2], $user[3]).'" />';
 
         if ($user[7] == 1 && !empty($user[10])) {
             // check expiration date
             $expiration_time = convert_sql_date($user[10]);
             // if expiration date is passed, store a special value for active field
             if ($expiration_time < $t) {
-        	   $user[7] = '-1';
+                $user[7] = '-1';
             }
         }
 
@@ -510,7 +510,7 @@ 
 */
 function email_filter($email)
 {
-	return Display :: encrypted_mailto_link($email, $email);
+    return Display :: encrypted_mailto_link($email, $email);
 }
 
 /**
@@ -520,7 +520,7 @@ 
 */
 function user_filter($name, $params, $row)
 {
-	return '<a href="'.api_get_path(WEB_PATH).'whoisonline.php?origin=user_list&id='.$row[0].'">'.$name.'</a>';
+    return '<a href="'.api_get_path(WEB_PATH).'whoisonline.php?origin=user_list&id='.$row[0].'">'.$name.'</a>';
 }
 
 /**
@@ -532,23 +532,23 @@ 
  */
 function modify_filter($user_id, $url_params, $row)
 {
-	global $charset, $_admins_list;
+    global $charset, $_admins_list;
     $is_admin = in_array($user_id, $_admins_list);
     $statusname = api_get_status_langvars();
     $user_is_anonymous = false;
     $current_user_status_label = $row['7'];
 
-	if ($current_user_status_label == $statusname[ANONYMOUS]) {
-		$user_is_anonymous = true;
-	}
-	$result = '';
-	if (!$user_is_anonymous) {
+    if ($current_user_status_label == $statusname[ANONYMOUS]) {
+        $user_is_anonymous = true;
+    }
+    $result = '';
+    if (!$user_is_anonymous) {
         $icon = Display::return_icon(
             'course.png',
             get_lang('Courses'),
             array('onmouseout' => 'clear_course_list (\'div_'.$user_id.'\')')
         );
-		$result .= '<a href="javascript:void(0)" onclick="load_course_list(\'div_'.$user_id.'\','.$user_id.')" >
+        $result .= '<a href="javascript:void(0)" onclick="load_course_list(\'div_'.$user_id.'\','.$user_id.')" >
 			        '.$icon.'
 					<div class="blackboard_hide" id="div_'.$user_id.'">&nbsp;&nbsp;</div>
 					</a>';
@@ -558,14 +558,14 @@ 
             get_lang('Sessions'),
             array('onmouseout' => 'clear_session_list (\'div_s_'.$user_id.'\')')
         );
-		$result .= '<a href="javascript:void(0)" onclick="load_session_list(\'div_s_'.$user_id.'\','.$user_id.')" >
+        $result .= '<a href="javascript:void(0)" onclick="load_session_list(\'div_s_'.$user_id.'\','.$user_id.')" >
 					'.$icon.'
 					<div class="blackboard_hide" id="div_s_'.$user_id.'">&nbsp;&nbsp;</div>
 					</a>';
-	} else {
-		$result .= Display::return_icon('course_na.png',get_lang('Courses')).'&nbsp;&nbsp;';
-		$result .= Display::return_icon('course_na.png',get_lang('Sessions')).'&nbsp;&nbsp;';
-	}
+    } else {
+        $result .= Display::return_icon('course_na.png',get_lang('Courses')).'&nbsp;&nbsp;';
+        $result .= Display::return_icon('course_na.png',get_lang('Sessions')).'&nbsp;&nbsp;';
+    }
 
     if (api_is_platform_admin()) {
         if (!$user_is_anonymous) {
@@ -614,18 +614,18 @@ 
         );
     }
 
-	if ($is_admin) {
+    if ($is_admin) {
         $result .= Display::return_icon(
             'admin_star.png',
             get_lang('IsAdministrator'),
             array('width' => ICON_SIZE_SMALL, 'heigth' => ICON_SIZE_SMALL)
         );
-	} else {
-		$result .= Display::return_icon('admin_star_na.png', get_lang('IsNotAdministrator'));
-	}
+    } else {
+        $result .= Display::return_icon('admin_star_na.png', get_lang('IsNotAdministrator'));
+    }
 
-	// actions for assigning sessions, courses or users
-	if (!api_is_session_admin()) {
+    // actions for assigning sessions, courses or users
+    if (!api_is_session_admin()) {
         if ($current_user_status_label == $statusname[SESSIONADMIN]) {
             $result .= Display::url(
                 Display::return_icon('view_more_stats.gif', get_lang('AssignSessions')),
@@ -655,7 +655,7 @@ 
                 );
             }
         }
-	}
+    }
 
     if (api_is_platform_admin()) {
         $result .= ' <a data-title="'.get_lang('FreeBusyCalendar').'" href="'.api_get_path(WEB_AJAX_PATH).'agenda.ajax.php?a=get_user_agenda&user_id='.$user_id.'&modal_size=lg" class="agenda_opener ajax">'.
@@ -674,7 +674,7 @@ 
         }
     }
 
-	return $result;
+    return $result;
 }
 
 /**
@@ -706,16 +706,16 @@ 
     if ($action === 'edit') {
         $result = Display::return_icon($image.'.png', get_lang('AccountExpired'), array(), 16);
     } elseif ($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.
+        // 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('onclick' => 'active_user(this);', 'id' => 'img_'.$row['0']),
             16
         );
-	}
+    }
 
-	return $result;
+    return $result;
 }
 
 /**
@@ -728,8 +728,8 @@ 
  * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University, Belgium
  */
 function status_filter($status) {
-	$statusname = api_get_status_langvars();
-	return $statusname[$status];
+    $statusname = api_get_status_langvars();
+    return $statusname[$status];
 }
 
 if (isset($_GET['keyword']) || isset($_GET['keyword_firstname'])) {
@@ -745,8 +745,8 @@ 
 
 if (!empty($action)) {
     $check = Security::check_token('get');
-	if ($check) {
-		switch ($action) {
+    if ($check) {
+        switch ($action) {
             case 'add_user_to_my_url':
                 $user_id = $_REQUEST["user_id"];
                 $result = UrlManager::add_user_to_url($user_id, $current_access_url_id);
@@ -756,45 +756,45 @@ 
                     $message  = Display::return_message($message, 'confirmation');
                 }
                 break;
-			case 'delete_user':
-				if (api_is_platform_admin()) {
+            case 'delete_user':
+                if (api_is_platform_admin()) {
                     $user_to_delete = $_GET['user_id'];
                     $current_user_id = api_get_user_id();
 
-					if ($deleteUserAvailable && api_global_admin_can_edit_admin($_GET['user_id'])) {
-						if ($user_to_delete != $current_user_id && UserManager :: delete_user($_GET['user_id'])) {
-							$message = Display :: return_message(get_lang('UserDeleted'), 'confirmation');
-						} else {
-							$message = Display :: return_message(get_lang('CannotDeleteUserBecauseOwnsCourse'), 'error');
-						}
-					} else {
-						$message = Display :: return_message(get_lang('CannotDeleteUser'),'error');
-					}
-				}
-				break;
+                    if ($deleteUserAvailable && api_global_admin_can_edit_admin($_GET['user_id'])) {
+                        if ($user_to_delete != $current_user_id && UserManager :: delete_user($_GET['user_id'])) {
+                            $message = Display :: return_message(get_lang('UserDeleted'), 'confirmation');
+                        } else {
+                            $message = Display :: return_message(get_lang('CannotDeleteUserBecauseOwnsCourse'), 'error');
+                        }
+                    } else {
+                        $message = Display :: return_message(get_lang('CannotDeleteUser'),'error');
+                    }
+                }
+                break;
             case 'delete':
-				if (api_is_platform_admin()) {
-					$number_of_selected_users = count($_POST['id']);
-					$number_of_deleted_users = 0;
-					if (is_array($_POST['id'])) {
-						foreach ($_POST['id'] as $index => $user_id) {
-							if ($user_id != $_user['user_id']) {
-								if (UserManager::delete_user($user_id)) {
-									$number_of_deleted_users++;
-								}
-							}
-						}
-					}
-					if ($number_of_selected_users == $number_of_deleted_users) {
+                if (api_is_platform_admin()) {
+                    $number_of_selected_users = count($_POST['id']);
+                    $number_of_deleted_users = 0;
+                    if (is_array($_POST['id'])) {
+                        foreach ($_POST['id'] as $index => $user_id) {
+                            if ($user_id != $_user['user_id']) {
+                                if (UserManager::delete_user($user_id)) {
+                                    $number_of_deleted_users++;
+                                }
+                            }
+                        }
+                    }
+                    if ($number_of_selected_users == $number_of_deleted_users) {
                         $message = Display :: return_message(get_lang('SelectedUsersDeleted'), 'confirmation');
-					} else {
+                    } else {
                         $message = Display :: return_message(get_lang('SomeUsersNotDeleted'), 'error');
-					}
-				}
-				break;
-		}
-		Security::clear_token();
-	}
+                    }
+                }
+                break;
+        }
+        Security::clear_token();
+    }
 }
 
 // Create a search-box
@@ -811,15 +811,15 @@ 
 $actionsCenter = '';
 $actionsRight  = '';
 if (api_is_platform_admin()) {
-	$actionsRight .= '<a class="pull-right" href="'.api_get_path(WEB_CODE_PATH).'admin/user_add.php">'.
-         Display::return_icon('new_user.png',get_lang('AddUsers'),'',ICON_SIZE_MEDIUM).'</a>';
+    $actionsRight .= '<a class="pull-right" href="'.api_get_path(WEB_CODE_PATH).'admin/user_add.php">'.
+            Display::return_icon('new_user.png',get_lang('AddUsers'),'',ICON_SIZE_MEDIUM).'</a>';
 }
 
 $actionsLeft .= $form->returnForm();
 $actionsCenter .= $searchAdvanced;
 
 if (isset($_GET['keyword'])) {
-	$parameters = array('keyword' => Security::remove_XSS($_GET['keyword']));
+    $parameters = array('keyword' => Security::remove_XSS($_GET['keyword']));
 } elseif (isset ($_GET['keyword_firstname'])) {
     $parameters['keyword_firstname'] = Security::remove_XSS($_GET['keyword_firstname']);
     $parameters['keyword_lastname'] = Security::remove_XSS($_GET['keyword_lastname']);
@@ -893,11 +893,11 @@ 
 $table->set_header(2, get_lang('OfficialCode'));
 
 if (api_is_western_name_order()) {
-	$table->set_header(3, get_lang('FirstName'));
-	$table->set_header(4, get_lang('LastName'));
+    $table->set_header(3, get_lang('FirstName'));
+    $table->set_header(4, get_lang('LastName'));
 } else {
-	$table->set_header(3, get_lang('LastName'));
-	$table->set_header(4, get_lang('FirstName'));
+    $table->set_header(3, get_lang('LastName'));
+    $table->set_header(4, get_lang('FirstName'));
 }
 $table->set_header(5, get_lang('LoginName'));
 $table->set_header(6, get_lang('Email'));

main/ticket/ticket_details.php

Indentation +1 added lines, -1 removed lines

@@ -433,7 +433,7 @@
         $form->addElement(
             'checkbox',
             'confirmation',
-             null,
+                null,
             $plugin->get_lang('RequestConfirmation')
         );
     }

main/messages/new_message.php

Indentation +35 added lines, -35 removed lines

@@ -77,20 +77,20 @@ 
 
 function show_compose_reply_to_message($message_id, $receiver_id)
 {
-	$table_message = Database::get_main_table(TABLE_MESSAGE);
-	$query = "SELECT user_sender_id
+    $table_message = Database::get_main_table(TABLE_MESSAGE);
+    $query = "SELECT user_sender_id
               FROM $table_message
 			  WHERE user_receiver_id = ".intval($receiver_id)." AND id='".intval($message_id)."';";
-	$result = Database::query($query);
-	$row = Database::fetch_array($result,'ASSOC');
-	if (!isset($row['user_sender_id'])) {
-		$html = get_lang('InvalidMessageId');
+    $result = Database::query($query);
+    $row = Database::fetch_array($result,'ASSOC');
+    if (!isset($row['user_sender_id'])) {
+        $html = get_lang('InvalidMessageId');
 
-		return $html;
-	}
-	$userInfo = api_get_user_info($row['user_sender_id']);
-	$default['users'] = array($row['user_sender_id']);
-	$html = manage_form($default, null, $userInfo['complete_name']);
+        return $html;
+    }
+    $userInfo = api_get_user_info($row['user_sender_id']);
+    $default['users'] = array($row['user_sender_id']);
+    $html = manage_form($default, null, $userInfo['complete_name']);
 
     return $html;
 }
@@ -98,10 +98,10 @@ 
 function show_compose_to_user ($receiver_id)
 {
     $userInfo = api_get_user_info($receiver_id);
-	$html = get_lang('To').':&nbsp;<strong>'.$userInfo['complete_name'].'</strong>';
-	$default['title'] = api_xml_http_response_encode(get_lang('EnterTitle'));
-	$default['users'] = array($receiver_id);
-	$html .= manage_form($default);
+    $html = get_lang('To').':&nbsp;<strong>'.$userInfo['complete_name'].'</strong>';
+    $default['title'] = api_xml_http_response_encode(get_lang('EnterTitle'));
+    $default['users'] = array($receiver_id);
+    $html .= manage_form($default);
 
     return $html;
 }
@@ -273,13 +273,13 @@ 
 
 /* MAIN SECTION */
 if ($socialToolIsActive) {
-	$this_section = SECTION_SOCIAL;
+    $this_section = SECTION_SOCIAL;
     $interbreadcrumb[] = array(
         'url' => api_get_path(WEB_PATH).'main/social/home.php',
         'name' => get_lang('SocialNetwork')
     );
 } else {
-	$this_section = SECTION_MYPROFILE;
+    $this_section = SECTION_MYPROFILE;
     $interbreadcrumb[] = array(
         'url' => api_get_path(WEB_PATH).'main/auth/profile.php',
         'name' => get_lang('Profile')
@@ -289,30 +289,30 @@ 
 $group_id = isset($_REQUEST['group_id']) ? intval($_REQUEST['group_id']) : null;
 $social_right_content = null;
 if ($group_id != 0) {
-	$social_right_content .= '<div class=actions>';
-	$social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/social/group_view.php?id='.$group_id.'">'.
-		Display::return_icon('back.png',api_xml_http_response_encode(get_lang('ComposeMessage'))).'</a>';
-	$social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php?group_id='.$group_id.'">'.
-		Display::return_icon('message_new.png',api_xml_http_response_encode(get_lang('ComposeMessage'))).'</a>';
-	$social_right_content .= '</div>';
+    $social_right_content .= '<div class=actions>';
+    $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/social/group_view.php?id='.$group_id.'">'.
+        Display::return_icon('back.png',api_xml_http_response_encode(get_lang('ComposeMessage'))).'</a>';
+    $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php?group_id='.$group_id.'">'.
+        Display::return_icon('message_new.png',api_xml_http_response_encode(get_lang('ComposeMessage'))).'</a>';
+    $social_right_content .= '</div>';
 } else {
-	if ($socialToolIsActive) {
-	} else {
-		$social_right_content .= '<div class=actions>';
-		if (api_get_setting('allow_social_tool') === 'true' && api_get_setting('allow_message_tool') === 'true') {
-			$social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php">'.
+    if ($socialToolIsActive) {
+    } else {
+        $social_right_content .= '<div class=actions>';
+        if (api_get_setting('allow_social_tool') === 'true' && api_get_setting('allow_message_tool') === 'true') {
+            $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php">'.
                 Display::return_icon('shared_profile.png', get_lang('ViewSharedProfile')).'</a>';
-		}
-		if (api_get_setting('allow_message_tool') === 'true') {
-			$social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php">'.
+        }
+        if (api_get_setting('allow_message_tool') === 'true') {
+            $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php">'.
                 Display::return_icon('message_new.png',get_lang('ComposeMessage')).'</a>';
-			$social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.
+            $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.
                 Display::return_icon('inbox.png',get_lang('Inbox')).'</a>';
             $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php">'.
                 Display::return_icon('outbox.png',get_lang('Outbox')).'</a>';
-		}
-		$social_right_content .= '</div>';
-	}
+        }
+        $social_right_content .= '</div>';
+    }
 }
 
 // LEFT COLUMN

main/mySpace/user_import.php

Indentation +4 added lines, -4 removed lines

@@ -18,9 +18,9 @@ 
 $interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('MySpace'));
 $id_session = '';
 if (isset($_GET['id_session']) && $_GET['id_session'] != '') {
- 	$id_session = intval($_GET['id_session']);
-	$interbreadcrumb[] = array ('url' => 'session.php', 'name' => get_lang('Sessions'));
-	$interbreadcrumb[] = array ('url' => 'course.php?id_session='.$id_session.'', 'name' => get_lang('Course'));
+        $id_session = intval($_GET['id_session']);
+    $interbreadcrumb[] = array ('url' => 'session.php', 'name' => get_lang('Sessions'));
+    $interbreadcrumb[] = array ('url' => 'course.php?id_session='.$id_session.'', 'name' => get_lang('Course'));
 }
 
 // Set this option to true to enforce strict purification for usenames.
@@ -89,7 +89,7 @@ 
 Display :: display_header($tool_name);
 
 if ($_FILES['import_file']['size'] == 0 && $_POST) {
-	Display::display_error_message(get_lang('ThisFieldIsRequired'));
+    Display::display_error_message(get_lang('ThisFieldIsRequired'));
 }
 
 if (count($errors) != 0) {

main/lp/lp_view_item.php

Indentation +1 added lines, -1 removed lines

@@ -97,7 +97,7 @@
 // Theme calls
 $show_learn_path = true;
 if (isset($_SESSION['oLP']) && is_object($_SESSION['oLP'])) {
-	$lp_theme_css = $_SESSION['oLP']->get_theme();
+    $lp_theme_css = $_SESSION['oLP']->get_theme();
 }
 
 if ($mode == 'fullpage') {

main/inc/lib/system_announcements.lib.php

Indentation +120 added lines, -120 removed lines

@@ -10,12 +10,12 @@ 
     const VISIBLE_STUDENT = 2;
     const VISIBLE_TEACHER = 3;
 
-	/**
-	 * Displays all announcements
-	 * @param int $visible VISIBLE_GUEST, VISIBLE_STUDENT or VISIBLE_TEACHER
-	 * @param int $id The identifier of the announcement to display
-	 */
-	public static function display_announcements($visible, $id = -1)
+    /**
+     * Displays all announcements
+     * @param int $visible VISIBLE_GUEST, VISIBLE_STUDENT or VISIBLE_TEACHER
+     * @param int $id The identifier of the announcement to display
+     */
+    public static function display_announcements($visible, $id = -1)
     {
         $user_selected_language = api_get_interface_language();
         $db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
@@ -423,10 +423,10 @@ 
     }
 
     /**
-    * Makes the announcement id visible only for groups in groups_array
-    * @param int $announcement_id
-    * @param array $group_array array of group id
-    **/
+     * Makes the announcement id visible only for groups in groups_array
+     * @param int $announcement_id
+     * @param array $group_array array of group id
+     **/
     public static function announcement_for_groups($announcement_id, $group_array)
     {
         $tbl_announcement_group = Database:: get_main_table(
@@ -459,10 +459,10 @@ 
     }
 
     /**
-    * Gets the groups of this announce
-    * @param int announcement id
-    * @return array array of group id
-    **/
+     * Gets the groups of this announce
+     * @param int announcement id
+     * @return array array of group id
+     **/
     public static function get_announcement_groups($announcement_id)
     {
         $tbl_announcement_group = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS_GROUPS);
@@ -482,15 +482,15 @@ 
         return $groups;
     }
 
-	/**
-	 * Updates an announcement to the database
-	 * @param integer $id      : id of the announcement
-	 * @param string  $title   : title of the announcement
-	 * @param string  $content : content of the announcement
-	 * @param array $date_start: start date of announcement (0 => day ; 1 => month ; 2 => year ; 3 => hour ; 4 => minute)
-	 * @param array $date_end : end date of announcement (0 => day ; 1 => month ; 2 => year ; 3 => hour ; 4 => minute)
-	 * @return	bool	True on success, false on failure
-	 */
+    /**
+     * Updates an announcement to the database
+     * @param integer $id      : id of the announcement
+     * @param string  $title   : title of the announcement
+     * @param string  $content : content of the announcement
+     * @param array $date_start: start date of announcement (0 => day ; 1 => month ; 2 => year ; 3 => hour ; 4 => minute)
+     * @param array $date_end : end date of announcement (0 => day ; 1 => month ; 2 => year ; 3 => hour ; 4 => minute)
+     * @return	bool	True on success, false on failure
+     */
     public static function update_announcement(
         $id,
         $title,
@@ -505,7 +505,7 @@ 
         $sendEmailTest = false
     ) {
         $em = Database::getManager();
-		$announcement = $em->find('ChamiloCoreBundle:SysAnnouncement', $id);
+        $announcement = $em->find('ChamiloCoreBundle:SysAnnouncement', $id);
 
         if (!$announcement) {
             return false;
@@ -529,28 +529,28 @@ 
             return false;
         }
 
-		if (($date_end_to_compare[1] ||
+        if (($date_end_to_compare[1] ||
             $date_end_to_compare[2] ||
             $date_end_to_compare[0]) &&
             !checkdate($date_end_to_compare[1], $date_end_to_compare[2], $date_end_to_compare[0])
         ) {
-			Display :: display_normal_message(get_lang('InvalidEndDate'));
+            Display :: display_normal_message(get_lang('InvalidEndDate'));
 
-			return false;
-		}
+            return false;
+        }
 
-		if (strlen(trim($title)) == 0) {
-			Display::display_normal_message(get_lang('InvalidTitle'));
+        if (strlen(trim($title)) == 0) {
+            Display::display_normal_message(get_lang('InvalidTitle'));
 
-			return false;
-		}
+            return false;
+        }
 
         $start = api_get_utc_datetime($date_start);
         $end = api_get_utc_datetime($date_end);
 
-		//Fixing urls that are sent by email
-		//$content = str_replace('src=\"/home/', 'src=\"'.api_get_path(WEB_PATH).'home/', $content);
-		//$content = str_replace('file=/home/', 'file='.api_get_path(WEB_PATH).'home/', $content);
+        //Fixing urls that are sent by email
+        //$content = str_replace('src=\"/home/', 'src=\"'.api_get_path(WEB_PATH).'home/', $content);
+        //$content = str_replace('file=/home/', 'file='.api_get_path(WEB_PATH).'home/', $content);
         $content = str_replace('src=\"'.api_get_path(REL_HOME_PATH), 'src=\"'.api_get_path(WEB_PATH).api_get_path(REL_HOME_PATH), $content);
         $content = str_replace('file='.api_get_path(REL_HOME_PATH), 'file='.api_get_path(WEB_PATH).api_get_path(REL_HOME_PATH), $content);
 
@@ -592,81 +592,81 @@ 
         $em->merge($announcement);
         $em->flush();
 
-		return true;
-	}
+        return true;
+    }
 
-	/**
-	 * Deletes an announcement
-	 * @param 	int $id The identifier of the announcement that should be
-	 * @return	bool	True on success, false on failure
-	 */
-	public static function delete_announcement($id)
+    /**
+     * Deletes an announcement
+     * @param 	int $id The identifier of the announcement that should be
+     * @return	bool	True on success, false on failure
+     */
+    public static function delete_announcement($id)
     {
-		$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
-		$id = intval($id);
-		$sql = "DELETE FROM ".$db_table." WHERE id =".$id;
-		$res = Database::query($sql);
+        $db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
+        $id = intval($id);
+        $sql = "DELETE FROM ".$db_table." WHERE id =".$id;
+        $res = Database::query($sql);
         if ($res === false) {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Gets an announcement
-	 * @param 	int		$id The identifier of the announcement that should be
-	 * @return	object	Object of class StdClass or the required class, containing the query result row
-	 */
-	public static function get_announcement($id)
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Gets an announcement
+     * @param 	int		$id The identifier of the announcement that should be
+     * @return	object	Object of class StdClass or the required class, containing the query result row
+     */
+    public static function get_announcement($id)
     {
-		$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
-		$id = intval($id);
-		$sql = "SELECT * FROM ".$db_table." WHERE id = ".$id;
-		$announcement = Database::fetch_object(Database::query($sql));
-
-		return $announcement;
-	}
-
-	/**
-	 * Change the visibility of an announcement
-	 * @param 	int $announcement_id
-	 * @param 	int $user For who should the visibility be changed
+        $db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
+        $id = intval($id);
+        $sql = "SELECT * FROM ".$db_table." WHERE id = ".$id;
+        $announcement = Database::fetch_object(Database::query($sql));
+
+        return $announcement;
+    }
+
+    /**
+     * Change the visibility of an announcement
+     * @param 	int $announcement_id
+     * @param 	int $user For who should the visibility be changed
      * (possible values are VISIBLE_TEACHER, VISIBLE_STUDENT, VISIBLE_GUEST)
-	 * @return 	bool	True on success, false on failure
-	 */
-	public static function set_visibility($announcement_id, $user, $visible)
+     * @return 	bool	True on success, false on failure
+     */
+    public static function set_visibility($announcement_id, $user, $visible)
     {
-		$db_table = Database::get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
-		$visible = intval($visible);
-		$announcement_id = intval($announcement_id);
+        $db_table = Database::get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
+        $visible = intval($visible);
+        $announcement_id = intval($announcement_id);
 
         if (!in_array($user, array(self::VISIBLE_GUEST, self::VISIBLE_STUDENT, self::VISIBLE_TEACHER))) {
             return false;
         }
 
-		$field = ($user == self::VISIBLE_TEACHER ? 'visible_teacher' : ($user == self::VISIBLE_STUDENT ? 'visible_student' : 'visible_guest'));
+        $field = ($user == self::VISIBLE_TEACHER ? 'visible_teacher' : ($user == self::VISIBLE_STUDENT ? 'visible_student' : 'visible_guest'));
 
-		$sql = "UPDATE ".$db_table." SET ".$field." = '".$visible."'
+        $sql = "UPDATE ".$db_table." SET ".$field." = '".$visible."'
 		        WHERE id='".$announcement_id."'";
-		$res = Database::query($sql);
-
-		if ($res === false) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Send a system announcement by e-mail to all teachers/students depending on parameters
-	 * @param	string	$title
-	 * @param	string	$content
-	 * @param	int		$teacher Whether to send to all teachers (1) or not (0)
-	 * @param	int		$student Whether to send to all students (1) or not (0)
-	 * @param	string	$language Language (optional, considered for all languages if left empty)
+        $res = Database::query($sql);
+
+        if ($res === false) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Send a system announcement by e-mail to all teachers/students depending on parameters
+     * @param	string	$title
+     * @param	string	$content
+     * @param	int		$teacher Whether to send to all teachers (1) or not (0)
+     * @param	int		$student Whether to send to all students (1) or not (0)
+     * @param	string	$language Language (optional, considered for all languages if left empty)
      * @param	bool	$sendEmailTest
      * @return  bool    True if the message was sent or there was no destination matching. False on database or e-mail sending error.
-	 */
+     */
     public static function send_system_announcement_by_email(
         $title,
         $content,
@@ -692,26 +692,26 @@ 
         }
 
         if ($teacher <> 0 && $student == 0) {
-			$sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition 
+            $sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition 
 					WHERE status = '1' ";
-		}
+        }
 
-		if ($teacher == 0 && $student <> 0) {
-			$sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition 
+        if ($teacher == 0 && $student <> 0) {
+            $sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition 
 					WHERE status = '5' ";
-		}
+        }
 
-		if ($teacher<> 0 && $student <> 0) {
-			$sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition 
+        if ($teacher<> 0 && $student <> 0) {
+            $sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition 
 					WHERE 1 = 1 ";
-		}
+        }
 
-		if (!empty($language)) {
-			//special condition because language was already treated for SQL insert before
-			$sql .= " AND language = '".Database::escape_string($language)."' ";
-		}
+        if (!empty($language)) {
+            //special condition because language was already treated for SQL insert before
+            $sql .= " AND language = '".Database::escape_string($language)."' ";
+        }
 
-		if (api_is_multiple_url_enabled()) {
+        if (api_is_multiple_url_enabled()) {
             $sql .= " AND access_url_id = '".$current_access_url_id."' ";
         }
 
@@ -721,28 +721,28 @@ 
         // Expiration date
         $sql .= " AND (expiration_date = '' OR expiration_date IS NULL OR expiration_date > '$now') ";
 
-		if ((empty($teacher) || $teacher == '0') && (empty($student) || $student == '0')) {
+        if ((empty($teacher) || $teacher == '0') && (empty($student) || $student == '0')) {
 
-			return true;
-		}
+            return true;
+        }
 
-		$result = Database::query($sql);
-		if ($result === false) {
+        $result = Database::query($sql);
+        if ($result === false) {
 
-			return false;
-		}
+            return false;
+        }
 
         $message_sent = false;
 
-		while ($row = Database::fetch_array($result,'ASSOC')) {
+        while ($row = Database::fetch_array($result,'ASSOC')) {
             MessageManager::send_message_simple($row['user_id'], $title, $content);
             $message_sent = true;
-		}
+        }
 
-		return $message_sent; //true if at least one e-mail was sent
-	}
+        return $message_sent; //true if at least one e-mail was sent
+    }
 
-	/**
+    /**
      * Displays announcements as an slideshow
      * @param int $visible VISIBLE_GUEST, VISIBLE_STUDENT or VISIBLE_TEACHER
      * @param int $id The identifier of the announcement to display

main/admin/dashboard_add_courses_to_user.php

Indentation +29 added lines, -29 removed lines

@@ -36,20 +36,20 @@ 
 
 // setting the name of the tool
 if (UserManager::is_admin($user_id)) {
-	$tool_name= get_lang('AssignCoursesToPlatformAdministrator');
+    $tool_name= get_lang('AssignCoursesToPlatformAdministrator');
 } else if ($user_info['status'] == SESSIONADMIN) {
-	$tool_name= get_lang('AssignCoursesToSessionsAdministrator');
+    $tool_name= get_lang('AssignCoursesToSessionsAdministrator');
 } else {
-	$tool_name= get_lang('AssignCoursesToHumanResourcesManager');
+    $tool_name= get_lang('AssignCoursesToHumanResourcesManager');
 }
 
 $add_type = 'multiple';
 if(isset($_GET['add_type']) && $_GET['add_type']!='') {
-	$add_type = Security::remove_XSS($_REQUEST['add_type']);
+    $add_type = Security::remove_XSS($_REQUEST['add_type']);
 }
 
 if (!api_is_platform_admin()) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 function search_courses($needle, $type)
@@ -60,7 +60,7 @@ 
     $return = '';
     if (!empty($needle) && !empty($type)) {
         // xajax send utf8 datas... datas in db can be non-utf8 datas
-		$needle = Database::escape_string($needle);
+        $needle = Database::escape_string($needle);
 
         $assigned_courses_to_hrm = CourseManager::get_courses_followed_by_drh($user_id);
         $assigned_courses_code = array_keys($assigned_courses_to_hrm);
@@ -88,16 +88,16 @@ 
                 		$without_assigned_courses ";
         }
 
-		$rs	= Database::query($sql);
+        $rs	= Database::query($sql);
 
-		$return .= '<select id="origin" name="NoAssignedCoursesList[]" multiple="multiple" size="20" >';
-		while ($course = Database :: fetch_array($rs)) {
-			$return .= '<option value="'.$course['code'].'" title="'.htmlspecialchars($course['title'],ENT_QUOTES).'">'.$course['title'].' ('.$course['code'].')</option>';
-		}
-		$return .= '</select>';
-		$xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return));
-	}
-	return $xajax_response;
+        $return .= '<select id="origin" name="NoAssignedCoursesList[]" multiple="multiple" size="20" >';
+        while ($course = Database :: fetch_array($rs)) {
+            $return .= '<option value="'.$course['code'].'" title="'.htmlspecialchars($course['title'],ENT_QUOTES).'">'.$course['title'].' ('.$course['code'].')</option>';
+        }
+        $return .= '</select>';
+        $xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return));
+    }
+    return $xajax_response;
 }
 
 $xajax->processRequests();
@@ -187,23 +187,23 @@ 
 $assigned_courses_to_hrm = CourseManager::get_courses_followed_by_drh($user_id);
 $assigned_courses_code = array_keys($assigned_courses_to_hrm);
 foreach ($assigned_courses_code as &$value) {
-	$value = "'".$value."'";
+    $value = "'".$value."'";
 }
 
 $without_assigned_courses = '';
 if (count($assigned_courses_code) > 0) {
-	$without_assigned_courses = " AND c.code NOT IN(".implode(',', $assigned_courses_code).")";
+    $without_assigned_courses = " AND c.code NOT IN(".implode(',', $assigned_courses_code).")";
 }
 
 $needle = '%';
 $firstLetter = null;
 if (isset($_POST['firstLetterCourse'])) {
-	$firstLetter = $_POST['firstLetterCourse'];
-	$needle = Database::escape_string($firstLetter.'%');
+    $firstLetter = $_POST['firstLetterCourse'];
+    $needle = Database::escape_string($firstLetter.'%');
 }
 
 if (api_is_multiple_url_enabled()) {
-	$sql = " SELECT c.code, c.title
+    $sql = " SELECT c.code, c.title
             FROM $tbl_course c
             LEFT JOIN $tbl_course_rel_access_url a
             ON (a.c_id = c.id)
@@ -213,7 +213,7 @@ 
             ORDER BY c.title";
 
 } else {
-	$sql= " SELECT c.code, c.title
+    $sql= " SELECT c.code, c.title
 	        FROM $tbl_course c
             WHERE  c.code LIKE '$needle' $without_assigned_courses
             ORDER BY c.title";
@@ -227,7 +227,7 @@ 
 <input type="hidden" name="formSent" value="1" />
 <?php
 if(!empty($msg)) {
-	Display::display_normal_message($msg); //main API
+    Display::display_normal_message($msg); //main API
 }
 ?>
 
@@ -272,13 +272,13 @@ 
     </div>
     <div class="col-md-4">
         <h5><?php
-	  	if (UserManager::is_admin($user_id)) {
-			echo get_lang('AssignedCoursesListToPlatformAdministrator');
-		} else if ($user_info['status'] == SESSIONADMIN) {
-			echo get_lang('AssignedCoursesListToSessionsAdministrator');
-		} else {
-			echo get_lang('AssignedCoursesListToHumanResourcesManager');
-		}
+            if (UserManager::is_admin($user_id)) {
+            echo get_lang('AssignedCoursesListToPlatformAdministrator');
+        } else if ($user_info['status'] == SESSIONADMIN) {
+            echo get_lang('AssignedCoursesListToSessionsAdministrator');
+        } else {
+            echo get_lang('AssignedCoursesListToHumanResourcesManager');
+        }
             ?>: </h5>
 
         <select id='destination' name="CoursesList[]" multiple="multiple" size="20" style="width:320px;">

main/admin/grade_models.php

Indentation +2 added lines, -2 removed lines

@@ -114,8 +114,8 @@
 //With this function we can add actions to the jgrid (edit, delete, etc)
 $action_links = 'function action_formatter(cellvalue, options, rowObject) {
                          return \'<a href="?action=edit&id=\'+options.rowId+\'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>'.
-                         '&nbsp;<a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."\'".')) return false;"  href="?sec_token='.$token.'&action=delete&id=\'+options.rowId+\'">'.Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>'.
-                         '\';
+                            '&nbsp;<a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."\'".')) return false;"  href="?sec_token='.$token.'&action=delete&id=\'+options.rowId+\'">'.Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>'.
+                            '\';
                  }';
 ?>
 <script>

main/admin/skills_import.php

Indentation +12 added lines, -12 removed lines

@@ -70,7 +70,7 @@ 
             $oskill = new Skill();
             $skill_id = $oskill->add($skill);
             $parents[$saved_id] = $skill_id;
-		}
+        }
     }
 }
 
@@ -81,12 +81,12 @@ 
  */
 function parse_csv_data($file)
 {
-	$skills = Import :: csvToArray($file);
-	foreach ($skills as $index => $skill) {
-		$skills[$index] = $skill;
-	}
+    $skills = Import :: csvToArray($file);
+    foreach ($skills as $index => $skill) {
+        $skills[$index] = $skill;
+    }
 
-	return $skills;
+    return $skills;
 }
 
 /**
@@ -94,7 +94,7 @@ 
  */
 function element_start($parser, $data)
 {
-	$data = api_utf8_decode($data);
+    $data = api_utf8_decode($data);
     global $skill;
     global $current_tag;
     switch ($data) {
@@ -111,7 +111,7 @@ 
  */
 function element_end($parser, $data)
 {
-	$data = api_utf8_decode($data);
+    $data = api_utf8_decode($data);
     global $skill;
     global $skills;
     global $current_value;
@@ -130,9 +130,9 @@ 
  */
 function character_data($parser, $data)
 {
-	$data = trim(api_utf8_decode($data));
-	global $current_value;
-	$current_value = $data;
+    $data = trim(api_utf8_decode($data));
+    global $current_value;
+    $current_value = $data;
 }
 
 /**
@@ -154,7 +154,7 @@ 
     xml_parse($parser, api_utf8_encode_xml(file_get_contents($file)));
     xml_parser_free($parser);
 
-	return $skills;
+    return $skills;
 }
 
 $this_section = SECTION_PLATFORM_ADMIN;