From 9d4e6e6253b9ff0f3028809aee3697533a6e7a63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= <juancarlos@innovasoc.com>
Date: Wed, 5 Aug 2009 15:22:34 +0200
Subject: [PATCH 1/2] wiki online task: display task icons in: allpages,
 recentchanges. Change background icons to transparent. Add fckeditor to
 description. Fix main page edition

---
 main/img/wiki/assignment.gif | Bin 1047 -> 13695 bytes
 main/img/wiki/works.gif      | Bin 1035 -> 14096 bytes
 main/wiki/index.php          | 136 +++++++++++++++++++++++++++++------
 main/wiki/wiki.inc.php       |   9 +--
 4 files changed, 118 insertions(+), 27 deletions(-)

diff --git a/main/img/wiki/assignment.gif b/main/img/wiki/assignment.gif
index fa5dbbbca35e08f110cf79dc2248ff7438787ce9..f35c2a49730cd625c98b8e09240a23983cd7fde5 100644
GIT binary patch
literal 13695
zcmeI3Yg~+39LFalqGTmnx2FlYG|jEsjG2-WMM&9l_cZfVvo#kplbO<DOObM2Az^DH
z<dSUbl1f%3p;C%U=pwm9N_3fN_L)lIh5eit-ks+&pPBQV`To!4dwy@vJSRtM2C7HU
zBh(WJO6B`jWk;Jr^|3>#XsyLx6isFIEgkJm&&ofj3R}7qZ*D(mR4MAyyXr5g8sdvy
zDjznyZK$hitSeL0TxhMzQ$3A6|E9CKDogn|;cC6=Syj2B;y}R@W&5M()<+5X<((xJ
z&x#+uOndUWvm~mh>_cj~s=0V~V_{NZab;0S$@_wsrh<sf`)&IxRSBiami*Am1)nnR
zHI>}CRgst0l)E86rzGum&CBfI#w`Eixr$dA;V-W3jm%e`&aN)ZOgx`)f8X`aO*x9x
zs|DFt4u;)O?Mr{NJ@aF5R`tVk8!x9EOGtiHdd6q}#Zoj~CAicUd7(P$T#G!V{qCu?
zCla#`oxHg@siG*(DK&1}%H*!KNga1%=mD{HaR)=U#-uHdQ^xL1IT#(0xJS6)sAA`?
z#MDS;c;wlD$jb|My|vn0J3F|tX89V|z~mhwTUYTJy0pww5MSi#QS0Qq42!>I=aw^T
z&J!B#2F)nJV(wdHY|a$DdQE~#r6PQOj8wxsU6vpYs1(J2S+;T!%JIXbh!^I=6R?Tz
zu3aZ0JT9B)Vc|k?5!qwDy!k<5%q?h<J15AG!{8EaZM0c(rkpS0V^S26^Zf-9rkqVg
zxk4|DiMQ3=WFpdyNd4GEJM|xkdQN+x7(>j>s3Z=BZjP8+n$fIi3@b}h#0`}q&Zq#P
zSs^qE1^=Qk=~nm$>3xVc+IWj4=6W-iIym;uiNCRlzEY`(NhZr=GBX+7OepptQyB~f
znL;DeXe68<Ndg5@R8A5|jC%(8JdOh<;fQ%6DNiUs)Z?OF!T>3oNK{YM_w;TK74=Od
zkeGFE)QltKljW$0Of{pB`$onKS$HSYUW}nqq1at0^tb8Rz9UbJ$%JA*31aU?XQ?Z{
zg8FCeugCBs!fez&NE9lGV(yMxp;DN1>WVMwd!TR1U4&eoci`u828m*=E~i>B&8bW}
zrMLVGsJEO&R*U#TOt*FQp1$e-KVe)>pD$5>*uVQ&xEwO(kMS{qRDwIBe(j9QVR{S2
zd{k<~<D)(p*@x%NBKLQGcYQsp#$$oUlH8Ze&r9z+${*6`_x?kM?->+M0wfpeg1UeV
z0KqU_P#2H^AQ+|#>H;zV1jBSeT|fqaV3;nb3&;Qv4ATX50T}>-VY;9$AOk=!Oc&Gz
zWB>?;>4Lg|3;@9}T~HU00U#Kr3+e(g00hHyL0v!wfMA#|s0+vd5De1=bpaUwf?>L#
zE+7LyFiaQJ1!MpShUtR3fD8b^FkMg=kO3eVrVHu<G5`dBH(lEOH$5-`e!WA6-{a6w
zbtx5{9qnzOKDK^nX@1}I?rr0n*RNhSyr_R(S6fs4?CF!L$CVZ3j~<qlJ}4=^UsPCd
z@9v%a+j+NgbFy##dn4<5W=8t8w5wMxU-~EY?~5rHlFy$zdnW1hsgsE(jwk#TANS|6
zqeo&7#~eC%AbS5F`}XeHy=!Mw<c^5#+rq=PhKBsUW%H)rf;R>Q%4Hh@q!RIZkx;<*
z_xqLS>*I}aIbP_xwQE+dTDfAmr^heL+})PCE?K<DW#Iy6r}^_7=Q`NWv72pc!)6hf
z3~MV(3v)V+N+Fw(OlQuRKFwt6l*z_KBV^LV3FF88Y&dp|!D#(aKaJEIp{p}|nD)>i
zT7xwQ4IH3BAQ-g|($FFV6HL{&W7HRv2wH_(f<r<^vskm7%tIr$P9qQo>oRPkLWa!T
zJ!qKzh=ug%(US%z=olJWct(#k(bd&AoH&u;6+Oz@z+n7%6Uxff(E}YAlTAz+EBP~`
z^<16ZJUlRTl~vRP>XhL&vLF{SLYp0`$s}oMXsi#=8lXABWqJr=H&t)wNI$WWw((TQ
zWg#o(2cmOs>M%BhubN$4yM2ruHT6S7b%^sZ_PRCt)0^v}kdeMehKw8#raN(_aoBMx
l-8bSeb@`Dz>AvT8Vj1HM%B^d2b;en;tM}|hrs)x8{RjA5jyM1S

literal 1047
zcmeH`|7#Ox9LG;hH|y3}tA)`8>1M(H&{f6hI?P60&dx%M1%q=EMgn1O@izPtLLEn`
z*;!_HW?hWiEJvvI!7m}m2oI$k4`E!-GQvY(<v3V4@<VnO2@l8Uo<%4hWbOaq`?vQm
zZ+N}n{mJmq!28j5p<Q?`2(-f&m~snKB3cGkR;&hui(uv@%Vw}j6rHI_5vm%^Cr}Mo
zlWWrw84^i_vocc3fbx{DsI1|R%yMLd_<6z6HE24r4vOI*-5p6{oWo{X<aG)j;Z@@5
zF?3XPS6!#>(i+G=n_5!M+Q98Bwp~~UDT%@<la;kt2}~RC0twxRYzf2($1TaY%(Wtg
zI^s>vY@96vUt_Ytl@ef`geEYZ4S?sk{e5oDNj&DTIm_{^#43v8L0I3Q%R+-f4Pg(Q
zb76IZqG&P?Lf;gqL7>S(Nep%DdSKN!T?0ACoVWxpxRfzzmB;eH3^`i_z7Fy-C>!3k
z`bN?WO@~nhERQ=?1`QKxS!Y4QHPCV@IU|u3&MHW$0IVp?V<R~z*nkX1GXb;zJ)#%f
zj{?j{NGW1nPJ|zWH6MUlLC#TBbjSiFB{LjHS`~OjlMGOe4PC@7sWBa_I?y`c3WqfZ
z)>-IV44&z(GHz?wW?IqWO^^+M%?hldQp1E7K&v3Uj3D%FO4$5@upNX`t$~(%rV==u
zkQNVKjLe?CHKBDa9Zz3>r8m;<jQ8w((tWw(zwSLxqf5JH28MsiM9P^DN5|T&@woVC
z?~RT_XX~k%x9+qZc=qez_>Gp6=heY+A-GRH^p)?=zy4MxTgBJ9zV<)ddh_PCcZAm8
zcCQBaU+cOMnf_N9_6ePS`S_FXejM!E_D|sI%<|Y=&x5^Z*RPz2wE0ngXK(ixWBU#s
z0P<P%(^Tg5iH4j{_4qn>1}A5>kR`R#|L)-1(WUyX^c(XrG;n=x6rGIkaXz^F{l`5!
t-t@QJS?qmvDtLQt@b0B&LqglRBk5@9%iX_>o>-jxqa*mk?~}r@{{bC#*?j;2

diff --git a/main/img/wiki/works.gif b/main/img/wiki/works.gif
index 398fa545a705089d7a05a43d9c3aaa77e6343a6c..b9915bf57f1390a207dbb47d791df2154d355563 100644
GIT binary patch
literal 14096
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
Wt%lgP5P{iNMTOJ%&DWVD3;qS_62F%K

literal 1035
zcmeH`|4S2b7{{k*X<x6BRE+RTrG!7E34QSkqSLfSsEmFRQP>X>M`;YH7^3skA;Tb!
z(s2mt`6W3-$0;$6QR7%Oj)T^?XdFYvhb7~~i1oo>JV@ss(0|bL;{y-x*Ykq+z0UUA
zw+1K^W%^?>nfrK~7bKq`#{puTxGTCxEGP}US4J`2GK-PVhBeV00-`cv2rMHaBxTV<
zW0fOmjFLE#1a}a4l_*g{kMP!2AQ^B3fW&2PiNzsa)SzJskra-^jGzb(+CgJ^4Isg@
zUIHp(9@Q031JO8?B(xvs*Ro|)A_u?+uww~B1}g~yF+mAR{EQVP5b`_pDCP{LFe`-t
zk_x1CJq<#bI6@$6fKvoAV0|LcyP)sVijnJ=Id8<`Aw(0|uyN>?RAL<w<qevsoSp<W
zNcb>BG~DZyZ5zM@3_MBRWF?J65+DXK4l#lTybmcG20sS}*tTmJ<0YTO&CoavD2{Q!
z&K`+!iz<PXBzvq_6>t*qDkxFt-87siVic@S2~sE$2OM%hLJ&6<-N)HCK@RBRjM?!<
zrkxV&BfXFL$U*~exb^CGKUha4lma*;mIWYD$@)@)FavP`QVJaCa0p5q^b{~b5TXE4
z4ka-1GdN|u2B!b>4+GUl`=c(H@_w0W@@2++-gWm;Q@;1+R@t?xuADwk>lb&)^jyZW
zHQw$jyfhYbd|dxIy;6EkTEDa1;#`~RXprAA%ROrsdMx|Te+=cE&8~d--t~Jex8y`o
zZuMeaP<CEC=Ar1%=C<+c_WgoP*F^W^RQu{+ad{<GR%7e14b`@kuDA7H9v-at{%yH<
zbg-0i9q)E!4b<(t7+x82)lbd#duppr&Nq%dwT0?Fe3~rEztOlC-fJm1W%g2K&(<Cs
zZ<^n!8vDA~`nIcZt9QQ#b(ZsUMcXd6^0d4Cel|^IHE%R`Ts_l0e`VrTMP6qeqKYU}
F{a?lJ)<^&V

diff --git a/main/wiki/index.php b/main/wiki/index.php
index 93bdc73eec..825b5bcc57 100644
--- a/main/wiki/index.php
+++ b/main/wiki/index.php
@@ -823,7 +823,10 @@ if ($_GET['action']=='wanted')
 	}
 	
 	//get name refs in last pages and make a unique list
-	$sql='SELECT  *  FROM   '.$tbl_wiki.' s1 WHERE id=(SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2 WHERE s1.reflink = s2.reflink AND '.$groupfilter.')';
+	//$sql='SELECT  *  FROM   '.$tbl_wiki.' s1 WHERE id=(SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2 WHERE s1.reflink = s2.reflink AND '.$groupfilter.')'; //old version TODO:¿ delete ?
+	
+	$sql='SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.' WHERE visibility=1 AND '.$tbl_wiki_conf.'.page_id='.$tbl_wiki.'.page_id AND '.$tbl_wiki.'.'.$groupfilter; // new version
+	
 	$allpages=api_sql_query($sql,__FILE__,__LINE__);	
 	while ($row=Database::fetch_array($allpages))
 	{	
@@ -872,11 +875,14 @@ if ($_GET['action']=='orphaned')
 	}
 	
 	//get name refs in last pages and make a unique list	
-	$sql='SELECT  *  FROM   '.$tbl_wiki.' s1 WHERE id=(SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2 WHERE s1.reflink = s2.reflink AND '.$groupfilter.')';
+	//$sql='SELECT  *  FROM   '.$tbl_wiki.' s1 WHERE id=(SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2 WHERE s1.reflink = s2.reflink AND '.$groupfilter.')'; //old version TODO:¿ delete ?
+	
+	$sql='SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.' WHERE '.$tbl_wiki_conf.'.page_id='.$tbl_wiki.'.page_id AND '.$tbl_wiki.'.'.$groupfilter.' '; // new version
+
 	$allpages=api_sql_query($sql,__FILE__,__LINE__);	
 	while ($row=Database::fetch_array($allpages))
 	{			
-		//$row['linksto']= str_replace("\n".$row["reflink"]."\n", "\n", $row["linksto"]); //remove self reference. TODO check
+		//$row['linksto']= str_replace("\n".$row["reflink"]."\n", "\n", $row["linksto"]); //remove self reference. TODO: check
 		$rf = explode(" ", trim($row["linksto"]));	//fix replace explode("\n", trim($row["linksto"])) with  explode(" ", trim($row["linksto"]))	    
 		
 		$refs = array_merge($refs, $rf);
@@ -1099,11 +1105,17 @@ if ($_GET['action']=='links')
 		
 		if(api_is_allowed_to_edit() || api_is_platform_admin()) //only by professors if page is hidden
 		{				
-			$sql="SELECT * FROM ".$tbl_wiki." s1 WHERE linksto LIKE '%".html_entity_decode(Database::escape_string(stripslashes(urldecode($page))))." %' AND id=(SELECT MAX(s2.id) FROM ".$tbl_wiki." s2 WHERE s1.reflink = s2.reflink AND ".$groupfilter.")"; //add blank space after like '%" " %' to identify each word. 						
+			//$sql="SELECT * FROM ".$tbl_wiki." s1 WHERE linksto LIKE '%".html_entity_decode(Database::escape_string(stripslashes(urldecode($page))))." %' AND id=(SELECT MAX(s2.id) FROM ".$tbl_wiki." s2 WHERE s1.reflink = s2.reflink AND ".$groupfilter.")"; //add blank space after like '%" " %' to identify each word. //Old version TODO:¿delete?
+			
+			$sql="SELECT * FROM ".$tbl_wiki.", ".$tbl_wiki_conf." WHERE linksto LIKE '%".html_entity_decode(Database::escape_string(stripslashes(urldecode($page))))." %' AND ".$tbl_wiki_conf.".page_id=".$tbl_wiki.".page_id AND ".$tbl_wiki.".".$groupfilter.""; //add blank space after like '%" " %' to identify each word. // new version			
+			
 		}
 		else
 		{	
-			$sql="SELECT * FROM ".$tbl_wiki." s1 WHERE visibility=1 AND linksto LIKE '%".html_entity_decode(Database::escape_string(stripslashes(urldecode($page))))." %' AND id=(SELECT MAX(s2.id) FROM ".$tbl_wiki." s2 WHERE s1.reflink = s2.reflink AND ".$groupfilter.")"; //add blank space after like '%" " %' to identify each word		
+			//$sql="SELECT * FROM ".$tbl_wiki." s1 WHERE visibility=1 AND linksto LIKE '%".html_entity_decode(Database::escape_string(stripslashes(urldecode($page))))." %' AND id=(SELECT MAX(s2.id) FROM ".$tbl_wiki." s2 WHERE s1.reflink = s2.reflink AND ".$groupfilter.")"; //add blank space after like '%" " %' to identify each word //old version TODO:¿delete?
+			
+			$sql="SELECT * FROM ".$tbl_wiki.", ".$tbl_wiki_conf." WHERE visibility=1 AND linksto LIKE '%".html_entity_decode(Database::escape_string(stripslashes(urldecode($page))))." %' AND ".$tbl_wiki_conf.".page_id=".$tbl_wiki.".page_id AND ".$tbl_wiki.".".$groupfilter.""; //add blank space after like '%" " %' to identify each word // new version			
+			
 		}		
 
 		$allpages=api_sql_query($sql,__LINE__,__FILE__);	
@@ -1362,14 +1374,60 @@ if ($_GET['action']=='edit')
 				////
 				if (!empty($row['task']))
 				{
+					//previous change 0 by text
+					if ($row['startdate_assig']=='0000-00-00 00:00:00')
+					{
+						$message_task_startdate=get_lang('No');
+					}
+					else
+					{
+						$message_task_startdate=$row['startdate_assig'];
+					}
+					
+					if ($row['enddate_assig']=='0000-00-00 00:00:00')
+					{
+						$message_task_enddate=get_lang('No');
+					}
+					else
+					{
+						$message_task_endate=$row['enddate_assig'];
+					}					
+					
+					if ($row['delayedsubmit']==0)
+					{
+						$message_task_delayedsubmit=get_lang('No');
+					}
+					else
+					{
+						$message_task_delayedsubmit=get_lang('Yes');
+					}
+					if ($row['max_version']==0)
+					{
+						$message_task_max_version=get_lang('No');
+					}
+					else
+					{
+						$message_task_max_version=$row['max_version'];
+					}
+					if ($row['max_text']==0)
+					{
+						$message_task_max_text=get_lang('No');
+					}
+					else
+					{
+						$message_task_max_text=$row['max_text'];
+					}
+					
+					//comp message
 					$message_task='<b>'.get_lang('DescriptionOfTheTask').'</b><p>'.$row['task'].'</p><hr>';
-					$message_task.='<p>'.get_lang('StartDate').': '.$row['startdate_assig'].'</p>';
-					$message_task.='<p>'.get_lang('EndDate').': '.$row['enddate_assig'];
-					$message_task.=' ('.get_lang('AllowLaterSends').') '.$row['delayedsubmit'].'</p>';
-					$message_task.='<p>'.get_lang('OtherRequirements').': '.get_lang('NMaxVersion').': '.$row['max_version'];
-					$message_task.=' '.get_lang('NMaxWords').': '.$row['max_text'];
+					$message_task.='<p>'.get_lang('StartDate').': '.$message_task_startdate.'</p>';
+					$message_task.='<p>'.get_lang('EndDate').': '.$message_task_enddate;
+					$message_task.=' ('.get_lang('AllowLaterSends').') '.$message_task_delayedsubmit.'</p>';
+					$message_task.='<p>'.get_lang('OtherRequirements').': '.get_lang('NMaxVersion').': '.$message_task_max_version;
+					$message_task.=' '.get_lang('NMaxWords').': '.$message_task_max_text;
 					
-					Display::display_normal_message($message_task);				
+					//display message
+					echo '<div class="normal-message">'.$message_task.'</div>';
 				}
 				
 				if($row['progress']==$row['fprogress1'] && !empty($row['fprogress1']))
@@ -1413,10 +1471,10 @@ if ($_GET['action']=='edit')
 				//form
 				echo '<form name="form1" method="post" action="'.api_get_self().'?action=showpage&amp;title='.$page.'&group_id='.Security::remove_XSS($_GET['group_id']).'">';
 				echo '<div id="wikititle">';
-				echo $icon_assignment.'&nbsp;&nbsp;&nbsp;'.$title;				
+				echo $icon_assignment.'&nbsp;&nbsp;&nbsp;'.$title;		
 				//
 				
-				if((api_is_allowed_to_edit() || api_is_platform_admin()) && $_SESSION['_gid']!=0)
+				if((api_is_allowed_to_edit() || api_is_platform_admin()) && $row['reflink']!='index')
 				{
 
 					echo'<a href="javascript://" onclick="advanced_parameters()" ><span id="plus_minus" style="float:right">&nbsp;'.Display::return_icon('div_show.gif',get_lang('Show')).'&nbsp;'.get_lang('AdvancedParameters').'</span></a>';
@@ -1428,12 +1486,13 @@ if ($_GET['action']=='edit')
 					echo '&nbsp;&nbsp;&nbsp;<span id="msg_error4" style="display:none;color:red"></span>';
 					echo '<div id="option4" style="padding:4px; margin:5px; border:1px dotted; display:none;">';				
 
-					echo '<table border="0" style="font-weight:normal" align="center">';
+					echo '<table border="0" style="font-weight:normal">';
 					echo '<tr>';
 					echo '<td>'.get_lang('DescriptionOfTheTask').'</td>';
 					echo '</tr>';
-					echo '<tr>';					
-					echo '<td><textarea name="task" cols="60" rows="4" >'.stripslashes($row['task']).'</textarea></td>';
+					echo '<tr>';
+					//echo '<td><textarea name="task" cols="60" rows="4" >'.stripslashes($row['task']).'</textarea></td>';	// TODO: ¿delete?				
+					echo '<td>'.api_disp_html_area('task', stripslashes($row['task']), '', '', null, array('ToolbarSet' => 'project_comment', 'Width' => '600', 'Height' => '200')).'</td>'; //TODO:create a new tolbarset
 					echo '</tr>';
 					echo '</table>';
 					echo '</div>';
@@ -1835,11 +1894,16 @@ if ($_GET['action']=='recentchanges')
 	
 	if(api_is_allowed_to_edit() || api_is_platform_admin()) //only by professors if page is hidden
 	{	
-		$sql='SELECT * FROM '.$tbl_wiki.' WHERE '.$groupfilter.' ORDER BY dtime DESC';		
+		//$sql='SELECT * FROM '.$tbl_wiki.' WHERE '.$groupfilter.' ORDER BY dtime DESC'; // old version TODO:¿delete?
+		
+		$sql='SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.' WHERE '.$tbl_wiki_conf.'.page_id='.$tbl_wiki.'.page_id AND '.$tbl_wiki.'.'.$groupfilter.' ORDER BY dtime DESC'; // new version		
+		
 	}
 	else
 	{	
-		$sql='SELECT * FROM '.$tbl_wiki.' WHERE '.$groupfilter.' AND visibility=1 ORDER BY dtime DESC';					
+		//$sql='SELECT * FROM '.$tbl_wiki.' WHERE '.$groupfilter.' AND visibility=1 ORDER BY dtime DESC';	// old version TODO:¿delete?
+		
+		$sql='SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.' WHERE '.$tbl_wiki_conf.'.page_id='.$tbl_wiki.'.page_id AND visibility=1 AND '.$tbl_wiki.'.'.$groupfilter.' ORDER BY dtime DESC'; // new version
 	}		
 
 	$allpages=api_sql_query($sql,__LINE__,__FILE__);
@@ -1875,9 +1939,20 @@ if ($_GET['action']=='recentchanges')
 				$ShowAssignment='<img src="../img/wiki/trans.gif" />';			
 			}		
 		
+			//get icon task	
+			if (!empty($obj->task))
+			{
+				$icon_task='<img src="../img/wiki/task.gif" title="'.get_lang('TaskExtra').'" alt="'.get_lang('TaskExtra').'" />';
+			}
+			else
+			{
+				$icon_task='<img src="../img/wiki/trans.gif" />';
+			}
+		
+		
 			$row = array ();
 			$row[] = $year.'-'.$month.'-'.$day.' '.$hours.':'.$minutes.":".$seconds;	
-			$row[] = $ShowAssignment;
+			$row[] = $ShowAssignment.$icon_task;
 			$row[] = '<a href="'.api_get_self().'?cidReq='.$_course[id].'&action=showpage&title='.urlencode($obj->reflink).'&amp;view='.$obj->id.'&group_id='.Security::remove_XSS($_GET['group_id']).'">'.$obj->title.'</a>';
 			$row[] = $obj->version>1 ? get_lang('EditedBy') : get_lang('AddedBy');	
 			$row[] = $obj->user_id <>0 ? '<a href="../user/userInfo.php?uInfo='.$userinfo['user_id'].'">'.$userinfo['lastname'].', '.$userinfo['firstname'].'</a>' : get_lang('Anonymous').' ('.$obj->user_ip.')';
@@ -1909,11 +1984,16 @@ if ($_GET['action']=='allpages')
 
 	if(api_is_allowed_to_edit() || api_is_platform_admin()) //only by professors if page is hidden
 	{	
-		$sql='SELECT  *  FROM   '.$tbl_wiki.' s1 WHERE id=(SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2 WHERE s1.reflink = s2.reflink AND '.$groupfilter.')'; // warning don't use group by reflink because don't return the last version
+		//$sql='SELECT  *  FROM  '.$tbl_wiki.' s1 WHERE id=(SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2 WHERE s1.reflink = s2.reflink AND '.$groupfilter.')'; // warning don't use group by reflink because don't return the last version// old version TODO:¿ delete ?
+		
+		$sql='SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.' WHERE '.$tbl_wiki_conf.'.page_id='.$tbl_wiki.'.page_id AND '.$tbl_wiki.'.'.$groupfilter.' GROUP BY '.$tbl_wiki.'.page_id'; // new version
 	}
 	else
 	{	
-		$sql='SELECT  *  FROM   '.$tbl_wiki.' s1 WHERE visibility=1 AND id=(SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2 WHERE s1.reflink = s2.reflink AND '.$groupfilter.')'; // warning don't use group by reflink because don't return the last version				
+		//$sql='SELECT  *  FROM   '.$tbl_wiki.' s1 WHERE visibility=1 AND id=(SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2 WHERE s1.reflink = s2.reflink AND '.$groupfilter.')'; // warning don't use group by reflink because don't return the last version	// old version TODO:¿ delete ?
+		
+		$sql='SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.' WHERE visibility=1 AND '.$tbl_wiki_conf.'.page_id='.$tbl_wiki.'.page_id AND '.$tbl_wiki.'.'.$groupfilter.' GROUP BY '.$tbl_wiki.'.page_id'; // new version
+		
 	}		
 
 	$allpages=api_sql_query($sql,__LINE__,__FILE__);	
@@ -1947,10 +2027,20 @@ if ($_GET['action']=='allpages')
 			elseif ($obj->assignment==0)
 			{	
 				$ShowAssignment='<img src="../img/wiki/trans.gif" />';			
-			}		
+			}
+			
+			//get icon task	
+			if (!empty($obj->task))
+			{
+				$icon_task='<img src="../img/wiki/task.gif" title="'.get_lang('TaskExtra').'" alt="'.get_lang('TaskExtra').'" />';
+			}
+			else
+			{
+				$icon_task='<img src="../img/wiki/trans.gif" />';
+			}
 		
 			$row = array ();
-			$row[] =$ShowAssignment;
+			$row[] =$ShowAssignment.$icon_task;
 			$row[] = '<a href="'.api_get_self().'?cidReq='.$_course[id].'&action=showpage&title='.urlencode(Security::remove_XSS($obj->reflink)).'&group_id='.Security::remove_XSS($_GET['group_id']).'">'.Security::remove_XSS($obj->title).'</a>';
 			$row[] = $obj->user_id <>0 ? '<a href="../user/userInfo.php?uInfo='.$userinfo['user_id'].'">'.$userinfo['lastname'].', '.$userinfo['firstname'].'</a>' : get_lang('Anonymous').' ('.$obj->user_ip.')';
 			$row[] = $year.'-'.$month.'-'.$day.' '.$hours.":".$minutes.":".$seconds;
diff --git a/main/wiki/wiki.inc.php b/main/wiki/wiki.inc.php
index a9d6d92e7b..143ab56ad8 100644
--- a/main/wiki/wiki.inc.php
+++ b/main/wiki/wiki.inc.php
@@ -317,7 +317,7 @@ function save_wiki() {
 			
 	if(!empty($_POST['task']))
 	{
-		$_clean['task']=Database::escape_string(Security::remove_XSS($_POST['task']));
+		$_clean['task']= Database::escape_string(Security::remove_XSS(stripslashes(api_html_entity_decode($_POST['task'])),COURSEMANAGERLOWSECURITY));
 	}
 	if(!empty($_POST['feedback1']) || !empty($_POST['feedback2']) || !empty($_POST['feedback3']))
 	{
@@ -493,7 +493,7 @@ function save_new_wiki() {
 	$_clean['linksto'] = links_to($_clean['content']);	//check wikilinks
 	
 	//cleaning config variables
-	$_clean['task']=Database::escape_string(Security::remove_XSS($_POST['task']));
+	$_clean['task']= Database::escape_string(Security::remove_XSS(stripslashes(api_html_entity_decode($_POST['task'])),COURSEMANAGERLOWSECURITY));
 	$_clean['feedback1']=Database::escape_string(Security::remove_XSS($_POST['feedback1']));	
 	$_clean['feedback2']=Database::escape_string(Security::remove_XSS($_POST['feedback2']));
 	$_clean['feedback3']=Database::escape_string(Security::remove_XSS($_POST['feedback3']));
@@ -596,12 +596,13 @@ return true;
 		echo '&nbsp;&nbsp;&nbsp;<span id="msg_error4" style="display:none;color:red"></span>';
 		echo '<div id="option4" style="padding:4px; margin:5px; border:1px dotted; display:none;">';
 		
-		echo '<table border="0" style="font-weight:normal" align="center">';
+		echo '<table border="0" style="font-weight:normal">';
 		echo '<tr>';
 		echo '<td>'.get_lang('DescriptionOfTheTask').'</td>';
 		echo '</tr>';
 		echo '<tr>';
-		echo '<td><textarea name="task" cols="60" rows="4" >'.stripslashes($row['task']).'</textarea></td>';
+		//echo '<td><textarea name="task" cols="60" rows="4" >'.stripslashes($row['task']).'</textarea></td>';	// TODO: ¿delete?				
+		echo '<td>'.api_disp_html_area('task', stripslashes($row['task']), '', '', null, array('ToolbarSet' => 'project_comment', 'Width' => '600', 'Height' => '200')).'</td>'; //TODO:create a new tolbarset
 		echo '</tr>';
 		echo '</table>';
 		echo '</div>';

From 35a50d607999a78361fa4b5a7385e4c7d8bc7cff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= <juancarlos@innovasoc.com>
Date: Wed, 5 Aug 2009 19:21:17 +0200
Subject: [PATCH 2/2] fix coding conventions

---
 main/wiki/index.php    | 153 ++++++++++++++++++++---------------------
 main/wiki/wiki.inc.php | 112 +++++++++++++++---------------
 2 files changed, 132 insertions(+), 133 deletions(-)

diff --git a/main/wiki/index.php b/main/wiki/index.php
index 825b5bcc57..6a3a2f4955 100644
--- a/main/wiki/index.php
+++ b/main/wiki/index.php
@@ -51,14 +51,14 @@ $this_section=SECTION_COURSES;
 
 // including additional library scripts
 
-require_once (api_get_path(LIBRARY_PATH).'course.lib.php');
-require_once (api_get_path(LIBRARY_PATH).'groupmanager.lib.php');
-require_once (api_get_path(LIBRARY_PATH).'text.lib.php');
-require_once (api_get_path(LIBRARY_PATH).'security.lib.php'); 
-require_once (api_get_path(INCLUDE_PATH).'lib/mail.lib.inc.php');
-require_once (api_get_path(INCLUDE_PATH).'conf/mail.conf.php');
-require_once (api_get_path(LIBRARY_PATH).'sortabletable.class.php');
-require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');
+require_once api_get_path(LIBRARY_PATH).'course.lib.php';
+require_once api_get_path(LIBRARY_PATH).'groupmanager.lib.php';
+require_once api_get_path(LIBRARY_PATH).'text.lib.php';
+require_once api_get_path(LIBRARY_PATH).'security.lib.php'; 
+require_once api_get_path(INCLUDE_PATH).'lib/mail.lib.inc.php';
+require_once api_get_path(INCLUDE_PATH).'conf/mail.conf.php';
+require_once api_get_path(LIBRARY_PATH).'sortabletable.class.php';
+require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
 require_once 'wiki.inc.php';
 
 // additional style information
@@ -191,7 +191,7 @@ Display::display_introduction_section(TOOL_WIKI);
 
 //release of blocked pages to prevent concurrent editions
 $sql='SELECT * FROM '.$tbl_wiki.'WHERE is_editing!="0"';
-$result=api_sql_query($sql,__LINE__,__FILE__);
+$result=Database::query($sql,__LINE__,__FILE__);
 while ($is_editing_block=Database::fetch_array($result))
 {
 	$max_edit_time=1200; // 20 minutes
@@ -211,7 +211,7 @@ while ($is_editing_block=Database::fetch_array($result))
 	if ($time_editing>$max_edit_time || ($is_editing_block['is_editing']==$_user['user_id'] && $_GET['action']!='edit'))
 	{
 		$sql='UPDATE '.$tbl_wiki.' SET is_editing="0", time_edit="0000-00-00 00:00:00" WHERE is_editing="'.$is_editing_block['is_editing'].'"';
-		api_sql_query($sql,__FILE__,__LINE__);
+		Database::query($sql,__FILE__,__LINE__);
 	}	
 	
 }
@@ -276,11 +276,11 @@ if (isset($_POST['SaveWikiNew']))
 if ($_GET['view'])
 {
 	$sql='SELECT * FROM '.$tbl_wiki.'WHERE id="'.Database::escape_string($_GET['view']).'"'; //current view
-		$result=api_sql_query($sql,__LINE__,__FILE__);
+		$result=Database::query($sql,__LINE__,__FILE__);
 		$current_row=Database::fetch_array($result);
 	
 	$sql='SELECT * FROM '.$tbl_wiki.'WHERE reflink="'.html_entity_decode(Database::escape_string(stripslashes(urldecode($page)))).'" AND '.$groupfilter.' ORDER BY id DESC'; //last version
-		$result=api_sql_query($sql,__LINE__,__FILE__);
+		$result=Database::query($sql,__LINE__,__FILE__);
 		$last_row=Database::fetch_array($result);
 		
 	if ($_GET['view']<$last_row['id'])
@@ -534,43 +534,43 @@ if ($_GET['action']=='more')
 		
 	
 	//Submenu Most linked pages
-	//echo '<li><a href="index.php?cidReq='.$_course[id].'&action=mostlinked&group_id='.$_clean['group_id'].'">'.get_lang('MostLinkedPages').'</a></li>';//TODO
+	//echo '<li><a href="index.php?cidReq='.$_course[id].'&action=mostlinked&group_id='.$_clean['group_id'].'">'.get_lang('MostLinkedPages').'</a></li>';//TODO:
 	
 	//Submenu Dead end pages
-	//echo '<li><a href="index.php?cidReq='.$_course[id].'&action=deadend&group_id='.$_clean['group_id'].'">'.get_lang('DeadEndPages').'</a></li>';//TODO	
+	//echo '<li><a href="index.php?cidReq='.$_course[id].'&action=deadend&group_id='.$_clean['group_id'].'">'.get_lang('DeadEndPages').'</a></li>';//TODO:	
 	
 	//Submenu Most new pages (not versions)
-	//echo '<li><a href="index.php?cidReq='.$_course[id].'&action=mnew&group_id='.$_clean['group_id'].'">'.get_lang('MostNewPages').'</a></li>';//TODO
+	//echo '<li><a href="index.php?cidReq='.$_course[id].'&action=mnew&group_id='.$_clean['group_id'].'">'.get_lang('MostNewPages').'</a></li>';//TODO:
 	
 	//Submenu Most long pages
-	//echo '<li><a href="index.php?cidReq='.$_course[id].'&action=mnew&group_id='.$_clean['group_id'].'">'.get_lang('MostLongPages').'</a></li>';//TODO
+	//echo '<li><a href="index.php?cidReq='.$_course[id].'&action=mnew&group_id='.$_clean['group_id'].'">'.get_lang('MostLongPages').'</a></li>';//TODO:
 	
 	//Submenu Protected pages
-	//echo '<li><a href="index.php?cidReq='.$_course[id].'&action=protected&group_id='.$_clean['group_id'].'">'.get_lang('ProtectedPages').'</a></li>';//TODO
+	//echo '<li><a href="index.php?cidReq='.$_course[id].'&action=protected&group_id='.$_clean['group_id'].'">'.get_lang('ProtectedPages').'</a></li>';//TODO:
 	
 	//Submenu Hidden pages
-	//echo '<li><a href="index.php?cidReq='.$_course[id].'&action=hidden&group_id='.$_clean['group_id'].'">'.get_lang('HiddenPages').'</a></li>';//TODO	
+	//echo '<li><a href="index.php?cidReq='.$_course[id].'&action=hidden&group_id='.$_clean['group_id'].'">'.get_lang('HiddenPages').'</a></li>';//TODO:	
 	
 	//Submenu Most discuss pages
-	//echo '<li><a href="index.php?cidReq='.$_course[id].'&action=mdiscuss&group_id='.$_clean['group_id'].'">'.get_lang('MostDiscussPages').'</a></li>';//TODO	
+	//echo '<li><a href="index.php?cidReq='.$_course[id].'&action=mdiscuss&group_id='.$_clean['group_id'].'">'.get_lang('MostDiscussPages').'</a></li>';//TODO:	
 	
 	//Submenu Best scored pages
-	//echo '<li><a href="index.php?cidReq='.$_course[id].'&action=mscored&group_id='.$_clean['group_id'].'">'.get_lang('BestScoredPages').'</a></li>';//TODO	
+	//echo '<li><a href="index.php?cidReq='.$_course[id].'&action=mscored&group_id='.$_clean['group_id'].'">'.get_lang('BestScoredPages').'</a></li>';//TODO:	
 	
 	//Submenu Pages with more progress
-	//echo '<li><a href="index.php?cidReq='.$_course[id].'&action=mprogress&group_id='.$_clean['group_id'].'">'.get_lang('MProgressPages').'</a></li>';//TODO	
+	//echo '<li><a href="index.php?cidReq='.$_course[id].'&action=mprogress&group_id='.$_clean['group_id'].'">'.get_lang('MProgressPages').'</a></li>';//TODO:	
 		
 	//Submenu Most active users in discuss
-	//echo '<li><a href="index.php?cidReq='.$_course[id].'&action=mactiveusers&group_id='.$_clean['group_id'].'">'.get_lang('MostDiscussUsers').'</a></li>';//TODO
+	//echo '<li><a href="index.php?cidReq='.$_course[id].'&action=mactiveusers&group_id='.$_clean['group_id'].'">'.get_lang('MostDiscussUsers').'</a></li>';//TODO:
 	
 	//Submenu Individual assignments
-	//echo '<li><a href="index.php?cidReq='.$_course[id].'&action=assignments&group_id='.$_clean['group_id'].'">'.get_lang('Assignments').'</a></li>';//TODO
+	//echo '<li><a href="index.php?cidReq='.$_course[id].'&action=assignments&group_id='.$_clean['group_id'].'">'.get_lang('Assignments').'</a></li>';//TODO:
 	
 	//Submenu Delayed assignments
-	//echo '<li><a href="index.php?cidReq='.$_course[id].'&action=delayed&group_id='.$_clean['group_id'].'">'.get_lang('DelayedAssignments').'</a></li>';//TODO
+	//echo '<li><a href="index.php?cidReq='.$_course[id].'&action=delayed&group_id='.$_clean['group_id'].'">'.get_lang('DelayedAssignments').'</a></li>';//TODO:
 	
 	//Submenu Random page
-	//echo '<li><a href="index.php?cidReq='.$_course[id].'&action=mrandom&group_id='.$_clean['group_id'].'">'.get_lang('RandomPage').'</a></li>';//TODO
+	//echo '<li><a href="index.php?cidReq='.$_course[id].'&action=mrandom&group_id='.$_clean['group_id'].'">'.get_lang('RandomPage').'</a></li>';//TODO:
 
 }
 
@@ -581,7 +581,7 @@ if ($_GET['action']=='mactiveusers')
 	echo '<div class="actions">'.get_lang('MostActiveUsers').'</div>';
 	
 	$sql='SELECT *, COUNT(*) AS NUM_EDIT FROM '.$tbl_wiki.'  WHERE  '.$groupfilter.' GROUP BY user_id';
-	$allpages=api_sql_query($sql,__FILE__,__LINE__);		
+	$allpages=Database::query($sql,__FILE__,__LINE__);		
 
 	//show table
 	if (mysql_num_rows($allpages) > 0)
@@ -624,7 +624,7 @@ if ($_GET['action']=='usercontrib')
 		$sql='SELECT * FROM '.$tbl_wiki.'  WHERE  '.$groupfilter.' AND user_id="'.Security::remove_XSS($_GET['user_id']).'" AND visibility=1';	
 	}	
 	
-	$allpages=api_sql_query($sql,__FILE__,__LINE__);
+	$allpages=Database::query($sql,__FILE__,__LINE__);
 		
 	//show table
 	if (mysql_num_rows($allpages) > 0)
@@ -711,7 +711,7 @@ if ($_GET['action']=='mostchanged')
 		$sql='SELECT *, MAX(version) AS MAX FROM '.$tbl_wiki.'  WHERE  '.$groupfilter.' AND visibility=1 GROUP BY reflink';
 	}	
 	
-	$allpages=api_sql_query($sql,__FILE__,__LINE__);
+	$allpages=Database::query($sql,__FILE__,__LINE__);
 		
 	//show table
 	if (mysql_num_rows($allpages) > 0)
@@ -765,7 +765,7 @@ if ($_GET['action']=='mvisited')
 		$sql='SELECT *, SUM(hits) AS tsum FROM '.$tbl_wiki.'  WHERE  '.$groupfilter.' AND visibility=1 GROUP BY reflink';
 	}		
 	
-	$allpages=api_sql_query($sql,__FILE__,__LINE__);
+	$allpages=Database::query($sql,__FILE__,__LINE__);
 
 	//show table
 	if (mysql_num_rows($allpages) > 0)
@@ -815,7 +815,7 @@ if ($_GET['action']=='wanted')
 
 	//get name pages
 	$sql='SELECT * FROM '.$tbl_wiki.'  WHERE  '.$groupfilter.' GROUP BY reflink ORDER BY reflink ASC';
-	$allpages=api_sql_query($sql,__FILE__,__LINE__);
+	$allpages=Database::query($sql,__FILE__,__LINE__);
 		
 	while ($row=Database::fetch_array($allpages))
 	{
@@ -823,14 +823,14 @@ if ($_GET['action']=='wanted')
 	}
 	
 	//get name refs in last pages and make a unique list
-	//$sql='SELECT  *  FROM   '.$tbl_wiki.' s1 WHERE id=(SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2 WHERE s1.reflink = s2.reflink AND '.$groupfilter.')'; //old version TODO:¿ delete ?
+	$sql='SELECT  *  FROM   '.$tbl_wiki.' s1 WHERE id=(SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2 WHERE s1.reflink = s2.reflink AND '.$groupfilter.')'; //old version TODO: Replace by the bottom line
 	
-	$sql='SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.' WHERE visibility=1 AND '.$tbl_wiki_conf.'.page_id='.$tbl_wiki.'.page_id AND '.$tbl_wiki.'.'.$groupfilter; // new version
+	//$sql='SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.' WHERE visibility=1 AND '.$tbl_wiki_conf.'.page_id='.$tbl_wiki.'.page_id AND '.$tbl_wiki.'.'.$groupfilter; // new version
 	
-	$allpages=api_sql_query($sql,__FILE__,__LINE__);	
+	$allpages=Database::query($sql,__FILE__,__LINE__);	
 	while ($row=Database::fetch_array($allpages))
 	{	
-		//$row['linksto']= str_replace("\n".$row["reflink"]."\n", "\n", $row["linksto"]); //remove self reference. TODO check
+		//$row['linksto']= str_replace("\n".$row["reflink"]."\n", "\n", $row["linksto"]); //remove self reference. TODO: check
 		$rf = explode(" ", trim($row["linksto"]));//wanted pages without /n only blank " "  			
 		$refs = array_merge($refs, $rf);
 		if ($n++ > 299)
@@ -868,18 +868,18 @@ if ($_GET['action']=='orphaned')
 	
 	//get name pages	
 	$sql='SELECT * FROM '.$tbl_wiki.'  WHERE  '.$groupfilter.' GROUP BY reflink ORDER BY reflink ASC';
-	$allpages=api_sql_query($sql,__FILE__,__LINE__);	
+	$allpages=Database::query($sql,__FILE__,__LINE__);	
 	while ($row=Database::fetch_array($allpages))
 	{			   
 		$pages[] = $row['reflink'];
 	}
 	
 	//get name refs in last pages and make a unique list	
-	//$sql='SELECT  *  FROM   '.$tbl_wiki.' s1 WHERE id=(SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2 WHERE s1.reflink = s2.reflink AND '.$groupfilter.')'; //old version TODO:¿ delete ?
+	$sql='SELECT  *  FROM   '.$tbl_wiki.' s1 WHERE id=(SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2 WHERE s1.reflink = s2.reflink AND '.$groupfilter.')'; //old version TODO: Replace by the bottom line
 	
-	$sql='SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.' WHERE '.$tbl_wiki_conf.'.page_id='.$tbl_wiki.'.page_id AND '.$tbl_wiki.'.'.$groupfilter.' '; // new version
+	//$sql='SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.' WHERE '.$tbl_wiki_conf.'.page_id='.$tbl_wiki.'.page_id AND '.$tbl_wiki.'.'.$groupfilter.' '; // new version
 
-	$allpages=api_sql_query($sql,__FILE__,__LINE__);	
+	$allpages=Database::query($sql,__FILE__,__LINE__);	
 	while ($row=Database::fetch_array($allpages))
 	{			
 		//$row['linksto']= str_replace("\n".$row["reflink"]."\n", "\n", $row["linksto"]); //remove self reference. TODO: check
@@ -914,7 +914,7 @@ if ($_GET['action']=='orphaned')
 			$sql='SELECT  *  FROM   '.$tbl_wiki.' WHERE '.$groupfilter.' AND reflink="'.$vshow.'" AND visibility=1 GROUP BY reflink';		
 		}			
 		
-		$allpages=api_sql_query($sql,__FILE__,__LINE__);		
+		$allpages=Database::query($sql,__FILE__,__LINE__);		
 		
 		echo '<ul>';
 		while ($row=Database::fetch_array($allpages))
@@ -971,13 +971,13 @@ if ($_GET['action']=='delete')
 		if ($_GET['delete'] == 'yes')
 		{
 			$sql='DELETE '.$tbl_wiki_discuss.' FROM '.$tbl_wiki.', '.$tbl_wiki_discuss.' WHERE '.$tbl_wiki.'.reflink="'.html_entity_decode(Database::escape_string(stripslashes(urldecode($page)))).'" AND '.$tbl_wiki.'.'.$groupfilter.' AND '.$tbl_wiki_discuss.'.publication_id='.$tbl_wiki.'.id';
-			api_sql_query($sql,__FILE__,__LINE__);
+			Database::query($sql,__FILE__,__LINE__);
 			
 			$sql='DELETE '.$tbl_wiki_mailcue.' FROM '.$tbl_wiki.', '.$tbl_wiki_mailcue.' WHERE '.$tbl_wiki.'.reflink="'.html_entity_decode(Database::escape_string(stripslashes(urldecode($page)))).'" AND '.$tbl_wiki.'.'.$groupfilter.' AND '.$tbl_wiki_mailcue.'.id='.$tbl_wiki.'.id';
-			api_sql_query($sql,__FILE__,__LINE__);
+			Database::query($sql,__FILE__,__LINE__);
 			
 			$sql='DELETE FROM '.$tbl_wiki.' WHERE reflink="'.html_entity_decode(Database::escape_string(stripslashes(urldecode($page)))).'" AND '.$groupfilter.'';
-	  		api_sql_query($sql,__FILE__,__LINE__);		
+	  		Database::query($sql,__FILE__,__LINE__);		
 			
 			check_emailcue(0, 'E');
 			
@@ -1066,7 +1066,7 @@ if ($_GET['action']=='links')
 	{	
 	
 		$sql='SELECT * FROM '.$tbl_wiki.' WHERE reflink="'.html_entity_decode(Database::escape_string(stripslashes(urldecode($page)))).'" AND '.$groupfilter.'';		
-		$result=api_sql_query($sql,__FILE__,__LINE__);	
+		$result=Database::query($sql,__FILE__,__LINE__);	
 		$row=Database::fetch_array($result);		
 		
 		//get type assignment icon
@@ -1105,20 +1105,20 @@ if ($_GET['action']=='links')
 		
 		if(api_is_allowed_to_edit() || api_is_platform_admin()) //only by professors if page is hidden
 		{				
-			//$sql="SELECT * FROM ".$tbl_wiki." s1 WHERE linksto LIKE '%".html_entity_decode(Database::escape_string(stripslashes(urldecode($page))))." %' AND id=(SELECT MAX(s2.id) FROM ".$tbl_wiki." s2 WHERE s1.reflink = s2.reflink AND ".$groupfilter.")"; //add blank space after like '%" " %' to identify each word. //Old version TODO:¿delete?
+			$sql="SELECT * FROM ".$tbl_wiki." s1 WHERE linksto LIKE '%".html_entity_decode(Database::escape_string(stripslashes(urldecode($page))))." %' AND id=(SELECT MAX(s2.id) FROM ".$tbl_wiki." s2 WHERE s1.reflink = s2.reflink AND ".$groupfilter.")"; //add blank space after like '%" " %' to identify each word. //Old version TODO: Replace by the bottom line
 			
-			$sql="SELECT * FROM ".$tbl_wiki.", ".$tbl_wiki_conf." WHERE linksto LIKE '%".html_entity_decode(Database::escape_string(stripslashes(urldecode($page))))." %' AND ".$tbl_wiki_conf.".page_id=".$tbl_wiki.".page_id AND ".$tbl_wiki.".".$groupfilter.""; //add blank space after like '%" " %' to identify each word. // new version			
+			//$sql="SELECT * FROM ".$tbl_wiki.", ".$tbl_wiki_conf." WHERE linksto LIKE '%".html_entity_decode(Database::escape_string(stripslashes(urldecode($page))))." %' AND ".$tbl_wiki_conf.".page_id=".$tbl_wiki.".page_id AND ".$tbl_wiki.".".$groupfilter.""; //add blank space after like '%" " %' to identify each word. // new version			
 			
 		}
 		else
 		{	
-			//$sql="SELECT * FROM ".$tbl_wiki." s1 WHERE visibility=1 AND linksto LIKE '%".html_entity_decode(Database::escape_string(stripslashes(urldecode($page))))." %' AND id=(SELECT MAX(s2.id) FROM ".$tbl_wiki." s2 WHERE s1.reflink = s2.reflink AND ".$groupfilter.")"; //add blank space after like '%" " %' to identify each word //old version TODO:¿delete?
+			$sql="SELECT * FROM ".$tbl_wiki." s1 WHERE visibility=1 AND linksto LIKE '%".html_entity_decode(Database::escape_string(stripslashes(urldecode($page))))." %' AND id=(SELECT MAX(s2.id) FROM ".$tbl_wiki." s2 WHERE s1.reflink = s2.reflink AND ".$groupfilter.")"; //add blank space after like '%" " %' to identify each word //old version TODO: Replace by the bottom line
 			
-			$sql="SELECT * FROM ".$tbl_wiki.", ".$tbl_wiki_conf." WHERE visibility=1 AND linksto LIKE '%".html_entity_decode(Database::escape_string(stripslashes(urldecode($page))))." %' AND ".$tbl_wiki_conf.".page_id=".$tbl_wiki.".page_id AND ".$tbl_wiki.".".$groupfilter.""; //add blank space after like '%" " %' to identify each word // new version			
+			//$sql="SELECT * FROM ".$tbl_wiki.", ".$tbl_wiki_conf." WHERE visibility=1 AND linksto LIKE '%".html_entity_decode(Database::escape_string(stripslashes(urldecode($page))))." %' AND ".$tbl_wiki_conf.".page_id=".$tbl_wiki.".page_id AND ".$tbl_wiki.".".$groupfilter.""; //add blank space after like '%" " %' to identify each word // new version			
 			
 		}		
 
-		$allpages=api_sql_query($sql,__LINE__,__FILE__);	
+		$allpages=Database::query($sql,__LINE__,__FILE__);	
 	
 		//show table
 		if (mysql_num_rows($allpages) > 0)
@@ -1242,7 +1242,7 @@ if ($_GET['action']=='edit')
 	$_clean['group_id']=(int)$_SESSION['_gid'];				
 
 	$sql='SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.' WHERE '.$tbl_wiki_conf.'.page_id='.$tbl_wiki.'.page_id AND '.$tbl_wiki.'.reflink="'.html_entity_decode(Database::escape_string(stripslashes(urldecode($page)))).'" AND '.$tbl_wiki.'.'.$groupfilter.' ORDER BY id DESC';
-	$result=api_sql_query($sql,__LINE__,__FILE__);
+	$result=Database::query($sql,__LINE__,__FILE__);
 	$row=Database::fetch_array($result); // we do not need a while loop since we are always displaying the last version
 	
 	
@@ -1453,7 +1453,7 @@ if ($_GET['action']=='edit')
 			
 					$time_edit = date("Y-m-d H:i:s");
 					$sql='UPDATE '.$tbl_wiki.' SET is_editing="'.$_user['user_id'].'", time_edit="'.$time_edit.'" WHERE id="'.$row['id'].'"';
-					api_sql_query($sql,__FILE__,__LINE__);
+					Database::query($sql,__FILE__,__LINE__);
 				}
 				elseif($row['is_editing']!=$_user['user_id'])
 				{		
@@ -1490,9 +1490,8 @@ if ($_GET['action']=='edit')
 					echo '<tr>';
 					echo '<td>'.get_lang('DescriptionOfTheTask').'</td>';
 					echo '</tr>';
-					echo '<tr>';
-					//echo '<td><textarea name="task" cols="60" rows="4" >'.stripslashes($row['task']).'</textarea></td>';	// TODO: ¿delete?				
-					echo '<td>'.api_disp_html_area('task', stripslashes($row['task']), '', '', null, array('ToolbarSet' => 'project_comment', 'Width' => '600', 'Height' => '200')).'</td>'; //TODO:create a new tolbarset
+					echo '<tr>';	
+					echo '<td>'.api_disp_html_area('task', stripslashes($row['task']), '', '', null, array('ToolbarSet' => 'project_comment', 'Width' => '600', 'Height' => '200')).'</td>'; //TODO: create a new tolbarset
 					echo '</tr>';
 					echo '</table>';
 					echo '</div>';
@@ -1680,7 +1679,7 @@ if ($_GET['action']=='history' or Security::remove_XSS($_POST['HistoryDifference
     //First, see the property visibility that is at the last register and therefore we should select descending order. But to give ownership to each record, this is no longer necessary except for the title. TODO: check this
 
 	$sql='SELECT * FROM '.$tbl_wiki.'WHERE reflink="'.html_entity_decode(Database::escape_string(stripslashes(urldecode($page)))).'" AND '.$groupfilter.' ORDER BY id DESC';
-	$result=api_sql_query($sql,__LINE__,__FILE__);
+	$result=Database::query($sql,__LINE__,__FILE__);
 		
 	while ($row=Database::fetch_array($result))
 	{
@@ -1710,7 +1709,7 @@ if ($_GET['action']=='history' or Security::remove_XSS($_POST['HistoryDifference
 		{
 	
 			$sql='SELECT * FROM '.$tbl_wiki.'WHERE reflink="'.html_entity_decode(Database::escape_string(stripslashes(urldecode($page)))).'" AND '.$groupfilter.' ORDER BY id DESC';
-			$result=api_sql_query($sql,__LINE__,__FILE__);
+			$result=Database::query($sql,__LINE__,__FILE__);
 			
 			$title		= Security::remove_XSS($_GET['title']);
 			$group_id	= Security::remove_XSS($_GET['group_id']);
@@ -1792,12 +1791,12 @@ if ($_GET['action']=='history' or Security::remove_XSS($_POST['HistoryDifference
 		else
 		{
 			$sql_old="SELECT * FROM $tbl_wiki WHERE id='".Database::escape_string($_POST['old'])."'";
-			$result_old=api_sql_query($sql_old,__LINE__,__FILE__);
+			$result_old=Database::query($sql_old,__LINE__,__FILE__);
 			$version_old=Database::fetch_array($result_old);
 			
 
 			$sql_new="SELECT * FROM $tbl_wiki WHERE id='".Database::escape_string($_POST['new'])."'";
-			$result_new=api_sql_query($sql_new,__LINE__,__FILE__);
+			$result_new=Database::query($sql_new,__LINE__,__FILE__);
 			$version_new=Database::fetch_array($result_new);	
 		
 		    if(isset($_POST['HistoryDifferences']))
@@ -1872,7 +1871,7 @@ if ($_GET['action']=='history' or Security::remove_XSS($_POST['HistoryDifference
 /////////////////////// recent changes ///////////////////////
 
 //
-//rss feed. TODO
+//rss feed. TODO:
 //
 
 if ($_GET['action']=='recentchanges')
@@ -1894,19 +1893,19 @@ if ($_GET['action']=='recentchanges')
 	
 	if(api_is_allowed_to_edit() || api_is_platform_admin()) //only by professors if page is hidden
 	{	
-		//$sql='SELECT * FROM '.$tbl_wiki.' WHERE '.$groupfilter.' ORDER BY dtime DESC'; // old version TODO:¿delete?
+		$sql='SELECT * FROM '.$tbl_wiki.' WHERE '.$groupfilter.' ORDER BY dtime DESC'; // old version TODO: Replace by the bottom line
 		
-		$sql='SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.' WHERE '.$tbl_wiki_conf.'.page_id='.$tbl_wiki.'.page_id AND '.$tbl_wiki.'.'.$groupfilter.' ORDER BY dtime DESC'; // new version		
+		//$sql='SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.' WHERE '.$tbl_wiki_conf.'.page_id='.$tbl_wiki.'.page_id AND '.$tbl_wiki.'.'.$groupfilter.' ORDER BY dtime DESC'; // new version		
 		
 	}
 	else
 	{	
-		//$sql='SELECT * FROM '.$tbl_wiki.' WHERE '.$groupfilter.' AND visibility=1 ORDER BY dtime DESC';	// old version TODO:¿delete?
+		$sql='SELECT * FROM '.$tbl_wiki.' WHERE '.$groupfilter.' AND visibility=1 ORDER BY dtime DESC';	// old version TODO: Replace by the bottom line
 		
-		$sql='SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.' WHERE '.$tbl_wiki_conf.'.page_id='.$tbl_wiki.'.page_id AND visibility=1 AND '.$tbl_wiki.'.'.$groupfilter.' ORDER BY dtime DESC'; // new version
+		//$sql='SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.' WHERE '.$tbl_wiki_conf.'.page_id='.$tbl_wiki.'.page_id AND visibility=1 AND '.$tbl_wiki.'.'.$groupfilter.' ORDER BY dtime DESC'; // new version
 	}		
 
-	$allpages=api_sql_query($sql,__LINE__,__FILE__);
+	$allpages=Database::query($sql,__LINE__,__FILE__);
 
 	//show table
 	if (mysql_num_rows($allpages) > 0)
@@ -1984,19 +1983,19 @@ if ($_GET['action']=='allpages')
 
 	if(api_is_allowed_to_edit() || api_is_platform_admin()) //only by professors if page is hidden
 	{	
-		//$sql='SELECT  *  FROM  '.$tbl_wiki.' s1 WHERE id=(SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2 WHERE s1.reflink = s2.reflink AND '.$groupfilter.')'; // warning don't use group by reflink because don't return the last version// old version TODO:¿ delete ?
+		$sql='SELECT  *  FROM  '.$tbl_wiki.' s1 WHERE id=(SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2 WHERE s1.reflink = s2.reflink AND '.$groupfilter.')'; // warning don't use group by reflink because don't return the last version// old version TODO: Replace by the bottom line
 		
-		$sql='SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.' WHERE '.$tbl_wiki_conf.'.page_id='.$tbl_wiki.'.page_id AND '.$tbl_wiki.'.'.$groupfilter.' GROUP BY '.$tbl_wiki.'.page_id'; // new version
+		//$sql='SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.' WHERE '.$tbl_wiki_conf.'.page_id='.$tbl_wiki.'.page_id AND '.$tbl_wiki.'.'.$groupfilter.' GROUP BY '.$tbl_wiki.'.page_id'; // new version
 	}
 	else
 	{	
-		//$sql='SELECT  *  FROM   '.$tbl_wiki.' s1 WHERE visibility=1 AND id=(SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2 WHERE s1.reflink = s2.reflink AND '.$groupfilter.')'; // warning don't use group by reflink because don't return the last version	// old version TODO:¿ delete ?
+		$sql='SELECT  *  FROM   '.$tbl_wiki.' s1 WHERE visibility=1 AND id=(SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2 WHERE s1.reflink = s2.reflink AND '.$groupfilter.')'; // warning don't use group by reflink because don't return the last version	// old version TODO: Replace by the bottom line
 		
-		$sql='SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.' WHERE visibility=1 AND '.$tbl_wiki_conf.'.page_id='.$tbl_wiki.'.page_id AND '.$tbl_wiki.'.'.$groupfilter.' GROUP BY '.$tbl_wiki.'.page_id'; // new version
+		//$sql='SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.' WHERE visibility=1 AND '.$tbl_wiki_conf.'.page_id='.$tbl_wiki.'.page_id AND '.$tbl_wiki.'.'.$groupfilter.' GROUP BY '.$tbl_wiki.'.page_id'; // new version
 		
 	}		
 
-	$allpages=api_sql_query($sql,__LINE__,__FILE__);	
+	$allpages=Database::query($sql,__LINE__,__FILE__);	
 
 	//show table
 	if (mysql_num_rows($allpages) > 0)
@@ -2078,14 +2077,14 @@ if ($_GET['action']=='discuss')
 	
 	//first extract the date of last version
 	$sql='SELECT * FROM '.$tbl_wiki.'WHERE reflink="'.html_entity_decode(Database::escape_string(stripslashes(urldecode($page)))).'" AND '.$groupfilter.' ORDER BY id DESC';
-	$result=api_sql_query($sql,__LINE__,__FILE__);
+	$result=Database::query($sql,__LINE__,__FILE__);
 	$row=Database::fetch_array($result);
 	$lastversiondate=$row['dtime'];
 	$lastuserinfo=Database::get_user_info_from_id($row['user_id']);
 	
 	//select page to discuss
     $sql='SELECT * FROM '.$tbl_wiki.'WHERE reflink="'.html_entity_decode(Database::escape_string(stripslashes(urldecode($page)))).'" AND '.$groupfilter.' ORDER BY id ASC';
-	$result=api_sql_query($sql,__LINE__,__FILE__);
+	$result=Database::query($sql,__LINE__,__FILE__);
 	$row=Database::fetch_array($result);
 	$id=$row['id'];
 	$firstuserid=$row['user_id'];
@@ -2249,7 +2248,7 @@ if ($_GET['action']=='discuss')
 					$message_author=api_get_user_id();
 					
 					$sql="INSERT INTO $tbl_wiki_discuss (publication_id, userc_id, comment, p_score, dtime) VALUES ('".$id."','".$message_author."','".$_POST['comment']."','".$_POST['rating']."','".$dtime."')";
-					$result=api_sql_query($sql,__FILE__,__LINE__) or die(mysql_error());					
+					$result=Database::query($sql,__FILE__,__LINE__) or die(mysql_error());					
 					
 					check_emailcue($id, 'D', $dtime, $message_author);			
 										
@@ -2260,17 +2259,17 @@ if ($_GET['action']=='discuss')
 			$user_table = Database :: get_main_table(TABLE_MAIN_USER);
 			
 			$sql="SELECT * FROM $tbl_wiki_discuss reviews, $user_table user  WHERE reviews.publication_id='".$id."' AND user.user_id='".$firstuserid."' ORDER BY id DESC";
-			$result=api_sql_query($sql,__FILE__,__LINE__) or die(mysql_error());
+			$result=Database::query($sql,__FILE__,__LINE__) or die(mysql_error());
 			
 			$countWPost = Database::num_rows($result); 
 			echo get_lang('NumComments').": ".$countWPost; //comment's numbers 
 			
 			$sql="SELECT SUM(p_score) as sumWPost FROM $tbl_wiki_discuss WHERE publication_id='".$id."' AND NOT p_score='-' ORDER BY id DESC"; 
-			$result2=api_sql_query($sql,__FILE__,__LINE__) or die(mysql_error());
+			$result2=Database::query($sql,__FILE__,__LINE__) or die(mysql_error());
 			$row2=Database::fetch_array($result2);
 			
 			$sql="SELECT * FROM $tbl_wiki_discuss WHERE publication_id='".$id."' AND NOT p_score='-'"; 
-			$result3=api_sql_query($sql,__FILE__,__LINE__) or die(mysql_error());
+			$result3=Database::query($sql,__FILE__,__LINE__) or die(mysql_error());
 			$countWPost_score= Database::num_rows($result3);
 			
 			echo ' - '.get_lang('NumCommentsScore').': '.$countWPost_score;//
@@ -2286,8 +2285,8 @@ if ($_GET['action']=='discuss')
 			
 			echo ' - '.get_lang('RatingMedia').': '.$avg_WPost_score; // average rating
 	
-			$sql='UPDATE '.$tbl_wiki.' SET score="'.Database::escape_string($avg_WPost_score).'" WHERE reflink="'.html_entity_decode(Database::escape_string(stripslashes(urldecode($page)))).'" AND '.$groupfilter;	// check if work ok. TODO			
-				api_sql_query($sql,__FILE__,__LINE__); 
+			$sql='UPDATE '.$tbl_wiki.' SET score="'.Database::escape_string($avg_WPost_score).'" WHERE reflink="'.html_entity_decode(Database::escape_string(stripslashes(urldecode($page)))).'" AND '.$groupfilter;	// check if work ok. TODO:			
+				Database::query($sql,__FILE__,__LINE__); 
 	
 			echo '<hr noshade size="1">';
 			//echo '<div style="overflow:auto; height:170px;">';
@@ -2304,7 +2303,7 @@ if ($_GET['action']=='discuss')
 					$author_status=get_lang('Teacher');
 				}			
 				
-				require_once(api_get_path(INCLUDE_PATH).'/lib/usermanager.lib.php');
+				require_once api_get_path(INCLUDE_PATH).'/lib/usermanager.lib.php';
 				$user_id=$row['userc_id'];
 				$name=$userinfo['lastname']." ".$userinfo['firstname'];
 				$attrb=array();		
diff --git a/main/wiki/wiki.inc.php b/main/wiki/wiki.inc.php
index 143ab56ad8..09b6779958 100644
--- a/main/wiki/wiki.inc.php
+++ b/main/wiki/wiki.inc.php
@@ -68,7 +68,7 @@ function checktitle($paramwk)
 	global $groupfilter;
 
 	$sql='SELECT * FROM '.$tbl_wiki.' WHERE reflink="'.html_entity_decode(Database::escape_string(stripslashes(urldecode($paramwk)))).'" AND '.$groupfilter.''; // TODO: check if need entity
-	$result=api_sql_query($sql,__FILE__,__LINE__);
+	$result=Database::query($sql,__FILE__,__LINE__);
 	$numberofresults=Database::num_rows($result);
 
 	if ($numberofresults==0) // the value has not been found and is this available
@@ -357,13 +357,13 @@ function save_wiki() {
 	
 	$sql="INSERT INTO ".$tbl_wiki." (page_id, reflink, title, content, user_id, group_id, dtime, assignment, comment, progress, version, linksto, user_ip) VALUES ('".$_clean['page_id']."','".$_clean['reflink']."','".$_clean['title']."','".$_clean['content']."','".$_clean['user_id']."','".$_clean['group_id']."','".$dtime."','".$_clean['assignment']."','".$_clean['comment']."','".$_clean['progress']."','".$_clean['version']."','".$_clean['linksto']."','".Database::escape_string($_SERVER['REMOTE_ADDR'])."')";
 	
-	$result=api_sql_query($sql);	
+	$result=Database::query($sql);	
     $Id = Database::insert_id();
 	
 	if ($_clean['page_id']	==0)   
 	{	    
 		$sql='UPDATE '.$tbl_wiki.' SET page_id="'.$Id.'" WHERE id="'.$Id.'"';
-		api_sql_query($sql,__FILE__,__LINE__);
+		Database::query($sql,__FILE__,__LINE__);
 	}
 	
 	//update wiki config
@@ -376,7 +376,7 @@ function save_wiki() {
 	{
 		$sql='UPDATE'.$tbl_wiki_conf.' SET task="'.$_clean['task'].'", feedback1="'.$_clean['feedback1'].'", feedback2="'.$_clean['feedback2'].'", feedback3="'.$_clean['feedback3'].'",  fprogress1="'.$_clean['fprogress1'].'",  fprogress2="'.$_clean['fprogress2'].'",  fprogress3="'.$_clean['fprogress3'].'", max_text="'.$_clean['max_text'].'", max_version="'.$_clean['max_version'].'", startdate_assig="'.$_clean['startdate_assig'].'", enddate_assig="'.$_clean['enddate_assig'].'", delayedsubmit="'.$_clean['delayedsubmit'].'" WHERE page_id="'.$_clean['page_id'].'"';
 	}
-	api_sql_query($sql,__FILE__,__LINE__);	
+	Database::query($sql,__FILE__,__LINE__);	
 	
 	api_item_property_update($_course, 'wiki', $Id, 'WikiAdded', api_get_user_id(), $_clean['group_id']);
 	
@@ -401,7 +401,7 @@ function restore_wikipage($r_page_id, $r_reflink, $r_title, $r_content, $r_group
 	
 	$sql="INSERT INTO ".$tbl_wiki." (page_id, reflink, title, content, user_id, group_id, dtime, assignment, comment, progress, version, linksto, user_ip) VALUES ('".$r_page_id."','".$r_reflink."','".$r_title."','".$r_content."','".$r_user_id."','".$r_group_id."','".$r_dtime."','".$r_assignment."','".$r_comment."','".$r_progress."','".$r_version."','".$r_linksto."','".Database::escape_string($_SERVER['REMOTE_ADDR'])."')";
 	
-	$result=api_sql_query($sql);	
+	$result=Database::query($sql);	
     $Id = Database::insert_id();		
 	api_item_property_update($_course, 'wiki', $Id, 'WikiAdded', api_get_user_id(), $r_group_id);
 	
@@ -421,18 +421,18 @@ function delete_wiki()
 	global $tbl_wiki, $tbl_wiki_conf, $tbl_wiki_discuss, $tbl_wiki_mailcue, $groupfilter;
 	//identify the first id by group = identify wiki
 	$sql='SELECT * FROM '.$tbl_wiki.'  WHERE  '.$groupfilter.' ORDER BY id DESC';
-	$allpages=api_sql_query($sql,__FILE__,__LINE__);
+	$allpages=Database::query($sql,__FILE__,__LINE__);
 		
 	while ($row=Database::fetch_array($allpages))	{
 		$id 		= $row['id'];
 		$group_id	= $row['group_id'];
 		$page_id	= $row['page_id'];
-		api_sql_query('DELETE FROM '.$tbl_wiki_conf.' WHERE page_id="'.$id.'"' ,__FILE__,__LINE__);
-		api_sql_query('DELETE FROM '.$tbl_wiki_discuss.' WHERE publication_id="'.$id.'"' ,__FILE__,__LINE__);
+		Database::query('DELETE FROM '.$tbl_wiki_conf.' WHERE page_id="'.$id.'"' ,__FILE__,__LINE__);
+		Database::query('DELETE FROM '.$tbl_wiki_discuss.' WHERE publication_id="'.$id.'"' ,__FILE__,__LINE__);
 	}
 	
-	api_sql_query('DELETE FROM '.$tbl_wiki_mailcue.' WHERE group_id="'.$group_id.'"' ,__FILE__,__LINE__);	
-	api_sql_query('DELETE FROM '.$tbl_wiki.' WHERE '.$groupfilter.'',__FILE__,__LINE__);	
+	Database::query('DELETE FROM '.$tbl_wiki_mailcue.' WHERE group_id="'.$group_id.'"' ,__FILE__,__LINE__);	
+	Database::query('DELETE FROM '.$tbl_wiki.' WHERE '.$groupfilter.'',__FILE__,__LINE__);	
 	return get_lang('WikiDeleted');
 }
 
@@ -537,15 +537,15 @@ function save_new_wiki() {
 		} else { 	
 			$dtime = date( "Y-m-d H:i:s" );
 			$sql="INSERT INTO ".$tbl_wiki." (reflink, title, content, user_id, group_id, dtime, visibility, visibility_disc, ratinglock_disc, assignment, comment, progress, version, linksto, user_ip) VALUES ('".$_clean['reflink']."','".$_clean['title']."','".$_clean['content']."','".$_clean['user_id']."','".$_clean['group_id']."','".$dtime."','".$_clean['visibility']."','".$_clean['visibility_disc']."','".$_clean['ratinglock_disc']."','".$_clean['assignment']."','".$_clean['comment']."','".$_clean['progress']."','".$_clean['version']."','".$_clean['linksto']."','".Database::escape_string($_SERVER['REMOTE_ADDR'])."')";
-		   $result=api_sql_query($sql,__LINE__,__FILE__);
+		   $result=Database::query($sql,__LINE__,__FILE__);
 		   $Id = Database::insert_id();
 		   
 		   $sql='UPDATE '.$tbl_wiki.' SET page_id="'.$Id.'" WHERE id="'.$Id.'"';		 	
-	       api_sql_query($sql,__FILE__,__LINE__);
+	       Database::query($sql,__FILE__,__LINE__);
 		   	
 			//insert wiki config		 
 		   $sql="INSERT INTO ".$tbl_wiki_conf." (page_id, task, feedback1, feedback2, feedback3, fprogress1, fprogress2, fprogress3, max_text, max_version, startdate_assig, enddate_assig, delayedsubmit) VALUES ('".$Id."','".$_clean['task']."','".$_clean['feedback1']."','".$_clean['feedback2']."','".$_clean['feedback3']."','".$_clean['fprogress1']."','".$_clean['fprogress2']."','".$_clean['fprogress3']."','".$_clean['max_text']."','".$_clean['max_version']."','".$_clean['startdate_assig']."','".$_clean['enddate_assig']."','".$_clean['delayedsubmit']."')";
-		   api_sql_query($sql,__LINE__,__FILE__);
+		   Database::query($sql,__LINE__,__FILE__);
 			
 		   api_item_property_update($_course, 'wiki', $Id, 'WikiAdded', api_get_user_id(), $_clean['group_id']);
 		   
@@ -602,7 +602,7 @@ return true;
 		echo '</tr>';
 		echo '<tr>';
 		//echo '<td><textarea name="task" cols="60" rows="4" >'.stripslashes($row['task']).'</textarea></td>';	// TODO: ¿delete?				
-		echo '<td>'.api_disp_html_area('task', stripslashes($row['task']), '', '', null, array('ToolbarSet' => 'project_comment', 'Width' => '600', 'Height' => '200')).'</td>'; //TODO:create a new tolbarset
+		echo '<td>'.api_disp_html_area('task', stripslashes($row['task']), '', '', null, array('ToolbarSet' => 'project_comment', 'Width' => '600', 'Height' => '200')).'</td>'; //TODO: create a new tolbarset
 		echo '</tr>';
 		echo '</table>';
 		echo '</div>';
@@ -761,13 +761,13 @@ function display_wiki_entry()
 
 	//first, check page visibility in the first page version
 	$sql='SELECT * FROM '.$tbl_wiki.'WHERE reflink="'.html_entity_decode(Database::escape_string(stripslashes(urldecode($page)))).'" AND '.$groupfilter.' ORDER BY id ASC';
-		$result=api_sql_query($sql,__LINE__,__FILE__);	
+		$result=Database::query($sql,__LINE__,__FILE__);	
 		$row=Database::fetch_array($result);		
 		$KeyVisibility=$row['visibility'];	
 
 	// second, show the last version
 	$sql='SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.' WHERE '.$tbl_wiki_conf.'.page_id='.$tbl_wiki.'.page_id AND '.$tbl_wiki.'.reflink="'.html_entity_decode(Database::escape_string(stripslashes(urldecode($page)))).'" AND '.$tbl_wiki.'.'.$groupfilter.' '.$filter.' ORDER BY id DESC';
-	$result=api_sql_query($sql,__LINE__,__FILE__);
+	$result=Database::query($sql,__LINE__,__FILE__);
 	$row=Database::fetch_array($result); // we do not need a while loop since we are always displaying the last version
 
 
@@ -775,7 +775,7 @@ function display_wiki_entry()
 	if($row['id'])
 	{
 		$sql='UPDATE '.$tbl_wiki.' SET hits=(hits+1) WHERE id='.$row['id'].'';
-		api_sql_query($sql,__FILE__,__LINE__);
+		Database::query($sql,__FILE__,__LINE__);
 	}
 
 
@@ -997,7 +997,7 @@ function wiki_exist($title)
 	global $tbl_wiki;
 	global $groupfilter;
 	$sql='SELECT id FROM '.$tbl_wiki.'WHERE title="'.Database::escape_string($title).'" AND '.$groupfilter.' ORDER BY id ASC'; 
-	$result=api_sql_query($sql,__LINE__,__FILE__);
+	$result=Database::query($sql,__LINE__,__FILE__);
 	$cant=Database::num_rows($result);
 	if ($cant>0)
 		return true;
@@ -1044,7 +1044,7 @@ function check_addnewpagelock()
 	$_clean['group_id']=(int)$_SESSION['_gid'];
 		
 	$sql='SELECT * FROM '.$tbl_wiki.'WHERE '.$groupfilter.' ORDER BY id ASC'; 
-	$result=api_sql_query($sql,__LINE__,__FILE__);
+	$result=Database::query($sql,__LINE__,__FILE__);
 	$row=Database::fetch_array($result); 
 							
 	$status_addlock=$row['addlock'];
@@ -1061,10 +1061,10 @@ function check_addnewpagelock()
 			$status_addlock=1; 
 		}       
 		
-		api_sql_query('UPDATE '.$tbl_wiki.' SET addlock="'.Database::escape_string($status_addlock).'" WHERE '.$groupfilter.'',__LINE__,__FILE__);	
+		Database::query('UPDATE '.$tbl_wiki.' SET addlock="'.Database::escape_string($status_addlock).'" WHERE '.$groupfilter.'',__LINE__,__FILE__);	
 	  
 		$sql='SELECT * FROM '.$tbl_wiki.'WHERE '.$groupfilter.' ORDER BY id ASC'; 
-		$result=api_sql_query($sql,__LINE__,__FILE__);
+		$result=Database::query($sql,__LINE__,__FILE__);
 		$row=Database::fetch_array($result);
 	} 
 	 		
@@ -1095,7 +1095,7 @@ function check_protect_page()
 
 	$sql='SELECT * FROM '.$tbl_wiki.'WHERE reflink="'.html_entity_decode(Database::escape_string(stripslashes(urldecode($page)))).'" AND '.$groupfilter.' ORDER BY id ASC';
 		
-	$result=api_sql_query($sql,__LINE__,__FILE__);
+	$result=Database::query($sql,__LINE__,__FILE__);
 	$row=Database::fetch_array($result);
 			
 	$status_editlock=$row['editlock'];
@@ -1114,11 +1114,11 @@ function check_protect_page()
 	 	}
 		
 		$sql='UPDATE '.$tbl_wiki.' SET editlock="'.Database::escape_string($status_editlock).'" WHERE id="'.$id.'"';			   
-	    api_sql_query($sql,__FILE__,__LINE__); 
+	    Database::query($sql,__FILE__,__LINE__); 
 	  
 	    $sql='SELECT * FROM '.$tbl_wiki.'WHERE reflink="'.html_entity_decode(Database::escape_string(stripslashes(urldecode($page)))).'" AND '.$groupfilter.' ORDER BY id ASC';
 		
-	    $result=api_sql_query($sql,__LINE__,__FILE__);
+	    $result=Database::query($sql,__LINE__,__FILE__);
 	    $row=Database::fetch_array($result); 
 
 	}
@@ -1150,7 +1150,7 @@ function check_visibility_page()
 	$_clean['group_id']=(int)$_SESSION['_gid'];
 
 	$sql='SELECT * FROM '.$tbl_wiki.'WHERE reflink="'.html_entity_decode(Database::escape_string(stripslashes(urldecode($page)))).'" AND '.$groupfilter.' ORDER BY id ASC';
-	$result=api_sql_query($sql,__LINE__,__FILE__);
+	$result=Database::query($sql,__LINE__,__FILE__);
 	$row=Database::fetch_array($result);
 				
 	$status_visibility=$row['visibility'];
@@ -1169,11 +1169,11 @@ function check_visibility_page()
 		}       
 				
 		$sql='UPDATE '.$tbl_wiki.' SET visibility="'.Database::escape_string($status_visibility).'" WHERE reflink="'.html_entity_decode(Database::escape_string(stripslashes(urldecode($page)))).'" AND '.$groupfilter; 
-	    api_sql_query($sql,__FILE__,__LINE__); 
+	    Database::query($sql,__FILE__,__LINE__); 
 		
 	    //Although the value now is assigned to all (not only the first), these three lines remain necessary. They do that by changing the page state is made when you press the button and not have to wait to change his page
 	    $sql='SELECT * FROM '.$tbl_wiki.'WHERE reflink="'.html_entity_decode(Database::escape_string(stripslashes(urldecode($page)))).'" AND '.$groupfilter.' ORDER BY id ASC';
-	    $result=api_sql_query($sql,__LINE__,__FILE__);
+	    $result=Database::query($sql,__LINE__,__FILE__);
 	    $row=Database::fetch_array($result); 
 
      } 
@@ -1205,7 +1205,7 @@ function check_visibility_discuss()
 	$_clean['group_id']=(int)$_SESSION['_gid'];
 
 	$sql='SELECT * FROM '.$tbl_wiki.'WHERE reflink="'.html_entity_decode(Database::escape_string(stripslashes(urldecode($page)))).'" AND '.$groupfilter.' ORDER BY id ASC';
-	$result=api_sql_query($sql,__LINE__,__FILE__);
+	$result=Database::query($sql,__LINE__,__FILE__);
 	$row=Database::fetch_array($result);
 				
 	$status_visibility_disc=$row['visibility_disc'];
@@ -1224,11 +1224,11 @@ function check_visibility_discuss()
 		}       
 		
 		$sql='UPDATE '.$tbl_wiki.' SET visibility_disc="'.Database::escape_string($status_visibility_disc).'" WHERE reflink="'.html_entity_decode(Database::escape_string(stripslashes(urldecode($page)))).'" AND '.$groupfilter;
-	    api_sql_query($sql,__FILE__,__LINE__); 
+	    Database::query($sql,__FILE__,__LINE__); 
 		
 	   //Although the value now is assigned to all (not only the first), these three lines remain necessary. They do that by changing the page state is made when you press the button and not have to wait to change his page
 	    $sql='SELECT * FROM '.$tbl_wiki.'WHERE reflink="'.html_entity_decode(Database::escape_string(stripslashes(urldecode($page)))).'" AND '.$groupfilter.' ORDER BY id ASC';
-	    $result=api_sql_query($sql,__LINE__,__FILE__);
+	    $result=Database::query($sql,__LINE__,__FILE__);
 	    $row=Database::fetch_array($result); 
 
 	}
@@ -1260,7 +1260,7 @@ function check_addlock_discuss()
 	$_clean['group_id']=(int)$_SESSION['_gid'];
 
 	$sql='SELECT * FROM '.$tbl_wiki.'WHERE reflink="'.html_entity_decode(Database::escape_string(stripslashes(urldecode($page)))).'" AND '.$groupfilter.' ORDER BY id ASC';
-	$result=api_sql_query($sql,__LINE__,__FILE__);
+	$result=Database::query($sql,__LINE__,__FILE__);
 	$row=Database::fetch_array($result);
 				
 	$status_addlock_disc=$row['addlock_disc'];
@@ -1279,11 +1279,11 @@ function check_addlock_discuss()
 		}       
 		
 		$sql='UPDATE '.$tbl_wiki.' SET addlock_disc="'.Database::escape_string($status_addlock_disc).'" WHERE reflink="'.html_entity_decode(Database::escape_string(stripslashes(urldecode($page)))).'" AND '.$groupfilter;		
-	    api_sql_query($sql,__FILE__,__LINE__); 
+	    Database::query($sql,__FILE__,__LINE__); 
 		
 	  	//Although the value now is assigned to all (not only the first), these three lines remain necessary. They do that by changing the page state is made when you press the button and not have to wait to change his page
 	    $sql='SELECT * FROM '.$tbl_wiki.'WHERE reflink="'.html_entity_decode(Database::escape_string(stripslashes(urldecode($page)))).'" AND '.$groupfilter.' ORDER BY id ASC';
-	    $result=api_sql_query($sql,__LINE__,__FILE__);
+	    $result=Database::query($sql,__LINE__,__FILE__);
 	    $row=Database::fetch_array($result); 
 
 	}
@@ -1316,7 +1316,7 @@ function check_ratinglock_discuss()
 	$_clean['group_id']=(int)$_SESSION['_gid'];
 
 	$sql='SELECT * FROM '.$tbl_wiki.'WHERE reflink="'.html_entity_decode(Database::escape_string(stripslashes(urldecode($page)))).'" AND '.$groupfilter.' ORDER BY id ASC';
-	$result=api_sql_query($sql,__LINE__,__FILE__);
+	$result=Database::query($sql,__LINE__,__FILE__);
 	$row=Database::fetch_array($result);
 				
 	$status_ratinglock_disc=$row['ratinglock_disc'];
@@ -1335,11 +1335,11 @@ function check_ratinglock_discuss()
 		}       
 		
 		$sql='UPDATE '.$tbl_wiki.' SET ratinglock_disc="'.Database::escape_string($status_ratinglock_disc).'" WHERE reflink="'.html_entity_decode(Database::escape_string(stripslashes(urldecode($page)))).'" AND '.$groupfilter; //Visibility. Value to all,not only for the first	
-	    api_sql_query($sql,__FILE__,__LINE__); 
+	    Database::query($sql,__FILE__,__LINE__); 
 		
 	  	//Although the value now is assigned to all (not only the first), these three lines remain necessary. They do that by changing the page state is made when you press the button and not have to wait to change his page
 	    $sql='SELECT * FROM '.$tbl_wiki.'WHERE reflink="'.html_entity_decode(Database::escape_string(stripslashes(urldecode($page)))).'" AND '.$groupfilter.' ORDER BY id ASC';
-	    $result=api_sql_query($sql,__LINE__,__FILE__);
+	    $result=Database::query($sql,__LINE__,__FILE__);
 	    $row=Database::fetch_array($result); 
 
 	}
@@ -1370,13 +1370,13 @@ function check_notify_page($reflink)
 	
 	$_clean['group_id']=(int)$_SESSION['_gid'];
 	$sql='SELECT * FROM '.$tbl_wiki.'WHERE reflink="'.$reflink.'" AND '.$groupfilter.' ORDER BY id ASC';
-	$result=api_sql_query($sql,__LINE__,__FILE__);
+	$result=Database::query($sql,__LINE__,__FILE__);
 	$row=Database::fetch_array($result);
 	
 	$id=$row['id'];		
 		
 	$sql='SELECT * FROM '.$tbl_wiki_mailcue.'WHERE id="'.$id.'" AND user_id="'.api_get_user_id().'" AND type="P"';
-	$result=api_sql_query($sql,__LINE__,__FILE__);
+	$result=Database::query($sql,__LINE__,__FILE__);
 	$row=Database::fetch_array($result);
 			
 	$idm=$row['id'];
@@ -1398,14 +1398,14 @@ function check_notify_page($reflink)
 	    {		
 		   	  
 			$sql="INSERT INTO ".$tbl_wiki_mailcue." (id, user_id, type, group_id) VALUES ('".$id."','".api_get_user_id()."','P','".$_clean['group_id']."')";
-			api_sql_query($sql,__FILE__,__LINE__);		
+			Database::query($sql,__FILE__,__LINE__);		
 			
 	    	$status_notify=1;			
 	    }
 	    else
 		{					
 		    $sql='DELETE FROM '.$tbl_wiki_mailcue.' WHERE id="'.$id.'" AND user_id="'.api_get_user_id().'" AND type="P"'; //$_clean['group_id'] not necessary
-			api_sql_query($sql,__FILE__,__LINE__);
+			Database::query($sql,__FILE__,__LINE__);
 			
 		    $status_notify=0;				
 	    } 			
@@ -1435,13 +1435,13 @@ function check_notify_discuss($reflink)
 	
 	$_clean['group_id']=(int)$_SESSION['_gid'];
 	$sql='SELECT * FROM '.$tbl_wiki.'WHERE reflink="'.$reflink.'" AND '.$groupfilter.' ORDER BY id ASC';
-	$result=api_sql_query($sql,__LINE__,__FILE__);
+	$result=Database::query($sql,__LINE__,__FILE__);
 	$row=Database::fetch_array($result);
 	
 	$id=$row['id'];	
 			
 	$sql='SELECT * FROM '.$tbl_wiki_mailcue.'WHERE id="'.$id.'" AND user_id="'.api_get_user_id().'" AND type="D"';
-	$result=api_sql_query($sql,__LINE__,__FILE__);
+	$result=Database::query($sql,__LINE__,__FILE__);
 	$row=Database::fetch_array($result);
 			
 	$idm=$row['id'];
@@ -1467,7 +1467,7 @@ function check_notify_discuss($reflink)
 			{	  
 								
 				$sql="INSERT INTO ".$tbl_wiki_mailcue." (id, user_id, type, group_id) VALUES ('".$id."','".api_get_user_id()."','D','".$_clean['group_id']."')";
-				api_sql_query($sql,__FILE__,__LINE__);		
+				Database::query($sql,__FILE__,__LINE__);		
 				
 				$status_notify_disc=1;
 			}
@@ -1481,7 +1481,7 @@ function check_notify_discuss($reflink)
 			if (!$_POST['Submit'])
 			{				
 				$sql='DELETE FROM '.$tbl_wiki_mailcue.' WHERE id="'.$id.'" AND user_id="'.api_get_user_id().'" AND type="D"'; //$_clean['group_id'] not necessary
-				api_sql_query($sql,__FILE__,__LINE__);
+				Database::query($sql,__FILE__,__LINE__);
 				
 				$status_notify_disc=0;
 			}
@@ -1517,7 +1517,7 @@ function check_notify_all()
 	$_clean['group_id']=(int)$_SESSION['_gid'];	
 		
 	$sql='SELECT * FROM '.$tbl_wiki_mailcue.'WHERE user_id="'.api_get_user_id().'" AND type="F" AND group_id="'.$_clean['group_id'].'"';
-	$result=api_sql_query($sql,__LINE__,__FILE__);
+	$result=Database::query($sql,__LINE__,__FILE__);
 	$row=Database::fetch_array($result);
 			
 	$idm=$row['user_id'];
@@ -1538,14 +1538,14 @@ function check_notify_all()
 		if ($status_notify_all==0)
 	    {	
 			$sql="INSERT INTO ".$tbl_wiki_mailcue." (user_id, type, group_id) VALUES ('".api_get_user_id()."','F','".$_clean['group_id']."')";
-			api_sql_query($sql,__FILE__,__LINE__);		
+			Database::query($sql,__FILE__,__LINE__);		
 			
 			$status_notify_all=1;				
 	    }
 	    else
 		{								
 			$sql='DELETE FROM '.$tbl_wiki_mailcue.' WHERE user_id="'.api_get_user_id().'" AND type="F" AND group_id="'.$_clean['group_id'].'"';
-			api_sql_query($sql,__FILE__,__LINE__);
+			Database::query($sql,__FILE__,__LINE__);
 		
 			$status_notify_all=0;			
 	    } 					
@@ -1603,7 +1603,7 @@ function check_emailcue($id_or_ref, $type, $lastime='', $lastuser='')
 		//second, extract data from first reg
 	 	$sql='SELECT * FROM '.$tbl_wiki.'WHERE reflink="'.$id_or_ref.'" AND '.$groupfilter.' ORDER BY id ASC'; //id_or_ref is reflink from tblwiki
 		
-		$result=api_sql_query($sql,__LINE__,__FILE__);
+		$result=Database::query($sql,__LINE__,__FILE__);
 		$row=Database::fetch_array($result);
 		
 		$id=$row['id'];
@@ -1615,7 +1615,7 @@ function check_emailcue($id_or_ref, $type, $lastime='', $lastuser='')
 			$allow_send_mail=true; //if visibility off - notify off	
 		
 			$sql='SELECT * FROM '.$tbl_wiki_mailcue.'WHERE id="'.$id.'" AND type="'.$type.'" OR type="F" AND group_id="'.$_clean['group_id'].'"'; //type: P=page, D=discuss, F=full.		
-			$result=api_sql_query($sql,__LINE__,__FILE__);
+			$result=Database::query($sql,__LINE__,__FILE__);
 			
 			$emailtext=get_lang('EmailWikipageModified').' <strong>'.$email_page_name.'</strong> '.get_lang('Wiki');
 		}
@@ -1645,7 +1645,7 @@ function check_emailcue($id_or_ref, $type, $lastime='', $lastuser='')
 		
 		$sql='SELECT * FROM '.$tbl_wiki.'WHERE id="'.$id.'" ORDER BY id ASC';
 		
-		$result=api_sql_query($sql,__LINE__,__FILE__);
+		$result=Database::query($sql,__LINE__,__FILE__);
 		$row=Database::fetch_array($result);
 		
 		$email_page_name=$row['title'];
@@ -1656,7 +1656,7 @@ function check_emailcue($id_or_ref, $type, $lastime='', $lastuser='')
 			$allow_send_mail=true; //if visibility off - notify off				
 				
 			$sql='SELECT * FROM '.$tbl_wiki_mailcue.'WHERE id="'.$id.'" AND type="'.$type.'" OR type="F" AND group_id="'.$_clean['group_id'].'"'; //type: P=page, D=discuss, F=full
-			$result=api_sql_query($sql,__LINE__,__FILE__);			
+			$result=Database::query($sql,__LINE__,__FILE__);			
 			
 			$emailtext=get_lang('EmailWikiPageDiscAdded').' <strong>'.$email_page_name.'</strong> '.get_lang('Wiki');
 		}
@@ -1668,7 +1668,7 @@ function check_emailcue($id_or_ref, $type, $lastime='', $lastuser='')
 	
 		$sql='SELECT * FROM '.$tbl_wiki.' ORDER BY id DESC'; //the added is always the last
 		
-		$result=api_sql_query($sql,__LINE__,__FILE__);
+		$result=Database::query($sql,__LINE__,__FILE__);
 		$row=Database::fetch_array($result);
 		
 		$email_page_name=$row['title'];
@@ -1702,7 +1702,7 @@ function check_emailcue($id_or_ref, $type, $lastime='', $lastuser='')
 		}		
 		
 		$sql='SELECT * FROM '.$tbl_wiki_mailcue.'WHERE id="'.$id.'" AND type="F" AND group_id="'.$_clean['group_id'].'"'; //type: P=page, D=discuss, F=full
-		$result=api_sql_query($sql,__LINE__,__FILE__);
+		$result=Database::query($sql,__LINE__,__FILE__);
 	
 		$emailtext=get_lang('EmailWikiPageAdded').' <strong>'.$email_page_name.'</strong> '.get_lang('In').' '. get_lang('Wiki');
 	}
@@ -1722,7 +1722,7 @@ function check_emailcue($id_or_ref, $type, $lastime='', $lastuser='')
 		$email_date_changes=$today;	
 		
 		$sql='SELECT * FROM '.$tbl_wiki_mailcue.'WHERE id="'.$id.'" AND type="F" AND group_id="'.$_clean['group_id'].'"'; //type: P=page, D=discuss, F=wiki
-		$result=api_sql_query($sql,__LINE__,__FILE__);
+		$result=Database::query($sql,__LINE__,__FILE__);
 				
 		$emailtext=get_lang('EmailWikipageDedeleted');
 	}			
@@ -1857,7 +1857,7 @@ function auto_add_page_users($assignment_type)
 
 	//data about teacher
 	$userinfo=Database::get_user_info_from_id(api_get_user_id());
-	require_once(api_get_path(INCLUDE_PATH).'/lib/usermanager.lib.php');
+	require_once api_get_path(INCLUDE_PATH).'/lib/usermanager.lib.php';
 	if (api_get_user_id()<>0)
 	{		
 		$image_path = UserManager::get_user_picture_path_by_id(api_get_user_id(),'web',false, true);
@@ -1991,7 +1991,7 @@ function display_wiki_search_results($search_term, $search_content=0)
 		}
 	}
 
-	$result=api_sql_query($sql,__LINE__,__FILE__);
+	$result=Database::query($sql,__LINE__,__FILE__);
 
 	//show table
 	if (mysql_num_rows($result) > 0)