Sfoglia il codice sorgente

Injecting the $result inside the Database::affected_rows() in order to work with Doctrine

Julio Montoya 11 anni fa
parent
commit
8616f1e9de

+ 5 - 5
main/admin/configure_extensions.php

@@ -26,7 +26,7 @@ if (isset($_POST['activeExtension'])) {
 					WHERE variable="service_visio"
 					AND subkey="active"';
 			$rs = Database::query($sql);
-			if(Database::affected_rows()>0) {
+			if (Database::affected_rows($rs)>0) {
 				// select all the courses and insert the tool inside
 				$sql = 'SELECT id FROM '.Database::get_main_table(TABLE_MAIN_COURSE);
 				$rs = Database::query($sql);
@@ -105,7 +105,7 @@ if (isset($_POST['activeExtension'])) {
 
 			$rs = Database::query($sql);
 
-			if(Database::affected_rows()>0){
+			if (Database::affected_rows($rs)>0){
 				$message = get_lang('ServiceActivated');
 			}
 
@@ -299,7 +299,7 @@ Display::display_header($nameTool);
 	</div>
 
  */ ?>
-    
+
 	<!-- PPT2LP -->
 	<div id="main_ppt2lp">
 		<div id="extension_header_ppt2lp" class="accordion_header">
@@ -441,8 +441,8 @@ Display::display_header($nameTool);
 	</div>
 	*/
     /*
-	
-    
+
+
 	<!-- SEARCH -->
 	<div id="main_search">
 		<div id="extension_header_search" class="accordion_header">

+ 3 - 3
main/admin/session_course_list.php

@@ -47,8 +47,8 @@ if ($action == 'delete') {
 		}
 		$idChecked = $my_temp;
 		$idChecked="'".implode("','", $idChecked)."'";
-		Database::query("DELETE FROM $tbl_session_rel_course WHERE id_session='$id_session' AND c_id IN($idChecked)");
-		$nbr_affected_rows=Database::affected_rows();
+		$result = Database::query("DELETE FROM $tbl_session_rel_course WHERE id_session='$id_session' AND c_id IN($idChecked)");
+		$nbr_affected_rows = Database::affected_rows($result);
 		Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session='$id_session' AND c_id IN($idChecked)");
 		Database::query("UPDATE $tbl_session SET nbr_courses=nbr_courses-$nbr_affected_rows WHERE id='$id_session'");
 	}
@@ -99,4 +99,4 @@ echo '<select name="action">
 	</select>
 	<button class="save" type="submit">'.get_lang('Ok').'</button>
 	</form>';
-Display::display_footer();
+Display::display_footer();

+ 2 - 2
main/admin/user_fields.php

@@ -343,7 +343,7 @@ function delete_user_fields($field_id) {
     // delete the fields
     $sql = "DELETE FROM $table_user_field WHERE id = '" . Database::escape_string($field_id) . "'";
     $result = Database::query($sql);
-    if (Database::affected_rows() == 1) {
+    if (Database::affected_rows($result) == 1) {
         // delete the field options
         $sql = "DELETE FROM $table_user_field_options WHERE field_id = '" . Database::escape_string($field_id) . "'";
         $result = Database::query($sql);
@@ -369,4 +369,4 @@ function delete_user_fields($field_id) {
         // the field was not deleted so we return false
         return false;
     }
-}
+}

+ 25 - 25
main/inc/lib/attendance.lib.php

@@ -277,8 +277,8 @@ class Attendance
 					attendance_qualify_title = '$title_gradebook',
 					attendance_weight = '$weight_calification',
 					session_id = '$session_id'";
-		Database::query($sql);
-		$affected_rows = Database::affected_rows();
+		$result = Database::query($sql);
+		$affected_rows = Database::affected_rows($result);
 		$last_id = 0;
 		if (!empty($affected_rows)) {
 			// save inside item property table
@@ -361,8 +361,8 @@ class Attendance
 			foreach ($attendance_id as $id) {
 				$id	= intval($id);
 				$sql = "UPDATE $tbl_attendance SET active = 1 WHERE c_id = $course_id AND id = '$id'";
-				Database::query($sql);
-				$affected_rows = Database::affected_rows();
+				$result = Database::query($sql);
+				$affected_rows = Database::affected_rows($result);
 				if (!empty($affected_rows)) {
 					// update row item property table
 					api_item_property_update($course_info, TOOL_ATTENDANCE, $id,"restore", $user_id);
@@ -371,8 +371,8 @@ class Attendance
 		} else  {
 			$attendance_id	= intval($attendance_id);
 			$sql = "UPDATE $tbl_attendance SET active = 1 WHERE c_id = $course_id AND id = '$attendance_id'";
-			Database::query($sql);
-			$affected_rows = Database::affected_rows();
+			$result = Database::query($sql);
+			$affected_rows = Database::affected_rows($result);
 			if (!empty($affected_rows)) {
 				// update row item property table
 				api_item_property_update($course_info, TOOL_ATTENDANCE, $attendance_id,"restore", $user_id);
@@ -397,8 +397,8 @@ class Attendance
 			foreach ($attendance_id as $id) {
 				$id	= intval($id);
 				$sql = "UPDATE $tbl_attendance SET active = 0 WHERE c_id = $course_id AND id = '$id'";
-				Database::query($sql);
-				$affected_rows = Database::affected_rows();
+				$result = Database::query($sql);
+				$affected_rows = Database::affected_rows($result);
 				if (!empty($affected_rows)) {
 					// update row item property table
 					api_item_property_update($course_info, TOOL_ATTENDANCE, $id,"delete", $user_id);
@@ -407,8 +407,8 @@ class Attendance
 		} else  {
 			$attendance_id	= intval($attendance_id);
 			$sql = "UPDATE $tbl_attendance SET active = 0 WHERE c_id = $course_id AND id = '$attendance_id'";
-			Database::query($sql);
-			$affected_rows = Database::affected_rows();
+			$result = Database::query($sql);
+			$affected_rows = Database::affected_rows($result);
 			if (!empty($affected_rows)) {
 				// update row item property table
 				api_item_property_update($course_info, TOOL_ATTENDANCE, $attendance_id,"delete", $user_id);
@@ -428,8 +428,8 @@ class Attendance
         $attendance_id = intval($attendance_id);
         $locked = ($lock)?1:0;
         $upd = "UPDATE $tbl_attendance SET locked = $locked WHERE c_id = $course_id AND id = $attendance_id";
-        Database::query($upd);
-        $affected_rows = Database::affected_rows();
+        $result = Database::query($upd);
+        $affected_rows = Database::affected_rows($result);
         if ($affected_rows && $lock) {
             //save attendance sheet log
             $lastedit_type = self::LOCKED_ATTENDANCE_LOG_TYPE;
@@ -575,13 +575,13 @@ class Attendance
                             user_id 				= '$uid',
                             attendance_calendar_id 	= '$calendar_id',
                             presence 				= $presence";
-                    Database::query($sql);
-                    $affected_rows += Database::affected_rows();
+                    $result = Database::query($sql);
+                    $affected_rows += Database::affected_rows($result);
                 } else {
                     $sql = "UPDATE $tbl_attendance_sheet SET presence = $presence
                             WHERE c_id = $course_id AND user_id ='$uid' AND attendance_calendar_id = '$calendar_id'";
-                    Database::query($sql);
-                    $affected_rows += Database::affected_rows();
+                    $result = Database::query($sql);
+                    $affected_rows += Database::affected_rows($result);
                 }
             }
         }
@@ -765,8 +765,8 @@ class Attendance
         // save data
         $ins = "INSERT INTO $tbl_attendance_sheet_log(c_id, attendance_id, lastedit_date, lastedit_type, lastedit_user_id, calendar_date_value)
                 VALUES ($course_id, $attendance_id, '$lastedit_date', '$lastedit_type', $lastedit_user_id, '$calendar_date_value')";
-        Database::query($ins);
-        return Database::affected_rows();
+        $result = Database::query($ins);
+        return Database::affected_rows($result);
    }
 
 	/**
@@ -1222,9 +1222,9 @@ class Attendance
 					c_id			= $course_id,
 					date_time		= '".Database::escape_string($this->date_time)."',
 					attendance_id 	= '$attendance_id'";
-			Database::query($sql);
+			$result = Database::query($sql);
             $cal_id = Database::insert_id();
-			$affected_rows = Database::affected_rows();
+			$affected_rows = Database::affected_rows($result);
 		}
 
         // update locked attendance
@@ -1336,8 +1336,8 @@ class Attendance
 		$rs = Database::query($sql);
 		if (Database::num_rows($rs) == 0) {
 			$sql = "UPDATE $tbl_attendance_calendar SET date_time='".Database::escape_string($this->date_time)."' WHERE c_id = $course_id AND id = '".intval($calendar_id)."'";
-			Database::query($sql);
-			$affected_rows = Database::affected_rows();
+			$result = Database::query($sql);
+			$affected_rows = Database::affected_rows($result);
 		}
 
         // update locked attendance
@@ -1379,7 +1379,7 @@ class Attendance
 					Database::query($sql);
 					// delete data from attendance calendar
 					$sql = "DELETE FROM $tbl_attendance_calendar WHERE c_id = $course_id AND id = '".intval($cal['id'])."'";
-					Database::query($sql);
+					$result = Database::query($sql);
 				}
 			}
 		} else {
@@ -1388,10 +1388,10 @@ class Attendance
 			Database::query($sql);
 			// delete data from attendance calendar
 			$sql = "DELETE FROM $tbl_attendance_calendar WHERE c_id = $course_id AND id = '".intval($calendar_id)."'";
-			Database::query($sql);
+			$result = Database::query($sql);
 		}
 
-		$affected_rows = Database::affected_rows();
+		$affected_rows = Database::affected_rows($result);
 		// update users' results
 		$this->update_users_results($user_ids, $attendance_id);
 

+ 13 - 14
main/inc/lib/auth.lib.php

@@ -177,10 +177,10 @@ class AuthLib {
         $current_user = api_get_user_id();
 
         $max_sort_value = api_max_sort_value($newcategory, $current_user); // max_sort_value($newcategory);
-        Database::query("UPDATE $TABLECOURSUSER SET user_course_cat='" . $newcategory . "', sort='" . ($max_sort_value + 1) . "'
+        $result = Database::query("UPDATE $TABLECOURSUSER SET user_course_cat='" . $newcategory . "', sort='" . ($max_sort_value + 1) . "'
                         WHERE c_id ='" . $courseId . "' AND user_id='" . $current_user . "' AND relation_type<>" . COURSE_RELATION_TYPE_RRHH . "");
-        $result = false;
-        if (Database::affected_rows()) {
+
+        if (Database::affected_rows($result)) {
             $result = true;
         }
         return $result;
@@ -231,8 +231,8 @@ class AuthLib {
             $sql_update2 = "UPDATE $TABLECOURSUSER SET sort='" . $source_course['sort'] . "'
                             WHERE c_id = '" . $target_course['real_id'] . "' AND user_id='" . $current_user_id . "' AND relation_type<>" . COURSE_RELATION_TYPE_RRHH . " ";
             Database::query($sql_update2);
-            Database::query($sql_update1);
-            if (Database::affected_rows()) {
+            $result = Database::query($sql_update1);
+            if (Database::affected_rows($result)) {
                 $result = true;
             }
         }
@@ -273,8 +273,8 @@ class AuthLib {
             $sql_update1 = "UPDATE $table_user_defined_category SET sort='" . Database::escape_string($target_category['sort']) . "' WHERE id='" . intval($source_category['id']) . "' AND user_id='" . $current_user_id . "'";
             $sql_update2 = "UPDATE $table_user_defined_category SET sort='" . Database::escape_string($source_category['sort']) . "' WHERE id='" . intval($target_category['id']) . "' AND user_id='" . $current_user_id . "'";
             Database::query($sql_update2);
-            Database::query($sql_update1);
-            if (Database::affected_rows()) {
+            $result = Database::query($sql_update1);
+            if (Database::affected_rows($result)) {
                 $result = true;
             }
         }
@@ -309,8 +309,8 @@ class AuthLib {
         $result = false;
         $tucc = Database::get_main_table(TABLE_USER_COURSE_CATEGORY);
         $sql_update = "UPDATE $tucc SET title='" . api_htmlentities($title, ENT_QUOTES, api_get_system_encoding()) . "' WHERE id='" . $category_id . "'";
-        Database::query($sql_update);
-        if (Database::affected_rows()) {
+        $result = Database::query($sql_update);
+        if (Database::affected_rows($result)) {
             $result = true;
         }
         return $result;
@@ -326,10 +326,9 @@ class AuthLib {
         $tucc = Database::get_main_table(TABLE_USER_COURSE_CATEGORY);
         $TABLECOURSUSER = Database::get_main_table(TABLE_MAIN_COURSE_USER);
         $category_id = intval($category_id);
-        $result = false;
         $sql_delete = "DELETE FROM $tucc WHERE id='" . $category_id . "' and user_id='" . $current_user_id . "'";
-        Database::query($sql_delete);
-        if (Database::affected_rows()) {
+        $result = Database::query($sql_delete);
+        if (Database::affected_rows($result)) {
             $result = true;
         }
         $sql_update = "UPDATE $TABLECOURSUSER SET user_course_cat='0'
@@ -391,8 +390,8 @@ class AuthLib {
         $rs = Database::query($sql);
         if (Database::num_rows($rs) == 0) {
             $sql_insert = "INSERT INTO $tucc (user_id, title,sort) VALUES ('" . $current_user_id . "', '" . api_htmlentities($category_title, ENT_QUOTES, api_get_system_encoding()) . "', '" . $nextsort . "')";
-            Database::query($sql_insert);
-            if (Database::affected_rows()) {
+            $result = Database::query($sql_insert);
+            if (Database::affected_rows($result)) {
                 $result = true;
             }
         } else {

+ 3 - 3
main/inc/lib/classmanager.lib.php

@@ -39,8 +39,8 @@ class ClassManager
 	function create_class($name) {
 		$table_class = Database :: get_main_table(TABLE_MAIN_CLASS);
 		$sql = "INSERT INTO $table_class SET name='".Database::escape_string($name)."'";
-		Database::query($sql);
-		return Database::affected_rows() == 1;
+		$result = Database::query($sql);
+		return Database::affected_rows($result) == 1;
 	}
 	/**
 	 * Check if a classname is allready in use
@@ -224,4 +224,4 @@ class ClassManager
 		}
 		return $classes;
 	}
-}
+}

+ 8 - 8
main/inc/lib/course_description.lib.php

@@ -200,9 +200,9 @@ class CourseDescription
 				content 			= '".Database::escape_string($this->content)."',
 				progress 			= '".intval($this->progress)."',
 				session_id = '".intval($this->session_id)."' ";
-		Database::query($sql);
+		$result = Database::query($sql);
 		$last_id = Database::insert_id();
-		$affected_rows = Database::affected_rows();
+		$affected_rows = Database::affected_rows($result);
 		if ($last_id > 0) {
 			//insert into item_property
 			api_item_property_update(api_get_course_info(), TOOL_COURSE_DESCRIPTION, $last_id, 'CourseDescriptionAdded', api_get_user_id());
@@ -233,8 +233,8 @@ class CourseDescription
 			 	lastedit_date 		= '".date('Y-m-d H:i:s')."',
 			 	lastedit_user_id 	= '".api_get_user_id()."',
 			 	session_id			= '".intval($this->session_id)."'";
-		Database::query($sql);
-		$affected_rows = Database::affected_rows();
+		$result = Database::query($sql);
+		$affected_rows = Database::affected_rows($result);
 		return $affected_rows;
 	}
 
@@ -253,8 +253,8 @@ class CourseDescription
 						session_id  = '".$this->session_id."' AND
 						c_id = ".api_get_course_int_id()."
 						";
-		Database::query($sql);
-		$affected_rows = Database::affected_rows();
+		$result = Database::query($sql);
+		$affected_rows = Database::affected_rows($result);
 
 		if ($this->id > 0) {
 			//insert into item_property
@@ -271,8 +271,8 @@ class CourseDescription
 		$tbl_course_description = Database::get_course_table(TABLE_COURSE_DESCRIPTION);
 		$course_id = api_get_course_int_id();
 		$sql = "DELETE FROM $tbl_course_description WHERE c_id = $course_id AND id = '".intval($this->id)."' AND session_id = '".intval($this->session_id)."'";
-		Database::query($sql);
-		$affected_rows = Database::affected_rows();
+		$result = Database::query($sql);
+		$affected_rows = Database::affected_rows($result);
 		if ($this->id > 0) {
 			//insert into item_property
 			api_item_property_update(api_get_course_info(), TOOL_COURSE_DESCRIPTION, $this->id, 'CourseDescriptionDeleted', api_get_user_id());

+ 2 - 4
main/inc/lib/dashboard.lib.php

@@ -232,12 +232,10 @@ class DashboardManager {
 					$ins = "INSERT INTO $tbl_block(name, description, path, controller) VALUES ('$plugin_name', '$plugin_description', '$plugin_path', '$plugin_controller')";
 					Database::query($ins);
 				}
-				$affected_rows = Database::affected_rows();
+				// $affected_rows = Database::affected_rows();
 			}
-
 		}
-
-		return $affected_rows;
+		return true;
 	}
 
 	/**

+ 4 - 4
main/inc/lib/events.lib.inc.php

@@ -112,9 +112,9 @@ function event_access_course()
     // added for "what's new" notification
     $sql = "UPDATE $TABLETRACK_LASTACCESS  SET access_date = '$now'
         	WHERE access_user_id = $user_id AND c_id = '$courseId' AND access_tool IS NULL AND access_session_id=".$id_session;
-    Database::query($sql);
+    $result = Database::query($sql);
 
-    if (Database::affected_rows() == 0) {
+    if (Database::affected_rows($result) == 0) {
         $sql = "INSERT INTO $TABLETRACK_LASTACCESS (access_user_id, c_id, access_date, access_session_id)
         		VALUES (".$user_id.", '".$courseId."', '$now', '".$id_session."')";
         Database::query($sql);
@@ -179,8 +179,8 @@ function event_access_tool($tool, $id_session = 0)
     $sql = "UPDATE $TABLETRACK_LASTACCESS
         	SET access_date = '$reallyNow'
         	WHERE access_user_id = ".$user_id." AND c_id = '".$courseId."' AND access_tool = '".$tool."' AND access_session_id=".$id_session;
-    Database::query($sql);
-    if (Database::affected_rows() == 0) {
+    $result = Database::query($sql);
+    if (Database::affected_rows($result) == 0) {
         $sql = "INSERT INTO $TABLETRACK_LASTACCESS (access_user_id, c_id, access_tool, access_date, access_session_id)
         		VALUES (".$user_id.", '".$courseId."' , '$tool', '$reallyNow', $id_session)";
         Database::query($sql);

+ 1 - 1
main/inc/lib/glossary.lib.php

@@ -306,7 +306,7 @@ class GlossaryManager
             $glossary_id
         )."'";
         $result = Database::query($sql);
-        if ($result === false or Database::affected_rows() < 1) {
+        if ($result === false or Database::affected_rows($result) < 1) {
             return false;
         }
         //update item_property (delete)

+ 4 - 4
main/inc/lib/groupmanager.lib.php

@@ -420,9 +420,9 @@ class GroupManager
             "' , '",
             $group_ids
         )."')";
-        Database::query($sql2);
+        $result = Database::query($sql2);
 
-        return Database::affected_rows();
+        return Database::affected_rows($result);
     }
 
     /**
@@ -1477,7 +1477,7 @@ class GroupManager
         $user_id = Database::escape_string($user_id);
 
         $sql = "SELECT tutor_id FROM ".$course_user_table."
-		        WHERE user_id='".$user_id."' AND c_id ='".api_get_course_int_id()."'"."AND tutor_id=1";
+		        WHERE user_id = '".$user_id."' AND c_id ='".api_get_course_int_id()."'"."AND tutor_id=1";
         $db_result = Database::query($sql);
         $result = (Database::num_rows($db_result) > 0);
 
@@ -1967,4 +1967,4 @@ class GroupManager
         }
         $table->display();
     }
-}
+}

+ 4 - 4
main/inc/lib/notebook.lib.php

@@ -70,7 +70,7 @@ class NotebookManager {
             //insert into item_property
             api_item_property_update(api_get_course_info(), TOOL_NOTEBOOK, $id, 'NotebookAdded', api_get_user_id());
         }
-        $affected_rows = Database::affected_rows();
+        $affected_rows = Database::affected_rows($result);
         if (!empty($affected_rows)) {
             return $id;
         }
@@ -127,7 +127,7 @@ class NotebookManager {
 
         //update item_property (update)
         api_item_property_update(api_get_course_info(), TOOL_NOTEBOOK, $values['notebook_id'], 'NotebookUpdated', api_get_user_id());
-        $affected_rows = Database::affected_rows();
+        $affected_rows = Database::affected_rows($result);
         if (!empty($affected_rows)) {
             return true;
         }
@@ -144,7 +144,7 @@ class NotebookManager {
 
         $sql = "DELETE FROM $t_notebook WHERE c_id = $course_id AND notebook_id='" . intval($notebook_id) . "' AND user_id = '" . api_get_user_id() . "'";
         $result = Database::query($sql);
-        $affected_rows = Database::affected_rows();
+        $affected_rows = Database::affected_rows($result);
         if ($affected_rows != 1) {
             return false;
         }
@@ -226,4 +226,4 @@ class NotebookManager {
             echo '</div>';
         }
     }
-}
+}

+ 27 - 27
main/inc/lib/sessionmanager.lib.php

@@ -819,8 +819,8 @@ class SessionManager
                 foreach ($existingUsers as $existing_user) {
                     if (!in_array($existing_user, $user_list)) {
                         $sql = "DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session='$id_session' AND c_id ='$courseId' AND id_user='$existing_user' AND status = 0";
-                        Database::query($sql);
-                        if (Database::affected_rows()) {
+                        $result = Database::query($sql);
+                        if (Database::affected_rows($result)) {
                             $nbr_users--;
                         }
                     }
@@ -834,9 +834,9 @@ class SessionManager
                 if(!in_array($enreg_user, $existingUsers)) {
                     $enreg_user = Database::escape_string($enreg_user);
                     $insert_sql = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user(id_session, c_id, id_user, visibility, status) VALUES('$id_session','$courseId','$enreg_user','$session_visibility', '0')";
-                    Database::query($insert_sql);
+                    $result = Database::query($insert_sql);
 
-                    if(Database::affected_rows()) {
+                    if (Database::affected_rows($result)) {
                         $nbr_users++;
                     }
                 }
@@ -906,8 +906,8 @@ class SessionManager
                 $enreg_user = intval($enreg_user);
                 $insert_sql = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user(id_session, c_id, id_user, visibility)
                                VALUES ('$session_id','$courseId','$enreg_user','$session_visibility')";
-                Database::query($insert_sql);
-                if (Database::affected_rows()) {
+                $result = Database::query($insert_sql);
+                if (Database::affected_rows($result)) {
                     $nbr_users++;
                 }
             //}
@@ -947,8 +947,8 @@ class SessionManager
         }
 
         $delete_sql = "DELETE FROM $tbl_session_rel_user WHERE id_session = '$session_id' AND id_user ='$user_id' AND relation_type<>".SESSION_RELATION_TYPE_RRHH."";
-        Database::query($delete_sql);
-        $return = Database::affected_rows();
+        $result = Database::query($delete_sql);
+        $return = Database::affected_rows($result);
 
         // Update number of users
         $update_sql = "UPDATE $tbl_session SET nbr_users = nbr_users - $return WHERE id='$session_id' ";
@@ -961,9 +961,9 @@ class SessionManager
             foreach($course_list as $course) {
                 $courseId = $course['id'];
                 // Delete user from course
-                Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session='$session_id' AND c_id='$courseId' AND id_user='$user_id'");
+                $result = Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session='$session_id' AND c_id='$courseId' AND id_user='$user_id'");
 
-                if (Database::affected_rows()) {
+                if (Database::affected_rows($result)) {
                     // Update number of users in this relation
                     Database::query("UPDATE $tbl_session_rel_course SET nbr_users=nbr_users - 1 WHERE id_session='$session_id' AND c_id ='$courseId'");
                 }
@@ -990,8 +990,8 @@ class SessionManager
         $courseId = Database::escape_string($courseId);
 
         if (!empty($user_list)) {
-            Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session='$session_id' AND c_id='".$courseId."' AND id_user IN($user_list)");
-            $nbr_affected_rows = Database::affected_rows();
+            $result = Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session='$session_id' AND c_id='".$courseId."' AND id_user IN($user_list)");
+            $nbr_affected_rows = Database::affected_rows($result);
             Database::query("UPDATE $tbl_session_rel_course SET nbr_users=nbr_users-$nbr_affected_rows WHERE id_session='$session_id' AND c_id='".$courseId."'");
         }
     }
@@ -1068,8 +1068,8 @@ class SessionManager
                 foreach ($user_list as $enreg_user) {
                     $enreg_user_id = Database::escape_string($enreg_user['id_user']);
                     $sql_insert = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user (id_session, c_id, id_user) VALUES ('$id_session','$courseId','$enreg_user_id')";
-                    Database::query($sql_insert);
-                    if (Database::affected_rows()) {
+                    $result = Database::query($sql_insert);
+                    if (Database::affected_rows($result)) {
                         $nbr_users++;
                     }
                 }
@@ -1096,11 +1096,11 @@ class SessionManager
         $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
 
         // Unsubscribe course
-        Database::query("DELETE FROM $tbl_session_rel_course WHERE c_id ='$course_id' AND id_session='$session_id'");
-        $nb_affected = Database::affected_rows();
+        $result = Database::query("DELETE FROM $tbl_session_rel_course WHERE c_id ='$course_id' AND id_session='$session_id'");
+        $nb_affected = Database::affected_rows($result);
 
         Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE c_id ='$course_id' AND id_session='$session_id'");
-        if($nb_affected > 0) {
+        if ($nb_affected > 0) {
             // Update number of courses in the session
             Database::query("UPDATE $tbl_session SET nbr_courses= nbr_courses + $nb_affected WHERE id='$session_id' ");
             return true;
@@ -1383,8 +1383,8 @@ class SessionManager
             }
         }
         $sql = "DELETE FROM $tbl_session_category WHERE id IN (".$id_checked.")";
-        $rs = @Database::query($sql);
-        $result = Database::affected_rows();
+        $rs = Database::query($sql);
+        $result = Database::affected_rows($rs);
 
         // Add event to system log
         $user_id = api_get_user_id();
@@ -1546,13 +1546,13 @@ class SessionManager
                     // The user don't be a coach now
                     $sql = "UPDATE $tbl_session_rel_course_rel_user SET status = 0 WHERE id_session = '$session_id' AND c_id = '$courseId' AND id_user = '$user_id' ";
                     $rs_update = Database::query($sql);
-                    if (Database::affected_rows() > 0) return true;
+                    if (Database::affected_rows($rs_update) > 0) return true;
                     else return false;
                 } else {
                     // The user don't be a coach now
                     $sql = "DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session = '$session_id' AND c_id = '$courseId' AND id_user = '$user_id' ";
                     $rs_delete = Database::query($sql);
-                    if (Database::affected_rows() > 0) return true;
+                    if (Database::affected_rows($rs_delete) > 0) return true;
                     else return false;
                 }
 
@@ -1566,12 +1566,12 @@ class SessionManager
                 if (Database::num_rows($rs_check) > 0) {
                     $sql = "UPDATE $tbl_session_rel_course_rel_user SET status = 2 WHERE id_session = '$session_id' AND c_id = '$courseId' AND id_user = '$user_id' ";
                     $rs_update = Database::query($sql);
-                    if (Database::affected_rows() > 0) return true;
+                    if (Database::affected_rows($rs_update) > 0) return true;
                     else return false;
                 } else {
                     $sql = " INSERT INTO $tbl_session_rel_course_rel_user(id_session, c_id, id_user, status) VALUES('$session_id', '$courseId', '$user_id', 2)";
                     $rs_insert = Database::query($sql);
-                    if (Database::affected_rows() > 0) return true;
+                    if (Database::affected_rows($rs_insert) > 0) return true;
                     else return false;
                 }
             }
@@ -1618,8 +1618,8 @@ class SessionManager
             foreach ($sessions_list as $session_id) {
                 $session_id = intval($session_id);
                 $insert_sql = "INSERT IGNORE INTO $tbl_session_rel_user(id_session, id_user, relation_type) VALUES($session_id, $hr_manager_id, '".SESSION_RELATION_TYPE_RRHH."')";
-                Database::query($insert_sql);
-                $affected_rows = Database::affected_rows();
+                $result = Database::query($insert_sql);
+                $affected_rows = Database::affected_rows($result);
             }
         }
         return $affected_rows;
@@ -2355,8 +2355,8 @@ class SessionManager
 
         if (!empty($id_session) && !empty($courseId)) {
 
-            Database::query("DELETE FROM $tbl_session_rel_course WHERE id_session='$id_session' AND c_id = '$courseId'");
-            $nbr_affected_rows=Database::affected_rows();
+            $result = Database::query("DELETE FROM $tbl_session_rel_course WHERE id_session='$id_session' AND c_id = '$courseId'");
+            $nbr_affected_rows = Database::affected_rows($result);
 
             Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session='$id_session' AND c_id = '$courseId'");
             Database::query("UPDATE $tbl_session SET nbr_courses=nbr_courses-$nbr_affected_rows WHERE id='$id_session'");

+ 22 - 22
main/inc/lib/thematic.lib.php

@@ -327,9 +327,9 @@ class Thematic
 			// insert
 			$sql = "INSERT INTO $tbl_thematic (c_id, title, content, active, display_order, session_id)
 					VALUES ($course_id, '$title', '$content', 1, ".(intval($max_thematic_item)+1).", $session_id) ";
-			Database::query($sql);
+			$result = Database::query($sql);
 			$last_id = Database::insert_id();
-			if (Database::affected_rows()) {
+			if (Database::affected_rows($result)) {
 				// save inside item property table
 				$last_id = Database::insert_id();
 				api_item_property_update($course_info, 'thematic', $last_id, "ThematicAdded", $user_id);
@@ -337,9 +337,9 @@ class Thematic
 		} else {
 			// update
 			$sql = "UPDATE $tbl_thematic SET title = '$title', content = '$content', session_id = $session_id WHERE id = $id AND c_id = $course_id";
-			Database::query($sql);
+			$result = Database::query($sql);
 			$last_id = $id;
-			if (Database::affected_rows()) {
+			if (Database::affected_rows($result)) {
 				// save inside item property table
 				api_item_property_update($course_info, 'thematic', $last_id, "ThematicUpdated", $user_id);
 			}
@@ -364,8 +364,8 @@ class Thematic
 			foreach ($thematic_id as $id) {
 				$id	= intval($id);
 				$sql = "UPDATE $tbl_thematic SET active = 0 WHERE c_id = $course_id AND id = $id";
-				Database::query($sql);
-				$affected_rows += Database::affected_rows();
+				$result = Database::query($sql);
+				$affected_rows += Database::affected_rows($result);
 				if (!empty($affected_rows)) {
 					// update row item property table
                      api_item_property_update($course_info, 'thematic', $id,"ThematicDeleted", $user_id);
@@ -375,8 +375,8 @@ class Thematic
 		} else  {
 			$thematic_id	= intval($thematic_id);
 			$sql = "UPDATE $tbl_thematic SET active = 0 WHERE c_id = $course_id AND id = $thematic_id";
-			Database::query($sql);
-			$affected_rows = Database::affected_rows();
+			$result = Database::query($sql);
+			$affected_rows = Database::affected_rows($result);
 			if (!empty($affected_rows)) {
 				// update row item property table
 				//api_item_property_update($_course, TOOL_COURSE_PROGRESS, $thematic_id,"delete", $user_id);
@@ -675,17 +675,17 @@ class Thematic
 			// Insert
 			$sql = "INSERT INTO $tbl_thematic_advance (c_id, thematic_id, attendance_id, content, start_date, duration)
 					VALUES ($course_id, $tematic_id, $attendance_id, '$content', '".api_get_utc_datetime($start_date)."', '$duration') ";
-			Database::query($sql);
+			$result = Database::query($sql);
 			$last_id = Database::insert_id();
-            if (Database::affected_rows()) {
+            if (Database::affected_rows($result)) {
                 api_item_property_update($course_info, 'thematic_advance', $last_id,"ThematicAdvanceAdded", $user_id);
             }
 		} else {
 			// update
 			$sql = "UPDATE $tbl_thematic_advance SET thematic_id = '$tematic_id', attendance_id = '$attendance_id', content = '$content', start_date = '".api_get_utc_datetime($start_date)."', duration = '$duration'
                     WHERE c_id = $course_id AND id = $id ";
-			Database::query($sql);
-            if (Database::affected_rows()) {
+			$result = Database::query($sql);
+            if (Database::affected_rows($result)) {
                 api_item_property_update($course_info, 'thematic_advance', $id, "ThematicAdvanceUpdated", $user_id);
             }
 		}
@@ -709,8 +709,8 @@ class Thematic
         $user_id = api_get_user_id();
 
 		$sql = "DELETE FROM $tbl_thematic_advance WHERE c_id = $course_id AND id = $thematic_advance_id ";
-		Database::query($sql);
-		$affected_rows = Database::affected_rows();
+		$result = Database::query($sql);
+		$affected_rows = Database::affected_rows($result);
         if ($affected_rows) {
             api_item_property_update($_course, 'thematic_advance', $thematic_advance_id,"ThematicAdvanceDeleted", $user_id);
         }
@@ -856,8 +856,8 @@ class Thematic
                         title = '$title',
                         description = '$description'
                     WHERE c_id = $course_id AND id = $thematic_plan_id";
-            Database::query($upd);
-            $affected_rows = Database::affected_rows();
+            $result = Database::query($upd);
+            $affected_rows = Database::affected_rows($result);
             if ($affected_rows) {
                 api_item_property_update($course_info, 'thematic_plan', $thematic_plan_id, "ThematicPlanUpdated", $user_id);
             }
@@ -865,9 +865,9 @@ class Thematic
             // insert
             $ins = "INSERT INTO $tbl_thematic_plan (c_id, thematic_id, title, description, description_type)
                     VALUES ($course_id, $thematic_id, '$title', '$description', $description_type) ";
-            Database::query($ins);
+            $result = Database::query($ins);
             $last_id = Database::insert_id();
-            $affected_rows = Database::affected_rows();
+            $affected_rows = Database::affected_rows($result);
             if ($affected_rows) {
                 api_item_property_update($course_info, 'thematic_plan', $last_id,"ThematicPlanAdded", $user_id);
             }
@@ -898,8 +898,8 @@ class Thematic
 
         // delete
 		$sql = "DELETE FROM $tbl_thematic_plan WHERE c_id = $course_id AND thematic_id = $thematic_id AND description_type = $description_type ";
-		Database::query($sql);
-		$affected_rows = Database::affected_rows();
+		$result = Database::query($sql);
+		$affected_rows = Database::affected_rows($result);
         if ($affected_rows) {
             api_item_property_update($course_info, 'thematic_plan', $thematic_plan_id, "ThematicPlanDeleted", $user_id);
         }
@@ -998,8 +998,8 @@ class Thematic
 
     						// update done thematic for previous advances ((done_advance = 1))
     						$upd = "UPDATE $tbl_thematic_advance SET done_advance = 1 WHERE c_id = $course_id AND id = ".$thematic_advance['id']." ";
-    						Database::query($upd);
-    						$my_affected_rows = Database::affected_rows();
+    						$result = Database::query($upd);
+    						$my_affected_rows = Database::affected_rows($result);
     						$affected_rows += $my_affected_rows;
                             //if ($my_affected_rows) {
                                 api_item_property_update($this->course, 'thematic_advance', $thematic_advance['id'], "ThematicAdvanceDone", $user_id);

+ 4 - 4
main/inc/lib/usermanager.lib.php

@@ -1906,8 +1906,8 @@ class UserManager
             // deleting the answer of the user who has chosen this option
             $sql_delete_option_value = "DELETE FROM $table_field_options_values
                                         WHERE field_id = '".Database::escape_string($fieldid)."' AND field_value = '".Database::escape_string($row['option_value'])."'";
-            Database::query($sql_delete_option_value);
-            $return['deleted_option_values'] = $return['deleted_option_values'] + Database::affected_rows();
+            $result = Database::query($sql_delete_option_value);
+            $return['deleted_option_values'] = $return['deleted_option_values'] + Database::affected_rows($result);
         }
 
         // we now try to find the field options that are newly added
@@ -3792,8 +3792,8 @@ class UserManager
             foreach ($users_id as $user_id) {
                 $user_id = intval($user_id);
                 $insert_sql = "INSERT IGNORE INTO $tbl_user_rel_user(user_id, friend_user_id, relation_type) VALUES('$user_id', $hr_dept_id, '".USER_RELATION_TYPE_RRHH."')";
-                Database::query($insert_sql);
-                $affected_rows = Database::affected_rows();
+                $result = Database::query($insert_sql);
+                $affected_rows = Database::affected_rows($result);
             }
         }
         return $affected_rows;

+ 3 - 4
main/metadata/md_phpdig.php

@@ -104,13 +104,12 @@ function remove_engine_entries($url, $path, $file = '')
 
     while ($row = Database::fetch_array($result))
     {
-        Database::query("DELETE FROM " . PHPDIG_DB_PREFIX .
+        $result = Database::query("DELETE FROM " . PHPDIG_DB_PREFIX .
             "engine WHERE spider_id=" . (int)$row['spider_id']);  // delete all references to keywords
-        $aff .= ' +' . Database::affected_rows();
+        $aff .= ' +' . Database::affected_rows($result);
     }
 
-    Database::query("DELETE FROM " . PHPDIG_DB_PREFIX .
-        "spider WHERE site_id=" . $site_id . $and_path);  // delete page
+    Database::query("DELETE FROM " . PHPDIG_DB_PREFIX ."spider WHERE site_id=" . $site_id . $and_path);  // delete page
 
     echo htmlspecialchars($url . $path . $file, ENT_QUOTES, $charset), ' (site_id ',
         $site_id, '): ', Database::affected_rows(), $aff,

+ 2 - 2
main/mySpace/myspace.lib.php

@@ -1635,8 +1635,8 @@ class MySpace {
 			foreach ($users as $user) {
 				$userid = intval($user['id']);
 				$sql = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user(id_session,c_id,id_user) VALUES('$id_session','$enreg_course','$userid')";
-				Database::query($sql);
-				if (Database::affected_rows()) {
+				$result = Database::query($sql);
+				if (Database::affected_rows($result)) {
 					$nbr_users++;
 				}
 				$new_users[] = $user;

+ 2 - 2
main/newscorm/learnpath.class.php

@@ -4506,9 +4506,9 @@ class learnpath
         if ($this->debug > 2) {
             error_log('New LP - lp updated with new name : '.$this->name, 0);
         }
-        Database::query($sql);
+        $result = Database::query($sql);
         // If the lp is visible on the homepage, change his name there.
-        if (Database::affected_rows()) {
+        if (Database::affected_rows($result)) {
             $session_id = api_get_session_id();
             $session_condition = api_get_session_condition($session_id);
             $tbl_tool = Database :: get_course_table(TABLE_TOOL_LIST);

+ 18 - 22
main/webservices/registration.soap.php

@@ -4370,8 +4370,8 @@ function WSUnsubscribeUserFromCourse($params)
         foreach ($usersList as $user_id) {
             $course_code = Database::escape_string($course_code);
             $sql = "DELETE FROM $table_course_user WHERE user_id = '$user_id' AND course_code = '".$course_code."'";
-            Database::query($sql);
-            $return = Database::affected_rows();
+            $result = Database::query($sql);
+            $return = Database::affected_rows($result);
         }
         $results[] = 1;
         continue;
@@ -4559,8 +4559,8 @@ function WSSuscribeUsersToSession($params)
                 if (!in_array($enreg_user, $existingUsers)) {
                     $enreg_user = Database::escape_string($enreg_user);
                     $insert_sql = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user(id_session, c_id, id_user) VALUES('$id_session','$courseId','$enreg_user')";
-                    Database::query($insert_sql);
-                    if (Database::affected_rows()) {
+                    $result = Database::query($insert_sql);
+                    if (Database::affected_rows($result)) {
                         $nbr_users++;
                     }
                 }
@@ -4585,8 +4585,8 @@ function WSSuscribeUsersToSession($params)
         // update number of users in the session
         $nbr_users = count($usersList);
         $update_sql = "UPDATE $tbl_session SET nbr_users= $nbr_users WHERE id='$id_session' ";
-        Database::query($update_sql);
-        Database::affected_rows();
+        $result = Database::query($update_sql);
+        Database::affected_rows($result);
         $results[] = 1;
         continue;
 
@@ -4774,9 +4774,9 @@ function WSUnsuscribeUsersFromSession($params)
             foreach ($existingUsers as $existing_user) {
                 if (!in_array($existing_user, $usersList)) {
                     $sql = "DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session='$id_session' AND c_id='$courseId' AND id_user='$existing_user'";
-                    Database::query($sql);
+                    $result = Database::query($sql);
 
-                    if (Database::affected_rows()) {
+                    if (Database::affected_rows($result)) {
                         $nbr_users--;
                     }
                 }
@@ -4796,8 +4796,8 @@ function WSUnsuscribeUsersFromSession($params)
             $enreg_user = Database::escape_string($enreg_user);
             $delete_sql = "DELETE FROM $tbl_session_rel_user
                            WHERE id_session = '$id_session' AND id_user ='$enreg_user' AND relation_type<>".SESSION_RELATION_TYPE_RRHH."";
-            Database::query($delete_sql);
-            $return = Database::affected_rows();
+            $result = Database::query($delete_sql);
+            $return = Database::affected_rows($result);
         }
 
         $nbr_users = 0;
@@ -4811,8 +4811,8 @@ function WSUnsuscribeUsersFromSession($params)
 
         // Update number of users in the session.
         $update_sql = "UPDATE $tbl_session SET nbr_users= $nbr_users WHERE id='$id_session' ";
-        Database::query($update_sql);
-        $return = Database::affected_rows();
+        $result = Database::query($update_sql);
+        $return = Database::affected_rows($result);
         $results[] = 1;
         continue;
 
@@ -5088,8 +5088,8 @@ function WSSuscribeCoursesToSession($params)
                 foreach ($user_list as $enreg_user) {
                     $enreg_user_id = Database::escape_string($enreg_user['id_user']);
                     $sql_insert = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user (id_session,c_id,id_user) VALUES ('$id_session','$courseId','$enreg_user_id')";
-                    Database::query($sql_insert);
-                    if (Database::affected_rows()) {
+                    $result = Database::query($sql_insert);
+                    if (Database::affected_rows($result)) {
                         $nbr_users++;
                     }
                 }
@@ -5281,13 +5281,9 @@ function WSUnsuscribeCoursesFromSession($params)
 
         foreach ($course_list as $courseId) {
             $courseId = Database::escape_string($courseId);
-            Database::query(
-                "DELETE FROM $tbl_session_rel_course WHERE c_id = '$courseId' AND id_session='$id_session'"
-            );
-            Database::query(
-                "DELETE FROM $tbl_session_rel_course_rel_user WHERE c_id ='$courseId' AND id_session='$id_session'"
-            );
-            $return = Database::affected_rows();
+            $result = Database::query("DELETE FROM $tbl_session_rel_course WHERE c_id = '$courseId' AND id_session='$id_session'");
+            $result = Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE c_id ='$courseId' AND id_session='$id_session'");
+            $return = Database::affected_rows($result);
         }
 
         $nbr_courses = 0;
@@ -5296,7 +5292,7 @@ function WSUnsuscribeCoursesFromSession($params)
         $row_nbr_courses = Database::fetch_row($res_nbr_courses);
 
         if (Database::num_rows($res_nbr_courses) > 0) {
-            $nbr_users = ($row_nbr_courses[0] - $return);
+            $nbr_users = $row_nbr_courses[0] - $return;
         }
 
         // Update number of users in the session.