Yannick Warnier 14 years ago
parent
commit
c6d9b21f2a

+ 28 - 28
main/admin/special_exports.php

@@ -72,13 +72,13 @@ if ((isset ($_POST['action']) && $_POST['action'] == 'course_select_form') || (i
 				$tbl_property = Database::get_course_table(TABLE_ITEM_PROPERTY, $_course['db_name']);
 				//Add tem to the zip file course
 				$sql = "SELECT path FROM $tbl_document AS docs, $tbl_property AS props
-					WHERE `props`.`tool`='".TOOL_DOCUMENT."'
-						AND `docs`.`id`=`props`.`ref`
-						AND `docs`.`path` LIKE '".$querypath."/%'
-						AND `docs`.`filetype`='file'
-						AND `docs`.`session_id` = '0'
-						AND `props`.`visibility`<>'2'
-						AND `props`.`to_group_id`=".$to_group_id."";
+					WHERE props.tool='".TOOL_DOCUMENT."'
+						AND docs.id=props.ref
+						AND docs.path LIKE '".$querypath."/%'
+						AND docs.filetype='file'
+						AND docs.session_id = '0'
+						AND props.visibility<>'2'
+						AND props.to_group_id=".$to_group_id."";
 				$query = Database::query($sql );
 				while ($rows_course_file = Database::fetch_assoc($query)) {
 					$zip_folder->add($FileZip['PATH_COURSE'].$_course['directory']."/document".$rows_course_file['path'],
@@ -90,13 +90,13 @@ if ((isset ($_POST['action']) && $_POST['action'] == 'course_select_form') || (i
 					$session_id = Security::remove_XSS($IdSession);
 					//Add tem to the zip file session course
 					$sql_session_doc = "SELECT path FROM $tbl_document AS docs,$tbl_property AS props
-						WHERE `props`.`tool`='".TOOL_DOCUMENT."'
-							AND `docs`.`id`=`props`.`ref`
-							AND `docs`.`path` LIKE '".$querypath."/%'
-							AND `docs`.`filetype`='file'
-							AND `docs`.`session_id` = '$session_id'
-							AND `props`.`visibility`<>'2'
-							AND `props`.`to_group_id`=".$to_group_id."";
+						WHERE props.tool='".TOOL_DOCUMENT."'
+							AND docs.id=props.ref
+							AND docs.path LIKE '".$querypath."/%'
+							AND docs.filetype='file'
+							AND docs.session_id = '$session_id'
+							AND props.visibility<>'2'
+							AND props.to_group_id=".$to_group_id."";
 					$query_session_doc = Database::query($sql_session_doc);
 					while ($rows_course_session_file = Database::fetch_assoc($query_session_doc)) {
 						$zip_folder->add($FileZip['PATH_COURSE'].$_course['directory'].'/document'.$rows_course_session_file['path'],
@@ -223,13 +223,13 @@ function fullexportspecial(){
             $tbl_property = Database::get_course_table(TABLE_ITEM_PROPERTY, $_course['db_name']);
             //Add tem to the zip file course
             $sql = "SELECT path FROM $tbl_document AS docs, $tbl_property AS props
-                WHERE `props`.`tool`='".TOOL_DOCUMENT."'
-                    AND `docs`.`id`=`props`.`ref`
-                    AND `docs`.`path` LIKE '".$querypath."/%'
-                    AND `docs`.`filetype`='file'
-                    AND `docs`.`session_id` = '0'
-                    AND `props`.`visibility`<>'2'
-                    AND `props`.`to_group_id`=".$to_group_id."";
+                WHERE props.tool='".TOOL_DOCUMENT."'
+                    AND docs.id=props.ref
+                    AND docs.path LIKE '".$querypath."/%'
+                    AND docs.filetype='file'
+                    AND docs.session_id = '0'
+                    AND props.visibility<>'2'
+                    AND props.to_group_id=".$to_group_id."";
             $query = Database::query($sql );
             while ($rows_course_file = Database::fetch_assoc($query)) {
                 $rows_course_file['path'];
@@ -247,13 +247,13 @@ function fullexportspecial(){
             while ($rows_session = Database::fetch_assoc($query_session)) {
                 $session_id = $rows_session['id'];
                 $sql_session_doc = "SELECT path FROM $tbl_document AS docs,$tbl_property AS props
-                    WHERE `props`.`tool`='".TOOL_DOCUMENT."'
-                        AND `docs`.`id`=`props`.`ref`
-                        AND `docs`.`path` LIKE '".$querypath."/%'
-                        AND `docs`.`filetype`='file'
-                        AND `docs`.`session_id` = '$session_id'
-                        AND `props`.`visibility`<>'2'
-                        AND `props`.`to_group_id`=".$to_group_id."";
+                    WHERE props.tool='".TOOL_DOCUMENT."'
+                        AND docs.id=props.ref
+                        AND docs.path LIKE '".$querypath."/%'
+                        AND docs.filetype='file'
+                        AND docs.session_id = '$session_id'
+                        AND props.visibility<>'2'
+                        AND props.to_group_id=".$to_group_id."";
                 $query_session_doc = Database::query($sql_session_doc);
                 while ($rows_course_session_file = Database::fetch_assoc($query_session_doc)) {
                     $zip_folder->add($FileZip['PATH_COURSE'].$_course['directory'].'/document'.$rows_course_session_file['path'],

+ 1 - 1
main/calendar/agenda.inc.php

@@ -3413,7 +3413,7 @@ function get_day_agendaitems($courses_dbs, $month, $year, $day) {
 								WHERE agenda.id = item_property.ref
 								AND DAYOFMONTH(start_date)='".$day."' AND MONTH(start_date)='".$month."' AND YEAR(start_date)='".$year."'
 								AND item_property.tool='".TOOL_CALENDAR_EVENT."'
-								AND	( item_property.to_user_id='".$_user['user_id']."' OR `item_property`.`to_group_id` IN (0, ".implode(", ", $group_memberships).") )
+								AND	( item_property.to_user_id='".$_user['user_id']."' OR item_property.to_group_id IN (0, ".implode(", ", $group_memberships).") )
 								AND item_property.visibility='1'
 								ORDER BY start_date ";
 			} else {

+ 4 - 4
main/document/downloadfolder.inc.php

@@ -79,7 +79,7 @@ if (is_allowed_to_edit()) {
 		$querypath = $path;
 	}
 	// Search for all files that are not deleted => visibility != 2
-	$query = Database::query("SELECT path FROM $doc_table AS docs,$prop_table AS props  WHERE `props`.`tool`='".TOOL_DOCUMENT."' AND `docs`.`id`=`props`.`ref` AND `docs`.`path` LIKE '".$querypath."/%' AND `docs`.`filetype`='file' AND `props`.`visibility`<>'2' AND `props`.`to_group_id`=".$to_group_id."");
+	$query = Database::query("SELECT path FROM $doc_table AS docs,$prop_table AS props  WHERE props.tool='".TOOL_DOCUMENT."' AND docs.id=props.ref AND docs.path LIKE '".$querypath."/%' AND docs.filetype='file' AND props.visibility<>'2' AND props.to_group_id=".$to_group_id."");
 	// Add tem to the zip file
 	while ($not_deleted_file = Database::fetch_assoc($query)) {
 		$zip_folder->add($sys_course_path.$_course['path'].'/document'.$not_deleted_file['path'], PCLZIP_OPT_REMOVE_PATH, $sys_course_path.$_course['path'].'/document'.$remove_dir);
@@ -95,7 +95,7 @@ else {
 	// A big problem: Visible files that are in a hidden folder are included when we do a query for visiblity='v'
 	// So... I do it in a couple of steps:
 	// 1st: Get all files that are visible in the given path
-	$query = Database::query("SELECT path FROM $doc_table AS docs,$prop_table AS props WHERE `props`.`tool`='".TOOL_DOCUMENT."' AND `docs`.`id`=`props`.`ref` AND `docs`.`path` LIKE '".$querypath."/%' AND `props`.`visibility`='1' AND `docs`.`filetype`='file' AND `props`.`to_group_id`=".$to_group_id);
+	$query = Database::query("SELECT path FROM $doc_table AS docs,$prop_table AS props WHERE props.tool='".TOOL_DOCUMENT."' AND docs.id=props.ref AND docs.path LIKE '".$querypath."/%' AND props.visibility='1' AND docs.filetype='file' AND props.to_group_id=".$to_group_id);
 	// Add them to an array
 	while ($all_visible_files = Database::fetch_assoc($query)) {
 		$all_visible_files_path[] = $all_visible_files['path'];
@@ -105,14 +105,14 @@ else {
 	//print_r($all_visible_files_path);
 	//echo('</pre>');
 	// 2nd: Get all folders that are invisible in the given path
-	$query2 = Database::query("SELECT path FROM $doc_table AS docs,$prop_table AS props WHERE `props`.`tool`='".TOOL_DOCUMENT."' AND `docs`.`id`=`props`.`ref` AND `docs`.`path` LIKE '".$querypath."/%' AND `props`.`visibility`<>'1' AND `docs`.`filetype`='folder'");
+	$query2 = Database::query("SELECT path FROM $doc_table AS docs,$prop_table AS props WHERE props.tool='".TOOL_DOCUMENT."' AND docs.id=props.ref AND docs.path LIKE '".$querypath."/%' AND props.visibility<>'1' AND docs.filetype='folder'");
 	// If we get invisible folders, we have to filter out these results from all visible files we found
 	if (Database::num_rows($query2) > 0) {
 		// Add tem to an array
 		while ($invisible_folders = Database::fetch_assoc($query2)) {
 		//3rd: Get all files that are in the found invisible folder (these are "invisible" too)
 			//echo "<br /><br />invisible folders: ".$sys_course_path.$_course['path'].'/document'.$invisible_folders['path'].'<br />';
-			$query3 = Database::query("SELECT path FROM $doc_table AS docs,$prop_table AS props  WHERE `props`.`tool`='".TOOL_DOCUMENT."' AND `docs`.`id`=`props`.`ref` AND `docs`.`path` LIKE '".$invisible_folders['path']."/%' AND `docs`.`filetype`='file' AND `props`.`visibility`='1'");
+			$query3 = Database::query("SELECT path FROM $doc_table AS docs,$prop_table AS props  WHERE props.tool='".TOOL_DOCUMENT."' AND docs.id=props.ref AND docs.path LIKE '".$invisible_folders['path']."/%' AND docs.filetype='file' AND props.visibility='1'");
 			// Add tem to an array
 			while ($files_in_invisible_folder = Database::fetch_assoc($query3)) {
 				$files_in_invisible_folder_path[] = $files_in_invisible_folder['path'];

+ 2 - 2
main/dropbox/dropbox_submit.php

@@ -246,7 +246,7 @@ if (isset($_GET['mailingIndex'])) { // examine or send
 		$var = api_strtoupper($nameParts[2]);  // the variable part of the name
 		$course_user = Database::get_main_table(TABLE_MAIN_COURSE_USER);
 		$sel = "SELECT u.user_id, u.lastname, u.firstname, cu.status
-				FROM `".$_configuration['main_database']."`.`user` u
+				FROM ".$_configuration['main_database'].".user u
 				LEFT JOIN $course_user cu
 				ON cu.user_id = u.user_id AND cu.relation_type<>".COURSE_RELATION_TYPE_RRHH." AND cu.course_code = '".$_course['sysCode']."'";
 		$sel .= " WHERE u.".dropbox_cnf("mailingWhere".$var)." = '";
@@ -361,7 +361,7 @@ if (isset($_GET['mailingIndex'])) { // examine or send
 			$course_user = Database::get_main_table(TABLE_MAIN_COURSE_USER);
 			$sql = "SELECT u.lastname, u.firstname
 					FROM $course_user cu
-					LEFT JOIN  `".$_configuration['main_database']."`.`user` u
+					LEFT JOIN  ".$_configuration['main_database'].".user u
 					ON cu.user_id = u.user_id AND cu.course_code = '".$_course['sysCode']."'
 					WHERE cu.status = 5
 					AND u.user_id NOT IN ('" . implode("', '" , $students) . "')";