[svn r18237] We only export the sessions/users of the current access_url_id FS#3462

main/admin/session_export.php

@@ -69,7 +69,20 @@ if($_POST['formSent'] )
 	$session_id=$_POST['session_id'];
 	if(empty($session_id))
 	{
-		$result=api_sql_query("SELECT id,name,id_coach,date_start,date_end FROM $tbl_session ORDER BY id",__FILE__,__LINE__);
+		$sql = "SELECT id,name,id_coach,date_start,date_end FROM $tbl_session ORDER BY id";		
+		global $_configuration;	
+		if ($_configuration['multiple_access_urls']==true) {	
+			$tbl_session_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);	
+			$access_url_id = api_get_current_access_url_id();
+			if ($access_url_id != -1){
+			$sql = "SELECT id, name,id_coach,date_start,date_end FROM $tbl_session s INNER JOIN $tbl_session_rel_access_url as session_rel_url 		
+				ON (s.id= session_rel_url.session_id)		
+				WHERE access_url_id = $access_url_id
+				ORDER BY id";		
+			}
+		} 
+
+		$result=api_sql_query($sql,__FILE__,__LINE__);
 	}
 	else
 	{
@@ -83,7 +96,7 @@ if($_POST['formSent'] )
 
 	}
 
-	if(mysql_num_rows($result))
+	if(Database::num_rows($result))
 	{
 		if(!file_exists($archivePath))
 		{
@@ -118,7 +131,7 @@ if($_POST['formSent'] )
 			fputs($fp,"<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<Sessions>\n");
 		}
 
-		while($row=mysql_fetch_array($result))
+		while($row=Database::fetch_array($result))
 		{
 
 
@@ -146,7 +159,7 @@ if($_POST['formSent'] )
 
 			$rsUsers = api_sql_query($sql,__FILE__,__LINE__);
 			$users = '';
-			while($rowUsers = mysql_fetch_array($rsUsers)){
+			while($rowUsers = Database::fetch_array($rsUsers)){
 				if($cvs){
 					$users .= str_replace(';',',',$rowUsers['username']).'|';
 				}
@@ -175,7 +188,7 @@ if($_POST['formSent'] )
 			$rsCourses = api_sql_query($sql,__FILE__,__LINE__);
 
 			$courses = '';
-			while($rowCourses = mysql_fetch_array($rsCourses)){
+			while($rowCourses = Database::fetch_array($rsCourses)){
 
 				if($cvs){
 					$courses .= str_replace(';',',',$rowCourses['code']);
@@ -196,7 +209,7 @@ if($_POST['formSent'] )
 							AND id_session='".$row['id']."'";
 
 				$rsUsersCourse = api_sql_query($sql,__FILE__,__LINE__);
-				while($rowUsersCourse = mysql_fetch_array($rsUsersCourse)){
+				while($rowUsersCourse = Database::fetch_array($rsUsersCourse)){
 					if($cvs){
 						$userscourse .= str_replace(';',',',$rowUsersCourse['username']).',';
 					}
@@ -241,6 +254,18 @@ api_display_tool_title($tool_name);
 
 //select of sessions
 $sql = "SELECT id, name FROM $tbl_session ORDER BY name";
+global $_configuration;	
+if ($_configuration['multiple_access_urls']==true) {		
+	$tbl_session_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);	
+	$access_url_id = api_get_current_access_url_id();
+	if ($access_url_id != -1){
+	$sql = "SELECT id, name FROM $tbl_session s INNER JOIN $tbl_session_rel_access_url as session_rel_url 		
+		ON (s.id= session_rel_url.session_id)		
+		WHERE access_url_id = $access_url_id
+		ORDER BY name";		
+	}
+} 
+
 
 $result=api_sql_query($sql,__FILE__,__LINE__);
 

main/admin/user_export.php

@@ -1,5 +1,5 @@
 <?php
-// $Id: user_export.php 18050 2009-01-28 18:54:19Z cfasanando $
+// $Id: user_export.php 18237 2009-02-04 19:13:09Z juliomontoya $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -55,6 +55,18 @@ set_time_limit(0);
 $courses = array ();
 $courses[''] = '--';
 $sql = "SELECT code,visual_code,title FROM $course_table ORDER BY visual_code";
+
+global $_configuration;	
+if ($_configuration['multiple_access_urls']==true) {		
+	$tbl_course_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);	
+	$access_url_id = api_get_current_access_url_id();
+	if ($access_url_id != -1){
+	$sql = "SELECT code,visual_code,title FROM $course_table as c INNER JOIN $tbl_course_rel_access_url as course_rel_url 		
+		ON (c.code = course_rel_url.course_code)		
+		WHERE access_url_id = $access_url_id
+		ORDER BY visual_code";		
+	}
+}
 $result = api_sql_query($sql, __FILE__, __LINE__);
 while ($course = mysql_fetch_object($result))
 {
@@ -84,14 +96,25 @@ if ($form->validate())
 					u.status		AS Status,
 					u.official_code	AS OfficialCode,
 					u.phone		AS Phone";
-	if (strlen($course_code) > 0)
+	if (strlen($course_code) > 0) {
-	{
 		$sql .= " FROM $user_table u, $course_user_table cu WHERE u.user_id = cu.user_id AND course_code = '$course_code' ORDER BY lastname,firstname";
 		$filename = 'export_users_'.$course_code.'_'.date('Y-m-d_H-i-s');
-	}
+	} else {
-	else
+		
-	{
+		global $_configuration;	
-		$sql .= " FROM $user_table u ORDER BY lastname,firstname";
+		if ($_configuration['multiple_access_urls']==true) {		
+			$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);	
+			$access_url_id = api_get_current_access_url_id();
+			if ($access_url_id != -1){
+			$sql.= " FROM $user_table u INNER JOIN $tbl_user_rel_access_url as user_rel_url 		
+				ON (u.user_id= user_rel_url.user_id)		
+				WHERE access_url_id = $access_url_id
+				ORDER BY lastname,firstname";		
+			}
+		} else {
+			$sql .= " FROM $user_table u ORDER BY lastname,firstname";
+		}	
+		
 		$filename = 'export_users_'.date('Y-m-d_H-i-s');
 	}
 	$data = array();