chamilo / chamilo-lms

main/admin/special_exports.php

Indentation +4 added lines, -4 removed lines

@@ -45,7 +45,7 @@ 
 if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form') ||
     (isset ($_POST['backup_option']) && $_POST['backup_option'] == 'full_backup')
 ) {
-	$export = false;
+    $export = false;
     if (isset ($_POST['action']) && $_POST['action'] == 'course_select_form') {
         $FileZip = create_zip();
         $to_group_id = 0;
@@ -288,9 +288,9 @@ 
                 $query_session_doc = Database::query($sql_session_doc);
                 while ($rows_course_session_file = Database::fetch_assoc($query_session_doc)) {
                     $zip_folder->add($FileZip['PATH_COURSE'].$_course['directory'].'/document'.$rows_course_session_file['path'],
-                         PCLZIP_OPT_ADD_PATH, $_course['directory']."/".$rows_session['name'],
-                         PCLZIP_OPT_REMOVE_PATH, $FileZip['PATH_COURSE'].$_course['directory'].'/document'.$FileZip['PATH_REMOVE']
-                     );
+                            PCLZIP_OPT_ADD_PATH, $_course['directory']."/".$rows_session['name'],
+                            PCLZIP_OPT_REMOVE_PATH, $FileZip['PATH_COURSE'].$_course['directory'].'/document'.$FileZip['PATH_REMOVE']
+                        );
                 }
             }
         }

main/dropbox/dropbox_init.inc.php

Indentation +5 added lines, -5 removed lines

@@ -216,7 +216,7 @@ 
             $javascript .= "'".$dropbox_person->sentWork[$i]->title."'";
         }
     }
-	$javascript .= ");
+    $javascript .= ");
 
 		function checkfile(str)
 		{
@@ -326,15 +326,15 @@ 
         'url' => api_get_path(WEB_CODE_PATH).'dropbox/index.php?'.api_get_cidreq(),
         'name' => get_lang('Dropbox', ''),
     );
-	$nameTools = get_lang('ReceivedFiles');
+    $nameTools = get_lang('ReceivedFiles');
 
-	if ($action == 'addreceivedcategory') {
+    if ($action == 'addreceivedcategory') {
         $interbreadcrumb[] = array(
             'url' => api_get_path(WEB_CODE_PATH).'dropbox/index.php?view=received&'.api_get_cidreq(),
             'name' => get_lang('ReceivedFiles'),
         );
-		$nameTools = get_lang('AddNewCategory');
-	}
+        $nameTools = get_lang('AddNewCategory');
+    }
 }
 
 if ($view == 'sent' || empty($view)) {

main/inc/lib/blog.lib.php

Indentation +92 added lines, -93 removed lines

@@ -6,7 +6,6 @@ 
  *
  * Contains several functions dealing with displaying,
  * editing,... of a blog
-
  * @package chamilo.blogs
  * @author Toon Keppens <toon@vi-host.net>
  * @author Julio Montoya - Cleaning code
@@ -335,7 +334,7 @@ 
                     // Storing the attachments if any
                     if ($result) {
                         $sql = 'INSERT INTO '.$blog_table_attachment.'(c_id, filename,comment, path, post_id,size, blog_id,comment_id) '.
-                               "VALUES ($course_id, '".Database::escape_string($file_name)."', '".$comment."', '".Database::escape_string($new_file_name)."' , '".$last_post_id."', '".intval($_FILES['user_upload']['size'])."',  '".$blog_id."', '0' )";
+                                "VALUES ($course_id, '".Database::escape_string($file_name)."', '".$comment."', '".Database::escape_string($new_file_name)."' , '".$last_post_id."', '".intval($_FILES['user_upload']['size'])."',  '".$blog_id."', '0' )";
                         Database::query($sql);
                         $id = Database::insert_id();
                         if ($id) {
@@ -479,7 +478,7 @@ 
                     // Storing the attachments if any
                     if ($result) {
                         $sql='INSERT INTO '.$blog_table_attachment.'(c_id, filename,comment, path, post_id,size,blog_id,comment_id) '.
-                             "VALUES ($course_id, '".Database::escape_string($file_name)."', '".$comment."', '".Database::escape_string($new_file_name)."' , '".$post_id."', '".$_FILES['user_upload']['size']."',  '".$blog_id."', '".$last_id."'  )";
+                                "VALUES ($course_id, '".Database::escape_string($file_name)."', '".$comment."', '".Database::escape_string($new_file_name)."' , '".$post_id."', '".$_FILES['user_upload']['size']."',  '".$blog_id."', '".$last_id."'  )";
                         Database::query($sql);
 
                         $id = Database::insert_id();
@@ -1398,10 +1397,10 @@ 
             echo '<span class="blogpost_title">' . get_lang('TaskList') . '</span><br />';
             echo "<table class=\"data_table\">";
             echo	"<tr bgcolor=\"$color2\" align=\"center\" valign=\"top\">",
-                     "<th width='240'><b>",get_lang('Title'),"</b></th>",
-                     "<th><b>",get_lang('Description'),"</b></th>",
-                     "<th><b>",get_lang('Color'),"</b></th>",
-                     "<th width='50'><b>",get_lang('Modify'),"</b></th>",
+                        "<th width='240'><b>",get_lang('Title'),"</b></th>",
+                        "<th><b>",get_lang('Description'),"</b></th>",
+                        "<th><b>",get_lang('Color'),"</b></th>",
+                        "<th width='50'><b>",get_lang('Modify'),"</b></th>",
                 "</tr>";
 
 
@@ -1433,14 +1432,14 @@ 
                 echo '<td width="50">';
                 echo '<a href="'.api_get_self().'?action=manage_tasks&blog_id='.$task['blog_id'].'&do=edit&task_id='.$task['task_id'].'">';
                 echo Display::return_icon('edit.png', get_lang('EditTask'));
-                      echo "</a>";
-                      echo '<a href="'.$delete_link.'"';
-                      echo $delete_confirm;
-                       echo '>';
+                        echo "</a>";
+                        echo '<a href="'.$delete_link.'"';
+                        echo $delete_confirm;
+                        echo '>';
                         echo Display::return_icon($delete_icon, $delete_title);
-                       echo "</a>";
-                     echo '</td>';
-                   echo '</tr>';
+                        echo "</a>";
+                        echo '</td>';
+                    echo '</tr>';
             }
             echo "</table>";
         }
@@ -1464,11 +1463,11 @@ 
         echo '<span class="blogpost_title">' . get_lang('AssignedTasks') . '</span><br />';
         echo "<table class=\"data_table\">";
         echo	"<tr bgcolor=\"$color2\" align=\"center\" valign=\"top\">",
-                 "<th width='240'><b>",get_lang('Member'),"</b></th>",
-                 "<th><b>",get_lang('Task'),"</b></th>",
-                 "<th><b>",get_lang('Description'),"</b></th>",
-                 "<th><b>",get_lang('TargetDate'),"</b></th>",
-                 "<th width='50'><b>",get_lang('Modify'),"</b></th>",
+                    "<th width='240'><b>",get_lang('Member'),"</b></th>",
+                    "<th><b>",get_lang('Task'),"</b></th>",
+                    "<th><b>",get_lang('Description'),"</b></th>",
+                    "<th><b>",get_lang('TargetDate'),"</b></th>",
+                    "<th width='50'><b>",get_lang('Modify'),"</b></th>",
             "</tr>";
 
         $course_id = api_get_course_int_id();
@@ -2316,7 +2315,7 @@ 
      * @param Integer $year: the 4-digit year indication e.g. 2005
      *
      * @return html code
-    */
+     */
     public static function display_minimonthcalendar($month, $year, $blog_id)
     {
         // Init
@@ -2609,34 +2608,34 @@ 
  */
 function get_blog_attachment($blog_id, $post_id=null,$comment_id=null)
 {
-	$blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
-
-	$blog_id = intval($blog_id);
-	$comment_id = intval($comment_id);
-	$post_id = intval($post_id);
-	$row=array();
-	$where='';
-	if (!empty ($post_id) && is_numeric($post_id)) {
-		$where.=' AND post_id ="'.$post_id.'" ';
-	}
-
-	if (!empty ($comment_id) && is_numeric($comment_id)) {
-		if (!empty ($post_id)) {
-			$where.= ' AND ';
-		}
-		$where.=' comment_id ="'.$comment_id.'" ';
-	}
+    $blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
+
+    $blog_id = intval($blog_id);
+    $comment_id = intval($comment_id);
+    $post_id = intval($post_id);
+    $row=array();
+    $where='';
+    if (!empty ($post_id) && is_numeric($post_id)) {
+        $where.=' AND post_id ="'.$post_id.'" ';
+    }
+
+    if (!empty ($comment_id) && is_numeric($comment_id)) {
+        if (!empty ($post_id)) {
+            $where.= ' AND ';
+        }
+        $where.=' comment_id ="'.$comment_id.'" ';
+    }
 
     $course_id = api_get_course_int_id();
 
-	$sql = 'SELECT path, filename, comment FROM '. $blog_table_attachment.'
+    $sql = 'SELECT path, filename, comment FROM '. $blog_table_attachment.'
 	        WHERE c_id = '.$course_id.' AND blog_id ="'.intval($blog_id).'"  '.$where;
 
-	$result=Database::query($sql);
-	if (Database::num_rows($result)!=0) {
-		$row=Database::fetch_array($result);
-	}
-	return $row;
+    $result=Database::query($sql);
+    if (Database::num_rows($result)!=0) {
+        $row=Database::fetch_array($result);
+    }
+    return $row;
 }
 
 /**
@@ -2652,16 +2651,16 @@ 
     $post_id = null,
     $comment_id = null
 ) {
-	$_course = api_get_course_info();
-	$blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
-	$blog_id = intval($blog_id);
-	$comment_id = intval($comment_id);
-	$post_id = intval($post_id);
+    $_course = api_get_course_info();
+    $blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
+    $blog_id = intval($blog_id);
+    $comment_id = intval($comment_id);
+    $post_id = intval($post_id);
 
     $course_id = api_get_course_int_id();
-	$where = null;
+    $where = null;
 
-	// delete files in DB
+    // delete files in DB
     if (!empty ($post_id) && is_numeric($post_id)) {
         $where .= ' AND post_id ="'.$post_id.'" ';
     }
@@ -2673,25 +2672,25 @@ 
         $where .= ' comment_id ="'.$comment_id.'" ';
     }
 
-	// delete all files in directory
-	$courseDir   = $_course['path'].'/upload/blog';
-	$sys_course_path = api_get_path(SYS_COURSE_PATH);
-	$updir = $sys_course_path.$courseDir;
+    // delete all files in directory
+    $courseDir   = $_course['path'].'/upload/blog';
+    $sys_course_path = api_get_path(SYS_COURSE_PATH);
+    $updir = $sys_course_path.$courseDir;
 
-	$sql = 'SELECT path FROM '.$blog_table_attachment.'
+    $sql = 'SELECT path FROM '.$blog_table_attachment.'
 	        WHERE c_id = '.$course_id.' AND blog_id ="'.intval($blog_id).'"  '.$where;
-	$result=Database::query($sql);
-
-	while ($row=Database::fetch_row($result)) {
-		$file=$updir.'/'.$row[0];
-		if (Security::check_abs_path($file,$updir) )
-		{
-			@ unlink($file);
-		}
-	}
-	$sql = 'DELETE FROM '. $blog_table_attachment.'
+    $result=Database::query($sql);
+
+    while ($row=Database::fetch_row($result)) {
+        $file=$updir.'/'.$row[0];
+        if (Security::check_abs_path($file,$updir) )
+        {
+            @ unlink($file);
+        }
+    }
+    $sql = 'DELETE FROM '. $blog_table_attachment.'
 	        WHERE c_id = '.$course_id.' AND  blog_id ="'.intval($blog_id).'"  '.$where;
-	Database::query($sql);
+    Database::query($sql);
 }
 
 /**
@@ -2707,7 +2706,7 @@ 
     $course_id = $course_info['real_id'];
     $user_id = intval($user_id);
 
-	$sql = "SELECT DISTINCT blog.blog_id, post_id, title, full_text, post.date_creation
+    $sql = "SELECT DISTINCT blog.blog_id, post_id, title, full_text, post.date_creation
 			FROM $tbl_blogs blog
 			INNER JOIN  $tbl_blog_post post
 			ON (blog.blog_id = post.blog_id)
@@ -2716,19 +2715,19 @@ 
 				post.c_id = $course_id AND
 				author_id =  $user_id AND visibility = 1
 			ORDER BY post.date_creation DESC ";
-	$result = Database::query($sql);
-	$return_data = '';
-
-	if (Database::num_rows($result)!=0) {
-		while ($row=Database::fetch_array($result)) {
-			$return_data.=  '<div class="clear"></div><br />';
-			$return_data.=  '<div class="actions" style="margin-left:5px;margin-right:5px;">'.Display::return_icon('blog_article.png',get_lang('BlogPosts')).' '.$row['title'].'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<div style="float:right;margin-top:-18px"><a href="../blog/blog.php?blog_id='.$row['blog_id'].'&gidReq=&cidReq='.$my_course_id.' " >'.get_lang('SeeBlog').'</a></div></div>';
-			$return_data.=  '<br / >';
-			$return_data.= $row['full_text'];
-			$return_data.= '<br /><br />';
-		}
-	}
-	return $return_data;
+    $result = Database::query($sql);
+    $return_data = '';
+
+    if (Database::num_rows($result)!=0) {
+        while ($row=Database::fetch_array($result)) {
+            $return_data.=  '<div class="clear"></div><br />';
+            $return_data.=  '<div class="actions" style="margin-left:5px;margin-right:5px;">'.Display::return_icon('blog_article.png',get_lang('BlogPosts')).' '.$row['title'].'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<div style="float:right;margin-top:-18px"><a href="../blog/blog.php?blog_id='.$row['blog_id'].'&gidReq=&cidReq='.$my_course_id.' " >'.get_lang('SeeBlog').'</a></div></div>';
+            $return_data.=  '<br / >';
+            $return_data.= $row['full_text'];
+            $return_data.= '<br /><br />';
+        }
+    }
+    return $return_data;
 }
 
 /**
@@ -2745,7 +2744,7 @@ 
     $course_info = api_get_course_info($course_code);
     $course_id = $course_info['real_id'];
 
-	$sql = "SELECT DISTINCT blog.blog_id, comment_id, title, comment, comment.date_creation
+    $sql = "SELECT DISTINCT blog.blog_id, comment_id, title, comment, comment.date_creation
 			FROM $tbl_blogs blog INNER JOIN  $tbl_blog_comment comment
 			ON (blog.blog_id = comment.blog_id)
 			WHERE 	blog.c_id = $course_id AND
@@ -2753,17 +2752,17 @@ 
 					author_id =  $user_id AND
 					visibility = 1
 			ORDER BY blog_name";
-	$result = Database::query($sql);
-	$return_data = '';
-	if (Database::num_rows($result)!=0) {
-		while ($row=Database::fetch_array($result)) {
-			$return_data.=  '<div class="clear"></div><br />';
-			$return_data.=  '<div class="actions" style="margin-left:5px;margin-right:5px;">'.$row['title'].'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<div style="float:right;margin-top:-18px"><a href="../blog/blog.php?blog_id='.$row['blog_id'].'&gidReq=&cidReq='.Security::remove_XSS($course_code).' " >'.get_lang('SeeBlog').'</a></div></div>';
-			$return_data.=  '<br / >';
-			$return_data.=  $row['comment'];
-			$return_data.=  '<br />';
-		}
-	}
-	return $return_data;
+    $result = Database::query($sql);
+    $return_data = '';
+    if (Database::num_rows($result)!=0) {
+        while ($row=Database::fetch_array($result)) {
+            $return_data.=  '<div class="clear"></div><br />';
+            $return_data.=  '<div class="actions" style="margin-left:5px;margin-right:5px;">'.$row['title'].'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<div style="float:right;margin-top:-18px"><a href="../blog/blog.php?blog_id='.$row['blog_id'].'&gidReq=&cidReq='.Security::remove_XSS($course_code).' " >'.get_lang('SeeBlog').'</a></div></div>';
+            $return_data.=  '<br / >';
+            $return_data.=  $row['comment'];
+            $return_data.=  '<br />';
+        }
+    }
+    return $return_data;
 }
 

main/inc/lib/AnnouncementManager.php

Indentation +5 added lines, -5 removed lines

@@ -480,8 +480,8 @@ 
                         );
 
                         if (($counter % $batchSize) === 0) {
-                             $em->flush();
-                             $em->clear();
+                                $em->flush();
+                                $em->clear();
                         }
                         $counter++;
                     }
@@ -502,8 +502,8 @@ 
                         );
 
                         if (($counter % $batchSize) === 0) {
-                             $em->flush();
-                             $em->clear();
+                                $em->flush();
+                                $em->clear();
                         }
                         $counter++;
                     }
@@ -1406,7 +1406,7 @@ 
                             ip.to_user_id = $user_id AND (ip.to_group_id IS NULL OR ip.to_group_id IN (0, ".implode(", ", $group_memberships)."))
                         ) ";
                     } else {
-                       $cond_user_id = " AND (
+                        $cond_user_id = " AND (
                             ip.to_user_id = $user_id AND (ip.to_group_id IS NULL OR ip.to_group_id IN (0, ".$group_id."))
                         )";
                     }

main/admin/user_list.php

Indentation +86 added lines, -86 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());
@@ -441,7 +441,7 @@ 
 {
     $sql = prepare_user_sql_query(false);
     if (!in_array($direction, array('ASC','DESC'))) {
-    	$direction = 'ASC';
+        $direction = 'ASC';
     }
     $column = intval($column);
     $from = intval($from);
@@ -452,23 +452,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';
             }
         }
 
@@ -498,7 +498,7 @@ 
 */
 function email_filter($email)
 {
-	return Display :: encrypted_mailto_link($email, $email);
+    return Display :: encrypted_mailto_link($email, $email);
 }
 
 /**
@@ -508,7 +508,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>';
 }
 
 /**
@@ -526,17 +526,17 @@ 
     $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>';
@@ -546,14 +546,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) {
@@ -602,18 +602,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')),
@@ -643,7 +643,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">'.
@@ -662,7 +662,7 @@ 
         }
     }
 
-	return $result;
+    return $result;
 }
 
 /**
@@ -694,16 +694,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;
 }
 
 /**
@@ -716,8 +716,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'])) {
@@ -733,8 +733,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);
@@ -744,52 +744,52 @@ 
                     $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'];
                     $userToDeleteInfo = api_get_user_info($user_to_delete);
                     $current_user_id = api_get_user_id();
 
-					if ($userToDeleteInfo && $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').': '.$userToDeleteInfo['complete_name_with_username'],
+                    if ($userToDeleteInfo && $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').': '.$userToDeleteInfo['complete_name_with_username'],
                                 'confirmation'
                             );
-						} else {
-							$message = Display :: return_message(get_lang('CannotDeleteUserBecauseOwnsCourse'), 'error');
-						}
-					} else {
-						$message = Display :: return_message(get_lang('CannotDeleteUser'), 'error');
-					}
-					Display::addFlash($message);
-					header('Location: '.api_get_self());
+                        } else {
+                            $message = Display :: return_message(get_lang('CannotDeleteUserBecauseOwnsCourse'), 'error');
+                        }
+                    } else {
+                        $message = Display :: return_message(get_lang('CannotDeleteUser'), 'error');
+                    }
+                    Display::addFlash($message);
+                    header('Location: '.api_get_self());
                     exit;
-				}
-				break;
+                }
+                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
@@ -807,15 +807,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']);
@@ -889,11 +889,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/inc/lib/fileManage.lib.php

Indentation +41 added lines, -41 removed lines

@@ -132,38 +132,38 @@ 
  */
 function my_rename($file_path, $new_file_name) {
 
-	$save_dir = getcwd();
-	$path = dirname($file_path);
-	$old_file_name = basename($file_path);
-	$new_file_name = api_replace_dangerous_char($new_file_name);
+    $save_dir = getcwd();
+    $path = dirname($file_path);
+    $old_file_name = basename($file_path);
+    $new_file_name = api_replace_dangerous_char($new_file_name);
 
-	// If no extension, take the old one
-	if ((strpos($new_file_name, '.') === false) && ($dotpos = strrpos($old_file_name, '.'))) {
-		$new_file_name .= substr($old_file_name, $dotpos);
-	}
+    // If no extension, take the old one
+    if ((strpos($new_file_name, '.') === false) && ($dotpos = strrpos($old_file_name, '.'))) {
+        $new_file_name .= substr($old_file_name, $dotpos);
+    }
 
-	// Note: still possible: 'xx.yy' -rename-> '.yy' -rename-> 'zz'
-	// This is useful for folder names, where otherwise '.' would be sticky
+    // Note: still possible: 'xx.yy' -rename-> '.yy' -rename-> 'zz'
+    // This is useful for folder names, where otherwise '.' would be sticky
 
-	// Extension PHP is not allowed, change to PHPS
-	$new_file_name = php2phps($new_file_name);
+    // Extension PHP is not allowed, change to PHPS
+    $new_file_name = php2phps($new_file_name);
 
-	if ($new_file_name == $old_file_name) {
-		return $old_file_name;
-	}
+    if ($new_file_name == $old_file_name) {
+        return $old_file_name;
+    }
 
-	if (strtolower($new_file_name) != strtolower($old_file_name) && check_name_exist($path.'/'.$new_file_name)) {
-		return false;
-	}
-	// On a Windows server, it would be better not to do the above check
-	// because it succeeds for some new names resembling the old name.
-	// But on Unix/Linux the check must be done because rename overwrites.
+    if (strtolower($new_file_name) != strtolower($old_file_name) && check_name_exist($path.'/'.$new_file_name)) {
+        return false;
+    }
+    // On a Windows server, it would be better not to do the above check
+    // because it succeeds for some new names resembling the old name.
+    // But on Unix/Linux the check must be done because rename overwrites.
 
-	chdir($path);
-	$res = rename($old_file_name, $new_file_name) ? $new_file_name : false;
-	chdir($save_dir);
+    chdir($path);
+    $res = rename($old_file_name, $new_file_name) ? $new_file_name : false;
+    chdir($save_dir);
 
-	return $res;
+    return $res;
 }
 
 /**
@@ -185,7 +185,7 @@ 
         $file_name = basename($source);
         // move onto self illegal: mv a/b/c a/b/c or mv a/b/c a/b
         if (strcasecmp($target, dirname($source)) === 0) {
-               return false;
+                return false;
         }
         $isWindowsOS = api_is_windows_os();
         $canExec = function_exists('exec');
@@ -265,8 +265,8 @@ 
  */
 function getextension($filename)
 {
-	$bouts = explode('.', $filename);
-	return array(array_pop($bouts), implode('.', $bouts));
+    $bouts = explode('.', $filename);
+    return array(array_pop($bouts), implode('.', $bouts));
 }
 
 /**
@@ -277,17 +277,17 @@ 
  * @param 	boolean $recursive if true , include subdirectory in total
  */
 function dirsize($root, $recursive = true) {
-	$dir = @opendir($root);
-	$size = 0;
-	while ($file = @readdir($dir)) {
-		if (!in_array($file, array('.', '..'))) {
-			if (is_dir($root.'/'.$file)) {
-				$size += $recursive ? dirsize($root.'/'.$file) : 0;
-			} else {
-				$size += @filesize($root.'/'.$file);
-			}
-		}
-	}
-	@closedir($dir);
-	return $size;
+    $dir = @opendir($root);
+    $size = 0;
+    while ($file = @readdir($dir)) {
+        if (!in_array($file, array('.', '..'))) {
+            if (is_dir($root.'/'.$file)) {
+                $size += $recursive ? dirsize($root.'/'.$file) : 0;
+            } else {
+                $size += @filesize($root.'/'.$file);
+            }
+        }
+    }
+    @closedir($dir);
+    return $size;
 }

main/inc/lib/social.lib.php

Indentation +5 added lines, -5 removed lines

@@ -1408,7 +1408,7 @@ 
             $media .= '<div class="col-md-2 col-xs-2 social-post-answers">';
             $media .= '<div class="user-image pull-right">';
             $media .= '<a href="'.$url.'" ><img src="'. $users[$userIdLoop]['avatar'] .
-                       '" alt="'.$users[$userIdLoop]['complete_name'].'" class="avatar-thumb"></a>';
+                        '" alt="'.$users[$userIdLoop]['complete_name'].'" class="avatar-thumb"></a>';
             $media .= '</div>';
             $media .= '</div>';
             $media .= '<div class="col-md-9 col-xs-9 social-post-answers">';
@@ -1623,10 +1623,10 @@ 
     }
 
     /**
-    * Delete messages delete logic
-    * @param int $id id message to delete.
-    * @return bool status query
-    */
+     * Delete messages delete logic
+     * @param int $id id message to delete.
+     * @return bool status query
+     */
     public static function deleteMessage($id)
     {
         $id = intval($id);

main/admin/user_edit.php

Indentation +94 added lines, -94 removed lines

@@ -72,8 +72,8 @@ 
 $geolocalization = $gMapsPlugin->get('enable_api') === 'true';
 
 if ($geolocalization) {
-	$gmapsApiKey = $gMapsPlugin->get('api_key');
-	$htmlHeadXtra[] = '<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?sensor=true&key='. $gmapsApiKey . '" ></script>';
+    $gmapsApiKey = $gMapsPlugin->get('api_key');
+    $htmlHeadXtra[] = '<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?sensor=true&key='. $gmapsApiKey . '" ></script>';
 }
 
 $htmlHeadXtra[] = api_get_css_asset('cropper/dist/cropper.min.css');
@@ -117,27 +117,27 @@ 
 $form->addElement('hidden', 'user_id', $user_id);
 
 if (api_is_western_name_order()) {
-	// Firstname
-	$form->addElement('text', 'firstname', get_lang('FirstName'));
-	$form->applyFilter('firstname', 'html_filter');
-	$form->applyFilter('firstname', 'trim');
-	$form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
-	// Lastname
-	$form->addElement('text', 'lastname', get_lang('LastName'));
-	$form->applyFilter('lastname', 'html_filter');
-	$form->applyFilter('lastname', 'trim');
-	$form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
+    // Firstname
+    $form->addElement('text', 'firstname', get_lang('FirstName'));
+    $form->applyFilter('firstname', 'html_filter');
+    $form->applyFilter('firstname', 'trim');
+    $form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
+    // Lastname
+    $form->addElement('text', 'lastname', get_lang('LastName'));
+    $form->applyFilter('lastname', 'html_filter');
+    $form->applyFilter('lastname', 'trim');
+    $form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
 } else {
-	// Lastname
-	$form->addElement('text', 'lastname', get_lang('LastName'));
-	$form->applyFilter('lastname', 'html_filter');
-	$form->applyFilter('lastname', 'trim');
-	$form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
-	// Firstname
-	$form->addElement('text', 'firstname', get_lang('FirstName'));
-	$form->applyFilter('firstname', 'html_filter');
-	$form->applyFilter('firstname', 'trim');
-	$form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
+    // Lastname
+    $form->addElement('text', 'lastname', get_lang('LastName'));
+    $form->applyFilter('lastname', 'html_filter');
+    $form->applyFilter('lastname', 'trim');
+    $form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
+    // Firstname
+    $form->addElement('text', 'firstname', get_lang('FirstName'));
+    $form->applyFilter('firstname', 'html_filter');
+    $form->applyFilter('firstname', 'trim');
+    $form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
 }
 
 // Official code
@@ -159,7 +159,7 @@ 
 
 // OpenID
 if (api_get_setting('openid_authentication') == 'true') {
-	$form->addElement('text', 'openid', get_lang('OpenIDURL'));
+    $form->addElement('text', 'openid', get_lang('OpenIDURL'));
 }
 
 // Phone
@@ -174,18 +174,18 @@ 
 $allowed_picture_types = api_get_supported_image_extensions(false);
 
 $form->addRule(
-	'picture',
-	get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')',
-	'filetype',
-	$allowed_picture_types
+    'picture',
+    get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')',
+    'filetype',
+    $allowed_picture_types
 );
 if (strlen($user_data['picture_uri']) > 0) {
-	$form->addElement('checkbox', 'delete_picture', '', get_lang('DelImage'));
+    $form->addElement('checkbox', 'delete_picture', '', get_lang('DelImage'));
 }
 
 // Username
 if (api_get_setting('login_is_email') != 'true') {
-	$form->addElement('text', 'username', get_lang('LoginName'), array('maxlength' => USERNAME_MAX_LENGTH));
+    $form->addElement('text', 'username', get_lang('LoginName'), array('maxlength' => USERNAME_MAX_LENGTH));
     $form->addRule('username', get_lang('ThisFieldIsRequired'), 'required');
     $form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'), (string)USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
     $form->addRule('username', get_lang('OnlyLettersAndNumbersAllowed'), 'username');
@@ -257,15 +257,15 @@ 
 
 // Platform admin
 if (api_is_platform_admin()) {
-	$group = array();
-	$group[] =$form->createElement('radio', 'platform_admin', null, get_lang('Yes'), 1);
-	$group[] =$form->createElement('radio', 'platform_admin', null, get_lang('No'), 0);
+    $group = array();
+    $group[] =$form->createElement('radio', 'platform_admin', null, get_lang('Yes'), 1);
+    $group[] =$form->createElement('radio', 'platform_admin', null, get_lang('No'), 0);
 
-	$user_data['status'] == 1 ? $display = 'block':$display = 'none';
+    $user_data['status'] == 1 ? $display = 'block':$display = 'none';
 
-	$form->addElement('html', '<div id="id_platform_admin" style="display:'.$display.'">');
-	$form->addGroup($group, 'admin', get_lang('PlatformAdmin'), null, false);
-	$form->addElement('html', '</div>');
+    $form->addElement('html', '<div id="id_platform_admin" style="display:'.$display.'">');
+    $form->addGroup($group, 'admin', get_lang('PlatformAdmin'), null, false);
+    $form->addElement('html', '</div>');
 }
 
 //Language
@@ -283,16 +283,16 @@ 
 $form->addElement('label', get_lang('RegistrationDate'), $date);
 
 if (!$user_data['platform_admin']) {
-	// Expiration Date
-	$form->addElement('radio', 'radio_expiration_date', get_lang('ExpirationDate'), get_lang('NeverExpires'), 0);
-	$group = array ();
-	$group[] = $form->createElement('radio', 'radio_expiration_date', null, get_lang('Enabled'), 1);
-	$group[] = $form->createElement('DateTimePicker', 'expiration_date', null, array('onchange' => 'javascript: enable_expiration_date();'));
-	$form->addGroup($group, 'max_member_group', null, null, false);
-
-	// Active account or inactive account
-	$form->addElement('radio', 'active', get_lang('ActiveAccount'), get_lang('Active'), 1);
-	$form->addElement('radio', 'active', '', get_lang('Inactive'), 0);
+    // Expiration Date
+    $form->addElement('radio', 'radio_expiration_date', get_lang('ExpirationDate'), get_lang('NeverExpires'), 0);
+    $group = array ();
+    $group[] = $form->createElement('radio', 'radio_expiration_date', null, get_lang('Enabled'), 1);
+    $group[] = $form->createElement('DateTimePicker', 'expiration_date', null, array('onchange' => 'javascript: enable_expiration_date();'));
+    $form->addGroup($group, 'max_member_group', null, null, false);
+
+    // Active account or inactive account
+    $form->addElement('radio', 'active', get_lang('ActiveAccount'), get_lang('Active'), 1);
+    $form->addElement('radio', 'active', '', get_lang('Inactive'), 0);
 }
 $studentBossList = UserManager::getStudentBossList($user_data['user_id']);
 
@@ -334,18 +334,18 @@ 
 $expiration_date = $user_data['expiration_date'];
 
 if (empty($expiration_date)) {
-	$user_data['radio_expiration_date'] = 0;
-	$user_data['expiration_date'] = api_get_local_time();
+    $user_data['radio_expiration_date'] = 0;
+    $user_data['expiration_date'] = api_get_local_time();
 } else {
-	$user_data['radio_expiration_date'] = 1;
-	$user_data['expiration_date'] = api_get_local_time($expiration_date);
+    $user_data['radio_expiration_date'] = 1;
+    $user_data['expiration_date'] = api_get_local_time($expiration_date);
 }
 $form->setDefaults($user_data);
 
 $error_drh = false;
 // Validate form
 if ($form->validate()) {
-	$user = $form->getSubmitValues(1);
+    $user = $form->getSubmitValues(1);
     $reset_password = intval($user['reset_password']);
     if ($reset_password == 2 && empty($user['password'])) {
         Display::addFlash(Display::return_message(get_lang('PasswordIsTooShort')));
@@ -353,48 +353,48 @@ 
         exit();
     }
 
-	$is_user_subscribed_in_course = CourseManager::is_user_subscribed_in_course($user['user_id']);
+    $is_user_subscribed_in_course = CourseManager::is_user_subscribed_in_course($user['user_id']);
 
-	if ($user['status'] == DRH && $is_user_subscribed_in_course) {
-		$error_drh = true;
-	} else {
-		$picture_element = $form->getElement('picture');
-		$picture = $picture_element->getValue();
+    if ($user['status'] == DRH && $is_user_subscribed_in_course) {
+        $error_drh = true;
+    } else {
+        $picture_element = $form->getElement('picture');
+        $picture = $picture_element->getValue();
 
-		$picture_uri = $user_data['picture_uri'];
-		if (isset($user['delete_picture']) && $user['delete_picture']) {
-			$picture_uri = UserManager::delete_user_picture($user_id);
-		} elseif (!empty($picture['name'])) {
+        $picture_uri = $user_data['picture_uri'];
+        if (isset($user['delete_picture']) && $user['delete_picture']) {
+            $picture_uri = UserManager::delete_user_picture($user_id);
+        } elseif (!empty($picture['name'])) {
             $picture_uri = UserManager::update_user_picture(
                 $user_id,
                 $_FILES['picture']['name'],
                 $_FILES['picture']['tmp_name'],
                 $user['picture_crop_result']
             );
-		}
+        }
 
-		$lastname = $user['lastname'];
-		$firstname = $user['firstname'];
+        $lastname = $user['lastname'];
+        $firstname = $user['firstname'];
         $password = $user['password'];
         $auth_source = isset($user['auth_source']) ? $user['auth_source'] : $userInfo['auth_source'];
-		$official_code = $user['official_code'];
-		$email = $user['email'];
-		$phone = $user['phone'];
-		$username = isset($user['username']) ? $user['username'] : $userInfo['username'];
-		$status = intval($user['status']);
-		$platform_admin = intval($user['platform_admin']);
-		$send_mail = intval($user['send_mail']);
-		$reset_password = intval($user['reset_password']);
-		$hr_dept_id = isset($user['hr_dept_id']) ? intval($user['hr_dept_id']) : null;
-		$language = $user['language'];
-
-		if ($user['radio_expiration_date'] == '1' && !$user_data['platform_admin']) {
+        $official_code = $user['official_code'];
+        $email = $user['email'];
+        $phone = $user['phone'];
+        $username = isset($user['username']) ? $user['username'] : $userInfo['username'];
+        $status = intval($user['status']);
+        $platform_admin = intval($user['platform_admin']);
+        $send_mail = intval($user['send_mail']);
+        $reset_password = intval($user['reset_password']);
+        $hr_dept_id = isset($user['hr_dept_id']) ? intval($user['hr_dept_id']) : null;
+        $language = $user['language'];
+
+        if ($user['radio_expiration_date'] == '1' && !$user_data['platform_admin']) {
             $expiration_date = $user['expiration_date'];
-		} else {
-			$expiration_date = null;
-		}
+        } else {
+            $expiration_date = null;
+        }
 
-		$active = $user_data['platform_admin'] ? 1 : intval($user['active']);
+        $active = $user_data['platform_admin'] ? 1 : intval($user['active']);
 
         //If the user is set to admin the status will be overwrite by COURSEMANAGER = 1
         if ($platform_admin == 1) {
@@ -426,40 +426,40 @@ 
             null,
             $send_mail,
             $reset_password,
-			$user['address']
+            $user['address']
         );
 
         if (isset($user['student_boss'])) {
             UserManager::subscribeUserToBossList($user_id, $user['student_boss']);
         }
 
-		if (api_get_setting('openid_authentication') == 'true' && !empty($user['openid'])) {
-			$up = UserManager::update_openid($user_id, $user['openid']);
-		}
+        if (api_get_setting('openid_authentication') == 'true' && !empty($user['openid'])) {
+            $up = UserManager::update_openid($user_id, $user['openid']);
+        }
         $currentUserId = api_get_user_id();
 
         $userObj = api_get_user_entity($user_id);
 
         UserManager::add_user_as_admin($userObj);
 
-		if ($user_id != $currentUserId) {
-			if ($platform_admin == 1) {
-				$userObj = api_get_user_entity($user_id);
+        if ($user_id != $currentUserId) {
+            if ($platform_admin == 1) {
+                $userObj = api_get_user_entity($user_id);
                 UserManager::add_user_as_admin($userObj);
-			} else {
+            } else {
                 UserManager::remove_user_admin($user_id);
-			}
-		}
+            }
+        }
 
         $extraFieldValue = new ExtraFieldValue('user');
         $extraFieldValue->saveFieldValues($user);
 
-		$tok = Security::get_token();
+        $tok = Security::get_token();
 
         Display::addFlash(Display::return_message(get_lang('UserUpdated')));
-		header('Location: user_list.php?sec_token='.$tok);
-		exit();
-	}
+        header('Location: user_list.php?sec_token='.$tok);
+        exit();
+    }
 }
 
 if ($error_drh) {

main/exercise/exercise_result.php

Indentation +15 added lines, -15 removed lines

@@ -58,7 +58,7 @@ 
 
 $gradebook = '';
 if (isset($_SESSION['gradebook'])) {
-	$gradebook=	$_SESSION['gradebook'];
+    $gradebook=	$_SESSION['gradebook'];
 }
 if (!empty($gradebook) && $gradebook=='view') {
     $interbreadcrumb[] = array(
@@ -78,8 +78,8 @@ 
 $htmlHeadXtra[] = '<link rel="stylesheet" href="' . api_get_path(WEB_LIBRARY_JS_PATH) . 'hotspot/css/hotspot.css">';
 
 if ($origin != 'learnpath') {
-	// So we are not in learnpath tool
-	Display::display_header($nameTools, get_lang('Exercise'));
+    // So we are not in learnpath tool
+    Display::display_header($nameTools, get_lang('Exercise'));
 } else {
     $htmlHeadXtra[] = "
     <style>
@@ -93,19 +93,19 @@ 
 
 // I'm in a preview mode as course admin. Display the action menu.
 if (api_is_course_admin() && $origin != 'learnpath') {
-	echo '<div class="actions">';
-	echo '<a href="admin.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id.'">'.
+    echo '<div class="actions">';
+    echo '<a href="admin.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id.'">'.
         Display::return_icon('back.png', get_lang('GoBackToQuestionList'), array(), 32).'</a>';
-	echo '<a href="exercise_admin.php?'.api_get_cidreq().'&modifyExercise=yes&exerciseId='.$objExercise->id.'">'.
+    echo '<a href="exercise_admin.php?'.api_get_cidreq().'&modifyExercise=yes&exerciseId='.$objExercise->id.'">'.
         Display::return_icon('edit.png', get_lang('ModifyExercise'), array(), 32).'</a>';
-	echo '</div>';
+    echo '</div>';
 }
 
 $feedback_type = $objExercise->feedback_type;
 $exercise_stat_info = $objExercise->get_stat_track_exercise_info_by_exe_id($exe_id);
 
 if (!empty($exercise_stat_info['data_tracking'])) {
-	$question_list = explode(',', $exercise_stat_info['data_tracking']);
+    $question_list = explode(',', $exercise_stat_info['data_tracking']);
 }
 
 $learnpath_id = $exercise_stat_info['orig_lp_id'];
@@ -204,11 +204,11 @@ 
         Session::erase('objExercise');
         Session::erase('exe_id');
     }
-	Display::display_footer();
+    Display::display_footer();
 } else {
-	$lp_mode = isset($_SESSION['lp_mode']) ? $_SESSION['lp_mode'] : null;
-	$url = '../lp/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$learnpath_id.'&lp_item_id='.$learnpath_item_id.'&exeId='.$exercise_stat_info['exe_id'].'&fb_type='.$objExercise->feedback_type.'#atoc_'.$learnpath_item_id;
-	$href = ($lp_mode == 'fullscreen')?' window.opener.location.href="'.$url.'" ':' top.location.href="'.$url.'"';
+    $lp_mode = isset($_SESSION['lp_mode']) ? $_SESSION['lp_mode'] : null;
+    $url = '../lp/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$learnpath_id.'&lp_item_id='.$learnpath_item_id.'&exeId='.$exercise_stat_info['exe_id'].'&fb_type='.$objExercise->feedback_type.'#atoc_'.$learnpath_item_id;
+    $href = ($lp_mode == 'fullscreen')?' window.opener.location.href="'.$url.'" ':' top.location.href="'.$url.'"';
 
     if (api_is_allowed_to_session_edit()) {
         Session::erase('objExercise');
@@ -217,8 +217,8 @@ 
 
     Session::write('attempt_remaining', $remainingMessage);
 
-	// Record the results in the learning path, using the SCORM interface (API)
-	echo "<script>window.parent.API.void_save_asset('$total_score', '$max_score', 0, 'completed');</script>";
+    // Record the results in the learning path, using the SCORM interface (API)
+    echo "<script>window.parent.API.void_save_asset('$total_score', '$max_score', 0, 'completed');</script>";
     echo '<script type="text/javascript">'.$href.'</script>';
-	echo '</body></html>';
+    echo '</body></html>';
 }