Browse Source

Feature #5397 - Replacing mysql_num_rows() with Database::num_rows().

Ivan Tcholakov 15 years ago
parent
commit
6e016fb743
37 changed files with 61 additions and 61 deletions
  1. 2 2
      main/admin/course_information.php
  2. 1 1
      main/admin/resume_session.php
  3. 1 1
      main/course_home/activity.php
  4. 1 1
      main/course_info/infocours.php
  5. 1 1
      main/dropbox/dropbox_download.php
  6. 1 1
      main/dropbox/dropbox_submit.php
  7. 1 1
      main/exercice/exercise.class.php
  8. 1 1
      main/exercice/mark_free_answer.php
  9. 1 1
      main/forum/forumfunction.inc.php
  10. 3 3
      main/inc/lib/classmanager.lib.php
  11. 2 2
      main/inc/lib/database.lib.php
  12. 1 1
      main/inc/lib/fileDisplay.lib.php
  13. 1 1
      main/inc/lib/fileManage.lib.php
  14. 1 1
      main/inc/lib/fileUpload.lib.php
  15. 1 1
      main/inc/lib/formvalidator/Rule/UsernameAvailable.php
  16. 1 1
      main/inc/local.inc.php
  17. 1 1
      main/metadata/importdocs.php
  18. 2 2
      main/metadata/importlinks.php
  19. 3 3
      main/metadata/importmanifest.php
  20. 2 2
      main/metadata/md_phpdig.php
  21. 1 1
      main/metadata/statistics.php
  22. 1 1
      main/metadata/update_indexabletext.php
  23. 7 7
      main/newscorm/learnpath_functions.inc.php
  24. 1 1
      main/newscorm/resourcelinker.inc.php
  25. 1 1
      main/newscorm/resourcelinker.php
  26. 1 1
      main/newscorm/scorm_admin.php
  27. 1 1
      main/resourcelinker/resourcelinker.inc.php
  28. 3 3
      main/resourcelinker/resourcelinker.php
  29. 3 3
      main/survey/survey.download.inc.php
  30. 1 1
      main/tracking/courseLogCSV.php
  31. 1 1
      main/tracking/userLog.php
  32. 1 1
      main/tracking/userlogCSV.php
  33. 1 1
      main/user/class.php
  34. 1 1
      main/user/subscribe_class.php
  35. 1 1
      main/user/user_add.php
  36. 7 7
      main/wiki/index.php
  37. 1 1
      main/wiki/wiki.inc.php

+ 2 - 2
main/admin/course_information.php

@@ -104,7 +104,7 @@ $table_user = Database :: get_main_table(TABLE_MAIN_USER);
 $sql = "SELECT *,cu.status as course_status FROM $table_course_user cu, $table_user u WHERE cu.user_id = u.user_id AND cu.course_code = '".$code."'";
 $res = Database::query($sql,__FILE__,__LINE__);
 $is_western_name_order = api_is_western_name_order();
-if (mysql_num_rows($res) > 0)
+if (Database::num_rows($res) > 0)
 {
 	$users = array ();
 	while ($obj = Database::fetch_object($res))
@@ -157,7 +157,7 @@ $table_course_class = Database :: get_main_table(TABLE_MAIN_COURSE_CLASS);
 $table_class = Database :: get_main_table(TABLE_MAIN_CLASS);
 $sql = "SELECT * FROM $table_course_class cc, $table_class c WHERE cc.class_id = c.id AND cc.course_code = '".$code."'";
 $res = Database::query($sql,__FILE__,__LINE__);
-if (mysql_num_rows($res) > 0)
+if (Database::num_rows($res) > 0)
 {
 	$data = array ();
 	while ($class = Database::fetch_object($res))

+ 1 - 1
main/admin/resume_session.php

@@ -57,7 +57,7 @@ if(!api_is_platform_admin() && $session['session_admin_id']!=$_user['user_id'])
 $sql = 'SELECT name FROM  '.$tbl_session_category.' WHERE id = "'.intval($session['session_category_id']).'"';
 $rs = Database::query($sql, __FILE__, __LINE__);
 $session_category = '';
-if(mysql_num_rows($rs)>0) {
+if(Database::num_rows($rs)>0) {
 	$rows_session_category = Database::store_result($rs);
 	$rows_session_category = $rows_session_category[0];
 	$session_category = $rows_session_category['name'];

+ 1 - 1
main/course_home/activity.php

@@ -528,7 +528,7 @@ function show_session_data($id_session) {
 	$sql_category = 'SELECT name FROM '.$session_category_table.' WHERE id = "'.intval($session['session_category_id']).'"';
 	$rs_category = Database::query($sql_category, __FILE__, __LINE__);
 	$session_category = '';
-	if (mysql_num_rows($rs_category) > 0) {
+	if (Database::num_rows($rs_category) > 0) {
 		$rows_session_category = Database::store_result($rs_category);
 		$rows_session_category = $rows_session_category[0];
 		$session_category = $rows_session_category['name'];

+ 1 - 1
main/course_info/infocours.php

@@ -117,7 +117,7 @@ $s_sql_course_titular="SELECT DISTINCT username, lastname, firstname FROM $tbl_u
 $q_result_titulars=Database::query($s_sql_course_titular, __FILE__, __LINE__);
 
 $target_name = api_sort_by_first_name() ? 'firstname' : 'lastname';
-if(mysql_num_rows($q_result_titulars)==0){
+if(Database::num_rows($q_result_titulars)==0){
 	$sql="SELECT username, lastname, firstname FROM $tbl_user as user, $tbl_admin as admin WHERE admin.user_id=user.user_id ORDER BY ".$target_name." ASC";
 	$q_result_titulars=Database::query($sql, __FILE__, __LINE__);
 }

+ 1 - 1
main/dropbox/dropbox_download.php

@@ -99,7 +99,7 @@ $allowed_to_download=false;
 // Check if the user has sent or received the file.
 $sql="SELECT * FROM ".$dropbox_cnf["tbl_person"]." WHERE file_id='".Database::escape_string($_GET['id'])."' AND user_id='".Database::escape_string($_user['user_id'])."'";
 $result=Database::query($sql);
-if (mysql_num_rows($result)>0)
+if (Database::num_rows($result)>0)
 {
 	$allowed_to_download=true;
 }

+ 1 - 1
main/dropbox/dropbox_submit.php

@@ -484,7 +484,7 @@ if ( isset( $_GET['mailingIndex']))  // examine or send
 					AND u.user_id NOT IN ('" . implode("', '" , $students) . "')";
 	        $result = Database::query($sql,__FILE__,__LINE__);
 
-	        if ( mysql_num_rows($result) > 0)
+	        if ( Database::num_rows($result) > 0)
 	        {
 		        $remainingUsers = '';
 		        while ( ($res = Database::fetch_array($result)))

+ 1 - 1
main/exercice/exercise.class.php

@@ -399,7 +399,7 @@ class Exercise
             ." WHERE path='".str_replace($documentPath,'',$audioPath).'/'.$this->sound."'";
 				$result=Database::query($query,__FILE__,__LINE__);
 
-				if(!mysql_num_rows($result))
+				if(!Database::num_rows($result))
 				{
         /*$query="INSERT INTO $TBL_DOCUMENT(path,filetype) VALUES "
             ." ('".str_replace($documentPath,'',$audioPath).'/'.$this->sound."','file')";

+ 1 - 1
main/exercice/mark_free_answer.php

@@ -138,7 +138,7 @@ if($action == 'mark'){
 				ORDER BY exe_date DESC";
 			#echo $sql;
 			$res = Database::query($sql,__FILE__,__LINE__);
-			if(mysql_num_rows($res)>0){
+			if(Database::num_rows($res)>0){
 				$row = Database::fetch_array($res);
 				//@todo Check that just summing past score and the new free answer mark doesn't come up
 				// with a score higher than the possible score for that exercise

+ 1 - 1
main/forum/forumfunction.inc.php

@@ -3614,7 +3614,7 @@ function set_notification($content,$id, $add_only = false) {
 	// first we check if the notification is already set for this
 	$sql = "SELECT * FROM $table_notification WHERE $database_field = '".Database::escape_string($id)."' AND user_id = '".Database::escape_string($_user['user_id'])."'";
 	$result=Database::query($sql, __FILE__, __LINE__);
-	$total = mysql_num_rows($result);
+	$total = Database::num_rows($result);
 
 	// if the user did not indicate that (s)he wanted to be notified already then we store the notification request (to prevent double notification requests)
 	if ($total <= 0) {

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

@@ -79,7 +79,7 @@ class ClassManager
 		$table_class = Database :: get_main_table(TABLE_MAIN_CLASS);
 		$sql = "SELECT * FROM $table_class WHERE name='".Database::escape_string($name)."'";
 		$res = Database::query($sql, __FILE__, __LINE__);
-		return mysql_num_rows($res) != 0;
+		return Database::num_rows($res) != 0;
 	}
 	/**
 	 * Delete a class
@@ -153,7 +153,7 @@ class ClassManager
 				$course_codes[] = $course['course_code'];
 				$sql = "SELECT DISTINCT user_id FROM $table_class_user t1, $table_course_class t2 WHERE t1.class_id=t2.class_id AND course_code = '".$course['course_code']."' AND user_id = $user_id AND t2.class_id<>'$class_id'";
 				$res = Database::query($sql, __FILE__, __LINE__);
-				if (mysql_num_rows($res) == 0 && CourseManager :: get_user_in_course_status($user_id, $course['course_code']) == STUDENT)
+				if (Database::num_rows($res) == 0 && CourseManager :: get_user_in_course_status($user_id, $course['course_code']) == STUDENT)
 				{
 					CourseManager :: unsubscribe_user($user_id, $course['course_code']);
 				}
@@ -216,7 +216,7 @@ class ClassManager
 		{
 			$sql = "SELECT * FROM $tbl_class_user WHERE class_id = '".Database::escape_string($class_id)."' AND user_id = '".Database::escape_string($single_class_user->user_id)."'";
 			$res = Database::query($sql, __FILE__, __LINE__);
-			if (mysql_num_rows($res) > 0)
+			if (Database::num_rows($res) > 0)
 			{
 				if (CourseManager :: get_user_in_course_status($single_class_user->user_id, $course_code) == STUDENT)
 				{

+ 2 - 2
main/inc/lib/database.lib.php

@@ -693,7 +693,7 @@ class Database {
 	 * @author Yannick Warnier <yannick.warnier@dokeos.com>
 	 **/
 	public static function num_rows($res) {
-		return mysql_num_rows($res);
+		return Database::num_rows($res);
 	}
 
 	public static function get_course_chat_connected_table($database_name = '') {
@@ -709,7 +709,7 @@ class Database {
 	 * @result	mixed		One cell of the result, or FALSE on error
 	 */
 	public static function result($resource, $row, $field = '') {
-		return mysql_num_rows($resource) > 0 ? (!empty($field) ? mysql_result($resource, $row, $field) : mysql_result($resource, $row)) : null;
+		return Database::num_rows($resource) > 0 ? (!empty($field) ? mysql_result($resource, $row, $field) : mysql_result($resource, $row)) : null;
 	}
 
 	/**

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

@@ -280,7 +280,7 @@ EOQ;
 
 	$result = Database::query($sql,__FILE__,__LINE__);
 
-	if($result && mysql_num_rows($result) != 0)
+	if($result && Database::num_rows($result) != 0)
 	{
 		$row = Database::fetch_row($result);
 		return $row[0] == null ? 0 : $row[0];

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

@@ -61,7 +61,7 @@ function update_db_info($action, $oldPath, $newPath="")
 
         $result = Database::query("SELECT id FROM $dbTable " . $to_delete);
 
-        if (mysql_num_rows($result))
+        if (Database::num_rows($result))
         {
             require_once(api_get_path(INCLUDE_PATH) . "../metadata/md_funcs.php");
             $mdStore = new mdstore(TRUE);  // create if needed

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

@@ -571,7 +571,7 @@ function documents_total_space($to_group_id='0')
 
 	$result = Database::query($sql,__FILE__,__LINE__);
 
-	if($result && mysql_num_rows($result)!=0)
+	if($result && Database::num_rows($result)!=0)
 	{
 		$row = Database::fetch_row($result);
 

+ 1 - 1
main/inc/lib/formvalidator/Rule/UsernameAvailable.php

@@ -43,7 +43,7 @@ class HTML_QuickForm_Rule_UsernameAvailable extends HTML_QuickForm_Rule
 			$sql .= " AND username != '$current_username'";
 		}
 		$res = Database::query($sql,__FILE__,__LINE__);
-		$number = mysql_num_rows($res);
+		$number = Database::num_rows($res);
 		return $number == 0;
 	}
 }

+ 1 - 1
main/inc/local.inc.php

@@ -394,7 +394,7 @@ if (api_get_setting('allow_terms_conditions')=='true') {
 
     	    }
         } else {
-        	// login failed, mysql_num_rows($result) <= 0
+        	// login failed, Database::num_rows($result) <= 0
             $loginFailed = true;  // Default initialisation. It could
                                   // change after the external authentication
 

+ 1 - 1
main/metadata/importdocs.php

@@ -61,7 +61,7 @@ if (isset($dmo))  // for future use
 }
 
 $result = $mdStore->mds_get_many('eid,indexabletext', OF_EID_TYPE);
-echo get_lang('Tool'), ': ', mysql_num_rows($result), "<br><br>\n";
+echo get_lang('Tool'), ': ', Database::num_rows($result), "<br><br>\n";
 
 $idt = array(); $cidpar = '?cidReq=' . $_course['sysCode'];
 

+ 2 - 2
main/metadata/importlinks.php

@@ -88,7 +88,7 @@ function get_cat($catname)
     $linkcat_table = Database::get_course_table(TABLE_LINK_CATEGORY);
     $result = Database::query("SELECT id FROM $linkcat_table WHERE " . $cateq, __FILE__, __LINE__);
 
-    if (mysql_num_rows($result) >= 1 && ($row = Database::fetch_array($result)))
+    if (Database::num_rows($result) >= 1 && ($row = Database::fetch_array($result)))
         return $row['id'];  // several categories with same name: take first
 
     return FALSE;
@@ -277,7 +277,7 @@ elseif ($slo == get_lang('Index'))
 echo '<h3>', get_lang('Statistics'), '</h3>', "\n";
 
 $result = $mdStore->mds_get_many('eid,mdxmltext', OF_EID_TYPE);
-echo get_lang('TotalMDEs'), mysql_num_rows($result), "\n";
+echo get_lang('TotalMDEs'), Database::num_rows($result), "\n";
 
 while ($row = Database::fetch_array($result))
 {

+ 3 - 3
main/metadata/importmanifest.php

@@ -63,7 +63,7 @@ if (isset($workWith))  // explicit in URL, or selected at bottom of screen
     $sql = "SELECT id FROM $scormdocument WHERE path='". Database::escape_string(api_substr($workWith,1)) . "' OR path='". Database::escape_string(substr($workWith,1)) . "/.'";
     $result = Database::query($sql, __FILE__, __LINE__);
 
-    if (mysql_num_rows($result) == 1)
+    if (Database::num_rows($result) == 1)
     {
         if (($row = Database::fetch_array($result)))
         {
@@ -458,7 +458,7 @@ elseif ($smo == get_lang('Index'))
 echo '<h3>', get_lang('Statistics'), '</h3>', "\n";
 
 $result = $mdStore->mds_get_many('eid', "eid LIKE '" . EID_TYPE . ".%'");
-echo get_lang('TotalMDEs'), mysql_num_rows($result), "\n";
+echo get_lang('TotalMDEs'), Database::num_rows($result), "\n";
 
 while ($row = Database::fetch_array($result))
 {
@@ -541,7 +541,7 @@ if ($mfContents)
             {
                 $result = $mdStore->mds_get_many('eid', "eid LIKE '" .
                     EID_TYPE . "." . $sdi . "." . $ns . "\_%'");
-                $nns = mysql_num_rows($result);
+                $nns = Database::num_rows($result);
                 echo $ns, $nns ? '_ ' . $nns : '', '; ';
             }
             echo '<br>';

+ 2 - 2
main/metadata/md_phpdig.php

@@ -76,7 +76,7 @@ function find_site($url)
     $result = Database::query("SELECT site_id FROM " . PHPDIG_DB_PREFIX .
         "sites WHERE " . $site_url, __FILE__, __LINE__);  // find site
 
-    if (mysql_num_rows($result) == 1)
+    if (Database::num_rows($result) == 1)
     {
         $row = Database::fetch_array($result); return (int) $row['site_id'];
     }
@@ -147,7 +147,7 @@ function index_words($site_id, $path, $file, $first_words, $keywords)
             "keywords WHERE keyword = '" . addslashes($key) . "'",
             __FILE__, __LINE__);
 
-        if (mysql_num_rows($result) == 0)
+        if (Database::num_rows($result) == 0)
         {
             Database::query("INSERT INTO " . PHPDIG_DB_PREFIX .
                 "keywords (keyword,twoletters) VALUES ('" . addslashes($key) .

+ 1 - 1
main/metadata/statistics.php

@@ -80,7 +80,7 @@ while (($kwline = fgets($myFile)))
 fclose($myFile);
 
 $result = $mdStore->mds_get_many('eid,mdxmltext', '1 = 1');
-echo get_lang('TotalMDEs'), mysql_num_rows($result), "<br>\n";
+echo get_lang('TotalMDEs'), Database::num_rows($result), "<br>\n";
 
 echo count($kwds), ' ', get_lang('CourseKwds'), '<br>', "\n";
 

+ 1 - 1
main/metadata/update_indexabletext.php

@@ -54,7 +54,7 @@ Display::display_header($nameTools);
 echo '<h3>', htmlspecialchars(EID_TYPE, ENT_QUOTES, $charset), '</h3>', "\n";
 
 $result = $mdStore->mds_get_many('eid,mdxmltext', "eid LIKE '" . EID_TYPE . ".%'");
-echo get_lang('TotalMDEs'), $total = mysql_num_rows($result), "<br><br>\n";
+echo get_lang('TotalMDEs'), $total = Database::num_rows($result), "<br><br>\n";
 
 if ($total > 100) set_time_limit((int) ($total / 10));
 

+ 7 - 7
main/newscorm/learnpath_functions.inc.php

@@ -57,7 +57,7 @@ function deleteitem($id)
 	//get the display order for this item before it is deleted
 	$sql = "SELECT display_order, parent_item_id FROM $tbl_lp_item WHERE id=$id";
 	$result = Database::query($sql, __FILE__, __LINE__);
-	if (mysql_num_rows($result) == 0)
+	if (Database::num_rows($result) == 0)
 	{
 		return false;
 	}
@@ -110,7 +110,7 @@ function deletemodule($parent_item_id)
 	//get this chapter's display order
 	$sql = "SELECT display_order, parent_item_id FROM $tbl_learnpath_chapter WHERE id=$parent_item_id and lp_id=$learnpath_id";
 	$result = Database::query($sql, __FILE__, __LINE__);
-	if (mysql_num_rows($result) == 0)
+	if (Database::num_rows($result) == 0)
 	{
 		return false;
 	}
@@ -440,7 +440,7 @@ function display_learnpath_chapters($parent_item_id = 0, $tree = array (), $leve
 		$tree = get_learnpath_tree($learnpath_id);
 
 		$num_modules = count($tree);
-		//$num_modules=mysql_num_rows($result);
+		//$num_modules=Database::num_rows($result);
 		if ($num_modules == 0)
 		{
 			// do not diplay useless information
@@ -656,7 +656,7 @@ function display_all_learnpath()
 	$sql = "SELECT * FROM  $tbl_learnpath_main  ORDER BY learnpath_name";
 	$result = Database::query($sql, __FILE__, __LINE__);
 	$i = 1;
-	$num_modules = mysql_num_rows($result);
+	$num_modules = Database::num_rows($result);
 
 	while ($row = Database::fetch_array($result))
 	{
@@ -1336,7 +1336,7 @@ function is_empty($id)
 
 	$sql = "SELECT * FROM $tbl_learnpath_chapter WHERE lp_id=$id ORDER BY display_order ASC";
 	$result = Database::query($sql, __FILE__, __LINE__);
-	$num_modules = mysql_num_rows($result);
+	$num_modules = Database::num_rows($result);
 	$empty = true;
 
 	if ($num_modules != 0)
@@ -1348,7 +1348,7 @@ function is_empty($id)
 			$parent_item_id = $row['id'];
 			$sql2 = "SELECT * FROM $tbl_learnpath_item WHERE (parent_item_id=$parent_item_id) ORDER BY display_order ASC";
 			$result2 = Database::query($sql2, __FILE__, __LINE__);
-			$num_items = mysql_num_rows($result2);
+			$num_items = Database::num_rows($result2);
 			if ($num_items > 0)
 			{
 				$empty = false;
@@ -1816,7 +1816,7 @@ function exportitem($id, $item_id, $item_type, $add_scorm_communications = false
 			$result = Database::query("SELECT id, title, content FROM ".$tbl_course_description." ORDER BY id", __FILE__, __LINE__);
 
 			//2 Check this element
-			if (mysql_num_rows($result))
+			if (Database::num_rows($result))
 			{
 				//2.a This course has one (or more) description in the database
 				$expcontent .= "<hr noshade=\"noshade\" size=\"1\" />";

+ 1 - 1
main/newscorm/resourcelinker.inc.php

@@ -1514,7 +1514,7 @@ function check_added_resources($type, $id)
 	$TABLERESOURCE 		= $_course['dbNameGlu']."resource";
 	$sql="SELECT * FROM `$TABLERESOURCE` WHERE source_type='$type' and source_id='$id'";
 	$result=Database::query($sql,__FILE__,__LINE__);
-	$number_added=mysql_num_rows($result);
+	$number_added=Database::num_rows($result);
 	if ($number_added<>0)
 		return true;
 	else

+ 1 - 1
main/newscorm/resourcelinker.php

@@ -944,7 +944,7 @@ if ($content == "Link")
 	// showing the links that are in the root (having no category)
 	$sql = "SELECT * FROM ".$link_table.", ".$item_property_table." WHERE (category_id=0 or category_id IS NULL) AND tool = '".TOOL_LINK."' AND id=ref AND visibility='1'";
 	$result = Database::query($sql, __FILE__, __LINE__);
-	if (mysql_num_rows($result) > 0)
+	if (Database::num_rows($result) > 0)
 	{
 		echo "<table width=\"100%\"><tr><td bgcolor=\"#E6E6E6\"><i>".get_lang('NoCategory')."</i></td></tr></table>";
 		while ($myrow = Database::fetch_array($result))

+ 1 - 1
main/newscorm/scorm_admin.php

@@ -134,7 +134,7 @@ switch($action){
 			$sql="SELECT * FROM $tbl_tool where (name='$name' and image='scormbuilder.gif')";
 			$result=Database::query($sql,__FILE__,__LINE__);
 			$row2=Database::fetch_array($result);
-			$num=mysql_num_rows($result);
+			$num=Database::num_rows($result);
 			if (($set_visibility == 'i') && ($num>0))
 			{
 				//it is visible or hidden but once was published

+ 1 - 1
main/resourcelinker/resourcelinker.inc.php

@@ -1487,7 +1487,7 @@ function check_added_resources($type, $id)
 	$TABLERESOURCE 		= $_course['dbNameGlu']."resource";
 	$sql="SELECT * FROM `$TABLERESOURCE` WHERE source_type='$type' and source_id='$id'";
 	$result=Database::query($sql,__FILE__,__LINE__);
-	$number_added=mysql_num_rows($result);
+	$number_added=Database::num_rows($result);
 	if ($number_added<>0)
 		return true;
 	else

+ 3 - 3
main/resourcelinker/resourcelinker.php

@@ -210,7 +210,7 @@ if ($add)
 		//calculating the last order of the items of this chapter
 		$sql = "SELECT MAX(display_order) FROM $tbl_learnpath_item WHERE chapter_id=$chapter_id";
 		$result = Database::query($sql, __FILE__, __LINE__);
-		if(mysql_num_rows($result)==0){
+		if(Database::num_rows($result)==0){
 			$lastorder_item = 0;
 		}else{
 			$row = Database::fetch_array($result);
@@ -218,7 +218,7 @@ if ($add)
 		}
 		$sql = "SELECT MAX(display_order) FROM $tbl_learnpath_chapter WHERE parent_chapter_id=$chapter_id";
 		$result = Database::query($sql, __FILE__, __LINE__);
-		if(mysql_num_rows($result)==0){
+		if(Database::num_rows($result)==0){
 			$lastorder_chapter = 0;
 		}else{
 			$row = Database::fetch_array($result);
@@ -846,7 +846,7 @@ if ($content == "Link")
 	// showing the links that are in the root (having no category)
 	$sql = "SELECT * FROM ".$link_table.", ".$item_property_table." WHERE (category_id=0 or category_id IS NULL) AND tool = '".TOOL_LINK."' AND id=ref AND visibility='1'";
 	$result = Database::query($sql, __FILE__, __LINE__);
-	if (mysql_num_rows($result) > 0)
+	if (Database::num_rows($result) > 0)
 	{
 		echo "<table width=\"100%\"><tr><td bgcolor=\"#E6E6E6\"><i>".get_lang('NoCategory')."</i></td></tr></table>";
 		while ($myrow = Database::fetch_array($result))

+ 3 - 3
main/survey/survey.download.inc.php

@@ -47,7 +47,7 @@ function check_download_survey($course, $invitation, $doc_url) {
 	// now we check if the invitationcode is valid
 	$sql = "SELECT * FROM $table_survey_invitation WHERE invitation_code = '".Database::escape_string($invitation)."'";
 	$result = Database::query($sql, __FILE__, __LINE__);
-	if (mysql_num_rows($result) < 1)
+	if (Database::num_rows($result) < 1)
 	{
 		Display :: display_error_message(get_lang('WrongInvitationCode'), false);
 		Display :: display_footer();
@@ -73,7 +73,7 @@ function check_download_survey($course, $invitation, $doc_url) {
 	// If this is the case there will be a language choice
 	$sql = "SELECT * FROM $table_survey WHERE code='".Database::escape_string($survey_invitation['survey_code'])."'";
 	$result = Database::query($sql, __FILE__, __LINE__);
-	if (mysql_num_rows($result) > 1)
+	if (Database::num_rows($result) > 1)
 	{
 		if ($_POST['language'])
 		{
@@ -117,7 +117,7 @@ function check_download_survey($course, $invitation, $doc_url) {
 								)";
 	$result = Database::query($sql, __FILE__, __LINE__);
 
-	if (mysql_num_rows($result) == 0)
+	if (Database::num_rows($result) == 0)
 	{
 		Display :: display_error_message(get_lang('WrongInvitationCode'), false);
 		Display :: display_footer();

+ 1 - 1
main/tracking/courseLogCSV.php

@@ -453,7 +453,7 @@ if($is_allowedToTrack && $_configuration['tracking_enabled'])
 		            //error_log($sql2,0);
 					$result2=Database::query($sql2,__FILE__,__LINE__);
 
-					if(mysql_num_rows($result2)>0){
+					if(Database::num_rows($result2)>0){
 
 
 					    $ar2=Database::fetch_array($result2);

+ 1 - 1
main/tracking/userLog.php

@@ -148,7 +148,7 @@ if(api_get_setting('use_session_mode') == "true") {
 			WHERE id_session='".$_SESSION['id_session']."' AND course_code='$_cid'";
 	//echo $sql;
 	$result=Database::query($sql,__FILE__,__LINE__);
-	if(!mysql_num_rows($result)){
+	if(!Database::num_rows($result)){
 		$disabled = true;
 	}
 }

+ 1 - 1
main/tracking/userlogCSV.php

@@ -139,7 +139,7 @@ if(api_get_setting('use_session_mode') == "true") {
 			WHERE id_session='".$_SESSION['id_session']."' AND course_code='$_cid'";
 	//echo $sql;
 	$result=Database::query($sql,__FILE__,__LINE__);
-	if(!mysql_num_rows($result)){
+	if(!Database::num_rows($result)){
 		$disabled = true;
 	}
 }

+ 1 - 1
main/user/class.php

@@ -121,7 +121,7 @@ function get_number_of_classes()
 		$sql .= " AND (c.name LIKE '%".$keyword."%')";
 	}
 	$res = Database::query($sql, __FILE__, __LINE__);
-	$result = mysql_num_rows($res);
+	$result = Database::num_rows($res);
 	return $result;
 }
 /**

+ 1 - 1
main/user/subscribe_class.php

@@ -133,7 +133,7 @@ function get_number_of_classes()
 		$sql .= " AND c.id NOT IN ('".implode("','",$subscribed_classes)."')";
 	}
 	$res = Database::query($sql, __FILE__, __LINE__);
-	$result = mysql_num_rows($res);
+	$result = Database::num_rows($res);
 	return $result;
 }
 /**

+ 1 - 1
main/user/user_add.php

@@ -98,7 +98,7 @@ if($register)
 		                     WHERE username='$username_form' OR (lastname='$lastname_form' AND firstname='$firstname_form' AND email='$email_form')
 		                     ORDER BY userExists DESC, loginExists DESC");
 
-		if(mysql_num_rows($result))
+		if(Database::num_rows($result))
 		{
 			while($user=Database::fetch_array($result))
 			{

+ 7 - 7
main/wiki/index.php

@@ -586,7 +586,7 @@ if ($_GET['action']=='mactiveusers')
 	$allpages=Database::query($sql,__FILE__,__LINE__);
 
 	//show table
-	if (mysql_num_rows($allpages) > 0)
+	if (Database::num_rows($allpages) > 0)
 	{
 		$row = array ();
 		while ($obj = Database::fetch_object($allpages))
@@ -629,7 +629,7 @@ if ($_GET['action']=='usercontrib')
 	$allpages=Database::query($sql,__FILE__,__LINE__);
 
 	//show table
-	if (mysql_num_rows($allpages) > 0)
+	if (Database::num_rows($allpages) > 0)
 	{
 		$row = array ();
 		while ($obj = Database::fetch_object($allpages))
@@ -716,7 +716,7 @@ if ($_GET['action']=='mostchanged')
 	$allpages=Database::query($sql,__FILE__,__LINE__);
 
 	//show table
-	if (mysql_num_rows($allpages) > 0)
+	if (Database::num_rows($allpages) > 0)
 	{
 		$row = array ();
 		while ($obj = Database::fetch_object($allpages))
@@ -770,7 +770,7 @@ if ($_GET['action']=='mvisited')
 	$allpages=Database::query($sql,__FILE__,__LINE__);
 
 	//show table
-	if (mysql_num_rows($allpages) > 0)
+	if (Database::num_rows($allpages) > 0)
 	{
 		$row = array ();
 		while ($obj = Database::fetch_object($allpages))
@@ -1123,7 +1123,7 @@ if ($_GET['action']=='links')
 		$allpages=Database::query($sql,__LINE__,__FILE__);
 
 		//show table
-		if (mysql_num_rows($allpages) > 0)
+		if (Database::num_rows($allpages) > 0)
 		{
 			$row = array ();
 			while ($obj = Database::fetch_object($allpages))
@@ -1925,7 +1925,7 @@ if ($_GET['action']=='recentchanges')
 	$allpages=Database::query($sql,__LINE__,__FILE__);
 
 	//show table
-	if (mysql_num_rows($allpages) > 0)
+	if (Database::num_rows($allpages) > 0)
 	{
 		$row = array ();
 		while ($obj = Database::fetch_object($allpages))
@@ -2015,7 +2015,7 @@ if ($_GET['action']=='allpages')
 	$allpages=Database::query($sql,__LINE__,__FILE__);
 
 	//show table
-	if (mysql_num_rows($allpages) > 0)
+	if (Database::num_rows($allpages) > 0)
 	{
 		$row = array ();
 		while ($obj = Database::fetch_object($allpages))

+ 1 - 1
main/wiki/wiki.inc.php

@@ -1972,7 +1972,7 @@ function display_wiki_search_results($search_term, $search_content=0)
 	$result=Database::query($sql,__LINE__,__FILE__);
 
 	//show table
-	if (mysql_num_rows($result) > 0)
+	if (Database::num_rows($result) > 0)
 	{
 		$row = array ();
 		while ($obj = Database::fetch_object($result))