chamilo / chamilo-lms

main/resourcelinker/resourcelinker.php

Indentation +462 added lines, -462 removed lines

@@ -79,81 +79,81 @@ 
 */
 if ($from_learnpath == 'yes')
 {
-	//start from clear every time in LearnPath Builder
-	$_SESSION['addedresource'] = null;
-	$_SESSION['addedresourceid'] = null;
-	$_SESSION['addedresourceassigned'] = null;
-	unset ($_SESSION['addedresource']);
-	unset ($_SESSION['addedresourceid']);
-	unset ($_SESSION['addedresourceassigned']);
+    //start from clear every time in LearnPath Builder
+    $_SESSION['addedresource'] = null;
+    $_SESSION['addedresourceid'] = null;
+    $_SESSION['addedresourceassigned'] = null;
+    unset ($_SESSION['addedresource']);
+    unset ($_SESSION['addedresourceid']);
+    unset ($_SESSION['addedresourceassigned']);
 }
 
 // Process a new chapter?
 if (!empty ($_POST['add_dir']) && !empty ($_POST['title']))
 {
-	$title = $_POST['title'];
-	$description = '';
-	if (!empty ($_POST['description']))
-	{
-		$description = $_POST['description'];
-	}
-
-	// get max display_order so far in this parent chapter
-	$sql = "SELECT MAX(display_order) FROM $tbl_learnpath_chapter WHERE learnpath_id = $learnpath_id "." AND parent_chapter_id = $chapter_id";
-	$res = Database::query($sql);
-	$row = Database::fetch_array($res);
-	$max_temp = $row[0];
-
-	$sql = "SELECT MAX(display_order) FROM $tbl_learnpath_item WHERE "." chapter_id = $chapter_id";
-	$res = Database::query($sql);
-	$row = Database::fetch_array($res);
-	$max_temp2 = $row[0];
-	if ($max_temp2 > $max_temp)
-	{
-		$order = $max_temp2 +1;
-	}
-	else
-	{
-		$order = $max_temp +1;
-	}
-
-	$sql = "INSERT INTO $tbl_learnpath_chapter "."(learnpath_id,chapter_name,chapter_description,parent_chapter_id,display_order) "." VALUES "."($learnpath_id, '$title', '$description', $chapter_id, $order )";
-	$res = Database::query($sql);
-	if ($res !== false)
-	{
-		$title = '';
-		$description = '';
-	}
+    $title = $_POST['title'];
+    $description = '';
+    if (!empty ($_POST['description']))
+    {
+        $description = $_POST['description'];
+    }
+
+    // get max display_order so far in this parent chapter
+    $sql = "SELECT MAX(display_order) FROM $tbl_learnpath_chapter WHERE learnpath_id = $learnpath_id "." AND parent_chapter_id = $chapter_id";
+    $res = Database::query($sql);
+    $row = Database::fetch_array($res);
+    $max_temp = $row[0];
+
+    $sql = "SELECT MAX(display_order) FROM $tbl_learnpath_item WHERE "." chapter_id = $chapter_id";
+    $res = Database::query($sql);
+    $row = Database::fetch_array($res);
+    $max_temp2 = $row[0];
+    if ($max_temp2 > $max_temp)
+    {
+        $order = $max_temp2 +1;
+    }
+    else
+    {
+        $order = $max_temp +1;
+    }
+
+    $sql = "INSERT INTO $tbl_learnpath_chapter "."(learnpath_id,chapter_name,chapter_description,parent_chapter_id,display_order) "." VALUES "."($learnpath_id, '$title', '$description', $chapter_id, $order )";
+    $res = Database::query($sql);
+    if ($res !== false)
+    {
+        $title = '';
+        $description = '';
+    }
 }
 
 // This if when a external link is submitted
 if (!empty ($_POST['external_link_submit']))
 {
-	$add = true;
-	if ($add_2_links != "niet toevoegen")
-	{
-		// add external link to the links table.
-		$pos = strpos($external_link, 'ttp:');
-		if ($pos == '')
-		{
-			$external_link = 'http://'.$external_link;
-		}
-
-		$sql = "INSERT INTO $link_table (url, title, category_id) VALUES ('$external_link','$external_link','$add_2_links')";
-		$result = Database::query($sql);
-		$addedresource[] = "Link";
-		$addedresourceid[] = Database::insert_id();
-		$_SESSION['addedresource'] = $addedresource;
-		$_SESSION['addedresourceid'] = $addedresourceid;
-	}
-	else
-	{
-		// do not add external link to the links table
-		$addedresource[] = "Externallink";
-		$addedresourceid[] = $external_link;
-		$_SESSION['addedresource'] = $addedresource;
-		$_SESSION['addedresourceid'] = $addedresourceid;
-	}
+    $add = true;
+    if ($add_2_links != "niet toevoegen")
+    {
+        // add external link to the links table.
+        $pos = strpos($external_link, 'ttp:');
+        if ($pos == '')
+        {
+            $external_link = 'http://'.$external_link;
+        }
+
+        $sql = "INSERT INTO $link_table (url, title, category_id) VALUES ('$external_link','$external_link','$add_2_links')";
+        $result = Database::query($sql);
+        $addedresource[] = "Link";
+        $addedresourceid[] = Database::insert_id();
+        $_SESSION['addedresource'] = $addedresource;
+        $_SESSION['addedresourceid'] = $addedresourceid;
+    }
+    else
+    {
+        // do not add external link to the links table
+        $addedresource[] = "Externallink";
+        $addedresourceid[] = $external_link;
+        $_SESSION['addedresource'] = $addedresource;
+        $_SESSION['addedresourceid'] = $addedresourceid;
+    }
 }
 
 // loading the session variables into local array
@@ -163,107 +163,107 @@ 
 // This is when a resource was added to the session
 if ($add)
 {
-	// adding the new variable to the local array
-	if (empty ($_POST['external_link_submit']))
-	{
-		//that case is already arranged, see upwards
-		$addedresource[] = $content;
-		$addedresourceid[] = $add;
-	}
-	$addedresourceassigned[] = 0;
-
-	// loading the local array into the session variable
-	$_SESSION['addedresource'] = $addedresource;
-	$_SESSION['addedresourceid'] = $addedresourceid;
+    // adding the new variable to the local array
+    if (empty ($_POST['external_link_submit']))
+    {
+        //that case is already arranged, see upwards
+        $addedresource[] = $content;
+        $addedresourceid[] = $add;
+    }
+    $addedresourceassigned[] = 0;
+
+    // loading the local array into the session variable
+    $_SESSION['addedresource'] = $addedresource;
+    $_SESSION['addedresourceid'] = $addedresourceid;
+
+    //---------------------------------------
+    //we assign to chapters immediately !
+    //---------------------------------------
+    $resource_added = false;
+    if ($from_learnpath == 'yes')
+    {
+        $i = 0;
+        //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);
+        if(Database::num_rows($result)==0){
+            $lastorder_item = 0;
+        }else{
+            $row = Database::fetch_array($result);
+            $lastorder_item = ($row[0]);
+        }
+        $sql = "SELECT MAX(display_order) FROM $tbl_learnpath_chapter WHERE parent_chapter_id=$chapter_id";
+        $result = Database::query($sql);
+        if(Database::num_rows($result)==0){
+            $lastorder_chapter = 0;
+        }else{
+            $row = Database::fetch_array($result);
+            $lastorder_chapter = ($row[0]);
+        }
+        $lastorder = ($lastorder_chapter>$lastorder_item?$lastorder_chapter+1:$lastorder_item+1);
 
-	//---------------------------------------
-	//we assign to chapters immediately !
-	//---------------------------------------
-	$resource_added = false;
-	if ($from_learnpath == 'yes')
-	{
-		$i = 0;
-		//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);
-		if(Database::num_rows($result)==0){
-			$lastorder_item = 0;
-		}else{
-			$row = Database::fetch_array($result);
-			$lastorder_item = ($row[0]);
-		}
-		$sql = "SELECT MAX(display_order) FROM $tbl_learnpath_chapter WHERE parent_chapter_id=$chapter_id";
-		$result = Database::query($sql);
-		if(Database::num_rows($result)==0){
-			$lastorder_chapter = 0;
-		}else{
-			$row = Database::fetch_array($result);
-			$lastorder_chapter = ($row[0]);
-		}
-		$lastorder = ($lastorder_chapter>$lastorder_item?$lastorder_chapter+1:$lastorder_item+1);
-
-		foreach ($addedresource as $addedresource_item)
-		{
-			// in the case we added a chapter, add this into the chapters list with the correct parent_id
-			if ($addedresource_item == "Chap")
-			{
-				$sql = "INSERT INTO $tbl_learnpath_chapter ("."'learnpath_id','chapter_name','chapter_description','parent_chapter_id','display_order'".") VALUES (".$learnpath_id.",'".$learnpath_chapter_name."','".$learnpath_chapter_description."',".$chapter_id.",".$lastorder.")";
-				Database::query($sql);
-			}
-
-			if (!$addedresourceassigned[$i])
-			{
-				//not to assign it twice
-				if ($addedresource_item == "Ass")
-				{
-					$addedresource_item = "Assignments";
-				}
-				if ($addedresource_item == "Drop")
-				{
-					$addedresource_item = "Dropbox";
-				}
-				if ($addedresource_item == "Intro")
-				{
-					$addedresource_item = "Introduction_text";
-				}
-				if ($addedresource_item == "Course_desc")
-				{
-					$addedresource_item = "Course_description";
-				}
-				if ($addedresource_item == "Group")
-				{
-					$addedresource_item = "Groups";
-				}
-				if ($addedresource_item == "User")
-				{
-					$addedresource_item = "Users";
-				}
-				if ($target == '')
-				{
-					$target = '_self';
-				}
-				if ($addedresource_item == 'Link')
-				{
-					$addedresource_item .= ' '.$target;
-				}
-				$sql = "INSERT INTO $tbl_learnpath_item (id, chapter_id, item_type, item_id, display_order) VALUES ( '$autoid', '$chapter_id', '$addedresource_item','$addedresourceid[$i]','".$lastorder."')";
-				$result = Database::query($sql);
-				$addedresourceassigned[$i] = 1;
-				$resource_added = true;
-			}
-			$i ++;
-			$lastorder ++;
-		}
-		//$_SESSION['addedresource']=null;
-		//$_SESSION['addedresourceid']=null;
-		// cleaning up the session once again
-		$_SESSION['addedresource'] = null;
-   		$_SESSION['addedresourceid'] = null;
-   		$_SESSION['addedresourceassigned'] = null;
-   		unset ($_SESSION['addedresource']);
-   		unset ($_SESSION['addedresourceid']);
-   		unset ($_SESSION['addedresourceassigned']);
-	}
+        foreach ($addedresource as $addedresource_item)
+        {
+            // in the case we added a chapter, add this into the chapters list with the correct parent_id
+            if ($addedresource_item == "Chap")
+            {
+                $sql = "INSERT INTO $tbl_learnpath_chapter ("."'learnpath_id','chapter_name','chapter_description','parent_chapter_id','display_order'".") VALUES (".$learnpath_id.",'".$learnpath_chapter_name."','".$learnpath_chapter_description."',".$chapter_id.",".$lastorder.")";
+                Database::query($sql);
+            }
+
+            if (!$addedresourceassigned[$i])
+            {
+                //not to assign it twice
+                if ($addedresource_item == "Ass")
+                {
+                    $addedresource_item = "Assignments";
+                }
+                if ($addedresource_item == "Drop")
+                {
+                    $addedresource_item = "Dropbox";
+                }
+                if ($addedresource_item == "Intro")
+                {
+                    $addedresource_item = "Introduction_text";
+                }
+                if ($addedresource_item == "Course_desc")
+                {
+                    $addedresource_item = "Course_description";
+                }
+                if ($addedresource_item == "Group")
+                {
+                    $addedresource_item = "Groups";
+                }
+                if ($addedresource_item == "User")
+                {
+                    $addedresource_item = "Users";
+                }
+                if ($target == '')
+                {
+                    $target = '_self';
+                }
+                if ($addedresource_item == 'Link')
+                {
+                    $addedresource_item .= ' '.$target;
+                }
+                $sql = "INSERT INTO $tbl_learnpath_item (id, chapter_id, item_type, item_id, display_order) VALUES ( '$autoid', '$chapter_id', '$addedresource_item','$addedresourceid[$i]','".$lastorder."')";
+                $result = Database::query($sql);
+                $addedresourceassigned[$i] = 1;
+                $resource_added = true;
+            }
+            $i ++;
+            $lastorder ++;
+        }
+        //$_SESSION['addedresource']=null;
+        //$_SESSION['addedresourceid']=null;
+        // cleaning up the session once again
+        $_SESSION['addedresource'] = null;
+            $_SESSION['addedresourceid'] = null;
+            $_SESSION['addedresourceassigned'] = null;
+            unset ($_SESSION['addedresource']);
+            unset ($_SESSION['addedresourceid']);
+            unset ($_SESSION['addedresourceassigned']);
+    }
 }
 
 /*
@@ -278,64 +278,64 @@ 
 */
 if ($_GET["source_id"])
 {
-	switch ($_GET["source_id"])
-	{
-		case "1" : // coming from Agenda
-			if ($action == "edit")
-			{
-				$url = "../calendar/agenda.php?action=edit&id=49&originalresource=$originalresource";
-			}
-			elseif ($action == "add")
-		{
-				$url = "../calendar/agenda.php?action=add&originalresource=$originalresource";
-			}
-			else
-			{
-				$url = "../calendar/agenda.php?action=add";
-			}
-			$originaltoolname = get_lang("Agenda");
-			$breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
-			unset($_SESSION['from_learnpath']);
-			unset ($from_learnpath);
-			break;
-		case "2" : // coming from forum: new topic
-			$url = "../phpbb/newtopic.php?forum=$source_forum&md5=$md5";
-			$originaltoolname = get_lang("ForumAddNewTopic");
-			$breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
-			unset($_SESSION['from_learnpath']);
-			unset ($from_learnpath);
-			break;
-		case "3" : // coming from forum: edit topic
-			$url = "../phpbb/editpost.php?post_id=$post_id&topic=$topic&forum=$forum&md5=$md5&originalresource=no";
-			$originaltoolname = get_lang("ForumEditTopic");
-			$breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
-			unset($_SESSION['from_learnpath']);
-			unset ($from_learnpath);
-			break;
-		case "4" : // coming from exercises: edit topic
-			$url = "../exercise/admin.php?modifyAnswers=$modifyAnswers";
-			$originaltoolname = get_lang("ExerciseAnswers");
-			$breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
-			unset($_SESSION['from_learnpath']);
-			unset ($from_learnpath);
-			break;
-		case "5" : // coming from learning path
-			$from_learnpath = 'yes';
-			Session::write('from_learnpath',$from_learnpath);
-			break;
-			/*************************************** end add Frederik.Vermeire@pandora.be *********************************/
-
-	}
-	// We do not come from the learning path. We store the name of the tool & url in a session.
-	if ($from_learnpath != 'yes')
-	{
-		if (!$_SESSION["origintoolurl"] OR $_SESSION["origintoolurl"]<>$interbreadcrumb["url"])
-		{
-			$_SESSION["origintoolurl"] = $breadcrumbelement["url"];
-			$_SESSION["origintoolname"] = $breadcrumbelement["name"];
-			$interbreadcrumb = "";
-		}
-	}
+    switch ($_GET["source_id"])
+    {
+        case "1" : // coming from Agenda
+            if ($action == "edit")
+            {
+                $url = "../calendar/agenda.php?action=edit&id=49&originalresource=$originalresource";
+            }
+            elseif ($action == "add")
+        {
+                $url = "../calendar/agenda.php?action=add&originalresource=$originalresource";
+            }
+            else
+            {
+                $url = "../calendar/agenda.php?action=add";
+            }
+            $originaltoolname = get_lang("Agenda");
+            $breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
+            unset($_SESSION['from_learnpath']);
+            unset ($from_learnpath);
+            break;
+        case "2" : // coming from forum: new topic
+            $url = "../phpbb/newtopic.php?forum=$source_forum&md5=$md5";
+            $originaltoolname = get_lang("ForumAddNewTopic");
+            $breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
+            unset($_SESSION['from_learnpath']);
+            unset ($from_learnpath);
+            break;
+        case "3" : // coming from forum: edit topic
+            $url = "../phpbb/editpost.php?post_id=$post_id&topic=$topic&forum=$forum&md5=$md5&originalresource=no";
+            $originaltoolname = get_lang("ForumEditTopic");
+            $breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
+            unset($_SESSION['from_learnpath']);
+            unset ($from_learnpath);
+            break;
+        case "4" : // coming from exercises: edit topic
+            $url = "../exercise/admin.php?modifyAnswers=$modifyAnswers";
+            $originaltoolname = get_lang("ExerciseAnswers");
+            $breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
+            unset($_SESSION['from_learnpath']);
+            unset ($from_learnpath);
+            break;
+        case "5" : // coming from learning path
+            $from_learnpath = 'yes';
+            Session::write('from_learnpath',$from_learnpath);
+            break;
+            /*************************************** end add Frederik.Vermeire@pandora.be *********************************/
+
+    }
+    // We do not come from the learning path. We store the name of the tool & url in a session.
+    if ($from_learnpath != 'yes')
+    {
+        if (!$_SESSION["origintoolurl"] OR $_SESSION["origintoolurl"]<>$interbreadcrumb["url"])
+        {
+            $_SESSION["origintoolurl"] = $breadcrumbelement["url"];
+            $_SESSION["origintoolname"] = $breadcrumbelement["name"];
+            $interbreadcrumb = "";
+        }
+    }
 
 }
 
@@ -343,26 +343,26 @@ 
 // the information from the session. Else we use the information of the learningpath itself.
 if ($from_learnpath != 'yes')
 {
-	$nameTools = get_lang('AddResource');
-	$interbreadcrumb[] = array ("url" => $_SESSION["origintoolurl"], "name" => $_SESSION["origintoolname"]);
+    $nameTools = get_lang('AddResource');
+    $interbreadcrumb[] = array ("url" => $_SESSION["origintoolurl"], "name" => $_SESSION["origintoolname"]);
 }
 else
 {
-	$learnpath_select_query = "	SELECT * FROM $tbl_learnpath_main
+    $learnpath_select_query = "	SELECT * FROM $tbl_learnpath_main
 		  								WHERE learnpath_id=$learnpath_id";
-	$sql_result = Database::query($learnpath_select_query);
-	$therow = Database::fetch_array($sql_result);
+    $sql_result = Database::query($learnpath_select_query);
+    $therow = Database::fetch_array($sql_result);
 
-	$learnpath_chapter_query = "	SELECT * FROM $tbl_learnpath_chapter
+    $learnpath_chapter_query = "	SELECT * FROM $tbl_learnpath_chapter
 		  								WHERE (learnpath_id = '$learnpath_id' and id = '$chapter_id')";
-	$sql_result = Database::query($learnpath_chapter_query);
-	$therow2 = Database::fetch_array($sql_result);
+    $sql_result = Database::query($learnpath_chapter_query);
+    $therow2 = Database::fetch_array($sql_result);
 
-	$from_learnpath = 'yes';
-	$_SESSION['from_learnpath'] = $from_learnpath;
-	$interbreadcrumb[] = array ("url" => "../scorm/scormdocument.php", "name" => get_lang('LearningPath'));
-	$interbreadcrumb[] = array ("url" => "../learnpath/learnpath_handler.php?learnpath_id=$learnpath_id", "name" => "{$therow['learnpath_name']}");
-	$interbreadcrumb[] = array ("url" => api_get_self()."?action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no", "name" => "{$therow2['chapter_name']}");
+    $from_learnpath = 'yes';
+    $_SESSION['from_learnpath'] = $from_learnpath;
+    $interbreadcrumb[] = array ("url" => "../scorm/scormdocument.php", "name" => get_lang('LearningPath'));
+    $interbreadcrumb[] = array ("url" => "../learnpath/learnpath_handler.php?learnpath_id=$learnpath_id", "name" => "{$therow['learnpath_name']}");
+    $interbreadcrumb[] = array ("url" => api_get_self()."?action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no", "name" => "{$therow2['chapter_name']}");
 
 }
 
@@ -380,7 +380,7 @@ 
 echo "<h3>".$nameTools;
 if ($from_learnpath == 'yes')
 {
-	echo get_lang("AddResource")." - {$therow2['chapter_name']}";
+    echo get_lang("AddResource")." - {$therow2['chapter_name']}";
 }
 echo "</h3>";
 
@@ -393,7 +393,7 @@ 
 $result_select_active=Database::query($sql_select_active);
 while ($row=Database::fetch_array($result_select_active))
 {
-	$active_modules[]=$row['name'];
+    $active_modules[]=$row['name'];
 }
 
 
@@ -536,12 +536,12 @@ 
 
 if ($from_learnpath != 'yes')
 {
-	echo "<tr><td>&nbsp;</td></tr>";
-	echo "<tr><td><b>".get_lang('ResourcesAdded')." (";
-	echo count($addedresource);
-	echo ")</b></td></tr>";
-	echo "<tr><td nowrap><a href=\"".api_get_self()."?showresources=true&action=$action&id=$id&learnpath_id=$learnpath_id&chapter_id=$chapter_id&source_forum=$source_forum&originalresource=no\">".get_lang('ShowDelete')."</a>";
-	echo "</td></tr>";
+    echo "<tr><td>&nbsp;</td></tr>";
+    echo "<tr><td><b>".get_lang('ResourcesAdded')." (";
+    echo count($addedresource);
+    echo ")</b></td></tr>";
+    echo "<tr><td nowrap><a href=\"".api_get_self()."?showresources=true&action=$action&id=$id&learnpath_id=$learnpath_id&chapter_id=$chapter_id&source_forum=$source_forum&originalresource=no\">".get_lang('ShowDelete')."</a>";
+    echo "</td></tr>";
 }
 ?>
         <tr>
@@ -557,11 +557,11 @@ 
 
 if ($from_learnpath != 'yes')
 {
-	echo "<form method=\"post\" action=\"{$_SESSION['origintoolurl']}\" style=\"margin: 0px;\"><input type=\"submit\" value=\"".get_lang('Ok')."\"></form>";
+    echo "<form method=\"post\" action=\"{$_SESSION['origintoolurl']}\" style=\"margin: 0px;\"><input type=\"submit\" value=\"".get_lang('Ok')."\"></form>";
 }
 else
 {
-	echo "<form method=\"get\" action=\"../learnpath/learnpath_handler.php\" style=\"margin: 0px;\"><input type=\"hidden\" name=\"learnpath_id\" value=\"".htmlentities($learnpath_id)."\"><input type=\"submit\" value=\"".'  '.get_lang('Ok').'  '."\"></form>";
+    echo "<form method=\"get\" action=\"../learnpath/learnpath_handler.php\" style=\"margin: 0px;\"><input type=\"hidden\" name=\"learnpath_id\" value=\"".htmlentities($learnpath_id)."\"><input type=\"submit\" value=\"".'  '.get_lang('Ok').'  '."\"></form>";
 }
 ?>
 
@@ -577,40 +577,40 @@ 
 
 if ($resource_added)
 {
-	Display :: display_normal_message(get_lang("ResourceAdded"));
+    Display :: display_normal_message(get_lang("ResourceAdded"));
 }
 
 if ($from_learnpath != 'yes')
 {
-	echo count($addedresource)." ".api_strtolower(get_lang('ResourcesAdded'))."<br/>";
+    echo count($addedresource)." ".api_strtolower(get_lang('ResourcesAdded'))."<br/>";
 }
 //echo "<hr>";
 
 // Agenda items -->
 if ($content == "Agenda")
 {
-	$TABLEAGENDA 			= Database::get_course_table(TABLE_AGENDA);
-	$TABLE_ITEM_PROPERTY 	= Database::get_course_table(TABLE_ITEM_PROPERTY);
+    $TABLEAGENDA 			= Database::get_course_table(TABLE_AGENDA);
+    $TABLE_ITEM_PROPERTY 	= Database::get_course_table(TABLE_ITEM_PROPERTY);
 
-	$sql="SELECT agenda.*, toolitemproperties.*
+    $sql="SELECT agenda.*, toolitemproperties.*
 					FROM ".$TABLEAGENDA." agenda, ".$TABLE_ITEM_PROPERTY." toolitemproperties
 					WHERE agenda.id = toolitemproperties.ref
 					AND toolitemproperties.tool='".TOOL_CALENDAR_EVENT."'
 					AND (toolitemproperties.to_group_id='0' OR toolitemproperties.to_group_id IS NULL)
 					AND toolitemproperties.visibility='1'";
 
-	$result = Database::query($sql);
-
-	while ($myrow = Database::fetch_array($result))
-	{
-		echo "<table width=\"100%\"><tr><td bgcolor=\"#E6E6E6\">";
-		echo "<img src='../img/agenda.gif' alt='agenda'>";
-		echo api_convert_and_format_date($myrow["start_date"], null, date_default_timezone_get())."<br />";
-		echo "<b>".$myrow["title"]."</b></td></tr><tr><td>";
-		echo $myrow["content"]."<br />";
-		showorhide_addresourcelink($content, $myrow["id"]);
-		echo "</td></tr></table><br />";
-	}
+    $result = Database::query($sql);
+
+    while ($myrow = Database::fetch_array($result))
+    {
+        echo "<table width=\"100%\"><tr><td bgcolor=\"#E6E6E6\">";
+        echo "<img src='../img/agenda.gif' alt='agenda'>";
+        echo api_convert_and_format_date($myrow["start_date"], null, date_default_timezone_get())."<br />";
+        echo "<b>".$myrow["title"]."</b></td></tr><tr><td>";
+        echo $myrow["content"]."<br />";
+        showorhide_addresourcelink($content, $myrow["id"]);
+        echo "</td></tr></table><br />";
+    }
 } // end if ($_GET["resource"]=="Agenda")
 
 /*
@@ -620,12 +620,12 @@ 
 */
 if ($content == "chapter")
 {
-	echo '<table><form name="add_dir" action="'.'" method="POST">'."\n";
-	echo '  <tr><td>'.get_lang('Title').'</td><td><input type="text" name="title" value="'.$title.'"></input></td></tr>'."\n";
-	echo '  <tr><td>'.get_lang('Description').'</td><td><input type="text" name="description" value="'.$description.'"></input></td></tr>'."\n";
-	echo '  <tr><td></td><td><input type="submit" name="add_dir" value="'.get_lang('AddIt').'"/></td></tr>'."\n";
-	echo '</form></table>'."\n";
-	//echo "<hr>";
+    echo '<table><form name="add_dir" action="'.'" method="POST">'."\n";
+    echo '  <tr><td>'.get_lang('Title').'</td><td><input type="text" name="title" value="'.$title.'"></input></td></tr>'."\n";
+    echo '  <tr><td>'.get_lang('Description').'</td><td><input type="text" name="description" value="'.$description.'"></input></td></tr>'."\n";
+    echo '  <tr><td></td><td><input type="submit" name="add_dir" value="'.get_lang('AddIt').'"/></td></tr>'."\n";
+    echo '</form></table>'."\n";
+    //echo "<hr>";
 }
 
 /*
@@ -640,23 +640,23 @@ 
 //				b. one is a student AND the documents tool is active. Student cannot add documents if the documents tool is inactive (teacher can do this)
 if ($content == "Document" OR (empty($content) AND (api_is_allowed_to_edit() OR in_array(TOOL_DOCUMENT,$active_modules))) AND !$_GET['showresources'])
 {
-	// setting variables for file locations
-	$baseServDir = $_configuration['root_sys'];
-	$courseDir = $_course['path']."/document";
-	$baseWorkDir = $baseServDir.$courseDir;
-	// showing the link to move one folder up (when not in the root folder)
-	show_folder_up($chapter_id);
-	// showing the blue bar with the path in it when we are not in the root
-	if (get_levels($folder))
-	{
-		echo "<table width=\"100%\"><tr><td bgcolor=\"#4171B5\">";
-		echo "<img src=\"../img/opendir.gif\" alt='directory'><font color=\"#ffffff\"><b>";
-		echo $folder."</b></font></td></tr></table>";
-	}
-
-	// showing the documents and subfolders of the folder we are in.
-	show_documents($folder, $chapter_id);
-	//echo "<hr>";
+    // setting variables for file locations
+    $baseServDir = $_configuration['root_sys'];
+    $courseDir = $_course['path']."/document";
+    $baseWorkDir = $baseServDir.$courseDir;
+    // showing the link to move one folder up (when not in the root folder)
+    show_folder_up($chapter_id);
+    // showing the blue bar with the path in it when we are not in the root
+    if (get_levels($folder))
+    {
+        echo "<table width=\"100%\"><tr><td bgcolor=\"#4171B5\">";
+        echo "<img src=\"../img/opendir.gif\" alt='directory'><font color=\"#ffffff\"><b>";
+        echo $folder."</b></font></td></tr></table>";
+    }
+
+    // showing the documents and subfolders of the folder we are in.
+    show_documents($folder, $chapter_id);
+    //echo "<hr>";
 }
 
 /*
@@ -666,8 +666,8 @@ 
 */
 if ($content == "Ad_Valvas")
 {
-	$tbl_announcement = Database :: get_course_table(TABLE_ANNOUNCEMENT);
-	$sql = "SELECT * FROM ".$tbl_announcement." a, ".$item_property_table." i
+    $tbl_announcement = Database :: get_course_table(TABLE_ANNOUNCEMENT);
+    $sql = "SELECT * FROM ".$tbl_announcement." a, ".$item_property_table." i
 			WHERE
 				i.tool = '".TOOL_ANNOUNCEMENT."' AND
 				a.id=i.ref AND
@@ -676,17 +676,17 @@ 
 				i.to_user_id IS NULL
 			ORDER BY a.display_order ASC";
 
-	$result = Database::query($sql);
-	while ($myrow = Database::fetch_array($result))
-	{
-		echo "<table width=\"100%\"><tr><td>";
-		echo "<img src='../img/valves.gif' alt='advalvas'>";
-		echo api_convert_and_format_date($myrow["end_date"], DATE_FORMAT_LONG, date_default_timezone_get());
-		echo "</td></tr><tr><td>";
-		echo $myrow["title"]."<br />";
-		showorhide_addresourcelink($content, $myrow["id"]);
-		echo "</td></tr></table>";
-	}
+    $result = Database::query($sql);
+    while ($myrow = Database::fetch_array($result))
+    {
+        echo "<table width=\"100%\"><tr><td>";
+        echo "<img src='../img/valves.gif' alt='advalvas'>";
+        echo api_convert_and_format_date($myrow["end_date"], DATE_FORMAT_LONG, date_default_timezone_get());
+        echo "</td></tr><tr><td>";
+        echo $myrow["title"]."<br />";
+        showorhide_addresourcelink($content, $myrow["id"]);
+        echo "</td></tr></table>";
+    }
 }
 
 /*
@@ -696,75 +696,75 @@ 
 */
 if ($content == "Forum")
 {
-	$TBL_FORUMS 		= Database::get_course_table(TABLE_FORUM);
-	$TBL_CATAGORIES 	= Database::get_course_table(TABLE_FORUM_CATEGORY);
-	$TBL_FORUMTOPICS 	= Database::get_course_table(TABLE_FORUM_POST);
-	$tbl_posts 			= Database::get_course_table(TABLE_FORUM_POST);
-	$tbl_posts_text 	= Database::get_course_table(TOOL_FORUM_POST_TEXT_TABLE);
-
-	echo "<table width='100%'>";
+    $TBL_FORUMS 		= Database::get_course_table(TABLE_FORUM);
+    $TBL_CATAGORIES 	= Database::get_course_table(TABLE_FORUM_CATEGORY);
+    $TBL_FORUMTOPICS 	= Database::get_course_table(TABLE_FORUM_POST);
+    $tbl_posts 			= Database::get_course_table(TABLE_FORUM_POST);
+    $tbl_posts_text 	= Database::get_course_table(TOOL_FORUM_POST_TEXT_TABLE);
+
+    echo "<table width='100%'>";
+
+    // displaying the categories and the forums
+    if (!$forum and !$thread)
+    {
+        $sql = "SELECT * FROM ".$TBL_FORUMS." forums, ".$TBL_CATAGORIES." categories WHERE forums.cat_id=categories.cat_id ORDER BY forums.cat_id DESC";
+        $result = Database::query($sql);
+        while ($myrow = Database::fetch_array($result))
+        {
+            if ($myrow["cat_title"] !== $old_cat_title)
+            {
+                echo "<tr><td bgcolor='#4171B5' colspan='2'><font color='white'><b>".$myrow["cat_title"]."</b></font></td></tr>";
+            }
+            $old_cat_title = $myrow["cat_title"];
+            echo "<tr><td><img src='../img/forum.gif'><a href='".api_get_self()."?content=Forum&category=".$myrow["cat_id"]."&forum=".$myrow["forum_id"]."&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".$myrow["forum_name"]."</td><td>";
+            showorhide_addresourcelink("Forum", $myrow["forum_id"]);
+            echo "</td></tr>";
+        }
+    }
+    //displaying all the threads of one forum
+    if ($forum)
+    {
+        // displaying the category title
+        $sql = "SELECT * FROM ".$TBL_CATAGORIES." WHERE cat_id=$category";
+        $result = Database::query($sql);
+        $myrow = Database::fetch_array($result);
+        echo "<tr><td bgcolor='#4171B5' colspan='2'><font color='white'><b>".$myrow["cat_title"]."</b></font></td></tr>";
+
+        // displaying the forum title
+        $sql = "SELECT * FROM ".$TBL_FORUMS." forums, ".$TBL_FORUMTOPICS." topics WHERE forums.forum_id=topics.forum_id";
+        $result = Database::query($sql);
+        $myrow = Database::fetch_array($result);
+        echo "<tr><td bgcolor='#cccccc' colspan='2'><b>".$myrow["forum_name"]."</b></td></tr>";
+
+        if (!$thread)
+        {
+            // displaying all the threads of this forum
+            $sql = "SELECT * FROM ".$TBL_FORUMTOPICS." WHERE forum_id=$forum";
+            $result = Database::query($sql);
+            while ($myrow = Database::fetch_array($result))
+            {
+                echo "<tr><td><a href='".api_get_self()."?content=Forum&category=$category&forum=1&thread=".$myrow["topic_id"]."&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".$myrow["topic_title"]."</a>  (".$myrow["prenom"]." ".$myrow["nom"].")</td><td>";
+                showorhide_addresourcelink("Thread", $myrow["topic_id"]);
+                echo "</td></tr>";
+            }
+        }
+        else
+        {
+            // displaying all the replies
+            $sql = "SELECT * FROM ".$tbl_posts." post, ".$tbl_posts_text." post_text WHERE post_text.post_id=post.post_id and post.topic_id=$thread ORDER BY post_text.post_id ASC";
+            $result = Database::query($sql);
+            while ($myrow = Database::fetch_array($result))
+            {
+                echo "<tr><td><b>".$myrow["post_title"]."</b><br>";
+                echo $myrow["post_text"]."</td>";
+                echo "<td>";
+                showorhide_addresourcelink("Post", $myrow["post_id"]);
+                echo "</td></tr><tr><td colspan='2'><hr noshade></td></tr>";
+            }
 
-	// displaying the categories and the forums
-	if (!$forum and !$thread)
-	{
-		$sql = "SELECT * FROM ".$TBL_FORUMS." forums, ".$TBL_CATAGORIES." categories WHERE forums.cat_id=categories.cat_id ORDER BY forums.cat_id DESC";
-		$result = Database::query($sql);
-		while ($myrow = Database::fetch_array($result))
-		{
-			if ($myrow["cat_title"] !== $old_cat_title)
-			{
-				echo "<tr><td bgcolor='#4171B5' colspan='2'><font color='white'><b>".$myrow["cat_title"]."</b></font></td></tr>";
-			}
-			$old_cat_title = $myrow["cat_title"];
-			echo "<tr><td><img src='../img/forum.gif'><a href='".api_get_self()."?content=Forum&category=".$myrow["cat_id"]."&forum=".$myrow["forum_id"]."&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".$myrow["forum_name"]."</td><td>";
-			showorhide_addresourcelink("Forum", $myrow["forum_id"]);
-			echo "</td></tr>";
-		}
-	}
-	//displaying all the threads of one forum
-	if ($forum)
-	{
-		// displaying the category title
-		$sql = "SELECT * FROM ".$TBL_CATAGORIES." WHERE cat_id=$category";
-		$result = Database::query($sql);
-		$myrow = Database::fetch_array($result);
-		echo "<tr><td bgcolor='#4171B5' colspan='2'><font color='white'><b>".$myrow["cat_title"]."</b></font></td></tr>";
-
-		// displaying the forum title
-		$sql = "SELECT * FROM ".$TBL_FORUMS." forums, ".$TBL_FORUMTOPICS." topics WHERE forums.forum_id=topics.forum_id";
-		$result = Database::query($sql);
-		$myrow = Database::fetch_array($result);
-		echo "<tr><td bgcolor='#cccccc' colspan='2'><b>".$myrow["forum_name"]."</b></td></tr>";
-
-		if (!$thread)
-		{
-			// displaying all the threads of this forum
-			$sql = "SELECT * FROM ".$TBL_FORUMTOPICS." WHERE forum_id=$forum";
-			$result = Database::query($sql);
-			while ($myrow = Database::fetch_array($result))
-			{
-				echo "<tr><td><a href='".api_get_self()."?content=Forum&category=$category&forum=1&thread=".$myrow["topic_id"]."&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".$myrow["topic_title"]."</a>  (".$myrow["prenom"]." ".$myrow["nom"].")</td><td>";
-				showorhide_addresourcelink("Thread", $myrow["topic_id"]);
-				echo "</td></tr>";
-			}
-		}
-		else
-		{
-			// displaying all the replies
-			$sql = "SELECT * FROM ".$tbl_posts." post, ".$tbl_posts_text." post_text WHERE post_text.post_id=post.post_id and post.topic_id=$thread ORDER BY post_text.post_id ASC";
-			$result = Database::query($sql);
-			while ($myrow = Database::fetch_array($result))
-			{
-				echo "<tr><td><b>".$myrow["post_title"]."</b><br>";
-				echo $myrow["post_text"]."</td>";
-				echo "<td>";
-				showorhide_addresourcelink("Post", $myrow["post_id"]);
-				echo "</td></tr><tr><td colspan='2'><hr noshade></td></tr>";
-			}
-
-		}
-	}
-	echo "</table>";
+        }
+    }
+    echo "</table>";
 }
 
 /*
@@ -774,57 +774,57 @@ 
 */
 if ($content == "Link")
 {
-	// including the links language file
-	include ("../lang/$language/link.inc.php");
-
-	$tbl_categories = Database::get_course_table(TABLE_LINK_CATEGORY);
-	if (($learnpath_id != '') and ($content == 'Link'))
-	{
-		echo "<form name='learnpath_link'><table>";
-		echo "<tr></td><td align='left'>".get_lang('LinkTarget')." :</td><td align='left'><select name='target' onchange='targetfunc()'><option value='_self' ";
-		if ($target == '_self')
-		{
-			echo "selected";
-		}
-		echo ">".get_lang('SameWindow')."</option><option value='_blank'";
-		if ($target == '_blank')
-		{
-			echo "selected";
-		}
-		echo ">".get_lang('NewWindow')."</option></select></td></tr></table></form>";
-	}
-
-	// showing the links that are in the root (having no category)
-	$sql = "SELECT * FROM ".$link_table." l, ".$item_property_table." ip WHERE (l.category_id=0 or l.category_id IS NULL) AND ip.tool = '".TOOL_LINK."' AND l.id=ip.ref AND ip.visibility='1'";
-	$result = Database::query($sql);
-	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))
-		{
-			echo "<img src='../img/links.gif'>".$myrow["title"];
-			echo "<br>";
-			showorhide_addresourcelink($content, $myrow["id"]);
-			echo "<br><br>";
-		}
-	}
-
-	// showing the categories and the links in it.
-	$sqlcategories = "SELECT * FROM ".$tbl_categories." ORDER by display_order DESC";
-	$resultcategories = Database::query($sqlcategories) or die;
-	while ($myrow = @ Database::fetch_array($resultcategories))
-	{
-		$sql_links = "SELECT * FROM ".$link_table." l, ".$item_property_table." ip WHERE l.category_id='".$myrow["id"]."' AND ip.tool = '".TOOL_LINK."' AND l.id=ip.ref AND ip.visibility='1' ORDER BY l.display_order DESC";
-		echo "<table width=\"100%\"><tr><td bgcolor=\"#E6E6E6\"><i>".$myrow["category_title"]."</i></td></tr></table>";
-		$result_links = Database::query($sql_links);
-		while ($myrow = Database::fetch_array($result_links))
-		{
-			echo "<img src='../img/links.gif' />".$myrow["title"];
-			echo "<br>";
-			showorhide_addresourcelink($content, $myrow["id"]);
-			echo "<br><br>";
-		}
-	}
+    // including the links language file
+    include ("../lang/$language/link.inc.php");
+
+    $tbl_categories = Database::get_course_table(TABLE_LINK_CATEGORY);
+    if (($learnpath_id != '') and ($content == 'Link'))
+    {
+        echo "<form name='learnpath_link'><table>";
+        echo "<tr></td><td align='left'>".get_lang('LinkTarget')." :</td><td align='left'><select name='target' onchange='targetfunc()'><option value='_self' ";
+        if ($target == '_self')
+        {
+            echo "selected";
+        }
+        echo ">".get_lang('SameWindow')."</option><option value='_blank'";
+        if ($target == '_blank')
+        {
+            echo "selected";
+        }
+        echo ">".get_lang('NewWindow')."</option></select></td></tr></table></form>";
+    }
+
+    // showing the links that are in the root (having no category)
+    $sql = "SELECT * FROM ".$link_table." l, ".$item_property_table." ip WHERE (l.category_id=0 or l.category_id IS NULL) AND ip.tool = '".TOOL_LINK."' AND l.id=ip.ref AND ip.visibility='1'";
+    $result = Database::query($sql);
+    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))
+        {
+            echo "<img src='../img/links.gif'>".$myrow["title"];
+            echo "<br>";
+            showorhide_addresourcelink($content, $myrow["id"]);
+            echo "<br><br>";
+        }
+    }
+
+    // showing the categories and the links in it.
+    $sqlcategories = "SELECT * FROM ".$tbl_categories." ORDER by display_order DESC";
+    $resultcategories = Database::query($sqlcategories) or die;
+    while ($myrow = @ Database::fetch_array($resultcategories))
+    {
+        $sql_links = "SELECT * FROM ".$link_table." l, ".$item_property_table." ip WHERE l.category_id='".$myrow["id"]."' AND ip.tool = '".TOOL_LINK."' AND l.id=ip.ref AND ip.visibility='1' ORDER BY l.display_order DESC";
+        echo "<table width=\"100%\"><tr><td bgcolor=\"#E6E6E6\"><i>".$myrow["category_title"]."</i></td></tr></table>";
+        $result_links = Database::query($sql_links);
+        while ($myrow = Database::fetch_array($result_links))
+        {
+            echo "<img src='../img/links.gif' />".$myrow["title"];
+            echo "<br>";
+            showorhide_addresourcelink($content, $myrow["id"]);
+            echo "<br><br>";
+        }
+    }
 }
 
 /*
@@ -834,31 +834,31 @@ 
 */
 if (($content == "Exercise") or ($content == "HotPotatoes"))
 {
-	$TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
-	$result = Database::query("SELECT * FROM ".$TBL_EXERCICES." WHERE active='1' ORDER BY id ASC");
-	while ($myrow = Database::fetch_array($result))
-	{
-		echo "<img src='../img/quiz.gif'>".$myrow["title"]."<br>";
-		showorhide_addresourcelink($content, $myrow["id"]);
-		echo "<br><br>";
-	}
+    $TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
+    $result = Database::query("SELECT * FROM ".$TBL_EXERCICES." WHERE active='1' ORDER BY id ASC");
+    while ($myrow = Database::fetch_array($result))
+    {
+        echo "<img src='../img/quiz.gif'>".$myrow["title"]."<br>";
+        showorhide_addresourcelink($content, $myrow["id"]);
+        echo "<br><br>";
+    }
+
+    if ($from_learnpath == 'yes')
+    {
+        $uploadPath = "/HotPotatoes_files";
+        $TBL_DOCUMENT = Database::get_course_table(TABLE_DOCUMENT);
+        $documentPath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
+        $sql = "SELECT * FROM ".$TBL_DOCUMENT." WHERE (path LIKE '%htm%' OR path LIKE '%html%') AND path LIKE '".$uploadPath."/%/%' ORDER BY id ASC";
+        $result = Database::query($sql);
+        while ($myrow = Database::fetch_array($result))
+        {
+            $path = $myrow["path"];
+            echo "<img src='../img/jqz.gif'>".GetQuizName($path, $documentPath)."<br>";
+            showorhide_addresourcelink("HotPotatoes", $myrow["id"]);
+            echo "<br><br>";
 
-	if ($from_learnpath == 'yes')
-	{
-		$uploadPath = "/HotPotatoes_files";
-		$TBL_DOCUMENT = Database::get_course_table(TABLE_DOCUMENT);
-		$documentPath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
-		$sql = "SELECT * FROM ".$TBL_DOCUMENT." WHERE (path LIKE '%htm%' OR path LIKE '%html%') AND path LIKE '".$uploadPath."/%/%' ORDER BY id ASC";
-		$result = Database::query($sql);
-		while ($myrow = Database::fetch_array($result))
-		{
-			$path = $myrow["path"];
-			echo "<img src='../img/jqz.gif'>".GetQuizName($path, $documentPath)."<br>";
-			showorhide_addresourcelink("HotPotatoes", $myrow["id"]);
-			echo "<br><br>";
-
-		}
-	}
+        }
+    }
 }
 
 /*
@@ -876,10 +876,10 @@ 
       <td align="left"><input name="external_link" type="text" id="external_link" value="http://"></td>
 	  <?php
 
-	if ($learnpath_id != '')
-	{
-		echo "</tr><tr><td align='right'>".get_lang('LinkTarget')." :</td><td align='left'><select name='target'><option value='_self'>".get_lang('SameWindow')."</option><option value='_blank'>".get_lang('NewWindow')."</option></select></td>";
-	}
+    if ($learnpath_id != '')
+    {
+        echo "</tr><tr><td align='right'>".get_lang('LinkTarget')." :</td><td align='left'><select name='target'><option value='_self'>".get_lang('SameWindow')."</option><option value='_blank'>".get_lang('NewWindow')."</option></select></td>";
+    }
 ?>
 	</tr>
     <tr>
@@ -891,14 +891,14 @@ 
 	  <option value="0"><?php echo get_lang('MainCategory'); ?></option>
 		<?php
 
-	$tbl_categories = Database::get_course_table(TABLE_LINK_CATEGORY);
-	$sql = "SELECT * FROM $tbl_categories ORDER BY display_order ASC";
-	echo $sql;
-	$result = Database::query($sql);
-	while ($row = Database::fetch_array($result))
-	{
-		echo "<option value='".$row["id"]."'>".$row["category_title"]."</option>";
-	}
+    $tbl_categories = Database::get_course_table(TABLE_LINK_CATEGORY);
+    $sql = "SELECT * FROM $tbl_categories ORDER BY display_order ASC";
+    echo $sql;
+    $result = Database::query($sql);
+    while ($row = Database::fetch_array($result))
+    {
+        echo "<option value='".$row["id"]."'>".$row["category_title"]."</option>";
+    }
 ?>
 
       </select><?php } ?></td>
@@ -927,7 +927,7 @@ 
 */
 if ($content == "Assignment")
 {
-	echo "<a href=".api_get_self()."?content=Ass&add=Ass&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no>".get_lang('AddAssignmentPage')."</a>";
+    echo "<a href=".api_get_self()."?content=Ass&add=Ass&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no>".get_lang('AddAssignmentPage')."</a>";
 }
 
 /*
@@ -937,7 +937,7 @@ 
 */
 if ($content == "Dropbox")
 {
-	echo "<a href='".api_get_self()."?content=Drop&add=Drop&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('DropboxAdd')."</a>";
+    echo "<a href='".api_get_self()."?content=Drop&add=Drop&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('DropboxAdd')."</a>";
 }
 
 /*
@@ -947,7 +947,7 @@ 
 */
 if ($content == "Introduction_text")
 {
-	echo "<a href='".api_get_self()."?content=Intro&add=Intro&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('IntroductionTextAdd')."</a>";
+    echo "<a href='".api_get_self()."?content=Intro&add=Intro&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('IntroductionTextAdd')."</a>";
 }
 
 /*
@@ -957,7 +957,7 @@ 
 */
 if ($content == "Course_description")
 {
-	echo "<a href='".api_get_self()."?content=Course_desc&add=Course_desc&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('CourseDescriptionAdd')."</a>";
+    echo "<a href='".api_get_self()."?content=Course_desc&add=Course_desc&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('CourseDescriptionAdd')."</a>";
 }
 
 /*
@@ -967,7 +967,7 @@ 
 */
 if ($content == "Groups")
 {
-	echo "<a href='".api_get_self()."?content=Group&add=Group&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('$GroupsAdd')."</a>";
+    echo "<a href='".api_get_self()."?content=Group&add=Group&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('$GroupsAdd')."</a>";
 }
 
 /*
@@ -977,13 +977,13 @@ 
 */
 if ($content == "Users")
 {
-	echo "<a href='".api_get_self()."?content=User&add=User&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('UsersAdd')."</a>";
+    echo "<a href='".api_get_self()."?content=User&add=User&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('UsersAdd')."</a>";
 }
 
 if ($showresources)
 {
-	//echo "<h4>".get_lang('ResourceAdded')."</h4>";
-	display_resources(1);
+    //echo "<h4>".get_lang('ResourceAdded')."</h4>";
+    display_resources(1);
 }
 
 echo "</td></tr></table>";

main/webservices/cm_webservice_course.php

Indentation +511 added lines, -511 removed lines

@@ -10,521 +10,521 @@
  */
 class WSCMCourse extends WSCM
 {
-	/**
-	 * Deletes a course (helper method)
-	 *
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @return mixed True if the course was successfully deleted, WSError otherwise
-	 */
-	protected function deleteCourseHelper($course_id_field_name, $course_id_value) {
-		$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-		if($course_id instanceof WSCMError) {
-			return $course_id;
-		} else {
-			$course_code = CourseManager::get_course_code_from_course_id($course_id);
-			CourseManager::delete_course($course_code);
-			return true;
-		}
-	}
-
-	/**
-	 * Deletes a course
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name
-	 * @param string Course id value
-	 */
-	public function DeleteCourse($secret_key, $course_id_field_name, $course_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->deleteCourseHelper($course_id_field_name, $course_id_value);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
-
-	/**
-	 * Deletes multiple courses
-	 *
-	 * @param string API secret key
-	 * @param array Array of courses with elements of the form array('course_id_field_name' => 'name_of_field', 'course_id_value' => 'value')
-	 * @return array Array with elements like array('course_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
-	 * than 0, an error occured
-	 */
-	public function DeleteCourses($secret_key, $courses) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$results = array();
-			foreach($courses as $course) {
-				$result_tmp = array();
-				$result_op = $this->deleteCourseHelper($course['course_id_field_name'], $course['course_id_value']);
-				$result_tmp['course_id_value'] = $course['course_id_value'];
-				if($result_op instanceof WSCMError) {
-					// Return the error in the results
-					$result_tmp['result'] = $result_op->toArray();
-				} else {
-					$result_tmp['result'] = $this->getSuccessfulResult();
-				}
-				$results[] = $result_tmp;
-			}
-			return $results;
-		}
-	}
-
-	/**
-	 * Creates a course (helper method)
-	 *
-	 * @param string Title
-	 * @param string Category code
-	 * @param string Wanted code. If it's not defined, it will be generated automatically
-	 * @param string Tutor name
-	 * @param string Course admin user id field name
-	 * @param string Course admin user id value
-	 * @param string Course language
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param array Course extra fields
-	 * @return mixed Generated id if creation was successful, WSError otherwise
-	 */
-	protected function createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras) {
-		// Add the original course id field name and value to the extra fields if needed
-		$extras_associative = array();
-		if($course_id_field_name != "chamilo_course_id") {
-			$extras_associative[$course_id_field_name] = $course_id_value;
-		}
-		foreach($extras as $extra) {
-			$extras_associative[$extra['field_name']] = $extra['field_value'];
-		}
-		$course_admin_id = $this->getUserId($course_admin_user_id_field_name, $course_admin_user_id_value);
-		if($course_admin_id instanceof WSError) {
-			return $course_admin_id;
-		}
-		if($wanted_code == '') {
-			$wanted_code = CourseManager::generate_course_code($title);
-		}
-		$result = create_course($wanted_code, $title, $tutor_name, $category_code, $language, $course_admin_id, $this->_configuration['db_prefix'], 0);
-		if (!$result) {
-			return new WSError(202, 'There was an error creating the course');
-		} else {
-			// Update extra fields
-			foreach($extras_associative as $fname => $fvalue) {
-				CourseManager::update_course_extra_field_value($result, $fname, $fvalue);
-			}
-			// Get course id
-			$course_info = CourseManager::get_course_information($result);
-			return $course_info['real_id'];
-		}
-	}
-
-	/**
-	 * Creates a course
-	 *
-	 * @param string API secret key
-	 * @param string Title
-	 * @param string Category code
-	 * @param string Wanted code. If it's not defined, it will be generated automatically
-	 * @param string Tutor name
-	 * @param string Course admin user id field name
-	 * @param string Course admin user id value
-	 * @param string Course language
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param array Course extra fields
-	 * @return int Course id generated
-	 */
-	public function CreateCourse($secret_key, $title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras) {
-		// First, verify the secret key
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			} else {
-				return $result;
-			}
-		}
-	}
-
-	/**
-	 * Create multiple courses
-	 *
-	 * @param string API secret key
-	 * @param array Courses to be created, with elements following the structure presented in CreateCourse
-	 * @return array Array with elements of the form array('course_id_value' => 'original value sent', 'course_id_generated' => 'value_generated', 'result' => array('code' => 0, 'message' => 'Operation was successful'))
-	 */
-	public function CreateCourses($secret_key, $courses) {
-		// First, verify the secret key
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSCMError) {
-			$this->handleError($verifKey);
-		} else {
-			$results = array();
-			foreach($courses as $course) {
-				$result_tmp = array();
-				//reinitialize variables just in case
-				$title = $category_code = $wanted_code = $tutor_name = $course_admin_user_id_field_name = $course_admin_user_id_value = $language = $course_id_field_name = $course_id_value = $extras = null;
-				extract($course);
-				$result = $this->createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras);
-				if($result instanceof WSCMError) {
-					$result_tmp['result'] = $result->toArray();
-					$result_tmp['course_id_value'] = $course_id_value;
-					$result_tmp['course_id_generated'] = 0;
-				} else {
-					$result_tmp['result'] = $this->getSuccessfulResult();
-					$result_tmp['course_id_value'] = $course_id_value;
-					$result_tmp['course_id_generated'] = $result;
-				}
-				$results[] = $result_tmp;
-			}
-			return $results;
-		}
-	}
-
-	/**
-	 * Edits a course (helper method)
-	 *
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param string Title
-	 * @param string Category code
-	 * @param string Department name
-	 * @param string Department url
-	 * @param string Course language
-	 * @param int Visibility
-	 * @param int Subscribe (0 = denied, 1 = allowed)
-	 * @param int Unsubscribe (0 = denied, 1 = allowed)
-	 * @param string Visual code
-	 * @param array Course extra fields
-	 * @return mixed True in case of success, WSError otherwise
-	 */
-	protected function editCourseHelper($course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras) {
-		$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-		if($course_id instanceof WSCMError) {
-			return $course_id;
-		} else {
-			$attributes = array();
-			if(!empty($title)) {
-				$attributes['title'] = $title;
-			}
-			if(!empty($category_code)) {
-				$attributes['category_code'] = $category_code;
-			}
-			if(!empty($department_name)) {
-				$attributes['department_name'] = $department_name;
-			}
-			if(!empty($department_url)) {
-				$attributes['department_url'] = $department_url;
-			}
-			if(!empty($language)) {
-				$attributes['course_language'] = $language;
-			}
-			if($visibility != '') {
-				$attributes['visibility'] = (int)$visibility;
-			}
-			if($subscribe != '') {
-				$attributes['subscribe'] = (int)$subscribe;
-			}
-			if($unsubscribe != '') {
-				$attributes['unsubscribe'] = (int)$unsubscribe;
-			}
-			if(!empty($visual_code)) {
-				$attributes['visual_code'] = $visual_code;
-			}
-			if(!empty($attributes)) {
-				CourseManager::update_attributes($course_id, $attributes);
-			}
-			if(!empty($extras)) {
-				$course_code = CourseManager::get_course_code_from_course_id($course_id);
-				$extras_associative = array();
-				foreach($extras as $extra) {
-					$extras_associative[$extra['field_name']] = $extra['field_value'];
-				}
-				foreach($extras_associative as $fname => $fvalue) {
-					CourseManager::update_extra_field_value($course_code, $fname, $fvalue);
-				}
-			}
-			return true;
-		}
-	}
-
-	/**
-	 * Edits a course
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param string Title
-	 * @param string Category code
-	 * @param string Department name
-	 * @param string Department url
-	 * @param string Course language
-	 * @param int Visibility
-	 * @param int Subscribe (0 = denied, 1 = allowed)
-	 * @param int Unsubscribe (0 = denied, 1 = allowed)
-	 * @param string Visual code
-	 * @param array Course extra fields
-	 */
-	public function EditCourse($secret_key, $course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSCMError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->editCourseHelper($course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras);
-			if($result instanceof WSCMError) {
-				$this->handleError($result);
-			}
-		}
-	}
-
-	/**
-	 * List courses
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name. Use "chamilo_course_id" to use internal id
-	 * @return array An array with elements of the form ('id' => 'Course internal id', 'code' => 'Course code', 'title' => 'Course title', 'language' => 'Course language', 'visibility' => 'Course visibility',
-	 * 'category_name' => 'Name of the category of the course', 'number_students' => 'Number of students in the course', 'external_course_id' => 'External course id')
-	 */
-	public function ListCourses($secret_key, $course_id_field_name) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$courses_result = array();
-			$category_names = array();
-
-			$courses = CourseManager::get_courses_list();
-			foreach($courses as $course) {
-				$course_tmp = array();
-				$course_tmp['id'] = $course['id'];
-				$course_tmp['code'] = $course['code'];
-				$course_tmp['title'] = $course['title'];
-				$course_tmp['language'] = $course['course_language'];
-				$course_tmp['visibility'] = $course['visibility'];
-
-				// Determining category name
-				if($category_names[$course['category_code']]) {
-					$course_tmp['category_name'] = $category_names[$course['category_code']];
-				} else {
-					$category = CourseManager::get_course_category($course['category_code']);
-					$category_names[$course['category_code']] = $category['name'];
-					$course_tmp['category_name'] = $category['name'];
-				}
-
-				// Determining number of students registered in course
-				$user_list = CourseManager::get_user_list_from_course_code($course['code']);
-				$course_tmp['number_students'] = count($user_list);
-
-				// Determining external course id
-				$course_tmp['external_course_id'] = CourseManager::get_course_extra_field_value($course_id_field_name, $course['code']);
-
-
-				$courses_result[] = $course_tmp;
-			}
-
-			return $courses_result;
-		}
-	}
-
-	/**
-	 * Subscribe or unsubscribe user to a course (helper method)
-	 *
-	 * @param string Course id field name. Use "chamilo_course_id" to use internal id
-	 * @param string Course id value.
-	 * @param string User id field name. Use "chamilo_user_id" to use internal id
-	 * @param string User id value
-	 * @param int Set to 1 to subscribe, 0 to unsubscribe
-	 * @param int Status (STUDENT or TEACHER) Used for subscription only
-	 * @return mixed True if subscription or unsubscription was successful, false otherwise
-	 */
-	protected function changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $state, $status = STUDENT) {
-		$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-		if($course_id instanceof WSError) {
-			return $course_id;
-		} else {
-			$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-			if($user_id instanceof WSError) {
-				return $user_id;
-			} else {
-				$course_code = CourseManager::get_course_code_from_course_id($course_id);
-				if($state == 0) {
-					// Unsubscribe user
-					CourseManager::unsubscribe_user($user_id, $course_code);
-					return true;
-				} else {
-					// Subscribe user
-					if(CourseManager::subscribe_user($user_id, $course_code, $status)) {
-						return true;
-					} else {
-						return new WSError(203, 'An error occured subscribing to this course');
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Subscribe user to a course
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name. Use "chamilo_course_id" to use internal id
-	 * @param string Course id value.
-	 * @param string User id field name. Use "chamilo_user_id" to use internal id
-	 * @param string User id value
-	 * @param int Status (1 = Teacher, 5 = Student)
-	 */
-	public function SubscribeUserToCourse($secret_key, $course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $status) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, 1, $status);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
-
-	/**
-	 * Unsusbscribe user from course
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name. Use "chamilo_course_id" to use internal id
-	 * @param string Course id value.
-	 * @param string User id field name. Use "chamilo_user_id" to use internal id
-	 * @param string User id value
-	 */
-	public function UnsubscribeUserFromCourse($secret_key, $course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, 0);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
-
-	/**
-	 * Returns the descriptions of a course, along with their id
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @return array Returns an array with elements of the form ('course_desc_id' => 1, 'course_desc_title' => 'Title', 'course_desc_content' => 'Content')
-	 */
-	public function GetCourseDescriptions($secret_key, $course_id_field_name, $course_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-			if($course_id instanceof WSError) {
-				return $course_id;
-			} else {
-				// Course exists, get its descriptions
-				$descriptions = CourseDescription::get_descriptions($course_id);
-				$results = array();
-				foreach($descriptions as $description) {
-					$results[] = array('course_desc_id' => $description->get_description_type(),
-						'course_desc_title' => $description->get_title(),
-						'course_desc_content' => $description->get_content());
-				}
-				return $results;
-			}
-		}
-	}
-
-
-	/**
-	 * Edit course description
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param int Category id from course description
-	 * @param string Description title
-	 * @param string Course description content
-	 */
-	public function EditCourseDescription($secret_key, $course_id_field_name, $course_id_value, $course_desc_id, $course_desc_title, $course_desc_content) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-			if($course_id instanceof WSError) {
-				return $course_id;
-			} else {
-				// Create the new course description
-				$cd = new CourseDescription();
-				$cd->set_description_type($course_desc_id);
-				$cd->set_title($course_desc_title);
-				$cd->set_content($course_desc_content);
-				$cd->set_session_id(0);
-
-				// Get course info
+    /**
+     * Deletes a course (helper method)
+     *
+     * @param string Course id field name
+     * @param string Course id value
+     * @return mixed True if the course was successfully deleted, WSError otherwise
+     */
+    protected function deleteCourseHelper($course_id_field_name, $course_id_value) {
+        $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
+        if($course_id instanceof WSCMError) {
+            return $course_id;
+        } else {
+            $course_code = CourseManager::get_course_code_from_course_id($course_id);
+            CourseManager::delete_course($course_code);
+            return true;
+        }
+    }
+
+    /**
+     * Deletes a course
+     *
+     * @param string API secret key
+     * @param string Course id field name
+     * @param string Course id value
+     */
+    public function DeleteCourse($secret_key, $course_id_field_name, $course_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->deleteCourseHelper($course_id_field_name, $course_id_value);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
+
+    /**
+     * Deletes multiple courses
+     *
+     * @param string API secret key
+     * @param array Array of courses with elements of the form array('course_id_field_name' => 'name_of_field', 'course_id_value' => 'value')
+     * @return array Array with elements like array('course_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
+     * than 0, an error occured
+     */
+    public function DeleteCourses($secret_key, $courses) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $results = array();
+            foreach($courses as $course) {
+                $result_tmp = array();
+                $result_op = $this->deleteCourseHelper($course['course_id_field_name'], $course['course_id_value']);
+                $result_tmp['course_id_value'] = $course['course_id_value'];
+                if($result_op instanceof WSCMError) {
+                    // Return the error in the results
+                    $result_tmp['result'] = $result_op->toArray();
+                } else {
+                    $result_tmp['result'] = $this->getSuccessfulResult();
+                }
+                $results[] = $result_tmp;
+            }
+            return $results;
+        }
+    }
+
+    /**
+     * Creates a course (helper method)
+     *
+     * @param string Title
+     * @param string Category code
+     * @param string Wanted code. If it's not defined, it will be generated automatically
+     * @param string Tutor name
+     * @param string Course admin user id field name
+     * @param string Course admin user id value
+     * @param string Course language
+     * @param string Course id field name
+     * @param string Course id value
+     * @param array Course extra fields
+     * @return mixed Generated id if creation was successful, WSError otherwise
+     */
+    protected function createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras) {
+        // Add the original course id field name and value to the extra fields if needed
+        $extras_associative = array();
+        if($course_id_field_name != "chamilo_course_id") {
+            $extras_associative[$course_id_field_name] = $course_id_value;
+        }
+        foreach($extras as $extra) {
+            $extras_associative[$extra['field_name']] = $extra['field_value'];
+        }
+        $course_admin_id = $this->getUserId($course_admin_user_id_field_name, $course_admin_user_id_value);
+        if($course_admin_id instanceof WSError) {
+            return $course_admin_id;
+        }
+        if($wanted_code == '') {
+            $wanted_code = CourseManager::generate_course_code($title);
+        }
+        $result = create_course($wanted_code, $title, $tutor_name, $category_code, $language, $course_admin_id, $this->_configuration['db_prefix'], 0);
+        if (!$result) {
+            return new WSError(202, 'There was an error creating the course');
+        } else {
+            // Update extra fields
+            foreach($extras_associative as $fname => $fvalue) {
+                CourseManager::update_course_extra_field_value($result, $fname, $fvalue);
+            }
+            // Get course id
+            $course_info = CourseManager::get_course_information($result);
+            return $course_info['real_id'];
+        }
+    }
+
+    /**
+     * Creates a course
+     *
+     * @param string API secret key
+     * @param string Title
+     * @param string Category code
+     * @param string Wanted code. If it's not defined, it will be generated automatically
+     * @param string Tutor name
+     * @param string Course admin user id field name
+     * @param string Course admin user id value
+     * @param string Course language
+     * @param string Course id field name
+     * @param string Course id value
+     * @param array Course extra fields
+     * @return int Course id generated
+     */
+    public function CreateCourse($secret_key, $title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras) {
+        // First, verify the secret key
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            } else {
+                return $result;
+            }
+        }
+    }
+
+    /**
+     * Create multiple courses
+     *
+     * @param string API secret key
+     * @param array Courses to be created, with elements following the structure presented in CreateCourse
+     * @return array Array with elements of the form array('course_id_value' => 'original value sent', 'course_id_generated' => 'value_generated', 'result' => array('code' => 0, 'message' => 'Operation was successful'))
+     */
+    public function CreateCourses($secret_key, $courses) {
+        // First, verify the secret key
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSCMError) {
+            $this->handleError($verifKey);
+        } else {
+            $results = array();
+            foreach($courses as $course) {
+                $result_tmp = array();
+                //reinitialize variables just in case
+                $title = $category_code = $wanted_code = $tutor_name = $course_admin_user_id_field_name = $course_admin_user_id_value = $language = $course_id_field_name = $course_id_value = $extras = null;
+                extract($course);
+                $result = $this->createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras);
+                if($result instanceof WSCMError) {
+                    $result_tmp['result'] = $result->toArray();
+                    $result_tmp['course_id_value'] = $course_id_value;
+                    $result_tmp['course_id_generated'] = 0;
+                } else {
+                    $result_tmp['result'] = $this->getSuccessfulResult();
+                    $result_tmp['course_id_value'] = $course_id_value;
+                    $result_tmp['course_id_generated'] = $result;
+                }
+                $results[] = $result_tmp;
+            }
+            return $results;
+        }
+    }
+
+    /**
+     * Edits a course (helper method)
+     *
+     * @param string Course id field name
+     * @param string Course id value
+     * @param string Title
+     * @param string Category code
+     * @param string Department name
+     * @param string Department url
+     * @param string Course language
+     * @param int Visibility
+     * @param int Subscribe (0 = denied, 1 = allowed)
+     * @param int Unsubscribe (0 = denied, 1 = allowed)
+     * @param string Visual code
+     * @param array Course extra fields
+     * @return mixed True in case of success, WSError otherwise
+     */
+    protected function editCourseHelper($course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras) {
+        $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
+        if($course_id instanceof WSCMError) {
+            return $course_id;
+        } else {
+            $attributes = array();
+            if(!empty($title)) {
+                $attributes['title'] = $title;
+            }
+            if(!empty($category_code)) {
+                $attributes['category_code'] = $category_code;
+            }
+            if(!empty($department_name)) {
+                $attributes['department_name'] = $department_name;
+            }
+            if(!empty($department_url)) {
+                $attributes['department_url'] = $department_url;
+            }
+            if(!empty($language)) {
+                $attributes['course_language'] = $language;
+            }
+            if($visibility != '') {
+                $attributes['visibility'] = (int)$visibility;
+            }
+            if($subscribe != '') {
+                $attributes['subscribe'] = (int)$subscribe;
+            }
+            if($unsubscribe != '') {
+                $attributes['unsubscribe'] = (int)$unsubscribe;
+            }
+            if(!empty($visual_code)) {
+                $attributes['visual_code'] = $visual_code;
+            }
+            if(!empty($attributes)) {
+                CourseManager::update_attributes($course_id, $attributes);
+            }
+            if(!empty($extras)) {
+                $course_code = CourseManager::get_course_code_from_course_id($course_id);
+                $extras_associative = array();
+                foreach($extras as $extra) {
+                    $extras_associative[$extra['field_name']] = $extra['field_value'];
+                }
+                foreach($extras_associative as $fname => $fvalue) {
+                    CourseManager::update_extra_field_value($course_code, $fname, $fvalue);
+                }
+            }
+            return true;
+        }
+    }
+
+    /**
+     * Edits a course
+     *
+     * @param string API secret key
+     * @param string Course id field name
+     * @param string Course id value
+     * @param string Title
+     * @param string Category code
+     * @param string Department name
+     * @param string Department url
+     * @param string Course language
+     * @param int Visibility
+     * @param int Subscribe (0 = denied, 1 = allowed)
+     * @param int Unsubscribe (0 = denied, 1 = allowed)
+     * @param string Visual code
+     * @param array Course extra fields
+     */
+    public function EditCourse($secret_key, $course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSCMError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->editCourseHelper($course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras);
+            if($result instanceof WSCMError) {
+                $this->handleError($result);
+            }
+        }
+    }
+
+    /**
+     * List courses
+     *
+     * @param string API secret key
+     * @param string Course id field name. Use "chamilo_course_id" to use internal id
+     * @return array An array with elements of the form ('id' => 'Course internal id', 'code' => 'Course code', 'title' => 'Course title', 'language' => 'Course language', 'visibility' => 'Course visibility',
+     * 'category_name' => 'Name of the category of the course', 'number_students' => 'Number of students in the course', 'external_course_id' => 'External course id')
+     */
+    public function ListCourses($secret_key, $course_id_field_name) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $courses_result = array();
+            $category_names = array();
+
+            $courses = CourseManager::get_courses_list();
+            foreach($courses as $course) {
+                $course_tmp = array();
+                $course_tmp['id'] = $course['id'];
+                $course_tmp['code'] = $course['code'];
+                $course_tmp['title'] = $course['title'];
+                $course_tmp['language'] = $course['course_language'];
+                $course_tmp['visibility'] = $course['visibility'];
+
+                // Determining category name
+                if($category_names[$course['category_code']]) {
+                    $course_tmp['category_name'] = $category_names[$course['category_code']];
+                } else {
+                    $category = CourseManager::get_course_category($course['category_code']);
+                    $category_names[$course['category_code']] = $category['name'];
+                    $course_tmp['category_name'] = $category['name'];
+                }
+
+                // Determining number of students registered in course
+                $user_list = CourseManager::get_user_list_from_course_code($course['code']);
+                $course_tmp['number_students'] = count($user_list);
+
+                // Determining external course id
+                $course_tmp['external_course_id'] = CourseManager::get_course_extra_field_value($course_id_field_name, $course['code']);
+
+
+                $courses_result[] = $course_tmp;
+            }
+
+            return $courses_result;
+        }
+    }
+
+    /**
+     * Subscribe or unsubscribe user to a course (helper method)
+     *
+     * @param string Course id field name. Use "chamilo_course_id" to use internal id
+     * @param string Course id value.
+     * @param string User id field name. Use "chamilo_user_id" to use internal id
+     * @param string User id value
+     * @param int Set to 1 to subscribe, 0 to unsubscribe
+     * @param int Status (STUDENT or TEACHER) Used for subscription only
+     * @return mixed True if subscription or unsubscription was successful, false otherwise
+     */
+    protected function changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $state, $status = STUDENT) {
+        $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
+        if($course_id instanceof WSError) {
+            return $course_id;
+        } else {
+            $user_id = $this->getUserId($user_id_field_name, $user_id_value);
+            if($user_id instanceof WSError) {
+                return $user_id;
+            } else {
+                $course_code = CourseManager::get_course_code_from_course_id($course_id);
+                if($state == 0) {
+                    // Unsubscribe user
+                    CourseManager::unsubscribe_user($user_id, $course_code);
+                    return true;
+                } else {
+                    // Subscribe user
+                    if(CourseManager::subscribe_user($user_id, $course_code, $status)) {
+                        return true;
+                    } else {
+                        return new WSError(203, 'An error occured subscribing to this course');
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Subscribe user to a course
+     *
+     * @param string API secret key
+     * @param string Course id field name. Use "chamilo_course_id" to use internal id
+     * @param string Course id value.
+     * @param string User id field name. Use "chamilo_user_id" to use internal id
+     * @param string User id value
+     * @param int Status (1 = Teacher, 5 = Student)
+     */
+    public function SubscribeUserToCourse($secret_key, $course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $status) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, 1, $status);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
+
+    /**
+     * Unsusbscribe user from course
+     *
+     * @param string API secret key
+     * @param string Course id field name. Use "chamilo_course_id" to use internal id
+     * @param string Course id value.
+     * @param string User id field name. Use "chamilo_user_id" to use internal id
+     * @param string User id value
+     */
+    public function UnsubscribeUserFromCourse($secret_key, $course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, 0);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
+
+    /**
+     * Returns the descriptions of a course, along with their id
+     *
+     * @param string API secret key
+     * @param string Course id field name
+     * @param string Course id value
+     * @return array Returns an array with elements of the form ('course_desc_id' => 1, 'course_desc_title' => 'Title', 'course_desc_content' => 'Content')
+     */
+    public function GetCourseDescriptions($secret_key, $course_id_field_name, $course_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
+            if($course_id instanceof WSError) {
+                return $course_id;
+            } else {
+                // Course exists, get its descriptions
+                $descriptions = CourseDescription::get_descriptions($course_id);
+                $results = array();
+                foreach($descriptions as $description) {
+                    $results[] = array('course_desc_id' => $description->get_description_type(),
+                        'course_desc_title' => $description->get_title(),
+                        'course_desc_content' => $description->get_content());
+                }
+                return $results;
+            }
+        }
+    }
+
+
+    /**
+     * Edit course description
+     *
+     * @param string API secret key
+     * @param string Course id field name
+     * @param string Course id value
+     * @param int Category id from course description
+     * @param string Description title
+     * @param string Course description content
+     */
+    public function EditCourseDescription($secret_key, $course_id_field_name, $course_id_value, $course_desc_id, $course_desc_title, $course_desc_content) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
+            if($course_id instanceof WSError) {
+                return $course_id;
+            } else {
+                // Create the new course description
+                $cd = new CourseDescription();
+                $cd->set_description_type($course_desc_id);
+                $cd->set_title($course_desc_title);
+                $cd->set_content($course_desc_content);
+                $cd->set_session_id(0);
+
+                // Get course info
                 $course_info = CourseManager::get_course_information(
                     CourseManager::get_course_code_from_course_id($course_id)
                 );
-				// Check if this course description exists
-				$descriptions = CourseDescription::get_descriptions($course_id);
-				$exists = false;
-				foreach($descriptions as $description) {
-					if($description->get_description_type() == $course_desc_id) {
-						$exists = true;
-					}
-				}
+                // Check if this course description exists
+                $descriptions = CourseDescription::get_descriptions($course_id);
+                $exists = false;
+                foreach($descriptions as $description) {
+                    if($description->get_description_type() == $course_desc_id) {
+                        $exists = true;
+                    }
+                }
                 $cd->set_course_id($course_info['real_id']);
-				if (!$exists) {
-					$cd->set_progress(0);
-					$cd->insert();
-				} else {
-					$cd->update();
-				}
-			}
-		}
-	}
-	public function unreadMessage($username, $password)
-	{
-		if($this->verifyUserPass($username, $password) == "valid")
-		{
-			$table_message = Database::get_main_table(TABLE_MESSAGE);
-			$user_id = UserManager::get_user_id_from_username($username);
-			$condition_msg_status = ' msg_status = 1 '; // define('MESSAGE_STATUS_UNREAD', '1');
-
-			$sql_query = "SELECT COUNT(*) as number_messages FROM $table_message WHERE $condition_msg_status AND user_receiver_id=".$user_id;
-
-			$sql_result = Database::query($sql_query);
-			$result = Database::fetch_array($sql_result);
-			return $result['number_messages'];
-		}
-		return "0";
-	}
-
-	public function get_message_data($username, $password)
-	{
-		if($this->verifyUserPass($username, $password) == "valid")
-		{
-			$user_id = get_user_id_from_username($username);
-
-		}
-
-	}
-
-	public function nada($username, $password)
-	{
-		if($this->verifyUserPass($username, $password) == "valid")
-			return $username.$password;
-		return $username;
-	}
+                if (!$exists) {
+                    $cd->set_progress(0);
+                    $cd->insert();
+                } else {
+                    $cd->update();
+                }
+            }
+        }
+    }
+    public function unreadMessage($username, $password)
+    {
+        if($this->verifyUserPass($username, $password) == "valid")
+        {
+            $table_message = Database::get_main_table(TABLE_MESSAGE);
+            $user_id = UserManager::get_user_id_from_username($username);
+            $condition_msg_status = ' msg_status = 1 '; // define('MESSAGE_STATUS_UNREAD', '1');
+
+            $sql_query = "SELECT COUNT(*) as number_messages FROM $table_message WHERE $condition_msg_status AND user_receiver_id=".$user_id;
+
+            $sql_result = Database::query($sql_query);
+            $result = Database::fetch_array($sql_result);
+            return $result['number_messages'];
+        }
+        return "0";
+    }
+
+    public function get_message_data($username, $password)
+    {
+        if($this->verifyUserPass($username, $password) == "valid")
+        {
+            $user_id = get_user_id_from_username($username);
+
+        }
+
+    }
+
+    public function nada($username, $password)
+    {
+        if($this->verifyUserPass($username, $password) == "valid")
+            return $username.$password;
+        return $username;
+    }
 
 
 

main/webservices/webservice_course.php

Indentation +455 added lines, -455 removed lines

@@ -12,490 +12,490 @@
  */
 class WSCourse extends WS
 {
-	/**
-	 * Deletes a course (helper method)
-	 *
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @return mixed True if the course was successfully deleted, WSError otherwise
-	 */
-	protected function deleteCourseHelper($course_id_field_name, $course_id_value) {
-		$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-		if($course_id instanceof WSError) {
-			return $course_id;
-		} else {
-			$course_code = CourseManager::get_course_code_from_course_id($course_id);
-			CourseManager::delete_course($course_code);
-			return true;
-		}
-	}
+    /**
+     * Deletes a course (helper method)
+     *
+     * @param string Course id field name
+     * @param string Course id value
+     * @return mixed True if the course was successfully deleted, WSError otherwise
+     */
+    protected function deleteCourseHelper($course_id_field_name, $course_id_value) {
+        $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
+        if($course_id instanceof WSError) {
+            return $course_id;
+        } else {
+            $course_code = CourseManager::get_course_code_from_course_id($course_id);
+            CourseManager::delete_course($course_code);
+            return true;
+        }
+    }
 
-	/**
-	 * Deletes a course
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name
-	 * @param string Course id value
-	 */
-	public function DeleteCourse($secret_key, $course_id_field_name, $course_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->deleteCourseHelper($course_id_field_name, $course_id_value);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Deletes a course
+     *
+     * @param string API secret key
+     * @param string Course id field name
+     * @param string Course id value
+     */
+    public function DeleteCourse($secret_key, $course_id_field_name, $course_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->deleteCourseHelper($course_id_field_name, $course_id_value);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Deletes multiple courses
-	 *
-	 * @param string API secret key
-	 * @param array Array of courses with elements of the form array('course_id_field_name' => 'name_of_field', 'course_id_value' => 'value')
-	 * @return array Array with elements like array('course_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
-	 * than 0, an error occured
-	 */
-	public function DeleteCourses($secret_key, $courses) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$results = array();
-			foreach($courses as $course) {
-				$result_tmp = array();
-				$result_op = $this->deleteCourseHelper($course['course_id_field_name'], $course['course_id_value']);
-				$result_tmp['course_id_value'] = $course['course_id_value'];
-				if($result_op instanceof WSError) {
-					// Return the error in the results
-					$result_tmp['result'] = $result_op->toArray();
-				} else {
-					$result_tmp['result'] = $this->getSuccessfulResult();
-				}
-				$results[] = $result_tmp;
-			}
-			return $results;
-		}
-	}
+    /**
+     * Deletes multiple courses
+     *
+     * @param string API secret key
+     * @param array Array of courses with elements of the form array('course_id_field_name' => 'name_of_field', 'course_id_value' => 'value')
+     * @return array Array with elements like array('course_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
+     * than 0, an error occured
+     */
+    public function DeleteCourses($secret_key, $courses) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $results = array();
+            foreach($courses as $course) {
+                $result_tmp = array();
+                $result_op = $this->deleteCourseHelper($course['course_id_field_name'], $course['course_id_value']);
+                $result_tmp['course_id_value'] = $course['course_id_value'];
+                if($result_op instanceof WSError) {
+                    // Return the error in the results
+                    $result_tmp['result'] = $result_op->toArray();
+                } else {
+                    $result_tmp['result'] = $this->getSuccessfulResult();
+                }
+                $results[] = $result_tmp;
+            }
+            return $results;
+        }
+    }
 
-	/**
-	 * Creates a course (helper method)
-	 *
-	 * @param string Title
-	 * @param string Category code
-	 * @param string Wanted code. If it's not defined, it will be generated automatically
-	 * @param string Tutor name
-	 * @param string Course admin user id field name
-	 * @param string Course admin user id value
-	 * @param string Course language
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param array Course extra fields
-	 * @return mixed Generated id if creation was successful, WSError otherwise
-	 */
-	protected function createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras) {
-		// Add the original course id field name and value to the extra fields if needed
-		$extras_associative = array();
-		if($course_id_field_name != "chamilo_course_id") {
-			$extras_associative[$course_id_field_name] = $course_id_value;
-		}
-		foreach($extras as $extra) {
-			$extras_associative[$extra['field_name']] = $extra['field_value'];
-		}
-		$course_admin_id = $this->getUserId($course_admin_user_id_field_name, $course_admin_user_id_value);
-		if($course_admin_id instanceof WSError) {
-			return $course_admin_id;
-		}
-		if($wanted_code == '') {
-			$wanted_code = CourseManager::generate_course_code($title);
-		}
-		$result = create_course($wanted_code, $title, $tutor_name, $category_code, $language, $course_admin_id, $this->_configuration['db_prefix'], 0);
-		if (!$result) {
-			return new WSError(202, 'There was an error creating the course');
-		} else {
-			// Update extra fields
-			foreach($extras_associative as $fname => $fvalue) {
-				CourseManager::update_course_extra_field_value($result, $fname, $fvalue);
-			}
-			// Get course id
-			$course_info = CourseManager::get_course_information($result);
-			return $course_info['real_id'];
-		}
-	}
+    /**
+     * Creates a course (helper method)
+     *
+     * @param string Title
+     * @param string Category code
+     * @param string Wanted code. If it's not defined, it will be generated automatically
+     * @param string Tutor name
+     * @param string Course admin user id field name
+     * @param string Course admin user id value
+     * @param string Course language
+     * @param string Course id field name
+     * @param string Course id value
+     * @param array Course extra fields
+     * @return mixed Generated id if creation was successful, WSError otherwise
+     */
+    protected function createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras) {
+        // Add the original course id field name and value to the extra fields if needed
+        $extras_associative = array();
+        if($course_id_field_name != "chamilo_course_id") {
+            $extras_associative[$course_id_field_name] = $course_id_value;
+        }
+        foreach($extras as $extra) {
+            $extras_associative[$extra['field_name']] = $extra['field_value'];
+        }
+        $course_admin_id = $this->getUserId($course_admin_user_id_field_name, $course_admin_user_id_value);
+        if($course_admin_id instanceof WSError) {
+            return $course_admin_id;
+        }
+        if($wanted_code == '') {
+            $wanted_code = CourseManager::generate_course_code($title);
+        }
+        $result = create_course($wanted_code, $title, $tutor_name, $category_code, $language, $course_admin_id, $this->_configuration['db_prefix'], 0);
+        if (!$result) {
+            return new WSError(202, 'There was an error creating the course');
+        } else {
+            // Update extra fields
+            foreach($extras_associative as $fname => $fvalue) {
+                CourseManager::update_course_extra_field_value($result, $fname, $fvalue);
+            }
+            // Get course id
+            $course_info = CourseManager::get_course_information($result);
+            return $course_info['real_id'];
+        }
+    }
 
-	/**
-	 * Creates a course
-	 *
-	 * @param string API secret key
-	 * @param string Title
-	 * @param string Category code
-	 * @param string Wanted code. If it's not defined, it will be generated automatically
-	 * @param string Tutor name
-	 * @param string Course admin user id field name
-	 * @param string Course admin user id value
-	 * @param string Course language
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param array Course extra fields
-	 * @return int Course id generated
-	 */
-	public function CreateCourse($secret_key, $title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras) {
-		// First, verify the secret key
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			} else {
-				return $result;
-			}
-		}
-	}
+    /**
+     * Creates a course
+     *
+     * @param string API secret key
+     * @param string Title
+     * @param string Category code
+     * @param string Wanted code. If it's not defined, it will be generated automatically
+     * @param string Tutor name
+     * @param string Course admin user id field name
+     * @param string Course admin user id value
+     * @param string Course language
+     * @param string Course id field name
+     * @param string Course id value
+     * @param array Course extra fields
+     * @return int Course id generated
+     */
+    public function CreateCourse($secret_key, $title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras) {
+        // First, verify the secret key
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            } else {
+                return $result;
+            }
+        }
+    }
 
-	/**
-	 * Create multiple courses
-	 *
-	 * @param string API secret key
-	 * @param array Courses to be created, with elements following the structure presented in CreateCourse
-	 * @return array Array with elements of the form array('course_id_value' => 'original value sent', 'course_id_generated' => 'value_generated', 'result' => array('code' => 0, 'message' => 'Operation was successful'))
-	 */
-	public function CreateCourses($secret_key, $courses) {
-		// First, verify the secret key
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$results = array();
-			foreach($courses as $course) {
-				$result_tmp = array();
+    /**
+     * Create multiple courses
+     *
+     * @param string API secret key
+     * @param array Courses to be created, with elements following the structure presented in CreateCourse
+     * @return array Array with elements of the form array('course_id_value' => 'original value sent', 'course_id_generated' => 'value_generated', 'result' => array('code' => 0, 'message' => 'Operation was successful'))
+     */
+    public function CreateCourses($secret_key, $courses) {
+        // First, verify the secret key
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $results = array();
+            foreach($courses as $course) {
+                $result_tmp = array();
                 // re-initialize variables just in case
                 $title = $category_code = $wanted_code = $tutor_name = $course_admin_user_id_field_name = $course_admin_user_id_value = $language = $course_id_field_name = $course_id_value = $extras = 0;
-				extract($course);
-				$result = $this->createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras);
-				if($result instanceof WSError) {
-					$result_tmp['result'] = $result->toArray();
-					$result_tmp['course_id_value'] = $course_id_value;
-					$result_tmp['course_id_generated'] = 0;
-				} else {
-					$result_tmp['result'] = $this->getSuccessfulResult();
-					$result_tmp['course_id_value'] = $course_id_value;
-					$result_tmp['course_id_generated'] = $result;
-				}
-				$results[] = $result_tmp;
-			}
-			return $results;
-		}
-	}
+                extract($course);
+                $result = $this->createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras);
+                if($result instanceof WSError) {
+                    $result_tmp['result'] = $result->toArray();
+                    $result_tmp['course_id_value'] = $course_id_value;
+                    $result_tmp['course_id_generated'] = 0;
+                } else {
+                    $result_tmp['result'] = $this->getSuccessfulResult();
+                    $result_tmp['course_id_value'] = $course_id_value;
+                    $result_tmp['course_id_generated'] = $result;
+                }
+                $results[] = $result_tmp;
+            }
+            return $results;
+        }
+    }
 
-	/**
-	 * Edits a course (helper method)
-	 *
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param string Title
-	 * @param string Category code
-	 * @param string Department name
-	 * @param string Department url
-	 * @param string Course language
-	 * @param int Visibility
-	 * @param int Subscribe (0 = denied, 1 = allowed)
-	 * @param int Unsubscribe (0 = denied, 1 = allowed)
-	 * @param string Visual code
-	 * @param array Course extra fields
-	 * @return mixed True in case of success, WSError otherwise
-	 */
-	protected function editCourseHelper($course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras) {
-		$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-		if($course_id instanceof WSError) {
-			return $course_id;
-		} else {
-			$attributes = array();
-			if(!empty($title)) {
-				$attributes['title'] = $title;
-			}
-			if(!empty($category_code)) {
-				$attributes['category_code'] = $category_code;
-			}
-			if(!empty($department_name)) {
-				$attributes['department_name'] = $department_name;
-			}
-			if(!empty($department_url)) {
-				$attributes['department_url'] = $department_url;
-			}
-			if(!empty($language)) {
-				$attributes['course_language'] = $language;
-			}
-			if($visibility != '') {
-				$attributes['visibility'] = (int)$visibility;
-			}
-			if($subscribe != '') {
-				$attributes['subscribe'] = (int)$subscribe;
-			}
-			if($unsubscribe != '') {
-				$attributes['unsubscribe'] = (int)$unsubscribe;
-			}
-			if(!empty($visual_code)) {
-				$attributes['visual_code'] = $visual_code;
-			}
-			if(!empty($attributes)) {
-				CourseManager::update_attributes($course_id, $attributes);
-			}
-			if(!empty($extras)) {
-				$course_code = CourseManager::get_course_code_from_course_id($course_id);
-				$extras_associative = array();
-				foreach($extras as $extra) {
-					$extras_associative[$extra['field_name']] = $extra['field_value'];
-				}
-				foreach($extras_associative as $fname => $fvalue) {
-					CourseManager::update_extra_field_value($course_code, $fname, $fvalue);
-				}
-			}
-			return true;
-		}
-	}
+    /**
+     * Edits a course (helper method)
+     *
+     * @param string Course id field name
+     * @param string Course id value
+     * @param string Title
+     * @param string Category code
+     * @param string Department name
+     * @param string Department url
+     * @param string Course language
+     * @param int Visibility
+     * @param int Subscribe (0 = denied, 1 = allowed)
+     * @param int Unsubscribe (0 = denied, 1 = allowed)
+     * @param string Visual code
+     * @param array Course extra fields
+     * @return mixed True in case of success, WSError otherwise
+     */
+    protected function editCourseHelper($course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras) {
+        $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
+        if($course_id instanceof WSError) {
+            return $course_id;
+        } else {
+            $attributes = array();
+            if(!empty($title)) {
+                $attributes['title'] = $title;
+            }
+            if(!empty($category_code)) {
+                $attributes['category_code'] = $category_code;
+            }
+            if(!empty($department_name)) {
+                $attributes['department_name'] = $department_name;
+            }
+            if(!empty($department_url)) {
+                $attributes['department_url'] = $department_url;
+            }
+            if(!empty($language)) {
+                $attributes['course_language'] = $language;
+            }
+            if($visibility != '') {
+                $attributes['visibility'] = (int)$visibility;
+            }
+            if($subscribe != '') {
+                $attributes['subscribe'] = (int)$subscribe;
+            }
+            if($unsubscribe != '') {
+                $attributes['unsubscribe'] = (int)$unsubscribe;
+            }
+            if(!empty($visual_code)) {
+                $attributes['visual_code'] = $visual_code;
+            }
+            if(!empty($attributes)) {
+                CourseManager::update_attributes($course_id, $attributes);
+            }
+            if(!empty($extras)) {
+                $course_code = CourseManager::get_course_code_from_course_id($course_id);
+                $extras_associative = array();
+                foreach($extras as $extra) {
+                    $extras_associative[$extra['field_name']] = $extra['field_value'];
+                }
+                foreach($extras_associative as $fname => $fvalue) {
+                    CourseManager::update_extra_field_value($course_code, $fname, $fvalue);
+                }
+            }
+            return true;
+        }
+    }
 
-	/**
-	 * Edits a course
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param string Title
-	 * @param string Category code
-	 * @param string Department name
-	 * @param string Department url
-	 * @param string Course language
-	 * @param int Visibility
-	 * @param int Subscribe (0 = denied, 1 = allowed)
-	 * @param int Unsubscribe (0 = denied, 1 = allowed)
-	 * @param string Visual code
-	 * @param array Course extra fields
-	 */
-	public function EditCourse($secret_key, $course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->editCourseHelper($course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Edits a course
+     *
+     * @param string API secret key
+     * @param string Course id field name
+     * @param string Course id value
+     * @param string Title
+     * @param string Category code
+     * @param string Department name
+     * @param string Department url
+     * @param string Course language
+     * @param int Visibility
+     * @param int Subscribe (0 = denied, 1 = allowed)
+     * @param int Unsubscribe (0 = denied, 1 = allowed)
+     * @param string Visual code
+     * @param array Course extra fields
+     */
+    public function EditCourse($secret_key, $course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->editCourseHelper($course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * List courses
-	 *
-	 * @param string API secret key
-	 * @param string A list of visibility filter we want to apply
-	 * @return array An array with elements of the form ('id' => 'Course internal id', 'code' => 'Course code', 'title' => 'Course title', 'language' => 'Course language', 'visibility' => 'Course visibility',
-	 * 'category_name' => 'Name of the category of the course', 'number_students' => 'Number of students in the course', 'external_course_id' => 'External course id')
-	 */
-	public function ListCourses($secret_key, $visibility = 'public,public-registered,private,closed') {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
+    /**
+     * List courses
+     *
+     * @param string API secret key
+     * @param string A list of visibility filter we want to apply
+     * @return array An array with elements of the form ('id' => 'Course internal id', 'code' => 'Course code', 'title' => 'Course title', 'language' => 'Course language', 'visibility' => 'Course visibility',
+     * 'category_name' => 'Name of the category of the course', 'number_students' => 'Number of students in the course', 'external_course_id' => 'External course id')
+     */
+    public function ListCourses($secret_key, $visibility = 'public,public-registered,private,closed') {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
             $visibilities = split(',',$visibility);
             $vis = array('public' => '3', 'public-registered' => '2', 'private' => '1', 'closed' => '0');
             foreach ($visibilities as $p => $visibility) {
                 $visibilities[$p] = $vis[$visibility];
             }
-			$courses_result = array();
-			$category_names = array();
+            $courses_result = array();
+            $category_names = array();
 
-			$courses = CourseManager::get_courses_list();
-			foreach($courses as $course) {
+            $courses = CourseManager::get_courses_list();
+            foreach($courses as $course) {
                 //skip elements that do not match required visibility
                 if (!in_array($course['visibility'],$visibilities)) { continue; }
-				$course_tmp = array();
-				$course_tmp['id'] = $course['id'];
-				$course_tmp['code'] = $course['code'];
-				$course_tmp['title'] = $course['title'];
-				$course_tmp['language'] = $course['course_language'];
-				$course_tmp['visibility'] = $course['visibility'];
+                $course_tmp = array();
+                $course_tmp['id'] = $course['id'];
+                $course_tmp['code'] = $course['code'];
+                $course_tmp['title'] = $course['title'];
+                $course_tmp['language'] = $course['course_language'];
+                $course_tmp['visibility'] = $course['visibility'];
 
-				// Determining category name
-				if($category_names[$course['category_code']]) {
-					$course_tmp['category_name'] = $category_names[$course['category_code']];
-				} else {
-					$category = CourseManager::get_course_category($course['category_code']);
-					$category_names[$course['category_code']] = $category['name'];
-					$course_tmp['category_name'] = $category['name'];
-				}
+                // Determining category name
+                if($category_names[$course['category_code']]) {
+                    $course_tmp['category_name'] = $category_names[$course['category_code']];
+                } else {
+                    $category = CourseManager::get_course_category($course['category_code']);
+                    $category_names[$course['category_code']] = $category['name'];
+                    $course_tmp['category_name'] = $category['name'];
+                }
 
-				// Determining number of students registered in course
-				$user_list = CourseManager::get_user_list_from_course_code($course['code'], 0);
-				$course_tmp['number_students'] = count($user_list);
+                // Determining number of students registered in course
+                $user_list = CourseManager::get_user_list_from_course_code($course['code'], 0);
+                $course_tmp['number_students'] = count($user_list);
 
-				// Determining external course id - this code misses the external course id field name
-				// $course_tmp['external_course_id'] = CourseManager::get_course_extra_field_value($course_field_name, $course['code']);
+                // Determining external course id - this code misses the external course id field name
+                // $course_tmp['external_course_id'] = CourseManager::get_course_extra_field_value($course_field_name, $course['code']);
 
 
-				$courses_result[] = $course_tmp;
-			}
+                $courses_result[] = $course_tmp;
+            }
 
-			return $courses_result;
-		}
-	}
+            return $courses_result;
+        }
+    }
 
-	/**
-	 * Subscribe or unsubscribe user to a course (helper method)
-	 *
-	 * @param string Course id field name. Use "chamilo_course_id" to use internal id
-	 * @param string Course id value.
-	 * @param string User id field name. Use "chamilo_user_id" to use internal id
-	 * @param string User id value
-	 * @param int Set to 1 to subscribe, 0 to unsubscribe
-	 * @param int Status (STUDENT or TEACHER) Used for subscription only
-	 * @return mixed True if subscription or unsubscription was successful, false otherwise
-	 */
-	protected function changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $state, $status = STUDENT) {
-		$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-		if($course_id instanceof WSError) {
-			return $course_id;
-		} else {
-			$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-			if($user_id instanceof WSError) {
-				return $user_id;
-			} else {
-				$course_code = CourseManager::get_course_code_from_course_id($course_id);
-				if($state == 0) {
-					// Unsubscribe user
-					CourseManager::unsubscribe_user($user_id, $course_code);
-					return true;
-				} else {
-					// Subscribe user
-					if(CourseManager::subscribe_user($user_id, $course_code, $status)) {
-						return true;
-					} else {
-						return new WSError(203, 'An error occured subscribing to this course');
-					}
-				}
-			}
-		}
-	}
+    /**
+     * Subscribe or unsubscribe user to a course (helper method)
+     *
+     * @param string Course id field name. Use "chamilo_course_id" to use internal id
+     * @param string Course id value.
+     * @param string User id field name. Use "chamilo_user_id" to use internal id
+     * @param string User id value
+     * @param int Set to 1 to subscribe, 0 to unsubscribe
+     * @param int Status (STUDENT or TEACHER) Used for subscription only
+     * @return mixed True if subscription or unsubscription was successful, false otherwise
+     */
+    protected function changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $state, $status = STUDENT) {
+        $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
+        if($course_id instanceof WSError) {
+            return $course_id;
+        } else {
+            $user_id = $this->getUserId($user_id_field_name, $user_id_value);
+            if($user_id instanceof WSError) {
+                return $user_id;
+            } else {
+                $course_code = CourseManager::get_course_code_from_course_id($course_id);
+                if($state == 0) {
+                    // Unsubscribe user
+                    CourseManager::unsubscribe_user($user_id, $course_code);
+                    return true;
+                } else {
+                    // Subscribe user
+                    if(CourseManager::subscribe_user($user_id, $course_code, $status)) {
+                        return true;
+                    } else {
+                        return new WSError(203, 'An error occured subscribing to this course');
+                    }
+                }
+            }
+        }
+    }
 
-	/**
-	 * Subscribe user to a course
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name. Use "chamilo_course_id" to use internal id
-	 * @param string Course id value.
-	 * @param string User id field name. Use "chamilo_user_id" to use internal id
-	 * @param string User id value
-	 * @param int Status (1 = Teacher, 5 = Student)
-	 */
-	public function SubscribeUserToCourse($secret_key, $course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $status) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, 1, $status);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Subscribe user to a course
+     *
+     * @param string API secret key
+     * @param string Course id field name. Use "chamilo_course_id" to use internal id
+     * @param string Course id value.
+     * @param string User id field name. Use "chamilo_user_id" to use internal id
+     * @param string User id value
+     * @param int Status (1 = Teacher, 5 = Student)
+     */
+    public function SubscribeUserToCourse($secret_key, $course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $status) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, 1, $status);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Unsusbscribe user from course
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name. Use "chamilo_course_id" to use internal id
-	 * @param string Course id value.
-	 * @param string User id field name. Use "chamilo_user_id" to use internal id
-	 * @param string User id value
-	 */
-	public function UnsubscribeUserFromCourse($secret_key, $course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, 0);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Unsusbscribe user from course
+     *
+     * @param string API secret key
+     * @param string Course id field name. Use "chamilo_course_id" to use internal id
+     * @param string Course id value.
+     * @param string User id field name. Use "chamilo_user_id" to use internal id
+     * @param string User id value
+     */
+    public function UnsubscribeUserFromCourse($secret_key, $course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, 0);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Returns the descriptions of a course, along with their id
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @return array Returns an array with elements of the form ('course_desc_id' => 1, 'course_desc_title' => 'Title', 'course_desc_content' => 'Content')
-	 */
-	public function GetCourseDescriptions($secret_key, $course_id_field_name, $course_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-			if($course_id instanceof WSError) {
-				return $course_id;
-			} else {
-				// Course exists, get its descriptions
-				$descriptions = CourseDescription::get_descriptions($course_id);
-				$results = array();
-				foreach($descriptions as $description) {
-					$results[] = array('course_desc_id' => $description->get_description_type(),
-										'course_desc_title' => $description->get_title(),
-										'course_desc_content' => $description->get_content());
-				}
-				return $results;
-			}
-		}
-	}
+    /**
+     * Returns the descriptions of a course, along with their id
+     *
+     * @param string API secret key
+     * @param string Course id field name
+     * @param string Course id value
+     * @return array Returns an array with elements of the form ('course_desc_id' => 1, 'course_desc_title' => 'Title', 'course_desc_content' => 'Content')
+     */
+    public function GetCourseDescriptions($secret_key, $course_id_field_name, $course_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
+            if($course_id instanceof WSError) {
+                return $course_id;
+            } else {
+                // Course exists, get its descriptions
+                $descriptions = CourseDescription::get_descriptions($course_id);
+                $results = array();
+                foreach($descriptions as $description) {
+                    $results[] = array('course_desc_id' => $description->get_description_type(),
+                                        'course_desc_title' => $description->get_title(),
+                                        'course_desc_content' => $description->get_content());
+                }
+                return $results;
+            }
+        }
+    }
 
 
-	/**
-	 * Edit course description
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param int Category id from course description
-	 * @param string Description title
-	 * @param string Course description content
-	 */
-	public function EditCourseDescription($secret_key, $course_id_field_name, $course_id_value, $course_desc_id, $course_desc_title, $course_desc_content) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-			if($course_id instanceof WSError) {
-				return $course_id;
-			} else {
-				// Create the new course description
-				$cd = new CourseDescription();
-				$cd->set_description_type($course_desc_id);
-				$cd->set_title($course_desc_title);
-				$cd->set_content($course_desc_content);
-				$cd->set_session_id(0);
-				// Get course info
-				$course_info = CourseManager::get_course_information(CourseManager::get_course_code_from_course_id($course_id));
+    /**
+     * Edit course description
+     *
+     * @param string API secret key
+     * @param string Course id field name
+     * @param string Course id value
+     * @param int Category id from course description
+     * @param string Description title
+     * @param string Course description content
+     */
+    public function EditCourseDescription($secret_key, $course_id_field_name, $course_id_value, $course_desc_id, $course_desc_title, $course_desc_content) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
+            if($course_id instanceof WSError) {
+                return $course_id;
+            } else {
+                // Create the new course description
+                $cd = new CourseDescription();
+                $cd->set_description_type($course_desc_id);
+                $cd->set_title($course_desc_title);
+                $cd->set_content($course_desc_content);
+                $cd->set_session_id(0);
+                // Get course info
+                $course_info = CourseManager::get_course_information(CourseManager::get_course_code_from_course_id($course_id));
                 $cd->set_course_id($course_info['real_id']);
-				// Check if this course description exists
-				$descriptions = CourseDescription::get_descriptions($course_id);
-				$exists = false;
-				foreach($descriptions as $description) {
-					if($description->get_description_type() == $course_desc_id) {
-						$exists = true;
-					}
-				}
-				if (!$exists) {
-					$cd->set_progress(0);
-					$cd->insert();
-				} else {
-					$cd->update();
-				}
-			}
-		}
-	}
+                // Check if this course description exists
+                $descriptions = CourseDescription::get_descriptions($course_id);
+                $exists = false;
+                foreach($descriptions as $description) {
+                    if($description->get_description_type() == $course_desc_id) {
+                        $exists = true;
+                    }
+                }
+                if (!$exists) {
+                    $cd->set_progress(0);
+                    $cd->insert();
+                } else {
+                    $cd->update();
+                }
+            }
+        }
+    }
 }

main/inc/lib/formvalidator/Rule/CompareFields.php

Indentation +15 added lines, -15 removed lines

@@ -6,24 +6,24 @@
  */
 class HTML_QuickForm_Compare_Fields extends HTML_QuickForm_Rule_Compare 
 {
-	/**
-	 * Function to check an array of fields 	 
-	 * @param   array of field names
+    /**
+     * Function to check an array of fields 	 
+     * @param   array of field names
      * @param   string operator ==, >=, etc
      * @param   string the value to compare
-	 * @return boolean True if date is valid
-	 */
-	function validate($values = [], $operator_and_max_value = null) {
+     * @return boolean True if date is valid
+     */
+    function validate($values = [], $operator_and_max_value = null) {
         if (is_array($values) && !empty($values) && !empty($operator_and_max_value)) {
-           $final_value = 0;
-           foreach ($values as $value) {
-               $final_value += $value;
-           }
-           $params = explode('@', $operator_and_max_value);
-           $operator    = $params[0];
-           $max_value   = $params[1];                      
-           return parent::validate(array($final_value, $max_value), $operator);
+            $final_value = 0;
+            foreach ($values as $value) {
+                $final_value += $value;
+            }
+            $params = explode('@', $operator_and_max_value);
+            $operator    = $params[0];
+            $max_value   = $params[1];                      
+            return parent::validate(array($final_value, $max_value), $operator);
         }
         return false;        
-	}
+    }
 }
\ No newline at end of file

main/mySpace/users.php

Indentation +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
             COURSEMANAGER,
             $keyword
         );
-      }
+        }
 
     $all_datas = array();
 

main/document/record_audio.php

Indentation +43 added lines, -43 removed lines

@@ -18,11 +18,11 @@ 
 
 $document_data = DocumentManager::get_document_data_by_id($_GET['id'], api_get_course_id(), true);
 if (empty($document_data)) {
-	if (api_is_in_group()) {
-		$group_properties   = GroupManager::get_group_properties(api_get_group_id());
-		$document_id        = DocumentManager::get_document_id(api_get_course_info(), $group_properties['directory']);
-		$document_data      = DocumentManager::get_document_data_by_id($document_id, api_get_course_id());
-	}
+    if (api_is_in_group()) {
+        $group_properties   = GroupManager::get_group_properties(api_get_group_id());
+        $document_id        = DocumentManager::get_document_id(api_get_course_info(), $group_properties['directory']);
+        $document_data      = DocumentManager::get_document_data_by_id($document_id, api_get_course_id());
+    }
 }
 
 $document_id = $document_data['id'];
@@ -31,7 +31,7 @@ 
 //make some vars
 $wamidir = $dir;
 if ($wamidir == "/") {
-	$wamidir = "";
+    $wamidir = "";
 }
 $wamiurlplay = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document'.$wamidir."/";
 $groupId = api_get_group_id();
@@ -41,48 +41,48 @@ 
 // Please, do not modify this dirname formatting
 
 if (strstr($dir, '..')) {
-	$dir = '/';
+    $dir = '/';
 }
 
 if ($dir[0] == '.') {
-	$dir = substr($dir, 1);
+    $dir = substr($dir, 1);
 }
 
 if ($dir[0] != '/') {
-	$dir = '/'.$dir;
+    $dir = '/'.$dir;
 }
 
 if ($dir[strlen($dir) - 1] != '/') {
-	$dir .= '/';
+    $dir .= '/';
 }
 
 $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir;
 
 if (!is_dir($filepath)) {
-	$filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
-	$dir = '/';
+    $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
+    $dir = '/';
 }
 
 //groups //TODO: clean
 if (!empty($groupId)) {
-	$interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
-	$noPHP_SELF = true;
-	$group = GroupManager :: get_group_properties($groupId);
-	$path = explode('/', $dir);
-	if ('/'.$path[1] != $group['directory']) {
-		api_not_allowed(true);
-	}
+    $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
+    $noPHP_SELF = true;
+    $group = GroupManager :: get_group_properties($groupId);
+    $path = explode('/', $dir);
+    if ('/'.$path[1] != $group['directory']) {
+        api_not_allowed(true);
+    }
 }
 
 $interbreadcrumb[] = array("url" => "./document.php?id=".$document_id.'&'.api_get_cidreq(), "name" => get_lang('Documents'));
 
 if (!$is_allowed_in_course) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] ||
-	DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) {
-	api_not_allowed(true);
+    DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) {
+    api_not_allowed(true);
 }
 
 /*	Header */
@@ -90,26 +90,26 @@ 
 
 $display_dir = $dir;
 if (isset ($group)) {
-	$display_dir = explode('/', $dir);
-	unset ($display_dir[0]);
-	unset ($display_dir[1]);
-	$display_dir = implode('/', $display_dir);
+    $display_dir = explode('/', $dir);
+    unset ($display_dir[0]);
+    unset ($display_dir[1]);
+    $display_dir = implode('/', $display_dir);
 }
 
 // Interbreadcrumb for the current directory root path
 $counter = 0;
 if (isset($document_data['parents'])) {
-	foreach($document_data['parents'] as $document_sub_data) {
-		//fixing double group folder in breadcrumb
-		if (api_get_group_id()) {
-			if ($counter == 0) {
-				$counter++;
-				continue;
-			}
-		}
-		$interbreadcrumb[] = array('url' => $document_sub_data['document_url'], 'name' => $document_sub_data['title']);
-		$counter++;
-	}
+    foreach($document_data['parents'] as $document_sub_data) {
+        //fixing double group folder in breadcrumb
+        if (api_get_group_id()) {
+            if ($counter == 0) {
+                $counter++;
+                continue;
+            }
+        }
+        $interbreadcrumb[] = array('url' => $document_sub_data['document_url'], 'name' => $document_sub_data['title']);
+        $counter++;
+    }
 }
 
 //make some vars
@@ -121,12 +121,12 @@ 
 $htmlHeadXtra[] = '<script type="text/javascript" src="' . api_get_path(WEB_LIBRARY_PATH) . 'swfobject/swfobject.js"></script>';
 
 $actions = Display::toolbarButton(
-	get_lang('BackTo') . ' ' . get_lang('DocumentsOverview'),
-	'document.php?' . api_get_cidreq() . "&id=$document_id",
-	'arrow-left',
-	'default',
-	[],
-	false
+    get_lang('BackTo') . ' ' . get_lang('DocumentsOverview'),
+    'document.php?' . api_get_cidreq() . "&id=$document_id",
+    'arrow-left',
+    'default',
+    [],
+    false
 );
 
 $template = new Template($nameTools);

main/inc/lib/extra_field.lib.php

Indentation +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
         'changeable',
         'filter',
         'extra_field_type',
-         /* Enable this when field_loggeable is introduced as a table field (2.0)
+            /* Enable this when field_loggeable is introduced as a table field (2.0)
         'field_loggeable',
          */
         'created_at'
@@ -808,7 +808,7 @@ 
                 foreach ($orderFields as $order) {
                     foreach ($extra as $field_details) {
                         if ($order == $field_details['variable']) {
-                           $newOrder[] = $field_details;
+                            $newOrder[] = $field_details;
                         }
                     }
                 }

main/session/session_export.php

Indentation +177 added lines, -177 removed lines

@@ -37,11 +37,11 @@ 
 set_time_limit(0);
 
 if (isset($_POST['formSent'])) {
-	$formSent = $_POST['formSent'];
-	$file_type = isset($_POST['file_type']) ? $_POST['file_type'] : 'csv';
-	$session_id = $_POST['session_id'];
-	if (empty($session_id)) {
-		$sql = "SELECT
+    $formSent = $_POST['formSent'];
+    $file_type = isset($_POST['file_type']) ? $_POST['file_type'] : 'csv';
+    $session_id = $_POST['session_id'];
+    if (empty($session_id)) {
+        $sql = "SELECT
 					s.id,
 					name,
 					id_coach,
@@ -55,84 +55,84 @@ 
 				ON $tbl_user.user_id = s.id_coach
 				ORDER BY id";
 
-		if (api_is_multiple_url_enabled()) {
-			$tbl_session_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
-			$access_url_id = api_get_current_access_url_id();
-			if ($access_url_id != -1){
-			$sql = "SELECT s.id, name,id_coach,username,access_start_date,access_end_date,visibility,session_category_id
+        if (api_is_multiple_url_enabled()) {
+            $tbl_session_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
+            $access_url_id = api_get_current_access_url_id();
+            if ($access_url_id != -1){
+            $sql = "SELECT s.id, name,id_coach,username,access_start_date,access_end_date,visibility,session_category_id
 					FROM $tbl_session s
 					INNER JOIN $tbl_session_rel_access_url as session_rel_url
 					ON (s.id= session_rel_url.session_id)
 					INNER JOIN $tbl_user u ON (u.user_id = s.id_coach)
 					WHERE access_url_id = $access_url_id
 					ORDER BY id";
-			}
-		}
+            }
+        }
 
-		$result = Database::query($sql);
-	} else {
-		$sql = "SELECT s.id,name,username,access_start_date,access_end_date,visibility,session_category_id
+        $result = Database::query($sql);
+    } else {
+        $sql = "SELECT s.id,name,username,access_start_date,access_end_date,visibility,session_category_id
 				FROM $tbl_session s
 				INNER JOIN $tbl_user
 					ON $tbl_user.user_id = s.id_coach
 				WHERE id='$session_id'";
-		$result = Database::query($sql);
-	}
+        $result = Database::query($sql);
+    }
 
-	if (Database::num_rows($result)) {
+    if (Database::num_rows($result)) {
 
 
 
-		$sessionListToExport = [];
+        $sessionListToExport = [];
 
-		if (in_array($file_type, ['csv', 'xls'])) {
+        if (in_array($file_type, ['csv', 'xls'])) {
 
-			$archiveFile = 'export_sessions_'.$session_id.'_'.api_get_local_time();
+            $archiveFile = 'export_sessions_'.$session_id.'_'.api_get_local_time();
 
-			$cvs = true;
-			$sessionListToExport[] = [
-				'SessionName',
-				'Coach',
-				'DateStart',
-				'DateEnd',
-				'Visibility',
-				'SessionCategory',
-				'Users',
-				'Courses'
-			];
-		} else {
-			if (!file_exists($archivePath)) {
-				mkdir($archivePath, api_get_permissions_for_new_directories(), true);
-			}
+            $cvs = true;
+            $sessionListToExport[] = [
+                'SessionName',
+                'Coach',
+                'DateStart',
+                'DateEnd',
+                'Visibility',
+                'SessionCategory',
+                'Users',
+                'Courses'
+            ];
+        } else {
+            if (!file_exists($archivePath)) {
+                mkdir($archivePath, api_get_permissions_for_new_directories(), true);
+            }
 
-			if (!file_exists($archivePath.'index.html')) {
-				$fp = fopen($archivePath.'index.html', 'w');
-				fputs($fp, '<html><head></head><body></body></html>');
-				fclose($fp);
-			}
+            if (!file_exists($archivePath.'index.html')) {
+                $fp = fopen($archivePath.'index.html', 'w');
+                fputs($fp, '<html><head></head><body></body></html>');
+                fclose($fp);
+            }
 
-			$archiveFile = 'export_sessions_'.$session_id.'_'.api_get_local_time().'.'.$file_type;
-			while (file_exists($archivePath.$archiveFile)) {
-				$archiveFile ='export_users_'.$session_id.'_'.api_get_local_time().'_'.uniqid('').'.'.$file_type;
-			}
+            $archiveFile = 'export_sessions_'.$session_id.'_'.api_get_local_time().'.'.$file_type;
+            while (file_exists($archivePath.$archiveFile)) {
+                $archiveFile ='export_users_'.$session_id.'_'.api_get_local_time().'_'.uniqid('').'.'.$file_type;
+            }
 
-			$cvs = false;
-			$fp = fopen($archivePath.$archiveFile, 'w');
-			fputs($fp, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<Sessions>\n");
-		}
+            $cvs = false;
+            $fp = fopen($archivePath.$archiveFile, 'w');
+            fputs($fp, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<Sessions>\n");
+        }
 
 
-		while ($row = Database::fetch_array($result)) {
-			$row['name'] = str_replace(';',',',$row['name']);
-			$row['username'] = str_replace(';',',',$row['username']);
-			$row['access_start_date'] = str_replace(';',',',$row['access_start_date']);
-			$row['access_end_date'] = str_replace(';',',',$row['access_end_date']);
-			$row['visibility'] = str_replace(';',',',$row['visibility']);
-			$row['session_category'] = str_replace(';',',',$row['session_category_id']);
+        while ($row = Database::fetch_array($result)) {
+            $row['name'] = str_replace(';',',',$row['name']);
+            $row['username'] = str_replace(';',',',$row['username']);
+            $row['access_start_date'] = str_replace(';',',',$row['access_start_date']);
+            $row['access_end_date'] = str_replace(';',',',$row['access_end_date']);
+            $row['visibility'] = str_replace(';',',',$row['visibility']);
+            $row['session_category'] = str_replace(';',',',$row['session_category_id']);
 
 
-			// users
-			$sql = "SELECT DISTINCT $tbl_user.username
+            // users
+            $sql = "SELECT DISTINCT $tbl_user.username
 					FROM $tbl_user
 					INNER JOIN $tbl_session_user
 					ON
@@ -140,33 +140,33 @@ 
 						$tbl_session_user.relation_type<>".SESSION_RELATION_TYPE_RRHH." AND
 						$tbl_session_user.session_id = '".$row['id']."'";
 
-			$rsUsers = Database::query($sql);
-			$users = '';
-			while ($rowUsers = Database::fetch_array($rsUsers)){
-				if($cvs){
-					$users .= str_replace(';',',',$rowUsers['username']).'|';
-				} else {
-					$users .= "\t\t<User>$rowUsers[username]</User>\n";
-				}
-			}
-
-			if (!empty($users) && $cvs) {
-				$users = api_substr($users, 0, api_strlen($users) - 1);
-			}
-
-			// Courses
-			$sql = "SELECT DISTINCT c.code, sc.id, c_id
+            $rsUsers = Database::query($sql);
+            $users = '';
+            while ($rowUsers = Database::fetch_array($rsUsers)){
+                if($cvs){
+                    $users .= str_replace(';',',',$rowUsers['username']).'|';
+                } else {
+                    $users .= "\t\t<User>$rowUsers[username]</User>\n";
+                }
+            }
+
+            if (!empty($users) && $cvs) {
+                $users = api_substr($users, 0, api_strlen($users) - 1);
+            }
+
+            // Courses
+            $sql = "SELECT DISTINCT c.code, sc.id, c_id
 					FROM $tbl_course c
 					INNER JOIN $tbl_session_course_user sc
 						ON c.id = sc.c_id
 						AND sc.session_id = '".$row['id']."'";
 
-			$rsCourses = Database::query($sql);
+            $rsCourses = Database::query($sql);
 
-			$courses = '';
-			while ($rowCourses = Database::fetch_array($rsCourses)) {
-				// get coachs from a course
-				$sql = "SELECT u.username
+            $courses = '';
+            while ($rowCourses = Database::fetch_array($rsCourses)) {
+                // get coachs from a course
+                $sql = "SELECT u.username
 						FROM $tbl_session_course_user scu
 						INNER JOIN $tbl_user u
 						ON u.user_id = scu.user_id
@@ -175,25 +175,25 @@ 
 							scu.session_id = '".$row['id']."' AND
 							scu.status = 2 ";
 
-				$rs_coachs = Database::query($sql);
-				$coachs = array();
-				while ($row_coachs = Database::fetch_array($rs_coachs)) {
-					$coachs[] = $row_coachs['username'];
-				}
-
-				$coachs = implode(",", $coachs);
-
-				if ($cvs) {
-					$courses .= str_replace(';',',',$rowCourses['code']);
-					$courses .= '['.str_replace(';',',',$coachs).'][';
-				} else {
-					$courses .= "\t\t<Course>\n";
-					$courses .= "\t\t\t<CourseCode>$rowCourses[code]</CourseCode>\n";
-					$courses .= "\t\t\t<Coach>$coachs</Coach>\n";
-				}
-
-				// rel user courses
-				$sql = "SELECT DISTINCT u.username
+                $rs_coachs = Database::query($sql);
+                $coachs = array();
+                while ($row_coachs = Database::fetch_array($rs_coachs)) {
+                    $coachs[] = $row_coachs['username'];
+                }
+
+                $coachs = implode(",", $coachs);
+
+                if ($cvs) {
+                    $courses .= str_replace(';',',',$rowCourses['code']);
+                    $courses .= '['.str_replace(';',',',$coachs).'][';
+                } else {
+                    $courses .= "\t\t<Course>\n";
+                    $courses .= "\t\t\t<CourseCode>$rowCourses[code]</CourseCode>\n";
+                    $courses .= "\t\t\t<Coach>$coachs</Coach>\n";
+                }
+
+                // rel user courses
+                $sql = "SELECT DISTINCT u.username
 						FROM $tbl_session_course_user scu
 						INNER JOIN $tbl_session_user su
 						ON
@@ -206,79 +206,79 @@ 
 							scu.c_id='".$rowCourses['c_id']."' AND
 							scu.session_id='".$row['id']."'";
 
-				$rsUsersCourse = Database::query($sql);
-				$userscourse = '';
-				while ($rowUsersCourse = Database::fetch_array($rsUsersCourse)){
-					if ($cvs) {
-						$userscourse .= str_replace(';',',',$rowUsersCourse['username']).',';
-					} else {
-						$courses .= "\t\t\t<User>$rowUsersCourse[username]</User>\n";
-					}
-				}
-
-				if ($cvs) {
-					if (!empty($userscourse)) {
-						$userscourse = api_substr(
-							$userscourse,
-							0,
-							api_strlen($userscourse) - 1
-						);
-					}
-
-					$courses .= $userscourse.']|';
-				} else {
-					$courses .= "\t\t</Course>\n";
-				}
-			}
-
-			if (!empty($courses) && $cvs) {
-				$courses = api_substr($courses, 0, api_strlen($courses) - 1);
-			}
-			$add = $courses;
-
-			if (in_array($file_type, ['csv', 'xls'])) {
-				$sessionListToExport[] = [
-					$row['name'],
-					$row['username'],
-					$row['access_start_date'],
-					$row['access_end_date'],
-					$row['visibility'],
-					$row['session_category'],
-					$users,
-					$courses
-				];
-			} else {
-				$add = "\t<Session>\n"
-						 ."\t\t<SessionName>$row[name]</SessionName>\n"
-						 ."\t\t<Coach>$row[username]</Coach>\n"
-						 ."\t\t<DateStart>$row[access_start_date]</DateStart>\n"
-						 ."\t\t<DateEnd>$row[access_end_date]</DateEnd>\n"
-						 ."\t\t<Visibility>$row[visibility]</Visibility>\n"
-						 ."\t\t<SessionCategory>$row[session_category]</SessionCategory>\n";
-			}
-
-		 	if (!$cvs) {
-				$add .= "\t</Session>\n";
-				fputs($fp, $add);
-			}
-		}
-
-		switch ($file_type) {
-			case 'xml':
-				fputs($fp, "</Sessions>\n");
-				fclose($fp);
-				$errorMsg = get_lang('UserListHasBeenExported').'<br/>
+                $rsUsersCourse = Database::query($sql);
+                $userscourse = '';
+                while ($rowUsersCourse = Database::fetch_array($rsUsersCourse)){
+                    if ($cvs) {
+                        $userscourse .= str_replace(';',',',$rowUsersCourse['username']).',';
+                    } else {
+                        $courses .= "\t\t\t<User>$rowUsersCourse[username]</User>\n";
+                    }
+                }
+
+                if ($cvs) {
+                    if (!empty($userscourse)) {
+                        $userscourse = api_substr(
+                            $userscourse,
+                            0,
+                            api_strlen($userscourse) - 1
+                        );
+                    }
+
+                    $courses .= $userscourse.']|';
+                } else {
+                    $courses .= "\t\t</Course>\n";
+                }
+            }
+
+            if (!empty($courses) && $cvs) {
+                $courses = api_substr($courses, 0, api_strlen($courses) - 1);
+            }
+            $add = $courses;
+
+            if (in_array($file_type, ['csv', 'xls'])) {
+                $sessionListToExport[] = [
+                    $row['name'],
+                    $row['username'],
+                    $row['access_start_date'],
+                    $row['access_end_date'],
+                    $row['visibility'],
+                    $row['session_category'],
+                    $users,
+                    $courses
+                ];
+            } else {
+                $add = "\t<Session>\n"
+                            ."\t\t<SessionName>$row[name]</SessionName>\n"
+                            ."\t\t<Coach>$row[username]</Coach>\n"
+                            ."\t\t<DateStart>$row[access_start_date]</DateStart>\n"
+                            ."\t\t<DateEnd>$row[access_end_date]</DateEnd>\n"
+                            ."\t\t<Visibility>$row[visibility]</Visibility>\n"
+                            ."\t\t<SessionCategory>$row[session_category]</SessionCategory>\n";
+            }
+
+                if (!$cvs) {
+                $add .= "\t</Session>\n";
+                fputs($fp, $add);
+            }
+        }
+
+        switch ($file_type) {
+            case 'xml':
+                fputs($fp, "</Sessions>\n");
+                fclose($fp);
+                $errorMsg = get_lang('UserListHasBeenExported').'<br/>
 				<a class="btn btn-default" href="'.$archiveURL.$archiveFile.'">'.get_lang('ClickHereToDownloadTheFile').'</a>';
-				break;
-			case 'csv':
-				Export::arrayToCsv($sessionListToExport, $archiveFile);
-				exit;
-			case 'xls':
-				Export::arrayToXls($sessionListToExport, $archiveFile);
-				exit;
-				break;
-		}
-	}
+                break;
+            case 'csv':
+                Export::arrayToCsv($sessionListToExport, $archiveFile);
+                exit;
+            case 'xls':
+                Export::arrayToXls($sessionListToExport, $archiveFile);
+                exit;
+                break;
+        }
+    }
 }
 
 // display the header
@@ -288,26 +288,26 @@ 
 $sql = "SELECT id, name FROM $tbl_session ORDER BY name";
 
 if (api_is_multiple_url_enabled()) {
-	$tbl_session_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
-	$access_url_id = api_get_current_access_url_id();
-	if ($access_url_id != -1){
-	$sql = "SELECT s.id, name FROM $tbl_session s
+    $tbl_session_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
+    $access_url_id = api_get_current_access_url_id();
+    if ($access_url_id != -1){
+    $sql = "SELECT s.id, name FROM $tbl_session s
 			INNER JOIN $tbl_session_rel_access_url as session_rel_url
 			ON (s.id = session_rel_url.session_id)
 			WHERE access_url_id = $access_url_id
 			ORDER BY name";
-	}
+    }
 }
 $result = Database::query($sql);
 $Sessions = Database::store_result($result);
 
 echo '<div class="actions">';
 echo '<a href="../session/session_list.php">'.
-		Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('SessionList'),'',ICON_SIZE_MEDIUM).'</a>';
+        Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('SessionList'),'',ICON_SIZE_MEDIUM).'</a>';
 echo '</div>';
 
 if (!empty($errorMsg)) {
-	Display::display_normal_message($errorMsg, false); //main API
+    Display::display_normal_message($errorMsg, false); //main API
 }
 
 $form = new FormValidator('session_export', 'post', api_get_self());

main/document/edit_document.php

Indentation +186 added lines, -186 removed lines

@@ -69,7 +69,7 @@ 
 $sessionId = api_get_session_id();
 
 if (api_is_in_group()) {
-	$group_properties = GroupManager::get_group_properties($group_id);
+    $group_properties = GroupManager::get_group_properties($group_id);
 }
 
 $dir = '/';
@@ -81,7 +81,7 @@ 
         $_GET['id'],
         api_get_course_id(),
         true,
-		0
+        0
     );
 
     if (!empty($sessionId) && empty($document_data)) {
@@ -93,13 +93,13 @@ 
         );
     }
 
-	$document_id = $document_data['id'];
-	$file = $document_data['path'];
-	$parent_id = DocumentManager::get_document_id($course_info, dirname($file));
-	$dir = dirname($document_data['path']);
-	$dir_original = $dir;
-	$doc = basename($file);
-	$readonly = $document_data['readonly'];
+    $document_id = $document_data['id'];
+    $file = $document_data['path'];
+    $parent_id = DocumentManager::get_document_id($course_info, dirname($file));
+    $dir = dirname($document_data['path']);
+    $dir_original = $dir;
+    $doc = basename($file);
+    $readonly = $document_data['readonly'];
 }
 
 if (empty($document_data)) {
@@ -121,7 +121,7 @@ 
 
 // Level correction for group documents.
 if (!empty($group_properties['directory'])) {
-	$count_dir = $count_dir > 0 ? $count_dir - 1 : 0;
+    $count_dir = $count_dir > 0 ? $count_dir - 1 : 0;
 }
 $relative_url = '';
 for ($i = 0; $i < ($count_dir); $i++) {
@@ -143,13 +143,13 @@ 
 );
 
 if ($is_certificate_mode) {
-	$editorConfig['CreateDocumentDir'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/';
-	$editorConfig['CreateDocumentWebDir'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/';
-	$editorConfig['BaseHref'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$dir;
+    $editorConfig['CreateDocumentDir'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/';
+    $editorConfig['CreateDocumentWebDir'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/';
+    $editorConfig['BaseHref'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$dir;
 }
 
 $is_allowed_to_edit = api_is_allowed_to_edit(null, true) || $_SESSION['group_member_with_upload_rights']||
-	DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $sessionId);
+    DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $sessionId);
 $noPHP_SELF = true;
 
 /*	Other initialization code */
@@ -162,8 +162,8 @@ 
         'url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq(),
         'name' => get_lang('GroupSpace'),
     );
-	$group_document = true;
-	$noPHP_SELF = true;
+    $group_document = true;
+    $noPHP_SELF = true;
 }
 
 if (!$is_certificate_mode) {
@@ -197,9 +197,9 @@ 
 
 //TODO:check the below code and his funcionality
 if (!api_is_allowed_to_edit()) {
-	if (DocumentManager::check_readonly($course_info, $user_id, $file)) {
-		api_not_allowed();
-	}
+    if (DocumentManager::check_readonly($course_info, $user_id, $file)) {
+        api_not_allowed();
+    }
 }
 
 /* MAIN TOOL CODE */
@@ -207,18 +207,18 @@ 
 /*	Code to change the comment	*/
 
 if (isset($_POST['comment'])) {
-	// Fixing the path if it is wrong
-	$comment = trim($_POST['comment']);
-	$title = trim($_POST['title']);
+    // Fixing the path if it is wrong
+    $comment = trim($_POST['comment']);
+    $title = trim($_POST['title']);
 
     // Just in case see BT#3525
     if (empty($title)) {
-		$title = $document_data['title'];
-	}
+        $title = $document_data['title'];
+    }
 
-	if (empty($title)) {
-		$title = get_document_title($_POST['filename']);
-	}
+    if (empty($title)) {
+        $title = get_document_title($_POST['filename']);
+    }
 
     if (!empty($document_id)) {
         $params = [
@@ -230,43 +230,43 @@ 
             $params,
             ['c_id = ? AND id = ?' => [$course_id, $document_id]]
         );
-		Display::addFlash(Display::return_message(get_lang('fileModified')));
+        Display::addFlash(Display::return_message(get_lang('fileModified')));
     }
 }
 
 /*	WYSIWYG HTML EDITOR - Program Logic */
 if ($is_allowed_to_edit) {
-	if (isset($_POST['formSent']) && $_POST['formSent'] == 1) {
+    if (isset($_POST['formSent']) && $_POST['formSent'] == 1) {
 
-		$filename = stripslashes($_POST['filename']);
+        $filename = stripslashes($_POST['filename']);
         $extension = $_POST['extension'];
-		$content = isset($_POST['content']) ? trim(str_replace(array("\r", "\n"), '', stripslashes($_POST['content']))) : null;
-		$content = Security::remove_XSS($content, COURSEMANAGERLOWSECURITY);
+        $content = isset($_POST['content']) ? trim(str_replace(array("\r", "\n"), '', stripslashes($_POST['content']))) : null;
+        $content = Security::remove_XSS($content, COURSEMANAGERLOWSECURITY);
 
         if ($dir == '/') {
             $dir = '';
         }
 
-		$file = $dir.'/'.$filename.'.'.$extension;
-		$read_only_flag = isset($_POST['readonly']) ? $_POST['readonly'] : null;
-		$read_only_flag = empty($read_only_flag) ? 0 : 1;
+        $file = $dir.'/'.$filename.'.'.$extension;
+        $read_only_flag = isset($_POST['readonly']) ? $_POST['readonly'] : null;
+        $read_only_flag = empty($read_only_flag) ? 0 : 1;
 
-		if (empty($filename)) {
+        if (empty($filename)) {
             Display::addFlash(Display::return_message(get_lang('NoFileName'), 'warning'));
-		} else {
+        } else {
 
-		    $file_size = filesize($document_data['absolute_path']);
+            $file_size = filesize($document_data['absolute_path']);
 
-			if ($read_only_flag == 0) {
-				if (!empty($content)) {
-					if ($fp = @fopen($document_data['absolute_path'], 'w')) {
-						// For flv player, change absolute path temporarily to prevent from erasing it in the following lines
-						$content = str_replace(array('flv=h', 'flv=/'), array('flv=h|', 'flv=/|'), $content);
- 						fputs($fp, $content);
-						fclose($fp);
+            if ($read_only_flag == 0) {
+                if (!empty($content)) {
+                    if ($fp = @fopen($document_data['absolute_path'], 'w')) {
+                        // For flv player, change absolute path temporarily to prevent from erasing it in the following lines
+                        $content = str_replace(array('flv=h', 'flv=/'), array('flv=h|', 'flv=/|'), $content);
+                            fputs($fp, $content);
+                        fclose($fp);
 
                         $filepath = $document_data['absolute_parent_path'];
-						/*
+                        /*
 						if (!is_dir($filepath.'css')) {
 							mkdir($filepath.'css', api_get_permissions_for_new_directories());
 							$doc_id = add_document($_course, $dir.'css', 'folder', 0, 'css');
@@ -296,7 +296,7 @@ 
 							);
 						}*/
 
-						/*if (!is_file($filepath.'css/frames.css')) {
+                        /*if (!is_file($filepath.'css/frames.css')) {
 							$platform_theme = api_get_setting('stylesheets');
 							if (file_exists(api_get_path(SYS_CODE_PATH).'css/'.$platform_theme.'/frames.css')) {
 								copy(api_get_path(SYS_CODE_PATH).'css/'.$platform_theme.'/frames.css', $filepath.'css/frames.css');
@@ -334,54 +334,54 @@ 
 							}
 						}*/
 
-						// "WHAT'S NEW" notification: update table item_property
-						$document_id = DocumentManager::get_document_id($_course, $file);
-
-						if ($document_id) {
-							update_existing_document(
-								$_course,
-								$document_id,
-								$file_size,
-								$read_only_flag
-							);
-							api_item_property_update(
-								$_course,
-								TOOL_DOCUMENT,
-								$document_id,
-								'DocumentUpdated',
-								api_get_user_id(),
-								null,
-								null,
-								null,
-								null,
-								$sessionId
-							);
-							// Update parent folders
-							item_property_update_on_folder(
-								$_course,
-								$dir,
-								api_get_user_id()
-							);
-							header('Location: document.php?id=' . $document_data['parent_id'] . '&' . api_get_cidreq() . ($is_certificate_mode?'&curdirpath=/certificates&selectcat=1':''));
-							exit;
-						} else {
+                        // "WHAT'S NEW" notification: update table item_property
+                        $document_id = DocumentManager::get_document_id($_course, $file);
+
+                        if ($document_id) {
+                            update_existing_document(
+                                $_course,
+                                $document_id,
+                                $file_size,
+                                $read_only_flag
+                            );
+                            api_item_property_update(
+                                $_course,
+                                TOOL_DOCUMENT,
+                                $document_id,
+                                'DocumentUpdated',
+                                api_get_user_id(),
+                                null,
+                                null,
+                                null,
+                                null,
+                                $sessionId
+                            );
+                            // Update parent folders
+                            item_property_update_on_folder(
+                                $_course,
+                                $dir,
+                                api_get_user_id()
+                            );
+                            header('Location: document.php?id=' . $document_data['parent_id'] . '&' . api_get_cidreq() . ($is_certificate_mode?'&curdirpath=/certificates&selectcat=1':''));
+                            exit;
+                        } else {
                             Display::addFlash(Display::return_message(get_lang('Impossible'), 'warning'));
-						}
-					} else {
+                        }
+                    } else {
                         Display::addFlash(Display::return_message(get_lang('Impossible'), 'warning'));
-					}
-				} else {
-					if ($document_id) {
+                    }
+                } else {
+                    if ($document_id) {
                         update_existing_document($_course, $document_id, $file_size, $read_only_flag);
-					}
-				}
-			} else {
+                    }
+                }
+            } else {
                 if ($document_id) {
                     update_existing_document($_course, $document_id, $file_size, $read_only_flag);
                 }
-			}
-		}
-	}
+            }
+        }
+    }
 }
 
 // Replace relative paths by absolute web paths (e.g. './' => 'http://www.chamilo.org/courses/ABC/document/')
@@ -435,35 +435,35 @@ 
         api_get_group_id()
     )
 ) {
-	$action = api_get_self().'?id='.$document_data['id'].'&'.api_get_cidreq();
+    $action = api_get_self().'?id='.$document_data['id'].'&'.api_get_cidreq();
     if ($is_certificate_mode) {
         $action .= '&curdirpath=/certificates&selectcat=1';
     }
-	$form = new FormValidator('formEdit', 'post', $action, null, array('class' => 'form-vertical'));
-
-	// Form title
-	$form->addElement('header', $nameTools);
-	$form->addElement('hidden', 'filename');
-	$form->addElement('hidden', 'extension');
-	$form->addElement('hidden', 'file_path');
-	$form->addElement('hidden', 'commentPath');
-	$form->addElement('hidden', 'showedit');
-	$form->addElement('hidden', 'origin');
-	$form->addElement('hidden', 'origin_opt');
+    $form = new FormValidator('formEdit', 'post', $action, null, array('class' => 'form-vertical'));
+
+    // Form title
+    $form->addElement('header', $nameTools);
+    $form->addElement('hidden', 'filename');
+    $form->addElement('hidden', 'extension');
+    $form->addElement('hidden', 'file_path');
+    $form->addElement('hidden', 'commentPath');
+    $form->addElement('hidden', 'showedit');
+    $form->addElement('hidden', 'origin');
+    $form->addElement('hidden', 'origin_opt');
     $form->addText('title', get_lang('Title'), true, array('cols-size' => [2, 10, 0], 'autofocus'));
 
-	$defaults['title'] = $document_data['title'];
+    $defaults['title'] = $document_data['title'];
 
-	$form->addElement('hidden', 'formSent');
-	$defaults['formSent'] = 1;
+    $form->addElement('hidden', 'formSent');
+    $defaults['formSent'] = 1;
 
-	$read_only_flag = isset($_POST['readonly']) ? $_POST['readonly'] : null;
+    $read_only_flag = isset($_POST['readonly']) ? $_POST['readonly'] : null;
 
-	// Desactivation of IE proprietary commenting tags inside the text before loading it on the online editor.
-	// This fix has been proposed by Hubert Borderiou, see Bug #573, http://support.chamilo.org/issues/573
-	$defaults['content'] = str_replace('<!--[', '<!-- [', $content);
+    // Desactivation of IE proprietary commenting tags inside the text before loading it on the online editor.
+    // This fix has been proposed by Hubert Borderiou, see Bug #573, http://support.chamilo.org/issues/573
+    $defaults['content'] = str_replace('<!--[', '<!-- [', $content);
 
-	// HotPotatoes tests are html files, but they should not be edited in order their functionality to be preserved.
+    // HotPotatoes tests are html files, but they should not be edited in order their functionality to be preserved.
 
     $showSystemFolders = api_get_course_setting('show_system_folders');
     $condition = stripos($dir, '/HotPotatoes_files') === false;
@@ -471,44 +471,44 @@ 
         $condition = true;
     }
 
-	if (($extension == 'htm' || $extension == 'html') && $condition) {
-		if (empty($readonly) && $readonly == 0) {
+    if (($extension == 'htm' || $extension == 'html') && $condition) {
+        if (empty($readonly) && $readonly == 0) {
             $form->addHtmlEditor('content', '', true, true, $editorConfig);
-		}
-	}
+        }
+    }
 
-	if (!$group_document && !DocumentManager::is_my_shared_folder(api_get_user_id(), $currentDirPath, $sessionId)) {
-		// Updated on field
+    if (!$group_document && !DocumentManager::is_my_shared_folder(api_get_user_id(), $currentDirPath, $sessionId)) {
+        // Updated on field
         $display_date = date_to_str_ago($last_edit_date).
-			' <span class="dropbox_date">'.api_format_date(api_get_local_time($last_edit_date)).'</span>';
-		$form->addElement('static', null, get_lang('UpdatedOn'), $display_date);
-	}
+            ' <span class="dropbox_date">'.api_format_date(api_get_local_time($last_edit_date)).'</span>';
+        $form->addElement('static', null, get_lang('UpdatedOn'), $display_date);
+    }
 
-	$form->addElement('textarea', 'comment', get_lang('Comment'), ['cols-size' => [2, 10, 0]]);
+    $form->addElement('textarea', 'comment', get_lang('Comment'), ['cols-size' => [2, 10, 0]]);
 
-	if ($owner_id == api_get_user_id() || api_is_platform_admin()) {
-		$checked =& $form->addElement('checkbox', 'readonly', null, get_lang('ReadOnly'));
-		if ($readonly == 1) {
-			$checked->setChecked(true);
-		}
-	}
+    if ($owner_id == api_get_user_id() || api_is_platform_admin()) {
+        $checked =& $form->addElement('checkbox', 'readonly', null, get_lang('ReadOnly'));
+        if ($readonly == 1) {
+            $checked->setChecked(true);
+        }
+    }
 
-	if ($is_certificate_mode) {
-		$form->addButtonUpdate(get_lang('SaveCertificate'));
+    if ($is_certificate_mode) {
+        $form->addButtonUpdate(get_lang('SaveCertificate'));
     } else {
-		$form->addButtonUpdate(get_lang('SaveDocument'));
+        $form->addButtonUpdate(get_lang('SaveDocument'));
     }
 
-	$defaults['filename'] = $filename;
-	$defaults['extension'] = $extension;
-	$defaults['file_path'] = isset($_GET['file']) ? Security::remove_XSS($_GET['file']) : null;
-	$defaults['commentPath'] = $file;
-	$defaults['renameTo'] = $file_name;
-	$defaults['comment'] = $document_data['comment'];
-	$defaults['origin'] = isset($_GET['origin']) ? Security::remove_XSS($_GET['origin']) : null;
-	$defaults['origin_opt'] = isset($_GET['origin_opt']) ? Security::remove_XSS($_GET['origin_opt']) : null;
+    $defaults['filename'] = $filename;
+    $defaults['extension'] = $extension;
+    $defaults['file_path'] = isset($_GET['file']) ? Security::remove_XSS($_GET['file']) : null;
+    $defaults['commentPath'] = $file;
+    $defaults['renameTo'] = $file_name;
+    $defaults['comment'] = $document_data['comment'];
+    $defaults['origin'] = isset($_GET['origin']) ? Security::remove_XSS($_GET['origin']) : null;
+    $defaults['origin_opt'] = isset($_GET['origin_opt']) ? Security::remove_XSS($_GET['origin_opt']) : null;
 
-	$form->setDefaults($defaults);
+    $form->setDefaults($defaults);
 
     show_return(
         $parent_id,
@@ -518,25 +518,25 @@ 
         $is_certificate_mode
     );
 
-	if ($is_certificate_mode) {
-		$all_information_by_create_certificate = DocumentManager::get_all_info_to_certificate(
-			api_get_user_id(),
-			api_get_course_id()
-		);
-		$str_info = '';
-		foreach ($all_information_by_create_certificate[0] as $info_value) {
-			$str_info .= $info_value.'<br/>';
-		}
-		$create_certificate=get_lang('CreateCertificateWithTags');
-		Display::display_normal_message(
-			$create_certificate.': <br /><br />'.$str_info,
-			false
-		);
-	}
-
-	if ($extension=='svg' && !api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true'){
-		Display::display_warning_message(get_lang('BrowserDontSupportsSVG'));
-	}
+    if ($is_certificate_mode) {
+        $all_information_by_create_certificate = DocumentManager::get_all_info_to_certificate(
+            api_get_user_id(),
+            api_get_course_id()
+        );
+        $str_info = '';
+        foreach ($all_information_by_create_certificate[0] as $info_value) {
+            $str_info .= $info_value.'<br/>';
+        }
+        $create_certificate=get_lang('CreateCertificateWithTags');
+        Display::display_normal_message(
+            $create_certificate.': <br /><br />'.$str_info,
+            false
+        );
+    }
+
+    if ($extension=='svg' && !api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true'){
+        Display::display_warning_message(get_lang('BrowserDontSupportsSVG'));
+    }
     // HTML-editor
     echo '<div class="page-create">
             <div class="row" style="overflow:hidden">
@@ -563,26 +563,26 @@ 
 */
 function change_name($base_work_dir, $source_file, $rename_to, $dir, $doc)
 {
-	$file_name_for_change = $base_work_dir.$dir.$source_file;
+    $file_name_for_change = $base_work_dir.$dir.$source_file;
     $rename_to = disable_dangerous_file($rename_to); // Avoid renaming to .htaccess file
-	$rename_to = my_rename($file_name_for_change, stripslashes($rename_to)); // fileManage API
-
-	if ($rename_to) {
-		if (isset($dir) && $dir != '') {
-			$source_file = $dir.$source_file;
-			$new_full_file_name = dirname($source_file).'/'.$rename_to;
-		} else {
-			$source_file = '/'.$source_file;
-			$new_full_file_name = '/'.$rename_to;
-		}
-
-		update_db_info('update', $source_file, $new_full_file_name); // fileManage API
+    $rename_to = my_rename($file_name_for_change, stripslashes($rename_to)); // fileManage API
+
+    if ($rename_to) {
+        if (isset($dir) && $dir != '') {
+            $source_file = $dir.$source_file;
+            $new_full_file_name = dirname($source_file).'/'.$rename_to;
+        } else {
+            $source_file = '/'.$source_file;
+            $new_full_file_name = '/'.$rename_to;
+        }
+
+        update_db_info('update', $source_file, $new_full_file_name); // fileManage API
         Display::addFlash(Display::return_message(get_lang('fileModified')));
 
-		return true;
-	} else {
+        return true;
+    } else {
         Display::addFlash(Display::return_message(get_lang('FileExists')));
-	}
+    }
 }
 
 //return button back to
@@ -595,32 +595,32 @@ 
     global $parent_id;
     $url = api_get_path(WEB_CODE_PATH).'document/document.php?'.api_get_cidreq().'&id='.$parent_id;
 
-	if ($is_certificate_mode) {
-		$selectedCategory = (isset($_GET['curdirpath']) ? Security::remove_XSS($_GET['curdirpath']) : '');
-		$actionsLeft .= '<a href="document.php?curdirpath='. $selectedCategory .'&selectcat=' . $selectedCategory .'">'.
+    if ($is_certificate_mode) {
+        $selectedCategory = (isset($_GET['curdirpath']) ? Security::remove_XSS($_GET['curdirpath']) : '');
+        $actionsLeft .= '<a href="document.php?curdirpath='. $selectedCategory .'&selectcat=' . $selectedCategory .'">'.
             Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'),'',ICON_SIZE_MEDIUM).'</a>';
         $actionsLeft .= '<a id="hide_bar_template" href="#">'.Display::return_icon('expand.png',get_lang('Expand'),array('id'=>'expand'),ICON_SIZE_MEDIUM).Display::return_icon('contract.png',get_lang('Collapse'),array('id'=>'contract', 'class'=>'hide'),ICON_SIZE_MEDIUM).'</a>';
-	} elseif($call_from_tool=='slideshow') {
-		$actionsLeft .= '<a href="'.api_get_path(WEB_PATH).'main/document/slideshow.php?slide_id='.$slide_id.'&curdirpath='.Security::remove_XSS(urlencode($_GET['curdirpath'])).'">'.
+    } elseif($call_from_tool=='slideshow') {
+        $actionsLeft .= '<a href="'.api_get_path(WEB_PATH).'main/document/slideshow.php?slide_id='.$slide_id.'&curdirpath='.Security::remove_XSS(urlencode($_GET['curdirpath'])).'">'.
             Display::return_icon('slideshow.png', get_lang('BackTo').' '.get_lang('ViewSlideshow'),'',ICON_SIZE_MEDIUM).'</a>';
-	} elseif($call_from_tool=='editdraw') {
-		$actionsLeft .= '<a href="'.$url.'">'.
+    } elseif($call_from_tool=='editdraw') {
+        $actionsLeft .= '<a href="'.$url.'">'.
             Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
-		$actionsLeft .= '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Draw'), array(), 32).'</a>';
-	} elseif($call_from_tool=='editodf') {
+        $actionsLeft .= '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Draw'), array(), 32).'</a>';
+    } elseif($call_from_tool=='editodf') {
         $actionsLeft .= '<a href="'.$url.'">'.
             Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
         $actionsLeft .= '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Write'), array(), 32).'</a>';
         $actionsLeft .= '<a id="hide_bar_template" href="#">'.Display::return_icon('expand.png',get_lang('Expand'),array('id'=>'expand'),ICON_SIZE_MEDIUM).Display::return_icon('contract.png',get_lang('Collapse'),array('id'=>'contract', 'class'=>'hide'),ICON_SIZE_MEDIUM).'</a>';
     } elseif($call_from_tool=='editpaint'){
-		$actionsLeft .= '<a href="'.$url.'">'.
+        $actionsLeft .= '<a href="'.$url.'">'.
             Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), array(), ICON_SIZE_MEDIUM).'</a>';
-		$actionsLeft .= '<a href="javascript:history.back(1)">'.Display::return_icon('paint.png', get_lang('BackTo').' '.get_lang('Paint'), array(), 32).'</a>';
-	} else {
-		$actionsLeft .= '<a href="'.$url.'">'.
+        $actionsLeft .= '<a href="javascript:history.back(1)">'.Display::return_icon('paint.png', get_lang('BackTo').' '.get_lang('Paint'), array(), 32).'</a>';
+    } else {
+        $actionsLeft .= '<a href="'.$url.'">'.
             Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
         $actionsLeft .= '<a id="hide_bar_template" href="#">'.Display::return_icon('expand.png',get_lang('Expand'),array('id'=>'expand'),ICON_SIZE_MEDIUM).Display::return_icon('contract.png',get_lang('Collapse'),array('id'=>'contract', 'class'=>'hide'),ICON_SIZE_MEDIUM).'</a>';
-	}
+    }
     
     echo $toolbar = Display::toolbarAction('actions-documents', array(0 => $actionsLeft, 1 => ''));
 }