merge

main/admin/index.php

@@ -96,6 +96,15 @@ if (api_is_platform_admin()) {
 		<li><a href="user_add.php">		<?php echo get_lang('AddUsers') ?></a></li>
 		<li><a href="user_export.php">	<?php echo get_lang('ExportUserListXMLCSV') ?></a></li>
 		<li><a href="user_import.php">	<?php echo get_lang('ImportUserListXMLCSV') ?></a></li>
+		<?php
+		if(isset($extAuthSource) && isset($extAuthSource['ldap']) && count($extAuthSource['ldap'])>0){
+			?>
+			<!-- dynamic ldap code -->
+			  <li><a href="ldap_users_list.php"><?php echo get_lang('ImportLDAPUsersIntoPlatform');?></a></li> 
+			<!-- dynamic ldap code -->
+			<?php
+			}
+		?>
 		<li><a href="user_fields.php">	<?php echo get_lang('ManageUserFields'); ?></a></li>	
 		</ul>
 		</div>
@@ -139,6 +148,16 @@ if(api_is_platform_admin()) {
 	<?php if (api_get_setting('search_enabled')=='true') { ?>
 	  <li><a href="specific_fields.php"><?php echo get_lang('SpecificSearchFields'); ?></a></li>
 	<?php } ?>
+	<?php
+		if(isset($extAuthSource) && isset($extAuthSource['ldap']) && count($extAuthSource['ldap'])>0){
+		?>
+		<!-- dynamic ldap code -->
+		<li><a href="ldap_import_students.php"><?php echo get_lang('ImportLDAPUsersIntoCourse');?></a></li>
+		<!-- dynamic ldap code -->
+		<?php
+		}
+	?>
+	
 	</ul>
 	</div>
 
@@ -195,10 +214,19 @@ if(api_get_setting('use_session_mode')=='true')
   <li><a href="session_category_list.php"><?php echo get_lang('ListSessionCategory') ?></a></li>
   <li><a href="session_add.php"><?php echo get_lang('AddSession') ?></a></li>
   <li><a href="session_import.php"><?php echo get_lang('ImportSessionListXMLCSV') ?></a></li>
+  <?php
+		if(isset($extAuthSource) && isset($extAuthSource['ldap']) && count($extAuthSource['ldap'])>0){
+		?>
+		<!-- dynamic ldap code -->
+		 <li><a href="ldap_import_students_to_session.php"><?php echo get_lang('ImportLDAPUsersIntoSession');?></a></li>
+		<!-- dynamic ldap code -->
+		<?php
+		}
+	?>
   <li><a href="session_export.php"><?php echo get_lang('ExportSessionListXMLCSV') ?></a></li>
   <li><a href="../coursecopy/copy_course_session.php"><?php echo get_lang('CopyFromCourseInSessionToAnotherSession') ?></a></li>
   </ul>
-</div>
+  </div>
 
 <?php
 }
@@ -244,7 +272,7 @@ if(api_is_platform_admin()){
   </ul>
 </div>
 <?php
-	if(isset($extAuthSource) && isset($extAuthSource['ldap']) && count($extAuthSource['ldap'])>0){
+	/*if(isset($extAuthSource) && isset($extAuthSource['ldap']) && count($extAuthSource['ldap'])>0){
 	?>
 	<!-- dynamic ldap code -->
 	<div class="admin_section">
@@ -258,7 +286,7 @@ if(api_is_platform_admin()){
 	</div>
 	<!-- dynamic ldap code -->
 	<?php
-	}
+	}*/
 ?>
 <div class="admin_section">
  <h4><?php Display::display_icon('dokeos.gif', 'Dokeos'); ?> Dokeos.com</h4>

main/inc/footer.inc.php

@@ -72,11 +72,15 @@ if (api_get_setting('show_tutor_data')=='true'){
 	if (isset($id_course) && $id_course!=-1) {
 		echo '<span id="coursemanager">';
 		if ($id_session!=0){
-			$mail=CourseManager::get_email_of_tutor_to_session($id_session);
+			$coachs_email=CourseManager::get_email_of_tutor_to_session($id_session,$id_course);
-			echo '&nbsp;'.get_lang('Tutor')." : ";
+
-			foreach ($mail as $v=>$k) {
+				$email_link = array();
-				echo Display::encrypted_mailto_link($v,$k);
+				foreach ($coachs_email as $coach_email) {				
+					foreach ($coach_email as $email=>$username) {
+						$email_link[] = Display::encrypted_mailto_link($email,$username);
+					}
 				}				
+			echo '&nbsp;'.get_lang('Coachs')." : ".implode("&nbsp;|&nbsp;",$email_link);				
 		}
 		echo '</span>';
 	}

main/inc/lib/course.lib.php

@@ -1721,24 +1721,42 @@ class CourseManager {
 	}
 
 	/**
-	 * Get emails of tutors to course
+	 * Get coachs' emails by session 
-	 * @param string session session
+	 * @param int session id
-	 * @return string email of tutor to session
+	 * @param string course code
-	 * @author @author Carlos Vargas <carlos.vargas@dokeos.com>, Dokeos Latino
+	 * @return array  array(email => name_tutor)  by coach
+	 * @author Carlos Vargas <carlos.vargas@dokeos.com>
 	 */
-	public static function get_email_of_tutor_to_session($session) {
+	public static function get_email_of_tutor_to_session($session_id,$course_code) {
-		$row_email = Database::fetch_array(Database::query("SELECT * FROM ".Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER)."
+		
-				WHERE id_session='".Database::escape_string($session)."' AND status = 2", __FILE__, __LINE__));
+		$tbl_session_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
+		$tbl_user = Database::get_main_table(TABLE_MAIN_USER);
+		$coachs_emails = array();
+		
+		$course_code = Database::escape_string($course_code);
+		$session_id = intval($session_id);
 		
-		$result_user = Database::query("SELECT * FROM ".Database::get_main_table(TABLE_MAIN_USER)."
+		$sql = "SELECT id_user FROM $tbl_session_course_user WHERE id_session='$session_id' AND course_code='$course_code' AND status =2";
-				WHERE user_id=".$row_email['id_user'], __FILE__, __LINE__);
+		$rs  = Database::query($sql,__FILE__,__LINE__);
 				
-		while ($row_emails = Database::fetch_array($result_user)) {
+		if (Database::num_rows($rs) > 0) {
+			
+			$user_ids = array();
+			while ($row = Database::fetch_array($rs)) {
+				$user_ids[] = $row['id_user'];
+			}
+					
+			$sql = "SELECT firstname,lastname,email FROM $tbl_user WHERE user_id IN (".implode(",",$user_ids).")";		
+			$rs_user = Database::query($sql,__FILE__,__LINE__);
+			
+			while ($row_emails = Database::fetch_array($rs_user)) {								
 				$name_tutor = api_get_person_name($row_emails['firstname'], $row_emails['lastname'], null, PERSON_NAME_EMAIL_ADDRESS);
 				$mail_tutor = array($row_emails['email'] => $name_tutor);
+				$coachs_emails[] = $mail_tutor;
+			}
 		}
 		
-		return $mail_tutor;
+		return $coachs_emails;
 	}
 
 	/**