chamilo / chamilo-lms

main/admin/skills_wheel.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 $url = api_get_path(WEB_AJAX_PATH)."skill.ajax.php?a=get_skills_tree_json&load_user=$load_user";
 $tpl->assign('wheel_url', $url);
 
-$url  = api_get_path(WEB_AJAX_PATH).'skill.ajax.php?1=1';
+$url = api_get_path(WEB_AJAX_PATH).'skill.ajax.php?1=1';
 $tpl->assign('url', $url);
 $tpl->assign('isAdministration', true);
 

main/admin/promotions.php

Indentation +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
 <script>
 $(function() {
 <?php
-     echo Display::grid_js('promotions', $url, $columns, $column_model, $extra_params, array(), $action_links, true);
+        echo Display::grid_js('promotions', $url, $columns, $column_model, $extra_params, array(), $action_links, true);
 ?>
 });
 </script>

Spacing +7 added lines, -7 removed lines

@@ -16,8 +16,8 @@ 
 $htmlHeadXtra[] = api_get_jqgrid_js();
 
 // setting breadcrumbs
-$interbreadcrumb[] = array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array('url' => 'career_dashboard.php','name' => get_lang('CareersAndPromotions'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'career_dashboard.php', 'name' => get_lang('CareersAndPromotions'));
 
 $action = isset($_GET['action']) ? $_GET['action'] : null;
 
@@ -102,10 +102,10 @@ 
 $extra_params['height'] = 'auto'; //use the width of the parent
 //With this function we can add actions to the jgrid
 $action_links = 'function action_formatter (cellvalue, options, rowObject) {
-    return \'<a href="add_sessions_to_promotion.php?id=\'+options.rowId+\'">'.Display::return_icon('session_to_promotion.png',get_lang('SubscribeSessionsToPromotions'),'',ICON_SIZE_SMALL).'</a>'.
-    '&nbsp;<a href="?action=edit&id=\'+options.rowId+\'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>'.
-    '&nbsp;<a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."\'".')) return false;"  href="?sec_token='.$token.'&action=copy&id=\'+options.rowId+\'">'.Display::return_icon('copy.png',get_lang('Copy'),'',ICON_SIZE_SMALL).'</a>'.
-    '&nbsp;<a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."\'".')) return false;"  href="?sec_token='.$token.'&action=delete&id=\'+options.rowId+\'">'.Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a> \';
+    return \'<a href="add_sessions_to_promotion.php?id=\'+options.rowId+\'">'.Display::return_icon('session_to_promotion.png', get_lang('SubscribeSessionsToPromotions'), '', ICON_SIZE_SMALL).'</a>'.
+    '&nbsp;<a href="?action=edit&id=\'+options.rowId+\'">'.Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>'.
+    '&nbsp;<a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES))."\'".')) return false;"  href="?sec_token='.$token.'&action=copy&id=\'+options.rowId+\'">'.Display::return_icon('copy.png', get_lang('Copy'), '', ICON_SIZE_SMALL).'</a>'.
+    '&nbsp;<a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES))."\'".')) return false;"  href="?sec_token='.$token.'&action=delete&id=\'+options.rowId+\'">'.Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a> \';
 }';
 
 ?>
@@ -150,7 +150,7 @@ 
             $promotion->display();
         } else {
             echo '<div class="actions">';
-            echo Display::url(Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM), api_get_self());
+            echo Display::url(Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM), api_get_self());
             echo '</div>';
             $form->addElement('hidden', 'sec_token');
             $form->setConstants(array('sec_token' => $token));

main/admin/access_url_add_courses_to_url.php

Indentation +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
       <?php
         echo Display :: get_alphabet_options($first_letter_course);
         echo Display :: get_numeric_options(0,9,$first_letter_course);
-      ?>
+        ?>
      </select>
     </td>
         <td width="20%">&nbsp;</td>

Spacing +10 added lines, -10 removed lines

@@ -10,7 +10,7 @@ 
 $cidReset = true;
 require_once '../inc/global.inc.php';
 
-$this_section=SECTION_PLATFORM_ADMIN;
+$this_section = SECTION_PLATFORM_ADMIN;
 
 api_protect_global_admin_script();
 
@@ -21,7 +21,7 @@ 
 
 $form_sent = 0;
 $first_letter_course = '';
-$courses = array ();
+$courses = array();
 $url_list = array();
 $users = array();
 
@@ -32,8 +32,8 @@ 
 
 /*	Header   */
 $tool_name = get_lang('AddCoursesToURL');
-$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'));
 
 Display :: display_header($tool_name);
 
@@ -48,8 +48,8 @@ 
 
 if (isset($_POST['form_sent']) && $_POST['form_sent']) {
     $form_sent = $_POST['form_sent'];
-    $courses = is_array($_POST['course_list']) ? $_POST['course_list'] : array() ;
-    $url_list = is_array($_POST['url_list']) ? $_POST['url_list'] : array() ;
+    $courses = is_array($_POST['course_list']) ? $_POST['course_list'] : array();
+    $url_list = is_array($_POST['url_list']) ? $_POST['url_list'] : array();
     $first_letter_course = $_POST['first_letter_course'];
 
     foreach ($users as $key => $value) {
@@ -70,7 +70,7 @@ 
     $sql = "SELECT count(*) as num_courses FROM $tbl_course";
     $result = Database::query($sql);
     $num_row = Database::fetch_array($result);
-    if ($num_row['num_courses']>1000) {
+    if ($num_row['num_courses'] > 1000) {
         //if there are too much num_courses to gracefully handle with the HTML select list,
         // assign a default filter on users names
         $first_letter_user = 'A';
@@ -106,7 +106,7 @@ 
       <option value="">--</option>
       <?php
         echo Display :: get_alphabet_options($first_letter_course);
-        echo Display :: get_numeric_options(0,9,$first_letter_course);
+        echo Display :: get_numeric_options(0, 9, $first_letter_course);
       ?>
      </select>
     </td>
@@ -119,7 +119,7 @@ 
     <td width="40%" align="center">
      <select name="course_list[]" multiple="multiple" size="20" style="width:400px;">
 		<?php foreach ($db_courses as $course) { ?>
-			<option value="<?php echo $course['code']; ?>" <?php if(in_array($course['code'],$courses)) echo 'selected="selected"'; ?>><?php echo $course['title'].' ('.$course['code'].')'; ?>
+			<option value="<?php echo $course['code']; ?>" <?php if (in_array($course['code'], $courses)) echo 'selected="selected"'; ?>><?php echo $course['title'].' ('.$course['code'].')'; ?>
             </option>
         <?php } ?>
     </select>
@@ -130,7 +130,7 @@ 
    <td width="40%" align="center">
     <select name="url_list[]" multiple="multiple" size="20" style="width:300px;">
 		<?php foreach ($db_urls as $url_obj) { ?>
-        <option value="<?php echo $url_obj['id']; ?>" <?php if(in_array($url_obj['id'],$url_list)) echo 'selected="selected"'; ?>><?php echo $url_obj['url']; ?>
+        <option value="<?php echo $url_obj['id']; ?>" <?php if (in_array($url_obj['id'], $url_list)) echo 'selected="selected"'; ?>><?php echo $url_obj['url']; ?>
         </option>
 		<?php } ?>
     </select>

Braces +8 added lines, -2 removed lines

@@ -119,7 +119,10 @@ 
     <td width="40%" align="center">
      <select name="course_list[]" multiple="multiple" size="20" style="width:400px;">
 		<?php foreach ($db_courses as $course) { ?>
-			<option value="<?php echo $course['code']; ?>" <?php if(in_array($course['code'],$courses)) echo 'selected="selected"'; ?>><?php echo $course['title'].' ('.$course['code'].')'; ?>
+			<option value="<?php echo $course['code']; ?>" <?php if(in_array($course['code'],$courses)) {
+    echo 'selected="selected"';
+}
+?>><?php echo $course['title'].' ('.$course['code'].')'; ?>
             </option>
         <?php } ?>
     </select>
@@ -130,7 +133,10 @@ 
    <td width="40%" align="center">
     <select name="url_list[]" multiple="multiple" size="20" style="width:300px;">
 		<?php foreach ($db_urls as $url_obj) { ?>
-        <option value="<?php echo $url_obj['id']; ?>" <?php if(in_array($url_obj['id'],$url_list)) echo 'selected="selected"'; ?>><?php echo $url_obj['url']; ?>
+        <option value="<?php echo $url_obj['id']; ?>" <?php if(in_array($url_obj['id'],$url_list)) {
+    echo 'selected="selected"';
+}
+?>><?php echo $url_obj['url']; ?>
         </option>
 		<?php } ?>
     </select>

main/admin/ldap_import_students_to_session.php

Spacing +19 added lines, -19 removed lines

@@ -9,7 +9,7 @@ 
  * Code
  */
 // resetting the course id
-$cidReset=true;
+$cidReset = true;
 require_once('../inc/global.inc.php');
 // setting the section (for the tabs)
 $this_section = SECTION_PLATFORM_ADMIN;
@@ -17,11 +17,11 @@ 
 api_protect_admin_script();
 require('../auth/ldap/authldap.php');
 
-$annee_base=date('Y');
+$annee_base = date('Y');
 
 $tool_name = get_lang('LDAPImport');
 // setting breadcrumbs
-$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
 
 $htmlHeadXtra[] = '<script language="JavaScript" type="text/javascript">
 var buttoncheck = 1;
@@ -64,7 +64,7 @@ 
 		echo '</div>';
 
 }
-elseif(!empty($annee) && empty($id_session))
+elseif (!empty($annee) && empty($id_session))
 {
 	Display::display_header($tool_name);
 	echo '<div style="align:center">';
@@ -73,14 +73,14 @@ 
 	echo '<select name="id_session">';
 
 	$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
-	$sql = "SELECT id,name,nbr_courses,access_start_date,access_end_date " .
+	$sql = "SELECT id,name,nbr_courses,access_start_date,access_end_date ".
 		" FROM $tbl_session ".
 		" ORDER BY name";
 	$result = Database::query($sql);
 
-	$sessions=Database::store_result($result);
-	$nbr_results=count($sessions);
-	foreach($sessions as $row) {
+	$sessions = Database::store_result($result);
+	$nbr_results = count($sessions);
+	foreach ($sessions as $row) {
 		echo '<option value="'.$row['id'].'">'.api_htmlentities($row['name']).' ('.$row['access_start_date'].' - '.$row['access_end_date'].')</option>';
 	}
 	echo '</select>';
@@ -112,7 +112,7 @@ 
 
 		$info = ldap_get_entries($ds, $sr);
 
-		for ($key = 0; $key < $info["count"]; $key ++) {
+		for ($key = 0; $key < $info["count"]; $key++) {
 			$nom_form[] = $info[$key]["sn"][0];
 			$prenom_form[] = $info[$key]["givenname"][0];
 			$email_form[] = $info[$key]["mail"][0];
@@ -132,7 +132,7 @@ 
 		asort($nom_form);
 		reset($nom_form);
 
-		$statut=5;
+		$statut = 5;
 		include ('ldap_form_add_users_group.php');
 	} else {
 		echo '<h4>'.get_lang('UnableToConnectTo').' '.$host.'</h4>';
@@ -143,24 +143,24 @@ 
     echo '</div>';
 
 }
-elseif (!empty($annee) && !empty($id_session) && ($_POST['confirmed']=='yes'))
+elseif (!empty($annee) && !empty($id_session) && ($_POST['confirmed'] == 'yes'))
 {
-	$id=$_POST['username_form'];
-	$UserList=array();
+	$id = $_POST['username_form'];
+	$UserList = array();
 	$userid_match_login = array();
 	foreach ($id as $form_index=>$user_id)
 	{
-		if(is_array($_POST['checkboxes']) && in_array($form_index,array_values($_POST['checkboxes'])))
+		if (is_array($_POST['checkboxes']) && in_array($form_index, array_values($_POST['checkboxes'])))
 		{
 			$tmp = ldap_add_user($user_id);
-			$UserList[]= $tmp;
+			$UserList[] = $tmp;
 			$userid_match_login[$tmp] = $user_id;
 		}
 	}
 	if (!empty($_POST['id_session'])) {
 		$num = 0;
 		$tbl_session_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
-		$tbl_session	  = Database::get_main_table(TABLE_MAIN_SESSION);
+		$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
 		foreach ($UserList as $user_id) {
                     $res_user = Database::insert(
                         $tbl_session_user,
@@ -175,7 +175,7 @@ 
                     }
 		}
 
-		if($num>0) {
+		if ($num > 0) {
 			$sql = 'UPDATE '.$tbl_session.' SET nbr_users = (nbr_users + '.$num.') WHERE id = '.intval($id_session);
 			$res = Database::query($sql);
 		}
@@ -203,8 +203,8 @@ 
 	else
 	{
 		Display::display_header($tool_name);
-		$message=get_lang('NoUserAdded');
-		Display :: display_normal_message($message,false);
+		$message = get_lang('NoUserAdded');
+		Display :: display_normal_message($message, false);
 	}
 	echo '<br /><br />';
     echo '<a href="ldap_import_students.php?annee=&composante=&etape=">'.get_lang('BackToNewSearch').'</a>';

Braces +2 added lines, -4 removed lines

@@ -63,8 +63,7 @@ 
 		echo '</form>';
 		echo '</div>';
 
-}
-elseif(!empty($annee) && empty($id_session))
+} elseif(!empty($annee) && empty($id_session))
 {
 	Display::display_header($tool_name);
 	echo '<div style="align:center">';
@@ -142,8 +141,7 @@ 
     echo '<br /><br />';
     echo '</div>';
 
-}
-elseif (!empty($annee) && !empty($id_session) && ($_POST['confirmed']=='yes'))
+} elseif (!empty($annee) && !empty($id_session) && ($_POST['confirmed']=='yes'))
 {
 	$id=$_POST['username_form'];
 	$UserList=array();

Indentation +111 added lines, -111 removed lines

@@ -53,93 +53,93 @@ 
 //if ($annee == "" && $composante == "" && $etape == "") {
 if (empty($annee) && empty($id_session))
 {
-		Display::display_header($tool_name);
-		echo '<div style="align:center">';
-		echo Display::return_icon('group.gif', get_lang('LDAPSelectFilterOnUsersOU')).' '.get_lang('LDAPSelectFilterOnUsersOU');
-		echo '<form method="get" action="'.api_get_self().'"><br />';
-		echo '<em>'.get_lang('LDAPOUAttributeFilter').' :</em> ';
-		echo '<input  type="text" name="annee" size="4" maxlength="30" value="'.$annee_base.'"> ';
-		echo '<input type="submit" value="'.get_lang('Submit').'">';
-		echo '</form>';
-		echo '</div>';
+        Display::display_header($tool_name);
+        echo '<div style="align:center">';
+        echo Display::return_icon('group.gif', get_lang('LDAPSelectFilterOnUsersOU')).' '.get_lang('LDAPSelectFilterOnUsersOU');
+        echo '<form method="get" action="'.api_get_self().'"><br />';
+        echo '<em>'.get_lang('LDAPOUAttributeFilter').' :</em> ';
+        echo '<input  type="text" name="annee" size="4" maxlength="30" value="'.$annee_base.'"> ';
+        echo '<input type="submit" value="'.get_lang('Submit').'">';
+        echo '</form>';
+        echo '</div>';
 
 }
 elseif(!empty($annee) && empty($id_session))
 {
-	Display::display_header($tool_name);
-	echo '<div style="align:center">';
-	echo Display::return_icon(
-			'course.png',
-			get_lang('SelectSessionToImportUsersTo')).' '.get_lang('SelectSessionToImportUsersTo').'<br />';
-	echo '<form method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'"><br />';
-	echo '<select name="id_session">';
-
-	$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
-	$sql = "SELECT id,name,nbr_courses,access_start_date,access_end_date " .
-		" FROM $tbl_session ".
-		" ORDER BY name";
-	$result = Database::query($sql);
-
-	$sessions=Database::store_result($result);
-	$nbr_results=count($sessions);
-	foreach($sessions as $row) {
-		echo '<option value="'.$row['id'].'">'.api_htmlentities($row['name']).' ('.$row['access_start_date'].' - '.$row['access_end_date'].')</option>';
-	}
-	echo '</select>';
-	echo '<input type="submit" value="'.get_lang('Submit').'">';
-	echo '</form>';
-	echo '</div>';
+    Display::display_header($tool_name);
+    echo '<div style="align:center">';
+    echo Display::return_icon(
+            'course.png',
+            get_lang('SelectSessionToImportUsersTo')).' '.get_lang('SelectSessionToImportUsersTo').'<br />';
+    echo '<form method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'"><br />';
+    echo '<select name="id_session">';
+
+    $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
+    $sql = "SELECT id,name,nbr_courses,access_start_date,access_end_date " .
+        " FROM $tbl_session ".
+        " ORDER BY name";
+    $result = Database::query($sql);
+
+    $sessions=Database::store_result($result);
+    $nbr_results=count($sessions);
+    foreach($sessions as $row) {
+        echo '<option value="'.$row['id'].'">'.api_htmlentities($row['name']).' ('.$row['access_start_date'].' - '.$row['access_end_date'].')</option>';
+    }
+    echo '</select>';
+    echo '<input type="submit" value="'.get_lang('Submit').'">';
+    echo '</form>';
+    echo '</div>';
 }
 // form4  annee != 0; composante != 0 etape != 0
 //elseif ($annee <> "" && $composante <> "" && $etape <> "" && $listeok != 'yes') {
 elseif (!empty($annee) && !empty($id_session) && empty($_POST['confirmed']))
 {
-	Display::display_header($tool_name);
-	echo '<div style="align: center;">';
-	echo '<br />';
-	echo '<br />';
-	echo '<h3>'.Display::return_icon('group.gif', get_lang('SelectStudents')).' '.get_lang('SelectStudents').'</h3>';
-	//echo "Connection ...";
-	$ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError'));
-	ldap_set_version($ds);
-
-	if ($ds) {
-
-		$r = false;
-		$res = ldap_handle_bind($ds, $r);
-
-		//$sr = @ ldap_search($ds, "ou=people,$LDAPbasedn", "(|(edupersonprimaryorgunitdn=ou=$etape,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn)(edupersonprimaryorgunitdn=ou=02PEL,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn))");
-		//echo "(ou=*$annee,ou=$composante)";
-		$sr = @ ldap_search($ds, $ldap_basedn, "(ou=*$annee)");
-
-		$info = ldap_get_entries($ds, $sr);
-
-		for ($key = 0; $key < $info["count"]; $key ++) {
-			$nom_form[] = $info[$key]["sn"][0];
-			$prenom_form[] = $info[$key]["givenname"][0];
-			$email_form[] = $info[$key]["mail"][0];
-			// Get uid from dn
-			//$dn_array=ldap_explode_dn($info[$key]["dn"],1);
-			//$username_form[] = $dn_array[0]; // uid is first key
-			$username_form[] = $info[$key]['uid'][0];
-			$outab[] = $info[$key]["eduPersonPrimaryAffiliation"][0]; // Ici "student"
-			//$val = ldap_get_values_len($ds, $entry, "userPassword");
-			//$password_form[] = $val[0];
-			$password_form[] = $info[$key]['userPassword'][0];
-		}
-		ldap_unbind($ds);
-
-		/*-----------------------------------------------*/
-
-		asort($nom_form);
-		reset($nom_form);
-
-		$statut=5;
-		include ('ldap_form_add_users_group.php');
-	} else {
-		echo '<h4>'.get_lang('UnableToConnectTo').' '.$host.'</h4>';
-	}
-	echo '<br /><br />';
+    Display::display_header($tool_name);
+    echo '<div style="align: center;">';
+    echo '<br />';
+    echo '<br />';
+    echo '<h3>'.Display::return_icon('group.gif', get_lang('SelectStudents')).' '.get_lang('SelectStudents').'</h3>';
+    //echo "Connection ...";
+    $ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError'));
+    ldap_set_version($ds);
+
+    if ($ds) {
+
+        $r = false;
+        $res = ldap_handle_bind($ds, $r);
+
+        //$sr = @ ldap_search($ds, "ou=people,$LDAPbasedn", "(|(edupersonprimaryorgunitdn=ou=$etape,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn)(edupersonprimaryorgunitdn=ou=02PEL,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn))");
+        //echo "(ou=*$annee,ou=$composante)";
+        $sr = @ ldap_search($ds, $ldap_basedn, "(ou=*$annee)");
+
+        $info = ldap_get_entries($ds, $sr);
+
+        for ($key = 0; $key < $info["count"]; $key ++) {
+            $nom_form[] = $info[$key]["sn"][0];
+            $prenom_form[] = $info[$key]["givenname"][0];
+            $email_form[] = $info[$key]["mail"][0];
+            // Get uid from dn
+            //$dn_array=ldap_explode_dn($info[$key]["dn"],1);
+            //$username_form[] = $dn_array[0]; // uid is first key
+            $username_form[] = $info[$key]['uid'][0];
+            $outab[] = $info[$key]["eduPersonPrimaryAffiliation"][0]; // Ici "student"
+            //$val = ldap_get_values_len($ds, $entry, "userPassword");
+            //$password_form[] = $val[0];
+            $password_form[] = $info[$key]['userPassword'][0];
+        }
+        ldap_unbind($ds);
+
+        /*-----------------------------------------------*/
+
+        asort($nom_form);
+        reset($nom_form);
+
+        $statut=5;
+        include ('ldap_form_add_users_group.php');
+    } else {
+        echo '<h4>'.get_lang('UnableToConnectTo').' '.$host.'</h4>';
+    }
+    echo '<br /><br />';
     echo '<a href="ldap_import_students.php?annee=">'.get_lang('BackToNewSearch').'</a>';
     echo '<br /><br />';
     echo '</div>';
@@ -147,23 +147,23 @@ 
 }
 elseif (!empty($annee) && !empty($id_session) && ($_POST['confirmed']=='yes'))
 {
-	$id=$_POST['username_form'];
-	$UserList=array();
-	$userid_match_login = array();
-	foreach ($id as $form_index=>$user_id)
-	{
-		if(is_array($_POST['checkboxes']) && in_array($form_index,array_values($_POST['checkboxes'])))
-		{
-			$tmp = ldap_add_user($user_id);
-			$UserList[]= $tmp;
-			$userid_match_login[$tmp] = $user_id;
-		}
-	}
-	if (!empty($_POST['id_session'])) {
-		$num = 0;
-		$tbl_session_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
-		$tbl_session	  = Database::get_main_table(TABLE_MAIN_SESSION);
-		foreach ($UserList as $user_id) {
+    $id=$_POST['username_form'];
+    $UserList=array();
+    $userid_match_login = array();
+    foreach ($id as $form_index=>$user_id)
+    {
+        if(is_array($_POST['checkboxes']) && in_array($form_index,array_values($_POST['checkboxes'])))
+        {
+            $tmp = ldap_add_user($user_id);
+            $UserList[]= $tmp;
+            $userid_match_login[$tmp] = $user_id;
+        }
+    }
+    if (!empty($_POST['id_session'])) {
+        $num = 0;
+        $tbl_session_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
+        $tbl_session	  = Database::get_main_table(TABLE_MAIN_SESSION);
+        foreach ($UserList as $user_id) {
                     $res_user = Database::insert(
                         $tbl_session_user,
                         [
@@ -175,15 +175,15 @@ 
                     if ($res_user !== false) {
                         $num++;
                     }
-		}
-
-		if($num>0) {
-			$sql = 'UPDATE '.$tbl_session.' SET nbr_users = (nbr_users + '.$num.') WHERE id = '.intval($id_session);
-			$res = Database::query($sql);
-		}
-		header('Location: resume_session.php?id_session='.Security::remove_XSS($_POST['id_session']));
-	}
-	/*
+        }
+
+        if($num>0) {
+            $sql = 'UPDATE '.$tbl_session.' SET nbr_users = (nbr_users + '.$num.') WHERE id = '.intval($id_session);
+            $res = Database::query($sql);
+        }
+        header('Location: resume_session.php?id_session='.Security::remove_XSS($_POST['id_session']));
+    }
+    /*
 	else
 	{
 		Display :: display_header($tool_name);
@@ -202,13 +202,13 @@ 
 		Display :: display_normal_message($message,false);
 	}
 	*/
-	else
-	{
-		Display::display_header($tool_name);
-		$message=get_lang('NoUserAdded');
-		Display :: display_normal_message($message,false);
-	}
-	echo '<br /><br />';
+    else
+    {
+        Display::display_header($tool_name);
+        $message=get_lang('NoUserAdded');
+        Display :: display_normal_message($message,false);
+    }
+    echo '<br /><br />';
     echo '<a href="ldap_import_students.php?annee=&composante=&etape=">'.get_lang('BackToNewSearch').'</a>';
     echo '<br /><br />';
 }

main/admin/access_url_add_users_to_url.php

Indentation +30 added lines, -30 removed lines

@@ -13,8 +13,8 @@ 
 
 api_protect_global_admin_script();
 if (!api_get_multiple_access_url()) {
-	header('Location: index.php');
-	exit;
+    header('Location: index.php');
+    exit;
 }
 
 $form_sent = 0;
@@ -44,36 +44,36 @@ 
 api_display_tool_title($tool_name);
 
 if ($_POST['form_sent']) {
-	$form_sent = $_POST['form_sent'];
-	$users = is_array($_POST['user_list']) ? $_POST['user_list'] : array() ;
-	$url_list = is_array($_POST['url_list']) ? $_POST['url_list'] : array() ;
-	$first_letter_user = $_POST['first_letter_user'];
+    $form_sent = $_POST['form_sent'];
+    $users = is_array($_POST['user_list']) ? $_POST['user_list'] : array() ;
+    $url_list = is_array($_POST['url_list']) ? $_POST['url_list'] : array() ;
+    $first_letter_user = $_POST['first_letter_user'];
 
-	foreach($users as $key => $value) {
-		$users[$key] = intval($value);
-	}
+    foreach($users as $key => $value) {
+        $users[$key] = intval($value);
+    }
 
-	if ($form_sent == 1) {
-		if (count($users) == 0 || count($url_list) == 0) {
-			Display :: display_error_message(get_lang('AtLeastOneUserAndOneURL'));
-		} else {
-			UrlManager::add_users_to_urls($users,$url_list);
-			Display :: display_confirmation_message(get_lang('UsersBelongURL'));
-		}
-	}
+    if ($form_sent == 1) {
+        if (count($users) == 0 || count($url_list) == 0) {
+            Display :: display_error_message(get_lang('AtLeastOneUserAndOneURL'));
+        } else {
+            UrlManager::add_users_to_urls($users,$url_list);
+            Display :: display_confirmation_message(get_lang('UsersBelongURL'));
+        }
+    }
 }
 
 /*	Display GUI	*/
 if (empty($first_letter_user)) {
-	$sql = "SELECT count(*) as nb_users FROM $tbl_user";
-	$result = Database::query($sql);
-	$num_row = Database::fetch_array($result);
+    $sql = "SELECT count(*) as nb_users FROM $tbl_user";
+    $result = Database::query($sql);
+    $num_row = Database::fetch_array($result);
     if ($num_row['nb_users']>1000) {
         //if there are too much users to gracefully handle with the HTML select list,
         // assign a default filter on users names
         $first_letter_user = 'A';
     }
-	unset($result);
+    unset($result);
 }
 $first_letter_user_lower = Database::escape_string(api_strtolower($first_letter_user));
 
@@ -104,7 +104,7 @@ 
       <option value="">--</option>
       <?php
         echo Display :: get_alphabet_options($first_letter_user);
-      ?>
+        ?>
      </select>
     </td>
         <td width="20%">&nbsp;</td>
@@ -116,14 +116,14 @@ 
     <td width="40%" align="center">
      <select name="user_list[]" multiple="multiple" size="20" style="width:380px;">
 		<?php
-		foreach ($db_users as $user) {
-		?>
+        foreach ($db_users as $user) {
+        ?>
             <option value="<?php echo $user['user_id']; ?>" <?php if(in_array($user['user_id'], $users)) echo 'selected="selected"'; ?>>
                 <?php echo api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')'; ?>
             </option>
 		<?php
-		}
-		?>
+        }
+        ?>
     </select>
    </td>
    <td width="20%" valign="middle" align="center">
@@ -132,14 +132,14 @@ 
    <td width="40%" align="center">
     <select name="url_list[]" multiple="multiple" size="20" style="width:230px;">
 		<?php
-		foreach ($db_urls as $url_obj) {
-			?>
+        foreach ($db_urls as $url_obj) {
+            ?>
 			<option value="<?php echo $url_obj['id']; ?>" <?php if(in_array($url_obj['id'],$url_list)) echo 'selected="selected"'; ?>>
                 <?php echo $url_obj['url']; ?>
 			</option>
 			<?php
-		}
-		?>
+        }
+        ?>
     </select>
    </td>
   </tr>

Spacing +13 added lines, -13 removed lines

@@ -20,24 +20,24 @@ 
 $form_sent = 0;
 $first_letter_user = '';
 $first_letter_course = '';
-$courses = array ();
+$courses = array();
 $url_list = array();
 $users = array();
 
 $tbl_access_url_rel_user = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
 $tbl_access_url = Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
-$tbl_user 		= Database :: get_main_table(TABLE_MAIN_USER);
+$tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
 
 /*	Header	*/
 $tool_name = get_lang('AddUsersToURL');
-$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'));
 
 Display :: display_header($tool_name);
 
 echo '<div class="actions">';
 echo Display::url(
-    Display::return_icon('edit.png', get_lang('EditUsersToURL'),''),
+    Display::return_icon('edit.png', get_lang('EditUsersToURL'), ''),
     api_get_path(WEB_CODE_PATH).'admin/access_url_edit_users_to_url.php');
 echo '</div>';
 
@@ -45,11 +45,11 @@ 
 
 if ($_POST['form_sent']) {
 	$form_sent = $_POST['form_sent'];
-	$users = is_array($_POST['user_list']) ? $_POST['user_list'] : array() ;
-	$url_list = is_array($_POST['url_list']) ? $_POST['url_list'] : array() ;
+	$users = is_array($_POST['user_list']) ? $_POST['user_list'] : array();
+	$url_list = is_array($_POST['url_list']) ? $_POST['url_list'] : array();
 	$first_letter_user = $_POST['first_letter_user'];
 
-	foreach($users as $key => $value) {
+	foreach ($users as $key => $value) {
 		$users[$key] = intval($value);
 	}
 
@@ -57,7 +57,7 @@ 
 		if (count($users) == 0 || count($url_list) == 0) {
 			Display :: display_error_message(get_lang('AtLeastOneUserAndOneURL'));
 		} else {
-			UrlManager::add_users_to_urls($users,$url_list);
+			UrlManager::add_users_to_urls($users, $url_list);
 			Display :: display_confirmation_message(get_lang('UsersBelongURL'));
 		}
 	}
@@ -68,7 +68,7 @@ 
 	$sql = "SELECT count(*) as nb_users FROM $tbl_user";
 	$result = Database::query($sql);
 	$num_row = Database::fetch_array($result);
-    if ($num_row['nb_users']>1000) {
+    if ($num_row['nb_users'] > 1000) {
         //if there are too much users to gracefully handle with the HTML select list,
         // assign a default filter on users names
         $first_letter_user = 'A';
@@ -99,7 +99,7 @@ 
     <td width="40%" align="center">
      <b><?php echo get_lang('UserList'); ?></b>
      <br/><br/>
-     <?php echo get_lang('Select').' ' ; echo $target_name == 'firstname'? get_lang('FirstName') : get_lang('LastName'); ?>
+     <?php echo get_lang('Select').' '; echo $target_name == 'firstname' ? get_lang('FirstName') : get_lang('LastName'); ?>
      <select name="first_letter_user" onchange="javascript:document.formulaire.form_sent.value='2'; document.formulaire.submit();">
       <option value="">--</option>
       <?php
@@ -118,7 +118,7 @@ 
 		<?php
 		foreach ($db_users as $user) {
 		?>
-            <option value="<?php echo $user['user_id']; ?>" <?php if(in_array($user['user_id'], $users)) echo 'selected="selected"'; ?>>
+            <option value="<?php echo $user['user_id']; ?>" <?php if (in_array($user['user_id'], $users)) echo 'selected="selected"'; ?>>
                 <?php echo api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')'; ?>
             </option>
 		<?php
@@ -134,7 +134,7 @@ 
 		<?php
 		foreach ($db_urls as $url_obj) {
 			?>
-			<option value="<?php echo $url_obj['id']; ?>" <?php if(in_array($url_obj['id'],$url_list)) echo 'selected="selected"'; ?>>
+			<option value="<?php echo $url_obj['id']; ?>" <?php if (in_array($url_obj['id'], $url_list)) echo 'selected="selected"'; ?>>
                 <?php echo $url_obj['url']; ?>
 			</option>
 			<?php

Braces +8 added lines, -2 removed lines

@@ -118,7 +118,10 @@ 
 		<?php
 		foreach ($db_users as $user) {
 		?>
-            <option value="<?php echo $user['user_id']; ?>" <?php if(in_array($user['user_id'], $users)) echo 'selected="selected"'; ?>>
+            <option value="<?php echo $user['user_id']; ?>" <?php if(in_array($user['user_id'], $users)) {
+    echo 'selected="selected"';
+}
+?>>
                 <?php echo api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')'; ?>
             </option>
 		<?php
@@ -134,7 +137,10 @@ 
 		<?php
 		foreach ($db_urls as $url_obj) {
 			?>
-			<option value="<?php echo $url_obj['id']; ?>" <?php if(in_array($url_obj['id'],$url_list)) echo 'selected="selected"'; ?>>
+			<option value="<?php echo $url_obj['id']; ?>" <?php if(in_array($url_obj['id'],$url_list)) {
+    echo 'selected="selected"';
+}
+?>>
                 <?php echo $url_obj['url']; ?>
 			</option>
 			<?php

main/admin/course_request_review.php

Spacing +2 added lines, -2 removed lines

@@ -189,8 +189,8 @@
 {
     $code = CourseRequestManager::get_course_request_code($id);
     $result = '<a href="course_request_edit.php?id='.$id.'&caller=0">'.Display::return_icon('edit.png', get_lang('Edit'), array('style' => 'vertical-align: middle;')).'</a>'.
-        '&nbsp;<a href="?accept_course_request='.$id.'">'.Display::return_icon('accept.png', get_lang('AcceptThisCourseRequest'), array('style' => 'vertical-align: middle;', 'onclick' => 'javascript: if (!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('ANewCourseWillBeCreated'), $code), ENT_QUOTES)).'\')) return false;'),16).'</a>'.
-        '&nbsp;<a href="?reject_course_request='.$id.'">'.Display::return_icon('error.png', get_lang('RejectThisCourseRequest'), array('style' => 'vertical-align: middle;', 'onclick' => 'javascript: if (!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('ACourseRequestWillBeRejected'), $code), ENT_QUOTES)).'\')) return false;'),16).'</a>';
+        '&nbsp;<a href="?accept_course_request='.$id.'">'.Display::return_icon('accept.png', get_lang('AcceptThisCourseRequest'), array('style' => 'vertical-align: middle;', 'onclick' => 'javascript: if (!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('ANewCourseWillBeCreated'), $code), ENT_QUOTES)).'\')) return false;'), 16).'</a>'.
+        '&nbsp;<a href="?reject_course_request='.$id.'">'.Display::return_icon('error.png', get_lang('RejectThisCourseRequest'), array('style' => 'vertical-align: middle;', 'onclick' => 'javascript: if (!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('ACourseRequestWillBeRejected'), $code), ENT_QUOTES)).'\')) return false;'), 16).'</a>';
     if (!CourseRequestManager::additional_info_asked($id)) {
         $result .= '&nbsp;<a href="?request_info='.$id.'">'.Display::return_icon('request_info.gif', get_lang('AskAdditionalInfo'), array('style' => 'vertical-align: middle;', 'onclick' => 'javascript: if (!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('AdditionalInfoWillBeAsked'), $code), ENT_QUOTES)).'\')) return false;')).'</a>';
     }

main/admin/ldap_users_synchro.php

Spacing +24 added lines, -24 removed lines

@@ -8,43 +8,43 @@ 
  */
 exit(); //not yet functional, needs to be revised
 
-$cidReset=true;
+$cidReset = true;
 
 require('../inc/global.inc.php');
 $libpath = api_get_path(LIBRARY_PATH);
 require("../auth/ldap/authldap.php");
-$annee_base=date('Y');
+$annee_base = date('Y');
 // setting the section (for the tabs)
 $this_section = SECTION_PLATFORM_ADMIN;
 api_protect_admin_script();
 
 // setting breadcrumbs
-$interbreadcrumb[]=array('url' => 'index.php',"name" => get_lang('PlatformAdmin'));
-$interbreadcrumb[]=array('url' => api_get_self(),"name" => get_lang('SessionsList'));
+$interbreadcrumb[] = array('url' => 'index.php', "name" => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => api_get_self(), "name" => get_lang('SessionsList'));
 
 // Database Table Definitions
 $tbl_session						= Database::get_main_table(TABLE_MAIN_SESSION);
-$tbl_session_rel_class				= Database::get_main_table(TABLE_MAIN_SESSION_CLASS);
-$tbl_session_rel_course				= Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
-$tbl_session_rel_course_rel_user	= Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
-$tbl_course							= Database::get_main_table(TABLE_MAIN_COURSE);
-$tbl_user							= Database::get_main_table(TABLE_MAIN_USER);
-$tbl_session_rel_user				= Database::get_main_table(TABLE_MAIN_SESSION_USER);
-$tbl_class							= Database::get_main_table(TABLE_MAIN_CLASS);
-$tbl_class_user						= Database::get_main_table(TABLE_MAIN_CLASS_USER);
+$tbl_session_rel_class = Database::get_main_table(TABLE_MAIN_SESSION_CLASS);
+$tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
+$tbl_session_rel_course_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
+$tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
+$tbl_user = Database::get_main_table(TABLE_MAIN_USER);
+$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
+$tbl_class = Database::get_main_table(TABLE_MAIN_CLASS);
+$tbl_class_user = Database::get_main_table(TABLE_MAIN_CLASS_USER);
 
-$tbl_session_rel_etape 				= "session_rel_etape";
+$tbl_session_rel_etape = "session_rel_etape";
 
-$id_session=intval($_GET['id_session']);
+$id_session = intval($_GET['id_session']);
 
-$formSent=0;
-$errorMsg=$firstLetterUser=$firstLetterSession='';
-$UserList=$SessionList=array();
-$users=$sessions=array();
-$noPHP_SELF=true;
+$formSent = 0;
+$errorMsg = $firstLetterUser = $firstLetterSession = '';
+$UserList = $SessionList = array();
+$users = $sessions = array();
+$noPHP_SELF = true;
 
-$page=intval($_GET['page']);
-$action=$_REQUEST['action'];
+$page = intval($_GET['page']);
+$action = $_REQUEST['action'];
 
 $tool_name = get_lang('Synchro LDAP : Import Etudiants/Etapes dans session');
 Display::display_header($tool_name);
@@ -59,10 +59,10 @@ 
 		</form>
 
 <?php
-if (isset($action) && ($action=="synchro")) {
-	$included=true;
+if (isset($action) && ($action == "synchro")) {
+	$included = true;
 	require('ldap_synchro.php');
-	Display :: display_normal_message($message,false);
+	Display :: display_normal_message($message, false);
 }
 Display::display_footer();
 ?>

Indentation +3 added lines, -3 removed lines

@@ -60,9 +60,9 @@
 
 <?php
 if (isset($action) && ($action=="synchro")) {
-	$included=true;
-	require('ldap_synchro.php');
-	Display :: display_normal_message($message,false);
+    $included=true;
+    require('ldap_synchro.php');
+    Display :: display_normal_message($message,false);
 }
 Display::display_footer();
 ?>

main/admin/usergroup_export.php

Spacing +2 added lines, -2 removed lines

@@ -13,8 +13,8 @@
 
 $tool_name = get_lang('Export');
 
-$interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array ('url' => 'usergroups.php', 'name' => get_lang('Classes'));
+$interbreadcrumb[] = array("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'usergroups.php', 'name' => get_lang('Classes'));
 
 set_time_limit(0);
 

main/admin/ldap_synchro.php

Braces +1 added lines, -2 removed lines

@@ -118,8 +118,7 @@
 		if (isset($included) && ($included))
 		{
 			$message .= "> $name_session: ".count($UserAdd)." ".get_lang('Added').' '.get_lang('And').' '.count($UserUpdate).' '.get_lang('Modified').'<br/>';
-		}
-		else
+		} else
 		{
 			print "> $name_session: ".count($UserAdd).get_lang('Added').' '.get_lang('And').' '.count($UserUpdate).' '.get_lang('Modified')."\n";
 		}

Indentation +102 added lines, -102 removed lines

@@ -44,121 +44,121 @@
 $users=Database::store_result($result);
 
 foreach($Sessions as $session){
-	$id_session = $session['id'];
-	$name_session = $session['name'];
-	$UserList=array();
-	$UserUpdate=array();
-	$UserAdd=array();
+    $id_session = $session['id'];
+    $name_session = $session['name'];
+    $UserList=array();
+    $UserUpdate=array();
+    $UserAdd=array();
 
-	// Parse des code etape de la session
-	/*
+    // Parse des code etape de la session
+    /*
 	$sql = "SELECT  id_session, code_etape, etape_description, code_ufr, annee
 		FROM $tbl_session_rel_etape
 		WHERE id_session='$id_session'
 		ORDER BY code_ufr, code_etape";
 	$result = Database::query($sql);
 	*/
-	$ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError'));
-	ldap_set_version($ds);
-	// Import des utilisateurs des etapes dans la session
-	if ($ds)
-	{
-		$r = false;
-		$res = ldap_handle_bind($ds, $r);
-		$UserList=array();
-		if($result !== false)
-		{
-			//while($row = Database::fetch_array($result))
-			//{
-				/*
+    $ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError'));
+    ldap_set_version($ds);
+    // Import des utilisateurs des etapes dans la session
+    if ($ds)
+    {
+        $r = false;
+        $res = ldap_handle_bind($ds, $r);
+        $UserList=array();
+        if($result !== false)
+        {
+            //while($row = Database::fetch_array($result))
+            //{
+                /*
 				$annee = $row['annee'];
 				$code_ufr = $row['code_ufr'];
 				$etape = $row['code_etape'];
 				*/
-				// LDAP Query
-				// edupersonorgunitdn=ou=12CI1,ou=2006,ou=diploma,o=Paris1,dc=univ-paris1,dc=fr
-				//etapescommented
-				//$sr = @ ldap_search($ds, "ou=people,$LDAPbasedn", "edupersonorgunitdn=ou=$etape,ou=$annee,ou=diploma,$LDAPbasedn");
-				$sr = @ ldap_search($ds, $ldap_basedn, '(uid=*)');
-				$info = ldap_get_entries($ds, $sr);
-				for ($key = 0; $key < $info["count"]; $key ++)
-				{
-					echo "<pre>";
-					print_r($info[$key]);
-					echo "</pre>";
-					$lastname = api_utf8_decode($info[$key]["sn"][0]);
-					$firstname = api_utf8_decode($info[$key]["givenname"][0]);
-					$email = $info[$key]["mail"][0];
-					// Get uid from dn
-					$dn_array=ldap_explode_dn($info[$key]["dn"],1);
-					$username = $dn_array[0]; // uid is first key
-					$outab[] = $info[$key]["edupersonprimaryaffiliation"][0]; // Ici "student"
-					$val = ldap_get_values_len($ds, $sr, "userPassword");
-					$password = $val[0];
-					// Pour faciliter la gestion on ajoute le code "etape-annee"
-					$official_code=$etape."-".$annee;
-					$auth_source="ldap";
-					// Pas de date d'expiration d'etudiant (a recuperer par rapport au shadow expire LDAP)
-					$expiration_date='';
-					$active=1;
-					// Ajout de l'utilisateur
-					if (UserManager::is_username_available($username)) {
-						$user_id = UserManager::create_user($firstname,$lastname,$status,$email,$username,$password,$official_code,api_get_setting('platformLanguage'),$phone,$picture_uri,$auth_source,$expiration_date,$active);
-						$UserAdd[]=$user_id;
-					} else {
-						$user = api_get_user_info_from_username($username);
-						$user_id=$user['user_id'];
-						UserManager::update_user($user_id, $firstname, $lastname, $username, null, null, $email, $status, $official_code, $phone, $picture_uri, $expiration_date, $active);
-						$UserUpdate[]=$user_id;
-					}
-					$UserList[]=$user_id;
-				}
-			//}
-		}
-		if (isset($included) && ($included))
-		{
-			$message .= "> $name_session: ".count($UserAdd)." ".get_lang('Added').' '.get_lang('And').' '.count($UserUpdate).' '.get_lang('Modified').'<br/>';
-		}
-		else
-		{
-			print "> $name_session: ".count($UserAdd).get_lang('Added').' '.get_lang('And').' '.count($UserUpdate).' '.get_lang('Modified')."\n";
-		}
+                // LDAP Query
+                // edupersonorgunitdn=ou=12CI1,ou=2006,ou=diploma,o=Paris1,dc=univ-paris1,dc=fr
+                //etapescommented
+                //$sr = @ ldap_search($ds, "ou=people,$LDAPbasedn", "edupersonorgunitdn=ou=$etape,ou=$annee,ou=diploma,$LDAPbasedn");
+                $sr = @ ldap_search($ds, $ldap_basedn, '(uid=*)');
+                $info = ldap_get_entries($ds, $sr);
+                for ($key = 0; $key < $info["count"]; $key ++)
+                {
+                    echo "<pre>";
+                    print_r($info[$key]);
+                    echo "</pre>";
+                    $lastname = api_utf8_decode($info[$key]["sn"][0]);
+                    $firstname = api_utf8_decode($info[$key]["givenname"][0]);
+                    $email = $info[$key]["mail"][0];
+                    // Get uid from dn
+                    $dn_array=ldap_explode_dn($info[$key]["dn"],1);
+                    $username = $dn_array[0]; // uid is first key
+                    $outab[] = $info[$key]["edupersonprimaryaffiliation"][0]; // Ici "student"
+                    $val = ldap_get_values_len($ds, $sr, "userPassword");
+                    $password = $val[0];
+                    // Pour faciliter la gestion on ajoute le code "etape-annee"
+                    $official_code=$etape."-".$annee;
+                    $auth_source="ldap";
+                    // Pas de date d'expiration d'etudiant (a recuperer par rapport au shadow expire LDAP)
+                    $expiration_date='';
+                    $active=1;
+                    // Ajout de l'utilisateur
+                    if (UserManager::is_username_available($username)) {
+                        $user_id = UserManager::create_user($firstname,$lastname,$status,$email,$username,$password,$official_code,api_get_setting('platformLanguage'),$phone,$picture_uri,$auth_source,$expiration_date,$active);
+                        $UserAdd[]=$user_id;
+                    } else {
+                        $user = api_get_user_info_from_username($username);
+                        $user_id=$user['user_id'];
+                        UserManager::update_user($user_id, $firstname, $lastname, $username, null, null, $email, $status, $official_code, $phone, $picture_uri, $expiration_date, $active);
+                        $UserUpdate[]=$user_id;
+                    }
+                    $UserList[]=$user_id;
+                }
+            //}
+        }
+        if (isset($included) && ($included))
+        {
+            $message .= "> $name_session: ".count($UserAdd)." ".get_lang('Added').' '.get_lang('And').' '.count($UserUpdate).' '.get_lang('Modified').'<br/>';
+        }
+        else
+        {
+            print "> $name_session: ".count($UserAdd).get_lang('Added').' '.get_lang('And').' '.count($UserUpdate).' '.get_lang('Modified')."\n";
+        }
 
-		// Une fois les utilisateurs importer dans la base des utilisateurs, on peux les affecter la session
-		$result=Database::query("SELECT c_id FROM $tbl_session_rel_course WHERE session_id='$id_session'");
-		$CourseList=array();
-		while($row=Database::fetch_array($result)) {
-			$CourseList[]= $row['c_id'];
-		}
+        // Une fois les utilisateurs importer dans la base des utilisateurs, on peux les affecter la session
+        $result=Database::query("SELECT c_id FROM $tbl_session_rel_course WHERE session_id='$id_session'");
+        $CourseList=array();
+        while($row=Database::fetch_array($result)) {
+            $CourseList[]= $row['c_id'];
+        }
 
-		foreach ($CourseList as $enreg_course) {
-			// On ajoute la relation entre l'utilisateur et le cours
-			foreach ($UserList as $enreg_user) {
-				$sql = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user(session_id,c_id,user_id)
+        foreach ($CourseList as $enreg_course) {
+            // On ajoute la relation entre l'utilisateur et le cours
+            foreach ($UserList as $enreg_user) {
+                $sql = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user(session_id,c_id,user_id)
 						VALUES('$id_session','$enreg_course','$enreg_user')";
-				Database::query($sql);
-			}
-			$sql = "SELECT COUNT(user_id) as nbUsers " .
-					"FROM $tbl_session_rel_course_rel_user " .
-					"WHERE session_id='$id_session' AND c_id='$enreg_course'";
-			$rs = Database::query($sql);
-			list($nbr_users) = Database::fetch_array($rs);
-			$sql = "UPDATE $tbl_session_rel_course SET nbr_users=$nbr_users
+                Database::query($sql);
+            }
+            $sql = "SELECT COUNT(user_id) as nbUsers " .
+                    "FROM $tbl_session_rel_course_rel_user " .
+                    "WHERE session_id='$id_session' AND c_id='$enreg_course'";
+            $rs = Database::query($sql);
+            list($nbr_users) = Database::fetch_array($rs);
+            $sql = "UPDATE $tbl_session_rel_course SET nbr_users=$nbr_users
 					WHERE session_id='$id_session' AND c_id = '$enreg_course'";
-			Database::query($sql);
-		}
-		// On ajoute la relation entre l'utilisateur et la session
-		foreach($UserList as $enreg_user){
-			$sql = "INSERT IGNORE INTO $tbl_session_rel_user(session_id, user_id, registered_at) " .
-					"VALUES('$id_session','$enreg_user', '" . api_get_utc_datetime() . "')";
-			Database::query($sql);
-		}
-		$sql = "SELECT COUNT(user_id) as nbUsers " .
-				"FROM $tbl_session_rel_user " .
-				"WHERE session_id='$id_session' AND relation_type<>".SESSION_RELATION_TYPE_RRHH."";
-		$rs = Database::query($sql);
-		list($nbr_users) = Database::fetch_array($rs);
-		$sql = "UPDATE $tbl_session SET nbr_users=$nbr_users WHERE id='$id_session'";
-		Database::query($sql);
-	}
+            Database::query($sql);
+        }
+        // On ajoute la relation entre l'utilisateur et la session
+        foreach($UserList as $enreg_user){
+            $sql = "INSERT IGNORE INTO $tbl_session_rel_user(session_id, user_id, registered_at) " .
+                    "VALUES('$id_session','$enreg_user', '" . api_get_utc_datetime() . "')";
+            Database::query($sql);
+        }
+        $sql = "SELECT COUNT(user_id) as nbUsers " .
+                "FROM $tbl_session_rel_user " .
+                "WHERE session_id='$id_session' AND relation_type<>".SESSION_RELATION_TYPE_RRHH."";
+        $rs = Database::query($sql);
+        list($nbr_users) = Database::fetch_array($rs);
+        $sql = "UPDATE $tbl_session SET nbr_users=$nbr_users WHERE id='$id_session'";
+        Database::query($sql);
+    }
 }

Spacing +46 added lines, -46 removed lines

@@ -8,47 +8,47 @@ 
  */
 exit(); //not yet functional, needs to be revised
 
-$cidReset=true;
+$cidReset = true;
 
 require('../inc/global.inc.php');
 $libpath = api_get_path(LIBRARY_PATH);
 require_once('../auth/ldap/authldap.php');
-$annee_base=date('Y');
+$annee_base = date('Y');
 // setting the section (for the tabs)
 $this_section = SECTION_PLATFORM_ADMIN;
 //api_protect_admin_script(); // on vire la secu... qui n'a pas lieu d'etre ici (script de synchro)
 
 // setting breadcrumbs
-$interbreadcrumb[]=array('url' => 'index.php',"name" => get_lang('PlatformAdmin'));
-$interbreadcrumb[]=array('url' => api_get_self(),"name" => "Liste des sessions");
+$interbreadcrumb[] = array('url' => 'index.php', "name" => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => api_get_self(), "name" => "Liste des sessions");
 
 // Database Table Definitions
 $tbl_session						= Database::get_main_table(TABLE_MAIN_SESSION);
-$tbl_session_rel_class				= Database::get_main_table(TABLE_MAIN_SESSION_CLASS);
-$tbl_session_rel_course				= Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
-$tbl_session_rel_course_rel_user	= Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
-$tbl_course							= Database::get_main_table(TABLE_MAIN_COURSE);
-$tbl_user							= Database::get_main_table(TABLE_MAIN_USER);
-$tbl_session_rel_user				= Database::get_main_table(TABLE_MAIN_SESSION_USER);
-$tbl_class							= Database::get_main_table(TABLE_MAIN_CLASS);
-$tbl_class_user						= Database::get_main_table(TABLE_MAIN_CLASS_USER);
+$tbl_session_rel_class = Database::get_main_table(TABLE_MAIN_SESSION_CLASS);
+$tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
+$tbl_session_rel_course_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
+$tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
+$tbl_user = Database::get_main_table(TABLE_MAIN_USER);
+$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
+$tbl_class = Database::get_main_table(TABLE_MAIN_CLASS);
+$tbl_class_user = Database::get_main_table(TABLE_MAIN_CLASS_USER);
 
-$tbl_session_rel_etape 				= "session_rel_etape";
+$tbl_session_rel_etape = "session_rel_etape";
 
-$message="";
+$message = "";
 
-$result=Database::query("SELECT id, name FROM $tbl_session");
-$Sessions=Database::store_result($result);
+$result = Database::query("SELECT id, name FROM $tbl_session");
+$Sessions = Database::store_result($result);
 
-$result=Database::query($sql);
-$users=Database::store_result($result);
+$result = Database::query($sql);
+$users = Database::store_result($result);
 
-foreach($Sessions as $session){
+foreach ($Sessions as $session) {
 	$id_session = $session['id'];
 	$name_session = $session['name'];
-	$UserList=array();
-	$UserUpdate=array();
-	$UserAdd=array();
+	$UserList = array();
+	$UserUpdate = array();
+	$UserAdd = array();
 
 	// Parse des code etape de la session
 	/*
@@ -65,8 +65,8 @@ 
 	{
 		$r = false;
 		$res = ldap_handle_bind($ds, $r);
-		$UserList=array();
-		if($result !== false)
+		$UserList = array();
+		if ($result !== false)
 		{
 			//while($row = Database::fetch_array($result))
 			//{
@@ -81,7 +81,7 @@ 
 				//$sr = @ ldap_search($ds, "ou=people,$LDAPbasedn", "edupersonorgunitdn=ou=$etape,ou=$annee,ou=diploma,$LDAPbasedn");
 				$sr = @ ldap_search($ds, $ldap_basedn, '(uid=*)');
 				$info = ldap_get_entries($ds, $sr);
-				for ($key = 0; $key < $info["count"]; $key ++)
+				for ($key = 0; $key < $info["count"]; $key++)
 				{
 					echo "<pre>";
 					print_r($info[$key]);
@@ -90,28 +90,28 @@ 
 					$firstname = api_utf8_decode($info[$key]["givenname"][0]);
 					$email = $info[$key]["mail"][0];
 					// Get uid from dn
-					$dn_array=ldap_explode_dn($info[$key]["dn"],1);
+					$dn_array = ldap_explode_dn($info[$key]["dn"], 1);
 					$username = $dn_array[0]; // uid is first key
 					$outab[] = $info[$key]["edupersonprimaryaffiliation"][0]; // Ici "student"
 					$val = ldap_get_values_len($ds, $sr, "userPassword");
 					$password = $val[0];
 					// Pour faciliter la gestion on ajoute le code "etape-annee"
-					$official_code=$etape."-".$annee;
-					$auth_source="ldap";
+					$official_code = $etape."-".$annee;
+					$auth_source = "ldap";
 					// Pas de date d'expiration d'etudiant (a recuperer par rapport au shadow expire LDAP)
-					$expiration_date='';
-					$active=1;
+					$expiration_date = '';
+					$active = 1;
 					// Ajout de l'utilisateur
 					if (UserManager::is_username_available($username)) {
-						$user_id = UserManager::create_user($firstname,$lastname,$status,$email,$username,$password,$official_code,api_get_setting('platformLanguage'),$phone,$picture_uri,$auth_source,$expiration_date,$active);
-						$UserAdd[]=$user_id;
+						$user_id = UserManager::create_user($firstname, $lastname, $status, $email, $username, $password, $official_code, api_get_setting('platformLanguage'), $phone, $picture_uri, $auth_source, $expiration_date, $active);
+						$UserAdd[] = $user_id;
 					} else {
 						$user = api_get_user_info_from_username($username);
-						$user_id=$user['user_id'];
+						$user_id = $user['user_id'];
 						UserManager::update_user($user_id, $firstname, $lastname, $username, null, null, $email, $status, $official_code, $phone, $picture_uri, $expiration_date, $active);
-						$UserUpdate[]=$user_id;
+						$UserUpdate[] = $user_id;
 					}
-					$UserList[]=$user_id;
+					$UserList[] = $user_id;
 				}
 			//}
 		}
@@ -125,10 +125,10 @@ 
 		}
 
 		// Une fois les utilisateurs importer dans la base des utilisateurs, on peux les affecter la session
-		$result=Database::query("SELECT c_id FROM $tbl_session_rel_course WHERE session_id='$id_session'");
-		$CourseList=array();
-		while($row=Database::fetch_array($result)) {
-			$CourseList[]= $row['c_id'];
+		$result = Database::query("SELECT c_id FROM $tbl_session_rel_course WHERE session_id='$id_session'");
+		$CourseList = array();
+		while ($row = Database::fetch_array($result)) {
+			$CourseList[] = $row['c_id'];
 		}
 
 		foreach ($CourseList as $enreg_course) {
@@ -138,8 +138,8 @@ 
 						VALUES('$id_session','$enreg_course','$enreg_user')";
 				Database::query($sql);
 			}
-			$sql = "SELECT COUNT(user_id) as nbUsers " .
-					"FROM $tbl_session_rel_course_rel_user " .
+			$sql = "SELECT COUNT(user_id) as nbUsers ".
+					"FROM $tbl_session_rel_course_rel_user ".
 					"WHERE session_id='$id_session' AND c_id='$enreg_course'";
 			$rs = Database::query($sql);
 			list($nbr_users) = Database::fetch_array($rs);
@@ -148,13 +148,13 @@ 
 			Database::query($sql);
 		}
 		// On ajoute la relation entre l'utilisateur et la session
-		foreach($UserList as $enreg_user){
-			$sql = "INSERT IGNORE INTO $tbl_session_rel_user(session_id, user_id, registered_at) " .
-					"VALUES('$id_session','$enreg_user', '" . api_get_utc_datetime() . "')";
+		foreach ($UserList as $enreg_user) {
+			$sql = "INSERT IGNORE INTO $tbl_session_rel_user(session_id, user_id, registered_at) ".
+					"VALUES('$id_session','$enreg_user', '".api_get_utc_datetime()."')";
 			Database::query($sql);
 		}
-		$sql = "SELECT COUNT(user_id) as nbUsers " .
-				"FROM $tbl_session_rel_user " .
+		$sql = "SELECT COUNT(user_id) as nbUsers ".
+				"FROM $tbl_session_rel_user ".
 				"WHERE session_id='$id_session' AND relation_type<>".SESSION_RELATION_TYPE_RRHH."";
 		$rs = Database::query($sql);
 		list($nbr_users) = Database::fetch_array($rs);