chamilo / chamilo-lms

main/admin/skill_badge.php

Spacing +2 added lines, -2 removed lines

@@ -23,14 +23,14 @@
 
 $interbreadcrumb = array(
     array(
-        'url' => api_get_path(WEB_CODE_PATH) . 'admin/index.php',
+        'url' => api_get_path(WEB_CODE_PATH).'admin/index.php',
         'name' => get_lang('Administration')
     )
 );
 
 $toolbar = Display::toolbarButton(
     get_lang('ManageSkills'),
-    api_get_path(WEB_CODE_PATH) . 'admin/skill_list.php',
+    api_get_path(WEB_CODE_PATH).'admin/skill_list.php',
     'list',
     'primary',
     ['title' => get_lang('ManageSkills')]

main/admin/user_import.php

Braces +8 added lines, -2 removed lines

@@ -505,8 +505,14 @@
     <p><?php echo get_lang('CSVMustLookLike').' ('.get_lang('MandatoryFields').')'; ?> :</p>
     <blockquote>
 <pre>
-<b>LastName</b>;<b>FirstName</b>;<b>Email</b>;UserName;Password;AuthSource;OfficialCode;PhoneNumber;Status;ExpiryDate;<span style="color:red;"><?php if (count($list) > 0) echo implode(';', $list).';'; ?></span>Courses;ClassId;
-<b>xxx</b>;<b>xxx</b>;<b>xxx</b>;xxx;xxx;<?php echo implode('/', $defined_auth_sources); ?>;xxx;xxx;user/teacher/drh;0000-00-00 00:00:00;<span style="color:red;"><?php if (count($list_reponse) > 0) echo implode(';', $list_reponse).';'; ?></span>xxx1|xxx2|xxx3;1;<br />
+<b>LastName</b>;<b>FirstName</b>;<b>Email</b>;UserName;Password;AuthSource;OfficialCode;PhoneNumber;Status;ExpiryDate;<span style="color:red;"><?php if (count($list) > 0) {
+    echo implode(';', $list).';';
+}
+?></span>Courses;ClassId;
+<b>xxx</b>;<b>xxx</b>;<b>xxx</b>;xxx;xxx;<?php echo implode('/', $defined_auth_sources); ?>;xxx;xxx;user/teacher/drh;0000-00-00 00:00:00;<span style="color:red;"><?php if (count($list_reponse) > 0) {
+    echo implode(';', $list_reponse).';';
+}
+?></span>xxx1|xxx2|xxx3;1;<br />
 </pre>
 </blockquote>
 <p><?php echo get_lang('XMLMustLookLike').' ('.get_lang('MandatoryFields').')'; ?> :</p>

Spacing +5 added lines, -5 removed lines

@@ -215,8 +215,8 @@ 
             // We are sure that the extra field exists.
             foreach ($extra_fields as $extras) {
                 if (isset($user[$extras[1]])) {
-                    $key 	= $extras[1];
-                    $value 	= $user[$extras[1]];
+                    $key = $extras[1];
+                    $value = $user[$extras[1]];
                     UserManager::update_extra_field_value($user_id, $key, $value);
                 }
             }
@@ -252,7 +252,7 @@ 
     global $current_tag;
     switch ($data) {
         case 'Contact':
-            $user = array ();
+            $user = array();
             break;
         default:
             $current_tag = $data;
@@ -345,7 +345,7 @@ 
     $allowed_file_mimetype = array('csv', 'xml');
     $error_kind_file = false;
 
-    $checkUniqueEmail = isset($_POST['check_unique_email']) ? $_POST['check_unique_email'] :null;
+    $checkUniqueEmail = isset($_POST['check_unique_email']) ? $_POST['check_unique_email'] : null;
 
     $uploadInfo = pathinfo($_FILES['import_file']['name']);
     $ext_import_file = $uploadInfo['extension'];
@@ -354,7 +354,7 @@ 
         if (strcmp($file_type, 'csv') === 0 &&
             $ext_import_file == $allowed_file_mimetype[0]
         ) {
-            $users	= parse_csv_data($_FILES['import_file']['tmp_name']);
+            $users = parse_csv_data($_FILES['import_file']['tmp_name']);
             $errors = validate_data($users, $checkUniqueEmail);
             $error_kind_file = false;
         } elseif (strcmp($file_type, 'xml') === 0 && $ext_import_file == $allowed_file_mimetype[1]) {

Doc Comments +1 added lines, -1 removed lines

@@ -227,7 +227,7 @@
 /**
  * Read the CSV-file
  * @param string $file Path to the CSV-file
- * @return array All userinformation read from the file
+ * @return Ddeboer\DataImport\Reader\CsvReader All userinformation read from the file
  */
 function parse_csv_data($file)
 {

main/admin/dashboard_add_sessions_to_user.php

Spacing +20 added lines, -20 removed lines

@@ -22,11 +22,11 @@ 
 
 // setting breadcrumbs
 $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array('url' => 'user_list.php','name' => get_lang('UserList'));
+$interbreadcrumb[] = array('url' => 'user_list.php', 'name' => get_lang('UserList'));
 
 // Database Table Definitions
-$tbl_session 			= Database::get_main_table(TABLE_MAIN_SESSION);
-$tbl_session_rel_user 	= Database::get_main_table(TABLE_MAIN_SESSION_USER);
+$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
+$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
 $tbl_session_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
 
 // Initializing variables
@@ -46,7 +46,7 @@ 
 }
 
 $add_type = 'multiple';
-if (isset($_GET['add_type']) && $_GET['add_type']!='') {
+if (isset($_GET['add_type']) && $_GET['add_type'] != '') {
     $add_type = Security::remove_XSS($_REQUEST['add_type']);
 }
 
@@ -71,20 +71,20 @@ 
         }
 
         if (api_is_multiple_url_enabled()) {
-            $sql 	= " SELECT s.id, s.name FROM $tbl_session s
+            $sql = " SELECT s.id, s.name FROM $tbl_session s
                         LEFT JOIN $tbl_session_rel_access_url a ON (s.id = a.session_id)
                         WHERE  s.name LIKE '$needle%' $without_assigned_sessions AND access_url_id = ".api_get_current_access_url_id()."";
         } else {
             $sql = "SELECT s.id, s.name FROM $tbl_session s
                     WHERE  s.name LIKE '$needle%' $without_assigned_sessions ";
         }
-        $rs	= Database::query($sql);
+        $rs = Database::query($sql);
         $return .= '<select class="form-control" id="origin" name="NoAssignedSessionsList[]" multiple="multiple" size="20">';
-        while($session = Database :: fetch_array($rs)) {
-            $return .= '<option value="'.$session['id'].'" title="'.htmlspecialchars($session['name'],ENT_QUOTES).'">'.$session['name'].'</option>';
+        while ($session = Database :: fetch_array($rs)) {
+            $return .= '<option value="'.$session['id'].'" title="'.htmlspecialchars($session['name'], ENT_QUOTES).'">'.$session['name'].'</option>';
         }
         $return .= '</select>';
-        $xajax_response->addAssign('ajax_list_sessions_multiple','innerHTML',api_utf8_encode($return));
+        $xajax_response->addAssign('ajax_list_sessions_multiple', 'innerHTML', api_utf8_encode($return));
     }
 
     return $xajax_response;
@@ -143,7 +143,7 @@ 
 }
 </script>';
 
-$formSent=0;
+$formSent = 0;
 $firstLetterSession = isset($_POST['firstLetterSession']) ? $_POST['firstLetterSession'] : null;
 $errorMsg = '';
 $UserList = array();
@@ -168,12 +168,12 @@ 
 // actions
 
 if ($user_info['status'] != SESSIONADMIN) {
-    $actionsLeft = '<a href="dashboard_add_users_to_user.php?user='.$user_id.'">' . Display::return_icon('add-user.png', get_lang('AssignUsers'), null, ICON_SIZE_MEDIUM ) . '</a>';
-    $actionsLeft .= '<a href="dashboard_add_courses_to_user.php?user='.$user_id.'">' . Display::return_icon('course-add.png', get_lang('AssignCourses'), null, ICON_SIZE_MEDIUM) . '</a>';
+    $actionsLeft = '<a href="dashboard_add_users_to_user.php?user='.$user_id.'">'.Display::return_icon('add-user.png', get_lang('AssignUsers'), null, ICON_SIZE_MEDIUM).'</a>';
+    $actionsLeft .= '<a href="dashboard_add_courses_to_user.php?user='.$user_id.'">'.Display::return_icon('course-add.png', get_lang('AssignCourses'), null, ICON_SIZE_MEDIUM).'</a>';
 }
 
 
-echo Display::toolbarAction('toolbar-dashboard', array( 0 => $actionsLeft, 1 => ''));
+echo Display::toolbarAction('toolbar-dashboard', array(0 => $actionsLeft, 1 => ''));
 
 echo Display::page_header(sprintf(get_lang('AssignSessionsToX'), api_get_person_name($user_info['firstname'], $user_info['lastname'])), null, 'h3');
 
@@ -182,7 +182,7 @@ 
 
 $without_assigned_sessions = '';
 if (count($assigned_sessions_id) > 0) {
-    $without_assigned_sessions = " AND s.id NOT IN (".implode(',',$assigned_sessions_id).") ";
+    $without_assigned_sessions = " AND s.id NOT IN (".implode(',', $assigned_sessions_id).") ";
 }
 
 $needle = '%';
@@ -203,9 +203,9 @@ 
 		    WHERE  s.name LIKE '$needle%' $without_assigned_sessions
             ORDER BY s.name";
 }
-$result	= Database::query($sql);
+$result = Database::query($sql);
 ?>
-    <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?user=<?php echo $user_id ?>" style="margin:0px;" <?php if($ajax_search){ echo ' onsubmit="valide();"';}?>>
+    <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?user=<?php echo $user_id ?>" style="margin:0px;" <?php if ($ajax_search) { echo ' onsubmit="valide();"'; }?>>
         <input type="hidden" name="formSent" value="1" />
         
         <div class="row">
@@ -217,7 +217,7 @@ 
                         <?php
                         while ($enreg = Database::fetch_array($result)) {
                         ?>
-                            <option value="<?php echo $enreg['id']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['name'],ENT_QUOTES).'"';?>>
+                            <option value="<?php echo $enreg['id']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['name'], ENT_QUOTES).'"'; ?>>
                                 <?php echo $enreg['name']; ?>
                             </option>
                         <?php } ?>
@@ -227,7 +227,7 @@ 
             <div class="col-md-4">
                 <div class="code-course">
                     <?php if ($add_type == 'multiple') { ?>
-                    <p><?php echo get_lang('FirstLetterSession');?> :</p>
+                    <p><?php echo get_lang('FirstLetterSession'); ?> :</p>
                     <select class="selectpicker form-control" name="firstLetterSession" onchange = "xajax_search_sessions(this.value, 'multiple')">
                         <option value="%">--</option>
                             <?php  echo Display :: get_alphabet_options($firstLetterSession); ?>
@@ -282,9 +282,9 @@ 
                  <select id='destination' name="SessionsList[]" multiple="multiple" size="20" style="width:320px;">
                         <?php
                         if (is_array($assigned_sessions_to_hrm)) {
-                            foreach($assigned_sessions_to_hrm as $enreg) {
+                            foreach ($assigned_sessions_to_hrm as $enreg) {
                                 ?>
-                                <option value="<?php echo $enreg['id']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['name'],ENT_QUOTES).'"'; ?>>
+                                <option value="<?php echo $enreg['id']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['name'], ENT_QUOTES).'"'; ?>>
                                     <?php echo $enreg['name'] ?>
                                 </option>
                             <?php }

Braces +1 added lines, -2 removed lines

@@ -244,8 +244,7 @@
                             </button>
                         </div>    
                     <?php
-                    }
-                    else
+                    } else
                     {
                         ?>
                     <div class="separate-action">

main/admin/ldap_users_list.php

Spacing +30 added lines, -30 removed lines

@@ -30,7 +30,7 @@ 
 }
 */
 
-$interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
 $tool_name = get_lang('SearchLDAPUsers');
 //Display :: display_header($tool_name); //cannot display now as we need to redirect
 //api_display_tool_title($tool_name);
@@ -38,7 +38,7 @@ 
 if (isset ($_GET['action']))
 {
 	$check = Security::check_token('get');
-	if($check)
+	if ($check)
 	{
 		switch ($_GET['action'])
 		{
@@ -59,41 +59,41 @@ 
 				break;
 			case 'lock' :
 				Display :: display_header($tool_name);
-				$message=lock_unlock_user('lock',$_GET['user_id']);
+				$message = lock_unlock_user('lock', $_GET['user_id']);
 				Display :: display_normal_message($message);
 				break;
 			case 'unlock';
 				Display :: display_header($tool_name);
-				$message=lock_unlock_user('unlock',$_GET['user_id']);
+				$message = lock_unlock_user('unlock', $_GET['user_id']);
 				Display :: display_normal_message($message);
 				break;
 			case 'add_user';
-				$id=$_GET['id'];
-				$UserList=array();
+				$id = $_GET['id'];
+				$UserList = array();
 				$userid_match_login = array();
 				foreach ($id as $user_id) {
 					$tmp = ldap_add_user($user_id);
-					$UserList[]= $tmp;
+					$UserList[] = $tmp;
 					$userid_match_login[$tmp] = $user_id;
 				}
-				if (isset($_GET['id_session']) && ($_GET['id_session'] == strval(intval($_GET['id_session']))) && ($_GET['id_session']>0)) {
+				if (isset($_GET['id_session']) && ($_GET['id_session'] == strval(intval($_GET['id_session']))) && ($_GET['id_session'] > 0)) {
 					ldap_add_user_to_session($UserList, $_GET['id_session']);
 					header('Location: resume_session.php?id_session='.$_GET['id_session']);
 				} else {
 					Display :: display_header($tool_name);
-					if(count($userid_match_login)>0)
+					if (count($userid_match_login) > 0)
 					{
-						$message=get_lang('LDAPUsersAddedOrUpdated').':<br />';
-						foreach($userid_match_login as $user_id => $login)
+						$message = get_lang('LDAPUsersAddedOrUpdated').':<br />';
+						foreach ($userid_match_login as $user_id => $login)
 						{
 							$message .= '- '.$login.'<br />';
 						}
 					}
 					else
 					{
-						$message=get_lang('NoUserAdded');
+						$message = get_lang('NoUserAdded');
 					}
-					Display :: display_normal_message($message,false);
+					Display :: display_normal_message($message, false);
 				}
 				break;
 			default :
@@ -113,7 +113,7 @@ 
 if (isset ($_POST['action']))
 {
 	$check = Security::check_token('get');
-	if($check)
+	if ($check)
 	{
 		switch ($_POST['action'])
 		{
@@ -122,15 +122,15 @@ 
 				$number_of_deleted_users = 0;
 				foreach ($_POST['id'] as $index => $user_id)
 				{
-					if($user_id != $_user['user_id'])
+					if ($user_id != $_user['user_id'])
 					{
-						if(UserManager :: delete_user($user_id))
+						if (UserManager :: delete_user($user_id))
 						{
 							$number_of_deleted_users++;
 						}
 					}
 				}
-				if($number_of_selected_users == $number_of_deleted_users)
+				if ($number_of_selected_users == $number_of_deleted_users)
 				{
 					Display :: display_normal_message(get_lang('SelectedUsersDeleted'));
 				}
@@ -142,17 +142,17 @@ 
 			case 'add_user' :
 				$number_of_selected_users = count($_POST['id']);
 				$number_of_added_users = 0;
-				$UserList=array();
+				$UserList = array();
 				foreach ($_POST['id'] as $index => $user_id)
 				{
-					if($user_id != $_user['user_id'])
+					if ($user_id != $_user['user_id'])
 					{
 						$UserList[] = ldap_add_user($user_id);
 					}
 				}
-				if (isset($_GET['id_session']) && (trim($_GET['id_session'])!=""))
+				if (isset($_GET['id_session']) && (trim($_GET['id_session']) != ""))
 					addUserToSession($UserList, $_GET['id_session']);
-				if(count($UserList)>0)
+				if (count($UserList) > 0)
 				{
 					Display :: display_normal_message(count($UserList)." ".get_lang('LDAPUsersAdded'));
 				}
@@ -167,8 +167,8 @@ 
 	}
 }
 
-$form = new FormValidator('advanced_search','get');
-$form->addText('keyword_username',get_lang('LoginName'),false);
+$form = new FormValidator('advanced_search', 'get');
+$form->addText('keyword_username', get_lang('LoginName'), false);
 if (api_is_western_name_order())
 {
 	$form->addText('keyword_firstname', get_lang('FirstName'), false);
@@ -176,20 +176,20 @@ 
 }
 else
 {
-	$form->addText('keyword_lastname',get_lang('LastName'),false);
-	$form->addText('keyword_firstname',get_lang('FirstName'),false);
+	$form->addText('keyword_lastname', get_lang('LastName'), false);
+	$form->addText('keyword_firstname', get_lang('FirstName'), false);
 }
 if (isset($_GET['id_session']))
-	$form->addElement('hidden','id_session',$_GET['id_session']);
+	$form->addElement('hidden', 'id_session', $_GET['id_session']);
 
 $type = array();
 $type["all"] = get_lang('All');
-$type["employee"]  = get_lang('Teacher');
+$type["employee"] = get_lang('Teacher');
 $type["student"] = get_lang('Student');
 
-$form->addElement('select','keyword_type',get_lang('Status'),$type);
+$form->addElement('select', 'keyword_type', get_lang('Status'), $type);
 // Structure a rajouer ??
-$form->addElement('submit','submit',get_lang('Ok'));
+$form->addElement('submit', 'submit', get_lang('Ok'));
 //$defaults['keyword_active'] = 1;
 //$defaults['keyword_inactive'] = 1;
 //$form->setDefaults($defaults);
@@ -225,7 +225,7 @@ 
 //$table->set_column_filter(5, 'email_filter');
 //$table->set_column_filter(5, 'active_filter');
 $table->set_column_filter(5, 'modify_filter');
-$table->set_form_actions(array ('add_user' => get_lang('AddLDAPUsers')));
+$table->set_form_actions(array('add_user' => get_lang('AddLDAPUsers')));
 $table->display();
 
 /*

Braces +15 added lines, -20 removed lines

@@ -51,8 +51,7 @@ 
 				if ($user_id != $_user['user_id'] && UserManager :: delete_user($_GET['user_id']))
 				{
 					Display :: display_normal_message(get_lang('UserDeleted'));
-				}
-				else
+				} else
 				{
 					Display :: display_error_message(get_lang('CannotDeleteUser'));
 				}
@@ -88,8 +87,7 @@ 
 						{
 							$message .= '- '.$login.'<br />';
 						}
-					}
-					else
+					} else
 					{
 						$message=get_lang('NoUserAdded');
 					}
@@ -100,13 +98,11 @@ 
 				Display :: display_header($tool_name);
 		}
 		Security::clear_token();
-	}
-	else
+	} else
 	{
 		Display::display_header($tool_name);
 	}
-}
-else
+} else
 {
 	Display::display_header($tool_name);
 }
@@ -133,8 +129,7 @@ 
 				if($number_of_selected_users == $number_of_deleted_users)
 				{
 					Display :: display_normal_message(get_lang('SelectedUsersDeleted'));
-				}
-				else
+				} else
 				{
 					Display :: display_error_message(get_lang('SomeUsersNotDeleted'));
 				}
@@ -150,13 +145,13 @@ 
 						$UserList[] = ldap_add_user($user_id);
 					}
 				}
-				if (isset($_GET['id_session']) && (trim($_GET['id_session'])!=""))
-					addUserToSession($UserList, $_GET['id_session']);
+				if (isset($_GET['id_session']) && (trim($_GET['id_session'])!="")) {
+									addUserToSession($UserList, $_GET['id_session']);
+				}
 				if(count($UserList)>0)
 				{
 					Display :: display_normal_message(count($UserList)." ".get_lang('LDAPUsersAdded'));
-				}
-				else
+				} else
 				{
 					Display :: display_normal_message(get_lang('NoUserAdded'));
 				}
@@ -173,14 +168,14 @@ 
 {
 	$form->addText('keyword_firstname', get_lang('FirstName'), false);
 	$form->addText('keyword_lastname', get_lang('LastName'), false);
-}
-else
+} else
 {
 	$form->addText('keyword_lastname',get_lang('LastName'),false);
 	$form->addText('keyword_firstname',get_lang('FirstName'),false);
 }
-if (isset($_GET['id_session']))
+if (isset($_GET['id_session'])) {
 	$form->addElement('hidden','id_session',$_GET['id_session']);
+}
 
 $type = array();
 $type["all"] = get_lang('All');
@@ -201,8 +196,9 @@ 
 $parameters['keyword_firstname'] = @$_GET['keyword_firstname'] ?: null;
 $parameters['keyword_lastname'] = @$_GET['keyword_lastname'] ?: null;
 $parameters['keyword_email'] = @$_GET['keyword_email'] ?: null;
-if (isset($_GET['id_session']))
+if (isset($_GET['id_session'])) {
 	$parameters['id_session'] = $_GET['id_session'];
+}
 // Create a sortable table with user-data
 
 $parameters['sec_token'] = Security::get_token();
@@ -214,8 +210,7 @@ 
 {
 	$table->set_header(2, get_lang('FirstName'));
 	$table->set_header(3, get_lang('LastName'));
-}
-else
+} else
 {
 	$table->set_header(2, get_lang('LastName'));
 	$table->set_header(3, get_lang('FirstName'));

Indentation +132 added lines, -132 removed lines

@@ -20,7 +20,7 @@ 
 // Login as ...
 if ($action == "login_as" && !empty ($login_as_user_id))
 {
-	login_user($login_as_user_id);
+    login_user($login_as_user_id);
 }
 
 //if we already have a session id and a user...
@@ -37,150 +37,150 @@ 
 
 if (isset ($_GET['action']))
 {
-	$check = Security::check_token('get');
-	if($check)
-	{
-		switch ($_GET['action'])
-		{
-			case 'show_message' :
-				Display :: display_header($tool_name);
-				Display :: display_normal_message($_GET['message']);
-				break;
-			case 'delete_user' :
-				Display :: display_header($tool_name);
-				if ($user_id != $_user['user_id'] && UserManager :: delete_user($_GET['user_id']))
-				{
-					Display :: display_normal_message(get_lang('UserDeleted'));
-				}
-				else
-				{
-					Display :: display_error_message(get_lang('CannotDeleteUser'));
-				}
-				break;
-			case 'lock' :
-				Display :: display_header($tool_name);
-				$message=lock_unlock_user('lock',$_GET['user_id']);
-				Display :: display_normal_message($message);
-				break;
-			case 'unlock';
-				Display :: display_header($tool_name);
-				$message=lock_unlock_user('unlock',$_GET['user_id']);
-				Display :: display_normal_message($message);
-				break;
-			case 'add_user';
-				$id=$_GET['id'];
-				$UserList=array();
-				$userid_match_login = array();
-				foreach ($id as $user_id) {
-					$tmp = ldap_add_user($user_id);
-					$UserList[]= $tmp;
-					$userid_match_login[$tmp] = $user_id;
-				}
-				if (isset($_GET['id_session']) && ($_GET['id_session'] == strval(intval($_GET['id_session']))) && ($_GET['id_session']>0)) {
-					ldap_add_user_to_session($UserList, $_GET['id_session']);
-					header('Location: resume_session.php?id_session='.$_GET['id_session']);
-				} else {
-					Display :: display_header($tool_name);
-					if(count($userid_match_login)>0)
-					{
-						$message=get_lang('LDAPUsersAddedOrUpdated').':<br />';
-						foreach($userid_match_login as $user_id => $login)
-						{
-							$message .= '- '.$login.'<br />';
-						}
-					}
-					else
-					{
-						$message=get_lang('NoUserAdded');
-					}
-					Display :: display_normal_message($message,false);
-				}
-				break;
-			default :
-				Display :: display_header($tool_name);
-		}
-		Security::clear_token();
-	}
-	else
-	{
-		Display::display_header($tool_name);
-	}
+    $check = Security::check_token('get');
+    if($check)
+    {
+        switch ($_GET['action'])
+        {
+            case 'show_message' :
+                Display :: display_header($tool_name);
+                Display :: display_normal_message($_GET['message']);
+                break;
+            case 'delete_user' :
+                Display :: display_header($tool_name);
+                if ($user_id != $_user['user_id'] && UserManager :: delete_user($_GET['user_id']))
+                {
+                    Display :: display_normal_message(get_lang('UserDeleted'));
+                }
+                else
+                {
+                    Display :: display_error_message(get_lang('CannotDeleteUser'));
+                }
+                break;
+            case 'lock' :
+                Display :: display_header($tool_name);
+                $message=lock_unlock_user('lock',$_GET['user_id']);
+                Display :: display_normal_message($message);
+                break;
+            case 'unlock';
+                Display :: display_header($tool_name);
+                $message=lock_unlock_user('unlock',$_GET['user_id']);
+                Display :: display_normal_message($message);
+                break;
+            case 'add_user';
+                $id=$_GET['id'];
+                $UserList=array();
+                $userid_match_login = array();
+                foreach ($id as $user_id) {
+                    $tmp = ldap_add_user($user_id);
+                    $UserList[]= $tmp;
+                    $userid_match_login[$tmp] = $user_id;
+                }
+                if (isset($_GET['id_session']) && ($_GET['id_session'] == strval(intval($_GET['id_session']))) && ($_GET['id_session']>0)) {
+                    ldap_add_user_to_session($UserList, $_GET['id_session']);
+                    header('Location: resume_session.php?id_session='.$_GET['id_session']);
+                } else {
+                    Display :: display_header($tool_name);
+                    if(count($userid_match_login)>0)
+                    {
+                        $message=get_lang('LDAPUsersAddedOrUpdated').':<br />';
+                        foreach($userid_match_login as $user_id => $login)
+                        {
+                            $message .= '- '.$login.'<br />';
+                        }
+                    }
+                    else
+                    {
+                        $message=get_lang('NoUserAdded');
+                    }
+                    Display :: display_normal_message($message,false);
+                }
+                break;
+            default :
+                Display :: display_header($tool_name);
+        }
+        Security::clear_token();
+    }
+    else
+    {
+        Display::display_header($tool_name);
+    }
 }
 else
 {
-	Display::display_header($tool_name);
+    Display::display_header($tool_name);
 }
 if (isset ($_POST['action']))
 {
-	$check = Security::check_token('get');
-	if($check)
-	{
-		switch ($_POST['action'])
-		{
-			case 'delete' :
-				$number_of_selected_users = count($_POST['id']);
-				$number_of_deleted_users = 0;
-				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)
-				{
-					Display :: display_normal_message(get_lang('SelectedUsersDeleted'));
-				}
-				else
-				{
-					Display :: display_error_message(get_lang('SomeUsersNotDeleted'));
-				}
-				break;
-			case 'add_user' :
-				$number_of_selected_users = count($_POST['id']);
-				$number_of_added_users = 0;
-				$UserList=array();
-				foreach ($_POST['id'] as $index => $user_id)
-				{
-					if($user_id != $_user['user_id'])
-					{
-						$UserList[] = ldap_add_user($user_id);
-					}
-				}
-				if (isset($_GET['id_session']) && (trim($_GET['id_session'])!=""))
-					addUserToSession($UserList, $_GET['id_session']);
-				if(count($UserList)>0)
-				{
-					Display :: display_normal_message(count($UserList)." ".get_lang('LDAPUsersAdded'));
-				}
-				else
-				{
-					Display :: display_normal_message(get_lang('NoUserAdded'));
-				}
-				break;
+    $check = Security::check_token('get');
+    if($check)
+    {
+        switch ($_POST['action'])
+        {
+            case 'delete' :
+                $number_of_selected_users = count($_POST['id']);
+                $number_of_deleted_users = 0;
+                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)
+                {
+                    Display :: display_normal_message(get_lang('SelectedUsersDeleted'));
+                }
+                else
+                {
+                    Display :: display_error_message(get_lang('SomeUsersNotDeleted'));
+                }
+                break;
+            case 'add_user' :
+                $number_of_selected_users = count($_POST['id']);
+                $number_of_added_users = 0;
+                $UserList=array();
+                foreach ($_POST['id'] as $index => $user_id)
+                {
+                    if($user_id != $_user['user_id'])
+                    {
+                        $UserList[] = ldap_add_user($user_id);
+                    }
+                }
+                if (isset($_GET['id_session']) && (trim($_GET['id_session'])!=""))
+                    addUserToSession($UserList, $_GET['id_session']);
+                if(count($UserList)>0)
+                {
+                    Display :: display_normal_message(count($UserList)." ".get_lang('LDAPUsersAdded'));
+                }
+                else
+                {
+                    Display :: display_normal_message(get_lang('NoUserAdded'));
+                }
+                break;
 
-		}
-		Security::clear_token();
-	}
+        }
+        Security::clear_token();
+    }
 }
 
 $form = new FormValidator('advanced_search','get');
 $form->addText('keyword_username',get_lang('LoginName'),false);
 if (api_is_western_name_order())
 {
-	$form->addText('keyword_firstname', get_lang('FirstName'), false);
-	$form->addText('keyword_lastname', get_lang('LastName'), false);
+    $form->addText('keyword_firstname', get_lang('FirstName'), false);
+    $form->addText('keyword_lastname', get_lang('LastName'), false);
 }
 else
 {
-	$form->addText('keyword_lastname',get_lang('LastName'),false);
-	$form->addText('keyword_firstname',get_lang('FirstName'),false);
+    $form->addText('keyword_lastname',get_lang('LastName'),false);
+    $form->addText('keyword_firstname',get_lang('FirstName'),false);
 }
 if (isset($_GET['id_session']))
-	$form->addElement('hidden','id_session',$_GET['id_session']);
+    $form->addElement('hidden','id_session',$_GET['id_session']);
 
 $type = array();
 $type["all"] = get_lang('All');
@@ -202,7 +202,7 @@ 
 $parameters['keyword_lastname'] = @$_GET['keyword_lastname'] ?: null;
 $parameters['keyword_email'] = @$_GET['keyword_email'] ?: null;
 if (isset($_GET['id_session']))
-	$parameters['id_session'] = $_GET['id_session'];
+    $parameters['id_session'] = $_GET['id_session'];
 // Create a sortable table with user-data
 
 $parameters['sec_token'] = Security::get_token();
@@ -212,13 +212,13 @@ 
 $table->set_header(1, get_lang('LoginName'));
 if (api_is_western_name_order())
 {
-	$table->set_header(2, get_lang('FirstName'));
-	$table->set_header(3, get_lang('LastName'));
+    $table->set_header(2, get_lang('FirstName'));
+    $table->set_header(3, get_lang('LastName'));
 }
 else
 {
-	$table->set_header(2, get_lang('LastName'));
-	$table->set_header(3, get_lang('FirstName'));
+    $table->set_header(2, get_lang('LastName'));
+    $table->set_header(3, get_lang('FirstName'));
 }
 $table->set_header(4, get_lang('Email'));
 $table->set_header(5, get_lang('Actions'));

main/admin/filler.php

Indentation +4 added lines, -4 removed lines

@@ -30,8 +30,8 @@ 
 $output = array();
 if (!empty($_GET['fill'])) {
     switch ($_GET['fill']) {
-    	case 'users':
-        	require api_get_path(SYS_TEST_PATH).'datafiller/fill_users.php';
+        case 'users':
+            require api_get_path(SYS_TEST_PATH).'datafiller/fill_users.php';
             $output = fill_users();
             break;
         case 'courses':
@@ -53,8 +53,8 @@ 
     $result .= '<table>';
     foreach ($output as $line) {
         $result .= '<tr>';
-	    $result .= '<td class="filler-report-data-init">'.$line['line-init'].' </td><td class="filler-report-data">'.$line['line-info'].'</td>';
-	    $result .= '</tr>';
+        $result .= '<td class="filler-report-data-init">'.$line['line-init'].' </td><td class="filler-report-data">'.$line['line-info'].'</td>';
+        $result .= '</tr>';
     }
     $result .= '</table>';
     $result .= '</div>';

Spacing +7 added lines, -7 removed lines

@@ -22,7 +22,7 @@ 
 $nameTools = get_lang('PlatformAdmin');
 
 // setting breadcrumbs
-$interbreadcrumb[] = array ("url" => 'index.php', "name" => $nameTools);
+$interbreadcrumb[] = array("url" => 'index.php', "name" => $nameTools);
 
 // setting the name of the tool
 $nameTools = get_lang('DataFiller');
@@ -47,7 +47,7 @@ 
 Display::display_header($nameTools);
 
 $result = '';
-if (count($output)>0) {
+if (count($output) > 0) {
     $result = '<div class="filler-report">'."\n";
     $result .= '<h3>'.$output[0]['title'].'</h3>'."\n";
     $result .= '<table>';
@@ -58,15 +58,15 @@ 
     }
     $result .= '</table>';
     $result .= '</div>';
-    Display::display_normal_message($result,false);
+    Display::display_normal_message($result, false);
 }
 ?>
 <div id="datafiller" class="actions">
-  <h4><?php echo Display::return_icon('bug.png',get_lang('DataFiller'),null,ICON_SIZE_MEDIUM).' '.get_lang('DataFiller')?></h4>
-  <div class="description"><?php echo get_lang('ThisSectionIsOnlyVisibleOnSourceInstalls');?></div>
+  <h4><?php echo Display::return_icon('bug.png', get_lang('DataFiller'), null, ICON_SIZE_MEDIUM).' '.get_lang('DataFiller')?></h4>
+  <div class="description"><?php echo get_lang('ThisSectionIsOnlyVisibleOnSourceInstalls'); ?></div>
   <ul class="fillers">
-    <li><a href="filler.php?fill=users"><?php echo Display::return_icon('user.png',get_lang('FillUsers'),null,ICON_SIZE_SMALL).' '.get_lang('FillUsers');?></a></li>
-    <li><a href="filler.php?fill=courses"><?php echo Display::return_icon('new-course.png',get_lang('FillCourses'),null,ICON_SIZE_SMALL).' '.get_lang('FillCourses');?></a></li>
+    <li><a href="filler.php?fill=users"><?php echo Display::return_icon('user.png', get_lang('FillUsers'), null, ICON_SIZE_SMALL).' '.get_lang('FillUsers'); ?></a></li>
+    <li><a href="filler.php?fill=courses"><?php echo Display::return_icon('new-course.png', get_lang('FillCourses'), null, ICON_SIZE_SMALL).' '.get_lang('FillCourses'); ?></a></li>
   </ul>
 </div>
 <?php

main/admin/access_url_edit_course_category_to_url.php

Indentation +21 added lines, -21 removed lines

@@ -124,11 +124,11 @@ 
 }
 
 if ($add_type == 'multiple') {
-	$link_add_type_unique = '<a href="'.api_get_self().'?add_type=unique&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeUnique').'</a>';
-	$link_add_type_multiple = get_lang('SessionAddTypeMultiple');
+    $link_add_type_unique = '<a href="'.api_get_self().'?add_type=unique&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeUnique').'</a>';
+    $link_add_type_multiple = get_lang('SessionAddTypeMultiple');
 } else {
-	$link_add_type_unique = get_lang('SessionAddTypeUnique');
-	$link_add_type_multiple = '<a href="'.api_get_self().'?add_type=multiple&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeMultiple').'</a>';
+    $link_add_type_unique = get_lang('SessionAddTypeUnique');
+    $link_add_type_multiple = '<a href="'.api_get_self().'?add_type=multiple&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeMultiple').'</a>';
 }
 
 $url_list = UrlManager::get_url_data();
@@ -192,34 +192,34 @@ 
     <?php } else { ?>
 	  <select id="origin_users" name="no_course_list[]" multiple="multiple" size="15" style="width:380px;">
 		<?php
-		foreach ($noUserGroupList as $noItem) {
-		?>
+        foreach ($noUserGroupList as $noItem) {
+        ?>
 			<option value="<?php echo $noItem['id']; ?>">
                 <?php echo $noItem['name']; ?>
             </option>
 		<?php
-		}
-		?>
+        }
+        ?>
 	  </select>
 	<?php
-  	  }
-  	 ?>
+        }
+        ?>
   </div>
   </td>
   <td width="10%" valign="middle" align="center">
   <?php
-  if ($ajax_search) {
-	?>
+    if ($ajax_search) {
+    ?>
 	<button class="btn btn-default" type="button" onclick="remove_item(document.getElementById('destination_users'))" ></button>
   	<?php
-  } else {
-  	?>
+    } else {
+        ?>
 	<button class="arrowr" type="button" onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))" ></button>
 	<br /><br />
 	<button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('destination_users'), document.getElementById('origin_users'))" ></button>
 	<?php
-  }
-  ?>
+    }
+    ?>
 	<br /><br /><br /><br /><br /><br />
   </td>
   <td align="center">
@@ -240,11 +240,11 @@ 
 	<td colspan="3" align="center">
 		<br />
 		<?php
-		if(isset($_GET['add']))
-			echo '<button class="save" onclick="valide()" >'.get_lang('Add').'</button>';
-		else
-			echo '<button class="save" onclick="valide()" >'.get_lang('Edit').'</button>';
-		?>
+        if(isset($_GET['add']))
+            echo '<button class="save" onclick="valide()" >'.get_lang('Add').'</button>';
+        else
+            echo '<button class="save" onclick="valide()" >'.get_lang('Edit').'</button>';
+        ?>
 	</td>
 </tr>
 </table>

Spacing +13 added lines, -13 removed lines

@@ -24,8 +24,8 @@ 
 
 // Setting breadcrumbs
 $tool_name = get_lang('EditUserGroupToURL');
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array ('url' => 'access_urls.php', 'name' => get_lang('MultipleAccessURLs'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'access_urls.php', 'name' => get_lang('MultipleAccessURLs'));
 
 $add_type = 'multiple';
 if (isset($_REQUEST['add_type']) && $_REQUEST['add_type'] != '') {
@@ -72,10 +72,10 @@ 
 }
 </script>';
 
-$form_sent=0;
-$errorMsg='';
-$UserList=$SessionList = array();
-$users=$sessions = array();
+$form_sent = 0;
+$errorMsg = '';
+$UserList = $SessionList = array();
+$users = $sessions = array();
 
 if (isset($_POST['form_sent']) && $_POST['form_sent']) {
     $form_sent = $_POST['form_sent'];
@@ -117,7 +117,7 @@ 
 
     foreach ($userGroups as $item) {
         if ($item['access_url_id'] == $access_url_id) {
-            $userGroupList[$item['id']] = $item ;
+            $userGroupList[$item['id']] = $item;
         }
     }
     $noUserGroupList = getCourseCategoryNotInList(array_keys($userGroupList));
@@ -153,11 +153,11 @@ 
         if (!empty($access_url_id)) {
             if ($url_obj[0] == $access_url_id) {
                 $checked = 'selected=true';
-                $url_selected=$url_obj[1];
+                $url_selected = $url_obj[1];
             }
         }
-        if ($url_obj['active']==1) { ?>
-            <option <?php echo $checked;?> value="<?php echo $url_obj[0]; ?>"> <?php echo $url_obj[1]; ?>
+        if ($url_obj['active'] == 1) { ?>
+            <option <?php echo $checked; ?> value="<?php echo $url_obj[0]; ?>"> <?php echo $url_obj[1]; ?>
             </option>
         <?php
         }
@@ -180,7 +180,7 @@ 
   <td align="center"><b><?php echo get_lang('CourseCategoryInPlatform') ?> :</b>
   </td>
   <td></td>
-  <td align="center"><b><?php printf(get_lang('CourseCategoryListInX'),$url_selected); ?></b></td>
+  <td align="center"><b><?php printf(get_lang('CourseCategoryListInX'), $url_selected); ?></b></td>
 </tr>
 
 <tr>
@@ -225,7 +225,7 @@ 
   <td align="center">
   <select id="destination_users" name="course_list[]" multiple="multiple" size="15" style="width:380px;">
 <?php
-foreach($userGroupList as $item) {
+foreach ($userGroupList as $item) {
 ?>
 	<option value="<?php echo $item['id']; ?>">
         <?php echo $item['name']; ?>
@@ -240,7 +240,7 @@ 
 	<td colspan="3" align="center">
 		<br />
 		<?php
-		if(isset($_GET['add']))
+		if (isset($_GET['add']))
 			echo '<button class="save" onclick="valide()" >'.get_lang('Add').'</button>';
 		else
 			echo '<button class="save" onclick="valide()" >'.get_lang('Edit').'</button>';

Braces +5 added lines, -4 removed lines

@@ -240,10 +240,11 @@
 	<td colspan="3" align="center">
 		<br />
 		<?php
-		if(isset($_GET['add']))
-			echo '<button class="save" onclick="valide()" >'.get_lang('Add').'</button>';
-		else
-			echo '<button class="save" onclick="valide()" >'.get_lang('Edit').'</button>';
+		if(isset($_GET['add'])) {
+					echo '<button class="save" onclick="valide()" >'.get_lang('Add').'</button>';
+		} else {
+					echo '<button class="save" onclick="valide()" >'.get_lang('Edit').'</button>';
+		}
 		?>
 	</td>
 </tr>

main/admin/system_announcements.php

Spacing +20 added lines, -20 removed lines

@@ -14,7 +14,7 @@ 
 
 // Setting the section (for the tabs).
 $this_section = SECTION_PLATFORM_ADMIN;
-$_SESSION['this_section']=$this_section;
+$_SESSION['this_section'] = $this_section;
 
 $action = isset($_GET['action']) ? $_GET['action'] : null;
 $action_todo = false;
@@ -35,12 +35,12 @@ 
 }
 
 if (!empty($action)) {
-    $interbreadcrumb[] = array ("url" => "system_announcements.php", "name" => get_lang('SystemAnnouncements'));
+    $interbreadcrumb[] = array("url" => "system_announcements.php", "name" => get_lang('SystemAnnouncements'));
     if ($action == 'add') {
-        $interbreadcrumb[] = array ("url" => '#', "name" => get_lang('AddAnnouncement'));
+        $interbreadcrumb[] = array("url" => '#', "name" => get_lang('AddAnnouncement'));
     }
     if ($action == 'edit') {
-        $interbreadcrumb[] = array ("url" => '#', "name" => get_lang('Edit'));
+        $interbreadcrumb[] = array("url" => '#', "name" => get_lang('Edit'));
     }
 } else {
     $tool_name = get_lang('SystemAnnouncements');
@@ -66,7 +66,7 @@ 
 }
 
 // Actions
-switch($action) {
+switch ($action) {
     case 'make_visible':
     case 'make_invisible':
         $status = false;
@@ -81,7 +81,7 @@ 
         Display :: display_confirmation_message(get_lang('AnnouncementDeleted'));
         break;
     case 'delete_selected':
-        foreach($_POST['id'] as $index => $id) {
+        foreach ($_POST['id'] as $index => $id) {
             SystemAnnouncementManager :: delete_announcement($id);
         }
         Display :: display_confirmation_message(get_lang('AnnouncementDeleted'));
@@ -137,11 +137,11 @@ 
     $language_list = api_get_languages();
     $language_list_with_keys = array();
     $language_list_with_keys['all'] = get_lang('All');
-    for ($i=0; $i<count($language_list['name']) ; $i++) {
+    for ($i = 0; $i < count($language_list['name']); $i++) {
         $language_list_with_keys[$language_list['folder'][$i]] = $language_list['name'][$i];
     }
 
-    $form->addElement('select', 'lang',get_lang('Language'), $language_list_with_keys);
+    $form->addElement('select', 'lang', get_lang('Language'), $language_list_with_keys);
     $form->addHtmlEditor(
         'content',
         get_lang('Content'),
@@ -157,9 +157,9 @@ 
 
     $group = array();
 
-    $group[]= $form->createElement('checkbox', 'visible_teacher', null, get_lang('Teacher'));
-    $group[]= $form->createElement('checkbox', 'visible_student', null, get_lang('Student'));
-    $group[]= $form->createElement('checkbox', 'visible_guest', null, get_lang('Guest'));
+    $group[] = $form->createElement('checkbox', 'visible_teacher', null, get_lang('Teacher'));
+    $group[] = $form->createElement('checkbox', 'visible_student', null, get_lang('Student'));
+    $group[] = $form->createElement('checkbox', 'visible_guest', null, get_lang('Guest'));
 
     $form->addGroup($group, null, get_lang('Visible'), '');
 
@@ -182,15 +182,15 @@ 
 
     $form->addElement('checkbox', 'send_mail', null, get_lang('SendMail'));
 
-    if (isset($_REQUEST['action']) && $_REQUEST['action']=='add') {
+    if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'add') {
         $form->addElement('checkbox', 'add_to_calendar', null, get_lang('AddToCalendar'));
-        $text=get_lang('AddNews');
-        $class='add';
+        $text = get_lang('AddNews');
+        $class = 'add';
         $form->addElement('hidden', 'action', 'add');
 
     } elseif (isset($_REQUEST['action']) && $_REQUEST['action'] == 'edit') {
-        $text=get_lang('EditNews');
-        $class='save';
+        $text = get_lang('EditNews');
+        $class = 'save';
         $form->addElement('hidden', 'action', 'edit');
     }
     $form->addElement('checkbox', 'send_email_test', null, get_lang('SendOnlyAnEmailToMySelfToTest'));
@@ -280,7 +280,7 @@ 
 
 if ($show_announcement_list) {
     $announcements = SystemAnnouncementManager :: get_all_announcements();
-    $announcement_data = array ();
+    $announcement_data = array();
     foreach ($announcements as $index => $announcement) {
         $row = array();
         $row[] = $announcement->id;
@@ -288,9 +288,9 @@ 
         $row[] = $announcement->title;
         $row[] = api_convert_and_format_date($announcement->date_start);
         $row[] = api_convert_and_format_date($announcement->date_end);
-        $row[] = "<a href=\"?id=".$announcement->id."&person=".SystemAnnouncementManager::VISIBLE_TEACHER."&action=". ($announcement->visible_teacher ? 'make_invisible' : 'make_visible')."\">".Display::return_icon(($announcement->visible_teacher  ? 'eyes.png' : 'eyes-close.png'), get_lang('ShowOrHide'))."</a>";
-        $row[] = "<a href=\"?id=".$announcement->id."&person=".SystemAnnouncementManager::VISIBLE_STUDENT."&action=". ($announcement->visible_student  ? 'make_invisible' : 'make_visible')."\">".Display::return_icon(($announcement->visible_student  ? 'eyes.png' : 'eyes-close.png'), get_lang('ShowOrHide'))."</a>";
-        $row[] = "<a href=\"?id=".$announcement->id."&person=".SystemAnnouncementManager::VISIBLE_GUEST."&action=". ($announcement->visible_guest ? 'make_invisible' : 'make_visible')."\">".Display::return_icon(($announcement->visible_guest  ? 'eyes.png' : 'eyes-close.png'), get_lang('ShowOrHide'))."</a>";
+        $row[] = "<a href=\"?id=".$announcement->id."&person=".SystemAnnouncementManager::VISIBLE_TEACHER."&action=".($announcement->visible_teacher ? 'make_invisible' : 'make_visible')."\">".Display::return_icon(($announcement->visible_teacher ? 'eyes.png' : 'eyes-close.png'), get_lang('ShowOrHide'))."</a>";
+        $row[] = "<a href=\"?id=".$announcement->id."&person=".SystemAnnouncementManager::VISIBLE_STUDENT."&action=".($announcement->visible_student ? 'make_invisible' : 'make_visible')."\">".Display::return_icon(($announcement->visible_student ? 'eyes.png' : 'eyes-close.png'), get_lang('ShowOrHide'))."</a>";
+        $row[] = "<a href=\"?id=".$announcement->id."&person=".SystemAnnouncementManager::VISIBLE_GUEST."&action=".($announcement->visible_guest ? 'make_invisible' : 'make_visible')."\">".Display::return_icon(($announcement->visible_guest ? 'eyes.png' : 'eyes-close.png'), get_lang('ShowOrHide'))."</a>";
 
         $row[] = $announcement->lang;
         $row[] = "<a href=\"?action=edit&id=".$announcement->id."\">".Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL)."</a> <a href=\"?action=delete&id=".$announcement->id."\"  onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES))."')) return false;\">".Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL)."</a>";

main/admin/specific_fields.php

Indentation +7 added lines, -7 removed lines

@@ -43,15 +43,15 @@ 
 $table->set_column_filter(3, 'edit_filter');
 
 function edit_filter($id,$url_params,$row) {
-	global $charset;
-	$return = '<a href="specific_fields_add.php?action=edit&field_id='.$row[0].'">'.Display::return_icon('edit.gif',get_lang('Edit')).'</a>';
-	$return .= ' <a href="'.api_get_self().'?action=delete&field_id='.$row[0].'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset))."'".')) return false;">'.Display::return_icon('delete.gif',get_lang('Delete')).'</a>';
-	return $return;
+    global $charset;
+    $return = '<a href="specific_fields_add.php?action=edit&field_id='.$row[0].'">'.Display::return_icon('edit.gif',get_lang('Edit')).'</a>';
+    $return .= ' <a href="'.api_get_self().'?action=delete&field_id='.$row[0].'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset))."'".')) return false;">'.Display::return_icon('delete.gif',get_lang('Delete')).'</a>';
+    return $return;
 }
 
 if ($_REQUEST['action'] == 'delete') {
-	delete_specific_field($_REQUEST['field_id']);
-	header('Location: specific_fields.php?message='.get_lang('FieldRemoved'));
+    delete_specific_field($_REQUEST['field_id']);
+    header('Location: specific_fields.php?message='.get_lang('FieldRemoved'));
 }
 
 // Start output
@@ -61,7 +61,7 @@ 
 echo Display::display_normal_message(get_lang('SpecificSearchFieldsIntro'));
 
 if(!empty($_GET['message'])) {
-  Display::display_confirmation_message($_GET['message']);
+    Display::display_confirmation_message($_GET['message']);
 }
 
 echo '<div class="actions">';

Spacing +14 added lines, -14 removed lines

@@ -15,36 +15,36 @@ 
 api_protect_admin_script();
 
 // Breadcrumb
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array ('url' => 'settings.php?category=Search', 'name' => get_lang('PlatformConfigSettings'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'settings.php?category=Search', 'name' => get_lang('PlatformConfigSettings'));
 
 $libpath = api_get_path(LIBRARY_PATH);
 
 include_once $libpath.'specific_fields_manager.lib.php';
 
 // Create an add-field box
-$form = new FormValidator('add_field','post','','',null,false);
-$renderer =& $form->defaultRenderer();
+$form = new FormValidator('add_field', 'post', '', '', null, false);
+$renderer = & $form->defaultRenderer();
 $renderer->setCustomElementTemplate('<span>{element}</span> ');
-$form->addElement('static','search_advanced_link',null,'<a href="specific_fields_add.php">'.Display::return_icon('fieldadd.gif').get_lang('AddSpecificSearchField').'</a>');
+$form->addElement('static', 'search_advanced_link', null, '<a href="specific_fields_add.php">'.Display::return_icon('fieldadd.gif').get_lang('AddSpecificSearchField').'</a>');
 
 // Create a sortable table with specific fields data
-$column_show = array(1,1,1);
-$column_order = array(3,2,1);
+$column_show = array(1, 1, 1);
+$column_order = array(3, 2, 1);
 $extra_fields = get_specific_field_list();
 $number_of_extra_fields = count($extra_fields);
 
-$table = new SortableTableFromArrayConfig($extra_fields,2,50,'',$column_show,$column_order);
-$table->set_header(0, '&nbsp;', false,null,'width="2%"', 'style="display:none"');
+$table = new SortableTableFromArrayConfig($extra_fields, 2, 50, '', $column_show, $column_order);
+$table->set_header(0, '&nbsp;', false, null, 'width="2%"', 'style="display:none"');
 $table->set_header(1, get_lang('Code'), TRUE, 'width="10%"');
 $table->set_header(2, get_lang('Name'));
-$table->set_header(3, get_lang('Modify'),false,'width="10%"');
+$table->set_header(3, get_lang('Modify'), false, 'width="10%"');
 $table->set_column_filter(3, 'edit_filter');
 
-function edit_filter($id,$url_params,$row) {
+function edit_filter($id, $url_params, $row) {
 	global $charset;
-	$return = '<a href="specific_fields_add.php?action=edit&field_id='.$row[0].'">'.Display::return_icon('edit.gif',get_lang('Edit')).'</a>';
-	$return .= ' <a href="'.api_get_self().'?action=delete&field_id='.$row[0].'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset))."'".')) return false;">'.Display::return_icon('delete.gif',get_lang('Delete')).'</a>';
+	$return = '<a href="specific_fields_add.php?action=edit&field_id='.$row[0].'">'.Display::return_icon('edit.gif', get_lang('Edit')).'</a>';
+	$return .= ' <a href="'.api_get_self().'?action=delete&field_id='.$row[0].'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset))."'".')) return false;">'.Display::return_icon('delete.gif', get_lang('Delete')).'</a>';
 	return $return;
 }
 
@@ -60,7 +60,7 @@ 
 Display::display_header(get_lang('SpecificSearchFields'));
 echo Display::display_normal_message(get_lang('SpecificSearchFieldsIntro'));
 
-if(!empty($_GET['message'])) {
+if (!empty($_GET['message'])) {
   Display::display_confirmation_message($_GET['message']);
 }
 

main/admin/skills_profile.php

Spacing +8 added lines, -8 removed lines

@@ -24,7 +24,7 @@ 
 $skill_profile   = new SkillProfile();
 $skill_rel_user  = new SkillRelUser();
 
-$url  = api_get_path(WEB_AJAX_PATH).'skill.ajax.php';
+$url = api_get_path(WEB_AJAX_PATH).'skill.ajax.php';
 
 $tpl = new Template(get_lang('Skills'));
 
@@ -55,16 +55,16 @@ 
         $_SESSION['skills'] = $skills;
 
     } else {
-        $skills = isset($_SESSION['skills']) ? $_SESSION['skills']: array();
+        $skills = isset($_SESSION['skills']) ? $_SESSION['skills'] : array();
     }
 } else {
-    $skills = isset($_SESSION['skills']) ? $_SESSION['skills']: array();
+    $skills = isset($_SESSION['skills']) ? $_SESSION['skills'] : array();
 }
 
 $user_list = array();
 $count_skills = count($skills);
 
-$users  = $skill_rel_user->get_user_by_skills($skills);
+$users = $skill_rel_user->get_user_by_skills($skills);
 
 if (!empty($users)) {
     foreach ($users as $user) {
@@ -72,7 +72,7 @@ 
         $user_list[$user['user_id']]['user'] = $user_info;
         $my_user_skills = $skill_rel_user->get_user_skills($user['user_id']);
         $user_skills = array();
-        $found_counts = 0 ;
+        $found_counts = 0;
         foreach ($my_user_skills as $my_skill) {
             $found = false;
             if (in_array($my_skill['skill_id'], $skills)) {
@@ -89,7 +89,7 @@ 
         $user_list[$user['user_id']]['total_found_skills'] = $found_counts;
     }
     $ordered_user_list = array();
-    foreach($user_list as $user_id => $user_data) {
+    foreach ($user_list as $user_id => $user_data) {
         $ordered_user_list[$user_data['total_found_skills']][] = $user_data;
     }
     if (!empty($ordered_user_list)) {
@@ -103,14 +103,14 @@ 
 
 if (!empty($skills)) {
     $counter = 0;
-    foreach($skills as $hidden_skill_id) {
+    foreach ($skills as $hidden_skill_id) {
         $form->addElement('hidden', 'hidden_skills[]', $hidden_skill_id);
         $counter++;
     }
 }
 
 if (!empty($skills)) {
-    foreach($skills as $my_skill) {
+    foreach ($skills as $my_skill) {
         $total_skills_to_search[$my_skill] = $my_skill;
     }
 }